Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1175974

[RFC 07/17] KVM: arm: rename pause into power_off

From Eric Auger <eric.auger@linaro.org>
Newsgroups linux.kernel
Subject [RFC 07/17] KVM: arm: rename pause into power_off
Date 2015-07-02 15:30 +0200
Message-ID <pHMIW-3df-15@gated-at.bofh.it> (permalink)
References <pHMzf-39U-5@gated-at.bofh.it>
Organization linux.* mail to news gateway

Show all headers | View raw

The kvm_vcpu_arch pause field is renamed into power_off to prepare
for the introduction of a new pause field.

Signed-off-by: Eric Auger <eric.auger@linaro.org>

v4 -> v5:
- fix compilation issue on arm64 (add power_off field in kvm_host.h)
---
 arch/arm/include/asm/kvm_host.h   |  4 ++--
 arch/arm/kvm/arm.c                | 10 +++++-----
 arch/arm/kvm/psci.c               | 10 +++++-----
 arch/arm64/include/asm/kvm_host.h |  4 ++--
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/arch/arm/include/asm/kvm_host.h b/arch/arm/include/asm/kvm_host.h
index e896d2c..304004d 100644
--- a/arch/arm/include/asm/kvm_host.h
+++ b/arch/arm/include/asm/kvm_host.h
@@ -129,8 +129,8 @@ struct kvm_vcpu_arch {
 	 * here.
 	 */
 
-	/* Don't run the guest on this vcpu */
-	bool pause;
+	/* vcpu power-off state */
+	bool power_off;
 
 	/* IO related fields */
 	struct kvm_decode mmio_decode;
diff --git a/arch/arm/kvm/arm.c b/arch/arm/kvm/arm.c
index bcdf799..7537e68 100644
--- a/arch/arm/kvm/arm.c
+++ b/arch/arm/kvm/arm.c
@@ -475,7 +475,7 @@ static void vcpu_pause(struct kvm_vcpu *vcpu)
 {
 	wait_queue_head_t *wq = kvm_arch_vcpu_wq(vcpu);
 
-	wait_event_interruptible(*wq, !vcpu->arch.pause);
+	wait_event_interruptible(*wq, !vcpu->arch.power_off);
 }
 
 static int kvm_vcpu_initialized(struct kvm_vcpu *vcpu)
@@ -525,7 +525,7 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *run)
 
 		update_vttbr(vcpu->kvm);
 
-		if (vcpu->arch.pause)
+		if (vcpu->arch.power_off)
 			vcpu_pause(vcpu);
 
 		/*
@@ -766,12 +766,12 @@ static int kvm_arch_vcpu_ioctl_vcpu_init(struct kvm_vcpu *vcpu,
 	vcpu_reset_hcr(vcpu);
 
 	/*
-	 * Handle the "start in power-off" case by marking the VCPU as paused.
+	 * Handle the "start in power-off" case.
 	 */
 	if (test_bit(KVM_ARM_VCPU_POWER_OFF, vcpu->arch.features))
-		vcpu->arch.pause = true;
+		vcpu->arch.power_off = true;
 	else
-		vcpu->arch.pause = false;
+		vcpu->arch.power_off = false;
 
 	return 0;
 }
diff --git a/arch/arm/kvm/psci.c b/arch/arm/kvm/psci.c
index 4b94b51..134971a 100644
--- a/arch/arm/kvm/psci.c
+++ b/arch/arm/kvm/psci.c
@@ -63,7 +63,7 @@ static unsigned long kvm_psci_vcpu_suspend(struct kvm_vcpu *vcpu)
 
 static void kvm_psci_vcpu_off(struct kvm_vcpu *vcpu)
 {
-	vcpu->arch.pause = true;
+	vcpu->arch.power_off = true;
 }
 
 static unsigned long kvm_psci_vcpu_on(struct kvm_vcpu *source_vcpu)
@@ -87,7 +87,7 @@ static unsigned long kvm_psci_vcpu_on(struct kvm_vcpu *source_vcpu)
 	 */
 	if (!vcpu)
 		return PSCI_RET_INVALID_PARAMS;
