[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 11/24] Implement scsi device destruction
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PATCH 11/24] Implement scsi device destruction |
Date: |
Fri, 25 Sep 2009 21:42:36 +0200 |
Signed-off-by: Gerd Hoffmann <address@hidden>
---
hw/scsi-bus.c | 24 +++++++++++++++++++++---
hw/scsi-disk.c | 6 ------
hw/scsi-generic.c | 2 --
3 files changed, 21 insertions(+), 11 deletions(-)
diff --git a/hw/scsi-bus.c b/hw/scsi-bus.c
index 881e363..27defc4 100644
--- a/hw/scsi-bus.c
+++ b/hw/scsi-bus.c
@@ -30,6 +30,7 @@ static int scsi_qdev_init(DeviceState *qdev, DeviceInfo *base)
SCSIDevice *dev = DO_UPCAST(SCSIDevice, qdev, qdev);
SCSIDeviceInfo *info = DO_UPCAST(SCSIDeviceInfo, qdev, base);
SCSIBus *bus = DO_UPCAST(SCSIBus, qbus, dev->qdev.parent_bus);
+ int rc = -1;
if (dev->id == -1) {
for (dev->id = 0; dev->id < bus->ndev; dev->id++) {
@@ -43,21 +44,38 @@ static int scsi_qdev_init(DeviceState *qdev, DeviceInfo
*base)
}
if (bus->devs[dev->id]) {
- bus->devs[dev->id]->info->destroy(bus->devs[dev->id]);
+ qdev_free(&bus->devs[dev->id]->qdev);
}
bus->devs[dev->id] = dev;
dev->info = info;
- return dev->info->init(dev);
+ rc = dev->info->init(dev);
+ if (rc != 0) {
+ bus->devs[dev->id] = NULL;
+ }
err:
- return -1;
+ return rc;
+}
+
+static int scsi_qdev_exit(DeviceState *qdev)
+{
+ SCSIDevice *dev = DO_UPCAST(SCSIDevice, qdev, qdev);
+ SCSIBus *bus = DO_UPCAST(SCSIBus, qbus, dev->qdev.parent_bus);
+
+ assert(bus->devs[dev->id] != NULL);
+ if (bus->devs[dev->id]->info->destroy) {
+ bus->devs[dev->id]->info->destroy(bus->devs[dev->id]);
+ }
+ bus->devs[dev->id] = NULL;
+ return 0;
}
void scsi_qdev_register(SCSIDeviceInfo *info)
{
info->qdev.bus_info = &scsi_bus_info;
info->qdev.init = scsi_qdev_init;
+ info->qdev.exit = scsi_qdev_exit;
qdev_register(&info->qdev);
}
diff --git a/hw/scsi-disk.c b/hw/scsi-disk.c
index de8e314..0f029f8 100644
--- a/hw/scsi-disk.c
+++ b/hw/scsi-disk.c
@@ -936,11 +936,6 @@ static int32_t scsi_send_command(SCSIDevice *d, uint32_t
tag,
}
}
-static void scsi_destroy(SCSIDevice *d)
-{
- qemu_free(d);
-}
-
static int scsi_disk_initfn(SCSIDevice *dev)
{
SCSIDiskState *s = DO_UPCAST(SCSIDiskState, qdev, dev);
@@ -974,7 +969,6 @@ static SCSIDeviceInfo scsi_disk_info = {
.qdev.desc = "virtual scsi disk or cdrom",
.qdev.size = sizeof(SCSIDiskState),
.init = scsi_disk_initfn,
- .destroy = scsi_destroy,
.send_command = scsi_send_command,
.read_data = scsi_read_data,
.write_data = scsi_write_data,
diff --git a/hw/scsi-generic.c b/hw/scsi-generic.c
index f8c010b..86d1e54 100644
--- a/hw/scsi-generic.c
+++ b/hw/scsi-generic.c
@@ -668,8 +668,6 @@ static void scsi_destroy(SCSIDevice *d)
qemu_free(r);
r = n;
}
-
- qemu_free(d);
}
static int scsi_generic_initfn(SCSIDevice *dev)
--
1.6.2.5
- [Qemu-devel] [PATCH 05/24] switch ide bus to inplace allocation., (continued)
- [Qemu-devel] [PATCH 05/24] switch ide bus to inplace allocation., Gerd Hoffmann, 2009/09/25
- [Qemu-devel] [PATCH 04/24] switch usb bus to inplace allocation., Gerd Hoffmann, 2009/09/25
- [Qemu-devel] [PATCH 03/24] switch scsi bus to inplace allocation., Gerd Hoffmann, 2009/09/25
- [Qemu-devel] [PATCH 06/24] inplace allocation for pci, split irq init., Gerd Hoffmann, 2009/09/25
- [Qemu-devel] [PATCH 02/24] allow qdev busses allocations be inplace, Gerd Hoffmann, 2009/09/25
- [Qemu-devel] [PATCH 08/24] piix_pci: kill PIIX3IrqState, Gerd Hoffmann, 2009/09/25
- [Qemu-devel] [PATCH 10/24] Add exit callback to DeviceInfo., Gerd Hoffmann, 2009/09/25
- [Qemu-devel] [PATCH 12/24] pci: use qdev for device destruction., Gerd Hoffmann, 2009/09/25
- [Qemu-devel] [PATCH 07/24] convert pci bridge to qdev, Gerd Hoffmann, 2009/09/25
- [Qemu-devel] [PATCH 13/24] pci: move unregister from PCIDevice to PCIDeviceInfo, Gerd Hoffmann, 2009/09/25
- [Qemu-devel] [PATCH 11/24] Implement scsi device destruction,
Gerd Hoffmann <=
- [Qemu-devel] [PATCH 09/24] qdev: device free fixups., Gerd Hoffmann, 2009/09/25
- [Qemu-devel] [PATCH 14/24] usb: hook unplug into qdev, cleanups + fixes., Gerd Hoffmann, 2009/09/25
- [Qemu-devel] [PATCH 17/24] usb: hotplug windup, Gerd Hoffmann, 2009/09/25
- [Qemu-devel] [PATCH 23/24] allow if=none for drive_add, Gerd Hoffmann, 2009/09/25
- [Qemu-devel] [PATCH 19/24] pci: hotplug windup, Gerd Hoffmann, 2009/09/25
- [Qemu-devel] [PATCH 15/24] switch qemu-config to qemu_error, Gerd Hoffmann, 2009/09/25
- [Qemu-devel] [PATCH 21/24] drive cleanup fixes., Gerd Hoffmann, 2009/09/25
- [Qemu-devel] [PATCH 18/24] scsi: hotplug windup, Gerd Hoffmann, 2009/09/25