[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 13/21] sun4m: obey -vga none
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PULL 13/21] sun4m: obey -vga none |
Date: |
Wed, 15 May 2019 22:50:25 +0200 |
Do not create a TCX if "-vga none" was passed on the command line.
Remove some dead code along the way to avoid big reindentation.
Signed-off-by: Paolo Bonzini <address@hidden>
---
hw/sparc/sun4m.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/hw/sparc/sun4m.c b/hw/sparc/sun4m.c
index ca1e382..07d126a 100644
--- a/hw/sparc/sun4m.c
+++ b/hw/sparc/sun4m.c
@@ -850,7 +850,6 @@ static void sun4m_hw_init(const struct sun4m_hwdef *hwdef,
uint32_t initrd_size;
DriveInfo *fd[MAX_FD];
FWCfgState *fw_cfg;
- unsigned int num_vsimms;
DeviceState *dev;
SysBusDevice *s;
@@ -909,8 +908,7 @@ static void sun4m_hw_init(const struct sun4m_hwdef *hwdef,
error_report("Unsupported depth: %d", graphic_depth);
exit (1);
}
- num_vsimms = 0;
- if (num_vsimms == 0) {
+ if (vga_interface_type != VGA_NONE) {
if (vga_interface_type == VGA_CG3) {
if (graphic_depth != 8) {
error_report("Unsupported depth: %d", graphic_depth);
@@ -945,7 +943,7 @@ static void sun4m_hw_init(const struct sun4m_hwdef *hwdef,
}
}
- for (i = num_vsimms; i < MAX_VSIMMS; i++) {
+ for (i = 0; i < MAX_VSIMMS; i++) {
/* vsimm registers probed by OBP */
if (hwdef->vsimm[i].reg_base) {
empty_slot_init(hwdef->vsimm[i].reg_base, 0x2000);
--
1.8.3.1
- [Qemu-devel] [PULL 03/21] Declare -realtime as deprecated, (continued)
- [Qemu-devel] [PULL 03/21] Declare -realtime as deprecated, Paolo Bonzini, 2019/05/15
- [Qemu-devel] [PULL 04/21] vl: Add missing descriptions to the VGA adapters list, Paolo Bonzini, 2019/05/15
- [Qemu-devel] [PULL 05/21] megasas: fix mapped frame size, Paolo Bonzini, 2019/05/15
- [Qemu-devel] [PULL 06/21] hvf: Add missing break statement, Paolo Bonzini, 2019/05/15
- [Qemu-devel] [PULL 08/21] memory: correct the comment to DIRTY_MEMORY_MIGRATION, Paolo Bonzini, 2019/05/15
- [Qemu-devel] [PULL 07/21] vl: fix -sandbox parsing crash when seccomp support is disabled, Paolo Bonzini, 2019/05/15
- [Qemu-devel] [PULL 09/21] hw/acpi/piix4: Move TYPE_PIIX4_PM to a public header, Paolo Bonzini, 2019/05/15
- [Qemu-devel] [PULL 10/21] hw/i386/acpi: Add object_resolve_type_unambiguous to improve modularity, Paolo Bonzini, 2019/05/15
- [Qemu-devel] [PULL 11/21] hw/i386/acpi: Assert a pointer is not null BEFORE using it, Paolo Bonzini, 2019/05/15
- [Qemu-devel] [PULL 12/21] mips-fulong2e: obey -vga none, Paolo Bonzini, 2019/05/15
- [Qemu-devel] [PULL 13/21] sun4m: obey -vga none,
Paolo Bonzini <=
- [Qemu-devel] [PULL 14/21] trace: only include trace-event-subdirs when they are needed, Paolo Bonzini, 2019/05/15
- [Qemu-devel] [PULL 20/21] hw/char: Move multi-serial devices into separate file, Paolo Bonzini, 2019/05/15
- [Qemu-devel] [PULL 19/21] ioapic: allow buggy guests mishandling level-triggered interrupts to make progress, Paolo Bonzini, 2019/05/15
- [Qemu-devel] [PULL 17/21] build: chardev is only needed for softmmu targets, Paolo Bonzini, 2019/05/15
- [Qemu-devel] [PULL 15/21] build: replace GENERATED_FILES by generated-files-y, Paolo Bonzini, 2019/05/15
- [Qemu-devel] [PULL 16/21] configure: qemu-ga is only needed with softmmu targets, Paolo Bonzini, 2019/05/15
- [Qemu-devel] [PULL 18/21] build: don't build hardware objects with linux-user, Paolo Bonzini, 2019/05/15