From nobody Mon Feb 9 01:30:47 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=1612278306; cv=none; d=zohomail.com; s=zohoarc; b=HWVYu1dE8/VJpV5T2tFDSYsthTj83Q0zKL/5VAOn7NP9ZyF1ZzabP6EiPT3E4uAVWvVLCPk1Z+XbZFJikXTWNm0Tp3ZmP1x0PFYlYCIRA8Tf8nFJijcz0Q56ty+Ey+wSFrEa8efb2hkmkfAi6qHrUAKGsn2oL5Vg33OQNEl8Q2M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1612278306; 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=mU5PojN6nba/mPEgf+27e7/vVfBAaDYyqAUjPN7Zhlg=; b=e/dMp6uVT0ZgKJaRS3BeDYcd0sT/dLCgNqSOWEq21pm/usG6pgouJrXLHwKyFO15EuJP/BRqDSlEUu6TjPmQ1xvMbptCCBVwyswQRVLEdfz/h5zv7Bg9pRD26uM8m3yYl3xGGCzPrcsRxwozl4luzsM8a26xDx7bvqIF5MpDRGw= 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) header.from= 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 1612278306873799.2105279380638; Tue, 2 Feb 2021 07:05:06 -0800 (PST) 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-407-lnIPdiqSPKihl1PeQTjL1A-1; Tue, 02 Feb 2021 10:04:46 -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 BC4208710E7; Tue, 2 Feb 2021 15:04:37 +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 969E56EF45; Tue, 2 Feb 2021 15:04:37 +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 54B7D1809C90; Tue, 2 Feb 2021 15:04:37 +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 112F4EMX003110 for ; Tue, 2 Feb 2021 10:04:14 -0500 Received: by smtp.corp.redhat.com (Postfix) id 7AE9519813; Tue, 2 Feb 2021 15:04:14 +0000 (UTC) Received: from antique-work.lan (unknown [10.40.192.101]) by smtp.corp.redhat.com (Postfix) with ESMTP id EB4161F0 for ; Tue, 2 Feb 2021 15:04:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1612278304; 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=mU5PojN6nba/mPEgf+27e7/vVfBAaDYyqAUjPN7Zhlg=; b=Z1CmCktB8vza0UCg7znGxb2iIX4qxxp7mizMrWSdrCg0c+PN3QiSu8O3T2msgBkAKCxZZp Emg7QhWChvduM6Wqp0A4PUBvkjohU1PQrB85QdstCfZOrPDTxoNBiAb6xJJzZ4oOhgocpl XXiSZy2AabQZyxk0sJWXRzbK/kSVyp8= X-MC-Unique: lnIPdiqSPKihl1PeQTjL1A-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 1/6] qemu_alias: introduce qemuDomainGetVhostUserAlias helper Date: Tue, 2 Feb 2021 16:04:07 +0100 Message-Id: <9d4803cb4c26b4a77ad36766d88914fffaaf73ee.1612277922.git.phrdina@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 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) Content-Type: text/plain; charset="utf-8" Signed-off-by: Pavel Hrdina --- src/qemu/qemu_alias.c | 6 ++++++ src/qemu/qemu_alias.h | 2 ++ src/qemu/qemu_command.c | 8 +++++--- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_alias.c b/src/qemu/qemu_alias.c index b3492d6e85..57b56b9ded 100644 --- a/src/qemu/qemu_alias.c +++ b/src/qemu/qemu_alias.c @@ -868,3 +868,9 @@ qemuDomainGetDBusVMStateAlias(void) { return "dbus-vmstate0"; } + +char * +qemuDomainGetVhostUserAlias(const char *devalias) +{ + return g_strdup_printf("chr-vu-%s", devalias); +} diff --git a/src/qemu/qemu_alias.h b/src/qemu/qemu_alias.h index 239747beb1..7c5b1ec929 100644 --- a/src/qemu/qemu_alias.h +++ b/src/qemu/qemu_alias.h @@ -97,3 +97,5 @@ const char *qemuDomainGetManagedPRAlias(void); char *qemuDomainGetUnmanagedPRAlias(const char *parentalias); =20 const char *qemuDomainGetDBusVMStateAlias(void); + +char *qemuDomainGetVhostUserAlias(const char *devalias); diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index f613aa0201..5101e5d74c 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -2172,7 +2172,7 @@ qemuBuildVHostUserFsCommandLine(virCommandPtr cmd, g_autofree char *chardev_alias =3D NULL; g_auto(virBuffer) opt =3D VIR_BUFFER_INITIALIZER; =20 - chardev_alias =3D g_strdup_printf("chr-vu-%s", fs->info.alias); + chardev_alias =3D qemuDomainGetVhostUserAlias(fs->info.alias); =20 virCommandAddArg(cmd, "-chardev"); virBufferAddLit(&opt, "socket"); @@ -4166,9 +4166,10 @@ qemuBuildDeviceVideoStr(const virDomainDef *def, virBufferAsprintf(&buf, ",max_outputs=3D%u", video->heads); } } else if (video->backend =3D=3D VIR_DOMAIN_VIDEO_BACKEND_TYPE_VHOSTUS= ER) { + g_autofree char *alias =3D qemuDomainGetVhostUserAlias(video->info= .alias); if (video->heads) virBufferAsprintf(&buf, ",max_outputs=3D%u", video->heads); - virBufferAsprintf(&buf, ",chardev=3Dchr-vu-%s", video->info.alias); + virBufferAsprintf(&buf, ",chardev=3D%s", alias); } else if (video->type =3D=3D VIR_DOMAIN_VIDEO_TYPE_VIRTIO) { if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_GPU_MAX_OUTPUTS)) { if (video->heads) @@ -4288,6 +4289,7 @@ qemuBuildVhostUserChardevStr(const char *alias, int *fd, virCommandPtr cmd) { + g_autofree char *chardev_alias =3D qemuDomainGetVhostUserAlias(alias); char *chardev =3D NULL; =20 if (*fd =3D=3D -1) { @@ -4296,7 +4298,7 @@ qemuBuildVhostUserChardevStr(const char *alias, return NULL; } =20 - chardev =3D g_strdup_printf("socket,id=3Dchr-vu-%s,fd=3D%d", alias, *f= d); + chardev =3D g_strdup_printf("socket,id=3D%s,fd=3D%d", chardev_alias, *= fd); =20 virCommandPassFD(cmd, *fd, VIR_COMMAND_PASS_FD_CLOSE_PARENT); *fd =3D -1; --=20 2.29.2