From nobody Fri Mar 29 11:51:42 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1531259174519958.7752157663595; Tue, 10 Jul 2018 14:46:14 -0700 (PDT) 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 mx1.redhat.com (Postfix) with ESMTPS id 69C668110D; Tue, 10 Jul 2018 21:46:12 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id BBEC4414B; Tue, 10 Jul 2018 21:46:11 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 03F4F18037ED; Tue, 10 Jul 2018 21:46:10 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w6ALk89q023414 for ; Tue, 10 Jul 2018 17:46:08 -0400 Received: by smtp.corp.redhat.com (Postfix) id 8916521568A4; Tue, 10 Jul 2018 21:46:07 +0000 (UTC) Received: from worklaptop.bos.redhat.com (dhcp-17-157.bos.redhat.com [10.18.17.157]) by smtp.corp.redhat.com (Postfix) with ESMTP id 610582156891; Tue, 10 Jul 2018 21:46:07 +0000 (UTC) From: Cole Robinson To: libvirt-list@redhat.com Date: Tue, 10 Jul 2018 17:46:01 -0400 Message-Id: In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 X-loop: libvir-list@redhat.com Cc: eskultet@redhat.com Subject: [libvirt] [PATCH v2 1/2] conf: nodedev: Don't refresh host caps in testdriver X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Tue, 10 Jul 2018 21:46:12 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Add a 'skipUpdateCaps' bool that we set for test_driver.c nodedevs which will skip accessing host resources via virNodeDeviceUpdateCaps Signed-off-by: Cole Robinson Reviewed-by: Erik Skultety --- src/conf/virnodedeviceobj.c | 13 ++++++++++++- src/conf/virnodedeviceobj.h | 4 ++++ src/test/test_driver.c | 2 ++ 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/src/conf/virnodedeviceobj.c b/src/conf/virnodedeviceobj.c index 13e9a17518..6c04caf6ab 100644 --- a/src/conf/virnodedeviceobj.c +++ b/src/conf/virnodedeviceobj.c @@ -37,6 +37,8 @@ struct _virNodeDeviceObj { virObjectLockable parent; =20 virNodeDeviceDefPtr def; /* device definition */ + bool skipUpdateCaps; /* whether to skip checking host c= aps, + used by testdriver */ }; =20 struct _virNodeDeviceObjList { @@ -806,7 +808,8 @@ virNodeDeviceMatch(virNodeDeviceObjPtr obj, unsigned int flags) { /* Refresh the capabilities first, e.g. due to a driver change */ - if (virNodeDeviceUpdateCaps(obj->def) < 0) + if (!obj->skipUpdateCaps && + virNodeDeviceUpdateCaps(obj->def) < 0) return false; =20 /* filter by cap type */ @@ -915,3 +918,11 @@ virNodeDeviceObjListExport(virConnectPtr conn, virObjectListFree(data.devices); return -1; } + + +void +virNodeDeviceObjSetSkipUpdateCaps(virNodeDeviceObjPtr obj, + bool skipUpdateCaps) +{ + obj->skipUpdateCaps =3D skipUpdateCaps; +} diff --git a/src/conf/virnodedeviceobj.h b/src/conf/virnodedeviceobj.h index 87f9083696..ffbe4e32e5 100644 --- a/src/conf/virnodedeviceobj.h +++ b/src/conf/virnodedeviceobj.h @@ -109,4 +109,8 @@ virNodeDeviceObjListExport(virConnectPtr conn, virNodeDeviceObjListFilter filter, unsigned int flags); =20 +void +virNodeDeviceObjSetSkipUpdateCaps(virNodeDeviceObjPtr obj, + bool skipUpdateCaps); + #endif /* __VIRNODEDEVICEOBJ_H__ */ diff --git a/src/test/test_driver.c b/src/test/test_driver.c index 951d9c4151..7374c83eaa 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -1165,6 +1165,7 @@ testParseNodedevs(testDriverPtr privconn, goto error; } =20 + virNodeDeviceObjSetSkipUpdateCaps(obj, true); virNodeDeviceObjEndAPI(&obj); } =20 @@ -5565,6 +5566,7 @@ testNodeDeviceMockCreateVport(testDriverPtr driver, goto cleanup; def =3D NULL; objdef =3D virNodeDeviceObjGetDef(obj); + virNodeDeviceObjSetSkipUpdateCaps(obj, true); =20 event =3D virNodeDeviceEventLifecycleNew(objdef->name, VIR_NODE_DEVICE_EVENT_CREATED, --=20 2.17.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Fri Mar 29 11:51:42 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1531259185336123.51961462443523; Tue, 10 Jul 2018 14:46:25 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id D1C794E90E; Tue, 10 Jul 2018 21:46:23 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 803D61001949; Tue, 10 Jul 2018 21:46:23 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 3077218037EF; Tue, 10 Jul 2018 21:46:23 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w6ALk8Y7023419 for ; Tue, 10 Jul 2018 17:46:08 -0400 Received: by smtp.corp.redhat.com (Postfix) id B988D2156700; Tue, 10 Jul 2018 21:46:07 +0000 (UTC) Received: from worklaptop.bos.redhat.com (dhcp-17-157.bos.redhat.com [10.18.17.157]) by smtp.corp.redhat.com (Postfix) with ESMTP id 930DB2156891; Tue, 10 Jul 2018 21:46:07 +0000 (UTC) From: Cole Robinson To: libvirt-list@redhat.com Date: Tue, 10 Jul 2018 17:46:02 -0400 Message-Id: <34dec2cf3568a43193be17920ee37ca97a3dff21.1531259066.git.crobinso@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 X-loop: libvir-list@redhat.com Cc: eskultet@redhat.com Subject: [libvirt] [PATCH v2 2/2] test: Implement virConnectListAllNodeDevices X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Tue, 10 Jul 2018 21:46:24 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Cole Robinson Reviewed-by: Erik Skultety --- src/test/test_driver.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/test/test_driver.c b/src/test/test_driver.c index 7374c83eaa..3bc79bf358 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -5381,6 +5381,18 @@ testNodeListDevices(virConnectPtr conn, cap, names, maxnames); } =20 +static int +testConnectListAllNodeDevices(virConnectPtr conn, + virNodeDevicePtr **devices, + unsigned int flags) +{ + testDriverPtr driver =3D conn->privateData; + + virCheckFlags(VIR_CONNECT_LIST_NODE_DEVICES_FILTERS_CAP, -1); + + return virNodeDeviceObjListExport(conn, driver->devs, devices, + NULL, flags); +} =20 static virNodeDevicePtr testNodeDeviceLookupByName(virConnectPtr conn, const char *name) @@ -7017,6 +7029,7 @@ static virStorageDriver testStorageDriver =3D { }; =20 static virNodeDeviceDriver testNodeDeviceDriver =3D { + .connectListAllNodeDevices =3D testConnectListAllNodeDevices, /* 4.1.0= */ .connectNodeDeviceEventRegisterAny =3D testConnectNodeDeviceEventRegis= terAny, /* 2.2.0 */ .connectNodeDeviceEventDeregisterAny =3D testConnectNodeDeviceEventDer= egisterAny, /* 2.2.0 */ .nodeNumOfDevices =3D testNodeNumOfDevices, /* 0.7.2 */ --=20 2.17.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list