qemu: don't release network actual device twice

For direct attach devices, in qemuBuildCommandLine, we seem to be freeing
actual device on error path (with networkReleaseActualDevice). But the actual
device is not deleted.

qemuProcessStop eventually deletes the direct attach device and releases
actual device. But by the time qemuProcessStop is called qemuBuildCommandLine
has already freed actual device, leaving stray macvtap devices behind on error.
So the simplest fix is to remove the networkReleaseActualDevice in
qemuBuildCommandLine. This patch does just that.

Signed-off-by: Roopa Prabhu <roprabhu@cisco.com>
This commit is contained in:
Roopa Prabhu 2011-11-16 18:34:32 -08:00 committed by Eric Blake
parent 2e37bf42d2
commit 334c539ba0

View File

@ -5432,8 +5432,6 @@ qemuBuildCommandLine(virConnectPtr conn,
virReportOOMError();
error:
/* free up any resources in the network driver */
for (i = 0 ; i < def->nnets ; i++)
networkReleaseActualDevice(def->nets[i]);
for (i = 0; i <= last_good_net; i++)
virDomainConfNWFilterTeardown(def->nets[i]);
virCommandFree(cmd);