qdev: rename qdev_free() to qdev_unparent()
PATCH 1/1 qdev: rename qdev_free() to qdev_unparent()
The qdev_free() function name is misleading since all the function does is unlink the device from its parent. The device is not necessarily freed.
The device will be freed when its QObject refcount reaches zero. It is usual for the parent (bus) to hold the final reference but there are cases where something else holds a reference so "free" is a misleading name.
I opted to keep a qdev wrapper function instead of making all callers use object_unparent(OBJECT(qdev)) directly due to the slightly ugly cast.
---
This patch is based on the "[PATCH 0/6] qdev and blockdev refcount leak fixes" series that I sent yesterday.
hw/acpi/piix4.c | 2 +- hw/core/qdev.c | 10 +++++----- hw/pci/pci-hotplug-old.c | 2 +- hw/pci/pci_bridge.c | 2 +- hw/pci/pcie.c | 2 +- hw/pci/shpc.c | 2 +- hw/s390x/virtio-ccw.c | 2 +- hw/scsi/scsi-bus.c | 6 +++--- hw/usb/bus.c | 4 ++-- hw/usb/dev-storage.c | 2 +- hw/usb/host-legacy.c | 2 +- hw/virtio/virtio-bus.c | 2 +- hw/xen/xen_platform.c | 2 +- include/hw/qdev-core.h | 2 +- qdev-monitor.c | 2 +- 15 files changed, 22 insertions(+), 22 deletions(-)
hw/acpi/piix4.c +1 -1
@@ -326,7 +326,7 @@ static void acpi_piix_eject_slot(PIIX4PMState *s, unsigned slots)if (pc->no_hotplug) { slot_free = false; }else { -qdev_free (qdev); +qdev_unparent (qdev); } } }
hw/core/qdev.c +5 -5
@@ -164,7 +164,7 @@ int qdev_init(DeviceState *dev)if (local_err !=NULL ) {qerror_report_err (local_err);error_free (local_err); -qdev_free (dev); +qdev_unparent (dev);return -1 ; }return 0 ;
@@ -258,7 +258,7 @@ void qbus_reset_all_fn(void *opaque)int qdev_simple_unplug_cb (DeviceState *dev) {/* just zap it */ -qdev_free (dev); +qdev_unparent (dev);return 0 ; }
@@ -280,8 +280,8 @@ void qdev_init_nofail(DeviceState *dev) } } -/* Unlink device from bus and free the structure. */ -void qdev_free (DeviceState *dev) +/* Unlink device from bus. dev is freed if refcount reaches zero. */ +void qdev_unparent (DeviceState *dev) {object_unparent (OBJECT (dev)); }
@@ -458,7 +458,7 @@ static void bus_unparent(Object *obj)while ((kid =QTAILQ_FIRST (&bus->children)) !=NULL ) {DeviceState *dev = kid->child; -qdev_free (dev); +qdev_unparent (dev); }if (bus->parent) {QLIST_REMOVE (bus, sibling);
hw/pci/pci-hotplug-old.c +1 -1
@@ -248,7 +248,7 @@ static PCIDevice *qemu_pci_hot_add_storage(Monitor *mon, } dev =pci_create (bus, devfn,"virtio-blk-pci" );if (qdev_prop_set_drive (&dev->qdev,"drive" , dinfo->bdrv) <0 ) { -qdev_free (&dev->qdev); +qdev_unparent (&dev->qdev); dev =NULL ;break ; }
hw/pci/pci_bridge.c +1 -1
@@ -391,7 +391,7 @@ void pci_bridge_exitfn(PCIDevice *pci_dev)pci_bridge_region_cleanup (s, s->windows);memory_region_destroy (&s->address_space_mem);memory_region_destroy (&s->address_space_io); -/* qbus_free() is called automatically by qdev_free() */ +/* qbus_free() is called automatically by qdev_unparent() */ }/*
hw/pci/pcie.c +1 -1
@@ -251,7 +251,7 @@ static int pcie_cap_slot_hotplug(DeviceState *qdev, PCI_EXP_SLTSTA_PDS);pcie_cap_slot_event (d,PCI_EXP_HP_EV_PDC ); }else { -qdev_free (&pci_dev->qdev); +qdev_unparent (&pci_dev->qdev);pci_word_test_and_clear_mask (exp_cap +PCI_EXP_SLTSTA ,PCI_EXP_SLTSTA_PDS );pcie_cap_slot_event (d,PCI_EXP_HP_EV_PDC );
hw/pci/shpc.c +1 -1
@@ -254,7 +254,7 @@ static void shpc_free_devices_in_slot(SHPCDevice *shpc, int slot) ++devfn) {PCIDevice *affected_dev = shpc->sec_bus->devices[devfn];if (affected_dev) { -qdev_free (&affected_dev->qdev); +qdev_unparent (&affected_dev->qdev); } } }
hw/s390x/virtio-ccw.c +1 -1
@@ -1239,7 +1239,7 @@ static int virtio_ccw_busdev_unplug(DeviceState *dev)css_generate_sch_crws (sch->cssid, sch->ssid, sch->schid,1 ,0 ); -qdev_free (dev); +qdev_unparent (dev);return 0 ; }
hw/scsi/scsi-bus.c +3 -3
@@ -176,7 +176,7 @@ static int scsi_qdev_init(DeviceState *qdev) d =scsi_device_find (bus, dev->channel, dev->id, dev->lun);assert (d);if (d->lun == dev->lun && dev != d) { -qdev_free (&d->qdev); +qdev_unparent (&d->qdev); } }
@@ -229,13 +229,13 @@ SCSIDevice *scsi_bus_legacy_add_drive(SCSIBus *bus, BlockDriverState *bdrv, }if (qdev_prop_set_drive (dev,"drive" , bdrv) <0 ) {error_setg (errp,"Setting drive property failed" ); -qdev_free (dev); +qdev_unparent (dev);return NULL ; }object_property_set_bool (OBJECT (dev), true,"realized" , &err);if (err !=NULL ) {error_propagate (errp, err); -qdev_free (dev); +qdev_unparent (dev);return NULL ; }return SCSI_DEVICE (dev);
hw/usb/bus.c +2 -2
@@ -353,7 +353,7 @@ void usb_port_location(USBPort *downstream, USBPort *upstream, int portnr)void usb_unregister_port (USBBus *bus,USBPort *port) {if (port->dev) -qdev_free (&port->dev->qdev); +qdev_unparent (&port->dev->qdev);QTAILQ_REMOVE (&bus->free, port, next); bus->nfree--; }
@@ -501,7 +501,7 @@ int usb_device_delete_addr(int busnr, int addr)return -1 ; dev = port->dev; -qdev_free (&dev->qdev); +qdev_unparent (&dev->qdev);return 0 ; }
hw/usb/dev-storage.c +1 -1
@@ -703,7 +703,7 @@ static USBDevice *usb_msd_init(USBBus *bus, const char *filename)return NULL ; }if (qdev_prop_set_drive (&dev->qdev,"drive" , dinfo->bdrv) <0 ) { -qdev_free (&dev->qdev); +qdev_unparent (&dev->qdev);return NULL ; }if (qdev_init (&dev->qdev) <0 )
hw/usb/host-legacy.c +1 -1
@@ -132,7 +132,7 @@ USBDevice *usb_host_device_open(USBBus *bus, const char *devname)return dev; fail: -qdev_free (&dev->qdev); +qdev_unparent (&dev->qdev);return NULL ; }
hw/virtio/virtio-bus.c +1 -1
@@ -77,7 +77,7 @@ void virtio_bus_destroy_device(VirtioBusState *bus) klass->device_unplug (qbus->parent); } qdev =DEVICE (bus->vdev); -qdev_free (qdev); +qdev_unparent (qdev); bus->vdev =NULL ; } }
hw/xen/xen_platform.c +1 -1
@@ -95,7 +95,7 @@ static void unplug_nic(PCIBus *b, PCIDevice *d, void *o)if (pci_get_word (d->config +PCI_CLASS_DEVICE ) ==PCI_CLASS_NETWORK_ETHERNET &&strcmp (d->name,"xen-pci-passthrough" ) !=0 ) { -qdev_free (DEVICE (d)); +qdev_unparent (DEVICE (d)); } }
include/hw/qdev-core.h +1 -1
@@ -237,7 +237,7 @@ void qdev_init_nofail(DeviceState *dev);void qdev_set_legacy_instance_id (DeviceState *dev,int alias_id,int required_for_version);void qdev_unplug (DeviceState *dev,Error **errp); -void qdev_free (DeviceState *dev); +void qdev_unparent (DeviceState *dev);int qdev_simple_unplug_cb (DeviceState *dev);void qdev_machine_creation_done (void );bool qdev_machine_modified (void );
qdev-monitor.c +1 -1
@@ -511,7 +511,7 @@ DeviceState *qdev_device_add(QemuOpts *opts) qdev->id = id; }if (qemu_opt_foreach (opts, set_property, qdev,1 ) !=0 ) { -qdev_free (qdev); +qdev_unparent (qdev);object_unref (OBJECT (qdev));return NULL ; }
Signature · 1 line
1.8.3.1
Il 11/09/2013 09:45, Stefan Hajnoczi ha scritto:
Quoted 277 lines
The
qdev_free()function name is misleading since all the function does is unlink the device from its parent. The device is not necessarily freed.The device will be freed when its QObject refcount reaches zero. It is usual for the parent (bus) to hold the final reference but there are cases where something else holds a reference so "free" is a misleading name.
I opted to keep a qdev wrapper function instead of making all callers use object_unparent(OBJECT(qdev)) directly due to the slightly ugly cast.
Signed-off-by Stefan Hajnoczi <[email protected]>---
This patch is based on the "[PATCH 0/6] qdev and blockdev refcount leak fixes" series that I sent yesterday.hw/acpi/piix4.c | 2 +- hw/core/qdev.c | 10 +++++----- hw/pci/pci-hotplug-old.c | 2 +- hw/pci/pci_bridge.c | 2 +- hw/pci/pcie.c | 2 +- hw/pci/shpc.c | 2 +- hw/s390x/virtio-ccw.c | 2 +- hw/scsi/scsi-bus.c | 6 +++--- hw/usb/bus.c | 4 ++-- hw/usb/dev-storage.c | 2 +- hw/usb/host-legacy.c | 2 +- hw/virtio/virtio-bus.c | 2 +- hw/xen/xen_platform.c | 2 +- include/hw/qdev-core.h | 2 +- qdev-monitor.c | 2 +- 15 files changed, 22 insertions(+), 22 deletions(-)hw/acpi/piix4.c +1
-1@@ -326,7 +326,7 @@ static void acpi_piix_eject_slot(PIIX4PMState *s, unsigned slots)if (pc->no_hotplug) { slot_free = false; }else { -qdev_free (qdev); +qdev_unparent (qdev); } } }hw/core/qdev.c +5
-5@@ -164,7 +164,7 @@ int qdev_init(DeviceState *dev)if (local_err !=NULL ) {qerror_report_err (local_err);error_free (local_err); -qdev_free (dev); +qdev_unparent (dev);return -1 ; }return 0 ;@@ -258,7 +258,7 @@ void qbus_reset_all_fn(void *opaque)int qdev_simple_unplug_cb (DeviceState *dev) {/* just zap it */ -qdev_free (dev); +qdev_unparent (dev);return 0 ; }@@ -280,8 +280,8 @@ void qdev_init_nofail(DeviceState *dev) } } -/* Unlink device from bus and free the structure. */ -void qdev_free (DeviceState *dev) +/* Unlink device from bus. dev is freed if refcount reaches zero. */ +void qdev_unparent (DeviceState *dev) {object_unparent (OBJECT (dev)); }@@ -458,7 +458,7 @@ static void bus_unparent(Object *obj)while ((kid =QTAILQ_FIRST (&bus->children)) !=NULL ) {DeviceState *dev = kid->child; -qdev_free (dev); +qdev_unparent (dev); }if (bus->parent) {QLIST_REMOVE (bus, sibling);hw/pci/pci-hotplug-old.c +1
-1@@ -248,7 +248,7 @@ static PCIDevice *qemu_pci_hot_add_storage(Monitor *mon, } dev =pci_create (bus, devfn,"virtio-blk-pci" );if (qdev_prop_set_drive (&dev->qdev,"drive" , dinfo->bdrv) <0 ) { -qdev_free (&dev->qdev); +qdev_unparent (&dev->qdev); dev =NULL ;break ; }hw/pci/pci_bridge.c +1
-1@@ -391,7 +391,7 @@ void pci_bridge_exitfn(PCIDevice *pci_dev)pci_bridge_region_cleanup (s, s->windows);memory_region_destroy (&s->address_space_mem);memory_region_destroy (&s->address_space_io); -/* qbus_free() is called automatically by qdev_free() */ +/* qbus_free() is called automatically by qdev_unparent() */ }/* hw/pci/pcie.c +1
-1@@ -251,7 +251,7 @@ static int pcie_cap_slot_hotplug(DeviceState *qdev, PCI_EXP_SLTSTA_PDS);pcie_cap_slot_event (d,PCI_EXP_HP_EV_PDC ); }else { -qdev_free (&pci_dev->qdev); +qdev_unparent (&pci_dev->qdev);pci_word_test_and_clear_mask (exp_cap +PCI_EXP_SLTSTA ,PCI_EXP_SLTSTA_PDS );pcie_cap_slot_event (d,PCI_EXP_HP_EV_PDC );hw/pci/shpc.c +1
-1@@ -254,7 +254,7 @@ static void shpc_free_devices_in_slot(SHPCDevice *shpc, int slot) ++devfn) {PCIDevice *affected_dev = shpc->sec_bus->devices[devfn];if (affected_dev) { -qdev_free (&affected_dev->qdev); +qdev_unparent (&affected_dev->qdev); } } }hw/s390x/virtio-ccw.c +1
-1@@ -1239,7 +1239,7 @@ static int virtio_ccw_busdev_unplug(DeviceState *dev)css_generate_sch_crws (sch->cssid, sch->ssid, sch->schid,1 ,0 ); -qdev_free (dev); +qdev_unparent (dev);return 0 ; }hw/scsi/scsi-bus.c +3
-3@@ -176,7 +176,7 @@ static int scsi_qdev_init(DeviceState *qdev) d =scsi_device_find (bus, dev->channel, dev->id, dev->lun);assert (d);if (d->lun == dev->lun && dev != d) { -qdev_free (&d->qdev); +qdev_unparent (&d->qdev); } }@@ -229,13 +229,13 @@ SCSIDevice *scsi_bus_legacy_add_drive(SCSIBus *bus, BlockDriverState *bdrv, }if (qdev_prop_set_drive (dev,"drive" , bdrv) <0 ) {error_setg (errp,"Setting drive property failed" ); -qdev_free (dev); +qdev_unparent (dev);return NULL ; }object_property_set_bool (OBJECT (dev), true,"realized" , &err);if (err !=NULL ) {error_propagate (errp, err); -qdev_free (dev); +qdev_unparent (dev);return NULL ; }return SCSI_DEVICE (dev);hw/usb/bus.c +2
-2@@ -353,7 +353,7 @@ void usb_port_location(USBPort *downstream, USBPort *upstream, int portnr)void usb_unregister_port (USBBus *bus,USBPort *port) {if (port->dev) -qdev_free (&port->dev->qdev); +qdev_unparent (&port->dev->qdev);QTAILQ_REMOVE (&bus->free, port, next); bus->nfree--; }@@ -501,7 +501,7 @@ int usb_device_delete_addr(int busnr, int addr)return -1 ; dev = port->dev; -qdev_free (&dev->qdev); +qdev_unparent (&dev->qdev);return 0 ; }hw/usb/dev-storage.c +1
-1@@ -703,7 +703,7 @@ static USBDevice *usb_msd_init(USBBus *bus, const char *filename)return NULL ; }if (qdev_prop_set_drive (&dev->qdev,"drive" , dinfo->bdrv) <0 ) { -qdev_free (&dev->qdev); +qdev_unparent (&dev->qdev);return NULL ; }if (qdev_init (&dev->qdev) <0 )hw/usb/host-legacy.c +1
-1@@ -132,7 +132,7 @@ USBDevice *usb_host_device_open(USBBus *bus, const char *devname)return dev; fail: -qdev_free (&dev->qdev); +qdev_unparent (&dev->qdev);return NULL ; }hw/virtio/virtio-bus.c +1
-1@@ -77,7 +77,7 @@ void virtio_bus_destroy_device(VirtioBusState *bus) klass->device_unplug (qbus->parent); } qdev =DEVICE (bus->vdev); -qdev_free (qdev); +qdev_unparent (qdev); bus->vdev =NULL ; } }hw/xen/xen_platform.c +1
-1@@ -95,7 +95,7 @@ static void unplug_nic(PCIBus *b, PCIDevice *d, void *o)if (pci_get_word (d->config +PCI_CLASS_DEVICE ) ==PCI_CLASS_NETWORK_ETHERNET &&strcmp (d->name,"xen-pci-passthrough" ) !=0 ) { -qdev_free (DEVICE (d)); +qdev_unparent (DEVICE (d)); } }include/hw/qdev-core.h +1
-1@@ -237,7 +237,7 @@ void qdev_init_nofail(DeviceState *dev);void qdev_set_legacy_instance_id (DeviceState *dev,int alias_id,int required_for_version);void qdev_unplug (DeviceState *dev,Error **errp); -void qdev_free (DeviceState *dev); +void qdev_unparent (DeviceState *dev);int qdev_simple_unplug_cb (DeviceState *dev);void qdev_machine_creation_done (void );bool qdev_machine_modified (void );qdev-monitor.c +0
-0
qdev-monitor.c DeviceState *qdev_device_add(QemuOpts *opts) · line 517
Quoted 8 lines
qdev-monitor.c +1
-1@@ -511,7 +511,7 @@ DeviceState *qdev_device_add(QemuOpts *opts) qdev->id = id; }if (qemu_opt_foreach (opts, set_property, qdev,1 ) !=0 ) { -qdev_free (qdev); +qdev_unparent (qdev);object_unref (OBJECT (qdev));return NULL ; }
Am 11.09.2013 09:45, schrieb Stefan Hajnoczi:
Quoted 95 lines
The
qdev_free()function name is misleading since all the function does is unlink the device from its parent. The device is not necessarily freed.The device will be freed when its QObject refcount reaches zero. It is usual for the parent (bus) to hold the final reference but there are cases where something else holds a reference so "free" is a misleading name.
I opted to keep a qdev wrapper function instead of making all callers use object_unparent(OBJECT(qdev)) directly due to the slightly ugly cast.
Signed-off-by Stefan Hajnoczi <[email protected]>---
This patch is based on the "[PATCH 0/6] qdev and blockdev refcount leak fixes" series that I sent yesterday.hw/acpi/piix4.c | 2 +- hw/core/qdev.c | 10 +++++----- hw/pci/pci-hotplug-old.c | 2 +- hw/pci/pci_bridge.c | 2 +- hw/pci/pcie.c | 2 +- hw/pci/shpc.c | 2 +- hw/s390x/virtio-ccw.c | 2 +- hw/scsi/scsi-bus.c | 6 +++--- hw/usb/bus.c | 4 ++-- hw/usb/dev-storage.c | 2 +- hw/usb/host-legacy.c | 2 +- hw/virtio/virtio-bus.c | 2 +- hw/xen/xen_platform.c | 2 +- include/hw/qdev-core.h | 2 +- qdev-monitor.c | 2 +- 15 files changed, 22 insertions(+), 22 deletions(-)hw/acpi/piix4.c +1
-1@@ -326,7 +326,7 @@ static void acpi_piix_eject_slot(PIIX4PMState *s, unsigned slots)if (pc->no_hotplug) { slot_free = false; }else { -qdev_free (qdev); +qdev_unparent (qdev); } } }hw/core/qdev.c +5
-5@@ -164,7 +164,7 @@ int qdev_init(DeviceState *dev)if (local_err !=NULL ) {qerror_report_err (local_err);error_free (local_err); -qdev_free (dev); +qdev_unparent (dev);return -1 ; }return 0 ;@@ -258,7 +258,7 @@ void qbus_reset_all_fn(void *opaque)int qdev_simple_unplug_cb (DeviceState *dev) {/* just zap it */ -qdev_free (dev); +qdev_unparent (dev);return 0 ; }@@ -280,8 +280,8 @@ void qdev_init_nofail(DeviceState *dev) } } -/* Unlink device from bus and free the structure. */ -void qdev_free (DeviceState *dev) +/* Unlink device from bus. dev is freed if refcount reaches zero. */ +void qdev_unparent (DeviceState *dev) {object_unparent (OBJECT (dev)); }@@ -458,7 +458,7 @@ static void bus_unparent(Object *obj)while ((kid =QTAILQ_FIRST (&bus->children)) !=NULL ) {DeviceState *dev = kid->child; -qdev_free (dev); +qdev_unparent (dev); }if (bus->parent) {QLIST_REMOVE (bus, sibling);hw/pci/pci-hotplug-old.c +0
-0
hw/pci/pci-hotplug-old.c static PCIDevice *qemu_pci_hot_add_storage(Monitor *mon, · line 251
Quoted 5 lines
hw/pci/pci-hotplug-old.c +1
-1@@ -248,7 +248,7 @@ static PCIDevice *qemu_pci_hot_add_storage(Monitor *mon, } dev =pci_create (bus, devfn,"virtio-blk-pci" );if (qdev_prop_set_drive (&dev->qdev,"drive" , dinfo->bdrv) <0 ) { -qdev_free (&dev->qdev); +qdev_unparent (&dev->qdev);
This should be DEVICE(dev), making most callers outside qdev.c do a cast after all.
Also we should name the function device_unparent if we decide to keep it around.
Andreas
Quoted 185 lines
hw/pci/pci-hotplug-old.c +0
-0dev =NULL ;break ; }hw/pci/pci_bridge.c +1
-1@@ -391,7 +391,7 @@ void pci_bridge_exitfn(PCIDevice *pci_dev)pci_bridge_region_cleanup (s, s->windows);memory_region_destroy (&s->address_space_mem);memory_region_destroy (&s->address_space_io); -/* qbus_free() is called automatically by qdev_free() */ +/* qbus_free() is called automatically by qdev_unparent() */ }/* hw/pci/pcie.c +1
-1@@ -251,7 +251,7 @@ static int pcie_cap_slot_hotplug(DeviceState *qdev, PCI_EXP_SLTSTA_PDS);pcie_cap_slot_event (d,PCI_EXP_HP_EV_PDC ); }else { -qdev_free (&pci_dev->qdev); +qdev_unparent (&pci_dev->qdev);pci_word_test_and_clear_mask (exp_cap +PCI_EXP_SLTSTA ,PCI_EXP_SLTSTA_PDS );pcie_cap_slot_event (d,PCI_EXP_HP_EV_PDC );hw/pci/shpc.c +1
-1@@ -254,7 +254,7 @@ static void shpc_free_devices_in_slot(SHPCDevice *shpc, int slot) ++devfn) {PCIDevice *affected_dev = shpc->sec_bus->devices[devfn];if (affected_dev) { -qdev_free (&affected_dev->qdev); +qdev_unparent (&affected_dev->qdev); } } }hw/s390x/virtio-ccw.c +1
-1@@ -1239,7 +1239,7 @@ static int virtio_ccw_busdev_unplug(DeviceState *dev)css_generate_sch_crws (sch->cssid, sch->ssid, sch->schid,1 ,0 ); -qdev_free (dev); +qdev_unparent (dev);return 0 ; }hw/scsi/scsi-bus.c +3
-3@@ -176,7 +176,7 @@ static int scsi_qdev_init(DeviceState *qdev) d =scsi_device_find (bus, dev->channel, dev->id, dev->lun);assert (d);if (d->lun == dev->lun && dev != d) { -qdev_free (&d->qdev); +qdev_unparent (&d->qdev); } }@@ -229,13 +229,13 @@ SCSIDevice *scsi_bus_legacy_add_drive(SCSIBus *bus, BlockDriverState *bdrv, }if (qdev_prop_set_drive (dev,"drive" , bdrv) <0 ) {error_setg (errp,"Setting drive property failed" ); -qdev_free (dev); +qdev_unparent (dev);return NULL ; }object_property_set_bool (OBJECT (dev), true,"realized" , &err);if (err !=NULL ) {error_propagate (errp, err); -qdev_free (dev); +qdev_unparent (dev);return NULL ; }return SCSI_DEVICE (dev);hw/usb/bus.c +2
-2@@ -353,7 +353,7 @@ void usb_port_location(USBPort *downstream, USBPort *upstream, int portnr)void usb_unregister_port (USBBus *bus,USBPort *port) {if (port->dev) -qdev_free (&port->dev->qdev); +qdev_unparent (&port->dev->qdev);QTAILQ_REMOVE (&bus->free, port, next); bus->nfree--; }@@ -501,7 +501,7 @@ int usb_device_delete_addr(int busnr, int addr)return -1 ; dev = port->dev; -qdev_free (&dev->qdev); +qdev_unparent (&dev->qdev);return 0 ; }hw/usb/dev-storage.c +1
-1@@ -703,7 +703,7 @@ static USBDevice *usb_msd_init(USBBus *bus, const char *filename)return NULL ; }if (qdev_prop_set_drive (&dev->qdev,"drive" , dinfo->bdrv) <0 ) { -qdev_free (&dev->qdev); +qdev_unparent (&dev->qdev);return NULL ; }if (qdev_init (&dev->qdev) <0 )hw/usb/host-legacy.c +1
-1@@ -132,7 +132,7 @@ USBDevice *usb_host_device_open(USBBus *bus, const char *devname)return dev; fail: -qdev_free (&dev->qdev); +qdev_unparent (&dev->qdev);return NULL ; }hw/virtio/virtio-bus.c +1
-1@@ -77,7 +77,7 @@ void virtio_bus_destroy_device(VirtioBusState *bus) klass->device_unplug (qbus->parent); } qdev =DEVICE (bus->vdev); -qdev_free (qdev); +qdev_unparent (qdev); bus->vdev =NULL ; } }hw/xen/xen_platform.c +1
-1@@ -95,7 +95,7 @@ static void unplug_nic(PCIBus *b, PCIDevice *d, void *o)if (pci_get_word (d->config +PCI_CLASS_DEVICE ) ==PCI_CLASS_NETWORK_ETHERNET &&strcmp (d->name,"xen-pci-passthrough" ) !=0 ) { -qdev_free (DEVICE (d)); +qdev_unparent (DEVICE (d)); } }include/hw/qdev-core.h +1
-1@@ -237,7 +237,7 @@ void qdev_init_nofail(DeviceState *dev);void qdev_set_legacy_instance_id (DeviceState *dev,int alias_id,int required_for_version);void qdev_unplug (DeviceState *dev,Error **errp); -void qdev_free (DeviceState *dev); +void qdev_unparent (DeviceState *dev);int qdev_simple_unplug_cb (DeviceState *dev);void qdev_machine_creation_done (void );bool qdev_machine_modified (void );qdev-monitor.c +1
-1@@ -511,7 +511,7 @@ DeviceState *qdev_device_add(QemuOpts *opts) qdev->id = id; }if (qemu_opt_foreach (opts, set_property, qdev,1 ) !=0 ) { -qdev_free (qdev); +qdev_unparent (qdev);object_unref (OBJECT (qdev));return NULL ; }
Signature · 2 lines
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg
Quoted 15 lines · Andreas Färber
Am 11.09.2013 09:45, schrieb Stefan Hajnoczi:
hw/pci/pci-hotplug-old.c static PCIDevice *qemu_pci_hot_add_storage(Monitor *mon, · line 251
Quoted 10 lines
hw/pci/pci-hotplug-old.c +1
-1@@ -248,7 +248,7 @@ static PCIDevice *qemu_pci_hot_add_storage(Monitor *mon, } dev =pci_create (bus, devfn,"virtio-blk-pci" );if (qdev_prop_set_drive (&dev->qdev,"drive" , dinfo->bdrv) <0 ) { -qdev_free (&dev->qdev); +qdev_unparent (&dev->qdev);This should be DEVICE(dev), making most callers outside
qdev.cdo a cast after all.
Quoted 2 lines
Also we should name the function
device_unparentif we decide to keep it around.
This is true. We should probably just use object_unref(OBJECT(foo)) everywhere.
I'll drop qdev_free() completely and resend.
Stefan