From patchwork Mon Nov 18 12:25:23 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= X-Patchwork-Id: 292057 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 8ACC52C00C7 for ; Mon, 18 Nov 2013 23:31:09 +1100 (EST) Received: from localhost ([::1]:42707 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ViNyt-0001RT-0G for incoming@patchwork.ozlabs.org; Mon, 18 Nov 2013 07:31:07 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51031) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ViNvg-0006NK-Fd for qemu-devel@nongnu.org; Mon, 18 Nov 2013 07:27:56 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ViNvY-0006ui-2u for qemu-devel@nongnu.org; Mon, 18 Nov 2013 07:27:48 -0500 Received: from mail-wg0-x22c.google.com ([2a00:1450:400c:c00::22c]:56171) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ViNvX-0006uc-SX for qemu-devel@nongnu.org; Mon, 18 Nov 2013 07:27:40 -0500 Received: by mail-wg0-f44.google.com with SMTP id k14so6118034wgh.35 for ; Mon, 18 Nov 2013 04:27:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-type:content-transfer-encoding; bh=kHyYyFqStAXUXpNMCozxSkZnRziJLABZk0Ty8Sl8LZw=; b=FYYpn06H3PvgasxAgCDzfI45ENW4AGyBeJUIh0VXbn82fvGejz78Pya8FDFnbym4w2 mBs/Uz7dB5YPdYuQCYgB4G5VDPTrjEnkDjmH16vSsc3ZFAauC9SzNazR7QgBQl6nHudN 1NdQ33NjFjKQhWfr0n7bg5vrV6E8sHw1G3SAEEC1coaHly+HktyTiZyMRi0LVQqY8jbi e1OhlmJeD4jWZYxsYEatLibeegs6u417uVRjwYR+XcbEFog8dSKztc9t4V3cv3Rw6Aon z6H1c1HUpA8e0/s8qfvxjWQkMsmxM47CiUJ4oDGc4VgzbJsDHnrFCZYF/PA2Gswcz2bO ko6w== X-Received: by 10.194.21.104 with SMTP id u8mr96612wje.63.1384777659124; Mon, 18 Nov 2013 04:27:39 -0800 (PST) Received: from localhost (nat-pool-cdg-t.redhat.com. [209.132.186.20]) by mx.google.com with ESMTPSA id y20sm23702580wib.0.2013.11.18.04.27.35 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 18 Nov 2013 04:27:38 -0800 (PST) From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= To: qemu-devel@nongnu.org Date: Mon, 18 Nov 2013 13:25:23 +0100 Message-Id: <1384777531-14635-14-git-send-email-marcandre.lureau@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1384777531-14635-1-git-send-email-marcandre.lureau@gmail.com> References: <1384777531-14635-1-git-send-email-marcandre.lureau@gmail.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:400c:c00::22c Cc: kwolf@redhat.com, jcody@redhat.com, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , kraxel@redhat.com, spice-devel@freedesktop.org, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Subject: [Qemu-devel] [PATCH 13/21] blockdev: add qmp_change_blockdev_int() 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 From: Marc-André Lureau Allow to pass additional arguments, such as options and opaque Signed-off-by: Marc-André Lureau --- blockdev.c | 24 +++++++++++++++++++----- include/sysemu/blockdev.h | 3 +++ 2 files changed, 22 insertions(+), 5 deletions(-) diff --git a/blockdev.c b/blockdev.c index b8db544..f2c3c4e 100644 --- a/blockdev.c +++ b/blockdev.c @@ -1498,12 +1498,13 @@ void qmp_block_passwd(const char *device, const char *password, Error **errp) static void qmp_bdrv_open_encrypted(BlockDriverState *bs, const char *filename, int bdrv_flags, BlockDriver *drv, - const char *password, Error **errp) + const char *password, QDict *options, + Error **errp) { Error *local_err = NULL; int ret; - ret = bdrv_open(bs, filename, NULL, bdrv_flags, drv, &local_err); + ret = bdrv_open(bs, filename, options, bdrv_flags, drv, &local_err); if (ret < 0) { error_propagate(errp, local_err); return; @@ -1523,8 +1524,9 @@ static void qmp_bdrv_open_encrypted(BlockDriverState *bs, const char *filename, } } -void qmp_change_blockdev(const char *device, const char *filename, - const char *format, Error **errp) +void qmp_change_blockdev_int(const char *device, const char *filename, + const char *format, QDict *options, void *opaque, + Error **errp) { BlockDriverState *bs; BlockDriver *drv = NULL; @@ -1554,7 +1556,19 @@ void qmp_change_blockdev(const char *device, const char *filename, bdrv_flags = bdrv_is_read_only(bs) ? 0 : BDRV_O_RDWR; bdrv_flags |= bdrv_is_snapshot(bs) ? BDRV_O_SNAPSHOT : 0; - qmp_bdrv_open_encrypted(bs, filename, bdrv_flags, drv, NULL, errp); + if (bs->opaque) { + error_set(errp, QERR_INVALID_PARAMETER, device); + return; + } + bs->opaque = opaque; + + qmp_bdrv_open_encrypted(bs, filename, bdrv_flags, drv, NULL, options, errp); +} + +void qmp_change_blockdev(const char *device, const char *filename, + const char *format, Error **errp) +{ + qmp_change_blockdev_int(device, filename, format, NULL, NULL, errp); } /* throttling disk I/O limits */ diff --git a/include/sysemu/blockdev.h b/include/sysemu/blockdev.h index 134712b..5ce4997 100644 --- a/include/sysemu/blockdev.h +++ b/include/sysemu/blockdev.h @@ -65,6 +65,9 @@ DriveInfo *add_init_drive(const char *opts); void qmp_change_blockdev(const char *device, const char *filename, const char *format, Error **errp); +void qmp_change_blockdev_int(const char *device, const char *filename, + const char *format, QDict *options, void *opaque, + Error **errp); void do_commit(Monitor *mon, const QDict *qdict); int do_drive_del(Monitor *mon, const QDict *qdict, QObject **ret_data); #endif