mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

s390x/kvm: remove unused gs handling

Browse Source 
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.

Signed-off-by: Cornelia Huck <cohuck@redhat.com>
Reviewed-by: Christian Borntraeger <borntraeger@de.ibm.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Message-Id: <20210602125050.492500-1-cohuck@redhat.com>
This commit is contained in:
Cornelia Huck 2021-06-02 14:50:50 +02:00
parent 8f521741e1
commit 3fb3b122ac
3 changed files with 1 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
target/s390x/kvm-stub.c
View File

@ -49,11 +49,6 @@ int kvm_s390_get_ri(void)
return 0; return 0;
} }
int kvm_s390_get_gs(void)
{
return 0;
}
int kvm_s390_get_clock(uint8_t *tod_high, uint64_t *tod_low) int kvm_s390_get_clock(uint8_t *tod_high, uint64_t *tod_low)
{ {
return -ENOSYS; return -ENOSYS;

10
target/s390x/kvm.c
View File

@ -154,7 +154,6 @@ static int cap_async_pf;
static int cap_mem_op; static int cap_mem_op;
static int cap_s390_irq; static int cap_s390_irq;
static int cap_ri; static int cap_ri;
static int cap_gs;
static int cap_hpage_1m; static int cap_hpage_1m;
static int cap_vcpu_resets; static int cap_vcpu_resets;
static int cap_protected; static int cap_protected;
@ -369,9 +368,7 @@ int kvm_arch_init(MachineState *ms, KVMState *s)
} }
} }
if (cpu_model_allowed()) { if (cpu_model_allowed()) {
if (kvm_vm_enable_cap(s, KVM_CAP_S390_GS, 0) == 0) { kvm_vm_enable_cap(s, KVM_CAP_S390_GS, 0);
cap_gs = 1;
}
} }
/* /*
@ -2039,11 +2036,6 @@ int kvm_s390_get_ri(void)
return cap_ri; return cap_ri;
} }
int kvm_s390_get_gs(void)
{
return cap_gs;
}
int kvm_s390_set_cpu_state(S390CPU *cpu, uint8_t cpu_state) int kvm_s390_set_cpu_state(S390CPU *cpu, uint8_t cpu_state)
{ {
struct kvm_mp_state mp_state = {}; struct kvm_mp_state mp_state = {};

1
target/s390x/kvm_s390x.h
View File

@ -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_vcpu_interrupt_post_load(S390CPU *cpu);
int kvm_s390_get_hpage_1m(void); int kvm_s390_get_hpage_1m(void);
int kvm_s390_get_ri(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(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_get_clock_ext(uint8_t *tod_high, uint64_t *tod_clock);
int kvm_s390_set_clock(uint8_t tod_high, uint64_t tod_clock); int kvm_s390_set_clock(uint8_t tod_high, uint64_t tod_clock);