From patchwork Mon Sep 20 20:18:00 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Weil X-Patchwork-Id: 65252 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 C364EB70CC for ; Tue, 21 Sep 2010 07:16:06 +1000 (EST) Received: from localhost ([127.0.0.1]:34447 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OxnEJ-0002Ze-Ro for incoming@patchwork.ozlabs.org; Mon, 20 Sep 2010 16:44:51 -0400 Received: from [140.186.70.92] (port=33655 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OxmtL-0000oO-5J for qemu-devel@nongnu.org; Mon, 20 Sep 2010 16:23:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1Oxmoe-0006MH-2J for qemu-devel@nongnu.org; Mon, 20 Sep 2010 16:18:21 -0400 Received: from moutng.kundenserver.de ([212.227.126.171]:64150) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1Oxmod-0006Kr-JQ for qemu-devel@nongnu.org; Mon, 20 Sep 2010 16:18:20 -0400 Received: from flocke.weilnetz.de (p54ADAC47.dip.t-dialin.net [84.173.172.71]) by mrelayeu.kundenserver.de (node=mrbap2) with ESMTP (Nemesis) id 0MCOnp-1P6LP00v9F-009pfv; Mon, 20 Sep 2010 22:18:11 +0200 Received: from stefan by flocke.weilnetz.de with local (Exim 4.72) (envelope-from ) id 1OxmoU-0005m6-4Z; Mon, 20 Sep 2010 22:18:10 +0200 From: Stefan Weil To: QEMU Developers Date: Mon, 20 Sep 2010 22:18:00 +0200 Message-Id: <1285013881-22169-1-git-send-email-weil@mail.berlios.de> X-Mailer: git-send-email 1.7.1 In-Reply-To: References: X-Provags-ID: V02:K0:2D/gobMJ4Y/rWYUU87NI4biq0xdcj4Cl7y+8y7szeU5 5jPH+yXJbR0i0YYhXmhS2VmykQj/PtG3l3dtfIanM31jnZTeTP D9LMdwg1JVupsIV0RaV3+SQ7SwbSoUtUC6JYeoe+7sv36XPG2T NN6xQ79wnZqv/xBageojLGCWjSQ1LcaTkfuWXkkHbBBhW8f+NV 6yDLi6DGP5a/xQxF7+nwtN5iRQX9tUpJToioFrC/mYF9ZEd0Vu lZkiildjFMb+I X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. Cc: Blue Swirl , Aurelien Jarno Subject: [Qemu-devel] [PATCH 1/2] mips_fulong2e: Fix format strings 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 Fix two compiler warnings (when format attribute is applied) and one error (missing %) in format strings. Cc: Aurelien Jarno Cc: Blue Swirl Signed-off-by: Stefan Weil --- 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 */