From nobody Thu Nov 6 12:12:19 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 1540912664775369.1221953256264; Tue, 30 Oct 2018 08:17:44 -0700 (PDT) Received: from localhost ([::1]:53830 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gHVm3-0005zU-C4 for importer@patchew.org; Tue, 30 Oct 2018 11:17:43 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46707) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gHVHR-0000CW-Su for qemu-devel@nongnu.org; Tue, 30 Oct 2018 10:46:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gHVHL-000205-P6 for qemu-devel@nongnu.org; Tue, 30 Oct 2018 10:46:05 -0400 Received: from mail-qk1-x732.google.com ([2607:f8b0:4864:20::732]:33454) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gHVHJ-0001D0-Sr for qemu-devel@nongnu.org; Tue, 30 Oct 2018 10:45:58 -0400 Received: by mail-qk1-x732.google.com with SMTP id o89so7397632qko.0 for ; Tue, 30 Oct 2018 07:45:28 -0700 (PDT) Received: from localhost (76-251-165-188.lightspeed.austtx.sbcglobal.net. [76.251.165.188]) by smtp.gmail.com with ESMTPSA id u123-v6sm13482180qkd.51.2018.10.30.07.45.25 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 30 Oct 2018 07:45:25 -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=Ogb5hMscvBR7/97F7+QGB34/MnUmfKCPRhsa5QI4p84=; b=YU/TMvOXQUHWGY5dDgJciuLMBGDuozDE8l2cWMP3eMW9Tpk4xPOF4/vd+utdf1VEL7 Rb9dfQCNqTxvphaMMWZuTLohQpYkPgggRXFuIzA0gfvyD6lCyEPMk6+USEEA4rWui6fW 2nQFOY7i88T9x3bAknVlmahBu9dD5wku6+sxBPFFnlYByg5wktYa6hYcZ5HvyozsWRvV uA3UaOhWTWIrNwgj2s4WuckDqUHlS+Gzp1xce5iywWXXGZW3ML8P/YYCyw9Ez9ybZga8 7kxDbPDu3WASNAZjAMxG6w/Mu3y6ImtMk9Q+xnNRTvrqcIM7QM1Am+MlrfdRSDAeCWrg VL+A== 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=Ogb5hMscvBR7/97F7+QGB34/MnUmfKCPRhsa5QI4p84=; b=nJQYQIjRSHr2tP7RJknGWpav4tRSKKGks1XYgWf6vn+exCOubkmRGF2rNp+NPXbY/T jkvOynGx3eNQ6wkZ7Ckd+pZTPN0XjG4Py+tv6X3ZxB9kQXeBhBMAAznrK7uNyOl1jj6o EUv0XOPzxo1FyfBCqz+LoKTeMs4cB3GiD+a2bSSadEZ3JCdfoUdMr6WgImPJE0QLOXLD dfPkYj0+0B56Dh2lgqWklPYmZYSPFFiLTjcwL34MEPlSgKCleuOqo2PNU53glzVna3Oi V/AB+Pa03g8Leld3eghyHCEz7dToPG4l8X6rCCB0lzwUH1/T0SGi2X2iqYdtyrQYG8mk C3RQ== X-Gm-Message-State: AGRZ1gIs2d/RAMr5Ib57lx0DkQCK0QcevPo7+N4oO261GGOl/apkOOWc MtaFPchHt8wiJ0SzfCBeLBlKKGk6 X-Google-Smtp-Source: AJdET5ezn+SCWZ3gx9xbyRRkxZZSTLgbeWsx3gP+yb8tS52cu51JcxooAg+o/pQIHygvrSmOMWg/rw== X-Received: by 2002:a37:6389:: with SMTP id x131mr5090477qkb.149.1540910726748; Tue, 30 Oct 2018 07:45:26 -0700 (PDT) From: Michael Roth To: qemu-devel@nongnu.org Date: Tue, 30 Oct 2018 09:43:40 -0500 Message-Id: <20181030144358.23144-7-mdroth@linux.vnet.ibm.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181030144358.23144-1-mdroth@linux.vnet.ibm.com> References: <20181030144358.23144-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::732 Subject: [Qemu-devel] [PULL 06/24] qga: linux: 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 node of the disk on Linux (e.g. "/dev/sda2"). Requirs libudev. Signed-off-by: Tom=C3=A1=C5=A1 Golembiovsk=C3=BD Signed-off-by: Michael Roth --- qga/commands-posix.c | 7 ++++++- qga/qapi-schema.json | 3 ++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/qga/commands-posix.c b/qga/commands-posix.c index 41bd11b2b5..1877976522 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/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.17.1