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

s390x/kvm: factor out SIGP code into sigp.c 



We want to use the same code base for TCG, so let's cleanly factor it
out.

The sigp mutex is currently not really needed, as everything is
protected by the iothread mutex. But this could change later, so leave
it in place and initialize it properly from common code.

Reviewed-by: default avatarRichard Henderson <richard.henderson@linaro.org>
Signed-off-by: default avatarDavid Hildenbrand <david@redhat.com>
Message-Id: <20170928203708.9376-17-david@redhat.com>
Signed-off-by: default avatarCornelia Huck <cohuck@redhat.com>
parent a7a2b8e3

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -303,6 +303,7 @@ F: target/s390x/kvm_s390x.h 
F: target/s390x/kvm-stub.c

F: target/s390x/ioinst.[ch]

F: target/s390x/machine.c

F: target/s390x/sigp.c

F: hw/intc/s390_flic.c

F: hw/intc/s390_flic_kvm.c

F: include/hw/s390x/s390_flic.h

hw/s390x/s390-virtio-ccw.c

+3 −0
Original line number Diff line number Diff line
@@ -258,6 +258,9 @@ static void ccw_init(MachineState *machine) 


    s390_flic_init();



    /* init the SIGP facility */

    s390_init_sigp();



    /* get a BUS */

    css_bus = virtual_css_bus_init();

    s390_init_ipl_dev(machine->kernel_filename, machine->kernel_cmdline,

target/s390x/Makefile.objs

+1 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ obj-y += cpu.o cpu_models.o cpu_features.o gdbstub.o interrupt.o helper.o 
obj-$(CONFIG_TCG) += translate.o cc_helper.o excp_helper.o fpu_helper.o

obj-$(CONFIG_TCG) += int_helper.o mem_helper.o misc_helper.o crypto_helper.o

obj-$(CONFIG_SOFTMMU) += machine.o ioinst.o arch_dump.o mmu_helper.o diag.o

obj-$(CONFIG_SOFTMMU) += sigp.o

obj-$(CONFIG_KVM) += kvm.o

obj-$(call lnot,$(CONFIG_KVM)) += kvm-stub.o

target/s390x/cpu.c

+0 −8
Original line number Diff line number Diff line
@@ -400,14 +400,6 @@ void s390_cmma_reset(void) 
    }

}



int s390_cpu_restart(S390CPU *cpu)

{

    if (kvm_enabled()) {

        return kvm_s390_cpu_restart(cpu);

    }

    return -ENOSYS;

}



int s390_get_memslot_count(void)

{

    if (kvm_enabled()) {

target/s390x/cpu.h

+5 −1
Original line number Diff line number Diff line
@@ -676,7 +676,6 @@ bool s390_get_squash_mcss(void); 
int s390_get_memslot_count(void);

int s390_set_memory_limit(uint64_t new_limit, uint64_t *hw_limit);

void s390_cmma_reset(void);

int s390_cpu_restart(S390CPU *cpu);

void s390_enable_css_support(S390CPU *cpu);

int s390_assign_subch_ioeventfd(EventNotifier *notifier, uint32_t sch_id,

                                int vq, bool assign);
@@ -730,6 +729,11 @@ int s390_cpu_virt_mem_rw(S390CPU *cpu, vaddr laddr, uint8_t ar, void *hostbuf, 
        s390_cpu_virt_mem_rw(cpu, laddr, ar, NULL, len, true)





/* sigp.c */

int s390_cpu_restart(S390CPU *cpu);

void s390_init_sigp(void);





/* outside of target/s390x/ */

S390CPU *s390_cpu_addr2state(uint16_t cpu_addr);