From nobody Thu Nov 6 19:45:39 2025 Delivered-To: importer@patchew.org Received-SPF: temperror (zoho.com: Error in retrieving data from DNS) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=temperror (zoho.com: Error in retrieving data from DNS) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1542884773552209.84722943720544; Thu, 22 Nov 2018 03:06:13 -0800 (PST) Received: from localhost ([::1]:45178 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gPmo8-00012n-Lg for importer@patchew.org; Thu, 22 Nov 2018 06:06:04 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50887) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gPmjf-0005uV-WF for qemu-devel@nongnu.org; Thu, 22 Nov 2018 06:01:37 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gPmjZ-00056O-I5 for qemu-devel@nongnu.org; Thu, 22 Nov 2018 06:01:27 -0500 Received: from mx1.redhat.com ([209.132.183.28]:45162) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gPmjY-00055w-R1 for qemu-devel@nongnu.org; Thu, 22 Nov 2018 06:01:21 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 176B9308ED4C; Thu, 22 Nov 2018 11:01:20 +0000 (UTC) Received: from localhost (ovpn-112-60.ams2.redhat.com [10.36.112.60]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9EE2817B25; Thu, 22 Nov 2018 11:01:16 +0000 (UTC) From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= To: qemu-devel@nongnu.org Date: Thu, 22 Nov 2018 15:00:39 +0400 Message-Id: <20181122110039.15972-5-marcandre.lureau@redhat.com> In-Reply-To: <20181122110039.15972-1-marcandre.lureau@redhat.com> References: <20181122110039.15972-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.44]); Thu, 22 Nov 2018 11:01:20 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH for-3.2 4/4] RFC: qga: drop < Vista compatibility X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Crosthwaite , Stefan Weil , Michael Roth , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , samuel.thibault@ens-lyon.org, Paolo Bonzini , Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" 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=C3=A9 Lureau --- 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[] =3D { [BusTypeFibre] =3D GUEST_DISK_BUS_TYPE_SSA, [BusTypeUsb] =3D GUEST_DISK_BUS_TYPE_USB, [BusTypeRAID] =3D GUEST_DISK_BUS_TYPE_RAID, -#if (_WIN32_WINNT >=3D 0x0600) [BusTypeiScsi] =3D GUEST_DISK_BUS_TYPE_ISCSI, [BusTypeSas] =3D GUEST_DISK_BUS_TYPE_SAS, [BusTypeSata] =3D GUEST_DISK_BUS_TYPE_SATA, [BusTypeSd] =3D GUEST_DISK_BUS_TYPE_SD, [BusTypeMmc] =3D GUEST_DISK_BUS_TYPE_MMC, -#endif #if (_WIN32_WINNT >=3D 0x0601) [BusTypeVirtual] =3D GUEST_DISK_BUS_TYPE_VIRTUAL, [BusTypeFileBackedVirtual] =3D GUEST_DISK_BUS_TYPE_FILE_BACKED_VIRTUAL, @@ -724,10 +722,8 @@ static void get_single_disk_info(GuestDiskAddress *dis= k, Error **errp) if (disk->bus_type =3D=3D GUEST_DISK_BUS_TYPE_SCSI || disk->bus_type =3D=3D GUEST_DISK_BUS_TYPE_IDE || disk->bus_type =3D=3D GUEST_DISK_BUS_TYPE_RAID -#if (_WIN32_WINNT >=3D 0x0600) /* This bus type is not supported before Windows Server 2003 S= P1 */ || disk->bus_type =3D=3D 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_ADD= RESS *ip_addr, return NULL; } =20 -#if (_WIN32_WINNT >=3D 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_AD= DRESS *ip_addr) */ return ip_addr->OnLinkPrefixLength; } -#else -/* When using the Windows XP and 2003 build environment, do the best we ca= n to - * figure out the prefix. - */ -static IP_ADAPTER_INFO *guest_get_adapters_info(void) -{ - IP_ADAPTER_INFO *adptr_info =3D NULL; - ULONG adptr_info_len =3D 0; - DWORD ret; - - /* Call the first time to get the adptr_info_len. */ - GetAdaptersInfo(adptr_info, &adptr_info_len); - - adptr_info =3D g_malloc(adptr_info_len); - ret =3D GetAdaptersInfo(adptr_info, &adptr_info_len); - if (ret !=3D ERROR_SUCCESS) { - g_free(adptr_info); - adptr_info =3D NULL; - } - return adptr_info; -} - -static int64_t guest_ip_prefix(IP_ADAPTER_UNICAST_ADDRESS *ip_addr) -{ - int64_t prefix =3D -1; /* Use for AF_INET6 and unknown/undetermined va= lues. */ - IP_ADAPTER_INFO *adptr_info, *info; - IP_ADDR_STRING *ip; - struct in_addr *p; - - if (ip_addr->Address.lpSockaddr->sa_family !=3D AF_INET) { - return prefix; - } - adptr_info =3D guest_get_adapters_info(); - if (adptr_info =3D=3D 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 =3D &((struct sockaddr_in *)ip_addr->Address.lpSockaddr)->sin_addr; - for (info =3D adptr_info; info; info =3D info->Next) { - for (ip =3D &info->IpAddressList; ip; ip =3D ip->Next) { - if (p->S_un.S_addr =3D=3D inet_addr(ip->IpAddress.String)) { - prefix =3D ctpop32(inet_addr(ip->IpMask.String)); - goto out; - } - } - } -out: - g_free(adptr_info); - return prefix; -} -#endif =20 #define INTERFACE_PATH_BUF_SZ 512 =20 @@ -1904,7 +1845,6 @@ typedef struct _GA_WTSINFOA { =20 GuestUserList *qmp_guest_get_users(Error **err) { -#if (_WIN32_WINNT >=3D 0x0600) #define QGA_NANOSECONDS 10000000 =20 GHashTable *cache =3D 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 } =20 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 --=20 2.20.0.rc1