mc->kvm_type = spapr_kvm_type;
machine_class_allow_dynamic_sysbus_dev(mc,
TYPE_SPAPR_PCI_HOST_BRIDGE);
mc->pci_allow_0_address = true;
diff --git a/vl.c b/vl.c
index 16b913f9d5..e60bf2d6cd 100644
--- a/vl.c
+++ b/vl.c
@@ -4475,10 +4475,10 @@ int main(int argc, char **argv, char **envp)
if (default_vga) {
if (machine_class->default_display) {
vga_model = machine_class->default_display;
- } else if (vga_interface_available(VGA_CIRRUS)) {
- vga_model = "cirrus";
} else if (vga_interface_available(VGA_STD)) {
vga_model = "std";
+ } else if (vga_interface_available(VGA_CIRRUS)) {
+ vga_model = "cirrus";
If we don't make the machines above have default_display=NULL, we
won't need this hunk, right? In either case, I suggest doing
this change on a separate patch.