On Wed, Jul 04, 2018 at 10:21:19PM +0200, Sebastian Bauer wrote: > Am 2018-07-04 20:53, schrieb Eduardo Habkost: > > > 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. > > An alternative would be to define the default always to VGA_STD if the > machine does not override it. This is from the observation that the majority > would chose std. Obviously, having default values always has pro and cons. I > would not consider it harmful here.
That would be my preference: not having any machine with default_display==NULL. I just don't want to make this a requirement for fixing the current bug. > > Is there any configuration that includes VGA_CIRRUS but not VGA_STD? Not sure, I'll check. -- Eduardo