-	if (!vcpu->arch.pause) {
+	if (!vcpu->arch.power_off) {
 		if (kvm_psci_version(source_vcpu) != KVM_ARM_PSCI_0_1)
 			return PSCI_RET_ALREADY_ON;
 		else
@@ -115,7 +115,7 @@ static unsigned long kvm_psci_vcpu_on(struct kvm_vcpu *source_vcpu)
 	 * the general puspose registers are undefined upon CPU_ON.
 	 */
 	*vcpu_reg(vcpu, 0) = context_id;
-	vcpu->arch.pause = false;
+	vcpu->arch.power_off = false;
 	smp_mb();		/* Make sure the above is visible */
 
 	wq = kvm_arch_vcpu_wq(vcpu);
@@ -152,7 +152,7 @@ static unsigned long kvm_psci_vcpu_affinity_info(struct kvm_vcpu *vcpu)
 	kvm_for_each_vcpu(i, tmp, kvm) {
 		mpidr = kvm_vcpu_get_mpidr_aff(tmp);
 		if (((mpidr & target_affinity_mask) == target_affinity) &&
-		    !tmp->arch.pause) {
+		    !tmp->arch.power_off) {
 			return PSCI_0_2_AFFINITY_LEVEL_ON;
 		}
 	}
@@ -175,7 +175,7 @@ static void kvm_prepare_system_event(struct kvm_vcpu *vcpu, u32 type)
 	 * re-initialized.
 	 */
 	kvm_for_each_vcpu(i, tmp, vcpu->kvm) {
-		tmp->arch.pause = true;
+		tmp->arch.power_off = true;
 		kvm_vcpu_kick(tmp);
 	}
 
diff --git a/arch/arm64/include/asm/kvm_host.h b/arch/arm64/include/asm/kvm_host.h
index 2709db2..009da6b 100644
--- a/arch/arm64/include/asm/kvm_host.h
+++ b/arch/arm64/include/asm/kvm_host.h
@@ -122,8 +122,8 @@ struct kvm_vcpu_arch {
 	 * here.
 	 */
 
-	/* Don't run the guest */
-	bool pause;
+	/* vcpu power-off state */
+	bool power_off;
 
 	/* IO related fields */
 	struct kvm_decode mmio_decode;
-- 
1.9.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[RFC 00/17] ARM IRQ forward control based on IRQ bypass manager Eric Auger <eric.auger@linaro.org> - 2015-07-02 15:20 +0200
  [RFC 02/17] VFIO: platform: single handler using function pointer Eric Auger <eric.auger@linaro.org> - 2015-07-02 15:20 +0200
  [RFC 01/17] VFIO: platform: test forwarded state when selecting IRQ handler Eric Auger <eric.auger@linaro.org> - 2015-07-02 15:20 +0200
  [RFC 13/17] KVM: introduce kvm_arch functions for IRQ bypass Eric Auger <eric.auger@linaro.org> - 2015-07-02 15:30 +0200
    Re: [RFC 13/17] KVM: introduce kvm_arch functions for IRQ bypass Paolo Bonzini <pbonzini@redhat.com> - 2015-07-02 15:50 +0200
  [RFC 17/17] VFIO: platform: add irq bypass producer management Eric Auger <eric.auger@linaro.org> - 2015-07-02 15:30 +0200
  [RFC 04/17] VFIO: pci: initialize vfio_device_external_ops Eric Auger <eric.auger@linaro.org> - 2015-07-02 15:30 +0200
  [RFC 07/17] KVM: arm: rename pause into power_off Eric Auger <eric.auger@linaro.org> - 2015-07-02 15:30 +0200
  [RFC 06/17] VFIO: add vfio_external_{mask|is_active|set_automasked} Eric Auger <eric.auger@linaro.org> - 2015-07-02 15:30 +0200
  [RFC 09/17] bypass: IRQ bypass manager proto by Alex Eric Auger <eric.auger@linaro.org> - 2015-07-02 15:30 +0200
    RE: [RFC 09/17] bypass: IRQ bypass manager proto by Alex "Wu, Feng" <feng.wu@intel.com> - 2015-07-03 04:20 +0200
  [RFC 10/17] KVM: arm: select IRQ_BYPASS_MANAGER Eric Auger <eric.auger@linaro.org> - 2015-07-02 15:30 +0200
  [RFC 16/17] KVM: eventfd: add irq bypass consumer management Eric Auger <eric.auger@linaro.org> - 2015-07-02 15:30 +0200
    Re: [RFC 16/17] KVM: eventfd: add irq bypass consumer management Paolo Bonzini <pbonzini@redhat.com> - 2015-07-02 15:50 +0200
      Re: [RFC 16/17] KVM: eventfd: add irq bypass consumer management Eric Auger <eric.auger@linaro.org> - 2015-07-02 16:00 +0200
  [RFC 08/17] kvm: arm/arm64: implement kvm_arm_[halt,resume]_guest Eric Auger <eric.auger@linaro.org> - 2015-07-02 15:30 +0200
  [RFC 14/17] KVM: arm/arm64: vgic: forwarding control Eric Auger <eric.auger@linaro.org> - 2015-07-02 15:30 +0200
  [RFC 12/17] irq: bypass: Extend skeleton for ARM forwarding control Eric Auger <eric.auger@linaro.org> - 2015-07-02 15:30 +0200
    Re: [RFC 12/17] irq: bypass: Extend skeleton for ARM forwarding  control Paolo Bonzini <pbonzini@redhat.com> - 2015-07-02 15:50 +0200
      RE: [RFC 12/17] irq: bypass: Extend skeleton for ARM forwarding  control "Wu, Feng" <feng.wu@intel.com> - 2015-07-03 04:30 +0200
        RE: [RFC 12/17] irq: bypass: Extend skeleton for ARM forwarding  control "Wu, Feng" <feng.wu@intel.com> - 2015-07-03 04:30 +0200
      Re: [RFC 12/17] irq: bypass: Extend skeleton for ARM forwarding control Eric Auger <eric.auger@linaro.org> - 2015-07-03 15:20 +0200
    RE: [RFC 12/17] irq: bypass: Extend skeleton for ARM forwarding  control "Wu, Feng" <feng.wu@intel.com> - 2015-07-03 04:50 +0200
  [RFC 05/17] VFIO: platform: implement vfio_device_external_ops callbacks Eric Auger <eric.auger@linaro.org> - 2015-07-02 15:30 +0200
  [RFC 11/17] VFIO: platform: select IRQ_BYPASS_MANAGER Eric Auger <eric.auger@linaro.org> - 2015-07-02 15:30 +0200

csiph-web