diff options
author | Anthony Liguori <aliguori@us.ibm.com> | 2010-11-30 15:25:34 -0600 |
---|---|---|
committer | Anthony Liguori <aliguori@us.ibm.com> | 2010-11-30 15:25:34 -0600 |
commit | 09fa35e5cdc7d17ed3e1528ca743893ae77a0ea2 (patch) | |
tree | b11bb495700b297a4d49692bfd8d6070a1b74e0b /blockdev.c | |
parent | 9233da785f55c924c5850cd1ce1b7f5f200d631b (diff) | |
parent | b76876e602ca09ff848d99595a506feb1fd54ff4 (diff) | |
download | qemu-09fa35e5cdc7d17ed3e1528ca743893ae77a0ea2.zip qemu-09fa35e5cdc7d17ed3e1528ca743893ae77a0ea2.tar.gz qemu-09fa35e5cdc7d17ed3e1528ca743893ae77a0ea2.tar.bz2 |
Merge remote branch 'kwolf/for-anthony' into staging
Diffstat (limited to 'blockdev.c')
-rw-r--r-- | blockdev.c | 39 |
1 files changed, 39 insertions, 0 deletions
@@ -14,6 +14,8 @@ #include "qemu-option.h" #include "qemu-config.h" #include "sysemu.h" +#include "hw/qdev.h" +#include "block_int.h" static QTAILQ_HEAD(drivelist, DriveInfo) drives = QTAILQ_HEAD_INITIALIZER(drives); @@ -597,3 +599,40 @@ int do_change_block(Monitor *mon, const char *device, } return monitor_read_bdrv_key_start(mon, bs, NULL, NULL); } + +int do_drive_del(Monitor *mon, const QDict *qdict, QObject **ret_data) +{ + const char *id = qdict_get_str(qdict, "id"); + BlockDriverState *bs; + BlockDriverState **ptr; + Property *prop; + + bs = bdrv_find(id); + if (!bs) { + qerror_report(QERR_DEVICE_NOT_FOUND, id); + return -1; + } + + /* quiesce block driver; prevent further io */ + qemu_aio_flush(); + bdrv_flush(bs); + bdrv_close(bs); + + /* clean up guest state from pointing to host resource by + * finding and removing DeviceState "drive" property */ + for (prop = bs->peer->info->props; prop && prop->name; prop++) { + if (prop->info->type == PROP_TYPE_DRIVE) { + ptr = qdev_get_prop_ptr(bs->peer, prop); + if ((*ptr) == bs) { + bdrv_detach(bs, bs->peer); + *ptr = NULL; + break; + } + } + } + + /* clean up host side */ + drive_uninit(drive_get_by_blockdev(bs)); + + return 0; +} |