mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-10-23 06:23:10 +00:00
qemu: Manage /dev entry on chardev hotplug
When attaching a device to a domain that's using separate mount namespace we must maintain /dev entries in order for qemu process to see them. Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
parent
6e57492839
commit
f5fdf23a68
@ -7534,6 +7534,10 @@ qemuDomainAttachDeviceMknodHelper(pid_t pid ATTRIBUTE_UNUSED,
|
|||||||
goto cleanup;
|
goto cleanup;
|
||||||
} break;
|
} break;
|
||||||
|
|
||||||
|
case VIR_DOMAIN_DEVICE_CHR:
|
||||||
|
/* No labelling. */
|
||||||
|
break;
|
||||||
|
|
||||||
case VIR_DOMAIN_DEVICE_NONE:
|
case VIR_DOMAIN_DEVICE_NONE:
|
||||||
case VIR_DOMAIN_DEVICE_LEASE:
|
case VIR_DOMAIN_DEVICE_LEASE:
|
||||||
case VIR_DOMAIN_DEVICE_FS:
|
case VIR_DOMAIN_DEVICE_FS:
|
||||||
@ -7547,7 +7551,6 @@ qemuDomainAttachDeviceMknodHelper(pid_t pid ATTRIBUTE_UNUSED,
|
|||||||
case VIR_DOMAIN_DEVICE_HUB:
|
case VIR_DOMAIN_DEVICE_HUB:
|
||||||
case VIR_DOMAIN_DEVICE_REDIRDEV:
|
case VIR_DOMAIN_DEVICE_REDIRDEV:
|
||||||
case VIR_DOMAIN_DEVICE_SMARTCARD:
|
case VIR_DOMAIN_DEVICE_SMARTCARD:
|
||||||
case VIR_DOMAIN_DEVICE_CHR:
|
|
||||||
case VIR_DOMAIN_DEVICE_MEMBALLOON:
|
case VIR_DOMAIN_DEVICE_MEMBALLOON:
|
||||||
case VIR_DOMAIN_DEVICE_NVRAM:
|
case VIR_DOMAIN_DEVICE_NVRAM:
|
||||||
case VIR_DOMAIN_DEVICE_RNG:
|
case VIR_DOMAIN_DEVICE_RNG:
|
||||||
@ -7667,6 +7670,10 @@ qemuDomainDetachDeviceUnlink(virQEMUDriverPtr driver,
|
|||||||
return -1;
|
return -1;
|
||||||
} break;
|
} break;
|
||||||
|
|
||||||
|
case VIR_DOMAIN_DEVICE_CHR:
|
||||||
|
/* No labelling. */
|
||||||
|
break;
|
||||||
|
|
||||||
case VIR_DOMAIN_DEVICE_NONE:
|
case VIR_DOMAIN_DEVICE_NONE:
|
||||||
case VIR_DOMAIN_DEVICE_LEASE:
|
case VIR_DOMAIN_DEVICE_LEASE:
|
||||||
case VIR_DOMAIN_DEVICE_FS:
|
case VIR_DOMAIN_DEVICE_FS:
|
||||||
@ -7680,7 +7687,6 @@ qemuDomainDetachDeviceUnlink(virQEMUDriverPtr driver,
|
|||||||
case VIR_DOMAIN_DEVICE_HUB:
|
case VIR_DOMAIN_DEVICE_HUB:
|
||||||
case VIR_DOMAIN_DEVICE_REDIRDEV:
|
case VIR_DOMAIN_DEVICE_REDIRDEV:
|
||||||
case VIR_DOMAIN_DEVICE_SMARTCARD:
|
case VIR_DOMAIN_DEVICE_SMARTCARD:
|
||||||
case VIR_DOMAIN_DEVICE_CHR:
|
|
||||||
case VIR_DOMAIN_DEVICE_MEMBALLOON:
|
case VIR_DOMAIN_DEVICE_MEMBALLOON:
|
||||||
case VIR_DOMAIN_DEVICE_NVRAM:
|
case VIR_DOMAIN_DEVICE_NVRAM:
|
||||||
case VIR_DOMAIN_DEVICE_RNG:
|
case VIR_DOMAIN_DEVICE_RNG:
|
||||||
@ -7829,3 +7835,57 @@ qemuDomainNamespaceTeardownHostdev(virQEMUDriverPtr driver,
|
|||||||
VIR_FREE(path);
|
VIR_FREE(path);
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
int
|
||||||
|
qemuDomainNamespaceSetupChardev(virQEMUDriverPtr driver,
|
||||||
|
virDomainObjPtr vm,
|
||||||
|
virDomainChrDefPtr chr)
|
||||||
|
{
|
||||||
|
virDomainDeviceDef dev = {.type = VIR_DOMAIN_DEVICE_CHR, .data.chr = chr};
|
||||||
|
const char *path;
|
||||||
|
int ret = -1;
|
||||||
|
|
||||||
|
if (!qemuDomainNamespaceEnabled(vm, QEMU_DOMAIN_NS_MOUNT))
|
||||||
|
return 0;
|
||||||
|
|
||||||
|
if (chr->source->type != VIR_DOMAIN_CHR_TYPE_DEV)
|
||||||
|
return 0;
|
||||||
|
|
||||||
|
path = chr->source->data.file.path;
|
||||||
|
|
||||||
|
if (qemuDomainAttachDeviceMknod(driver,
|
||||||
|
vm,
|
||||||
|
&dev,
|
||||||
|
path) < 0)
|
||||||
|
goto cleanup;
|
||||||
|
ret = 0;
|
||||||
|
cleanup:
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
int
|
||||||
|
qemuDomainNamespaceTeardownChardev(virQEMUDriverPtr driver,
|
||||||
|
virDomainObjPtr vm,
|
||||||
|
virDomainChrDefPtr chr)
|
||||||
|
{
|
||||||
|
virDomainDeviceDef dev = {.type = VIR_DOMAIN_DEVICE_CHR, .data.chr = chr};
|
||||||
|
int ret = -1;
|
||||||
|
const char *path = NULL;
|
||||||
|
|
||||||
|
if (!qemuDomainNamespaceEnabled(vm, QEMU_DOMAIN_NS_MOUNT))
|
||||||
|
return 0;
|
||||||
|
|
||||||
|
if (chr->source->type != VIR_DOMAIN_CHR_TYPE_DEV)
|
||||||
|
return 0;
|
||||||
|
|
||||||
|
path = chr->source->data.file.path;
|
||||||
|
|
||||||
|
if (qemuDomainDetachDeviceUnlink(driver, vm, &dev, path) < 0)
|
||||||
|
goto cleanup;
|
||||||
|
|
||||||
|
ret = 0;
|
||||||
|
cleanup:
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
@ -821,4 +821,12 @@ int qemuDomainNamespaceSetupHostdev(virQEMUDriverPtr driver,
|
|||||||
int qemuDomainNamespaceTeardownHostdev(virQEMUDriverPtr driver,
|
int qemuDomainNamespaceTeardownHostdev(virQEMUDriverPtr driver,
|
||||||
virDomainObjPtr vm,
|
virDomainObjPtr vm,
|
||||||
virDomainHostdevDefPtr hostdev);
|
virDomainHostdevDefPtr hostdev);
|
||||||
|
|
||||||
|
int qemuDomainNamespaceSetupChardev(virQEMUDriverPtr driver,
|
||||||
|
virDomainObjPtr vm,
|
||||||
|
virDomainChrDefPtr chr);
|
||||||
|
|
||||||
|
int qemuDomainNamespaceTeardownChardev(virQEMUDriverPtr driver,
|
||||||
|
virDomainObjPtr vm,
|
||||||
|
virDomainChrDefPtr chr);
|
||||||
#endif /* __QEMU_DOMAIN_H__ */
|
#endif /* __QEMU_DOMAIN_H__ */
|
||||||
|
@ -1851,6 +1851,7 @@ int qemuDomainAttachChrDevice(virConnectPtr conn,
|
|||||||
bool chardevAttached = false;
|
bool chardevAttached = false;
|
||||||
bool tlsobjAdded = false;
|
bool tlsobjAdded = false;
|
||||||
bool teardowncgroup = false;
|
bool teardowncgroup = false;
|
||||||
|
bool teardowndevice = false;
|
||||||
bool secobjAdded = false;
|
bool secobjAdded = false;
|
||||||
virJSONValuePtr tlsProps = NULL;
|
virJSONValuePtr tlsProps = NULL;
|
||||||
char *tlsAlias = NULL;
|
char *tlsAlias = NULL;
|
||||||
@ -1872,6 +1873,10 @@ int qemuDomainAttachChrDevice(virConnectPtr conn,
|
|||||||
if (rc == 1)
|
if (rc == 1)
|
||||||
need_release = true;
|
need_release = true;
|
||||||
|
|
||||||
|
if (qemuDomainNamespaceSetupChardev(driver, vm, chr) < 0)
|
||||||
|
goto cleanup;
|
||||||
|
teardowndevice = true;
|
||||||
|
|
||||||
if (qemuSetupChardevCgroup(vm, chr) < 0)
|
if (qemuSetupChardevCgroup(vm, chr) < 0)
|
||||||
goto cleanup;
|
goto cleanup;
|
||||||
teardowncgroup = true;
|
teardowncgroup = true;
|
||||||
@ -1935,6 +1940,8 @@ int qemuDomainAttachChrDevice(virConnectPtr conn,
|
|||||||
qemuDomainReleaseDeviceAddress(vm, &chr->info, NULL);
|
qemuDomainReleaseDeviceAddress(vm, &chr->info, NULL);
|
||||||
if (teardowncgroup && qemuTeardownChardevCgroup(vm, chr) < 0)
|
if (teardowncgroup && qemuTeardownChardevCgroup(vm, chr) < 0)
|
||||||
VIR_WARN("Unable to remove chr device cgroup ACL on hotplug fail");
|
VIR_WARN("Unable to remove chr device cgroup ACL on hotplug fail");
|
||||||
|
if (teardowndevice && qemuDomainNamespaceTeardownChardev(driver, vm, chr) < 0)
|
||||||
|
VIR_WARN("Unable to remove chr device from /dev");
|
||||||
}
|
}
|
||||||
VIR_FREE(tlsAlias);
|
VIR_FREE(tlsAlias);
|
||||||
virJSONValueFree(tlsProps);
|
virJSONValueFree(tlsProps);
|
||||||
@ -4021,6 +4028,9 @@ qemuDomainRemoveChrDevice(virQEMUDriverPtr driver,
|
|||||||
if (qemuTeardownChardevCgroup(vm, chr) < 0)
|
if (qemuTeardownChardevCgroup(vm, chr) < 0)
|
||||||
VIR_WARN("Failed to remove chr device cgroup ACL");
|
VIR_WARN("Failed to remove chr device cgroup ACL");
|
||||||
|
|
||||||
|
if (qemuDomainNamespaceTeardownChardev(driver, vm, chr) < 0)
|
||||||
|
VIR_WARN("Unable to remove chr device from /dev");
|
||||||
|
|
||||||
event = virDomainEventDeviceRemovedNewFromObj(vm, chr->info.alias);
|
event = virDomainEventDeviceRemovedNewFromObj(vm, chr->info.alias);
|
||||||
qemuDomainEventQueue(driver, event);
|
qemuDomainEventQueue(driver, event);
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user