Commit fba5f6fe authored by David Hildenbrand's avatar David Hildenbrand Committed by Cornelia Huck
Browse files

s390x/kvm: drop KVMState parameter from s390_get_memslot_count() 



Not needed at that point.

Signed-off-by: default avatarDavid Hildenbrand <david@redhat.com>
Message-Id: <20170818114353.13455-2-david@redhat.com>
Reviewed-by: default avatarThomas Huth <thuth@redhat.com>
Signed-off-by: default avatarCornelia Huck <cohuck@redhat.com>
parent 574ee06d

hw/s390x/sclp.c

+1 −1
Original line number Diff line number Diff line
@@ -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) {

target/s390x/cpu.h

+4 −4
Original line number Diff line number Diff line
@@ -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;

    }

target/s390x/kvm.c

+2 −2
Original line number Diff line number Diff line
@@ -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)