From nobody Wed May 14 12:06:23 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 1523858946326373.55304224044824; Sun, 15 Apr 2018 23:09:06 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id ADBF83153263; Mon, 16 Apr 2018 06:09:04 +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 7FC894BD; Mon, 16 Apr 2018 06:09:04 +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 34A074CA9F; Mon, 16 Apr 2018 06:09:04 +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 w3G673SI009898 for ; Mon, 16 Apr 2018 02:07:03 -0400 Received: by smtp.corp.redhat.com (Postfix) id 682D0215CDCF; Mon, 16 Apr 2018 06:07:03 +0000 (UTC) Received: from cv1.lan (ovpn-120-89.rdu2.redhat.com [10.10.120.89]) by smtp.corp.redhat.com (Postfix) with ESMTP id 208CD215CDC8; Mon, 16 Apr 2018 06:07:03 +0000 (UTC) From: Chris Venteicher To: libvir-list@redhat.com Date: Mon, 16 Apr 2018 01:06:57 -0500 Message-Id: <20180416060658.31760-3-cventeic@redhat.com> In-Reply-To: <20180416060658.31760-1-cventeic@redhat.com> References: <20180416060658.31760-1-cventeic@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 X-loop: libvir-list@redhat.com Cc: Chris Venteicher Subject: [libvirt] [PATCH 2/3] qemu_monitor_json: Build Json CPU Model Info 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.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.44]); Mon, 16 Apr 2018 06:09:05 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Function qemuMonitorJSONBuildCPUModelInfoJSON builds Json of form {"model": {"name": "IvyBridge", "props": {}}} from pointer to qemuMonitorCPUModelInfo. --- src/qemu/qemu_monitor_json.c | 49 ++++++++++++++++++++++++++++++++++++++++= ++++ 1 file changed, 49 insertions(+) diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index cf31c16a0..320d4601e 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -5337,6 +5337,55 @@ qemuMonitorJSONParseCPUModelProperty(const char *key, return 0; } =20 +// model_json: {"model": {"name": "IvyBridge", "props": {}}} +static int +qemuMonitorJSONBuildCPUModelInfoJSON(qemuMonitorCPUModelInfoPtr model, + virJSONValuePtr *model_json) +{ + virJSONValuePtr cpu_props =3D NULL; + size_t i; + int ret =3D -1; + + *model_json =3D NULL; + + if (!(cpu_props =3D virJSONValueNewObject())) + goto cleanup; + + for (i =3D 0; i < model->nprops; i++) { + qemuMonitorCPUPropertyPtr prop =3D model->props + i; + + switch (prop->type) { + case QEMU_MONITOR_CPU_PROPERTY_BOOLEAN: + if (virJSONValueObjectAppendBoolean(cpu_props, prop->name, pro= p->value.boolean) < 0) + goto cleanup; + break; + + case QEMU_MONITOR_CPU_PROPERTY_STRING: + if (virJSONValueObjectAppendString(cpu_props, prop->name, prop= ->value.string) < 0) + goto cleanup; + break; + + case QEMU_MONITOR_CPU_PROPERTY_NUMBER: + if (virJSONValueObjectAppendNumberLong(cpu_props, prop->name, = prop->value.number) < 0) + goto cleanup; + break; + + case QEMU_MONITOR_CPU_PROPERTY_LAST: + break; + } + } + + if (virJSONValueObjectCreate(model_json, "s:name", model->name, + "a:props", &cpu_props, NULL) = < 0) + goto cleanup; + + ret =3D 0; + + cleanup: + + return ret; +} + // model_json: {"model": {"name": "IvyBridge", "props": {}}} static int qemuMonitorJSONBuildCPUModelInfo(virJSONValuePtr model_json, --=20 2.14.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list