Attachment 304108 Details for Bug 444583 – Proposed patch for qemu from Chris Wright and Aurelien Jarno

[patch] Proposed patch for qemu from Chris Wright and Aurelien Jarno

qemu-block-format-arg.diff (text/plain), 2.95 KB, created by Tomas Hoger on 2008-04-29 11:35:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tomas Hoger

Created: 2008-04-29 11:35:03 UTC

Size: 2.95 KB

patch

obsolete

>From: Chris Wright <chrisw@redhat.com>
>Subject: [PATCH] add format= to drive options
>
>A guest with a raw format disk can write any format header to that device.
>A subsequent restart of the guest will cause qemu to interpret the format
>header and could allow the guest read access to any host file.  Add a
>format= drive option to allow host to specify, e.g. format=raw, to give
>qemu a hint to choose a specific block format driver.  Originially noted
>by Avi Kivity <avi@qumranet.com>.
>
>Signed-off-by: Chris Wright <chrisw@redhat.com>
>[Aurelien Jarno: port to SVN tip for QEMU)
>---
> qemu-doc.texi |    4 ++++
> vl.c          |   13 +++++++++++--
> 2 files changed, 15 insertions(+), 2 deletions(-)
>
>diff --git a/qemu-doc.texi b/qemu-doc.texi
>index 68630c0..6a7c421 100644
>--- a/qemu-doc.texi
>+++ b/qemu-doc.texi
>@@ -261,6 +261,10 @@ These options have the same definition as they have in @option{-hdachs}.
> @var{snapshot} is "on" or "off" and allows to enable snapshot for given drive (see @option{-snapshot}).
> @item cache=@var{cache}
> @var{cache} is "on" or "off" and allows to disable host cache to access data.
>+@item format=@var{format}
>+Specify which disk @var{format} will be used rather than detecting
>+the format.  Can be used to specifiy format=raw to avoid interpreting
>+an untrusted format header.
> @end table
> 
> Instead of @option{-cdrom} you can use:
>diff --git a/vl.c b/vl.c
>index 78486cf..684ed70 100644
>--- a/vl.c
>+++ b/vl.c
>@@ -4963,6 +4963,7 @@ static int drive_init(struct drive_opt *arg, int snapshot,
>     int bus_id, unit_id;
>     int cyls, heads, secs, translation;
>     BlockDriverState *bdrv;
>+    BlockDriver *drv = NULL;
>     int max_devs;
>     int index;
>     int cache;
>@@ -4970,7 +4971,7 @@ static int drive_init(struct drive_opt *arg, int snapshot,
>     char *str = arg->opt;
>     char *params[] = { "bus", "unit", "if", "index", "cyls", "heads",
>                        "secs", "trans", "media", "snapshot", "file",
>-                       "cache", NULL };
>+                       "cache", "format", NULL };
> 
>     if (check_params(buf, sizeof(buf), params, str) < 0) {
>          fprintf(stderr, "qemu: unknown parameter '%s' in '%s'\n",
>@@ -5138,6 +5139,14 @@ static int drive_init(struct drive_opt *arg, int snapshot,
>         }
>     }
> 
>+    if (get_param_value(buf, sizeof(buf), "format", str)) {
>+	drv = bdrv_find_format(buf);
>+	if (!drv) {
>+	    fprintf(stderr, "qemu: '%s' invalid format\n", buf);
>+	    return -1;
>+	}
>+    }
>+
>     if (arg->file == NULL)
>         get_param_value(file, sizeof(file), "file", str);
>     else
>@@ -5240,7 +5249,7 @@ static int drive_init(struct drive_opt *arg, int snapshot,
>         bdrv_flags |= BDRV_O_SNAPSHOT;
>     if (!cache)
>         bdrv_flags |= BDRV_O_DIRECT;
>-    if (bdrv_open(bdrv, file, bdrv_flags) < 0 || qemu_key_check(bdrv, file)) {
>+    if (bdrv_open2(bdrv, file, bdrv_flags, drv) < 0 || qemu_key_check(bdrv, file)) {
>         fprintf(stderr, "qemu: could not open disk image %s\n",
>                         file);
>         return -1;

Actions: View | Diff

Attachments on bug 444583: 304107 | 304108