[Qemu-devel] [Discussion 10/10] translate: remove file translate-all.h

[Xuebing Wang <xbing6@gmail.com>]

This patch does below:
-   Move the declaration of 2 translate functions from translate-all.h into
    include/exec/translate.h
-   remove file translate-all.h

Signed-off-by: Xuebing Wang <xbing6@gmail.com>
---
 exec.c                   |    2 --
 include/exec/translate.h |    4 ++++
 translate-all.c          |    2 +-
 translate-all.h          |   27 ---------------------------
 4 files changed, 5 insertions(+), 30 deletions(-)
 delete mode 100644 translate-all.h

diff --git a/exec.c b/exec.c
index ffbd26c..ee52b3b 100644
--- a/exec.c
+++ b/exec.c
@@ -44,8 +44,6 @@
 #endif
 
 #include "exec/cputlb.h"
-#include "translate-all.h"
-
 #include "exec/memory-internal.h"
 #include "exec/ram_addr.h"
 #include "qemu/cache-utils.h"
diff --git a/include/exec/translate.h b/include/exec/translate.h
index 9e877f2..42895b4 100644
--- a/include/exec/translate.h
+++ b/include/exec/translate.h
@@ -303,4 +303,8 @@ extern uintptr_t tci_tb_ptr;
 
 #define GETPC()  (GETRA() - GETPC_ADJ)
 
+/* translate-all.c */
+void tb_invalidate_phys_page_fast(tb_page_addr_t start, int len);
+void tb_check_watchpoint(CPUArchState *env);
+
 #endif /* EXEC_TRANSLATE_H */
diff --git a/translate-all.c b/translate-all.c
index 98e215f..975f823 100644
--- a/translate-all.c
+++ b/translate-all.c
@@ -61,7 +61,7 @@
 #endif
 
 #include "exec/cputlb.h"
-#include "translate-all.h"
+#include "exec/translate.h"
 #include "qemu/timer.h"
 
 //#define DEBUG_TB_INVALIDATE
diff --git a/translate-all.h b/translate-all.h
deleted file mode 100644
index f7e5932..0000000
--- a/translate-all.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- *  Translated block handling
- *
- *  Copyright (c) 2003 Fabrice Bellard
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, see <http://www.gnu.org/licenses/>.
- */
-#ifndef TRANSLATE_ALL_H
-#define TRANSLATE_ALL_H
-
-/* translate-all.c */
-void tb_invalidate_phys_page_fast(tb_page_addr_t start, int len);
-void cpu_unlink_tb(CPUState *cpu);
-void tb_check_watchpoint(CPUArchState *env);
-
-#endif /* TRANSLATE_ALL_H */
-- 
1.7.9.5