mirrors
/
qemu
mirror of https://gitlab.com/qemu-project/qemu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

delete block device 

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@2126 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
bellard 2006-08-19 11:58:59 +00:00
parent a9f277ba8f
commit b56bdb328a
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
hw/usb-msd.c
View File

@ -35,6 +35,7 @@ typedef struct {
uint32_t data_len; uint32_t data_len;
uint32_t transfer_len; uint32_t transfer_len;
uint32_t tag; uint32_t tag;
BlockDriverState *bs;
SCSIDevice *scsi_dev; SCSIDevice *scsi_dev;
int result; int result;
/* For async completion. */ /* For async completion. */
@ -406,6 +407,7 @@ static void usb_msd_handle_destroy(USBDevice *dev)
MSDState *s = (MSDState *)dev; MSDState *s = (MSDState *)dev;
scsi_disk_destroy(s->scsi_dev); scsi_disk_destroy(s->scsi_dev);
bdrv_delete(s->bs);
qemu_free(s); qemu_free(s);
} }
@ -419,7 +421,9 @@ USBDevice *usb_msd_init(const char *filename)
return NULL; return NULL;
bdrv = bdrv_new("usb"); bdrv = bdrv_new("usb");
bdrv_open(bdrv, filename, 0); if (bdrv_open(bdrv, filename, 0) < 0)
goto fail;
s->bs = bdrv;
s->dev.speed = USB_SPEED_FULL; s->dev.speed = USB_SPEED_FULL;
s->dev.handle_packet = usb_generic_handle_packet; s->dev.handle_packet = usb_generic_handle_packet;
@ -435,4 +439,7 @@ USBDevice *usb_msd_init(const char *filename)
s->scsi_dev = scsi_disk_init(bdrv, usb_msd_command_complete, s); s->scsi_dev = scsi_disk_init(bdrv, usb_msd_command_complete, s);
usb_msd_handle_reset((USBDevice *)s); usb_msd_handle_reset((USBDevice *)s);
return (USBDevice *)s; return (USBDevice *)s;
fail:
qemu_free(s);
return NULL;
} }