From eb0d15231c020bdf0f6d83e63088c56b1209979d Mon Sep 17 00:00:00 2001 From: Ulrich Hecht 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 [AF: Changed BLOCK_FLAG_SCSI from 8 to 16 for v1.2] [AF: Rebased onto upstream VMDK SCSI support] Signed-off-by: Andreas Färber --- block.c | 5 ++++- block/vmdk.c | 9 ++++++++- include/block/block_int.h | 2 ++ qemu-img.c | 8 +++++++- 4 Dateien geändert, 21 Zeilen hinzugefügt(+), 3 Zeilen entfernt(-) diff --git a/block.c b/block.c index 50dab8e..7ea5ab4 100644 --- a/block.c +++ b/block.c @@ -4434,7 +4434,7 @@ void bdrv_img_create(const char *filename, const char *fmt, char *options, uint64_t img_size, int flags, Error **errp) { 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; @@ -4542,6 +4542,9 @@ void 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 aef1abc..a64d888 100644 --- a/block/vmdk.c +++ b/block/vmdk.c @@ -1482,6 +1482,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++; } @@ -1587,7 +1589,7 @@ static int vmdk_create(const char *filename, QEMUOptionParameter *options) ext_desc_lines, (flags & BLOCK_FLAG_COMPAT6 ? 6 : 4), total_size / (int64_t)(63 * number_heads * 512), number_heads, - adapter_type); + flags & BLOCK_FLAG_SCSI ? "lsilogic" : adapter_type); if (split || flat) { fd = qemu_open(filename, O_WRONLY | O_CREAT | O_TRUNC | O_BINARY | O_LARGEFILE, @@ -1694,6 +1696,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/include/block/block_int.h b/include/block/block_int.h index eaad53e..d8cdd08 100644 --- a/include/block/block_int.h +++ b/include/block/block_int.h @@ -37,6 +37,7 @@ #define BLOCK_FLAG_ENCRYPT 1 #define BLOCK_FLAG_COMPAT6 4 #define BLOCK_FLAG_LAZY_REFCOUNTS 8 +#define BLOCK_FLAG_SCSI 16 #define BLOCK_IO_LIMIT_READ 0 #define BLOCK_IO_LIMIT_WRITE 1 @@ -48,6 +49,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 85d3740..6de3887 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -676,7 +676,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 = 0; @@ -869,6 +869,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) {