[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 02/16] include/sysemu/blockdev.h: remove drive_mark_claimed_by_boa
From: |
Kevin Wolf |
Subject: |
[PULL 02/16] include/sysemu/blockdev.h: remove drive_mark_claimed_by_board and inline drive_def |
Date: |
Fri, 14 Jan 2022 14:52:12 +0100 |
From: Emanuele Giuseppe Esposito <eesposit@redhat.com>
drive_def is only a particular use case of
qemu_opts_parse_noisily, so it can be inlined.
Also remove drive_mark_claimed_by_board, as it is only defined
but not implemented (nor used) anywhere.
Signed-off-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
Message-Id: <20211215121140.456939-3-eesposit@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
include/sysemu/blockdev.h | 2 --
block/monitor/block-hmp-cmds.c | 2 +-
blockdev.c | 7 +------
softmmu/vl.c | 4 +++-
4 files changed, 5 insertions(+), 10 deletions(-)
diff --git a/include/sysemu/blockdev.h b/include/sysemu/blockdev.h
index a750f99b79..ea35c42f5c 100644
--- a/include/sysemu/blockdev.h
+++ b/include/sysemu/blockdev.h
@@ -45,13 +45,11 @@ BlockBackend *blk_by_legacy_dinfo(DriveInfo *dinfo);
void override_max_devs(BlockInterfaceType type, int max_devs);
DriveInfo *drive_get(BlockInterfaceType type, int bus, int unit);
-void drive_mark_claimed_by_board(void);
void drive_check_orphaned(void);
DriveInfo *drive_get_by_index(BlockInterfaceType type, int index);
int drive_get_max_bus(BlockInterfaceType type);
int drive_get_max_devs(BlockInterfaceType type);
-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,
diff --git a/block/monitor/block-hmp-cmds.c b/block/monitor/block-hmp-cmds.c
index 2ac4aedfff..bfb3c043a0 100644
--- a/block/monitor/block-hmp-cmds.c
+++ b/block/monitor/block-hmp-cmds.c
@@ -101,7 +101,7 @@ void hmp_drive_add(Monitor *mon, const QDict *qdict)
return;
}
- opts = drive_def(optstr);
+ opts = qemu_opts_parse_noisily(qemu_find_opts("drive"), optstr, false);
if (!opts)
return;
diff --git a/blockdev.c b/blockdev.c
index b5ff9b854e..25b3b202e7 100644
--- a/blockdev.c
+++ b/blockdev.c
@@ -197,17 +197,12 @@ static int drive_index_to_unit_id(BlockInterfaceType
type, int index)
return max_devs ? index % max_devs : index;
}
-QemuOpts *drive_def(const char *optstr)
-{
- return qemu_opts_parse_noisily(qemu_find_opts("drive"), optstr, false);
-}
-
QemuOpts *drive_add(BlockInterfaceType type, int index, const char *file,
const char *optstr)
{
QemuOpts *opts;
- opts = drive_def(optstr);
+ opts = qemu_opts_parse_noisily(qemu_find_opts("drive"), optstr, false);
if (!opts) {
return NULL;
}
diff --git a/softmmu/vl.c b/softmmu/vl.c
index a8cad43691..207a9eb8be 100644
--- a/softmmu/vl.c
+++ b/softmmu/vl.c
@@ -2887,7 +2887,9 @@ void qemu_init(int argc, char **argv, char **envp)
break;
}
case QEMU_OPTION_drive:
- if (drive_def(optarg) == NULL) {
+ opts = qemu_opts_parse_noisily(qemu_find_opts("drive"),
+ optarg, false);
+ if (opts == NULL) {
exit(1);
}
break;
--
2.31.1
- [PULL 00/16] Block layer patches, Kevin Wolf, 2022/01/14
- [PULL 02/16] include/sysemu/blockdev.h: remove drive_mark_claimed_by_board and inline drive_def,
Kevin Wolf <=
- [PULL 01/16] block_int: make bdrv_backing_overridden static, Kevin Wolf, 2022/01/14
- [PULL 04/16] softmmu: fix device deletion events with -device JSON syntax, Kevin Wolf, 2022/01/14
- [PULL 03/16] include/sysemu/blockdev.h: remove drive_get_max_devs, Kevin Wolf, 2022/01/14
- [PULL 06/16] qemu-storage-daemon: Add vhost-user-blk help, Kevin Wolf, 2022/01/14
- [PULL 05/16] docs: Correct 'vhost-user-blk' spelling, Kevin Wolf, 2022/01/14
- [PULL 08/16] block-backend: prevent dangling BDS pointers across aio_poll(), Kevin Wolf, 2022/01/14
- [PULL 07/16] qapi/block: Restrict vhost-user-blk to CONFIG_VHOST_USER_BLK_SERVER, Kevin Wolf, 2022/01/14
- [PULL 10/16] iotests/308: Fix for CAP_DAC_OVERRIDE, Kevin Wolf, 2022/01/14
- [PULL 12/16] vvfat: Fix vvfat_write() for writes before the root directory, Kevin Wolf, 2022/01/14