From 4074a56e2dad94d83db2a96bce7bfc5c4cae4835 Mon Sep 17 00:00:00 2001 From: Han, Weidong <weidong.han@intel.com> Date: Thu, 21 May 2009 17:08:43 -0700 Subject: [PATCH 14/15] kvm: qemu: fix build breakage on non-device-deassignment capable host kernels kvm_deassign_pci_device is defined when KVM_CAP_DEVICE_DEASSIGNMENT is defined. Signed-off-by: Weidong Han <weidong.han@intel.com> Signed-off-by: Avi Kivity <avi@redhat.com> (cherry picked from commit 4e000c5d44a40601ec944ccc38ce67c252641fc5) Signed-off-by: Chris Wright <chrisw@redhat.com> Bugzilla: 498084 Message-Id: <1242950924-30161-13-git-send-email-chrisw@redhat.com> Signed-off-by: Eduardo Habkost <ehabkost@redhat.com> RH-Upstream-status: applied Acked-by: Juan Quintela <quintela@redhat.com> Acked-by: Marcelo Tosatti <mtosatti@redhat.com> Acked-by: Don Dutile <ddutile@redhat.com> --- qemu/hw/device-assignment.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/qemu/hw/device-assignment.c b/qemu/hw/device-assignment.c index b7cbcec..56d70b4 100644 --- a/qemu/hw/device-assignment.c +++ b/qemu/hw/device-assignment.c @@ -551,6 +551,7 @@ static int assign_irq(AssignedDevInfo *adev) static void deassign_device(AssignedDevInfo *adev) { +#ifdef KVM_CAP_DEVICE_DEASSIGNMENT struct kvm_assigned_pci_dev assigned_dev_data; AssignedDevice *dev = adev->assigned_dev; int r; @@ -563,6 +564,7 @@ static void deassign_device(AssignedDevInfo *adev) if (r < 0) fprintf(stderr, "Failed to deassign device \"%s\" : %s\n", adev->name, strerror(-r)); +#endif } void remove_assigned_device(AssignedDevInfo *adev) -- 1.6.3.rc4.29.g8146