[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 30/30] rename included C files to foo.inc.c, remove o
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PULL 30/30] rename included C files to foo.inc.c, remove osdep.h |
Date: |
Wed, 9 May 2018 00:14:47 +0200 |
osdep.h is only needed for files that are compiled directly.
Remove it from included C source files, and rename them to
*.inc.c so that scripts/clean-includes knows to skip them.
Cc: Eric Blake <address@hidden>
Cc: Michael S. Tsirkin <address@hidden>
Reviewed-by: Stefan Hajnoczi <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
target/cris/translate.c | 2 +-
.../cris/{translate_v10.c => translate_v10.inc.c} | 0
target/mips/translate.c | 2 +-
.../{translate_init.c => translate_init.inc.c} | 0
target/ppc/int_helper.c | 2 +-
target/ppc/{mfrom_table.c => mfrom_table.inc.c} | 0
target/ppc/translate.c | 2 +-
.../ppc/{translate_init.c => translate_init.inc.c} | 1 -
ui/vnc-enc-zrle.c | 22 +++++++++++-----------
ui/{vnc-enc-zrle-template.c => vnc-enc-zrle.inc.c} | 0
10 files changed, 15 insertions(+), 16 deletions(-)
rename target/cris/{translate_v10.c => translate_v10.inc.c} (100%)
rename target/mips/{translate_init.c => translate_init.inc.c} (100%)
rename target/ppc/{mfrom_table.c => mfrom_table.inc.c} (100%)
rename target/ppc/{translate_init.c => translate_init.inc.c} (99%)
rename ui/{vnc-enc-zrle-template.c => vnc-enc-zrle.inc.c} (100%)
diff --git a/target/cris/translate.c b/target/cris/translate.c
index f51a731..ce1ee7a 100644
--- a/target/cris/translate.c
+++ b/target/cris/translate.c
@@ -3047,7 +3047,7 @@ static unsigned int crisv32_decoder(CPUCRISState *env,
DisasContext *dc)
return insn_len;
}
-#include "translate_v10.c"
+#include "translate_v10.inc.c"
/*
* Delay slots on QEMU/CRIS.
diff --git a/target/cris/translate_v10.c b/target/cris/translate_v10.inc.c
similarity index 100%
rename from target/cris/translate_v10.c
rename to target/cris/translate_v10.inc.c
diff --git a/target/mips/translate.c b/target/mips/translate.c
index d05ee67..26f5404 100644
--- a/target/mips/translate.c
+++ b/target/mips/translate.c
@@ -20499,7 +20499,7 @@ void mips_tcg_init(void)
"fcr31");
}
-#include "translate_init.c"
+#include "translate_init.inc.c"
void cpu_mips_realize_env(CPUMIPSState *env)
{
diff --git a/target/mips/translate_init.c b/target/mips/translate_init.inc.c
similarity index 100%
rename from target/mips/translate_init.c
rename to target/mips/translate_init.inc.c
diff --git a/target/ppc/int_helper.c b/target/ppc/int_helper.c
index 35bdf09..1607a7a 100644
--- a/target/ppc/int_helper.c
+++ b/target/ppc/int_helper.c
@@ -379,7 +379,7 @@ target_ulong helper_divso(CPUPPCState *env, target_ulong
arg1,
target_ulong helper_602_mfrom(target_ulong arg)
{
if (likely(arg < 602)) {
-#include "mfrom_table.c"
+#include "mfrom_table.inc.c"
return mfrom_ROM_table[arg];
} else {
return 0;
diff --git a/target/ppc/mfrom_table.c b/target/ppc/mfrom_table.inc.c
similarity index 100%
rename from target/ppc/mfrom_table.c
rename to target/ppc/mfrom_table.inc.c
diff --git a/target/ppc/translate.c b/target/ppc/translate.c
index 2a4140f..257badf 100644
--- a/target/ppc/translate.c
+++ b/target/ppc/translate.c
@@ -6991,7 +6991,7 @@ GEN_HANDLER2_E(trechkpt, "trechkpt", 0x1F, 0x0E, 0x1F,
0x03FFF800, \
};
#include "helper_regs.h"
-#include "translate_init.c"
+#include "translate_init.inc.c"
/*****************************************************************************/
/* Misc PowerPC helpers */
diff --git a/target/ppc/translate_init.c b/target/ppc/translate_init.inc.c
similarity index 99%
rename from target/ppc/translate_init.c
rename to target/ppc/translate_init.inc.c
index a72be6d..a0b3f18 100644
--- a/target/ppc/translate_init.c
+++ b/target/ppc/translate_init.inc.c
@@ -18,7 +18,6 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
-#include "qemu/osdep.h"
#include "disas/bfd.h"
#include "exec/gdbstub.h"
#include "kvm_ppc.h"
diff --git a/ui/vnc-enc-zrle.c b/ui/vnc-enc-zrle.c
index fd63d4f..7493a84 100644
--- a/ui/vnc-enc-zrle.c
+++ b/ui/vnc-enc-zrle.c
@@ -199,56 +199,56 @@ static void zrle_write_u8(VncState *vs, uint8_t value)
#define ZRLE_BPP 8
#define ZYWRLE_ENDIAN ENDIAN_NO
-#include "vnc-enc-zrle-template.c"
+#include "vnc-enc-zrle.inc.c"
#undef ZRLE_BPP
#define ZRLE_BPP 15
#undef ZYWRLE_ENDIAN
#define ZYWRLE_ENDIAN ENDIAN_LITTLE
-#include "vnc-enc-zrle-template.c"
+#include "vnc-enc-zrle.inc.c"
#undef ZYWRLE_ENDIAN
#define ZYWRLE_ENDIAN ENDIAN_BIG
-#include "vnc-enc-zrle-template.c"
+#include "vnc-enc-zrle.inc.c"
#undef ZRLE_BPP
#define ZRLE_BPP 16
#undef ZYWRLE_ENDIAN
#define ZYWRLE_ENDIAN ENDIAN_LITTLE
-#include "vnc-enc-zrle-template.c"
+#include "vnc-enc-zrle.inc.c"
#undef ZYWRLE_ENDIAN
#define ZYWRLE_ENDIAN ENDIAN_BIG
-#include "vnc-enc-zrle-template.c"
+#include "vnc-enc-zrle.inc.c"
#undef ZRLE_BPP
#define ZRLE_BPP 32
#undef ZYWRLE_ENDIAN
#define ZYWRLE_ENDIAN ENDIAN_LITTLE
-#include "vnc-enc-zrle-template.c"
+#include "vnc-enc-zrle.inc.c"
#undef ZYWRLE_ENDIAN
#define ZYWRLE_ENDIAN ENDIAN_BIG
-#include "vnc-enc-zrle-template.c"
+#include "vnc-enc-zrle.inc.c"
#define ZRLE_COMPACT_PIXEL 24a
#undef ZYWRLE_ENDIAN
#define ZYWRLE_ENDIAN ENDIAN_LITTLE
-#include "vnc-enc-zrle-template.c"
+#include "vnc-enc-zrle.inc.c"
#undef ZYWRLE_ENDIAN
#define ZYWRLE_ENDIAN ENDIAN_BIG
-#include "vnc-enc-zrle-template.c"
+#include "vnc-enc-zrle.inc.c"
#undef ZRLE_COMPACT_PIXEL
#define ZRLE_COMPACT_PIXEL 24b
#undef ZYWRLE_ENDIAN
#define ZYWRLE_ENDIAN ENDIAN_LITTLE
-#include "vnc-enc-zrle-template.c"
+#include "vnc-enc-zrle.inc.c"
#undef ZYWRLE_ENDIAN
#define ZYWRLE_ENDIAN ENDIAN_BIG
-#include "vnc-enc-zrle-template.c"
+#include "vnc-enc-zrle.inc.c"
#undef ZRLE_COMPACT_PIXEL
#undef ZRLE_BPP
diff --git a/ui/vnc-enc-zrle-template.c b/ui/vnc-enc-zrle.inc.c
similarity index 100%
rename from ui/vnc-enc-zrle-template.c
rename to ui/vnc-enc-zrle.inc.c
--
1.8.3.1
- [Qemu-devel] [PULL 15/30] opts: don't silently truncate long option values, (continued)
- [Qemu-devel] [PULL 15/30] opts: don't silently truncate long option values, Paolo Bonzini, 2018/05/08
- [Qemu-devel] [PULL 21/30] qemu-options: Remove deprecated -no-kvm-irqchip, Paolo Bonzini, 2018/05/08
- [Qemu-devel] [PULL 25/30] configure: Really use local libfdt if the system one is too old, Paolo Bonzini, 2018/05/08
- [Qemu-devel] [PULL 22/30] qemu-doc: provide details of supported build platforms, Paolo Bonzini, 2018/05/08
- [Qemu-devel] [PULL 23/30] glib: bump min required glib library version to 2.42, Paolo Bonzini, 2018/05/08
- [Qemu-devel] [PULL 27/30] shippable: Remove Debian 8 libfdt kludge, Paolo Bonzini, 2018/05/08
- [Qemu-devel] [PULL 26/30] configure: Display if libfdt is from system or git, Paolo Bonzini, 2018/05/08
- [Qemu-devel] [PULL 24/30] i386/kvm: add support for Hyper-V reenlightenment MSRs, Paolo Bonzini, 2018/05/08
- [Qemu-devel] [PULL 28/30] build: Silence dtc directory creation, Paolo Bonzini, 2018/05/08
- [Qemu-devel] [PULL 29/30] pc-dimm: fix error messages if no slots were defined, Paolo Bonzini, 2018/05/08
- [Qemu-devel] [PULL 30/30] rename included C files to foo.inc.c, remove osdep.h,
Paolo Bonzini <=
- Re: [Qemu-devel] [PULL 00/30] Misc patches for 2018-05-09, Peter Maydell, 2018/05/11