summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Hildenbrand <david@redhat.com>2017-08-18 13:43:36 +0200
committerCornelia Huck <cohuck@redhat.com>2017-08-30 18:23:25 +0200
commitfba5f6feba119c2c2ac3ecc8f7cb630085611c93 (patch)
tree24c87ba292b313e432b76f9c62c5bb3c967e6854
parent574ee06de9c4fe63c90be90dc9c747fc9382bb2b (diff)
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>
-rw-r--r--hw/s390x/sclp.c2
-rw-r--r--target/s390x/cpu.h8
-rw-r--r--target/s390x/kvm.c4
3 files changed, 7 insertions, 7 deletions
diff --git a/hw/s390x/sclp.c b/hw/s390x/sclp.c
index 7ae6a0e37a..ffdf4712a1 100644
--- a/hw/s390x/sclp.c
+++ b/hw/s390x/sclp.c
@@ -57,7 +57,7 @@ static void read_SCP_info(SCLPDevice *sclp, SCCB *sccb)
CPUState *cpu;
int cpu_count = 0;
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();
CPU_FOREACH(cpu) {
diff --git a/target/s390x/cpu.h b/target/s390x/cpu.h
index 29fdd5d49a..44b1a7ab71 100644
--- a/target/s390x/cpu.h
+++ b/target/s390x/cpu.h
@@ -1164,7 +1164,7 @@ void kvm_s390_enable_css_support(S390CPU *cpu);
int kvm_s390_assign_subch_ioeventfd(EventNotifier *notifier, uint32_t sch,
int vq, bool assign);
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);
void kvm_s390_cmma_reset(void);
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 int kvm_s390_get_memslot_count(KVMState *s)
+static inline int kvm_s390_get_memslot_count(void)
{
return MAX_AVAIL_SLOTS;
}
@@ -1263,10 +1263,10 @@ static inline int s390_cpu_restart(S390CPU *cpu)
return -ENOSYS;
}
-static inline int s390_get_memslot_count(KVMState *s)
+static inline int s390_get_memslot_count(void)
{
if (kvm_enabled()) {
- return kvm_s390_get_memslot_count(s);
+ return kvm_s390_get_memslot_count();
} else {
return MAX_AVAIL_SLOTS;
}
diff --git a/target/s390x/kvm.c b/target/s390x/kvm.c
index 9de165d8b1..d961fcf18b 100644
--- a/target/s390x/kvm.c
+++ b/target/s390x/kvm.c
@@ -2317,9 +2317,9 @@ int kvm_s390_assign_subch_ioeventfd(EventNotifier *notifier, uint32_t sch,
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)