From patchwork Wed Aug 24 18:43:08 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony Liguori X-Patchwork-Id: 111417 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id BFFD2B6F18 for ; Thu, 25 Aug 2011 05:29:33 +1000 (EST) Received: from localhost ([::1]:49511 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QwJ8k-0001Al-7b for incoming@patchwork.ozlabs.org; Wed, 24 Aug 2011 15:29:30 -0400 Received: from eggs.gnu.org ([140.186.70.92]:46629) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QwIRJ-0002yp-Py for qemu-devel@nongnu.org; Wed, 24 Aug 2011 14:44:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QwIRI-0006Sk-30 for qemu-devel@nongnu.org; Wed, 24 Aug 2011 14:44:37 -0400 Received: from e8.ny.us.ibm.com ([32.97.182.138]:46686) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QwIRH-0006SA-UO for qemu-devel@nongnu.org; Wed, 24 Aug 2011 14:44:36 -0400 Received: from d01relay02.pok.ibm.com (d01relay02.pok.ibm.com [9.56.227.234]) by e8.ny.us.ibm.com (8.14.4/8.13.1) with ESMTP id p7OIUZmp024446 for ; Wed, 24 Aug 2011 14:30:35 -0400 Received: from d01av02.pok.ibm.com (d01av02.pok.ibm.com [9.56.224.216]) by d01relay02.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id p7OIhcJO436500 for ; Wed, 24 Aug 2011 14:43:40 -0400 Received: from d01av02.pok.ibm.com (loopback [127.0.0.1]) by d01av02.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id p7OIhbob011744 for ; Wed, 24 Aug 2011 15:43:38 -0300 Received: from titi.austin.rr.com (sig-9-48-61-239.mts.ibm.com [9.48.61.239]) by d01av02.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id p7OIhHuf009550; Wed, 24 Aug 2011 15:43:37 -0300 From: Anthony Liguori To: qemu-devel@nongnu.org Date: Wed, 24 Aug 2011 13:43:08 -0500 Message-Id: <1314211389-28915-14-git-send-email-aliguori@us.ibm.com> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1314211389-28915-1-git-send-email-aliguori@us.ibm.com> References: <1314211389-28915-1-git-send-email-aliguori@us.ibm.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) X-Received-From: 32.97.182.138 Cc: Kevin Wolf , Anthony Liguori , Michael Roth , Luiz Capitulino Subject: [Qemu-devel] [PATCH 13/14] qapi: convert change X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Convert the change command to QAPI and document all of its gloriousness. Signed-off-by: Anthony Liguori --- blockdev.c | 27 ++++++++---------- blockdev.h | 6 +++- hmp-commands.hx | 3 +- hmp.c | 59 ++++++++++++++++++++++++++++++++++++++++ hmp.h | 1 + monitor.c | 78 +++++++---------------------------------------------- qapi-schema.json | 38 ++++++++++++++++++++++++++ qmp-commands.hx | 3 +- 8 files changed, 127 insertions(+), 88 deletions(-) diff --git a/blockdev.c b/blockdev.c index c00c69d..3832118 100644 --- a/blockdev.c +++ b/blockdev.c @@ -785,8 +785,9 @@ void qmp_change_blockdev(const char *device, const char *filename, qmp_bdrv_open_encrypted(bs, filename, bdrv_flags, drv, password, errp); } -int do_change_block(Monitor *mon, const char *device, - const char *filename, const char *fmt) +void deprecated_qmp_change_blockdev(const char *device, const char *filename, + bool has_format, const char *format, + Error **errp) { BlockDriverState *bs; BlockDriver *drv = NULL; @@ -795,14 +796,14 @@ int do_change_block(Monitor *mon, const char *device, bs = bdrv_find(device); if (!bs) { - qerror_report(QERR_DEVICE_NOT_FOUND, device); - return -1; + error_set(errp, QERR_DEVICE_NOT_FOUND, device); + return; } - if (fmt) { - drv = bdrv_find_whitelisted_format(fmt); + if (has_format) { + drv = bdrv_find_whitelisted_format(format); if (!drv) { - qerror_report(QERR_INVALID_BLOCK_FORMAT, fmt); - return -1; + error_set(errp, QERR_INVALID_BLOCK_FORMAT, format); + return; } } @@ -811,17 +812,13 @@ int do_change_block(Monitor *mon, const char *device, eject_device(bs, 0, &err); if (err) { - qerror_report_err(err); - return -1; + error_propagate(errp, err); + return; } qmp_bdrv_open_encrypted(bs, filename, bdrv_flags, drv, NULL, &err); - if (err) { - qerror_report_err(err); - return -1; - } - return 0; + error_propagate(errp, err); } int do_drive_del(Monitor *mon, const QDict *qdict, QObject **ret_data) diff --git a/blockdev.h b/blockdev.h index badbf01..54b142f 100644 --- a/blockdev.h +++ b/blockdev.h @@ -12,6 +12,7 @@ #include "block.h" #include "qemu-queue.h" +#include "error.h" void blockdev_mark_auto_del(BlockDriverState *bs); void blockdev_auto_del(BlockDriverState *bs); @@ -59,8 +60,9 @@ DriveInfo *add_init_drive(const char *opts); void do_commit(Monitor *mon, const QDict *qdict); int do_block_set_passwd(Monitor *mon, const QDict *qdict, QObject **ret_data); -int do_change_block(Monitor *mon, const char *device, - const char *filename, const char *fmt); +void deprecated_qmp_change_blockdev(const char *device, const char *filename, + bool has_format, const char *format, + Error **errp); int do_drive_del(Monitor *mon, const QDict *qdict, QObject **ret_data); int do_snapshot_blkdev(Monitor *mon, const QDict *qdict, QObject **ret_data); int do_block_resize(Monitor *mon, const QDict *qdict, QObject **ret_data); diff --git a/hmp-commands.hx b/hmp-commands.hx index 2f0ffa3..700d2f1 100644 --- a/hmp-commands.hx +++ b/hmp-commands.hx @@ -108,8 +108,7 @@ ETEXI .args_type = "device:B,target:F,arg:s?", .params = "device filename [format]", .help = "change a removable medium, optional format", - .user_print = monitor_user_noop, - .mhandler.cmd_new = do_change, + .mhandler.cmd = hmp_change, }, STEXI diff --git a/hmp.c b/hmp.c index a8ae36b..e8bca20 100644 --- a/hmp.c +++ b/hmp.c @@ -50,3 +50,62 @@ void hmp_block_passwd(Monitor *mon, const QDict *qdict) error_free(err); } } + +static void cb_hmp_change_bdrv_pwd(Monitor *mon, const char *password, + void *opaque) +{ + Error *encryption_err = opaque; + Error *err = NULL; + const char *device; + + device = error_get_field(encryption_err, "device"); + + qmp_block_passwd(device, password, &err); + if (err) { + monitor_printf(mon, "invalid password\n"); + error_free(err); + } + + error_free(encryption_err); + + monitor_read_command(mon, 1); +} + +static void hmp_change_read_arg(Monitor *mon, const char *password, + void *opaque) +{ + qmp_change_vnc_password(password, NULL); + monitor_read_command(mon, 1); +} + +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"); + Error *err = NULL; + + if (strcmp(device, "vnc") == 0 && + (strcmp(target, "passwd") == 0 || + strcmp(target, "password") == 0)) { + if (arg == NULL) { + monitor_read_password(mon, hmp_change_read_arg, NULL); + return; + } + } + + qmp_change(device, target, !!arg, arg, &err); + if (error_is_type(err, QERR_DEVICE_ENCRYPTED)) { + monitor_printf(mon, "%s (%s) is encrypted.\n", + error_get_field(err, "device"), + error_get_field(err, "encrypted_filename")); + if (!monitor_get_rs(mon)) { + monitor_printf(mon, + "terminal does not support password prompting\n"); + error_free(err); + return; + } + readline_start(monitor_get_rs(mon), "Password: ", 1, + cb_hmp_change_bdrv_pwd, err); + } +} diff --git a/hmp.h b/hmp.h index 8f72ef2..9df6ccc 100644 --- a/hmp.h +++ b/hmp.h @@ -20,5 +20,6 @@ void hmp_info_name(Monitor *mon); void hmp_eject(Monitor *mon, const QDict *args); void hmp_block_passwd(Monitor *mon, const QDict *qdict); +void hmp_change(Monitor *mon, const QDict *qdict); #endif diff --git a/monitor.c b/monitor.c index 5cb36cd..9801a2d 100644 --- a/monitor.c +++ b/monitor.c @@ -1005,78 +1005,22 @@ static int do_quit(Monitor *mon, const QDict *qdict, QObject **ret_data) return 0; } -#ifdef CONFIG_VNC -static int change_vnc_password(const char *password) -{ - if (!password || !password[0]) { - if (vnc_display_disable_login(NULL)) { - qerror_report(QERR_SET_PASSWD_FAILED); - return -1; - } - return 0; - } - - if (vnc_display_password(NULL, password) < 0) { - qerror_report(QERR_SET_PASSWD_FAILED); - return -1; - } - - return 0; -} - -static void change_vnc_password_cb(Monitor *mon, const char *password, - void *opaque) +void qmp_change(const char *device, const char *target, + bool has_arg, const char *arg, Error **err) { - change_vnc_password(password); - monitor_read_command(mon, 1); -} - -static int do_change_vnc(Monitor *mon, const char *target, const char *arg) -{ - if (strcmp(target, "passwd") == 0 || - strcmp(target, "password") == 0) { - if (arg) { - char password[9]; - strncpy(password, arg, sizeof(password)); - password[sizeof(password) - 1] = '\0'; - return change_vnc_password(password); + if (strcmp(device, "vnc") == 0) { + if (strcmp(target, "passwd") == 0 || strcmp(target, "password") == 0) { + if (!has_arg || !arg[0]) { + vnc_display_disable_login(NULL); + } else { + qmp_change_vnc_password(arg, err); + } } else { - return monitor_read_password(mon, change_vnc_password_cb, NULL); + qmp_change_vnc_listen(target, err); } } else { - if (vnc_display_open(NULL, target) < 0) { - qerror_report(QERR_VNC_SERVER_FAILED, target); - return -1; - } + deprecated_qmp_change_blockdev(device, target, has_arg, arg, err); } - - return 0; -} -#else -static int do_change_vnc(Monitor *mon, const char *target, const char *arg) -{ - qerror_report(QERR_FEATURE_DISABLED, "vnc"); - return -ENODEV; -} -#endif - -/** - * do_change(): Change a removable medium, or VNC configuration - */ -static int do_change(Monitor *mon, const QDict *qdict, QObject **ret_data) -{ - 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"); - int ret; - - if (strcmp(device, "vnc") == 0) { - ret = do_change_vnc(mon, target, arg); - } else { - ret = do_change_block(mon, device, target, arg); - } - - return ret; } static int set_password(Monitor *mon, const QDict *qdict, QObject **ret_data) diff --git a/qapi-schema.json b/qapi-schema.json index 139c6e3..f108d20 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -84,6 +84,44 @@ 'data': {'device': 'str', 'password': 'str'} } ## +# @change: +# +# This command is multiple commands multiplexed together. Generally speaking, +# it should not be used in favor of the single purpose alternatives such as +# @change-vnc-listen, @change-vnc-password, and @change-blockdev. +# +# @device: This is normally the name of a block device but it may also be 'vnc'. +# when it's 'vnc', then sub command depends on @target +# +# @target: If @device is a block device, then this is the new filename. +# If @device is 'vnc', then if the value 'password' selects the vnc +# change password command. Otherwise, this specifies a new server URI +# address to listen to for VNC connections. +# +# @arg: If @device is a block device, then this is an optional format to open +# the device with. +# If @device is 'vnc' and @target is 'password', this is the new VNC +# password to set. If this argument is an empty string, then no future +# logins will be allowed. +# +# Returns: Nothing on success. +# If @device is not a valid block device, DeviceNotFound +# If @format is not a valid block format, InvalidBlockFormat +# If the new block device is encrypted, DeviceEncrypted. Note that +# if this error is returned, the device has been opened successfully +# and an additional call to @block_passwd is required to set the +# device's password. The behavior of reads and writes to the block +# device between when these calls are executed is undefined. +# +# Notes: It is strongly recommended that this interface is not used especially +# for changing block devices. +# +# Since: 0.14.0 +## +{ 'command': 'change', + 'data': {'device': 'str', 'target': 'str', '*arg': 'str'} } + +## # @set-blockdev-password: # # Alias for @block_passwd. diff --git a/qmp-commands.hx b/qmp-commands.hx index cec7135..89b8d00 100644 --- a/qmp-commands.hx +++ b/qmp-commands.hx @@ -117,8 +117,7 @@ EQMP .args_type = "device:B,target:F,arg:s?", .params = "device filename [format]", .help = "change a removable medium, optional format", - .user_print = monitor_user_noop, - .mhandler.cmd_new = do_change, + .mhandler.cmd_new = qmp_marshal_input_change, }, {