mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sun4m: obey -vga none

Browse Source 
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 <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2019-03-19 15:37:47 +01:00
parent 78c37d88f1
commit 6807874d55
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hw/sparc/sun4m.c
View File

@ -850,7 +850,6 @@ static void sun4m_hw_init(const struct sun4m_hwdef *hwdef,
uint32_t initrd_size; uint32_t initrd_size;
DriveInfo *fd[MAX_FD]; DriveInfo *fd[MAX_FD];
FWCfgState *fw_cfg; FWCfgState *fw_cfg;
unsigned int num_vsimms;
DeviceState *dev; DeviceState *dev;
SysBusDevice *s; SysBusDevice *s;
@ -909,8 +908,7 @@ static void sun4m_hw_init(const struct sun4m_hwdef *hwdef,
error_report("Unsupported depth: %d", graphic_depth); error_report("Unsupported depth: %d", graphic_depth);
exit (1); exit (1);
} }
num_vsimms = 0; if (vga_interface_type != VGA_NONE) {
if (num_vsimms == 0) {
if (vga_interface_type == VGA_CG3) { if (vga_interface_type == VGA_CG3) {
if (graphic_depth != 8) { if (graphic_depth != 8) {
error_report("Unsupported depth: %d", graphic_depth); 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 */ /* vsimm registers probed by OBP */
if (hwdef->vsimm[i].reg_base) { if (hwdef->vsimm[i].reg_base) {
empty_slot_init(hwdef->vsimm[i].reg_base, 0x2000); empty_slot_init(hwdef->vsimm[i].reg_base, 0x2000);