mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-08-29 20:11:16 +00:00
lxc: don't try to reserve macvtap name for LXC domains
Commit729a06c41
added code to the LXC driver (patterned after similar code in the QEMU driver) that called virNetDevMacVlanReserveName(net->ifname) for all type='direct' interfaces during a libvirtd restart, to prevent other domains from attempting to use a macvtap device name that was already in use by a domain. But, unlike a QEMU domain, when an LXC domain creates a macvtap device, that device is almost immediately moved into the namespace of the container (and it's then renamed, but that part isn't important). Because of this, the LXC driver doesn't keep track (in net->ifname) of the name used to create the device (as the QEMU driver does). The result of this is that if libvirtd is restarted while there is an active LXC domain that has <interface type='direct'>, libvirtd will segfault (since virNetDevMacVLanReserveName() doesn't check for a NULL pointer). The fix is to just not call that function in the case of the LXC driver, since it is pointless anyway. Fixes:729a06c41a
Signed-off-by: Laine Stump <laine@redhat.com> Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
This commit is contained in:
parent
555b880aae
commit
84dc367e2a
@ -1636,13 +1636,6 @@ virLXCProcessReconnectNotifyNets(virDomainDefPtr def)
|
|||||||
|
|
||||||
for (i = 0; i < def->nnets; i++) {
|
for (i = 0; i < def->nnets; i++) {
|
||||||
virDomainNetDefPtr net = def->nets[i];
|
virDomainNetDefPtr net = def->nets[i];
|
||||||
/* keep others from trying to use the macvtap device name, but
|
|
||||||
* don't return error if this happens, since that causes the
|
|
||||||
* domain to be unceremoniously killed, which would be *very*
|
|
||||||
* impolite.
|
|
||||||
*/
|
|
||||||
if (virDomainNetGetActualType(net) == VIR_DOMAIN_NET_TYPE_DIRECT)
|
|
||||||
virNetDevMacVLanReserveName(net->ifname);
|
|
||||||
|
|
||||||
if (net->type == VIR_DOMAIN_NET_TYPE_NETWORK) {
|
if (net->type == VIR_DOMAIN_NET_TYPE_NETWORK) {
|
||||||
if (!conn && !(conn = virGetConnectNetwork()))
|
if (!conn && !(conn = virGetConnectNetwork()))
|
||||||
|
Loading…
Reference in New Issue
Block a user