Patchwork Block: Support creation of SCSI VMDK images in qemu-img.

login
register
mail settings
Submitter Alexander Graf
Date Aug. 3, 2010, 12:17 p.m.
Message ID <1280837861-31971-1-git-send-email-agraf@suse.de>
Download mbox | patch
Permalink /patch/60730/
State New
Headers show

Comments

Alexander Graf - Aug. 3, 2010, 12:17 p.m.
While looking through patches we have not upstreamed yet, I stumbled over this
trivial patch that Kevin created back in the day. It allows to specify the
creation of scsi type vmdk images.

Signed-off-by: Alexander Graf <agraf@suse.de>
---
 block/vmdk.c |   12 ++++++++++--
 block_int.h  |    2 ++
 2 files changed, 12 insertions(+), 2 deletions(-)
Kevin Wolf - Aug. 3, 2010, 12:47 p.m.
Hi Alex,

Am 03.08.2010 14:17, schrieb Alexander Graf:
> While looking through patches we have not upstreamed yet, I stumbled over this
> trivial patch that Kevin created back in the day. It allows to specify the
> creation of scsi type vmdk images.
> 
> Signed-off-by: Alexander Graf <agraf@suse.de>

Aaron (CCed) sent a similar patch only a few days ago (subject
"[Qemu-devel] PATCH: Adding options to generate SCSI based VMDK
images"). The only difference I see is that his option went like
interface=[ide|lsilogic|buslogic] instead of hard-coding lsilogic. I
think this is a better interface.

Aaron, I asked you to fix some formal things (including tabs and SoB),
but you haven't resubmitted the patch yet. Are you going to send a fixed
version, or should I rather take Alex' patch?

Kevin

> ---
>  block/vmdk.c |   12 ++++++++++--
>  block_int.h  |    2 ++
>  2 files changed, 12 insertions(+), 2 deletions(-)
> 
> diff --git a/block/vmdk.c b/block/vmdk.c
> index 2d4ba42..64f1c88 100644
> --- a/block/vmdk.c
> +++ b/block/vmdk.c
> @@ -686,7 +686,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;
> @@ -702,6 +702,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);
> @@ -845,6 +848,11 @@ static QEMUOptionParameter vmdk_create_options[] = {
>          .type = OPT_FLAG,
>          .help = "VMDK version 6 image"
>      },
> +    {
> +        .name = BLOCK_OPT_SCSI,
> +        .type = OPT_FLAG,
> +        .help = "SCSI image"
> +    },
>      { NULL }
>  };
>  
> diff --git a/block_int.h b/block_int.h
> index b863451..01ba00e 100644
> --- a/block_int.h
> +++ b/block_int.h
> @@ -31,10 +31,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"
Alexander Graf - Aug. 3, 2010, 1:13 p.m.
Am 03.08.2010 um 14:47 schrieb Kevin Wolf <kwolf@redhat.com>:

> Hi Alex,
>
> Am 03.08.2010 14:17, schrieb Alexander Graf:
>> While looking through patches we have not upstreamed yet, I  
>> stumbled over this
>> trivial patch that Kevin created back in the day. It allows to  
>> specify the
>> creation of scsi type vmdk images.
>>
>> Signed-off-by: Alexander Graf <agraf@suse.de>
>
> Aaron (CCed) sent a similar patch only a few days ago (subject
> "[Qemu-devel] PATCH: Adding options to generate SCSI based VMDK
> images"). The only difference I see is that his option went like
> interface=[ide|lsilogic|buslogic] instead of hard-coding lsilogic. I
> think this is a better interface.

Oh, I must have missed that patch :). I'm reasonably indifferent on  
which approach gets upstream, as long as there will be a choice at  
all ;). And yes, I would also consider an interface= parameter superior.


Alex

Patch

diff --git a/block/vmdk.c b/block/vmdk.c
index 2d4ba42..64f1c88 100644
--- a/block/vmdk.c
+++ b/block/vmdk.c
@@ -686,7 +686,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;
@@ -702,6 +702,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);
@@ -845,6 +848,11 @@  static QEMUOptionParameter vmdk_create_options[] = {
         .type = OPT_FLAG,
         .help = "VMDK version 6 image"
     },
+    {
+        .name = BLOCK_OPT_SCSI,
+        .type = OPT_FLAG,
+        .help = "SCSI image"
+    },
     { NULL }
 };
 
diff --git a/block_int.h b/block_int.h
index b863451..01ba00e 100644
--- a/block_int.h
+++ b/block_int.h
@@ -31,10 +31,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"