From nobody Mon Feb 9 09:15:37 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.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.133.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=1633624004; cv=none; d=zohomail.com; s=zohoarc; b=ACtEGCJAbb3uOqMUlm5SeAHwdI2uiQsCqFcZjhQTyJNyKwNebvNktmOTDXFbBH3K5dGXnSjMHbG5y+enPdwaj8dUK583COBOrPTUNVDotGTmWJtgkCJ0pOFKV6JEJ2o/VZ3qBOJl/SqQknUjlWYruhiM0X/XgxFbDvpoiYdrX8o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1633624004; 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=wijXx59t5EhvLiaypgjYjur+BrSrKSfnZfFYD9dQo/0=; b=KJESwc9Ph6NAkckib8VU+hRXY79TTwlNYq6KkRNmbgX1eY9LuKnOe3s6p50g9L1U+JgizzVFhjizrUBnbEZVc3wK+FRiXX3thXVzoLuM90YQUMIH7N53YfeIlo3th0boZH87vsGRwbTGvk4Ea2kDdZq3nCJihd8t8CnKHvGu7Xw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.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.133.124]) by mx.zohomail.com with SMTPS id 1633624004315712.3906819372578; Thu, 7 Oct 2021 09:26:44 -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-328-18aE-J53MtyDQR3FjdoKag-1; Thu, 07 Oct 2021 12:26:31 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id A0C0F8F2948; Thu, 7 Oct 2021 15:58:39 +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 77F4E57DE3; Thu, 7 Oct 2021 15:58:39 +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 1A8DE1806D02; Thu, 7 Oct 2021 15:58:39 +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 197FLSo2024678 for ; Thu, 7 Oct 2021 11:21:28 -0400 Received: by smtp.corp.redhat.com (Postfix) id DD88E6F949; Thu, 7 Oct 2021 15:21:26 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.5]) by smtp.corp.redhat.com (Postfix) with ESMTP id C06DB70F62 for ; Thu, 7 Oct 2021 15:21:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1633624003; 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=wijXx59t5EhvLiaypgjYjur+BrSrKSfnZfFYD9dQo/0=; b=cSIX2kiDq3Qq3r6OvVUs/p4pO6C5qePuzZgDYdlj0KlBFXMFp5nyMCZ22ZHEErUoRJ5Gud ekC1hcDbSPnPRBD939VqgrMIGs3mEq9GWZ0+BBwBpT/FBHgxWA3Wysfrbvr6sq2uTq9D2M ahwafYoG2O8bTPjWfsOs4rKAn4MVPNo= X-MC-Unique: 18aE-J53MtyDQR3FjdoKag-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 101/103] qemuBuildHubCommandLine: Generate via JSON Date: Thu, 7 Oct 2021 17:18:29 +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.23 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: 1633624006078100001 Content-Type: text/plain; charset="utf-8" The 'usb-hub' device doesn't have any special properties. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/qemu/qemu_command.c | 33 ++++++++++++++++++--------------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index d0bf3dbb30..306dcc6b8c 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -4860,19 +4860,27 @@ qemuBuildUSBHostdevDevProps(const virDomainDef *def, } -static char * -qemuBuildHubDevStr(const virDomainDef *def, +static int +qemuBuildHubDevCmd(virCommand *cmd, + const virDomainDef *def, virDomainHubDef *dev, - virQEMUCaps *qemuCaps G_GNUC_UNUSED) + virQEMUCaps *qemuCaps) { - g_auto(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; + g_autoptr(virJSONValue) props =3D NULL; - virBufferAddLit(&buf, "usb-hub"); - virBufferAsprintf(&buf, ",id=3D%s", dev->info.alias); - if (qemuBuildDeviceAddressStr(&buf, def, &dev->info) < 0) - return NULL; + if (virJSONValueObjectCreate(&props, + "s:driver", "usb-hub", + "s:id", dev->info.alias, + NULL) < 0) + return -1; - return virBufferContentAndReset(&buf); + if (qemuBuildDeviceAddressProps(props, def, &dev->info) < 0) + return -1; + + if (qemuBuildDeviceCommandlineFromJSON(cmd, props, qemuCaps) < 0) + return -1; + + return 0; } @@ -4884,13 +4892,8 @@ qemuBuildHubCommandLine(virCommand *cmd, size_t i; for (i =3D 0; i < def->nhubs; i++) { - virDomainHubDef *hub =3D def->hubs[i]; - g_autofree char *optstr =3D NULL; - - virCommandAddArg(cmd, "-device"); - if (!(optstr =3D qemuBuildHubDevStr(def, hub, qemuCaps))) + if (qemuBuildHubDevCmd(cmd, def, def->hubs[i], qemuCaps) < 0) return -1; - virCommandAddArg(cmd, optstr); } return 0; --=20 2.31.1