From nobody Mon Feb 9 10:32:19 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=1633623017; cv=none; d=zohomail.com; s=zohoarc; b=hcVp8Dj5K2NHKeBQmWq7mBIwwfe9oyeTTR0h/1bYa20Zz15j87+x+BlkJiKhFx/5zk7flNPPrMzZjMiik0vlV5Z9j29ftAlBqE6XQF8AbClct9dVnpRCtdHjf8i0pIZ04pNrAJBN1cxunR6Apw96oaAar8W2SKVu0kpdB6ixRSo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1633623017; 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=kx0KXCPpCWB3rvDuW7sxngyR8Fd1tS7mAYgC35NSYAA=; b=fuvW9dCmJy3/6cwxAEDVDB22zlk4M7panuezXgzcbSSMrL1RWHxxMvCSVkHXNCqsw76T6WdTCU+e0EE5w72MFWSvR1a3X/1nntnFjR5OHA42fEtCLhruhipqYVjAlH+CkWkSmdnmufspI/5+/gBtbg4jIozkXmPCKiRZceqA1uQ= 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 1633623017901244.62042377520595; Thu, 7 Oct 2021 09:10: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-595-w69R6JzzPyiI2x2tYqbZSw-1; Thu, 07 Oct 2021 12:10:14 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id B9759115059B; Thu, 7 Oct 2021 15:52:47 +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 C542914BCA78; Thu, 7 Oct 2021 15:50:14 +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 846271806D02; Thu, 7 Oct 2021 15:50:14 +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 197FLCoE024530 for ; Thu, 7 Oct 2021 11:21:12 -0400 Received: by smtp.corp.redhat.com (Postfix) id A447B5D6BA; Thu, 7 Oct 2021 15:21:12 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.5]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0B54C5F4E7 for ; Thu, 7 Oct 2021 15:21:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1633623016; 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=kx0KXCPpCWB3rvDuW7sxngyR8Fd1tS7mAYgC35NSYAA=; b=XEIkUQGB3GlNEidozKVIXsQIp6zzg0FJ1vCxCvw2n3/Dgwo2CbTmh4bcprin381gT38L+D TJNwO/gkVF5vyu9xCzhc3oJw5aG1r3Sfx+EhEFCIdyQJBBLaiC5bNWBabxLbWSjF3aqecK mf5Xujk71FHUPghXwCnzR0/t2NHiCIw= X-MC-Unique: w69R6JzzPyiI2x2tYqbZSw-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 090/103] qemuBuildControllersByTypeCommandLine: Generate via JSON Date: Thu, 7 Oct 2021 17:18:18 +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.84 on 10.5.11.22 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: 1633623019588100001 Content-Type: text/plain; charset="utf-8" The handlers for PCI, SCSI and USB controllers already use JSON internally. This patch converts 'virtio-serial', 'ccid' and 'sata' to do the same and passes out the JSON directly so that it can be used in monitor code to avoid conversion. >From the controllers converted in this patch only 'virtio-serial' has special properties. QEMU thinks they have the following types: max_ports=3D - (default: 31) vectors=3D - (default: 2) Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/qemu/qemu_command.c | 122 +++++++++++++++------------------------- src/qemu/qemu_command.h | 9 +-- src/qemu/qemu_hotplug.c | 8 +-- 3 files changed, 54 insertions(+), 85 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 2f1d4b846a..81b1eb5980 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -2866,16 +2866,12 @@ qemuBuildUSBControllerDevProps(const virDomainDef *= domainDef, return NULL; } - if (qemuBuildDeviceAddressProps(props, domainDef, &def->info) < 0) - return NULL; - return g_steal_pointer(&props); } static virJSONValue * -qemuBuildControllerSCSIDevProps(const virDomainDef *domainDef, - virDomainControllerDef *def, +qemuBuildControllerSCSIDevProps(virDomainControllerDef *def, virQEMUCaps *qemuCaps) { g_autoptr(virJSONValue) props =3D NULL; @@ -2948,16 +2944,12 @@ qemuBuildControllerSCSIDevProps(const virDomainDef = *domainDef, return NULL; } - if (qemuBuildDeviceAddressProps(props, domainDef, &def->info) < 0) - return NULL; - return g_steal_pointer(&props); } static int qemuBuildControllerPCIDevProps(virDomainControllerDef *def, - const virDomainDef *domainDef, virJSONValue **devprops) { g_autoptr(virJSONValue) props =3D NULL; @@ -3054,9 +3046,6 @@ qemuBuildControllerPCIDevProps(virDomainControllerDef= *def, return -1; } - if (qemuBuildDeviceAddressProps(props, domainDef, &def->info) < 0) - return -1; - *devprops =3D g_steal_pointer(&props); return 0; } @@ -3068,8 +3057,7 @@ qemuBuildControllerPCIDevProps(virDomainControllerDef= *def, * @domainDef: domain definition * @def: controller definition * @qemuCaps: QEMU binary capabilities - * @devstr: device string - * @nusbcontroller: number of USB controllers + * @devprops: filled with JSON object describing @def * * Turn @def into a description of the controller that QEMU will understan= d, * to be used either on the command line or through the monitor. @@ -3084,89 +3072,65 @@ qemuBuildControllerPCIDevProps(virDomainControllerD= ef *def, * Returns: 0 on success, <0 on failure */ int -qemuBuildControllerDevStr(const virDomainDef *domainDef, - virDomainControllerDef *def, - virQEMUCaps *qemuCaps, - char **devstr) +qemuBuildControllerDevProps(const virDomainDef *domainDef, + virDomainControllerDef *def, + virQEMUCaps *qemuCaps, + virJSONValue **devprops) { - g_auto(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; g_autoptr(virJSONValue) props =3D NULL; - const char *driver =3D NULL; - *devstr =3D NULL; + *devprops =3D NULL; switch ((virDomainControllerType)def->type) { case VIR_DOMAIN_CONTROLLER_TYPE_SCSI: - if (!(props =3D qemuBuildControllerSCSIDevProps(domainDef, def, qe= muCaps))) + if (!(props =3D qemuBuildControllerSCSIDevProps(def, qemuCaps))) return -1; - driver =3D virJSONValueObjectGetString(props, "driver"); - - virBufferAsprintf(&buf, "%s,", driver); + break; - if (virQEMUBuildCommandLineJSON(props, &buf, "driver", NULL) < 0) + case VIR_DOMAIN_CONTROLLER_TYPE_VIRTIO_SERIAL: + if (!(props =3D qemuBuildVirtioDevProps(VIR_DOMAIN_DEVICE_CONTROLL= ER, def, + qemuCaps))) return -1; - *devstr =3D virBufferContentAndReset(&buf); - - return 0; - - case VIR_DOMAIN_CONTROLLER_TYPE_VIRTIO_SERIAL: - if (qemuBuildVirtioDevStr(&buf, qemuCaps, VIR_DOMAIN_DEVICE_CONTRO= LLER, def) < 0) { + if (virJSONValueObjectAdd(props, + "s:id", def->info.alias, + "k:max_ports", def->opts.vioserial.ports, + "k:vectors", def->opts.vioserial.vectors, + NULL) < 0) return -1; - } - virBufferAsprintf(&buf, ",id=3D%s", def->info.alias); - if (def->opts.vioserial.ports !=3D -1) { - virBufferAsprintf(&buf, ",max_ports=3D%d", - def->opts.vioserial.ports); - } - if (def->opts.vioserial.vectors !=3D -1) { - virBufferAsprintf(&buf, ",vectors=3D%d", - def->opts.vioserial.vectors); - } break; case VIR_DOMAIN_CONTROLLER_TYPE_CCID: - virBufferAsprintf(&buf, "usb-ccid,id=3D%s", def->info.alias); + if (virJSONValueObjectCreate(&props, + "s:driver", "usb-ccid", + "s:id", def->info.alias, + NULL) < 0) + return -1; + break; case VIR_DOMAIN_CONTROLLER_TYPE_SATA: - virBufferAsprintf(&buf, "ahci,id=3D%s", def->info.alias); + if (virJSONValueObjectCreate(&props, + "s:driver", "ahci", + "s:id", def->info.alias, + NULL) < 0) + return -1; + break; case VIR_DOMAIN_CONTROLLER_TYPE_USB: if (!(props =3D qemuBuildUSBControllerDevProps(domainDef, def, qem= uCaps))) return -1; - driver =3D virJSONValueObjectGetString(props, "driver"); - - virBufferAsprintf(&buf, "%s,", driver); - - if (virQEMUBuildCommandLineJSON(props, &buf, "driver", NULL) < 0) - return -1; - - *devstr =3D virBufferContentAndReset(&buf); - - return 0; break; case VIR_DOMAIN_CONTROLLER_TYPE_PCI: - if (qemuBuildControllerPCIDevProps(def, domainDef, &props) < 0) + if (qemuBuildControllerPCIDevProps(def, &props) < 0) return -1; - if (!props) - return 0; - - driver =3D virJSONValueObjectGetString(props, "driver"); - - virBufferAsprintf(&buf, "%s,", driver); - - if (virQEMUBuildCommandLineJSON(props, &buf, "driver", NULL) < 0) - return -1; - - *devstr =3D virBufferContentAndReset(&buf); - return 0; + break; case VIR_DOMAIN_CONTROLLER_TYPE_IDE: case VIR_DOMAIN_CONTROLLER_TYPE_FDC: @@ -3179,10 +3143,13 @@ qemuBuildControllerDevStr(const virDomainDef *domai= nDef, return -1; } - if (qemuBuildDeviceAddressStr(&buf, domainDef, &def->info) < 0) + if (!props) + return 0; + + if (qemuBuildDeviceAddressProps(props, domainDef, &def->info) < 0) return -1; - *devstr =3D virBufferContentAndReset(&buf); + *devprops =3D g_steal_pointer(&props); return 0; } @@ -3313,7 +3280,7 @@ qemuBuildControllersByTypeCommandLine(virCommand *cmd, for (i =3D 0; i < def->ncontrollers; i++) { virDomainControllerDef *cont =3D def->controllers[i]; - g_autofree char *devstr =3D NULL; + g_autoptr(virJSONValue) props =3D NULL; if (cont->type !=3D type) continue; @@ -3349,16 +3316,17 @@ qemuBuildControllersByTypeCommandLine(virCommand *c= md, continue; } - if (qemuBuildControllerDevStr(def, cont, qemuCaps, &devstr) < 0) + if (qemuBuildControllerDevProps(def, cont, qemuCaps, &props) < 0) return -1; - if (devstr) { - if (qemuCommandAddExtDevice(cmd, &cont->info, qemuCaps) < 0) - return -1; + if (!props) + continue; - virCommandAddArg(cmd, "-device"); - virCommandAddArg(cmd, devstr); - } + if (qemuCommandAddExtDevice(cmd, &cont->info, qemuCaps) < 0) + return -1; + + if (qemuBuildDeviceCommandlineFromJSON(cmd, props, qemuCaps) < 0) + return -1; } return 0; diff --git a/src/qemu/qemu_command.h b/src/qemu/qemu_command.h index 29db16e729..cf57fc9a41 100644 --- a/src/qemu/qemu_command.h +++ b/src/qemu/qemu_command.h @@ -147,10 +147,11 @@ qemuBuildVHostUserFsDevStr(virDomainFSDef *fs, qemuDomainObjPrivate *priv); /* Current, best practice */ -int qemuBuildControllerDevStr(const virDomainDef *domainDef, - virDomainControllerDef *def, - virQEMUCaps *qemuCaps, - char **devstr); +int +qemuBuildControllerDevProps(const virDomainDef *domainDef, + virDomainControllerDef *def, + virQEMUCaps *qemuCaps, + virJSONValue **devprops); int qemuBuildMemoryBackendProps(virJSONValue **backendProps, const char *alias, diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 1c0056da16..f55cedc784 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -828,7 +828,7 @@ int qemuDomainAttachControllerDevice(virQEMUDriver *dri= ver, { int ret =3D -1; const char* type =3D virDomainControllerTypeToString(controller->type); - g_autofree char *devstr =3D NULL; + g_autoptr(virJSONValue) devprops =3D NULL; qemuDomainObjPrivate *priv =3D vm->privateData; virDomainDeviceDef dev =3D { VIR_DOMAIN_DEVICE_CONTROLLER, { .controller =3D controller } }; @@ -862,10 +862,10 @@ int qemuDomainAttachControllerDevice(virQEMUDriver *d= river, if (qemuAssignDeviceControllerAlias(vm->def, controller) < 0) goto cleanup; - if (qemuBuildControllerDevStr(vm->def, controller, priv->qemuCaps, &de= vstr) < 0) + if (qemuBuildControllerDevProps(vm->def, controller, priv->qemuCaps, &= devprops) < 0) goto cleanup; - if (!devstr) + if (!devprops) goto cleanup; VIR_REALLOC_N(vm->def->controllers, vm->def->ncontrollers+1); @@ -877,7 +877,7 @@ int qemuDomainAttachControllerDevice(virQEMUDriver *dri= ver, goto exit_monitor; } - if ((ret =3D qemuMonitorAddDevice(priv->mon, devstr)) < 0) + if ((ret =3D qemuMonitorAddDeviceProps(priv->mon, &devprops)) < 0) ignore_value(qemuDomainDetachExtensionDevice(priv->mon, &controlle= r->info)); exit_monitor: --=20 2.31.1