[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH] Add support for vmware vmdk scsi images to qemu-img
From: |
Pantelis Koukousoulas |
Subject: |
[Qemu-devel] [PATCH] Add support for vmware vmdk scsi images to qemu-img |
Date: |
Thu, 30 Jul 2009 18:55:19 +0300 |
This adds support to qemu-img for creating vmdk scsi images.
(It currently creates only IDE ones).
Original version was from Soren Hansen.
I just updated it for latest qemu.
Tested with latest vmware player (2.5.2) and seems to work well.
Signed-off-by: Pantelis Koukousoulas <address@hidden>
---
block/vmdk.c | 12 ++++++++++--
block_int.h | 2 ++
qemu-img.c | 1 +
3 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/block/vmdk.c b/block/vmdk.c
index f21f02b..6381aa4 100644
--- a/block/vmdk.c
+++ b/block/vmdk.c
@@ -709,7 +709,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";
char desc[1024];
const char *real_filename, *temp_str;
int64_t total_size = 0;
@@ -724,6 +724,8 @@ static int vmdk_create(const char *filename,
QEMUOptionParameter *options)
backing_file = options->value.s;
} else if (!strcmp(options->name, BLOCK_OPT_COMPAT6)) {
flags |= options->value.n ? BLOCK_FLAG_COMPAT6: 0;
+ } else if (!strcmp(options->name, BLOCK_OPT_SCSI)) {
+ flags |= options->value.n ? BLOCK_FLAG_SCSI: 0;
}
options++;
}
@@ -799,7 +801,8 @@ static int vmdk_create(const char *filename,
QEMUOptionParameter *options)
snprintf(desc, sizeof(desc), desc_template, (unsigned int)time(NULL),
total_size, real_filename,
(flags & BLOCK_FLAG_COMPAT6 ? 6 : 4),
- total_size / (int64_t)(63 * 16));
+ total_size / (int64_t)(63 * 16),
+ (flags & BLOCK_FLAG_SCSI ? "lsilogic" : "ide"));
/* write the descriptor */
lseek(fd, le64_to_cpu(header.desc_offset) << 9, SEEK_SET);
@@ -843,6 +846,11 @@ static QEMUOptionParameter vmdk_create_options[] = {
.type = OPT_FLAG,
.help = "VMDK version 6 image"
},
+ {
+ .name = BLOCK_OPT_SCSI,
+ .type = OPT_FLAG,
+ .help = "VMDK scsi image"
+ },
{ NULL }
};
diff --git a/block_int.h b/block_int.h
index 830b7e9..0311198 100644
--- a/block_int.h
+++ b/block_int.h
@@ -30,10 +30,12 @@
#define BLOCK_FLAG_ENCRYPT 1
#define BLOCK_FLAG_COMPRESS 2
#define BLOCK_FLAG_COMPAT6 4
+#define BLOCK_FLAG_SCSI 8
#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"
--
1.6.3.3
- [Qemu-devel] [PATCH] Add support for vmware vmdk scsi images to qemu-img,
Pantelis Koukousoulas <=