External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-07-17 07:07:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu,lxc: remove use to nwfilter update lock

Browse Source 
Now that the virNWFilterBinding APIs are using the nwfilter
update lock directly, there is no need for the virt drivers
to do it themselves.

Reviewed-by: Laine Stump <laine@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
This commit is contained in:
Daniel P. Berrangé 2022-02-24 19:02:32 +00:00
parent 65dc79f50b
commit 5f8b090f42
4 changed files with 0 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/lxc/lxc_driver.c
View File

@ -971,8 +971,6 @@ static int lxcDomainCreateWithFiles(virDomainPtr dom,
virCheckFlags(VIR_DOMAIN_START_AUTODESTROY, -1); virCheckFlags(VIR_DOMAIN_START_AUTODESTROY, -1);
virNWFilterReadLockFilterUpdates();
if (!(vm = lxcDomObjFromDomain(dom))) if (!(vm = lxcDomObjFromDomain(dom)))
goto cleanup; goto cleanup;
@ -1014,7 +1012,6 @@ static int lxcDomainCreateWithFiles(virDomainPtr dom,
cleanup: cleanup:
virDomainObjEndAPI(&vm); virDomainObjEndAPI(&vm);
virObjectEventStateQueue(driver->domainEventState, event); virObjectEventStateQueue(driver->domainEventState, event);
virNWFilterUnlockFilterUpdates();
return ret; return ret;
} }
@ -1080,8 +1077,6 @@ lxcDomainCreateXMLWithFiles(virConnectPtr conn,
if (flags & VIR_DOMAIN_START_VALIDATE) if (flags & VIR_DOMAIN_START_VALIDATE)
parse_flags |= VIR_DOMAIN_DEF_PARSE_VALIDATE_SCHEMA; parse_flags |= VIR_DOMAIN_DEF_PARSE_VALIDATE_SCHEMA;
virNWFilterReadLockFilterUpdates();
if (!(caps = virLXCDriverGetCapabilities(driver, false))) if (!(caps = virLXCDriverGetCapabilities(driver, false)))
goto cleanup; goto cleanup;
@ -1138,7 +1133,6 @@ lxcDomainCreateXMLWithFiles(virConnectPtr conn,
cleanup: cleanup:
virDomainObjEndAPI(&vm); virDomainObjEndAPI(&vm);
virObjectEventStateQueue(driver->domainEventState, event); virObjectEventStateQueue(driver->domainEventState, event);
virNWFilterUnlockFilterUpdates();
return dom; return dom;
} }

18
src/qemu/qemu_driver.c
View File

@ -1606,8 +1606,6 @@ static virDomainPtr qemuDomainCreateXML(virConnectPtr conn,
if (flags & VIR_DOMAIN_START_RESET_NVRAM) if (flags & VIR_DOMAIN_START_RESET_NVRAM)
start_flags |= VIR_QEMU_PROCESS_START_RESET_NVRAM; start_flags |= VIR_QEMU_PROCESS_START_RESET_NVRAM;
virNWFilterReadLockFilterUpdates();
if (!(def = virDomainDefParseString(xml, driver->xmlopt, if (!(def = virDomainDefParseString(xml, driver->xmlopt,
NULL, parse_flags))) NULL, parse_flags)))
goto cleanup; goto cleanup;
@ -1661,7 +1659,6 @@ static virDomainPtr qemuDomainCreateXML(virConnectPtr conn,
virDomainObjEndAPI(&vm); virDomainObjEndAPI(&vm);
virObjectEventStateQueue(driver->domainEventState, event); virObjectEventStateQueue(driver->domainEventState, event);
virObjectEventStateQueue(driver->domainEventState, event2); virObjectEventStateQueue(driver->domainEventState, event2);
virNWFilterUnlockFilterUpdates();
return dom; return dom;
} }
@ -5776,8 +5773,6 @@ qemuDomainRestoreFlags(virConnectPtr conn,
if (flags & VIR_DOMAIN_SAVE_RESET_NVRAM) if (flags & VIR_DOMAIN_SAVE_RESET_NVRAM)
reset_nvram = true; reset_nvram = true;
virNWFilterReadLockFilterUpdates();
fd = qemuSaveImageOpen(driver, NULL, path, &def, &data, fd = qemuSaveImageOpen(driver, NULL, path, &def, &data,
(flags & VIR_DOMAIN_SAVE_BYPASS_CACHE) != 0, (flags & VIR_DOMAIN_SAVE_BYPASS_CACHE) != 0,
&wrapperFd, false, false); &wrapperFd, false, false);
@ -5849,7 +5844,6 @@ qemuDomainRestoreFlags(virConnectPtr conn,
if (vm && ret < 0) if (vm && ret < 0)
qemuDomainRemoveInactiveJob(driver, vm); qemuDomainRemoveInactiveJob(driver, vm);
virDomainObjEndAPI(&vm); virDomainObjEndAPI(&vm);
virNWFilterUnlockFilterUpdates();
return ret; return ret;
} }
@ -6403,8 +6397,6 @@ qemuDomainCreateWithFlags(virDomainPtr dom, unsigned int flags)
VIR_DOMAIN_START_FORCE_BOOT | VIR_DOMAIN_START_FORCE_BOOT |
VIR_DOMAIN_START_RESET_NVRAM, -1); VIR_DOMAIN_START_RESET_NVRAM, -1);
virNWFilterReadLockFilterUpdates();
if (!(vm = qemuDomainObjFromDomain(dom))) if (!(vm = qemuDomainObjFromDomain(dom)))
goto cleanup; goto cleanup;
@ -6433,7 +6425,6 @@ qemuDomainCreateWithFlags(virDomainPtr dom, unsigned int flags)
cleanup: cleanup:
virDomainObjEndAPI(&vm); virDomainObjEndAPI(&vm);
virNWFilterUnlockFilterUpdates();
return ret; return ret;
} }
@ -7815,8 +7806,6 @@ qemuDomainAttachDeviceFlags(virDomainPtr dom,
virDomainObj *vm = NULL; virDomainObj *vm = NULL;
int ret = -1; int ret = -1;
virNWFilterReadLockFilterUpdates();
if (!(vm = qemuDomainObjFromDomain(dom))) if (!(vm = qemuDomainObjFromDomain(dom)))
goto cleanup; goto cleanup;
@ -7839,7 +7828,6 @@ qemuDomainAttachDeviceFlags(virDomainPtr dom,
cleanup: cleanup:
virDomainObjEndAPI(&vm); virDomainObjEndAPI(&vm);
virNWFilterUnlockFilterUpdates();
return ret; return ret;
} }
@ -7869,8 +7857,6 @@ static int qemuDomainUpdateDeviceFlags(virDomainPtr dom,
VIR_DOMAIN_AFFECT_CONFIG | VIR_DOMAIN_AFFECT_CONFIG |
VIR_DOMAIN_DEVICE_MODIFY_FORCE, -1); VIR_DOMAIN_DEVICE_MODIFY_FORCE, -1);
virNWFilterReadLockFilterUpdates();
cfg = virQEMUDriverGetConfig(driver); cfg = virQEMUDriverGetConfig(driver);
if (!(vm = qemuDomainObjFromDomain(dom))) if (!(vm = qemuDomainObjFromDomain(dom)))
@ -7947,7 +7933,6 @@ static int qemuDomainUpdateDeviceFlags(virDomainPtr dom,
if (dev != dev_copy) if (dev != dev_copy)
virDomainDeviceDefFree(dev_copy); virDomainDeviceDefFree(dev_copy);
virDomainObjEndAPI(&vm); virDomainObjEndAPI(&vm);
virNWFilterUnlockFilterUpdates();
return ret; return ret;
} }
@ -13654,8 +13639,6 @@ qemuDomainRevertToSnapshot(virDomainSnapshotPtr snapshot,
virDomainObj *vm = NULL; virDomainObj *vm = NULL;
int ret = -1; int ret = -1;
virNWFilterReadLockFilterUpdates();
if (!(vm = qemuDomObjFromSnapshot(snapshot))) if (!(vm = qemuDomObjFromSnapshot(snapshot)))
goto cleanup; goto cleanup;
@ -13666,7 +13649,6 @@ qemuDomainRevertToSnapshot(virDomainSnapshotPtr snapshot,
cleanup: cleanup:
virDomainObjEndAPI(&vm); virDomainObjEndAPI(&vm);
virNWFilterUnlockFilterUpdates();
return ret; return ret;
} }

