| Message ID | 1270145010-18452-1-git-send-email-weil@mail.berlios.de |
|---|---|
| State | New |
| Headers | show |
On Thu, Apr 01, 2010 at 08:03:30PM +0200, Stefan Weil wrote: > With argument checking for cpu_fprintf, gcc throws this warning: > > CC i386-softmmu/helper.o > cc1: warnings being treated as errors > /qemu/ar7/target-i386/helper.c: In function ‘cpu_x86_dump_seg_cache’: > /qemu/ar7/target-i386/helper.c:220: error: format not a string literal and no format arguments > > The code is correct, but current gcc versions don't detect this. > Therefore the patch rewrites the statement to satisfy the compiler. Thanks, applied. > Signed-off-by: Stefan Weil <weil@mail.berlios.de> > --- > target-i386/helper.c | 7 ++++--- > 1 files changed, 4 insertions(+), 3 deletions(-) > > diff --git a/target-i386/helper.c b/target-i386/helper.c > index 136ca8d..67c1224 100644 > --- a/target-i386/helper.c > +++ b/target-i386/helper.c > @@ -214,9 +214,10 @@ cpu_x86_dump_seg_cache(CPUState *env, FILE *f, > "Reserved", "IntGate64", "TrapGate64" > } > }; > - cpu_fprintf(f, sys_type_name[(env->hflags & HF_LMA_MASK) ? 1 : 0] > - [(sc->flags & DESC_TYPE_MASK) > - >> DESC_TYPE_SHIFT]); > + cpu_fprintf(f, "%s", > + sys_type_name[(env->hflags & HF_LMA_MASK) ? 1 : 0] > + [(sc->flags & DESC_TYPE_MASK) > + >> DESC_TYPE_SHIFT]); > } > done: > cpu_fprintf(f, "\n"); > -- > 1.7.0 > > > >
diff --git a/target-i386/helper.c b/target-i386/helper.c index 136ca8d..67c1224 100644 --- a/target-i386/helper.c +++ b/target-i386/helper.c @@ -214,9 +214,10 @@ cpu_x86_dump_seg_cache(CPUState *env, FILE *f, "Reserved", "IntGate64", "TrapGate64" } }; - cpu_fprintf(f, sys_type_name[(env->hflags & HF_LMA_MASK) ? 1 : 0] - [(sc->flags & DESC_TYPE_MASK) - >> DESC_TYPE_SHIFT]); + cpu_fprintf(f, "%s", + sys_type_name[(env->hflags & HF_LMA_MASK) ? 1 : 0] + [(sc->flags & DESC_TYPE_MASK) + >> DESC_TYPE_SHIFT]); } done: cpu_fprintf(f, "\n");
With argument checking for cpu_fprintf, gcc throws this warning: CC i386-softmmu/helper.o cc1: warnings being treated as errors /qemu/ar7/target-i386/helper.c: In function ‘cpu_x86_dump_seg_cache’: /qemu/ar7/target-i386/helper.c:220: error: format not a string literal and no format arguments The code is correct, but current gcc versions don't detect this. Therefore the patch rewrites the statement to satisfy the compiler. Signed-off-by: Stefan Weil <weil@mail.berlios.de> --- target-i386/helper.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-)