[Qemu-commits] [qemu/qemu] 805d8a: nsis: Add QEMU version information to Windows regi...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 805d8a67647768173c27761cd86e6f99a9d3b7cd
      
https://github.com/qemu/qemu/commit/805d8a67647768173c27761cd86e6f99a9d3b7cd
  Author: Stefan Weil <address@hidden>
  Date:   2015-09-24 (Thu, 24 Sep 2015)

  Changed paths:
    M Makefile
    M qemu.nsi

  Log Message:
  -----------
  nsis: Add QEMU version information to Windows registry

The uninstall keys include an option key "DisplayVersion" which we set
now. By default the version value is read from file VERSION, but it is
also possible to pass VERSION=#.#.# to make.

Signed-off-by: Stefan Weil <address@hidden>


  Commit: a246a01631f90230374c2b8ffce608232e2aa654
      
https://github.com/qemu/qemu/commit/a246a01631f90230374c2b8ffce608232e2aa654
  Author: Stefan Weil <address@hidden>
  Date:   2015-09-24 (Thu, 24 Sep 2015)

  Changed paths:
    M slirp/tcp_input.c

  Log Message:
  -----------
  slirp: Fix non blocking connect for w32

Signed-off-by: Stefan Weil <address@hidden>


  Commit: 7c9b2bf67775ecc1359ce973580807d173e7f710
      
https://github.com/qemu/qemu/commit/7c9b2bf67775ecc1359ce973580807d173e7f710
  Author: Paolo Bonzini <address@hidden>
  Date:   2015-09-24 (Thu, 24 Sep 2015)

  Changed paths:
    A docs/win32-qemu-event.promela
    M include/qemu/thread-win32.h
    M util/qemu-thread-win32.c

  Log Message:
  -----------
  qemu-thread: add a fast path to the Win32 QemuEvent

QemuEvents are used heavily by call_rcu.  We do not want them to be slow,
but the current implementation does a kernel call on every invocation
of qemu_event_* and won't cut it.

So, wrap a Win32 manual-reset event with a fast userspace path.  The
states and transitions are the same as for the futex and mutex/condvar
implementations, but the slow path is different of course.  The idea
is to reset the Win32 event lazily, as part of a test-reset-test-wait
sequence.  Such a sequence is, indeed, how QemuEvents are used by
RCU and other subsystems!

The patch includes a formal model of the algorithm.

Tested-by: Stefan Weil <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
Signed-off-by: Stefan Weil <address@hidden>


  Commit: c8f3f17cf1015d6621f79aa6a88280539621a108
      
https://github.com/qemu/qemu/commit/c8f3f17cf1015d6621f79aa6a88280539621a108
  Author: Daniel P. Berrange <address@hidden>
  Date:   2015-09-24 (Thu, 24 Sep 2015)

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

  Log Message:
  -----------
  gtk: avoid redefining _WIN32_WINNT macro

When building for Mingw64 target on Fedora 22 a warning
is issued about _WIN32_WINNT being redefined.

In file included from ui/gtk.c:40:0:
include/ui/gtk.h:5:0: warning: "_WIN32_WINNT" redefined
 # define _WIN32_WINNT 0x0601 /* needed to get definition of MAPVK_VK_TO_VSC */
  ^
In file included from 
/usr/i686-w64-mingw32/sys-root/mingw/include/crtdefs.h:10:0,
           from /usr/i686-w64-mingw32/sys-root/mingw/include/stdio.h:9,
           from /home/berrange/src/virt/qemu/include/qemu/fprintf-fn.h:12,
           from /home/berrange/src/virt/qemu/include/qemu-common.h:18,
           from ui/gtk.c:37:
/usr/i686-w64-mingw32/sys-root/mingw/include/_mingw.h:225:0: note: this is the 
location of the previous definition
 #define _WIN32_WINNT 0x502
 ^

Rather than try to get MAPVK_VK_TO_VSC defined indirectly
by defining _WIN32_WINNT, instead just define it explicitly
if missing.

Signed-off-by: Daniel P. Berrange <address@hidden>
Signed-off-by: Stefan Weil <address@hidden>
Acked-by: Paolo Bonzini <address@hidden>


  Commit: 4d9310f427b477a126f6f2006c3a73b9764948b6
      
