From nobody Mon Feb 9 05:44: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; 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 (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1538653206293805.5016543990753; Thu, 4 Oct 2018 04:40:06 -0700 (PDT) Received: from localhost ([::1]:55140 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g81z3-0000qr-AM for importer@patchew.org; Thu, 04 Oct 2018 07:39:57 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34917) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g81tF-0004Be-R0 for qemu-devel@nongnu.org; Thu, 04 Oct 2018 07:34:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1g81iY-0003cH-Fr for qemu-devel@nongnu.org; Thu, 04 Oct 2018 07:22:58 -0400 Received: from mail-wm1-f50.google.com ([209.85.128.50]:38541) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1g81iY-0003bZ-8j for qemu-devel@nongnu.org; Thu, 04 Oct 2018 07:22:54 -0400 Received: by mail-wm1-f50.google.com with SMTP id 193-v6so8598547wme.3 for ; Thu, 04 Oct 2018 04:22:54 -0700 (PDT) Received: from fiorina.brq.redhat.com (nat-pool-brq-t.redhat.com. [213.175.37.10]) by smtp.gmail.com with ESMTPSA id k7-v6sm5191789wmf.41.2018.10.04.04.22.51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 04 Oct 2018 04:22:52 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=qS2f2v1zI9HNWeLvPN3uviTMmWFxvdf6H2VDxP5hhrE=; b=qoaKAexk1bWrhdg1zk4sRK3MT69bdSIoCLTdL+nuB6JQjOq0LujENPf4bsqivinANQ xK7yQ6uqu+ZiUKd7sUlxpQJTaq4K7Om3GoWgXQzr2SVQhF6AlYT6YUJsif5RKOCiNtK5 0354jrIYlnAZCYvdth8AOzpSslIVsj4RqQUBlWhANayPjIdkf/7DN/VcUX+mbLxdGgb7 CSYSWOtDKdgXUN8Sxc2Y4r4q2Z3rwWSyEa20OeEAdTo0a41B80cuvJJjIN9bZPb91ckC s2GRfJ1vXGU6W31tYgcNB7PzHNZmOUmKbsRZq/H6X17EeR+OJY3e78Jmr6wWC5jHEcjH TlrQ== X-Gm-Message-State: ABuFfogMspyhcIfTDtYEeKCmfycheOJgTFGdk9TcdiVLIUSG3uxqisOb bOvT2KWwR2ml5V9zI1n324LuMo/piaE= X-Google-Smtp-Source: ACcGV619ii7pKuCVt/C0F2no3Jwx9jBO+3EVXrLGRIvD4aW0nEVpVLDrWvpjML70TbdVrFu7IEBxqA== X-Received: by 2002:a1c:87ca:: with SMTP id j193-v6mr3991972wmd.99.1538652172823; Thu, 04 Oct 2018 04:22:52 -0700 (PDT) From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Golembiovsk=C3=BD?= To: qemu-devel@nongnu.org Date: Thu, 4 Oct 2018 13:22:37 +0200 Message-Id: X-Mailer: git-send-email 2.19.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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.85.128.50 Subject: [Qemu-devel] [PATCH v4 10/11] qga: 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: Michael Roth , Olga Krishtal , =?UTF-8?q?Tom=C3=A1=C5=A1=20Golembiovsk=C3=BD?= , Sameeh Jubran , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RDMRC_1 RSF_0 Z_629925259 SPT_0 Report device node of the disk. It is implemented for Linux (needs libudev) and Windows. The node is reported e.g. as "/dev/sda2" on Linux and as "\\.\PhysicalDriveX" on Windows. Signed-off-by: Tom=C3=A1=C5=A1 Golembiovsk=C3=BD --- qga/commands-posix.c | 7 ++++++- qga/commands-win32.c | 21 +++++++++++---------- qga/qapi-schema.json | 3 ++- 3 files changed, 19 insertions(+), 12 deletions(-) diff --git a/qga/commands-posix.c b/qga/commands-posix.c index 4d324178f2..31952b07f4 100644 --- a/qga/commands-posix.c +++ b/qga/commands-posix.c @@ -950,7 +950,12 @@ static void build_guest_fsinfo_for_real_device(char co= nst *syspath, if (udev =3D=3D NULL || udevice =3D=3D NULL) { g_debug("failed to query udev"); } else { - const char *serial; + const char *devnode, *serial; + devnode =3D udev_device_get_devnode(udevice); + if (devnode !=3D NULL) { + disk->dev =3D g_strdup(devnode); + disk->has_dev =3D true; + } serial =3D udev_device_get_property_value(udevice, "ID_SERIAL"); if (serial !=3D NULL && *serial !=3D 0) { disk->serial =3D g_strdup(serial); diff --git a/qga/commands-win32.c b/qga/commands-win32.c index a591d8221d..d0d969d0ce 100644 --- a/qga/commands-win32.c +++ b/qga/commands-win32.c @@ -649,8 +649,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; @@ -659,8 +658,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"); @@ -692,7 +691,7 @@ static void get_single_disk_info(char *name, GuestDiskA= ddress *disk, disk->bus =3D addr.PathId; g_debug("unit=3D%lld target=3D%lld bus=3D%lld", disk->unit, disk->target, disk->bus); - disk->pci_controller =3D get_pci_info(name, &local_err); + disk->pci_controller =3D get_pci_info(disk->dev, &local_err); =20 if (local_err) { g_debug("failed to get PCI controller info: %s", @@ -771,7 +770,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)); @@ -793,7 +794,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 @@ -804,10 +804,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; diff --git a/qga/qapi-schema.json b/qga/qapi-schema.json index 3bcda6257e..c6725b3ec8 100644 --- a/qga/qapi-schema.json +++ b/qga/qapi-schema.json @@ -835,6 +835,7 @@ # @target: target id # @unit: unit id # @serial: serial number (since: 3.1) +# @dev: device node (POSIX) or device UNC (Windows) (since: 3.1) # # Since: 2.2 ## @@ -842,7 +843,7 @@ 'data': {'pci-controller': 'GuestPCIAddress', 'bus-type': 'GuestDiskBusType', 'bus': 'int', 'target': 'int', 'unit': 'int', - '*serial': 'str'} } + '*serial': 'str', '*dev': 'str'} } =20 ## # @GuestFilesystemInfo: --=20 2.19.0