[Qemu-devel] [PATCH 0/3] bitops: Header dependency fixes

[Qemu-devel] [PATCH 0/3] bitops: Header dependency fixes

[Eduardo Habkost]

This series adds a missing include, kills a circular header dependency, and
avoid including qemu-common.h from a header to avoid new circular dependencies.

Eduardo Habkost (3):
  tests: Add missing include to test-bitops.c
  bitops.h: Don't include qemu-common.h
  bitmap.h: Don't include qemu-common.h

 include/qemu/bitmap.h | 5 ++++-
 include/qemu/bitops.h | 4 +++-
 tests/test-bitops.c   | 1 +
 3 files changed, 8 insertions(+), 2 deletions(-)

-- 
1.9.3

[Qemu-devel] [PATCH 1/3] tests: Add missing include to test-bitops.c

[Eduardo Habkost]

The test code needs osdep.h for the ARRAY_SIZE macro.

Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
 tests/test-bitops.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/test-bitops.c b/tests/test-bitops.c
index 8238eb5..47b5d3e 100644
--- a/tests/test-bitops.c
+++ b/tests/test-bitops.c
@@ -8,6 +8,7 @@
 
 #include <glib.h>
 #include <stdint.h>
+#include "qemu/osdep.h"
 #include "qemu/bitops.h"
 
 typedef struct {
-- 
1.9.3

[Qemu-devel] [PATCH 2/3] bitops.h: Don't include qemu-common.h

[Eduardo Habkost]

This removes the following circular dependency:

bitops.h -> qemu-common.h -> target-i386/cpu.h -> target-i386/cpu-qom.h ->
qom/cpu.h -> qdev-core.h -> bitmap.h -> bitops.h.

Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
 include/qemu/bitops.h | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/include/qemu/bitops.h b/include/qemu/bitops.h
index 7e2d5c9..181bd46 100644
--- a/include/qemu/bitops.h
+++ b/include/qemu/bitops.h
@@ -12,7 +12,9 @@
 #ifndef BITOPS_H
 #define BITOPS_H
 
-#include "qemu-common.h"
+#include <stdint.h>
+#include <assert.h>
+
 #include "host-utils.h"
 
 #define BITS_PER_BYTE           CHAR_BIT
-- 
1.9.3

[Qemu-devel] [PATCH 3/3] bitmap.h: Don't include qemu-common.h

[Eduardo Habkost]

This will avoid unexpected circular header dependencies in the future.

Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
 include/qemu/bitmap.h | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/include/qemu/bitmap.h b/include/qemu/bitmap.h
index 1babd5d..8c50d70 100644
--- a/include/qemu/bitmap.h
+++ b/include/qemu/bitmap.h
@@ -12,7 +12,10 @@
 #ifndef BITMAP_H
 #define BITMAP_H
 
-#include "qemu-common.h"
+#include <glib.h>
+#include <string.h>
+
+#include "qemu/osdep.h"
 #include "qemu/bitops.h"
 
 /*
-- 
1.9.3

Re: [Qemu-devel] [Qemu-trivial] [PATCH 0/3] bitops: Header dependency fixes

[Michael Tokarev]

On 09/26/2014 11:46 PM, Eduardo Habkost wrote:
> This series adds a missing include, kills a circular header dependency, and
> avoid including qemu-common.h from a header to avoid new circular dependencies.
> 
> Eduardo Habkost (3):
>   tests: Add missing include to test-bitops.c
>   bitops.h: Don't include qemu-common.h
>   bitmap.h: Don't include qemu-common.h

Applied all 3 to -trivial, _finally_ :)

Thank you!

/mjt

Re: [Qemu-devel] [Qemu-trivial] [PATCH 0/3] bitops: Header dependency fixes

[Eduardo Habkost]

On Thu, Oct 23, 2014 at 10:35:47AM +0400, Michael Tokarev wrote:
> On 09/26/2014 11:46 PM, Eduardo Habkost wrote:
> > This series adds a missing include, kills a circular header dependency, and
> > avoid including qemu-common.h from a header to avoid new circular dependencies.
> > 
> > Eduardo Habkost (3):
> >   tests: Add missing include to test-bitops.c
> >   bitops.h: Don't include qemu-common.h
> >   bitmap.h: Don't include qemu-common.h
> 
> Applied all 3 to -trivial, _finally_ :)

Thanks!

But applying the series after commit be4d57c1ea7f17b9cadb0150b330efd9b6026972
breaks build, because now bitmap.h needs stdlib.h (for abort()). Can you
squash the following into patch 3/3?

---
 include/qemu/bitmap.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/include/qemu/bitmap.h b/include/qemu/bitmap.h
index 955627f..f0273c9 100644
--- a/include/qemu/bitmap.h
+++ b/include/qemu/bitmap.h
@@ -14,6 +14,7 @@
 
 #include <glib.h>
 #include <string.h>
+#include <stdlib.h>
 
 #include "qemu/osdep.h"
 #include "qemu/bitops.h"
-- 
1.9.3

Re: [Qemu-devel] [Qemu-trivial] [PATCH 0/3] bitops: Header dependency fixes

[Michael Tokarev]

On 10/23/2014 04:32 PM, Eduardo Habkost wrote:
> On Thu, Oct 23, 2014 at 10:35:47AM +0400, Michael Tokarev wrote:
>> On 09/26/2014 11:46 PM, Eduardo Habkost wrote:
>>> This series adds a missing include, kills a circular header dependency, and
>>> avoid including qemu-common.h from a header to avoid new circular dependencies.
>>>
>>> Eduardo Habkost (3):
>>>   tests: Add missing include to test-bitops.c
>>>   bitops.h: Don't include qemu-common.h
>>>   bitmap.h: Don't include qemu-common.h
>>
>> Applied all 3 to -trivial, _finally_ :)
> 
> Thanks!
> 
> But applying the series after commit be4d57c1ea7f17b9cadb0150b330efd9b6026972
> breaks build, because now bitmap.h needs stdlib.h (for abort()). Can you
> squash the following into patch 3/3?

Heh.  I already fixed it in local git, -- it become obvious right when I tried
to verify the whole lot, -- I usually perform build tests after applying all
patches, not after each of them (actually maybe this is not good, because this
way I can't catch "intermediate" breakage which breaks git bisection).

Yes, squashed it in.  Thank you!

/mjt

> ---
>  include/qemu/bitmap.h | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/include/qemu/bitmap.h b/include/qemu/bitmap.h
> index 955627f..f0273c9 100644
> --- a/include/qemu/bitmap.h
> +++ b/include/qemu/bitmap.h
> @@ -14,6 +14,7 @@
>  
>  #include <glib.h>
>  #include <string.h>
> +#include <stdlib.h>
>  
>  #include "qemu/osdep.h"
>  #include "qemu/bitops.h"
>