From nobody Wed Apr 24 21:20:51 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.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.133.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=1637692541; cv=none; d=zohomail.com; s=zohoarc; b=V210yV4Js0VnAjzEd+uek/p25R4buGSB0N/dsJ6a8MjzaRZWgTfzbqDSmCdjd4oxywsultXU0yDk3ts6hnIT0TC9rAkj8Lrdzk1vCKO5dSYx6uY+va6C2X/qw/eMKFzGnigrJwqrWVGUYS/gMZvy8bksvi4jeetx7R551sEtLIs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1637692541; 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=GW22CCn6qTv7pSNRIxmDOzYXYWcWKCPu1saV+wPLwW8=; b=TKixlzrJmyKJyRaECqIEisst6uhDXztM3YI+WR9AzY3T+EUTzjvOfQIQmc9eMgMDP0s85Evt/IZkUiNAijAH5roSkRrsGZFp694DIzNEIx1A2OZSNfAo7ZRoev24C0M37GRhxX6vyANOIAxnKHgq27+SULx32C0xQHnwyvYm2qQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.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.133.124]) by mx.zohomail.com with SMTPS id 1637692541263391.7372594915985; Tue, 23 Nov 2021 10:35:41 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-124-FgshJi6YOyWMZDFmET3_eg-1; Tue, 23 Nov 2021 13:35:38 -0500 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 AE322806700; Tue, 23 Nov 2021 18:35:33 +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 904FA794A4; Tue, 23 Nov 2021 18:35: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 EE83E4A703; Tue, 23 Nov 2021 18:35:32 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 1ANIZKIt031815 for ; Tue, 23 Nov 2021 13:35:20 -0500 Received: by smtp.corp.redhat.com (Postfix) id 63CAB19D9F; Tue, 23 Nov 2021 18:35:20 +0000 (UTC) Received: from fedora.redhat.com (unknown [10.43.2.78]) by smtp.corp.redhat.com (Postfix) with ESMTP id E0A5D1972E for ; Tue, 23 Nov 2021 18:35:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1637692540; 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=GW22CCn6qTv7pSNRIxmDOzYXYWcWKCPu1saV+wPLwW8=; b=gOHLJv/nAbdfhRuho0ZRvqc2o7BrZ61q9KWWAEWskWqlfXIe/gS0vw/VfihrkfPegI8yTN ounRbvFDi0oaFbv4lgFCyis6StbIbzLw+evr32Vawo9+cD3ddHnEA9IMnUDKwT7hmjlJxS SulC5f796mwpri7AS00EQlFOuBF6xgo= X-MC-Unique: FgshJi6YOyWMZDFmET3_eg-1 From: Kristina Hanicova To: libvir-list@redhat.com Subject: [PATCH] qemu: Rewrite of code pattern Date: Tue, 23 Nov 2021 19:35:08 +0100 Message-Id: <4177db960c2cd642df0317084ba170caaa3f0d06.1637691165.git.khanicov@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 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.79 on 10.5.11.16 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: 1637692543423100001 Content-Type: text/plain; charset="utf-8" This patch rewrites the pattern using early return where it is not needed. Signed-off-by: Kristina Hanicova --- src/qemu/qemu_alias.c | 41 ++++++++++++++++------------------------- 1 file changed, 16 insertions(+), 25 deletions(-) diff --git a/src/qemu/qemu_alias.c b/src/qemu/qemu_alias.c index 5e35f43614..6f664fcd84 100644 --- a/src/qemu/qemu_alias.c +++ b/src/qemu/qemu_alias.c @@ -361,10 +361,9 @@ static int qemuAssignDeviceSoundAlias(virDomainSoundDef *sound, int idx) { - if (sound->info.alias) - return 0; + if (!sound->info.alias) + sound->info.alias =3D g_strdup_printf("sound%d", idx); =20 - sound->info.alias =3D g_strdup_printf("sound%d", idx); return 0; } =20 @@ -373,10 +372,9 @@ static int qemuAssignDeviceVideoAlias(virDomainVideoDef *video, int idx) { - if (video->info.alias) - return 0; + if (!video->info.alias) + video->info.alias =3D g_strdup_printf("video%d", idx); =20 - video->info.alias =3D g_strdup_printf("video%d", idx); return 0; } =20 @@ -385,10 +383,9 @@ static int qemuAssignDeviceHubAlias(virDomainHubDef *hub, int idx) { - if (hub->info.alias) - return 0; + if (!hub->info.alias) + hub->info.alias =3D g_strdup_printf("hub%d", idx); =20 - hub->info.alias =3D g_strdup_printf("hub%d", idx); return 0; } =20 @@ -397,10 +394,9 @@ static int qemuAssignDeviceSmartcardAlias(virDomainSmartcardDef *smartcard, int idx) { - if (smartcard->info.alias) - return 0; + if (!smartcard->info.alias) + smartcard->info.alias =3D g_strdup_printf("smartcard%d", idx); =20 - smartcard->info.alias =3D g_strdup_printf("smartcard%d", idx); return 0; } =20 @@ -409,10 +405,9 @@ static int qemuAssignDeviceMemballoonAlias(virDomainMemballoonDef *memballoon, int idx) { - if (memballoon->info.alias) - return 0; + if (!memballoon->info.alias) + memballoon->info.alias =3D g_strdup_printf("balloon%d", idx); =20 - memballoon->info.alias =3D g_strdup_printf("balloon%d", idx); return 0; } =20 @@ -421,10 +416,9 @@ static int qemuAssignDeviceTPMAlias(virDomainTPMDef *tpm, int idx) { - if (tpm->info.alias) - return 0; + if (!tpm->info.alias) + tpm->info.alias =3D g_strdup_printf("tpm%d", idx); =20 - tpm->info.alias =3D g_strdup_printf("tpm%d", idx); return 0; } =20 @@ -586,10 +580,8 @@ qemuAssignDeviceWatchdogAlias(virDomainWatchdogDef *wa= tchdog) { /* Currently, there's just one watchdog per domain */ =20 - if (watchdog->info.alias) - return 0; - - watchdog->info.alias =3D g_strdup("watchdog0"); + if (!watchdog->info.alias) + watchdog->info.alias =3D g_strdup("watchdog0"); =20 return 0; } @@ -621,9 +613,8 @@ qemuAssignDeviceInputAlias(virDomainDef *def, int qemuAssignDeviceVsockAlias(virDomainVsockDef *vsock) { - if (vsock->info.alias) - return 0; - vsock->info.alias =3D g_strdup("vsock0"); + if (!vsock->info.alias) + vsock->info.alias =3D g_strdup("vsock0"); =20 return 0; } --=20 2.31.1