drive_add is only used in softmmu/vl.c, so it can be a static
function there, and 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>
---
block/monitor/block-hmp-cmds.c | 2 +-
blockdev.c | 25 -------------------------
include/sysemu/blockdev.h | 4 ----
softmmu/vl.c | 25 ++++++++++++++++++++++++-
4 files changed, 25 insertions(+), 31 deletions(-)
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 1581f0d2f5..e5cb3eb95f 100644
--- a/blockdev.c
+++ b/blockdev.c
@@ -202,31 +202,6 @@ 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);
- if (!opts) {
- return NULL;
- }
- if (type != IF_DEFAULT) {
- qemu_opt_set(opts, "if", if_name[type], &error_abort);
- }
- if (index >= 0) {
- qemu_opt_set_number(opts, "index", index, &error_abort);
- }
- if (file)
- qemu_opt_set(opts, "file", file, &error_abort);
- return opts;
-}
-
DriveInfo *drive_get(BlockInterfaceType type, int bus, int unit)
{
BlockBackend *blk;
diff --git a/include/sysemu/blockdev.h b/include/sysemu/blockdev.h
index b321286dee..21ae0b994a 100644
--- a/include/sysemu/blockdev.h
+++ b/include/sysemu/blockdev.h
@@ -46,16 +46,12 @@ const char *block_if_name(BlockInterfaceType iface);
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);
DriveInfo *drive_get_next(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,
Error **errp);
diff --git a/softmmu/vl.c b/softmmu/vl.c
index 1159a64bce..4df30bad14 100644
--- a/softmmu/vl.c
+++ b/softmmu/vl.c
@@ -650,6 +650,27 @@ static int drive_enable_snapshot(void *opaque, QemuOpts *opts, Error **errp)
return 0;
}
+static QemuOpts *drive_add(BlockInterfaceType type, int index,
+ const char *file, const char *optstr)
+{
+ QemuOpts *opts;
+
+ opts = qemu_opts_parse_noisily(qemu_find_opts("drive"), optstr, false);
+ if (!opts) {
+ return NULL;
+ }
+ if (type != IF_DEFAULT) {
+ qemu_opt_set(opts, "if", block_if_name(type), &error_abort);
+ }
+ if (index >= 0) {
+ qemu_opt_set_number(opts, "index", index, &error_abort);
+ }
+ if (file) {
+ qemu_opt_set(opts, "file", file, &error_abort);
+ }
+ return opts;
+}
+
static void default_drive(int enable, int snapshot, BlockInterfaceType type,
int index, const char *optstr)
{
@@ -2884,7 +2905,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
Am 30.11.2021 um 10:46 hat Emanuele Giuseppe Esposito geschrieben: > drive_add is only used in softmmu/vl.c, so it can be a static > function there, and 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> I don't think moving drive_add() actually improves anything. Yes, you can make it static, but in order to do that you had to introduce block_if_name() as a new public function and you're moving an obviously block related function to common code in vl.c. So this part doesn't look like a net win to me. The rest of the series looks good to me. Kevin
On 14/12/2021 15:35, Kevin Wolf wrote: > Am 30.11.2021 um 10:46 hat Emanuele Giuseppe Esposito geschrieben: >> drive_add is only used in softmmu/vl.c, so it can be a static >> function there, and 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> > > I don't think moving drive_add() actually improves anything. Yes, you > can make it static, but in order to do that you had to introduce > block_if_name() as a new public function and you're moving an obviously > block related function to common code in vl.c. > > So this part doesn't look like a net win to me. The rest of the series > looks good to me. > So are we going to drop patch 2 and 3? For me it is fine either way, and I saw Stefan added r-b to all patches. If we are, Kevin are you going to apply only patch 1 and 4, or do you want me to send v3? Thank you, Emanuele
Am 15.12.2021 um 10:19 hat Emanuele Giuseppe Esposito geschrieben: > > > On 14/12/2021 15:35, Kevin Wolf wrote: > > Am 30.11.2021 um 10:46 hat Emanuele Giuseppe Esposito geschrieben: > > > drive_add is only used in softmmu/vl.c, so it can be a static > > > function there, and 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> > > > > I don't think moving drive_add() actually improves anything. Yes, you > > can make it static, but in order to do that you had to introduce > > block_if_name() as a new public function and you're moving an obviously > > block related function to common code in vl.c. > > > > So this part doesn't look like a net win to me. The rest of the series > > looks good to me. > > > > So are we going to drop patch 2 and 3? For me it is fine either way, and I > saw Stefan added r-b to all patches. > > If we are, Kevin are you going to apply only patch 1 and 4, or do you want > me to send v3? This patch does a bit more than just moving drive_add(). It also inlines drive_def() and deletes drive_mark_claimed_by_board(), which are both things that make sense to me. So this suggests a v3. But if you think I should just apply patches 1 and 4, I'm happy to do that, too. Kevin
On 15/12/2021 11:00, Kevin Wolf wrote: > Am 15.12.2021 um 10:19 hat Emanuele Giuseppe Esposito geschrieben: >> >> >> On 14/12/2021 15:35, Kevin Wolf wrote: >>> Am 30.11.2021 um 10:46 hat Emanuele Giuseppe Esposito geschrieben: >>>> drive_add is only used in softmmu/vl.c, so it can be a static >>>> function there, and 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> >>> >>> I don't think moving drive_add() actually improves anything. Yes, you >>> can make it static, but in order to do that you had to introduce >>> block_if_name() as a new public function and you're moving an obviously >>> block related function to common code in vl.c. >>> >>> So this part doesn't look like a net win to me. The rest of the series >>> looks good to me. >>> >> >> So are we going to drop patch 2 and 3? For me it is fine either way, and I >> saw Stefan added r-b to all patches. >> >> If we are, Kevin are you going to apply only patch 1 and 4, or do you want >> me to send v3? > > This patch does a bit more than just moving drive_add(). It also inlines > drive_def() and deletes drive_mark_claimed_by_board(), which are both > things that make sense to me. So this suggests a v3. > > But if you think I should just apply patches 1 and 4, I'm happy to do > that, too. You're right, I forgot about that. I will send v3, thanks. Emanuele
© 2016 - 2026 Red Hat, Inc.