From nobody Mon Feb 9 03:29:11 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.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 170.10.129.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=1633621022; cv=none; d=zohomail.com; s=zohoarc; b=Fzo8cqSptOlhIXI46wREhmKkO+mX3N8eK69wvGwXYZEyY2mNBdCK4EIYEdFtaeJoU7vao+QmAEuP6I3bZcT2HpyHNxkZwrmYpaQHgfrkqNplBYp5nKRo8Tl7poT/DQobbfuXyszJrbAhHvrUnjI3hTnHL38aHWsb/bBzLwyhds8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1633621022; 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=3cjNuc4uN67Hmnai2kAa2YmU8ESLffkzdqKbwnM/l4M=; b=K971vkSDYIU/t9aKdlWaxac+ctAfnPvaOPM88Vp0HfgXCM3ii2rSiKH9ZVawFg1m8w61dYlzfuqtSeO/5fjTMmpk30YppAMWORuWLu1ggqCBR8WHQYYY2l1mlTDg0M7WmhN15w5IYvaTfDl9SZdqKz4hnS8+M+gI+tcsqyVFuvA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.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 [170.10.129.124]) by mx.zohomail.com with SMTPS id 1633621022599292.4538962168798; Thu, 7 Oct 2021 08:37:02 -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-35-ehcPiFU3PkeRq7cg-gHCRA-1; Thu, 07 Oct 2021 11:36:59 -0400 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 98EDA187F2E5; Thu, 7 Oct 2021 15:30:09 +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 27C0BF8830; Thu, 7 Oct 2021 15:30:09 +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 DEFBF4E9F4; Thu, 7 Oct 2021 15:30:08 +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 197FKgLm024240 for ; Thu, 7 Oct 2021 11:20:42 -0400 Received: by smtp.corp.redhat.com (Postfix) id 0379B5F503; Thu, 7 Oct 2021 15:20:42 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.5]) by smtp.corp.redhat.com (Postfix) with ESMTP id 650DA5F4F4 for ; Thu, 7 Oct 2021 15:20:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1633621021; 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=3cjNuc4uN67Hmnai2kAa2YmU8ESLffkzdqKbwnM/l4M=; b=JJp2t7ZtjQTMqjgyRTBAVEq3HzB1hdHaqy1I5Uw0LFzcDkEnMvJdW7/XWTIMfrTLN7eB5F QNCt+SXSQ0g2V0d+Og1EyXhFWZ+V6BaYu3jOvUj8AphRux9FYbhzLX2MvAtA/NjIi2RGqf 7QCDhwomz5PTgKRu4zEvKWo6tmta6wA= X-MC-Unique: ehcPiFU3PkeRq7cg-gHCRA-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 067/103] qemuBuildInputCommandLine: Generate via JSON Date: Thu, 7 Oct 2021 17:17:55 +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.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) X-ZM-MESSAGEID: 1633621023338100001 Content-Type: text/plain; charset="utf-8" For 'usb-mouse'/'usb-tablet'/'usb-kbd' we don't use any special property. For 'virtio-input-pci' we only use the 'evdev' argument which is a string so this conversion doesn't impact anything. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/qemu/qemu_command.c | 107 +++++++++++++++++++++------------------- src/qemu/qemu_command.h | 14 +++--- src/qemu/qemu_hotplug.c | 46 ++++++++++------- 3 files changed, 91 insertions(+), 76 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index bab1da1c11..9f593151ab 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -4271,21 +4271,19 @@ qemuBuildNVRAMCommandLine(virCommand *cmd, } -static char * -qemuBuildVirtioInputDevStr(const virDomainDef *def, - virDomainInputDef *dev, - virQEMUCaps *qemuCaps) +virJSONValue * +qemuBuildInputVirtioDevProps(const virDomainDef *def, + virDomainInputDef *dev, + virQEMUCaps *qemuCaps) { - g_auto(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; + g_autoptr(virJSONValue) props =3D NULL; + const char *evdev =3D NULL; switch ((virDomainInputType)dev->type) { case VIR_DOMAIN_INPUT_TYPE_MOUSE: case VIR_DOMAIN_INPUT_TYPE_TABLET: case VIR_DOMAIN_INPUT_TYPE_KBD: case VIR_DOMAIN_INPUT_TYPE_PASSTHROUGH: - if (qemuBuildVirtioDevStr(&buf, qemuCaps, VIR_DOMAIN_DEVICE_INPUT,= dev) < 0) { - return NULL; - } break; case VIR_DOMAIN_INPUT_TYPE_EVDEV: case VIR_DOMAIN_INPUT_TYPE_LAST: @@ -4294,42 +4292,54 @@ qemuBuildVirtioInputDevStr(const virDomainDef *def, return NULL; } - virBufferAsprintf(&buf, ",id=3D%s", dev->info.alias); + if (dev->type =3D=3D VIR_DOMAIN_INPUT_TYPE_PASSTHROUGH) + evdev =3D dev->source.evdev; - if (dev->type =3D=3D VIR_DOMAIN_INPUT_TYPE_PASSTHROUGH) { - virBufferAddLit(&buf, ",evdev=3D"); - virQEMUBuildBufferEscapeComma(&buf, dev->source.evdev); - } + if (!(props =3D qemuBuildVirtioDevProps(VIR_DOMAIN_DEVICE_INPUT, dev, = qemuCaps))) + return NULL; - if (qemuBuildDeviceAddressStr(&buf, def, &dev->info) < 0) + if (virJSONValueObjectAdd(props, + "s:id", dev->info.alias, + "S:evdev", evdev, + NULL) < 0) return NULL; - return virBufferContentAndReset(&buf); + if (qemuBuildDeviceAddressProps(props, def, &dev->info) < 0) + return NULL; + + return g_steal_pointer(&props); } -static char * -qemuBuildUSBInputDevStr(const virDomainDef *def, - virDomainInputDef *dev, - virQEMUCaps *qemuCaps G_GNUC_UNUSED) + +virJSONValue * +qemuBuildInputUSBDevProps(const virDomainDef *def, + virDomainInputDef *dev) { - g_auto(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; + g_autoptr(virJSONValue) props =3D NULL; + const char *driver =3D NULL; switch (dev->type) { case VIR_DOMAIN_INPUT_TYPE_MOUSE: - virBufferAsprintf(&buf, "usb-mouse,id=3D%s", dev->info.alias); + driver =3D "usb-mouse"; break; case VIR_DOMAIN_INPUT_TYPE_TABLET: - virBufferAsprintf(&buf, "usb-tablet,id=3D%s", dev->info.alias); + driver =3D "usb-tablet"; break; case VIR_DOMAIN_INPUT_TYPE_KBD: - virBufferAsprintf(&buf, "usb-kbd,id=3D%s", dev->info.alias); + driver =3D "usb-kbd"; break; } - if (qemuBuildDeviceAddressStr(&buf, def, &dev->info) < 0) + if (virJSONValueObjectCreate(&props, + "s:driver", driver, + "s:id", dev->info.alias, + NULL) < 0) return NULL; - return virBufferContentAndReset(&buf); + if (qemuBuildDeviceAddressProps(props, def, &dev->info) < 0) + return NULL; + + return g_steal_pointer(&props); } @@ -4356,27 +4366,6 @@ qemuBuildInputEvdevProps(virDomainInputDef *dev) } -int -qemuBuildInputDevStr(char **devstr, - const virDomainDef *def, - virDomainInputDef *input, - virQEMUCaps *qemuCaps) -{ - switch (input->bus) { - case VIR_DOMAIN_INPUT_BUS_USB: - if (!(*devstr =3D qemuBuildUSBInputDevStr(def, input, qemuCaps))) - return -1; - break; - - case VIR_DOMAIN_INPUT_BUS_VIRTIO: - if (!(*devstr =3D qemuBuildVirtioInputDevStr(def, input, qemuCaps)= )) - return -1; - break; - } - return 0; -} - - static int qemuBuildInputCommandLine(virCommand *cmd, const virDomainDef *def, @@ -4399,15 +4388,29 @@ qemuBuildInputCommandLine(virCommand *cmd, if (qemuBuildObjectCommandlineFromJSON(cmd, props, qemuCaps) <= 0) return -1; } else { - g_autofree char *devstr =3D NULL; + g_autoptr(virJSONValue) props =3D NULL; - if (qemuBuildInputDevStr(&devstr, def, input, qemuCaps) < 0) - return -1; + switch ((virDomainInputBus) input->bus) { + case VIR_DOMAIN_INPUT_BUS_USB: + if (!(props =3D qemuBuildInputUSBDevProps(def, input))) + return -1; + break; - if (devstr) { - virCommandAddArg(cmd, "-device"); - virCommandAddArg(cmd, devstr); + case VIR_DOMAIN_INPUT_BUS_VIRTIO: + if (!(props =3D qemuBuildInputVirtioDevProps(def, input, q= emuCaps))) + return -1; + + case VIR_DOMAIN_INPUT_BUS_PS2: + case VIR_DOMAIN_INPUT_BUS_XEN: + case VIR_DOMAIN_INPUT_BUS_PARALLELS: + case VIR_DOMAIN_INPUT_BUS_NONE: + case VIR_DOMAIN_INPUT_BUS_LAST: + break; } + + if (props && + qemuBuildDeviceCommandlineFromJSON(cmd, props, qemuCaps) <= 0) + return -1; } } diff --git a/src/qemu/qemu_command.h b/src/qemu/qemu_command.h index f965125277..e8561c0a3c 100644 --- a/src/qemu/qemu_command.h +++ b/src/qemu/qemu_command.h @@ -237,12 +237,14 @@ virJSONValue * qemuBuildWatchdogDevProps(const virDomainDef *def, virDomainWatchdogDef *dev); -int qemuBuildInputDevStr(char **devstr, - const virDomainDef *def, - virDomainInputDef *input, - virQEMUCaps *qemuCaps) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3) - ATTRIBUTE_NONNULL(4); +virJSONValue * +qemuBuildInputVirtioDevProps(const virDomainDef *def, + virDomainInputDef *dev, + virQEMUCaps *qemuCaps); + +virJSONValue * +qemuBuildInputUSBDevProps(const virDomainDef *def, + virDomainInputDef *dev); char * qemuBuildVsockDevStr(virDomainDef *def, diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 422ab267cf..3c76e9be91 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -3229,7 +3229,7 @@ qemuDomainAttachInputDevice(virQEMUDriver *driver, virDomainInputDef *input) { int ret =3D -1; - g_autofree char *devstr =3D NULL; + g_autoptr(virJSONValue) devprops =3D NULL; qemuDomainObjPrivate *priv =3D vm->privateData; virDomainDeviceDef dev =3D { VIR_DOMAIN_DEVICE_INPUT, { .input =3D input } }; @@ -3239,28 +3239,38 @@ qemuDomainAttachInputDevice(virQEMUDriver *driver, bool teardownlabel =3D false; bool teardowncgroup =3D false; - if (input->bus !=3D VIR_DOMAIN_INPUT_BUS_USB && - input->bus !=3D VIR_DOMAIN_INPUT_BUS_VIRTIO) { - virReportError(VIR_ERR_OPERATION_UNSUPPORTED, - _("input device on bus '%s' cannot be hot plugged."= ), - virDomainInputBusTypeToString(input->bus)); + if (qemuAssignDeviceInputAlias(vm->def, input, -1) < 0) return -1; - } - if (input->bus =3D=3D VIR_DOMAIN_INPUT_BUS_VIRTIO) { - if (qemuDomainEnsureVirtioAddress(&releaseaddr, vm, &dev) < 0) - return -1; - } else if (input->bus =3D=3D VIR_DOMAIN_INPUT_BUS_USB) { + switch ((virDomainInputBus) input->bus) { + case VIR_DOMAIN_INPUT_BUS_USB: if (virDomainUSBAddressEnsure(priv->usbaddrs, &input->info) < 0) - goto cleanup; + return -1; + releaseaddr =3D true; - } - if (qemuAssignDeviceInputAlias(vm->def, input, -1) < 0) - goto cleanup; + if (!(devprops =3D qemuBuildInputUSBDevProps(vm->def, input))) + goto cleanup; + break; - if (qemuBuildInputDevStr(&devstr, vm->def, input, priv->qemuCaps) < 0) - goto cleanup; + case VIR_DOMAIN_INPUT_BUS_VIRTIO: + if (qemuDomainEnsureVirtioAddress(&releaseaddr, vm, &dev) < 0) + goto cleanup; + + if (!(devprops =3D qemuBuildInputVirtioDevProps(vm->def, input, pr= iv->qemuCaps))) + goto cleanup; + break; + + case VIR_DOMAIN_INPUT_BUS_PS2: + case VIR_DOMAIN_INPUT_BUS_XEN: + case VIR_DOMAIN_INPUT_BUS_PARALLELS: + case VIR_DOMAIN_INPUT_BUS_NONE: + case VIR_DOMAIN_INPUT_BUS_LAST: + virReportError(VIR_ERR_OPERATION_UNSUPPORTED, + _("input device on bus '%s' cannot be hot plugged."= ), + virDomainInputBusTypeToString(input->bus)); + return -1; + } if (qemuDomainNamespaceSetupInput(vm, input, &teardowndevice) < 0) goto cleanup; @@ -3280,7 +3290,7 @@ qemuDomainAttachInputDevice(virQEMUDriver *driver, if (qemuDomainAttachExtensionDevice(priv->mon, &input->info) < 0) goto exit_monitor; - if (qemuMonitorAddDevice(priv->mon, devstr) < 0) { + if (qemuMonitorAddDeviceProps(priv->mon, &devprops) < 0) { ignore_value(qemuDomainDetachExtensionDevice(priv->mon, &input->in= fo)); goto exit_monitor; } --=20 2.31.1