* [Qemu-devel] [PATCH] rename included C files to foo.inc.c, remove osdep.h
@ 2018-05-04 10:51 Paolo Bonzini
2018-05-04 13:15 ` Eric Blake
2018-05-08 12:48 ` Stefan Hajnoczi
0 siblings, 2 replies; 3+ messages in thread
From: Paolo Bonzini @ 2018-05-04 10:51 UTC (permalink / raw)
To: qemu-devel; +Cc: Eric Blake, Michael S. Tsirkin
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>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
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 218665b..043b483 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 391b94b..d92422c 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.7.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [Qemu-devel] [PATCH] rename included C files to foo.inc.c, remove osdep.h
2018-05-04 10:51 [Qemu-devel] [PATCH] rename included C files to foo.inc.c, remove osdep.h Paolo Bonzini
@ 2018-05-04 13:15 ` Eric Blake
2018-05-08 12:48 ` Stefan Hajnoczi
1 sibling, 0 replies; 3+ messages in thread
From: Eric Blake @ 2018-05-04 13:15 UTC (permalink / raw)
To: Paolo Bonzini, qemu-devel; +Cc: Michael S. Tsirkin
On 05/04/2018 05:51 AM, Paolo Bonzini wrote:
> 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>
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> ---
> 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%)
How did we ever manage rename patches without git's nice compressed
patch representation? :)
Reviewed-by: Eric Blake <eblake@redhat.com>
--
Eric Blake, Principal Software Engineer
Red Hat, Inc. +1-919-301-3266
Virtualization: qemu.org | libvirt.org
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [Qemu-devel] [PATCH] rename included C files to foo.inc.c, remove osdep.h
2018-05-04 10:51 [Qemu-devel] [PATCH] rename included C files to foo.inc.c, remove osdep.h Paolo Bonzini
2018-05-04 13:15 ` Eric Blake
@ 2018-05-08 12:48 ` Stefan Hajnoczi
1 sibling, 0 replies; 3+ messages in thread
From: Stefan Hajnoczi @ 2018-05-08 12:48 UTC (permalink / raw)
To: Paolo Bonzini; +Cc: qemu-devel, Michael S. Tsirkin
[-- Attachment #1: Type: text/plain, Size: 1513 bytes --]
On Fri, May 04, 2018 at 12:51:47PM +0200, Paolo Bonzini wrote:
> 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>
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> ---
> 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%)
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 455 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2018-05-08 12:49 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-05-04 10:51 [Qemu-devel] [PATCH] rename included C files to foo.inc.c, remove osdep.h Paolo Bonzini
2018-05-04 13:15 ` Eric Blake
2018-05-08 12:48 ` Stefan Hajnoczi
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.