Re: [Qemu-devel] [RFC v1 01/22] memory: rename 'exec-obsolete.h'

[Anthony Liguori]

Avi Kivity <address@hidden> writes:

> exec-obsolete.h used to hold pre-memory-API functions that were used from
> device code prior to the transition to the memory API.  Now that the
> transition is complete, the name no longer describes the file.  The
> functions still need to be merged better into the memory core, but there's
> no danger of anyone using them.
>
> Signed-off-by: Avi Kivity <address@hidden>

Reviewed-by: Anthony Liguori <address@hidden>

Regards,

Anthony Liguori

> ---
>  cputlb.c                             | 3 +--
>  exec.c                               | 3 +--
>  exec-obsolete.h => memory-internal.h | 8 ++------
>  memory.c                             | 3 +--
>  4 files changed, 5 insertions(+), 12 deletions(-)
>  rename exec-obsolete.h => memory-internal.h (97%)
>
> diff --git a/cputlb.c b/cputlb.c
> index 51b5897..0627f32 100644
> --- a/cputlb.c
> +++ b/cputlb.c
> @@ -24,8 +24,7 @@
>  
>  #include "cputlb.h"
>  
> -#define WANT_EXEC_OBSOLETE
> -#include "exec-obsolete.h"
> +#include "memory-internal.h"
>  
>  //#define DEBUG_TLB
>  //#define DEBUG_TLB_CHECK
> diff --git a/exec.c b/exec.c
> index bb6aa4a..5c703b9 100644
> --- a/exec.c
> +++ b/exec.c
> @@ -59,8 +59,7 @@
>  
>  #include "cputlb.h"
>  
> -#define WANT_EXEC_OBSOLETE
> -#include "exec-obsolete.h"
> +#include "memory-internal.h"
>  
>  //#define DEBUG_TB_INVALIDATE
>  //#define DEBUG_FLUSH
> diff --git a/exec-obsolete.h b/memory-internal.h
> similarity index 97%
> rename from exec-obsolete.h
> rename to memory-internal.h
> index c099256..655f71f 100644
> --- a/exec-obsolete.h
> +++ b/memory-internal.h
> @@ -16,12 +16,8 @@
>   * The functions declared here will be removed soon.
>   */
>  
> -#ifndef EXEC_OBSOLETE_H
> -#define EXEC_OBSOLETE_H
> -
> -#ifndef WANT_EXEC_OBSOLETE
> -#error Do not include exec-obsolete.h
> -#endif
> +#ifndef MEMORY_INTERNAL_H
> +#define MEMORY_INTERNAL_H
>  
>  #ifndef CONFIG_USER_ONLY
>  
> diff --git a/memory.c b/memory.c
> index 4f3ade0..1aeca08 100644
> --- a/memory.c
> +++ b/memory.c
> @@ -20,8 +20,7 @@
>  #include "kvm.h"
>  #include <assert.h>
>  
> -#define WANT_EXEC_OBSOLETE
> -#include "exec-obsolete.h"
> +#include "memory-internal.h"
>  
>  unsigned memory_region_transaction_depth = 0;
>  static bool global_dirty_log = false;
> -- 
> 1.7.12