From nobody Mon Feb 9 09:15:32 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=1633621098; cv=none; d=zohomail.com; s=zohoarc; b=EHPfhXT/eRcEiq10a9x252d0frDwWIRQXlbQ9FYlpmb66XvQhodt9XGmc0y+I1pk4RWw+Y9DBDn5JJ4mFawD60jb7Ymiw7xC40WT7kqNIimt3HF9BNorNmORFUp6+NJzrJa3RZBE8u3leACBgRZplgnqwBPwpYVVNF/7Dulx3qM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1633621098; 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=Vvx89byhaOOHfhbYUFzeXGbB/AztMw/biDJeJc8BOLM=; b=iwsSqvr8i8+/kjOuCA0+ZE1rdyvSmInjP7SsvSBVdXwywsf7ARNN+aNIAIKEP77zBehEgQ79tZD1w57a1ptqcuLFlQ84Jh1dp4NoF8NTzb2Zxa9/5j5+I4Ce47zIFHwe0S+JlkPaJJ3hBrzyyUEbA4MYRoHTdUp2JkbRWSEbaqo= 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) 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 1633621097876532.8955575780275; Thu, 7 Oct 2021 08:38:17 -0700 (PDT) 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-107-D7knL-K5PU2JepSBQqkLcg-1; Thu, 07 Oct 2021 11:38:15 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id C050811E9132; Thu, 7 Oct 2021 15:29:47 +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 9F22A5F50E; Thu, 7 Oct 2021 15:29:47 +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 421324E590; Thu, 7 Oct 2021 15:29:47 +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 197FKeo5024233 for ; Thu, 7 Oct 2021 11:20:41 -0400 Received: by smtp.corp.redhat.com (Postfix) id EFE1B5F503; Thu, 7 Oct 2021 15:20:40 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.5]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5131F5F4F4 for ; Thu, 7 Oct 2021 15:20:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1633621096; 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=Vvx89byhaOOHfhbYUFzeXGbB/AztMw/biDJeJc8BOLM=; b=FBR56KIerKcjThhLRJMyijkDAUbDW89zWBDlcaLHd1QlPMIFZ3Ov5eCHiN36t8hkaGoqtZ q2fy7ntxINPxjShydVOk7+k2k3AbJ/evsvc8Q4IfMY/XpvBQ5/4/HlsaoO9GNOL5EBJtVO RPBCaBmrJHxGLr6wdHgazP/Wgk8QXQ8= X-MC-Unique: D7knL-K5PU2JepSBQqkLcg-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 066/103] qemuBuildRedirdevCommandLine: Generate via JSON Date: Thu, 7 Oct 2021 17:17:54 +0200 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.15 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: 1633621102245100003 Content-Type: text/plain; charset="utf-8" The 'usb-redir' device has the following types according to QEMU for properties we control: chardev=3D - ID of a chardev to use as a backend filter=3D bootindex=3D Signed-off-by: Peter Krempa --- src/qemu/qemu_command.c | 49 +++++++++++++++++++++++------------------ src/qemu/qemu_command.h | 6 ++--- src/qemu/qemu_hotplug.c | 6 ++--- 3 files changed, 33 insertions(+), 28 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 810a4cc760..bab1da1c11 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -9710,20 +9710,17 @@ qemuBuildConsoleCommandLine(virLogManager *logManag= er, } -char * -qemuBuildRedirdevDevStr(const virDomainDef *def, - virDomainRedirdevDef *dev, - virQEMUCaps *qemuCaps G_GNUC_UNUSED) +virJSONValue * +qemuBuildRedirdevDevProps(const virDomainDef *def, + virDomainRedirdevDef *dev) { - size_t i; - g_auto(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; + g_autoptr(virJSONValue) props =3D NULL; virDomainRedirFilterDef *redirfilter =3D def->redirfilter; + g_autofree char *filter =3D NULL; - virBufferAsprintf(&buf, "usb-redir,chardev=3Dchar%s,id=3D%s", - dev->info.alias, dev->info.alias); - - if (redirfilter && redirfilter->nusbdevs) { - virBufferAddLit(&buf, ",filter=3D"); + if (redirfilter) { + g_auto(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; + size_t i; for (i =3D 0; i < redirfilter->nusbdevs; i++) { virDomainRedirFilterUSBDevDef *usbdev =3D redirfilter->usbdevs= [i]; @@ -9747,19 +9744,26 @@ qemuBuildRedirdevDevStr(const virDomainDef *def, else virBufferAddLit(&buf, "-1:"); - virBufferAsprintf(&buf, "%u", usbdev->allow); - if (i < redirfilter->nusbdevs -1) - virBufferAddLit(&buf, "|"); + virBufferAsprintf(&buf, "%u|", usbdev->allow); } + virBufferTrim(&buf, "|"); + + filter =3D virBufferContentAndReset(&buf); } - if (dev->info.bootIndex) - virBufferAsprintf(&buf, ",bootindex=3D%u", dev->info.bootIndex); + if (virJSONValueObjectCreate(&props, + "s:driver", "usb-redir", + "f:chardev", g_strdup_printf("char%s", de= v->info.alias), + "s:id", dev->info.alias, + "S:filter", filter, + "p:bootindex", dev->info.bootIndex, + NULL) < 0) + return NULL; - if (qemuBuildDeviceAddressStr(&buf, def, &dev->info) < 0) + if (qemuBuildDeviceAddressProps(props, def, &dev->info) < 0) return NULL; - return virBufferContentAndReset(&buf); + return g_steal_pointer(&props); } @@ -9780,6 +9784,7 @@ qemuBuildRedirdevCommandLine(virLogManager *logManage= r, for (i =3D 0; i < def->nredirdevs; i++) { virDomainRedirdevDef *redirdev =3D def->redirdevs[i]; + g_autoptr(virJSONValue) devprops =3D NULL; char *devstr; if (!(devstr =3D qemuBuildChrChardevStr(logManager, secManager, @@ -9794,11 +9799,11 @@ qemuBuildRedirdevCommandLine(virLogManager *logMana= ger, virCommandAddArg(cmd, devstr); VIR_FREE(devstr); - virCommandAddArg(cmd, "-device"); - if (!(devstr =3D qemuBuildRedirdevDevStr(def, redirdev, qemuCaps))) + if (!(devprops =3D qemuBuildRedirdevDevProps(def, redirdev))) + return -1; + + if (qemuBuildDeviceCommandlineFromJSON(cmd, devprops, qemuCaps) < = 0) return -1; - virCommandAddArg(cmd, devstr); - VIR_FREE(devstr); } return 0; diff --git a/src/qemu/qemu_command.h b/src/qemu/qemu_command.h index 6995780f83..f965125277 100644 --- a/src/qemu/qemu_command.h +++ b/src/qemu/qemu_command.h @@ -204,9 +204,9 @@ virJSONValue * qemuBuildHostdevMediatedDevProps(const virDomainDef *def, virDomainHostdevDef *dev); -char *qemuBuildRedirdevDevStr(const virDomainDef *def, - virDomainRedirdevDef *dev, - virQEMUCaps *qemuCaps); +virJSONValue * +qemuBuildRedirdevDevProps(const virDomainDef *def, + virDomainRedirdevDef *dev); char *qemuBuildZPCIDevStr(virDomainDeviceInfo *dev); diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index e1db3d55f3..422ab267cf 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -1961,7 +1961,7 @@ int qemuDomainAttachRedirdevDevice(virQEMUDriver *dri= ver, qemuDomainObjPrivate *priv =3D vm->privateData; virDomainDef *def =3D vm->def; g_autofree char *charAlias =3D NULL; - g_autofree char *devstr =3D NULL; + g_autoptr(virJSONValue) devprops =3D NULL; bool chardevAdded =3D false; g_autofree char *tlsAlias =3D NULL; const char *secAlias =3D NULL; @@ -1976,7 +1976,7 @@ int qemuDomainAttachRedirdevDevice(virQEMUDriver *dri= ver, if ((virDomainUSBAddressEnsure(priv->usbaddrs, &redirdev->info)) < 0) return -1; - if (!(devstr =3D qemuBuildRedirdevDevStr(def, redirdev, priv->qemuCaps= ))) + if (!(devprops =3D qemuBuildRedirdevDevProps(def, redirdev))) goto cleanup; VIR_REALLOC_N(def->redirdevs, def->nredirdevs+1); @@ -1994,7 +1994,7 @@ int qemuDomainAttachRedirdevDevice(virQEMUDriver *dri= ver, goto exit_monitor; chardevAdded =3D true; - if (qemuMonitorAddDevice(priv->mon, devstr) < 0) + if (qemuMonitorAddDeviceProps(priv->mon, &devprops) < 0) goto exit_monitor; if (qemuDomainObjExitMonitor(driver, vm) < 0) --=20 2.31.1