[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 02/12] monitor/hmp: inline add_init_drive
From: |
Dr. David Alan Gilbert (git) |
Subject: |
[PULL 02/12] monitor/hmp: inline add_init_drive |
Date: |
Mon, 9 Mar 2020 19:46:40 +0000 |
From: Maxim Levitsky <address@hidden>
This function is only used by hmp_drive_add.
The code is just a bit shorter this way.
No functional changes
Signed-off-by: Maxim Levitsky <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Dr. David Alan Gilbert <address@hidden>
---
device-hotplug.c | 31 ++++++++++++-------------------
1 file changed, 12 insertions(+), 19 deletions(-)
diff --git a/device-hotplug.c b/device-hotplug.c
index f01d53774b..554e4d98db 100644
--- a/device-hotplug.c
+++ b/device-hotplug.c
@@ -34,42 +34,35 @@
#include "monitor/monitor.h"
#include "block/block_int.h"
-static DriveInfo *add_init_drive(const char *optstr)
+
+void hmp_drive_add(Monitor *mon, const QDict *qdict)
{
Error *err = NULL;
DriveInfo *dinfo;
QemuOpts *opts;
MachineClass *mc;
+ const char *optstr = qdict_get_str(qdict, "opts");
+ bool node = qdict_get_try_bool(qdict, "node", false);
+
+ if (node) {
+ hmp_drive_add_node(mon, optstr);
+ return;
+ }
opts = drive_def(optstr);
if (!opts)
- return NULL;
+ return;
mc = MACHINE_GET_CLASS(current_machine);
dinfo = drive_new(opts, mc->block_default_type, &err);
if (err) {
error_report_err(err);
qemu_opts_del(opts);
- return NULL;
- }
-
- return dinfo;
-}
-
-void hmp_drive_add(Monitor *mon, const QDict *qdict)
-{
- DriveInfo *dinfo = NULL;
- const char *opts = qdict_get_str(qdict, "opts");
- bool node = qdict_get_try_bool(qdict, "node", false);
-
- if (node) {
- hmp_drive_add_node(mon, opts);
- return;
+ goto err;
}
- dinfo = add_init_drive(opts);
if (!dinfo) {
- goto err;
+ return;
}
switch (dinfo->type) {
--
2.24.1
- [PULL 00/12] hmp queue, Dr. David Alan Gilbert (git), 2020/03/09
- [PULL 01/12] usb/dev-storage: remove unused include, Dr. David Alan Gilbert (git), 2020/03/09
- [PULL 03/12] monitor/hmp: rename device-hotplug.c to block/monitor/block-hmp-cmds.c, Dr. David Alan Gilbert (git), 2020/03/09
- [PULL 02/12] monitor/hmp: inline add_init_drive,
Dr. David Alan Gilbert (git) <=
- [PULL 04/12] monitor/hmp: move hmp_drive_del and hmp_commit to block-hmp-cmds.c, Dr. David Alan Gilbert (git), 2020/03/09
- [PULL 05/12] monitor/hmp: move hmp_drive_mirror and hmp_drive_backup to block-hmp-cmds.c, Dr. David Alan Gilbert (git), 2020/03/09
- [PULL 06/12] monitor/hmp: move hmp_block_job* to block-hmp-cmds.c, Dr. David Alan Gilbert (git), 2020/03/09
- [PULL 08/12] monitor/hmp: move hmp_nbd_server* to block-hmp-cmds.c, Dr. David Alan Gilbert (git), 2020/03/09
- [PULL 11/12] monitor/hmp: Move hmp_drive_add_node to block-hmp-cmds.c, Dr. David Alan Gilbert (git), 2020/03/09
- [PULL 07/12] monitor/hmp: move hmp_snapshot_* to block-hmp-cmds.c, Dr. David Alan Gilbert (git), 2020/03/09
- [PULL 12/12] net: Remove deprecated [hub_id name] tuple of 'hostfwd_add' / 'hostfwd_remove', Dr. David Alan Gilbert (git), 2020/03/09
- [PULL 10/12] monitor/hmp: move hmp_info_block* to block-hmp-cmds.c, Dr. David Alan Gilbert (git), 2020/03/09
- [PULL 09/12] monitor/hmp: move remaining hmp_block* functions to block-hmp-cmds.c, Dr. David Alan Gilbert (git), 2020/03/09
- Re: [PULL 00/12] hmp queue, no-reply, 2020/03/09