From patchwork Tue Sep 13 17:16:20 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 669593 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org 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 ozlabs.org (Postfix) with ESMTPS id 3sYXxv0Wtfz9s9x for ; Wed, 14 Sep 2016 04:19:15 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=0uYjY2yc; dkim-atps=neutral Received: from localhost ([::1]:50794 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bjsIa-0001kf-HF for incoming@patchwork.ozlabs.org; Tue, 13 Sep 2016 14:19:12 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33930) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bjrLz-0000Kr-EN for qemu-devel@nongnu.org; Tue, 13 Sep 2016 13:18:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bjrLu-0006Oc-AD for qemu-devel@nongnu.org; Tue, 13 Sep 2016 13:18:38 -0400 Received: from mail-wm0-f67.google.com ([74.125.82.67]:33289) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bjrLu-0006Ni-4E for qemu-devel@nongnu.org; Tue, 13 Sep 2016 13:18:34 -0400 Received: by mail-wm0-f67.google.com with SMTP id b187so19221510wme.0 for ; Tue, 13 Sep 2016 10:18:34 -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=5FlW2ZrWhXu3TwRW70btwyWcOma0XnTyoaYHoC0ZRlk=; b=0uYjY2ychMEJt7EXC4hzfdY8pMlBhE9iwvWQ38c8KQCKm+vHAVmmba1rQ/35PTmwRG IBwSZ26M54zpSrWcpwLrv7Bi9N4V0RGoy9PqaDWPscWUUiN6Bh1IqTde5XeIRst8Z2YC ByyJ8R0ZPMJrpEnUO1EsjrUG815zPLjswEiJRdeMnNLeZ0HNrnX29awXaXQHxfUsatV8 4X1hqHkcQQDfMcAh7ohOfZB/+w0Gi5itQ+VnGFZuCDS2y7meGksUr+olxYcZuhwcnVpy m4oFzExslllss17Slwu2sqgrRHviXP9QaSPu3sJKa9DXYHFCbzgwnexXoCh8zV51x/vM goRA== 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=5FlW2ZrWhXu3TwRW70btwyWcOma0XnTyoaYHoC0ZRlk=; b=DbvVZpehTrEPNjVvKw6Wr5F7hFiv7o+3cXhwmUG+wCXJxbapiOFREPTNTss16E3KHd PLCzG4SKtzka34SSmxYSA+lTgVh06Q86lUMTYxq7kU6OZB8tAKa3QIjo18nbeHCt4eLi 75M6lIJRTLW4do/7in12FzlKqgsYdhLhBuXogAKXBhnhYmp509+4SGXHBdo8aSaH2kaA xPJ9QZcUCEy21BOBPNByJN7qtbTaNZL4HW2KVqPAe3qKIi+I6F5qFCdLzNsOeVM7Y/iJ ExWP0QXAF3H07FUkKEYOSEgWmProRmbG0aUYCbeoHe5wV99z/vVYqkrJWUn1TOyrtR0Y Dw4w== X-Gm-Message-State: AE9vXwOJFbdQDiDjwkBvWibX1MeBRxsfGVII197+Rv+AFl/pilHcBnECynVQ77k3s9rraQ== X-Received: by 10.28.28.70 with SMTP id c67mr1895013wmc.8.1473787053398; Tue, 13 Sep 2016 10:17:33 -0700 (PDT) Received: from 640k.lan (94-39-180-254.adsl-ull.clienti.tiscali.it. [94.39.180.254]) by smtp.gmail.com with ESMTPSA id s184sm6331987wmb.11.2016.09.13.10.17.32 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 13 Sep 2016 10:17:32 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Tue, 13 Sep 2016 19:16:20 +0200 Message-Id: <1473786989-54823-50-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1473786989-54823-1-git-send-email-pbonzini@redhat.com> References: <1473786989-54823-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 74.125.82.67 Subject: [Qemu-devel] [PULL 49/58] ppc: do not redefine CPUPPCState 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Just include the file that is supposed to bring it in. Signed-off-by: Paolo Bonzini --- include/hw/ppc/fdt.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/include/hw/ppc/fdt.h b/include/hw/ppc/fdt.h index 2c68d16..0cabb6a 100644 --- a/include/hw/ppc/fdt.h +++ b/include/hw/ppc/fdt.h @@ -11,8 +11,7 @@ #define PPC_FDT_H #include "qemu/error-report.h" - -typedef struct CPUPPCState CPUPPCState; +#include "target-ppc/cpu-qom.h" #define _FDT(exp) \ do { \