From nobody Sat May 4 20:31:28 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1594951963; cv=none; d=zohomail.com; s=zohoarc; b=eHNlRnABhKuRagVmjztD0A79lwBnwrTWXaRrGMqQDZncbB5QKKD+O/jsd0e3OuQues0h/aA3xEp2NMaMiSln1HFwl7zwkndS+ggBAy9lzYTxe8QmLCkru711n6pPmInaUdWDAu50prMIS6OCke7/IgjMGeAtUbNPxVTyc3EEJeo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594951963; h=Content-Type:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:Sender:Subject:To; bh=EDCCXes1WeSyZP2zwxPkokejffEJ5ycFeaRULQYV6PY=; b=hGZX5kTJmcz9RAIVakZp7a2OWJo3ejno+4GUiZqdSnyxaVwStIbkxg8/cdSmm0+iY1G4497oM9XiWdHOP/RHpgkE+gJ3oQEcfBaG85inh0zrKl9K7iq++xfB3HucOVHqoWLkyBa8P5Rnfa7oJV4QNWCF0WytYFuPCJvpEwKF7GY= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by mx.zohomail.com with SMTPS id 1594951963599803.1686877357652; Thu, 16 Jul 2020 19:12:43 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-364-EOgU3BMJP3eUyJwHnP-90g-1; Thu, 16 Jul 2020 22:12:39 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 0C0D610059B4; Fri, 17 Jul 2020 02:12:34 +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 5D7265C1D4; Fri, 17 Jul 2020 02:12:33 +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 9270E94F07; Fri, 17 Jul 2020 02:12:31 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 06H2CUPg018487 for ; Thu, 16 Jul 2020 22:12:30 -0400 Received: by smtp.corp.redhat.com (Postfix) id 4B2D5F8964; Fri, 17 Jul 2020 02:12:30 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast05.extmail.prod.ext.rdu2.redhat.com [10.11.55.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 46469F896E for ; Fri, 17 Jul 2020 02:12:25 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-1.mimecast.com [205.139.110.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 91854924907 for ; Fri, 17 Jul 2020 02:12:25 +0000 (UTC) Received: from mxct.zte.com.cn (mx7.zte.com.cn [202.103.147.169]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-96-t1kboC8WNCehDSPbcdSPnw-1; Thu, 16 Jul 2020 22:12:22 -0400 Received: from mse-fl1.zte.com.cn (unknown [10.30.14.238]) by Forcepoint Email with ESMTPS id 79E50534DBEF29303332 for ; Fri, 17 Jul 2020 09:56:42 +0800 (CST) Received: from notes_smtp.zte.com.cn (notessmtp.zte.com.cn [10.30.1.239]) by mse-fl1.zte.com.cn with ESMTP id 06H1ubGE097461 for ; Fri, 17 Jul 2020 09:56:37 +0800 (GMT-8) (envelope-from wang.yi59@zte.com.cn) Received: from fox-host8.localdomain ([10.74.120.8]) by szsmtp06.zte.com.cn (Lotus Domino Release 8.5.3FP6) with ESMTP id 2020071709571210-4311289 ; Fri, 17 Jul 2020 09:57:12 +0800 X-MC-Unique: EOgU3BMJP3eUyJwHnP-90g-1 X-MC-Unique: t1kboC8WNCehDSPbcdSPnw-1 From: Yi Wang To: libvir-list@redhat.com Subject: [PATCH] conf: Remove superfluous breaks Date: Fri, 17 Jul 2020 10:00:09 +0800 Message-Id: <1594951209-34844-1-git-send-email-wang.yi59@zte.com.cn> X-MIMETrack: Itemize by SMTP Server on SZSMTP06/server/zte_ltd(Release 8.5.3FP6|November 21, 2013) at 2020-07-17 09:57:12, Serialize by Router on notes_smtp/zte_ltd(Release 9.0.1FP7|August 17, 2016) at 2020-07-17 09:56:42, Serialize complete at 2020-07-17 09:56:42 X-MAIL: mse-fl1.zte.com.cn 06H1ubGE097461 X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-loop: libvir-list@redhat.com Cc: wang.yi59@zte.com.cn, Liao Pingfang , wang.liang82@zte.com.cn, xue.zhihong@zte.com.cn 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: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Mimecast-Spam-Score: 2 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Liao Pingfang Remove superfluous breaks, as there is a "return" before them. Signed-off-by: Liao Pingfang Signed-off-by: Yi Wang Reviewed-by: Daniel Henrique Barboza Reviewed-by: J=C3=A1n Tomko --- src/conf/domain_conf.c | 6 ------ src/conf/network_conf.c | 12 ------------ src/conf/nwfilter_params.c | 4 ---- 3 files changed, 22 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index bcebfc6..355aa74 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -1840,7 +1840,6 @@ const char *virDomainInputDefGetPath(virDomainInputDe= fPtr input) case VIR_DOMAIN_INPUT_TYPE_KBD: case VIR_DOMAIN_INPUT_TYPE_LAST: return NULL; - break; =20 case VIR_DOMAIN_INPUT_TYPE_PASSTHROUGH: return input->source.evdev; @@ -2728,7 +2727,6 @@ virDomainChrSourceDefIsEqual(const virDomainChrSource= Def *src, case VIR_DOMAIN_CHR_TYPE_DEV: case VIR_DOMAIN_CHR_TYPE_PIPE: return STREQ_NULLABLE(src->data.file.path, tgt->data.file.path); - break; case VIR_DOMAIN_CHR_TYPE_NMDM: return STREQ_NULLABLE(src->data.nmdm.master, tgt->data.nmdm.master= ) && STREQ_NULLABLE(src->data.nmdm.slave, tgt->data.nmdm.slave); @@ -8425,7 +8423,6 @@ virDomainHostdevSubsysSCSIVHostDefParseXML(xmlNodePtr= sourcenode, _("Invalid hostdev protocol '%s'"), virDomainHostdevSubsysSCSIHostProtocolTypeToString(= hostsrc->protocol)); return -1; - break; } =20 return 0; @@ -18139,13 +18136,11 @@ virDomainChrEquals(virDomainChrDefPtr src, case VIR_DOMAIN_CHR_CHANNEL_TARGET_TYPE_XEN: case VIR_DOMAIN_CHR_CHANNEL_TARGET_TYPE_VIRTIO: return STREQ_NULLABLE(src->target.name, tgt->target.name); - break; case VIR_DOMAIN_CHR_CHANNEL_TARGET_TYPE_GUESTFWD: if (!src->target.addr || !tgt->target.addr) return src->target.addr =3D=3D tgt->target.addr; return memcmp(src->target.addr, tgt->target.addr, sizeof(*src->target.addr)) =3D=3D 0; - break; =20 case VIR_DOMAIN_CHR_CHANNEL_TARGET_TYPE_NONE: case VIR_DOMAIN_CHR_CHANNEL_TARGET_TYPE_LAST: @@ -18163,7 +18158,6 @@ virDomainChrEquals(virDomainChrDefPtr src, case VIR_DOMAIN_CHR_DEVICE_TYPE_CONSOLE: case VIR_DOMAIN_CHR_DEVICE_TYPE_PARALLEL: return src->target.port =3D=3D tgt->target.port; - break; case VIR_DOMAIN_CHR_DEVICE_TYPE_LAST: /* shouldn't happen */ break; diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index 0fd68a7..4221623 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -3682,48 +3682,36 @@ virNetworkDefUpdateSection(virNetworkDefPtr def, switch (section) { case VIR_NETWORK_SECTION_BRIDGE: return virNetworkDefUpdateBridge(def, command, parentIndex, ctxt, = flags); - break; =20 case VIR_NETWORK_SECTION_DOMAIN: return virNetworkDefUpdateDomain(def, command, parentIndex, ctxt, = flags); - break; case VIR_NETWORK_SECTION_IP: return virNetworkDefUpdateIP(def, command, parentIndex, ctxt, flag= s); - break; case VIR_NETWORK_SECTION_IP_DHCP_HOST: return virNetworkDefUpdateIPDHCPHost(def, command, parentIndex, ctxt, flags); - break; case VIR_NETWORK_SECTION_IP_DHCP_RANGE: return virNetworkDefUpdateIPDHCPRange(def, command, parentIndex, ctxt, flags); - break; case VIR_NETWORK_SECTION_FORWARD: return virNetworkDefUpdateForward(def, command, parentIndex, ctxt, flags); - break; case VIR_NETWORK_SECTION_FORWARD_INTERFACE: return virNetworkDefUpdateForwardInterface(def, command, parentIndex, ctxt, flag= s); - break; case VIR_NETWORK_SECTION_FORWARD_PF: return virNetworkDefUpdateForwardPF(def, command, parentIndex, ctxt, flags); - break; case VIR_NETWORK_SECTION_PORTGROUP: return virNetworkDefUpdatePortGroup(def, command, parentIndex, ctxt, flags); - break; case VIR_NETWORK_SECTION_DNS_HOST: return virNetworkDefUpdateDNSHost(def, command, parentIndex, ctxt, flags); - break; case VIR_NETWORK_SECTION_DNS_TXT: return virNetworkDefUpdateDNSTxt(def, command, parentIndex, ctxt, = flags); - break; case VIR_NETWORK_SECTION_DNS_SRV: return virNetworkDefUpdateDNSSrv(def, command, parentIndex, ctxt, = flags); - break; default: virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", _("can't update unrecognized section of network")); diff --git a/src/conf/nwfilter_params.c b/src/conf/nwfilter_params.c index b0d60ab..f2ec080 100644 --- a/src/conf/nwfilter_params.c +++ b/src/conf/nwfilter_params.c @@ -169,10 +169,8 @@ virNWFilterVarValueGetCardinality(const virNWFilterVar= Value *val) switch (val->valType) { case NWFILTER_VALUE_TYPE_SIMPLE: return 1; - break; case NWFILTER_VALUE_TYPE_ARRAY: return val->u.array.nValues; - break; case NWFILTER_VALUE_TYPE_LAST: return 0; } @@ -853,10 +851,8 @@ virNWFilterVarAccessEqual(const virNWFilterVarAccess *= a, case VIR_NWFILTER_VAR_ACCESS_ELEMENT: return (a->u.index.idx =3D=3D b->u.index.idx && a->u.index.intIterId =3D=3D b->u.index.intIterId); - break; case VIR_NWFILTER_VAR_ACCESS_ITERATOR: return a->u.iterId =3D=3D b->u.iterId; - break; case VIR_NWFILTER_VAR_ACCESS_LAST: break; } --=20 2.9.5