* [Qemu-devel] [PATCH v2 0/2] Fix compilation of netmap backend
@ 2015-11-06 15:13 Vincenzo Maffione
2015-11-06 15:13 ` [Qemu-devel] [PATCH v2 1/2] net: netmap: Fix compilation issue Vincenzo Maffione
2015-11-06 15:13 ` [Qemu-devel] [PATCH v2 2/2] net: netmap: use error_setg_errno() in place of error_report() Vincenzo Maffione
0 siblings, 2 replies; 6+ messages in thread
From: Vincenzo Maffione @ 2015-11-06 15:13 UTC (permalink / raw)
To: qemu-devel; +Cc: rizzo, jasowang, armbru, v.maffione, g.lettieri
This patch series adds some fixes to the netmap net backend. It contains
two changes:
(1) Fix compilation issue of netmap.c introduced by the reorganization
of struct NetClientOptions
(2) Address the FIXME comment that was asking to use error_setg()
in place of error_report()
CHANGELOG:
- fixed commit messages to reference appropriate commits
- modify netmap_open() to return error in a local Error
variable
Vincenzo Maffione (2):
net: netmap: Fix compilation issue
net: netmap: use error_setg_errno() in place of error_report()
net/clients.h | 4 ++--
net/netmap.c | 34 +++++++++++++++++-----------------
2 files changed, 19 insertions(+), 19 deletions(-)
--
2.3.3
^ permalink raw reply [flat|nested] 6+ messages in thread
* [Qemu-devel] [PATCH v2 1/2] net: netmap: Fix compilation issue
2015-11-06 15:13 [Qemu-devel] [PATCH v2 0/2] Fix compilation of netmap backend Vincenzo Maffione
@ 2015-11-06 15:13 ` Vincenzo Maffione
2015-11-06 15:30 ` Eric Blake
2015-11-06 15:13 ` [Qemu-devel] [PATCH v2 2/2] net: netmap: use error_setg_errno() in place of error_report() Vincenzo Maffione
1 sibling, 1 reply; 6+ messages in thread
From: Vincenzo Maffione @ 2015-11-06 15:13 UTC (permalink / raw)
To: qemu-devel; +Cc: rizzo, jasowang, armbru, v.maffione, g.lettieri
Reorganization of struct NetClientOptions (commit e4ba22b) caused a
compilation failure of the netmap backend. This patch fixes the issue
by properly accessing the union field.
Signed-off-by: Vincenzo Maffione <v.maffione@gmail.com>
---
net/netmap.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net/netmap.c b/net/netmap.c
index 508b829..4197a9c 100644
--- a/net/netmap.c
+++ b/net/netmap.c
@@ -439,7 +439,7 @@ int net_init_netmap(const NetClientOptions *opts,
const char *name, NetClientState *peer, Error **errp)
{
/* FIXME error_setg(errp, ...) on failure */
- const NetdevNetmapOptions *netmap_opts = opts->netmap;
+ const NetdevNetmapOptions *netmap_opts = opts->u.netmap;
NetClientState *nc;
NetmapPriv me;
NetmapState *s;
--
2.3.3
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [Qemu-devel] [PATCH v2 2/2] net: netmap: use error_setg_errno() in place of error_report()
2015-11-06 15:13 [Qemu-devel] [PATCH v2 0/2] Fix compilation of netmap backend Vincenzo Maffione
2015-11-06 15:13 ` [Qemu-devel] [PATCH v2 1/2] net: netmap: Fix compilation issue Vincenzo Maffione
@ 2015-11-06 15:13 ` Vincenzo Maffione
2015-11-06 15:35 ` Eric Blake
1 sibling, 1 reply; 6+ messages in thread
From: Vincenzo Maffione @ 2015-11-06 15:13 UTC (permalink / raw)
To: qemu-devel; +Cc: rizzo, jasowang, armbru, v.maffione, g.lettieri
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(-)
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;
}
--
2.3.3
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [Qemu-devel] [PATCH v2 1/2] net: netmap: Fix compilation issue
2015-11-06 15:13 ` [Qemu-devel] [PATCH v2 1/2] net: netmap: Fix compilation issue Vincenzo Maffione
@ 2015-11-06 15:30 ` Eric Blake
0 siblings, 0 replies; 6+ messages in thread
From: Eric Blake @ 2015-11-06 15:30 UTC (permalink / raw)
To: Vincenzo Maffione, qemu-devel; +Cc: jasowang, rizzo, g.lettieri, armbru
[-- Attachment #1: Type: text/plain, Size: 610 bytes --]
On 11/06/2015 08:13 AM, Vincenzo Maffione wrote:
> Reorganization of struct NetClientOptions (commit e4ba22b) caused a
> compilation failure of the netmap backend. This patch fixes the issue
> by properly accessing the union field.
Technically, it was 8d0bcba that missed converting net/netmap.c
alongside all the other net/*, but e4ba22b that turned it into a compile
error. But no need to respin for that; the commit message is good enough.
Reviewed-by: Eric Blake <eblake@redhat.com>
--
Eric Blake eblake redhat com +1-919-301-3266
Libvirt virtualization library http://libvirt.org
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 604 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [Qemu-devel] [PATCH v2 2/2] net: netmap: use error_setg_errno() in place of error_report()
2015-11-06 15:13 ` [Qemu-devel] [PATCH v2 2/2] net: netmap: use error_setg_errno() in place of error_report() Vincenzo Maffione
@ 2015-11-06 15:35 ` Eric Blake
2015-11-09 18:47 ` Vincenzo Maffione
0 siblings, 1 reply; 6+ messages in thread
From: Eric Blake @ 2015-11-06 15:35 UTC (permalink / raw)
To: Vincenzo Maffione, qemu-devel; +Cc: jasowang, rizzo, g.lettieri, armbru
[-- Attachment #1: Type: text/plain, Size: 1541 bytes --]
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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 604 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [Qemu-devel] [PATCH v2 2/2] net: netmap: use error_setg_errno() in place of error_report()
2015-11-06 15:35 ` Eric Blake
@ 2015-11-09 18:47 ` Vincenzo Maffione
0 siblings, 0 replies; 6+ messages in thread
From: Vincenzo Maffione @ 2015-11-09 18:47 UTC (permalink / raw)
To: Eric Blake
Cc: Giuseppe Lettieri, Jason Wang, Luigi Rizzo, qemu-devel,
Markus Armbruster
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
>
--
Vincenzo Maffione
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2015-11-09 18:47 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-11-06 15:13 [Qemu-devel] [PATCH v2 0/2] Fix compilation of netmap backend Vincenzo Maffione
2015-11-06 15:13 ` [Qemu-devel] [PATCH v2 1/2] net: netmap: Fix compilation issue Vincenzo Maffione
2015-11-06 15:30 ` Eric Blake
2015-11-06 15:13 ` [Qemu-devel] [PATCH v2 2/2] net: netmap: use error_setg_errno() in place of error_report() Vincenzo Maffione
2015-11-06 15:35 ` Eric Blake
2015-11-09 18:47 ` Vincenzo Maffione
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.