Patchwork [1/6] error: Trim includes after "Move qemu_error & friends..."

login
register
mail settings
Submitter Markus Armbruster
Date March 17, 2010, 5:56 p.m.
Message ID <1268848614-6844-2-git-send-email-armbru@redhat.com>
Download mbox | patch
Permalink /patch/47963/
State New
Headers show

Comments

Markus Armbruster - March 17, 2010, 5:56 p.m.
Missed in commit 2f792016.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
 hw/qdev-properties.c |    1 +
 monitor.c            |    2 --
 sysemu.h             |    2 --
 3 files changed, 1 insertions(+), 4 deletions(-)
Luiz Capitulino - March 18, 2010, 9:30 p.m.
On Wed, 17 Mar 2010 18:56:49 +0100
Markus Armbruster <armbru@redhat.com> wrote:

> Missed in commit 2f792016.
> 
> Signed-off-by: Markus Armbruster <armbru@redhat.com>
> ---
>  hw/qdev-properties.c |    1 +
>  monitor.c            |    2 --
>  sysemu.h             |    2 --
>  3 files changed, 1 insertions(+), 4 deletions(-)
> 
> diff --git a/hw/qdev-properties.c b/hw/qdev-properties.c
> index 92d6793..157a111 100644
> --- a/hw/qdev-properties.c
> +++ b/hw/qdev-properties.c
> @@ -1,6 +1,7 @@
>  #include "sysemu.h"
>  #include "net.h"
>  #include "qdev.h"
> +#include "qerror.h"
>  
>  void *qdev_get_prop_ptr(DeviceState *dev, Property *prop)
>  {
> diff --git a/monitor.c b/monitor.c
> index 0448a70..822dc27 100644
> --- a/monitor.c
> +++ b/monitor.c
> @@ -49,10 +49,8 @@
>  #include "qint.h"
>  #include "qfloat.h"
>  #include "qlist.h"
> -#include "qdict.h"
>  #include "qbool.h"
>  #include "qstring.h"
> -#include "qerror.h"
>  #include "qjson.h"
>  #include "json-streamer.h"
>  #include "json-parser.h"
> diff --git a/sysemu.h b/sysemu.h
> index 8a9c630..9d3d51d 100644

 Hmm, why this second hunk? Also note that we have qemu-objects.h.

> --- a/sysemu.h
> +++ b/sysemu.h
> @@ -6,8 +6,6 @@
>  #include "qemu-option.h"
>  #include "qemu-queue.h"
>  #include "qemu-timer.h"
> -#include "qdict.h"
> -#include "qerror.h"
>  
>  #ifdef _WIN32
>  #include <windows.h>
Markus Armbruster - March 19, 2010, 9:31 p.m.
Luiz Capitulino <lcapitulino@redhat.com> writes:

> On Wed, 17 Mar 2010 18:56:49 +0100
> Markus Armbruster <armbru@redhat.com> wrote:
>
>> Missed in commit 2f792016.
>> 
>> Signed-off-by: Markus Armbruster <armbru@redhat.com>
>> ---
>>  hw/qdev-properties.c |    1 +
>>  monitor.c            |    2 --
>>  sysemu.h             |    2 --
>>  3 files changed, 1 insertions(+), 4 deletions(-)
>> 
>> diff --git a/hw/qdev-properties.c b/hw/qdev-properties.c
>> index 92d6793..157a111 100644
>> --- a/hw/qdev-properties.c
>> +++ b/hw/qdev-properties.c
>> @@ -1,6 +1,7 @@
>>  #include "sysemu.h"
>>  #include "net.h"
>>  #include "qdev.h"
>> +#include "qerror.h"
>>  
>>  void *qdev_get_prop_ptr(DeviceState *dev, Property *prop)
>>  {
>> diff --git a/monitor.c b/monitor.c
>> index 0448a70..822dc27 100644
>> --- a/monitor.c
>> +++ b/monitor.c
>> @@ -49,10 +49,8 @@
>>  #include "qint.h"
>>  #include "qfloat.h"
>>  #include "qlist.h"
>> -#include "qdict.h"
>>  #include "qbool.h"
>>  #include "qstring.h"
>> -#include "qerror.h"
>>  #include "qjson.h"
>>  #include "json-streamer.h"
>>  #include "json-parser.h"
>> diff --git a/sysemu.h b/sysemu.h
>> index 8a9c630..9d3d51d 100644
>
>  Hmm, why this second hunk? Also note that we have qemu-objects.h.

The one below or the one above?

What do you mean by "we have qemu-objects.h"?

>> --- a/sysemu.h
>> +++ b/sysemu.h
>> @@ -6,8 +6,6 @@
>>  #include "qemu-option.h"
>>  #include "qemu-queue.h"
>>  #include "qemu-timer.h"
>> -#include "qdict.h"
>> -#include "qerror.h"
>>  
>>  #ifdef _WIN32
>>  #include <windows.h>
Luiz Capitulino - March 22, 2010, 12:40 a.m.
On Fri, 19 Mar 2010 22:31:05 +0100
Markus Armbruster <armbru@redhat.com> wrote:

> Luiz Capitulino <lcapitulino@redhat.com> writes:
> 
> > On Wed, 17 Mar 2010 18:56:49 +0100
> > Markus Armbruster <armbru@redhat.com> wrote:
> >
> >> Missed in commit 2f792016.
> >> 
> >> Signed-off-by: Markus Armbruster <armbru@redhat.com>
> >> ---
> >>  hw/qdev-properties.c |    1 +
> >>  monitor.c            |    2 --
> >>  sysemu.h             |    2 --
> >>  3 files changed, 1 insertions(+), 4 deletions(-)
> >> 
> >> diff --git a/hw/qdev-properties.c b/hw/qdev-properties.c
> >> index 92d6793..157a111 100644
> >> --- a/hw/qdev-properties.c
> >> +++ b/hw/qdev-properties.c
> >> @@ -1,6 +1,7 @@
> >>  #include "sysemu.h"
> >>  #include "net.h"
> >>  #include "qdev.h"
> >> +#include "qerror.h"
> >>  
> >>  void *qdev_get_prop_ptr(DeviceState *dev, Property *prop)
> >>  {
> >> diff --git a/monitor.c b/monitor.c
> >> index 0448a70..822dc27 100644
> >> --- a/monitor.c
> >> +++ b/monitor.c
> >> @@ -49,10 +49,8 @@
> >>  #include "qint.h"
> >>  #include "qfloat.h"
> >>  #include "qlist.h"
> >> -#include "qdict.h"
> >>  #include "qbool.h"
> >>  #include "qstring.h"
> >> -#include "qerror.h"
> >>  #include "qjson.h"
> >>  #include "json-streamer.h"
> >>  #include "json-parser.h"
> >> diff --git a/sysemu.h b/sysemu.h
> >> index 8a9c630..9d3d51d 100644
> >
> >  Hmm, why this second hunk? Also note that we have qemu-objects.h.
> 
> The one below or the one above?

 The one above, but I believe it's because monitor.h includes them,
right? This is fine.

> What do you mean by "we have qemu-objects.h"?

 That header includes all QObject header files, so if you want do
some cleanup you could include it and drop all q-ones.

> 
> >> --- a/sysemu.h
> >> +++ b/sysemu.h
> >> @@ -6,8 +6,6 @@
> >>  #include "qemu-option.h"
> >>  #include "qemu-queue.h"
> >>  #include "qemu-timer.h"
> >> -#include "qdict.h"
> >> -#include "qerror.h"
> >>  
> >>  #ifdef _WIN32
> >>  #include <windows.h>
Markus Armbruster - March 22, 2010, 8:38 a.m.
Luiz Capitulino <lcapitulino@redhat.com> writes:

> On Fri, 19 Mar 2010 22:31:05 +0100
> Markus Armbruster <armbru@redhat.com> wrote:
>
>> Luiz Capitulino <lcapitulino@redhat.com> writes:
>> 
>> > On Wed, 17 Mar 2010 18:56:49 +0100
>> > Markus Armbruster <armbru@redhat.com> wrote:
>> >
>> >> Missed in commit 2f792016.
>> >> 
>> >> Signed-off-by: Markus Armbruster <armbru@redhat.com>
>> >> ---
>> >>  hw/qdev-properties.c |    1 +
>> >>  monitor.c            |    2 --
>> >>  sysemu.h             |    2 --
>> >>  3 files changed, 1 insertions(+), 4 deletions(-)
>> >> 
>> >> diff --git a/hw/qdev-properties.c b/hw/qdev-properties.c
>> >> index 92d6793..157a111 100644
>> >> --- a/hw/qdev-properties.c
>> >> +++ b/hw/qdev-properties.c
>> >> @@ -1,6 +1,7 @@
>> >>  #include "sysemu.h"
>> >>  #include "net.h"
>> >>  #include "qdev.h"
>> >> +#include "qerror.h"
>> >>  
>> >>  void *qdev_get_prop_ptr(DeviceState *dev, Property *prop)
>> >>  {
>> >> diff --git a/monitor.c b/monitor.c
>> >> index 0448a70..822dc27 100644
>> >> --- a/monitor.c
>> >> +++ b/monitor.c
>> >> @@ -49,10 +49,8 @@
>> >>  #include "qint.h"
>> >>  #include "qfloat.h"
>> >>  #include "qlist.h"
>> >> -#include "qdict.h"
>> >>  #include "qbool.h"
>> >>  #include "qstring.h"
>> >> -#include "qerror.h"
>> >>  #include "qjson.h"
>> >>  #include "json-streamer.h"
>> >>  #include "json-parser.h"
>> >> diff --git a/sysemu.h b/sysemu.h
>> >> index 8a9c630..9d3d51d 100644
>> >
>> >  Hmm, why this second hunk? Also note that we have qemu-objects.h.
>> 
>> The one below or the one above?
>
>  The one above, but I believe it's because monitor.h includes them,
> right? This is fine.

Right.

[...]

Patch

diff --git a/hw/qdev-properties.c b/hw/qdev-properties.c
index 92d6793..157a111 100644
--- a/hw/qdev-properties.c
+++ b/hw/qdev-properties.c
@@ -1,6 +1,7 @@ 
 #include "sysemu.h"
 #include "net.h"
 #include "qdev.h"
+#include "qerror.h"
 
 void *qdev_get_prop_ptr(DeviceState *dev, Property *prop)
 {
diff --git a/monitor.c b/monitor.c
index 0448a70..822dc27 100644
--- a/monitor.c
+++ b/monitor.c
@@ -49,10 +49,8 @@ 
 #include "qint.h"
 #include "qfloat.h"
 #include "qlist.h"
-#include "qdict.h"
 #include "qbool.h"
 #include "qstring.h"
-#include "qerror.h"
 #include "qjson.h"
 #include "json-streamer.h"
 #include "json-parser.h"
diff --git a/sysemu.h b/sysemu.h
index 8a9c630..9d3d51d 100644
--- a/sysemu.h
+++ b/sysemu.h
@@ -6,8 +6,6 @@ 
 #include "qemu-option.h"
 #include "qemu-queue.h"
 #include "qemu-timer.h"
-#include "qdict.h"
-#include "qerror.h"
 
 #ifdef _WIN32
 #include <windows.h>