[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v6 07/24] blockdev: Eliminate drive_del()
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PATCH v6 07/24] blockdev: Eliminate drive_del() |
Date: |
Tue, 7 Oct 2014 13:59:09 +0200 |
drive_del() has become a trivial wrapper around blk_unref(). Get rid
of it.
Signed-off-by: Markus Armbruster <address@hidden>
---
blockdev.c | 9 ++-------
device-hotplug.c | 3 ++-
hw/ide/piix.c | 4 +++-
include/sysemu/blockdev.h | 1 -
4 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/blockdev.c b/blockdev.c
index 63f797b..3038203 100644
--- a/blockdev.c
+++ b/blockdev.c
@@ -134,7 +134,7 @@ void blockdev_auto_del(BlockDriverState *bs)
DriveInfo *dinfo = blk_legacy_dinfo(blk);
if (dinfo && dinfo->auto_del) {
- drive_del(dinfo);
+ blk_unref(blk);
}
}
@@ -276,11 +276,6 @@ static void bdrv_format_print(void *opaque, const char
*name)
error_printf(" %s", name);
}
-void drive_del(DriveInfo *dinfo)
-{
- blk_unref(dinfo->bdrv->blk);
-}
-
typedef struct {
QEMUBH *bh;
BlockDriverState *bs;
@@ -1867,7 +1862,7 @@ int do_drive_del(Monitor *mon, const QDict *qdict,
QObject **ret_data)
bdrv_set_on_error(bs, BLOCKDEV_ON_ERROR_REPORT,
BLOCKDEV_ON_ERROR_REPORT);
} else {
- drive_del(dinfo);
+ blk_unref(blk);
}
aio_context_release(aio_context);
diff --git a/device-hotplug.c b/device-hotplug.c
index e6a1ffb..9e38cc4 100644
--- a/device-hotplug.c
+++ b/device-hotplug.c
@@ -24,6 +24,7 @@
#include "hw/hw.h"
#include "hw/boards.h"
+#include "sysemu/block-backend.h"
#include "sysemu/blockdev.h"
#include "qemu/config-file.h"
#include "sysemu/sysemu.h"
@@ -76,6 +77,6 @@ void drive_hot_add(Monitor *mon, const QDict *qdict)
err:
if (dinfo) {
- drive_del(dinfo);
+ blk_unref(blk_by_legacy_dinfo(dinfo));
}
}
diff --git a/hw/ide/piix.c b/hw/ide/piix.c
index 49e78a7..ec93977 100644
--- a/hw/ide/piix.c
+++ b/hw/ide/piix.c
@@ -27,6 +27,7 @@
#include <hw/i386/pc.h>
#include <hw/pci/pci.h>
#include <hw/isa/isa.h>
+#include "sysemu/block-backend.h"
#include "sysemu/blockdev.h"
#include "sysemu/sysemu.h"
#include "sysemu/dma.h"
@@ -178,12 +179,13 @@ int pci_piix3_xen_ide_unplug(DeviceState *dev)
for (; i < 3; i++) {
di = drive_get_by_index(IF_IDE, i);
if (di != NULL && !di->media_cd) {
+ BlockBackend *blk = blk_by_legacy_dinfo(di);
DeviceState *ds = bdrv_get_attached_dev(di->bdrv);
if (ds) {
bdrv_detach_dev(di->bdrv, ds);
}
pci_ide->bus[di->bus].ifs[di->unit].bs = NULL;
- drive_del(di);
+ blk_unref(blk);
}
}
qdev_reset_all(DEVICE(dev));
diff --git a/include/sysemu/blockdev.h b/include/sysemu/blockdev.h
index ccd4bf4..439844d 100644
--- a/include/sysemu/blockdev.h
+++ b/include/sysemu/blockdev.h
@@ -64,7 +64,6 @@ QemuOpts *drive_def(const char *optstr);
QemuOpts *drive_add(BlockInterfaceType type, int index, const char *file,
const char *optstr);
DriveInfo *drive_new(QemuOpts *arg, BlockInterfaceType block_default_type);
-void drive_del(DriveInfo *dinfo);
/* device-hotplug */
--
1.9.3
- [Qemu-devel] [PATCH v6 00/24] Split BlockBackend off BDS with an axe, Markus Armbruster, 2014/10/07
- [Qemu-devel] [PATCH v6 01/24] block: Split bdrv_new_root() off bdrv_new(), Markus Armbruster, 2014/10/07
- [Qemu-devel] [PATCH v6 11/24] block: Eliminate DriveInfo member bdrv, use blk_by_legacy_dinfo(), Markus Armbruster, 2014/10/07
- [Qemu-devel] [PATCH v6 08/24] block: Eliminate bdrv_iterate(), use bdrv_next(), Markus Armbruster, 2014/10/07
- [Qemu-devel] [PATCH v6 14/24] virtio-blk: Drop redundant VirtIOBlock member conf, Markus Armbruster, 2014/10/07
- [Qemu-devel] [PATCH v6 07/24] blockdev: Eliminate drive_del(),
Markus Armbruster <=
- [Qemu-devel] [PATCH v6 05/24] block: Code motion to get rid of stubs/blockdev.c, Markus Armbruster, 2014/10/07
- [Qemu-devel] [PATCH v6 10/24] block: Merge BlockBackend and BlockDriverState name spaces, Markus Armbruster, 2014/10/07
- [Qemu-devel] [PATCH v6 04/24] block: Connect BlockBackend and DriveInfo, Markus Armbruster, 2014/10/07
- [Qemu-devel] [PATCH v6 06/24] block: Make BlockBackend own its BlockDriverState, Markus Armbruster, 2014/10/07
- [Qemu-devel] [PATCH v6 24/24] block: Make device model's references to BlockBackend strong, Markus Armbruster, 2014/10/07
- [Qemu-devel] [PATCH v6 21/24] block/qapi: Convert qmp_query_block() to BlockBackend, Markus Armbruster, 2014/10/07
- [Qemu-devel] [PATCH v6 02/24] block: New BlockBackend, Markus Armbruster, 2014/10/07
- [Qemu-devel] [PATCH v6 03/24] block: Connect BlockBackend to BlockDriverState, Markus Armbruster, 2014/10/07