External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-11 15:27:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix bridge/tap system error reporting

Browse Source 
* src/qemu_conf.c, src/uml_conf.c: use virReportSystemError() to report
  system errors
This commit is contained in:
Mark McLoughlin 2009-08-18 14:15:58 +01:00
parent 2b1f67d418
commit 3ec80d0112
2 changed files with 16 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/qemu_conf.c
View File

@ -1060,11 +1060,9 @@ qemudNetworkIfaceConnect(virConnectPtr conn,
return -1;
}
char ebuf[1024];
if (!driver->brctl && (err = brInit(&driver->brctl))) {
qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR,
_("cannot initialize bridge support: %s"),
virStrerror(err, ebuf, sizeof ebuf));
virReportSystemError(conn, err, "%s",
_("cannot initialize bridge support"));
return -1;
}
@ -1092,14 +1090,13 @@ qemudNetworkIfaceConnect(virConnectPtr conn,
_("Failed to add tap interface to bridge. "
"%s is not a bridge device"), brname);
} else if (template_ifname) {
qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR,
_("Failed to add tap interface to bridge '%s' : %s"),
brname, virStrerror(err, ebuf, sizeof ebuf));
virReportSystemError(conn, err,
_("Failed to add tap interface to bridge '%s'"),
brname);
} else {
qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR,
_("Failed to add tap interface '%s' "
"to bridge '%s' : %s"),
net->ifname, brname, virStrerror(err, ebuf, sizeof ebuf));
virReportSystemError(conn, err,
_("Failed to add tap interface '%s' to bridge '%s'"),
net->ifname, brname);
}
if (template_ifname)
VIR_FREE(net->ifname);

21
src/uml_conf.c
View File

@ -110,10 +110,8 @@ umlConnectTapDevice(virConnectPtr conn,
int err;
if ((err = brInit(&brctl))) {
char ebuf[1024];
umlReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR,
_("cannot initialize bridge support: %s"),
virStrerror(err, ebuf, sizeof ebuf));
virReportSystemError(conn, err, "%s",
_("cannot initialize bridge support"));
goto error;
}
@ -135,16 +133,13 @@ umlConnectTapDevice(virConnectPtr conn,
_("Failed to add tap interface to bridge. "
"%s is not a bridge device"), bridge);
} else if (template_ifname) {
char ebuf[1024];
umlReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR,
_("Failed to add tap interface to bridge '%s' : %s"),
bridge, virStrerror(err, ebuf, sizeof ebuf));
virReportSystemError(conn, err,
_("Failed to add tap interface to bridge '%s'"),
bridge);
} else {
char ebuf[1024];
umlReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR,
_("Failed to add tap interface '%s' "
"to bridge '%s' : %s"),
net->ifname, bridge, virStrerror(err, ebuf, sizeof ebuf));
virReportSystemError(conn, err,
_("Failed to add tap interface '%s' to bridge '%s'"),
net->ifname, bridge);
}
if (template_ifname)
VIR_FREE(net->ifname);