[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 6/9] monitor/hmp-cmds: add 'goto end' to reduce duplicate code.
From: |
Mao Zhongyi |
Subject: |
[PATCH 6/9] monitor/hmp-cmds: add 'goto end' to reduce duplicate code. |
Date: |
Wed, 3 Jun 2020 16:09:01 +0800 |
Signed-off-by: Mao Zhongyi <maozhongyi@cmss.chinamobile.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 acdd6baff3..e8cf72eb3a 100644
--- a/monitor/hmp-cmds.c
+++ b/monitor/hmp-cmds.c
@@ -1501,8 +1501,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;
}
}
@@ -1511,6 +1510,7 @@ void hmp_change(Monitor *mon, const QDict *qdict)
&err);
}
+end:
hmp_handle_error(mon, err);
}
@@ -1629,13 +1629,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.17.1
- [PATCH 0/9] monitor/hmp-cmds: small improvements for migration, Mao Zhongyi, 2020/06/03
- [PATCH 6/9] monitor/hmp-cmds: add 'goto end' to reduce duplicate code.,
Mao Zhongyi <=
- [PATCH 5/9] monitor/hmp-cmds: delete redundant Error check before invoke hmp_handle_error(), Mao Zhongyi, 2020/06/03
- [PATCH 4/9] monitor/hmp-cmds: don't silently output when running 'migrate_set_downtime' fails, Mao Zhongyi, 2020/06/03
- [PATCH 9/9] migration/ram: calculate un/encoded_size only when needed., Mao Zhongyi, 2020/06/03
- [PATCH 2/9] tests/migration: fix unreachable path in stress test, Mao Zhongyi, 2020/06/03
- [PATCH 7/9] monitor/hmp-cmds: improvements for the 'info migrate', Mao Zhongyi, 2020/06/03