From nobody Sun Feb 8 14:52:28 2026 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 Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1540995797473244.33177317604589; Wed, 31 Oct 2018 07:23:17 -0700 (PDT) Received: from localhost ([::1]:59884 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gHrOp-00027N-0e for importer@patchew.org; Wed, 31 Oct 2018 10:23:11 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33382) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gHrMa-0000q6-BM for qemu-devel@nongnu.org; Wed, 31 Oct 2018 10:20:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gHrMZ-0007C0-7I for qemu-devel@nongnu.org; Wed, 31 Oct 2018 10:20:52 -0400 Received: from mail-oi1-x22c.google.com ([2607:f8b0:4864:20::22c]:40297) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gHrMY-00075e-R1 for qemu-devel@nongnu.org; Wed, 31 Oct 2018 10:20:50 -0400 Received: by mail-oi1-x22c.google.com with SMTP id u130-v6so8990148oie.7 for ; Wed, 31 Oct 2018 07:20:43 -0700 (PDT) Received: from localhost (76-251-165-188.lightspeed.austtx.sbcglobal.net. [76.251.165.188]) by smtp.gmail.com with ESMTPSA id 111sm23000449otf.51.2018.10.31.07.20.41 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 31 Oct 2018 07:20:41 -0700 (PDT) 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=reWrzN1nbgrUa5M9CT6ngaBhfrzDoBBYAKpSG9utug0=; b=JiBoeuFlbmUNatJHqR387bz6Y4cMizXFaGWZafmtqbrkjVdEymGE8Um78ArWUVXHJq HJXLgGsB6FV/2mCpDpkKTBdHXxXcsBz1fURrbRL3Riz7ONA8ILnVP6S6uCobbUgCQaMt j7xi6q/VxA/ajF/1TSkJr18yN1SkDICeYfyhLz1HyJhsIIcEiO0H8Nw7K4RAvfgEuser Q81tRxSiNLbfUrSdyaHB4rswONPpKwoy32oL84pyWOZXlX3nxvrcXtQ4c6GgJlSJ8xGC ezeq1YcljqKz2avR1zWt+f07gHLxGBZvShXwtaNVljdnf4biL6gyQtDa5kpnuqOYSuda 1Nbw== 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=reWrzN1nbgrUa5M9CT6ngaBhfrzDoBBYAKpSG9utug0=; b=Fs0FcfeNaqcAPKsjDiWfBGiltRagnE4lSkTalnCDwz1jdAZ0Haa22KnzxkABDRe9BJ g49/sPosJiYHhvqwcBOCYKJGocjflPh5tBpkVrSvP4PekGiWrE4EM5B8e66/Tg3SywCM rWojpR8jQ3RxYrhzEmXV4FbkaZmb/Bm81aKqWMFKGSHVjpkgjwCaKP7S9kUOusGMNLn8 HiQzp4TQC9M7GH8baktOXaZup9x6S33MQq+wgZc161ciPxGU3YvLRnlrigIKhhFVWnsC V03c/0Lw6egbz/POvEJqbJ/2a/d8Q2Mj9B87iaZh9qUeYi5/VMNUT8nIPm6U14LY8N6U wiGQ== X-Gm-Message-State: AGRZ1gJ3igwSLJvcpaIPRWWabA3S5p7IVkDtU2yA2hCRZ8OnQVLQaRT5 xHzon6rz/Yz/AxDkFRDLVRx7nUmq X-Google-Smtp-Source: AJdET5fdZQvLa/It6g6/i8b398Q6noG6td5ZO5jL2QpnWqig4mik/iyE5TTGfa5ae2/743siMrwjjg== X-Received: by 2002:aca:d7c6:: with SMTP id o189-v6mr1933703oig.33.1540995642330; Wed, 31 Oct 2018 07:20:42 -0700 (PDT) From: Michael Roth To: qemu-devel@nongnu.org Date: Wed, 31 Oct 2018 09:19:17 -0500 Message-Id: <20181031141925.30026-17-mdroth@linux.vnet.ibm.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181031141925.30026-1-mdroth@linux.vnet.ibm.com> References: <20181031141925.30026-1-mdroth@linux.vnet.ibm.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: 2607:f8b0:4864:20::22c Subject: [Qemu-devel] [PULL v3 16/24] qga-win: demystify namespace stripping 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.maydell@linaro.org, =?UTF-8?q?Tom=C3=A1=C5=A1=20Golembiovsk=C3=BD?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Tom=C3=A1=C5=A1 Golembiovsk=C3=BD It was not obvious what exactly the cryptic string copying does to the GUID. This change makes the intent clearer. Signed-off-by: Tom=C3=A1=C5=A1 Golembiovsk=C3=BD Signed-off-by: Michael Roth --- qga/commands-win32.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/qga/commands-win32.c b/qga/commands-win32.c index 30d6c639c3..a1b7512d46 100644 --- a/qga/commands-win32.c +++ b/qga/commands-win32.c @@ -521,7 +521,7 @@ static GuestPCIAddress *get_pci_info(char *guid, Error = **errp) char dev_name[MAX_PATH]; char *buffer =3D NULL; GuestPCIAddress *pci =3D NULL; - char *name =3D g_strdup(&guid[4]); + char *name =3D NULL; bool partial_pci =3D false; pci =3D g_malloc0(sizeof(*pci)); pci->domain =3D -1; @@ -529,6 +529,13 @@ static GuestPCIAddress *get_pci_info(char *guid, Error= **errp) pci->function =3D -1; pci->bus =3D -1; =20 + if (g_str_has_prefix(guid, "\\\\.\\") || + g_str_has_prefix(guid, "\\\\?\\")) { + name =3D g_strdup(guid + 4); + } else { + name =3D g_strdup(guid); + } + if (!QueryDosDevice(name, dev_name, ARRAY_SIZE(dev_name))) { error_setg_win32(errp, GetLastError(), "failed to get dos device n= ame"); goto out; --=20 2.17.1