| Message ID | 1411111624-3064-1-git-send-email-armbru@redhat.com |
|---|---|
| State | New |
| Headers | show |
> Subject: [Qemu-devel] [PATCH] qemu-socket: Polish errors for connect() and > listen() failure > > connect() doesn't "connect to socket", it connects a socket to an > address and, if it's of type SOCK_STREAM, initiates a connection. > Scratch "to". > > listen() does "set socket to listening mode", but it sounds awkward. > Change to "listen on socket". > > Signed-off-by: Markus Armbruster <armbru@redhat.com> > --- > include/qapi/qmp/qerror.h | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > Reviewed-by: Gonglei <arei.gonglei@huawei.com> And Cc'ing qemu-trivial@ Best regards, -Gonglei > diff --git a/include/qapi/qmp/qerror.h b/include/qapi/qmp/qerror.h > index 902d1a7..774e75d 100644 > --- a/include/qapi/qmp/qerror.h > +++ b/include/qapi/qmp/qerror.h > @@ -155,10 +155,10 @@ void qerror_report_err(Error *err); > ERROR_CLASS_GENERIC_ERROR, "this feature or command is not > currently supported" > > #define QERR_SOCKET_CONNECT_FAILED \ > - ERROR_CLASS_GENERIC_ERROR, "Failed to connect to socket" > + ERROR_CLASS_GENERIC_ERROR, "Failed to connect socket" > > #define QERR_SOCKET_LISTEN_FAILED \ > - ERROR_CLASS_GENERIC_ERROR, "Failed to set socket to listening mode" > + ERROR_CLASS_GENERIC_ERROR, "Failed to listen on socket" > > #define QERR_SOCKET_BIND_FAILED \ > ERROR_CLASS_GENERIC_ERROR, "Failed to bind socket" > -- > 1.9.3 >
On Fri, 19 Sep 2014 09:27:04 +0200 Markus Armbruster <armbru@redhat.com> wrote: > connect() doesn't "connect to socket", it connects a socket to an > address and, if it's of type SOCK_STREAM, initiates a connection. > Scratch "to". > > listen() does "set socket to listening mode", but it sounds awkward. > Change to "listen on socket". > > Signed-off-by: Markus Armbruster <armbru@redhat.com> > --- > include/qapi/qmp/qerror.h | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/include/qapi/qmp/qerror.h b/include/qapi/qmp/qerror.h > index 902d1a7..774e75d 100644 > --- a/include/qapi/qmp/qerror.h > +++ b/include/qapi/qmp/qerror.h > @@ -155,10 +155,10 @@ void qerror_report_err(Error *err); > ERROR_CLASS_GENERIC_ERROR, "this feature or command is not currently supported" > > #define QERR_SOCKET_CONNECT_FAILED \ > - ERROR_CLASS_GENERIC_ERROR, "Failed to connect to socket" > + ERROR_CLASS_GENERIC_ERROR, "Failed to connect socket" > > #define QERR_SOCKET_LISTEN_FAILED \ > - ERROR_CLASS_GENERIC_ERROR, "Failed to set socket to listening mode" > + ERROR_CLASS_GENERIC_ERROR, "Failed to listen on socket" > > #define QERR_SOCKET_BIND_FAILED \ > ERROR_CLASS_GENERIC_ERROR, "Failed to bind socket" The word fixing is good, but what about getting rid of the QERR_ macros too? The easiest way to do this would be to just replace each macro with its text. If the string duplication bothers you (it doesn't bother me very much, btw) you could create wrappers say qemu_listen() or listen_errp() or whatever.
Luiz Capitulino <lcapitulino@redhat.com> writes: > On Fri, 19 Sep 2014 09:27:04 +0200 > Markus Armbruster <armbru@redhat.com> wrote: > >> connect() doesn't "connect to socket", it connects a socket to an >> address and, if it's of type SOCK_STREAM, initiates a connection. >> Scratch "to". >> >> listen() does "set socket to listening mode", but it sounds awkward. >> Change to "listen on socket". >> >> Signed-off-by: Markus Armbruster <armbru@redhat.com> >> --- >> include/qapi/qmp/qerror.h | 4 ++-- >> 1 file changed, 2 insertions(+), 2 deletions(-) >> >> diff --git a/include/qapi/qmp/qerror.h b/include/qapi/qmp/qerror.h >> index 902d1a7..774e75d 100644 >> --- a/include/qapi/qmp/qerror.h >> +++ b/include/qapi/qmp/qerror.h >> @@ -155,10 +155,10 @@ void qerror_report_err(Error *err); >> ERROR_CLASS_GENERIC_ERROR, "this feature or command is not currently supported" >> >> #define QERR_SOCKET_CONNECT_FAILED \ >> - ERROR_CLASS_GENERIC_ERROR, "Failed to connect to socket" >> + ERROR_CLASS_GENERIC_ERROR, "Failed to connect socket" >> >> #define QERR_SOCKET_LISTEN_FAILED \ >> - ERROR_CLASS_GENERIC_ERROR, "Failed to set socket to listening mode" >> + ERROR_CLASS_GENERIC_ERROR, "Failed to listen on socket" >> >> #define QERR_SOCKET_BIND_FAILED \ >> ERROR_CLASS_GENERIC_ERROR, "Failed to bind socket" > > The word fixing is good, but what about getting rid of the QERR_ macros > too? > > The easiest way to do this would be to just replace each macro with its > text. If the string duplication bothers you (it doesn't bother me very > much, btw) you could create wrappers say qemu_listen() or listen_errp() > or whatever. I can do that on top. Okay?
On Fri, 19 Sep 2014 19:16:08 +0200 Markus Armbruster <armbru@redhat.com> wrote: > Luiz Capitulino <lcapitulino@redhat.com> writes: > > > On Fri, 19 Sep 2014 09:27:04 +0200 > > Markus Armbruster <armbru@redhat.com> wrote: > > > >> connect() doesn't "connect to socket", it connects a socket to an > >> address and, if it's of type SOCK_STREAM, initiates a connection. > >> Scratch "to". > >> > >> listen() does "set socket to listening mode", but it sounds awkward. > >> Change to "listen on socket". > >> > >> Signed-off-by: Markus Armbruster <armbru@redhat.com> > >> --- > >> include/qapi/qmp/qerror.h | 4 ++-- > >> 1 file changed, 2 insertions(+), 2 deletions(-) > >> > >> diff --git a/include/qapi/qmp/qerror.h b/include/qapi/qmp/qerror.h > >> index 902d1a7..774e75d 100644 > >> --- a/include/qapi/qmp/qerror.h > >> +++ b/include/qapi/qmp/qerror.h > >> @@ -155,10 +155,10 @@ void qerror_report_err(Error *err); > >> ERROR_CLASS_GENERIC_ERROR, "this feature or command is not currently supported" > >> > >> #define QERR_SOCKET_CONNECT_FAILED \ > >> - ERROR_CLASS_GENERIC_ERROR, "Failed to connect to socket" > >> + ERROR_CLASS_GENERIC_ERROR, "Failed to connect socket" > >> > >> #define QERR_SOCKET_LISTEN_FAILED \ > >> - ERROR_CLASS_GENERIC_ERROR, "Failed to set socket to listening mode" > >> + ERROR_CLASS_GENERIC_ERROR, "Failed to listen on socket" > >> > >> #define QERR_SOCKET_BIND_FAILED \ > >> ERROR_CLASS_GENERIC_ERROR, "Failed to bind socket" > > > > The word fixing is good, but what about getting rid of the QERR_ macros > > too? > > > > The easiest way to do this would be to just replace each macro with its > > text. If the string duplication bothers you (it doesn't bother me very > > much, btw) you could create wrappers say qemu_listen() or listen_errp() > > or whatever. > > I can do that on top. Okay? OK.
On Fri, 19 Sep 2014 09:27:04 +0200 Markus Armbruster <armbru@redhat.com> wrote: > connect() doesn't "connect to socket", it connects a socket to an > address and, if it's of type SOCK_STREAM, initiates a connection. > Scratch "to". > > listen() does "set socket to listening mode", but it sounds awkward. > Change to "listen on socket". > > Signed-off-by: Markus Armbruster <armbru@redhat.com> Applied to the qmp branch, thanks. > --- > include/qapi/qmp/qerror.h | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/include/qapi/qmp/qerror.h b/include/qapi/qmp/qerror.h > index 902d1a7..774e75d 100644 > --- a/include/qapi/qmp/qerror.h > +++ b/include/qapi/qmp/qerror.h > @@ -155,10 +155,10 @@ void qerror_report_err(Error *err); > ERROR_CLASS_GENERIC_ERROR, "this feature or command is not currently supported" > > #define QERR_SOCKET_CONNECT_FAILED \ > - ERROR_CLASS_GENERIC_ERROR, "Failed to connect to socket" > + ERROR_CLASS_GENERIC_ERROR, "Failed to connect socket" > > #define QERR_SOCKET_LISTEN_FAILED \ > - ERROR_CLASS_GENERIC_ERROR, "Failed to set socket to listening mode" > + ERROR_CLASS_GENERIC_ERROR, "Failed to listen on socket" > > #define QERR_SOCKET_BIND_FAILED \ > ERROR_CLASS_GENERIC_ERROR, "Failed to bind socket"
diff --git a/include/qapi/qmp/qerror.h b/include/qapi/qmp/qerror.h index 902d1a7..774e75d 100644 --- a/include/qapi/qmp/qerror.h +++ b/include/qapi/qmp/qerror.h @@ -155,10 +155,10 @@ void qerror_report_err(Error *err); ERROR_CLASS_GENERIC_ERROR, "this feature or command is not currently supported" #define QERR_SOCKET_CONNECT_FAILED \ - ERROR_CLASS_GENERIC_ERROR, "Failed to connect to socket" + ERROR_CLASS_GENERIC_ERROR, "Failed to connect socket" #define QERR_SOCKET_LISTEN_FAILED \ - ERROR_CLASS_GENERIC_ERROR, "Failed to set socket to listening mode" + ERROR_CLASS_GENERIC_ERROR, "Failed to listen on socket" #define QERR_SOCKET_BIND_FAILED \ ERROR_CLASS_GENERIC_ERROR, "Failed to bind socket"
connect() doesn't "connect to socket", it connects a socket to an address and, if it's of type SOCK_STREAM, initiates a connection. Scratch "to". listen() does "set socket to listening mode", but it sounds awkward. Change to "listen on socket". Signed-off-by: Markus Armbruster <armbru@redhat.com> --- include/qapi/qmp/qerror.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)