qemu-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Qemu-commits] [qemu/qemu] 7c20b4: console: fix displaychangelisteners i


From: GitHub
Subject: [Qemu-commits] [qemu/qemu] 7c20b4: console: fix displaychangelisteners interface
Date: Mon, 18 Mar 2013 07:30:18 -0700

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 7c20b4a374d0016e3fce005690fb428354a56621
      
https://github.com/qemu/qemu/commit/7c20b4a374d0016e3fce005690fb428354a56621
  Author: Gerd Hoffmann <address@hidden>
  Date:   2013-03-18 (Mon, 18 Mar 2013)

  Changed paths:
    M hw/qxl.c
    M include/ui/console.h
    M include/ui/spice-display.h
    M trace-events
    M ui/cocoa.m
    M ui/console.c
    M ui/curses.c
    M ui/gtk.c
    M ui/sdl.c
    M ui/spice-display.c
    M ui/vnc.c
    M vl.c

  Log Message:
  -----------
  console: fix displaychangelisteners interface

Split callbacks into separate Ops struct.  Pass DisplayChangeListener
pointer as first argument to all callbacks.  Uninline a bunch of
display functions and move them from console.h to console.c

Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: 21ef45d71221b4577330fe3aacfb06afad91ad46
      
https://github.com/qemu/qemu/commit/21ef45d71221b4577330fe3aacfb06afad91ad46
  Author: Gerd Hoffmann <address@hidden>
  Date:   2013-03-18 (Mon, 18 Mar 2013)

  Changed paths:
    M include/ui/console.h
    M ui/gtk.c
    M ui/vnc.c
    M ui/vnc.h

  Log Message:
  -----------
  console: kill DisplayState->opaque

It's broken by design.  There can be multiple DisplayChangeListener
instances, so they simply can't store state in the (single) DisplayState
struct.  Try 'qemu -display gtk -vnc :0', watch it crash & burn.

With DisplayChangeListenerOps having a more sane interface now we can
simply use the DisplayChangeListener pointer to get access to our
private data instead.

Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: 9c80a315b47a64043f6b91bd6f14352a455b323e
      
https://github.com/qemu/qemu/commit/9c80a315b47a64043f6b91bd6f14352a455b323e
  Author: Gerd Hoffmann <address@hidden>
  Date:   2013-03-18 (Mon, 18 Mar 2013)

  Changed paths:
    M ui/spice-display.c

  Log Message:
  -----------
  spice: zap sdpy global

DisplayChangeListener is passed now to all DisplayChangeListenerOps
callbacks, so we can use that to access the spice display state and
kill the sdpy global variable.

Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: c6c06853d99127c03778fc1bf9bc2d96a05c108e
      
https://github.com/qemu/qemu/commit/c6c06853d99127c03778fc1bf9bc2d96a05c108e
  Author: Gerd Hoffmann <address@hidden>
  Date:   2013-03-18 (Mon, 18 Mar 2013)

  Changed paths:
    M hw/qxl.c

  Log Message:
  -----------
  qxl: zap qxl0 global

DisplayChangeListener is passed now to all DisplayChangeListenerOps
callbacks, so we can use that to access the qxl state and kill the
qxl0 global variable.

Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: c099e7aa0295678859d58e9e60b7619f6ae3bac8
      
https://github.com/qemu/qemu/commit/c099e7aa0295678859d58e9e60b7619f6ae3bac8
  Author: Gerd Hoffmann <address@hidden>
  Date:   2013-03-18 (Mon, 18 Mar 2013)

  Changed paths:
    M hw/qxl.c

  Log Message:
  -----------
  qxl: better vga init in enter_vga_mode

Ask the vga core to update the display.  Will trigger dpy_gfx_resize
if needed.  More complete than just calling dpy_gfx_resize.

Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: 468dfd6de2df3cbaed8c5cc43f8fbde6f94f9dbc
      
https://github.com/qemu/qemu/commit/468dfd6de2df3cbaed8c5cc43f8fbde6f94f9dbc
  Author: Gerd Hoffmann <address@hidden>
  Date:   2013-03-18 (Mon, 18 Mar 2013)

  Changed paths:
    M ui/sdl.c

  Log Message:
  -----------
  sdl: drop dead code

