esx: Explicitly disable unused floppy devices

floppy0.present defaults to true. Therefore, it needs to be
explicitly set to false when the XML config doesn't specify the
corresponding floppy device.

Also update tests accordingly.

diff --git a/src/esx/esx_vmx.c b/src/esx/esx_vmx.c
index d5d9ff009d889be8b1069a42ff9f8fa54d9a9f91..12cd005526b532a2b1168e6e332977b295a2985c 100644 (file)
--- a/src/esx/esx_vmx.c
+++ b/src/esx/esx_vmx.c
@@ -215,7 +215,7 @@ def->disks[0]...
 
 ## disks: floppy from .flp image ###############################################
 
-                                        floppy0.present = "true"                # defaults to "false"
+                                        floppy0.present = "true"                # defaults to "true"
                                         floppy0.startConnected = "true"         # defaults to "true"
                                         floppy0.clientDevice = "false"          # defaults to "false"
 
@@ -235,7 +235,7 @@ def->disks[0]...
 
 ## disks: floppy from host device ##############################################
 
-                                        floppy0.present = "true"                # defaults to "false"
+                                        floppy0.present = "true"                # defaults to "true"
                                         floppy0.startConnected = "true"         # defaults to "true"
                                         floppy0.clientDevice = "false"          # defaults to "false"
 