https://github.com/qemu/qemu/commit/4d9310f427b477a126f6f2006c3a73b9764948b6
  Author: Daniel P. Berrange <address@hidden>
  Date:   2015-09-24 (Thu, 24 Sep 2015)

  Changed paths:
    M configure
    M include/qemu/osdep.h
    M include/sysemu/os-win32.h
    M util/oslib-win32.c

  Log Message:
  -----------
  oslib-win32: only provide localtime_r/gmtime_r if missing

The oslib-win32 file currently provides a localtime_r and
gmtime_r replacement unconditionally. Some versions of
Mingw-w64 would provide crude macros for localtime_r/gmtime_r
which QEMU takes care to disable. Latest versions of Mingw-w64
now provide actual functions for localtime_r/gmtime_r, but
with a twist that you have to include unistd.h or pthread.h
before including time.h.  By luck some files in QEMU have
such an include order, resulting in compile errors:

  CC    util/osdep.o
In file included from include/qemu-common.h:48:0,
           from util/osdep.c:48:
include/sysemu/os-win32.h:77:12: error: redundant redeclaration of 'gmtime_r' 
[-Werror=redundant-decls]
 struct tm *gmtime_r(const time_t *timep, struct tm *result);
      ^
In file included from include/qemu-common.h:35:0,
           from util/osdep.c:48:
/usr/i686-w64-mingw32/sys-root/mingw/include/time.h:272:107: note: previous 
definition of 'gmtime_r' was here
In file included from include/qemu-common.h:48:0,
           from util/osdep.c:48:
include/sysemu/os-win32.h:79:12: error: redundant redeclaration of 
'localtime_r' [-Werror=redundant-decls]
 struct tm *localtime_r(const time_t *timep, struct tm *result);
      ^
In file included from include/qemu-common.h:35:0,
           from util/osdep.c:48:
/usr/i686-w64-mingw32/sys-root/mingw/include/time.h:269:107: note: previous 
definition of 'localtime_r' was here

This change adds a configure test to see if localtime_r
exits, and only enables the QEMU impl if missing. We also
re-arrange qemu-common.h try attempt to guarantee that all
source files get unistd.h before time.h and thus see the
localtime_r/gmtime_r defs.

[sw: Use "official" spellings for Mingw-w64, MinGW in comments.]
[sw: Terminate sentences with a dot in comments.]

Signed-off-by: Daniel P. Berrange <address@hidden>
Reviewed-by: Denis V. Lunev <address@hidden>
Signed-off-by: Stefan Weil <address@hidden>


  Commit: 8a47d575dfac0f6675e2ac56c5921cc520d021a6
      
https://github.com/qemu/qemu/commit/8a47d575dfac0f6675e2ac56c5921cc520d021a6
  Author: Peter Maydell <address@hidden>
  Date:   2015-09-24 (Thu, 24 Sep 2015)

  Changed paths:
    M Makefile
    M configure
    A docs/win32-qemu-event.promela
    M include/qemu/osdep.h
    M include/qemu/thread-win32.h
    M include/sysemu/os-win32.h
    M include/ui/gtk.h
    M qemu.nsi
    M slirp/tcp_input.c
    M ui/gtk.c
    M util/oslib-win32.c
    M util/qemu-thread-win32.c

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/weil/tags/pull-wxx-20150924' into 
staging

wxx patch queue

# gpg: Signature made Thu 24 Sep 2015 20:24:50 BST using RSA key ID 677450AD
# gpg: Good signature from "Stefan Weil <address@hidden>"
# gpg:                 aka "Stefan Weil <address@hidden>"
# gpg:                 aka "Stefan Weil <address@hidden>"
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg:          It is not certain that the signature belongs to the owner.
# Primary key fingerprint: 4923 6FEA 75C9 5D69 8EC2  B78A E08C 21D5 6774 50AD

* remotes/weil/tags/pull-wxx-20150924:
  oslib-win32: only provide localtime_r/gmtime_r if missing
  gtk: avoid redefining _WIN32_WINNT macro
  qemu-thread: add a fast path to the Win32 QemuEvent
  slirp: Fix non blocking connect for w32
  nsis: Add QEMU version information to Windows registry

Signed-off-by: Peter Maydell <address@hidden>


Compare: https://github.com/qemu/qemu/compare/9438fe9e5676...8a47d575dfac