From nobody Sun Feb 8 12:42:55 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.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 63.128.21.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=1612365992; cv=none; d=zohomail.com; s=zohoarc; b=Wi8Rmr4ExX2L9cnXKn04xP1dKF8Ueng9UdsMDko9tyiaDCev55YlBSw2bxjlEk3NT6Klw1Ho2BDspWYFj9bdlQBUdcQS9ZdA0XwdcKSFFNohbFZM7g2dv1h70O+dnRZjzPlIdyn3IIZlu9yy0hqwAYB3Zx4QSm/I5bjJa/mqz0I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1612365992; 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=eKKOfNh4M8W0uRfAIydWS1JoTorDgkobVGby0H6cgs0=; b=aW/x5j0vTMh1SlCr//pu9ciDm+4OqxQsJ96Sd48cW8WLoDK8KXHTHlk8G/PCW0NbFwvQfk3k2sh2pTim0puYIlgVHChMqqr9a70xHdX+N7bgbfFo+/dWmEDNWg26meWLZzDOg7wuLa0jANx+hKxE3avkI8d8fjcsJ7xCmKDjjSI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.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 [63.128.21.124]) by mx.zohomail.com with SMTPS id 1612365992223891.9710963290513; Wed, 3 Feb 2021 07:26:32 -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-102-oOXzoUzbNt-PRPS3bxzqrw-1; Wed, 03 Feb 2021 10:26:28 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 9971A1936B79; Wed, 3 Feb 2021 15:26:21 +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 75A6A1980D; Wed, 3 Feb 2021 15:26: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 3C73185F2; Wed, 3 Feb 2021 15:26:21 +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 113FQ4xv002765 for ; Wed, 3 Feb 2021 10:26:04 -0500 Received: by smtp.corp.redhat.com (Postfix) id 567EB5B692; Wed, 3 Feb 2021 15:26:04 +0000 (UTC) Received: from antique-work.lan (unknown [10.40.192.101]) by smtp.corp.redhat.com (Postfix) with ESMTP id C8C7A5D6A8 for ; Wed, 3 Feb 2021 15:26:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1612365991; 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=eKKOfNh4M8W0uRfAIydWS1JoTorDgkobVGby0H6cgs0=; b=RGfA7SpOq672QRqWkf3E3pXkDx71cfEFci0EMLhfudtG3pWAqmrDoqkCr4TgptbSPrL7Sr dZqt9T+ZL+E1AVguF2/C0QKTHD6Jf5i+II93cPWs4/Ya3nDAO0rOMj00ANhmFeogVHeGPe bZ0lyNLt/HX2dYk+/C4ktIfsPUbC/FE= X-MC-Unique: oOXzoUzbNt-PRPS3bxzqrw-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH v2 1/6] qemu_alias: introduce qemuDomainGetVhostUserAlias helper Date: Wed, 3 Feb 2021 16:25:54 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 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.11 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-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Signed-off-by: Pavel Hrdina Reviewed-by: J=C3=A1n Tomko Reviewed-by: Peter Krempa --- Changes in v2: - qemuDomainGetVhostUserAlias renamed to qemuDomainGetVhostUserChrAlias 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..1c6f04c0ba 100644 --- a/src/qemu/qemu_alias.c +++ b/src/qemu/qemu_alias.c @@ -868,3 +868,9 @@ qemuDomainGetDBusVMStateAlias(void) { return "dbus-vmstate0"; } + +char * +qemuDomainGetVhostUserChrAlias(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..fc4bdf35fa 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 *qemuDomainGetVhostUserChrAlias(const char *devalias); diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index f742379919..c30e5a6c83 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -2174,7 +2174,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 qemuDomainGetVhostUserChrAlias(fs->info.alias); =20 virCommandAddArg(cmd, "-chardev"); virBufferAddLit(&opt, "socket"); @@ -4168,9 +4168,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 qemuDomainGetVhostUserChrAlias(video->i= nfo.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) @@ -4290,6 +4291,7 @@ qemuBuildVhostUserChardevStr(const char *alias, int *fd, virCommandPtr cmd) { + g_autofree char *chardev_alias =3D qemuDomainGetVhostUserChrAlias(alia= s); char *chardev =3D NULL; =20 if (*fd =3D=3D -1) { @@ -4298,7 +4300,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