Linux KVM/arm64 development list
 help / color / mirror / Atom feed
From: Dave Martin <Dave.Martin@arm.com>
To: kvmarm@lists.cs.columbia.edu
Cc: Okamoto Takayuki <tokamoto@jp.fujitsu.com>,
	Christoffer Dall <cdall@kernel.org>,
	Ard Biesheuvel <ard.biesheuvel@linaro.org>,
	Marc Zyngier <marc.zyngier@arm.com>,
	Catalin Marinas <catalin.marinas@arm.com>,
	Will Deacon <will.deacon@arm.com>,
	Zhang Lei <zhang.lei@jp.fujitsu.com>,
	Julien Grall <julien.grall@arm.com>,
	linux-arm-kernel@lists.infradead.org
Subject: [PATCH 03/14] KVM: arm: Make vcpu finalization stubs into inline functions
Date: Fri, 12 Apr 2019 17:28:07 +0100	[thread overview]
Message-ID: <1555086498-26691-4-git-send-email-Dave.Martin@arm.com> (raw)
In-Reply-To: <1555086498-26691-1-git-send-email-Dave.Martin@arm.com>

The vcpu finalization stubs kvm_arm_vcpu_finalize() and
kvm_arm_vcpu_is_finalized() are currently #defines for ARM, which
limits the type-checking that the compiler can do at runtime.

The only reason for them to be #defines was to avoid reliance on
the definition of struct kvm_vcpu, which is not available here due
to circular #include problems.  However, because these are stubs
containing no code, they don't need the definition of struct
kvm_vcpu after all; only a declaration is needed (which is
available already).

So in the interests of cleanliness, this patch converts them to
inline functions.

No functional change.

Suggested-by: Andrew Jones <drjones@redhat.com>
Signed-off-by: Dave Martin <Dave.Martin@arm.com>
---
 arch/arm/include/asm/kvm_host.h | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/arch/arm/include/asm/kvm_host.h b/arch/arm/include/asm/kvm_host.h
index d956273..7feddac 100644
--- a/arch/arm/include/asm/kvm_host.h
+++ b/arch/arm/include/asm/kvm_host.h
@@ -412,7 +412,14 @@ static inline int kvm_arm_setup_stage2(struct kvm *kvm, unsigned long type)
 	return 0;
 }
 
-#define kvm_arm_vcpu_finalize(vcpu, what) (-EINVAL)
-#define kvm_arm_vcpu_is_finalized(vcpu) true
+static inline int kvm_arm_vcpu_finalize(struct kvm_vcpu *vcpu, int what)
+{
+	return -EINVAL;
+}
+
+static inline bool kvm_arm_vcpu_is_finalized(struct kvm_vcpu *vcpu)
+{
+	return true;
+}
 
 #endif /* __ARM_KVM_HOST_H__ */
-- 
2.1.4

WARNING: multiple messages have this Message-ID (diff)
From: Dave Martin <Dave.Martin@arm.com>
To: kvmarm@lists.cs.columbia.edu
Cc: Okamoto Takayuki <tokamoto@jp.fujitsu.com>,
	Christoffer Dall <cdall@kernel.org>,
	Ard Biesheuvel <ard.biesheuvel@linaro.org>,
	Marc Zyngier <marc.zyngier@arm.com>,
	Catalin Marinas <catalin.marinas@arm.com>,
	Will Deacon <will.deacon@arm.com>,
	Zhang Lei <zhang.lei@jp.fujitsu.com>,
	Julien Grall <julien.grall@arm.com>,
	linux-arm-kernel@lists.infradead.org
Subject: [PATCH 03/14] KVM: arm: Make vcpu finalization stubs into inline functions
Date: Fri, 12 Apr 2019 17:28:07 +0100	[thread overview]
Message-ID: <1555086498-26691-4-git-send-email-Dave.Martin@arm.com> (raw)
Message-ID: <20190412162807.wzQNq6OWXf-Kznqsotux3hIfgjBbeDSDMXcUe-g_eQc@z> (raw)
In-Reply-To: <1555086498-26691-1-git-send-email-Dave.Martin@arm.com>

The vcpu finalization stubs kvm_arm_vcpu_finalize() and
kvm_arm_vcpu_is_finalized() are currently #defines for ARM, which
limits the type-checking that the compiler can do at runtime.

The only reason for them to be #defines was to avoid reliance on
the definition of struct kvm_vcpu, which is not available here due
to circular #include problems.  However, because these are stubs
containing no code, they don't need the definition of struct
kvm_vcpu after all; only a declaration is needed (which is
available already).

So in the interests of cleanliness, this patch converts them to
inline functions.

No functional change.

Suggested-by: Andrew Jones <drjones@redhat.com>
Signed-off-by: Dave Martin <Dave.Martin@arm.com>
---
 arch/arm/include/asm/kvm_host.h | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/arch/arm/include/asm/kvm_host.h b/arch/arm/include/asm/kvm_host.h
index d956273..7feddac 100644
--- a/arch/arm/include/asm/kvm_host.h
+++ b/arch/arm/include/asm/kvm_host.h
@@ -412,7 +412,14 @@ static inline int kvm_arm_setup_stage2(struct kvm *kvm, unsigned long type)
 	return 0;
 }
 
-#define kvm_arm_vcpu_finalize(vcpu, what) (-EINVAL)
-#define kvm_arm_vcpu_is_finalized(vcpu) true
+static inline int kvm_arm_vcpu_finalize(struct kvm_vcpu *vcpu, int what)
+{
+	return -EINVAL;
+}
+
+static inline bool kvm_arm_vcpu_is_finalized(struct kvm_vcpu *vcpu)
+{
+	return true;
+}
 
 #endif /* __ARM_KVM_HOST_H__ */
