Commit 7f2039f6 authored by Othmar Pasteka's avatar Othmar Pasteka Committed by Stefan Hajnoczi
Browse files

vmdk: Allow selecting SCSI adapter in image creation 



Introduce a new option "adapter_type" when converting to vmdk images.
It can be one of the following: ide (default), buslogic, lsilogic
or legacyESX (according to the vmdk spec from vmware).

In case of a non-ide adapter, heads is set to 255 instead of the 16.
The latter is used for "ide".

Also see LP#545089

Signed-off-by: default avatarOthmar Pasteka <pasteka@kabsi.at>
Signed-off-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
parent a04eca10

block/vmdk.c

+28 −3
Original line number Diff line number Diff line
@@ -1442,6 +1442,7 @@ static int vmdk_create(const char *filename, QEMUOptionParameter *options) 
    int fd, idx = 0;

    char desc[BUF_SIZE];

    int64_t total_size = 0, filesize;

    const char *adapter_type = NULL;

    const char *backing_file = NULL;

    const char *fmt = NULL;

    int flags = 0;
@@ -1453,6 +1454,7 @@ static int vmdk_create(const char *filename, QEMUOptionParameter *options) 
    const char *desc_extent_line;

    char parent_desc_line[BUF_SIZE] = "";

    uint32_t parent_cid = 0xffffffff;

    uint32_t number_heads = 16;

    const char desc_template[] =

        "# Disk DescriptorFile\n"

        "version=1\n"
@@ -1469,9 +1471,9 @@ static int vmdk_create(const char *filename, QEMUOptionParameter *options) 
        "\n"

        "ddb.virtualHWVersion = \"%d\"\n"

        "ddb.geometry.cylinders = \"%" PRId64 "\"\n"

        "ddb.geometry.heads = \"16\"\n"

        "ddb.geometry.heads = \"%d\"\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;
@@ -1480,6 +1482,8 @@ static int vmdk_create(const char *filename, QEMUOptionParameter *options) 
    while (options && options->name) {

        if (!strcmp(options->name, BLOCK_OPT_SIZE)) {

            total_size = options->value.n;

        } else if (!strcmp(options->name, BLOCK_OPT_ADAPTER_TYPE)) {

            adapter_type = options->value.s;

        } else if (!strcmp(options->name, BLOCK_OPT_BACKING_FILE)) {

            backing_file = options->value.s;

        } else if (!strcmp(options->name, BLOCK_OPT_COMPAT6)) {
@@ -1489,6 +1493,20 @@ static int vmdk_create(const char *filename, QEMUOptionParameter *options) 
        }

        options++;

    }

    if (!adapter_type) {

        adapter_type = "ide";

    } else if (strcmp(adapter_type, "ide") &&

               strcmp(adapter_type, "buslogic") &&

               strcmp(adapter_type, "lsilogic") &&

               strcmp(adapter_type, "legacyESX")) {

        fprintf(stderr, "VMDK: Unknown adapter type: '%s'.\n", adapter_type);

        return -EINVAL;

    }

    if (strcmp(adapter_type, "ide") != 0) {

        /* that's the number of heads with which vmware operates when

           creating, exporting, etc. vmdk files with a non-ide adapter type */

        number_heads = 255;

    }

    if (!fmt) {

        /* Default format to monolithicSparse */

        fmt = "monolithicSparse";
@@ -1576,7 +1594,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 * number_heads * 512), number_heads,

                adapter_type);

    if (split || flat) {

        fd = qemu_open(filename,

                       O_WRONLY | O_CREAT | O_TRUNC | O_BINARY | O_LARGEFILE,
@@ -1660,6 +1679,12 @@ static QEMUOptionParameter vmdk_create_options[] = { 
        .type = OPT_SIZE,

        .help = "Virtual disk size"

    },

    {

        .name = BLOCK_OPT_ADAPTER_TYPE,

        .type = OPT_STRING,

        .help = "Virtual adapter type, can be one of "

                "ide (default), lsilogic, buslogic or legacyESX"

    },

    {

        .name = BLOCK_OPT_BACKING_FILE,

        .type = OPT_STRING,

include/block/block_int.h

+1 −0
Original line number Diff line number Diff line
@@ -56,6 +56,7 @@ 
#define BLOCK_OPT_SUBFMT            "subformat"

#define BLOCK_OPT_COMPAT_LEVEL      "compat"

#define BLOCK_OPT_LAZY_REFCOUNTS    "lazy_refcounts"

#define BLOCK_OPT_ADAPTER_TYPE      "adapter_type"



typedef struct BdrvTrackedRequest BdrvTrackedRequest;