From patchwork Wed Aug 30 17:01:42 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Cody X-Patchwork-Id: 807796 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3xjCTm5zGpz9sN7 for ; Thu, 31 Aug 2017 03:41:00 +1000 (AEST) Received: from localhost ([::1]:51857 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dn6z1-00037P-Ad for incoming@patchwork.ozlabs.org; Wed, 30 Aug 2017 13:40:55 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60067) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dn6Nd-0001wo-3y for qemu-devel@nongnu.org; Wed, 30 Aug 2017 13:02:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dn6Nc-0000SM-6g for qemu-devel@nongnu.org; Wed, 30 Aug 2017 13:02:17 -0400 Received: from mx1.redhat.com ([209.132.183.28]:42802) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dn6NO-0000OI-09; Wed, 30 Aug 2017 13:02:02 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id DF3F1C0587D1; Wed, 30 Aug 2017 17:02:00 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com DF3F1C0587D1 Authentication-Results: ext-mx08.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx08.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=jcody@redhat.com Received: from localhost (ovpn-116-70.phx2.redhat.com [10.3.116.70]) by smtp.corp.redhat.com (Postfix) with ESMTPS id AB89D6951F; Wed, 30 Aug 2017 17:01:54 +0000 (UTC) From: Jeff Cody To: qemu-devel@nongnu.org Date: Wed, 30 Aug 2017 13:01:42 -0400 Message-Id: <8a9d17a953caedcb66655d945181457eccde9acd.1504112256.git.jcody@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Wed, 30 Aug 2017 17:02:01 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v2 3/3] hmp: Optionally disable live block operations in HMP monitor X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: ehabkost@redhat.com, qemu-block@nongnu.org, dgilbert@redhat.com, peterx@redhat.com, mrezanin@redhat.com, jsnow@redhat.com Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Jeffrey Cody If live block operations are disabled, disable the corresponding HMP commands. Signed-off-by: Jeff Cody --- hmp-commands-info.hx | 4 ++++ hmp-commands.hx | 12 ++++++++++++ hmp.c | 12 ++++++++++++ 3 files changed, 28 insertions(+) diff --git a/hmp-commands-info.hx b/hmp-commands-info.hx index d9df238..0967e41 100644 --- a/hmp-commands-info.hx +++ b/hmp-commands-info.hx @@ -84,6 +84,8 @@ STEXI Show block device statistics. ETEXI +#ifdef CONFIG_LIVE_BLOCK_OPS + { .name = "block-jobs", .args_type = "", @@ -98,6 +100,8 @@ STEXI Show progress of ongoing block device operations. ETEXI +#endif /* CONFIG_LIVE_BLOCK_OPS */ + { .name = "registers", .args_type = "cpustate_all:-a", diff --git a/hmp-commands.hx b/hmp-commands.hx index 1941e19..2d137a1 100644 --- a/hmp-commands.hx +++ b/hmp-commands.hx @@ -73,6 +73,8 @@ but should be used with extreme caution. Note that this command only resizes image files, it can not resize block devices like LVM volumes. ETEXI +#ifdef CONFIG_LIVE_BLOCK_OPS + { .name = "block_stream", .args_type = "device:B,speed:o?,base:s?", @@ -159,6 +161,8 @@ STEXI Resume a paused block streaming operation. ETEXI +#endif /* CONFIG_LIVE_BLOCK_OPS */ + { .name = "eject", .args_type = "force:-f,device:B", @@ -1169,6 +1173,8 @@ STEXI Enables or disables migration mode. ETEXI +#ifdef CONFIG_LIVE_BLOCK_OPS + { .name = "snapshot_blkdev", .args_type = "reuse:-n,device:B,snapshot-file:s?,format:s?", @@ -1190,6 +1196,8 @@ STEXI Snapshot device, using snapshot file as target if provided ETEXI +#endif /* CONFIG_LIVE_BLOCK_OPS */ + { .name = "snapshot_blkdev_internal", .args_type = "device:B,name:s", @@ -1224,6 +1232,8 @@ STEXI Delete an internal snapshot on device if it support ETEXI +#ifdef CONFIG_LIVE_BLOCK_OPS + { .name = "drive_mirror", .args_type = "reuse:-n,full:-f,device:B,target:s,format:s?", @@ -1267,6 +1277,8 @@ STEXI Start a point-in-time copy of a block device to a specificed target. ETEXI +#endif /* CONFIG_LIVE_BLOCK_OPS */ + { .name = "drive_add", .args_type = "node:-n,pci_addr:s,opts:s", diff --git a/hmp.c b/hmp.c index fd80dce..ab985c6 100644 --- a/hmp.c +++ b/hmp.c @@ -951,6 +951,8 @@ void hmp_info_pci(Monitor *mon, const QDict *qdict) qapi_free_PciInfoList(info_list); } +#ifdef CONFIG_LIVE_BLOCK_OPS + void hmp_info_block_jobs(Monitor *mon, const QDict *qdict) { BlockJobInfoList *list; @@ -989,6 +991,8 @@ void hmp_info_block_jobs(Monitor *mon, const QDict *qdict) qapi_free_BlockJobInfoList(list); } +#endif /* CONFIG_LIVE_BLOCK_OPS */ + void hmp_info_tpm(Monitor *mon, const QDict *qdict) { TPMInfoList *info_list, *info; @@ -1197,6 +1201,8 @@ void hmp_block_resize(Monitor *mon, const QDict *qdict) hmp_handle_error(mon, &err); } +#ifdef CONFIG_LIVE_BLOCK_OPS + void hmp_drive_mirror(Monitor *mon, const QDict *qdict) { const char *filename = qdict_get_str(qdict, "target"); @@ -1280,6 +1286,8 @@ void hmp_snapshot_blkdev(Monitor *mon, const QDict *qdict) hmp_handle_error(mon, &err); } +#endif /* CONFIG_LIVE_BLOCK_OPS */ + void hmp_snapshot_blkdev_internal(Monitor *mon, const QDict *qdict) { const char *device = qdict_get_str(qdict, "device"); @@ -1776,6 +1784,8 @@ void hmp_block_set_io_throttle(Monitor *mon, const QDict *qdict) hmp_handle_error(mon, &err); } +#ifdef CONFIG_LIVE_BLOCK_OPS + void hmp_block_stream(Monitor *mon, const QDict *qdict) { Error *error = NULL; @@ -1842,6 +1852,8 @@ void hmp_block_job_complete(Monitor *mon, const QDict *qdict) hmp_handle_error(mon, &error); } +#endif /* CONFIG_LIVE_BLOCK_OPS */ + typedef struct HMPMigrationStatus { QEMUTimer *timer;