NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2026-09-03 20:53:04 -05:00
Code Issues Packages Projects Releases Wiki Activity

qemu: Explicitly error if guest virtual network is inactive

Browse Source 
Currently we just error with ex. 'virbr0: No such device'.

Since we are using public API calls here, we need to ensure that any
raised error is properly saved and restored, since API entry points
always reset messages.
This commit is contained in:
Cole Robinson
2010-02-18 09:23:05 -05:00
parent 6d4bd59cf8
commit 3f745ebe9f
1 changed files with 25 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/qemu/qemu_conf.c
+25 -3
View File
@@ -1472,17 +1472,39 @@ qemudNetworkIfaceConnect(virConnectPtr conn,
int template_ifname = 0;
if (net->type == VIR_DOMAIN_NET_TYPE_NETWORK) {
int active, fail = 0;
virErrorPtr errobj;
virNetworkPtr network = virNetworkLookupByName(conn,
net->data.network.name);
net->data.network.name);
if (!network)
return -1;
brname = virNetworkGetBridgeName(network);
active = virNetworkIsActive(network);
if (active != 1) {
fail = 1;
if (active == 0)
qemuReportError(VIR_ERR_INTERNAL_ERROR,
_("Network '%s' is not active."),
net->data.network.name);
}
if (!fail) {
brname = virNetworkGetBridgeName(network);
if (brname == NULL)
fail = 1;
}
/* Make sure any above failure is preserved */
errobj = virSaveLastError();
virNetworkFree(network);
virSetError(errobj);
virFreeError(errobj);
if (brname == NULL)
errobj = virSaveLastError();
if (fail)
return -1;
} else if (net->type == VIR_DOMAIN_NET_TYPE_BRIDGE) {
if (!(brname = strdup(net->data.bridge.brname))) {
virReportOOMError();