mirror of https://github.com/xemu-project/xemu.git
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>
This commit is contained in:
parent
cffaca0fab
commit
fa1d2f8f63
|
@ -1005,3 +1005,24 @@ void hmp_info_snapshots(Monitor *mon, const QDict *qdict)
|
||||||
g_free(sn_tab);
|
g_free(sn_tab);
|
||||||
g_free(global_snapshots);
|
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);
|
||||||
|
}
|
||||||
|
|
|
@ -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,
|
const char *arg, const char *read_only, bool force,
|
||||||
Error **errp);
|
Error **errp);
|
||||||
#endif
|
#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_migrate(Monitor *mon, const QDict *qdict);
|
||||||
void hmp_device_add(Monitor *mon, const QDict *qdict);
|
void hmp_device_add(Monitor *mon, const QDict *qdict);
|
||||||
void hmp_device_del(Monitor *mon, const QDict *qdict);
|
void hmp_device_del(Monitor *mon, const QDict *qdict);
|
||||||
|
|
|
@ -24,7 +24,6 @@
|
||||||
#include "qapi/error.h"
|
#include "qapi/error.h"
|
||||||
#include "qapi/clone-visitor.h"
|
#include "qapi/clone-visitor.h"
|
||||||
#include "qapi/qapi-builtin-visit.h"
|
#include "qapi/qapi-builtin-visit.h"
|
||||||
#include "qapi/qapi-commands-block.h"
|
|
||||||
#include "qapi/qapi-commands-control.h"
|
#include "qapi/qapi-commands-control.h"
|
||||||
#include "qapi/qapi-commands-migration.h"
|
#include "qapi/qapi-commands-migration.h"
|
||||||
#include "qapi/qapi-commands-misc.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 *arg = qdict_get_try_str(qdict, "arg");
|
||||||
const char *read_only = qdict_get_try_str(qdict, "read-only-mode");
|
const char *read_only = qdict_get_try_str(qdict, "read-only-mode");
|
||||||
bool force = qdict_get_try_bool(qdict, "force", false);
|
bool force = qdict_get_try_bool(qdict, "force", false);
|
||||||
BlockdevChangeReadOnlyMode read_only_mode = 0;
|
|
||||||
Error *err = NULL;
|
Error *err = NULL;
|
||||||
|
|
||||||
#ifdef CONFIG_VNC
|
#ifdef CONFIG_VNC
|
||||||
|
@ -925,22 +923,9 @@ void hmp_change(Monitor *mon, const QDict *qdict)
|
||||||
} else
|
} else
|
||||||
#endif
|
#endif
|
||||||
{
|
{
|
||||||
if (read_only) {
|
hmp_change_medium(mon, device, target, arg, read_only, force, &err);
|
||||||
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);
|
|
||||||
}
|
|
||||||
|
|
||||||
end:
|
|
||||||
hmp_handle_error(mon, err);
|
hmp_handle_error(mon, err);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue