* Markus Armbruster ([email protected]) wrote: > Error messages change from > > Can't open /dev/ip (actually /dev/udp) > Can't open /dev/tap > Can't open /dev/tap (2) > > to > > Could not open '/dev/udp': REASON > Could not open '/dev/tap': REASON > > where REASON is the value of strerror(errno).
I guess the new macro has a __LINE__ so the (2) is redundant. > > Signed-off-by: Markus Armbruster <[email protected]> Reviewed-by: Dr. David Alan Gilbert <[email protected]> > --- > net/tap-solaris.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/net/tap-solaris.c b/net/tap-solaris.c > index 75397e6c54..faf7922ea8 100644 > --- a/net/tap-solaris.c > +++ b/net/tap-solaris.c > @@ -87,13 +87,13 @@ static int tap_alloc(char *dev, size_t dev_size, Error > **errp) > > ip_fd = RETRY_ON_EINTR(open("/dev/udp", O_RDWR, 0)); > if (ip_fd < 0) { > - error_setg(errp, "Can't open /dev/ip (actually /dev/udp)"); > + error_setg_file_open(errp, errno, "/dev/udp"); > return -1; > } > > tap_fd = RETRY_ON_EINTR(open("/dev/tap", O_RDWR, 0)); > if (tap_fd < 0) { > - error_setg(errp, "Can't open /dev/tap"); > + error_setg_file_open(errp, errno, "/dev/tap"); > return -1; > } > > @@ -107,7 +107,7 @@ static int tap_alloc(char *dev, size_t dev_size, Error > **errp) > > if_fd = RETRY_ON_EINTR(open("/dev/tap", O_RDWR, 0)); > if (if_fd < 0) { > - error_setg(errp, "Can't open /dev/tap (2)"); > + error_setg_file_open(errp, errno, "/dev/tap"); > return -1; > } > if(ioctl(if_fd, I_PUSH, "ip") < 0){ > -- > 2.49.0 > -- -----Open up your eyes, open up your mind, open up your code ------- / Dr. David Alan Gilbert | Running GNU/Linux | Happy \ \ dave @ treblig.org | | In Hex / \ _________________________|_____ http://www.treblig.org |_______/
