Backport fix for a bug in the dbus change from -35 (POO #91163)
Also backport PR #1646 to fix the arg used to disable the floppy drive so it works with qemu 6.0 (and hence fix Rawhide build).f38
Adam Williamson
4 years ago
parent
f8b2c2bc52
commit
92814e9c94
@ -0,0 +1,36 @@
|
||||
From 442f79e8b018ef4fed91c1256d5f4796cc42a36e Mon Sep 17 00:00:00 2001
|
||||
From: Adam Williamson <awilliam@redhat.com>
|
||||
Date: Wed, 14 Apr 2021 21:43:27 -0700
|
||||
Subject: [PATCH] Fix return value of _dbus_do_call
|
||||
|
||||
This was relying on perl's default return behaviour before
|
||||
(return the result of the final line of the function, if it's an
|
||||
expression). But now that's wrong, as the last line is something
|
||||
else. We need to be explicit about what we're returning (which
|
||||
would generally be a good thing to do anyway).
|
||||
|
||||
Related progress issue: https://progress.opensuse.org/issues/91163
|
||||
|
||||
Signed-off-by: Adam Williamson <awilliam@redhat.com>
|
||||
---
|
||||
backend/qemu.pm | 3 ++-
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/backend/qemu.pm b/backend/qemu.pm
|
||||
index 735e349c..04bb05fb 100644
|
||||
--- a/backend/qemu.pm
|
||||
+++ b/backend/qemu.pm
|
||||
@@ -141,8 +141,9 @@ sub _dbus_do_call {
|
||||
my $bus = Net::DBus->system(private => 1);
|
||||
my $bus_service = $bus->get_service("org.opensuse.os_autoinst.switch");
|
||||
my $bus_object = $bus_service->get_object("/switch", "org.opensuse.os_autoinst.switch");
|
||||
- $bus_object->$fn(@args);
|
||||
+ my @result = $bus_object->$fn(@args);
|
||||
$bus->get_connection->disconnect;
|
||||
+ return @result;
|
||||
}
|
||||
|
||||
sub _dbus_call {
|
||||
--
|
||||
2.31.1
|
||||
|
||||
@ -0,0 +1,34 @@
|
||||
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
|
||||
|
||||
Loading…
Reference in new issue