console: qom-ify consoles
Hi,
Here are the console patches, targeting 1.5. It's just the QemuConsole QOM-ification and three little fixes.
New in v2: unbreak xen build, add a patch which fixes the "qemu -nodefaults" segfault.
cheers,
Gerd
The following changes since commit bb71623811686ce3c34ce724f073f5c5dd95f51b:
Move TPM passthrough specific command line options to backend structure (2013-04-23 10:40:40 -0500)
are available in the git repository at:
git://git.kraxel.org/qemu pixman.v13
for you to fetch changes up to 81bf3853dd362a032eb687190af44c710092cbcb:
console: add dummy surface for guests without graphic card (2013-04-25 09:36:43 +0200)
----------------------------------------------------------------
Gerd Hoffmann (6):
console: qom-ify QemuConsole
console: add device link to QemuConsoles
console: add qemu_console_lookup_by_device
console: switch ppm_save to qemu_open
console: zap ds arg from register_displaychangelistener
console: add dummy surface for guests without graphic card
hw/arm/musicpal.c | 2 +- hw/display/blizzard.c | 2 +- hw/display/cirrus_vga.c | 4 +- hw/display/exynos4210_fimd.c | 2 +- hw/display/g364fb.c | 2 +- hw/display/jazz_led.c | 2 +- hw/display/milkymist-vgafb.c | 2 +- hw/display/omap_lcdc.c | 2 +- hw/display/pl110.c | 2 +- hw/display/pxa2xx_lcd.c | 2 +- hw/display/qxl.c | 8 ++-- hw/display/sm501.c | 2 +- hw/display/ssd0303.c | 2 +- hw/display/ssd0323.c | 2 +- hw/display/tc6393xb.c | 2 +- hw/display/tcx.c | 4 +- hw/display/vga-isa-mm.c | 2 +- hw/display/vga-isa.c | 2 +- hw/display/vga-pci.c | 2 +- hw/display/vmware_vga.c | 7 +-- hw/display/xenfb.c | 2 +- hw/unicore32/puv3.c | 2 +- include/ui/console.h | 22 ++++++++-- ui/cocoa.m | 2 +- ui/console.c | 99 +++++++++++++++++++++++++++++++++++++----- ui/curses.c | 2 +- ui/gtk.c | 2 +- ui/sdl.c | 2 +- ui/spice-display.c | 2 +- ui/vnc.c | 2 +- 30 files changed, 142 insertions(+), 50 deletions(-)
PATCH 1/6 console: qom-ify QemuConsole
Just the minimal bits to turn QemuConsoles into Objects.
--- hw/display/xenfb.c | 2 +- include/ui/console.h | 15 +++++++++++++++ ui/console.c | 15 ++++++++++++++- 3 files changed, 30 insertions(+), 2 deletions(-)
hw/display/xenfb.c +1 -1
@@ -987,7 +987,7 @@ wait_more:/* vfb */ fb = container_of(xfb, struct XenFB, c.xendev); - fb->c.con =graphic_console_init (&xenfb_ops, fb); + fb->c.con =graphic_console_init (NULL , &xenfb_ops, fb); fb->have_console =1 ;/* vkbd */
include/ui/console.h +15 -0
@@ -2,6 +2,7 @@#define CONSOLE_H #include "ui/qemu-pixman.h" +#include "qom/object.h" #include "qapi/qmp/qdict.h" #include "qemu/notify.h" #include "monitor/monitor.h"
@@ -106,6 +107,20 @@ void kbd_put_keysym(int keysym);/* consoles */ +#define TYPE_QEMU_CONSOLE "qemu-console" +#define QEMU_CONSOLE (obj) \ + OBJECT_CHECK(QemuConsole, (obj), TYPE_QEMU_CONSOLE) +#define QEMU_CONSOLE_GET_CLASS (obj) \ + OBJECT_GET_CLASS(QemuConsoleClass, (obj), TYPE_QEMU_CONSOLE) +#define QEMU_CONSOLE_CLASS (klass) \ + OBJECT_CLASS_CHECK(QemuConsoleClass, (klass), TYPE_QEMU_CONSOLE) + +typedef struct QemuConsoleClass QemuConsoleClass ; + +struct QemuConsoleClass { +ObjectClass parent_class; +}; +#define QEMU_BIG_ENDIAN_FLAG 0x01#define QEMU_ALLOCATED_FLAG 0x02
ui/console.c +14 -1
@@ -113,6 +113,8 @@ typedef enum { } console_type_t;struct QemuConsole { +Object parent; +int index;console_type_t console_type;DisplayState *ds;
@@ -1197,12 +1199,14 @@ static void text_console_update(void *opaque, console_ch_t *chardata)static QemuConsole *new_console (DisplayState *ds,console_type_t console_type) { +Object *obj;QemuConsole *s;int i;if (nb_consoles >=MAX_CONSOLES )return NULL ; - s =g_malloc0 (sizeof (QemuConsole)); + obj =object_new (TYPE_QEMU_CONSOLE ); + s =QEMU_CONSOLE (obj);if (!active_console || ((active_console->console_type !=GRAPHIC_CONSOLE ) && (console_type ==GRAPHIC_CONSOLE ))) { active_console = s;
@@ -1920,8 +1924,17 @@ static void qemu_chr_parse_vc(QemuOpts *opts, ChardevBackend *backend, } } +static const TypeInfo qemu_console_info = { + .name =TYPE_QEMU_CONSOLE , + .parent =TYPE_OBJECT , + .instance_size =sizeof (QemuConsole), + .class_size =sizeof (QemuConsoleClass), +}; + +static void register_types (void ) { +type_register_static (&qemu_console_info);register_char_driver_qapi ("vc" ,CHARDEV_BACKEND_KIND_VC , qemu_chr_parse_vc); }
Signature · 1 line
1.7.9.7
PATCH 2/6 console: add device link to QemuConsoles
In reply to Gerd HoffmannSo it is possible to figure which qemu console displays which device.
--- hw/arm/musicpal.c | 2 +- hw/display/blizzard.c | 2 +- hw/display/cirrus_vga.c | 4 ++-- hw/display/exynos4210_fimd.c | 2 +- hw/display/g364fb.c | 2 +- hw/display/jazz_led.c | 2 +- hw/display/milkymist-vgafb.c | 2 +- hw/display/omap_lcdc.c | 2 +- hw/display/pl110.c | 2 +- hw/display/pxa2xx_lcd.c | 2 +- hw/display/qxl.c | 4 ++-- hw/display/sm501.c | 2 +- hw/display/ssd0303.c | 2 +- hw/display/ssd0323.c | 2 +- hw/display/tc6393xb.c | 2 +- hw/display/tcx.c | 4 ++-- hw/display/vga-isa-mm.c | 2 +- hw/display/vga-isa.c | 2 +- hw/display/vga-pci.c | 2 +- hw/display/vmware_vga.c | 7 ++++--- hw/unicore32/puv3.c | 2 +- include/ui/console.h | 3 ++- ui/console.c | 15 ++++++++++++++- 23 files changed, 43 insertions(+), 28 deletions(-)
hw/arm/musicpal.c +1 -1
@@ -616,7 +616,7 @@ static int musicpal_lcd_init(SysBusDevice *dev) "musicpal-lcd", MP_LCD_SIZE);sysbus_init_mmio (dev, &s->iomem); - s->con =graphic_console_init (&musicpal_gfx_ops, s); + s->con =graphic_console_init (DEVICE (dev), &musicpal_gfx_ops, s);qemu_console_resize (s->con,128 *3 ,64 *3 );qdev_init_gpio_in (&dev->qdev, musicpal_lcd_gpio_brigthness_in,3 );
hw/display/blizzard.c +1 -1
@@ -956,7 +956,7 @@ void *s1d13745_init(qemu_irq gpio_int) s->fb =g_malloc (0x180000 ); - s->con =graphic_console_init (&blizzard_ops, s); + s->con =graphic_console_init (NULL , &blizzard_ops, s); surface =qemu_console_surface (s->con);switch (surface_bits_per_pixel (surface)) {
hw/display/cirrus_vga.c +2 -2
@@ -2910,7 +2910,7 @@ static int vga_initfn(ISADevice *dev)vga_common_init (s);cirrus_init_common (&d->cirrus_vga,CIRRUS_ID_CLGD5430 ,0 ,isa_address_space (dev),isa_address_space_io (dev)); - s->con =graphic_console_init (s->hw_ops, s); + s->con =graphic_console_init (DEVICE (dev), s->hw_ops, s);rom_add_vga (VGABIOS_CIRRUS_FILENAME );/* XXX ISA-LFB support */ /* FIXME not qdev yet */
@@ -2957,7 +2957,7 @@ static int pci_cirrus_vga_initfn(PCIDevice *dev)vga_common_init (&s->vga);cirrus_init_common (s, device_id,1 ,pci_address_space (dev),pci_address_space_io (dev)); - s->vga.con =graphic_console_init (s->vga.hw_ops, &s->vga); + s->vga.con =graphic_console_init (DEVICE (dev), s->vga.hw_ops, &s->vga);/* setup PCI */
hw/display/exynos4210_fimd.c +1 -1
@@ -1905,7 +1905,7 @@ static int exynos4210_fimd_init(SysBusDevice *dev)memory_region_init_io (&s->iomem, &exynos4210_fimd_mmio_ops, s,"exynos4210.fimd" ,FIMD_REGS_SIZE );sysbus_init_mmio (dev, &s->iomem); - s->console =graphic_console_init (&exynos4210_fimd_ops, s); + s->console =graphic_console_init (DEVICE (dev), &exynos4210_fimd_ops, s);return 0 ; }
hw/display/g364fb.c +1 -1
@@ -484,7 +484,7 @@ static void g364fb_init(DeviceState *dev, G364State *s) { s->vram =g_malloc0 (s->vram_size); - s->con =graphic_console_init (&g364fb_ops, s); + s->con =graphic_console_init (dev, &g364fb_ops, s);memory_region_init_io (&s->mem_ctrl, &g364fb_ctrl_ops, s,"ctrl" ,0x180000 ); memory_region_init_ram_ptr(&s->mem_vram, "vram",
hw/display/jazz_led.c +1 -1
@@ -267,7 +267,7 @@ static int jazz_led_init(SysBusDevice *dev)memory_region_init_io (&s->iomem, &led_ops, s,"led" ,1 );sysbus_init_mmio (dev, &s->iomem); - s->con =graphic_console_init (&jazz_led_ops, s); + s->con =graphic_console_init (DEVICE (dev), &jazz_led_ops, s);return 0 ; }
hw/display/milkymist-vgafb.c +1 -1
@@ -283,7 +283,7 @@ static int milkymist_vgafb_init(SysBusDevice *dev) "milkymist-vgafb", R_MAX * 4);sysbus_init_mmio (dev, &s->regs_region); - s->con =graphic_console_init (&vgafb_ops, s); + s->con =graphic_console_init (DEVICE (dev), &vgafb_ops, s);return 0 ; }
hw/display/omap_lcdc.c +1 -1
@@ -406,7 +406,7 @@ struct omap_lcd_panel_s *omap_lcdc_init(MemoryRegion *sysmem,memory_region_init_io (&s->iomem, &omap_lcdc_ops, s,"omap.lcdc" ,0x100 );memory_region_add_subregion (sysmem, base, &s->iomem); - s->con =graphic_console_init (&omap_ops, s); + s->con =graphic_console_init (NULL , &omap_ops, s);return s; }
hw/display/pl110.c +1 -1
@@ -457,7 +457,7 @@ static int pl110_init(SysBusDevice *dev)sysbus_init_mmio (dev, &s->iomem);sysbus_init_irq (dev, &s->irq);qdev_init_gpio_in (&s->busdev.qdev, pl110_mux_ctrl_set,1 ); - s->con =graphic_console_init (&pl110_gfx_ops, s); + s->con =graphic_console_init (DEVICE (dev), &pl110_gfx_ops, s);return 0 ; }
hw/display/pxa2xx_lcd.c +1 -1
@@ -1013,7 +1013,7 @@ PXA2xxLCDState *pxa2xx_lcdc_init(MemoryRegion *sysmem, "pxa2xx-lcd-controller", 0x00100000);memory_region_add_subregion (sysmem, base, &s->iomem); - s->con =graphic_console_init (&pxa2xx_ops, s); + s->con =graphic_console_init (NULL , &pxa2xx_ops, s); surface =qemu_console_surface (s->con);switch (surface_bits_per_pixel (surface)) {
hw/display/qxl.c +2 -2
@@ -2069,7 +2069,7 @@ static int qxl_init_primary(PCIDevice *dev)portio_list_init (qxl_vga_port_list, qxl_vga_portio_list, vga,"vga" );portio_list_add (qxl_vga_port_list,pci_address_space_io (dev),0x3b0 ); - vga->con =graphic_console_init (&qxl_ops, qxl); + vga->con =graphic_console_init (DEVICE (dev), &qxl_ops, qxl);qemu_spice_display_init_common (&qxl->ssd); rc =qxl_init_common (qxl);
@@ -2094,7 +2094,7 @@ static int qxl_init_secondary(PCIDevice *dev)memory_region_init_ram (&qxl->vga.vram,"qxl.vgavram" , qxl->vga.vram_size);vmstate_register_ram (&qxl->vga.vram, &qxl->pci.qdev); qxl->vga.vram_ptr =memory_region_get_ram_ptr (&qxl->vga.vram); - qxl->vga.con =graphic_console_init (&qxl_ops, qxl); + qxl->vga.con =graphic_console_init (DEVICE (dev), &qxl_ops, qxl);return qxl_init_common (qxl); }
hw/display/sm501.c +1 -1
@@ -1448,5 +1448,5 @@ void sm501_init(MemoryRegion *address_space_mem, uint32_t base, }/* create qemu graphic console */ - s->con =graphic_console_init (&sm501_ops, s); + s->con =graphic_console_init (DEVICE (dev), &sm501_ops, s); }
hw/display/ssd0303.c +1 -1
@@ -293,7 +293,7 @@ static int ssd0303_init(I2CSlave *i2c) {ssd0303_state *s =FROM_I2C_SLAVE (ssd0303_state, i2c); - s->con =graphic_console_init (&ssd0303_ops, s); + s->con =graphic_console_init (DEVICE (i2c), &ssd0303_ops, s);qemu_console_resize (s->con,96 *MAGNIFY ,16 *MAGNIFY );return 0 ; }
hw/display/ssd0323.c +1 -1
@@ -342,7 +342,7 @@ static int ssd0323_init(SSISlave *dev) s->col_end =63 ; s->row_end =79 ; - s->con =graphic_console_init (&ssd0323_ops, s); + s->con =graphic_console_init (DEVICE (dev), &ssd0323_ops, s);qemu_console_resize (s->con,128 *MAGNIFY ,64 *MAGNIFY );qdev_init_gpio_in (&dev->qdev, ssd0323_cd,1 );
hw/display/tc6393xb.c +1 -1
@@ -587,7 +587,7 @@ TC6393xbState *tc6393xb_init(MemoryRegion *sysmem, uint32_t base, qemu_irq irq)memory_region_add_subregion (sysmem, base +0x100000 , &s->vram); s->scr_width =480 ; s->scr_height =640 ; - s->con =graphic_console_init (&tc6393xb_gfx_ops, s); + s->con =graphic_console_init (NULL , &tc6393xb_gfx_ops, s);return s; }
hw/display/tcx.c +2 -2
@@ -571,14 +571,14 @@ static int tcx_init1(SysBusDevice *dev) &s->vram_mem, vram_offset, size);sysbus_init_mmio (dev, &s->vram_cplane); - s->con =graphic_console_init (&tcx24_ops, s); + s->con =graphic_console_init (DEVICE (dev), &tcx24_ops, s); }else {/* THC 8 bit (dummy) */ memory_region_init_io (&s->thc8, &dummy_ops, s,"tcx.thc8" ,TCX_THC_NREGS_8 );sysbus_init_mmio (dev, &s->thc8); - s->con =graphic_console_init (&tcx_ops, s); + s->con =graphic_console_init (DEVICE (dev), &tcx_ops, s); }qemu_console_resize (s->con, s->width, s->height);
hw/display/vga-isa-mm.c +1 -1
@@ -135,7 +135,7 @@ int isa_vga_mm_init(hwaddr vram_base,vga_common_init (&s->vga);vga_mm_init (s, vram_base, ctrl_base, it_shift, address_space); - s->vga.con =graphic_console_init (s->vga.hw_ops, s); + s->vga.con =graphic_console_init (NULL , s->vga.hw_ops, s);vga_init_vbe (&s->vga, address_space);return 0 ;
hw/display/vga-isa.c +1 -1
@@ -62,7 +62,7 @@ static int vga_initfn(ISADevice *dev) isa_mem_base +0x000a0000 , vga_io_memory, 1);memory_region_set_coalescing (vga_io_memory); - s->con =graphic_console_init (s->hw_ops, s); + s->con =graphic_console_init (DEVICE (dev), s->hw_ops, s);vga_init_vbe (s,isa_address_space (dev));/* ROM BIOS */
hw/display/vga-pci.c +1 -1
@@ -150,7 +150,7 @@ static int pci_std_vga_initfn(PCIDevice *dev)vga_common_init (s);vga_init (s,pci_address_space (dev),pci_address_space_io (dev), true); - s->con =graphic_console_init (s->hw_ops, s); + s->con =graphic_console_init (DEVICE (dev), s->hw_ops, s);/* XXX: VGA_RAM_SIZE must be a power of two */ pci_register_bar (&d->dev,0 ,PCI_BASE_ADDRESS_MEM_PREFETCH , &s->vram);
hw/display/vmware_vga.c +4 -3
@@ -1185,13 +1185,13 @@ static const GraphicHwOps vmsvga_ops = { .text_update = vmsvga_text_update, }; -static void vmsvga_init (struct vmsvga_state_s *s, +static void vmsvga_init (DeviceState *dev,struct vmsvga_state_s *s,MemoryRegion *address_space,MemoryRegion *io) { s->scratch_size =SVGA_SCRATCH_SIZE ; s->scratch =g_malloc (s->scratch_size *4 ); - s->vga.con =graphic_console_init (&vmsvga_ops, s); + s->vga.con =graphic_console_init (dev, &vmsvga_ops, s); s->fifo_size =SVGA_FIFO_SIZE ;memory_region_init_ram (&s->fifo_ram,"vmsvga.fifo" , s->fifo_size);
@@ -1258,7 +1258,8 @@ static int pci_vmsvga_initfn(PCIDevice *dev)memory_region_set_flush_coalesced (&s->io_bar);pci_register_bar (&s->card,0 ,PCI_BASE_ADDRESS_SPACE_IO , &s->io_bar); -vmsvga_init (&s->chip,pci_address_space (dev),pci_address_space_io (dev)); +vmsvga_init (DEVICE (dev), &s->chip, +pci_address_space (dev),pci_address_space_io (dev));pci_register_bar (&s->card,1 ,PCI_BASE_ADDRESS_MEM_PREFETCH , &s->chip.vga.vram);
hw/unicore32/puv3.c +1 -1
@@ -94,7 +94,7 @@ static void puv3_load_kernel(const char *kernel_filename) }/* cheat curses that we have a graphic console, only under ocd console */ -graphic_console_init (&no_ops,NULL ); +graphic_console_init (NULL , &no_ops,NULL ); }static void puv3_init (QEMUMachineInitArgs *args)
include/ui/console.h +2 -1
@@ -291,7 +291,8 @@ typedef struct GraphicHwOps {void (*update_interval)(void *opaque,uint64_t interval); } GraphicHwOps; -QemuConsole *graphic_console_init (const GraphicHwOps *ops, +QemuConsole *graphic_console_init (DeviceState *dev, +const GraphicHwOps *ops,void *opaque);void graphic_hw_update (QemuConsole *con);
ui/console.c +14 -1
@@ -23,6 +23,7 @@*/ #include "qemu-common.h" #include "ui/console.h" +#include "hw/qdev-core.h" #include "qemu/timer.h" #include "qmp-commands.h" #include "sysemu/char.h"
@@ -122,6 +123,7 @@ struct QemuConsole {int dcls;/* Graphic console state. */ +Object *device;const GraphicHwOps *hw_ops;void *hw;
@@ -1199,14 +1201,19 @@ static void text_console_update(void *opaque, console_ch_t *chardata)static QemuConsole *new_console (DisplayState *ds,console_type_t console_type) { +Error *local_err =NULL ;Object *obj;QemuConsole *s;int i;if (nb_consoles >=MAX_CONSOLES )return NULL ; + obj =object_new (TYPE_QEMU_CONSOLE ); s =QEMU_CONSOLE (obj); +object_property_add_link (obj,"device" ,TYPE_DEVICE , + (Object **)&s->device, &local_err); +if (!active_console || ((active_console->console_type !=GRAPHIC_CONSOLE ) && (console_type ==GRAPHIC_CONSOLE ))) { active_console = s;
@@ -1557,9 +1564,11 @@ DisplayState *init_displaystate(void)return display_state; } -QemuConsole *graphic_console_init (const GraphicHwOps *hw_ops, +QemuConsole *graphic_console_init (DeviceState *dev, +const GraphicHwOps *hw_ops,void *opaque) { +Error *local_err =NULL ;int width =640 ;int height =480 ;QemuConsole *s;
@@ -1570,6 +1579,10 @@ QemuConsole *graphic_console_init(const GraphicHwOps *hw_ops, s =new_console (ds,GRAPHIC_CONSOLE ); s->hw_ops = hw_ops; s->hw = opaque; +if (dev) { +object_property_set_link (OBJECT (s),OBJECT (dev), +"device" , &local_err); + } s->surface =qemu_create_displaysurface (width, height);return s;
Signature · 1 line
1.7.9.7
PATCH 3/6 console: add qemu_console_lookup_by_device
In reply to Gerd HoffmannLook up the QemuConsole for a given device, using the new link.
--- include/ui/console.h | 1 + ui/console.c | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+)
include/ui/console.h +1 -0
@@ -300,6 +300,7 @@ void graphic_hw_invalidate(QemuConsole *con);void graphic_hw_text_update (QemuConsole *con,console_ch_t *chardata);QemuConsole *qemu_console_lookup_by_index (unsigned int index); +QemuConsole *qemu_console_lookup_by_device (DeviceState *dev);bool qemu_console_is_visible (QemuConsole *con);bool qemu_console_is_graphic (QemuConsole *con);bool qemu_console_is_fixedsize (QemuConsole *con);
ui/console.c +19 -0
@@ -1596,6 +1596,25 @@ QemuConsole *qemu_console_lookup_by_index(unsigned int index)return consoles[index]; } +QemuConsole *qemu_console_lookup_by_device (DeviceState *dev) +{ +Error *local_err =NULL ; +Object *obj; +int i; + +for (i =0 ; i < nb_consoles; i++) { +if (!consoles[i]) { +continue ; + } + obj =object_property_get_link (OBJECT (consoles[i]), +"device" , &local_err); +if (DEVICE (obj) == dev) { +return consoles[i]; + } + } +return NULL ; +} +bool qemu_console_is_visible (QemuConsole *con) {return (con == active_console) || (con->dcls >0 );
Signature · 1 line
1.7.9.7
PATCH 4/6 console: switch ppm_save to qemu_open
In reply to Gerd Hoffmann... so it works with fdset.
--- ui/console.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
ui/console.c +4 -2
@@ -269,18 +269,20 @@ static void ppm_save(const char *filename, struct DisplaySurface *ds, {int width =pixman_image_get_width (ds->image);int height =pixman_image_get_height (ds->image); +int fd;FILE *f;int y;int ret;pixman_image_t *linebuf;trace_ppm_save (filename, ds); - f =fopen (filename,"wb" ); -if (!f) { + fd =qemu_open (filename,O_WRONLY |O_CREAT |O_TRUNC |O_BINARY ,0666 ); +if (fd ==-1 ) {error_setg (errp,"failed to open file '%s': %s" , filename,strerror (errno));return ; } + f =fdopen (fd,"wb" ); ret =fprintf (f,"P6\n%d %d\n%d\n" , width, height,255 );if (ret <0 ) { linebuf =NULL ;
Signature · 1 line
1.7.9.7
PATCH 5/6 console: zap ds arg from register_displaychangelistener
In reply to Gerd HoffmannWe don't have multiple DisplayStates any more,
so passing it in as argument is not needed.
--- hw/display/qxl.c | 4 +--- include/ui/console.h | 3 +-- ui/cocoa.m | 2 +- ui/console.c | 10 +++++----- ui/curses.c | 2 +- ui/gtk.c | 2 +- ui/sdl.c | 2 +- ui/spice-display.c | 2 +- ui/vnc.c | 2 +- 9 files changed, 13 insertions(+), 16 deletions(-)
hw/display/qxl.c +1 -3
@@ -2058,7 +2058,6 @@ static int qxl_init_primary(PCIDevice *dev)PCIQXLDevice *qxl =DO_UPCAST (PCIQXLDevice, pci, dev);VGACommonState *vga = &qxl->vga;PortioList *qxl_vga_port_list =g_new (PortioList,1 ); -DisplayState *ds;int rc; qxl->id =0 ;
@@ -2079,8 +2078,7 @@ static int qxl_init_primary(PCIDevice *dev) qxl->ssd.dcl.ops = &display_listener_ops; qxl->ssd.dcl.con = vga->con; - ds =qemu_console_displaystate (vga->con); -register_displaychangelistener (ds, &qxl->ssd.dcl); +register_displaychangelistener (&qxl->ssd.dcl);return rc; }
include/ui/console.h +1 -2
@@ -221,8 +221,7 @@ static inline int is_buffer_shared(DisplaySurface *surface)return !(surface->flags &QEMU_ALLOCATED_FLAG ); } -void register_displaychangelistener (DisplayState *ds, -DisplayChangeListener *dcl); +void register_displaychangelistener (DisplayChangeListener *dcl);void update_displaychangelistener (DisplayChangeListener *dcl,uint64_t interval);void unregister_displaychangelistener (DisplayChangeListener *dcl);
ui/cocoa.m +1 -1
@@ -1030,7 +1030,7 @@ void cocoa_display_init(DisplayState *ds, int full_screen) // register vga output callbacks dcl->ops = &dcl_ops; - register_displaychangelistener(ds, dcl); + register_displaychangelistener(dcl); // register cleanup function atexit(cocoa_cleanup);
ui/console.c +5 -5
@@ -178,6 +178,7 @@ static int nb_consoles = 0;static void text_console_do_init (CharDriverState *chr,DisplayState *ds);static void dpy_refresh (DisplayState *s); +static DisplayState *get_alloc_displaystate (void );static void gui_update (void *opaque) {
@@ -1309,15 +1310,14 @@ void qemu_free_displaysurface(DisplaySurface *surface)g_free (surface); } -void register_displaychangelistener (DisplayState *ds, -DisplayChangeListener *dcl) +void register_displaychangelistener (DisplayChangeListener *dcl) {QemuConsole *con;trace_displaychangelistener_register (dcl, dcl->ops->dpy_name); - dcl->ds = ds; -QLIST_INSERT_HEAD (&ds->listeners, dcl, next); -gui_setup_refresh (ds); + dcl->ds =get_alloc_displaystate (); +QLIST_INSERT_HEAD (&dcl->ds->listeners, dcl, next); +gui_setup_refresh (dcl->ds);if (dcl->con) { dcl->con->dcls++; con = dcl->con;
ui/curses.c +1 -1
@@ -359,7 +359,7 @@ void curses_display_init(DisplayState *ds, int full_screen) dcl = (DisplayChangeListener *)g_malloc0 (sizeof (DisplayChangeListener)); dcl->ops = &dcl_ops; -register_displaychangelistener (ds, dcl); +register_displaychangelistener (dcl); invalidate =1 ; }
ui/gtk.c +1 -1
@@ -1470,7 +1470,7 @@ void gtk_display_init(DisplayState *ds)gtk_widget_show_all (s->window); -register_displaychangelistener (ds, &s->dcl); +register_displaychangelistener (&s->dcl); global_state = s; }
ui/sdl.c +1 -1
@@ -937,7 +937,7 @@ void sdl_display_init(DisplayState *ds, int full_screen, int no_frame) dcl =g_malloc0 (sizeof (DisplayChangeListener)); dcl->ops = &dcl_ops; -register_displaychangelistener (ds, dcl); +register_displaychangelistener (dcl); mouse_mode_notifier.notify = sdl_mouse_mode_change;qemu_add_mouse_mode_change_notifier (&mouse_mode_notifier);
ui/spice-display.c +1 -1
@@ -625,7 +625,7 @@ void qemu_spice_display_init(DisplayState *ds) ssd->dcl.ops = &display_listener_ops; ssd->dcl.con =qemu_console_lookup_by_index (0 ); -register_displaychangelistener (ds, &ssd->dcl); +register_displaychangelistener (&ssd->dcl);qemu_spice_create_host_primary (ssd); }
ui/vnc.c +1 -1
@@ -2832,7 +2832,7 @@ void vnc_display_init(DisplayState *ds)vnc_start_worker_thread (); vs->dcl.ops = &dcl_ops; -register_displaychangelistener (ds, &vs->dcl); +register_displaychangelistener (&vs->dcl); }
Signature · 1 line
1.7.9.7
PATCH 6/6 console: add dummy surface for guests without graphic card
In reply to Gerd HoffmannSo users get a notification instead of a crash.
--- ui/console.c | 34 ++++++++++++++++++++++++++++++++-- 1 file changed, 32 insertions(+), 2 deletions(-)
ui/console.c +32 -2
@@ -1300,6 +1300,28 @@ DisplaySurface *qemu_create_displaysurface_from(int width, int height, int bpp,return surface; } +static DisplaySurface *qemu_create_dummy_surface (void ) +{ +static const char msg[] = +"This VM has no graphic display device." ; +DisplaySurface *surface =qemu_create_displaysurface (640 ,480 ); +pixman_color_t bg = color_table_rgb[0 ][COLOR_BLACK ]; +pixman_color_t fg = color_table_rgb[0 ][COLOR_WHITE ]; +pixman_image_t *glyph; +int len, x, y, i; + + len =strlen (msg); + x = (640 /FONT_WIDTH - len) /2 ; + y = (480 /FONT_HEIGHT -1 ) /2 ; +for (i =0 ; i < len; i++) { + glyph =qemu_pixman_glyph_from_vgafont (FONT_HEIGHT , vgafont16, msg[i]); +qemu_pixman_glyph_render (glyph, surface->image, &fg, &bg, + x+i, y,FONT_WIDTH ,FONT_HEIGHT ); +qemu_pixman_image_unref (glyph); + } +return surface; +} +void qemu_free_displaysurface (DisplaySurface *surface) {if (surface ==NULL ) {
@@ -1312,6 +1334,7 @@ void qemu_free_displaysurface(DisplaySurface *surface)void register_displaychangelistener (DisplayChangeListener *dcl) { +static DisplaySurface *dummy;QemuConsole *con;trace_displaychangelistener_register (dcl, dcl->ops->dpy_name);
@@ -1324,8 +1347,15 @@ void register_displaychangelistener(DisplayChangeListener *dcl) }else { con = active_console; } -if (dcl->ops->dpy_gfx_switch && con) { - dcl->ops->dpy_gfx_switch (dcl, con->surface); +if (dcl->ops->dpy_gfx_switch) { +if (con) { + dcl->ops->dpy_gfx_switch (dcl, con->surface); + }else { +if (!dummy) { + dummy =qemu_create_dummy_surface (); + } + dcl->ops->dpy_gfx_switch (dcl, dummy); + } } }
Signature · 1 line
1.7.9.7
Pulled. Thanks.
Regards,
Anthony Liguori