From nobody Mon Feb 9 20:09:59 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1658400378; cv=none; d=zohomail.com; s=zohoarc; b=i4zQ1qGffGdMaTULiUXlfhP5gsTTMEoYeOpfxFhwTUnTQCwwVEKxTXQIoBz97tludN4ljus4o3OLwJl3IUmMnB39+Xgs3hquC8gKNCWhamZAUpJpvWlWgBL8+EUnB7BodQLy8F7EpbWjKfXSoNe5bGVt5W2Q87X/fz/9pT3uOl0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1658400378; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=PlyIcJ3+e6EqDHOYEFF+wor1s9da+FAqF1QvyBOCYvA=; b=ahOm2mSE7EQfQfWahIxfoKylhyia3rVlRChUPXeeU3HbNnxHAChe73F4U2LGpN7dUGE2E6cW6h7pP/7b28frlV/IXdpPpJs2O4QaZwongJwSBTAW9AbWCFTflAtLwTvh/H+lXR9F8SA0fW54fzeZbiPaLM5nDus655j7uy9REfk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.zohomail.com with SMTPS id 1658400378783625.0783113622688; Thu, 21 Jul 2022 03:46:18 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-267-p9DaG40YO7Og3MI-Y6kVkw-1; Thu, 21 Jul 2022 06:46:16 -0400 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 00D9F3801F5E; Thu, 21 Jul 2022 10:46:13 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id E1380492C3B; Thu, 21 Jul 2022 10:46:12 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 6C9E81947053; Thu, 21 Jul 2022 10:46:12 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 21C1E1947053 for ; Thu, 21 Jul 2022 10:46:11 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id EAB8C400E894; Thu, 21 Jul 2022 10:46:10 +0000 (UTC) Received: from fedora.redhat.com (unknown [10.43.2.166]) by smtp.corp.redhat.com (Postfix) with ESMTP id 94FB8404C6C9 for ; Thu, 21 Jul 2022 10:46:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1658400377; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=PlyIcJ3+e6EqDHOYEFF+wor1s9da+FAqF1QvyBOCYvA=; b=dP4fOrWqH9IEb3dY5prL6/6vmlp8OnT1YaYNqUB+VgH12MG7Qqe+goCimXmmZcLrrLV7rq 3nrOAq44YarKzS6coHLbC+K5EpS7nBiEkOmSmjk4IINgE/AZ7PdnTZtEHsXQ/1tAYDkqWC 2HVZbQn41gHE+d4VyjbxOVG+PY+MJHM= X-MC-Unique: p9DaG40YO7Og3MI-Y6kVkw-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Kristina Hanicova To: libvirt-list@redhat.com Subject: [PATCH v2 4/8] domain_conf: remove breaks after return in virDomainChrSourceDefIsEqual() Date: Thu, 21 Jul 2022 12:45:49 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.11.54.1 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 2.85 on 10.11.54.10 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1658400379278100001 Content-Type: text/plain; charset="utf-8"; x-default="true" Signed-off-by: Kristina Hanicova Reviewed-by: Martin Kletzander --- src/conf/domain_conf.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 26a241db38..b903dac1cb 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -2844,21 +2844,22 @@ virDomainChrSourceDefIsEqual(const virDomainChrSour= ceDef *src, case VIR_DOMAIN_CHR_TYPE_FILE: return src->data.file.append =3D=3D tgt->data.file.append && STREQ_NULLABLE(src->data.file.path, tgt->data.file.path); - break; + case VIR_DOMAIN_CHR_TYPE_PTY: case VIR_DOMAIN_CHR_TYPE_DEV: case VIR_DOMAIN_CHR_TYPE_PIPE: return STREQ_NULLABLE(src->data.file.path, tgt->data.file.path); + 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); - break; + case VIR_DOMAIN_CHR_TYPE_UDP: return STREQ_NULLABLE(src->data.udp.bindHost, tgt->data.udp.bindHo= st) && STREQ_NULLABLE(src->data.udp.bindService, tgt->data.udp.bindSe= rvice) && STREQ_NULLABLE(src->data.udp.connectHost, tgt->data.udp.connec= tHost) && STREQ_NULLABLE(src->data.udp.connectService, tgt->data.udp.con= nectService); - break; + case VIR_DOMAIN_CHR_TYPE_TCP: return src->data.tcp.listen =3D=3D tgt->data.tcp.listen && src->data.tcp.protocol =3D=3D tgt->data.tcp.protocol && @@ -2866,18 +2867,16 @@ virDomainChrSourceDefIsEqual(const virDomainChrSour= ceDef *src, STREQ_NULLABLE(src->data.tcp.service, tgt->data.tcp.service) && src->data.tcp.reconnect.enabled =3D=3D tgt->data.tcp.reconnect= .enabled && src->data.tcp.reconnect.timeout =3D=3D tgt->data.tcp.reconnect= .timeout; - break; + case VIR_DOMAIN_CHR_TYPE_UNIX: return src->data.nix.listen =3D=3D tgt->data.nix.listen && STREQ_NULLABLE(src->data.nix.path, tgt->data.nix.path) && src->data.nix.reconnect.enabled =3D=3D tgt->data.nix.reconnect= .enabled && src->data.nix.reconnect.timeout =3D=3D tgt->data.nix.reconnect= .timeout; - break; =20 case VIR_DOMAIN_CHR_TYPE_SPICEPORT: return STREQ_NULLABLE(src->data.spiceport.channel, tgt->data.spiceport.channel); - break; =20 case VIR_DOMAIN_CHR_TYPE_SPICEVMC: return src->data.spicevmc =3D=3D tgt->data.spicevmc; @@ -2885,12 +2884,10 @@ virDomainChrSourceDefIsEqual(const virDomainChrSour= ceDef *src, case VIR_DOMAIN_CHR_TYPE_QEMU_VDAGENT: return src->data.qemuVdagent.clipboard =3D=3D tgt->data.qemuVdagen= t.clipboard && src->data.qemuVdagent.mouse =3D=3D tgt->data.qemuVdagent.mouse; - break; =20 case VIR_DOMAIN_CHR_TYPE_DBUS: return STREQ_NULLABLE(src->data.dbus.channel, tgt->data.dbus.channel); - break; =20 case VIR_DOMAIN_CHR_TYPE_NULL: case VIR_DOMAIN_CHR_TYPE_VC: --=20 2.35.3