[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 for-2.11 01/18] s390x/kvm: drop KVMState paramete
From: |
David Hildenbrand |
Subject: |
[Qemu-devel] [PATCH v3 for-2.11 01/18] s390x/kvm: drop KVMState parameter from s390_get_memslot_count() |
Date: |
Fri, 18 Aug 2017 13:43:36 +0200 |
Not needed at that point.
Signed-off-by: David Hildenbrand <address@hidden>
---
hw/s390x/sclp.c | 2 +-
target/s390x/cpu.h | 8 ++++----
target/s390x/kvm.c | 4 ++--
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/hw/s390x/sclp.c b/hw/s390x/sclp.c
index 9253dbb..8dd1109 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 29fdd5d..44b1a7a 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 c4c5791..d0bb9e9 100644
--- a/target/s390x/kvm.c
+++ b/target/s390x/kvm.c
@@ -2289,9 +2289,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)
--
2.9.4
- [Qemu-devel] [PATCH v3 for-2.11 00/18] target/s390x: cleanup cpu.h, David Hildenbrand, 2017/08/18
- [Qemu-devel] [PATCH v3 for-2.11 01/18] s390x/kvm: drop KVMState parameter from s390_get_memslot_count(),
David Hildenbrand <=
- [Qemu-devel] [PATCH v3 for-2.11 02/18] s390x/kvm: drop KVMState parameter from kvm_s390_set_mem_limit(), David Hildenbrand, 2017/08/18
- [Qemu-devel] [PATCH v3 for-2.11 03/18] target/s390x: simplify ri_allowed(), David Hildenbrand, 2017/08/18
- [Qemu-devel] [PATCH v3 for-2.11 04/18] target/s390x: simplify gs_allowed(), David Hildenbrand, 2017/08/18
- [Qemu-devel] [PATCH v3 for-2.11 05/18] target/s390x: no need to pass kvm_state to savevm_gtod handlers, David Hildenbrand, 2017/08/18
- [Qemu-devel] [PATCH v3 for-2.11 06/18] s390x/cpumodel: factor out determination of default model name, David Hildenbrand, 2017/08/18