Revision 6fdb03d5 hw/pci-hotplug.c
| b/hw/pci-hotplug.c | ||
|---|---|---|
| 73 | 73 |
return pci_nic_init(&nd_table[ret], "rtl8139", devaddr); |
| 74 | 74 |
} |
| 75 | 75 |
|
| 76 |
static int scsi_hot_add(DeviceState *adapter, DriveInfo *dinfo, int printinfo) |
|
| 76 |
static int scsi_hot_add(Monitor *mon, DeviceState *adapter, |
|
| 77 |
DriveInfo *dinfo, int printinfo) |
|
| 77 | 78 |
{
|
| 78 | 79 |
SCSIBus *scsibus; |
| 79 | 80 |
SCSIDevice *scsidev; |
| ... | ... | |
| 97 | 98 |
dinfo->unit = scsidev->id; |
| 98 | 99 |
|
| 99 | 100 |
if (printinfo) |
| 100 |
qemu_error("OK bus %d, unit %d\n", scsibus->busnr, scsidev->id);
|
|
| 101 |
monitor_printf(mon, "OK bus %d, unit %d\n", |
|
| 102 |
scsibus->busnr, scsidev->id); |
|
| 101 | 103 |
return 0; |
| 102 | 104 |
} |
| 103 | 105 |
|
| ... | ... | |
| 131 | 133 |
monitor_printf(mon, "no pci device with address %s\n", pci_addr); |
| 132 | 134 |
goto err; |
| 133 | 135 |
} |
| 134 |
if (scsi_hot_add(&dev->qdev, dinfo, 1) != 0) {
|
|
| 136 |
if (scsi_hot_add(mon, &dev->qdev, dinfo, 1) != 0) {
|
|
| 135 | 137 |
goto err; |
| 136 | 138 |
} |
| 137 | 139 |
break; |
| ... | ... | |
| 203 | 205 |
if (qdev_init(&dev->qdev) < 0) |
| 204 | 206 |
dev = NULL; |
| 205 | 207 |
if (dev && dinfo) {
|
| 206 |
if (scsi_hot_add(&dev->qdev, dinfo, 0) != 0) {
|
|
| 208 |
if (scsi_hot_add(mon, &dev->qdev, dinfo, 0) != 0) {
|
|
| 207 | 209 |
qdev_unplug(&dev->qdev); |
| 208 | 210 |
dev = NULL; |
| 209 | 211 |
} |
Also available in: Unified diff