From nobody Sat May 4 06:01:39 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; 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 1488558704326342.58568354001966; Fri, 3 Mar 2017 08:31:44 -0800 (PST) Received: from localhost ([::1]:58936 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cjq7K-0003wf-4I for importer@patchew.org; Fri, 03 Mar 2017 11:31:42 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58813) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cjq4f-0002cO-8r for qemu-devel@nongnu.org; Fri, 03 Mar 2017 11:28:58 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cjq4e-0001mR-EZ for qemu-devel@nongnu.org; Fri, 03 Mar 2017 11:28:57 -0500 Received: from mail-wr0-x243.google.com ([2a00:1450:400c:c0c::243]:35687) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cjq4e-0001ls-8P; Fri, 03 Mar 2017 11:28:56 -0500 Received: by mail-wr0-x243.google.com with SMTP id u108so9959162wrb.2; Fri, 03 Mar 2017 08:28:56 -0800 (PST) Received: from 640k.lan (94-36-245-171.adsl-ull.clienti.tiscali.it. [94.36.245.171]) by smtp.gmail.com with ESMTPSA id f67sm3640225wmd.0.2017.03.03.08.28.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 03 Mar 2017 08:28:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id; bh=wteG9snMApueLc1ui2hWnVNhurNnyjtpxM7LoOPRiSs=; b=PCE5RbeRhDk/RIj13Nbog1r0NM1znttR0/+TKieZudHnBaePOcHxcdceF61BkHYG5m KMalsyTTrEK0WC6NJpdb4z6W/oMmdavWoqqvGaiJLOQVJINtV6fi+nfmvsr0tpMx+CS8 Ld2ODtIN8dh5z67V4BIrhcgZRphPpS/q/tdyCCkQCsta91lAtdUiTcg0Mo8zVOFiGUJF LQrRxqlca1iWJQpo2YvbGbC8UmDHzRvylsjg0upgbrtH8sZew5cSc7QwzVsiAjP0h2gg AOdnClrawXh1TB6qmX5dck5S2gKhr4onKoxOCXBZs8kNfBIDKFNBZKF+TaPFutZ8Kr9D clBA== 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; bh=wteG9snMApueLc1ui2hWnVNhurNnyjtpxM7LoOPRiSs=; b=kZJ/ZbeAg6EWRgaJd0HHL+97ppHm+Q96qrAX8oqs9qkPm8+ZLBo4BKKyu04DLjGgh0 cc1xwY3oFf5ilkepsMBxKy9m9DquPQmemxXQSo18VYqwhrfpQgxsO0jad/nKQyWC3eBa euYlZP5XEdbiDoEazuthRmj+IjcKa6MA93N6xWv1RhwzHySvTLjSuRfRoARk4apLSTsH xY49EoFA9V8NCeo3WuqbcQfSVdj+wTcX3LjDu36gfeRYsRCQpmm/CIYNlg093JfhgQ2c R5TOQoLh57K5e+11fcj4HJG6ibhC6wUiGVHwznfmbnDeFCdijqDTOyqY/fNWRtP+Dnfm oHoQ== X-Gm-Message-State: AMke39keBaShsmDdesW6TLRT4dbb6Nvhe8REWOzE0mrRQnGDizMi96iXdYLl5ZWIulrIug== X-Received: by 10.223.134.231 with SMTP id 36mr3898372wry.46.1488558534903; Fri, 03 Mar 2017 08:28:54 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Fri, 3 Mar 2017 17:28:50 +0100 Message-Id: <1488558530-21016-3-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c0c::243 Subject: [Qemu-devel] [PATCH] ppc: avoid typedef redefinitions 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: David Gibson , qemu-ppc@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" These cause compilation failures on CentOS 6 or other operating systems with older GCCs. Cc: David Gibson Cc: qemu-ppc@nongnu.org Signed-off-by: Paolo Bonzini --- It would probably be better to remove the sPAPRMachineState typedef from xics.h instead, but this is a quick fix to restore the centos6 docker target. include/hw/ppc/spapr.h | 1 - include/hw/ppc/xics.h | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/include/hw/ppc/spapr.h b/include/hw/ppc/spapr.h index cfd2711..15f4371 100644 --- a/include/hw/ppc/spapr.h +++ b/include/hw/ppc/spapr.h @@ -21,7 +21,6 @@ typedef struct sPAPREventSource sPAPREventSource; #define SPAPR_TIMEBASE_FREQ 512000000ULL =20 typedef struct sPAPRMachineClass sPAPRMachineClass; -typedef struct sPAPRMachineState sPAPRMachineState; =20 #define TYPE_SPAPR_MACHINE "spapr-machine" #define SPAPR_MACHINE(obj) \ diff --git a/include/hw/ppc/xics.h b/include/hw/ppc/xics.h index 1945913..9a5e715 100644 --- a/include/hw/ppc/xics.h +++ b/include/hw/ppc/xics.h @@ -139,9 +139,9 @@ struct ICSIRQState { uint8_t flags; }; =20 -typedef struct XICSFabric { +struct XICSFabric { Object parent; -} XICSFabric; +}; =20 #define TYPE_XICS_FABRIC "xics-fabric" #define XICS_FABRIC(obj) \ --=20 1.8.3.1