Il 21/07/2013 12:24, Andreas Färber ha scritto:
> Only apply legacy command line handling when the device has not been
> hot-plugged. Propagate failure of legacy command line handling.
>
> Cc: qemu-sta...@nongnu.org
> Signed-off-by: Andreas Färber <afaer...@suse.de>
> ---
> hw/scsi/megasas.c | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/hw/scsi/megasas.c b/hw/scsi/megasas.c
> index 55d5b73..2ae4346 100644
> --- a/hw/scsi/megasas.c
> +++ b/hw/scsi/megasas.c
> @@ -2098,6 +2098,7 @@ static const struct SCSIBusInfo megasas_scsi_info = {
>
> static int megasas_scsi_init(PCIDevice *dev)
> {
> + DeviceState *d = DEVICE(dev);
> MegasasState *s = MEGASAS(dev);
> uint8_t *pci_conf;
> int i, bar_type;
> @@ -2170,7 +2171,9 @@ static int megasas_scsi_init(PCIDevice *dev)
> }
>
> scsi_bus_new(&s->bus, DEVICE(dev), &megasas_scsi_info, NULL);
> - scsi_bus_legacy_handle_cmdline(&s->bus);
> + if (!d->hotplugged) {
> + return scsi_bus_legacy_handle_cmdline(&s->bus);
> + }
> return 0;
> }
>
>
Acked-by: Paolo Bonzini <pbonz...@redhat.com>
