qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
* [Qemu-devel] [PATCH] fix Xen compilation
@ 2012-08-01 10:19 Stefano Stabellini
  2012-08-01 13:33 ` Andreas Färber
  2012-08-01 15:42 ` Anthony Liguori
  0 siblings, 2 replies; 4+ messages in thread
From: Stefano Stabellini @ 2012-08-01 10:19 UTC (permalink / raw)
  To: qemu-devel; +Cc: xen-devel, Ian Campbell, Stefano Stabellini, fantonifabio

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[] = {

^ permalink raw reply related	[flat|nested] 4+ messages in thread

* Re: [Qemu-devel] [PATCH] fix Xen compilation
  2012-08-01 10:19 [Qemu-devel] [PATCH] fix Xen compilation Stefano Stabellini
@ 2012-08-01 13:33 ` Andreas Färber
  2012-08-01 13:40   ` Stefano Stabellini
  2012-08-01 15:42 ` Anthony Liguori
  1 sibling, 1 reply; 4+ messages in thread
From: Andreas Färber @ 2012-08-01 13:33 UTC (permalink / raw)
  To: Stefano Stabellini
  Cc: Anthony Liguori, xen-devel, qemu-devel, fantonifabio,
	Ian Campbell

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

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [Qemu-devel] [PATCH] fix Xen compilation
  2012-08-01 13:33 ` Andreas Färber
@ 2012-08-01 13:40   ` Stefano Stabellini
  0 siblings, 0 replies; 4+ messages in thread
From: Stefano Stabellini @ 2012-08-01 13:40 UTC (permalink / raw)
  To: Andreas Färber
  Cc: xen-devel@lists.xensource.com, Ian Campbell,
	fantonifabio@tiscali.it, Stefano Stabellini,
	qemu-devel@nongnu.org, Anthony Liguori

[-- Attachment #1: Type: text/plain, Size: 443 bytes --]

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.

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [Qemu-devel] [PATCH] fix Xen compilation
  2012-08-01 10:19 [Qemu-devel] [PATCH] fix Xen compilation Stefano Stabellini
  2012-08-01 13:33 ` Andreas Färber
@ 2012-08-01 15:42 ` Anthony Liguori
  1 sibling, 0 replies; 4+ messages in thread
From: Anthony Liguori @ 2012-08-01 15:42 UTC (permalink / raw)
  To: Stefano Stabellini, qemu-devel
  Cc: xen-devel, Ian Campbell, fantonifabio, Stefano Stabellini

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[] = {

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2012-08-01 15:42 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-08-01 10:19 [Qemu-devel] [PATCH] fix Xen compilation Stefano Stabellini
2012-08-01 13:33 ` Andreas Färber
2012-08-01 13:40   ` Stefano Stabellini
2012-08-01 15:42 ` Anthony Liguori

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).