Skip to content

Commit

Permalink
memory: rename 'exec-obsolete.h'
Browse files Browse the repository at this point in the history
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.

Reviewed-by: Anthony Liguori <aliguori@us.ibm.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
  • Loading branch information
avikivity committed Oct 15, 2012
1 parent 8b4a3df commit 7762c2c
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 12 deletions.
3 changes: 1 addition & 2 deletions cputlb.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions exec.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 2 additions & 6 deletions exec-obsolete.h → memory-internal.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
#include "hw/xen.h"
Expand Down
3 changes: 1 addition & 2 deletions memory.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 7762c2c

Please sign in to comment.