From patchwork Thu Jul 18 18:47:31 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Main X-Patchwork-Id: 260117 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 1A2972C0089 for ; Fri, 19 Jul 2013 04:47:58 +1000 (EST) Received: from localhost ([::1]:55930 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UztF5-0005Xz-Sy for incoming@patchwork.ozlabs.org; Thu, 18 Jul 2013 14:47:55 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37447) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UztEo-0005XG-VM for qemu-devel@nongnu.org; Thu, 18 Jul 2013 14:47:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UztEm-0001oi-CT for qemu-devel@nongnu.org; Thu, 18 Jul 2013 14:47:38 -0400 Received: from mx1.redhat.com ([209.132.183.28]:31193) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UztEm-0001ob-5a for qemu-devel@nongnu.org; Thu, 18 Jul 2013 14:47:36 -0400 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r6IIlZKO021095 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 18 Jul 2013 14:47:35 -0400 Received: from arnold.mains.com (ovpn-113-150.phx2.redhat.com [10.3.113.150]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id r6IIlYUd014517; Thu, 18 Jul 2013 14:47:34 -0400 From: Ian Main To: qemu-devel@nongnu.org Date: Thu, 18 Jul 2013 11:47:31 -0700 Message-Id: <1374173251-19449-1-git-send-email-imain@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Ian Main Subject: [Qemu-devel] [PATCH V4 4/4] Change default to qcow2 for sync mode none. 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 qcow2 supports backing files so it makes sense to default to qcow2 for MIRROR_SYNC_MODE_NONE so that we can use the source as a backing drive and export it via nbd. Defaulting FULL and TOP to SYNC_MODE_NONE breaks tests but that could be fixed if we wanted it. Signed-off-by: Ian Main --- blockdev.c | 5 ++++- qapi-schema.json | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/blockdev.c b/blockdev.c index 000dea6..a56ba08 100644 --- a/blockdev.c +++ b/blockdev.c @@ -1462,7 +1462,10 @@ void qmp_drive_backup(const char *device, const char *target, } if (!has_format) { - format = mode == NEW_IMAGE_MODE_EXISTING ? NULL : bs->drv->format_name; + format = NULL; + if (mode != NEW_IMAGE_MODE_EXISTING) { + format = sync == MIRROR_SYNC_MODE_NONE ? "qcow2" : bs->drv->format_name; + } } if (format) { drv = bdrv_find_format(format); diff --git a/qapi-schema.json b/qapi-schema.json index b3f6c2a..e2c86f9 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -1806,6 +1806,7 @@ # # @format: #optional the format of the new destination, default is to # probe if @mode is 'existing', else the format of the source +# drive. If @sync is 'none' then the default is qcow2. # # @sync: what parts of the disk image should be copied to the destination # (all the disk, only the sectors allocated in the topmost image, or