From nobody Sun Feb 8 23:03:50 2026 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; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 153933424687925.428161595600614; Fri, 12 Oct 2018 01:50:46 -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 C0CEBC71A2; Fri, 12 Oct 2018 08:50:44 +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 6C35D7ADA1; Fri, 12 Oct 2018 08:50:44 +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 ED40118005B0; Fri, 12 Oct 2018 08:50:42 +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 w9C8odOY006074 for ; Fri, 12 Oct 2018 04:50:39 -0400 Received: by smtp.corp.redhat.com (Postfix) id DC4D65D76C; Fri, 12 Oct 2018 08:50:39 +0000 (UTC) Received: from hansolo.pek2.redhat.com (wlc-trust-100.pek2.redhat.com [10.72.3.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5CE0B69400; Fri, 12 Oct 2018 08:50:38 +0000 (UTC) From: Han Han To: libvir-list@redhat.com Date: Fri, 12 Oct 2018 16:50:09 +0800 Message-Id: <20181012085014.15743-4-hhan@redhat.com> In-Reply-To: <20181012085014.15743-1-hhan@redhat.com> References: <20181012085014.15743-1-hhan@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com Cc: Han Han Subject: [libvirt] [PATCH v2 3/8] qemu_alias: Refactor hub alias assignment for hotplug 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: , 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.39]); Fri, 12 Oct 2018 08:50:45 +0000 (UTC) X-ZohoMail: RDMRC_0 RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Make qemuAssignDeviceHubAlias global and allow alias generating for reuse on hotplug. Signed-off-by: Han Han Reviewed-by: John Ferlan --- src/qemu/qemu_alias.c | 22 ++++++++++++++++++---- src/qemu/qemu_alias.h | 4 ++++ 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/src/qemu/qemu_alias.c b/src/qemu/qemu_alias.c index 815caec465..116480eaee 100644 --- a/src/qemu/qemu_alias.c +++ b/src/qemu/qemu_alias.c @@ -364,14 +364,28 @@ qemuAssignDeviceVideoAlias(virDomainVideoDefPtr video, } =20 =20 -static int -qemuAssignDeviceHubAlias(virDomainHubDefPtr hub, +int +qemuAssignDeviceHubAlias(virDomainDefPtr def, + virDomainHubDefPtr hub, int idx) { if (hub->info.alias) return 0; =20 - return virAsprintf(&hub->info.alias, "hub%d", idx); + if (idx =3D=3D -1) { + int thisidx; + size_t i; + + for (i =3D 0; i < def->nhubs; i++) { + if ((thisidx =3D qemuDomainDeviceAliasIndex(&def->hubs[i]->inf= o, "hub")) >=3D idx) + idx =3D thisidx + 1; + } + } + + if (virAsprintf(&hub->info.alias, "hub%d", idx) < 0) + return -1; + + return 0; } =20 =20 @@ -647,7 +661,7 @@ qemuAssignDeviceAliases(virDomainDefPtr def, virQEMUCap= sPtr qemuCaps) return -1; } for (i =3D 0; i < def->nhubs; i++) { - if (qemuAssignDeviceHubAlias(def->hubs[i], i) < 0) + if (qemuAssignDeviceHubAlias(def, def->hubs[i], i) < 0) return -1; } for (i =3D 0; i < def->nshmems; i++) { diff --git a/src/qemu/qemu_alias.h b/src/qemu/qemu_alias.h index 33b9937ea4..ea30c1c8a3 100644 --- a/src/qemu/qemu_alias.h +++ b/src/qemu/qemu_alias.h @@ -71,6 +71,10 @@ int qemuAssignDeviceInputAlias(virDomainDefPtr def, virDomainInputDefPtr input, int idx); =20 +int qemuAssignDeviceHubAlias(virDomainDefPtr def, + virDomainHubDefPtr hub, + int idx); + int qemuAssignDeviceVsockAlias(virDomainVsockDefPtr vsock); =20 int qemuAssignDeviceAliases(virDomainDefPtr def, virQEMUCapsPtr qemuCaps); --=20 2.19.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list