From nobody Wed May 14 12:05: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; 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 1523858868620470.7289993677176; Sun, 15 Apr 2018 23:07:48 -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 3DCFE31395F5; Mon, 16 Apr 2018 06:07:47 +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 12EBC5EDE9; Mon, 16 Apr 2018 06:07:47 +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 C5938180596E; Mon, 16 Apr 2018 06:07:46 +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 w3G672qO009885 for ; Mon, 16 Apr 2018 02:07:02 -0400 Received: by smtp.corp.redhat.com (Postfix) id 1165F215CDCB; Mon, 16 Apr 2018 06:07:02 +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 C1731215CDC8; Mon, 16 Apr 2018 06:07:01 +0000 (UTC) From: Chris Venteicher To: libvir-list@redhat.com Date: Mon, 16 Apr 2018 01:06:56 -0500 Message-Id: <20180416060658.31760-2-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 1/3] qemu_monitor_json: Populate CPUModelInfo struct from json 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.40]); Mon, 16 Apr 2018 06:07:47 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" New function qemuMonitorJSONBuildCPUModelInfo created by extracting code from existing function qemuMonitorJSONGetCPUModelExpansion to create a reusable function for extracting cpu model info from json. --- src/qemu/qemu_monitor_json.c | 82 ++++++++++++++++++++++++++++++----------= ---- 1 file changed, 56 insertions(+), 26 deletions(-) diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 57c2c4de0..cf31c16a0 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -5337,6 +5337,61 @@ qemuMonitorJSONParseCPUModelProperty(const char *key, return 0; } =20 +// model_json: {"model": {"name": "IvyBridge", "props": {}}} +static int +qemuMonitorJSONBuildCPUModelInfo(virJSONValuePtr model_json, + qemuMonitorCPUModelInfoPtr *model) +{ + virJSONValuePtr cpu_model; + virJSONValuePtr cpu_props; + qemuMonitorCPUModelInfoPtr machine_model =3D NULL; + int ret =3D -1; + char const *cpu_name; + + *model =3D NULL; + + if (!(cpu_model =3D virJSONValueObjectGetObject(model_json, "model")))= { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("query-cpu-model-expansion reply data was missing= 'model'")); + goto cleanup; + } + + if (!(cpu_name =3D virJSONValueObjectGetString(cpu_model, "name"))) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("query-cpu-model-expansion reply data was missing= 'name'")); + goto cleanup; + } + + if (!(cpu_props =3D virJSONValueObjectGetObject(cpu_model, "props"))) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("query-cpu-model-expansion reply data was missing= 'props'")); + goto cleanup; + } + + if (VIR_ALLOC(machine_model) < 0) + goto cleanup; + + if (VIR_STRDUP(machine_model->name, cpu_name) < 0) + goto cleanup; + + if (VIR_ALLOC_N(machine_model->props, virJSONValueObjectKeysNumber(cpu= _props)) < 0) + goto cleanup; + + if (virJSONValueObjectForeachKeyValue(cpu_props, + qemuMonitorJSONParseCPUModelProp= erty, + machine_model) < 0) + goto cleanup; + + ret =3D 0; + *model =3D machine_model; + machine_model =3D NULL; + + cleanup: + qemuMonitorCPUModelInfoFree(machine_model); + + return ret; +} + int qemuMonitorJSONGetCPUModelExpansion(qemuMonitorPtr mon, qemuMonitorCPUModelExpansionType type, @@ -5351,9 +5406,7 @@ qemuMonitorJSONGetCPUModelExpansion(qemuMonitorPtr mo= n, virJSONValuePtr reply =3D NULL; virJSONValuePtr data; virJSONValuePtr cpu_model; - virJSONValuePtr cpu_props; qemuMonitorCPUModelInfoPtr machine_model =3D NULL; - char const *cpu_name; const char *typeStr =3D ""; =20 *model_info =3D NULL; @@ -5426,30 +5479,7 @@ qemuMonitorJSONGetCPUModelExpansion(qemuMonitorPtr m= on, goto retry; } =20 - if (!(cpu_name =3D virJSONValueObjectGetString(cpu_model, "name"))) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("query-cpu-model-expansion reply data was missing= 'name'")); - goto cleanup; - } - - if (!(cpu_props =3D virJSONValueObjectGetObject(cpu_model, "props"))) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("query-cpu-model-expansion reply data was missing= 'props'")); - goto cleanup; - } - - if (VIR_ALLOC(machine_model) < 0) - goto cleanup; - - if (VIR_STRDUP(machine_model->name, cpu_name) < 0) - goto cleanup; - - if (VIR_ALLOC_N(machine_model->props, virJSONValueObjectKeysNumber(cpu= _props)) < 0) - goto cleanup; - - if (virJSONValueObjectForeachKeyValue(cpu_props, - qemuMonitorJSONParseCPUModelProp= erty, - machine_model) < 0) + if (qemuMonitorJSONBuildCPUModelInfo(data, &machine_model) < 0) goto cleanup; =20 ret =3D 0; --=20 2.14.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list