DisplayAllocator removal (commit
187cd1d9f30d13f0d0ef682e4d91cfa3e4cbd472) made this a nop.

Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: da229ef3b3c5709b01d62e7a6e213b31bca33d16
      
https://github.com/qemu/qemu/commit/da229ef3b3c5709b01d62e7a6e213b31bca33d16
  Author: Gerd Hoffmann <address@hidden>
  Date:   2013-03-18 (Mon, 18 Mar 2013)

  Changed paths:
    M hw/arm/nseries.c
    M hw/arm/palm.c
    M hw/qxl-render.c
    M hw/vga.c
    M hw/xenfb.c
    M include/ui/console.h
    M trace-events
    M ui/console.c

  Log Message:
  -----------
  console: rework DisplaySurface handling [vga emu side]

Decouple DisplaySurface allocation & deallocation from DisplayState.
Replace dpy_gfx_resize + dpy_gfx_setdata with a dpy_gfx_replace_surface
function.

This handles the graphic hardware emulation.

Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: c12aeb860c63ba83190f962e2f0a1c5fe18ad3a6
      
https://github.com/qemu/qemu/commit/c12aeb860c63ba83190f962e2f0a1c5fe18ad3a6
  Author: Gerd Hoffmann <address@hidden>
  Date:   2013-03-18 (Mon, 18 Mar 2013)

  Changed paths:
    M hw/qxl.c
    M include/ui/console.h
    M include/ui/spice-display.h
    M ui/cocoa.m
    M ui/console.c
    M ui/gtk.c
    M ui/sdl.c
    M ui/spice-display.c
    M ui/vnc.c

  Log Message:
  -----------
  console: rework DisplaySurface handling [dcl/ui side]

Replace the dpy_gfx_resize and dpy_gfx_setdata DisplayChangeListener
callbacks with a dpy_gfx_switch callback which notifies the ui code
when the framebuffer backing storage changes.

Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: 626e3b34e30bc62d4f25f7aa4e23a346eba1a2c0
      
https://github.com/qemu/qemu/commit/626e3b34e30bc62d4f25f7aa4e23a346eba1a2c0
  Author: Gerd Hoffmann <address@hidden>
  Date:   2013-03-18 (Mon, 18 Mar 2013)

  Changed paths:
    M include/ui/console.h

  Log Message:
  -----------
  console: add surface_*() getters

Add convinence wrappers to query DisplaySurface properties.
Simliar to ds_get_*, but operating in the DisplaySurface
not the DisplayState.

With this patch in place ui frontents can stop using DisplayState
in the rendering code paths, they can simply operate using the
DisplaySurface passed in via dpy_gfx_switch callback.

Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: 9d9801cf803cdceaa4845fe27150b24d5ab083e6
      
https://github.com/qemu/qemu/commit/9d9801cf803cdceaa4845fe27150b24d5ab083e6
  Author: Gerd Hoffmann <address@hidden>
  Date:   2013-03-18 (Mon, 18 Mar 2013)

  Changed paths:
    M ui/gtk.c

  Log Message:
  -----------
  gtk: stop using DisplayState

Rework DisplayStateListener callbacks to not use the DisplayState
any more.  Factor out the window size handling to a separate function,
so the zoom callbacks can call that directly instead of abusing the
gd_switch DisplayStateListener callback for that.

Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: d39fa6d86d07646e3481e5c3e45a984bff590642
      
https://github.com/qemu/qemu/commit/d39fa6d86d07646e3481e5c3e45a984bff590642
  Author: Gerd Hoffmann <address@hidden>
  Date:   2013-03-18 (Mon, 18 Mar 2013)

  Changed paths:
    M ui/vnc-enc-tight.c
    M ui/vnc-jobs.c
    M ui/vnc.c
    M ui/vnc.h

  Log Message:
  -----------
  vnc: stop using DisplayState

Rework DisplayStateListener callbacks to not use the DisplayState
any more.

Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: 8db9bae94eadcb7d5d07af1ba0c642aafafc5498
      
https://github.com/qemu/qemu/commit/8db9bae94eadcb7d5d07af1ba0c642aafafc5498
  Author: Gerd Hoffmann <address@hidden>
  Date:   2013-03-18 (Mon, 18 Mar 2013)

  Changed paths:
    M ui/sdl.c

  Log Message:
  -----------
  sdl: stop using DisplayState

