Warn user if the vga flag is passed but no vga device is created
PATCH v3 1/1 Warn user if the vga flag is passed but no vga device is created
A global boolean variable "vga_interface_created"(declared in softmmu/globals.c) has been used to track the creation of vga interface. If the vga flag is passed in the command line "default_vga"(declared in softmmu/vl.c) variable is set to 0. To warn user, the condition checks if vga_interface_created is false and default_vga is equal to 0. If "-vga none" is passed, this patch will not warn the user regarding the creation of VGA device.
The warning "A -vga option was passed but this
machine type does not use that option; no VGA device has been created" is logged if vga flag is passed but no vga device is created.
This patch has been tested for x86_64, i386, sparc, sparc64 and arm boards.
Resolves: https://gitlab.com/qemu-project/qemu/-/issues/581
--- hw/hppa/machine.c | 1 + hw/isa/isa-bus.c | 1 + hw/mips/fuloong2e.c | 1 + hw/pci/pci.c | 1 + hw/ppc/spapr.c | 1 + hw/sparc/sun4m.c | 2 ++ hw/sparc64/sun4u.c | 1 + hw/xenpv/xen_machine_pv.c | 1 + include/sysemu/sysemu.h | 1 + softmmu/globals.c | 1 + softmmu/vl.c | 6 ++++++ 11 files changed, 17 insertions(+)
hw/hppa/machine.c +1 -0
@@ -192,6 +192,7 @@ static void machine_hppa_init(MachineState *machine)/* Graphics setup. */ if (machine->enable_graphics && vga_interface_type !=VGA_NONE ) { + vga_interface_created = true; dev =qdev_new ("artist" ); s =SYS_BUS_DEVICE (dev);sysbus_realize_and_unref (s, &error_fatal);
hw/isa/isa-bus.c +1 -0
@@ -166,6 +166,7 @@ bool isa_realize_and_unref(ISADevice *dev, ISABus *bus, Error **errp)ISADevice *isa_vga_init (ISABus *bus) { + vga_interface_created = true;switch (vga_interface_type) {case VGA_CIRRUS :return isa_create_simple (bus,"isa-cirrus-vga" );
hw/mips/fuloong2e.c +1 -0
@@ -320,6 +320,7 @@ static void mips_fuloong2e_init(MachineState *machine)/* GPU */ if (vga_interface_type !=VGA_NONE ) { + vga_interface_created = true; pci_dev =pci_new (-1 ,"ati-vga" ); dev =DEVICE (pci_dev);qdev_prop_set_uint32 (dev,"vgamem_mb" ,16 );
hw/pci/pci.c +1 -0
@@ -2037,6 +2037,7 @@ PCIDevice *pci_nic_init_nofail(NICInfo *nd, PCIBus *rootbus,PCIDevice *pci_vga_init (PCIBus *bus) { + vga_interface_created = true;switch (vga_interface_type) {case VGA_CIRRUS :return pci_create_simple (bus,-1 ,"cirrus-vga" );
hw/ppc/spapr.c +1 -0
@@ -1742,6 +1742,7 @@ static void spapr_rtc_create(SpaprMachineState *spapr)/* Returns whether we want to use VGA or not */ static bool spapr_vga_init (PCIBus *pci_bus,Error **errp) { + vga_interface_created = true;switch (vga_interface_type) {case VGA_NONE :return false;
hw/sparc/sun4m.c +2 -0
@@ -920,6 +920,7 @@ static void sun4m_hw_init(MachineState *machine)/* sbus irq 5 */ cg3_init (hwdef->tcx_base, slavio_irq[11 ],0x00100000 , graphic_width, graphic_height, graphic_depth); + vga_interface_created = true; }else {/* If no display specified, default to TCX */ if (graphic_depth !=8 && graphic_depth !=24 ) {
@@ -935,6 +936,7 @@ static void sun4m_hw_init(MachineState *machine)tcx_init (hwdef->tcx_base, slavio_irq[11 ],0x00100000 , graphic_width, graphic_height, graphic_depth); + vga_interface_created = true; } }
hw/sparc64/sun4u.c +1 -0
@@ -632,6 +632,7 @@ static void sun4uv_init(MemoryRegion *address_space_mem,switch (vga_interface_type) {case VGA_STD :pci_create_simple (pci_busA,PCI_DEVFN (2 ,0 ),"VGA" ); + vga_interface_created = true;break ;case VGA_NONE :break ;
hw/xenpv/xen_machine_pv.c +1 -0
@@ -63,6 +63,7 @@ static void xen_init_pv(MachineState *machine)if (vga_interface_type ==VGA_XENFB ) {xen_config_dev_vfb (0 ,"vnc" );xen_config_dev_vkbd (0 ); + vga_interface_created = true; }/* configure disks */
include/sysemu/sysemu.h +1 -0
@@ -34,6 +34,7 @@ typedef enum { } VGAInterfaceType;extern int vga_interface_type; +extern bool vga_interface_created;extern int graphic_width;extern int graphic_height;
softmmu/globals.c +1 -0
@@ -40,6 +40,7 @@ int nb_nics;NICInfo nd_table[MAX_NICS ];int autostart =1 ;int vga_interface_type =VGA_NONE ; +bool vga_interface_created;Chardev *parallel_hds[MAX_PARALLEL_PORTS ];int win2k_install_hack;int singlestep;
softmmu/vl.c +6 -0
@@ -2734,6 +2734,12 @@ static void qemu_machine_creation_done(void)if (foreach_device_config (DEV_GDB , gdbserver_start) <0 ) {exit (1 ); } +if (!vga_interface_created && !default_vga && + vga_interface_type !=VGA_NONE ) { +warn_report ("A -vga option was passed but this machine " +"type does not use that option; " +"No VGA device has been created" ); + } }void qmp_x_exit_preconfig (Error **errp)
Signature · 1 line
2.34.1
Quoted 8 lines · Gautam Agrawal
A global boolean variable "vga_interface_created"(declared in
softmmu/globals.c) has been used to track the creation of vga interface. If the vga flag is passed in the command line "default_vga"(declared insoftmmu/vl.c) variable is set to 0. To warn user, the condition checks ifvga_interface_createdis false anddefault_vgais equal to 0. If "-vga none" is passed, this patch will not warn the user regarding the creation of VGA device.
Quoted 8 lines
The warning "A -vga option was passed but this
machine type does not use that option; no VGA device has been created" is logged if vga flag is passed but no vga device is created.This patch has been tested for
x86_64, i386, sparc, sparc64 and arm boards.Signed-off-by Gautam Agrawal <[email protected]>
thanks
-- PMM
Quoted 15 lines · Gautam Agrawal
A global boolean variable "vga_interface_created"(declared in
softmmu/globals.c) has been used to track the creation of vga interface. If the vga flag is passed in the command line "default_vga"(declared insoftmmu/vl.c) variable is set to 0. To warn user, the condition checks ifvga_interface_createdis false anddefault_vgais equal to 0. If "-vga none" is passed, this patch will not warn the user regarding the creation of VGA device.The warning "A -vga option was passed but this
machine type does not use that option; no VGA device has been created" is logged if vga flag is passed but no vga device is created.This patch has been tested for
x86_64, i386, sparc, sparc64 and arm boards.Signed-off-by Gautam Agrawal <[email protected]>
Quoted 13 lines
--- hw/hppa/machine.c | 1 + hw/isa/isa-bus.c | 1 + hw/mips/fuloong2e.c | 1 + hw/pci/pci.c | 1 + hw/ppc/spapr.c | 1 + hw/sparc/sun4m.c | 2 ++ hw/sparc64/sun4u.c | 1 + hw/xenpv/xen_machine_pv.c | 1 + include/sysemu/sysemu.h | 1 + softmmu/globals.c | 1 + softmmu/vl.c | 6 ++++++ 11 files changed, 17 insertions(+)
Gerd or Richard: do you want to merge this patch?
Thanks,
Stefan
Quoted 149 lines
hw/hppa/machine.c +1
-0@@ -192,6 +192,7 @@ static void machine_hppa_init(MachineState *machine)/* Graphics setup. */ if (machine->enable_graphics && vga_interface_type !=VGA_NONE ) { + vga_interface_created = true; dev =qdev_new ("artist" ); s =SYS_BUS_DEVICE (dev);sysbus_realize_and_unref (s, &error_fatal);hw/isa/isa-bus.c +1
-0@@ -166,6 +166,7 @@ bool isa_realize_and_unref(ISADevice *dev, ISABus *bus, Error **errp)ISADevice *isa_vga_init (ISABus *bus) { + vga_interface_created = true;switch (vga_interface_type) {case VGA_CIRRUS :return isa_create_simple (bus,"isa-cirrus-vga" );hw/mips/fuloong2e.c +1
-0@@ -320,6 +320,7 @@ static void mips_fuloong2e_init(MachineState *machine)/* GPU */ if (vga_interface_type !=VGA_NONE ) { + vga_interface_created = true; pci_dev =pci_new (-1 ,"ati-vga" ); dev =DEVICE (pci_dev);qdev_prop_set_uint32 (dev,"vgamem_mb" ,16 );hw/pci/pci.c +1
-0@@ -2037,6 +2037,7 @@ PCIDevice *pci_nic_init_nofail(NICInfo *nd, PCIBus *rootbus,PCIDevice *pci_vga_init (PCIBus *bus) { + vga_interface_created = true;switch (vga_interface_type) {case VGA_CIRRUS :return pci_create_simple (bus,-1 ,"cirrus-vga" );hw/ppc/spapr.c +1
-0@@ -1742,6 +1742,7 @@ static void spapr_rtc_create(SpaprMachineState *spapr)/* Returns whether we want to use VGA or not */ static bool spapr_vga_init (PCIBus *pci_bus,Error **errp) { + vga_interface_created = true;switch (vga_interface_type) {case VGA_NONE :return false;hw/sparc/sun4m.c +2
-0@@ -920,6 +920,7 @@ static void sun4m_hw_init(MachineState *machine)/* sbus irq 5 */ cg3_init (hwdef->tcx_base, slavio_irq[11 ],0x00100000 , graphic_width, graphic_height, graphic_depth); + vga_interface_created = true; }else {/* If no display specified, default to TCX */ if (graphic_depth !=8 && graphic_depth !=24 ) {@@ -935,6 +936,7 @@ static void sun4m_hw_init(MachineState *machine)tcx_init (hwdef->tcx_base, slavio_irq[11 ],0x00100000 , graphic_width, graphic_height, graphic_depth); + vga_interface_created = true; } }hw/sparc64/sun4u.c +1
-0@@ -632,6 +632,7 @@ static void sun4uv_init(MemoryRegion *address_space_mem,switch (vga_interface_type) {case VGA_STD :pci_create_simple (pci_busA,PCI_DEVFN (2 ,0 ),"VGA" ); + vga_interface_created = true;break ;case VGA_NONE :break ;hw/xenpv/xen_machine_pv.c +1
-0@@ -63,6 +63,7 @@ static void xen_init_pv(MachineState *machine)if (vga_interface_type ==VGA_XENFB ) {xen_config_dev_vfb (0 ,"vnc" );xen_config_dev_vkbd (0 ); + vga_interface_created = true; }/* configure disks */ include/sysemu/sysemu.h +1
-0@@ -34,6 +34,7 @@ typedef enum { } VGAInterfaceType;extern int vga_interface_type; +extern bool vga_interface_created;extern int graphic_width;extern int graphic_height;softmmu/globals.c +1
-0@@ -40,6 +40,7 @@ int nb_nics;NICInfo nd_table[MAX_NICS ];int autostart =1 ;int vga_interface_type =VGA_NONE ; +bool vga_interface_created;Chardev *parallel_hds[MAX_PARALLEL_PORTS ];int win2k_install_hack;int singlestep;softmmu/vl.c +6
-0@@ -2734,6 +2734,12 @@ static void qemu_machine_creation_done(void)if (foreach_device_config (DEV_GDB , gdbserver_start) <0 ) {exit (1 ); } +if (!vga_interface_created && !default_vga && + vga_interface_type !=VGA_NONE ) { +warn_report ("A -vga option was passed but this machine " +"type does not use that option; " +"No VGA device has been created" ); + } }void qmp_x_exit_preconfig (Error **errp)Signature · 1 line
2.34.1
Quoted 30 lines · Stefan Hajnoczi
Quoted 15 lines · Gautam Agrawal
A global boolean variable "vga_interface_created"(declared in
softmmu/globals.c) has been used to track the creation of vga interface. If the vga flag is passed in the command line "default_vga"(declared insoftmmu/vl.c) variable is set to 0. To warn user, the condition checks ifvga_interface_createdis false anddefault_vgais equal to 0. If "-vga none" is passed, this patch will not warn the user regarding the creation of VGA device.The warning "A -vga option was passed but this
machine type does not use that option; no VGA device has been created" is logged if vga flag is passed but no vga device is created.This patch has been tested for
x86_64, i386, sparc, sparc64 and arm boards.Signed-off-by Gautam Agrawal <[email protected]>Quoted 13 lines
--- hw/hppa/machine.c | 1 + hw/isa/isa-bus.c | 1 + hw/mips/fuloong2e.c | 1 + hw/pci/pci.c | 1 + hw/ppc/spapr.c | 1 + hw/sparc/sun4m.c | 2 ++ hw/sparc64/sun4u.c | 1 + hw/xenpv/xen_machine_pv.c | 1 + include/sysemu/sysemu.h | 1 + softmmu/globals.c | 1 + softmmu/vl.c | 6 ++++++ 11 files changed, 17 insertions(+)
Quoted 1 line
Gerd or Richard: do you want to merge this patch?
I'm just in progress of preparing a pull request with misc patches, I can also throw it in there if nobody minds.
Thomas
Quoted 32 lines · Thomas Huth
Quoted 30 lines · Stefan Hajnoczi
Quoted 28 lines · Gautam Agrawal
A global boolean variable "vga_interface_created"(declared in
softmmu/globals.c) has been used to track the creation of vga interface. If the vga flag is passed in the command line "default_vga"(declared insoftmmu/vl.c) variable is set to 0. To warn user, the condition checks ifvga_interface_createdis false anddefault_vgais equal to 0. If "-vga none" is passed, this patch will not warn the user regarding the creation of VGA device.The warning "A -vga option was passed but this
machine type does not use that option; no VGA device has been created" is logged if vga flag is passed but no vga device is created.This patch has been tested for
x86_64, i386, sparc, sparc64 and arm boards.Signed-off-by Gautam Agrawal <[email protected]>Resolves: https://gitlab.com/qemu-project/qemu/-/issues/581
--- hw/hppa/machine.c | 1 + hw/isa/isa-bus.c | 1 + hw/mips/fuloong2e.c | 1 + hw/pci/pci.c | 1 + hw/ppc/spapr.c | 1 + hw/sparc/sun4m.c | 2 ++ hw/sparc64/sun4u.c | 1 + hw/xenpv/xen_machine_pv.c | 1 + include/sysemu/sysemu.h | 1 + softmmu/globals.c | 1 + softmmu/vl.c | 6 ++++++ 11 files changed, 17 insertions(+)
Quoted 4 lines
Quoted 1 line
Gerd or Richard: do you want to merge this patch?
I'm just in progress of preparing a pull request with misc patches, I can also throw it in there if nobody minds.
Paolo mentioned on IRC yesterday that there was some detail he thought it wasn't handling right with VGA_DEVICE, but I didn't really understand the details. Paolo ?
thanks
-- PMM
Quoted 5 lines · Peter Maydell
Quoted 2 lines
I'm just in progress of preparing a pull request with misc patches, I can also throw it in there if nobody minds.
Paolo mentioned on IRC yesterday that there was some detail he thought it wasn't handling right with
VGA_DEVICE, but I didn't really understand the details. Paolo ?
Yeah, I was wondering if this would warn for "-device VGA". But if so it should be enough to do this to fix it:
softmmu/vl.c +1 -0
@@ -1352,6 +1352,7 @@ static void qemu_disable_default_devices(void)if (!vga_model && !default_vga) { vga_interface_type =VGA_DEVICE ; + vga_interface_created = true; }if (!has_defaults || machine_class->no_serial) { default_serial =0 ;
Paolo
Quoted 16 lines · Paolo Bonzini
Quoted 5 lines · Peter Maydell
Quoted 2 lines
I'm just in progress of preparing a pull request with misc patches, I can also throw it in there if nobody minds.
Paolo mentioned on IRC yesterday that there was some detail he thought it wasn't handling right with
VGA_DEVICE, but I didn't really understand the details. Paolo ?Yeah, I was wondering if this would warn for "-device VGA". But if so it should be enough to do this to fix it:
softmmu/vl.c +0
-0
softmmu/vl.c static void qemu_disable_default_devices(void) · line 1358
Quoted 7 lines
softmmu/vl.c +1
-0@@ -1352,6 +1352,7 @@ static void qemu_disable_default_devices(void)if (!vga_model && !default_vga) { vga_interface_type =VGA_DEVICE ; + vga_interface_created = true; }if (!has_defaults || machine_class->no_serial) { default_serial =0 ;
Can you explain why that's right? qemu_disable_default_devices() isn't creating any devices at all, so it's not clear to me
(a) why it's setting vga_interface_type or (b) why setting vga_interface_created to true is OK.
What I would have expected would have been some kind of callback where the device created with -device whatever arranged to set vga_interface_type to VGA_DEVICE when it was created; but that's clearly not how the code works, so I'm confused about how it does work...
thanks
-- PMM
Quoted 11 lines · Peter Maydell
Quoted 6 lines
if (!vga_model && !default_vga) { vga_interface_type = VGA_DEVICE; + vga_interface_created = true; } if (!has_defaults || machine_class->no_serial) { default_serial = 0;Can you explain why that's right?
qemu_disable_default_devices()isn't creating any devices at all, so it's not clear to me
(a) why it's settingvga_interface_typeor (b) why settingvga_interface_createdto true is OK.
VGA_DEVICE means the device has been specified on the command line, but the board should otherwise behave as if "-vga something" was there.
While the device has not been created yet, it will be in qemu_create_cli_devices(), and that's what !default_vga means at this point of the function.
This in fact means that almost all three occurrences of "vga_interface_type != VGA_NONE" are wrong. :(
Paolo
Quoted 9 lines · Paolo Bonzini
Quoted 7 lines · Peter Maydell
Quoted 6 lines
if (!vga_model && !default_vga) { vga_interface_type = VGA_DEVICE; + vga_interface_created = true; } if (!has_defaults || machine_class->no_serial) { default_serial = 0;
Quoted 7 lines
Quoted 4 lines
Can you explain why that's right?
qemu_disable_default_devices()isn't creating any devices at all, so it's not clear to me
(a) why it's settingvga_interface_typeor (b) why settingvga_interface_createdto true is OK.
VGA_DEVICEmeans the device has been specified on the command line, but the board should otherwise behave as if "-vga something" was there.
Oh, I see now -- qemu_disable_default_devices() does a preliminary scan through of every supplied -device option, looking to see if it has a driver=foo that matches some value in the default_list[] array; if it does then we set default_vga or whatever to false. (So effectively we have a hardcoded list of things we consider to be "VGA devices" for this purpose, which might or might not be the same as the set of actual VGA devices we support...)
I guess this is all here for backwards compatibility purposes? I kind of expect that short options like '-vga' might have magic extra behaviour beyond "create a device", but having some devices that have magic "make the board behave differently" behaviour when they're created with '-device' is a bit unexpected to me.
thanks
-- PMM
Hi,
Quoted 10 lines
Oh, I see now --
qemu_disable_default_devices()does a preliminary scan through of every supplied -device option, looking to see if it has a driver=foo that matches some value in the default_list[] array; if it does then we setdefault_vgaor whatever to false. (So effectively we have a hardcoded list of things we consider to be "VGA devices" for this purpose, which might or might not be the same as the set of actual VGA devices we support...)I guess this is all here for backwards compatibility purposes?
Well, sort of. This tries to deal with the messy side effects of the default devices, i.e. avoid users end up with *two* vga devices in case they use "qemu -device VGA" (same for serial, ...).
take care,
Gerd
Quoted 8 lines · Paolo Bonzini
Quoted 5 lines · Peter Maydell
Quoted 2 lines
I'm just in progress of preparing a pull request with misc patches, I can also throw it in there if nobody minds.
Paolo mentioned on IRC yesterday that there was some detail he thought it wasn't handling right with
VGA_DEVICE, but I didn't really understand the details. Paolo ?Yeah, I was wondering if this would warn for "-device VGA".
Yes, it's possible to trigger the warning like this:
$ ./qemu-system-ppc -M ppce500 -device VGA qemu-system-ppc: warning: A -vga option was passed but this machine type does not use that option; No VGA device has been created
Quoted 7 lines
But if so it should be enough to do this to fix it:
softmmu/vl.c +0
-0
softmmu/vl.c static void qemu_disable_default_devices(void) · line 1358
Quoted 7 lines
softmmu/vl.c +1
-0@@ -1352,6 +1352,7 @@ static void qemu_disable_default_devices(void) if (!vga_model && !default_vga) { vga_interface_type = VGA_DEVICE; + vga_interface_created = true; } if (!has_defaults || machine_class->no_serial) { default_serial = 0;
That fixes the warning, indeed. Thanks, I'll fix up the patch with this hunk and respin my pull request.
Thomas