From nobody Mon Feb 9 02:28:23 2026 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 ARC-Seal: i=1; a=rsa-sha256; t=1600048813; cv=none; d=zohomail.com; s=zohoarc; b=LCbR0vvsLqP8TX2qnTfE1k9XBXgc7Zis9tMl8wEliRk5WHBrWki8fBE8XCwbotbhF7elYHHHMu2VAI/qE/8ROdvXknUEPy67XWyDWAhkWMpo36l5/C/ZYMmmH5GYOGWlXs4V2wo8Q60ckorOllz0stLD/2VkQPQqn/sjjwoNWYo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1600048813; 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=o4mSoG5q+aRN/4U3JPRKEBXuvYdbubdRIlCE9XVbaLk=; b=b1CKiOkZUr0DyejrnQ2o3fiD9dop6fI2ukYAQj88B4xd1UQdcoy1L+JlM9NOsqessUbGTUXwo0nBAGzvTbJcxl5/AejL0LzTX1hnoWqNDVdq0DPCuNz/rTcwHVAGZu/IzzYwiko5MCg63ZWK8tBC+UrcXxKkL6eGhWqD0wlbFE0= 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1600048813806791.387605554117; Sun, 13 Sep 2020 19:00:13 -0700 (PDT) Received: from localhost ([::1]:34828 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kHdms-0003di-3F for importer@patchew.org; Sun, 13 Sep 2020 22:00:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59254) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kHdm1-000232-4D for qemu-devel@nongnu.org; Sun, 13 Sep 2020 21:59:17 -0400 Received: from mail-ot1-x329.google.com ([2607:f8b0:4864:20::329]:36293) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kHdlz-0008EW-IY for qemu-devel@nongnu.org; Sun, 13 Sep 2020 21:59:16 -0400 Received: by mail-ot1-x329.google.com with SMTP id 60so13496545otw.3 for ; Sun, 13 Sep 2020 18:59:15 -0700 (PDT) Received: from localhost (76-251-165-188.lightspeed.austtx.sbcglobal.net. [76.251.165.188]) by smtp.gmail.com with ESMTPSA id b17sm2752717oog.25.2020.09.13.18.59.13 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sun, 13 Sep 2020 18:59:13 -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=o4mSoG5q+aRN/4U3JPRKEBXuvYdbubdRIlCE9XVbaLk=; b=VA6Ud4SaMDV1lBkSxrzPmPWbrsbcDlwqZT3KDx+PF1IooRSJjQqiQBQEVT/VkZTmWn OlEXsoF+85PI1PWedWqV8rrp99Q3Ki4zvvulTblbbP/EvJtqmp0vTbznHbV186zwwQNO lRs+BzWJSG1w7LBRaY6K+i0l777YrF8Wq+YB6AXb9xAgVZgS8EBSCigXdcL0QVHm51Pb uo8Wbe6ETC4WyWhrM4C3gXUocpIplR5AmFmOIDWEXsntIL8kA87v/PSVB8h2E0ZkK8lE GuyIRRwgTzpze9HSXZF3Rd1KYukXuymOxdwaumSOkwBqYpoIrawk8ZZTzgdaHCUsSlaa okNg== 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=o4mSoG5q+aRN/4U3JPRKEBXuvYdbubdRIlCE9XVbaLk=; b=tTv/4vQAI0YSdOuSnqc0EjPSxFSp6LzMYpLGicF8bNd54ke2QmHcRJi3keQqmLEo7q nblZ2C4yBrukIC4vUNrQtXUeknpgCoN7PaIGr1ebMN+AlPjIvHWv3mOaHCE4R5bj57Xs ZcS6vxIq8BYrJ07yLcXKkwbRDNVFhAkQgDd+9xmAQpgWnW0Wv9frDNUc0zUypdCSKMVF emxhsSwL1xN1vQx9/BGp3kObwZqIBKM1kllJRZe4etKP43VonAMRnHz4NmtqogeZ8D1K EtWMziF+DLQeToAgePAlHVFaUsfr5pNkOl4nc6rZN4M4JUxxNi9mOYz0KOwcVW8+yx+F yYYQ== X-Gm-Message-State: AOAM531w9u95q2Wp1ZRlYhgscgmlVBo6n1l5jxNPLaUC9Dmn8AfzKlTg ujqK/PbsppHZeiFTgH09SROAdMCdDUE= X-Google-Smtp-Source: ABdhPJymBiD6IqHFFXYXNpQLtjcofYEdrO/73Y/z3a1+1wxexnaAW2LMEjuhhhI6HWUitdvXPE14og== X-Received: by 2002:a9d:10d:: with SMTP id 13mr8364355otu.130.1600048753964; Sun, 13 Sep 2020 18:59:13 -0700 (PDT) From: Michael Roth To: qemu-devel@nongnu.org Subject: [PULL 1/4] qga/commands-posix: Rework build_guest_fsinfo_for_real_device() function Date: Sun, 13 Sep 2020 20:58:59 -0500 Message-Id: <20200914015902.25769-2-mdroth@linux.vnet.ibm.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200914015902.25769-1-mdroth@linux.vnet.ibm.com> References: <20200914015902.25769-1-mdroth@linux.vnet.ibm.com> MIME-Version: 1.0 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=2607:f8b0:4864:20::329; envelope-from=flukshun@gmail.com; helo=mail-ot1-x329.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.248, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: peter.maydell@linaro.org, Thomas Huth Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Thomas Huth 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 Signed-off-by: Michael Roth --- 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.17.1