]> git.ipfire.org Git - thirdparty/libvirt.git/commit
qemu: don't kill qemu process on restart if networkNotify fails
authorLaine Stump <laine@laine.org>
Tue, 25 Apr 2017 16:20:30 +0000 (12:20 -0400)
committerLaine Stump <laine@laine.org>
Fri, 28 Apr 2017 13:41:34 +0000 (09:41 -0400)
commitcb182eb11d3a99adb06e188989899dcd488c43fc
tree125028ed05047d5a822bb237c848c7c59c6a3b09
parent2b7d516434190ae4da44aee3b9ae98f776d912a0
qemu: don't kill qemu process on restart if networkNotify fails

Nothing that could happen during networkNotifyActualDevice() could
justify unceremoniously killing the qemu process, but that's what we
were doing.

In particular, new code added in commit 85bcc022 (first appearred in
libvirt-3.2.0) attempts to reattach tap devices to their assigned
bridge devices when libvirtd restarts (to make it easier to recover
from a restart of a libvirt network). But if the network has been
stopped and *not* restarted, the bridge device won't exist and
networkNotifyActualDevice() will fail.

This patch changes networkNotifyActualDevice() and
qemuProcessNotifyNets() to return void, so that qemuProcessReconnect()
will soldier on regardless of what happens (any errors will still be
logged though).

Partially resolves: https://bugzilla.redhat.com/1442700
src/network/bridge_driver.c
src/network/bridge_driver.h
src/qemu/qemu_process.c