From patchwork Wed Apr 27 13:27:33 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Hajnoczi X-Patchwork-Id: 93046 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 ACDD21007D8 for ; Wed, 27 Apr 2011 23:29:41 +1000 (EST) Received: from localhost ([::1]:46444 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QF4oE-0008RE-QE for incoming@patchwork.ozlabs.org; Wed, 27 Apr 2011 09:29:38 -0400 Received: from eggs.gnu.org ([140.186.70.92]:58670) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QF4mU-00068y-MR for qemu-devel@nongnu.org; Wed, 27 Apr 2011 09:27:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QF4mP-0005bX-F8 for qemu-devel@nongnu.org; Wed, 27 Apr 2011 09:27:50 -0400 Received: from mtagate7.uk.ibm.com ([194.196.100.167]:52416) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QF4mP-0005bI-7h for qemu-devel@nongnu.org; Wed, 27 Apr 2011 09:27:45 -0400 Received: from d06nrmr1307.portsmouth.uk.ibm.com (d06nrmr1307.portsmouth.uk.ibm.com [9.149.38.129]) by mtagate7.uk.ibm.com (8.13.1/8.13.1) with ESMTP id p3RDRikE012457 for ; Wed, 27 Apr 2011 13:27:44 GMT Received: from d06av04.portsmouth.uk.ibm.com (d06av04.portsmouth.uk.ibm.com [9.149.37.216]) by d06nrmr1307.portsmouth.uk.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id p3RDSmmW1810466 for ; Wed, 27 Apr 2011 14:28:48 +0100 Received: from d06av04.portsmouth.uk.ibm.com (loopback [127.0.0.1]) by d06av04.portsmouth.uk.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id p3RDRhFM031433 for ; Wed, 27 Apr 2011 07:27:44 -0600 Received: from stefanha-thinkpad.ibm.com (sig-9-145-204-45.de.ibm.com [9.145.204.45]) by d06av04.portsmouth.uk.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id p3RDRcjb031186; Wed, 27 Apr 2011 07:27:43 -0600 From: Stefan Hajnoczi To: Date: Wed, 27 Apr 2011 14:27:33 +0100 Message-Id: <1303910855-28999-7-git-send-email-stefanha@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.4.4 In-Reply-To: <1303910855-28999-1-git-send-email-stefanha@linux.vnet.ibm.com> References: <1303910855-28999-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.167 Cc: Kevin Wolf , Anthony Liguori , Stefan Hajnoczi Subject: [Qemu-devel] [PATCH 6/8] blockdev: Allow image files to auto-enable streaming 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 Image files that having streaming enabled will automatically begin streaming when opened. Signed-off-by: Stefan Hajnoczi --- block.c | 5 +++++ block.h | 1 + block_int.h | 1 + blockdev.c | 9 +++++++++ 4 files changed, 16 insertions(+), 0 deletions(-) diff --git a/block.c b/block.c index 5e3476c..68a97a3 100644 --- a/block.c +++ b/block.c @@ -1584,6 +1584,11 @@ const char *bdrv_get_device_name(BlockDriverState *bs) return bs->device_name; } +int bdrv_stream_enabled(BlockDriverState *bs) +{ + return bs->stream; +} + int bdrv_flush(BlockDriverState *bs) { if (bs->open_flags & BDRV_O_NO_FLUSH) { diff --git a/block.h b/block.h index fad828a..3357c50 100644 --- a/block.h +++ b/block.h @@ -189,6 +189,7 @@ int bdrv_is_removable(BlockDriverState *bs); int bdrv_is_read_only(BlockDriverState *bs); int bdrv_is_sg(BlockDriverState *bs); int bdrv_enable_write_cache(BlockDriverState *bs); +int bdrv_stream_enabled(BlockDriverState *bs); int bdrv_is_inserted(BlockDriverState *bs); int bdrv_media_changed(BlockDriverState *bs); int bdrv_is_locked(BlockDriverState *bs); diff --git a/block_int.h b/block_int.h index 0c125d0..d0fe96c 100644 --- a/block_int.h +++ b/block_int.h @@ -155,6 +155,7 @@ struct BlockDriverState { int encrypted; /* if true, the media is encrypted */ int valid_key; /* if true, a valid encryption key has been set */ int sg; /* if true, the device is a /dev/sg* */ + int stream; /* if true, stream from the backing file */ /* event callback when inserting/removing */ void (*change_cb)(void *opaque, int reason); void *change_opaque; diff --git a/blockdev.c b/blockdev.c index 99c0726..5d6cb2b 100644 --- a/blockdev.c +++ b/blockdev.c @@ -678,6 +678,15 @@ DriveInfo *drive_init(QemuOpts *opts, int default_to_scsi) goto err; } + if (bdrv_stream_enabled(dinfo->bdrv)) { + const char *device_name = bdrv_get_device_name(dinfo->bdrv); + + if (!stream_start(device_name, 0, 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;