From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54213) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XrR6l-0006T3-Ac for qemu-devel@nongnu.org; Thu, 20 Nov 2014 07:45:17 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XrR6a-0005c9-PY for qemu-devel@nongnu.org; Thu, 20 Nov 2014 07:45:11 -0500 Received: from mx1.redhat.com ([209.132.183.28]:59900) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XrR6a-0005bz-Hl for qemu-devel@nongnu.org; Thu, 20 Nov 2014 07:45:00 -0500 From: Max Reitz Date: Thu, 20 Nov 2014 13:44:48 +0100 Message-Id: <1416487488-8423-4-git-send-email-mreitz@redhat.com> In-Reply-To: <1416487488-8423-1-git-send-email-mreitz@redhat.com> References: <1416487488-8423-1-git-send-email-mreitz@redhat.com> Subject: [Qemu-devel] [PATCH 3/3] hmp: Expose read-only option for 'change' List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Kevin Wolf , Peter Lieven , Markus Armbruster , Luiz Capitulino , Stefan Hajnoczi , Max Reitz Expose the new read-only option of qmp_change_blockdev() for the 'change' HMP command. Signed-off-by: Max Reitz --- hmp-commands.hx | 24 +++++++++++++++++++++--- hmp.c | 17 ++++++++++++++++- 2 files changed, 37 insertions(+), 4 deletions(-) diff --git a/hmp-commands.hx b/hmp-commands.hx index e37bc8b..f0ec0da 100644 --- a/hmp-commands.hx +++ b/hmp-commands.hx @@ -196,8 +196,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:s?", + .params = "device filename [format [read-only]]", .help = "change a removable medium, optional format", .mhandler.cmd = hmp_change, }, @@ -209,7 +209,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}]] Change the medium for a removable disk device to point to @var{filename}. eg @example @@ -218,6 +218,24 @@ Change the medium for a removable disk device to point to @var{filename}. eg @var{format} is optional. +@var{read-only} 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 ro +Makes the device read-only. + +@item rw +Makes the device writable. + +@item auto +If @var{filename} can be opened with write access, the block device will be +writable; otherwise it will be read-only. +@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 diff --git a/hmp.c b/hmp.c index 0719fa3..c25e7dc 100644 --- a/hmp.c +++ b/hmp.c @@ -23,6 +23,7 @@ #include "monitor/monitor.h" #include "qapi/opts-visitor.h" #include "qapi/string-output-visitor.h" +#include "qapi/util.h" #include "qapi-visit.h" #include "ui/console.h" #include "block/qapi.h" @@ -1122,6 +1123,8 @@ 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"); + BlockdevChangeReadOnlyMode read_only_mode = 0; Error *err = NULL; if (strcmp(device, "vnc") == 0 && @@ -1133,7 +1136,19 @@ void hmp_change(Monitor *mon, const QDict *qdict) } } - qmp_change(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_change(device, target, !!arg, arg, !!read_only, read_only_mode, &err); if (err && error_get_class(err) == ERROR_CLASS_DEVICE_ENCRYPTED) { error_free(err); -- 1.9.3