Patchwork megasas: Update function megasys_scsi_uninit

login
register
mail settings
Submitter Stefan Weil
Date July 31, 2012, 5:54 a.m.
Message ID <1343714097-545-1-git-send-email-sw@weilnetz.de>
Download mbox | patch
Permalink /patch/174147/
State Accepted
Headers show

Comments

Stefan Weil - July 31, 2012, 5:54 a.m.
Commit f90c2bcdbc69e41e575f868b984c3e2de8f51bac changed
PCIUnregisterFunc, therefore the function prototype
needs an update.

megasas.o is currently not linked, so this bug was not
detected by the buildbots.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
---
 hw/megasas.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
Paolo Bonzini - July 31, 2012, 2:13 p.m.
Il 31/07/2012 07:54, Stefan Weil ha scritto:
> Commit f90c2bcdbc69e41e575f868b984c3e2de8f51bac changed
> PCIUnregisterFunc, therefore the function prototype
> needs an update.
> 
> megasas.o is currently not linked, so this bug was not
> detected by the buildbots.
> 
> Signed-off-by: Stefan Weil <sw@weilnetz.de>
> ---
>  hw/megasas.c |    3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
> 
> diff --git a/hw/megasas.c b/hw/megasas.c
> index 833f313..5235c50 100644
> --- a/hw/megasas.c
> +++ b/hw/megasas.c
> @@ -2041,7 +2041,7 @@ static const VMStateDescription vmstate_megasas = {
>      }
>  };
>  
> -static int megasas_scsi_uninit(PCIDevice *d)
> +static void megasas_scsi_uninit(PCIDevice *d)
>  {
>      MegasasState *s = DO_UPCAST(MegasasState, dev, d);
>  
> @@ -2051,7 +2051,6 @@ static int megasas_scsi_uninit(PCIDevice *d)
>      memory_region_destroy(&s->mmio_io);
>      memory_region_destroy(&s->port_io);
>      memory_region_destroy(&s->queue_io);
> -    return 0;
>  }
>  
>  static const struct SCSIBusInfo megasas_scsi_info = {
> 

Applied to scsi-next branch, thanks.

Paolo
Andreas Färber - July 31, 2012, 2:39 p.m.
Am 31.07.2012 07:54, schrieb Stefan Weil:
> Commit f90c2bcdbc69e41e575f868b984c3e2de8f51bac changed
> PCIUnregisterFunc, therefore the function prototype
> needs an update.
> 
> megasas.o is currently not linked, so this bug was not
> detected by the buildbots.

Why would megasas be in master but not compiled/linked?

Andreas
Paolo Bonzini - July 31, 2012, 2:43 p.m.
Il 31/07/2012 16:39, Andreas Färber ha scritto:
>> > Commit f90c2bcdbc69e41e575f868b984c3e2de8f51bac changed
>> > PCIUnregisterFunc, therefore the function prototype
>> > needs an update.
>> > 
>> > megasas.o is currently not linked, so this bug was not
>> > detected by the buildbots.
> Why would megasas be in master but not compiled/linked?

Because Anthony objected to how it picks the initiator WWN.

Paolo
Andreas Färber - July 31, 2012, 2:46 p.m.
Am 31.07.2012 16:43, schrieb Paolo Bonzini:
> Il 31/07/2012 16:39, Andreas Färber ha scritto:
>>>> Commit f90c2bcdbc69e41e575f868b984c3e2de8f51bac changed
>>>> PCIUnregisterFunc, therefore the function prototype
>>>> needs an update.
>>>>
>>>> megasas.o is currently not linked, so this bug was not
>>>> detected by the buildbots.
>> Why would megasas be in master but not compiled/linked?
> 
> Because Anthony objected to how it picks the initiator WWN.

Ah, anything keeping us from fixing that? :)

Andreas
Paolo Bonzini - July 31, 2012, 2:50 p.m.
Il 31/07/2012 16:46, Andreas Färber ha scritto:
> > > Why would megasas be in master but not compiled/linked?
> > Because Anthony objected to how it picks the initiator WWN.
> Ah, anything keeping us from fixing that? :)

Exact knowledge of the requirements, basically. :)

Paolo
Andreas Färber - July 31, 2012, 2:55 p.m.
Am 31.07.2012 16:50, schrieb Paolo Bonzini:
> Il 31/07/2012 16:46, Andreas Färber ha scritto:
>>>> Why would megasas be in master but not compiled/linked?
>>> Because Anthony objected to how it picks the initiator WWN.
>> Ah, anything keeping us from fixing that? :)
> 
> Exact knowledge of the requirements, basically. :)

I.e. waiting on feedback about numeric constraints from Hannes? :)
Or waiting on general direction from Anthony?
How to make progress there for 1.2 / Soft Freeze?

Andreas
Anthony Liguori - July 31, 2012, 3:15 p.m.
Andreas Färber <afaerber@suse.de> writes:

> Am 31.07.2012 16:50, schrieb Paolo Bonzini:
>> Il 31/07/2012 16:46, Andreas Färber ha scritto:
>>>>> Why would megasas be in master but not compiled/linked?
>>>> Because Anthony objected to how it picks the initiator WWN.
>>> Ah, anything keeping us from fixing that? :)
>> 
>> Exact knowledge of the requirements, basically. :)
>
> I.e. waiting on feedback about numeric constraints from Hannes? :)
> Or waiting on general direction from Anthony?
> How to make progress there for 1.2 / Soft Freeze?

You cannot build guest visible state by casting pointers.

I'm really disappointed that this hasn't been resolved yet.  If it's not
resolved before the soft freeze, I think we ought to revert the megasas
patches completely.

Regards,

Anthony Liguori

>
> Andreas
>
> -- 
> SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
> GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg
Paolo Bonzini - July 31, 2012, 3:16 p.m.
Il 31/07/2012 16:55, Andreas Färber ha scritto:
>> > Exact knowledge of the requirements, basically. :)
> I.e. waiting on feedback about numeric constraints from Hannes? :)

Yeah, mostly which parts are 100% necessary and which are not.  Do you
need absolutely a WWN for each disk?

> Or waiting on general direction from Anthony?

No, we agreed on that.

> How to make progress there for 1.2 / Soft Freeze?

No possibility of regressions, so we can do it during hard freeze.  But
it is really a small task once we agreed on what has to be done.

Paolo

Patch

diff --git a/hw/megasas.c b/hw/megasas.c
index 833f313..5235c50 100644
--- a/hw/megasas.c
+++ b/hw/megasas.c
@@ -2041,7 +2041,7 @@  static const VMStateDescription vmstate_megasas = {
     }
 };
 
-static int megasas_scsi_uninit(PCIDevice *d)
+static void megasas_scsi_uninit(PCIDevice *d)
 {
     MegasasState *s = DO_UPCAST(MegasasState, dev, d);
 
@@ -2051,7 +2051,6 @@  static int megasas_scsi_uninit(PCIDevice *d)
     memory_region_destroy(&s->mmio_io);
     memory_region_destroy(&s->port_io);
     memory_region_destroy(&s->queue_io);
-    return 0;
 }
 
 static const struct SCSIBusInfo megasas_scsi_info = {