From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jan Kiszka Subject: [PATCH] qemu-kvm: Fix kvm-disabled build Date: Sat, 04 Jul 2009 11:03:12 +0200 Message-ID: <4A4F1AD0.4090905@web.de> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="------------enig682FF8A369BDB23FBFDBD0C1" Cc: kvm-devel To: Avi Kivity Return-path: Received: from fmmailgate03.web.de ([217.72.192.234]:38082 "EHLO fmmailgate03.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753280AbZGDJDM (ORCPT ); Sat, 4 Jul 2009 05:03:12 -0400 Sender: kvm-owner@vger.kernel.org List-ID: This is an OpenPGP/MIME signed message (RFC 2440 and 3156) --------------enig682FF8A369BDB23FBFDBD0C1 Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: quoted-printable This addresses all issues that currently block building qemu-kvm with kvm support switched off. It's a pragmatic approach as more cleanups are actually required /wrt {kvm,libkvm,qemu-kvm}.h. Signed-off-by: Jan Kiszka --- hw/pcspk.c | 4 ++-- libkvm-all.h | 8 ++++++++ qemu-kvm.h | 3 ++- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/hw/pcspk.c b/hw/pcspk.c index 9e1b59a..3d3eba4 100644 --- a/hw/pcspk.c +++ b/hw/pcspk.c @@ -82,9 +82,9 @@ static void kvm_set_pit_ch2(PITState *pit, } #else static inline void kvm_get_pit_ch2(PITState *pit, - kvm_pit_state *inkernel_state) { } + struct kvm_pit_state *inkernel_state)= { } static inline void kvm_set_pit_ch2(PITState *pit, - kvm_pit_state *inkernel_state) { } + struct kvm_pit_state *inkernel_state)= { } #endif =20 static inline void generate_samples(PCSpkState *s) diff --git a/libkvm-all.h b/libkvm-all.h index ecd3065..f348e69 100644 --- a/libkvm-all.h +++ b/libkvm-all.h @@ -5,6 +5,8 @@ #ifndef LIBKVM_H #define LIBKVM_H =20 +#ifdef USE_KVM + #if defined(__s390__) #include #endif @@ -938,4 +940,10 @@ int kvm_assign_set_msix_entry(kvm_context_t kvm, =20 uint32_t kvm_get_supported_cpuid(kvm_context_t kvm, uint32_t function, i= nt reg); =20 +#else /* !USE_KVM */ + +struct kvm_pit_state { }; + +#endif /* !USE_KVM */ + #endif diff --git a/qemu-kvm.h b/qemu-kvm.h index eb99bc4..18a5b7f 100644 --- a/qemu-kvm.h +++ b/qemu-kvm.h @@ -12,6 +12,8 @@ =20 #include =20 +#include "libkvm-all.h" + int kvm_main_loop(void); int kvm_qemu_init(void); int kvm_qemu_create_context(void); @@ -141,7 +143,6 @@ void kvm_arch_do_ioperm(void *_data); #define BITMAP_SIZE(m) (ALIGN(((m)>>TARGET_PAGE_BITS), HOST_LONG_BITS) /= 8) =20 #ifdef USE_KVM -#include "libkvm-all.h" #include "sys-queue.h" =20 extern int kvm_allowed; --------------enig682FF8A369BDB23FBFDBD0C1 Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.9 (GNU/Linux) Comment: Using GnuPG with SUSE - http://enigmail.mozdev.org iEYEARECAAYFAkpPGtAACgkQniDOoMHTA+kGkACdEngdx4eXbredGxzZvvwVzchH utcAnRS6Yk7qQHkz3T8OvnAfRFlmKYvI =ECYF -----END PGP SIGNATURE----- --------------enig682FF8A369BDB23FBFDBD0C1--