From nobody Mon Feb 9 12:11:34 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=1633621433; cv=none; d=zohomail.com; s=zohoarc; b=dOMeaRylA3LZdAjMKGaxJiCI+NFpvHQYA3MKiCBU2ZjYBJJxvQ6WnREDfnhYEqiesezTtazxHyJnWrHuQ7aDax/h2Qb+aoXvLdb4q4l5r8exYV/sapW24IcxaayoovdXZxo55gfzLq+1+SPnT/ffyKwp36F2hFfuFAWNIGSOMj8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1633621433; 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=UqF8B6D9xZKj4TKZ+VkqJrzX399AwHQgcGqtxhwZYJc=; b=F5wBCxwPjDQHtEgLvG7YK+Mc0W7h+cUE18Sk6rt+GqZZ5tDCByNecXU28Ed850JZD+S3wl8rrDJEfC7oZyWZuO1uY+q27c36yXXps9kaQE4Qv4qMmAcmytnSPofoyovwxOv+2c8oQqNzc+jFz4nQZWLMEVz7H4KGTAP9y/PbJVY= 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 1633621433001275.3222704509617; Thu, 7 Oct 2021 08:43:53 -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-528-gsSfsVY8P6yUq2sApRdAPw-1; Thu, 07 Oct 2021 11:43:49 -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 C486393634B; Thu, 7 Oct 2021 15:33:37 +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 7448E1115638; Thu, 7 Oct 2021 15:33:37 +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 E5DDC1803B30; Thu, 7 Oct 2021 15:33:36 +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 197FLKql024601 for ; Thu, 7 Oct 2021 11:21:20 -0400 Received: by smtp.corp.redhat.com (Postfix) id 34FAD5F500; Thu, 7 Oct 2021 15:21:20 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.5]) by smtp.corp.redhat.com (Postfix) with ESMTP id 663FB6F132 for ; Thu, 7 Oct 2021 15:21:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1633621432; 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=UqF8B6D9xZKj4TKZ+VkqJrzX399AwHQgcGqtxhwZYJc=; b=CXFTYKedQgmy63529lYifW7DIwq5s3PIcE+UkKvbilIci4tICQt4Mbb4eSWYk1tuihrfc2 gFJT6KzmwleFpH83/hDt+E79KPY6gqsoKPtWwYTruJ/eroXlAuMhmnnW1khKGmDaNq88Tk bdIuWZ0Z4g3yta/eMXr1HSW+LRrJ6Qk= X-MC-Unique: gsSfsVY8P6yUq2sApRdAPw-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 096/103] qemuBuildFSDevCommandLine: Generate via JSON Date: Thu, 7 Oct 2021 17:18:24 +0200 Message-Id: <46a87d44a6977d0b14e34c56b94f6173c510bc88.1633619630.git.pkrempa@redhat.com> 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: 1633621434105100001 Content-Type: text/plain; charset="utf-8" Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/qemu/qemu_command.c | 37 ++++++++++++++++++++----------------- 1 file changed, 20 insertions(+), 17 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index f47d77548d..71816288e5 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -2675,26 +2675,32 @@ qemuBuildFSStr(virDomainFSDef *fs) } -static char * -qemuBuildFSDevStr(const virDomainDef *def, +static int +qemuBuildFSDevCmd(virCommand *cmd, + const virDomainDef *def, virDomainFSDef *fs, virQEMUCaps *qemuCaps) { - g_auto(virBuffer) opt =3D VIR_BUFFER_INITIALIZER; + g_autoptr(virJSONValue) devprops =3D NULL; + g_autofree char *fsdev =3D g_strdup_printf("%s%s", QEMU_FSDEV_HOST_PRE= FIX, fs->info.alias); - if (qemuBuildVirtioDevStr(&opt, qemuCaps, VIR_DOMAIN_DEVICE_FS, fs) < = 0) - return NULL; + if (!(devprops =3D qemuBuildVirtioDevProps(VIR_DOMAIN_DEVICE_FS, fs, q= emuCaps))) + return -1; - virBufferAsprintf(&opt, ",id=3D%s", fs->info.alias); - virBufferAsprintf(&opt, ",fsdev=3D%s%s", - QEMU_FSDEV_HOST_PREFIX, fs->info.alias); - virBufferAddLit(&opt, ",mount_tag=3D"); - virQEMUBuildBufferEscapeComma(&opt, fs->dst); + if (virJSONValueObjectAdd(devprops, + "s:id", fs->info.alias, + "s:fsdev", fsdev, + "s:mount_tag", fs->dst, + NULL) < 0) + return -1; - if (qemuBuildDeviceAddressStr(&opt, def, &fs->info) < 0) - return NULL; + if (qemuBuildDeviceAddressProps(devprops, def, &fs->info) < 0) + return -1; - return virBufferContentAndReset(&opt); + if (qemuBuildDeviceCommandlineFromJSON(cmd, devprops, qemuCaps) < 0) + return -1; + + return 0; } @@ -2705,7 +2711,6 @@ qemuBuildFSDevCommandLine(virCommand *cmd, virQEMUCaps *qemuCaps) { g_autofree char *fsdevstr =3D NULL; - g_autofree char *devicestr =3D NULL; virCommandAddArg(cmd, "-fsdev"); if (!(fsdevstr =3D qemuBuildFSStr(fs))) @@ -2715,10 +2720,8 @@ qemuBuildFSDevCommandLine(virCommand *cmd, if (qemuCommandAddExtDevice(cmd, &fs->info, qemuCaps) < 0) return -1; - virCommandAddArg(cmd, "-device"); - if (!(devicestr =3D qemuBuildFSDevStr(def, fs, qemuCaps))) + if (qemuBuildFSDevCmd(cmd, def, fs, qemuCaps) < 0) return -1; - virCommandAddArg(cmd, devicestr); return 0; } --=20 2.31.1