From patchwork Tue Sep 22 23:19:02 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juan Quintela X-Patchwork-Id: 34099 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 373B9B7B7B for ; Wed, 23 Sep 2009 09:21:14 +1000 (EST) Received: from localhost ([127.0.0.1]:54026 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MqEfX-0000gR-Hz for incoming@patchwork.ozlabs.org; Tue, 22 Sep 2009 19:21:11 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MqEdk-0008GX-Fv for qemu-devel@nongnu.org; Tue, 22 Sep 2009 19:19:20 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MqEde-0008Dn-KU for qemu-devel@nongnu.org; Tue, 22 Sep 2009 19:19:18 -0400 Received: from [199.232.76.173] (port=54128 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MqEde-0008Da-8u for qemu-devel@nongnu.org; Tue, 22 Sep 2009 19:19:14 -0400 Received: from mx1.redhat.com ([209.132.183.28]:29070) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MqEdd-0003Uz-O0 for qemu-devel@nongnu.org; Tue, 22 Sep 2009 19:19:14 -0400 Received: from int-mx05.intmail.prod.int.phx2.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.18]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id n8MNJCwn015136 for ; Tue, 22 Sep 2009 19:19:13 -0400 Received: from localhost.localdomain (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1]) by int-mx05.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id n8MNJ6l3028452; Tue, 22 Sep 2009 19:19:11 -0400 From: Juan Quintela To: qemu-devel@nongnu.org Date: Wed, 23 Sep 2009 01:19:02 +0200 Message-Id: In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.67 on 10.5.11.18 X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Subject: [Qemu-devel] [PATCH 4/7] gcc wants 1st static and then const 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 Signed-off-by: Juan Quintela --- hw/g364fb.c | 2 +- target-i386/kvm.c | 2 +- target-microblaze/translate.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/hw/g364fb.c b/hw/g364fb.c index 88e3048..d1d2c12 100644 --- a/hw/g364fb.c +++ b/hw/g364fb.c @@ -396,7 +396,7 @@ static uint32_t g364fb_ctrl_readb(void *opaque, target_phys_addr_t addr) static void g364fb_update_depth(G364State *s) { - const static int depths[8] = { 1, 2, 4, 8, 15, 16, 0 }; + static const int depths[8] = { 1, 2, 4, 8, 15, 16, 0 }; s->depth = depths[(s->ctla & 0x00700000) >> 20]; } diff --git a/target-i386/kvm.c b/target-i386/kvm.c index cab9fcc..7010999 100644 --- a/target-i386/kvm.c +++ b/target-i386/kvm.c @@ -790,7 +790,7 @@ int kvm_arch_handle_exit(CPUState *env, struct kvm_run *run) #ifdef KVM_CAP_SET_GUEST_DEBUG int kvm_arch_insert_sw_breakpoint(CPUState *env, struct kvm_sw_breakpoint *bp) { - const static uint8_t int3 = 0xcc; + static const uint8_t int3 = 0xcc; if (cpu_memory_rw_debug(env, bp->pc, (uint8_t *)&bp->saved_insn, 1, 0) || cpu_memory_rw_debug(env, bp->pc, (uint8_t *)&int3, 1, 1)) diff --git a/target-microblaze/translate.c b/target-microblaze/translate.c index dfeb8ae..e91ea39 100644 --- a/target-microblaze/translate.c +++ b/target-microblaze/translate.c @@ -91,7 +91,7 @@ typedef struct DisasContext { int singlestep_enabled; } DisasContext; -const static char *regnames[] = +static const char *regnames[] = { "r0", "r1", "r2", "r3", "r4", "r5", "r6", "r7", "r8", "r9", "r10", "r11", "r12", "r13", "r14", "r15", @@ -99,7 +99,7 @@ const static char *regnames[] = "r24", "r25", "r26", "r27", "r28", "r29", "r30", "r31", }; -const static char *special_regnames[] = +static const char *special_regnames[] = { "rpc", "rmsr", "sr2", "sr3", "sr4", "sr5", "sr6", "sr7", "sr8", "sr9", "sr10", "sr11", "sr12", "sr13", "sr14", "sr15",