From nobody Sun May 5 02:09:42 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; dkim=fail spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1493977795485939.4454348007055; Fri, 5 May 2017 02:49:55 -0700 (PDT) Received: from localhost ([::1]:45954 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d6Zs2-0001UX-00 for importer@patchew.org; Fri, 05 May 2017 05:49:54 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42229) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d6ZrE-0001C3-Rf for qemu-devel@nongnu.org; Fri, 05 May 2017 05:49:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d6Zr6-00078e-8k for qemu-devel@nongnu.org; Fri, 05 May 2017 05:48:59 -0400 Received: from mail-wm0-x242.google.com ([2a00:1450:400c:c09::242]:36247) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1d6Zr6-00078P-1g for qemu-devel@nongnu.org; Fri, 05 May 2017 05:48:56 -0400 Received: by mail-wm0-x242.google.com with SMTP id u65so237280wmu.3 for ; Fri, 05 May 2017 02:48:55 -0700 (PDT) Received: from 640k.lan (94-39-148-124.adsl-ull.clienti.tiscali.it. [94.39.148.124]) by smtp.gmail.com with ESMTPSA id o20sm3577501wro.61.2017.05.05.02.48.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 05 May 2017 02:48:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=vIZHklYaMQXAfBLm3q0fGNTnNihOl2WQZdiNtm6hKIA=; b=KP4TBF+7ePpns2dk2fSH4L92Y7dau+Kc43XyMgDtg/IoPBh4kZ1MsVz8UUf9+j08jD ScNFFpip5iErHmN44L59Po95w5RnnO3gp7e+bTL9WqSa/Qdb4bZl976BjuF8TwjNWUBK zNFaor0/c6nsBqEP6MNuxzVZIRVJ7qwEyZoVgtmuw170RnWB4J2Kmv0uJpdRYRRbvYio yYLGzUjjbRCfBX2cJVTwr20teXcUDjdC7r7uyUmr6oXN95/gdmCYOtfQE52D3DiCMP9X vUFH16Nd/NTlpJI9Fbb+XvhN7tAqiAGwekaKv8ZH08LYTNcpn4HuTzjcIBnLOMPipMn+ IeSA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :mime-version:content-transfer-encoding; bh=vIZHklYaMQXAfBLm3q0fGNTnNihOl2WQZdiNtm6hKIA=; b=iqWsoVUbJjANKmtfXg8YgNOLc19ms5YcvEWJwrc15iOcDuMUzrOY8cfB0NtH7qDOrI 5fh/Zgn0Zw2oLXolFozBXnRqCUaxr8M/0Y08K4zHKHeRR+xYnGKmA266vvNrZQiAyXef miXVKCYBNU1XrLSHHdEYpmSeA6fKPaTgh44eVpaOM+/7rjpPlCc6pbAoAxr19dJGUoGw yaXzXeM8Zks1kmi061KNcLJJ/CZjk+qFiKXx/9abljsp8tECFShM4+pvMGORxv0/k2pG twYSLAs74euPkpFeaUpGxSaZkITXZpQkMY/cfuOdh+kNW9qwxK0xQKhSjL+O5hgF+kPm ElDA== X-Gm-Message-State: AN3rC/5VYMBKnYbnIcjVafHhahPkpdFMN9wWMieGJ4nhwFzEafD/vmwB xEIQiU+O9PCn4uBEEsE= X-Received: by 10.28.11.207 with SMTP id 198mr4550675wml.53.1493977734507; Fri, 05 May 2017 02:48:54 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Fri, 5 May 2017 11:48:50 +0200 Message-Id: <1493977730-20581-1-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c09::242 Subject: [Qemu-devel] [PATCH] ppc: xics: fix compilation with CentOS 6 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: , Cc: dgibson@redhat.com, stefanha@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 The PowerPCCPU typedef is included twice if a file includes both hw/ppc/xics.h and target/ppc/cpu-qom.h. Signed-off-by: Paolo Bonzini Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- There are other failures but I don't have time to debug them today: In file included from /tmp/qemu-test/src/include/hw/ppc/pnv.h:26, from /tmp/qemu-test/src/hw/ppc/pnv.c:31: /tmp/qemu-test/src/include/hw/ppc/pnv_psi.h:50: error: redefinition of typ= edef =E2=80=98PnvPsi=E2=80=99 /tmp/qemu-test/src/include/hw/ppc/pnv_lpc.h:26: note: previous declaration= of =E2=80=98PnvPsi=E2=80=99 was here In file included from /tmp/qemu-test/src/include/hw/ppc/pnv.h:27, from /tmp/qemu-test/src/hw/ppc/pnv.c:31: /tmp/qemu-test/src/include/hw/ppc/pnv_occ.h:25: error: redefinition of typ= edef =E2=80=98PnvPsi=E2=80=99 /tmp/qemu-test/src/include/hw/ppc/pnv_psi.h:50: note: previous declaration= of =E2=80=98PnvPsi=E2=80=99 was here In file included from /tmp/qemu-test/src/hw/ppc/pnv.c:39: /tmp/qemu-test/src/include/hw/ipmi/ipmi.h:188: error: redefinition of type= def =E2=80=98IPMIBmc=E2=80=99 /tmp/qemu-test/src/include/hw/ppc/pnv.h:121: note: previous declaration of= =E2=80=98IPMIBmc=E2=80=99 was here make[1]: *** [hw/ppc/pnv.o] Error 1 Please start including Docker-based tests in your pre-pull-request tests. include/hw/ppc/xics.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/hw/ppc/xics.h b/include/hw/ppc/xics.h index c215dc7..ce1942b 100644 --- a/include/hw/ppc/xics.h +++ b/include/hw/ppc/xics.h @@ -29,6 +29,7 @@ #define XICS_H =20 #include "hw/qdev.h" +#include "target/ppc/cpu-qom.h" =20 #define XICS_IPI 0x2 #define XICS_BUID 0x1 @@ -46,7 +47,6 @@ typedef struct ICSStateClass ICSStateClass; typedef struct ICSState ICSState; typedef struct ICSIRQState ICSIRQState; typedef struct XICSFabric XICSFabric; -typedef struct PowerPCCPU PowerPCCPU; =20 #define TYPE_ICP "icp" #define ICP(obj) OBJECT_CHECK(ICPState, (obj), TYPE_ICP) --=20 1.8.3.1