[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 15/35] block: Factor out hmp_change_medium(), and move to block/mo
From: |
Markus Armbruster |
Subject: |
[PULL 15/35] block: Factor out hmp_change_medium(), and move to block/monitor/ |
Date: |
Fri, 3 Feb 2023 09:45:29 +0100 |
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20230124121946.1139465-13-armbru@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Stefan Berger <stefanb@linux.ibm.com>
---
include/monitor/hmp.h | 3 +++
block/monitor/block-hmp-cmds.c | 21 +++++++++++++++++++++
monitor/hmp-cmds.c | 17 +----------------
3 files changed, 25 insertions(+), 16 deletions(-)
diff --git a/include/monitor/hmp.h b/include/monitor/hmp.h
index 58ed1bec62..6fafa7ffb4 100644
--- a/include/monitor/hmp.h
+++ b/include/monitor/hmp.h
@@ -78,6 +78,9 @@ void hmp_change_vnc(Monitor *mon, const char *device, const
char *target,
const char *arg, const char *read_only, bool force,
Error **errp);
#endif
+void hmp_change_medium(Monitor *mon, const char *device, const char *target,
+ const char *arg, const char *read_only, bool force,
+ Error **errp);
void hmp_migrate(Monitor *mon, const QDict *qdict);
void hmp_device_add(Monitor *mon, const QDict *qdict);
void hmp_device_del(Monitor *mon, const QDict *qdict);
diff --git a/block/monitor/block-hmp-cmds.c b/block/monitor/block-hmp-cmds.c
index 0ff7c84039..ae624ab575 100644
--- a/block/monitor/block-hmp-cmds.c
+++ b/block/monitor/block-hmp-cmds.c
@@ -1005,3 +1005,24 @@ void hmp_info_snapshots(Monitor *mon, const QDict *qdict)
g_free(sn_tab);
g_free(global_snapshots);
}
+
+void hmp_change_medium(Monitor *mon, const char *device, const char *target,
+ const char *arg, const char *read_only, bool force,
+ Error **errp)
+{
+ ERRP_GUARD();
+ BlockdevChangeReadOnlyMode read_only_mode = 0;
+
+ if (read_only) {
+ read_only_mode =
+ qapi_enum_parse(&BlockdevChangeReadOnlyMode_lookup,
+ read_only,
+ BLOCKDEV_CHANGE_READ_ONLY_MODE_RETAIN, errp);
+ if (*errp) {
+ return;
+ }
+ }
+
+ qmp_blockdev_change_medium(device, NULL, target, arg, true, force,
+ !!read_only, read_only_mode, errp);
+}
diff --git a/monitor/hmp-cmds.c b/monitor/hmp-cmds.c
index 4fe2aaebcd..bed75af656 100644
--- a/monitor/hmp-cmds.c
+++ b/monitor/hmp-cmds.c
@@ -24,7 +24,6 @@
#include "qapi/error.h"
#include "qapi/clone-visitor.h"
#include "qapi/qapi-builtin-visit.h"
-#include "qapi/qapi-commands-block.h"
#include "qapi/qapi-commands-control.h"
#include "qapi/qapi-commands-migration.h"
#include "qapi/qapi-commands-misc.h"
@@ -916,7 +915,6 @@ void hmp_change(Monitor *mon, const QDict *qdict)
const char *arg = qdict_get_try_str(qdict, "arg");
const char *read_only = qdict_get_try_str(qdict, "read-only-mode");
bool force = qdict_get_try_bool(qdict, "force", false);
- BlockdevChangeReadOnlyMode read_only_mode = 0;
Error *err = NULL;
#ifdef CONFIG_VNC
@@ -925,22 +923,9 @@ void hmp_change(Monitor *mon, const QDict *qdict)
} else
#endif
{
- if (read_only) {
- read_only_mode =
- qapi_enum_parse(&BlockdevChangeReadOnlyMode_lookup,
- read_only,
- BLOCKDEV_CHANGE_READ_ONLY_MODE_RETAIN, &err);
- if (err) {
- goto end;
- }
- }
-
- qmp_blockdev_change_medium(device, NULL, target, arg, true, force,
- !!read_only, read_only_mode,
- &err);
+ hmp_change_medium(mon, device, target, arg, read_only, force, &err);
}
-end:
hmp_handle_error(mon, err);
}
--
2.39.0
- [PULL 00/35] Monitor patches for 2023-02-03, Markus Armbruster, 2023/02/03
- [PULL 04/35] monitor: Drop unnecessary includes, Markus Armbruster, 2023/02/03
- [PULL 14/35] qom: Move HMP commands from monitor/ to qom/, Markus Armbruster, 2023/02/03
- [PULL 21/35] migration: Move the QMP command from monitor/ to migration/, Markus Armbruster, 2023/02/03
- [PULL 02/35] MAINTAINERS: Cover include/sysemu/accel-blocker.h, Markus Armbruster, 2023/02/03
- [PULL 11/35] trace: Move HMP commands from monitor/ to trace/, Markus Armbruster, 2023/02/03
- [PULL 12/35] machine: Move QMP commands from monitor/ to hw/core/, Markus Armbruster, 2023/02/03
- [PULL 03/35] MAINTAINERS: Cover tpm.c again, Markus Armbruster, 2023/02/03
- [PULL 24/35] runstate: Move HMP commands from monitor/ to softmmu/, Markus Armbruster, 2023/02/03
- [PULL 15/35] block: Factor out hmp_change_medium(), and move to block/monitor/,
Markus Armbruster <=
- [PULL 30/35] monitor: Move monitor_putc() next to monitor_puts & external linkage, Markus Armbruster, 2023/02/03
- [PULL 18/35] net: Move HMP commands from monitor to net/, Markus Armbruster, 2023/02/03
- [PULL 28/35] qdev: Move HMP command completion from monitor to softmmu/, Markus Armbruster, 2023/02/03
- [PULL 35/35] monitor: Rename misc.c to hmp-target.c, Markus Armbruster, 2023/02/03
- [PULL 08/35] hmp: Drop redundant argument check from add_completion_option(), Markus Armbruster, 2023/02/03
- [PULL 31/35] monitor: Move target-dependent HMP commands to hmp-cmds-target.c, Markus Armbruster, 2023/02/03
- [PULL 01/35] MAINTAINERS: Cover userfaultfd, Markus Armbruster, 2023/02/03
- [PULL 33/35] monitor: Move remaining QMP stuff from misc.c to qmp-cmds.c, Markus Armbruster, 2023/02/03
- [PULL 25/35] stats: Move QMP commands from monitor/ to stats/, Markus Armbruster, 2023/02/03
- [PULL 34/35] monitor: Loosen coupling between misc.c and monitor.c slightly, Markus Armbruster, 2023/02/03