qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Dr. David Alan Gilbert (git)" <dgilbert@redhat.com>
To: qemu-devel@nongnu.org, david@redhat.com, lvivier@redhat.com,
	maozhongyi@cmss.chinamobile.com, mreitz@redhat.com,
	pannengyuan@huawei.com
Cc: stefanha@redhat.com, quintela@redhat.com
Subject: [PULL 09/12] monitor/hmp-cmds: add 'goto end' to reduce duplicate code.
Date: Wed, 17 Jun 2020 19:37:30 +0100	[thread overview]
Message-ID: <20200617183733.186168-10-dgilbert@redhat.com> (raw)
In-Reply-To: <20200617183733.186168-1-dgilbert@redhat.com>

From: Mao Zhongyi <maozhongyi@cmss.chinamobile.com>

Signed-off-by: Mao Zhongyi <maozhongyi@cmss.chinamobile.com>
Message-Id: <20200603080904.997083-7-maozhongyi@cmss.chinamobile.com>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
---
 monitor/hmp-cmds.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/monitor/hmp-cmds.c b/monitor/hmp-cmds.c
index 504796d6e9..00e3362cb0 100644
--- a/monitor/hmp-cmds.c
+++ b/monitor/hmp-cmds.c
@@ -1502,8 +1502,7 @@ void hmp_change(Monitor *mon, const QDict *qdict)
                                 read_only,
                                 BLOCKDEV_CHANGE_READ_ONLY_MODE_RETAIN, &err);
             if (err) {
-                hmp_handle_error(mon, err);
-                return;
+                goto end;
             }
         }
 
@@ -1512,6 +1511,7 @@ void hmp_change(Monitor *mon, const QDict *qdict)
                                    &err);
     }
 
+end:
     hmp_handle_error(mon, err);
 }
 
@@ -1630,13 +1630,13 @@ void hmp_object_add(Monitor *mon, const QDict *qdict)
 
     opts = qemu_opts_from_qdict(qemu_find_opts("object"), qdict, &err);
     if (err) {
-        hmp_handle_error(mon, err);
-        return;
+        goto end;
     }
 
     obj = user_creatable_add_opts(opts, &err);
     qemu_opts_del(opts);
 
+end:
     hmp_handle_error(mon, err);
 
     if (obj) {
-- 
2.26.2



  parent reply	other threads:[~2020-06-17 18:44 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-06-17 18:37 [PULL 00/12] migration, HMP and virtiofs queue Dr. David Alan Gilbert (git)
2020-06-17 18:37 ` [PULL 01/12] virtiofsd: Whitelist fchmod Dr. David Alan Gilbert (git)
2020-06-17 18:37 ` [PULL 02/12] qom-hmp-cmds: fix a memleak in hmp_qom_get Dr. David Alan Gilbert (git)
2020-06-17 18:37 ` [PULL 03/12] hmp: Make json format optional for qom-set Dr. David Alan Gilbert (git)
2020-06-17 18:37 ` [PULL 04/12] tests/migration: mem leak fix Dr. David Alan Gilbert (git)
2020-06-17 18:37 ` [PULL 05/12] tests/migration: fix unreachable path in stress test Dr. David Alan Gilbert (git)
2020-06-17 18:37 ` [PULL 06/12] monitor/hmp-cmds: add units for migrate_parameters Dr. David Alan Gilbert (git)
2020-06-17 18:37 ` [PULL 07/12] monitor/hmp-cmds: don't silently output when running 'migrate_set_downtime' fails Dr. David Alan Gilbert (git)
2020-06-17 18:37 ` [PULL 08/12] monitor/hmp-cmds: delete redundant Error check before invoke hmp_handle_error() Dr. David Alan Gilbert (git)
2020-06-17 18:37 ` Dr. David Alan Gilbert (git) [this message]
2020-06-17 18:37 ` [PULL 10/12] monitor/hmp-cmds: improvements for the 'info migrate' Dr. David Alan Gilbert (git)
2020-06-17 18:37 ` [PULL 11/12] docs/xbzrle: update 'cache miss rate' and 'encoding rate' to docs Dr. David Alan Gilbert (git)
2020-06-17 18:37 ` [PULL 12/12] migration: fix multifd_send_pages() next channel Dr. David Alan Gilbert (git)
2020-06-17 19:09 ` [PULL 00/12] migration, HMP and virtiofs queue no-reply
2020-06-18 15:51 ` Peter Maydell

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=20200617183733.186168-10-dgilbert@redhat.com \
    --to=dgilbert@redhat.com \
    --cc=david@redhat.com \
    --cc=lvivier@redhat.com \
    --cc=maozhongyi@cmss.chinamobile.com \
    --cc=mreitz@redhat.com \
    --cc=pannengyuan@huawei.com \
    --cc=qemu-devel@nongnu.org \
    --cc=quintela@redhat.com \
    --cc=stefanha@redhat.com \
    /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).