diff options
| author | Gerd Hoffmann <kraxel@redhat.com> | 2009-09-25 21:42:46 +0200 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2009-10-05 09:32:49 -0500 |
| commit | 56a14938809331372b6cdb2afcb14d9818de4cbf (patch) | |
| tree | 256e324375f698356af28158f601b2301a673ba5 /hw/usb-msd.c | |
| parent | 3f84865ade594a2ec1ef613ab5fd11949f3d49de (diff) | |
| download | focaccia-qemu-56a14938809331372b6cdb2afcb14d9818de4cbf.tar.gz focaccia-qemu-56a14938809331372b6cdb2afcb14d9818de4cbf.zip | |
drive cleanup fixes.
Changes:
* drive_uninit() wants a DriveInfo now.
* drive_uninit() also calls bdrv_delete(),
so callers don't need to do that.
* drive_uninit() calls are moved over to the ->exit()
callbacks, destroy_bdrvs() is zapped.
* setting bdrv->private is not needed any more as the
only user (destroy_bdrvs) is gone.
* usb-storage needs no drive_uninit, scsi-disk will
handle that.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'hw/usb-msd.c')
| -rw-r--r-- | hw/usb-msd.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/hw/usb-msd.c b/hw/usb-msd.c index a19b31d68e..e090014f74 100644 --- a/hw/usb-msd.c +++ b/hw/usb-msd.c @@ -508,13 +508,6 @@ static int usb_msd_handle_data(USBDevice *dev, USBPacket *p) return ret; } -static void usb_msd_handle_destroy(USBDevice *dev) -{ - MSDState *s = (MSDState *)dev; - - drive_uninit(s->dinfo->bdrv); -} - static int usb_msd_initfn(USBDevice *dev) { MSDState *s = DO_UPCAST(MSDState, dev, dev); @@ -599,7 +592,6 @@ static struct USBDeviceInfo msd_info = { .handle_reset = usb_msd_handle_reset, .handle_control = usb_msd_handle_control, .handle_data = usb_msd_handle_data, - .handle_destroy = usb_msd_handle_destroy, .qdev.props = (Property[]) { DEFINE_PROP_DRIVE("drive", MSDState, dinfo), DEFINE_PROP_END_OF_LIST(), |