| Message ID | 1351775057-3938-1-git-send-email-kraxel@redhat.com |
|---|---|
| State | New |
| Headers | show |
Gerd Hoffmann <kraxel@redhat.com> writes: > Hi, > > Sitting on these too long already. Series has been on the list a while > back, only splitted into two parts (separate "console cleanups" series > carrying patches 1-8). Patch 11 was updated according to Paolos > suggestion, otherwise the patches are unmodified. > > please pull, > Gerd Pulled. Thanks. Regards, Anthony Liguori > > The following changes since commit 286d52ebfc0d0d53c2a878e454292fea14bad41b: > > target-mips: don't flush extra TLB on permissions upgrade (2012-10-31 22:20:49 +0100) > > are available in the git repository at: > git://git.kraxel.org/qemu pixman.v3 > > Gerd Hoffmann (22): > console: QLIST-ify display change listeners. > console: add unregister_displaychangelistener > console: move set_mouse + cursor_define callbacks > console: s/TextConsole/QemuConsole/ > console: untangle gfx & txt updates > console: init displaychangelisteners on register > vga: fix text mode updating > console: remove dpy_gfx_fill > console: remove DisplayAllocator > pixman: add submodule > pixman: windup in configure & makefiles > pixman: helper functions > pixman: add pixman image to DisplaySurface > console: make qemu_alloc_display static > console: don't set PixelFormat alpha fields for 32bpp > qxl: stop direct access to DisplaySurface fields. > vga: stop direct access to DisplaySurface fields. > pixman: switch screendump function. > pixman/vnc: use pixman images in vnc. > pixman/vnc: remove rgb_prepare_row* functions > pixman/vnc: remove dead code. > pixman: drop obsolete fields from DisplaySurface > > .gitmodules | 3 + > Makefile | 9 ++ > Makefile.objs | 1 + > configure | 38 ++++++ > console.c | 240 +++++++++++++++++------------------ > console.h | 229 ++++++++++++++++++++------------- > hw/blizzard.c | 4 +- > hw/exynos4210_fimd.c | 2 +- > hw/g364fb.c | 7 +- > hw/jazz_led.c | 6 +- > hw/milkymist-vgafb.c | 2 +- > hw/musicpal.c | 2 +- > hw/nseries.c | 2 +- > hw/omap_lcdc.c | 2 +- > hw/palm.c | 2 +- > hw/pl110.c | 2 +- > hw/pxa2xx_lcd.c | 8 +- > hw/qxl-render.c | 14 +- > hw/qxl.c | 4 +- > hw/sm501.c | 4 +- > hw/ssd0303.c | 2 +- > hw/ssd0323.c | 2 +- > hw/tc6393xb.c | 4 +- > hw/tcx.c | 16 ++-- > hw/vga.c | 111 +++++++++-------- > hw/vga_int.h | 2 + > hw/vmware_vga.c | 15 ++- > hw/xenfb.c | 2 +- > pixman | 1 + > qemu-common.h | 4 +- > qemu-pixman.c | 60 +++++++++ > qemu-pixman.h | 32 +++++ > ui/curses.c | 21 +-- > ui/sdl.c | 140 ++------------------ > ui/spice-display.c | 8 +- > ui/vnc-enc-hextile-template.h | 23 ++-- > ui/vnc-enc-hextile.c | 53 ++------- > ui/vnc-enc-tight.c | 280 +++++++++++++++-------------------------- > ui/vnc-enc-zrle.c | 18 ++-- > ui/vnc-jobs.c | 3 +- > ui/vnc.c | 255 +++++++++++++++++++------------------ > ui/vnc.h | 19 +++- > vl.c | 49 +++++-- > 43 files changed, 847 insertions(+), 854 deletions(-) > create mode 160000 pixman > create mode 100644 qemu-pixman.c > create mode 100644 qemu-pixman.h
Am 01.11.2012 20:33, schrieb Anthony Liguori: > Gerd Hoffmann <kraxel@redhat.com> writes: > >> Hi, >> >> Sitting on these too long already. Series has been on the list a while >> back, only splitted into two parts (separate "console cleanups" series >> carrying patches 1-8). Patch 11 was updated according to Paolos >> suggestion, otherwise the patches are unmodified. >> >> please pull, >> Gerd > > Pulled. Thanks. Getting this on SLES 11 SP2 s390x (pixman 0.16.0): cc1: warnings being treated as errors In file included from /home/andreas/qemu-s390/qemu-pixman.h:4, from /home/andreas/qemu-s390/console.h:5, from /home/andreas/qemu-s390/qemu-timer.c:28: /usr/include/pixman-1/pixman.h:225: error: redundant redeclaration of ‘pixman_transform_from_pixman_f_transform’ /usr/include/pixman-1/pixman.h:221: error: previous declaration of ‘pixman_transform_from_pixman_f_transform’ was here make: *** [qemu-timer.o] Fehler 1 make: *** Warte auf noch nicht beendete Prozesse... Any idea how to resolve? Andreas
Am 02.11.2012 17:14, schrieb Andreas Färber: > Am 01.11.2012 20:33, schrieb Anthony Liguori: >> Gerd Hoffmann <kraxel@redhat.com> writes: >> >>> Hi, >>> >>> Sitting on these too long already. Series has been on the list a while >>> back, only splitted into two parts (separate "console cleanups" series >>> carrying patches 1-8). Patch 11 was updated according to Paolos >>> suggestion, otherwise the patches are unmodified. >>> >>> please pull, >>> Gerd >> >> Pulled. Thanks. > > Getting this on SLES 11 SP2 s390x (pixman 0.16.0): > > cc1: warnings being treated as errors > In file included from /home/andreas/qemu-s390/qemu-pixman.h:4, > from /home/andreas/qemu-s390/console.h:5, > from /home/andreas/qemu-s390/qemu-timer.c:28: > /usr/include/pixman-1/pixman.h:225: error: redundant redeclaration of > ‘pixman_transform_from_pixman_f_transform’ > /usr/include/pixman-1/pixman.h:221: error: previous declaration of > ‘pixman_transform_from_pixman_f_transform’ was here > make: *** [qemu-timer.o] Fehler 1 > make: *** Warte auf noch nicht beendete Prozesse... > > Any idea how to resolve? So, it seems that our pixman 0.16.0 header has a genuine redundant declaration, not influenced by qemu-pixman.h. I worked around it by manually changing -Wredundant-decl to -Wno-redundant-decl in configure, similar to what some FreeBSD versions needed. Suggestions for a real warnings-fix or configure-detection of incompatible headers appreciated! Andreas
Hi, Sitting on these too long already. Series has been on the list a while back, only splitted into two parts (separate "console cleanups" series carrying patches 1-8). Patch 11 was updated according to Paolos suggestion, otherwise the patches are unmodified. please pull, Gerd The following changes since commit 286d52ebfc0d0d53c2a878e454292fea14bad41b: target-mips: don't flush extra TLB on permissions upgrade (2012-10-31 22:20:49 +0100) are available in the git repository at: git://git.kraxel.org/qemu pixman.v3 Gerd Hoffmann (22): console: QLIST-ify display change listeners. console: add unregister_displaychangelistener console: move set_mouse + cursor_define callbacks console: s/TextConsole/QemuConsole/ console: untangle gfx & txt updates console: init displaychangelisteners on register vga: fix text mode updating console: remove dpy_gfx_fill console: remove DisplayAllocator pixman: add submodule pixman: windup in configure & makefiles pixman: helper functions pixman: add pixman image to DisplaySurface console: make qemu_alloc_display static console: don't set PixelFormat alpha fields for 32bpp qxl: stop direct access to DisplaySurface fields. vga: stop direct access to DisplaySurface fields. pixman: switch screendump function. pixman/vnc: use pixman images in vnc. pixman/vnc: remove rgb_prepare_row* functions pixman/vnc: remove dead code. pixman: drop obsolete fields from DisplaySurface .gitmodules | 3 + Makefile | 9 ++ Makefile.objs | 1 + configure | 38 ++++++ console.c | 240 +++++++++++++++++------------------ console.h | 229 ++++++++++++++++++++------------- hw/blizzard.c | 4 +- hw/exynos4210_fimd.c | 2 +- hw/g364fb.c | 7 +- hw/jazz_led.c | 6 +- hw/milkymist-vgafb.c | 2 +- hw/musicpal.c | 2 +- hw/nseries.c | 2 +- hw/omap_lcdc.c | 2 +- hw/palm.c | 2 +- hw/pl110.c | 2 +- hw/pxa2xx_lcd.c | 8 +- hw/qxl-render.c | 14 +- hw/qxl.c | 4 +- hw/sm501.c | 4 +- hw/ssd0303.c | 2 +- hw/ssd0323.c | 2 +- hw/tc6393xb.c | 4 +- hw/tcx.c | 16 ++-- hw/vga.c | 111 +++++++++-------- hw/vga_int.h | 2 + hw/vmware_vga.c | 15 ++- hw/xenfb.c | 2 +- pixman | 1 + qemu-common.h | 4 +- qemu-pixman.c | 60 +++++++++ qemu-pixman.h | 32 +++++ ui/curses.c | 21 +-- ui/sdl.c | 140 ++------------------ ui/spice-display.c | 8 +- ui/vnc-enc-hextile-template.h | 23 ++-- ui/vnc-enc-hextile.c | 53 ++------- ui/vnc-enc-tight.c | 280 +++++++++++++++-------------------------- ui/vnc-enc-zrle.c | 18 ++-- ui/vnc-jobs.c | 3 +- ui/vnc.c | 255 +++++++++++++++++++------------------ ui/vnc.h | 19 +++- vl.c | 49 +++++-- 43 files changed, 847 insertions(+), 854 deletions(-) create mode 160000 pixman create mode 100644 qemu-pixman.c create mode 100644 qemu-pixman.h