qemu-haxm: Add missing patches

[Kamil Rytarowski <n54%gmx.com@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Thu Feb 14 20:01:06 2019 +0100
Changeset:	fae9b32713cce1693ee6ee754642a219c4ec9bcf

Modified Files:
	qemu-haxm/distinfo
	qemu-haxm/patches/patch-target_i386_kvm-stub.c
Added Files:
	qemu-haxm/patches/patch-include_sysemu_kvm.h
	qemu-haxm/patches/patch-target_i386_Makefile.objs

Log Message:
qemu-haxm: Add missing patches

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=fae9b32713cce1693ee6ee754642a219c4ec9bcf

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 qemu-haxm/distinfo                                |  6 +++---
 qemu-haxm/patches/patch-include_sysemu_kvm.h      | 23 +++++++++++++++++++++++
 qemu-haxm/patches/patch-target_i386_Makefile.objs | 16 ++++++++++++++++
 qemu-haxm/patches/patch-target_i386_kvm-stub.c    |  6 ++----
 4 files changed, 44 insertions(+), 7 deletions(-)

diffs:
diff --git a/qemu-haxm/distinfo b/qemu-haxm/distinfo
index 70c0e7db9b..51ac4dfa15 100644
--- a/qemu-haxm/distinfo
+++ b/qemu-haxm/distinfo
@@ -17,8 +17,8 @@ SHA1 (patch-hw_display_omap__dss.c) = 6b13242f28e32346bc70548c216c578d98fd3420
 SHA1 (patch-hw_net_etraxfs__eth.c) = e5dd1661d60dbcd27b332403e0843500ba9544bc
 SHA1 (patch-hw_net_xilinx__axienet.c) = ebcd2676d64ce6f31e4a8c976d4fdf530ad5e8b7
 SHA1 (patch-hw_usb_dev-mtp.c) = 66543b5559d92f8e2fa9a6eb85e5dfe7c1ad3339
-SHA1 (patch-include_sysemu_kvm.h) = f99e8ad021f6c8e89e3ca52538bd9b0656e6f619
-SHA1 (patch-target_i386_Makefile.objs) = bf6e641f44abead5c1909c43681c2b8ea97f31a0
+SHA1 (patch-include_sysemu_kvm.h) = 93dd3e9df9e3fb1dadaf8fa56ecf7d241afb37fb
+SHA1 (patch-target_i386_Makefile.objs) = d97d9cd01d1ab2aefcf7a016c69407530daa8d28
 SHA1 (patch-target_i386_hax-i386.h) = 040f5c4df532a027bb3d7305c7d924e1bd8fd831
-SHA1 (patch-target_i386_kvm-stub.c) = 4cd2b7a8d8d8a317829f982b5acff7fdf2479d9f
+SHA1 (patch-target_i386_kvm-stub.c) = d8199abcda623e54e760dde94e780faa3f231d0c
 SHA1 (patch-tests_Makefile.include) = 42345d697cb2e324dccf1d68bd8d61e8001c6162
diff --git a/qemu-haxm/patches/patch-include_sysemu_kvm.h b/qemu-haxm/patches/patch-include_sysemu_kvm.h
new file mode 100644
index 0000000000..0a9e0564dc
--- /dev/null
+++ b/qemu-haxm/patches/patch-include_sysemu_kvm.h
@@ -0,0 +1,23 @@
+$NetBSD: patch-include_sysemu_kvm.h,v 1.1 2019/02/13 05:16:12 kamil Exp $
+
+Fix debug build on NetBSD (without Linux-KVM).
+
+--- include/sysemu/kvm.h.orig	2018-08-14 19:10:34.000000000 +0000
++++ include/sysemu/kvm.h
+@@ -461,8 +461,16 @@ int kvm_vm_check_extension(KVMState *s, 
+         kvm_vcpu_ioctl(cpu, KVM_ENABLE_CAP, &cap);                   \
+     })
+ 
++#ifdef CONFIG_KVM
+ uint32_t kvm_arch_get_supported_cpuid(KVMState *env, uint32_t function,
+                                       uint32_t index, int reg);
++#else
++#define kvm_arch_get_supported_cpuid(a,b,c,d)                        \
++    ({                                                               \
++        abort();                                                     \
++        0;                                                           \
++    })
++#endif
+ 
+ void kvm_set_sigmask_len(KVMState *s, unsigned int sigmask_len);
+ 
diff --git a/qemu-haxm/patches/patch-target_i386_Makefile.objs b/qemu-haxm/patches/patch-target_i386_Makefile.objs
new file mode 100644
index 0000000000..ddaca8a0be
--- /dev/null
+++ b/qemu-haxm/patches/patch-target_i386_Makefile.objs
@@ -0,0 +1,16 @@
+$NetBSD$
+
+--- target/i386/Makefile.objs.orig	2018-08-14 19:10:35.000000000 +0000
++++ target/i386/Makefile.objs
+@@ -12,8 +12,10 @@ obj-$(call lnot,$(CONFIG_SEV)) += sev-st
+ ifdef CONFIG_WIN32
+ obj-$(CONFIG_HAX) += hax-all.o hax-mem.o hax-windows.o
+ endif
+-ifdef CONFIG_DARWIN
++ifeq ($(CONFIG_POSIX),y)
+ obj-$(CONFIG_HAX) += hax-all.o hax-mem.o hax-darwin.o
++endif
++ifdef CONFIG_DARWIN
+ obj-$(CONFIG_HVF) += hvf/
+ endif
+ obj-$(CONFIG_WHPX) += whpx-all.o
diff --git a/qemu-haxm/patches/patch-target_i386_kvm-stub.c b/qemu-haxm/patches/patch-target_i386_kvm-stub.c
index 0b551728c5..554b4d0bb3 100644
--- a/qemu-haxm/patches/patch-target_i386_kvm-stub.c
+++ b/qemu-haxm/patches/patch-target_i386_kvm-stub.c
@@ -1,8 +1,6 @@
-$NetBSD: patch-target_i386_kvm-stub.c,v 1.1 2019/02/13 05:16:12 kamil Exp $
+$NetBSD$
 
-Fix debug build on NetBSD (without Linux-KVM).
-
---- target/i386/kvm-stub.c.orig	2019-02-02 13:12:09.564671574 +0000
+--- target/i386/kvm-stub.c.orig	2018-08-14 19:10:35.000000000 +0000
 +++ target/i386/kvm-stub.c
 @@ -29,16 +29,6 @@ bool kvm_enable_x2apic(void)
  {