From patchwork Tue Dec 13 12:35:47 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 633506 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp3050080pvb; Tue, 13 Dec 2022 04:38:38 -0800 (PST) X-Google-Smtp-Source: AA0mqf4j7GwBJw/mNnXpRdmlHdwPtP5tMG/UrHuN/6BvzIYzh0B2zqz5K0CeLCFTOs6NFfU2L2v+ X-Received: by 2002:ac8:124c:0:b0:3a7:ea9b:5627 with SMTP id g12-20020ac8124c000000b003a7ea9b5627mr4876067qtj.13.1670935118005; Tue, 13 Dec 2022 04:38:38 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1670935117; cv=none; d=google.com; s=arc-20160816; b=A6s3yLrC7U98WLPyM/u1y8ofmkUSjtDV0IGXeFHoKKLh/YwXatxcQWJPo8YZ7Qly4k gO2PV3Xw++7jyEpAzxJYnDO+Fio5saYHiHT4PVC44yYP/mZMmELtLTMbr5rw3tAelM34 Uxq1saFWbLMkq+6UKHbv5buBeKZHSUBEfwtjDepaB3ZreCNDCbpBexs95CvzgEBN+4tB +TL1+erJFsO+7EaUXDshDGZ1si0MFWww2tth1bug/vR6ksn84G+7UlF3E605Gt95ROqm CHgJABmOY+o0zGXhqKUi/jZvtkZzPuk+WtH9/UJM97CQ/r5epNsneVj9jHg+mZklbKbX 5UAw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=jfoDaqyDi5g2SMMUF24M2o5M/2GLRFzHx+wauvWPlgQ=; b=Gao4ZrGztTQgCnwAJ893Hff5GqWPGensNWv3zrXT8PKt4QMju316Fu+ZZhKrd7/SaV zUTNfkO3dJXHHMnpXNVCUeVSIOj/dsuqoPsEDFoX+U2QTfMXDUakJrAsKrSM9u46T2cz maK6QRQNFfRUPbHtrFjWsXKp9xK46gFJ2A7p3Xcv46ZnRAC/WQvjB3J+76l8HUyr4iZW O3CGnQ1pykq8TiwDJV6EFINOe/KsE9RmySpEAbdEfmKFivpfKd47GRNNXtUmjyqLKew9 05ppiOmUUJ5cc4T6MDTS3/rrmL6a4r8X3SPgq9RkC3+CIWJAm8eyV+CjqpLFM1/8+Cb8 Pa7A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=RUnAyaXz; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id i22-20020ac87656000000b003979d6bb76asi6893976qtr.31.2022.12.13.04.38.37 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 13 Dec 2022 04:38:37 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=RUnAyaXz; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p54W8-0001Io-ST; Tue, 13 Dec 2022 07:36:16 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p54Vv-0001F4-A4 for qemu-devel@nongnu.org; Tue, 13 Dec 2022 07:36:04 -0500 Received: from mail-wr1-x42d.google.com ([2a00:1450:4864:20::42d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1p54Vt-00062e-Q1 for qemu-devel@nongnu.org; Tue, 13 Dec 2022 07:36:03 -0500 Received: by mail-wr1-x42d.google.com with SMTP id m14so15438287wrh.7 for ; Tue, 13 Dec 2022 04:36:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=jfoDaqyDi5g2SMMUF24M2o5M/2GLRFzHx+wauvWPlgQ=; b=RUnAyaXz2JFQXkf5dgXKJV9M0oDJESZyYkFT7wF9FlwaBHuPbbwscXuYCr6iatV0EW 0cjPST/WmAs7jL+Ku7Sko0l9gWGIYm355S1wXkBrPAZYT6VwWBwwUaMRf8xwcTQqlpqW U6UKWAnIIPFnBTGoinUsbrcRFZQUKyLsjiSVAM2N10/nxVCUf6B5zLf23hI8I9ncKm9R A0QiEcXFmDIxm2/7EeZ7z3jN680gJMZPvbhKcbkbPnIt3csmMUvDIKym/FV6RlanBanf yVbX17Ng5k7SkpPfXSLjuh+Y0NI+2lpL7wGIDMgFGXx8X6fd6L7Cpf+/hhgxmZFSySuc YJqA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=jfoDaqyDi5g2SMMUF24M2o5M/2GLRFzHx+wauvWPlgQ=; b=hAETGM2NZAJyWHGcvC27lYiIiGa5nL8MyNGoXwcdlZgehJ2cKco+MKH/+nx27lf1Rm nNVHzTshR5Rp7KTAHQwZpg2q7Mx/FoRvPc0eBvd3qbOMG04JNlLIa3oKn2m7MfcAaYbO 6Z654WpP7Z0IyWALvw3FNVHSlVMpsLQHek+/wKu8zlV1GmEFMi/j9DxXHx584oW8yJFn aYwDQWA6s5meccWBWiOPP3JMvhJ1edDUcQZeU4catcIevB1/NMC1QSvoYGHEC2aw2Snf D94tMP9UJbTI8BL+mKszw9wuxWxm5kzQ6rSYnf5lRp44F4VbniNNUeb4AHRfqmXAOIEK ln8w== X-Gm-Message-State: ANoB5pkjoGD3iXLc0QSCtMsypurhoSuYMUfKtwVpUfSNEjQ11dLFOCDK 9InqzakzyO3ex11wLny0RT/xiaXyj8QwSTzg2fc= X-Received: by 2002:a5d:6045:0:b0:242:24a7:c7f2 with SMTP id j5-20020a5d6045000000b0024224a7c7f2mr11925721wrt.58.1670934959132; Tue, 13 Dec 2022 04:35:59 -0800 (PST) Received: from localhost.localdomain ([81.0.6.76]) by smtp.gmail.com with ESMTPSA id e3-20020a5d5303000000b002366dd0e030sm11671653wrv.68.2022.12.13.04.35.57 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 13 Dec 2022 04:35:58 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-ppc@nongnu.org, David Gibson , kvm@vger.kernel.org, Alexey Kardashevskiy , Daniel Henrique Barboza , =?utf-8?q?C=C3=A9dric_Le_G?= =?utf-8?q?oater?= , Greg Kurz , Paolo Bonzini , Markus Armbruster , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH-for-8.0 1/4] target/ppc/kvm: Add missing "cpu.h" and "exec/hwaddr.h" Date: Tue, 13 Dec 2022 13:35:47 +0100 Message-Id: <20221213123550.39302-2-philmd@linaro.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221213123550.39302-1-philmd@linaro.org> References: <20221213123550.39302-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42d; envelope-from=philmd@linaro.org; helo=mail-wr1-x42d.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org kvm_ppc.h is missing various declarations from "cpu.h": target/ppc/kvm_ppc.h:128:40: error: unknown type name 'CPUPPCState'; did you mean 'CPUState'? static inline int kvmppc_get_hypercall(CPUPPCState *env, ^~~~~~~~~~~ CPUState include/qemu/typedefs.h:45:25: note: 'CPUState' declared here typedef struct CPUState CPUState; ^ target/ppc/kvm_ppc.h:134:40: error: unknown type name 'PowerPCCPU' static inline int kvmppc_set_interrupt(PowerPCCPU *cpu, int irq, int level) ^ target/ppc/kvm_ppc.h:285:38: error: unknown type name 'hwaddr' hwaddr ptex, int n) ^ target/ppc/kvm_ppc.h:220:15: error: unknown type name 'target_ulong' static inline target_ulong kvmppc_configure_v3_mmu(PowerPCCPU *cpu, ^ target/ppc/kvm_ppc.h:286:38: error: unknown type name 'ppc_hash_pte64_t' static inline void kvmppc_read_hptes(ppc_hash_pte64_t *hptes, ^ Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Daniel Henrique Barboza --- target/ppc/kvm_ppc.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/target/ppc/kvm_ppc.h b/target/ppc/kvm_ppc.h index ee9325bf9a..5fd9753953 100644 --- a/target/ppc/kvm_ppc.h +++ b/target/ppc/kvm_ppc.h @@ -9,6 +9,9 @@ #ifndef KVM_PPC_H #define KVM_PPC_H +#include "exec/hwaddr.h" +#include "cpu.h" + #define TYPE_HOST_POWERPC_CPU POWERPC_CPU_TYPE_NAME("host") #ifdef CONFIG_KVM From patchwork Tue Dec 13 12:35:48 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 633508 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp3050487pvb; Tue, 13 Dec 2022 04:39:30 -0800 (PST) X-Google-Smtp-Source: AA0mqf42fK5GhfDUAvnBCBSBHxVt3jm17mJUgOVOlVfN2yXJoEjBK/I66l2qqTEYDnG5y8HGyo67 X-Received: by 2002:ac8:4f07:0:b0:3a8:fd7:7347 with SMTP id b7-20020ac84f07000000b003a80fd77347mr17394785qte.32.1670935170216; Tue, 13 Dec 2022 04:39:30 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1670935170; cv=none; d=google.com; s=arc-20160816; b=LyjQYGzaajmVUPQVw0mB8d/ZYcSPh3dp4PhsN1w0hvwXP5rOEUDy3be1TE4clTfxWj NEfe10s+8PkFLImuO8JdAKXwtduo3YB2qZu6wHkVKSebkPQgyLc3UVK+jDHL2FzDpRyU 3E9xUvCQvWN2J43oSiu57waOohWikLFBGqcoClRdyr3jmC7f2f1QJtcH/ldmF0pa3SSJ ra0E53x3Sa8kDKJxAhw3mGklTqK7DpmSXhBviikYu7eG8/gftluTrbqDwPSrXTg9ku+q rIMdlUrJU9VmSx4m228HKDZ3d1zhaDrOnCbYnkdh57LvxaeDwdK6d//MrvmSS/jMOCeB JStg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=kaPjbKdMr76WDvODBflVFVeFIfBaQyO5rZm5rUBpNuw=; b=HkFc4y06TXjQ/a0JOUk4hpfiTDl9f+ApxPXTLrTl+U19aJF2AvgFWF1l6F6Xnp7tDV vfIL9EPg9lZw2YgxSJ68egpco05FfYIB89duCcdkLhjKhQcrAMAHpPIfDyCQuIdr3KS4 bYQ3TWtvz3ea6PN6HI+XBy2umlhEzHd3LtNKOGHTjfk/dOfMPjDibjA4fGHp3UeXukep 6xTsZr12XeHguDFF1RAX8hQigifF0+HyroN/TRFOraEZnCcnOS0EFiwEkO71jZy6ppNe NuMD6kUenhk6JufNYFFzMB8+rIXXdcSenAJkowQ6C0TB0qngikorI5QMGqMjkvWOLael P0FA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="O2ot/k26"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id cb7-20020a05622a1f8700b003a6a7728c2fsi7157907qtb.753.2022.12.13.04.39.30 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 13 Dec 2022 04:39:30 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="O2ot/k26"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p54WA-0001Kk-Du; Tue, 13 Dec 2022 07:36:18 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p54Vz-0001G0-Vx for qemu-devel@nongnu.org; Tue, 13 Dec 2022 07:36:12 -0500 Received: from mail-wm1-x32a.google.com ([2a00:1450:4864:20::32a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1p54Vy-00063Q-6d for qemu-devel@nongnu.org; Tue, 13 Dec 2022 07:36:07 -0500 Received: by mail-wm1-x32a.google.com with SMTP id m19so8171822wms.5 for ; Tue, 13 Dec 2022 04:36:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=kaPjbKdMr76WDvODBflVFVeFIfBaQyO5rZm5rUBpNuw=; b=O2ot/k263FnLwr6J9y4vgJFRt8gHLPGH+hYoc+NkfvsmnefXlPnGZlKV8VaoDFYsl2 tn4cJPrjWf4augfmgq/yh0o+PlrKquNKGxM+vgRAO/pBZE4l5MZ84gzT313lx8kTdwHV K6FxQulbeRmrkFTTBqGMFUcyGs7iCYU5rNySfLLa/9pwV0TyJUgHwk7niUza6Riz0S4E exNt9PaeK9U176+7vydCwwzvZPiJ41xLFN5PRFEM6K/4lqmnr+M/uc8DzjHVI5S0MNyE fNme6kL5jj1uCRkbMgT1tQ1KaxfYfrrr6h9aQJTHxFSoxa8k6RLI2cKkO5Sr1fugKJtF 8g0w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=kaPjbKdMr76WDvODBflVFVeFIfBaQyO5rZm5rUBpNuw=; b=OiOABViGl4ECJv3jxWPUZXJk6Sa9muAX0g26bNLgopD7W9AYciDUvXhbYSsOnmfRZe ZrBmg6sZj5PVRnSC/OLNQwl3GjVxjzy+Oei60NQByohPWs/A+C7dhydAChHemqxwgdDB /gco42OQwRTfIx1rPWTKQD9bFxZ8upuVk5H4eENhWtl993oZyanAy9otkHudQTt2Ascp xgwhD/A0R8x0HQAgTRNEMjAiHZZ3q1EDcVAAz1C7nXV1+swmbTdbiqRXRg+0XHn0dMXH +WYRHYRULGxbpZMZxeZY1rpVoOf9oAigwkDm6dAmhak5I25KeVBR0mtioqeZGFts4Ual ODuw== X-Gm-Message-State: ANoB5pnbStD764BP0WXs12wg6gieP/ScePuVLCQeMhjnHTJxD+vFOdBT rib7iU9t+dkBgaDW9s9NDbQxv8/+c+t9Bgil1B0= X-Received: by 2002:a05:600c:4e46:b0:3d1:c8c8:fc0 with SMTP id e6-20020a05600c4e4600b003d1c8c80fc0mr15296436wmq.10.1670934964621; Tue, 13 Dec 2022 04:36:04 -0800 (PST) Received: from localhost.localdomain ([81.0.6.76]) by smtp.gmail.com with ESMTPSA id o3-20020a05600c4fc300b003cfbbd54178sm3375484wmq.2.2022.12.13.04.36.03 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 13 Dec 2022 04:36:04 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-ppc@nongnu.org, David Gibson , kvm@vger.kernel.org, Alexey Kardashevskiy , Daniel Henrique Barboza , =?utf-8?q?C=C3=A9dric_Le_G?= =?utf-8?q?oater?= , Greg Kurz , Paolo Bonzini , Markus Armbruster , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH-for-8.0 2/4] hw/ppc/vof: Do not include the full "cpu.h" Date: Tue, 13 Dec 2022 13:35:48 +0100 Message-Id: <20221213123550.39302-3-philmd@linaro.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221213123550.39302-1-philmd@linaro.org> References: <20221213123550.39302-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32a; envelope-from=philmd@linaro.org; helo=mail-wm1-x32a.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org "vof.h" doesn't need the full "cpu.h" to get the target_ulong definition, including "exec/cpu-defs.h" is enough. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Daniel Henrique Barboza --- include/hw/ppc/vof.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/hw/ppc/vof.h b/include/hw/ppc/vof.h index f8c0effcaf..d3f293da8b 100644 --- a/include/hw/ppc/vof.h +++ b/include/hw/ppc/vof.h @@ -9,7 +9,7 @@ #include "qom/object.h" #include "exec/address-spaces.h" #include "exec/memory.h" -#include "cpu.h" +#include "exec/cpu-defs.h" typedef struct Vof { uint64_t top_addr; /* copied from rma_size */ From patchwork Tue Dec 13 12:35:49 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 633507 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp3050125pvb; Tue, 13 Dec 2022 04:38:45 -0800 (PST) X-Google-Smtp-Source: AA0mqf54NwQ0v+GZu+2QaeZuH4ojxrFPjP1uCbH8cPmoIxwLP2/hU63STbmCeKqsFK5Nsk1Pr4pt X-Received: by 2002:ac8:1013:0:b0:39c:da20:f6df with SMTP id z19-20020ac81013000000b0039cda20f6dfmr25688803qti.3.1670935125000; Tue, 13 Dec 2022 04:38:45 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1670935124; cv=none; d=google.com; s=arc-20160816; b=uJFwise8N0vu10Zsqflv2YbvHIHwpaS1Xn1Z8i7ORtBW5hfaqlFG2vOZLfN22bl1Wq Sv6nIZ9rvCkduMEBTMeMH4cAfkj6SliikQRZB79ic6hRqjI2V6AiP6PPP1iHR1U7HJ+H nSIeFt2td+2F3hmKmZEWaaN3vhnKOZwibDK0wmvCvkQ56yP4URIU4W7945ZidHypVYSF UM1NgWbdw/ojAsCpVDImxsxji03TUGPXqntZoRMIuXsp86r26IVXoLCXjVCX7OdnuZm1 dqLshkoH6e5zv3ZROvMATRFtZ+mvbnCYSNq2ZQTXguKhwaz2bNGROUFyrtZ/sLGazSn1 FBJg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=GAS00uDwTnX0iz6OiEnof4qv+85R5FD/5UPI6Ha2V80=; b=GM6jRC3PRywJzjLR+YNCuuKBRR1fzZmD0lN7rwq9SdVksv6VHt84T/P8wrCdpeogWi ycJOq1BHgAOvtOzWCMkbv4X+2lyomx0b7+o1/VVMQogQ+t1TwkCNKtK+R6EhghTQEHsj xmlVbraBL1H1iOP5Ly41hrObgdiBP9lgVlF/VCeEebcVfTGT0GNij5kjOGlwAHmgBHmw fRWSvim29K4LMWRQOylTwYszgdsRGDulzOv+lurhP2YCHqM9sqarEtzPSeSUQNRL1Ltw HmlEwOmJpw/A/ialmq15+42SZRxVOIkh5J1yqKk7lc/ifhxc/ao6qwjuGeJiCwKWgQdL xJqQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=lQmDA90D; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id v6-20020ac87486000000b003a69eb226casi6769041qtq.54.2022.12.13.04.38.44 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 13 Dec 2022 04:38:44 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=lQmDA90D; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p54W9-0001JV-C1; Tue, 13 Dec 2022 07:36:17 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p54W7-0001HN-NW for qemu-devel@nongnu.org; Tue, 13 Dec 2022 07:36:15 -0500 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1p54W5-000640-86 for qemu-devel@nongnu.org; Tue, 13 Dec 2022 07:36:14 -0500 Received: by mail-wm1-x331.google.com with SMTP id ay40so8186295wmb.2 for ; Tue, 13 Dec 2022 04:36:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=GAS00uDwTnX0iz6OiEnof4qv+85R5FD/5UPI6Ha2V80=; b=lQmDA90DbXEwC7qP5vPds/7EEfMXj/0zvOwqP7kxXmDGx6j9d3G5fJXLl9eVN3Voby 7N9XLDnv8YW2mE0ZUfC80tjWsajTp1tMWPNqsm2bfIm9lKyRnWmA9PHbpELvM/WJ0nDD SaDduq0n3B5HUjsRgR+3CyFagqZYjN05fZ5T7VPL7tdRQ0BujZ6hJYF/EoyT+nzBd/sy H55ydNcpEOcoDROHV+kPvDP0fguBIb9JZKbAMePgLuxyHHQuK25RhVlJ192zx2oE/P23 mTVu+xEKOhWXgNY5Y4wcrdeL1R+mTMHhV2Oau8MdxRaN78GpBLJIMu4DiIOMQgHi84Py +R+g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=GAS00uDwTnX0iz6OiEnof4qv+85R5FD/5UPI6Ha2V80=; b=yOBteEMCs2KvD8It7HIUS6CtIMFlZ4AvTwsUUBw+bYW3ZHt1V/LdC83OL4lHZ9MuTB vJ/7oZhQEIhOQSJCkPLUTrMoWFmJBOWjfTQVDKppKCkUwopujny/TRSOf4ExVpCxmbch 9hSloqONo7KRntyU0w1bX/i+eg4yVub09vBqejiS/NqAH5nNkIR+lzj59Mx4HGD1pKcQ A2FbaA0/liNfnMV66n7pusQLKkkvZClAHEwXwPZ/EeESiyzc3r7ujHNftkmuDtT3/qPB QW2EqdTKx+SR0FgBuUAK2hcsbeyu3sNAhRAtrufvrgCZ2xY3dv0MBoKs3p7DBFiPQMSm mJYg== X-Gm-Message-State: ANoB5pnQq/xlJhOMws33VZoQRhJGlYwcguvG84gg2YWNpMxuAKUN4ldC NF1yeRdnoYmajDsbv/OUJeSQ8TvwLDznsLqg/7o= X-Received: by 2002:a05:600c:22ca:b0:3d1:ee97:980 with SMTP id 10-20020a05600c22ca00b003d1ee970980mr19035459wmg.7.1670934970165; Tue, 13 Dec 2022 04:36:10 -0800 (PST) Received: from localhost.localdomain ([81.0.6.76]) by smtp.gmail.com with ESMTPSA id q13-20020a7bce8d000000b003cf71b1f66csm12090266wmj.0.2022.12.13.04.36.08 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 13 Dec 2022 04:36:09 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-ppc@nongnu.org, David Gibson , kvm@vger.kernel.org, Alexey Kardashevskiy , Daniel Henrique Barboza , =?utf-8?q?C=C3=A9dric_Le_G?= =?utf-8?q?oater?= , Greg Kurz , Paolo Bonzini , Markus Armbruster , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH-for-8.0 3/4] hw/ppc/spapr: Reduce "vof.h" inclusion Date: Tue, 13 Dec 2022 13:35:49 +0100 Message-Id: <20221213123550.39302-4-philmd@linaro.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221213123550.39302-1-philmd@linaro.org> References: <20221213123550.39302-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::331; envelope-from=philmd@linaro.org; helo=mail-wm1-x331.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Currently objects including "hw/ppc/spapr.h" are forced to be target specific due to the inclusion of "vof.h" in "spapr.h". "spapr.h" only uses a Vof pointer, so doesn't require the structure declaration. The only place where Vof structure is accessed is in spapr.c, so include "vof.h" there, and forward declare the structure in "spapr.h". Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Daniel Henrique Barboza --- hw/ppc/spapr.c | 1 + include/hw/ppc/spapr.h | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 66b414d2e9..f38a851ee3 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -62,6 +62,7 @@ #include "hw/ppc/fdt.h" #include "hw/ppc/spapr.h" #include "hw/ppc/spapr_vio.h" +#include "hw/ppc/vof.h" #include "hw/qdev-properties.h" #include "hw/pci-host/spapr.h" #include "hw/pci/msi.h" diff --git a/include/hw/ppc/spapr.h b/include/hw/ppc/spapr.h index 04a95669ab..5c8aabd444 100644 --- a/include/hw/ppc/spapr.h +++ b/include/hw/ppc/spapr.h @@ -12,7 +12,6 @@ #include "hw/ppc/spapr_xive.h" /* For SpaprXive */ #include "hw/ppc/xics.h" /* For ICSState */ #include "hw/ppc/spapr_tpm_proxy.h" -#include "hw/ppc/vof.h" struct SpaprVioBus; struct SpaprPhbState; @@ -22,6 +21,8 @@ typedef struct SpaprEventLogEntry SpaprEventLogEntry; typedef struct SpaprEventSource SpaprEventSource; typedef struct SpaprPendingHpt SpaprPendingHpt; +typedef struct Vof Vof; + #define HPTE64_V_HPTE_DIRTY 0x0000000000000040ULL #define SPAPR_ENTRY_POINT 0x100 From patchwork Tue Dec 13 12:35:50 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 633505 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp3049270pvb; Tue, 13 Dec 2022 04:37:05 -0800 (PST) X-Google-Smtp-Source: AA0mqf4Q8uMBb7A7BBc88l/EFDdf+4VvdfBHUDPV3q3MrnUzX8BzfABvUveA300JJLh0U339lr0I X-Received: by 2002:a0c:e585:0:b0:4df:5465:b289 with SMTP id t5-20020a0ce585000000b004df5465b289mr10625962qvm.21.1670935024895; Tue, 13 Dec 2022 04:37:04 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1670935024; cv=none; d=google.com; s=arc-20160816; b=x48KLA0owWE+A2o4z1DQwV4b1iB+jBsABjqNLL1BMO50dV5SyOl72/QrFQVigibjDQ LwRZZ5BlDN9TNKvr3yzEKbZ+/W1fbN1Ko4s5v0XFuf6rD8wklSKsbKAiVFdYx7dP0UOO 1n4bDqHlO0g7BBMKTL8uJvWtLqT7QGO+3JWmgozpkHA1KcmWE8bKeJ/pKyXVkmD20QXy NwtTlgB3o9Fj2N9yLZoFJxOs5g7TBwCcw3xz1K9j+CL2B/uZ1tsW5JiZCUMoWdpaUouI 38kBqHTBm3G+VATvcoSEL/ms+kdvQryVVuYNhovuZp2RQnnorw5m1Vve5DDDSGUH/0LV g/iA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=EIWqF960/rg6gqFejdnkrSGn2PEdfww2KszocKY9NPM=; b=DqADNxTarneeNMeh7QRJAA+OROY+yuliY0xNYNyCSLcMP/zWOzwOlKEaNLtNAJZsEM TjPajMHsSpiVZ/pjXuBQOUkznDXwYYFEZhLStKAPufMsMLHk1KubY0A8yu/XsBxOD4Gf 0zkjxMRfTD38MpSmmTBqfH9FGxUUKrlPoZ9YXKqVXYKpgmvyg0hzGl9kIEUCK+EpoaBl NxnBTndChlfOP+fCLviIz9KeVuCtbeDeM5Ht4FLCoOdIZlpEQjNNPPQCExYHJ1qstvii 1Iz1Sz7pUeWuUrlJ4qT35Zd70Y6vmnQYKZdl3xaH5zqtciWUkDSkukuM37hGEcGkGuqc kcCg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=h+gcwRar; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 6-20020a0562140d6600b004c692dc7df1si6823155qvs.309.2022.12.13.04.37.04 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 13 Dec 2022 04:37:04 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=h+gcwRar; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p54WC-0001MZ-5o; Tue, 13 Dec 2022 07:36:20 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p54WA-0001KC-0a for qemu-devel@nongnu.org; Tue, 13 Dec 2022 07:36:18 -0500 Received: from mail-wm1-x32a.google.com ([2a00:1450:4864:20::32a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1p54W8-00063Q-9A for qemu-devel@nongnu.org; Tue, 13 Dec 2022 07:36:17 -0500 Received: by mail-wm1-x32a.google.com with SMTP id m19so8172241wms.5 for ; Tue, 13 Dec 2022 04:36:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=EIWqF960/rg6gqFejdnkrSGn2PEdfww2KszocKY9NPM=; b=h+gcwRarxYHjDQt6eSyU6mMb0ymg/ujMpr/wyp/9NOXKwuVevsa2yuezcU38aA6uR6 EgIrEBN6stZqv94xqIx1RCw3f2THn/jyeyfS3pp8+5l4OVRciFQf4RGrOJcsrgOZrb+W /UgIenJ71XQQYqRl07SuUEGXJFw3kRU5W4AP6MNJlgUVyH+IQBn8P/gBnYW/8PyXFjjT 7qrpQPkacbCf7KNPFamMzHqj6FSCnjenY/SZwxTNqpgykDjL3eS5PQBeFY2AATyiFpcm UA4WpWOcvjMpG62XkYMzgJriRHmuK97wk4cyMPnuYWKn2rrBYZ8fHqx1FNQ77WpX9igD myZQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=EIWqF960/rg6gqFejdnkrSGn2PEdfww2KszocKY9NPM=; b=PZ5Hl3Vswiwid4bq0AHv8RhQpROu4NRS5ej21kmqbxZ5SNDWUz6r8LnB/2TuI1kj9O h0iMTrCXWeilbDnQYd8V/tDhLVY7j9xGIsD0fN6w3ejuz94Ldg/0OSzuA6CtKL/6EHwg rTerU3pCkH+akhM+9HzvdPRcY2kmKx3Nlc4gDI1j5KuhTuBNxhMq7j+Zy4ACHT+4IxXt e6gMAc+pF++TUOufBZ7J+5c2zD/oNrI/p+3vfp5tBlBvivlNvmvtDuicqIuKn1YLRvef tVXy6lhHPvHRBEwKAV1dEi5VWVCUGj5YqCfEc2oayODc1TdcHbuDvMzBUXAHcPV8AtOy V00g== X-Gm-Message-State: ANoB5pnvyroEJmWHLKBnmwk4N1dQWf06cmHBOgDoSFjW+jp7BUi6mKu6 vXvg4yMk/KmCCSPd2aVSvPiJuAX0NmPlqUQHyr4= X-Received: by 2002:a05:600c:1c06:b0:3cf:71f9:3b4c with SMTP id j6-20020a05600c1c0600b003cf71f93b4cmr14756046wms.23.1670934975281; Tue, 13 Dec 2022 04:36:15 -0800 (PST) Received: from localhost.localdomain ([81.0.6.76]) by smtp.gmail.com with ESMTPSA id j17-20020a05600c1c1100b003cfd42821dasm14467122wms.3.2022.12.13.04.36.14 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 13 Dec 2022 04:36:14 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-ppc@nongnu.org, David Gibson , kvm@vger.kernel.org, Alexey Kardashevskiy , Daniel Henrique Barboza , =?utf-8?q?C=C3=A9dric_Le_G?= =?utf-8?q?oater?= , Greg Kurz , Paolo Bonzini , Markus Armbruster , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH-for-8.0 4/4] hw/ppc/spapr_ovec: Avoid target_ulong spapr_ovec_parse_vector() Date: Tue, 13 Dec 2022 13:35:50 +0100 Message-Id: <20221213123550.39302-5-philmd@linaro.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221213123550.39302-1-philmd@linaro.org> References: <20221213123550.39302-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32a; envelope-from=philmd@linaro.org; helo=mail-wm1-x32a.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org spapr_ovec.c is a device, but it uses target_ulong which is target specific. The hwaddr type (declared in "exec/hwaddr.h") better fits hardware addresses. Change spapr_ovec_parse_vector() to take a hwaddr argument, allowing the removal of "cpu.h" in a device header. Signed-off-by: Philippe Mathieu-Daudé --- hw/ppc/spapr_ovec.c | 3 ++- include/hw/ppc/spapr_ovec.h | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/hw/ppc/spapr_ovec.c b/hw/ppc/spapr_ovec.c index b2567caa5c..a18a751b57 100644 --- a/hw/ppc/spapr_ovec.c +++ b/hw/ppc/spapr_ovec.c @@ -19,6 +19,7 @@ #include "qemu/error-report.h" #include "trace.h" #include +#include "cpu.h" #define OV_MAXBYTES 256 /* not including length byte */ #define OV_MAXBITS (OV_MAXBYTES * BITS_PER_BYTE) @@ -176,7 +177,7 @@ static target_ulong vector_addr(target_ulong table_addr, int vector) return table_addr; } -SpaprOptionVector *spapr_ovec_parse_vector(target_ulong table_addr, int vector) +SpaprOptionVector *spapr_ovec_parse_vector(hwaddr table_addr, int vector) { SpaprOptionVector *ov; target_ulong addr; diff --git a/include/hw/ppc/spapr_ovec.h b/include/hw/ppc/spapr_ovec.h index c3e8b98e7e..d756b916e4 100644 --- a/include/hw/ppc/spapr_ovec.h +++ b/include/hw/ppc/spapr_ovec.h @@ -37,7 +37,7 @@ #ifndef SPAPR_OVEC_H #define SPAPR_OVEC_H -#include "cpu.h" +#include "exec/hwaddr.h" typedef struct SpaprOptionVector SpaprOptionVector; @@ -73,7 +73,7 @@ void spapr_ovec_set(SpaprOptionVector *ov, long bitnr); void spapr_ovec_clear(SpaprOptionVector *ov, long bitnr); bool spapr_ovec_test(SpaprOptionVector *ov, long bitnr); bool spapr_ovec_empty(SpaprOptionVector *ov); -SpaprOptionVector *spapr_ovec_parse_vector(target_ulong table_addr, int vector); +SpaprOptionVector *spapr_ovec_parse_vector(hwaddr table_addr, int vector); int spapr_dt_ovec(void *fdt, int fdt_offset, SpaprOptionVector *ov, const char *name);