Patchwork [3/7] remove unused include of error.h

login
register
mail settings
Submitter Stefan Hajnoczi
Date Aug. 3, 2012, 10:51 a.m.
Message ID <1343991066-9814-4-git-send-email-stefanha@linux.vnet.ibm.com>
Download mbox | patch
Permalink /patch/174971/
State New
Headers show

Comments

Stefan Hajnoczi - Aug. 3, 2012, 10:51 a.m.
From: Amos Kong <akong@redhat.com>

Signed-off-by: Amos Kong <akong@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
---
 qemu_socket.h |    1 -
 1 file changed, 1 deletion(-)
Luiz Capitulino - Aug. 3, 2012, 1 p.m.
On Fri,  3 Aug 2012 11:51:02 +0100
Stefan Hajnoczi <stefanha@linux.vnet.ibm.com> wrote:

> From: Amos Kong <akong@redhat.com>
> 
> Signed-off-by: Amos Kong <akong@redhat.com>
> Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
> ---
>  qemu_socket.h |    1 -
>  1 file changed, 1 deletion(-)
> 
> 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"

nack on this one, as it's dropping the wrong file.

qemu_socket.h declares functions that take an Error argument, so it has
to include error.h.

However, qerror.h should be dropped and any build breakage should be
fixed by including qerror.h in the .c files it's missing.

>  
>  /* misc helpers */
Stefan Hajnoczi - Aug. 3, 2012, 1:24 p.m.
On Fri, Aug 3, 2012 at 2:00 PM, Luiz Capitulino <lcapitulino@redhat.com> wrote:
> On Fri,  3 Aug 2012 11:51:02 +0100
> Stefan Hajnoczi <stefanha@linux.vnet.ibm.com> wrote:
>
>> From: Amos Kong <akong@redhat.com>
>>
>> Signed-off-by: Amos Kong <akong@redhat.com>
>> Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
>> ---
>>  qemu_socket.h |    1 -
>>  1 file changed, 1 deletion(-)
>>
>> 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"
>
> nack on this one, as it's dropping the wrong file.
>
> qemu_socket.h declares functions that take an Error argument, so it has
> to include error.h.
>
> However, qerror.h should be dropped and any build breakage should be
> fixed by including qerror.h in the .c files it's missing.

Okay, let's drop this patch.  I build tested it across all targets, so
at least it doesn't break anything.

Stefan

Patch

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 */