mirrors
/
qemu
mirror of https://gitlab.com/qemu-project/qemu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

s390x/kvm: drop KVMState parameter from s390_get_memslot_count() 

Not needed at that point.

Signed-off-by: David Hildenbrand <david@redhat.com>
Message-Id: <20170818114353.13455-2-david@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
This commit is contained in:
David Hildenbrand 2017-08-18 13:43:36 +02:00 committed by Cornelia Huck
parent 574ee06de9
commit fba5f6feba
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/s390x/sclp.c
View File

@ -57,7 +57,7 @@ static void read_SCP_info(SCLPDevice *sclp, SCCB *sccb)
CPUState *cpu; CPUState *cpu;
int cpu_count = 0; int cpu_count = 0;
int rnsize, rnmax; int rnsize, rnmax;
int slots = MIN(machine->ram_slots, s390_get_memslot_count(kvm_state)); int slots = MIN(machine->ram_slots, s390_get_memslot_count());
IplParameterBlock *ipib = s390_ipl_get_iplb(); IplParameterBlock *ipib = s390_ipl_get_iplb();
CPU_FOREACH(cpu) { CPU_FOREACH(cpu) {

8
target/s390x/cpu.h
View File

@ -1164,7 +1164,7 @@ void kvm_s390_enable_css_support(S390CPU *cpu);
int kvm_s390_assign_subch_ioeventfd(EventNotifier *notifier, uint32_t sch, int kvm_s390_assign_subch_ioeventfd(EventNotifier *notifier, uint32_t sch,
int vq, bool assign); int vq, bool assign);
int kvm_s390_cpu_restart(S390CPU *cpu); int kvm_s390_cpu_restart(S390CPU *cpu);
int kvm_s390_get_memslot_count(KVMState *s); int kvm_s390_get_memslot_count(void);
int kvm_s390_cmma_active(void); int kvm_s390_cmma_active(void);
void kvm_s390_cmma_reset(void); void kvm_s390_cmma_reset(void);
int kvm_s390_set_cpu_state(S390CPU *cpu, uint8_t cpu_state); int kvm_s390_set_cpu_state(S390CPU *cpu, uint8_t cpu_state);
@ -1204,7 +1204,7 @@ static inline int kvm_s390_cpu_restart(S390CPU *cpu)
static inline void kvm_s390_cmma_reset(void) static inline void kvm_s390_cmma_reset(void)
{ {
} }
static inline int kvm_s390_get_memslot_count(KVMState *s) static inline int kvm_s390_get_memslot_count(void)
{ {
return MAX_AVAIL_SLOTS; return MAX_AVAIL_SLOTS;
} }
@ -1263,10 +1263,10 @@ static inline int s390_cpu_restart(S390CPU *cpu)
return -ENOSYS; return -ENOSYS;
} }
static inline int s390_get_memslot_count(KVMState *s) static inline int s390_get_memslot_count(void)
{ {
if (kvm_enabled()) { if (kvm_enabled()) {
return kvm_s390_get_memslot_count(s); return kvm_s390_get_memslot_count();
} else { } else {
return MAX_AVAIL_SLOTS; return MAX_AVAIL_SLOTS;
} }

4
target/s390x/kvm.c
View File

@ -2317,9 +2317,9 @@ int kvm_s390_assign_subch_ioeventfd(EventNotifier *notifier, uint32_t sch,
return kvm_vm_ioctl(kvm_state, KVM_IOEVENTFD, &kick); return kvm_vm_ioctl(kvm_state, KVM_IOEVENTFD, &kick);
} }
int kvm_s390_get_memslot_count(KVMState *s) int kvm_s390_get_memslot_count(void)
{ {
return kvm_check_extension(s, KVM_CAP_NR_MEMSLOTS); return kvm_check_extension(kvm_state, KVM_CAP_NR_MEMSLOTS);
} }
int kvm_s390_get_ri(void) int kvm_s390_get_ri(void)