diff mbox

[v2,2/2] net: netmap: use error_setg_errno() in place of error_report()

Message ID 896ac39693833166f8ab806c557bc6552226a773.1446822384.git.v.maffione@gmail.com
State New
Headers show

Commit Message

Vincenzo Maffione Nov. 6, 2015, 3:13 p.m. UTC 
This update was required to align error reporting of netmap backend
initialization to the modifications introduced by commit a30ecde.

Signed-off-by: Vincenzo Maffione <v.maffione@gmail.com>
---
 net/clients.h |  4 ++--
 net/netmap.c  | 32 ++++++++++++++++----------------
 2 files changed, 18 insertions(+), 18 deletions(-)

Comments

Eric Blake Nov. 6, 2015, 3:35 p.m. UTC | #1 
On 11/06/2015 08:13 AM, Vincenzo Maffione wrote:
> This update was required to align error reporting of netmap backend
> initialization to the modifications introduced by commit a30ecde.
> 
> Signed-off-by: Vincenzo Maffione <v.maffione@gmail.com>
> ---
>  net/clients.h |  4 ++--
>  net/netmap.c  | 32 ++++++++++++++++----------------
>  2 files changed, 18 insertions(+), 18 deletions(-)
> 

> +++ b/net/netmap.c

> @@ -99,9 +99,9 @@ static int netmap_open(NetmapPriv *me)
>  
>      me->fd = fd = open(me->fdname, O_RDWR);
>      if (fd < 0) {
> -        error_report("Unable to open netmap device '%s' (%s)",
> -                        me->fdname, strerror(errno));
> -        return -1;
> +        error_setg_errno(errp, errno, "Unable to open netmap device '%s'",
> +                         me->fdname);

We have error_setg_file_open() for reporting open() failures, if
consistent messages are desired.

> @@ -125,11 +124,12 @@ static int netmap_open(NetmapPriv *me)
>      me->nifp = NETMAP_IF(me->mem, req.nr_offset);
>      me->tx = NETMAP_TXRING(me->nifp, 0);
>      me->rx = NETMAP_RXRING(me->nifp, 0);
> -    return 0;
> +
> +    return;
>  
>  error:
>      close(me->fd);
> -    return -1;
> +    return;
>  }

Dead return, if you wanted to remove it.

Minor enough that I'm okay with it whether or not you make those changes:
Reviewed-by: Eric Blake <eblake@redhat.com>
Vincenzo Maffione Nov. 9, 2015, 6:47 p.m. UTC | #2 
Ok, preparing them.

2015-11-06 16:35 GMT+01:00 Eric Blake <eblake@redhat.com>:
> On 11/06/2015 08:13 AM, Vincenzo Maffione wrote:
>> This update was required to align error reporting of netmap backend
>> initialization to the modifications introduced by commit a30ecde.
>>
>> Signed-off-by: Vincenzo Maffione <v.maffione@gmail.com>
>> ---
>>  net/clients.h |  4 ++--
>>  net/netmap.c  | 32 ++++++++++++++++----------------
>>  2 files changed, 18 insertions(+), 18 deletions(-)
>>
>
>> +++ b/net/netmap.c
>
>> @@ -99,9 +99,9 @@ static int netmap_open(NetmapPriv *me)
>>
>>      me->fd = fd = open(me->fdname, O_RDWR);
>>      if (fd < 0) {
>> -        error_report("Unable to open netmap device '%s' (%s)",
>> -                        me->fdname, strerror(errno));
>> -        return -1;
>> +        error_setg_errno(errp, errno, "Unable to open netmap device '%s'",
>> +                         me->fdname);
>
> We have error_setg_file_open() for reporting open() failures, if
> consistent messages are desired.
>
>> @@ -125,11 +124,12 @@ static int netmap_open(NetmapPriv *me)
>>      me->nifp = NETMAP_IF(me->mem, req.nr_offset);
>>      me->tx = NETMAP_TXRING(me->nifp, 0);
>>      me->rx = NETMAP_RXRING(me->nifp, 0);
>> -    return 0;
>> +
>> +    return;
>>
>>  error:
>>      close(me->fd);
>> -    return -1;
>> +    return;
>>  }
>
> Dead return, if you wanted to remove it.
>
> Minor enough that I'm okay with it whether or not you make those changes:
> Reviewed-by: Eric Blake <eblake@redhat.com>
>
> --
> Eric Blake   eblake redhat com    +1-919-301-3266
> Libvirt virtualization library http://libvirt.org
>
diff mbox

Patch

