Re: [libvirt] [PATCH 11/14] Remove the network backend if NIC hotplug fails

If we fail to pci_add a NIC, we should remove the network backend and leave things the way we found them. To do that, we pre-allocate a host_net_remove monitor command and issue that if the pci_add fails. If the remove fails, we just log a warning. We can only do this if we have a name for the network backend and we know the vlan number its associated with. * src/qemu_driver.c: host_net_remove the network backend if the pci_add fails

if (qemuBuildNicStr(conn, net, - "pci_add pci_addr=auto ", ' ', net->vlan, &cmd) < 0) { - /* FIXME: try and remove the backend again */ - return -1; - } + "pci_add pci_addr=auto ", ' ', net->vlan, &cmd) < 0) + goto try_remove;

if (qemudMonitorCommand(vm, cmd, &reply) < 0) { - /* FIXME: try and remove the backend again */ qemudReportError(conn, dom, NULL, VIR_ERR_OPERATION_FAILED, _("failed to add NIC with '%s'"), cmd); VIR_FREE(cmd); - return -1; + goto try_remove; }