[Qemu-devel] [PATCH 0/2] cpu-common.h: remove pointless ifdef guards

[Qemu-devel] [PATCH 0/2] cpu-common.h: remove pointless ifdef guards

[Peter Maydell]

These patches remove a couple of pointless ifdef guards in cpu-common.h
that I happened to notice.

Peter Maydell (2):
  cpu-common.h: Remove unnecessary guard on including targphys.h
  cpu-common.h: Remove a pointless ifndef CONFIG_USER_ONLY

 cpu-common.h |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)

[Qemu-devel] [PATCH 1/2] cpu-common.h: Remove unnecessary guard on including targphys.h

[Peter Maydell]

There's no need to make the include of targphys.h conditional
on whether TARGET_PHYS_ADDR_BITS is defined, because targphys.h
itself checks that and does nothing if it isn't.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
 cpu-common.h |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/cpu-common.h b/cpu-common.h
index 1fe3280..321037f 100644
--- a/cpu-common.h
+++ b/cpu-common.h
@@ -3,9 +3,7 @@
 
 /* CPU interfaces that are target independent.  */
 
-#ifdef TARGET_PHYS_ADDR_BITS
 #include "targphys.h"
-#endif
 
 #ifndef NEED_CPU_H
 #include "poison.h"
-- 
1.7.1

Re: [Qemu-devel] [PATCH 1/2] cpu-common.h: Remove unnecessary guard on including targphys.h

[Andreas Färber]

Am 22.06.2012 13:30, schrieb Peter Maydell:
> There's no need to make the include of targphys.h conditional
> on whether TARGET_PHYS_ADDR_BITS is defined, because targphys.h
> itself checks that and does nothing if it isn't.
> 
> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

Reviewed-by: Andreas Färber <afaerber@suse.de>

/-F

-- 
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg

[Qemu-devel] [PATCH 2/2] cpu-common.h: Remove a pointless ifndef CONFIG_USER_ONLY

[Peter Maydell]

Remove an ifndef CONFIG_USER_ONLY guard that was pointless
because it is already inside an if !defined(CONFIG_USER_ONLY).

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
 cpu-common.h |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/cpu-common.h b/cpu-common.h
index 321037f..85548de 100644
--- a/cpu-common.h
+++ b/cpu-common.h
@@ -69,9 +69,7 @@ void cpu_physical_memory_unmap(void *buffer, target_phys_addr_t len,
 void *cpu_register_map_client(void *opaque, void (*callback)(void *opaque));
 void cpu_unregister_map_client(void *cookie);
 
-#ifndef CONFIG_USER_ONLY
 bool cpu_physical_memory_is_io(target_phys_addr_t phys_addr);
-#endif
 
 /* Coalesced MMIO regions are areas where write operations can be reordered.
  * This usually implies that write operations are side-effect free.  This allows
-- 
1.7.1

Re: [Qemu-devel] [PATCH 2/2] cpu-common.h: Remove a pointless ifndef CONFIG_USER_ONLY

[Andreas Färber]

Am 22.06.2012 13:30, schrieb Peter Maydell:
> Remove an ifndef CONFIG_USER_ONLY guard that was pointless
> because it is already inside an if !defined(CONFIG_USER_ONLY).
> 
> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
> ---
>  cpu-common.h |    2 --
>  1 files changed, 0 insertions(+), 2 deletions(-)
> 
> diff --git a/cpu-common.h b/cpu-common.h
> index 321037f..85548de 100644
> --- a/cpu-common.h
> +++ b/cpu-common.h
> @@ -69,9 +69,7 @@ void cpu_physical_memory_unmap(void *buffer, target_phys_addr_t len,
>  void *cpu_register_map_client(void *opaque, void (*callback)(void *opaque));
>  void cpu_unregister_map_client(void *cookie);
>  
> -#ifndef CONFIG_USER_ONLY
>  bool cpu_physical_memory_is_io(target_phys_addr_t phys_addr);
> -#endif
>  
>  /* Coalesced MMIO regions are areas where write operations can be reordered.
>   * This usually implies that write operations are side-effect free.  This allows

Acked-by: Andreas Färber <afaerber@suse.de>

Spotted that yesterday myself and was planning to send a patch. :)

Thanks,
Andreas

-- 
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg

Re: [Qemu-devel] [PATCH 0/2] cpu-common.h: remove pointless ifdef guards

[Stefan Hajnoczi]

On Fri, Jun 22, 2012 at 12:30:57PM +0100, Peter Maydell wrote:
> These patches remove a couple of pointless ifdef guards in cpu-common.h
> that I happened to notice.
> 
> Peter Maydell (2):
>   cpu-common.h: Remove unnecessary guard on including targphys.h
>   cpu-common.h: Remove a pointless ifndef CONFIG_USER_ONLY
> 
>  cpu-common.h |    4 ----
>  1 files changed, 0 insertions(+), 4 deletions(-)
> 
> 

Thanks, applied to the trivial patches tree:
https://github.com/stefanha/qemu/commits/trivial-patches

Stefan