summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Hecht <uli@suse.de>2009-04-14 14:37:42 (GMT)
committerYury Usishchev <y.usishchev@samsung.com>2014-12-10 10:47:57 (GMT)
commite42dffc94cb2b1d9d53753f45e12bea1d191ed97 (patch)
treecb02926e46c7585bf9c9b916b8c3502f3b838e21
parent9a55b1111955914bad2b347190bd82c2535836cc (diff)
downloadqemu-e42dffc94cb2b1d9d53753f45e12bea1d191ed97.zip
qemu-e42dffc94cb2b1d9d53753f45e12bea1d191ed97.tar.gz
qemu-e42dffc94cb2b1d9d53753f45e12bea1d191ed97.tar.bz2
block/vmdk: Support creation of SCSI VMDK images in qemu-img
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>
-rw-r--r--block.c3
-rw-r--r--block/vmdk.c10
-rw-r--r--include/block/block_int.h2
-rw-r--r--qemu-img.c7
4 files changed, 21 insertions, 1 deletions
diff --git a/block.c b/block.c
index a612594..74af007 100644
--- a/block.c
+++ b/block.c
@@ -5630,6 +5630,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 2cbfd3e..caefe19 100644
--- a/block/vmdk.c
+++ b/block/vmdk.c
@@ -1818,9 +1818,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") &&
@@ -2223,6 +2226,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 a1c17b9..9d03953 100644
--- a/include/block/block_int.h
+++ b/include/block/block_int.h
@@ -41,10 +41,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 a42335c..21c3bae 100644
--- a/qemu-img.c
+++ b/qemu-img.c
@@ -1583,6 +1583,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);