External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-30 17:45:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

util: add missing error log messages when failing to get netlink VFINFO

Browse Source 
This patch fixes the lack of error messages when libvirt fails to find
VFINFO in a returned netlinke response message.

https://bugzilla.redhat.com/show_bug.cgi?id=827519#c10 is an example
of the error message that was previously logged when the
IFLA_VFINFO_LIST object was missing from the netlink response. The
reason for this failure is detailed in

   https://bugzilla.redhat.com/show_bug.cgi?id=889319

Even though that root problem has been fixed, the experience of
finding the root cause shows us how important it is to properly log an
error message in these cases. This patch *seems* to replace the entire
function, but really most of the changes are due to moving code that
was previously inside an if() statement out to the top level of the
function (the original if() was reversed and made to log an error and
return).
(cherry picked from commit 846770e5ff)
This commit is contained in:
Laine Stump 2012-12-20 14:52:41 -05:00
parent 52fca883d2
commit 6b789ea3e0
1 changed files with 44 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

86
src/util/virnetdev.c
View File

@ -1465,53 +1465,55 @@ static int
virNetDevParseVfConfig(struct nlattr **tb, int32_t vf, virMacAddrPtr mac, virNetDevParseVfConfig(struct nlattr **tb, int32_t vf, virMacAddrPtr mac,
int *vlanid) int *vlanid)
{ {
const char *msg = NULL;
int rc = -1; int rc = -1;
struct ifla_vf_mac *vf_mac;
struct ifla_vf_vlan *vf_vlan;
struct nlattr *tb_vf_info = {NULL, };
struct nlattr *tb_vf[IFLA_VF_MAX+1];
int found = 0;
int rem;
if (tb[IFLA_VFINFO_LIST]) { if (!tb[IFLA_VFINFO_LIST]) {
struct ifla_vf_mac *vf_mac; virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
struct ifla_vf_vlan *vf_vlan; _("missing IFLA_VF_INFO in netlink response"));
struct nlattr *tb_vf_info = {NULL, }; goto cleanup;
struct nlattr *tb_vf[IFLA_VF_MAX+1];
int found = 0;
int rem;
nla_for_each_nested(tb_vf_info, tb[IFLA_VFINFO_LIST], rem) {
if (nla_type(tb_vf_info) != IFLA_VF_INFO)
continue;
if (nla_parse_nested(tb_vf, IFLA_VF_MAX, tb_vf_info,
ifla_vf_policy)) {
msg = _("error parsing IFLA_VF_INFO");
goto cleanup;
}
if (tb[IFLA_VF_MAC]) {
vf_mac = RTA_DATA(tb_vf[IFLA_VF_MAC]);
if (vf_mac && vf_mac->vf == vf) {
virMacAddrSetRaw(mac, vf_mac->mac);
found = 1;
}
}
if (tb[IFLA_VF_VLAN]) {
vf_vlan = RTA_DATA(tb_vf[IFLA_VF_VLAN]);
if (vf_vlan && vf_vlan->vf == vf) {
*vlanid = vf_vlan->vlan;
found = 1;
}
}
if (found) {
rc = 0;
break;
}
}
} }
cleanup: nla_for_each_nested(tb_vf_info, tb[IFLA_VFINFO_LIST], rem) {
if (msg) if (nla_type(tb_vf_info) != IFLA_VF_INFO)
virReportError(VIR_ERR_INTERNAL_ERROR, "%s", msg); continue;
if (nla_parse_nested(tb_vf, IFLA_VF_MAX, tb_vf_info,
ifla_vf_policy)) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("error parsing IFLA_VF_INFO"));
goto cleanup;
}
if (tb[IFLA_VF_MAC]) {
vf_mac = RTA_DATA(tb_vf[IFLA_VF_MAC]);
if (vf_mac && vf_mac->vf == vf) {
virMacAddrSetRaw(mac, vf_mac->mac);
found = 1;
}
}
if (tb[IFLA_VF_VLAN]) {
vf_vlan = RTA_DATA(tb_vf[IFLA_VF_VLAN]);
if (vf_vlan && vf_vlan->vf == vf) {
*vlanid = vf_vlan->vlan;
found = 1;
}
}
if (found) {
rc = 0;
goto cleanup;
}
}
virReportError(VIR_ERR_INTERNAL_ERROR,
_("couldn't find IFLA_VF_INFO for VF %d "
"in netlink response"), vf);
cleanup:
return rc; return rc;
} }