[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-commits] [qemu/qemu] c71465: qemu-edid: drop cast
|
From: |
Peter Maydell |
|
Subject: |
[Qemu-commits] [qemu/qemu] c71465: qemu-edid: drop cast |
|
Date: |
Wed, 14 Oct 2020 07:30:39 -0700 |
Branch: refs/heads/master
Home: https://github.com/qemu/qemu
Commit: c7146542b18a07672cf1d322b4c7500786b56275
https://github.com/qemu/qemu/commit/c7146542b18a07672cf1d322b4c7500786b56275
Author: Gerd Hoffmann <kraxel@redhat.com>
Date: 2020-10-14 (Wed, 14 Oct 2020)
Changed paths:
M qemu-edid.c
Log Message:
-----------
qemu-edid: drop cast
Not needed and makes some compilers error out with:
qemu-edid.c:15:1: error: initializer element is not constant
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Message-id: 20201013091615.14166-1-kraxel@redhat.com
Commit: 80d3ab61ad1d60e02717b8fa5fec86d8d0d9520f
https://github.com/qemu/qemu/commit/80d3ab61ad1d60e02717b8fa5fec86d8d0d9520f
Author: Yonggang Luo <luoyonggang@gmail.com>
Date: 2020-10-14 (Wed, 14 Oct 2020)
Changed paths:
M configure
M ui/curses.c
Log Message:
-----------
curses: Fixes compiler error that complain don't have langinfo.h on
msys2/mingw
msys2/mingw lacks the POSIX-required langinfo.h.
gcc test.c -DNCURSES_WIDECHAR -I/mingw64/include/ncursesw -pipe -lncursesw
-lgnurx -ltre -lintl -liconv
test.c:4:10: fatal error: langinfo.h: No such file or directory
4 | #include <langinfo.h>
| ^~~~~~~~~~~~
compilation terminated.
So we using g_get_codeset instead of nl_langinfo(CODESET)
Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
Reviewed-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-id: 20201012234348.1427-3-luoyonggang@gmail.com
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Commit: 65f5279761e20a1754dce450ca111382ff3b1e5c
https://github.com/qemu/qemu/commit/65f5279761e20a1754dce450ca111382ff3b1e5c
Author: Yonggang Luo <luoyonggang@gmail.com>
Date: 2020-10-14 (Wed, 14 Oct 2020)
Changed paths:
M ui/curses.c
Log Message:
-----------
curses: Fixes curses compiling errors.
This is the compiling error:
../ui/curses.c: In function 'curses_refresh':
../ui/curses.c:256:5: error: 'next_maybe_keycode' may be used uninitialized in
this function [-Werror=maybe-uninitialized]
256 | curses2foo(_curses2keycode, _curseskey2keycode, chr, maybe_keycode)
| ^~~~~~~~~~
../ui/curses.c:302:32: note: 'next_maybe_keycode' was declared here
302 | enum maybe_keycode next_maybe_keycode;
| ^~~~~~~~~~~~~~~~~~
../ui/curses.c:256:5: error: 'maybe_keycode' may be used uninitialized in this
function [-Werror=maybe-uninitialized]
256 | curses2foo(_curses2keycode, _curseskey2keycode, chr, maybe_keycode)
| ^~~~~~~~~~
../ui/curses.c:265:24: note: 'maybe_keycode' was declared here
265 | enum maybe_keycode maybe_keycode;
| ^~~~~~~~~~~~~
cc1.exe: all warnings being treated as errors
gcc version 10.2.0 (Rev1, Built by MSYS2 project)
Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
Reviewed-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Message-id: 20201012234348.1427-4-luoyonggang@gmail.com
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Commit: 7c3afc8570b7278f9a435e359effd22bc2287d96
https://github.com/qemu/qemu/commit/7c3afc8570b7278f9a435e359effd22bc2287d96
Author: Yonggang Luo <luoyonggang@gmail.com>
Date: 2020-10-14 (Wed, 14 Oct 2020)
Changed paths:
M configure
M include/sysemu/os-win32.h
M util/oslib-win32.c
Log Message:
-----------
win32: Simplify gmtime_r detection not depends on if _POSIX_C_SOURCE are
defined on msys2/mingw
We remove the CONFIG_LOCALTIME_R detection option in configure, and move the
check
existence of gmtime_r from configure into C header and source directly by using
macro
`_POSIX_THREAD_SAFE_FUNCTIONS`.
Before this patch, the configure script are always assume the compiler doesn't
define
_POSIX_C_SOURCE macro at all, but that's not true, because thirdparty library
such
as ncursesw may define -D_POSIX_C_SOURCE in it's pkg-config file. And that C
Flags will
added -D_POSIX_C_SOURCE into each QEMU_CFLAGS. And that's causing the following
compiling error:
n file included from C:/work/xemu/qemu/include/qemu/osdep.h:119,
from ../softmmu/main.c:25:
C:/work/xemu/qemu/include/sysemu/os-win32.h:53:12: error: redundant
redeclaration of 'gmtime_r' [-Werror=redundant-decls]
53 | struct tm *gmtime_r(const time_t *timep, struct tm *result);
| ^~~~~~~~
In file included from C:/work/xemu/qemu/include/qemu/osdep.h:94,
from ../softmmu/main.c:25:
C:/CI-Tools/msys64/mingw64/x86_64-w64-mingw32/include/time.h:284:36: note:
previous definition of 'gmtime_r' was here
284 | __forceinline struct tm *__CRTDECL gmtime_r(const time_t *_Time, struct
tm *_Tm) {
| ^~~~~~~~
In file included from C:/work/xemu/qemu/include/qemu/osdep.h:119,
from ../softmmu/main.c:25:
C:/work/xemu/qemu/include/sysemu/os-win32.h:55:12: error: redundant
redeclaration of 'localtime_r' [-Werror=redundant-decls]
55 | struct tm *localtime_r(const time_t *timep, struct tm *result);
| ^~~~~~~~~~~
In file included from C:/work/xemu/qemu/include/qemu/osdep.h:94,
from ../softmmu/main.c:25:
C:/CI-Tools/msys64/mingw64/x86_64-w64-mingw32/include/time.h:281:36: note:
previous definition of 'localtime_r' was here
281 | __forceinline struct tm *__CRTDECL localtime_r(const time_t *_Time,
struct tm *_Tm) {
| ^~~~~~~~~~~
Compiling C object libcommon.fa.p/hw_gpio_zaurus.c.obj
In file included from C:/work/xemu/qemu/include/qemu/osdep.h:119,
from ../hw/i2c/smbus_slave.c:16:
C:/work/xemu/qemu/include/sysemu/os-win32.h:53:12: error: redundant
redeclaration of 'gmtime_r' [-Werror=redundant-decls]
53 | struct tm *gmtime_r(const time_t *timep, struct tm *result);
| ^~~~~~~~
In file included from C:/work/xemu/qemu/include/qemu/osdep.h:94,
from ../hw/i2c/smbus_slave.c:16:
C:/CI-Tools/msys64/mingw64/x86_64-w64-mingw32/include/time.h:284:36: note:
previous definition of 'gmtime_r' was here
284 | __forceinline struct tm *__CRTDECL gmtime_r(const time_t *_Time, struct
tm *_Tm) {
| ^~~~~~~~
In file included from C:/work/xemu/qemu/include/qemu/osdep.h:119,
from ../hw/i2c/smbus_slave.c:16:
C:/work/xemu/qemu/include/sysemu/os-win32.h:55:12: error: redundant
redeclaration of 'localtime_r' [-Werror=redundant-decls]
55 | struct tm *localtime_r(const time_t *timep, struct tm *result);
| ^~~~~~~~~~~
In file included from C:/work/xemu/qemu/include/qemu/osdep.h:94,
from ../hw/i2c/smbus_slave.c:16:
C:/CI-Tools/msys64/mingw64/x86_64-w64-mingw32/include/time.h:281:36: note:
previous definition of 'localtime_r' was here
281 | __forceinline struct tm *__CRTDECL localtime_r(const time_t *_Time,
struct tm *_Tm) {
| ^~~~~~~~~~~
Compiling C object libcommon.fa.p/hw_dma_xilinx_axidma.c.obj
After this patch, whenever ncursesw or other thirdparty libraries tried to
define or not
define _POSIX_C_SOURCE, the source will building properly. Because now, we
don't make any
assumption if _POSIX_C_SOURCE are defined. We solely relied on if the macro
`_POSIX_THREAD_SAFE_FUNCTIONS`
are defined in msys2/mingw header.
The _POSIX_THREAD_SAFE_FUNCTIONS are defined in mingw header like this:
```
#if defined(_POSIX_C_SOURCE) && !defined(_POSIX_THREAD_SAFE_FUNCTIONS)
#define _POSIX_THREAD_SAFE_FUNCTIONS 200112L
#endif
#ifdef _POSIX_THREAD_SAFE_FUNCTIONS
__forceinline struct tm *__CRTDECL localtime_r(const time_t *_Time, struct tm
*_Tm) {
return localtime_s(_Tm, _Time) ? NULL : _Tm;
}
__forceinline struct tm *__CRTDECL gmtime_r(const time_t *_Time, struct tm
*_Tm) {
return gmtime_s(_Tm, _Time) ? NULL : _Tm;
}
__forceinline char *__CRTDECL ctime_r(const time_t *_Time, char *_Str) {
return ctime_s(_Str, 0x7fffffff, _Time) ? NULL : _Str;
}
__forceinline char *__CRTDECL asctime_r(const struct tm *_Tm, char * _Str) {
return asctime_s(_Str, 0x7fffffff, _Tm) ? NULL : _Str;
}
#endif
```
Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Message-id: 20201012234348.1427-5-luoyonggang@gmail.com
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Commit: 5285e593c33d7893ed7489b71f0fae95baa19e0a
https://github.com/qemu/qemu/commit/5285e593c33d7893ed7489b71f0fae95baa19e0a
Author: Yonggang Luo <luoyonggang@gmail.com>
Date: 2020-10-14 (Wed, 14 Oct 2020)
Changed paths:
M configure
M meson.build
M meson_options.txt
M ui/meson.build
Log Message:
-----------
configure: Fixes ncursesw detection under msys2/mingw by convert them to meson
The mingw pkg-config are showing following absolute path and contains : as the
separator,
-D_XOPEN_SOURCE=600 -D_POSIX_C_SOURCE=199506L
-IC:/CI-Tools/msys64/mingw64/include/ncursesw:-I/usr/include/ncursesw:
-DNCURSES_WIDECHAR -D_XOPEN_SOURCE=600 -D_POSIX_C_SOURCE=199506L -IC -pipe
-lncursesw -lgnurx -ltre -lintl -liconv
-DNCURSES_WIDECHAR -D_XOPEN_SOURCE=600 -D_POSIX_C_SOURCE=199506L -IC -lncursesw
-DNCURSES_WIDECHAR -D_XOPEN_SOURCE=600 -D_POSIX_C_SOURCE=199506L -IC -lcursesw
-DNCURSES_WIDECHAR /CI-Tools/msys64/mingw64/include/ncursesw -pipe -lncursesw
-lgnurx -ltre -lintl -liconv
-DNCURSES_WIDECHAR /CI-Tools/msys64/mingw64/include/ncursesw -lncursesw
-DNCURSES_WIDECHAR /CI-Tools/msys64/mingw64/include/ncursesw -lcursesw
-DNCURSES_WIDECHAR -I/usr/include/ncursesw -pipe -lncursesw -lgnurx -ltre
-lintl -liconv
-DNCURSES_WIDECHAR -I/usr/include/ncursesw -lncursesw
-DNCURSES_WIDECHAR -I/usr/include/ncursesw -lcursesw
Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
Reviewed-by: Gerd Hoffmann <kraxel@redhat.com>
Message-id: 20201012234348.1427-6-luoyonggang@gmail.com
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Commit: db88404a4e0f1cc1d2f26ed8187690088ba38a2b
https://github.com/qemu/qemu/commit/db88404a4e0f1cc1d2f26ed8187690088ba38a2b
Author: Jason Andryuk <jandryuk@gmail.com>
Date: 2020-10-14 (Wed, 14 Oct 2020)
Changed paths:
M ui/vnc-stubs.c
Log Message:
-----------
vnc-stubs: Allow -vnc none
Currently `-vnc none` is fatal when built with `--disable-vnc`. Make
vnc_parse accept "none", so QEMU still run without using vnc.
Signed-off-by: Jason Andryuk <jandryuk@gmail.com>
Message-id: 20201009014032.3507-1-jandryuk@gmail.com
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Commit: 67c6f1dbb708f4cf0edc18d427f694654999b4b2
https://github.com/qemu/qemu/commit/67c6f1dbb708f4cf0edc18d427f694654999b4b2
Author: Jan Henrik Weinstock <jan.weinstock@rwth-aachen.de>
Date: 2020-10-14 (Wed, 14 Oct 2020)
Changed paths:
M ui/sdl2.c
Log Message:
-----------
SDL: enable OpenGL context creation
We need to specify SDL_WINDOW_OPENGL if we want to create an OpenGL context on
it, i.e. when using '-device virtio-gpu-pci,virgl=on'
Signed-off-by: Jan Henrik Weinstock <jan.weinstock@rwth-aachen.de>
Message-id: b2ba98b3-2975-0d4d-1c56-f659923c714d@rwth-aachen.de
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Commit: 33d72145d783457973e29aed703b84f820763f47
https://github.com/qemu/qemu/commit/33d72145d783457973e29aed703b84f820763f47
Author: Colin Xu <colin.xu@intel.com>
Date: 2020-10-14 (Wed, 14 Oct 2020)
Changed paths:
M ui/input-linux.c
Log Message:
-----------
input-linux: Reset il->fd handler before closing it
If object-del input-linux object on-the-fly, instance finalize will
close evdev fd without resetting it. However the main thread is still
trying to lock_acquire/lock_release during ppoll, which leads to a very
high CPU utilization.
Signed-off-by: Colin Xu <colin.xu@intel.com>
Reviewed-by: Li Qiang <liq3ea@gmail.com>
Message-id: 20200925021808.26471-1-colin.xu@intel.com
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Commit: 41d004d8af59885da2c21460a73898b1aa09690f
https://github.com/qemu/qemu/commit/41d004d8af59885da2c21460a73898b1aa09690f
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: 2020-10-14 (Wed, 14 Oct 2020)
Changed paths:
M ui/console.c
Log Message:
-----------
ui: Fix default window_id value
./chardev/baum.c expects the default window_id value to be -1, and not 0
which could be confused with a proper window id (when numbered from 0 by
the ui backend).
This fixes getting Braille output with the curses and gtk frontends.
Fixes: f29b3431f62 ("console: move window ID code from baum to sdl")
Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20200914100637.eeommoflirxrgaeh@function>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Commit: 57c98ea9acdcef5021f5671efa6475a5794a51c4
https://github.com/qemu/qemu/commit/57c98ea9acdcef5021f5671efa6475a5794a51c4
Author: Peter Maydell <peter.maydell@linaro.org>
Date: 2020-10-14 (Wed, 14 Oct 2020)
Changed paths:
M configure
M include/sysemu/os-win32.h
M meson.build
M meson_options.txt
M qemu-edid.c
M ui/console.c
M ui/curses.c
M ui/input-linux.c
M ui/meson.build
M ui/sdl2.c
M ui/vnc-stubs.c
M util/oslib-win32.c
Log Message:
-----------
Merge remote-tracking branch 'remotes/kraxel/tags/ui-20201014-pull-request'
into staging
ui: fixes for sdl, curses, vnc, input-linux.
# gpg: Signature made Wed 14 Oct 2020 09:21:35 BST
# gpg: using RSA key 4CB6D8EED3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>" [full]
# gpg: aka "Gerd Hoffmann <gerd@kraxel.org>" [full]
# gpg: aka "Gerd Hoffmann (private) <kraxel@gmail.com>" [full]
# Primary key fingerprint: A032 8CFF B93A 17A7 9901 FE7D 4CB6 D8EE D3E8 7138
* remotes/kraxel/tags/ui-20201014-pull-request:
ui: Fix default window_id value
input-linux: Reset il->fd handler before closing it
SDL: enable OpenGL context creation
vnc-stubs: Allow -vnc none
configure: Fixes ncursesw detection under msys2/mingw by convert them to meson
win32: Simplify gmtime_r detection not depends on if _POSIX_C_SOURCE are
defined on msys2/mingw
curses: Fixes curses compiling errors.
curses: Fixes compiler error that complain don't have langinfo.h on
msys2/mingw
qemu-edid: drop cast
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Compare: https://github.com/qemu/qemu/compare/96292515c07e...57c98ea9acdc
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Qemu-commits] [qemu/qemu] c71465: qemu-edid: drop cast,
Peter Maydell <=