From nobody Sun Feb 8 15:30:51 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 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1508152042036507.43595388798394; Mon, 16 Oct 2017 04:07:22 -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 143F48765C; Mon, 16 Oct 2017 11:07:21 +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 E767662685; Mon, 16 Oct 2017 11:07:20 +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 AC71718355E1; Mon, 16 Oct 2017 11:07:20 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id v9GB6dxM008732 for ; Mon, 16 Oct 2017 07:06:39 -0400 Received: by smtp.corp.redhat.com (Postfix) id 4E8D25D964; Mon, 16 Oct 2017 11:06:39 +0000 (UTC) Received: from antique-work.brq.redhat.com (unknown [10.43.2.152]) by smtp.corp.redhat.com (Postfix) with ESMTP id CA7CA5D961 for ; Mon, 16 Oct 2017 11:06:38 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 143F48765C Authentication-Results: ext-mx02.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx02.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=libvir-list-bounces@redhat.com From: Pavel Hrdina To: libvir-list@redhat.com Date: Mon, 16 Oct 2017 13:06:22 +0200 Message-Id: <2c9e2d80e2039f453711cec618245ebf9941acc2.1508151956.git.phrdina@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 09/14] qemu: pass priv data instead of qemuCaps and autoNodeset 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.26]); Mon, 16 Oct 2017 11:07:21 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Pavel Hrdina --- src/qemu/qemu_command.c | 33 ++++++++++++++------------------- 1 file changed, 14 insertions(+), 19 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 5441f5e37f..db6cc55495 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -3543,10 +3543,9 @@ qemuBuildMemoryBackendStr(virJSONValuePtr *backendPr= ops, =20 static int qemuBuildMemoryCellBackendStr(virDomainDefPtr def, - virQEMUCapsPtr qemuCaps, virQEMUDriverConfigPtr cfg, size_t cell, - virBitmapPtr auto_nodeset, + qemuDomainObjPrivatePtr priv, char **backendStr) { virJSONValuePtr props =3D NULL; @@ -3565,8 +3564,8 @@ qemuBuildMemoryCellBackendStr(virDomainDefPtr def, if (virAsprintf(&alias, "ram-node%zu", cell) < 0) goto cleanup; =20 - if ((rc =3D qemuBuildMemoryBackendStr(&props, &backendType, cfg, qemuC= aps, - def, &mem, auto_nodeset, false)) <= 0) + if ((rc =3D qemuBuildMemoryBackendStr(&props, &backendType, cfg, priv-= >qemuCaps, + def, &mem, priv->autoNodeset, fals= e)) < 0) goto cleanup; =20 if (!(*backendStr =3D virQEMUBuildObjectCommandlineFromJSON(backendTyp= e, @@ -3587,9 +3586,8 @@ qemuBuildMemoryCellBackendStr(virDomainDefPtr def, static char * qemuBuildMemoryDimmBackendStr(virDomainMemoryDefPtr mem, virDomainDefPtr def, - virQEMUCapsPtr qemuCaps, virQEMUDriverConfigPtr cfg, - virBitmapPtr auto_nodeset) + qemuDomainObjPrivatePtr priv) { virJSONValuePtr props =3D NULL; char *alias =3D NULL; @@ -3605,8 +3603,8 @@ qemuBuildMemoryDimmBackendStr(virDomainMemoryDefPtr m= em, if (virAsprintf(&alias, "mem%s", mem->info.alias) < 0) goto cleanup; =20 - if (qemuBuildMemoryBackendStr(&props, &backendType, cfg, qemuCaps, - def, mem, auto_nodeset, true) < 0) + if (qemuBuildMemoryBackendStr(&props, &backendType, cfg, priv->qemuCap= s, + def, mem, priv->autoNodeset, true) < 0) goto cleanup; =20 ret =3D virQEMUBuildObjectCommandlineFromJSON(backendType, alias, prop= s); @@ -7717,10 +7715,10 @@ static int qemuBuildNumaArgStr(virQEMUDriverConfigPtr cfg, virDomainDefPtr def, virCommandPtr cmd, - virQEMUCapsPtr qemuCaps, - virBitmapPtr auto_nodeset) + qemuDomainObjPrivatePtr priv) { size_t i; + virQEMUCapsPtr qemuCaps =3D priv->qemuCaps; virBuffer buf =3D VIR_BUFFER_INITIALIZER; char *cpumask =3D NULL, *tmpmask =3D NULL, *next =3D NULL; char **nodeBackends =3D NULL; @@ -7748,7 +7746,7 @@ qemuBuildNumaArgStr(virQEMUDriverConfigPtr cfg, goto cleanup; } =20 - if (!virDomainNumatuneNodesetIsAvailable(def->numa, auto_nodeset)) + if (!virDomainNumatuneNodesetIsAvailable(def->numa, priv->autoNodeset)) goto cleanup; =20 for (i =3D 0; i < def->mem.nhugepages; i++) { @@ -7783,8 +7781,7 @@ qemuBuildNumaArgStr(virQEMUDriverConfigPtr cfg, for (i =3D 0; i < ncells; i++) { if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_OBJECT_MEMORY_RAM) || virQEMUCapsGet(qemuCaps, QEMU_CAPS_OBJECT_MEMORY_FILE)) { - if ((rc =3D qemuBuildMemoryCellBackendStr(def, qemuCaps, cfg, = i, - auto_nodeset, + if ((rc =3D qemuBuildMemoryCellBackendStr(def, cfg, i, priv, &nodeBackends[i])) < 0) goto cleanup; =20 @@ -7859,8 +7856,7 @@ static int qemuBuildMemoryDeviceCommandLine(virCommandPtr cmd, virQEMUDriverConfigPtr cfg, virDomainDefPtr def, - virQEMUCapsPtr qemuCaps, - virBitmapPtr nodeset) + qemuDomainObjPrivatePtr priv) { size_t i; =20 @@ -7871,7 +7867,7 @@ qemuBuildMemoryDeviceCommandLine(virCommandPtr cmd, char *dimmStr; =20 if (!(backStr =3D qemuBuildMemoryDimmBackendStr(def->mems[i], def, - qemuCaps, cfg, nodes= et))) + cfg, priv))) return -1; =20 if (!(dimmStr =3D qemuBuildMemoryDeviceStr(def->mems[i]))) { @@ -9960,7 +9956,6 @@ qemuBuildCommandLine(virQEMUDriverPtr driver, qemuDomainObjPrivatePtr priv =3D vm->privateData; virDomainDefPtr def =3D vm->def; virQEMUCapsPtr qemuCaps =3D priv->qemuCaps; - virBitmapPtr nodeset =3D priv->autoNodeset; bool chardevStdioLogd =3D priv->chardevStdioLogd; =20 VIR_DEBUG("driver=3D%p def=3D%p mon=3D%p json=3D%d " @@ -10016,10 +10011,10 @@ qemuBuildCommandLine(virQEMUDriverPtr driver, goto error; =20 if (virDomainNumaGetNodeCount(def->numa) && - qemuBuildNumaArgStr(cfg, def, cmd, qemuCaps, nodeset) < 0) + qemuBuildNumaArgStr(cfg, def, cmd, priv) < 0) goto error; =20 - if (qemuBuildMemoryDeviceCommandLine(cmd, cfg, def, qemuCaps, nodeset)= < 0) + if (qemuBuildMemoryDeviceCommandLine(cmd, cfg, def, priv) < 0) goto error; =20 virUUIDFormat(def->uuid, uuid); --=20 2.13.6 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list