From nobody Fri May 17 10:13:45 2024 Delivered-To: importer@patchew.org Received-SPF: none (zohomail.com: 8.43.85.245 is neither permitted nor denied by domain of lists.libvirt.org) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; spf=none (zohomail.com: 8.43.85.245 is neither permitted nor denied by domain of lists.libvirt.org) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1712674825589221.5127423203163; Tue, 9 Apr 2024 08:00:25 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 757DC19A1; Tue, 9 Apr 2024 11:00:24 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id C1FB01A8F; Tue, 9 Apr 2024 10:58:05 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id AF6331885; Tue, 9 Apr 2024 10:57:53 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 474D71915 for ; Tue, 9 Apr 2024 10:57:53 -0400 (EDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-659-a8Mumr11O1-3RVrgH3EqfA-1; Tue, 09 Apr 2024 10:57:49 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 7320E1808EF6; Tue, 9 Apr 2024 14:57:49 +0000 (UTC) Received: from colepc.redhat.com (unknown [10.22.32.6]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3468747F; Tue, 9 Apr 2024 14:57:48 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.7 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 X-MC-Unique: a8Mumr11O1-3RVrgH3EqfA-1 From: Cole Robinson To: libvir-list@redhat.com Subject: [PATCH v3 1/5] test: Fix `virsh nodedev-list` Date: Tue, 9 Apr 2024 10:56:25 -0400 Message-ID: <92a4abf79c064b04315b44e48bdc3f00ec414f68.1712674122.git.crobinso@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Message-ID-Hash: IYXTJX3OAC6AYXHY5XKSV2HXYS4VFCCY X-Message-ID-Hash: IYXTJX3OAC6AYXHY5XKSV2HXYS4VFCCY X-MailFrom: crobinso@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header CC: devel@lists.libvirt.org, Michal Privoznik , fiuczy@linux.ibm.com, Cole Robinson X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZM-MESSAGEID: 1712674827672100005 $ virsh --connect test:///default nodedev-list error: Failed to list node devices error: unsupported flags (0x80000000) in function testConnectListAllNodeDev= ices The test driver handles the nodedev state flags, we just need to allow them Signed-off-by: Cole Robinson Reviewed-by: Boris Fiuczynski Reviewed-by: Michal Privoznik --- src/test/test_driver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/test_driver.c b/src/test/test_driver.c index ed0cdc0dab..852a084bce 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -7481,7 +7481,7 @@ testConnectListAllNodeDevices(virConnectPtr conn, { testDriver *driver =3D conn->privateData; =20 - virCheckFlags(VIR_CONNECT_LIST_NODE_DEVICES_FILTERS_CAP, -1); + virCheckFlags(VIR_CONNECT_LIST_NODE_DEVICES_FILTERS_ALL, -1); =20 return virNodeDeviceObjListExport(conn, driver->devs, devices, NULL, flags); --=20 2.44.0 _______________________________________________ Devel mailing list -- devel@lists.libvirt.org To unsubscribe send an email to devel-leave@lists.libvirt.org From nobody Fri May 17 10:13:45 2024 Delivered-To: importer@patchew.org Received-SPF: none (zohomail.com: 8.43.85.245 is neither permitted nor denied by domain of lists.libvirt.org) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; spf=none (zohomail.com: 8.43.85.245 is neither permitted nor denied by domain of lists.libvirt.org) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1712674762670424.8421801009915; Tue, 9 Apr 2024 07:59:22 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 8E4AE1A74; Tue, 9 Apr 2024 10:59:21 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id E47EA1A38; Tue, 9 Apr 2024 10:57:58 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 267091885; Tue, 9 Apr 2024 10:57:52 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id C19BA1912 for ; Tue, 9 Apr 2024 10:57:51 -0400 (EDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-558-ExLYgm_POsGvNU8LoGdClQ-1; Tue, 09 Apr 2024 10:57:50 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 06DDA80A1B7; Tue, 9 Apr 2024 14:57:50 +0000 (UTC) Received: from colepc.redhat.com (unknown [10.22.32.6]) by smtp.corp.redhat.com (Postfix) with ESMTP id B9B6D2E5; Tue, 9 Apr 2024 14:57:49 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.7 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 X-MC-Unique: ExLYgm_POsGvNU8LoGdClQ-1 From: Cole Robinson To: libvir-list@redhat.com Subject: [PATCH v3 2/5] test: Implement virNodeDeviceIsActive Date: Tue, 9 Apr 2024 10:56:26 -0400 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Message-ID-Hash: TS6Q4Y7MYDYYKAOKWZ247D6FI63BZUZD X-Message-ID-Hash: TS6Q4Y7MYDYYKAOKWZ247D6FI63BZUZD X-MailFrom: crobinso@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header CC: devel@lists.libvirt.org, Michal Privoznik , fiuczy@linux.ibm.com, Cole Robinson X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZM-MESSAGEID: 1712674763240100001 Signed-off-by: Cole Robinson Reviewed-by: Boris Fiuczynski Reviewed-by: Michal Privoznik --- src/test/test_driver.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/src/test/test_driver.c b/src/test/test_driver.c index 852a084bce..f9bd6f4e67 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -7779,6 +7779,21 @@ testNodeDeviceDestroy(virNodeDevicePtr dev) return ret; } =20 +static int +testNodeDeviceIsActive(virNodeDevicePtr dev) +{ + testDriver *privconn =3D dev->conn->privateData; + virNodeDeviceObj *obj =3D NULL; + int ret =3D -1; + + if (!(obj =3D testNodeDeviceObjFindByName(privconn, dev->name))) + return -1; + + ret =3D virNodeDeviceObjIsActive(obj); + virNodeDeviceObjEndAPI(&obj); + return ret; +} + =20 /* Domain event implementations */ static int @@ -10657,6 +10672,7 @@ static virNodeDeviceDriver testNodeDeviceDriver =3D= { .nodeDeviceListCaps =3D testNodeDeviceListCaps, /* 0.7.2 */ .nodeDeviceCreateXML =3D testNodeDeviceCreateXML, /* 0.7.3 */ .nodeDeviceDestroy =3D testNodeDeviceDestroy, /* 0.7.3 */ + .nodeDeviceIsActive =3D testNodeDeviceIsActive, /* 10.3.0 */ }; =20 static virConnectDriver testConnectDriver =3D { --=20 2.44.0 _______________________________________________ Devel mailing list -- devel@lists.libvirt.org To unsubscribe send an email to devel-leave@lists.libvirt.org From nobody Fri May 17 10:13:45 2024 Delivered-To: importer@patchew.org Received-SPF: none (zohomail.com: 8.43.85.245 is neither permitted nor denied by domain of lists.libvirt.org) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; spf=none (zohomail.com: 8.43.85.245 is neither permitted nor denied by domain of lists.libvirt.org) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1712674858892557.9949169470283; Tue, 9 Apr 2024 08:00:58 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id D63231A36; Tue, 9 Apr 2024 11:00:57 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id D9DB71A16; Tue, 9 Apr 2024 10:58:09 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 742271885; Tue, 9 Apr 2024 10:57:54 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 0E4B11912 for ; Tue, 9 Apr 2024 10:57:54 -0400 (EDT) Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-647-JHI8Y9MqNMeD7QrlXPW_8w-1; Tue, 09 Apr 2024 10:57:50 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 88FAD29AA3AE; Tue, 9 Apr 2024 14:57:50 +0000 (UTC) Received: from colepc.redhat.com (unknown [10.22.32.6]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4BE0F47F; Tue, 9 Apr 2024 14:57:50 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.7 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 X-MC-Unique: JHI8Y9MqNMeD7QrlXPW_8w-1 From: Cole Robinson To: libvir-list@redhat.com Subject: [PATCH v3 3/5] test: Implement virNodeDeviceIsPersistent Date: Tue, 9 Apr 2024 10:56:27 -0400 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Message-ID-Hash: UBEFQSJN7CHJQEPCNLHMUWH5VXAOUIR7 X-Message-ID-Hash: UBEFQSJN7CHJQEPCNLHMUWH5VXAOUIR7 X-MailFrom: crobinso@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header CC: devel@lists.libvirt.org, Michal Privoznik , fiuczy@linux.ibm.com, Cole Robinson X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZM-MESSAGEID: 1712674859826100001 Signed-off-by: Cole Robinson Reviewed-by: Boris Fiuczynski Reviewed-by: Michal Privoznik --- src/test/test_driver.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/src/test/test_driver.c b/src/test/test_driver.c index f9bd6f4e67..41828f86b6 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -7794,6 +7794,21 @@ testNodeDeviceIsActive(virNodeDevicePtr dev) return ret; } =20 +static int +testNodeDeviceIsPersistent(virNodeDevicePtr dev) +{ + testDriver *privconn =3D dev->conn->privateData; + virNodeDeviceObj *obj =3D NULL; + int ret =3D -1; + + if (!(obj =3D testNodeDeviceObjFindByName(privconn, dev->name))) + return -1; + + ret =3D virNodeDeviceObjIsPersistent(obj); + virNodeDeviceObjEndAPI(&obj); + return ret; +} + =20 /* Domain event implementations */ static int @@ -10673,6 +10688,7 @@ static virNodeDeviceDriver testNodeDeviceDriver =3D= { .nodeDeviceCreateXML =3D testNodeDeviceCreateXML, /* 0.7.3 */ .nodeDeviceDestroy =3D testNodeDeviceDestroy, /* 0.7.3 */ .nodeDeviceIsActive =3D testNodeDeviceIsActive, /* 10.3.0 */ + .nodeDeviceIsPersistent =3D testNodeDeviceIsPersistent, /* 10.3.0 */ }; =20 static virConnectDriver testConnectDriver =3D { --=20 2.44.0 _______________________________________________ Devel mailing list -- devel@lists.libvirt.org To unsubscribe send an email to devel-leave@lists.libvirt.org From nobody Fri May 17 10:13:45 2024 Delivered-To: importer@patchew.org Received-SPF: none (zohomail.com: 8.43.85.245 is neither permitted nor denied by domain of lists.libvirt.org) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; spf=none (zohomail.com: 8.43.85.245 is neither permitted nor denied by domain of lists.libvirt.org) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1712674793825240.67388772298443; Tue, 9 Apr 2024 07:59:53 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 9042319E7; Tue, 9 Apr 2024 10:59:52 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 6E7BB1A6C; Tue, 9 Apr 2024 10:58:02 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 61F2E1919; Tue, 9 Apr 2024 10:57:53 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 004501885 for ; Tue, 9 Apr 2024 10:57:52 -0400 (EDT) Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-259-_dmO9h2nObqgu2xnNfQrZg-1; Tue, 09 Apr 2024 10:57:51 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 1D3263C100CE; Tue, 9 Apr 2024 14:57:51 +0000 (UTC) Received: from colepc.redhat.com (unknown [10.22.32.6]) by smtp.corp.redhat.com (Postfix) with ESMTP id CFDB7490FE; Tue, 9 Apr 2024 14:57:50 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.7 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 X-MC-Unique: _dmO9h2nObqgu2xnNfQrZg-1 From: Cole Robinson To: libvir-list@redhat.com Subject: [PATCH v3 4/5] test: make nodedevs active by default Date: Tue, 9 Apr 2024 10:56:28 -0400 Message-ID: <11c580a97d3bf35312a2609e76cd4c9369646dd2.1712674122.git.crobinso@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Message-ID-Hash: 33DLSCXQRPKWAC2YD4NM4HI3VV2WM6T7 X-Message-ID-Hash: 33DLSCXQRPKWAC2YD4NM4HI3VV2WM6T7 X-MailFrom: crobinso@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header CC: devel@lists.libvirt.org, Michal Privoznik , fiuczy@linux.ibm.com, Cole Robinson X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZM-MESSAGEID: 1712674795417100001 This was the implied default before nodedevs gained a notion of being inactive, and matches how we handle parsing other objects Signed-off-by: Cole Robinson Reviewed-by: Michal Privoznik --- src/test/test_driver.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/test/test_driver.c b/src/test/test_driver.c index 41828f86b6..9db7a44035 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -1269,6 +1269,7 @@ testParseNodedevs(testDriver *privconn, return -1; } =20 + virNodeDeviceObjSetActive(obj, true); virNodeDeviceObjSetSkipUpdateCaps(obj, true); virNodeDeviceObjEndAPI(&obj); } --=20 2.44.0 _______________________________________________ Devel mailing list -- devel@lists.libvirt.org To unsubscribe send an email to devel-leave@lists.libvirt.org From nobody Fri May 17 10:13:45 2024 Delivered-To: importer@patchew.org Received-SPF: none (zohomail.com: 8.43.85.245 is neither permitted nor denied by domain of lists.libvirt.org) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; spf=none (zohomail.com: 8.43.85.245 is neither permitted nor denied by domain of lists.libvirt.org) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1712674898415789.6309783153989; Tue, 9 Apr 2024 08:01:38 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 2606019A1; Tue, 9 Apr 2024 11:01:37 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 1EA871AB2; Tue, 9 Apr 2024 10:58:15 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 2CADF19F5; Tue, 9 Apr 2024 10:58:08 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id B226119CE for ; Tue, 9 Apr 2024 10:57:56 -0400 (EDT) Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-580-Dq9vFBfJPo28L00a4OYULg-1; Tue, 09 Apr 2024 10:57:51 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id A090D38012EE; Tue, 9 Apr 2024 14:57:51 +0000 (UTC) Received: from colepc.redhat.com (unknown [10.22.32.6]) by smtp.corp.redhat.com (Postfix) with ESMTP id 612742DD51; Tue, 9 Apr 2024 14:57:51 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.7 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 X-MC-Unique: Dq9vFBfJPo28L00a4OYULg-1 From: Cole Robinson To: libvir-list@redhat.com Subject: [PATCH v3 5/5] conf: nodedev: Fill active_config at XML parse time Date: Tue, 9 Apr 2024 10:56:29 -0400 Message-ID: <29d8081c557b7d40812ca7c031e3bdb9d3b83760.1712674122.git.crobinso@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Message-ID-Hash: RP5WRCWSQ5T3WBDBJIPUYDQCF4I6XK4I X-Message-ID-Hash: RP5WRCWSQ5T3WBDBJIPUYDQCF4I6XK4I X-MailFrom: crobinso@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header CC: devel@lists.libvirt.org, Michal Privoznik , fiuczy@linux.ibm.com, Cole Robinson X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZM-MESSAGEID: 1712674900393100001 Commit v10.0.0-265-ge67bca23e4 added a `active_config` and `defined_config` to nodedev mdev internal XML handling. `defined_config` can be filled at XML parse time, but `active_config` must be filled in by nodedev driver. This wasn't implemented for the test driver however, which caused virt-manager test suite regressions. Example before: ``` $ virsh --connect test:///home/crobinso/src/virt-manager/tests/data/testdri= ver/testdriver.xml nodedev-dumpxml mdev_8e37ee90_2b51_45e3_9b25_bf8283c03110 mdev_8e37ee90_2b51_45e3_9b25_bf8283c03110 /sys/devices/css0/0.0.0023/8e37ee90-2b51-45e3-9b25-bf8283c03110 css_0_0_0023 ``` Example after: ``` $ virsh --connect test:///home/crobinso/src/virt-manager/tests/data/testdri= ver/testdriver.xml nodedev-dumpxml mdev_8e37ee90_2b51_45e3_9b25_bf8283c03110 mdev_8e37ee90_2b51_45e3_9b25_bf8283c03110 /sys/devices/css0/0.0.0023/8e37ee90-2b51-45e3-9b25-bf8283c03110 css_0_0_0023 ``` Simplest solution is to fill in `active_config` at XML define time as well. The real node_device driver already takes care to free any `active_config` when it live updates this info, so we are safe there. This also lets us drop the test suite logic to duplicate this data. Signed-off-by: Cole Robinson Reviewed-by: Michal Privoznik --- src/conf/node_device_conf.c | 5 ++++- tests/nodedevxml2xmltest.c | 15 --------------- 2 files changed, 4 insertions(+), 16 deletions(-) diff --git a/src/conf/node_device_conf.c b/src/conf/node_device_conf.c index 5cfbd6a7eb..f381ea128c 100644 --- a/src/conf/node_device_conf.c +++ b/src/conf/node_device_conf.c @@ -2222,6 +2222,7 @@ virNodeDevCapMdevParseXML(xmlXPathContextPtr ctxt, _("missing type id attribute for '%1$s'"), def->nam= e); return -1; } + mdev->active_config.type =3D g_strdup(mdev->defined_config.type); =20 if ((uuidstr =3D virXPathString("string(./uuid[1])", ctxt))) { unsigned char uuidbuf[VIR_UUID_BUFLEN]; @@ -2248,8 +2249,10 @@ virNodeDevCapMdevParseXML(xmlXPathContextPtr ctxt, if ((nattrs =3D virXPathNodeSet("./attr", ctxt, &attrs)) < 0) return -1; =20 - for (i =3D 0; i < nattrs; i++) + for (i =3D 0; i < nattrs; i++) { virNodeDevCapMdevAttributeParseXML(ctxt, attrs[i], &mdev->defined_= config); + virNodeDevCapMdevAttributeParseXML(ctxt, attrs[i], &mdev->active_c= onfig); + } =20 return 0; } diff --git a/tests/nodedevxml2xmltest.c b/tests/nodedevxml2xmltest.c index e918922672..d2663a8d68 100644 --- a/tests/nodedevxml2xmltest.c +++ b/tests/nodedevxml2xmltest.c @@ -24,7 +24,6 @@ testCompareXMLToXMLFiles(const char *xml, const char *out= file, unsigned int flag int ret =3D -1; virNodeDeviceDef *dev =3D NULL; virNodeDevCapsDef *caps; - size_t i; =20 if (virTestLoadFile(xml, &xmlData) < 0) goto fail; @@ -52,20 +51,6 @@ testCompareXMLToXMLFiles(const char *xml, const char *ou= tfile, unsigned int flag data->storage.logical_block_siz= e; } } - - if (caps->data.type =3D=3D VIR_NODE_DEV_CAP_MDEV && - !(flags & VIR_NODE_DEVICE_XML_INACTIVE)) { - data->mdev.active_config.type =3D g_strdup(data->mdev.defined_= config.type); - for (i =3D 0; i < data->mdev.defined_config.nattributes; i++) { - g_autoptr(virMediatedDeviceAttr) attr =3D g_new0(virMediat= edDeviceAttr, 1); - - attr->name =3D g_strdup(data->mdev.defined_config.attribut= es[i]->name); - attr->value =3D g_strdup(data->mdev.defined_config.attribu= tes[i]->value); - VIR_APPEND_ELEMENT(data->mdev.active_config.attributes, - data->mdev.active_config.nattributes, - attr); - } - } } =20 if (!(actual =3D virNodeDeviceDefFormat(dev, flags))) --=20 2.44.0 _______________________________________________ Devel mailing list -- devel@lists.libvirt.org To unsubscribe send an email to devel-leave@lists.libvirt.org