diff mbox

[v2] memory_mapping: Rework cpu related includes

Message ID 1433714349-7262-1-git-send-email-crosthwaite.peter@gmail.com
State New
Headers show

Commit Message

Peter Crosthwaite June 7, 2015, 9:59 p.m. UTC
This makes it more consistent with all other core code files, which
either just rely on qemu-common.h inclusion or precede cpu.h with
qemu-common.h.

cpu-all.h should not be included in addition to cpu.h. Remove it.

Signed-off-by: Peter Crosthwaite <crosthwaite.peter@gmail.com>
---
changed since v1:
Leave in cpu.h include

Picked up by my multi arch WIP where target-multi/cpu.h cant handle
random core code inclusion without preceeded qemu-common.h. I guess
this is the only one in tree?
---
 memory_mapping.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Paolo Bonzini June 8, 2015, 10:47 a.m. UTC | #1
On 07/06/2015 23:59, Peter Crosthwaite wrote:
> This makes it more consistent with all other core code files, which
> either just rely on qemu-common.h inclusion or precede cpu.h with
> qemu-common.h.
> 
> cpu-all.h should not be included in addition to cpu.h. Remove it.
> 
> Signed-off-by: Peter Crosthwaite <crosthwaite.peter@gmail.com>
> ---
> changed since v1:
> Leave in cpu.h include
> 
> Picked up by my multi arch WIP where target-multi/cpu.h cant handle
> random core code inclusion without preceeded qemu-common.h. I guess
> this is the only one in tree?
> ---
>  memory_mapping.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/memory_mapping.c b/memory_mapping.c
> index 7b69801..36d6b26 100644
> --- a/memory_mapping.c
> +++ b/memory_mapping.c
> @@ -13,8 +13,8 @@
>  
>  #include <glib.h>
>  
> +#include "qemu-common.h"
>  #include "cpu.h"
> -#include "exec/cpu-all.h"
>  #include "sysemu/memory_mapping.h"
>  #include "exec/memory.h"
>  #include "exec/address-spaces.h"
> 

Acked-by: Paolo Bonzini <pbonzini@redhat.com>

About to leave on vacation, so someone else will have to pick it up.

Paolo
Peter Crosthwaite June 9, 2015, 7:42 a.m. UTC | #2
On Mon, Jun 8, 2015 at 3:47 AM, Paolo Bonzini <pbonzini@redhat.com> wrote:
>
>
> On 07/06/2015 23:59, Peter Crosthwaite wrote:
>> This makes it more consistent with all other core code files, which
>> either just rely on qemu-common.h inclusion or precede cpu.h with
>> qemu-common.h.
>>
>> cpu-all.h should not be included in addition to cpu.h. Remove it.
>>
>> Signed-off-by: Peter Crosthwaite <crosthwaite.peter@gmail.com>
>> ---
>> changed since v1:
>> Leave in cpu.h include
>>
>> Picked up by my multi arch WIP where target-multi/cpu.h cant handle
>> random core code inclusion without preceeded qemu-common.h. I guess
>> this is the only one in tree?
>> ---
>>  memory_mapping.c | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/memory_mapping.c b/memory_mapping.c
>> index 7b69801..36d6b26 100644
>> --- a/memory_mapping.c
>> +++ b/memory_mapping.c
>> @@ -13,8 +13,8 @@
>>
>>  #include <glib.h>
>>
>> +#include "qemu-common.h"
>>  #include "cpu.h"
>> -#include "exec/cpu-all.h"
>>  #include "sysemu/memory_mapping.h"
>>  #include "exec/memory.h"
>>  #include "exec/address-spaces.h"
>>
>
> Acked-by: Paolo Bonzini <pbonzini@redhat.com>
>
> About to leave on vacation, so someone else will have to pick it up.
>

Enjoy. If you are not back before soft freeze would you object to me
sending a [PULL] for some of the multi-arch related mainloop header
patches for which I have RB from Richard from?

