02ab0e5e49
Update qemu to v1.1.0-rc2 for 12.2. OBS-URL: https://build.opensuse.org/request/show/121369 OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=68
129 lines
4.5 KiB
Diff
129 lines
4.5 KiB
Diff
From cb02c392f4b137aab475f9d7e1f00a52c5fc2540 Mon Sep 17 00:00:00 2001
|
|
From: Ulrich Hecht <uli@suse.de>
|
|
Date: Tue, 14 Apr 2009 16:37:42 +0200
|
|
Subject: [PATCH] qemu-img-vmdk-scsi
|
|
|
|
Support creation of SCSI VMDK images in qemu-img.
|
|
|
|
Signed-off-by: Ulrich Hecht <uli@suse.de>
|
|
---
|
|
block.c | 5 ++++-
|
|
block/vmdk.c | 12 ++++++++++--
|
|
block_int.h | 2 ++
|
|
qemu-img.c | 8 +++++++-
|
|
4 files changed, 23 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/block.c b/block.c
|
|
index af2ab4f..185a9d4 100644
|
|
--- a/block.c
|
|
+++ b/block.c
|
|
@@ -4028,7 +4028,7 @@ int bdrv_img_create(const char *filename, const char *fmt,
|
|
char *options, uint64_t img_size, int flags)
|
|
{
|
|
QEMUOptionParameter *param = NULL, *create_options = NULL;
|
|
- QEMUOptionParameter *backing_fmt, *backing_file, *size;
|
|
+ QEMUOptionParameter *backing_fmt, *backing_file, *size, *scsi;
|
|
BlockDriverState *bs = NULL;
|
|
BlockDriver *drv, *proto_drv;
|
|
BlockDriver *backing_drv = NULL;
|
|
@@ -4143,6 +4143,9 @@ int bdrv_img_create(const char *filename, const char *fmt,
|
|
|
|
printf("Formatting '%s', fmt=%s ", filename, fmt);
|
|
print_option_parameters(param);
|
|
+ scsi = get_option_parameter(param, BLOCK_OPT_SCSI);
|
|
+ if (scsi && scsi->value.n)
|
|
+ printf(", SCSI");
|
|
puts("");
|
|
|
|
ret = bdrv_create(drv, filename, param);
|
|
diff --git a/block/vmdk.c b/block/vmdk.c
|
|
index 18e9b4c..c153617 100644
|
|
--- a/block/vmdk.c
|
|
+++ b/block/vmdk.c
|
|
@@ -1377,7 +1377,7 @@ static int vmdk_create(const char *filename, QEMUOptionParameter *options)
|
|
"ddb.geometry.cylinders = \"%" PRId64 "\"\n"
|
|
"ddb.geometry.heads = \"16\"\n"
|
|
"ddb.geometry.sectors = \"63\"\n"
|
|
- "ddb.adapterType = \"ide\"\n";
|
|
+ "ddb.adapterType = \"%s\"\n";
|
|
|
|
if (filename_decompose(filename, path, prefix, postfix, PATH_MAX)) {
|
|
return -EINVAL;
|
|
@@ -1392,6 +1392,8 @@ static int vmdk_create(const char *filename, QEMUOptionParameter *options)
|
|
flags |= options->value.n ? BLOCK_FLAG_COMPAT6 : 0;
|
|
} else if (!strcmp(options->name, BLOCK_OPT_SUBFMT)) {
|
|
fmt = options->value.s;
|
|
+ } else if (!strcmp(options->name, BLOCK_OPT_SCSI)) {
|
|
+ flags |= options->value.n ? BLOCK_FLAG_SCSI: 0;
|
|
}
|
|
options++;
|
|
}
|
|
@@ -1482,7 +1484,8 @@ static int vmdk_create(const char *filename, QEMUOptionParameter *options)
|
|
parent_desc_line,
|
|
ext_desc_lines,
|
|
(flags & BLOCK_FLAG_COMPAT6 ? 6 : 4),
|
|
- total_size / (int64_t)(63 * 16 * 512));
|
|
+ total_size / (int64_t)(63 * 16 * 512),
|
|
+ flags & BLOCK_FLAG_SCSI ? "lsilogic" : "ide");
|
|
if (split || flat) {
|
|
fd = open(
|
|
filename,
|
|
@@ -1585,6 +1588,11 @@ static QEMUOptionParameter vmdk_create_options[] = {
|
|
"VMDK flat extent format, can be one of "
|
|
"{monolithicSparse (default) | monolithicFlat | twoGbMaxExtentSparse | twoGbMaxExtentFlat | streamOptimized} "
|
|
},
|
|
+ {
|
|
+ .name = BLOCK_OPT_SCSI,
|
|
+ .type = OPT_FLAG,
|
|
+ .help = "SCSI image"
|
|
+ },
|
|
{ NULL }
|
|
};
|
|
|
|
diff --git a/block_int.h b/block_int.h
|
|
index b80e66d..e1c436f 100644
|
|
--- a/block_int.h
|
|
+++ b/block_int.h
|
|
@@ -33,6 +33,7 @@
|
|
|
|
#define BLOCK_FLAG_ENCRYPT 1
|
|
#define BLOCK_FLAG_COMPAT6 4
|
|
+#define BLOCK_FLAG_SCSI 8
|
|
|
|
#define BLOCK_IO_LIMIT_READ 0
|
|
#define BLOCK_IO_LIMIT_WRITE 1
|
|
@@ -44,6 +45,7 @@
|
|
#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 c8a70ff..00e3471 100644
|
|
--- a/qemu-img.c
|
|
+++ b/qemu-img.c
|
|
@@ -636,7 +636,7 @@ static int img_convert(int argc, char **argv)
|
|
const uint8_t *buf1;
|
|
BlockDriverInfo bdi;
|
|
QEMUOptionParameter *param = NULL, *create_options = NULL;
|
|
- QEMUOptionParameter *out_baseimg_param;
|
|
+ QEMUOptionParameter *out_baseimg_param, *scsi;
|
|
char *options = NULL;
|
|
const char *snapshot_name = NULL;
|
|
float local_progress;
|
|
@@ -829,6 +829,12 @@ static int img_convert(int argc, char **argv)
|
|
}
|
|
}
|
|
|
|
+ if ((scsi = get_option_parameter(param, BLOCK_OPT_SCSI)) && scsi->value.n && strcmp(drv->format_name, "vmdk")) {
|
|
+ error_report("SCSI devices not supported for this file format");
|
|
+ ret = -1;
|
|
+ goto out;
|
|
+ }
|
|
+
|
|
/* Create the new image */
|
|
ret = bdrv_create(drv, out_filename, param);
|
|
if (ret < 0) {
|