Re: [Qemu-devel] [PULL 0/5] console: qom-ify consoles

[Anthony Liguori <anthony@codemonkey.ws>]

Gerd Hoffmann <kraxel@redhat.com> writes:

>   Hi,
>
> Here are the console patches, targeting 1.5.  It's just the QemuConsole
> QOM-ification and two little fixes.
>
> I'll go hold back the screendump monitor patch until the dust from the
> qom api discussions has settled and it is clear which route we are
> taking wrt new vs. extended commands.  Which implies it most likely is
> 1.6 material.

Breaks Xen.

/home/aliguori/git/qemu/hw/display/xenfb.c: In function ‘xen_init_display’:
/home/aliguori/git/qemu/hw/display/xenfb.c:990:5: error: passing argument 1 of ‘graphic_console_init’ from incompatible pointer type [-Werror]
In file included from /home/aliguori/git/qemu/hw/display/xenfb.c:39:0:
/home/aliguori/git/qemu/include/ui/console.h:280:14: note: expected ‘struct DeviceState *’ but argument is of type ‘const struct GraphicHwOps *’
/home/aliguori/git/qemu/hw/display/xenfb.c:990:5: error: passing argument 2 of ‘graphic_console_init’ from incompatible pointer type [-Werror]
In file included from /home/aliguori/git/qemu/hw/display/xenfb.c:39:0:
/home/aliguori/git/qemu/include/ui/console.h:280:14: note: expected ‘const struct GraphicHwOps *’ but argument is of type ‘struct XenFB *’
/home/aliguori/git/qemu/hw/display/xenfb.c:990:5: error: too few arguments to function ‘graphic_console_init’
In file included from /home/aliguori/git/qemu/hw/display/xenfb.c:39:0:
/home/aliguori/git/qemu/include/ui/console.h:280:14: note: declared here

Regards,

Anthony Liguori


> please pull,
>   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.v12
>
> for you to fetch changes up to c7b02648d878828dd88868f59b5d666dbbbf1d6d:
>
>   console: zap ds arg from register_displaychangelistener (2013-04-24 10:37:59 +0200)
>
> ----------------------------------------------------------------
> Gerd Hoffmann (5):
>       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
>
>  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             |    6 ++--
>  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         |   22 ++++++++++++--
>  ui/cocoa.m                   |    2 +-
>  ui/console.c                 |   65 ++++++++++++++++++++++++++++++++++++------
>  ui/curses.c                  |    2 +-
>  ui/gtk.c                     |    2 +-
>  ui/sdl.c                     |    2 +-
>  ui/spice-display.c           |    2 +-
>  ui/vnc.c                     |    2 +-
>  29 files changed, 109 insertions(+), 45 deletions(-)