From nobody Thu May 15 10:20:11 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1509055451781206.67086224452987; Thu, 26 Oct 2017 15:04:11 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 8F22280461; Thu, 26 Oct 2017 22:04:09 +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 48F335D729; Thu, 26 Oct 2017 22:04:09 +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 05BE31805960; Thu, 26 Oct 2017 22:04:08 +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 v9QM46vs031908 for ; Thu, 26 Oct 2017 18:04:06 -0400 Received: by smtp.corp.redhat.com (Postfix) id AF071173B5; Thu, 26 Oct 2017 22:04:06 +0000 (UTC) Received: from mamuti.net (ovpn-204-16.brq.redhat.com [10.40.204.16]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 6A8C6173B2 for ; Thu, 26 Oct 2017 22:04:04 +0000 (UTC) Received: by mamuti.net (Postfix, from userid 500) id 83E6C10148E; Fri, 27 Oct 2017 00:04:02 +0200 (CEST) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 8F22280461 Authentication-Results: ext-mx04.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx04.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=libvir-list-bounces@redhat.com From: Jiri Denemark To: libvir-list@redhat.com Date: Fri, 27 Oct 2017 00:03:53 +0200 Message-Id: <8806b71562732f37b7a3cb9b93b5a727919345e1.1509052291.git.jdenemar@redhat.com> In-Reply-To: References: In-Reply-To: References: Mail-Followup-To: libvir-list@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 04/12] qemu: Generalize APPEND macro in qemuMonitorJSONSetMigrationParams 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: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Thu, 26 Oct 2017 22:04:10 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" The APPEND macro is now be usable for any type. Signed-off-by: Jiri Denemark --- src/qemu/qemu_monitor_json.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 76fc84ed0..218bbd8bd 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -2739,21 +2739,24 @@ qemuMonitorJSONSetMigrationParams(qemuMonitorPtr mo= n, if (!(args =3D virJSONValueNewObject())) goto cleanup; =20 -#define APPEND(VAR, FIELD) = \ +#define APPEND(VALID, API, VAR, FIELD) = \ do { = \ - if (params->VAR ## _set && = \ - virJSONValueObjectAppendNumberInt(args, FIELD, = \ - params->VAR) < 0) = \ + if (VALID && API(args, FIELD, params->VAR) < 0) = \ goto cleanup; = \ } while (0) =20 - APPEND(compressLevel, "compress-level"); - APPEND(compressThreads, "compress-threads"); - APPEND(decompressThreads, "decompress-threads"); - APPEND(cpuThrottleInitial, "cpu-throttle-initial"); - APPEND(cpuThrottleIncrement, "cpu-throttle-increment"); +#define APPEND_INT(VAR, FIELD) = \ + APPEND(params->VAR ## _set, = \ + virJSONValueObjectAppendNumberInt, VAR, FIELD) + + APPEND_INT(compressLevel, "compress-level"); + APPEND_INT(compressThreads, "compress-threads"); + APPEND_INT(decompressThreads, "decompress-threads"); + APPEND_INT(cpuThrottleInitial, "cpu-throttle-initial"); + APPEND_INT(cpuThrottleIncrement, "cpu-throttle-increment"); =20 #undef APPEND +#undef APPEND_INT =20 if (params->migrateTLSAlias && virJSONValueObjectAppendString(args, "tls-creds", --=20 2.14.3 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list