Warn user if the vga flag is passed but no vga device is created
PATCH v2 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 initialisation of Global variable "vga_interface_created" in softmmu/globals.c has also been corrected.
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.
"vga_interface_created" has also been included in "xen_machine_pv.c" and "fuloong2e.c". This patch has been tested for x86_64, i386, sparc, sparc64 and arm boards.
Resolves: https://gitlab.com/qemu-project/qemu/-/issues/581
--- hw/isa/isa-bus.c | 1 + hw/mips/fuloong2e.c | 1 + hw/pci/pci.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 ++++++ 9 files changed, 15 insertions(+)
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
@@ -321,6 +321,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
@@ -2038,6 +2038,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/sparc/sun4m.c +2 -0
@@ -921,6 +921,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 ) {
@@ -936,6 +937,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
@@ -633,6 +633,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
@@ -32,6 +32,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 20 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 initialisation of Global variable "
vga_interface_created" insoftmmu/globals.chas also been corrected.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."
vga_interface_created" has also been included in "xen_machine_pv.c" and "fuloong2e.c". This patch has been tested forx86_64, i386, sparc, sparc64 and arm boards.Signed-off-by Gautam Agrawal <[email protected]>
Quoted 11 lines
--- hw/isa/isa-bus.c | 1 + hw/mips/fuloong2e.c | 1 + hw/pci/pci.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 ++++++ 9 files changed, 15 insertions(+)
You've missed the uses of vga_interface_type in hw/hppa/machine.c and hw/ppc/spapr.c. ("git grep vga_interface_type" will give you the list of all the files which touch that variable.)
thanks
-- PMM
I will make changes in hw/ppc/spapr.c . In hw/hppa/machine.c , vga_interface_type is used inside if condition to check for graphics device creation, but I am not able to find any relation with creation of vga interface. Could you kindly provide some pointers about it?
thanks,
Regards,
Gautam Agrawal
Quoted 40 lines · Peter Maydell
Quoted 20 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 initialisation of Global variable "
vga_interface_created" insoftmmu/globals.chas also been corrected.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."
vga_interface_created" has also been included in "xen_machine_pv.c" and "fuloong2e.c". This patch has been tested forx86_64, i386, sparc, sparc64 and arm boards.Signed-off-by Gautam Agrawal <[email protected]>Quoted 11 lines
--- hw/isa/isa-bus.c | 1 + hw/mips/fuloong2e.c | 1 + hw/pci/pci.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 ++++++ 9 files changed, 15 insertions(+)You've missed the uses of
vga_interface_typeinhw/hppa/machine.candhw/ppc/spapr.c. ("git grepvga_interface_type" will give you the list of all the files which touch that variable.)thanks
-- PMM
Quoted 5 lines · Gautam Agrawal
I will make changes in
hw/ppc/spapr.c. Inhw/hppa/machine.c,vga_interface_typeis used inside if condition to check for graphics device creation, but I am not able to find any relation with creation of vga interface. Could you kindly provide some pointers about it?
It's exactly the same as all the other places that look at vga_interface_type -- it looks at it and decides whether to create a graphics device. (Arguably it should not really be saying "anything except 'none' means create the 'artist' graphics device", but that's a separate bug; all you need to care about is "did we create a graphics device because the user passed a -vga option".)
-- PMM
Quoted 7 lines · Peter Maydell
Quoted 5 lines · Gautam Agrawal
I will make changes in
hw/ppc/spapr.c. Inhw/hppa/machine.c,vga_interface_typeis used inside if condition to check for graphics device creation, but I am not able to find any relation with creation of vga interface. Could you kindly provide some pointers about it?
Quoted 7 lines
It's exactly the same as all the other places that look at
vga_interface_type-- it looks at it and decides whether to create a graphics device. (Arguably it should not really be saying "anything except 'none' means create the 'artist' graphics device", but that's a separate bug; all you need to care about is "did we create a graphics device because the user passed a -vga option".)
Agreed, that looks like a separate issue that we should fix one day... something for another BiteSizeTask ticket maybe? Same problem exists in the hw/mips/fuloong2e.c by the way.
Thomas