[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 04/17] net: Improve -net nic error reporting
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-devel] [PULL 04/17] net: Improve -net nic error reporting |
Date: |
Wed, 27 May 2015 11:02:55 +0100 |
From: Markus Armbruster <address@hidden>
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 <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Message-id: address@hidden
Signed-off-by: Stefan Hajnoczi <address@hidden>
---
net/net.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/net/net.c b/net/net.c
index 3295741..0fe5b8b 100644
--- a/net/net.c
+++ b/net/net.c
@@ -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,
NetClientState *peer, Error **errp)
{
- /* FIXME error_setg(errp, ...) on failure */
int idx;
NICInfo *nd;
const NetLegacyNicOptions *nic;
@@ -752,7 +751,7 @@ static int net_init_nic(const NetClientOptions *opts, const
char *name,
idx = nic_get_free_idx();
if (idx == -1 || nb_nics >= MAX_NICS) {
- error_report("Too Many NICs");
+ error_setg(errp, "too many NICs");
return -1;
}
@@ -763,7 +762,7 @@ static int net_init_nic(const NetClientOptions *opts, const
char *name,
if (nic->has_netdev) {
nd->netdev = qemu_find_netdev(nic->netdev);
if (!nd->netdev) {
- error_report("netdev '%s' not found", nic->netdev);
+ error_setg(errp, "netdev '%s' not found", nic->netdev);
return -1;
}
} else {
@@ -780,19 +779,20 @@ static int net_init_nic(const NetClientOptions *opts,
const char *name,
if (nic->has_macaddr &&
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;
}
if (nic->has_macaddr &&
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;
}
qemu_macaddr_default_if_unset(&nd->macaddr);
if (nic->has_vectors) {
if (nic->vectors > 0x7ffffff) {
- error_report("invalid # of vectors: %"PRIu32, nic->vectors);
+ error_setg(errp, "invalid # of vectors: %"PRIu32, nic->vectors);
return -1;
}
nd->nvectors = nic->vectors;
--
2.4.1
- [Qemu-devel] [PULL 00/17] Net patches, Stefan Hajnoczi, 2015/05/27
- [Qemu-devel] [PULL 01/17] net: Change help text to list -netdev instead of -net by default, Stefan Hajnoczi, 2015/05/27
- [Qemu-devel] [PULL 02/17] net: Improve error message for -net hubport a bit, Stefan Hajnoczi, 2015/05/27
- [Qemu-devel] [PULL 04/17] net: Improve -net nic error reporting,
Stefan Hajnoczi <=
- [Qemu-devel] [PULL 05/17] net/dump: Improve -net/host_net_add dump error reporting, Stefan Hajnoczi, 2015/05/27
- [Qemu-devel] [PULL 03/17] net: Permit incremental conversion of init functions to Error, Stefan Hajnoczi, 2015/05/27
- [Qemu-devel] [PULL 06/17] tap: net_tap_fd_init() can't fail, drop dead error handling, Stefan Hajnoczi, 2015/05/27
- [Qemu-devel] [PULL 07/17] tap: Improve -netdev/netdev_add/-net/... bridge error reporting, Stefan Hajnoczi, 2015/05/27
- [Qemu-devel] [PULL 10/17] tap: Convert launch_script() to Error, Stefan Hajnoczi, 2015/05/27
- [Qemu-devel] [PULL 09/17] tap: Convert net_init_tap_one() to Error, Stefan Hajnoczi, 2015/05/27
- [Qemu-devel] [PULL 08/17] tap: Convert tap_set_sndbuf() to Error, Stefan Hajnoczi, 2015/05/27
- [Qemu-devel] [PULL 11/17] tap: Permit incremental conversion of tap_open() to Error, Stefan Hajnoczi, 2015/05/27
- [Qemu-devel] [PULL 12/17] tap-linux: Convert tap_open() to Error, Stefan Hajnoczi, 2015/05/27
- [Qemu-devel] [PULL 13/17] tap-bsd: Convert tap_open() to Error, Stefan Hajnoczi, 2015/05/27