Merge pull request #3719 from pevogam/floppy-device-capability

Add support for newer floppy device after Qemu 5.1.0
avocado-framework · Aug 10, 2023 · d001933 · d001933
2 parents 12953f0 + 6222257
commit d001933
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/virttest/qemu_capabilities.py b/virttest/qemu_capabilities.py
@@ -26,6 +26,7 @@ class Flags(object):
     MIGRATION_PARAMS = _auto_value()
     SEV_GUEST = _auto_value()
     TDX_GUEST = _auto_value()
+    FLOPPY_DEVICE = _auto_value()
 
 
 class MigrationParams(object):

diff --git a/virttest/qemu_devices/qcontainer.py b/virttest/qemu_devices/qcontainer.py
@@ -81,6 +81,7 @@ class DevContainer(object):
     BLOCKDEV_VERSION_SCOPE = '[2.12.0, )'
     SMP_DIES_VERSION_SCOPE = '[4.1.0, )'
     SMP_CLUSTERS_VERSION_SCOPE = '[7.0.0, )'
+    FLOPPY_DEVICE_VERSION_SCOPE = '[5.1.0, )'
 
     MIGRATION_DOWNTIME_LIMTT_VERSION_SCOPE = '[5.1.0, )'
     MIGRATION_MAX_BANDWIDTH_VERSION_SCOPE = '[5.1.0, )'
@@ -302,6 +303,9 @@ def _probe_capabilities(self):
         # -object tdx-guest
         if self.has_object('tdx-guest'):
             self.caps.set_flag(Flags.TDX_GUEST)
+        # -device floppy,drive=$drive
+        if self.__qemu_ver in VersionInterval(self.FLOPPY_DEVICE_VERSION_SCOPE):
+            self.caps.set_flag(Flags.FLOPPY_DEVICE)
 
         if (self.has_qmp_cmd('migrate-set-parameters') and
                 self.has_hmp_cmd('migrate_set_parameter')):
@@ -2395,9 +2399,13 @@ def define_hbas(qtype, atype, bus, unit, port, qbus, pci_bus, iothread,
             devices[-1].set_param('port', unit)
             devices[-1].set_param('removable', removable, bool)
         elif fmt == 'floppy':
-            # Overwrite qdevices.QDevice with qdevices.QFloppy
-            devices[-1] = qdevices.QFloppy(unit, 'drive_%s' % name, name,
-                                           ({'busid': 'drive_%s' % name}, {'type': fmt}))
+            if Flags.FLOPPY_DEVICE in self.caps:
+                devices[-1] = qdevices.QDevice('floppy', aobject=name, parent_bus={'busid': 'drive_%s' % name})
+                devices[-1].set_param('unit', unit)
+            else:
+                # Overwrite qdevices.QDevice with qdevices.QFloppy
+                devices[-1] = qdevices.QFloppy(unit, 'drive_%s' % name, name,
+                                               ({'busid': 'drive_%s' % name}, {'type': fmt}))
         else:
             LOG.warn('Using default device handling (disk %s)', name)
             devices[-1].set_param('driver', fmt)