[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 13/14] hw/sparc64: Explicitly set default_display = "
From: |
Laurent Vivier |
Subject: |
[Qemu-devel] [PULL 13/14] hw/sparc64: Explicitly set default_display = "std" |
Date: |
Thu, 14 Feb 2019 11:47:16 +0100 |
From: Thomas Huth <address@hidden>
The sun4uv_init() function expects vga_interface_type to be either
VGA_STD or VGA_NONE and sets up a stdvga device or no vga card
accordingly.
However, the code in vl.c prefers the Cirrus VGA card to stdvga if
it is available and the user and the machine did not specify anything
else.
So far this has not been a problem, since the Cirrus VGA was not linked
into the sparc64 target. But with the upcoming Kconfig build system,
all theoretically possible PCI cards will be enabled by default, so the
Cirrus VGA card might become available on the sparc64 target, too. vl.c
then picks the wrong card, causing sun4uv_init() to abort.
Thus let's make it explicit that we always want stdvga for sparc64 and
so set default_display = "std" for these machines.
Signed-off-by: Thomas Huth <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Reviewed-by: Mark Cave-Ayland <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Laurent Vivier <address@hidden>
---
hw/sparc64/sun4u.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/hw/sparc64/sun4u.c b/hw/sparc64/sun4u.c
index ff24d9b35016..399f2d73c814 100644
--- a/hw/sparc64/sun4u.c
+++ b/hw/sparc64/sun4u.c
@@ -797,6 +797,7 @@ static void sun4u_class_init(ObjectClass *oc, void *data)
mc->default_boot_order = "c";
mc->default_cpu_type = SPARC_CPU_TYPE_NAME("TI-UltraSparc-IIi");
mc->ignore_boot_device_suffixes = true;
+ mc->default_display = "std";
fwc->get_dev_path = sun4u_fw_dev_path;
}
@@ -820,6 +821,7 @@ static void sun4v_class_init(ObjectClass *oc, void *data)
mc->max_cpus = 1; /* XXX for now */
mc->default_boot_order = "c";
mc->default_cpu_type = SPARC_CPU_TYPE_NAME("Sun-UltraSparc-T1");
+ mc->default_display = "std";
}
static const TypeInfo sun4v_type = {
--
2.20.1
- [Qemu-devel] [PULL 00/14] Trivial branch patches, Laurent Vivier, 2019/02/14
- [Qemu-devel] [PULL 08/14] pckbd: Convert DPRINTF->trace, Laurent Vivier, 2019/02/14
- [Qemu-devel] [PULL 12/14] hw/dma/i8257: Use qemu_log_mask(UNIMP) instead of fprintf, Laurent Vivier, 2019/02/14
- [Qemu-devel] [PULL 04/14] configure: remove handling of "wav" audio driver, Laurent Vivier, 2019/02/14
- [Qemu-devel] [PULL 14/14] configure: improve usbfs check, Laurent Vivier, 2019/02/14
- [Qemu-devel] [PULL 09/14] HMP: Prepend errors with 'Error:', Laurent Vivier, 2019/02/14
- [Qemu-devel] [PULL 10/14] kvm: Add kvm_set_ioeventfd* traces, Laurent Vivier, 2019/02/14
- [Qemu-devel] [PULL 06/14] configure: Add HAX support in NetBSD, Laurent Vivier, 2019/02/14
- [Qemu-devel] [PULL 02/14] qemu-deprecated: Remove -virtioconsole and -no-frame for good, Laurent Vivier, 2019/02/14
- [Qemu-devel] [PULL 13/14] hw/sparc64: Explicitly set default_display = "std",
Laurent Vivier <=
- [Qemu-devel] [PULL 01/14] qapi: Fix qcow2 encryption doc typo, Laurent Vivier, 2019/02/14
- [Qemu-devel] [PULL 07/14] configure: Make -Waddress-of-packed-member warnings be errors, Laurent Vivier, 2019/02/14
- [Qemu-devel] [PULL 11/14] wavcapture: Convert to error_report, Laurent Vivier, 2019/02/14
- [Qemu-devel] [PULL 03/14] qemu-options: Remove deprecated option -clock, Laurent Vivier, 2019/02/14
- [Qemu-devel] [PULL 05/14] configure: fix qemu-img name, Laurent Vivier, 2019/02/14
- Re: [Qemu-devel] [PULL 00/14] Trivial branch patches, Peter Maydell, 2019/02/14