You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
os-autoinst/0001-Remove-duplicated-vgao...

29 lines
1002 B

From 4fc67a069ff7807d1a22176f54863620265d065e Mon Sep 17 00:00:00 2001
From: Santiago Zarate <santiago@zarate.net.ve>
Date: Wed, 18 Jan 2017 09:46:54 +0100
Subject: [PATCH] Remove duplicated @vgaoptions (#700)
This was causing the following message from the qemu backend on xgene2.arch:
RAMBlock "vga.vram" already registered, abort!
---
backend/qemu.pm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/backend/qemu.pm b/backend/qemu.pm
index 84142b7..bdc42d5 100644
--- a/backend/qemu.pm
+++ b/backend/qemu.pm
@@ -530,7 +530,7 @@ sub start_qemu {
die "fork failed" unless defined($pid);
if ($pid == 0) {
$SIG{__DIE__} = undef; # overwrite the default - just exit
- my @params = ("-serial", "file:serial0", "-soundhw", "ac97", @vgaoptions);
+ my @params = ("-serial", "file:serial0", "-soundhw", "ac97");
push(@params, "-global", "isa-fdc.driveA=") unless ($vars->{QEMU_NO_FDC_SET});
push(@params, @vgaoptions);
--
2.11.0