rename included C files to foo.inc.c, remove osdep.h

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 <eblake@redhat.com>
Cc: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2018-05-04 11:52:55 +02:00
parent 3ff333effa
commit 5b27a92dcc
10 changed files with 15 additions and 16 deletions

View file

@ -3047,7 +3047,7 @@ static unsigned int crisv32_decoder(CPUCRISState *env, DisasContext *dc)
return insn_len; return insn_len;
} }
#include "translate_v10.c" #include "translate_v10.inc.c"
/* /*
* Delay slots on QEMU/CRIS. * Delay slots on QEMU/CRIS.

View file

@ -20499,7 +20499,7 @@ void mips_tcg_init(void)
"fcr31"); "fcr31");
} }
#include "translate_init.c" #include "translate_init.inc.c"
void cpu_mips_realize_env(CPUMIPSState *env) void cpu_mips_realize_env(CPUMIPSState *env)
{ {

View file

@ -379,7 +379,7 @@ target_ulong helper_divso(CPUPPCState *env, target_ulong arg1,
target_ulong helper_602_mfrom(target_ulong arg) target_ulong helper_602_mfrom(target_ulong arg)
{ {
if (likely(arg < 602)) { if (likely(arg < 602)) {
#include "mfrom_table.c" #include "mfrom_table.inc.c"
return mfrom_ROM_table[arg]; return mfrom_ROM_table[arg];
} else { } else {
return 0; return 0;

View file

@ -6991,7 +6991,7 @@ GEN_HANDLER2_E(trechkpt, "trechkpt", 0x1F, 0x0E, 0x1F, 0x03FFF800, \
}; };
#include "helper_regs.h" #include "helper_regs.h"
#include "translate_init.c" #include "translate_init.inc.c"
/*****************************************************************************/ /*****************************************************************************/
/* Misc PowerPC helpers */ /* Misc PowerPC helpers */

View file

@ -18,7 +18,6 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>. * License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/ */
#include "qemu/osdep.h"
#include "disas/bfd.h" #include "disas/bfd.h"
#include "exec/gdbstub.h" #include "exec/gdbstub.h"
#include "kvm_ppc.h" #include "kvm_ppc.h"

View file

@ -199,56 +199,56 @@ static void zrle_write_u8(VncState *vs, uint8_t value)
#define ZRLE_BPP 8 #define ZRLE_BPP 8
#define ZYWRLE_ENDIAN ENDIAN_NO #define ZYWRLE_ENDIAN ENDIAN_NO
#include "vnc-enc-zrle-template.c" #include "vnc-enc-zrle.inc.c"
#undef ZRLE_BPP #undef ZRLE_BPP
#define ZRLE_BPP 15 #define ZRLE_BPP 15
#undef ZYWRLE_ENDIAN #undef ZYWRLE_ENDIAN
#define ZYWRLE_ENDIAN ENDIAN_LITTLE #define ZYWRLE_ENDIAN ENDIAN_LITTLE
#include "vnc-enc-zrle-template.c" #include "vnc-enc-zrle.inc.c"
#undef ZYWRLE_ENDIAN #undef ZYWRLE_ENDIAN
#define ZYWRLE_ENDIAN ENDIAN_BIG #define ZYWRLE_ENDIAN ENDIAN_BIG
#include "vnc-enc-zrle-template.c" #include "vnc-enc-zrle.inc.c"
#undef ZRLE_BPP #undef ZRLE_BPP
#define ZRLE_BPP 16 #define ZRLE_BPP 16
#undef ZYWRLE_ENDIAN #undef ZYWRLE_ENDIAN
#define ZYWRLE_ENDIAN ENDIAN_LITTLE #define ZYWRLE_ENDIAN ENDIAN_LITTLE
#include "vnc-enc-zrle-template.c" #include "vnc-enc-zrle.inc.c"
#undef ZYWRLE_ENDIAN #undef ZYWRLE_ENDIAN
#define ZYWRLE_ENDIAN ENDIAN_BIG #define ZYWRLE_ENDIAN ENDIAN_BIG
#include "vnc-enc-zrle-template.c" #include "vnc-enc-zrle.inc.c"
#undef ZRLE_BPP #undef ZRLE_BPP
#define ZRLE_BPP 32 #define ZRLE_BPP 32
#undef ZYWRLE_ENDIAN #undef ZYWRLE_ENDIAN
#define ZYWRLE_ENDIAN ENDIAN_LITTLE #define ZYWRLE_ENDIAN ENDIAN_LITTLE
#include "vnc-enc-zrle-template.c" #include "vnc-enc-zrle.inc.c"
#undef ZYWRLE_ENDIAN #undef ZYWRLE_ENDIAN
#define ZYWRLE_ENDIAN ENDIAN_BIG #define ZYWRLE_ENDIAN ENDIAN_BIG
#include "vnc-enc-zrle-template.c" #include "vnc-enc-zrle.inc.c"
#define ZRLE_COMPACT_PIXEL 24a #define ZRLE_COMPACT_PIXEL 24a
#undef ZYWRLE_ENDIAN #undef ZYWRLE_ENDIAN
#define ZYWRLE_ENDIAN ENDIAN_LITTLE #define ZYWRLE_ENDIAN ENDIAN_LITTLE
#include "vnc-enc-zrle-template.c" #include "vnc-enc-zrle.inc.c"
#undef ZYWRLE_ENDIAN #undef ZYWRLE_ENDIAN
#define ZYWRLE_ENDIAN ENDIAN_BIG #define ZYWRLE_ENDIAN ENDIAN_BIG
#include "vnc-enc-zrle-template.c" #include "vnc-enc-zrle.inc.c"
#undef ZRLE_COMPACT_PIXEL #undef ZRLE_COMPACT_PIXEL
#define ZRLE_COMPACT_PIXEL 24b #define ZRLE_COMPACT_PIXEL 24b
#undef ZYWRLE_ENDIAN #undef ZYWRLE_ENDIAN
#define ZYWRLE_ENDIAN ENDIAN_LITTLE #define ZYWRLE_ENDIAN ENDIAN_LITTLE
#include "vnc-enc-zrle-template.c" #include "vnc-enc-zrle.inc.c"
#undef ZYWRLE_ENDIAN #undef ZYWRLE_ENDIAN
#define ZYWRLE_ENDIAN ENDIAN_BIG #define ZYWRLE_ENDIAN ENDIAN_BIG
#include "vnc-enc-zrle-template.c" #include "vnc-enc-zrle.inc.c"
#undef ZRLE_COMPACT_PIXEL #undef ZRLE_COMPACT_PIXEL
#undef ZRLE_BPP #undef ZRLE_BPP