From nobody Mon Feb 9 09:15:31 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.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 216.205.24.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=1633620965; cv=none; d=zohomail.com; s=zohoarc; b=PCIYEMEPPL+lPac14aFXa9hu3WrSf4ei6y2K4+wsHsu69WP/JvbYOEf6IV4VXGP/HYINECLAgccgTonYRfFTtLt2vSJKAc+fQXCadeU+QsG2gfjPMotmPPafgUGJ8kieJdsjaTJ+sP+HUqtQLUGelkVG0lotKThXjX2Eg4QKVJY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1633620965; 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=f5tCAE1bW9nCj1eUq0KqcQBbJ3ywvQvy/24DtWNtJ+I=; b=kPyC2IRYCHMROK6rO9y3EWUxk5ssY0ZeTwLnLtFdbXlFbWC2Bm6UJqSFtEmZC4g98Uisq4/NuYojK+z1qEtO7vnK0chC8THiUWVV/ik3o8kJ3XAs1NMHlU7WZ/A5lcNP6xbFpQFIEFHRucF7AihZivFhUz5uumMSchdHUVjQ7OA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.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 [216.205.24.124]) by mx.zohomail.com with SMTPS id 1633620965934700.4685137958261; Thu, 7 Oct 2021 08:36:05 -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-97-G2VP5Qw5OCKmMgsZnwuUJA-1; Thu, 07 Oct 2021 11:35:43 -0400 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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id B202418CA511; Thu, 7 Oct 2021 15:28:05 +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 66C9413071AC; Thu, 7 Oct 2021 15:28:05 +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 F0F7B4EA30; Thu, 7 Oct 2021 15:28:04 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 197FJhGa024031 for ; Thu, 7 Oct 2021 11:19:43 -0400 Received: by smtp.corp.redhat.com (Postfix) id 16CB65F4EA; Thu, 7 Oct 2021 15:19:43 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.5]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6F08D5F4F3 for ; Thu, 7 Oct 2021 15:19:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1633620964; 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=f5tCAE1bW9nCj1eUq0KqcQBbJ3ywvQvy/24DtWNtJ+I=; b=Z8x5Cjskd+IgWHfISIDrMjNd2Hj1cgTSspRQ+JvuIeB/dNSSq5m/BWpYx168+xRCGjKY44 5GygCqPrFX/IkzfBUfiub22EgeXAiW9wiHHzN5A7Pr5El6OWv4/LAN/jcIMKtMG9nwYZiD AiUV0zH/k+xiuZLdtlHerxcshHItgfM= X-MC-Unique: G2VP5Qw5OCKmMgsZnwuUJA-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 051/103] qemuValidateDomainDeviceDef: Avoid unneded variable and 'break' statements Date: Thu, 7 Oct 2021 17:17:39 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com 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.84 on 10.5.11.22 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: 1633620966477100001 Content-Type: text/plain; charset="utf-8" Signed-off-by: Peter Krempa --- src/qemu/qemu_validate.c | 72 ++++++++++++++-------------------------- 1 file changed, 24 insertions(+), 48 deletions(-) diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c index 3f76adb586..499c9ed571 100644 --- a/src/qemu/qemu_validate.c +++ b/src/qemu/qemu_validate.c @@ -4998,7 +4998,6 @@ qemuValidateDomainDeviceDef(const virDomainDeviceDef = *dev, void *opaque, void *parseOpaque) { - int ret =3D 0; virQEMUDriver *driver =3D opaque; g_autoptr(virQEMUCaps) qemuCapsLocal =3D NULL; virQEMUCaps *qemuCaps =3D parseOpaque; @@ -5016,99 +5015,76 @@ qemuValidateDomainDeviceDef(const virDomainDeviceDe= f *dev, switch ((virDomainDeviceType)dev->type) { case VIR_DOMAIN_DEVICE_NET: - ret =3D qemuValidateDomainDeviceDefNetwork(dev->data.net, qemuCaps= ); - break; + return qemuValidateDomainDeviceDefNetwork(dev->data.net, qemuCaps); case VIR_DOMAIN_DEVICE_CHR: - ret =3D qemuValidateDomainChrDef(dev->data.chr, def, qemuCaps); - break; + return qemuValidateDomainChrDef(dev->data.chr, def, qemuCaps); case VIR_DOMAIN_DEVICE_SMARTCARD: - ret =3D qemuValidateDomainSmartcardDef(dev->data.smartcard, qemuCa= ps); - break; + return qemuValidateDomainSmartcardDef(dev->data.smartcard, qemuCap= s); case VIR_DOMAIN_DEVICE_RNG: - ret =3D qemuValidateDomainRNGDef(dev->data.rng, qemuCaps); - break; + return qemuValidateDomainRNGDef(dev->data.rng, qemuCaps); case VIR_DOMAIN_DEVICE_REDIRDEV: - ret =3D qemuValidateDomainRedirdevDef(dev->data.redirdev, def, qem= uCaps); - break; + return qemuValidateDomainRedirdevDef(dev->data.redirdev, def, qemu= Caps); case VIR_DOMAIN_DEVICE_WATCHDOG: - ret =3D qemuValidateDomainWatchdogDef(dev->data.watchdog, def); - break; + return qemuValidateDomainWatchdogDef(dev->data.watchdog, def); case VIR_DOMAIN_DEVICE_HOSTDEV: - ret =3D qemuValidateDomainDeviceDefHostdev(dev->data.hostdev, def, + return qemuValidateDomainDeviceDefHostdev(dev->data.hostdev, def, qemuCaps); - break; case VIR_DOMAIN_DEVICE_VIDEO: - ret =3D qemuValidateDomainDeviceDefVideo(dev->data.video, qemuCaps= ); - break; + return qemuValidateDomainDeviceDefVideo(dev->data.video, qemuCaps); case VIR_DOMAIN_DEVICE_DISK: - ret =3D qemuValidateDomainDeviceDefDisk(dev->data.disk, def, qemuC= aps); - break; + return qemuValidateDomainDeviceDefDisk(dev->data.disk, def, qemuCa= ps); case VIR_DOMAIN_DEVICE_CONTROLLER: - ret =3D qemuValidateDomainDeviceDefController(dev->data.controller= , def, + return qemuValidateDomainDeviceDefController(dev->data.controller,= def, qemuCaps); - break; case VIR_DOMAIN_DEVICE_VSOCK: - ret =3D qemuValidateDomainDeviceDefVsock(dev->data.vsock, qemuCaps= ); - break; + return qemuValidateDomainDeviceDefVsock(dev->data.vsock, qemuCaps); case VIR_DOMAIN_DEVICE_TPM: - ret =3D qemuValidateDomainDeviceDefTPM(dev->data.tpm, def, qemuCap= s); - break; + return qemuValidateDomainDeviceDefTPM(dev->data.tpm, def, qemuCaps= ); case VIR_DOMAIN_DEVICE_GRAPHICS: - ret =3D qemuValidateDomainDeviceDefGraphics(dev->data.graphics, de= f, + return qemuValidateDomainDeviceDefGraphics(dev->data.graphics, def, driver, qemuCaps); - break; case VIR_DOMAIN_DEVICE_INPUT: - ret =3D qemuValidateDomainDeviceDefInput(dev->data.input, def, qem= uCaps); - break; + return qemuValidateDomainDeviceDefInput(dev->data.input, def, qemu= Caps); case VIR_DOMAIN_DEVICE_MEMBALLOON: - ret =3D qemuValidateDomainDeviceDefMemballoon(dev->data.memballoon= , qemuCaps); - break; + return qemuValidateDomainDeviceDefMemballoon(dev->data.memballoon,= qemuCaps); case VIR_DOMAIN_DEVICE_IOMMU: - ret =3D qemuValidateDomainDeviceDefIOMMU(dev->data.iommu, def, qem= uCaps); - break; + return qemuValidateDomainDeviceDefIOMMU(dev->data.iommu, def, qemu= Caps); case VIR_DOMAIN_DEVICE_FS: - ret =3D qemuValidateDomainDeviceDefFS(dev->data.fs, def, driver, q= emuCaps); - break; + return qemuValidateDomainDeviceDefFS(dev->data.fs, def, driver, qe= muCaps); case VIR_DOMAIN_DEVICE_NVRAM: - ret =3D qemuValidateDomainDeviceDefNVRAM(dev->data.nvram, def, qem= uCaps); - break; + return qemuValidateDomainDeviceDefNVRAM(dev->data.nvram, def, qemu= Caps); case VIR_DOMAIN_DEVICE_HUB: - ret =3D qemuValidateDomainDeviceDefHub(dev->data.hub, qemuCaps); - break; + return qemuValidateDomainDeviceDefHub(dev->data.hub, qemuCaps); case VIR_DOMAIN_DEVICE_SOUND: - ret =3D qemuValidateDomainDeviceDefSound(dev->data.sound, qemuCaps= ); - break; + return qemuValidateDomainDeviceDefSound(dev->data.sound, qemuCaps); case VIR_DOMAIN_DEVICE_MEMORY: - ret =3D qemuValidateDomainDeviceDefMemory(dev->data.memory, qemuCa= ps); - break; + return qemuValidateDomainDeviceDefMemory(dev->data.memory, qemuCap= s); case VIR_DOMAIN_DEVICE_SHMEM: - ret =3D qemuValidateDomainDeviceDefShmem(dev->data.shmem, qemuCaps= ); - break; + return qemuValidateDomainDeviceDefShmem(dev->data.shmem, qemuCaps); case VIR_DOMAIN_DEVICE_AUDIO: - ret =3D qemuValidateDomainDeviceDefAudio(dev->data.audio, qemuCaps= ); - break; + return qemuValidateDomainDeviceDefAudio(dev->data.audio, qemuCaps); case VIR_DOMAIN_DEVICE_LEASE: case VIR_DOMAIN_DEVICE_PANIC: @@ -5117,5 +5093,5 @@ qemuValidateDomainDeviceDef(const virDomainDeviceDef = *dev, break; } - return ret; + return 0; } --=20 2.31.1