diff --git a/net/clients.h b/net/clients.h
index d47530e..aefe75e 100644
--- a/net/clients.h
+++ b/net/clients.h
@@ -55,8 +55,8 @@  int net_init_vde(const NetClientOptions *opts, const char *name,
 #endif
 
 #ifdef CONFIG_NETMAP
-int net_init_netmap(const NetClientOptions *opts, const char *name,
-                    NetClientState *peer, Error **errp);
+void net_init_netmap(const NetClientOptions *opts, const char *name,
+                     NetClientState *peer, Error **errp);
 #endif
 
 int net_init_vhost_user(const NetClientOptions *opts, const char *name,
diff --git a/net/netmap.c b/net/netmap.c
index 4197a9c..2b0254d 100644
--- a/net/netmap.c
+++ b/net/netmap.c
@@ -90,7 +90,7 @@  pkt_copy(const void *_src, void *_dst, int l)
  * Open a netmap device. We assume there is only one queue
  * (which is the case for the VALE bridge).
  */
-static int netmap_open(NetmapPriv *me)
+static void netmap_open(NetmapPriv *me, Error **errp)
 {
     int fd;
     int err;
@@ -99,9 +99,9 @@  static int netmap_open(NetmapPriv *me)
 
     me->fd = fd = open(me->fdname, O_RDWR);
     if (fd < 0) {
-        error_report("Unable to open netmap device '%s' (%s)",
-                        me->fdname, strerror(errno));
-        return -1;
+        error_setg_errno(errp, errno, "Unable to open netmap device '%s'",
+                         me->fdname);
+        return;
     }
     memset(&req, 0, sizeof(req));
     pstrcpy(req.nr_name, sizeof(req.nr_name), me->ifname);
@@ -109,15 +109,14 @@  static int netmap_open(NetmapPriv *me)
     req.nr_version = NETMAP_API;
     err = ioctl(fd, NIOCREGIF, &req);
     if (err) {
-        error_report("Unable to register %s: %s", me->ifname, strerror(errno));
+        error_setg_errno(errp, errno, "Unable to register %s", me->ifname);
         goto error;
     }
     l = me->memsize = req.nr_memsize;
 
     me->mem = mmap(0, l, PROT_WRITE | PROT_READ, MAP_SHARED, fd, 0);
     if (me->mem == MAP_FAILED) {
-        error_report("Unable to mmap netmap shared memory: %s",
-                        strerror(errno));
+        error_setg_errno(errp, errno, "Unable to mmap netmap shared memory");
         me->mem = NULL;
         goto error;
     }
@@ -125,11 +124,12 @@  static int netmap_open(NetmapPriv *me)
     me->nifp = NETMAP_IF(me->mem, req.nr_offset);
     me->tx = NETMAP_TXRING(me->nifp, 0);
     me->rx = NETMAP_RXRING(me->nifp, 0);
-    return 0;
+
+    return;
 
 error:
     close(me->fd);
-    return -1;
+    return;
 }
 
 static void netmap_send(void *opaque);
@@ -435,12 +435,12 @@  static NetClientInfo net_netmap_info = {
  *
  * ... -net netmap,ifname="..."
  */
-int net_init_netmap(const NetClientOptions *opts,
-                    const char *name, NetClientState *peer, Error **errp)
+void net_init_netmap(const NetClientOptions *opts,
+                     const char *name, NetClientState *peer, Error **errp)
 {
-    /* FIXME error_setg(errp, ...) on failure */
     const NetdevNetmapOptions *netmap_opts = opts->u.netmap;
     NetClientState *nc;
+    Error *err = NULL;
     NetmapPriv me;
     NetmapState *s;
 
@@ -448,8 +448,10 @@  int net_init_netmap(const NetClientOptions *opts,
         netmap_opts->has_devname ? netmap_opts->devname : "/dev/netmap");
     /* Set default name for the port if not supplied. */
     pstrcpy(me.ifname, sizeof(me.ifname), netmap_opts->ifname);
-    if (netmap_open(&me)) {
-        return -1;
+    netmap_open(&me, &err);
+    if (err) {
+        error_propagate(errp, err);
+        return;
     }
     /* Create the object. */
     nc = qemu_new_net_client(&net_netmap_info, peer, "netmap", name);
@@ -457,7 +459,5 @@  int net_init_netmap(const NetClientOptions *opts,
     s->me = me;
     s->vnet_hdr_len = 0;
     netmap_read_poll(s, true); /* Initially only poll for reads. */
-
-    return 0;
 }