qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Maxim Levitsky <mlevitsk@redhat.com>
To: qemu-devel@nongnu.org
Cc: Kevin Wolf <kwolf@redhat.com>,
	qemu-block@nongnu.org, Markus Armbruster <armbru@redhat.com>,
	"Dr. David Alan Gilbert" <dgilbert@redhat.com>,
	Maxim Levitsky <mlevitsk@redhat.com>,
	Max Reitz <mreitz@redhat.com>
Subject: [PATCH 1/9] monitor: uninline add_init_drive
Date: Wed, 20 Nov 2019 20:58:42 +0200	[thread overview]
Message-ID: <20191120185850.18986-2-mlevitsk@redhat.com> (raw)
In-Reply-To: <20191120185850.18986-1-mlevitsk@redhat.com>

This is only used by hmp_drive_add.
The code is just a bit shorter this way.

No functional changes

Signed-off-by: Maxim Levitsky <mlevitsk@redhat.com>
---
 device-hotplug.c | 33 +++++++++++++--------------------
 1 file changed, 13 insertions(+), 20 deletions(-)

diff --git a/device-hotplug.c b/device-hotplug.c
index f01d53774b..5ce73f0cff 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;
+    DriveInfo *dinfo = NULL;
     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.17.2



  reply	other threads:[~2019-11-20 19:05 UTC|newest]

Thread overview: 32+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-11-20 18:58 [PATCH 0/9] RFC: [for 5.0]: HMP monitor handlers cleanups Maxim Levitsky
2019-11-20 18:58 ` Maxim Levitsky [this message]
2019-11-27  7:13   ` [PATCH 1/9] monitor: uninline add_init_drive Markus Armbruster
2020-01-27 11:03     ` Maxim Levitsky
2019-11-20 18:58 ` [PATCH 2/9] monitor: rename device-hotplug.c to blockdev-hmp-cmds.c Maxim Levitsky
2019-11-20 18:58 ` [PATCH 3/9] monitor: move hmp_drive_del and hmp_commit " Maxim Levitsky
2019-11-27  7:29   ` Markus Armbruster
2020-01-27 11:03     ` Maxim Levitsky
2019-11-27  7:50   ` Markus Armbruster
2020-01-27 11:03     ` Maxim Levitsky
2019-11-20 18:58 ` [PATCH 4/9] monitor: move hmp_drive_mirror and hmp_drive_backup " Maxim Levitsky
2019-11-27  7:22   ` Markus Armbruster
2020-01-27 11:04     ` Maxim Levitsky
2019-11-20 18:58 ` [PATCH 5/9] monitor: move hmp_block_job* to blockdev-hmp-cmd.c Maxim Levitsky
2019-11-27  7:24   ` Markus Armbruster
2020-01-27 11:03     ` Maxim Levitsky
2019-11-20 18:58 ` [PATCH 6/9] monitor: move hmp_snapshot_* to blockdev-hmp-cmds.c Maxim Levitsky
2019-11-20 18:58 ` [PATCH 7/9] monitor: move remaining hmp_block* functions " Maxim Levitsky
2019-11-20 18:58 ` [PATCH 8/9] monitor: move hmp_info_block* " Maxim Levitsky
2019-11-27  8:08   ` Markus Armbruster
2020-01-27 11:05     ` Maxim Levitsky
2020-01-27 13:33       ` Markus Armbruster
2020-01-27 13:54         ` Maxim Levitsky
2020-01-27 14:07         ` Kevin Wolf
2019-11-20 18:58 ` [PATCH 9/9] monitor/hmp: Prefer to use hmp_handle_error for error reporting in block hmp commands Maxim Levitsky
2019-11-27  8:38   ` Markus Armbruster
2020-01-27 11:04     ` Maxim Levitsky
2020-01-27 13:44       ` Markus Armbruster
2020-01-27 13:53         ` Maxim Levitsky
2020-01-28 19:35           ` Dr. David Alan Gilbert
2019-11-22 10:15 ` [PATCH 0/9] RFC: [for 5.0]: HMP monitor handlers cleanups Dr. David Alan Gilbert
2019-11-22 10:27   ` Kevin Wolf

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20191120185850.18986-2-mlevitsk@redhat.com \
    --to=mlevitsk@redhat.com \
    --cc=armbru@redhat.com \
    --cc=dgilbert@redhat.com \
    --cc=kwolf@redhat.com \
    --cc=mreitz@redhat.com \
    --cc=qemu-block@nongnu.org \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).