From nobody Thu Apr 25 07:49:08 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=1637770406; cv=none; d=zohomail.com; s=zohoarc; b=h+fOH/sMeBpNZQWAefsppvYrHrmZslAgfJpp4+94lTPb+8jp2HjWdVyN3tukFHFKWfdbf2GUDbLs9xcXD3FWQqv1dPgU7ESEW8TStFrUqttWgX58PbInYktUoeKldhp26VOWF/EnHdTDwincwNBZRG6OY0Xys6dfiQ14hXNwL/0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1637770406; 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=feJDzFRHxDWdevbqnX6/givnxF5DJWGgCOby3eZMEXA=; b=Ey3PShDBOjP96brhddtKmYmvKVPzquDo9bVrfei9zrgZDUrC8kD3SuEoFjhbs6upsi68XWqg+beOlaP+gefavVafQby9dQ5OoHmEH6VNY1knkCqZPeg1F1JfvkDFTy4UgOwMdijtbvgyUt+Q4KgTWFDsZO352BQgrt5mrpQqgeI= 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 1637770406810262.5864021480983; Wed, 24 Nov 2021 08:13:26 -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-506-82td58s7PFG8EB28Q57r3Q-1; Wed, 24 Nov 2021 11:13:21 -0500 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 CBC9DCC622; Wed, 24 Nov 2021 16:13:16 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 7D10D1001F50; Wed, 24 Nov 2021 16:13:16 +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 3B7881809CB7; Wed, 24 Nov 2021 16:13:16 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 1AOGDFfA030821 for ; Wed, 24 Nov 2021 11:13:15 -0500 Received: by smtp.corp.redhat.com (Postfix) id 4580160C4A; Wed, 24 Nov 2021 16:13:15 +0000 (UTC) Received: from fedora.redhat.com (unknown [10.43.2.78]) by smtp.corp.redhat.com (Postfix) with ESMTP id C0E4E60C05 for ; Wed, 24 Nov 2021 16:13:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1637770405; 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=feJDzFRHxDWdevbqnX6/givnxF5DJWGgCOby3eZMEXA=; b=GugySgVknyJN2VKuAcXWTqCjZ23D7FBcyRqQ/I0uYeMEBrZMFgGokVZZ7Kto33kJ69yj1j w7/4WY+Sc8bDcsBZpT0dHNWlVQLwAt5NQtt5+jhA2q9iLVp56r4Tx2xOttY8BK7H+pU9nR w6ytwGCxv8+8bYReF9zEF56vm2veCJg= X-MC-Unique: 82td58s7PFG8EB28Q57r3Q-1 From: Kristina Hanicova To: libvir-list@redhat.com Subject: [PATCH v2 1/2] qemu_alias: Rewrite of code pattern Date: Wed, 24 Nov 2021 17:12:53 +0100 Message-Id: <69fb0cd9e41e469377bfa3e2c568dd87998842d1.1637770067.git.khanicov@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 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: 1637770408504100001 Content-Type: text/plain; charset="utf-8" This patch rewrites the pattern using early return where it is not needed and changes the return type of the functions to 'void' if possible. Signed-off-by: Kristina Hanicova Reviewed-by: Michal Privoznik --- src/qemu/qemu_alias.c | 107 ++++++++++++++-------------------------- src/qemu/qemu_alias.h | 10 ++-- src/qemu/qemu_hotplug.c | 9 ++-- 3 files changed, 44 insertions(+), 82 deletions(-) diff --git a/src/qemu/qemu_alias.c b/src/qemu/qemu_alias.c index 5e35f43614..ff5c7f1bd8 100644 --- a/src/qemu/qemu_alias.c +++ b/src/qemu/qemu_alias.c @@ -357,75 +357,57 @@ qemuAssignDeviceFSAlias(virDomainDef *def, } =20 =20 -static int +static void qemuAssignDeviceSoundAlias(virDomainSoundDef *sound, int idx) { - if (sound->info.alias) - return 0; - - sound->info.alias =3D g_strdup_printf("sound%d", idx); - return 0; + if (!sound->info.alias) + sound->info.alias =3D g_strdup_printf("sound%d", idx); } =20 =20 -static int +static void qemuAssignDeviceVideoAlias(virDomainVideoDef *video, int idx) { - if (video->info.alias) - return 0; - - video->info.alias =3D g_strdup_printf("video%d", idx); - return 0; + if (!video->info.alias) + video->info.alias =3D g_strdup_printf("video%d", idx); } =20 =20 -static int +static void qemuAssignDeviceHubAlias(virDomainHubDef *hub, int idx) { - if (hub->info.alias) - return 0; - - hub->info.alias =3D g_strdup_printf("hub%d", idx); - return 0; + if (!hub->info.alias) + hub->info.alias =3D g_strdup_printf("hub%d", idx); } =20 =20 -static int +static void qemuAssignDeviceSmartcardAlias(virDomainSmartcardDef *smartcard, int idx) { - if (smartcard->info.alias) - return 0; - - smartcard->info.alias =3D g_strdup_printf("smartcard%d", idx); - return 0; + if (!smartcard->info.alias) + smartcard->info.alias =3D g_strdup_printf("smartcard%d", idx); } =20 =20 -static int +static void qemuAssignDeviceMemballoonAlias(virDomainMemballoonDef *memballoon, int idx) { - if (memballoon->info.alias) - return 0; - - memballoon->info.alias =3D g_strdup_printf("balloon%d", idx); - return 0; + if (!memballoon->info.alias) + memballoon->info.alias =3D g_strdup_printf("balloon%d", idx); } =20 =20 -static int +static void qemuAssignDeviceTPMAlias(virDomainTPMDef *tpm, int idx) { - if (tpm->info.alias) - return 0; - - tpm->info.alias =3D g_strdup_printf("tpm%d", idx); - return 0; + if (!tpm->info.alias) + tpm->info.alias =3D g_strdup_printf("tpm%d", idx); } =20 =20 @@ -581,26 +563,23 @@ qemuAssignDeviceShmemAlias(virDomainDef *def, } =20 =20 -int +void qemuAssignDeviceWatchdogAlias(virDomainWatchdogDef *watchdog) { /* Currently, there's just one watchdog per domain */ =20 - if (watchdog->info.alias) - return 0; - - watchdog->info.alias =3D g_strdup("watchdog0"); - - return 0; + if (!watchdog->info.alias) + watchdog->info.alias =3D g_strdup("watchdog0"); } =20 -int + +void qemuAssignDeviceInputAlias(virDomainDef *def, virDomainInputDef *input, int idx) { if (input->info.alias) - return 0; + return; =20 if (idx =3D=3D -1) { int thisidx; @@ -613,19 +592,14 @@ qemuAssignDeviceInputAlias(virDomainDef *def, } =20 input->info.alias =3D g_strdup_printf("input%d", idx); - - return 0; } =20 =20 -int +void qemuAssignDeviceVsockAlias(virDomainVsockDef *vsock) { - if (vsock->info.alias) - return 0; - vsock->info.alias =3D g_strdup("vsock0"); - - return 0; + if (!vsock->info.alias) + vsock->info.alias =3D g_strdup("vsock0"); } =20 =20 @@ -648,8 +622,7 @@ qemuAssignDeviceAliases(virDomainDef *def, virQEMUCaps = *qemuCaps) return -1; } for (i =3D 0; i < def->nsounds; i++) { - if (qemuAssignDeviceSoundAlias(def->sounds[i], i) < 0) - return -1; + qemuAssignDeviceSoundAlias(def->sounds[i], i); } for (i =3D 0; i < def->nhostdevs; i++) { /* we can't start assigning at 0, since netdevs may have used @@ -665,16 +638,14 @@ qemuAssignDeviceAliases(virDomainDef *def, virQEMUCap= s *qemuCaps) return -1; } for (i =3D 0; i < def->nvideos; i++) { - if (qemuAssignDeviceVideoAlias(def->videos[i], i) < 0) - return -1; + qemuAssignDeviceVideoAlias(def->videos[i], i); } for (i =3D 0; i < def->ncontrollers; i++) { if (qemuAssignDeviceControllerAlias(def, def->controllers[i]) < 0) return -1; } for (i =3D 0; i < def->ninputs; i++) { - if (qemuAssignDeviceInputAlias(def, def->inputs[i], i) < 0) - return -1; + qemuAssignDeviceInputAlias(def, def->inputs[i], i); } for (i =3D 0; i < def->nparallels; i++) { if (qemuAssignDeviceChrAlias(def, def->parallels[i], i) < 0) @@ -693,41 +664,35 @@ qemuAssignDeviceAliases(virDomainDef *def, virQEMUCap= s *qemuCaps) return -1; } for (i =3D 0; i < def->nhubs; i++) { - if (qemuAssignDeviceHubAlias(def->hubs[i], i) < 0) - return -1; + qemuAssignDeviceHubAlias(def->hubs[i], i); } for (i =3D 0; i < def->nshmems; i++) { if (qemuAssignDeviceShmemAlias(def, def->shmems[i], i) < 0) return -1; } for (i =3D 0; i < def->nsmartcards; i++) { - if (qemuAssignDeviceSmartcardAlias(def->smartcards[i], i) < 0) - return -1; + qemuAssignDeviceSmartcardAlias(def->smartcards[i], i); } if (def->watchdog) { - if (qemuAssignDeviceWatchdogAlias(def->watchdog) < 0) - return -1; + qemuAssignDeviceWatchdogAlias(def->watchdog); } if (def->memballoon && def->memballoon->model !=3D VIR_DOMAIN_MEMBALLOON_MODEL_NONE) { - if (qemuAssignDeviceMemballoonAlias(def->memballoon, 0) < 0) - return -1; + qemuAssignDeviceMemballoonAlias(def->memballoon, 0); } for (i =3D 0; i < def->nrngs; i++) { if (qemuAssignDeviceRNGAlias(def, def->rngs[i]) < 0) return -1; } for (i =3D 0; i < def->ntpms; i++) { - if (qemuAssignDeviceTPMAlias(def->tpms[i], i) < 0) - return -1; + qemuAssignDeviceTPMAlias(def->tpms[i], i); } for (i =3D 0; i < def->nmems; i++) { if (qemuAssignDeviceMemoryAlias(def, def->mems[i], false) < 0) return -1; } if (def->vsock) { - if (qemuAssignDeviceVsockAlias(def->vsock) < 0) - return -1; + qemuAssignDeviceVsockAlias(def->vsock); } =20 return 0; diff --git a/src/qemu/qemu_alias.h b/src/qemu/qemu_alias.h index 604e667b9a..35db0dc736 100644 --- a/src/qemu/qemu_alias.h +++ b/src/qemu/qemu_alias.h @@ -65,13 +65,13 @@ int qemuAssignDeviceShmemAlias(virDomainDef *def, virDomainShmemDef *shmem, int idx); =20 -int qemuAssignDeviceWatchdogAlias(virDomainWatchdogDef *watchdog); +void qemuAssignDeviceWatchdogAlias(virDomainWatchdogDef *watchdog); =20 -int qemuAssignDeviceInputAlias(virDomainDef *def, - virDomainInputDef *input, - int idx); +void qemuAssignDeviceInputAlias(virDomainDef *def, + virDomainInputDef *input, + int idx); =20 -int qemuAssignDeviceVsockAlias(virDomainVsockDef *vsock); +void qemuAssignDeviceVsockAlias(virDomainVsockDef *vsock); =20 int qemuAssignDeviceAliases(virDomainDef *def, virQEMUCaps *qemuCaps); =20 diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 3373ec2cdf..33466c40d6 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -3130,8 +3130,7 @@ qemuDomainAttachWatchdog(virQEMUDriver *driver, return -1; } =20 - if (qemuAssignDeviceWatchdogAlias(watchdog) < 0) - return -1; + qemuAssignDeviceWatchdogAlias(watchdog); =20 if (watchdog->model =3D=3D VIR_DOMAIN_WATCHDOG_MODEL_I6300ESB) { if (qemuDomainEnsurePCIAddress(vm, &dev) < 0) @@ -3239,8 +3238,7 @@ qemuDomainAttachInputDevice(virQEMUDriver *driver, bool teardownlabel =3D false; bool teardowncgroup =3D false; =20 - if (qemuAssignDeviceInputAlias(vm->def, input, -1) < 0) - return -1; + qemuAssignDeviceInputAlias(vm->def, input, -1); =20 switch ((virDomainInputBus) input->bus) { case VIR_DOMAIN_INPUT_BUS_USB: @@ -3359,8 +3357,7 @@ qemuDomainAttachVsockDevice(virQEMUDriver *driver, if (qemuDomainEnsureVirtioAddress(&releaseaddr, vm, &dev) < 0) return -1; =20 - if (qemuAssignDeviceVsockAlias(vsock) < 0) - goto cleanup; + qemuAssignDeviceVsockAlias(vsock); =20 if (qemuProcessOpenVhostVsock(vsock) < 0) goto cleanup; --=20 2.31.1 From nobody Thu Apr 25 07:49:08 2024 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=1637770411; cv=none; d=zohomail.com; s=zohoarc; b=lqBwp8rvx2jDdSZLSLbwLAcQ2Vl8NkOF8gQp9w+oaww9VTrtBr28oDb2cHCCJa65r9oKpY4mR24THkzrd9iLvMXcZy3Wvod4XUTQ7fPbWVimhnwKlm6SLwDkgsYrJ/5oGFNyl1Y9wON66DcHj3oXYNWu821Mn+C6rGnPwZkhmFM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1637770411; 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=8dOkDx5tl/xpaxw4nx5u1GqCN1F6Cw1IW5y7Zs5h/nc=; b=eBquV71Q+40LsdLiTMuGkHClmEbPXoO1yBX9umagifW5/BYY2nUvMNCe67MbI2MI4xr0zecMJcmFgVE0iUbpGSj+N8PzwCDsxwSaFXecfaqeJ0XCN4MmTINm7aZxA8TaCUiHWYBS9YzleJuMrdsMPnFV1ZtAXiWwljrspWftBeY= 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 1637770411208499.96836792904605; Wed, 24 Nov 2021 08:13:31 -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-311-fKg66-_AMBKtVZH0-04BzQ-1; Wed, 24 Nov 2021 11:13:28 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id DC75E84B9A6; Wed, 24 Nov 2021 16:13:21 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id C293C4ABA6; Wed, 24 Nov 2021 16:13:21 +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 74EFC1809CB9; Wed, 24 Nov 2021 16:13:21 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 1AOGDGg0030828 for ; Wed, 24 Nov 2021 11:13:16 -0500 Received: by smtp.corp.redhat.com (Postfix) id 3D86160C4A; Wed, 24 Nov 2021 16:13:16 +0000 (UTC) Received: from fedora.redhat.com (unknown [10.43.2.78]) by smtp.corp.redhat.com (Postfix) with ESMTP id 93A9660C05 for ; Wed, 24 Nov 2021 16:13:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1637770410; 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=8dOkDx5tl/xpaxw4nx5u1GqCN1F6Cw1IW5y7Zs5h/nc=; b=E3kEVN21sFmGLb+B5uZ29z8zybbhH2u2YQOicDROVDj96kUvlGRx/E0PhoBpJvr5f/5UHC /kgo4n4qXN3ZOHGp5s3u6It6pC/QzROT+a0Zc62L6tmqG8eWX2hf7fQCZvYgKnIx+OAhkC Yf6zP9vFKE1AZM528TEUsehm8RdwDjM= X-MC-Unique: fKg66-_AMBKtVZH0-04BzQ-1 From: Kristina Hanicova To: libvir-list@redhat.com Subject: [PATCH v2 2/2] qemu_alias: change return type to void if possible Date: Wed, 24 Nov 2021 17:12:54 +0100 Message-Id: <04470e14cf0bdd83d24fc419abba9b7995048f4d.1637770067.git.khanicov@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 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.13 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: 1637770412335100001 Content-Type: text/plain; charset="utf-8" These functions always return success so it seems logical to not return anything and remove unnecessary checks. Signed-off-by: Kristina Hanicova Reviewed-by: Michal Privoznik --- src/qemu/qemu_alias.c | 78 +++++++++++++++++------------------------ src/qemu/qemu_alias.h | 34 +++++++++--------- src/qemu/qemu_hotplug.c | 34 +++++++----------- 3 files changed, 61 insertions(+), 85 deletions(-) diff --git a/src/qemu/qemu_alias.c b/src/qemu/qemu_alias.c index ff5c7f1bd8..1b80b7559e 100644 --- a/src/qemu/qemu_alias.c +++ b/src/qemu/qemu_alias.c @@ -120,14 +120,14 @@ qemuAssignDeviceChrAlias(virDomainDef *def, } =20 =20 -int +void qemuAssignDeviceControllerAlias(virDomainDef *domainDef, virDomainControllerDef *controller) { const char *prefix =3D virDomainControllerTypeToString(controller->typ= e); =20 if (controller->info.alias) - return 0; + return; =20 if (controller->type =3D=3D VIR_DOMAIN_CONTROLLER_TYPE_PCI) { if (!virQEMUCapsHasPCIMultiBus(domainDef)) { @@ -136,21 +136,21 @@ qemuAssignDeviceControllerAlias(virDomainDef *domainD= ef, * "pci". */ controller->info.alias =3D g_strdup("pci"); - return 0; + return; } else if (controller->model =3D=3D VIR_DOMAIN_CONTROLLER_MODEL_PC= IE_ROOT) { /* The pcie-root controller on Q35 machinetypes uses a * different naming convention ("pcie.0"), because it is * hardcoded that way in qemu. */ controller->info.alias =3D g_strdup_printf("pcie.%d", controll= er->idx); - return 0; + return; } /* All other PCI controllers use the consistent "pci.%u" * (including the hardcoded pci-root controller on * multibus-capable qemus). */ controller->info.alias =3D g_strdup_printf("pci.%d", controller->i= dx); - return 0; + return; } else if (controller->type =3D=3D VIR_DOMAIN_CONTROLLER_TYPE_IDE) { /* for any machine based on e.g. I440FX or G3Beige, the * first (and currently only) IDE controller is an integrated @@ -159,7 +159,7 @@ qemuAssignDeviceControllerAlias(virDomainDef *domainDef, if (qemuDomainHasBuiltinIDE(domainDef) && controller->idx =3D=3D 0) { controller->info.alias =3D g_strdup("ide"); - return 0; + return; } } else if (controller->type =3D=3D VIR_DOMAIN_CONTROLLER_TYPE_SATA) { /* for any Q35 machine, the first SATA controller is the @@ -167,26 +167,25 @@ qemuAssignDeviceControllerAlias(virDomainDef *domainD= ef, */ if (qemuDomainIsQ35(domainDef) && controller->idx =3D=3D 0) { controller->info.alias =3D g_strdup("ide"); - return 0; + return; } } else if (controller->type =3D=3D VIR_DOMAIN_CONTROLLER_TYPE_USB) { /* first USB device is "usb", others are normal "usb%d" */ if (controller->idx =3D=3D 0) { controller->info.alias =3D g_strdup("usb"); - return 0; + return; } } else if (controller->type =3D=3D VIR_DOMAIN_CONTROLLER_TYPE_SCSI) { if (controller->model =3D=3D VIR_DOMAIN_CONTROLLER_MODEL_SCSI_NCR5= 3C90 && controller->idx =3D=3D 0) { controller->info.alias =3D g_strdup("scsi"); - return 0; + return; } } /* all other controllers use the default ${type}${index} naming * scheme for alias/id. */ controller->info.alias =3D g_strdup_printf("%s%d", prefix, controller-= >idx); - return 0; } =20 =20 @@ -264,13 +263,13 @@ qemuAssignDeviceDiskAlias(virDomainDef *def, } =20 =20 -int +void qemuAssignDeviceHostdevAlias(virDomainDef *def, char **alias, int idx) { if (*alias) - return 0; + return; =20 if (idx =3D=3D -1) { size_t i; @@ -296,25 +295,25 @@ qemuAssignDeviceHostdevAlias(virDomainDef *def, } =20 *alias =3D g_strdup_printf("hostdev%d", idx); - - return 0; } =20 =20 -int +void qemuAssignDeviceNetAlias(virDomainDef *def, virDomainNetDef *net, int idx) { if (net->info.alias) - return 0; + return; =20 /* uses "hostdevN" as the alias * We must use "-1" as the index because the caller doesn't know * that we're now looking for a unique hostdevN rather than netN */ - if (virDomainNetResolveActualType(net) =3D=3D VIR_DOMAIN_NET_TYPE_HOST= DEV) - return qemuAssignDeviceHostdevAlias(def, &net->info.alias, -1); + if (virDomainNetResolveActualType(net) =3D=3D VIR_DOMAIN_NET_TYPE_HOST= DEV) { + qemuAssignDeviceHostdevAlias(def, &net->info.alias, -1); + return; + } =20 if (idx =3D=3D -1) { size_t i; @@ -331,11 +330,10 @@ qemuAssignDeviceNetAlias(virDomainDef *def, } =20 net->info.alias =3D g_strdup_printf("net%d", idx); - return 0; } =20 =20 -int +void qemuAssignDeviceFSAlias(virDomainDef *def, virDomainFSDef *fss) { @@ -343,7 +341,7 @@ qemuAssignDeviceFSAlias(virDomainDef *def, int maxidx =3D 0; =20 if (fss->info.alias) - return 0; + return; =20 for (i =3D 0; i < def->nfss; i++) { int idx; @@ -353,7 +351,6 @@ qemuAssignDeviceFSAlias(virDomainDef *def, } =20 fss->info.alias =3D g_strdup_printf("fs%d", maxidx); - return 0; } =20 =20 @@ -411,13 +408,13 @@ qemuAssignDeviceTPMAlias(virDomainTPMDef *tpm, } =20 =20 -int +void qemuAssignDeviceRedirdevAlias(virDomainDef *def, virDomainRedirdevDef *redirdev, int idx) { if (redirdev->info.alias) - return 0; + return; =20 if (idx =3D=3D -1) { size_t i; @@ -432,11 +429,10 @@ qemuAssignDeviceRedirdevAlias(virDomainDef *def, } =20 redirdev->info.alias =3D g_strdup_printf("redir%d", idx); - return 0; } =20 =20 -int +void qemuAssignDeviceRNGAlias(virDomainDef *def, virDomainRNGDef *rng) { @@ -445,7 +441,7 @@ qemuAssignDeviceRNGAlias(virDomainDef *def, int idx; =20 if (rng->info.alias) - return 0; + return; =20 for (i =3D 0; i < def->nrngs; i++) { if ((idx =3D qemuDomainDeviceAliasIndex(&def->rngs[i]->info, "rng"= )) >=3D maxidx) @@ -453,8 +449,6 @@ qemuAssignDeviceRNGAlias(virDomainDef *def, } =20 rng->info.alias =3D g_strdup_printf("rng%d", maxidx); - - return 0; } =20 =20 @@ -535,13 +529,13 @@ qemuAssignDeviceMemoryAlias(virDomainDef *def, } =20 =20 -int +void qemuAssignDeviceShmemAlias(virDomainDef *def, virDomainShmemDef *shmem, int idx) { if (shmem->info.alias) - return 0; + return; =20 if (idx =3D=3D -1) { size_t i; @@ -559,7 +553,6 @@ qemuAssignDeviceShmemAlias(virDomainDef *def, } =20 shmem->info.alias =3D g_strdup_printf("shmem%d", idx); - return 0; } =20 =20 @@ -613,13 +606,11 @@ qemuAssignDeviceAliases(virDomainDef *def, virQEMUCap= s *qemuCaps) return -1; } for (i =3D 0; i < def->nnets; i++) { - if (qemuAssignDeviceNetAlias(def, def->nets[i], -1) < 0) - return -1; + qemuAssignDeviceNetAlias(def, def->nets[i], -1); } =20 for (i =3D 0; i < def->nfss; i++) { - if (qemuAssignDeviceFSAlias(def, def->fss[i]) < 0) - return -1; + qemuAssignDeviceFSAlias(def, def->fss[i]); } for (i =3D 0; i < def->nsounds; i++) { qemuAssignDeviceSoundAlias(def->sounds[i], i); @@ -630,19 +621,16 @@ qemuAssignDeviceAliases(virDomainDef *def, virQEMUCap= s *qemuCaps) * linked to a NetDef, they will share an info and the alias * will already be set, so don't try to set it again. */ - if (qemuAssignDeviceHostdevAlias(def, &def->hostdevs[i]->info->ali= as, -1) < 0) - return -1; + qemuAssignDeviceHostdevAlias(def, &def->hostdevs[i]->info->alias, = -1); } for (i =3D 0; i < def->nredirdevs; i++) { - if (qemuAssignDeviceRedirdevAlias(def, def->redirdevs[i], i) < 0) - return -1; + qemuAssignDeviceRedirdevAlias(def, def->redirdevs[i], i); } for (i =3D 0; i < def->nvideos; i++) { qemuAssignDeviceVideoAlias(def->videos[i], i); } for (i =3D 0; i < def->ncontrollers; i++) { - if (qemuAssignDeviceControllerAlias(def, def->controllers[i]) < 0) - return -1; + qemuAssignDeviceControllerAlias(def, def->controllers[i]); } for (i =3D 0; i < def->ninputs; i++) { qemuAssignDeviceInputAlias(def, def->inputs[i], i); @@ -667,8 +655,7 @@ qemuAssignDeviceAliases(virDomainDef *def, virQEMUCaps = *qemuCaps) qemuAssignDeviceHubAlias(def->hubs[i], i); } for (i =3D 0; i < def->nshmems; i++) { - if (qemuAssignDeviceShmemAlias(def, def->shmems[i], i) < 0) - return -1; + qemuAssignDeviceShmemAlias(def, def->shmems[i], i); } for (i =3D 0; i < def->nsmartcards; i++) { qemuAssignDeviceSmartcardAlias(def->smartcards[i], i); @@ -681,8 +668,7 @@ qemuAssignDeviceAliases(virDomainDef *def, virQEMUCaps = *qemuCaps) qemuAssignDeviceMemballoonAlias(def->memballoon, 0); } for (i =3D 0; i < def->nrngs; i++) { - if (qemuAssignDeviceRNGAlias(def, def->rngs[i]) < 0) - return -1; + qemuAssignDeviceRNGAlias(def, def->rngs[i]); } for (i =3D 0; i < def->ntpms; i++) { qemuAssignDeviceTPMAlias(def->tpms[i], i); diff --git a/src/qemu/qemu_alias.h b/src/qemu/qemu_alias.h index 35db0dc736..8fc27f4696 100644 --- a/src/qemu/qemu_alias.h +++ b/src/qemu/qemu_alias.h @@ -31,39 +31,39 @@ int qemuAssignDeviceChrAlias(virDomainDef *def, virDomainChrDef *chr, ssize_t idx); =20 -int qemuAssignDeviceControllerAlias(virDomainDef *domainDef, - virDomainControllerDef *controller); +void qemuAssignDeviceControllerAlias(virDomainDef *domainDef, + virDomainControllerDef *controller); =20 int qemuAssignDeviceDiskAlias(virDomainDef *def, virDomainDiskDef *disk, virQEMUCaps *qemuCaps); =20 -int qemuAssignDeviceHostdevAlias(virDomainDef *def, - char **alias, - int idx); +void qemuAssignDeviceHostdevAlias(virDomainDef *def, + char **alias, + int idx); =20 -int qemuAssignDeviceNetAlias(virDomainDef *def, - virDomainNetDef *net, - int idx); +void qemuAssignDeviceNetAlias(virDomainDef *def, + virDomainNetDef *net, + int idx); =20 -int +void qemuAssignDeviceFSAlias(virDomainDef *def, virDomainFSDef *fss); =20 -int qemuAssignDeviceRedirdevAlias(virDomainDef *def, - virDomainRedirdevDef *redirdev, - int idx); +void qemuAssignDeviceRedirdevAlias(virDomainDef *def, + virDomainRedirdevDef *redirdev, + int idx); =20 -int qemuAssignDeviceRNGAlias(virDomainDef *def, - virDomainRNGDef *rng); +void qemuAssignDeviceRNGAlias(virDomainDef *def, + virDomainRNGDef *rng); =20 int qemuAssignDeviceMemoryAlias(virDomainDef *def, virDomainMemoryDef *mems, bool oldAlias); =20 -int qemuAssignDeviceShmemAlias(virDomainDef *def, - virDomainShmemDef *shmem, - int idx); +void qemuAssignDeviceShmemAlias(virDomainDef *def, + virDomainShmemDef *shmem, + int idx); =20 void qemuAssignDeviceWatchdogAlias(virDomainWatchdogDef *watchdog); =20 diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 33466c40d6..426710786b 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -869,8 +869,7 @@ int qemuDomainAttachControllerDevice(virQEMUDriver *dri= ver, if (qemuDomainEnsureVirtioAddress(&releaseaddr, vm, &dev) < 0) return -1; =20 - if (qemuAssignDeviceControllerAlias(vm->def, controller) < 0) - goto cleanup; + qemuAssignDeviceControllerAlias(vm->def, controller); =20 if (qemuBuildControllerDevProps(vm->def, controller, priv->qemuCaps, &= devprops) < 0) goto cleanup; @@ -1221,8 +1220,7 @@ qemuDomainAttachNetDevice(virQEMUDriver *driver, =20 actualType =3D virDomainNetGetActualType(net); =20 - if (qemuAssignDeviceNetAlias(vm->def, net, -1) < 0) - goto cleanup; + qemuAssignDeviceNetAlias(vm->def, net, -1); =20 if (actualType =3D=3D VIR_DOMAIN_NET_TYPE_HOSTDEV) { /* This is really a "smart hostdev", so it should be attached @@ -1699,8 +1697,7 @@ qemuDomainAttachHostPCIDevice(virQEMUDriver *driver, if (backend !=3D VIR_DOMAIN_HOSTDEV_PCI_BACKEND_VFIO) teardownlabel =3D true; =20 - if (qemuAssignDeviceHostdevAlias(vm->def, &info->alias, -1) < 0) - goto error; + qemuAssignDeviceHostdevAlias(vm->def, &info->alias, -1); =20 if (qemuDomainIsPSeries(vm->def)) /* Isolation groups are only relevant for pSeries guests */ @@ -1960,8 +1957,7 @@ int qemuDomainAttachRedirdevDevice(virQEMUDriver *dri= ver, const char *secAlias =3D NULL; virErrorPtr orig_err; =20 - if (qemuAssignDeviceRedirdevAlias(def, redirdev, -1) < 0) - return -1; + qemuAssignDeviceRedirdevAlias(def, redirdev, -1); =20 if (!(charAlias =3D qemuAliasChardevFromDevAlias(redirdev->info.alias)= )) return -1; @@ -2310,8 +2306,7 @@ qemuDomainAttachRNGDevice(virQEMUDriver *driver, virJSONValue *props =3D NULL; int ret =3D -1; =20 - if (qemuAssignDeviceRNGAlias(vm->def, rng) < 0) - goto cleanup; + qemuAssignDeviceRNGAlias(vm->def, rng); =20 /* preallocate space for the device definition */ VIR_REALLOC_N(vm->def->rngs, vm->def->nrngs + 1); @@ -2587,8 +2582,8 @@ qemuDomainAttachHostUSBDevice(virQEMUDriver *driver, goto cleanup; teardownlabel =3D true; =20 - if (qemuAssignDeviceHostdevAlias(vm->def, &hostdev->info->alias, -1) <= 0) - goto cleanup; + qemuAssignDeviceHostdevAlias(vm->def, &hostdev->info->alias, -1); + if (!(devprops =3D qemuBuildUSBHostdevDevProps(vm->def, hostdev, priv-= >qemuCaps))) goto cleanup; =20 @@ -2667,8 +2662,7 @@ qemuDomainAttachHostSCSIDevice(virQEMUDriver *driver, goto cleanup; teardownlabel =3D true; =20 - if (qemuAssignDeviceHostdevAlias(vm->def, &hostdev->info->alias, -1) <= 0) - goto cleanup; + qemuAssignDeviceHostdevAlias(vm->def, &hostdev->info->alias, -1); =20 if (qemuDomainPrepareHostdev(hostdev, priv) < 0) goto cleanup; @@ -2786,8 +2780,7 @@ qemuDomainAttachSCSIVHostDevice(virQEMUDriver *driver, } releaseaddr =3D true; =20 - if (qemuAssignDeviceHostdevAlias(vm->def, &hostdev->info->alias, -1) <= 0) - goto cleanup; + qemuAssignDeviceHostdevAlias(vm->def, &hostdev->info->alias, -1); =20 if (!(devprops =3D qemuBuildSCSIVHostHostdevDevProps(vm->def, hostdev, @@ -2899,8 +2892,7 @@ qemuDomainAttachMediatedDevice(virQEMUDriver *driver, goto cleanup; teardownlabel =3D true; =20 - if (qemuAssignDeviceHostdevAlias(vm->def, &hostdev->info->alias, -1) <= 0) - goto cleanup; + qemuAssignDeviceHostdevAlias(vm->def, &hostdev->info->alias, -1); =20 if (!(devprops =3D qemuBuildHostdevMediatedDevProps(vm->def, hostdev))) goto cleanup; @@ -3028,8 +3020,7 @@ qemuDomainAttachShmemDevice(virQEMUDriver *driver, return -1; } =20 - if (qemuAssignDeviceShmemAlias(vm->def, shmem, -1) < 0) - return -1; + qemuAssignDeviceShmemAlias(vm->def, shmem, -1); =20 qemuDomainPrepareShmemChardev(shmem); =20 @@ -3438,8 +3429,7 @@ qemuDomainAttachFSDevice(virQEMUDriver *driver, if (qemuDomainEnsureVirtioAddress(&releaseaddr, vm, &dev) < 0) return -1; =20 - if (qemuAssignDeviceFSAlias(vm->def, fs) < 0) - goto cleanup; + qemuAssignDeviceFSAlias(vm->def, fs); =20 chardev =3D virDomainChrSourceDefNew(priv->driver->xmlopt); chardev->type =3D VIR_DOMAIN_CHR_TYPE_UNIX; --=20 2.31.1