From nobody Sat Nov 15 12:45:35 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1595392945; cv=none; d=zohomail.com; s=zohoarc; b=Wb4jD3wON4VR6FlBqFZ7cIUw9KQrrgHZAOhum4ntO5lXUM6hDrzncgNd0xmfsFdv7okc5T45YXK7XLkUocI1DU9GYofK3nhHfanJsueDdhJVtjyf+iSHxRMION/1c4pB3qj5b+kAYVsdxRYgAc8A0Bl1nXh/5K7pNf7b+IMCTuw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1595392945; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=vuU2C4DXYOazrUfiQAllmCLbpXnQAtJl/+AKDkt9d0U=; b=gAVEoljo/HJckpi5HeFSNRhVL+LZWf0/cUG7aNl5SMlPBojT3FWxwMpqoqzNs6loqgdJc36QNyoIjQvTNcL6jPB+qDnHtwUYidsJMapYDpL06fngGFppG93zqodnqyCEy//JLFz52u7Um00U+KquGhTUykrm+Rh7MURep02iG6w= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1595392945001647.378866363109; Tue, 21 Jul 2020 21:42:25 -0700 (PDT) Received: from localhost ([::1]:46782 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jy6aF-0004YK-IC for importer@patchew.org; Wed, 22 Jul 2020 00:42:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52514) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jy6Yb-0002qA-3I for qemu-devel@nongnu.org; Wed, 22 Jul 2020 00:40:41 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:28688 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jy6YY-0002lp-3e for qemu-devel@nongnu.org; Wed, 22 Jul 2020 00:40:40 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-513-UTUQFqSQPaqnyKuSmZWTKQ-1; Wed, 22 Jul 2020 00:40:34 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 60F4D100A8E8; Wed, 22 Jul 2020 04:40:33 +0000 (UTC) Received: from thuth.com (ovpn-112-92.ams2.redhat.com [10.36.112.92]) by smtp.corp.redhat.com (Postfix) with ESMTP id E668F726A2; Wed, 22 Jul 2020 04:40:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1595392837; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=vuU2C4DXYOazrUfiQAllmCLbpXnQAtJl/+AKDkt9d0U=; b=GIRGI5pfpGuifak1AV9DXHTz1RhTqDuhqOlOSI/qG0m5vllzNd3z3aHnHrcpA9QWYebycU h9EO7L6YcbX2JZ84eIj1msvWaXA+03E1wWQsjBxO1I+XBvxUs5pjTboATAW2f9uYnWoSkh Tqwa8OIwOUD0Gvvn0uoDp0dTgbPnQT8= X-MC-Unique: UTUQFqSQPaqnyKuSmZWTKQ-1 From: Thomas Huth To: qemu-devel@nongnu.org, Michael Roth Subject: [PATCH v2 1/4] qga/qapi-schema: Document -1 for invalid PCI address fields Date: Wed, 22 Jul 2020 06:40:25 +0200 Message-Id: <20200722044028.4059-2-thuth@redhat.com> In-Reply-To: <20200722044028.4059-1-thuth@redhat.com> References: <20200722044028.4059-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=207.211.31.120; envelope-from=thuth@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/07/22 00:40:35 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-s390x@nongnu.org, =?UTF-8?q?Tom=C3=A1=C5=A1=20Golembiovsk=C3=BD?= , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) The "guest-get-fsinfo" could also be used for non-PCI devices in the future. And the code in GuestPCIAddress() in qga/commands-win32.c seems to be using "-1" for fields that it can not determine already. Thus let's properly document "-1" as value for invalid PCI address fields. Reviewed-by: Daniel P. Berrang=C3=A9 Signed-off-by: Thomas Huth --- qga/qapi-schema.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qga/qapi-schema.json b/qga/qapi-schema.json index 4be9aad48e..408a662ea5 100644 --- a/qga/qapi-schema.json +++ b/qga/qapi-schema.json @@ -846,7 +846,7 @@ ## # @GuestDiskAddress: # -# @pci-controller: controller's PCI address +# @pci-controller: controller's PCI address (fields are set to -1 if inval= id) # @bus-type: bus type # @bus: bus id # @target: target id --=20 2.18.1 From nobody Sat Nov 15 12:45:35 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1595392952; cv=none; d=zohomail.com; s=zohoarc; b=baDJrTq8sTgE784nRQip3tVwTGwJYrCa05+9MW+3jJ8eHkv1K9ayvOjQw5gyqpkQ/+eoWt4jBS2M0T9UYfjGUShHiohPUgK37Nr5aUN4VeqdCz/pt+Bs4XC6NPbg+3kic80xad6RVIuJ58HwnZVIXRGuTwtCCV1mLCR15Jj/2xs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1595392952; h=Content-Type:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=1Yr2eWjUvnZxwwMdpp68vf/1MyEQFAKvoUYB5EwVOS0=; b=Pe5eqVN2kfyPPr2+EWpaulyMNPTSnRWP/EY+W5AnJ9zN7JA9bx0NStr/r6pCMPV6GW9P9eKAEOFVeQK6hOsqv8DeLJiXvz7/mzzSZhc99jAuAbSbUxOT1blRrVzrBUecbyIv9k6iVmYyRfK4g8EpR86A06Wheu/VOy/Jz5X7v0I= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1595392952687600.3547040332516; Tue, 21 Jul 2020 21:42:32 -0700 (PDT) Received: from localhost ([::1]:47054 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jy6aN-0004f4-0G for importer@patchew.org; Wed, 22 Jul 2020 00:42:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52526) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jy6Yb-0002qW-G0 for qemu-devel@nongnu.org; Wed, 22 Jul 2020 00:40:41 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:50249 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jy6YY-0002lx-U2 for qemu-devel@nongnu.org; Wed, 22 Jul 2020 00:40:41 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-422-mFvaOCNdO8q_syamjqc2dA-1; Wed, 22 Jul 2020 00:40:36 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 3B0488005B0; Wed, 22 Jul 2020 04:40:35 +0000 (UTC) Received: from thuth.com (ovpn-112-92.ams2.redhat.com [10.36.112.92]) by smtp.corp.redhat.com (Postfix) with ESMTP id C0D9D7268C; Wed, 22 Jul 2020 04:40:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1595392837; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:content-type:content-type:in-reply-to:in-reply-to: references:references; bh=1Yr2eWjUvnZxwwMdpp68vf/1MyEQFAKvoUYB5EwVOS0=; b=JB2P9KdUya6L3ndGYG+e5Dy1Ld2rBAGALQY+aRtgrQPwLnV7kTsNtCYyZzlshO88YDKuSJ m0EW0WkMdrti0kZ229k5cL+2495w/Zq2/mkSgtPLhb5X0zQsW+lVBIhumQnNJwBWnFy8xA fwV/wi/2uqLu86UjeRI/y3AsWiXfLU4= X-MC-Unique: mFvaOCNdO8q_syamjqc2dA-1 From: Thomas Huth To: qemu-devel@nongnu.org, Michael Roth Subject: [PATCH v2 2/4] qga/commands-posix: Rework build_guest_fsinfo_for_real_device() function Date: Wed, 22 Jul 2020 06:40:26 +0200 Message-Id: <20200722044028.4059-3-thuth@redhat.com> In-Reply-To: <20200722044028.4059-1-thuth@redhat.com> References: <20200722044028.4059-1-thuth@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=205.139.110.120; envelope-from=thuth@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/07/21 23:27:14 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -40 X-Spam_score: -4.1 X-Spam_bar: ---- X-Spam_report: (-4.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-s390x@nongnu.org, =?UTF-8?q?Tom=C3=A1=C5=A1=20Golembiovsk=C3=BD?= , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" We are going to support non-PCI devices soon. For this we need to split the generic GuestDiskAddress and GuestDiskAddressList memory allocation and list chaining into a separate function first. Signed-off-by: Thomas Huth Reviewed-by: Daniel P. Berrang=C3=A9 --- qga/commands-posix.c | 65 ++++++++++++++++++++++++++++---------------- 1 file changed, 41 insertions(+), 24 deletions(-) diff --git a/qga/commands-posix.c b/qga/commands-posix.c index 1a62a3a70d..1a42ec8171 100644 --- a/qga/commands-posix.c +++ b/qga/commands-posix.c @@ -861,28 +861,30 @@ static int build_hosts(char const *syspath, char cons= t *host, bool ata, return i; } =20 -/* Store disk device info specified by @sysfs into @fs */ -static void build_guest_fsinfo_for_real_device(char const *syspath, - GuestFilesystemInfo *fs, - Error **errp) +/* + * Store disk device info for devices on the PCI bus. + * Returns true if information has been stored, or false for failure. + */ +static bool build_guest_fsinfo_for_pci_dev(char const *syspath, + GuestDiskAddress *disk, + Error **errp) { unsigned int pci[4], host, hosts[8], tgt[3]; int i, nhosts =3D 0, pcilen; - GuestDiskAddress *disk; - GuestPCIAddress *pciaddr; - GuestDiskAddressList *list =3D NULL; + GuestPCIAddress *pciaddr =3D disk->pci_controller; bool has_ata =3D false, has_host =3D false, has_tgt =3D false; char *p, *q, *driver =3D NULL; #ifdef CONFIG_LIBUDEV struct udev *udev =3D NULL; struct udev_device *udevice =3D NULL; #endif + bool ret =3D false; =20 p =3D strstr(syspath, "/devices/pci"); if (!p || sscanf(p + 12, "%*x:%*x/%x:%x:%x.%x%n", pci, pci + 1, pci + 2, pci + 3, &pcilen) < 4) { g_debug("only pci device is supported: sysfs path '%s'", syspath); - return; + return false; } =20 p +=3D 12 + pcilen; @@ -903,7 +905,7 @@ static void build_guest_fsinfo_for_real_device(char con= st *syspath, } =20 g_debug("unsupported driver or sysfs path '%s'", syspath); - return; + return false; } =20 p =3D strstr(syspath, "/target"); @@ -929,18 +931,11 @@ static void build_guest_fsinfo_for_real_device(char c= onst *syspath, } } =20 - pciaddr =3D g_malloc0(sizeof(*pciaddr)); pciaddr->domain =3D pci[0]; pciaddr->bus =3D pci[1]; pciaddr->slot =3D pci[2]; pciaddr->function =3D pci[3]; =20 - disk =3D g_malloc0(sizeof(*disk)); - disk->pci_controller =3D pciaddr; - - list =3D g_malloc0(sizeof(*list)); - list->value =3D disk; - #ifdef CONFIG_LIBUDEV udev =3D udev_new(); udevice =3D udev_device_new_from_syspath(udev, syspath); @@ -1018,21 +1013,43 @@ static void build_guest_fsinfo_for_real_device(char= const *syspath, goto cleanup; } =20 - list->next =3D fs->disk; - fs->disk =3D list; - goto out; + ret =3D true; =20 cleanup: - if (list) { - qapi_free_GuestDiskAddressList(list); - } -out: g_free(driver); #ifdef CONFIG_LIBUDEV udev_unref(udev); udev_device_unref(udevice); #endif - return; + return ret; +} + +/* Store disk device info specified by @sysfs into @fs */ +static void build_guest_fsinfo_for_real_device(char const *syspath, + GuestFilesystemInfo *fs, + Error **errp) +{ + GuestDiskAddress *disk; + GuestPCIAddress *pciaddr; + GuestDiskAddressList *list =3D NULL; + bool has_hwinf; + + pciaddr =3D g_new0(GuestPCIAddress, 1); + + disk =3D g_new0(GuestDiskAddress, 1); + disk->pci_controller =3D pciaddr; + + list =3D g_new0(GuestDiskAddressList, 1); + list->value =3D disk; + + has_hwinf =3D build_guest_fsinfo_for_pci_dev(syspath, disk, errp); + + if (has_hwinf) { + list->next =3D fs->disk; + fs->disk =3D list; + } else { + qapi_free_GuestDiskAddressList(list); + } } =20 static void build_guest_fsinfo_for_device(char const *devpath, --=20 2.18.1 From nobody Sat Nov 15 12:45:35 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1595393028; cv=none; d=zohomail.com; s=zohoarc; b=Nl5WgzffOHDYzlZhnNSBkFHYNfsU3OrAMD0KStsZmCO4rOnPfkKbUSuKhGd6aXbM4fPwycz3PT6itvHyFYEoK0SszGbZwaW0MfbTQFRC+C5+WAaE9Wdwz9mPLvloR2JfO2SjgoStLS3UHgDdHZJ6KhXpS7G86ZWXFEwhCPRK5t8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1595393028; h=Content-Type:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=MvhamPpwgReB9Sphit1s83rRsQO6ok80fcqjytucDf4=; b=lTuOwPeMjJpFaIZghEs0Mq1YfStIeSknZUJmJb8hHIbZDZkGaBucBbx+37lhmoU5aRwL778qHh7HDx8wQdzGoYC3iPBzk53RgSBL09n9i0XZ5j/ukTe5Vn+fdw+zKosqJe1nSWi60YEj1Fh54Z9dDdOsu7WVWaPziCnO0G+baso= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1595393028510964.3094015267292; Tue, 21 Jul 2020 21:43:48 -0700 (PDT) Received: from localhost ([::1]:52388 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jy6bb-0006pl-AD for importer@patchew.org; Wed, 22 Jul 2020 00:43:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52554) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jy6Yc-0002sh-Lz for qemu-devel@nongnu.org; Wed, 22 Jul 2020 00:40:42 -0400 Received: from us-smtp-2.mimecast.com ([207.211.31.81]:25262 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jy6Ya-0002mH-OI for qemu-devel@nongnu.org; Wed, 22 Jul 2020 00:40:42 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-33-gawb5SmyNG6xbnbpueioKA-1; Wed, 22 Jul 2020 00:40:38 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 16B4B100A8E7; Wed, 22 Jul 2020 04:40:37 +0000 (UTC) Received: from thuth.com (ovpn-112-92.ams2.redhat.com [10.36.112.92]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9A82E7268C; Wed, 22 Jul 2020 04:40:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1595392840; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:content-type:content-type:in-reply-to:in-reply-to: references:references; bh=MvhamPpwgReB9Sphit1s83rRsQO6ok80fcqjytucDf4=; b=anAJrYwkUVNUAkeVfU0uSaA3yoDp32CJPaF7qt7SesGvSmrniUgnV++52mxYqugtuMroBS UvlREHVTYB9NHTsfln4fKjD7hoyT40mMj4XYH51w8q76LBPNKFtWC76x7FGAREmXF+I8Wy 7IhIsuZgg96O/XQgCTqTmRj+/e7tzPs= X-MC-Unique: gawb5SmyNG6xbnbpueioKA-1 From: Thomas Huth To: qemu-devel@nongnu.org, Michael Roth Subject: [PATCH v2 3/4] qga/commands-posix: Move the udev code from the pci to the generic function Date: Wed, 22 Jul 2020 06:40:27 +0200 Message-Id: <20200722044028.4059-4-thuth@redhat.com> In-Reply-To: <20200722044028.4059-1-thuth@redhat.com> References: <20200722044028.4059-1-thuth@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=thuth@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=207.211.31.81; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/07/21 23:34:34 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-s390x@nongnu.org, =?UTF-8?q?Tom=C3=A1=C5=A1=20Golembiovsk=C3=BD?= , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" The libudev-related code is independent from the other pci-related code and can be re-used for non-pci devices (like ccw devices on s390x). Thus move this part to the generic function. Buglink: https://bugzilla.redhat.com/show_bug.cgi?id=3D1755075 Signed-off-by: Thomas Huth Reviewed-by: Daniel P. Berrang=C3=A9 --- qga/commands-posix.c | 62 +++++++++++++++++++++++--------------------- 1 file changed, 33 insertions(+), 29 deletions(-) diff --git a/qga/commands-posix.c b/qga/commands-posix.c index 1a42ec8171..e8467ac567 100644 --- a/qga/commands-posix.c +++ b/qga/commands-posix.c @@ -874,10 +874,6 @@ static bool build_guest_fsinfo_for_pci_dev(char const = *syspath, GuestPCIAddress *pciaddr =3D disk->pci_controller; bool has_ata =3D false, has_host =3D false, has_tgt =3D false; char *p, *q, *driver =3D NULL; -#ifdef CONFIG_LIBUDEV - struct udev *udev =3D NULL; - struct udev_device *udevice =3D NULL; -#endif bool ret =3D false; =20 p =3D strstr(syspath, "/devices/pci"); @@ -936,26 +932,6 @@ static bool build_guest_fsinfo_for_pci_dev(char const = *syspath, pciaddr->slot =3D pci[2]; pciaddr->function =3D pci[3]; =20 -#ifdef CONFIG_LIBUDEV - udev =3D udev_new(); - udevice =3D udev_device_new_from_syspath(udev, syspath); - if (udev =3D=3D NULL || udevice =3D=3D NULL) { - g_debug("failed to query udev"); - } else { - 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); - disk->has_serial =3D true; - } - } -#endif - if (strcmp(driver, "ata_piix") =3D=3D 0) { /* a host per ide bus, target*:0::0 */ if (!has_host || !has_tgt) { @@ -1017,10 +993,6 @@ static bool build_guest_fsinfo_for_pci_dev(char const= *syspath, =20 cleanup: g_free(driver); -#ifdef CONFIG_LIBUDEV - udev_unref(udev); - udev_device_unref(udevice); -#endif return ret; } =20 @@ -1033,18 +1005,50 @@ static void build_guest_fsinfo_for_real_device(char= const *syspath, GuestPCIAddress *pciaddr; GuestDiskAddressList *list =3D NULL; bool has_hwinf; +#ifdef CONFIG_LIBUDEV + struct udev *udev =3D NULL; + struct udev_device *udevice =3D NULL; +#endif =20 pciaddr =3D g_new0(GuestPCIAddress, 1); + pciaddr->domain =3D -1; /* -1 means field is inv= alid */ + pciaddr->bus =3D -1; + pciaddr->slot =3D -1; + pciaddr->function =3D -1; =20 disk =3D g_new0(GuestDiskAddress, 1); disk->pci_controller =3D pciaddr; + disk->bus_type =3D GUEST_DISK_BUS_TYPE_UNKNOWN; =20 list =3D g_new0(GuestDiskAddressList, 1); list->value =3D disk; =20 +#ifdef CONFIG_LIBUDEV + udev =3D udev_new(); + udevice =3D udev_device_new_from_syspath(udev, syspath); + if (udev =3D=3D NULL || udevice =3D=3D NULL) { + g_debug("failed to query udev"); + } else { + 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); + disk->has_serial =3D true; + } + } + + udev_unref(udev); + udev_device_unref(udevice); +#endif + has_hwinf =3D build_guest_fsinfo_for_pci_dev(syspath, disk, errp); =20 - if (has_hwinf) { + if (has_hwinf || disk->has_dev || disk->has_serial) { list->next =3D fs->disk; fs->disk =3D list; } else { --=20 2.18.1 From nobody Sat Nov 15 12:45:35 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1595392955; cv=none; d=zohomail.com; s=zohoarc; b=i5BsAEQf2octNO2d6jlkfYLSoEFJpZhq/BFX28JgU2xi9yhq9ImmNccCZpqLWmNDqbs2XxG2gggREZmBS9jiA+CGnm3kWY0bvsEzxYnZCQqwvqpfvCDK9EqozCDhKcmR3Az9txrqJHefJi55grq/aFoOhK8dpT4s2IlkbAnNxZI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1595392955; h=Content-Type:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=5uq+UYEuC6nkUqQ+a/hfRkqBNYdVuBxxPe0O7MvBGpg=; b=NPPDHyqdQDd9cTBeBUMPQtozFjykKj5HpUVcrnUZFSRvNBQEb/w1gy1QgKGMsIF4UklqhuncqjMBWHHzrYAC+76AANkSYzDV4FaSoVXc7LheWdCUuI1962Ga9wRvTaLw54Zp8qzOB2v5FCl4SICQ/HHhK6xeNYQZfD9USTM/HKU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1595392955594834.4938936233477; Tue, 21 Jul 2020 21:42:35 -0700 (PDT) Received: from localhost ([::1]:47332 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jy6aQ-0004mA-B1 for importer@patchew.org; Wed, 22 Jul 2020 00:42:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52598) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jy6Yf-0002zr-F7 for qemu-devel@nongnu.org; Wed, 22 Jul 2020 00:40:45 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:24667 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jy6Yc-0002mp-Ik for qemu-devel@nongnu.org; Wed, 22 Jul 2020 00:40:45 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-380-KI7fv8rTMiqNpyg6DOuTdw-1; Wed, 22 Jul 2020 00:40:39 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id E32E618C63C0; Wed, 22 Jul 2020 04:40:38 +0000 (UTC) Received: from thuth.com (ovpn-112-92.ams2.redhat.com [10.36.112.92]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7461C7268C; Wed, 22 Jul 2020 04:40:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1595392841; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:content-type:content-type:in-reply-to:in-reply-to: references:references; bh=5uq+UYEuC6nkUqQ+a/hfRkqBNYdVuBxxPe0O7MvBGpg=; b=WvwTI+WZh2c5bCGRABNjZ2UpcOTXzUAX28qfPxmNnd8hFwh3RhzmAwf4CaRAy5xsrZlDr6 8DcXyN+84Dl0FUWwKqnUvcmaR526Qrc2GIzMEp1IZuQLTdsMYZ4D7x2QKqbE91D+wkWB5e ZBlLHg70rhtVElZwB75x2eLVyNalXzA= X-MC-Unique: KI7fv8rTMiqNpyg6DOuTdw-1 From: Thomas Huth To: qemu-devel@nongnu.org, Michael Roth Subject: [PATCH v2 4/4] qga/commands-posix: Support fsinfo for non-PCI virtio devices, too Date: Wed, 22 Jul 2020 06:40:28 +0200 Message-Id: <20200722044028.4059-5-thuth@redhat.com> In-Reply-To: <20200722044028.4059-1-thuth@redhat.com> References: <20200722044028.4059-1-thuth@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=205.139.110.120; envelope-from=thuth@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/07/21 23:27:14 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -40 X-Spam_score: -4.1 X-Spam_bar: ---- X-Spam_report: (-4.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-s390x@nongnu.org, =?UTF-8?q?Tom=C3=A1=C5=A1=20Golembiovsk=C3=BD?= , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" QEMU on s390x uses virtio via channel I/O instead of PCI by default. Add a function to detect and provide information for virtio-scsi and virtio-block devices here, too. Signed-off-by: Thomas Huth Reviewed-by: Daniel P. Berrang=C3=A9 --- qga/commands-posix.c | 42 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 41 insertions(+), 1 deletion(-) diff --git a/qga/commands-posix.c b/qga/commands-posix.c index e8467ac567..744c2b5a5d 100644 --- a/qga/commands-posix.c +++ b/qga/commands-posix.c @@ -996,6 +996,39 @@ cleanup: return ret; } =20 +/* + * Store disk device info for non-PCI virtio devices (for example s390x + * channel I/O devices). Returns true if information has been stored, or + * false for failure. + */ +static bool build_guest_fsinfo_for_nonpci_virtio(char const *syspath, + GuestDiskAddress *disk, + Error **errp) +{ + unsigned int tgt[3]; + char *p; + + if (!strstr(syspath, "/virtio") || !strstr(syspath, "/block")) { + g_debug("Unsupported virtio device '%s'", syspath); + return false; + } + + p =3D strstr(syspath, "/target"); + if (p && sscanf(p + 7, "%*u:%*u:%*u/%*u:%u:%u:%u", + &tgt[0], &tgt[1], &tgt[2]) =3D=3D 3) { + /* virtio-scsi: target*:0:: */ + disk->bus_type =3D GUEST_DISK_BUS_TYPE_SCSI; + disk->bus =3D tgt[0]; + disk->target =3D tgt[1]; + disk->unit =3D tgt[2]; + } else { + /* virtio-blk: 1 disk per 1 device */ + disk->bus_type =3D GUEST_DISK_BUS_TYPE_VIRTIO; + } + + return true; +} + /* Store disk device info specified by @sysfs into @fs */ static void build_guest_fsinfo_for_real_device(char const *syspath, GuestFilesystemInfo *fs, @@ -1046,7 +1079,14 @@ static void build_guest_fsinfo_for_real_device(char = const *syspath, udev_device_unref(udevice); #endif =20 - has_hwinf =3D build_guest_fsinfo_for_pci_dev(syspath, disk, errp); + if (strstr(syspath, "/devices/pci")) { + has_hwinf =3D build_guest_fsinfo_for_pci_dev(syspath, disk, errp); + } else if (strstr(syspath, "/virtio")) { + has_hwinf =3D build_guest_fsinfo_for_nonpci_virtio(syspath, disk, = errp); + } else { + g_debug("Unsupported device type for '%s'", syspath); + has_hwinf =3D false; + } =20 if (has_hwinf || disk->has_dev || disk->has_serial) { list->next =3D fs->disk; --=20 2.18.1