From nobody Sat May 18 20:15:16 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 1713879938106737.1124785118567; Tue, 23 Apr 2024 06:45:38 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 14DAA218B; Tue, 23 Apr 2024 09:45:37 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 633C71A3F; Tue, 23 Apr 2024 09:45:00 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 0926A1BC8; Tue, 23 Apr 2024 09:44:56 -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 9718C1AFE for ; Tue, 23 Apr 2024 09:44:44 -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-364-NIMUV3FeN9CU6V4Tia6Gkw-1; Tue, 23 Apr 2024 09:44:43 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (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 9608F3C0ED4B; Tue, 23 Apr 2024 13:44:42 +0000 (UTC) Received: from colepc.home (unknown [10.22.34.116]) by smtp.corp.redhat.com (Postfix) with ESMTP id 55E79200A5C5; Tue, 23 Apr 2024 13:44:42 +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: NIMUV3FeN9CU6V4Tia6Gkw-1 From: Cole Robinson To: devel@lists.libvirt.org Subject: [PATCH v5 1/3] test: make parsed nodedevs active and persistent Date: Tue, 23 Apr 2024 09:44:34 -0400 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.4 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Message-ID-Hash: VRO5W5TBCLAHFQLJ6Z7VIGJZLVHBXJKX X-Message-ID-Hash: VRO5W5TBCLAHFQLJ6Z7VIGJZLVHBXJKX 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: Michal Privoznik , fiuczy@linux.ibm.com, Jonathon Jongsma , 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: 1713879939261100001 This was the implied default before nodedevs gained a notion of being inactive and transient. It also matches the implied default when parsing other object types Signed-off-by: Cole Robinson Reviewed-by: Boris Fiuczynski --- src/test/test_driver.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/test/test_driver.c b/src/test/test_driver.c index 41828f86b6..153ab7cdc2 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -1269,6 +1269,8 @@ testParseNodedevs(testDriver *privconn, return -1; } =20 + virNodeDeviceObjSetPersistent(obj, true); + 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 Sat May 18 20:15:16 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 1713879980200857.3074898007369; Tue, 23 Apr 2024 06:46:20 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 05ED22215; Tue, 23 Apr 2024 09:46:18 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 000C51BC8; Tue, 23 Apr 2024 09:45:03 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 23F751B73; Tue, 23 Apr 2024 09:44:57 -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 E64BD1B73 for ; Tue, 23 Apr 2024 09:44:44 -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-681-4rEeJYhsO1my12qNv2cdyQ-1; Tue, 23 Apr 2024 09:44:43 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (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 E23BA29AB40B; Tue, 23 Apr 2024 13:44:42 +0000 (UTC) Received: from colepc.home (unknown [10.22.34.116]) by smtp.corp.redhat.com (Postfix) with ESMTP id A4E3C2026D0A; Tue, 23 Apr 2024 13:44:42 +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: 4rEeJYhsO1my12qNv2cdyQ-1 From: Cole Robinson To: devel@lists.libvirt.org Subject: [PATCH v5 2/3] test: Sync GetXML INACTIVE behavior with live driver Date: Tue, 23 Apr 2024 09:44:35 -0400 Message-ID: <4f166ac4f1bf4f869d529d75716f654dae380896.1713879485.git.crobinso@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.4 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Message-ID-Hash: PA57WCDEMHXSJGC4I2OPUOTYBO4KIXGW X-Message-ID-Hash: PA57WCDEMHXSJGC4I2OPUOTYBO4KIXGW 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: Michal Privoznik , fiuczy@linux.ibm.com, Jonathon Jongsma , 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: 1713879981365100001 - Error if INACTIVE requested for transient object - Force dumping INACTIVE XML when object is inactive Signed-off-by: Cole Robinson Reviewed-by: Boris Fiuczynski --- src/test/test_driver.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/src/test/test_driver.c b/src/test/test_driver.c index 153ab7cdc2..e7d2b6c866 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -7514,15 +7514,30 @@ testNodeDeviceGetXMLDesc(virNodeDevicePtr dev, { testDriver *driver =3D dev->conn->privateData; virNodeDeviceObj *obj; + virNodeDeviceDef *def; char *ret =3D NULL; =20 virCheckFlags(VIR_NODE_DEVICE_XML_INACTIVE, NULL); =20 if (!(obj =3D testNodeDeviceObjFindByName(driver, dev->name))) return NULL; + def =3D virNodeDeviceObjGetDef(obj); =20 - ret =3D virNodeDeviceDefFormat(virNodeDeviceObjGetDef(obj), flags); + if (flags & VIR_NODE_DEVICE_XML_INACTIVE) { + if (!virNodeDeviceObjIsPersistent(obj)) { + virReportError(VIR_ERR_OPERATION_INVALID, + _("node device '%1$s' is not persistent"), + def->name); + goto cleanup; + } + } else { + if (!virNodeDeviceObjIsActive(obj)) + flags |=3D VIR_NODE_DEVICE_XML_INACTIVE; + } =20 + ret =3D virNodeDeviceDefFormat(def, flags); + + cleanup: virNodeDeviceObjEndAPI(&obj); return ret; } --=20 2.44.0 _______________________________________________ Devel mailing list -- devel@lists.libvirt.org To unsubscribe send an email to devel-leave@lists.libvirt.org From nobody Sat May 18 20:15:16 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 1713880068014739.9390665659416; Tue, 23 Apr 2024 06:47:48 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id D78EF1B73; Tue, 23 Apr 2024 09:47:46 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 64F9F2158; Tue, 23 Apr 2024 09:45:12 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 86D821889; Tue, 23 Apr 2024 09:44:57 -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 55F42210D for ; Tue, 23 Apr 2024 09:44:48 -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-398-G4jimau2NmaZHIFiCilIMg-1; Tue, 23 Apr 2024 09:44:43 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (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 3DC7E3820EB7; Tue, 23 Apr 2024 13:44:43 +0000 (UTC) Received: from colepc.home (unknown [10.22.34.116]) by smtp.corp.redhat.com (Postfix) with ESMTP id F125A200AE7F; Tue, 23 Apr 2024 13:44:42 +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: G4jimau2NmaZHIFiCilIMg-1 From: Cole Robinson To: devel@lists.libvirt.org Subject: [PATCH v5 3/3] test: nodedev: fill active_config at driver startup time Date: Tue, 23 Apr 2024 09:44:36 -0400 Message-ID: <059f9b6ed09b9971b09f23ec79d7d7039c41a07b.1713879485.git.crobinso@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.4 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Message-ID-Hash: PARJO5MABAR3IRDOMKSVZ3FI666HNB35 X-Message-ID-Hash: PARJO5MABAR3IRDOMKSVZ3FI666HNB35 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: Michal Privoznik , fiuczy@linux.ibm.com, Jonathon Jongsma , 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: 1713880069633100001 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. Working example: ``` $ 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 ``` Broken example: ``` $ 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 ``` There's already code that does what we want in the test suite. Move it to a shared function, and call it in test driver when creating a nodedev from driver startup XML. Signed-off-by: Cole Robinson Reviewed-by: Boris Fiuczynski --- src/conf/node_device_conf.c | 24 ++++++++++++++++++++++++ src/conf/node_device_conf.h | 3 +++ src/libvirt_private.syms | 1 + src/test/test_driver.c | 1 + tests/nodedevxml2xmltest.c | 18 +++--------------- 5 files changed, 32 insertions(+), 15 deletions(-) diff --git a/src/conf/node_device_conf.c b/src/conf/node_device_conf.c index 5cfbd6a7eb..fe6d9a36b2 100644 --- a/src/conf/node_device_conf.c +++ b/src/conf/node_device_conf.c @@ -2804,6 +2804,30 @@ virNodeDeviceCapsListExport(virNodeDeviceDef *def, return ncaps; } =20 +void +virNodeDeviceSyncMdevActiveConfig(virNodeDeviceDef *def) +{ + size_t i; + virNodeDevCapsDef *caps; + + for (caps =3D def->caps; caps; caps =3D caps->next) { + virNodeDevCapData *data =3D &caps->data; + + if (caps->data.type !=3D VIR_NODE_DEV_CAP_MDEV) + continue; + + data->mdev.active_config.type =3D g_strdup(data->mdev.defined_conf= ig.type); + for (i =3D 0; i < data->mdev.defined_config.nattributes; i++) { + g_autoptr(virMediatedDeviceAttr) attr =3D g_new0(virMediatedDe= viceAttr, 1); + + attr->name =3D g_strdup(data->mdev.defined_config.attributes[i= ]->name); + attr->value =3D g_strdup(data->mdev.defined_config.attributes[= i]->value); + VIR_APPEND_ELEMENT(data->mdev.active_config.attributes, + data->mdev.active_config.nattributes, + attr); + } + } +} =20 #ifdef __linux__ =20 diff --git a/src/conf/node_device_conf.h b/src/conf/node_device_conf.h index f0a5333881..4b82636af7 100644 --- a/src/conf/node_device_conf.h +++ b/src/conf/node_device_conf.h @@ -470,3 +470,6 @@ virNodeDeviceUpdateCaps(virNodeDeviceDef *def); int virNodeDeviceCapsListExport(virNodeDeviceDef *def, virNodeDevCapType **list); + +void +virNodeDeviceSyncMdevActiveConfig(virNodeDeviceDef *def); diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 839fe4f545..3186dd6d23 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -888,6 +888,7 @@ virNodeDeviceGetPCIDynamicCaps; virNodeDeviceGetSCSIHostCaps; virNodeDeviceGetSCSITargetCaps; virNodeDeviceGetWWNs; +virNodeDeviceSyncMdevActiveConfig; virNodeDeviceUpdateCaps; =20 =20 diff --git a/src/test/test_driver.c b/src/test/test_driver.c index e7d2b6c866..d2d1bc43e3 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -1272,6 +1272,7 @@ testParseNodedevs(testDriver *privconn, virNodeDeviceObjSetPersistent(obj, true); virNodeDeviceObjSetActive(obj, true); virNodeDeviceObjSetSkipUpdateCaps(obj, true); + virNodeDeviceSyncMdevActiveConfig(def); virNodeDeviceObjEndAPI(&obj); } =20 diff --git a/tests/nodedevxml2xmltest.c b/tests/nodedevxml2xmltest.c index e918922672..814a817725 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,22 +51,11 @@ testCompareXMLToXMLFiles(const char *xml, const char *o= utfile, 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 (!(flags & VIR_NODE_DEVICE_XML_INACTIVE)) + virNodeDeviceSyncMdevActiveConfig(dev); + if (!(actual =3D virNodeDeviceDefFormat(dev, flags))) goto fail; =20 --=20 2.44.0 _______________________________________________ Devel mailing list -- devel@lists.libvirt.org To unsubscribe send an email to devel-leave@lists.libvirt.org