From nobody Mon Feb 9 22:38:10 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org ARC-Seal: i=1; a=rsa-sha256; t=1606153532; cv=none; d=zohomail.com; s=zohoarc; b=UFcsrmumwP711lf6SK/vJpR8GZNbjxlkuVYxYTsgEiTFn8BOXOK9uSoolgGWeMVOPNv8URZl25J546UA1zag4jah3DyHNOKdSsA5qxsGVy38b1KBsVliUSXkg783xNIeqFVpyhu/ezB92Xk/tFxATFy/Cq8IRJKMhHbkaXpWq90= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1606153532; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=gOoYvYBdUT6Nx0tE3SEPd8rpiDKo5xSEp4PAlyL6C2k=; b=j3ccUfHaqWJpDLhqntVNjVYzjdzSdWky9KJgvzS4Ie7eC04qEXVLU39t2gm7u3q8VlyHHEt8uVW5lTpP4JtF/7J7OkybdZV0fuogspqVMZQR3VoPaEcBGJPrLMhxpRJtF+P9TNggAbG+gXw6PXYnuJqFYFIwaXka3J+H1SUIuNc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1606153532628305.4355467111835; Mon, 23 Nov 2020 09:45:32 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.34934.66302 (Exim 4.92) (envelope-from ) id 1khFts-0006ZU-65; Mon, 23 Nov 2020 17:45:16 +0000 Received: by outflank-mailman (output) from mailman id 34934.66302; Mon, 23 Nov 2020 17:45:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1khFtr-0006YP-I1; Mon, 23 Nov 2020 17:45:15 +0000 Received: by outflank-mailman (input) for mailman id 34934; Mon, 23 Nov 2020 17:45:09 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1khFtl-0006JQ-NJ for xen-devel@lists.xenproject.org; Mon, 23 Nov 2020 17:45:09 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1khFtk-0006Yo-6k; Mon, 23 Nov 2020 17:45:08 +0000 Received: from ec2-54-145-241-208.compute-1.amazonaws.com ([54.145.241.208] helo=ip-10-0-29-170.ec2.internal) by xenbits.xenproject.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.92) (envelope-from ) id 1khFtk-0000at-4G; Mon, 23 Nov 2020 17:45:08 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1khFtl-0006JQ-NJ for xen-devel@lists.xenproject.org; Mon, 23 Nov 2020 17:45:09 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1khFtk-0006Yo-6k; Mon, 23 Nov 2020 17:45:08 +0000 Received: from ec2-54-145-241-208.compute-1.amazonaws.com ([54.145.241.208] helo=ip-10-0-29-170.ec2.internal) by xenbits.xenproject.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.92) (envelope-from ) id 1khFtk-0000at-4G; Mon, 23 Nov 2020 17:45:08 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From; bh=gOoYvYBdUT6Nx0tE3SEPd8rpiDKo5xSEp4PAlyL6C2k=; b=19D3PZ71froCvMd0/cWe6upTV 8yrsNLXtTcsFgdxmsyayoYwCnORvsSAhizZq4SVB6Sfxsh0AvG/VYvbx8apzcJ095obQNdJPsi0/Z 4Cox3BzkjsppqniWq2t2Yvf8o1zOGzbjtB72FGjzxPmHiL3P9xNQdw6We9WkRJKW+vxRQ=; From: Paul Durrant To: xen-devel@lists.xenproject.org Cc: Paul Durrant , Ian Jackson , Wei Liu Subject: [PATCH v3 07/23] libxl: stop using aodev->device_config in libxl__device_pci_add()... Date: Mon, 23 Nov 2020 17:44:47 +0000 Message-Id: <20201123174503.6800-8-paul@xen.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20201123174503.6800-1-paul@xen.org> References: <20201123174503.6800-1-paul@xen.org> X-ZohoMail-DKIM: pass (identity @xen.org) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Paul Durrant ... to hold a pointer to the device. There is already a 'pci' field in 'pci_add_state' so simply use that from the start. This also allows the 'pci' (#3) argument to be dropped from do_pci_add(). NOTE: This patch also changes the type of the 'pci_domid' field in 'pci_add_state' from 'int' to 'libxl_domid' which is more appropriate given what the field is used for. Signed-off-by: Paul Durrant --- Cc: Ian Jackson Cc: Wei Liu --- tools/libs/light/libxl_pci.c | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/tools/libs/light/libxl_pci.c b/tools/libs/light/libxl_pci.c index 41e4b2b571..77edd27345 100644 --- a/tools/libs/light/libxl_pci.c +++ b/tools/libs/light/libxl_pci.c @@ -1074,7 +1074,7 @@ typedef struct pci_add_state { libxl__ev_qmp qmp; libxl__ev_time timeout; libxl_device_pci *pci; - int pci_domid; + libxl_domid pci_domid; } pci_add_state; =20 static void pci_add_qemu_trad_watch_state_cb(libxl__egc *egc, @@ -1091,7 +1091,6 @@ static void pci_add_dm_done(libxl__egc *, =20 static void do_pci_add(libxl__egc *egc, libxl_domid domid, - libxl_device_pci *pci, pci_add_state *pas) { STATE_AO_GC(pas->aodev->ao); @@ -1101,7 +1100,6 @@ static void do_pci_add(libxl__egc *egc, /* init pci_add_state */ libxl__xswait_init(&pas->xswait); libxl__ev_qmp_init(&pas->qmp); - pas->pci =3D pci; pas->pci_domid =3D domid; libxl__ev_time_init(&pas->timeout); =20 @@ -1564,13 +1562,10 @@ void libxl__device_pci_add(libxl__egc *egc, uint32_= t domid, int stubdomid =3D 0; pci_add_state *pas; =20 - /* Store *pci to be used by callbacks */ - aodev->device_config =3D pci; - aodev->device_type =3D &libxl__pci_devtype; - GCNEW(pas); pas->aodev =3D aodev; pas->domid =3D domid; + pas->pci =3D pci; pas->starting =3D starting; pas->callback =3D device_pci_add_stubdom_done; =20 @@ -1624,9 +1619,10 @@ void libxl__device_pci_add(libxl__egc *egc, uint32_t= domid, GCNEW(pci_s); libxl_device_pci_init(pci_s); libxl_device_pci_copy(CTX, pci_s, pci); + pas->pci =3D pci_s; pas->callback =3D device_pci_add_stubdom_wait; =20 - do_pci_add(egc, stubdomid, pci_s, pas); /* must be last */ + do_pci_add(egc, stubdomid, pas); /* must be last */ return; } =20 @@ -1681,9 +1677,8 @@ static void device_pci_add_stubdom_done(libxl__egc *e= gc, int i; =20 /* Convenience aliases */ - libxl__ao_device *aodev =3D pas->aodev; libxl_domid domid =3D pas->domid; - libxl_device_pci *pci =3D aodev->device_config; + libxl_device_pci *pci =3D pas->pci; =20 if (rc) goto out; =20 @@ -1718,7 +1713,7 @@ static void device_pci_add_stubdom_done(libxl__egc *e= gc, pci->vdevfn =3D orig_vdev; } pas->callback =3D device_pci_add_done; - do_pci_add(egc, domid, pci, pas); /* must be last */ + do_pci_add(egc, domid, pas); /* must be last */ return; } } @@ -1734,7 +1729,7 @@ static void device_pci_add_done(libxl__egc *egc, EGC_GC; libxl__ao_device *aodev =3D pas->aodev; libxl_domid domid =3D pas->domid; - libxl_device_pci *pci =3D aodev->device_config; + libxl_device_pci *pci =3D pas->pci; =20 if (rc) { LOGD(ERROR, domid, --=20 2.11.0