From nobody Wed May 1 17:04:55 2024 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 150099782476480.33069643778788; Tue, 25 Jul 2017 08:50:24 -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 197B06CB50; Tue, 25 Jul 2017 15:50:19 +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 DCC1A65E82; Tue, 25 Jul 2017 15:50:18 +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 68E254BB79; Tue, 25 Jul 2017 15:50:18 +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 v6PFoHda013553 for ; Tue, 25 Jul 2017 11:50:17 -0400 Received: by smtp.corp.redhat.com (Postfix) id 388175C548; Tue, 25 Jul 2017 15:50:17 +0000 (UTC) Received: from caroline.localdomain (unknown [10.43.2.67]) by smtp.corp.redhat.com (Postfix) with ESMTPS id D9C7165EA1 for ; Tue, 25 Jul 2017 15:50:14 +0000 (UTC) Received: from caroline.brq.redhat.com (caroline [127.0.0.1]) by caroline.localdomain (Postfix) with ESMTP id 8981C120052 for ; Tue, 25 Jul 2017 17:50:13 +0200 (CEST) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 197B06CB50 Authentication-Results: ext-mx03.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx03.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=libvir-list-bounces@redhat.com From: Martin Kletzander To: libvir-list@redhat.com Date: Tue, 25 Jul 2017 17:49:43 +0200 Message-Id: <99188800f022a4ba73b17cb22d21e1b372a9ba6f.1500997783.git.mkletzan@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH] qemu_cgroup: Remove unnecessary virQEMUDriverPtr arguments 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.27]); Tue, 25 Jul 2017 15:50:20 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Since commit 2e6ecba1bcac, the pointer to the qemu driver is saved in domain object's private data and hence does not have to be passed as yet another parameter if domain object is already one of them. This is a first (example) patch of this kind of clean up, others will hopefully follow. Signed-off-by: Martin Kletzander --- src/qemu/qemu_cgroup.c | 33 ++++++++++++++------------------- src/qemu/qemu_cgroup.h | 6 ++---- src/qemu/qemu_process.c | 4 ++-- 3 files changed, 18 insertions(+), 25 deletions(-) diff --git a/src/qemu/qemu_cgroup.c b/src/qemu/qemu_cgroup.c index 7355527c1cc5..6fc413098ae8 100644 --- a/src/qemu/qemu_cgroup.c +++ b/src/qemu/qemu_cgroup.c @@ -604,8 +604,7 @@ qemuTeardownChardevCgroup(virDomainObjPtr vm, =20 =20 static int -qemuSetupDevicesCgroup(virQEMUDriverPtr driver, - virDomainObjPtr vm) +qemuSetupDevicesCgroup(virDomainObjPtr vm) { qemuDomainObjPrivatePtr priv =3D vm->privateData; virQEMUDriverConfigPtr cfg =3D NULL; @@ -644,7 +643,7 @@ qemuSetupDevicesCgroup(virQEMUDriverPtr driver, if (rv < 0) goto cleanup; =20 - cfg =3D virQEMUDriverGetConfig(driver); + cfg =3D virQEMUDriverGetConfig(priv->driver); deviceACL =3D cfg->cgroupDeviceACL ? (const char *const *)cfg->cgroupDeviceACL : defaultDeviceACL; @@ -769,8 +768,7 @@ qemuSetupCpusetCgroup(virDomainObjPtr vm) =20 =20 static int -qemuSetupCpuCgroup(virQEMUDriverPtr driver, - virDomainObjPtr vm) +qemuSetupCpuCgroup(virDomainObjPtr vm) { qemuDomainObjPrivatePtr priv =3D vm->privateData; virObjectEventPtr event =3D NULL; @@ -806,7 +804,7 @@ qemuSetupCpuCgroup(virQEMUDriverPtr driver, event =3D virDomainEventTunableNewFromObj(vm, eventParams, eve= ntNparams); } =20 - qemuDomainEventQueue(driver, event); + qemuDomainEventQueue(priv->driver, event); } =20 return 0; @@ -814,16 +812,15 @@ qemuSetupCpuCgroup(virQEMUDriverPtr driver, =20 =20 static int -qemuInitCgroup(virQEMUDriverPtr driver, - virDomainObjPtr vm, +qemuInitCgroup(virDomainObjPtr vm, size_t nnicindexes, int *nicindexes) { int ret =3D -1; qemuDomainObjPrivatePtr priv =3D vm->privateData; - virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); + virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(priv->driver); =20 - if (!virQEMUDriverIsPrivileged(driver)) + if (!virQEMUDriverIsPrivileged(priv->driver)) goto done; =20 if (!virCgroupAvailable()) @@ -954,14 +951,13 @@ qemuRestoreCgroupState(virDomainObjPtr vm) } =20 int -qemuConnectCgroup(virQEMUDriverPtr driver, - virDomainObjPtr vm) +qemuConnectCgroup(virDomainObjPtr vm) { - virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); qemuDomainObjPrivatePtr priv =3D vm->privateData; + virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(priv->driver); int ret =3D -1; =20 - if (!virQEMUDriverIsPrivileged(driver)) + if (!virQEMUDriverIsPrivileged(priv->driver)) goto done; =20 if (!virCgroupAvailable()) @@ -991,8 +987,7 @@ qemuConnectCgroup(virQEMUDriverPtr driver, } =20 int -qemuSetupCgroup(virQEMUDriverPtr driver, - virDomainObjPtr vm, +qemuSetupCgroup(virDomainObjPtr vm, size_t nnicindexes, int *nicindexes) { @@ -1005,13 +1000,13 @@ qemuSetupCgroup(virQEMUDriverPtr driver, return -1; } =20 - if (qemuInitCgroup(driver, vm, nnicindexes, nicindexes) < 0) + if (qemuInitCgroup(vm, nnicindexes, nicindexes) < 0) return -1; =20 if (!priv->cgroup) return 0; =20 - if (qemuSetupDevicesCgroup(driver, vm) < 0) + if (qemuSetupDevicesCgroup(vm) < 0) goto cleanup; =20 if (qemuSetupBlkioCgroup(vm) < 0) @@ -1020,7 +1015,7 @@ qemuSetupCgroup(virQEMUDriverPtr driver, if (qemuSetupMemoryCgroup(vm) < 0) goto cleanup; =20 - if (qemuSetupCpuCgroup(driver, vm) < 0) + if (qemuSetupCpuCgroup(vm) < 0) goto cleanup; =20 if (qemuSetupCpusetCgroup(vm) < 0) diff --git a/src/qemu/qemu_cgroup.h b/src/qemu/qemu_cgroup.h index d016ce29d87e..3fc1583612e1 100644 --- a/src/qemu/qemu_cgroup.h +++ b/src/qemu/qemu_cgroup.h @@ -55,10 +55,8 @@ int qemuSetupChardevCgroup(virDomainObjPtr vm, virDomainChrDefPtr dev); int qemuTeardownChardevCgroup(virDomainObjPtr vm, virDomainChrDefPtr dev); -int qemuConnectCgroup(virQEMUDriverPtr driver, - virDomainObjPtr vm); -int qemuSetupCgroup(virQEMUDriverPtr driver, - virDomainObjPtr vm, +int qemuConnectCgroup(virDomainObjPtr vm); +int qemuSetupCgroup(virDomainObjPtr vm, size_t nnicindexes, int *nicindexes); int qemuSetupCpusetMems(virDomainObjPtr vm); diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 87ab85fdb476..535c16b03705 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -5595,7 +5595,7 @@ qemuProcessLaunch(virConnectPtr conn, } =20 VIR_DEBUG("Setting up domain cgroup (if required)"); - if (qemuSetupCgroup(driver, vm, nnicindexes, nicindexes) < 0) + if (qemuSetupCgroup(vm, nnicindexes, nicindexes) < 0) goto cleanup; =20 if (!(priv->perf =3D virPerfNew())) @@ -6821,7 +6821,7 @@ qemuProcessReconnect(void *opaque) if (qemuHostdevUpdateActiveDomainDevices(driver, obj->def) < 0) goto error; =20 - if (qemuConnectCgroup(driver, obj) < 0) + if (qemuConnectCgroup(obj) < 0) goto error; =20 if (qemuDomainPerfRestart(obj) < 0) --=20 2.13.3 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list