3
src/qemu/qemu_migration.c
View File

@ -2782,8 +2782,6 @@ qemuMigrationDstPrepareAny(virQEMUDriver *driver,
int rv; int rv;
g_autofree char *tlsAlias = NULL; g_autofree char *tlsAlias = NULL;
virNWFilterReadLockFilterUpdates();
if (flags & VIR_MIGRATE_OFFLINE) { if (flags & VIR_MIGRATE_OFFLINE) {
if (flags & (VIR_MIGRATE_NON_SHARED_DISK | if (flags & (VIR_MIGRATE_NON_SHARED_DISK |
VIR_MIGRATE_NON_SHARED_INC)) { VIR_MIGRATE_NON_SHARED_INC)) {
@ -3103,7 +3101,6 @@ qemuMigrationDstPrepareAny(virQEMUDriver *driver,
virDomainObjEndAPI(&vm); virDomainObjEndAPI(&vm);
virObjectEventStateQueue(driver->domainEventState, event); virObjectEventStateQueue(driver->domainEventState, event);
qemuMigrationCookieFree(mig); qemuMigrationCookieFree(mig);
virNWFilterUnlockFilterUpdates();
virErrorRestore(&origErr); virErrorRestore(&origErr);
return ret; return ret;

4
src/qemu/qemu_process.c
View File

@ -9004,7 +9004,6 @@ qemuProcessReconnect(void *opaque)
qemuDomainRemoveInactiveJob(driver, obj); qemuDomainRemoveInactiveJob(driver, obj);
} }
virDomainObjEndAPI(&obj); virDomainObjEndAPI(&obj);
virNWFilterUnlockFilterUpdates();
virIdentitySetCurrent(NULL); virIdentitySetCurrent(NULL);
return; return;
@ -9056,8 +9055,6 @@ qemuProcessReconnectHelper(virDomainObj *obj,
data->obj = obj; data->obj = obj;
data->identity = virIdentityGetCurrent(); data->identity = virIdentityGetCurrent();
virNWFilterReadLockFilterUpdates();
/* this lock and reference will be eventually transferred to the thread /* this lock and reference will be eventually transferred to the thread
* that handles the reconnect */ * that handles the reconnect */
virObjectLock(obj); virObjectLock(obj);
@ -9080,7 +9077,6 @@ qemuProcessReconnectHelper(virDomainObj *obj,
qemuDomainRemoveInactiveJobLocked(src->driver, obj); qemuDomainRemoveInactiveJobLocked(src->driver, obj);
virDomainObjEndAPI(&obj); virDomainObjEndAPI(&obj);
virNWFilterUnlockFilterUpdates();
g_clear_object(&data->identity); g_clear_object(&data->identity);
VIR_FREE(data); VIR_FREE(data);
return -1; return -1;