From nobody Tue Feb 10 19:15:45 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 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=1645803217; cv=none; d=zohomail.com; s=zohoarc; b=Iic7IffseJb9OLZL3xheSXg6ZF+eK76xyVdz/5xj9iQ4/V6gKS6y4rT0dkO7Orjlz83U8PtDm2ueLrg/WzsTZmTTrgCu7/fPHfSYq3AUEj/VOmRmbvnaFxBXzjckhpQ2aJ+lUZSodbZjeh8q2sM2WpqjWMMLUxn1iKeuGKbWm88= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1645803217; 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=E740e1l8hUH4hcGSThu2u3IDsbSJ2PMnKMMEc9Hd6e0=; b=JaRej4etUL/kBL22ONz9vx7vQx6/3RXXctxzE68Og76an8AkQcBvHIg1zaQ6LEnuDibUHCT3AzW+9vzm+ZbB9JMjZvz+09T65COc0ZEXlaRiuPuwLE6bo9B8aWCg7pPNZ9woUUoDu6f6iacawQ9RGCZb6ExFXAk18JLq9zATgZY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 164580321705679.07227566224697; Fri, 25 Feb 2022 07:33:37 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-260-qnM3pjMcOCGFuBX3bAg6Rg-1; Fri, 25 Feb 2022 10:33:31 -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 EEB175123; Fri, 25 Feb 2022 15:33:26 +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 A8F087C034; Fri, 25 Feb 2022 15:33:26 +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 F091E4ED79; Fri, 25 Feb 2022 15:33:25 +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 21PFUvkF024512 for ; Fri, 25 Feb 2022 10:30:57 -0500 Received: by smtp.corp.redhat.com (Postfix) id A08DF7C026; Fri, 25 Feb 2022 15:30:57 +0000 (UTC) Received: from domokun.gsslab.fab.redhat.com (gx270-2.gsslab.fab.redhat.com [10.33.8.41]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1E24F7C029; Fri, 25 Feb 2022 15:30:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1645803215; 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=E740e1l8hUH4hcGSThu2u3IDsbSJ2PMnKMMEc9Hd6e0=; b=HM2q4eP4ZxyHInWRo7KHdg1ssb1eecmnGjMxZD3igTq/6bPa+1z0Ogk3fE4PIDic42wcsA 8YYi4vP+LAEPNm0CQgrNzG1zy5QzvfzS5D2QpQts53ek0raGmn2FJx63zasaUl6CxC8uVR X5Z+e3cVWBUai/3Sdiw3cUTbgkW+e8U= X-MC-Unique: qnM3pjMcOCGFuBX3bAg6Rg-1 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Subject: [libvirt PATCH 3/5] qemu,lxc: remove use to nwfilter update lock Date: Fri, 25 Feb 2022 15:30:51 +0000 Message-Id: <20220225153053.3241652-4-berrange@redhat.com> In-Reply-To: <20220225153053.3241652-1-berrange@redhat.com> References: <20220225153053.3241652-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-loop: libvir-list@redhat.com 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 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1645803219249100001 Now that the virNWFilterBinding APIs are using the nwfilter update lock directly, there is no need for the virt drivers to do it themselves. Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Laine Stump --- src/lxc/lxc_driver.c | 6 ------ src/qemu/qemu_driver.c | 18 ------------------ src/qemu/qemu_migration.c | 3 --- src/qemu/qemu_process.c | 4 ---- 4 files changed, 31 deletions(-) diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index 020ec257ae..4185a61267 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -971,8 +971,6 @@ static int lxcDomainCreateWithFiles(virDomainPtr dom, =20 virCheckFlags(VIR_DOMAIN_START_AUTODESTROY, -1); =20 - virNWFilterReadLockFilterUpdates(); - if (!(vm =3D lxcDomObjFromDomain(dom))) goto cleanup; =20 @@ -1014,7 +1012,6 @@ static int lxcDomainCreateWithFiles(virDomainPtr dom, cleanup: virDomainObjEndAPI(&vm); virObjectEventStateQueue(driver->domainEventState, event); - virNWFilterUnlockFilterUpdates(); return ret; } =20 @@ -1080,8 +1077,6 @@ lxcDomainCreateXMLWithFiles(virConnectPtr conn, if (flags & VIR_DOMAIN_START_VALIDATE) parse_flags |=3D VIR_DOMAIN_DEF_PARSE_VALIDATE_SCHEMA; =20 - virNWFilterReadLockFilterUpdates(); - if (!(caps =3D virLXCDriverGetCapabilities(driver, false))) goto cleanup; =20 @@ -1138,7 +1133,6 @@ lxcDomainCreateXMLWithFiles(virConnectPtr conn, cleanup: virDomainObjEndAPI(&vm); virObjectEventStateQueue(driver->domainEventState, event); - virNWFilterUnlockFilterUpdates(); return dom; } =20 diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index b74b0375a7..e4e1cd7bdf 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -1606,8 +1606,6 @@ static virDomainPtr qemuDomainCreateXML(virConnectPtr= conn, if (flags & VIR_DOMAIN_START_RESET_NVRAM) start_flags |=3D VIR_QEMU_PROCESS_START_RESET_NVRAM; =20 - virNWFilterReadLockFilterUpdates(); - if (!(def =3D virDomainDefParseString(xml, driver->xmlopt, NULL, parse_flags))) goto cleanup; @@ -1661,7 +1659,6 @@ static virDomainPtr qemuDomainCreateXML(virConnectPtr= conn, virDomainObjEndAPI(&vm); virObjectEventStateQueue(driver->domainEventState, event); virObjectEventStateQueue(driver->domainEventState, event2); - virNWFilterUnlockFilterUpdates(); return dom; } =20 @@ -5776,8 +5773,6 @@ qemuDomainRestoreFlags(virConnectPtr conn, if (flags & VIR_DOMAIN_SAVE_RESET_NVRAM) reset_nvram =3D true; =20 - virNWFilterReadLockFilterUpdates(); - fd =3D qemuSaveImageOpen(driver, NULL, path, &def, &data, (flags & VIR_DOMAIN_SAVE_BYPASS_CACHE) !=3D 0, &wrapperFd, false, false); @@ -5849,7 +5844,6 @@ qemuDomainRestoreFlags(virConnectPtr conn, if (vm && ret < 0) qemuDomainRemoveInactiveJob(driver, vm); virDomainObjEndAPI(&vm); - virNWFilterUnlockFilterUpdates(); return ret; } =20 @@ -6403,8 +6397,6 @@ qemuDomainCreateWithFlags(virDomainPtr dom, unsigned = int flags) VIR_DOMAIN_START_FORCE_BOOT | VIR_DOMAIN_START_RESET_NVRAM, -1); =20 - virNWFilterReadLockFilterUpdates(); - if (!(vm =3D qemuDomainObjFromDomain(dom))) goto cleanup; =20 @@ -6433,7 +6425,6 @@ qemuDomainCreateWithFlags(virDomainPtr dom, unsigned = int flags) =20 cleanup: virDomainObjEndAPI(&vm); - virNWFilterUnlockFilterUpdates(); return ret; } =20 @@ -7815,8 +7806,6 @@ qemuDomainAttachDeviceFlags(virDomainPtr dom, virDomainObj *vm =3D NULL; int ret =3D -1; =20 - virNWFilterReadLockFilterUpdates(); - if (!(vm =3D qemuDomainObjFromDomain(dom))) goto cleanup; =20 @@ -7839,7 +7828,6 @@ qemuDomainAttachDeviceFlags(virDomainPtr dom, =20 cleanup: virDomainObjEndAPI(&vm); - virNWFilterUnlockFilterUpdates(); return ret; } =20 @@ -7869,8 +7857,6 @@ static int qemuDomainUpdateDeviceFlags(virDomainPtr d= om, VIR_DOMAIN_AFFECT_CONFIG | VIR_DOMAIN_DEVICE_MODIFY_FORCE, -1); =20 - virNWFilterReadLockFilterUpdates(); - cfg =3D virQEMUDriverGetConfig(driver); =20 if (!(vm =3D qemuDomainObjFromDomain(dom))) @@ -7947,7 +7933,6 @@ static int qemuDomainUpdateDeviceFlags(virDomainPtr d= om, if (dev !=3D dev_copy) virDomainDeviceDefFree(dev_copy); virDomainObjEndAPI(&vm); - virNWFilterUnlockFilterUpdates(); return ret; } =20 @@ -13654,8 +13639,6 @@ qemuDomainRevertToSnapshot(virDomainSnapshotPtr sna= pshot, virDomainObj *vm =3D NULL; int ret =3D -1; =20 - virNWFilterReadLockFilterUpdates(); - if (!(vm =3D qemuDomObjFromSnapshot(snapshot))) goto cleanup; =20 @@ -13666,7 +13649,6 @@ qemuDomainRevertToSnapshot(virDomainSnapshotPtr sna= pshot, =20 cleanup: virDomainObjEndAPI(&vm); - virNWFilterUnlockFilterUpdates(); return ret; } =20 diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 5aecdddff0..43ee094486 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -2782,8 +2782,6 @@ qemuMigrationDstPrepareAny(virQEMUDriver *driver, int rv; g_autofree char *tlsAlias =3D NULL; =20 - virNWFilterReadLockFilterUpdates(); - if (flags & VIR_MIGRATE_OFFLINE) { if (flags & (VIR_MIGRATE_NON_SHARED_DISK | VIR_MIGRATE_NON_SHARED_INC)) { @@ -3103,7 +3101,6 @@ qemuMigrationDstPrepareAny(virQEMUDriver *driver, virDomainObjEndAPI(&vm); virObjectEventStateQueue(driver->domainEventState, event); qemuMigrationCookieFree(mig); - virNWFilterUnlockFilterUpdates(); virErrorRestore(&origErr); return ret; =20 diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 5af925e521..b19a6218d0 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -9004,7 +9004,6 @@ qemuProcessReconnect(void *opaque) qemuDomainRemoveInactiveJob(driver, obj); } virDomainObjEndAPI(&obj); - virNWFilterUnlockFilterUpdates(); virIdentitySetCurrent(NULL); return; =20 @@ -9056,8 +9055,6 @@ qemuProcessReconnectHelper(virDomainObj *obj, data->obj =3D obj; data->identity =3D virIdentityGetCurrent(); =20 - virNWFilterReadLockFilterUpdates(); - /* this lock and reference will be eventually transferred to the thread * that handles the reconnect */ virObjectLock(obj); @@ -9080,7 +9077,6 @@ qemuProcessReconnectHelper(virDomainObj *obj, qemuDomainRemoveInactiveJobLocked(src->driver, obj); =20 virDomainObjEndAPI(&obj); - virNWFilterUnlockFilterUpdates(); g_clear_object(&data->identity); VIR_FREE(data); return -1; --=20 2.35.1