qga/commands-win32.c: Drop the check for _WIN32_WINNT >= 0x0601

[PATCH] qga/commands-win32.c: Drop the check for _WIN32_WINNT >= 0x0601

Posted by Thomas Huth 12 months ago

All current versions of glib require _WIN32_WINNT set to 0x0601
or higher already, and we also use this value as a minimum in our
osdep.h header file, so there is no way to still compile this code
with an older version of the Windows ABI. Thus we can drop this
check now.

Signed-off-by: Thomas Huth <thuth@redhat.com>
---
 qga/commands-win32.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/qga/commands-win32.c b/qga/commands-win32.c
index b5fee6a2cd..d23875264f 100644
--- a/qga/commands-win32.c
+++ b/qga/commands-win32.c
@@ -484,7 +484,6 @@ static GuestDiskBusType win2qemu[] = {
     [BusTypeSata] = GUEST_DISK_BUS_TYPE_SATA,
     [BusTypeSd] =  GUEST_DISK_BUS_TYPE_SD,
     [BusTypeMmc] = GUEST_DISK_BUS_TYPE_MMC,
-#if (_WIN32_WINNT >= 0x0601)
     [BusTypeVirtual] = GUEST_DISK_BUS_TYPE_VIRTUAL,
     [BusTypeFileBackedVirtual] = GUEST_DISK_BUS_TYPE_FILE_BACKED_VIRTUAL,
     /*
@@ -492,7 +491,6 @@ static GuestDiskBusType win2qemu[] = {
      */
     [BusTypeSpaces] = GUEST_DISK_BUS_TYPE_UNKNOWN,
     [BusTypeNvme] = GUEST_DISK_BUS_TYPE_NVME,
-#endif
 };
 
 static GuestDiskBusType find_bus_type(STORAGE_BUS_TYPE bus)
-- 
2.31.1

Re: [PATCH] qga/commands-win32.c: Drop the check for _WIN32_WINNT >= 0x0601

Posted by Daniel P. Berrangé 12 months ago

On Thu, May 04, 2023 at 09:54:09AM +0200, Thomas Huth wrote:
> All current versions of glib require _WIN32_WINNT set to 0x0601
> or higher already, and we also use this value as a minimum in our
> osdep.h header file, so there is no way to still compile this code
> with an older version of the Windows ABI. Thus we can drop this
> check now.
> 
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
>  qga/commands-win32.c | 2 --
>  1 file changed, 2 deletions(-)

Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>


With regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|

Re: [PATCH] qga/commands-win32.c: Drop the check for _WIN32_WINNT >= 0x0601

Posted by Konstantin Kostiuk 12 months ago

Reviewed-by: Konstantin Kostiuk <kkostiuk@redhat.com>

On Thu, May 4, 2023 at 11:19 AM Daniel P. Berrangé <berrange@redhat.com>
wrote:

> On Thu, May 04, 2023 at 09:54:09AM +0200, Thomas Huth wrote:
> > All current versions of glib require _WIN32_WINNT set to 0x0601
> > or higher already, and we also use this value as a minimum in our
> > osdep.h header file, so there is no way to still compile this code
> > with an older version of the Windows ABI. Thus we can drop this
> > check now.
> >
> > Signed-off-by: Thomas Huth <thuth@redhat.com>
> > ---
> >  qga/commands-win32.c | 2 --
> >  1 file changed, 2 deletions(-)
>
> Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
>
>
> With regards,
> Daniel
> --
> |: https://berrange.com      -o-
> https://www.flickr.com/photos/dberrange :|
> |: https://libvirt.org         -o-
> https://fstop138.berrange.com :|
> |: https://entangle-photo.org    -o-
> https://www.instagram.com/dberrange :|
>
>