提交 246317d3 编写于 作者: J Ján Tomko

Include PCI address in the error in virDomainNetFindIdx

When looking up a net device by a MAC and PCI address, it is possible
that we've got a match on the MAC address but failed to match the
PCI address.

In that case, outputting just the MAC address can be confusing.

Partially resolves:
https://bugzilla.redhat.com/show_bug.cgi?id=872028
上级 2fbae1b2
...@@ -10278,10 +10278,21 @@ virDomainNetFindIdx(virDomainDefPtr def, virDomainNetDefPtr net) ...@@ -10278,10 +10278,21 @@ virDomainNetFindIdx(virDomainDefPtr def, virDomainNetDefPtr net)
} }
} }
if (matchidx < 0) { if (matchidx < 0) {
if (PCIAddrSpecified) {
virReportError(VIR_ERR_OPERATION_FAILED,
_("no device matching mac address %s found on "
"%.4x:%.2x:%.2x.%.1x"),
virMacAddrFormat(&net->mac, mac),
net->info.addr.pci.domain,
net->info.addr.pci.bus,
net->info.addr.pci.slot,
net->info.addr.pci.function);
} else {
virReportError(VIR_ERR_OPERATION_FAILED, virReportError(VIR_ERR_OPERATION_FAILED,
_("no device matching mac address %s found"), _("no device matching mac address %s found"),
virMacAddrFormat(&net->mac, mac)); virMacAddrFormat(&net->mac, mac));
} }
}
return matchidx; return matchidx;
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册