From nobody Thu Nov 6 12:14:35 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 154095065053225.951661002118612; Tue, 30 Oct 2018 18:50:50 -0700 (PDT) Received: from localhost ([::1]:56636 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gHfef-0001Qv-56 for importer@patchew.org; Tue, 30 Oct 2018 21:50:45 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60247) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gHfUg-0000Mc-Pt for qemu-devel@nongnu.org; Tue, 30 Oct 2018 21:40:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gHfUb-00026L-5O for qemu-devel@nongnu.org; Tue, 30 Oct 2018 21:40:24 -0400 Received: from mail-qt1-x831.google.com ([2607:f8b0:4864:20::831]:33439) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gHfUa-000267-WF for qemu-devel@nongnu.org; Tue, 30 Oct 2018 21:40:21 -0400 Received: by mail-qt1-x831.google.com with SMTP id i15-v6so16012861qtr.0 for ; Tue, 30 Oct 2018 18:40:20 -0700 (PDT) Received: from localhost (76-251-165-188.lightspeed.austtx.sbcglobal.net. [76.251.165.188]) by smtp.gmail.com with ESMTPSA id d20-v6sm1805231qtm.49.2018.10.30.18.40.18 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 30 Oct 2018 18:40:18 -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=V4QuD/SdmHm1xhwRyGU/67Fuszx4RPOvYIaCUYitays=; b=kaNfjQVg4Kp1ehNHWgH1U5U5DSVCKMTVHcEZQHrIlbGOmYuyDcDznOn8VGsWBgbG+b 8UcPtQX1OPjyTrQ/pR7TKfN8hjMsXw7AMH5NKaUTdaekgj59mTirWz9gMn05lb0oJi4b j9O3QtYxRw+JJkAPpgx9rmvXyi9kxFpv4JxqS7KldJ2h5LVrOB+cBdLwCUrAPK7HQq3/ fBBvtuW8yQsBoHiDikwZkwW0F4LHnnhLK3CTwD+KG7zISnqDC9UgZqQ5KV/0iiuRUBDw CDIcTelXzDjRVvES1DnQxFYLwAFCa1T16P42rEEwJGKGokU+IGwIYa+32HsfMaylDyTS Aq6w== 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=V4QuD/SdmHm1xhwRyGU/67Fuszx4RPOvYIaCUYitays=; b=ORyGta8n4/m+tBAkJMd92fspL5etjqdJ7hcl9uayWP4KaV9pAUCYPAmKxPNgLMr52h 8Swaz7KtGT7WAgr2R2tIMwb/rzQCdinaRt6UZT+87srNScahzJ1xPhwhNOHqNWj6g4xW gu60i27fLLrbZ8gShfJPHQv/4Ix3gfZ57eTccQhF0Ut8Ye9J2kC+XxTofn5+/8hiqEbu oBOsK/OkEX0bZmvhRRxtGSE7S44B1Da3SECEf9d8qdiUi+QicAwCx5j6GNBNzUnpBBnJ //fHeFleU0ndD7phb5Rkm1mjubN2MRf1bzTSmCDTVzXHuSB+3fMeS8akMj1I7FoBX6KP QH7w== X-Gm-Message-State: AGRZ1gLNCQqOrf5OmmHwgV/nwVYSYPLDXI/raRDtaML2DjdbvSq/xmKb sq2mL33Mjfpm48lzf6YwZjLcW9hy X-Google-Smtp-Source: AJdET5cgTrJUV/IxcxUzecGo4YPAun/CbqM3KKHPOOsh1RyntM19e+EnyrVZgMATjowR1e1uCL3vyA== X-Received: by 2002:ac8:36d9:: with SMTP id b25mr987650qtc.49.1540950019757; Tue, 30 Oct 2018 18:40:19 -0700 (PDT) From: Michael Roth To: qemu-devel@nongnu.org Date: Tue, 30 Oct 2018 20:38:12 -0500 Message-Id: <20181031013821.24023-16-mdroth@linux.vnet.ibm.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181031013821.24023-1-mdroth@linux.vnet.ibm.com> References: <20181031013821.24023-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::831 Subject: [Qemu-devel] [PULL v2 15/24] qga-win: return disk device in guest-get-fsinfo 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 Report device UNC of the disk. It is reported as "\\.\PhysicalDriveX". Signed-off-by: Tom=C3=A1=C5=A1 Golembiovsk=C3=BD Signed-off-by: Michael Roth --- qga/commands-win32.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/qga/commands-win32.c b/qga/commands-win32.c index 90432bbfce..30d6c639c3 100644 --- a/qga/commands-win32.c +++ b/qga/commands-win32.c @@ -684,8 +684,7 @@ out_free: return; } =20 -static void get_single_disk_info(char *name, GuestDiskAddress *disk, - Error **errp) +static void get_single_disk_info(GuestDiskAddress *disk, Error **errp) { SCSI_ADDRESS addr, *scsi_ad; DWORD len; @@ -694,8 +693,8 @@ static void get_single_disk_info(char *name, GuestDiskA= ddress *disk, =20 scsi_ad =3D &addr; =20 - g_debug("getting disk info for: %s", name); - disk_h =3D CreateFile(name, 0, FILE_SHARE_READ, NULL, OPEN_EXISTING, + g_debug("getting disk info for: %s", disk->dev); + disk_h =3D CreateFile(disk->dev, 0, FILE_SHARE_READ, NULL, OPEN_EXISTI= NG, 0, NULL); if (disk_h =3D=3D INVALID_HANDLE_VALUE) { error_setg_win32(errp, GetLastError(), "failed to open disk"); @@ -714,7 +713,7 @@ static void get_single_disk_info(char *name, GuestDiskA= ddress *disk, * if that doesn't hold since that suggests some other unexpected * breakage */ - disk->pci_controller =3D get_pci_info(name, &local_err); + disk->pci_controller =3D get_pci_info(disk->dev, &local_err); if (local_err) { error_propagate(errp, local_err); goto err_close; @@ -797,7 +796,9 @@ static GuestDiskAddressList *build_guest_disk_info(char= *guid, Error **errp) /* Possibly CD-ROM or a shared drive. Try to pass the volume */ g_debug("volume not on disk"); disk =3D g_malloc0(sizeof(GuestDiskAddress)); - get_single_disk_info(name, disk, &local_err); + disk->has_dev =3D true; + disk->dev =3D g_strdup(name); + get_single_disk_info(disk, &local_err); if (local_err) { g_debug("failed to get disk info, ignoring error: %s", error_get_pretty(local_err)); @@ -819,7 +820,6 @@ static GuestDiskAddressList *build_guest_disk_info(char= *guid, Error **errp) =20 /* Go through each extent */ for (i =3D 0; i < extents->NumberOfDiskExtents; i++) { - char *disk_name =3D NULL; disk =3D g_malloc0(sizeof(GuestDiskAddress)); =20 /* Disk numbers directly correspond to numbers used in UNCs @@ -830,10 +830,11 @@ static GuestDiskAddressList *build_guest_disk_info(ch= ar *guid, Error **errp) * See also Naming Files, Paths and Namespaces: * https://docs.microsoft.com/en-us/windows/desktop/FileIO/naming-= a-file#win32-device-namespaces */ - disk_name =3D g_strdup_printf("\\\\.\\PhysicalDrive%lu", + disk->has_dev =3D true; + disk->dev =3D g_strdup_printf("\\\\.\\PhysicalDrive%lu", extents->Extents[i].DiskNumber); - get_single_disk_info(disk_name, disk, &local_err); - g_free(disk_name); + + get_single_disk_info(disk, &local_err); if (local_err) { error_propagate(errp, local_err); goto out; --=20 2.17.1