@@ -2320,6 +2320,7 @@ esxVMX_FormatConfig(esxVMX_Context *ctx, virCapsPtr caps, virDomainDefPtr def,
     virBuffer buffer = VIR_BUFFER_INITIALIZER;
     bool scsi_present[4] = { false, false, false, false };
     int scsi_virtualDev[4] = { -1, -1, -1, -1 };
+    bool floppy_present[2] = { false, false };
 
     if (ctx->formatFileName == NULL) {
         ESX_ERROR(VIR_ERR_INTERNAL_ERROR, "%s",
@@ -2525,7 +2526,8 @@ esxVMX_FormatConfig(esxVMX_Context *ctx, virCapsPtr caps, virDomainDefPtr def,
             break;
 
           case VIR_DOMAIN_DISK_DEVICE_FLOPPY:
-            if (esxVMX_FormatFloppy(ctx, def->disks[i], &buffer) < 0) {
+            if (esxVMX_FormatFloppy(ctx, def->disks[i], &buffer,
+                                    floppy_present) < 0) {
                 goto failure;
             }
 
@@ -2539,6 +2541,13 @@ esxVMX_FormatConfig(esxVMX_Context *ctx, virCapsPtr caps, virDomainDefPtr def,
         }
     }
 
+    for (i = 0; i < 2; ++i) {
+        /* floppy[0..1].present defaults to true, disable it explicitly */
+        if (! floppy_present[i]) {
+            virBufferVSprintf(&buffer, "floppy%d.present = \"false\"\n", i);
+        }
+    }
+
     /* def:fss */
     /* FIXME */
 
@@ -2810,7 +2819,7 @@ esxVMX_FormatCDROM(esxVMX_Context *ctx, virDomainDiskDefPtr def,
 
 int
 esxVMX_FormatFloppy(esxVMX_Context *ctx, virDomainDiskDefPtr def,
-                    virBufferPtr buffer)
+                    virBufferPtr buffer, bool floppy_present[2])
 {
     int unit;
     char *fileName = NULL;
@@ -2824,6 +2833,8 @@ esxVMX_FormatFloppy(esxVMX_Context *ctx, virDomainDiskDefPtr def,
         return -1;
     }
 
+    floppy_present[unit] = true;
+
     virBufferVSprintf(buffer, "floppy%d.present = \"true\"\n", unit);
 
     if (def->type == VIR_DOMAIN_DISK_TYPE_FILE) {

diff --git a/src/esx/esx_vmx.h b/src/esx/esx_vmx.h
index a77264add59caa161d0547ff51330a560b5663a5..12fc5af8d2f17b73f1622f5f42320a933c634096 100644 (file)
--- a/src/esx/esx_vmx.h
+++ b/src/esx/esx_vmx.h
@@ -137,7 +137,7 @@ esxVMX_FormatCDROM(esxVMX_Context *ctx, virDomainDiskDefPtr def,
 
 int
 esxVMX_FormatFloppy(esxVMX_Context *ctx, virDomainDiskDefPtr def,
-                    virBufferPtr buffer);
+                    virBufferPtr buffer, bool floppy_present[2]);
 
 int
 esxVMX_FormatEthernet(virDomainNetDefPtr def, int controller,

diff --git a/tests/xml2vmxdata/xml2vmx-cdrom-ide-device.vmx b/tests/xml2vmxdata/xml2vmx-cdrom-ide-device.vmx
index 8712e1970d10a6344b474e1f1f85cc4c8a4ce19a..2db1bcb9eacf4a9b155859cd02118c23951d5fd5 100644 (file)
--- a/tests/xml2vmxdata/xml2vmx-cdrom-ide-device.vmx
+++ b/tests/xml2vmxdata/xml2vmx-cdrom-ide-device.vmx
@@ -8,3 +8,5 @@ numvcpus = "1"
 ide0:0.present = "true"
 ide0:0.deviceType = "atapi-cdrom"
 ide0:0.fileName = "/dev/scd0"
+floppy0.present = "false"
+floppy1.present = "false"

diff --git a/tests/xml2vmxdata/xml2vmx-cdrom-ide-file.vmx b/tests/xml2vmxdata/xml2vmx-cdrom-ide-file.vmx
index e7a781904adc9de7ab34a0052bd9a39e494f5726..1adf995c3e8d23bbe6af8c3b7829aa4ed9b13d9a 100644 (file)
--- a/tests/xml2vmxdata/xml2vmx-cdrom-ide-file.vmx
+++ b/tests/xml2vmxdata/xml2vmx-cdrom-ide-file.vmx
@@ -8,3 +8,5 @@ numvcpus = "1"
 ide0:0.present = "true"
 ide0:0.deviceType = "cdrom-image"
 ide0:0.fileName = "/vmfs/volumes/testing/isos/cdrom.iso"
+floppy0.present = "false"
+floppy1.present = "false"

diff --git a/tests/xml2vmxdata/xml2vmx-cdrom-scsi-device.vmx b/tests/xml2vmxdata/xml2vmx-cdrom-scsi-device.vmx
index 5121c36f0479b2b749ea70be4cae60c6984fe033..d7f12015c7f54cbc2987679e84147b751c196e27 100644 (file)
--- a/tests/xml2vmxdata/xml2vmx-cdrom-scsi-device.vmx
+++ b/tests/xml2vmxdata/xml2vmx-cdrom-scsi-device.vmx
@@ -9,3 +9,5 @@ scsi0.present = "true"
 scsi0:0.present = "true"
 scsi0:0.deviceType = "atapi-cdrom"
 scsi0:0.fileName = "/dev/scd0"
+floppy0.present = "false"
+floppy1.present = "false"

diff --git a/tests/xml2vmxdata/xml2vmx-cdrom-scsi-file.vmx b/tests/xml2vmxdata/xml2vmx-cdrom-scsi-file.vmx
index 396fb673aa92a32805504d06a061fc50d223c97e..bc6d0f7a9e9294a67fdf06d3d93ad29b42dd8067 100644 (file)
--- a/tests/xml2vmxdata/xml2vmx-cdrom-scsi-file.vmx
+++ b/tests/xml2vmxdata/xml2vmx-cdrom-scsi-file.vmx
@@ -9,3 +9,5 @@ scsi0.present = "true"
 scsi0:0.present = "true"
 scsi0:0.deviceType = "cdrom-image"
 scsi0:0.fileName = "/vmfs/volumes/testing/isos/cdrom.iso"
+floppy0.present = "false"
+floppy1.present = "false"

diff --git a/tests/xml2vmxdata/xml2vmx-esx-in-the-wild-1.vmx b/tests/xml2vmxdata/xml2vmx-esx-in-the-wild-1.vmx
index 077d9076b3ecce73ff6434d2488f0e186ebd21f7..5e78a3bdd36764bc7a2284d2f1dd8971cbd4480f 100644 (file)
--- a/tests/xml2vmxdata/xml2vmx-esx-in-the-wild-1.vmx
+++ b/tests/xml2vmxdata/xml2vmx-esx-in-the-wild-1.vmx
@@ -10,6 +10,8 @@ scsi0.virtualDev = "lsilogic"
 scsi0:0.present = "true"
 scsi0:0.deviceType = "scsi-hardDisk"
 scsi0:0.fileName = "/vmfs/volumes/498076b2-02796c1a-ef5b-000ae484a6a3/Fedora11/Fedora11.vmdk"
+floppy0.present = "false"
+floppy1.present = "false"
 ethernet0.present = "true"
 ethernet0.networkName = "VM Network"
 ethernet0.connectionType = "bridged"

diff --git a/tests/xml2vmxdata/xml2vmx-esx-in-the-wild-2.vmx b/tests/xml2vmxdata/xml2vmx-esx-in-the-wild-2.vmx
index f50754869009a44a528a2a4ea967443e21fe591c..44db410a7a41f074cf53b6d583026795c17a83ec 100644 (file)
--- a/tests/xml2vmxdata/xml2vmx-esx-in-the-wild-2.vmx
+++ b/tests/xml2vmxdata/xml2vmx-esx-in-the-wild-2.vmx
@@ -30,6 +30,7 @@ ide1:1.fileName = "/vmfs/volumes/498076b2-02796c1a-ef5b-000ae484a6a3/virtDebian1
 floppy0.present = "true"
 floppy0.fileType = "device"
 floppy0.fileName = "/dev/fd0"
+floppy1.present = "false"
 ethernet0.present = "true"
 ethernet0.virtualDev = "vlance"
 ethernet0.networkName = "VM Network"

diff --git a/tests/xml2vmxdata/xml2vmx-esx-in-the-wild-3.vmx b/tests/xml2vmxdata/xml2vmx-esx-in-the-wild-3.vmx
index 10559fbc2ef8d1fd57af42bef3a156c77de5aa95..5bdf40b1963b1fe597d96e1ed93f56d8c3087744 100644 (file)
--- a/tests/xml2vmxdata/xml2vmx-esx-in-the-wild-3.vmx
+++ b/tests/xml2vmxdata/xml2vmx-esx-in-the-wild-3.vmx
@@ -17,6 +17,7 @@ ide0:0.fileName = "/vmfs/volumes/498076b2-02796c1a-ef5b-000ae484a6a3/Isos/debian
 floppy1.present = "true"
 floppy1.fileType = "file"
 floppy1.fileName = "/vmfs/volumes/498076b2-02796c1a-ef5b-000ae484a6a3/Debian2/dummy.flp"
+floppy0.present = "false"
 ethernet0.present = "true"
 ethernet0.networkName = "VM Network"
 ethernet0.connectionType = "bridged"

diff --git a/tests/xml2vmxdata/xml2vmx-esx-in-the-wild-4.vmx b/tests/xml2vmxdata/xml2vmx-esx-in-the-wild-4.vmx
index 068f0f87a67ceb2fa6ea99a9c06e93d0db9c2248..7decab69c86deb3d71118cce6becff3cae1b8199 100644 (file)
--- a/tests/xml2vmxdata/xml2vmx-esx-in-the-wild-4.vmx
+++ b/tests/xml2vmxdata/xml2vmx-esx-in-the-wild-4.vmx
@@ -10,6 +10,8 @@ scsi0.virtualDev = "lsilogic"
 scsi0:0.present = "true"
 scsi0:0.deviceType = "scsi-hardDisk"
 scsi0:0.fileName = "/vmfs/volumes/498076b2-02796c1a-ef5b-000ae484a6a3/virtMonServ1/virtMonServ1.vmdk"
+floppy0.present = "false"
+floppy1.present = "false"
 ethernet0.present = "true"
 ethernet0.networkName = "VM Network"
 ethernet0.connectionType = "bridged"

diff --git a/tests/xml2vmxdata/xml2vmx-ethernet-bridged.vmx b/tests/xml2vmxdata/xml2vmx-ethernet-bridged.vmx
index 7d9c6f7a6ddb79b4f3fdd5f3d3bff5089ef9b23c..7d8e59bcf247c282d2e819d0218b9d3d00b0ccd2 100644 (file)
--- a/tests/xml2vmxdata/xml2vmx-ethernet-bridged.vmx
+++ b/tests/xml2vmxdata/xml2vmx-ethernet-bridged.vmx
@@ -5,6 +5,8 @@ uuid.bios = "56 4d 9b ef ac d9 b4 e0-c8 f0 ae a8 b9 10 35 15"
 displayName = "ethernet-bridged"
 memsize = "4"
 numvcpus = "1"
+floppy0.present = "false"
+floppy1.present = "false"
 ethernet0.present = "true"
 ethernet0.networkName = "VM Network"
 ethernet0.connectionType = "bridged"

diff --git a/tests/xml2vmxdata/xml2vmx-ethernet-custom.vmx b/tests/xml2vmxdata/xml2vmx-ethernet-custom.vmx
index fb4b116f3f35a3b89ff82336cf7bf4b40dfc87c2..2b96c40e9e28608d30d3f05fe3642910d9135829 100644 (file)
--- a/tests/xml2vmxdata/xml2vmx-ethernet-custom.vmx
+++ b/tests/xml2vmxdata/xml2vmx-ethernet-custom.vmx
@@ -5,6 +5,8 @@ uuid.bios = "56 4d 9b ef ac d9 b4 e0-c8 f0 ae a8 b9 10 35 15"
 displayName = "ethernet-custom"
 memsize = "4"
 numvcpus = "1"
+floppy0.present = "false"
+floppy1.present = "false"
 ethernet0.present = "true"
 ethernet0.networkName = "VM Network"
 ethernet0.connectionType = "custom"

diff --git a/tests/xml2vmxdata/xml2vmx-ethernet-e1000.vmx b/tests/xml2vmxdata/xml2vmx-ethernet-e1000.vmx
index 3aed46cad4907f761b2b500c4716491e2a5ccada..fb3c7556be027764e8419d9e2eace55b8b21e6d8 100644 (file)
--- a/tests/xml2vmxdata/xml2vmx-ethernet-e1000.vmx
+++ b/tests/xml2vmxdata/xml2vmx-ethernet-e1000.vmx
@@ -5,6 +5,8 @@ uuid.bios = "56 4d 9b ef ac d9 b4 e0-c8 f0 ae a8 b9 10 35 15"
 displayName = "ethernet-e1000"
 memsize = "4"
 numvcpus = "1"
+floppy0.present = "false"
+floppy1.present = "false"
 ethernet0.present = "true"
 ethernet0.virtualDev = "e1000"
 ethernet0.networkName = "VM Network"

diff --git a/tests/xml2vmxdata/xml2vmx-ethernet-generated.vmx b/tests/xml2vmxdata/xml2vmx-ethernet-generated.vmx
index ae825a54fab82c08cd1f46d946bab634125ad1ac..3c0aa9ee8a11b827727db08b9def70ab23bcf042 100644 (file)
--- a/tests/xml2vmxdata/xml2vmx-ethernet-generated.vmx
+++ b/tests/xml2vmxdata/xml2vmx-ethernet-generated.vmx
@@ -5,6 +5,8 @@ uuid.bios = "56 4d 9b ef ac d9 b4 e0-c8 f0 ae a8 b9 10 35 15"
 displayName = "ethernet-generated"
 memsize = "4"
 numvcpus = "1"
+floppy0.present = "false"
+floppy1.present = "false"
 ethernet0.present = "true"
 ethernet0.networkName = "VM Network"
 ethernet0.connectionType = "bridged"

diff --git a/tests/xml2vmxdata/xml2vmx-ethernet-other.vmx b/tests/xml2vmxdata/xml2vmx-ethernet-other.vmx
index 452076ad93a588413680f20cb901f593b3212cf2..017cd0bdf05b1c806a68da210a2d637169fde71d 100644 (file)
--- a/tests/xml2vmxdata/xml2vmx-ethernet-other.vmx
+++ b/tests/xml2vmxdata/xml2vmx-ethernet-other.vmx
@@ -5,6 +5,8 @@ uuid.bios = "56 4d 9b ef ac d9 b4 e0-c8 f0 ae a8 b9 10 35 15"
 displayName = "ethernet-static"
 memsize = "4"
 numvcpus = "1"
+floppy0.present = "false"
+floppy1.present = "false"
 ethernet0.present = "true"
 ethernet0.networkName = "VM Network"
 ethernet0.connectionType = "bridged"

diff --git a/tests/xml2vmxdata/xml2vmx-ethernet-static.vmx b/tests/xml2vmxdata/xml2vmx-ethernet-static.vmx
index 154a28bfa4e384ecc704bad8c37aebe9e8dd6337..a8a2ffb098caec6dcb0c3c85693de99ac2228e78 100644 (file)
--- a/tests/xml2vmxdata/xml2vmx-ethernet-static.vmx
+++ b/tests/xml2vmxdata/xml2vmx-ethernet-static.vmx
@@ -5,6 +5,8 @@ uuid.bios = "56 4d 9b ef ac d9 b4 e0-c8 f0 ae a8 b9 10 35 15"
 displayName = "ethernet-static"
 memsize = "4"
 numvcpus = "1"
+floppy0.present = "false"
+floppy1.present = "false"
 ethernet0.present = "true"
 ethernet0.networkName = "VM Network"
 ethernet0.connectionType = "bridged"

diff --git a/tests/xml2vmxdata/xml2vmx-ethernet-vmxnet2.vmx b/tests/xml2vmxdata/xml2vmx-ethernet-vmxnet2.vmx
index 50709e223f2bda66dcaff6860f8b7b95c74577eb..27b302f5718a2451d524f631a49e12c6ffdbf568 100644 (file)
--- a/tests/xml2vmxdata/xml2vmx-ethernet-vmxnet2.vmx
+++ b/tests/xml2vmxdata/xml2vmx-ethernet-vmxnet2.vmx
@@ -5,6 +5,8 @@ uuid.bios = "56 4d 9b ef ac d9 b4 e0-c8 f0 ae a8 b9 10 35 15"
 displayName = "ethernet-vmxnet2"
 memsize = "4"
 numvcpus = "1"
+floppy0.present = "false"
+floppy1.present = "false"
 ethernet0.present = "true"
 ethernet0.virtualDev = "vmxnet"
 ethernet0.features = "15"

diff --git a/tests/xml2vmxdata/xml2vmx-ethernet-vpx.vmx b/tests/xml2vmxdata/xml2vmx-ethernet-vpx.vmx
index 31283f6d5842bc458d00351d3c091435c53143bc..f9a01126c1098c4944faef0effd36c9c582cf588 100644 (file)
--- a/tests/xml2vmxdata/xml2vmx-ethernet-vpx.vmx
+++ b/tests/xml2vmxdata/xml2vmx-ethernet-vpx.vmx
@@ -5,6 +5,8 @@ uuid.bios = "56 4d 9b ef ac d9 b4 e0-c8 f0 ae a8 b9 10 35 15"
 displayName = "ethernet-vpx"
 memsize = "4"
 numvcpus = "1"
+floppy0.present = "false"
+floppy1.present = "false"
 ethernet0.present = "true"
 ethernet0.networkName = "VM Network"
 ethernet0.connectionType = "bridged"

diff --git a/tests/xml2vmxdata/xml2vmx-floppy-device.vmx b/tests/xml2vmxdata/xml2vmx-floppy-device.vmx
index 465501b06ce6726f7bbe656258ce6206a1f9d8ec..b0bb34888b6eaaaf506ca11602a6c5654a96e66b 100644 (file)
--- a/tests/xml2vmxdata/xml2vmx-floppy-device.vmx
+++ b/tests/xml2vmxdata/xml2vmx-floppy-device.vmx
@@ -8,3 +8,4 @@ numvcpus = "1"
 floppy0.present = "true"
 floppy0.fileType = "device"
 floppy0.fileName = "/dev/fd0"
+floppy1.present = "false"

diff --git a/tests/xml2vmxdata/xml2vmx-floppy-file.vmx b/tests/xml2vmxdata/xml2vmx-floppy-file.vmx
index 40b02c223bcce972b7676da10ffea81039f4f621..22a7e0327fcb008521e54207871eea7fbcefd6a6 100644 (file)
--- a/tests/xml2vmxdata/xml2vmx-floppy-file.vmx
+++ b/tests/xml2vmxdata/xml2vmx-floppy-file.vmx
@@ -8,3 +8,4 @@ numvcpus = "1"
 floppy0.present = "true"
 floppy0.fileType = "file"
 floppy0.fileName = "/vmfs/volumes/testing/floppy.flp"
+floppy1.present = "false"

diff --git a/tests/xml2vmxdata/xml2vmx-graphics-vnc.vmx b/tests/xml2vmxdata/xml2vmx-graphics-vnc.vmx
index b4966b5d34a2baa23a863deecc75ae17d9aba429..f233e7bf7c3e6af2d0d8231e852924ad950b300c 100644 (file)
--- a/tests/xml2vmxdata/xml2vmx-graphics-vnc.vmx
+++ b/tests/xml2vmxdata/xml2vmx-graphics-vnc.vmx
@@ -9,3 +9,5 @@ RemoteDisplay.vnc.enabled = "true"
 RemoteDisplay.vnc.port = "5903"
 RemoteDisplay.vnc.keymap = "de"
 RemoteDisplay.vnc.password = "password"
+floppy0.present = "false"
+floppy1.present = "false"

diff --git a/tests/xml2vmxdata/xml2vmx-gsx-in-the-wild-1.vmx b/tests/xml2vmxdata/xml2vmx-gsx-in-the-wild-1.vmx
index 526fe3c4c96dd9bbfc30f40db99e8b54f1a982a9..3ad8a94e7f3f1a5a062dc66b8dfdcd324cf3e639 100644 (file)
--- a/tests/xml2vmxdata/xml2vmx-gsx-in-the-wild-1.vmx
+++ b/tests/xml2vmxdata/xml2vmx-gsx-in-the-wild-1.vmx
@@ -8,6 +8,8 @@ numvcpus = "1"
 ide0:0.present = "true"
 ide0:0.deviceType = "ata-hardDisk"
 ide0:0.fileName = "/vmfs/volumes/storage/Server1/Debian-System1-0-cl2.vmdk"
+floppy0.present = "false"
+floppy1.present = "false"
 ethernet0.present = "true"
 ethernet0.networkName = "net1"
 ethernet0.connectionType = "custom"

diff --git a/tests/xml2vmxdata/xml2vmx-gsx-in-the-wild-2.vmx b/tests/xml2vmxdata/xml2vmx-gsx-in-the-wild-2.vmx
index 34f006dc0163dc1c63c43bbb63c89a4e979baa6f..88dac5d29b7913f5f07181590e2fa83d917ad7b9 100644 (file)
--- a/tests/xml2vmxdata/xml2vmx-gsx-in-the-wild-2.vmx
+++ b/tests/xml2vmxdata/xml2vmx-gsx-in-the-wild-2.vmx
@@ -8,6 +8,8 @@ numvcpus = "1"
 ide0:0.present = "true"
 ide0:0.deviceType = "ata-hardDisk"
 ide0:0.fileName = "/vmfs/volumes/storage/Server2/Debian-System1-0-cl3.vmdk"
+floppy0.present = "false"
+floppy1.present = "false"
 ethernet0.present = "true"
 ethernet0.networkName = "net1"
 ethernet0.connectionType = "custom"

diff --git a/tests/xml2vmxdata/xml2vmx-gsx-in-the-wild-3.vmx b/tests/xml2vmxdata/xml2vmx-gsx-in-the-wild-3.vmx
index a2a35754a1be662fb3b173fc0508ead4646eca0d..06eac3a0aca980e15afeb26e84c78a0181f43533 100644 (file)
--- a/tests/xml2vmxdata/xml2vmx-gsx-in-the-wild-3.vmx
+++ b/tests/xml2vmxdata/xml2vmx-gsx-in-the-wild-3.vmx
@@ -8,6 +8,8 @@ numvcpus = "1"
 ide0:0.present = "true"
 ide0:0.deviceType = "ata-hardDisk"
 ide0:0.fileName = "/vmfs/volumes/storage/Router/Debian-System1-0-cl1.vmdk"
+floppy0.present = "false"
+floppy1.present = "false"
 ethernet0.present = "true"
 ethernet0.networkName = "net1"
 ethernet0.connectionType = "custom"

diff --git a/tests/xml2vmxdata/xml2vmx-gsx-in-the-wild-4.vmx b/tests/xml2vmxdata/xml2vmx-gsx-in-the-wild-4.vmx
index 765d35c240a8480a2a3e75f27457123823fe6d47..718ac48ce91b81d69d1900ce8dab2c00d558ff43 100644 (file)
--- a/tests/xml2vmxdata/xml2vmx-gsx-in-the-wild-4.vmx
+++ b/tests/xml2vmxdata/xml2vmx-gsx-in-the-wild-4.vmx
@@ -8,6 +8,8 @@ numvcpus = "1"
 ide0:0.present = "true"
 ide0:0.deviceType = "ata-hardDisk"
 ide0:0.fileName = "/vmfs/volumes/storage/Client/Debian-System1-0-cl2.vmdk"
+floppy0.present = "false"
+floppy1.present = "false"
 ethernet0.present = "true"
 ethernet0.networkName = "net2"
 ethernet0.connectionType = "custom"

diff --git a/tests/xml2vmxdata/xml2vmx-harddisk-ide-file.vmx b/tests/xml2vmxdata/xml2vmx-harddisk-ide-file.vmx
index cd969695989d4b7855987c2c4a1f80db532f6d64..daff96999a3b8c7043856118ad3a2037ac2d16ad 100644 (file)
--- a/tests/xml2vmxdata/xml2vmx-harddisk-ide-file.vmx
+++ b/tests/xml2vmxdata/xml2vmx-harddisk-ide-file.vmx
@@ -8,3 +8,5 @@ numvcpus = "1"
 ide0:0.present = "true"
 ide0:0.deviceType = "ata-hardDisk"
 ide0:0.fileName = "/vmfs/volumes/datastore/directory/harddisk.vmdk"
+floppy0.present = "false"
+floppy1.present = "false"

diff --git a/tests/xml2vmxdata/xml2vmx-harddisk-scsi-file.vmx b/tests/xml2vmxdata/xml2vmx-harddisk-scsi-file.vmx
index a270dc425e2f7585a19b18b3ab4fb0e115ac6cb3..150aeaf61980321b38d4cf99e911a38bcb7a3df6 100644 (file)
--- a/tests/xml2vmxdata/xml2vmx-harddisk-scsi-file.vmx
+++ b/tests/xml2vmxdata/xml2vmx-harddisk-scsi-file.vmx
@@ -9,3 +9,5 @@ scsi0.present = "true"
 scsi0:0.present = "true"
 scsi0:0.deviceType = "scsi-hardDisk"
 scsi0:0.fileName = "/vmfs/volumes/datastore/directory/harddisk.vmdk"
+floppy0.present = "false"
+floppy1.present = "false"

diff --git a/tests/xml2vmxdata/xml2vmx-minimal-64bit.vmx b/tests/xml2vmxdata/xml2vmx-minimal-64bit.vmx
index 87de002e3ecc324bac5867223f922c58c6c995d3..a1118deb12c6e6d3f7198b50dc429bee7ad46c31 100644 (file)
--- a/tests/xml2vmxdata/xml2vmx-minimal-64bit.vmx
+++ b/tests/xml2vmxdata/xml2vmx-minimal-64bit.vmx
@@ -5,3 +5,5 @@ uuid.bios = "56 4d 9b ef ac d9 b4 e0-c8 f0 ae a8 b9 10 35 15"
 displayName = "minimal-64bit"
 memsize = "4"
 numvcpus = "1"
+floppy0.present = "false"
+floppy1.present = "false"

diff --git a/tests/xml2vmxdata/xml2vmx-minimal.vmx b/tests/xml2vmxdata/xml2vmx-minimal.vmx
index 08cc83f85dbd6f9adfb700445d4851cc45a603fb..38004f8d16d9f13ba7b645b1e538e2054c912219 100644 (file)
--- a/tests/xml2vmxdata/xml2vmx-minimal.vmx
+++ b/tests/xml2vmxdata/xml2vmx-minimal.vmx
@@ -5,3 +5,5 @@ uuid.bios = "56 4d 9b ef ac d9 b4 e0-c8 f0 ae a8 b9 10 35 15"
 displayName = "minimal"
 memsize = "4"
 numvcpus = "1"
+floppy0.present = "false"
+floppy1.present = "false"

diff --git a/tests/xml2vmxdata/xml2vmx-parallel-device.vmx b/tests/xml2vmxdata/xml2vmx-parallel-device.vmx
index 9294279ec05017985c74d13ad9c8b6e9438786c4..065cf1d0ac8ee2690ad6ca62b82412b74010fec2 100644 (file)
--- a/tests/xml2vmxdata/xml2vmx-parallel-device.vmx
+++ b/tests/xml2vmxdata/xml2vmx-parallel-device.vmx
@@ -5,6 +5,8 @@ uuid.bios = "56 4d 9b ef ac d9 b4 e0-c8 f0 ae a8 b9 10 35 15"
 displayName = "parallel-device"
 memsize = "4"
 numvcpus = "1"
+floppy0.present = "false"
+floppy1.present = "false"
 parallel0.present = "true"
 parallel0.fileType = "device"
 parallel0.fileName = "/dev/parallel0"

diff --git a/tests/xml2vmxdata/xml2vmx-parallel-file.vmx b/tests/xml2vmxdata/xml2vmx-parallel-file.vmx
index 40871b6cadf8ff0660216d0852fd714ed754d3ee..d46de168aa149a8146e5dedafdb372f9cbb45a52 100644 (file)
--- a/tests/xml2vmxdata/xml2vmx-parallel-file.vmx
+++ b/tests/xml2vmxdata/xml2vmx-parallel-file.vmx
@@ -5,6 +5,8 @@ uuid.bios = "56 4d 9b ef ac d9 b4 e0-c8 f0 ae a8 b9 10 35 15"
 displayName = "parallel-file"
 memsize = "4"
 numvcpus = "1"
+floppy0.present = "false"
+floppy1.present = "false"
 parallel0.present = "true"
 parallel0.fileType = "file"
 parallel0.fileName = "/vmfs/volumes/datastore/directory/parallel0.file"

diff --git a/tests/xml2vmxdata/xml2vmx-scsi-driver.vmx b/tests/xml2vmxdata/xml2vmx-scsi-driver.vmx
index a92d7fc98cd5b3c1a153015c09f3da40fbd3e426..b58dbe657c2b1e5ad2f4408486221f1d890081fd 100644 (file)
--- a/tests/xml2vmxdata/xml2vmx-scsi-driver.vmx
+++ b/tests/xml2vmxdata/xml2vmx-scsi-driver.vmx
@@ -25,3 +25,5 @@ scsi2:0.fileName = "/vmfs/volumes/datastore/directory/harddisk3.vmdk"
 scsi3:0.present = "true"
 scsi3:0.deviceType = "scsi-hardDisk"
 scsi3:0.fileName = "/vmfs/volumes/datastore/directory/harddisk4.vmdk"
+floppy0.present = "false"
+floppy1.present = "false"

diff --git a/tests/xml2vmxdata/xml2vmx-scsi-writethrough.vmx b/tests/xml2vmxdata/xml2vmx-scsi-writethrough.vmx
index 30f464a7ee454016ec4bdecffad1b1f732a8f811..9b08c572e0bb0508e9df334e85b0d1336b819dd6 100644 (file)
--- a/tests/xml2vmxdata/xml2vmx-scsi-writethrough.vmx
+++ b/tests/xml2vmxdata/xml2vmx-scsi-writethrough.vmx
@@ -11,3 +11,5 @@ scsi0:0.present = "true"
 scsi0:0.deviceType = "scsi-hardDisk"
 scsi0:0.fileName = "/vmfs/volumes/datastore/directory/harddisk.vmdk"
 scsi0:0.writeThrough = "true"
+floppy0.present = "false"
+floppy1.present = "false"

diff --git a/tests/xml2vmxdata/xml2vmx-serial-device.vmx b/tests/xml2vmxdata/xml2vmx-serial-device.vmx
index 32cb1755898f86a3903dbab82f3ecf82fc201738..2f86e83ee8927cd2a000fc27a05b1b82f07337f6 100644 (file)
--- a/tests/xml2vmxdata/xml2vmx-serial-device.vmx
+++ b/tests/xml2vmxdata/xml2vmx-serial-device.vmx
@@ -5,6 +5,8 @@ uuid.bios = "56 4d 9b ef ac d9 b4 e0-c8 f0 ae a8 b9 10 35 15"
 displayName = "serial-device"
 memsize = "4"
 numvcpus = "1"
+floppy0.present = "false"
+floppy1.present = "false"
 serial0.present = "true"
 serial0.fileType = "device"
 serial0.fileName = "/dev/ttyS0"

diff --git a/tests/xml2vmxdata/xml2vmx-serial-file.vmx b/tests/xml2vmxdata/xml2vmx-serial-file.vmx
index e64463c0a44c567e53f594f531e430da8758ddf2..aae79f1972fb5ff785c7e63d8807491a7233d297 100644 (file)
--- a/tests/xml2vmxdata/xml2vmx-serial-file.vmx
+++ b/tests/xml2vmxdata/xml2vmx-serial-file.vmx
@@ -5,6 +5,8 @@ uuid.bios = "56 4d 9b ef ac d9 b4 e0-c8 f0 ae a8 b9 10 35 15"
 displayName = "serial-file"
 memsize = "4"
 numvcpus = "1"
+floppy0.present = "false"
+floppy1.present = "false"
 serial0.present = "true"
 serial0.fileType = "file"
 serial0.fileName = "/vmfs/volumes/datastore/directory/serial0.file"

diff --git a/tests/xml2vmxdata/xml2vmx-serial-pipe.vmx b/tests/xml2vmxdata/xml2vmx-serial-pipe.vmx
index b177e14e4f0be1ad9fe0304b96d15b3caeb3782e..64462f629ec77fc5bece039296f6c93b11b4f1b8 100644 (file)
--- a/tests/xml2vmxdata/xml2vmx-serial-pipe.vmx
+++ b/tests/xml2vmxdata/xml2vmx-serial-pipe.vmx
@@ -5,6 +5,8 @@ uuid.bios = "56 4d 9b ef ac d9 b4 e0-c8 f0 ae a8 b9 10 35 15"
 displayName = "serial-pipe"
 memsize = "4"
 numvcpus = "1"
+floppy0.present = "false"
+floppy1.present = "false"
 serial0.present = "true"
 serial0.fileType = "pipe"
 serial0.pipe.endPoint = "client"