Received: from eggs.gnu.org ([2001:4830:134:3::10]:58346) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WIakf-0000eH-QY for qemu-devel@nongnu.org; Wed, 26 Feb 2014 04:26:11 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WIaka-0006nK-Ff for qemu-devel@nongnu.org; Wed, 26 Feb 2014 04:26:05 -0500 Received: from mail-pb0-x229.google.com ([2607:f8b0:400e:c01::229]:43302) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WIaka-0006nE-8b for qemu-devel@nongnu.org; Wed, 26 Feb 2014 04:26:00 -0500 Received: by mail-pb0-f41.google.com with SMTP id jt11so749706pbb.0 for ; Wed, 26 Feb 2014 01:25:59 -0800 (PST) From: Xuebing Wang Date: Wed, 26 Feb 2014 17:25:18 +0800 Message-Id: <1393406718-16860-1-git-send-email-xbing6@gmail.com> Subject: [Qemu-devel] [PATCH] translate: remove file translate-all.h List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: blauwirbel@gmail.com, pbonzini@redhat.com, xbing6@gmail.com, afaerber@suse.de This patch does below: - Move the declaration of 2 translate functions from translate-all.h into include/exec/exec-all.h - remove file translate-all.h "translate-all.h" => "exec/exec-all.h" can be done by: git grep -w "translate-all.h" | cut -d: -f1 | xargs sed -i 's/\/exec\/exec-all.h/g' Note: 1) "exact whole word match" is considered. 2) We may move translate related from include/exec/exec-all.h into include/exec/translate.h later. Signed-off-by: Xuebing Wang --- exec.c | 2 +- include/exec/exec-all.h | 4 ++++ translate-all.c | 2 +- translate-all.h | 27 --------------------------- 4 files changed, 6 insertions(+), 29 deletions(-) delete mode 100644 translate-all.h diff --git a/exec.c b/exec.c index b69fd29..ec3890e 100644 --- a/exec.c +++ b/exec.c @@ -47,7 +47,7 @@ #include "exec/cpu-all.h" #include "exec/cputlb.h" -#include "translate-all.h" +#include "exec/exec-all.h" #include "exec/memory-internal.h" #include "exec/ram_addr.h" diff --git a/include/exec/exec-all.h b/include/exec/exec-all.h index a387922..f9afb7a 100644 --- a/include/exec/exec-all.h +++ b/include/exec/exec-all.h @@ -213,6 +213,10 @@ void tb_free(TranslationBlock *tb); void tb_flush(CPUArchState *env); void tb_phys_invalidate(TranslationBlock *tb, tb_page_addr_t page_addr); +/* translate-all.c */ +void tb_invalidate_phys_page_fast(tb_page_addr_t start, int len); +void tb_check_watchpoint(CPUArchState *env); + #if defined(USE_DIRECT_JUMP) #if defined(CONFIG_TCG_INTERPRETER) diff --git a/translate-all.c b/translate-all.c index 1ac0246..6379b1a 100644 --- a/translate-all.c +++ b/translate-all.c @@ -57,7 +57,7 @@ #endif #include "exec/cputlb.h" -#include "translate-all.h" +#include "exec/exec-all.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 . - */ -#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