diff options
| -rw-r--r-- | block/block-backend.c | 13 | ||||
| -rw-r--r-- | blockdev.c | 11 | ||||
| -rw-r--r-- | include/sysemu/blockdev.h | 1 | ||||
| -rw-r--r-- | stubs/Makefile.objs | 1 | ||||
| -rw-r--r-- | stubs/blockdev.c | 12 |
5 files changed, 13 insertions, 25 deletions
diff --git a/block/block-backend.c b/block/block-backend.c index edaf73c1d7..d4bdd48e03 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 24d40f95b1..a00461df7b 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 c814a90be5..ccd4bf487e 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 c0b1f6a320..5e347d04bd 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 5d0a79c3a6..0000000000 --- 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); -} |