xen_pt_unregister_device is used as PCIUnregisterFunc, so it should
match the type.
Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
diff --git a/hw/xen_pt.c b/hw/xen_pt.c
index fdf68aa..307119a 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[] = {
Am 01.08.2012 12:19, schrieb Stefano Stabellini:> xen_pt_unregister_device is used as PCIUnregisterFunc, so it should > match the type. > > Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>Tested-by: Andreas Färber <afaerber@suse.de> /-F> > diff --git a/hw/xen_pt.c b/hw/xen_pt.c > index fdf68aa..307119a 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[] = { >-- SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg
On Wed, 1 Aug 2012, Andreas Färber wrote:> Am 01.08.2012 12:19, schrieb Stefano Stabellini: > > xen_pt_unregister_device is used as PCIUnregisterFunc, so it should > > match the type. > > > > Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com> > > Tested-by: Andreas Färber <afaerber@suse.de> >Thanks! I have another old Xen fix to configure in my backlog, I am just going to send a pull request with both fixes in it. --1342847746-1969835623-1343828412=:4645--
Stefano Stabellini <stefano.stabellini@eu.citrix.com> writes:> xen_pt_unregister_device is used as PCIUnregisterFunc, so it should > match the type. > > Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>Applied. Thanks. Regards, Anthony Liguori> > diff --git a/hw/xen_pt.c b/hw/xen_pt.c > index fdf68aa..307119a 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[] = {