From 7c0cbe02795988df157aeb457e793a5b568e1cab Mon Sep 17 00:00:00 2001
From: Matthias Bolte <matthias.bolte@googlemail.com>
Date: Fri, 6 Aug 2010 02:02:03 +0200
Subject: [PATCH] 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.
---
 src/esx/esx_vmx.c                             | 19 +++++++++++++++----
 src/esx/esx_vmx.h                             |  2 +-
 .../xml2vmxdata/xml2vmx-cdrom-ide-device.vmx  |  2 ++
 tests/xml2vmxdata/xml2vmx-cdrom-ide-file.vmx  |  2 ++
 .../xml2vmxdata/xml2vmx-cdrom-scsi-device.vmx |  2 ++
 tests/xml2vmxdata/xml2vmx-cdrom-scsi-file.vmx |  2 ++
 .../xml2vmxdata/xml2vmx-esx-in-the-wild-1.vmx |  2 ++
 .../xml2vmxdata/xml2vmx-esx-in-the-wild-2.vmx |  1 +
 .../xml2vmxdata/xml2vmx-esx-in-the-wild-3.vmx |  1 +
 .../xml2vmxdata/xml2vmx-esx-in-the-wild-4.vmx |  2 ++
 .../xml2vmxdata/xml2vmx-ethernet-bridged.vmx  |  2 ++
 tests/xml2vmxdata/xml2vmx-ethernet-custom.vmx |  2 ++
 tests/xml2vmxdata/xml2vmx-ethernet-e1000.vmx  |  2 ++
 .../xml2vmx-ethernet-generated.vmx            |  2 ++
 tests/xml2vmxdata/xml2vmx-ethernet-other.vmx  |  2 ++
 tests/xml2vmxdata/xml2vmx-ethernet-static.vmx |  2 ++
 .../xml2vmxdata/xml2vmx-ethernet-vmxnet2.vmx  |  2 ++
 tests/xml2vmxdata/xml2vmx-ethernet-vpx.vmx    |  2 ++
 tests/xml2vmxdata/xml2vmx-floppy-device.vmx   |  1 +
 tests/xml2vmxdata/xml2vmx-floppy-file.vmx     |  1 +
 tests/xml2vmxdata/xml2vmx-graphics-vnc.vmx    |  2 ++
 .../xml2vmxdata/xml2vmx-gsx-in-the-wild-1.vmx |  2 ++
 .../xml2vmxdata/xml2vmx-gsx-in-the-wild-2.vmx |  2 ++
 .../xml2vmxdata/xml2vmx-gsx-in-the-wild-3.vmx |  2 ++
 .../xml2vmxdata/xml2vmx-gsx-in-the-wild-4.vmx |  2 ++
 .../xml2vmxdata/xml2vmx-harddisk-ide-file.vmx |  2 ++
 .../xml2vmx-harddisk-scsi-file.vmx            |  2 ++
 tests/xml2vmxdata/xml2vmx-minimal-64bit.vmx   |  2 ++
 tests/xml2vmxdata/xml2vmx-minimal.vmx         |  2 ++
 tests/xml2vmxdata/xml2vmx-parallel-device.vmx |  2 ++
 tests/xml2vmxdata/xml2vmx-parallel-file.vmx   |  2 ++
 tests/xml2vmxdata/xml2vmx-scsi-driver.vmx     |  2 ++
 .../xml2vmxdata/xml2vmx-scsi-writethrough.vmx |  2 ++
 tests/xml2vmxdata/xml2vmx-serial-device.vmx   |  2 ++
 tests/xml2vmxdata/xml2vmx-serial-file.vmx     |  2 ++
 tests/xml2vmxdata/xml2vmx-serial-pipe.vmx     |  2 ++
 36 files changed, 80 insertions(+), 5 deletions(-)

diff --git a/src/esx/esx_vmx.c b/src/esx/esx_vmx.c
index d5d9ff009d..12cd005526 100644
--- 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 a77264add5..12fc5af8d2 100644
--- 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 8712e1970d..2db1bcb9ea 100644
--- 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 e7a781904a..1adf995c3e 100644
--- 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 5121c36f04..d7f12015c7 100644
--- 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 396fb673aa..bc6d0f7a9e 100644
--- 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 077d9076b3..5e78a3bdd3 100644
--- 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 f507548690..44db410a7a 100644
--- 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 10559fbc2e..5bdf40b196 100644
--- 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 068f0f87a6..7decab69c8 100644
--- 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 7d9c6f7a6d..7d8e59bcf2 100644
--- 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 fb4b116f3f..2b96c40e9e 100644
--- 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 3aed46cad4..fb3c7556be 100644
--- 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 ae825a54fa..3c0aa9ee8a 100644
--- 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 452076ad93..017cd0bdf0 100644
--- 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 154a28bfa4..a8a2ffb098 100644
--- 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 50709e223f..27b302f571 100644
--- 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 31283f6d58..f9a01126c1 100644
--- 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 465501b06c..b0bb34888b 100644
--- 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 40b02c223b..22a7e0327f 100644
--- 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 b4966b5d34..f233e7bf7c 100644
--- 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 526fe3c4c9..3ad8a94e7f 100644
--- 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 34f006dc01..88dac5d29b 100644
--- 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 a2a35754a1..06eac3a0ac 100644
--- 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 765d35c240..718ac48ce9 100644
--- 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 cd96969598..daff96999a 100644
--- 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 a270dc425e..150aeaf619 100644
--- 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 87de002e3e..a1118deb12 100644
--- 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 08cc83f85d..38004f8d16 100644
--- 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 9294279ec0..065cf1d0ac 100644
--- 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 40871b6cad..d46de168aa 100644
--- 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 a92d7fc98c..b58dbe657c 100644
--- 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 30f464a7ee..9b08c572e0 100644
--- 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 32cb175589..2f86e83ee8 100644
--- 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 e64463c0a4..aae79f1972 100644
--- 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 b177e14e4f..64462f629e 100644
--- 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"
-- 
GitLab