@@ -182,6 +182,7 @@ static void clipper_machine_init(MachineClass *mc)
mc->max_cpus = 4;
mc->is_default = 1;
mc->default_cpu_type = ALPHA_CPU_TYPE_NAME("ev67");
+ mc->default_display = "cirrus";
}
DEFINE_MACHINE("clipper", clipper_machine_init)
@@ -566,7 +566,7 @@ static void pc_i440fx_2_1_machine_options(MachineClass *m)
PCMachineClass *pcmc = PC_MACHINE_CLASS(m);
pc_i440fx_2_2_machine_options(m);
m->hw_version = "2.1.0";
- m->default_display = NULL;
+ m->default_display = "cirrus";
SET_MACHINE_COMPAT(m, PC_COMPAT_2_1);
pcmc->smbios_uuid_encoded = false;
pcmc->enforce_aligned_dimm = false;
@@ -1242,6 +1242,7 @@ static void mips_malta_machine_init(MachineClass *mc)
mc->block_default_type = IF_IDE;
mc->max_cpus = 16;
mc->is_default = 1;
+ mc->default_display = "cirrus";
#ifdef TARGET_MIPS64
mc->default_cpu_type = MIPS_CPU_TYPE_NAME("20Kc");
#else
@@ -295,6 +295,7 @@ static void mips_machine_init(MachineClass *mc)
mc->desc = "mips r4k platform";
mc->init = mips_r4k_init;
mc->block_default_type = IF_IDE;
+ mc->default_display = "cirrus";
#ifdef TARGET_MIPS64
mc->default_cpu_type = MIPS_CPU_TYPE_NAME("R4000");
#else
Explicitly set MachineClass->default_display to "cirrus" for all machine types (alpha, mips, old i386 versions) which use cirrus today, so they don't depend on cirrus being the default display device. Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> --- hw/alpha/dp264.c | 1 + hw/i386/pc_piix.c | 2 +- hw/mips/mips_malta.c | 1 + hw/mips/mips_r4k.c | 1 + 4 files changed, 4 insertions(+), 1 deletion(-)