From nobody Thu May 15 20:47:16 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1506006306263714.0774760006066; Thu, 21 Sep 2017 08:05:06 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id A54C7C0828CB; Thu, 21 Sep 2017 15:05:04 +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 C57845D97C; Thu, 21 Sep 2017 15:05:03 +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 C31F81855948; Thu, 21 Sep 2017 15:05:02 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id v8LElbRu014682 for ; Thu, 21 Sep 2017 10:47:37 -0400 Received: by smtp.corp.redhat.com (Postfix) id 8DD156031A; Thu, 21 Sep 2017 14:47:37 +0000 (UTC) Received: from moe.brq.redhat.com (unknown [10.43.2.192]) by smtp.corp.redhat.com (Postfix) with ESMTP id 15E9760469 for ; Thu, 21 Sep 2017 14:47:36 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com A54C7C0828CB Authentication-Results: ext-mx07.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx07.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=libvir-list-bounces@redhat.com From: Michal Privoznik To: libvir-list@redhat.com Date: Thu, 21 Sep 2017 16:47:06 +0200 Message-Id: <4701f4748dae5bb1963800d7718dcac4e67a9b20.1506005021.git.mprivozn@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH v1 2/7] qemuAssignDeviceRNGAlias: Allow index to be passed 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: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Thu, 21 Sep 2017 15:05:05 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" When generating aliases for RNG at the domain startup phase it make no sense trying to recalculate the next free index every time. We already know the index - it's the same as the index in the def->rngs[] array. Signed-off-by: Michal Privoznik --- src/qemu/qemu_alias.c | 22 +++++++++++++--------- src/qemu/qemu_alias.h | 3 ++- src/qemu/qemu_hotplug.c | 2 +- 3 files changed, 16 insertions(+), 11 deletions(-) diff --git a/src/qemu/qemu_alias.c b/src/qemu/qemu_alias.c index 914b2b94d..4ac41947c 100644 --- a/src/qemu/qemu_alias.c +++ b/src/qemu/qemu_alias.c @@ -314,18 +314,22 @@ qemuAssignDeviceRedirdevAlias(virDomainDefPtr def, =20 int qemuAssignDeviceRNGAlias(virDomainDefPtr def, - virDomainRNGDefPtr rng) + virDomainRNGDefPtr rng, + int idx) { - size_t i; - int maxidx =3D 0; - int idx; + if (idx =3D=3D -1) { + size_t i; + idx =3D 0; + for (i =3D 0; i < def->nrngs; i++) { + int thisidx; + thisidx =3D qemuDomainDeviceAliasIndex(&def->rngs[i]->info, "r= ng"); =20 - for (i =3D 0; i < def->nrngs; i++) { - if ((idx =3D qemuDomainDeviceAliasIndex(&def->rngs[i]->info, "rng"= )) >=3D maxidx) - maxidx =3D idx + 1; + if (thisidx >=3D idx) + idx =3D thisidx + 1; + } } =20 - if (virAsprintf(&rng->info.alias, "rng%d", maxidx) < 0) + if (virAsprintf(&rng->info.alias, "rng%d", idx) < 0) return -1; =20 return 0; @@ -490,7 +494,7 @@ qemuAssignDeviceAliases(virDomainDefPtr def, virQEMUCap= sPtr qemuCaps) return -1; } for (i =3D 0; i < def->nrngs; i++) { - if (virAsprintf(&def->rngs[i]->info.alias, "rng%zu", i) < 0) + if (qemuAssignDeviceRNGAlias(def, def->rngs[i], i) < 0) return -1; } if (def->tpm) { diff --git a/src/qemu/qemu_alias.h b/src/qemu/qemu_alias.h index 300fd4de5..860ab6c0c 100644 --- a/src/qemu/qemu_alias.h +++ b/src/qemu/qemu_alias.h @@ -55,7 +55,8 @@ int qemuAssignDeviceRedirdevAlias(virDomainDefPtr def, int idx); =20 int qemuAssignDeviceRNGAlias(virDomainDefPtr def, - virDomainRNGDefPtr rng); + virDomainRNGDefPtr rng, + int idx); =20 int qemuAssignDeviceMemoryAlias(virDomainDefPtr def, virDomainMemoryDefPtr mems, diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 7dd6e5fd9..816dbd46e 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -2073,7 +2073,7 @@ qemuDomainAttachRNGDevice(virConnectPtr conn, int ret =3D -1; int rv; =20 - if (qemuAssignDeviceRNGAlias(vm->def, rng) < 0) + if (qemuAssignDeviceRNGAlias(vm->def, rng, -1) < 0) goto cleanup; =20 /* preallocate space for the device definition */ --=20 2.13.5 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list