aboutsummaryrefslogtreecommitdiff
path: root/monitor/hmp-cmds.c
diff options
context:
space:
mode:
authorMarkus Armbruster <armbru@redhat.com>2023-01-24 13:19:26 +0100
committerMarkus Armbruster <armbru@redhat.com>2023-02-04 07:56:54 +0100
commitfa1d2f8f635f2e3d7a7269283cc0ff81ea6f2031 (patch)
treef8c84be268ecf38f5ea38df9c317ed447c7bdb0b /monitor/hmp-cmds.c
parentcffaca0fab7ccb955c0e498c5132b801844d2c41 (diff)
block: Factor out hmp_change_medium(), and move to block/monitor/
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>
Diffstat (limited to 'monitor/hmp-cmds.c')
-rw-r--r--monitor/hmp-cmds.c17
1 files changed, 1 insertions, 16 deletions
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);
}