From nobody Sun Feb 8 10:03:31 2026 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 ARC-Seal: i=1; a=rsa-sha256; t=1560600693; cv=none; d=zoho.com; s=zohoarc; b=LV3Z8ligzF5R4pfP63MnOuP+ojnvES85fQ555xCA32QWnH891seJe6ztv2capUIn8R/nXbWRd5mZmPHfowKUNzEN9NPI4WmkoLOh19U+0uXR+7Ce3WWNt1fjVTwA2zymVWQw14BFT+DyrnxMgiQ1Po0PNA6aiECnnAJHbx4XkuQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1560600693; 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:ARC-Authentication-Results; bh=xWM9a9R5fTTRNACK213IYcDEGRSLV/7X3BvRPOp8DOw=; b=i3+Q04ryZTO1MKpVSItHkwR8z+vbelL4+0hU2a9aVbkG9KARTCBvoZpTB7XjxkIXOu9jbQlj1Lr4aHp1IuwytwLnYHIfqtH++A+E/sJa4Fiu/sHYdACrk0m27eLHVMQEK/ny5fWLBoj1nRVYBwFdXgAEKVnRODjut3Sn4X7B0cg= ARC-Authentication-Results: i=1; mx.zoho.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 header.from= (p=none dis=none) header.from= Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1560600693459168.33157655453385; Sat, 15 Jun 2019 05:11:33 -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 2F4963082211; Sat, 15 Jun 2019 12:11:31 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 0C1EC379E; Sat, 15 Jun 2019 12:11:31 +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 EA645E167; Sat, 15 Jun 2019 12:11:29 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x5FCBK6C029549 for ; Sat, 15 Jun 2019 08:11:20 -0400 Received: by smtp.corp.redhat.com (Postfix) id 18D3318228; Sat, 15 Jun 2019 12:11:20 +0000 (UTC) Received: from lpt.redhat.com (ovpn-200-22.brq.redhat.com [10.40.200.22]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3A3165C29A for ; Sat, 15 Jun 2019 12:11:18 +0000 (UTC) From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Date: Sat, 15 Jun 2019 14:11:32 +0200 Message-Id: <82e5595f40f556293e889bd8bd40d977f7adbd75.1560600455.git.jtomko@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 03/10] qemu: domain: remove monJSON field 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: , Content-Type: text/plain; charset="utf-8" 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.47]); Sat, 15 Jun 2019 12:11:31 +0000 (UTC) If we have a monitor, it is a JSON monitor. Signed-off-by: J=C3=A1n Tomko --- src/qemu/qemu_domain.c | 3 --- src/qemu/qemu_domain.h | 1 - src/qemu/qemu_process.c | 1 - tests/qemuhotplugtest.c | 2 -- 4 files changed, 7 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 84c777827a..0b88b1b98b 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -2904,9 +2904,6 @@ qemuDomainObjPrivateXMLParse(xmlXPathContextPtr ctxt, priv->monConfig->type =3D VIR_DOMAIN_CHR_TYPE_PTY; VIR_FREE(tmp); =20 - priv->monJSON =3D virXPathBoolean("count(./monitor[@json =3D '1']) > 0= ", - ctxt) > 0; - switch (priv->monConfig->type) { case VIR_DOMAIN_CHR_TYPE_PTY: priv->monConfig->data.file.path =3D monitorpath; diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h index f92f0dbc27..a9d36ff5a5 100644 --- a/src/qemu/qemu_domain.h +++ b/src/qemu/qemu_domain.h @@ -281,7 +281,6 @@ struct _qemuDomainObjPrivate { =20 qemuMonitorPtr mon; virDomainChrSourceDefPtr monConfig; - bool monJSON; bool monError; unsigned long long monStart; =20 diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index bf6b76413c..def60596b0 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -6177,7 +6177,6 @@ qemuProcessPrepareDomain(virQEMUDriverPtr driver, if (qemuProcessPrepareMonitorChr(priv->monConfig, priv->libDir) < 0) goto cleanup; =20 - priv->monJSON =3D true; priv->monError =3D false; priv->monStart =3D 0; priv->runningReason =3D VIR_DOMAIN_RUNNING_UNKNOWN; diff --git a/tests/qemuhotplugtest.c b/tests/qemuhotplugtest.c index bfbf32baa4..e162b1d8db 100644 --- a/tests/qemuhotplugtest.c +++ b/tests/qemuhotplugtest.c @@ -298,7 +298,6 @@ testQemuHotplug(const void *data) =20 priv =3D vm->privateData; priv->mon =3D qemuMonitorTestGetMonitor(test_mon); - priv->monJSON =3D true; =20 /* XXX We need to unlock the monitor here, as * qemuDomainObjEnterMonitorInternal (called from qemuDomainChangeGrap= hics) @@ -441,7 +440,6 @@ testQemuHotplugCpuPrepare(const char *test, goto error; =20 priv->mon =3D qemuMonitorTestGetMonitor(data->mon); - priv->monJSON =3D true; virObjectUnlock(priv->mon); =20 if (qemuDomainRefreshVcpuInfo(&driver, data->vm, 0, false) < 0) --=20 2.20.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list