qemu-haxm: Fix debug build on NetBSD

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

Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Sat Feb 2 15:09:55 2019 +0100
Changeset:	949b9a405213d7a00de9b4eabad5b29110c83d28

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

Log Message:
qemu-haxm: Fix debug build on NetBSD

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

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

diffstat:
 qemu-haxm/distinfo                             |  2 ++
 qemu-haxm/patches/patch-include_sysemu_kvm.h   | 21 +++++++++++++++++++++
 qemu-haxm/patches/patch-target_i386_kvm-stub.c | 21 +++++++++++++++++++++
 3 files changed, 44 insertions(+)

diffs:
diff --git a/qemu-haxm/distinfo b/qemu-haxm/distinfo
index 3a23425d12..f3e6b5330d 100644
--- a/qemu-haxm/distinfo
+++ b/qemu-haxm/distinfo
@@ -5,3 +5,5 @@ RMD160 (qemu-2.8.1.tar.bz2) = 93f71138d19c871195c9e0b1a7ba66275773f93a
 SHA512 (qemu-2.8.1.tar.bz2) = 0397b4029cdcb77ed053c44b3579a3f34894038e6fc6b4aa88de14515f5a78bf2f41c5e865f37111529f567c85d2f1c4deefae47dde54f76eac79410e5b2bdda
 Size (qemu-2.8.1.tar.bz2) = 28366270 bytes
 SHA1 (patch-configure) = 3dff8457b48cdf60abc5b3208fc6522cb8962907
+SHA1 (patch-include_sysemu_kvm.h) = e3cd7c41d8c1cc25a7ea290c7c97474bae7938a8
+SHA1 (patch-target_i386_kvm-stub.c) = 54864ca8a0292f35e4f7d8bb94e98160652a16b5
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..3e412068ca
--- /dev/null
+++ b/qemu-haxm/patches/patch-include_sysemu_kvm.h
@@ -0,0 +1,21 @@
+$NetBSD$
+
+--- include/sysemu/kvm.h.orig	2019-02-02 13:14:03.877852089 +0000
++++ include/sysemu/kvm.h
+@@ -459,8 +459,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
+ uint32_t kvm_arch_get_supported_msr_feature(KVMState *s, uint32_t index);
+ 
+ 
diff --git a/qemu-haxm/patches/patch-target_i386_kvm-stub.c b/qemu-haxm/patches/patch-target_i386_kvm-stub.c
new file mode 100644
index 0000000000..123f308a39
--- /dev/null
+++ b/qemu-haxm/patches/patch-target_i386_kvm-stub.c
@@ -0,0 +1,21 @@
+$NetBSD$
+
+--- target/i386/kvm-stub.c.orig	2019-02-02 13:12:09.564671574 +0000
++++ target/i386/kvm-stub.c
+@@ -29,16 +29,6 @@ bool kvm_enable_x2apic(void)
+ {
+     return false;
+ }
+-
+-/* This function is only called inside conditionals which we
+- * rely on the compiler to optimize out when CONFIG_KVM is not
+- * defined.
+- */
+-uint32_t kvm_arch_get_supported_cpuid(KVMState *env, uint32_t function,
+-                                      uint32_t index, int reg)
+-{
+-    abort();
+-}
+ #endif
+ 
+ bool kvm_hv_vpindex_settable(void)