From nobody Sun Feb 8 12:43:29 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) client-ip=207.211.31.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1575453383; cv=none; d=zohomail.com; s=zohoarc; b=L2h5xBcBsIKmr9rUtArmBOcSAWA0eFvAuxgT+kXLPG5x6lFspWNRZB/cU/28hMcd41tMtlmz/QKWGxPtBHIWuWHjdlmsgmp3itI/flAriD9Br3moMRMlBgP/4p6RINEJdtAMh+N9j5Lkz+e6CafPG0S4HSRvfoSomGm3SCwbBGI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1575453383; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=qaUBm4GDidh9W8wA69sBV+iXysDwidhxneB4xMK/OUk=; b=QPQ1TboCXJXUhQHjxxWg23acaTP5i1t+oxPbXdE1FgsvZ7BKvRCoYPYEpBfQSc2p5VAG+4w/zikbYF72RjeIjDXNe1Q89shqWxYmefiuZ30y65uUUf52UJOeDhgYMseIhJSmCa/sur7T8rzSDGzkWHdz2/G6Egnkw+5fiK+XfqM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by mx.zohomail.com with SMTPS id 1575453383061521.3817349943151; Wed, 4 Dec 2019 01:56:23 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-359-lSm_Sd3EOBSW5eoylPCMIQ-1; Wed, 04 Dec 2019 04:56:01 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 33E74100F7CA; Wed, 4 Dec 2019 09:55:56 +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 0CA535DA7D; Wed, 4 Dec 2019 09:55:56 +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 B15225BC16; Wed, 4 Dec 2019 09:55:55 +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 xB49tmjA023792 for ; Wed, 4 Dec 2019 04:55:48 -0500 Received: by smtp.corp.redhat.com (Postfix) id 41FB25DA7E; Wed, 4 Dec 2019 09:55:48 +0000 (UTC) Received: from moe.redhat.com (unknown [10.43.2.30]) by smtp.corp.redhat.com (Postfix) with ESMTP id BC4845DA70 for ; Wed, 4 Dec 2019 09:55:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1575453381; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=qaUBm4GDidh9W8wA69sBV+iXysDwidhxneB4xMK/OUk=; b=ONR2AziVy66w+N/yH7gqU7kqKvK/m7Vr9GMZhHq6Qylc1GY1BN8fw4cYk+tkna3YEbdsay MMzaTRZjUSBkULW2PpLxFMF0loVvzZ74OOYI3s0Gz9JnJXHBS8fE2JJUi8qwmodRvvup/Y nMM/8QgEEBVCSwHLgTd++ymWqjXPEyU= From: Michal Privoznik To: libvir-list@redhat.com Date: Wed, 4 Dec 2019 10:55:33 +0100 Message-Id: <20476dce4727bcd74c58f2fed19386da539b697d.1575453027.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 8/9] lxc: Cleanup virConnectPtr usage 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: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-MC-Unique: lSm_Sd3EOBSW5eoylPCMIQ-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" There are some functions which pass virConnectPtr around for one reason and one reason only: to obtain virLXCDriverPtr in the end. Might replace the argument and pass a pointer to the driver right from the start. Signed-off-by: Michal Privoznik --- src/lxc/lxc_driver.c | 12 +++++------- src/lxc/lxc_process.c | 40 ++++++++++++++++++++++------------------ src/lxc/lxc_process.h | 2 +- 3 files changed, 28 insertions(+), 26 deletions(-) diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index 826bf074e3..e4be45fca2 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -3803,9 +3803,8 @@ lxcDomainAttachDeviceDiskLive(virLXCDriverPtr driver, } =20 =20 -/* XXX conn required for network -> bridge resolution */ static int -lxcDomainAttachDeviceNetLive(virConnectPtr conn, +lxcDomainAttachDeviceNetLive(virLXCDriverPtr driver, virDomainObjPtr vm, virDomainNetDefPtr net) { @@ -3866,7 +3865,7 @@ lxcDomainAttachDeviceNetLive(virConnectPtr conn, goto cleanup; break; case VIR_DOMAIN_NET_TYPE_DIRECT: { - if (!(veth =3D virLXCProcessSetupInterfaceDirect(conn, vm->def, ne= t))) + if (!(veth =3D virLXCProcessSetupInterfaceDirect(driver, vm->def, = net))) goto cleanup; } break; case VIR_DOMAIN_NET_TYPE_USER: @@ -4233,8 +4232,7 @@ lxcDomainAttachDeviceHostdevLive(virLXCDriverPtr driv= er, =20 =20 static int -lxcDomainAttachDeviceLive(virConnectPtr conn, - virLXCDriverPtr driver, +lxcDomainAttachDeviceLive(virLXCDriverPtr driver, virDomainObjPtr vm, virDomainDeviceDefPtr dev) { @@ -4248,7 +4246,7 @@ lxcDomainAttachDeviceLive(virConnectPtr conn, break; =20 case VIR_DOMAIN_DEVICE_NET: - ret =3D lxcDomainAttachDeviceNetLive(conn, vm, + ret =3D lxcDomainAttachDeviceNetLive(driver, vm, dev->data.net); if (!ret) dev->data.net =3D NULL; @@ -4736,7 +4734,7 @@ static int lxcDomainAttachDeviceFlags(virDomainPtr do= m, true) < 0) goto endjob; =20 - if ((ret =3D lxcDomainAttachDeviceLive(dom->conn, driver, vm, dev_= copy)) < 0) + if ((ret =3D lxcDomainAttachDeviceLive(driver, vm, dev_copy)) < 0) goto endjob; /* * update domain status forcibly because the domain status may be diff --git a/src/lxc/lxc_process.c b/src/lxc/lxc_process.c index 9b62a93096..f5d2fb0145 100644 --- a/src/lxc/lxc_process.c +++ b/src/lxc/lxc_process.c @@ -326,13 +326,13 @@ virLXCProcessSetupInterfaceTap(virDomainDefPtr vm, } =20 =20 -char *virLXCProcessSetupInterfaceDirect(virConnectPtr conn, - virDomainDefPtr def, - virDomainNetDefPtr net) +char * +virLXCProcessSetupInterfaceDirect(virLXCDriverPtr driver, + virDomainDefPtr def, + virDomainNetDefPtr net) { char *ret =3D NULL; char *res_ifname =3D NULL; - virLXCDriverPtr driver =3D conn->privateData; const virNetDevBandwidth *bw; const virNetDevVPortProfile *prof; virLXCDriverConfigPtr cfg =3D virLXCDriverGetConfig(driver); @@ -392,9 +392,10 @@ static const char *nsInfoLocal[VIR_LXC_DOMAIN_NAMESPAC= E_LAST] =3D { [VIR_LXC_DOMAIN_NAMESPACE_SHAREUTS] =3D "uts", }; =20 -static int virLXCProcessSetupNamespaceName(virConnectPtr conn, int ns_type= , const char *name) +static int virLXCProcessSetupNamespaceName(virLXCDriverPtr driver, + int ns_type, + const char *name) { - virLXCDriverPtr driver =3D conn->privateData; int fd =3D -1; virDomainObjPtr vm; virLXCDomainObjPrivatePtr priv; @@ -474,7 +475,7 @@ static int virLXCProcessSetupNamespaceNet(int ns_type, = const char *name) =20 /** * virLXCProcessSetupNamespaces: - * @conn: pointer to connection + * @driver: pointer to driver structure * @def: pointer to virtual machines namespaceData * @nsFDs: out parameter to store the namespace FD * @@ -483,9 +484,10 @@ static int virLXCProcessSetupNamespaceNet(int ns_type,= const char *name) * * Returns 0 on success or -1 in case of error */ -static int virLXCProcessSetupNamespaces(virConnectPtr conn, - lxcDomainDefPtr lxcDef, - int *nsFDs) +static int +virLXCProcessSetupNamespaces(virLXCDriverPtr driver, + lxcDomainDefPtr lxcDef, + int *nsFDs) { size_t i; =20 @@ -500,7 +502,8 @@ static int virLXCProcessSetupNamespaces(virConnectPtr c= onn, case VIR_LXC_DOMAIN_NAMESPACE_SOURCE_NONE: continue; case VIR_LXC_DOMAIN_NAMESPACE_SOURCE_NAME: - if ((nsFDs[i] =3D virLXCProcessSetupNamespaceName(conn, i, lxc= Def->ns_val[i])) < 0) + if ((nsFDs[i] =3D virLXCProcessSetupNamespaceName(driver, i, + lxcDef->ns_val= [i])) < 0) return -1; break; case VIR_LXC_DOMAIN_NAMESPACE_SOURCE_PID: @@ -519,7 +522,7 @@ static int virLXCProcessSetupNamespaces(virConnectPtr c= onn, =20 /** * virLXCProcessSetupInterfaces: - * @conn: pointer to connection + * @driver: pointer to driver structure * @def: pointer to virtual machine structure * @veths: string list of interface names * @@ -529,9 +532,10 @@ static int virLXCProcessSetupNamespaces(virConnectPtr = conn, * * Returns 0 on success or -1 in case of error */ -static int virLXCProcessSetupInterfaces(virConnectPtr conn, - virDomainDefPtr def, - char ***veths) +static int +virLXCProcessSetupInterfaces(virLXCDriverPtr driver, + virDomainDefPtr def, + char ***veths) { int ret =3D -1; size_t i; @@ -585,7 +589,7 @@ static int virLXCProcessSetupInterfaces(virConnectPtr c= onn, goto cleanup; break; case VIR_DOMAIN_NET_TYPE_DIRECT: - if (!(veth =3D virLXCProcessSetupInterfaceDirect(conn, def, ne= t))) + if (!(veth =3D virLXCProcessSetupInterfaceDirect(driver, def, = net))) goto cleanup; break; =20 @@ -1344,11 +1348,11 @@ int virLXCProcessStart(virConnectPtr conn, } =20 VIR_DEBUG("Setting up Interfaces"); - if (virLXCProcessSetupInterfaces(conn, vm->def, &veths) < 0) + if (virLXCProcessSetupInterfaces(driver, vm->def, &veths) < 0) goto cleanup; =20 VIR_DEBUG("Setting up namespaces if any"); - if (virLXCProcessSetupNamespaces(conn, vm->def->namespaceData, nsInher= itFDs) < 0) + if (virLXCProcessSetupNamespaces(driver, vm->def->namespaceData, nsInh= eritFDs) < 0) goto cleanup; =20 VIR_DEBUG("Preparing to launch"); diff --git a/src/lxc/lxc_process.h b/src/lxc/lxc_process.h index 1bf359b229..383f6f714d 100644 --- a/src/lxc/lxc_process.h +++ b/src/lxc/lxc_process.h @@ -50,6 +50,6 @@ int virLXCProcessValidateInterface(virDomainNetDefPtr net= ); char *virLXCProcessSetupInterfaceTap(virDomainDefPtr vm, virDomainNetDefPtr net, const char *brname); -char *virLXCProcessSetupInterfaceDirect(virConnectPtr conn, +char *virLXCProcessSetupInterfaceDirect(virLXCDriverPtr driver, virDomainDefPtr def, virDomainNetDefPtr net); --=20 2.23.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list