From nobody Mon Feb 9 07:44:18 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=1633620736; cv=none; d=zohomail.com; s=zohoarc; b=bsrHNkysCsdME7ZZUIxKIxkWFe7fpriiBcWq72GrdK0bRUbUaIVBBzBLXV/pivSDTh6XwG5+2wOluHb0X/YTgWqWMePs0qy982TfC+jwgQSvb/ysb9TWB0bum7zltPvv0iGlr+0Von0fC1W42jIkOG4LLP8DsY+YheIPYnKUHb8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1633620736; 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=sR5nATXWa6iRnj5m61ZG8y3F8Ee7pwd4jr1OkUEbHto=; b=lwKIuR6XXmwGJH5hFd+05a5nBRP944/vDGzrEnU0fi4A/2UCbwM+l49Y+HdCYQXTMb9XIWwjRad+ppIhhcZ+oAUCfdCHmZ9SKRLlc/tZVxo3KrWwtHc6RGWihz6Uaa1Lvq3vawYw9Xe7w9AGqydTfCKsLoJvrYZXD72HAe5AXdY= 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 1633620736959770.1254677707624; Thu, 7 Oct 2021 08:32:16 -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-287-80YzgJl3NBKybscwe3uzFg-1; Thu, 07 Oct 2021 11:32:14 -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 C5C481A0F5D4; Thu, 7 Oct 2021 15:25:33 +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 9FB662657A; Thu, 7 Oct 2021 15:25:33 +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 6AF73180598A; Thu, 7 Oct 2021 15:25:33 +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 197FJ3Sr023781 for ; Thu, 7 Oct 2021 11:19:03 -0400 Received: by smtp.corp.redhat.com (Postfix) id C0E4A5D740; Thu, 7 Oct 2021 15:19:03 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.5]) by smtp.corp.redhat.com (Postfix) with ESMTP id 29E0B6A916 for ; Thu, 7 Oct 2021 15:19:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1633620735; 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=sR5nATXWa6iRnj5m61ZG8y3F8Ee7pwd4jr1OkUEbHto=; b=I7BZVjUVFbrbIoiZsSmlRWrbdwjYKA5j6dtVTTOosPj4Mnvt4IdhQhfaVxb+JtqbRaL5Ad LstLN13xH6mxTOSXBfg0kU2eEQWS9RRsCZroW2tVdz6o2gabp9IBV3fG2+PsHO8pWBSlWI hud/Syb5mI5a4jojoV6Yi288K8NRlfQ= X-MC-Unique: 80YzgJl3NBKybscwe3uzFg-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 028/103] virQEMUBuildCommandLineJSONRecurse: Error out when array conversion function is not provided Date: Thu, 7 Oct 2021 17:17:16 +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: 1633620738962100001 Content-Type: text/plain; charset="utf-8" For conversion of '-device' we'll try to avoid usage of arrays if possible, so for now if the array coversion function is not provided the convertor will error out. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/util/virqemu.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/util/virqemu.c b/src/util/virqemu.c index 3e9311e3c7..aef6006dd7 100644 --- a/src/util/virqemu.c +++ b/src/util/virqemu.c @@ -219,7 +219,13 @@ virQEMUBuildCommandLineJSONRecurse(const char *key, return -1; } - if (!arrayFunc || arrayFunc(key, value, buf, skipKey) < 0) { + if (!arrayFunc) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("JSON array -> commandline conversion functio= n not provided")); + return -1; + } + + if (arrayFunc(key, value, buf, skipKey) < 0) { /* fallback, treat the array as a non-bitmap, adding the key * for each member */ for (i =3D 0; i < virJSONValueArraySize(value); i++) { --=20 2.31.1