net: netmap: use error_setg() helpers in place of error_report()
This update was required to align error reporting of netmap backend
initialization to the modifications introduced by commit a30ecde
.
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Vincenzo Maffione <v.maffione@gmail.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>
This commit is contained in:
parent
54c59b4de5
commit
39bec4f38b
22
net/netmap.c
22
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
|
* Open a netmap device. We assume there is only one queue
|
||||||
* (which is the case for the VALE bridge).
|
* (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 fd;
|
||||||
int err;
|
int err;
|
||||||
|
@ -99,9 +99,8 @@ static int netmap_open(NetmapPriv *me)
|
||||||
|
|
||||||
me->fd = fd = open(me->fdname, O_RDWR);
|
me->fd = fd = open(me->fdname, O_RDWR);
|
||||||
if (fd < 0) {
|
if (fd < 0) {
|
||||||
error_report("Unable to open netmap device '%s' (%s)",
|
error_setg_file_open(errp, errno, me->fdname);
|
||||||
me->fdname, strerror(errno));
|
return;
|
||||||
return -1;
|
|
||||||
}
|
}
|
||||||
memset(&req, 0, sizeof(req));
|
memset(&req, 0, sizeof(req));
|
||||||
pstrcpy(req.nr_name, sizeof(req.nr_name), me->ifname);
|
pstrcpy(req.nr_name, sizeof(req.nr_name), me->ifname);
|
||||||
|
@ -109,15 +108,14 @@ static int netmap_open(NetmapPriv *me)
|
||||||
req.nr_version = NETMAP_API;
|
req.nr_version = NETMAP_API;
|
||||||
err = ioctl(fd, NIOCREGIF, &req);
|
err = ioctl(fd, NIOCREGIF, &req);
|
||||||
if (err) {
|
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;
|
goto error;
|
||||||
}
|
}
|
||||||
l = me->memsize = req.nr_memsize;
|
l = me->memsize = req.nr_memsize;
|
||||||
|
|
||||||
me->mem = mmap(0, l, PROT_WRITE | PROT_READ, MAP_SHARED, fd, 0);
|
me->mem = mmap(0, l, PROT_WRITE | PROT_READ, MAP_SHARED, fd, 0);
|
||||||
if (me->mem == MAP_FAILED) {
|
if (me->mem == MAP_FAILED) {
|
||||||
error_report("Unable to mmap netmap shared memory: %s",
|
error_setg_errno(errp, errno, "Unable to mmap netmap shared memory");
|
||||||
strerror(errno));
|
|
||||||
me->mem = NULL;
|
me->mem = NULL;
|
||||||
goto error;
|
goto error;
|
||||||
}
|
}
|
||||||
|
@ -125,11 +123,11 @@ static int netmap_open(NetmapPriv *me)
|
||||||
me->nifp = NETMAP_IF(me->mem, req.nr_offset);
|
me->nifp = NETMAP_IF(me->mem, req.nr_offset);
|
||||||
me->tx = NETMAP_TXRING(me->nifp, 0);
|
me->tx = NETMAP_TXRING(me->nifp, 0);
|
||||||
me->rx = NETMAP_RXRING(me->nifp, 0);
|
me->rx = NETMAP_RXRING(me->nifp, 0);
|
||||||
return 0;
|
|
||||||
|
return;
|
||||||
|
|
||||||
error:
|
error:
|
||||||
close(me->fd);
|
close(me->fd);
|
||||||
return -1;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static void netmap_send(void *opaque);
|
static void netmap_send(void *opaque);
|
||||||
|
@ -438,9 +436,9 @@ static NetClientInfo net_netmap_info = {
|
||||||
int net_init_netmap(const NetClientOptions *opts,
|
int net_init_netmap(const NetClientOptions *opts,
|
||||||
const char *name, NetClientState *peer, Error **errp)
|
const char *name, NetClientState *peer, Error **errp)
|
||||||
{
|
{
|
||||||
/* FIXME error_setg(errp, ...) on failure */
|
|
||||||
const NetdevNetmapOptions *netmap_opts = opts->u.netmap;
|
const NetdevNetmapOptions *netmap_opts = opts->u.netmap;
|
||||||
NetClientState *nc;
|
NetClientState *nc;
|
||||||
|
Error *err = NULL;
|
||||||
NetmapPriv me;
|
NetmapPriv me;
|
||||||
NetmapState *s;
|
NetmapState *s;
|
||||||
|
|
||||||
|
@ -448,7 +446,9 @@ int net_init_netmap(const NetClientOptions *opts,
|
||||||
netmap_opts->has_devname ? netmap_opts->devname : "/dev/netmap");
|
netmap_opts->has_devname ? netmap_opts->devname : "/dev/netmap");
|
||||||
/* Set default name for the port if not supplied. */
|
/* Set default name for the port if not supplied. */
|
||||||
pstrcpy(me.ifname, sizeof(me.ifname), netmap_opts->ifname);
|
pstrcpy(me.ifname, sizeof(me.ifname), netmap_opts->ifname);
|
||||||
if (netmap_open(&me)) {
|
netmap_open(&me, &err);
|
||||||
|
if (err) {
|
||||||
|
error_propagate(errp, err);
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
/* Create the object. */
|
/* Create the object. */
|
||||||
|
|
Loading…
Reference in a new issue