From nobody Fri May 3 10:30:01 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 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1521805593184398.29751128530575; Fri, 23 Mar 2018 04:46:33 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id A771681DE1; Fri, 23 Mar 2018 11:46:31 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 6197160C8C; Fri, 23 Mar 2018 11:46:31 +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 D8F524CA99; Fri, 23 Mar 2018 11:46:30 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w2NBkT1O024949 for ; Fri, 23 Mar 2018 07:46:29 -0400 Received: by smtp.corp.redhat.com (Postfix) id 14F912023234; Fri, 23 Mar 2018 11:46:29 +0000 (UTC) Received: from localhost.localdomain.com (unknown [10.42.22.189]) by smtp.corp.redhat.com (Postfix) with ESMTP id AAF282023231; Fri, 23 Mar 2018 11:46:28 +0000 (UTC) From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Date: Fri, 23 Mar 2018 11:46:26 +0000 Message-Id: <20180323114626.24883-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH] conf: avoid reporting errors when network driver is disabled 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: , Content-Type: text/plain; charset="utf-8" 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.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Fri, 23 Mar 2018 11:46:32 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 In previous releases all these methods were a no-op if the network driver is disabled. These helper methods are called unconditionally for all types of network interface, so must be no-ops if missing. Other code will already generate an error if the network driver is disabled and a NIC with type=3Dnetwork is used. Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Laine Stump --- src/conf/domain_conf.c | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index c8d051fa9f..79d6bd378e 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -28979,10 +28979,13 @@ int virDomainNetAllocateActualDevice(virDomainDefPtr dom, virDomainNetDefPtr iface) { + /* Just silently ignore if network driver isn't present. If something + * has tried to use a NIC with type=3Dnetwork, other code will already + * cause an error. This ensures type=3Dbridge doesn't break when + * network driver is compiled out. + */ if (!netAllocate) { - virReportError(VIR_ERR_NO_SUPPORT, "%s", - _("Network device allocation not available")); - return -1; + return 0; } =20 return netAllocate(dom, iface); @@ -28993,8 +28996,6 @@ virDomainNetNotifyActualDevice(virDomainDefPtr dom, virDomainNetDefPtr iface) { if (!netNotify) { - virReportError(VIR_ERR_NO_SUPPORT, "%s", - _("Network device notification not available")); return; } =20 @@ -29007,9 +29008,7 @@ virDomainNetReleaseActualDevice(virDomainDefPtr dom, virDomainNetDefPtr iface) { if (!netRelease) { - virReportError(VIR_ERR_NO_SUPPORT, "%s", - _("Network device release not available")); - return -1; + return 0; } =20 return netRelease(dom, iface); @@ -29020,9 +29019,7 @@ virDomainNetBandwidthChangeAllowed(virDomainNetDefP= tr iface, virNetDevBandwidthPtr newBandwidth) { if (!netBandwidthChangeAllowed) { - virReportError(VIR_ERR_NO_SUPPORT, "%s", - _("Network device bandwidth change query not availa= ble")); - return -1; + return 0; } =20 return netBandwidthChangeAllowed(iface, newBandwidth); @@ -29033,9 +29030,7 @@ virDomainNetBandwidthUpdate(virDomainNetDefPtr ifac= e, virNetDevBandwidthPtr newBandwidth) { if (!netBandwidthUpdate) { - virReportError(VIR_ERR_NO_SUPPORT, "%s", - _("Network device bandwidth update not available")); - return -1; + return 0; } =20 return netBandwidthUpdate(iface, newBandwidth); --=20 2.14.3 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list