From patchwork Tue Apr 29 05:00:02 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 885707 Delivered-To: patch@linaro.org Received: by 2002:a5d:4884:0:b0:38f:210b:807b with SMTP id g4csp143326wrq; Mon, 28 Apr 2025 22:02:18 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWgPT2HnwnQQw9Jx5mD1GApkLrtcDdijCWOhV94A/boVUUSU1Pjp4HHnlf22C5eTouWaH31rg==@linaro.org X-Google-Smtp-Source: AGHT+IHLK66dny3qOCOP8Z/a89yN0+ffxVGElEiCxcFwqOi00lvzGT+1D9DoWZPDEktmBHhU4Qce X-Received: by 2002:ac8:5889:0:b0:476:790c:739a with SMTP id d75a77b69052e-48131806878mr208318021cf.20.1745902938439; Mon, 28 Apr 2025 22:02:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1745902938; cv=none; d=google.com; s=arc-20240605; b=WUp6JLVcntt7MnjtybdcpCh5Rco2GzkBduz1UtKdJVsv47Q43Dx4/pht6n8vyncF0Z mFuBsImKOmJZSkm+4Y/8Joar5tq7A63b41uXbUKny4cdjW2vM7PFGsbPyVGexExvUCwf /a/NVTHlWr/2wCBsN3Lb15vdLTCexF9XZSMui8e8YSwxBfei34j3bvUMau88cObi1VXc PSxBAvZ5Ayj0DNs63nsZym0P7/4Nwg1nyxd3y1ydVN0oLIvbBLrnNEFZUyEzyLMsVlN6 359OlnAtxHG1fuOBCbmpYLblQ0R65keAiswdZkanZp1Eb4t2xagIE8upx9L7OwpDQhMq o2ew== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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=2y4EwfHA2FmjYRfAFQnR46OcrZnAFzvzFB4cwR27V9E=; fh=O4yhk4V8tvPJDnLnyAX1De4ll2cui8YfCZlHtNTUPp4=; b=UJq9VsWR8ZQrO9XhFlNkbnaVQrh6xM31N7zYQNVkPeUeFQ4UGMqClpbOEoGQvLObbk KeyrUWXUe+07Yp+BiAuu0sKB+JBCpvqlEdNJ99hwcf5VfVFIKcCPxZqTFtI8NECKpPsn Hnu5mzs6qqBGKs6z0diongMz+SKMtYYrHzSO3AiTzCnMs6J9X9diFZ4xjuUY2u3Z5fqR 9/yBgdVhbZg287JQSVEJuLjTUmJIjRP62anmlZ4DjNHetfVgN+snmCddtMBzg7jukTiL 2LIWv9o88hbu7lxVhoMJDtNRSlXSXJoHlsx5RxKK0wspxnqKwzc4PZe0WL4djsD0w5id dJvA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=tu3nrhDG; 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; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d75a77b69052e-47ea26a52c4si117078941cf.571.2025.04.28.22.02.18 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 28 Apr 2025 22:02:18 -0700 (PDT) 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=tu3nrhDG; 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; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u9d5n-0008UA-8r; Tue, 29 Apr 2025 01:01:15 -0400 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 1u9d4y-0007ZT-RA for qemu-devel@nongnu.org; Tue, 29 Apr 2025 01:00:27 -0400 Received: from mail-pl1-x62d.google.com ([2607:f8b0:4864:20::62d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u9d4w-0005zN-CY for qemu-devel@nongnu.org; Tue, 29 Apr 2025 01:00:24 -0400 Received: by mail-pl1-x62d.google.com with SMTP id d9443c01a7336-223fd89d036so69119235ad.1 for ; Mon, 28 Apr 2025 22:00:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1745902821; x=1746507621; darn=nongnu.org; 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=2y4EwfHA2FmjYRfAFQnR46OcrZnAFzvzFB4cwR27V9E=; b=tu3nrhDG19IyRXkTgxJoaBuZ06NUmDjZkefReivDkYsjrI9iV9XccRsgG1owMA8Zx9 39xO+d18/F/rIqLLetM/Yl2+aiQ5tqXAjVdLTrykC/HQXsFFm3tIb9f7smtX36nWdwdm IbYUNbL/PNEDxyk6thDGq50XaXH2Jxyh0y6prbdqEKnuotdWtWzIsd7On6WQUK/mzDVF i7PeEEmKB74KQpZ5qd/0CKLbQtH2CxSdtcW7lYP6scsNxbr3JpkaTRMrAUkIe+mcz32V 41ilqjYPZ2zKi/pPiV4Ba7ztE5euHfSCSZvd2Husu45tRMcvXGceDKBFO4XiUXVuhi5R ZIug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745902821; x=1746507621; 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=2y4EwfHA2FmjYRfAFQnR46OcrZnAFzvzFB4cwR27V9E=; b=jEfuLjSi2UzAkTjEXXvLdaPss3cgV9lYokpyuQ7hYgihlqgSZjCx0pMqmyFdnDZmcV BPc4qWz07lqCMKgQGsBFkyBCuUCRQhGE4NWM0jhuclMt4jsW26bIj/BQx3QtSQJ0lnvF RvUog2TuEowyhVN/LOns1V0MCiwpys6x+onAdwpCnxdlPQmxmoHhhP9l1M4HZ8pfk5Mi izZSYTtizLufHUjtyZB5Nr7EvVIanB1+Hyc3JiJOrJ8p8Os8EGeIhSJ2Rx3FdZiQ/p+H 77UZbXJB9ZzvkJGByKw6mJjOTLOcaSlpV3skxoIwYXrDYNe8fNQwP5a0vk9enx6zp/pu d7ww== X-Gm-Message-State: AOJu0Yxvp1agOYN9hy/1zdCrmbuwXRkXIP9rv4yX+sBxxtr/fc+kGgd3 4qVxDnxiSFrY/F0vqgXShzEz9M+/f6YK4MLyV61WUeVZLvPWO2G9AHguSa3dLyapMIpZWcNR2xw 7 X-Gm-Gg: ASbGnctA+r7mxAluazn5ZkwXHAvIIQpCr0o52whsE5Z9LXAxwULvqgp0h7xLFy8ECIJ YB1p+9MdqXJu4VNyAyU1vYj1n/mwtEK9d66JwN/4/rFlvHX+dMz1OBOqtPrCp3Nf6ge3wpS830M Qi1qU0LhYOTPnPoaTcjwRBCQ911ieAYVr8y7jckI315jLz3pViOp32T5sNEYZ3zafbSg3n4gLcd /LccUAIKljxqtzcftaAqs1H0DxILcG/H4MkSVAF0t4SheJUPA3TqeWY6mRI5uaF5Lq8PW4dGTzL tXJRj+uw8ezfJkyboAOtSzlvVgTD/AhFv5FiiRxH X-Received: by 2002:a17:902:e841:b0:224:f12:3735 with SMTP id d9443c01a7336-22dc6a09655mr168001025ad.31.1745902820862; Mon, 28 Apr 2025 22:00:20 -0700 (PDT) Received: from pc.. ([38.41.223.211]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-22db4dbd6f7sm93004015ad.76.2025.04.28.22.00.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Apr 2025 22:00:20 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: Peter Maydell , kvm@vger.kernel.org, alex.bennee@linaro.org, Paolo Bonzini , =?utf-8?q?Phil?= =?utf-8?q?ippe_Mathieu-Daud=C3=A9?= , qemu-arm@nongnu.org, anjo@rev.ng, richard.henderson@linaro.org, Pierrick Bouvier Subject: [PATCH 05/13] target/arm/kvm_arm: copy definitions from kvm headers Date: Mon, 28 Apr 2025 22:00:02 -0700 Message-ID: <20250429050010.971128-6-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250429050010.971128-1-pierrick.bouvier@linaro.org> References: <20250429050010.971128-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::62d; envelope-from=pierrick.bouvier@linaro.org; helo=mail-pl1-x62d.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 "linux/kvm.h" is not included for code compiled without COMPILING_PER_TARGET, and headers are different depending architecture (arm, arm64). Thus we need to manually expose some definitions that will be used by target/arm, ensuring they are the same for arm amd aarch64. As well, we must but prudent to not redefine things if code is already including linux/kvm.h, thus the #ifndef COMPILING_PER_TARGET guard. Signed-off-by: Pierrick Bouvier --- target/arm/kvm_arm.h | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/target/arm/kvm_arm.h b/target/arm/kvm_arm.h index c8ddf8beb2e..eedd081064c 100644 --- a/target/arm/kvm_arm.h +++ b/target/arm/kvm_arm.h @@ -16,6 +16,21 @@ #define KVM_ARM_VGIC_V2 (1 << 0) #define KVM_ARM_VGIC_V3 (1 << 1) +#ifndef COMPILING_PER_TARGET + +/* we copy those definitions from asm-arm and asm-aarch64, as they are the same + * for both architectures */ +#define KVM_ARM_IRQ_CPU_IRQ 0 +#define KVM_ARM_IRQ_CPU_FIQ 1 +#define KVM_ARM_IRQ_TYPE_CPU 0 +typedef unsigned int __u32; +struct kvm_vcpu_init { + __u32 target; + __u32 features[7]; +}; + +#endif /* COMPILING_PER_TARGET */ + /** * kvm_arm_register_device: * @mr: memory region for this device