From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=48207 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Odvy6-00017P-Mc for qemu-devel@nongnu.org; Tue, 27 Jul 2010 22:02:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1Odvy5-0002tk-3Y for qemu-devel@nongnu.org; Tue, 27 Jul 2010 22:02:02 -0400 Received: from mail-ww0-f53.google.com ([74.125.82.53]:47189) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1Odvy4-0002ta-Qv for qemu-devel@nongnu.org; Tue, 27 Jul 2010 22:02:01 -0400 Received: by wwb13 with SMTP id 13so967539wwb.10 for ; Tue, 27 Jul 2010 19:01:59 -0700 (PDT) MIME-Version: 1.0 Date: Wed, 28 Jul 2010 12:01:57 +1000 Message-ID: From: Aaron Mason Content-Type: multipart/mixed; boundary=001485f87e2ea4639a048c690016 Subject: [Qemu-devel] PATCH: Adding options to generate SCSI based VMDK images List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org --001485f87e2ea4639a048c690016 Content-Type: text/plain; charset=ISO-8859-1 Hi all, I tried this once before using command-line parameters and it was knocked back. Someone made the mention of using options so I had a look and saw that it was really simple to do. The following is a patch from the latest Git snapshot. I have also attached it (in case it gets broken by Gmail) and uploaded it to http://milo.thats-too-much.info/qemu-vmdk_gen_scsi.patch (in case the mailing list prohibits attachments). diff --git a/block/vmdk.c b/block/vmdk.c index 2d4ba42..b60d86f 100644 --- a/block/vmdk.c +++ b/block/vmdk.c @@ -686,9 +686,9 @@ 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; + const char *real_filename, *temp_str, *adapter_type = "ide"; int64_t total_size = 0; const char *backing_file = NULL; int flags = 0; @@ -702,6 +702,15 @@ 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_ADAPTER)) { + if (options->value.s != NULL) { + if (!strcmp(options->value.s, "ide") || \ + !strcmp(options->value.s, "buslogic") || \ + !strcmp(options->value.s, "lsilogic")) { + adapter_type = options->value.s; + } else + return -1; + } } options++; } @@ -799,7 +808,7 @@ 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), adapter_type); /* write the descriptor */ lseek(fd, le64_to_cpu(header.desc_offset) << 9, SEEK_SET); @@ -845,6 +854,11 @@ static QEMUOptionParameter vmdk_create_options[] = { .type = OPT_FLAG, .help = "VMDK version 6 image" }, + { + .name = BLOCK_OPT_ADAPTER, + .type = OPT_STRING, + .help = "Adapter type - ide (default), lsilogic or buslogic" + }, { NULL } }; diff --git a/block_int.h b/block_int.h index 96ff4cf..4eb8c6d 100644 --- a/block_int.h +++ b/block_int.h @@ -39,6 +39,7 @@ #define BLOCK_OPT_BACKING_FMT "backing_fmt" #define BLOCK_OPT_CLUSTER_SIZE "cluster_size" #define BLOCK_OPT_PREALLOC "preallocation" +#define BLOCK_OPT_ADAPTER "adapter_type" typedef struct AIOPool { void (*cancel)(BlockDriverAIOCB *acb); --001485f87e2ea4639a048c690016 Content-Type: application/octet-stream; name="qemu-vmdk_gen_scsi.patch" Content-Disposition: attachment; filename="qemu-vmdk_gen_scsi.patch" Content-Transfer-Encoding: base64 X-Attachment-Id: f_gc5j091l0 ZGlmZiAtLWdpdCBhL2Jsb2NrL3ZtZGsuYyBiL2Jsb2NrL3ZtZGsuYwppbmRleCAyZDRiYTQyLi5i NjBkODZmIDEwMDY0NAotLS0gYS9ibG9jay92bWRrLmMKKysrIGIvYmxvY2svdm1kay5jCkBAIC02 ODYsOSArNjg2LDkgQEAgc3RhdGljIGludCB2bWRrX2NyZWF0ZShjb25zdCBjaGFyICpmaWxlbmFt ZSwgUUVNVU9wdGlvblBhcmFtZXRlciAqb3B0aW9ucykKICAgICAgICAgImRkYi5nZW9tZXRyeS5j eWxpbmRlcnMgPSBcIiUiIFBSSWQ2NCAiXCJcbiIKICAgICAgICAgImRkYi5nZW9tZXRyeS5oZWFk cyA9IFwiMTZcIlxuIgogICAgICAgICAiZGRiLmdlb21ldHJ5LnNlY3RvcnMgPSBcIjYzXCJcbiIK LSAgICAgICAgImRkYi5hZGFwdGVyVHlwZSA9IFwiaWRlXCJcbiI7CisgICAgICAgICJkZGIuYWRh cHRlclR5cGUgPSBcIiVzXCJcbiI7CiAgICAgY2hhciBkZXNjWzEwMjRdOwotICAgIGNvbnN0IGNo YXIgKnJlYWxfZmlsZW5hbWUsICp0ZW1wX3N0cjsKKyAgICBjb25zdCBjaGFyICpyZWFsX2ZpbGVu YW1lLCAqdGVtcF9zdHIsICphZGFwdGVyX3R5cGUgPSAiaWRlIjsKICAgICBpbnQ2NF90IHRvdGFs X3NpemUgPSAwOwogICAgIGNvbnN0IGNoYXIgKmJhY2tpbmdfZmlsZSA9IE5VTEw7CiAgICAgaW50 IGZsYWdzID0gMDsKQEAgLTcwMiw2ICs3MDIsMTUgQEAgc3RhdGljIGludCB2bWRrX2NyZWF0ZShj b25zdCBjaGFyICpmaWxlbmFtZSwgUUVNVU9wdGlvblBhcmFtZXRlciAqb3B0aW9ucykKICAgICAg ICAgICAgIGJhY2tpbmdfZmlsZSA9IG9wdGlvbnMtPnZhbHVlLnM7CiAgICAgICAgIH0gZWxzZSBp ZiAoIXN0cmNtcChvcHRpb25zLT5uYW1lLCBCTE9DS19PUFRfQ09NUEFUNikpIHsKICAgICAgICAg ICAgIGZsYWdzIHw9IG9wdGlvbnMtPnZhbHVlLm4gPyBCTE9DS19GTEFHX0NPTVBBVDY6IDA7Cisg ICAgICAgIH0gZWxzZSBpZiAoIXN0cmNtcChvcHRpb25zLT5uYW1lLCBCTE9DS19PUFRfQURBUFRF UikpIHsKKwkgICAgaWYgKG9wdGlvbnMtPnZhbHVlLnMgIT0gTlVMTCkgeworCSAgICAgICAgaWYg KCFzdHJjbXAob3B0aW9ucy0+dmFsdWUucywgImlkZSIpIHx8IFwKKyAgICAgICAgICAgICAgICAg ICAhc3RyY21wKG9wdGlvbnMtPnZhbHVlLnMsICJidXNsb2dpYyIpIHx8IFwKKwkJICAgICFzdHJj bXAob3B0aW9ucy0+dmFsdWUucywgImxzaWxvZ2ljIikpIHsKKwkJCWFkYXB0ZXJfdHlwZSA9IG9w dGlvbnMtPnZhbHVlLnM7CisJCX0gZWxzZQorCQkJcmV0dXJuIC0xOworCSAgICB9CiAgICAgICAg IH0KICAgICAgICAgb3B0aW9ucysrOwogICAgIH0KQEAgLTc5OSw3ICs4MDgsNyBAQCBzdGF0aWMg aW50IHZtZGtfY3JlYXRlKGNvbnN0IGNoYXIgKmZpbGVuYW1lLCBRRU1VT3B0aW9uUGFyYW1ldGVy ICpvcHRpb25zKQogICAgIHNucHJpbnRmKGRlc2MsIHNpemVvZihkZXNjKSwgZGVzY190ZW1wbGF0 ZSwgKHVuc2lnbmVkIGludCl0aW1lKE5VTEwpLAogICAgICAgICAgICAgIHRvdGFsX3NpemUsIHJl YWxfZmlsZW5hbWUsCiAgICAgICAgICAgICAgKGZsYWdzICYgQkxPQ0tfRkxBR19DT01QQVQ2ID8g NiA6IDQpLAotICAgICAgICAgICAgIHRvdGFsX3NpemUgLyAoaW50NjRfdCkoNjMgKiAxNikpOwor ICAgICAgICAgICAgIHRvdGFsX3NpemUgLyAoaW50NjRfdCkoNjMgKiAxNiksIGFkYXB0ZXJfdHlw ZSk7CiAKICAgICAvKiB3cml0ZSB0aGUgZGVzY3JpcHRvciAqLwogICAgIGxzZWVrKGZkLCBsZTY0 X3RvX2NwdShoZWFkZXIuZGVzY19vZmZzZXQpIDw8IDksIFNFRUtfU0VUKTsKQEAgLTg0NSw2ICs4 NTQsMTEgQEAgc3RhdGljIFFFTVVPcHRpb25QYXJhbWV0ZXIgdm1ka19jcmVhdGVfb3B0aW9uc1td ID0gewogICAgICAgICAudHlwZSA9IE9QVF9GTEFHLAogICAgICAgICAuaGVscCA9ICJWTURLIHZl cnNpb24gNiBpbWFnZSIKICAgICB9LAorICAgIHsKKwkubmFtZSA9IEJMT0NLX09QVF9BREFQVEVS LAorCS50eXBlID0gT1BUX1NUUklORywKKwkuaGVscCA9ICJBZGFwdGVyIHR5cGUgLSBpZGUgKGRl ZmF1bHQpLCBsc2lsb2dpYyBvciBidXNsb2dpYyIKKyAgICB9LAogICAgIHsgTlVMTCB9CiB9Owog CmRpZmYgLS1naXQgYS9ibG9ja19pbnQuaCBiL2Jsb2NrX2ludC5oCmluZGV4IDk2ZmY0Y2YuLjRl YjhjNmQgMTAwNjQ0Ci0tLSBhL2Jsb2NrX2ludC5oCisrKyBiL2Jsb2NrX2ludC5oCkBAIC0zOSw2 ICszOSw3IEBACiAjZGVmaW5lIEJMT0NLX09QVF9CQUNLSU5HX0ZNVCAgICJiYWNraW5nX2ZtdCIK ICNkZWZpbmUgQkxPQ0tfT1BUX0NMVVNURVJfU0laRSAgImNsdXN0ZXJfc2l6ZSIKICNkZWZpbmUg QkxPQ0tfT1BUX1BSRUFMTE9DICAgICAgInByZWFsbG9jYXRpb24iCisjZGVmaW5lIEJMT0NLX09Q VF9BREFQVEVSICAgICAgICJhZGFwdGVyX3R5cGUiCiAKIHR5cGVkZWYgc3RydWN0IEFJT1Bvb2wg ewogICAgIHZvaWQgKCpjYW5jZWwpKEJsb2NrRHJpdmVyQUlPQ0IgKmFjYik7Cg== --001485f87e2ea4639a048c690016--