Commit baead0ab authored by Max Reitz's avatar Max Reitz Committed by Kevin Wolf
Browse files

hmp: Add read-only-mode option to change command 



Expose the new read-only-mode option of 'blockdev-change-medium' for the
'change' HMP command.

Signed-off-by: default avatarMax Reitz <mreitz@redhat.com>
Reviewed-by: default avatarKevin Wolf <kwolf@redhat.com>
Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
parent 39ff43d9

hmp-commands.hx

+17 −3
Original line number Diff line number Diff line
@@ -194,8 +194,8 @@ ETEXI 


    {

        .name       = "change",

        .args_type  = "device:B,target:F,arg:s?",

        .params     = "device filename [format]",

        .args_type  = "device:B,target:F,arg:s?,read-only-mode:s?",

        .params     = "device filename [format [read-only-mode]]",

        .help       = "change a removable medium, optional format",

        .mhandler.cmd = hmp_change,

    },
@@ -206,7 +206,7 @@ STEXI 
Change the configuration of a device.



@table @option

@item change @var{diskdevice} @var{filename} [@var{format}]

@item change @var{diskdevice} @var{filename} [@var{format} [@var{read-only-mode}]]

Change the medium for a removable disk device to point to @var{filename}. eg



@example
@@ -215,6 +215,20 @@ Change the medium for a removable disk device to point to @var{filename}. eg 


@var{format} is optional.



@var{read-only-mode} may be used to change the read-only status of the device.

It accepts the following values:



@table @var

@item retain

Retains the current status; this is the default.



@item read-only

Makes the device read-only.



@item read-write

Makes the device writable.

@end table



@item change vnc @var{display},@var{options}

Change the configuration of the VNC server. The valid syntax for @var{display}

and @var{options} are described at @ref{sec_invocation}. eg

hmp.c

+21 −1
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ 
#include "qapi/opts-visitor.h"

#include "qapi/qmp/qerror.h"

#include "qapi/string-output-visitor.h"

#include "qapi/util.h"

#include "qapi-visit.h"

#include "ui/console.h"

#include "block/qapi.h"
@@ -1343,9 +1344,16 @@ void hmp_change(Monitor *mon, const QDict *qdict) 
    const char *device = qdict_get_str(qdict, "device");

    const char *target = qdict_get_str(qdict, "target");

    const char *arg = qdict_get_try_str(qdict, "arg");

    const char *read_only = qdict_get_try_str(qdict, "read-only-mode");

    BlockdevChangeReadOnlyMode read_only_mode = 0;

    Error *err = NULL;



    if (strcmp(device, "vnc") == 0) {

        if (read_only) {

            monitor_printf(mon,

                           "Parameter 'read-only-mode' is invalid for VNC\n");

            return;

        }

        if (strcmp(target, "passwd") == 0 ||

            strcmp(target, "password") == 0) {

            if (!arg) {
@@ -1355,7 +1363,19 @@ void hmp_change(Monitor *mon, const QDict *qdict) 
        }

        qmp_change("vnc", target, !!arg, arg, &err);

    } else {

        qmp_blockdev_change_medium(device, target, !!arg, arg, false, 0, &err);

        if (read_only) {

            read_only_mode =

                qapi_enum_parse(BlockdevChangeReadOnlyMode_lookup,

                                read_only, BLOCKDEV_CHANGE_READ_ONLY_MODE_MAX,

                                BLOCKDEV_CHANGE_READ_ONLY_MODE_RETAIN, &err);

            if (err) {

                hmp_handle_error(mon, &err);

                return;

            }

        }



        qmp_blockdev_change_medium(device, target, !!arg, arg,

                                   !!read_only, read_only_mode, &err);

        if (err &&

            error_get_class(err) == ERROR_CLASS_DEVICE_ENCRYPTED) {

            error_free(err);