[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v6 05/24] block: Code motion to get rid of stubs/blo
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PATCH v6 05/24] block: Code motion to get rid of stubs/blockdev.c |
Date: |
Tue, 7 Oct 2014 13:59:07 +0200 |
Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: BenoƮt Canet <address@hidden>
Reviewed-by: Max Reitz <address@hidden>
Reviewed-by: Kevin Wolf <address@hidden>
---
block/block-backend.c | 13 +++++++++++++
blockdev.c | 11 -----------
include/sysemu/blockdev.h | 1 -
stubs/Makefile.objs | 1 -
stubs/blockdev.c | 12 ------------
5 files changed, 13 insertions(+), 25 deletions(-)
delete mode 100644 stubs/blockdev.c
diff --git a/block/block-backend.c b/block/block-backend.c
index edaf73c..d4bdd48 100644
--- a/block/block-backend.c
+++ b/block/block-backend.c
@@ -22,6 +22,8 @@ struct BlockBackend {
QTAILQ_ENTRY(BlockBackend) link; /* for blk_backends */
};
+static void drive_info_del(DriveInfo *dinfo);
+
/* All the BlockBackends (except for hidden ones) */
static QTAILQ_HEAD(, BlockBackend) blk_backends =
QTAILQ_HEAD_INITIALIZER(blk_backends);
@@ -93,6 +95,17 @@ static void blk_delete(BlockBackend *blk)
g_free(blk);
}
+static void drive_info_del(DriveInfo *dinfo)
+{
+ if (!dinfo) {
+ return;
+ }
+ qemu_opts_del(dinfo->opts);
+ g_free(dinfo->id);
+ g_free(dinfo->serial);
+ g_free(dinfo);
+}
+
/*
* Increment @blk's reference count.
* @blk must not be null.
diff --git a/blockdev.c b/blockdev.c
index 24d40f9..a00461d 100644
--- a/blockdev.c
+++ b/blockdev.c
@@ -284,17 +284,6 @@ void drive_del(DriveInfo *dinfo)
blk_unref(blk);
}
-void drive_info_del(DriveInfo *dinfo)
-{
- if (!dinfo) {
- return;
- }
- qemu_opts_del(dinfo->opts);
- g_free(dinfo->id);
- g_free(dinfo->serial);
- g_free(dinfo);
-}
-
typedef struct {
QEMUBH *bh;
BlockDriverState *bs;
diff --git a/include/sysemu/blockdev.h b/include/sysemu/blockdev.h
index c814a90..ccd4bf4 100644
--- a/include/sysemu/blockdev.h
+++ b/include/sysemu/blockdev.h
@@ -65,7 +65,6 @@ 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);
-void drive_info_del(DriveInfo *dinfo);
/* device-hotplug */
diff --git a/stubs/Makefile.objs b/stubs/Makefile.objs
index c0b1f6a..5e347d0 100644
--- a/stubs/Makefile.objs
+++ b/stubs/Makefile.objs
@@ -1,6 +1,5 @@
stub-obj-y += arch-query-cpu-def.o
stub-obj-y += bdrv-commit-all.o
-stub-obj-y += blockdev.o
stub-obj-y += chr-baum-init.o
stub-obj-y += chr-msmouse.o
stub-obj-y += chr-testdev.o
diff --git a/stubs/blockdev.c b/stubs/blockdev.c
deleted file mode 100644
index 5d0a79c..0000000
--- a/stubs/blockdev.c
+++ /dev/null
@@ -1,12 +0,0 @@
-#include <assert.h>
-#include "sysemu/blockdev.h"
-
-DriveInfo *drive_get_by_blockdev(BlockDriverState *bs)
-{
- return NULL;
-}
-
-void drive_info_del(DriveInfo *dinfo)
-{
- assert(!dinfo);
-}
--
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, 2014/10/07
- [Qemu-devel] [PATCH v6 05/24] block: Code motion to get rid of stubs/blockdev.c,
Markus Armbruster <=
- [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
- [Qemu-devel] [PATCH v6 09/24] block: Eliminate BlockDriverState member device_name[], Markus Armbruster, 2014/10/07