From nobody Wed May 14 07:17:29 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; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1526992570800101.30552151089762; Tue, 22 May 2018 05:36:10 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id D9837A4E7F; Tue, 22 May 2018 12:36:08 +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 6ADA55D70A; Tue, 22 May 2018 12:36:08 +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 5B6E3180B5B2; Tue, 22 May 2018 12:36:07 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w4MCa3q3013699 for ; Tue, 22 May 2018 08:36:03 -0400 Received: by smtp.corp.redhat.com (Postfix) id 8C140215CDAA; Tue, 22 May 2018 12:36:03 +0000 (UTC) Received: from angien.brq.redhat.com (unknown [10.43.2.136]) by smtp.corp.redhat.com (Postfix) with ESMTP id E9F8E215CDA7; Tue, 22 May 2018 12:36:02 +0000 (UTC) From: Peter Krempa To: libvir-list@redhat.com Date: Tue, 22 May 2018 14:35:44 +0200 Message-Id: <0593fdb499ae46e984642832a574be831209fb76.1526992488.git.pkrempa@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 X-loop: libvir-list@redhat.com Cc: Peter Krempa Subject: [libvirt] [PATCH 4/8] qemu: monitor: Drop QEMU_CHECK_MONITOR_JSON... macros 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.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Tue, 22 May 2018 12:36:09 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Monitor is now JSON only. Drop the old cruft. Signed-off-by: Peter Krempa Reviewed-by: J=EF=BF=BDn Tomko --- src/qemu/qemu_monitor.c | 138 ++++++++++++++++++++++----------------------= ---- 1 file changed, 63 insertions(+), 75 deletions(-) diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index 3e87bf5a4a..9d665928d6 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -119,46 +119,34 @@ struct _qemuMonitor { /** * QEMU_CHECK_MONITOR_FULL: * @mon: monitor pointer variable to check, evaluated multiple times, no p= arentheses - * @force_json: force JSON monitor, true or false * @exit: statement that is used to exit the function * * This macro checks that the monitor is valid for given operation and exi= ts * the function if not. The macro also adds a debug statement regarding the * monitor. */ -#define QEMU_CHECK_MONITOR_FULL(mon, force_json, exit) \ +#define QEMU_CHECK_MONITOR_FULL(mon, exit) \ do { \ if (!mon) { \ virReportError(VIR_ERR_INVALID_ARG, "%s", \ _("monitor must not be NULL")); \ exit; \ } \ - VIR_DEBUG("mon:%p vm:%p json:%d fd:%d", \ - mon, mon->vm, mon->json, mon->fd); \ - if (force_json && !mon->json) { \ - virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", \ - _("JSON monitor is required")); \ - exit; \ - } \ + VIR_DEBUG("mon:%p vm:%p fd:%d", \ + mon, mon->vm, mon->fd); \ } while (0) /* Check monitor and return NULL on error */ #define QEMU_CHECK_MONITOR_NULL(mon) \ - QEMU_CHECK_MONITOR_FULL(mon, false, return NULL) -#define QEMU_CHECK_MONITOR_JSON_NULL(mon) \ - QEMU_CHECK_MONITOR_FULL(mon, true, return NULL) + QEMU_CHECK_MONITOR_FULL(mon, return NULL) /* Check monitor and return -1 on error */ #define QEMU_CHECK_MONITOR(mon) \ - QEMU_CHECK_MONITOR_FULL(mon, false, return -1) -#define QEMU_CHECK_MONITOR_JSON(mon) \ - QEMU_CHECK_MONITOR_FULL(mon, true, return -1) + QEMU_CHECK_MONITOR_FULL(mon, return -1) /* Check monitor and jump to the provided label */ #define QEMU_CHECK_MONITOR_GOTO(mon, label) \ - QEMU_CHECK_MONITOR_FULL(mon, false, goto label) -#define QEMU_CHECK_MONITOR_JSON_GOTO(mon, label) \ - QEMU_CHECK_MONITOR_FULL(mon, true, goto label) + QEMU_CHECK_MONITOR_FULL(mon, goto label) static virClassPtr qemuMonitorClass; static void qemuMonitorDispose(void *obj); @@ -2280,7 +2268,7 @@ qemuMonitorGetBlockInfo(qemuMonitorPtr mon) virJSONValuePtr qemuMonitorQueryBlockstats(qemuMonitorPtr mon) { - QEMU_CHECK_MONITOR_JSON_NULL(mon); + QEMU_CHECK_MONITOR_NULL(mon); return qemuMonitorJSONQueryBlockstats(mon); } @@ -2345,7 +2333,7 @@ qemuMonitorBlockStatsUpdateCapacity(qemuMonitorPtr mo= n, { VIR_DEBUG("stats=3D%p, backing=3D%d", stats, backingChain); - QEMU_CHECK_MONITOR_JSON(mon); + QEMU_CHECK_MONITOR(mon); return qemuMonitorJSONBlockStatsUpdateCapacity(mon, stats, backingChai= n); } @@ -2602,7 +2590,7 @@ qemuMonitorGetMigrationCacheSize(qemuMonitorPtr mon, { VIR_DEBUG("cacheSize=3D%p", cacheSize); - QEMU_CHECK_MONITOR_JSON(mon); + QEMU_CHECK_MONITOR(mon); return qemuMonitorJSONGetMigrationCacheSize(mon, cacheSize); } @@ -2614,7 +2602,7 @@ qemuMonitorSetMigrationCacheSize(qemuMonitorPtr mon, { VIR_DEBUG("cacheSize=3D%llu", cacheSize); - QEMU_CHECK_MONITOR_JSON(mon); + QEMU_CHECK_MONITOR(mon); return qemuMonitorJSONSetMigrationCacheSize(mon, cacheSize); } @@ -2635,7 +2623,7 @@ int qemuMonitorGetMigrationParams(qemuMonitorPtr mon, virJSONValuePtr *params) { - QEMU_CHECK_MONITOR_JSON(mon); + QEMU_CHECK_MONITOR(mon); return qemuMonitorJSONGetMigrationParams(mon, params); } @@ -2655,7 +2643,7 @@ int qemuMonitorSetMigrationParams(qemuMonitorPtr mon, virJSONValuePtr params) { - QEMU_CHECK_MONITOR_JSON_GOTO(mon, error); + QEMU_CHECK_MONITOR_GOTO(mon, error); return qemuMonitorJSONSetMigrationParams(mon, params); @@ -2755,7 +2743,7 @@ int qemuMonitorQueryDump(qemuMonitorPtr mon, qemuMonitorDumpStatsPtr stats) { - QEMU_CHECK_MONITOR_JSON(mon); + QEMU_CHECK_MONITOR(mon); return qemuMonitorJSONQueryDump(mon, stats); } @@ -2789,7 +2777,7 @@ qemuMonitorDumpToFd(qemuMonitorPtr mon, int ret; VIR_DEBUG("fd=3D%d dumpformat=3D%s", fd, dumpformat); - QEMU_CHECK_MONITOR_JSON(mon); + QEMU_CHECK_MONITOR(mon); if (qemuMonitorSendFileHandle(mon, "dump", fd) < 0) return -1; @@ -2899,7 +2887,7 @@ qemuMonitorAddFd(qemuMonitorPtr mon, int fdset, int f= d, const char *name) { VIR_DEBUG("fdset=3D%d, fd=3D%d, name=3D%s", fdset, fd, NULLSTR(name)); - QEMU_CHECK_MONITOR_JSON(mon); + QEMU_CHECK_MONITOR(mon); if (fd < 0 || fdset < 0) { virReportError(VIR_ERR_INVALID_ARG, "%s", @@ -2931,7 +2919,7 @@ qemuMonitorRemoveFd(qemuMonitorPtr mon, int fdset, in= t fd) error =3D virSaveLastError(); - QEMU_CHECK_MONITOR_JSON_GOTO(mon, cleanup); + QEMU_CHECK_MONITOR_GOTO(mon, cleanup); ret =3D qemuMonitorJSONRemoveFd(mon, fdset, fd); @@ -3011,7 +2999,7 @@ qemuMonitorQueryRxFilter(qemuMonitorPtr mon, const ch= ar *alias, { VIR_DEBUG("alias=3D%s filter=3D%p", alias, filter); - QEMU_CHECK_MONITOR_JSON(mon); + QEMU_CHECK_MONITOR(mon); return qemuMonitorJSONQueryRxFilter(mon, alias, filter); } @@ -3143,7 +3131,7 @@ int qemuMonitorAddDeviceArgs(qemuMonitorPtr mon, virJSONValuePtr args) { - QEMU_CHECK_MONITOR_JSON(mon); + QEMU_CHECK_MONITOR(mon); return qemuMonitorJSONAddDeviceArgs(mon, args); } @@ -3167,7 +3155,7 @@ qemuMonitorAddObject(qemuMonitorPtr mon, { VIR_DEBUG("type=3D%s objalias=3D%s props=3D%p", type, objalias, props); - QEMU_CHECK_MONITOR_JSON_GOTO(mon, error); + QEMU_CHECK_MONITOR_GOTO(mon, error); return qemuMonitorJSONAddObject(mon, type, objalias, props); @@ -3183,7 +3171,7 @@ qemuMonitorDelObject(qemuMonitorPtr mon, { VIR_DEBUG("objalias=3D%s", objalias); - QEMU_CHECK_MONITOR_JSON(mon); + QEMU_CHECK_MONITOR(mon); return qemuMonitorJSONDelObject(mon, objalias); } @@ -3270,7 +3258,7 @@ qemuMonitorDiskSnapshot(qemuMonitorPtr mon, virJSONVa= luePtr actions, VIR_DEBUG("actions=3D%p, device=3D%s, file=3D%s, format=3D%s, reuse=3D= %d", actions, device, file, format, reuse); - QEMU_CHECK_MONITOR_JSON(mon); + QEMU_CHECK_MONITOR(mon); return qemuMonitorJSONDiskSnapshot(mon, actions, device, file, format,= reuse); } @@ -3289,7 +3277,7 @@ qemuMonitorDriveMirror(qemuMonitorPtr mon, device, file, NULLSTR(format), bandwidth, granularity, buf_size, flags); - QEMU_CHECK_MONITOR_JSON(mon); + QEMU_CHECK_MONITOR(mon); return qemuMonitorJSONDriveMirror(mon, device, file, format, bandwidth, granularity, buf_size, flags); @@ -3302,7 +3290,7 @@ qemuMonitorTransaction(qemuMonitorPtr mon, virJSONVal= uePtr *actions) { VIR_DEBUG("actions=3D%p", *actions); - QEMU_CHECK_MONITOR_JSON(mon); + QEMU_CHECK_MONITOR(mon); return qemuMonitorJSONTransaction(mon, actions); } @@ -3318,7 +3306,7 @@ qemuMonitorBlockCommit(qemuMonitorPtr mon, const char= *device, VIR_DEBUG("device=3D%s, top=3D%s, base=3D%s, backingName=3D%s, bandwid= th=3D%llu", device, top, base, NULLSTR(backingName), bandwidth); - QEMU_CHECK_MONITOR_JSON(mon); + QEMU_CHECK_MONITOR(mon); return qemuMonitorJSONBlockCommit(mon, device, top, base, backingName, bandwidth); @@ -3344,7 +3332,7 @@ qemuMonitorDiskNameLookup(qemuMonitorPtr mon, virStorageSourcePtr top, virStorageSourcePtr target) { - QEMU_CHECK_MONITOR_JSON_NULL(mon); + QEMU_CHECK_MONITOR_NULL(mon); return qemuMonitorJSONDiskNameLookup(mon, device, top, target); } @@ -3357,7 +3345,7 @@ qemuMonitorDrivePivot(qemuMonitorPtr mon, { VIR_DEBUG("device=3D%s", device); - QEMU_CHECK_MONITOR_JSON(mon); + QEMU_CHECK_MONITOR(mon); return qemuMonitorJSONDrivePivot(mon, device); } @@ -3437,7 +3425,7 @@ qemuMonitorBlockStream(qemuMonitorPtr mon, VIR_DEBUG("device=3D%s, base=3D%s, backingName=3D%s, bandwidth=3D%lluB= ", device, NULLSTR(base), NULLSTR(backingName), bandwidth); - QEMU_CHECK_MONITOR_JSON(mon); + QEMU_CHECK_MONITOR(mon); return qemuMonitorJSONBlockStream(mon, device, base, backingName, band= width); } @@ -3449,7 +3437,7 @@ qemuMonitorBlockJobCancel(qemuMonitorPtr mon, { VIR_DEBUG("device=3D%s", device); - QEMU_CHECK_MONITOR_JSON(mon); + QEMU_CHECK_MONITOR(mon); return qemuMonitorJSONBlockJobCancel(mon, device); } @@ -3462,7 +3450,7 @@ qemuMonitorBlockJobSetSpeed(qemuMonitorPtr mon, { VIR_DEBUG("device=3D%s, bandwidth=3D%lluB", device, bandwidth); - QEMU_CHECK_MONITOR_JSON(mon); + QEMU_CHECK_MONITOR(mon); return qemuMonitorJSONBlockJobSetSpeed(mon, device, bandwidth); } @@ -3471,7 +3459,7 @@ qemuMonitorBlockJobSetSpeed(qemuMonitorPtr mon, virHashTablePtr qemuMonitorGetAllBlockJobInfo(qemuMonitorPtr mon) { - QEMU_CHECK_MONITOR_JSON_NULL(mon); + QEMU_CHECK_MONITOR_NULL(mon); return qemuMonitorJSONGetAllBlockJobInfo(mon); } @@ -3631,7 +3619,7 @@ qemuMonitorOpenGraphics(qemuMonitorPtr mon, int qemuMonitorSystemWakeup(qemuMonitorPtr mon) { - QEMU_CHECK_MONITOR_JSON(mon); + QEMU_CHECK_MONITOR(mon); return qemuMonitorJSONSystemWakeup(mon); } @@ -3647,7 +3635,7 @@ qemuMonitorGetVersion(qemuMonitorPtr mon, VIR_DEBUG("major=3D%p minor=3D%p micro=3D%p package=3D%p", major, minor, micro, package); - QEMU_CHECK_MONITOR_JSON(mon); + QEMU_CHECK_MONITOR(mon); return qemuMonitorJSONGetVersion(mon, major, minor, micro, package); } @@ -3659,7 +3647,7 @@ qemuMonitorGetMachines(qemuMonitorPtr mon, { VIR_DEBUG("machines=3D%p", machines); - QEMU_CHECK_MONITOR_JSON(mon); + QEMU_CHECK_MONITOR(mon); return qemuMonitorJSONGetMachines(mon, machines); } @@ -3682,7 +3670,7 @@ qemuMonitorGetCPUDefinitions(qemuMonitorPtr mon, { VIR_DEBUG("cpus=3D%p", cpus); - QEMU_CHECK_MONITOR_JSON(mon); + QEMU_CHECK_MONITOR(mon); return qemuMonitorJSONGetCPUDefinitions(mon, cpus); } @@ -3710,7 +3698,7 @@ qemuMonitorGetCPUModelExpansion(qemuMonitorPtr mon, VIR_DEBUG("type=3D%d model_name=3D%s migratable=3D%d", type, model_name, migratable); - QEMU_CHECK_MONITOR_JSON(mon); + QEMU_CHECK_MONITOR(mon); return qemuMonitorJSONGetCPUModelExpansion(mon, type, model_name, migratable, model_info); @@ -3795,7 +3783,7 @@ qemuMonitorGetCommands(qemuMonitorPtr mon, { VIR_DEBUG("commands=3D%p", commands); - QEMU_CHECK_MONITOR_JSON(mon); + QEMU_CHECK_MONITOR(mon); return qemuMonitorJSONGetCommands(mon, commands); } @@ -3807,7 +3795,7 @@ qemuMonitorGetEvents(qemuMonitorPtr mon, { VIR_DEBUG("events=3D%p", events); - QEMU_CHECK_MONITOR_JSON(mon); + QEMU_CHECK_MONITOR(mon); return qemuMonitorJSONGetEvents(mon, events); } @@ -3823,7 +3811,7 @@ qemuMonitorGetCommandLineOptionParameters(qemuMonitor= Ptr mon, { VIR_DEBUG("option=3D%s params=3D%p", option, params); - QEMU_CHECK_MONITOR_JSON(mon); + QEMU_CHECK_MONITOR(mon); return qemuMonitorJSONGetCommandLineOptionParameters(mon, option, params, found); @@ -3837,7 +3825,7 @@ qemuMonitorGetKVMState(qemuMonitorPtr mon, { VIR_DEBUG("enabled=3D%p present=3D%p", enabled, present); - QEMU_CHECK_MONITOR_JSON(mon); + QEMU_CHECK_MONITOR(mon); return qemuMonitorJSONGetKVMState(mon, enabled, present); } @@ -3849,7 +3837,7 @@ qemuMonitorGetObjectTypes(qemuMonitorPtr mon, { VIR_DEBUG("types=3D%p", types); - QEMU_CHECK_MONITOR_JSON(mon); + QEMU_CHECK_MONITOR(mon); return qemuMonitorJSONGetObjectTypes(mon, types); } @@ -3862,7 +3850,7 @@ qemuMonitorGetDeviceProps(qemuMonitorPtr mon, { VIR_DEBUG("device=3D%s props=3D%p", device, props); - QEMU_CHECK_MONITOR_JSON(mon); + QEMU_CHECK_MONITOR(mon); return qemuMonitorJSONGetDeviceProps(mon, device, props); } @@ -3875,7 +3863,7 @@ qemuMonitorGetObjectProps(qemuMonitorPtr mon, { VIR_DEBUG("object=3D%s props=3D%p", object, props); - QEMU_CHECK_MONITOR_JSON(mon); + QEMU_CHECK_MONITOR(mon); return qemuMonitorJSONGetObjectProps(mon, object, props); } @@ -3884,7 +3872,7 @@ qemuMonitorGetObjectProps(qemuMonitorPtr mon, char * qemuMonitorGetTargetArch(qemuMonitorPtr mon) { - QEMU_CHECK_MONITOR_JSON_NULL(mon); + QEMU_CHECK_MONITOR_NULL(mon); return qemuMonitorJSONGetTargetArch(mon); } @@ -3918,7 +3906,7 @@ int qemuMonitorSetMigrationCapabilities(qemuMonitorPtr mon, virJSONValuePtr caps) { - QEMU_CHECK_MONITOR_JSON_GOTO(mon, error); + QEMU_CHECK_MONITOR_GOTO(mon, error); return qemuMonitorJSONSetMigrationCapabilities(mon, caps); @@ -3939,7 +3927,7 @@ int qemuMonitorGetGICCapabilities(qemuMonitorPtr mon, virGICCapability **capabilities) { - QEMU_CHECK_MONITOR_JSON(mon); + QEMU_CHECK_MONITOR(mon); return qemuMonitorJSONGetGICCapabilities(mon, capabilities); } @@ -3953,7 +3941,7 @@ qemuMonitorNBDServerStart(qemuMonitorPtr mon, { VIR_DEBUG("host=3D%s port=3D%u tls_alias=3D%s", host, port, NULLSTR(tl= s_alias)); - QEMU_CHECK_MONITOR_JSON(mon); + QEMU_CHECK_MONITOR(mon); return qemuMonitorJSONNBDServerStart(mon, host, port, tls_alias); } @@ -3966,7 +3954,7 @@ qemuMonitorNBDServerAdd(qemuMonitorPtr mon, { VIR_DEBUG("deviceID=3D%s", deviceID); - QEMU_CHECK_MONITOR_JSON(mon); + QEMU_CHECK_MONITOR(mon); return qemuMonitorJSONNBDServerAdd(mon, deviceID, writable); } @@ -3975,7 +3963,7 @@ qemuMonitorNBDServerAdd(qemuMonitorPtr mon, int qemuMonitorNBDServerStop(qemuMonitorPtr mon) { - QEMU_CHECK_MONITOR_JSON(mon); + QEMU_CHECK_MONITOR(mon); return qemuMonitorJSONNBDServerStop(mon); } @@ -3987,7 +3975,7 @@ qemuMonitorGetTPMModels(qemuMonitorPtr mon, { VIR_DEBUG("tpmmodels=3D%p", tpmmodels); - QEMU_CHECK_MONITOR_JSON(mon); + QEMU_CHECK_MONITOR(mon); return qemuMonitorJSONGetTPMModels(mon, tpmmodels); } @@ -3999,7 +3987,7 @@ qemuMonitorGetTPMTypes(qemuMonitorPtr mon, { VIR_DEBUG("tpmtypes=3D%p", tpmtypes); - QEMU_CHECK_MONITOR_JSON(mon); + QEMU_CHECK_MONITOR(mon); return qemuMonitorJSONGetTPMTypes(mon, tpmtypes); } @@ -4012,7 +4000,7 @@ qemuMonitorAttachCharDev(qemuMonitorPtr mon, { VIR_DEBUG("chrID=3D%s chr=3D%p", chrID, chr); - QEMU_CHECK_MONITOR_JSON(mon); + QEMU_CHECK_MONITOR(mon); return qemuMonitorJSONAttachCharDev(mon, chrID, chr); } @@ -4024,7 +4012,7 @@ qemuMonitorDetachCharDev(qemuMonitorPtr mon, { VIR_DEBUG("chrID=3D%s", chrID); - QEMU_CHECK_MONITOR_JSON(mon); + QEMU_CHECK_MONITOR(mon); return qemuMonitorJSONDetachCharDev(mon, chrID); } @@ -4036,7 +4024,7 @@ qemuMonitorGetDeviceAliases(qemuMonitorPtr mon, { VIR_DEBUG("aliases=3D%p", aliases); - QEMU_CHECK_MONITOR_JSON(mon); + QEMU_CHECK_MONITOR(mon); return qemuMonitorJSONGetDeviceAliases(mon, aliases); } @@ -4112,7 +4100,7 @@ qemuMonitorGetGuestCPU(qemuMonitorPtr mon, VIR_DEBUG("arch=3D%s data=3D%p disabled=3D%p", virArchToString(arch), data, disabled); - QEMU_CHECK_MONITOR_JSON(mon); + QEMU_CHECK_MONITOR(mon); *data =3D NULL; if (disabled) @@ -4137,7 +4125,7 @@ qemuMonitorGetGuestCPU(qemuMonitorPtr mon, int qemuMonitorRTCResetReinjection(qemuMonitorPtr mon) { - QEMU_CHECK_MONITOR_JSON(mon); + QEMU_CHECK_MONITOR(mon); return qemuMonitorJSONRTCResetReinjection(mon); } @@ -4217,7 +4205,7 @@ qemuMonitorMigrateIncoming(qemuMonitorPtr mon, { VIR_DEBUG("uri=3D%s", uri); - QEMU_CHECK_MONITOR_JSON(mon); + QEMU_CHECK_MONITOR(mon); return qemuMonitorJSONMigrateIncoming(mon, uri); } @@ -4226,7 +4214,7 @@ qemuMonitorMigrateIncoming(qemuMonitorPtr mon, int qemuMonitorMigrateStartPostCopy(qemuMonitorPtr mon) { - QEMU_CHECK_MONITOR_JSON(mon); + QEMU_CHECK_MONITOR(mon); return qemuMonitorJSONMigrateStartPostCopy(mon); } @@ -4238,7 +4226,7 @@ qemuMonitorMigrateContinue(qemuMonitorPtr mon, { VIR_DEBUG("status=3D%s", qemuMonitorMigrationStatusTypeToString(status= )); - QEMU_CHECK_MONITOR_JSON(mon); + QEMU_CHECK_MONITOR(mon); return qemuMonitorJSONMigrateContinue(mon, status); } @@ -4248,7 +4236,7 @@ int qemuMonitorGetRTCTime(qemuMonitorPtr mon, struct tm *tm) { - QEMU_CHECK_MONITOR_JSON(mon); + QEMU_CHECK_MONITOR(mon); return qemuMonitorJSONGetRTCTime(mon, tm); } @@ -4257,7 +4245,7 @@ qemuMonitorGetRTCTime(qemuMonitorPtr mon, virJSONValuePtr qemuMonitorQueryQMPSchema(qemuMonitorPtr mon) { - QEMU_CHECK_MONITOR_JSON_NULL(mon); + QEMU_CHECK_MONITOR_NULL(mon); return qemuMonitorJSONQueryQMPSchema(mon); } @@ -4270,7 +4258,7 @@ qemuMonitorSetBlockThreshold(qemuMonitorPtr mon, { VIR_DEBUG("node=3D'%s', threshold=3D%llu", nodename, threshold); - QEMU_CHECK_MONITOR_JSON(mon); + QEMU_CHECK_MONITOR(mon); return qemuMonitorJSONSetBlockThreshold(mon, nodename, threshold); } @@ -4279,7 +4267,7 @@ qemuMonitorSetBlockThreshold(qemuMonitorPtr mon, virJSONValuePtr qemuMonitorQueryNamedBlockNodes(qemuMonitorPtr mon) { - QEMU_CHECK_MONITOR_JSON_NULL(mon); + QEMU_CHECK_MONITOR_NULL(mon); return qemuMonitorJSONQueryNamedBlockNodes(mon); } @@ -4342,7 +4330,7 @@ qemuMonitorSetWatchdogAction(qemuMonitorPtr mon, { VIR_DEBUG("watchdogAction=3D%s", action); - QEMU_CHECK_MONITOR_JSON(mon); + QEMU_CHECK_MONITOR(mon); return qemuMonitorJSONSetWatchdogAction(mon, action); } --=20 2.16.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list