[Qemu-devel] [PATCH v2 0/2] trivial fix of qemu-sockets.c

[Qemu-devel] [PATCH v2 0/2] trivial fix of qemu-sockets.c

[Amos Kong]

Those patches fix trivial issues which were found
in the second review.

Amos Kong (2):
  remove unused include of error.h
  socket: clean up redundant assignment

 qemu-sockets.c |    1 -
 qemu_socket.h  |    1 -
 2 files changed, 0 insertions(+), 2 deletions(-)

Changes from v1:
- drop wrong patch: [PATCH] socket: remove redundant check

[Qemu-devel] [PATCH v2 1/2] remove unused include of error.h

[Amos Kong]

Signed-off-by: Amos Kong <akong@redhat.com>
---
 qemu_socket.h |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/qemu_socket.h b/qemu_socket.h
index 4689ff3..1a2f517 100644
--- a/qemu_socket.h
+++ b/qemu_socket.h
@@ -27,7 +27,6 @@ int inet_aton(const char *cp, struct in_addr *ia);
 #endif /* !_WIN32 */
 
 #include "qemu-option.h"
-#include "error.h"
 #include "qerror.h"
 
 /* misc helpers */
-- 
1.7.1

Re: [Qemu-devel] [PATCH v2 1/2] remove unused include of error.h

[Luiz Capitulino]

On Fri,  3 Aug 2012 11:06:21 +0800
Amos Kong <akong@redhat.com> wrote:

> Signed-off-by: Amos Kong <akong@redhat.com>
> ---
>  qemu_socket.h |    1 -
>  1 files changed, 0 insertions(+), 1 deletions(-)
> 
> diff --git a/qemu_socket.h b/qemu_socket.h
> index 4689ff3..1a2f517 100644
> --- a/qemu_socket.h
> +++ b/qemu_socket.h
> @@ -27,7 +27,6 @@ int inet_aton(const char *cp, struct in_addr *ia);
>  #endif /* !_WIN32 */
>  
>  #include "qemu-option.h"
> -#include "error.h"
>  #include "qerror.h"

This is wrong. There are functions in this header that takes an Error argument
(which is declared in error.h).

qerror.h should be dropped though, as it's deprecated and as such shouldn't
be in a public header like this. If you get build failures, then you can
include it in the .c files where it's missing.

>  
>  /* misc helpers */

Re: [Qemu-devel] [PATCH v2 1/2] remove unused include of error.h

[Stefan Hajnoczi]

On Fri, Aug 3, 2012 at 4:06 AM, Amos Kong <akong@redhat.com> wrote:
> Signed-off-by: Amos Kong <akong@redhat.com>
> ---
>  qemu_socket.h |    1 -
>  1 files changed, 0 insertions(+), 1 deletions(-)

I have dropped this, see Luiz' comment.

Stefan

[Qemu-devel] [PATCH v2 2/2] socket: clean up redundant assignment

[Amos Kong]

Signed-off-by: Amos Kong <akong@redhat.com>
---
 qemu-sockets.c |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/qemu-sockets.c b/qemu-sockets.c
index 668fa93..beb2bb6 100644
--- a/qemu-sockets.c
+++ b/qemu-sockets.c
@@ -284,7 +284,6 @@ int inet_connect_opts(QemuOpts *opts, Error **errp)
                         inet_strfamily(e->ai_family),
                         e->ai_canonname, uaddr, uport, strerror(errno));
             closesocket(sock);
-            sock = -1;
             continue;
         }
         freeaddrinfo(res);
-- 
1.7.1

Re: [Qemu-devel] [PATCH v2 2/2] socket: clean up redundant assignment

[Luiz Capitulino]

On Fri,  3 Aug 2012 11:06:22 +0800
Amos Kong <akong@redhat.com> wrote:

> Signed-off-by: Amos Kong <akong@redhat.com>

Reviewed-by: Luiz Capitulino <lcapitulino@redhat.com>

> ---
>  qemu-sockets.c |    1 -
>  1 files changed, 0 insertions(+), 1 deletions(-)
> 
> diff --git a/qemu-sockets.c b/qemu-sockets.c
> index 668fa93..beb2bb6 100644
> --- a/qemu-sockets.c
> +++ b/qemu-sockets.c
> @@ -284,7 +284,6 @@ int inet_connect_opts(QemuOpts *opts, Error **errp)
>                          inet_strfamily(e->ai_family),
>                          e->ai_canonname, uaddr, uport, strerror(errno));
>              closesocket(sock);
> -            sock = -1;
>              continue;
>          }
>          freeaddrinfo(res);

Re: [Qemu-devel] [PATCH v2 0/2] trivial fix of qemu-sockets.c

[Stefan Hajnoczi]

On Fri, Aug 3, 2012 at 4:06 AM, Amos Kong <akong@redhat.com> wrote:
> Those patches fix trivial issues which were found
> in the second review.
>
> Amos Kong (2):
>   remove unused include of error.h
>   socket: clean up redundant assignment
>
>  qemu-sockets.c |    1 -
>  qemu_socket.h  |    1 -
>  2 files changed, 0 insertions(+), 2 deletions(-)
>
> Changes from v1:
> - drop wrong patch: [PATCH] socket: remove redundant check

Thanks, merged.  I will update the pending trivial-patches pull
request to include these patches.

https://github.com/stefanha/qemu/commits/trivial-patches

Stefan