From f6ccf1f45385c33ec0ea0463cdb0b1fba3bd7178 Mon Sep 17 00:00:00 2001 From: Anthony PERARD Date: Wed, 1 Aug 2012 13:42:44 +0000 Subject: [PATCH 1/2] configure: Fix xen probe with Xen 4.2 and later The xs.h header is now deprecated and produces a warning. This prevents the configure script from enabling Xen with xen-unstable whom will become 4.2. As this header is not anymore common to every version of Xen, we just remove it from the early probe for Xen. Signed-off-by: Anthony PERARD Acked-by: Stefano Stabellini --- configure | 1 - 1 file changed, 1 deletion(-) diff --git a/configure b/configure index 027a718140..3ca13a6ce1 100755 --- a/configure +++ b/configure @@ -1384,7 +1384,6 @@ if test "$xen" != "no" ; then # Xen (any) cat > $TMPC < -#include int main(void) { return 0; } From 47fb65ce3e15762064dd6d93834e3ce923ef6f89 Mon Sep 17 00:00:00 2001 From: Stefano Stabellini Date: Wed, 1 Aug 2012 13:44:11 +0000 Subject: [PATCH 2/2] fix Xen compilation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit xen_pt_unregister_device is used as PCIUnregisterFunc, so it should match the type. Signed-off-by: Stefano Stabellini Tested-by: Andreas Färber --- hw/xen_pt.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/hw/xen_pt.c b/hw/xen_pt.c index fdf68aa564..307119a12f 100644 --- a/hw/xen_pt.c +++ b/hw/xen_pt.c @@ -764,7 +764,7 @@ out: return 0; } -static int xen_pt_unregister_device(PCIDevice *d) +static void xen_pt_unregister_device(PCIDevice *d) { XenPCIPassthroughState *s = DO_UPCAST(XenPCIPassthroughState, dev, d); uint8_t machine_irq = s->machine_irq; @@ -814,8 +814,6 @@ static int xen_pt_unregister_device(PCIDevice *d) memory_listener_unregister(&s->memory_listener); xen_host_pci_device_put(&s->real_device); - - return 0; } static Property xen_pci_passthrough_properties[] = {