ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

net: Improve -net nic error reporting 

When -net nic fails, it first reports a specific error, then a generic
one, like this:

    $ qemu-system-x86_64 -net nic,netdev=nonexistent
    qemu-system-x86_64: -net nic,netdev=nonexistent: netdev 'nonexistent' not found
    qemu-system-x86_64: -net nic,netdev=nonexistent: Device 'nic' could not be initialized

Convert net_init_nic() to Error to get rid of the unwanted second
error message.

While there, tidy up an Overcapitalized Error Message.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-id: 1431691143-1015-4-git-send-email-armbru@redhat.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
This commit is contained in:
Markus Armbruster 2015-05-15 13:58:51 +02:00 committed by Stefan Hajnoczi
parent a30ecde6e7
commit 6630886863
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
net/net.c
View File

@ -742,7 +742,6 @@ int qemu_find_nic_model(NICInfo *nd, const char * const *models,
static int net_init_nic(const NetClientOptions *opts, const char *name, static int net_init_nic(const NetClientOptions *opts, const char *name,
NetClientState *peer, Error **errp) NetClientState *peer, Error **errp)
{ {
/* FIXME error_setg(errp, ...) on failure */
int idx; int idx;
NICInfo *nd; NICInfo *nd;
const NetLegacyNicOptions *nic; const NetLegacyNicOptions *nic;
@ -752,7 +751,7 @@ static int net_init_nic(const NetClientOptions *opts, const char *name,
idx = nic_get_free_idx(); idx = nic_get_free_idx();
if (idx == -1 || nb_nics >= MAX_NICS) { if (idx == -1 || nb_nics >= MAX_NICS) {
error_report("Too Many NICs"); error_setg(errp, "too many NICs");
return -1; return -1;
} }
@ -763,7 +762,7 @@ static int net_init_nic(const NetClientOptions *opts, const char *name,
if (nic->has_netdev) { if (nic->has_netdev) {
nd->netdev = qemu_find_netdev(nic->netdev); nd->netdev = qemu_find_netdev(nic->netdev);
if (!nd->netdev) { if (!nd->netdev) {
error_report("netdev '%s' not found", nic->netdev); error_setg(errp, "netdev '%s' not found", nic->netdev);
return -1; return -1;
} }
} else { } else {
@ -780,19 +779,20 @@ static int net_init_nic(const NetClientOptions *opts, const char *name,
if (nic->has_macaddr && if (nic->has_macaddr &&
net_parse_macaddr(nd->macaddr.a, nic->macaddr) < 0) { net_parse_macaddr(nd->macaddr.a, nic->macaddr) < 0) {
error_report("invalid syntax for ethernet address"); error_setg(errp, "invalid syntax for ethernet address");
return -1; return -1;
} }
if (nic->has_macaddr && if (nic->has_macaddr &&
is_multicast_ether_addr(nd->macaddr.a)) { is_multicast_ether_addr(nd->macaddr.a)) {
error_report("NIC cannot have multicast MAC address (odd 1st byte)"); error_setg(errp,
"NIC cannot have multicast MAC address (odd 1st byte)");
return -1; return -1;
} }
qemu_macaddr_default_if_unset(&nd->macaddr); qemu_macaddr_default_if_unset(&nd->macaddr);
if (nic->has_vectors) { if (nic->has_vectors) {
if (nic->vectors > 0x7ffffff) { if (nic->vectors > 0x7ffffff) {
error_report("invalid # of vectors: %"PRIu32, nic->vectors); error_setg(errp, "invalid # of vectors: %"PRIu32, nic->vectors);
return -1; return -1;
} }
nd->nvectors = nic->vectors; nd->nvectors = nic->vectors;