Regards,
Peter

> Paolo
>
Paolo Bonzini June 17, 2015, 8:57 a.m. UTC | #3
On 09/06/2015 09:42, Peter Crosthwaite wrote:
> > Acked-by: Paolo Bonzini <pbonzini@redhat.com>
> >
> > About to leave on vacation, so someone else will have to pick it up.
>
> Enjoy. If you are not back before soft freeze would you object to me
> sending a [PULL] for some of the multi-arch related mainloop header
> patches for which I have RB from Richard from?

I don't object to you sending a pull request for any multi-arch related
changes.  Anything that makes fewer patches go through my "misc" pull
requests is a good thing for me.

Just consult with Andreas when he's back about what he prefers to go
through his tree.

Paolo
Peter Crosthwaite June 24, 2015, 4:33 a.m. UTC | #4
Ping!

On Sun, Jun 7, 2015 at 2:59 PM, Peter Crosthwaite
<crosthwaitepeter@gmail.com> wrote:
> This makes it more consistent with all other core code files, which
> either just rely on qemu-common.h inclusion or precede cpu.h with
> qemu-common.h.
>
> cpu-all.h should not be included in addition to cpu.h. Remove it.
>
> Signed-off-by: Peter Crosthwaite <crosthwaite.peter@gmail.com>
> ---
> changed since v1:
> Leave in cpu.h include
>
> Picked up by my multi arch WIP where target-multi/cpu.h cant handle
> random core code inclusion without preceeded qemu-common.h. I guess
> this is the only one in tree?
> ---
>  memory_mapping.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/memory_mapping.c b/memory_mapping.c
> index 7b69801..36d6b26 100644
> --- a/memory_mapping.c
> +++ b/memory_mapping.c
> @@ -13,8 +13,8 @@
>
>  #include <glib.h>
>
> +#include "qemu-common.h"
>  #include "cpu.h"
> -#include "exec/cpu-all.h"
>  #include "sysemu/memory_mapping.h"
>  #include "exec/memory.h"
>  #include "exec/address-spaces.h"
> --
> 1.9.1
>
>
Paolo Bonzini June 24, 2015, 8:54 a.m. UTC | #5
On 07/06/2015 23:59, Peter Crosthwaite wrote:
> This makes it more consistent with all other core code files, which
> either just rely on qemu-common.h inclusion or precede cpu.h with
> qemu-common.h.
> 
> cpu-all.h should not be included in addition to cpu.h. Remove it.
> 
> Signed-off-by: Peter Crosthwaite <crosthwaite.peter@gmail.com>

Applied, will send a pull request today or tomorrow.

Paolo

> ---
> changed since v1:
> Leave in cpu.h include
> 
> Picked up by my multi arch WIP where target-multi/cpu.h cant handle
> random core code inclusion without preceeded qemu-common.h. I guess
> this is the only one in tree?
> ---
>  memory_mapping.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/memory_mapping.c b/memory_mapping.c
> index 7b69801..36d6b26 100644
> --- a/memory_mapping.c
> +++ b/memory_mapping.c
> @@ -13,8 +13,8 @@
>  
>  #include <glib.h>
>  
> +#include "qemu-common.h"
>  #include "cpu.h"
> -#include "exec/cpu-all.h"
>  #include "sysemu/memory_mapping.h"
>  #include "exec/memory.h"
>  #include "exec/address-spaces.h"
>
diff mbox

Patch

diff --git a/memory_mapping.c b/memory_mapping.c
index 7b69801..36d6b26 100644
--- a/memory_mapping.c
+++ b/memory_mapping.c
@@ -13,8 +13,8 @@ 
 
 #include <glib.h>
 
+#include "qemu-common.h"
 #include "cpu.h"
-#include "exec/cpu-all.h"
 #include "sysemu/memory_mapping.h"
 #include "exec/memory.h"
 #include "exec/address-spaces.h"