[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 49/55] megasas: Legacy command line handling fix
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PULL 49/55] megasas: Legacy command line handling fix |
Date: |
Tue, 23 Jul 2013 01:46:30 +0200 |
Only apply legacy command line handling when the device has not been
hot-plugged. Propagate failure of legacy command line handling.
Cc: address@hidden
Acked-by: Paolo Bonzini <address@hidden>
Signed-off-by: Andreas Färber <address@hidden>
---
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;
}
--
1.8.1.4
- [Qemu-devel] [PULL 37/55] ahci: QOM'ify some more, (continued)
- [Qemu-devel] [PULL 37/55] ahci: QOM'ify some more, Andreas Färber, 2013/07/22
- [Qemu-devel] [PULL 39/55] scsi/esp: QOM'ify some more, Andreas Färber, 2013/07/22
- [Qemu-devel] [PULL 41/55] kvm/clock: QOM'ify some more, Andreas Färber, 2013/07/22
- [Qemu-devel] [PULL 40/55] hpet: QOM'ify some more, Andreas Färber, 2013/07/22
- [Qemu-devel] [PULL 44/55] pflash_cfi01: Use QOM realize for pflash_cfi01, Andreas Färber, 2013/07/22
- [Qemu-devel] [PULL 45/55] pflash_cfi02: Use QOM realize for pflash_cfi02, Andreas Färber, 2013/07/22
- [Qemu-devel] [PULL 42/55] fdc: Use QOM realize for fdc, Andreas Färber, 2013/07/22
- [Qemu-devel] [PULL 43/55] fdc: Improve error propagation for QOM realize, Andreas Färber, 2013/07/22
- [Qemu-devel] [PULL 46/55] ahci: Use QOM realize for ahci, Andreas Färber, 2013/07/22
- [Qemu-devel] [PULL 48/55] scsi/esp: Use QOM realize for scsi esp, Andreas Färber, 2013/07/22
- [Qemu-devel] [PULL 49/55] megasas: Legacy command line handling fix,
Andreas Färber <=
- [Qemu-devel] [PULL 47/55] fw_cfg: Use QOM realize for fw_cfg, Andreas Färber, 2013/07/22
- [Qemu-devel] [PULL 52/55] kvm/clock: Use QOM realize for kvmclock, Andreas Färber, 2013/07/22
- [Qemu-devel] [PULL 51/55] hpet: Use QOM realize for hpet, Andreas Färber, 2013/07/22
- [Qemu-devel] [PULL 53/55] kvmvapic: Use QOM realize, Andreas Färber, 2013/07/22
- [Qemu-devel] [PULL 54/55] ioapic: Use QOM realize for ioapic, Andreas Färber, 2013/07/22
- [Qemu-devel] [PULL 50/55] scsi: Improve error propagation for scsi_bus_legacy_handle_cmdline(), Andreas Färber, 2013/07/22
- [Qemu-devel] [PULL 55/55] isa-bus: Drop isabus_bridge_init() since it does nothing, Andreas Färber, 2013/07/22