From nobody Fri Nov 7 00:47:50 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) 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; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) 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 (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1544629034941976.0563281416972; Wed, 12 Dec 2018 07:37:14 -0800 (PST) Received: from localhost ([::1]:45631 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gX6ZQ-000355-Dn for importer@patchew.org; Wed, 12 Dec 2018 10:37:08 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52275) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gX6MZ-0000qJ-DH for qemu-devel@nongnu.org; Wed, 12 Dec 2018 10:23:54 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gX6MX-0000Ep-FB for qemu-devel@nongnu.org; Wed, 12 Dec 2018 10:23:51 -0500 Received: from mail-wr1-x434.google.com ([2a00:1450:4864:20::434]:46532) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gX6MX-00008l-2R for qemu-devel@nongnu.org; Wed, 12 Dec 2018 10:23:49 -0500 Received: by mail-wr1-x434.google.com with SMTP id l9so18047851wrt.13 for ; Wed, 12 Dec 2018 07:23:42 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id u10sm15878859wrr.33.2018.12.12.07.23.40 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 12 Dec 2018 07:23:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=a9DFt6d5vc25qv90X/5YHrAammQkIh+VOHCJitcVnL0=; b=rUgpU/CMamARd3BBnfX3KJ6RAAic9pIdaU+f/kb92Avb4yghL7IEmBBru6m2zPN+s2 cFiE7d/p5ZpGbf8x/B5Zf8l3ISTwCCffW1mQKm5/gJfmps40SapzPGm2sRcX2sg/JRtR vyBN52PCXvwAaUAoo2zJtYskeyeRn5ZklZeFNVVR6COLjOPxE2oLtEpQBapD4mQnRVWu SYVrcr7PdhJV5RHtxAvr4kVjP6PrRjUdw1PhSiJf3P0O26SraqSzRx5Soxr9lRBgS0MA L3FrQMqwEvpVy98Bx57rkrxlNsBkXipUn/GS6UXqJ1OuUH0bTjHvpfiD++ZqLt7s2OXX MqVw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=a9DFt6d5vc25qv90X/5YHrAammQkIh+VOHCJitcVnL0=; b=fMUv989i8ZO0WFxyj1Q65VIOL+Fjbf5JGcQLL8p/ggc9grlE/SPQP17aRWN4tg4Cww yX5yHTlJeCPBMb1ZoaX6P20mJz2eHswJMPiY/X2EIEEHN5nFQt5SiedIOWRQMW0gfT6G Q7wksdy+HnHSf8lecE01Udjr82K9a03hmFtATA+MvPOf09ThtEVdGph0SRgnToo37jQV QL7Y6WfmSR5lphizguwHpymCgjiS72eYampRH5f/+PRML94fw5mMmn/uBs+jiX+PRW/b 3m/CyoHuFWzB337o75iUqlGrG9ulRdJyy1tXi9XzP9XWhobWb4eZv5fyctu+mRcfbTO4 zN3Q== X-Gm-Message-State: AA+aEWbFFiB8cpg+3gSJzS3GBazipXXX+Lxf4SzgyzE/sAe9I8Bga70u L2kjsiy2jZU6EajXF14lvIPfSoOz X-Google-Smtp-Source: AFSGD/VfLBM5bQwRKiBjpUgoojTCbYN9N4Aky0SNwxXB4QD61jxzitRJE8R5hBjAXU6L+rdH8Aq1OA== X-Received: by 2002:adf:e08c:: with SMTP id c12mr16685550wri.199.1544628221491; Wed, 12 Dec 2018 07:23:41 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Wed, 12 Dec 2018 16:22:42 +0100 Message-Id: <1544628195-37728-22-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1544628195-37728-1-git-send-email-pbonzini@redhat.com> References: <1544628195-37728-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::434 Subject: [Qemu-devel] [PULL 21/54] 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: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Marc-Andr=C3=A9 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=C3=A9 Lureau Message-Id: <20181122110039.15972-5-marcandre.lureau@redhat.com> Signed-off-by: Paolo Bonzini --- qga/commands-win32.c | 64 ------------------------------------------------= ---- 1 file changed, 64 deletions(-) diff --git a/qga/commands-win32.c b/qga/commands-win32.c index f03b9c1..989b93e 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 { --=20 1.8.3.1