From nobody Fri Dec 19 15:49:47 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1741797310560912.5029988384415; Wed, 12 Mar 2025 09:35:10 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 8F16B1E80; Wed, 12 Mar 2025 12:35:09 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 307861DB6; Wed, 12 Mar 2025 12:32:02 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 36CAB1CAF; Wed, 12 Mar 2025 12:31:55 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 3140A1D47 for ; Wed, 12 Mar 2025 12:31:40 -0400 (EDT) Received: from mx-prod-mc-04.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-175-1n2gcLSFMa2pmZlyKP1OIw-1; Wed, 12 Mar 2025 12:31:38 -0400 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 63D991955D4E for ; Wed, 12 Mar 2025 16:31:37 +0000 (UTC) Received: from speedmetal.lan (unknown [10.45.242.6]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 923611955BCB for ; Wed, 12 Mar 2025 16:31:36 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1741797099; h=from:from: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; bh=T7tcTTDTVHsgVhj5C8W1giFIZoUcpLvR/XS5iw5Qr38=; b=Gud+VrvDs45cA9JqXtOwjfXcOl9Vc+EneJKzcubcubCeOLs9PWU+OsYen/1Ulfwqd/CsEr rEhiwxRy2JeG+xIk1XpKxivUJeyYQH0IQLV8NS2kivrK/TdAee/7udIy62K+H3CLZWqSou 3sOMN/Z3IIrVTmCmKE3OTVE6kCZIDsg= X-MC-Unique: 1n2gcLSFMa2pmZlyKP1OIw-1 X-Mimecast-MFC-AGG-ID: 1n2gcLSFMa2pmZlyKP1OIw_1741797097 From: Peter Krempa To: devel@lists.libvirt.org Subject: [PATCH 05/17] util: Drop 'virQEMUBuildCommandLineJSONArrayBitmap' Date: Wed, 12 Mar 2025 17:31:15 +0100 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.12 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: eIE4Fz4ANLBs4nUgLChCqY-uyd-TUA3UPiBuT75J-VY_1741797097 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: OF5AHMMDMXPMAXJVMQEUEDFIEUGIZ5UR X-Message-ID-Hash: OF5AHMMDMXPMAXJVMQEUEDFIEUGIZ5UR X-MailFrom: pkrempa@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1741797312144019100 Content-Type: text/plain; charset="utf-8" It was used to convert JSON arrays in legacy -object commandline conversion. Since we now exclusively use JSON with -object, this infrastructure is no longer needed. Signed-off-by: Peter Krempa --- src/libvirt_private.syms | 1 - src/util/virqemu.c | 36 ------------------------------------ src/util/virqemu.h | 3 --- tests/qemucommandutiltest.c | 30 ------------------------------ 4 files changed, 70 deletions(-) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index e63939e2b5..e78abdad15 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -3279,7 +3279,6 @@ virProcessWait; # util/virqemu.h virQEMUBuildBufferEscapeComma; virQEMUBuildCommandLineJSON; -virQEMUBuildCommandLineJSONArrayBitmap; virQEMUBuildCommandLineJSONArrayNumbered; virQEMUBuildCommandLineJSONArrayObjectsStr; diff --git a/src/util/virqemu.c b/src/util/virqemu.c index c9fac5956a..d2a69026c8 100644 --- a/src/util/virqemu.c +++ b/src/util/virqemu.c @@ -50,42 +50,6 @@ virQEMUBuildCommandLineJSONRecurse(const char *key, -int -virQEMUBuildCommandLineJSONArrayBitmap(const char *key, - virJSONValue *array, - virBuffer *buf) -{ - ssize_t pos =3D -1; - ssize_t end; - g_autoptr(virBitmap) bitmap =3D virBitmapNew(0); - size_t i; - - for (i =3D 0; i < virJSONValueArraySize(array); i++) { - virJSONValue *member =3D virJSONValueArrayGet(array, i); - unsigned long long value; - - if (virJSONValueGetNumberUlong(member, &value) < 0) - return -1; - - virBitmapSetBitExpand(bitmap, value); - } - - while ((pos =3D virBitmapNextSetBit(bitmap, pos)) > -1) { - if ((end =3D virBitmapNextClearBit(bitmap, pos)) < 0) - end =3D virBitmapLastSetBit(bitmap) + 1; - - if (end - 1 > pos) { - virBufferAsprintf(buf, "%s=3D%zd-%zd,", key, pos, end - 1); - pos =3D end; - } else { - virBufferAsprintf(buf, "%s=3D%zd,", key, pos); - } - } - - return 0; -} - - int virQEMUBuildCommandLineJSONArrayNumbered(const char *key, virJSONValue *array, diff --git a/src/util/virqemu.h b/src/util/virqemu.h index be083d7545..e5d36b95c4 100644 --- a/src/util/virqemu.h +++ b/src/util/virqemu.h @@ -32,9 +32,6 @@ typedef int (*virQEMUBuildCommandLineJSONArrayFormatFunc)= (const char *key, int virQEMUBuildCommandLineJSONArrayObjectsStr(const char *key, virJSONValue *array, virBuffer *buf); -int virQEMUBuildCommandLineJSONArrayBitmap(const char *key, - virJSONValue *array, - virBuffer *buf); int virQEMUBuildCommandLineJSONArrayNumbered(const char *key, virJSONValue *array, virBuffer *buf); diff --git a/tests/qemucommandutiltest.c b/tests/qemucommandutiltest.c index f92fb8f177..58493c703f 100644 --- a/tests/qemucommandutiltest.c +++ b/tests/qemucommandutiltest.c @@ -83,39 +83,9 @@ mymain(void) ret =3D -1; \ } while (0) -#define DO_TEST_COMMAND_OBJECT_FROM_JSON(PROPS, EXPECT) \ - DO_TEST_COMMAND_FROM_JSON(PROPS, virQEMUBuildCommandLineJSONArrayBitma= p, EXPECT) - #define DO_TEST_COMMAND_DRIVE_FROM_JSON(PROPS, EXPECT) \ DO_TEST_COMMAND_FROM_JSON(PROPS, virQEMUBuildCommandLineJSONArrayNumbe= red, EXPECT) - DO_TEST_COMMAND_OBJECT_FROM_JSON("{}", NULL); - DO_TEST_COMMAND_OBJECT_FROM_JSON("{\"string\":\"qwer\"}", "string=3Dqw= er"); - DO_TEST_COMMAND_OBJECT_FROM_JSON("{\"string\":\"qw,e,r\"}", "string=3D= qw,,e,,r"); - DO_TEST_COMMAND_OBJECT_FROM_JSON("{\"number\":1234}", "number=3D1234"); - DO_TEST_COMMAND_OBJECT_FROM_JSON("{\"boolean\":true}", "boolean=3Don"); - DO_TEST_COMMAND_OBJECT_FROM_JSON("{\"boolean\":false}", "boolean=3Doff= "); - DO_TEST_COMMAND_OBJECT_FROM_JSON("{\"bitmap\":[]}", NULL); - DO_TEST_COMMAND_OBJECT_FROM_JSON("{\"bitmap\":[0]}", "bitmap=3D0"); - DO_TEST_COMMAND_OBJECT_FROM_JSON("{\"bitmap\":[1,3,5]}", - "bitmap=3D1,bitmap=3D3,bitmap=3D5"); - DO_TEST_COMMAND_OBJECT_FROM_JSON("{\"bitmap\":[0,1,2,3]}", "bitmap=3D0= -3"); - DO_TEST_COMMAND_OBJECT_FROM_JSON("{\"bitmap\":[1,2,3,5]}", - "bitmap=3D1-3,bitmap=3D5"); - DO_TEST_COMMAND_OBJECT_FROM_JSON("{\"bitmap\":[1,2,3,5,7,8,9]}", - "bitmap=3D1-3,bitmap=3D5,bitmap=3D7-9= "); - DO_TEST_COMMAND_OBJECT_FROM_JSON("{\"array\":[\"bleah\",\"qwerty\",1]}= ", - "array=3Dbleah,array=3Dqwerty,array= =3D1"); - DO_TEST_COMMAND_OBJECT_FROM_JSON("{\"boolean\":true,\"hyphen-name\":12= 34,\"some_string\":\"bleah\"}", - "boolean=3Don,hyphen-name=3D1234,some= _string=3Dbleah"); - DO_TEST_COMMAND_OBJECT_FROM_JSON("{\"nest\": {\"boolean\":true," - "\"hyphen-name\":1234," - "\"some_string\":\"bleah\= "," - "\"bleah\":\"bl,eah\"" - "}" - "}", - "nest.boolean=3Don,nest.hyphen-name= =3D1234," - "nest.some_string=3Dbleah,nest.bleah= =3Dbl,,eah"); DO_TEST_COMMAND_DRIVE_FROM_JSON("{\"driver\":\"gluster\"," "\"volume\":\"test\"," "\"path\":\"img\"," --=20 2.48.1