43a80c77f2
Clean up v2.1.0 update and libcacard split-off OBS-URL: https://build.opensuse.org/request/show/245649 OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=225
102 lines
3.5 KiB
Diff
102 lines
3.5 KiB
Diff
From b990b06fedf9acb38da0e8a5921b203e1572859e Mon Sep 17 00:00:00 2001
|
|
From: Ulrich Hecht <uli@suse.de>
|
|
Date: Tue, 14 Apr 2009 16:37:42 +0200
|
|
Subject: [PATCH] block/vmdk: Support creation of SCSI VMDK images in qemu-img
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
Signed-off-by: Ulrich Hecht <uli@suse.de>
|
|
[AF: Changed BLOCK_FLAG_SCSI from 8 to 16 for v1.2]
|
|
[AF: Rebased onto upstream VMDK SCSI support]
|
|
[AF: Rebased onto skipping of image creation in v1.7]
|
|
[AF: Simplified in preparation for v1.7.1/v2.0]
|
|
[AF: Rebased onto QemuOpts conversion for v2.1]
|
|
Signed-off-by: Andreas Färber <afaerber@suse.de>
|
|
---
|
|
block.c | 3 +++
|
|
block/vmdk.c | 10 +++++++++-
|
|
include/block/block_int.h | 2 ++
|
|
qemu-img.c | 7 +++++++
|
|
4 files changed, 21 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/block.c b/block.c
|
|
index 8cf519b..0e23958 100644
|
|
--- a/block.c
|
|
+++ b/block.c
|
|
@@ -5624,6 +5624,9 @@ void bdrv_img_create(const char *filename, const char *fmt,
|
|
if (!quiet) {
|
|
printf("Formatting '%s', fmt=%s ", filename, fmt);
|
|
qemu_opts_print(opts);
|
|
+ if (qemu_opt_get_bool(opts, BLOCK_OPT_SCSI, false)) {
|
|
+ printf(", SCSI");
|
|
+ }
|
|
puts("");
|
|
}
|
|
|
|
diff --git a/block/vmdk.c b/block/vmdk.c
|
|
index 0517bba..3eeb7bd 100644
|
|
--- a/block/vmdk.c
|
|
+++ b/block/vmdk.c
|
|
@@ -1752,9 +1752,12 @@ static int vmdk_create(const char *filename, QemuOpts *opts, Error **errp)
|
|
if (qemu_opt_get_bool_del(opts, BLOCK_OPT_ZEROED_GRAIN, false)) {
|
|
zeroed_grain = true;
|
|
}
|
|
+ if (qemu_opt_get_bool_del(opts, BLOCK_OPT_SCSI, false)) {
|
|
+ flags |= BLOCK_FLAG_SCSI;
|
|
+ }
|
|
|
|
if (!adapter_type) {
|
|
- adapter_type = g_strdup("ide");
|
|
+ adapter_type = g_strdup(flags & BLOCK_FLAG_SCSI ? "lsilogic" : "ide");
|
|
} else if (strcmp(adapter_type, "ide") &&
|
|
strcmp(adapter_type, "buslogic") &&
|
|
strcmp(adapter_type, "lsilogic") &&
|
|
@@ -2151,6 +2154,11 @@ static QemuOptsList vmdk_create_opts = {
|
|
.help = "Enable efficient zero writes "
|
|
"using the zeroed-grain GTE feature"
|
|
},
|
|
+ {
|
|
+ .name = BLOCK_OPT_SCSI,
|
|
+ .type = QEMU_OPT_BOOL,
|
|
+ .help = "SCSI image"
|
|
+ },
|
|
{ /* end of list */ }
|
|
}
|
|
};
|
|
diff --git a/include/block/block_int.h b/include/block/block_int.h
|
|
index 7b541a0..a4e1a97 100644
|
|
--- a/include/block/block_int.h
|
|
+++ b/include/block/block_int.h
|
|
@@ -40,10 +40,12 @@
|
|
#define BLOCK_FLAG_ENCRYPT 1
|
|
#define BLOCK_FLAG_COMPAT6 4
|
|
#define BLOCK_FLAG_LAZY_REFCOUNTS 8
|
|
+#define BLOCK_FLAG_SCSI 16
|
|
|
|
#define BLOCK_OPT_SIZE "size"
|
|
#define BLOCK_OPT_ENCRYPT "encryption"
|
|
#define BLOCK_OPT_COMPAT6 "compat6"
|
|
+#define BLOCK_OPT_SCSI "scsi"
|
|
#define BLOCK_OPT_BACKING_FILE "backing_file"
|
|
#define BLOCK_OPT_BACKING_FMT "backing_fmt"
|
|
#define BLOCK_OPT_CLUSTER_SIZE "cluster_size"
|
|
diff --git a/qemu-img.c b/qemu-img.c
|
|
index d4518e7..629cd80 100644
|
|
--- a/qemu-img.c
|
|
+++ b/qemu-img.c
|
|
@@ -1430,6 +1430,13 @@ static int img_convert(int argc, char **argv)
|
|
}
|
|
}
|
|
|
|
+ if (qemu_opt_get_bool(opts, BLOCK_OPT_SCSI, false)
|
|
+ && strcmp(drv->format_name, "vmdk")) {
|
|
+ error_report("SCSI devices not supported for this file format");
|
|
+ ret = -1;
|
|
+ goto out;
|
|
+ }
|
|
+
|
|
if (!skip_create) {
|
|
/* Create the new image */
|
|
ret = bdrv_create(drv, out_filename, opts, &local_err);
|