From b1ea2d3376d8d337bb84230eead0759a57905f8c Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Thu, 15 Apr 2021 16:43:24 -0700
Subject: [PATCH] Update qemu argument used to disable floppy drive for qemu
 6.0

The way we were doing this before no longer works with qemu 6.0.
Markus Armbruster suggests using -nodefaults, but that's a bigger
gun and we'd have to check we aren't relying on the default
devices in any way before using it. This was his second choice
suggestion "If you'd prefer not to". It does seem to work (with
both older and newer qemu). See:

https://bugs.launchpad.net/bugs/1923663
---
 backend/qemu.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/qemu.pm b/backend/qemu.pm
index 04bb05fb..28a6f88a 100644
--- a/backend/qemu.pm
+++ b/backend/qemu.pm
@@ -857,7 +857,7 @@ sub start_qemu {
     {
         # Remove floppy drive device on architectures
         unless ($arch eq 'aarch64' || $arch eq 'arm' || $vars->{QEMU_NO_FDC_SET}) {
-            sp('global', 'isa-fdc.driveA=');
+            sp('global', 'isa-fdc.fdtypeA=none');
         }
 
         sp('m',       $vars->{QEMURAM})     if $vars->{QEMURAM};
-- 
2.31.1