From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34119) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WYajy-0003kY-7W for qemu-devel@nongnu.org; Fri, 11 Apr 2014 08:39:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WYajr-00012G-FN for qemu-devel@nongnu.org; Fri, 11 Apr 2014 08:39:30 -0400 Received: from mx1.redhat.com ([209.132.183.28]:11634) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WYajr-000127-83 for qemu-devel@nongnu.org; Fri, 11 Apr 2014 08:39:23 -0400 From: Kevin Wolf Date: Fri, 11 Apr 2014 14:39:12 +0200 Message-Id: <1397219952-26807-5-git-send-email-kwolf@redhat.com> In-Reply-To: <1397219952-26807-1-git-send-email-kwolf@redhat.com> References: <1397219952-26807-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PULL 4/4] block-commit: speed is an optional parameter List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, peter.maydell@linaro.org From: Max Reitz As speed is an optional parameter for the QMP block-commit command, it should be set to 0 if not given (as it is undefined if has_speed is false), that is, the speed should not be limited. Cc: qemu-stable@nongnu.org Signed-off-by: Max Reitz Reviewed-by: Eric Blake Reviewed-by: Fam Zheng Signed-off-by: Kevin Wolf --- blockdev.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/blockdev.c b/blockdev.c index c3422a1..5dd01ea 100644 --- a/blockdev.c +++ b/blockdev.c @@ -1876,6 +1876,10 @@ void qmp_block_commit(const char *device, */ BlockdevOnError on_error = BLOCKDEV_ON_ERROR_REPORT; + if (!has_speed) { + speed = 0; + } + /* drain all i/o before commits */ bdrv_drain_all(); -- 1.8.3.1