hw/sparc64: Explicitly set default_display = "std"
PATCH 1/1 hw/sparc64: Explicitly set default_display = "std"
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.
--- hw/sparc64/sun4u.c | 2 ++ 1 file changed, 2 insertions(+)
hw/sparc64/sun4u.c +2 -0
@@ -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 = {
Signature · 1 line
1.8.3.1
Quoted 14 lines · Thomas Huth
The
sun4uv_init()function expectsvga_interface_typeto be eitherVGA_STDorVGA_NONEand sets up a stdvga device or no vga card accordingly.
However, the code invl.cprefers 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 upcomingKconfigbuild 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.cthen picks the wrong card, causingsun4uv_init()to abort. Thus let's make it explicit that we always want stdvga for sparc64 and so setdefault_display= "std" for these machines.
Quoted 1 line
Signed-off-by Thomas Huth <[email protected]>
Quoted 25 lines
--- hw/sparc64/sun4u.c | 2 ++ 1 file changed, 2 insertions(+)hw/sparc64/sun4u.c +2
-0@@ -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 = {
Quoted 32 lines · Thomas Huth
The
sun4uv_init()function expectsvga_interface_typeto be eitherVGA_STDorVGA_NONEand sets up a stdvga device or no vga card accordingly.
However, the code invl.cprefers 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 upcomingKconfigbuild 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.cthen picks the wrong card, causingsun4uv_init()to abort. Thus let's make it explicit that we always want stdvga for sparc64 and so setdefault_display= "std" for these machines.Signed-off-by Thomas Huth <[email protected]>--- hw/sparc64/sun4u.c | 2 ++ 1 file changed, 2 insertions(+)hw/sparc64/sun4u.c +1
-0@@ -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; }
hw/sparc64/sun4u.c static void sun4v_class_init(ObjectClass *oc, void *data) · line 827
Quoted 7 lines
hw/sparc64/sun4u.c +1
-0@@ -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 = {
ATB,
Mark.
Laurent Vivier
AppliedQuoted 33 lines · Thomas Huth
The
sun4uv_init()function expectsvga_interface_typeto be eitherVGA_STDorVGA_NONEand sets up a stdvga device or no vga card accordingly.
However, the code invl.cprefers 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 upcomingKconfigbuild 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.cthen picks the wrong card, causingsun4uv_init()to abort. Thus let's make it explicit that we always want stdvga for sparc64 and so setdefault_display= "std" for these machines.Signed-off-by Thomas Huth <[email protected]>--- hw/sparc64/sun4u.c | 2 ++ 1 file changed, 2 insertions(+)hw/sparc64/sun4u.c +1
-0@@ -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; }
hw/sparc64/sun4u.c static void sun4v_class_init(ObjectClass *oc, void *data) · line 827
Quoted 7 lines
hw/sparc64/sun4u.c +1
-0@@ -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 = {
Applied to my trivial-patches branch.
Thanks,
Laurent