From patchwork Tue Jun 14 18:18:29 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Hajnoczi X-Patchwork-Id: 100422 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 19C39B6F92 for ; Wed, 15 Jun 2011 05:06:01 +1000 (EST) Received: from localhost ([::1]:48076 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QWYw2-0000Dt-0n for incoming@patchwork.ozlabs.org; Tue, 14 Jun 2011 15:05:58 -0400 Received: from eggs.gnu.org ([140.186.70.92]:38379) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QWYCY-0005zF-My for qemu-devel@nongnu.org; Tue, 14 Jun 2011 14:19:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QWYCR-00069b-FG for qemu-devel@nongnu.org; Tue, 14 Jun 2011 14:18:58 -0400 Received: from mtagate5.uk.ibm.com ([194.196.100.165]:57871) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QWYCQ-00068f-P4 for qemu-devel@nongnu.org; Tue, 14 Jun 2011 14:18:51 -0400 Received: from d06nrmr1707.portsmouth.uk.ibm.com (d06nrmr1707.portsmouth.uk.ibm.com [9.149.39.225]) by mtagate5.uk.ibm.com (8.13.1/8.13.1) with ESMTP id p5EIInbk005801 for ; Tue, 14 Jun 2011 18:18:49 GMT Received: from d06av12.portsmouth.uk.ibm.com (d06av12.portsmouth.uk.ibm.com [9.149.37.247]) by d06nrmr1707.portsmouth.uk.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id p5EIInh51695992 for ; Tue, 14 Jun 2011 19:18:49 +0100 Received: from d06av12.portsmouth.uk.ibm.com (loopback [127.0.0.1]) by d06av12.portsmouth.uk.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id p5EIImrV015253 for ; Tue, 14 Jun 2011 12:18:48 -0600 Received: from stefanha-thinkpad.ibm.com (sig-9-145-202-176.de.ibm.com [9.145.202.176]) by d06av12.portsmouth.uk.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id p5EIIdDs014627; Tue, 14 Jun 2011 12:18:48 -0600 From: Stefan Hajnoczi To: Date: Tue, 14 Jun 2011 19:18:29 +0100 Message-Id: <1308075511-4745-12-git-send-email-stefanha@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.5.3 In-Reply-To: <1308075511-4745-1-git-send-email-stefanha@linux.vnet.ibm.com> References: <1308075511-4745-1-git-send-email-stefanha@linux.vnet.ibm.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) X-Received-From: 194.196.100.165 Cc: Kevin Wolf , Anthony Liguori , Stefan Hajnoczi , Adam Litke Subject: [Qemu-devel] [PATCH 11/13] block: add -drive stream=on|off 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 This patch adds the -drive stream=on|off command-line option: stream=on|off stream is "on" or "off" and enables background copying of backing file contents into the image file until the backing file is no longer needed. Signed-off-by: Stefan Hajnoczi --- blockdev.c | 12 +++++++++++- hmp-commands.hx | 3 ++- qemu-config.c | 3 +++ qemu-options.hx | 5 ++++- 4 files changed, 20 insertions(+), 3 deletions(-) diff --git a/blockdev.c b/blockdev.c index ffbc45e..9b2fbb5 100644 --- a/blockdev.c +++ b/blockdev.c @@ -429,7 +429,7 @@ DriveInfo *drive_init(QemuOpts *opts, int default_to_scsi) const char *devaddr; DriveInfo *dinfo; int snapshot = 0; - int copy_on_read; + int copy_on_read, stream; int ret; translation = BIOS_ATA_TRANSLATION_AUTO; @@ -455,6 +455,7 @@ DriveInfo *drive_init(QemuOpts *opts, int default_to_scsi) snapshot = qemu_opt_get_bool(opts, "snapshot", 0); ro = qemu_opt_get_bool(opts, "readonly", 0); copy_on_read = qemu_opt_get_bool(opts, "copy-on-read", 0); + stream = qemu_opt_get_bool(opts, "stream", 0); file = qemu_opt_get(opts, "file"); serial = qemu_opt_get(opts, "serial"); @@ -738,6 +739,15 @@ DriveInfo *drive_init(QemuOpts *opts, int default_to_scsi) goto err; } + if (stream) { + const char *device_name = bdrv_get_device_name(dinfo->bdrv); + + if (!stream_start(device_name, false, NULL, NULL)) { + fprintf(stderr, "qemu: warning: stream_start failed for '%s'\n", + device_name); + } + } + if (bdrv_key_required(dinfo->bdrv)) autostart = 0; return dinfo; diff --git a/hmp-commands.hx b/hmp-commands.hx index e78a1f8..46e385a 100644 --- a/hmp-commands.hx +++ b/hmp-commands.hx @@ -882,7 +882,8 @@ ETEXI "[,unit=m][,media=d][,index=i]\n" "[,cyls=c,heads=h,secs=s[,trans=t]]\n" "[,snapshot=on|off][,cache=on|off]\n" - "[,readonly=on|off][,copy-on-read=on|off]", + "[,readonly=on|off][,copy-on-read=on|off]" + "[,stream=on|off]", .help = "add drive to PCI storage controller", .mhandler.cmd = drive_hot_add, }, diff --git a/qemu-config.c b/qemu-config.c index dafacb7..a14d3f0 100644 --- a/qemu-config.c +++ b/qemu-config.c @@ -81,6 +81,9 @@ static QemuOptsList qemu_drive_opts = { }, { .name = "copy-on-read", .type = QEMU_OPT_BOOL, + }, { + .name = "stream", + .type = QEMU_OPT_BOOL, }, { /* end of list */ } }, diff --git a/qemu-options.hx b/qemu-options.hx index 97abcd9..b1d65d4 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -120,7 +120,7 @@ DEF("drive", HAS_ARG, QEMU_OPTION_drive, " [,cyls=c,heads=h,secs=s[,trans=t]][,snapshot=on|off]\n" " [,cache=writethrough|writeback|none|unsafe][,format=f]\n" " [,serial=s][,addr=A][,id=name][,aio=threads|native]\n" - " [,readonly=on|off][,copy-on-read=on|off]\n" + " [,readonly=on|off][,copy-on-read=on|off][,stream=on|off]\n" " use 'file' as a drive image\n", QEMU_ARCH_ALL) STEXI @item -drive @var{option}[,@var{option}[,@var{option}[,...]]] @@ -163,6 +163,9 @@ Specify the controller's PCI address (if=virtio only). @item copy-on-read=@var{copy-on-read} @var{copy-on-read} is "on" or "off" and enables whether to copy read backing file sectors into the image file. +@item stream=@var{stream} +@var{stream} is "on" or "off" and enables background copying of backing file +contents into the image file until the backing file is no longer needed. @end table By default, writethrough caching is used for all block device. This means that