8c721a87ae
- Remove deprecated patch "work-around-SA_RESTART-race" (boo#982208) - Patch queue updated from git://github.com/openSUSE/qemu.git opensuse-2.6 * Patches dropped: 0002-XXX-work-around-SA_RESTART-race-wit.patch 0003-qemu-0.9.0.cvs-binfmt.patch 0004-qemu-cvs-alsa_bitfield.patch 0005-qemu-cvs-alsa_ioctl.patch 0006-qemu-cvs-alsa_mmap.patch 0007-qemu-cvs-gettimeofday.patch 0008-qemu-cvs-ioctl_debug.patch 0009-qemu-cvs-ioctl_nodirection.patch 0010-block-vmdk-Support-creation-of-SCSI.patch 0011-linux-user-add-binfmt-wrapper-for-a.patch 0012-PPC-KVM-Disable-mmu-notifier-check.patch 0013-linux-user-fix-segfault-deadlock.patch 0014-linux-user-binfmt-support-host-bina.patch 0015-linux-user-Ignore-broken-loop-ioctl.patch 0016-linux-user-lock-tcg.patch 0017-linux-user-Run-multi-threaded-code-.patch 0018-linux-user-lock-tb-flushing-too.patch 0019-linux-user-Fake-proc-cpuinfo.patch 0020-linux-user-implement-FS_IOC_GETFLAG.patch 0021-linux-user-implement-FS_IOC_SETFLAG.patch 0022-linux-user-XXX-disable-fiemap.patch 0023-slirp-nooutgoing.patch 0024-vnc-password-file-and-incoming-conn.patch 0025-linux-user-add-more-blk-ioctls.patch 0026-linux-user-use-target_ulong.patch 0027-block-Add-support-for-DictZip-enabl.patch 0028-block-Add-tar-container-format.patch OBS-URL: https://build.opensuse.org/request/show/408549 OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=305
102 lines
3.5 KiB
Diff
102 lines
3.5 KiB
Diff
From 7164cadf6a1f23d2b931f34c78d3707207306cfb 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 d4939b4..b10e0fe 100644
|
|
--- a/block.c
|
|
+++ b/block.c
|
|
@@ -3588,6 +3588,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 45f9d3c..f5c68e0 100644
|
|
--- a/block/vmdk.c
|
|
+++ b/block/vmdk.c
|
|
@@ -1885,9 +1885,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") &&
|
|
@@ -2310,6 +2313,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 10d8759..7c0b99c 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 46f2a6d..01e6f4a 100644
|
|
--- a/qemu-img.c
|
|
+++ b/qemu-img.c
|
|
@@ -2027,6 +2027,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);
|