| Message ID | 1550041639-10232-1-git-send-email-thuth@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | hw/sparc64: Explicitly set default_display = "std" | expand |
On 2/13/19 8:07 AM, Thomas Huth wrote: > 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 <thuth@redhat.com> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> > --- > hw/sparc64/sun4u.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/hw/sparc64/sun4u.c b/hw/sparc64/sun4u.c > index ff24d9b..399f2d7 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 = { >
On 13/02/2019 07:07, Thomas Huth wrote: > 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 <thuth@redhat.com> > --- > hw/sparc64/sun4u.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/hw/sparc64/sun4u.c b/hw/sparc64/sun4u.c > index ff24d9b..399f2d7 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 = { Reviewed-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> ATB, Mark.
On 13/02/2019 08:07, Thomas Huth wrote: > 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 <thuth@redhat.com> > --- > hw/sparc64/sun4u.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/hw/sparc64/sun4u.c b/hw/sparc64/sun4u.c > index ff24d9b..399f2d7 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 = { > Applied to my trivial-patches branch. Thanks, Laurent
diff --git a/hw/sparc64/sun4u.c b/hw/sparc64/sun4u.c index ff24d9b..399f2d7 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 = {
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 <thuth@redhat.com> --- hw/sparc64/sun4u.c | 2 ++ 1 file changed, 2 insertions(+)