-- 
2.1.4

_______________________________________________
kvmarm mailing list
kvmarm@lists.cs.columbia.edu
https://lists.cs.columbia.edu/mailman/listinfo/kvmarm

  parent reply	other threads:[~2019-04-12 16:29 UTC|newest]

Thread overview: 59+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-04-12 16:28 [PATCH 00/14] KVM: arm64: SVE cleanups Dave Martin
2019-04-12 16:28 ` Dave Martin
2019-04-12 16:28 ` [PATCH 01/14] arm64/sve: Clarify vq map semantics Dave Martin
2019-04-12 16:28   ` Dave Martin
2019-04-12 16:28 ` [PATCH 02/14] KVM: arm/arm64: Demote kvm_arm_init_arch_resources() to just set up SVE Dave Martin
2019-04-12 16:28   ` Dave Martin
2019-04-12 16:28 ` Dave Martin [this message]
2019-04-12 16:28   ` [PATCH 03/14] KVM: arm: Make vcpu finalization stubs into inline functions Dave Martin
2019-04-12 16:28 ` [PATCH 04/14] KVM: arm64/sve: sys_regs: Demote redundant vcpu_has_sve() checks to WARNs Dave Martin
2019-04-12 16:28   ` Dave Martin
2019-04-12 16:28 ` [PATCH 05/14] KVM: arm64/sve: Clean up UAPI register ID definitions Dave Martin
2019-04-12 16:28   ` Dave Martin
2019-04-15 15:17   ` Andrew Jones
2019-04-15 15:17     ` Andrew Jones
2019-04-16 12:37     ` Dave Martin
2019-04-16 12:37       ` Dave Martin
2019-04-12 16:28 ` [PATCH 06/14] KVM: arm64/sve: Miscellaneous tidyups in guest.c Dave Martin
2019-04-12 16:28   ` Dave Martin
2019-04-12 16:28 ` [PATCH 07/14] KVM: arm64/sve: Make register ioctl access errors more consistent Dave Martin
2019-04-12 16:28   ` Dave Martin
2019-04-12 16:28 ` [PATCH 08/14] KVM: arm64/sve: WARN when avoiding divide-by-zero in sve_reg_to_region() Dave Martin
2019-04-12 16:28   ` Dave Martin
2019-04-12 16:28 ` [PATCH 09/14] KVM: arm64/sve: Simplify KVM_REG_ARM64_SVE_VLS array sizing Dave Martin
2019-04-12 16:28   ` Dave Martin
2019-04-15 15:20   ` Andrew Jones
2019-04-15 15:20     ` Andrew Jones
2019-04-16 12:41     ` Dave Martin
2019-04-16 12:41       ` Dave Martin
2019-04-16 13:00       ` Andrew Jones
2019-04-16 13:00         ` Andrew Jones
2019-04-16 14:10         ` Dave Martin
2019-04-16 14:10           ` Dave Martin
2019-04-16 14:28           ` Andrew Jones
2019-04-16 14:28             ` Andrew Jones
2019-04-16 15:36             ` Dave Martin
2019-04-16 15:36               ` Dave Martin
2019-04-16 15:52             ` Dave Martin
2019-04-16 15:52               ` Dave Martin
2019-04-17  4:16               ` Andrew Jones
2019-04-17  4:16                 ` Andrew Jones
2019-04-17 14:01                 ` Dave Martin
2019-04-17 14:01                   ` Dave Martin
2019-04-12 16:28 ` [PATCH 10/14] KVM: arm64/sve: Explain validity checks in set_sve_vls() Dave Martin
2019-04-12 16:28   ` Dave Martin
2019-04-12 16:28 ` [PATCH 11/14] KVM: arm/arm64: Clean up vcpu finalization function parameter naming Dave Martin
2019-04-12 16:28   ` Dave Martin
2019-04-12 16:28 ` [PATCH 12/14] KVM: Clarify capability requirements for KVM_ARM_VCPU_FINALIZE Dave Martin
2019-04-12 16:28   ` Dave Martin
2019-04-12 16:28 ` [PATCH 13/14] KVM: Clarify KVM_{SET, GET}_ONE_REG error code documentation Dave Martin
2019-04-15 15:21   ` [PATCH 13/14] KVM: Clarify KVM_{SET,GET}_ONE_REG " Andrew Jones
2019-04-15 15:21     ` Andrew Jones
2019-04-16 12:42     ` Dave Martin
2019-04-16 12:42       ` Dave Martin
2019-04-12 16:28 ` [PATCH 14/14] KVM: arm64: Clarify access behaviour for out-of-range SVE register slice IDs Dave Martin
2019-04-12 16:28   ` Dave Martin
2019-04-15 15:22 ` [PATCH 00/14] KVM: arm64: SVE cleanups Andrew Jones
2019-04-15 15:22   ` Andrew Jones
2019-04-16 12:46   ` Dave Martin
2019-04-16 12:46     ` Dave Martin

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1555086498-26691-4-git-send-email-Dave.Martin@arm.com \
    --to=dave.martin@arm.com \
    --cc=ard.biesheuvel@linaro.org \
    --cc=catalin.marinas@arm.com \
    --cc=cdall@kernel.org \
    --cc=julien.grall@arm.com \
    --cc=kvmarm@lists.cs.columbia.edu \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=marc.zyngier@arm.com \
    --cc=tokamoto@jp.fujitsu.com \
    --cc=will.deacon@arm.com \
    --cc=zhang.lei@jp.fujitsu.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox