[Qemu-devel] [PATCH for-3.2 0/4] build-sys: require Vista API by default globally

[Qemu-devel] [PATCH for-3.2 0/4] build-sys: require Vista API by default globally

[Marc-André Lureau]

Hi,

Here is a small series improving a bit Windows headers inclusion, and
setting the default required API version globally to Vista. It also
allows easier tweaking of available API version via CFLAGS.

Building QGA for older versions (XP) seems possible so far: the
dependency on libqemuutil.a implies building qemu-thread-win32.c,
which requires Vista API since commit 12f8def0 (v2.9). But qemu-thread
isn't being used in QGA, the resulting binary may still work on XP.
XP is no longer supported for the past 4.5y, it's time to drop support
for it.

Marc-André Lureau (4):
  build-sys: don't include windows.h, osdep.h does it
  build-sys: move windows defines in osdep.h header
  build-sys: build with Vista API by default
  RFC: qga: drop < Vista compatibility

 include/qemu/osdep.h      | 17 ++++++++++
 accel/tcg/translate-all.c |  4 ---
 qga/commands-win32.c      | 70 +--------------------------------------
 util/qemu-thread-win32.c  |  4 ---
 configure                 |  3 --
 roms/seabios              |  2 +-
 6 files changed, 19 insertions(+), 81 deletions(-)

-- 
2.20.0.rc1

[Qemu-devel] [PATCH for-3.2 1/4] build-sys: don't include windows.h, osdep.h does it

[Marc-André Lureau]

osdep.h will also define the available Windows API version for QEMU.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
 accel/tcg/translate-all.c | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/accel/tcg/translate-all.c b/accel/tcg/translate-all.c
index 639f0b2728..8cb8c8870e 100644
--- a/accel/tcg/translate-all.c
+++ b/accel/tcg/translate-all.c
@@ -16,12 +16,8 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
-#ifdef _WIN32
-#include <windows.h>
-#endif
 #include "qemu/osdep.h"
 
-
 #include "qemu-common.h"
 #define NO_CPU_IO_DEFS
 #include "cpu.h"
-- 
2.20.0.rc1

[Qemu-devel] [PATCH for-3.2 2/4] build-sys: move windows defines in osdep.h header

[Marc-André Lureau]

This removes some clutter in compilation logging, and allows some
easier tweaking per compilation unit/CFLAGS overriding.

Note that we can't move those define in os-win32.h, since they must be
set before the first system headers are included.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
 include/qemu/osdep.h | 17 +++++++++++++++++
 configure            |  3 ---
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/include/qemu/osdep.h b/include/qemu/osdep.h
index 3bf48bcdec..7b6e5db9d0 100644
--- a/include/qemu/osdep.h
+++ b/include/qemu/osdep.h
@@ -74,13 +74,30 @@ typedef __float128 _Float128;
 extern int daemon(int, int);
 #endif
 
+#ifdef _WIN32
+/* as defined in sdkddkver.h */
+#ifndef WINVER
+#define WINVER 0x0501 /* XP */
+#endif
+/* reduces the number of implicitly included headers */
+#ifndef WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN
+#endif
+#endif
+
 #include <stdarg.h>
 #include <stddef.h>
 #include <stdbool.h>
 #include <stdint.h>
 #include <sys/types.h>
 #include <stdlib.h>
+
+/* enable C99/POSIX format strings (needs mingw32-runtime 3.15 or later) */
+#ifdef __MINGW32__
+#define __USE_MINGW_ANSI_STDIO 1
+#endif
 #include <stdio.h>
+
 #include <string.h>
 #include <strings.h>
 #include <inttypes.h>
diff --git a/configure b/configure
index 0a3c6a72c3..8c292ef994 100755
--- a/configure
+++ b/configure
@@ -905,9 +905,6 @@ fi
 if test "$mingw32" = "yes" ; then
   EXESUF=".exe"
   DSOSUF=".dll"
-  QEMU_CFLAGS="-DWIN32_LEAN_AND_MEAN -DWINVER=0x501 $QEMU_CFLAGS"
-  # enable C99/POSIX format strings (needs mingw32-runtime 3.15 or later)
-  QEMU_CFLAGS="-D__USE_MINGW_ANSI_STDIO=1 $QEMU_CFLAGS"
   # MinGW needs -mthreads for TLS and macro _MT.
   QEMU_CFLAGS="-mthreads $QEMU_CFLAGS"
   LIBS="-lwinmm -lws2_32 -liphlpapi $LIBS"
-- 
2.20.0.rc1

[Qemu-devel] [PATCH for-3.2 3/4] build-sys: build with Vista API by default

[Marc-André Lureau]

Both qemu & qga build with Vista API by default already, by defining
_WIN32_WINNT 0x0600. Set it globally in osdep.h instead.

This replaces WINVER by _WIN32_WINNT in osdep.h. WINVER doesn't seem
to be really useful these days.
(see also https://blogs.msdn.microsoft.com/oldnewthing/20070411-00/?p=27283)

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
 include/qemu/osdep.h     | 4 ++--
 qga/commands-win32.c     | 6 +-----
 util/qemu-thread-win32.c | 4 ----
 3 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/include/qemu/osdep.h b/include/qemu/osdep.h
index 7b6e5db9d0..80df7253db 100644
--- a/include/qemu/osdep.h
+++ b/include/qemu/osdep.h
@@ -76,8 +76,8 @@ extern int daemon(int, int);
 
 #ifdef _WIN32
 /* as defined in sdkddkver.h */
-#ifndef WINVER
-#define WINVER 0x0501 /* XP */
+#ifndef _WIN32_WINNT
+#define _WIN32_WINNT 0x0600 /* Vista */
 #endif
 /* reduces the number of implicitly included headers */
 #ifndef WIN32_LEAN_AND_MEAN
diff --git a/qga/commands-win32.c b/qga/commands-win32.c
index 62e1b51dfe..f03b9c1d89 100644
--- a/qga/commands-win32.c
+++ b/qga/commands-win32.c
@@ -10,12 +10,8 @@
  * This work is licensed under the terms of the GNU GPL, version 2 or later.
  * See the COPYING file in the top-level directory.
  */
-
-#ifndef _WIN32_WINNT
-#   define _WIN32_WINNT 0x0600
-#endif
-
 #include "qemu/osdep.h"
+
 #include <wtypes.h>
 #include <powrprof.h>
 #include <winsock2.h>
diff --git a/util/qemu-thread-win32.c b/util/qemu-thread-win32.c
index 4a363ca675..572f88535d 100644
--- a/util/qemu-thread-win32.c
+++ b/util/qemu-thread-win32.c
@@ -11,10 +11,6 @@
  *
  */
 
-#ifndef _WIN32_WINNT
-#define _WIN32_WINNT 0x0600
-#endif
-
 #include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "qemu/thread.h"
-- 
2.20.0.rc1

[Qemu-devel] [PATCH for-3.2 4/4] RFC: qga: drop < Vista compatibility

[Marc-André Lureau]

Building QGA for XP seems possible so far: the dependency on
libqemuutil.a implies building qemu-thread-win32.c, which requires
Vista API since commit 12f8def0 (v2.9). But qemu-thread isn't being
used in QGA, the resulting binary may still work on XP.  XP is no
longer supported for the past 4.5y, it's time to drop support for it.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
 qga/commands-win32.c | 64 --------------------------------------------
 roms/seabios         |  2 +-
 2 files changed, 1 insertion(+), 65 deletions(-)

diff --git a/qga/commands-win32.c b/qga/commands-win32.c
index f03b9c1d89..989b93e702 100644
--- a/qga/commands-win32.c
+++ b/qga/commands-win32.c
@@ -466,13 +466,11 @@ static STORAGE_BUS_TYPE win2qemu[] = {
     [BusTypeFibre] = GUEST_DISK_BUS_TYPE_SSA,
     [BusTypeUsb] = GUEST_DISK_BUS_TYPE_USB,
     [BusTypeRAID] = GUEST_DISK_BUS_TYPE_RAID,
-#if (_WIN32_WINNT >= 0x0600)
     [BusTypeiScsi] = GUEST_DISK_BUS_TYPE_ISCSI,
     [BusTypeSas] = GUEST_DISK_BUS_TYPE_SAS,
     [BusTypeSata] = GUEST_DISK_BUS_TYPE_SATA,
     [BusTypeSd] =  GUEST_DISK_BUS_TYPE_SD,
     [BusTypeMmc] = GUEST_DISK_BUS_TYPE_MMC,
-#endif
 #if (_WIN32_WINNT >= 0x0601)
     [BusTypeVirtual] = GUEST_DISK_BUS_TYPE_VIRTUAL,
     [BusTypeFileBackedVirtual] = GUEST_DISK_BUS_TYPE_FILE_BACKED_VIRTUAL,
@@ -724,10 +722,8 @@ static void get_single_disk_info(GuestDiskAddress *disk, Error **errp)
     if (disk->bus_type == GUEST_DISK_BUS_TYPE_SCSI
             || disk->bus_type == GUEST_DISK_BUS_TYPE_IDE
             || disk->bus_type == GUEST_DISK_BUS_TYPE_RAID
-#if (_WIN32_WINNT >= 0x0600)
             /* This bus type is not supported before Windows Server 2003 SP1 */
             || disk->bus_type == GUEST_DISK_BUS_TYPE_SAS
-#endif
         ) {
         /* We are able to use the same ioctls for different bus types
          * according to Microsoft docs
@@ -1322,7 +1318,6 @@ static char *guest_addr_to_str(IP_ADAPTER_UNICAST_ADDRESS *ip_addr,
     return NULL;
 }
 
-#if (_WIN32_WINNT >= 0x0600)
 static int64_t guest_ip_prefix(IP_ADAPTER_UNICAST_ADDRESS *ip_addr)
 {
     /* For Windows Vista/2008 and newer, use the OnLinkPrefixLength
@@ -1330,60 +1325,6 @@ static int64_t guest_ip_prefix(IP_ADAPTER_UNICAST_ADDRESS *ip_addr)
      */
     return ip_addr->OnLinkPrefixLength;
 }
-#else
-/* When using the Windows XP and 2003 build environment, do the best we can to
- * figure out the prefix.
- */
-static IP_ADAPTER_INFO *guest_get_adapters_info(void)
-{
-    IP_ADAPTER_INFO *adptr_info = NULL;
-    ULONG adptr_info_len = 0;
-    DWORD ret;
-
-    /* Call the first time to get the adptr_info_len. */
-    GetAdaptersInfo(adptr_info, &adptr_info_len);
-
-    adptr_info = g_malloc(adptr_info_len);
-    ret = GetAdaptersInfo(adptr_info, &adptr_info_len);
-    if (ret != ERROR_SUCCESS) {
-        g_free(adptr_info);
-        adptr_info = NULL;
-    }
-    return adptr_info;
-}
-
-static int64_t guest_ip_prefix(IP_ADAPTER_UNICAST_ADDRESS *ip_addr)
-{
-    int64_t prefix = -1; /* Use for AF_INET6 and unknown/undetermined values. */
-    IP_ADAPTER_INFO *adptr_info, *info;
-    IP_ADDR_STRING *ip;
-    struct in_addr *p;
-
-    if (ip_addr->Address.lpSockaddr->sa_family != AF_INET) {
-        return prefix;
-    }
-    adptr_info = guest_get_adapters_info();
-    if (adptr_info == NULL) {
-        return prefix;
-    }
-
-    /* Match up the passed in ip_addr with one found in adaptr_info.
-     * The matching one in adptr_info will have the netmask.
-     */
-    p = &((struct sockaddr_in *)ip_addr->Address.lpSockaddr)->sin_addr;
-    for (info = adptr_info; info; info = info->Next) {
-        for (ip = &info->IpAddressList; ip; ip = ip->Next) {
-            if (p->S_un.S_addr == inet_addr(ip->IpAddress.String)) {
-                prefix = ctpop32(inet_addr(ip->IpMask.String));
-                goto out;
-            }
-        }
-    }
-out:
-    g_free(adptr_info);
-    return prefix;
-}
-#endif
 
 #define INTERFACE_PATH_BUF_SZ 512
 
@@ -1904,7 +1845,6 @@ typedef struct _GA_WTSINFOA {
 
 GuestUserList *qmp_guest_get_users(Error **err)
 {
-#if (_WIN32_WINNT >= 0x0600)
 #define QGA_NANOSECONDS 10000000
 
     GHashTable *cache = NULL;
@@ -1974,10 +1914,6 @@ GuestUserList *qmp_guest_get_users(Error **err)
     }
     g_hash_table_destroy(cache);
     return head;
-#else
-    error_setg(err, QERR_UNSUPPORTED);
-    return NULL;
-#endif
 }
 
 typedef struct _ga_matrix_lookup_t {
diff --git a/roms/seabios b/roms/seabios
index a698c8995f..14221cd86e 160000
--- a/roms/seabios
+++ b/roms/seabios
@@ -1 +1 @@
-Subproject commit a698c8995ffb2838296ec284fe3c4ad33dfca307
+Subproject commit 14221cd86eadba82255fdc55ed174d401c7a0a04
-- 
2.20.0.rc1

Re: [Qemu-devel] [PATCH for-3.2 0/4] build-sys: require Vista API by default globally

[Paolo Bonzini]

On 22/11/18 12:00, Marc-André Lureau wrote:
> Hi,
> 
> Here is a small series improving a bit Windows headers inclusion, and
> setting the default required API version globally to Vista. It also
> allows easier tweaking of available API version via CFLAGS.
> 
> Building QGA for older versions (XP) seems possible so far: the
> dependency on libqemuutil.a implies building qemu-thread-win32.c,
> which requires Vista API since commit 12f8def0 (v2.9). But qemu-thread
> isn't being used in QGA, the resulting binary may still work on XP.
> XP is no longer supported for the past 4.5y, it's time to drop support
> for it.
> 
> Marc-André Lureau (4):
>   build-sys: don't include windows.h, osdep.h does it
>   build-sys: move windows defines in osdep.h header
>   build-sys: build with Vista API by default
>   RFC: qga: drop < Vista compatibility
> 
>  include/qemu/osdep.h      | 17 ++++++++++
>  accel/tcg/translate-all.c |  4 ---
>  qga/commands-win32.c      | 70 +--------------------------------------
>  util/qemu-thread-win32.c  |  4 ---
>  configure                 |  3 --
>  roms/seabios              |  2 +-
>  6 files changed, 19 insertions(+), 81 deletions(-)
> 

Queued, thanks.

Paolo

Re: [Qemu-devel] [PATCH for-3.2 0/4] build-sys: require Vista API by default globally

[Stefan Weil]

Am 29.11.2018 um 11:16 schrieb Paolo Bonzini:
> On 22/11/18 12:00, Marc-André Lureau wrote:
>>  include/qemu/osdep.h      | 17 ++++++++++
>>  accel/tcg/translate-all.c |  4 ---
>>  qga/commands-win32.c      | 70 +--------------------------------------
>>  util/qemu-thread-win32.c  |  4 ---
>>  configure                 |  3 --
>>  roms/seabios              |  2 +-
>>  6 files changed, 19 insertions(+), 81 deletions(-)
>>
> Queued, thanks.
>
> Paolo


Was the change for roms/seabios intentional?

Stefan

Re: [Qemu-devel] [PATCH for-3.2 0/4] build-sys: require Vista API by default globally

[Marc-André Lureau]

On Thu, Nov 29, 2018 at 2:45 PM Stefan Weil <sw@weilnetz.de> wrote:
>
> Am 29.11.2018 um 11:16 schrieb Paolo Bonzini:
> > On 22/11/18 12:00, Marc-André Lureau wrote:
> >>  include/qemu/osdep.h      | 17 ++++++++++
> >>  accel/tcg/translate-all.c |  4 ---
> >>  qga/commands-win32.c      | 70 +--------------------------------------
> >>  util/qemu-thread-win32.c  |  4 ---
> >>  configure                 |  3 --
> >>  roms/seabios              |  2 +-
> >>  6 files changed, 19 insertions(+), 81 deletions(-)
> >>
> > Queued, thanks.
> >
> > Paolo
>
>
> Was the change for roms/seabios intentional?

oh no! sorry Paolo

Re: [Qemu-devel] [PATCH for-3.2 0/4] build-sys: require Vista API by default globally

[Paolo Bonzini]

On 29/11/18 11:50, Marc-André Lureau wrote:
> On Thu, Nov 29, 2018 at 2:45 PM Stefan Weil <sw@weilnetz.de> wrote:
>>
>> Am 29.11.2018 um 11:16 schrieb Paolo Bonzini:
>>> On 22/11/18 12:00, Marc-André Lureau wrote:
>>>>  include/qemu/osdep.h      | 17 ++++++++++
>>>>  accel/tcg/translate-all.c |  4 ---
>>>>  qga/commands-win32.c      | 70 +--------------------------------------
>>>>  util/qemu-thread-win32.c  |  4 ---
>>>>  configure                 |  3 --
>>>>  roms/seabios              |  2 +-
>>>>  6 files changed, 19 insertions(+), 81 deletions(-)
>>>>
>>> Queued, thanks.
>>>
>>> Paolo
>>
>>
>> Was the change for roms/seabios intentional?
> 
> oh no! sorry Paolo

Removed, no problem.

Paolo