From patchwork Thu May 19 11:18:09 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 9127351 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 9164E9F30C for ; Thu, 19 May 2016 11:58:01 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id EEE8B20211 for ; Thu, 19 May 2016 11:58:00 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 5091220212 for ; Thu, 19 May 2016 11:58:00 +0000 (UTC) Received: from localhost ([::1]:49879 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b3MaV-0005le-CA for patchwork-qemu-devel@patchwork.kernel.org; Thu, 19 May 2016 07:57:59 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36789) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b3Lyw-00049f-QC for qemu-devel@nongnu.org; Thu, 19 May 2016 07:19:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1b3Lyr-00045a-5N for qemu-devel@nongnu.org; Thu, 19 May 2016 07:19:09 -0400 Received: from mail-wm0-x242.google.com ([2a00:1450:400c:c09::242]:36512) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b3Lyq-00045E-UE for qemu-devel@nongnu.org; Thu, 19 May 2016 07:19:05 -0400 Received: by mail-wm0-x242.google.com with SMTP id w143so20025567wmw.3 for ; Thu, 19 May 2016 04:19:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:subject:date:message-id:in-reply-to:references; bh=KnN3hXFC3yjZyaNd2Zq4JkD46IpmcsCQSdeK6VQFAq8=; b=dPIfmXE2EaW/E26/wszNVSRsBSEmoI44rNO7zP2+laYuW1aPWfv79XRrqPj8t8Lo2c lA6Ob4pVr7wptkItBx6jiZNmaD501hntsVY7h/acZ9kNWQ9dI0fC7M3/E2e14ETwa2gA puXRg1EQ05fzXyNcIAIuGOUBL3Lavpu/neWmDtak7rf88Ra//yglzxOUSQgypio4t5os yCcAvExRr5DLvyNCKbrUUf+C5omsjRbhFjh7baJf8ZXHjMEifp8/5ZutPPu+ScWjAidT yU8TXzOBaM0YrJiGmLyWJ+elioVCNNHyaMCWTi60IrnFuwwJ7eeUDkK9Wm1dHFyEYFk0 htwQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references; bh=KnN3hXFC3yjZyaNd2Zq4JkD46IpmcsCQSdeK6VQFAq8=; b=Dxt2UM6iQVuVJrAoGsCtlvm5d+G2IJku7pPUWAONJ0l4KjzB1n/pIN56CtLH5Pjk1+ 08WM4rrWuk0wgwd2YKKKFKu11cHkriv/HJkpl+GOAoaV6OlThoU8yJzN8Gd4v9ru0xxG LI821Ng5XvgHlhbThGYjS1vuzfFk10mSkNBhkmsHK57xJXcHcBO29MZCR3rgetH6dsiu /Jsg66eOGUpHn8VYQnwsqiD2psyMwPWrker3Z4TBiI/vWqmHIy5gBQzRoacNa4p9ATZZ WYMUMf7VMYGbq/zxugTdM2igEYNWmtxIojHA99xqsp0+2lHdbkczNkvvkXIjGRyvIkfG rJfw== X-Gm-Message-State: AOPr4FWXKs+YQCYOYAqOSx7w1hyou2gBOzIAjlwBAGWKus+vWI8Egf8v7QeoQnE7JRpMyA== X-Received: by 10.194.10.69 with SMTP id g5mr12913652wjb.7.1463656744372; Thu, 19 May 2016 04:19:04 -0700 (PDT) Received: from 640k.lan (dynamic-adsl-78-12-252-58.clienti.tiscali.it. [78.12.252.58]) by smtp.gmail.com with ESMTPSA id c7sm8374317wji.38.2016.05.19.04.19.03 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 19 May 2016 04:19:03 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Thu, 19 May 2016 13:18:09 +0200 Message-Id: <1463656726-35952-16-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1463656726-35952-1-git-send-email-pbonzini@redhat.com> References: <1463656726-35952-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a00:1450:400c:c09::242 Subject: [Qemu-devel] [PULL 15/52] target-ppc: do not make PowerPCCPUClass depend on target-specific symbols X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Just leave some members in even if they are unused on e.g. 32-bit PPC or user-mode emulation. This avoids complications when using PowerPCCPUClass in code that is compiled just once (because it applies to both 32-bit and 64-bit PPC for example) but still needs to peek at PPC-specific members. Signed-off-by: Paolo Bonzini --- target-ppc/cpu-qom.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/target-ppc/cpu-qom.h b/target-ppc/cpu-qom.h index bab501f..6f4e929 100644 --- a/target-ppc/cpu-qom.h +++ b/target-ppc/cpu-qom.h @@ -67,14 +67,10 @@ typedef struct PowerPCCPUClass { uint32_t flags; int bfd_mach; uint32_t l1_dcache_size, l1_icache_size; -#if defined(TARGET_PPC64) const struct ppc_segment_page_sizes *sps; -#endif void (*init_proc)(CPUPPCState *env); int (*check_pow)(CPUPPCState *env); -#if defined(CONFIG_SOFTMMU) int (*handle_mmu_fault)(PowerPCCPU *cpu, vaddr eaddr, int rwx, int mmu_idx); -#endif bool (*interrupts_big_endian)(PowerPCCPU *cpu); } PowerPCCPUClass;