From nobody Wed May 14 07:20:07 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 1527700032454561.2537463252537; Wed, 30 May 2018 10:07:12 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.27]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id C837F300207A; Wed, 30 May 2018 17:07:10 +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 813279FA4D; Wed, 30 May 2018 17:07:10 +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 9BFF74CA85; Wed, 30 May 2018 17:07:09 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w4UH6pTb007282 for ; Wed, 30 May 2018 13:06:51 -0400 Received: by smtp.corp.redhat.com (Postfix) id 09CF42026DEF; Wed, 30 May 2018 17:06:51 +0000 (UTC) Received: from angien.brq.redhat.com (unknown [10.43.2.136]) by smtp.corp.redhat.com (Postfix) with ESMTP id A39762026DFD for ; Wed, 30 May 2018 17:06:50 +0000 (UTC) From: Peter Krempa To: libvir-list@redhat.com Date: Wed, 30 May 2018 19:06:25 +0200 Message-Id: <63ee96c0ff03c1376846254db75fc1243c144dd9.1527699462.git.pkrempa@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 01/13] qemu: command: Fix name of qemuBuildMemoryBackendStr 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.84 on 10.5.11.27 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.42]); Wed, 30 May 2018 17:07:11 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" The function generates JSON properties rather than a string so rename it. Signed-off-by: Peter Krempa Reviewed-by: J=EF=BF=BDn Tomko --- src/qemu/qemu_command.c | 26 +++++++++++++------------- src/qemu/qemu_command.h | 16 ++++++++-------- src/qemu/qemu_hotplug.c | 4 ++-- 3 files changed, 23 insertions(+), 23 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 07fa35c6b3..39dcd1cfba 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -2941,7 +2941,7 @@ qemuBuildControllerDevCommandLine(virCommandPtr cmd, /** - * qemuBuildMemoryBackendStr: + * qemuBuildMemoryBackendProps: * @backendProps: [out] constructed object * @backendType: [out] type of the backennd used * @cfg: qemu driver config object @@ -2967,14 +2967,14 @@ qemuBuildControllerDevCommandLine(virCommandPtr cmd, * -1 on error. */ int -qemuBuildMemoryBackendStr(virJSONValuePtr *backendProps, - const char **backendType, - virQEMUDriverConfigPtr cfg, - virQEMUCapsPtr qemuCaps, - virDomainDefPtr def, - virDomainMemoryDefPtr mem, - virBitmapPtr autoNodeset, - bool force) +qemuBuildMemoryBackendProps(virJSONValuePtr *backendProps, + const char **backendType, + virQEMUDriverConfigPtr cfg, + virQEMUCapsPtr qemuCaps, + virDomainDefPtr def, + virDomainMemoryDefPtr mem, + virBitmapPtr autoNodeset, + bool force) { virDomainNumatuneMemMode mode; const long system_page_size =3D virGetSystemPageSizeKB(); @@ -3225,8 +3225,8 @@ qemuBuildMemoryCellBackendStr(virDomainDefPtr def, mem.targetNode =3D cell; mem.info.alias =3D alias; - if ((rc =3D qemuBuildMemoryBackendStr(&props, &backendType, cfg, priv-= >qemuCaps, - def, &mem, priv->autoNodeset, fals= e)) < 0) + if ((rc =3D qemuBuildMemoryBackendProps(&props, &backendType, cfg, pri= v->qemuCaps, + def, &mem, priv->autoNodeset, fa= lse)) < 0) goto cleanup; if (!(*backendStr =3D virQEMUBuildObjectCommandlineFromJSON(backendTyp= e, @@ -3264,8 +3264,8 @@ qemuBuildMemoryDimmBackendStr(virDomainMemoryDefPtr m= em, if (virAsprintf(&alias, "mem%s", mem->info.alias) < 0) goto cleanup; - if (qemuBuildMemoryBackendStr(&props, &backendType, cfg, priv->qemuCap= s, - def, mem, priv->autoNodeset, true) < 0) + if (qemuBuildMemoryBackendProps(&props, &backendType, cfg, priv->qemuC= aps, + def, mem, priv->autoNodeset, true) < 0) goto cleanup; ret =3D virQEMUBuildObjectCommandlineFromJSON(backendType, alias, prop= s); diff --git a/src/qemu/qemu_command.h b/src/qemu/qemu_command.h index bbbf152660..2b2168d1ee 100644 --- a/src/qemu/qemu_command.h +++ b/src/qemu/qemu_command.h @@ -119,14 +119,14 @@ int qemuBuildControllerDevStr(const virDomainDef *dom= ainDef, char **devstr, int *nusbcontroller); -int qemuBuildMemoryBackendStr(virJSONValuePtr *backendProps, - const char **backendType, - virQEMUDriverConfigPtr cfg, - virQEMUCapsPtr qemuCaps, - virDomainDefPtr def, - virDomainMemoryDefPtr mem, - virBitmapPtr autoNodeset, - bool force); +int qemuBuildMemoryBackendProps(virJSONValuePtr *backendProps, + const char **backendType, + virQEMUDriverConfigPtr cfg, + virQEMUCapsPtr qemuCaps, + virDomainDefPtr def, + virDomainMemoryDefPtr mem, + virBitmapPtr autoNodeset, + bool force); char *qemuBuildMemoryDeviceStr(virDomainMemoryDefPtr mem); diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 4f58cfbd9a..7ce427be0d 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -2142,8 +2142,8 @@ qemuDomainAttachMemory(virQEMUDriverPtr driver, if (!(devstr =3D qemuBuildMemoryDeviceStr(mem))) goto cleanup; - if (qemuBuildMemoryBackendStr(&props, &backendType, cfg, - priv->qemuCaps, vm->def, mem, NULL, true= ) < 0) + if (qemuBuildMemoryBackendProps(&props, &backendType, cfg, + priv->qemuCaps, vm->def, mem, NULL, tr= ue) < 0) goto cleanup; if (qemuProcessBuildDestroyMemoryPaths(driver, vm, mem, true) < 0) --=20 2.16.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list