Rework DisplayStateListener callbacks to not use the DisplayState
any more.

Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: 71874c1751ebb7368eaa023a35ac919d2c1c5e4c
      
https://github.com/qemu/qemu/commit/71874c1751ebb7368eaa023a35ac919d2c1c5e4c
  Author: Gerd Hoffmann <address@hidden>
  Date:   2013-03-18 (Mon, 18 Mar 2013)

  Changed paths:
    M hw/qxl-render.c
    M hw/qxl.c
    M include/ui/spice-display.h
    M ui/spice-display.c

  Log Message:
  -----------
  spice: stop using DisplayState

Rework DisplayStateListener callbacks to not use the DisplayState
any more.

Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: 5e00d3ac475fb4c9afa17612a908e933fe142f00
      
https://github.com/qemu/qemu/commit/5e00d3ac475fb4c9afa17612a908e933fe142f00
  Author: Gerd Hoffmann <address@hidden>
  Date:   2013-03-18 (Mon, 18 Mar 2013)

  Changed paths:
    M ui/cocoa.m

  Log Message:
  -----------
  cocoa: stop using DisplayState

Rework DisplayStateListener callbacks to not use the DisplayState
any more.

Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: bc2ed9704fff2c721e4056ab5281f0291718bfa6
      
https://github.com/qemu/qemu/commit/bc2ed9704fff2c721e4056ab5281f0291718bfa6
  Author: Gerd Hoffmann <address@hidden>
  Date:   2013-03-18 (Mon, 18 Mar 2013)

  Changed paths:
    M hw/qxl.c
    M include/ui/console.h
    M ui/cocoa.m
    M ui/console.c
    M ui/curses.c
    M ui/gtk.c
    M ui/sdl.c
    M ui/spice-display.c
    M ui/vnc.c

  Log Message:
  -----------
  console: zap displaystate from dcl callbacks

Now that nobody depends on DisplayState in DisplayChangeListener
callbacks any more we can remove the parameter from all callbacks.

Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: c78f71378a345ea240c288993ca1378ded5504b9
      
https://github.com/qemu/qemu/commit/c78f71378a345ea240c288993ca1378ded5504b9
  Author: Gerd Hoffmann <address@hidden>
  Date:   2013-03-18 (Mon, 18 Mar 2013)

  Changed paths:
    M hw/arm/musicpal.c
    M hw/blizzard.c
    M hw/cirrus_vga.c
    M hw/exynos4210_fimd.c
    M hw/framebuffer.c
    M hw/framebuffer.h
    M hw/g364fb.c
    M hw/jazz_led.c
    M hw/milkymist-vgafb.c
    M hw/omap_lcdc.c
    M hw/pl110.c
    M hw/pxa2xx_lcd.c
    M hw/qxl-render.c
    M hw/qxl.c
    M hw/sm501.c
    M hw/ssd0303.c
    M hw/ssd0323.c
    M hw/tc6393xb.c
    M hw/tc6393xb_template.h
    M hw/tcx.c
    M hw/vga-isa-mm.c
    M hw/vga-isa.c
    M hw/vga-pci.c
    M hw/vga.c
    M hw/vga_int.h
    M hw/vmware_vga.c
    M hw/xenfb.c
    M include/ui/console.h
    M include/ui/spice-display.h
    M ui/console.c
    M ui/spice-display.c

  Log Message:
  -----------
  console: stop using DisplayState in gfx hardware emulation

Use QemuConsole instead.  Updates interfaces in console.[ch] and adapts
gfx hardware emulation code.

Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: cf6f05481affb600da22dba3c0bc2564e918e8f1
      
https://github.com/qemu/qemu/commit/cf6f05481affb600da22dba3c0bc2564e918e8f1
  Author: Gerd Hoffmann <address@hidden>
  Date:   2013-03-18 (Mon, 18 Mar 2013)

  Changed paths:
    M ui/console.c

  Log Message:
  -----------
  console: zap color_table

qemu_create_surface hands out 32bpp surfaces.
So we can just use color_table_rgb directly.

Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: 1562e53112fd1082c656a06d953a7447ab17e6e1
      
