From patchwork Sat Sep 11 06:46:25 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Weil X-Patchwork-Id: 64488 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 3B823B70AE for ; Sat, 11 Sep 2010 16:48:56 +1000 (EST) Received: from localhost ([127.0.0.1]:50179 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OuJtN-00063b-Gw for incoming@patchwork.ozlabs.org; Sat, 11 Sep 2010 02:48:53 -0400 Received: from [140.186.70.92] (port=45325 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OuJrD-0005Q2-Qb for qemu-devel@nongnu.org; Sat, 11 Sep 2010 02:46:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OuJrB-0003IG-Gr for qemu-devel@nongnu.org; Sat, 11 Sep 2010 02:46:39 -0400 Received: from moutng.kundenserver.de ([212.227.17.9]:59996) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OuJrB-0003HH-5s for qemu-devel@nongnu.org; Sat, 11 Sep 2010 02:46:37 -0400 Received: from flocke.weilnetz.de (p5086FB51.dip.t-dialin.net [80.134.251.81]) by mrelayeu.kundenserver.de (node=mrbap1) with ESMTP (Nemesis) id 0Mg0GL-1PHDtZ33QL-00NHyi; Sat, 11 Sep 2010 08:46:28 +0200 Received: from stefan by flocke.weilnetz.de with local (Exim 4.72) (envelope-from ) id 1OuJr1-0005SW-Q8; Sat, 11 Sep 2010 08:46:27 +0200 From: Stefan Weil To: QEMU Developers Date: Sat, 11 Sep 2010 08:46:25 +0200 Message-Id: <1284187585-20953-2-git-send-email-weil@mail.berlios.de> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1284187585-20953-1-git-send-email-weil@mail.berlios.de> References: <1284187585-20953-1-git-send-email-weil@mail.berlios.de> X-Provags-ID: V02:K0:MTqYve0F02ZQtGMqgMmFnFhtrZJ+gGJfGQfQSJoroSA 1HVN9MUBq2oTKa4AS3BI5fX9xmQVBOLsTNk1E8ygJTvadr/v/k b81FX7h2tCM6T/LDHYe8nXRtUaohIo/a98rPo2C4JWCPTp6fyh AueclayikzUrLjdeqOpsQeg6Iq1/wFGHoFv3wPsTmCEp98G+py CgC5jt7gUjYXjz26TieHxdGV9vF1rZ2L6dxcHGr46+soBtLisB OjlfGGtz630Wu X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. Cc: Aurelien Jarno Subject: [Qemu-devel] [PATCH] mips_malta: Detect format errors for function prom_set X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Add the necessary gcc attribute and fix the detected errors. Cc: Aurelien Jarno Signed-off-by: Stefan Weil --- hw/mips_malta.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/hw/mips_malta.c b/hw/mips_malta.c index a458c97..deee273 100644 --- a/hw/mips_malta.c +++ b/hw/mips_malta.c @@ -684,6 +684,8 @@ static void write_bootloader (CPUState *env, uint8_t *base, } static void prom_set(uint32_t* prom_buf, int index, const char *string, ...) + __attribute__ ((format (gnu_printf, 3, 4))); +static void prom_set(uint32_t* prom_buf, int index, const char *string, ...) { va_list ap; int32_t table_addr; @@ -750,13 +752,13 @@ static int64_t load_kernel(int big_endian) prom_size = ENVP_NB_ENTRIES * (sizeof(int32_t) + ENVP_ENTRY_SIZE); prom_buf = qemu_malloc(prom_size); - prom_set(prom_buf, prom_index++, loaderparams.kernel_filename); + prom_set(prom_buf, prom_index++, "%s", loaderparams.kernel_filename); if (initrd_size > 0) { prom_set(prom_buf, prom_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, prom_index++, loaderparams.kernel_cmdline); + prom_set(prom_buf, prom_index++, "%s", loaderparams.kernel_cmdline); } prom_set(prom_buf, prom_index++, "memsize");