[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 19/23] blockdev: Drop DriveInfo member enable_aut
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PATCH v2 19/23] blockdev: Drop DriveInfo member enable_auto_del |
Date: |
Sat, 13 Sep 2014 17:00:23 +0200 |
Commit 2d246f0 introduced DriveInfo member enable_auto_del to
distinguish DriveInfo created via drive_new() from DriveInfo created
via qmp_blockdev_add(). The latter no longer exist. Drop
enable_auto_del.
Signed-off-by: Markus Armbruster <address@hidden>
---
blockdev.c | 11 +++--------
include/sysemu/blockdev.h | 1 -
2 files changed, 3 insertions(+), 9 deletions(-)
diff --git a/blockdev.c b/blockdev.c
index 0d99be0..e218c59 100644
--- a/blockdev.c
+++ b/blockdev.c
@@ -90,16 +90,14 @@ void blockdev_mark_auto_del(BlockBackend *blk)
DriveInfo *dinfo = blk_legacy_dinfo(blk);
BlockDriverState *bs = blk_bs(blk);
- if (dinfo && !dinfo->enable_auto_del) {
+ if (!dinfo) {
return;
}
if (bs->job) {
block_job_cancel(bs->job);
}
- if (dinfo) {
- dinfo->auto_del = 1;
- }
+ dinfo->auto_del = 1;
}
void blockdev_auto_del(BlockBackend *blk)
@@ -900,7 +898,6 @@ DriveInfo *drive_new(QemuOpts *all_opts, BlockInterfaceType
block_default_type)
/* Set legacy DriveInfo fields */
dinfo = g_malloc0(sizeof(*dinfo));
- dinfo->enable_auto_del = true;
dinfo->opts = all_opts;
dinfo->cyls = cyls;
dinfo->heads = heads;
@@ -1716,7 +1713,6 @@ int do_drive_del(Monitor *mon, const QDict *qdict,
QObject **ret_data)
const char *id = qdict_get_str(qdict, "id");
BlockBackend *blk;
BlockDriverState *bs;
- DriveInfo *dinfo;
AioContext *aio_context;
Error *local_err = NULL;
@@ -1727,8 +1723,7 @@ int do_drive_del(Monitor *mon, const QDict *qdict,
QObject **ret_data)
}
bs = blk_bs(blk);
- dinfo = blk_legacy_dinfo(blk);
- if (dinfo && !dinfo->enable_auto_del) {
+ if (!blk_legacy_dinfo(blk)) {
error_report("Deleting device added with blockdev-add"
" is not supported");
return -1;
diff --git a/include/sysemu/blockdev.h b/include/sysemu/blockdev.h
index 27a40d5..2129d81 100644
--- a/include/sysemu/blockdev.h
+++ b/include/sysemu/blockdev.h
@@ -35,7 +35,6 @@ struct DriveInfo {
int bus;
int unit;
int auto_del; /* see blockdev_mark_auto_del() */
- bool enable_auto_del; /* Only for legacy drive_new() */
int media_cd;
int cyls, heads, secs, trans;
QemuOpts *opts;
--
1.9.3
- [Qemu-devel] [PATCH v2 05/23] block: Code motion to get rid of stubs/blockdev.c, (continued)
- [Qemu-devel] [PATCH v2 16/23] pc87312: Drop unused members of PC87312State, Markus Armbruster, 2014/09/13
- [Qemu-devel] [PATCH v2 15/23] ide: Complete conversion from BlockDriverState to BlockBackend, Markus Armbruster, 2014/09/13
- [Qemu-devel] [PATCH v2 17/23] blockdev: Drop superfluous DriveInfo member id, Markus Armbruster, 2014/09/13
- [Qemu-devel] [PATCH v2 21/23] blockdev: Convert qmp_eject(), qmp_change_blockdev() to BlockBackend, Markus Armbruster, 2014/09/13
- [Qemu-devel] [PATCH v2 20/23] block/qapi: Convert qmp_query_block() to BlockBackend, Markus Armbruster, 2014/09/13
- [Qemu-devel] [PATCH v2 23/23] block: Make device model's references to BlockBackend strong, Markus Armbruster, 2014/09/13
- [Qemu-devel] [PATCH v2 19/23] blockdev: Drop DriveInfo member enable_auto_del,
Markus Armbruster <=
- [Qemu-devel] [PATCH v2 11/23] block: Rename BlockDriverAIOCB* to BlockAIOCB*, Markus Armbruster, 2014/09/13
- [Qemu-devel] [PATCH v2 18/23] blockdev: Fix blockdev-add not to create IDE drive (0, 0), Markus Armbruster, 2014/09/13
- [Qemu-devel] [PATCH v2 22/23] block: Lift device model API into BlockBackend, Markus Armbruster, 2014/09/13
- [Qemu-devel] [PATCH v2 14/23] hw: Convert from BlockDriverState to BlockBackend, mostly, Markus Armbruster, 2014/09/13
- Re: [Qemu-devel] [PATCH v2 00/23] Split BlockBackend off BDS with an axe, Markus Armbruster, 2014/09/16