From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jan Kiszka Subject: qemu-kvm: Fix some libkvm warnings Date: Sun, 26 Apr 2009 14:48:02 +0200 Message-ID: <49F45802.6000809@web.de> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="------------enigCB0D37F6206554EA9C0C23C2" Cc: kvm-devel To: Avi Kivity Return-path: Received: from fmmailgate02.web.de ([217.72.192.227]:56746 "EHLO fmmailgate02.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754067AbZDZMsJ (ORCPT ); Sun, 26 Apr 2009 08:48:09 -0400 Sender: kvm-owner@vger.kernel.org List-ID: This is an OpenPGP/MIME signed message (RFC 2440 and 3156) --------------enigCB0D37F6206554EA9C0C23C2 Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: quoted-printable Signed-off-by: Jan Kiszka diff --git a/kvm/libkvm/kvm-common.h b/kvm/libkvm/kvm-common.h index 96361e8..591fb53 100644 --- a/kvm/libkvm/kvm-common.h +++ b/kvm/libkvm/kvm-common.h @@ -22,7 +22,7 @@ #define KVM_MAX_NUM_MEM_REGIONS 1u #define MAX_VCPUS 64 #define LIBKVM_S390_ORIGIN (0UL) -#elif __ia64__ +#elif defined(__ia64__) #define KVM_MAX_NUM_MEM_REGIONS 32u #define MAX_VCPUS 256 #else diff --git a/kvm/libkvm/libkvm-x86.c b/kvm/libkvm/libkvm-x86.c index 2fc4fce..df8cc81 100644 --- a/kvm/libkvm/libkvm-x86.c +++ b/kvm/libkvm/libkvm-x86.c @@ -52,7 +52,7 @@ static int kvm_init_tss(kvm_context_t kvm) return 0; } =20 -int kvm_create_pit(kvm_context_t kvm) +static int kvm_create_pit(kvm_context_t kvm) { #ifdef KVM_CAP_PIT int r; diff --git a/kvm/libkvm/libkvm.c b/kvm/libkvm/libkvm.c index 0610e3f..6751dc5 100644 --- a/kvm/libkvm/libkvm.c +++ b/kvm/libkvm/libkvm.c @@ -1158,6 +1158,19 @@ static int kvm_old_assign_irq(kvm_context_t kvm, return ret; } =20 +int kvm_destroy_memory_region_works(kvm_context_t kvm) +{ + int ret =3D 0; + +#ifdef KVM_CAP_DESTROY_MEMORY_REGION_WORKS + ret =3D ioctl(kvm->fd, KVM_CHECK_EXTENSION, + KVM_CAP_DESTROY_MEMORY_REGION_WORKS); + if (ret <=3D 0) + ret =3D 0; +#endif + return ret; +} + #ifdef KVM_CAP_ASSIGN_DEV_IRQ int kvm_assign_irq(kvm_context_t kvm, struct kvm_assigned_irq *assigned_irq) @@ -1209,19 +1222,7 @@ int kvm_deassign_pci_device(kvm_context_t kvm, } #endif =20 -int kvm_destroy_memory_region_works(kvm_context_t kvm) -{ - int ret =3D 0; - -#ifdef KVM_CAP_DESTROY_MEMORY_REGION_WORKS - ret =3D ioctl(kvm->fd, KVM_CHECK_EXTENSION, - KVM_CAP_DESTROY_MEMORY_REGION_WORKS); - if (ret <=3D 0) - ret =3D 0; -#endif - return ret; -} - +#ifdef KVM_CAP_PIT int kvm_reinject_control(kvm_context_t kvm, int pit_reinject) { #ifdef KVM_CAP_REINJECT_CONTROL @@ -1240,6 +1241,7 @@ int kvm_reinject_control(kvm_context_t kvm, int pit= _reinject) #endif return -ENOSYS; } +#endif =20 int kvm_has_gsi_routing(kvm_context_t kvm) { --------------enigCB0D37F6206554EA9C0C23C2 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 iEYEARECAAYFAkn0WAUACgkQniDOoMHTA+m2yACfRgtb0Nazzdn/7rYbFUkuJSOz vfYAn0DkinUgbRjyEKRmAcF7WqEQ8b7i =Wctn -----END PGP SIGNATURE----- --------------enigCB0D37F6206554EA9C0C23C2--