| Message ID | 1285013881-22169-1-git-send-email-weil@mail.berlios.de |
|---|---|
| State | New |
| Headers | show |
Thanks, applied. On Mon, Sep 20, 2010 at 8:18 PM, Stefan Weil <weil@mail.berlios.de> wrote: > Fix two compiler warnings (when format attribute is applied) > and one error (missing %) in format strings. > > Cc: Aurelien Jarno <aurelien@aurel32.net> > Cc: Blue Swirl <blauwirbel@gmail.com> > Signed-off-by: Stefan Weil <weil@mail.berlios.de> > --- > hw/mips_fulong2e.c | 6 +++--- > 1 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/hw/mips_fulong2e.c b/hw/mips_fulong2e.c > index ac82067..61ca9c4 100644 > --- a/hw/mips_fulong2e.c > +++ b/hw/mips_fulong2e.c > @@ -141,13 +141,13 @@ static int64_t load_kernel (CPUState *env) > prom_size = ENVP_NB_ENTRIES * (sizeof(int32_t) + ENVP_ENTRY_SIZE); > prom_buf = qemu_malloc(prom_size); > > - prom_set(prom_buf, index++, loaderparams.kernel_filename); > + prom_set(prom_buf, index++, "%s", loaderparams.kernel_filename); > if (initrd_size > 0) { > - prom_set(prom_buf, index++, "rd_start=0x" PRIx64 " rd_size=%li %s", > + prom_set(prom_buf, index++, "rd_start=0x%" PRIx64 " rd_size=%li %s", > cpu_mips_phys_to_kseg0(NULL, initrd_offset), initrd_size, > loaderparams.kernel_cmdline); > } else { > - prom_set(prom_buf, index++, loaderparams.kernel_cmdline); > + prom_set(prom_buf, index++, "%s", loaderparams.kernel_cmdline); > } > > /* Setup minimum environment variables */ > -- > 1.7.1 > >
diff --git a/hw/mips_fulong2e.c b/hw/mips_fulong2e.c index ac82067..61ca9c4 100644 --- a/hw/mips_fulong2e.c +++ b/hw/mips_fulong2e.c @@ -141,13 +141,13 @@ static int64_t load_kernel (CPUState *env) prom_size = ENVP_NB_ENTRIES * (sizeof(int32_t) + ENVP_ENTRY_SIZE); prom_buf = qemu_malloc(prom_size); - prom_set(prom_buf, index++, loaderparams.kernel_filename); + prom_set(prom_buf, index++, "%s", loaderparams.kernel_filename); if (initrd_size > 0) { - prom_set(prom_buf, index++, "rd_start=0x" PRIx64 " rd_size=%li %s", + prom_set(prom_buf, index++, "rd_start=0x%" PRIx64 " rd_size=%li %s", cpu_mips_phys_to_kseg0(NULL, initrd_offset), initrd_size, loaderparams.kernel_cmdline); } else { - prom_set(prom_buf, index++, loaderparams.kernel_cmdline); + prom_set(prom_buf, index++, "%s", loaderparams.kernel_cmdline); } /* Setup minimum environment variables */
Fix two compiler warnings (when format attribute is applied) and one error (missing %) in format strings. Cc: Aurelien Jarno <aurelien@aurel32.net> Cc: Blue Swirl <blauwirbel@gmail.com> Signed-off-by: Stefan Weil <weil@mail.berlios.de> --- hw/mips_fulong2e.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-)