From nobody Sat Nov 15 12:44:53 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=1595242984; cv=none; d=zohomail.com; s=zohoarc; b=K3UCQ0aqiUVD+I7+3Om5eQ7Bc10MgOaAmuIC+ndD6e/AzDXhW26ZGM4jmF3tf3YdymVLlAqii9KHmcMLZgA/oD+ILWKj3rADphrUHLWXFwAOXuxJoAXE6jLjBi+lHXPYOgryux1pFwAhOxUs0R7lFrAd3WbD1ie3raN3Q5zZBRA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1595242984; 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=nkxkRkVdp3nv9/qR/smaXle784CAD1lUo4UnYDeb+6o=; b=aMt9DlQG12HqmomJuEGLE8ahY2+m+nMduiTDn8FoNw9MSat9Ob+7fg1mFnCIzliQPS82ivMhecBHMV+KTCWoy79peTXgwl63DJ03mdV8Ksm9Q8Sjta089Q9bwbPqYVPn6ecTBq2x9JTA/Fv8Rot8vK0tNcBvKXZPLB6RF5+H3R8= 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 1595242984455772.8826745729934; Mon, 20 Jul 2020 04:03:04 -0700 (PDT) Received: from localhost ([::1]:52536 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jxTZW-0005cW-VQ for importer@patchew.org; Mon, 20 Jul 2020 07:03:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55744) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jxTYF-0004Qw-6e for qemu-devel@nongnu.org; Mon, 20 Jul 2020 07:01:43 -0400 Received: from us-smtp-1.mimecast.com ([207.211.31.81]:42953 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 1jxTYD-0008OU-My for qemu-devel@nongnu.org; Mon, 20 Jul 2020 07:01: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-231-Z2v6h9OVM5S0AWenjWtaiw-1; Mon, 20 Jul 2020 07:01:39 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 66C2E100AA21; Mon, 20 Jul 2020 11:01:38 +0000 (UTC) Received: from thuth.com (ovpn-112-34.ams2.redhat.com [10.36.112.34]) by smtp.corp.redhat.com (Postfix) with ESMTP id 291705D9E4; Mon, 20 Jul 2020 11:01:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1595242901; 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=nkxkRkVdp3nv9/qR/smaXle784CAD1lUo4UnYDeb+6o=; b=Dr4mAofx8psuvcROCBYO5xVMKgKIgBth0KGPN3uQF8VmNjs/JJhoUeVf5HEdg32e8Q3CzQ ImwKmQ26Q10ak7iLt2trxKlnswsko1HGKp4lUEe9HjUaQ/XTN0EFmXYhhtg/6FDqYaIZR1 VrT2nUQ+ii68gys2S/1djNESBp1oQxk= X-MC-Unique: Z2v6h9OVM5S0AWenjWtaiw-1 From: Thomas Huth To: qemu-devel@nongnu.org, Michael Roth Subject: [PATCH for-5.2 1/3] qga/qapi-schema: Document -1 for invalid PCI address fields Date: Mon, 20 Jul 2020 13:01:31 +0200 Message-Id: <20200720110133.4366-2-thuth@redhat.com> In-Reply-To: <20200720110133.4366-1-thuth@redhat.com> References: <20200720110133.4366-1-thuth@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 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/19 21:45:06 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=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: =?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 "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. Signed-off-by: Thomas Huth Reviewed-by: Daniel P. Berrang=C3=A9 --- 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:44:53 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=1595243054; cv=none; d=zohomail.com; s=zohoarc; b=ej6SZGy+llz+LDkohKwlNrh6w/y2FDYAeBCFpKUc0fBpX9s3KMJCkLXNHdRD/9Ed8D5GOO7/vzFaGYeg20pv1Yz4pBUtIhO09BXcsfuUJcVWV9FRiGBu95dRW3G0+JoKPdRO8SZtnAkP047ujgbZsoHQMtgZaO+Q24EKisx4rJg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1595243054; 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=vlNfwCgWDMNagxJ/BA9y3/iXVjRBVtFuveun+05G65k=; b=aS9T3VtukTex6o7qKjjSkgk2MUSZzEKXW8h21wKEoXcjI4Z5Q74Ja+j3cbI1Amxye3yPh2cyhkqIGzCko8WI661SfI8pDgA0lDBhw9JE/TEGkasg4mIHORsjPSsbLQrD+B8F713ZlByQf8HJE1wsULvxIaDDM+7b5hSbNrr7g2Y= 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 1595243054293185.32583478835602; Mon, 20 Jul 2020 04:04:14 -0700 (PDT) Received: from localhost ([::1]:57756 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jxTaf-0007kd-0s for importer@patchew.org; Mon, 20 Jul 2020 07:04:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55758) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jxTYI-0004UX-EO for qemu-devel@nongnu.org; Mon, 20 Jul 2020 07:01:46 -0400 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:50147 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 1jxTYG-0008Ok-M5 for qemu-devel@nongnu.org; Mon, 20 Jul 2020 07:01:46 -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-466-xjqAMlq3PeOqx5YMu3bOfw-1; Mon, 20 Jul 2020 07:01:40 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 0DB14108C; Mon, 20 Jul 2020 11:01:40 +0000 (UTC) Received: from thuth.com (ovpn-112-34.ams2.redhat.com [10.36.112.34]) by smtp.corp.redhat.com (Postfix) with ESMTP id C705B5D9E4; Mon, 20 Jul 2020 11:01:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1595242903; 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=vlNfwCgWDMNagxJ/BA9y3/iXVjRBVtFuveun+05G65k=; b=jVFhUAHoR9KLqsCpbxMiJtH2WWvVqXljnHHkeKs9u2rhHivDkkyx5jAwLGQxPKLvZvBFGu 7UPKur3CR2KnUXMf5LGxoyisZB8nUXaoGIhuGXdkfTWtzQ3yP65I0ReZc4tmAE0XpqVu33 fsEWJXCISrZ4UNTwGCPu5WN787BJicg= X-MC-Unique: xjqAMlq3PeOqx5YMu3bOfw-1 From: Thomas Huth To: qemu-devel@nongnu.org, Michael Roth Subject: [PATCH for-5.2 2/3] qga/commands-posix: Rework build_guest_fsinfo_for_real_device() function Date: Mon, 20 Jul 2020 13:01:32 +0200 Message-Id: <20200720110133.4366-3-thuth@redhat.com> In-Reply-To: <20200720110133.4366-1-thuth@redhat.com> References: <20200720110133.4366-1-thuth@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 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.61; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/07/20 02:16:39 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: =?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 chaining into a separate function first. Signed-off-by: Thomas Huth --- 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..cddbaf5c69 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, + GuestPCIAddress *pciaddr, + 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; 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_pci; + + pciaddr =3D g_malloc(sizeof(*pciaddr)); + memset(pciaddr, -1, sizeof(*pciaddr)); /* -1 means field is invalid */ + + disk =3D g_malloc0(sizeof(*disk)); + disk->pci_controller =3D pciaddr; + + list =3D g_malloc0(sizeof(*list)); + list->value =3D disk; + + has_pci =3D build_guest_fsinfo_for_pci_dev(syspath, disk, pciaddr, err= p); + if (has_pci) { + 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:44:53 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=1595242990; cv=none; d=zohomail.com; s=zohoarc; b=hRz7ho4DperUJdUUmJjn31ihekJxaVJ+zztaqazp+NzyxfKpU4uQiwPWFHKeY03Y8foZnROq5Rnur/eK+J5CPIKNzh3Pb5+tIAvA1Upx57Vph9ZmitIGTpVG892cXYlhr2ueksuDa1XxCFmdlrv5v0GkPXDqe6A1mVjweS7SCX8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1595242990; 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=iFD3MNtmPM9tgdTMYTHmzPT+7lG59HR/d+FtqyxnzEg=; b=QPW+5FY/jEvCxprWtlzoXJEpCxcVfRZq1aeRUYjVmOqN/3N/mMnZj7vpmwGlqRhbm9eJyFk1aSiNi98VRItTpdRuLzVNUerfpyxxO3YA3BvumrwA4l7dv/Nl3LtwRoiRFlDnXZoVnN2kRypt3RxhRf5zqkrzb3pPghM47S2icVw= 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 159524299039892.95361708073779; Mon, 20 Jul 2020 04:03:10 -0700 (PDT) Received: from localhost ([::1]:53010 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jxTZd-0005nz-4A for importer@patchew.org; Mon, 20 Jul 2020 07:03:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55768) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jxTYK-0004WZ-3Z for qemu-devel@nongnu.org; Mon, 20 Jul 2020 07:01:48 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:36924 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 1jxTYI-0008Op-9b for qemu-devel@nongnu.org; Mon, 20 Jul 2020 07:01:47 -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-254-MqoYO9QvM_O6S1r27pLNsw-1; Mon, 20 Jul 2020 07:01:43 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id A98C719057A1; Mon, 20 Jul 2020 11:01:41 +0000 (UTC) Received: from thuth.com (ovpn-112-34.ams2.redhat.com [10.36.112.34]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6CAAC5D9E4; Mon, 20 Jul 2020 11:01:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1595242905; 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=iFD3MNtmPM9tgdTMYTHmzPT+7lG59HR/d+FtqyxnzEg=; b=JW8gEfe+L+fS2BxduhSr82DjUZMMRWGvRzUB3K7kydJM9uTGq/P2EBS19a5RadxDvGPkqV 2fOuuSPR+2ZZIMdpV+Md1HGefOyuZ+WMzvmgxzVHZ9USpnxeYWbowns1rOYlcehqukJSgA Z+gggvbE5h1rMUW6Dh5EsEVn1lUfOVk= X-MC-Unique: MqoYO9QvM_O6S1r27pLNsw-1 From: Thomas Huth To: qemu-devel@nongnu.org, Michael Roth Subject: [PATCH for-5.2 3/3] qga/commands-posix: Move the udev code from the pci to the generic function Date: Mon, 20 Jul 2020 13:01:33 +0200 Message-Id: <20200720110133.4366-4-thuth@redhat.com> In-Reply-To: <20200720110133.4366-1-thuth@redhat.com> References: <20200720110133.4366-1-thuth@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 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/20 02:11:17 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: =?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 | 58 ++++++++++++++++++++++---------------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/qga/commands-posix.c b/qga/commands-posix.c index cddbaf5c69..169cb9195c 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, int i, nhosts =3D 0, pcilen; 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,46 @@ static void build_guest_fsinfo_for_real_device(char= const *syspath, GuestPCIAddress *pciaddr; GuestDiskAddressList *list =3D NULL; bool has_pci; +#ifdef CONFIG_LIBUDEV + struct udev *udev =3D NULL; + struct udev_device *udevice =3D NULL; +#endif =20 pciaddr =3D g_malloc(sizeof(*pciaddr)); memset(pciaddr, -1, sizeof(*pciaddr)); /* -1 means field is invalid */ =20 disk =3D g_malloc0(sizeof(*disk)); disk->pci_controller =3D pciaddr; + disk->bus_type =3D GUEST_DISK_BUS_TYPE_UNKNOWN; =20 list =3D g_malloc0(sizeof(*list)); 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_pci =3D build_guest_fsinfo_for_pci_dev(syspath, disk, pciaddr, err= p); - if (has_pci) { + if (has_pci || disk->has_dev || disk->has_serial) { list->next =3D fs->disk; fs->disk =3D list; } else { --=20 2.18.1