Skip to contentSkip to conversation

s390x/kvm: remove unused gs handling

PATCH Applied Cornelia Huck 4 participants 5 messages Jun 2, 2021 – Jun 8, 2021

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 s390x/kvm: remove unused gs handling

With commit 0280b3eb7c05 ("s390x/kvm: use cpu model for gscb on compat machines"), we removed any calls to kvm_s390_get_gs() in favour of a different mechanism.

Let's remove the unused kvm_s390_get_gs(), and with it the now unneeded cap_gs as well.

---
 target/s390x/kvm-stub.c  |  5 -----
 target/s390x/kvm.c       | 10 +---------
 target/s390x/kvm_s390x.h |  1 -
 3 files changed, 1 insertion(+), 15 deletions(-)
target/s390x/kvm-stub.c +0 -5
index 9970b5a8c705..8a308cfebb68 100644
@@ -49,11 +49,6 @@ int kvm_s390_get_ri(void)
     return 0;
 }
 
-int kvm_s390_get_gs(void)
-{
-    return 0;
-}
-
 int kvm_s390_get_clock(uint8_t *tod_high, uint64_t *tod_low)
 {
     return -ENOSYS;
target/s390x/kvm.c +1 -9
index 4fb3bbfef506..23889245877a 100644
@@ -154,7 +154,6 @@ static int cap_async_pf;
 static int cap_mem_op;
 static int cap_s390_irq;
 static int cap_ri;
-static int cap_gs;
 static int cap_hpage_1m;
 static int cap_vcpu_resets;
 static int cap_protected;
@@ -369,9 +368,7 @@ int kvm_arch_init(MachineState *ms, KVMState *s)
         }
     }
     if (cpu_model_allowed()) {
-        if (kvm_vm_enable_cap(s, KVM_CAP_S390_GS, 0) == 0) {
-            cap_gs = 1;
-        }
+        kvm_vm_enable_cap(s, KVM_CAP_S390_GS, 0);
     }
 
     /*
@@ -2039,11 +2036,6 @@ int kvm_s390_get_ri(void)
     return cap_ri;
 }
 
-int kvm_s390_get_gs(void)
-{
-    return cap_gs;
-}
-
 int kvm_s390_set_cpu_state(S390CPU *cpu, uint8_t cpu_state)
 {
     struct kvm_mp_state mp_state = {};
target/s390x/kvm_s390x.h +0 -1
index 25bbe98b2514..05a5e1e6f46d 100644
@@ -27,7 +27,6 @@ void kvm_s390_vcpu_interrupt_pre_save(S390CPU *cpu);
 int kvm_s390_vcpu_interrupt_post_load(S390CPU *cpu);
 int kvm_s390_get_hpage_1m(void);
 int kvm_s390_get_ri(void);
-int kvm_s390_get_gs(void);
 int kvm_s390_get_clock(uint8_t *tod_high, uint64_t *tod_clock);
 int kvm_s390_get_clock_ext(uint8_t *tod_high, uint64_t *tod_clock);
 int kvm_s390_set_clock(uint8_t tod_high, uint64_t tod_clock);
Signature · 1 line
2.31.1
Reviewed-by on v1 1/1
#1 lore raw
Quoted 7 lines · Cornelia Huck

With commit 0280b3eb7c05 ("s390x/kvm: use cpu model for gscb on compat machines"), we removed any calls to kvm_s390_get_gs() in favour of a different mechanism.

Let's remove the unused kvm_s390_get_gs(), and with it the now unneeded cap_gs as well.

Quoted 6 lines
---
  target/s390x/kvm-stub.c  |  5 -----
  target/s390x/kvm.c       | 10 +---------
  target/s390x/kvm_s390x.h |  1 -
  3 files changed, 1 insertion(+), 15 deletions(-)
Reviewed-by on v1 1/1
#2 lore raw
In reply to Cornelia Huck
Quoted 7 lines · Cornelia Huck

With commit 0280b3eb7c05 ("s390x/kvm: use cpu model for gscb on compat machines"), we removed any calls to kvm_s390_get_gs() in favour of a different mechanism.

Let's remove the unused kvm_s390_get_gs(), and with it the now unneeded cap_gs as well.

Quoted 6 lines
---
 target/s390x/kvm-stub.c  |  5 -----
 target/s390x/kvm.c       | 10 +---------
 target/s390x/kvm_s390x.h |  1 -
 3 files changed, 1 insertion(+), 15 deletions(-)
Reviewed-by on v1 1/1
#3 lore raw
In reply to Cornelia Huck
Quoted 8 lines · Cornelia Huck

With commit 0280b3eb7c05 ("s390x/kvm: use cpu model for gscb on compat machines"), we removed any calls to kvm_s390_get_gs() in favour of a different mechanism.

Let's remove the unused kvm_s390_get_gs(), and with it the now unneeded cap_gs as well.

Quoted 70 lines
---
  target/s390x/kvm-stub.c  |  5 -----
  target/s390x/kvm.c       | 10 +---------
  target/s390x/kvm_s390x.h |  1 -
  3 files changed, 1 insertion(+), 15 deletions(-)
target/s390x/kvm-stub.c +0 -5
index 9970b5a8c705..8a308cfebb68 100644
@@ -49,11 +49,6 @@ int kvm_s390_get_ri(void)
      return 0;
  }
 
-int kvm_s390_get_gs(void)
-{
-    return 0;
-}
-
  int kvm_s390_get_clock(uint8_t *tod_high, uint64_t *tod_low)
  {
      return -ENOSYS;
target/s390x/kvm.c +1 -9
index 4fb3bbfef506..23889245877a 100644
@@ -154,7 +154,6 @@ static int cap_async_pf;
  static int cap_mem_op;
  static int cap_s390_irq;
  static int cap_ri;
-static int cap_gs;
  static int cap_hpage_1m;
  static int cap_vcpu_resets;
  static int cap_protected;
@@ -369,9 +368,7 @@ int kvm_arch_init(MachineState *ms, KVMState *s)
          }
      }
      if (cpu_model_allowed()) {
-        if (kvm_vm_enable_cap(s, KVM_CAP_S390_GS, 0) == 0) {
-            cap_gs = 1;
-        }
+        kvm_vm_enable_cap(s, KVM_CAP_S390_GS, 0);
      }
 
      /*
@@ -2039,11 +2036,6 @@ int kvm_s390_get_ri(void)
      return cap_ri;
  }
 
-int kvm_s390_get_gs(void)
-{
-    return cap_gs;
-}
-
  int kvm_s390_set_cpu_state(S390CPU *cpu, uint8_t cpu_state)
  {
      struct kvm_mp_state mp_state = {};
target/s390x/kvm_s390x.h +0 -1
index 25bbe98b2514..05a5e1e6f46d 100644
@@ -27,7 +27,6 @@ void kvm_s390_vcpu_interrupt_pre_save(S390CPU *cpu);
  int kvm_s390_vcpu_interrupt_post_load(S390CPU *cpu);
  int kvm_s390_get_hpage_1m(void);
  int kvm_s390_get_ri(void);
-int kvm_s390_get_gs(void);
  int kvm_s390_get_clock(uint8_t *tod_high, uint64_t *tod_clock);
  int kvm_s390_get_clock_ext(uint8_t *tod_high, uint64_t *tod_clock);
  int kvm_s390_set_clock(uint8_t tod_high, uint64_t tod_clock);
author Applied
#4 lore raw
In reply to Cornelia Huck
Quoted 7 lines · Cornelia Huck

With commit 0280b3eb7c05 ("s390x/kvm: use cpu model for gscb on compat machines"), we removed any calls to kvm_s390_get_gs() in favour of a different mechanism.

Let's remove the unused kvm_s390_get_gs(), and with it the now unneeded cap_gs as well.

Quoted 6 lines
---
 target/s390x/kvm-stub.c  |  5 -----
 target/s390x/kvm.c       | 10 +---------
 target/s390x/kvm_s390x.h |  1 -
 3 files changed, 1 insertion(+), 15 deletions(-)

Queued to s390-next.