[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 11/13] block: add -drive stream=on|off
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-devel] [PATCH 11/13] block: add -drive stream=on|off |
Date: |
Tue, 14 Jun 2011 19:18:29 +0100 |
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 <address@hidden>
---
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 address@hidden
@var{copy-on-read} is "on" or "off" and enables whether to copy read backing
file sectors into the image file.
address@hidden address@hidden
address@hidden 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
--
1.7.5.3
- [Qemu-devel] [PATCH 00/13] QED image streaming, Stefan Hajnoczi, 2011/06/14
- [Qemu-devel] [PATCH 06/13] qed: add support for copy-on-read, Stefan Hajnoczi, 2011/06/14
- [Qemu-devel] [PATCH 07/13] qed: avoid deadlock on emulated synchronous I/O, Stefan Hajnoczi, 2011/06/14
- [Qemu-devel] [PATCH 09/13] block: add bdrv_aio_copy_backing(), Stefan Hajnoczi, 2011/06/14
- [Qemu-devel] [PATCH 04/13] qed: extract qed_start_allocating_write(), Stefan Hajnoczi, 2011/06/14
- [Qemu-devel] [PATCH 13/13] trace: trace bdrv_aio_readv/writev error paths, Stefan Hajnoczi, 2011/06/14
- [Qemu-devel] [PATCH 05/13] qed: make qed_aio_write_alloc() reusable, Stefan Hajnoczi, 2011/06/14
- [Qemu-devel] [PATCH 12/13] qed: intelligent streaming implementation, Stefan Hajnoczi, 2011/06/14
- [Qemu-devel] [PATCH 08/13] qerror: add qerror_from_args() to create qerror objects, Stefan Hajnoczi, 2011/06/14
- [Qemu-devel] [PATCH 10/13] qmp: add QMP support for stream commands, Stefan Hajnoczi, 2011/06/14
- [Qemu-devel] [PATCH 11/13] block: add -drive stream=on|off,
Stefan Hajnoczi <=
- [Qemu-devel] [PATCH 03/13] qed: replace is_write with flags field, Stefan Hajnoczi, 2011/06/14
- [Qemu-devel] [PATCH 01/13] qemu-config: }, { -> }, { to please checkpatch.pl, Stefan Hajnoczi, 2011/06/14
- [Qemu-devel] [PATCH 02/13] block: add -drive copy-on-read=on|off, Stefan Hajnoczi, 2011/06/14
- Re: [Qemu-devel] [PATCH 00/13] QED image streaming, Philipp Hahn, 2011/06/15
- [Qemu-devel] Image streaming and live block copy (was: [PATCH 00/13] QED image streaming), Kevin Wolf, 2011/06/16