https://github.com/qemu/qemu/commit/1562e53112fd1082c656a06d953a7447ab17e6e1
  Author: Gerd Hoffmann <address@hidden>
  Date:   2013-03-18 (Mon, 18 Mar 2013)

  Changed paths:
    M include/ui/console.h
    M ui/console.c

  Log Message:
  -----------
  console: remove ds_get_* helper functions

Switch the few remaining ds_get_* uses in console.c over to the new
surface_* accessors.

While doing so tripped over a few leftovers from commit
a93a4a226a2afba147ba5df688b85d844f537c68 (code using depth == 0
as indicator for textmode rendering).  Fixed them up.

Finally dropped ds_get_* helper helpers.

Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: e531761d63b7f8fe6b6423fafb3616ebbff768aa
      
https://github.com/qemu/qemu/commit/e531761d63b7f8fe6b6423fafb3616ebbff768aa
  Author: Anthony Liguori <address@hidden>
  Date:   2013-03-18 (Mon, 18 Mar 2013)

  Changed paths:
    M default-configs/arm-softmmu.mak
    M hw/Makefile.objs
    M hw/arm/musicpal.c
    M hw/arm/nseries.c
    M hw/arm/palm.c
    M hw/arm/vexpress.c
    M hw/arm/xilinx_zynq.c
    M hw/arm_sysctl.c
    M hw/blizzard.c
    M hw/cirrus_vga.c
    M hw/exynos4210_fimd.c
    M hw/framebuffer.c
    M hw/framebuffer.h
    M hw/g364fb.c
    M hw/jazz_led.c
    M hw/milkymist-vgafb.c
    M hw/omap_lcdc.c
    M hw/pl110.c
    A hw/pl330.c
    M hw/pxa2xx_lcd.c
    M hw/qdev-core.h
    M hw/qdev-properties.c
    M hw/qdev-properties.h
    M hw/qxl-render.c
    M hw/qxl.c
    M hw/sm501.c
    M hw/ssd0303.c
    M hw/ssd0323.c
    M hw/tc6393xb.c
    M hw/tc6393xb_template.h
    M hw/tcx.c
    M hw/vga-isa-mm.c
    M hw/vga-isa.c
    M hw/vga-pci.c
    M hw/vga.c
    M hw/vga_int.h
    M hw/vmware_vga.c
    M hw/xenfb.c
    M hw/xilinx_spips.c
    M include/qemu-common.h
    M include/ui/console.h
    M include/ui/spice-display.h
    M target-mips/dsp_helper.c
    M target-s390x/kvm.c
    M tests/tcg/mips/mips32-dsp/extr_r_w.c
    M tests/tcg/mips/mips32-dsp/extr_rs_w.c
    M tests/tcg/mips/mips32-dsp/extr_w.c
    M trace-events
    M ui/cocoa.m
    M ui/console.c
    M ui/curses.c
    M ui/gtk.c
    M ui/sdl.c
    M ui/spice-display.c
    M ui/vnc-enc-tight.c
    M ui/vnc-jobs.c
    M ui/vnc.c
    M ui/vnc.h
    M util/Makefile.objs
    A util/hexdump.c
    M util/iov.c
    M vl.c

  Log Message:
  -----------
  Merge remote-tracking branch 'kraxel/pixman.v8' into staging

# By Gerd Hoffmann (18) and others
# Via Blue Swirl (1) and Gerd Hoffmann (1)
* kraxel/pixman.v8: (37 commits)
  console: remove ds_get_* helper functions
  console: zap color_table
  console: stop using DisplayState in gfx hardware emulation
  console: zap displaystate from dcl callbacks
  cocoa: stop using DisplayState
  spice: stop using DisplayState
  sdl: stop using DisplayState
  vnc: stop using DisplayState
  gtk: stop using DisplayState
  console: add surface_*() getters
  console: rework DisplaySurface handling [dcl/ui side]
  console: rework DisplaySurface handling [vga emu side]
  sdl: drop dead code
  qxl: better vga init in enter_vga_mode
  qxl: zap qxl0 global
  spice: zap sdpy global
  console: kill DisplayState->opaque
  console: fix displaychangelisteners interface
  s390: Fix cpu refactoring fallout.
  target-mips: fix rndrashift_short_acc and code for EXTR_ instructions
  ...


Compare: https://github.com/qemu/qemu/compare/225dc991b03f...e531761d63b7

reply via email to

[Prev in Thread] Current Thread [Next in Thread]