From patchwork Wed Oct 31 01:38:03 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Michael Roth X-Patchwork-Id: 10662011 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 2DA6F15E9 for ; Wed, 31 Oct 2018 01:57:27 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1EC852ABC8 for ; Wed, 31 Oct 2018 01:57:27 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1327B2ABDF; Wed, 31 Oct 2018 01:57:27 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id AF5452ABC8 for ; Wed, 31 Oct 2018 01:57:26 +0000 (UTC) Received: from localhost ([::1]:56674 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gHfl8-0000o4-1u for patchwork-qemu-devel@patchwork.kernel.org; Tue, 30 Oct 2018 21:57:26 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60633) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gHfVQ-000104-UG for qemu-devel@nongnu.org; Tue, 30 Oct 2018 21:41:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gHfVM-0002do-D2 for qemu-devel@nongnu.org; Tue, 30 Oct 2018 21:41:12 -0400 Received: from mail-qt1-x82f.google.com ([2607:f8b0:4864:20::82f]:38510) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gHfVM-0002bC-6Z for qemu-devel@nongnu.org; Tue, 30 Oct 2018 21:41:08 -0400 Received: by mail-qt1-x82f.google.com with SMTP id v1-v6so11758418qtq.5 for ; Tue, 30 Oct 2018 18:41:05 -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=QiIM4hC88jDZm+65RrJFmlKVhdC0vCjRjTQtcLuHYnTOR4sEb5gsEbjcSg/MTEmJhK rH14GuxSjN/NPND1SwkEXrM1XApBzsO2Hq/Ir/XMHX1mspKqZnt+S/Dwr/UDuuO0yMUC 3tHqHg/JF6erZXZbFzC75IEA3qzNIWp/9NQsdPhWbqqIo1iaHQ3PNeCRE1acMucGS5wc WINYRpoIM50QTZA+Itv9D5HZ+tK6UBeyXCWWJegfTHMQBgQ8cXLA1x4u4XldwgIB1CoF MHGcoh/wWdFXpRoUuIesiwt50XYa1wkThE3797L1HyNeWmB7iJB+sHmGZV5oOBxja+EL r3/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=UiyVwHXWQGxO84fVneKkV/PZO53H1hVbC9nPyaWLuqdtoJgPvaCZNsF8Ub4mZmX/T3 F13s1g0An6ykXHYwwKBR8oqwVStWKyLgE1dKkt8PCeMayRK8HGzVXsTt3WuYvenKpWN1 XrdOKJ3YCs2byeNlZhoq1psI2vz01UMiwt2GpOL/crhedOJ5yj/zH0KQOACXE3TLJ56H nBWH0sy/alcgwYKY1Tz9WGciqlVZKfYasmPbDkEcF+oOgl0SY4EK1iVF0HjChHsi/IG3 Bt6jPcaE2ozKJBbKibihtfYf8qytPtxNCLg1JFxAca4joYUtI5Yd/Dz+Xs7bFAmN8gCi bzzw== X-Gm-Message-State: AGRZ1gLP7SZfFdBVA9Lem5iPCakvysb8o8cNidtQ7+o8gAgQvL3DtTxO p3TXlUZzPkOkAR4rWuxnIoxbQ2PV X-Google-Smtp-Source: AJdET5c8BO1+pzRZ2hePOBYD840YiZ1exVm7F9KLgWhL5J/XUqSvlAThmbwb15jPXZj6CFve0/s8hw== X-Received: by 2002:a0c:d29b:: with SMTP id q27mr988494qvh.62.1540950063932; Tue, 30 Oct 2018 18:41:03 -0700 (PDT) Received: from localhost (76-251-165-188.lightspeed.austtx.sbcglobal.net. [76.251.165.188]) by smtp.gmail.com with ESMTPSA id x141-v6sm8950832qka.9.2018.10.30.18.41.02 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 30 Oct 2018 18:41:02 -0700 (PDT) From: Michael Roth To: qemu-devel@nongnu.org Date: Tue, 30 Oct 2018 20:38:03 -0500 Message-Id: <20181031013821.24023-7-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 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::82f Subject: [Qemu-devel] [PULL v2 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?b?VG9tw6HFoSBHb2xlbWJpb3Zza8O9?= Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Tomáš Golembiovský Report device node of the disk on Linux (e.g. "/dev/sda2"). Requirs libudev. Signed-off-by: Tomáš Golembiovský 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 const *syspath, if (udev == NULL || udevice == NULL) { g_debug("failed to query udev"); } else { - const char *serial; + const char *devnode, *serial; + devnode = udev_device_get_devnode(udevice); + if (devnode != NULL) { + disk->dev = g_strdup(devnode); + disk->has_dev = true; + } serial = udev_device_get_property_value(udevice, "ID_SERIAL"); if (serial != NULL && *serial != 0) { disk->serial = 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'} } ## # @GuestFilesystemInfo: