Commit 8c4b4e37 authored by Philippe Mathieu-Daudé's avatar Philippe Mathieu-Daudé Committed by Cornelia Huck
Browse files

target/s390x/helper: Clean ifdef'ry 



All this code is guarded checking CONFIG_USER_ONLY definition.
Drop the duplicated checks.

Signed-off-by: default avatarPhilippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: default avatarDavid Hildenbrand <david@redhat.com>
Reviewed-by: default avatarCornelia Huck <cohuck@redhat.com>
Message-Id: <20200526172427.17460-7-f4bug@amsat.org>
Signed-off-by: default avatarCornelia Huck <cohuck@redhat.com>
parent d64c1bd6

target/s390x/helper.c

+0 −5
Original line number Diff line number Diff line
@@ -42,9 +42,6 @@ void s390x_cpu_timer(void *opaque) 
{

    cpu_inject_cpu_timer((S390CPU *) opaque);

}

#endif



#ifndef CONFIG_USER_ONLY



hwaddr s390_cpu_get_phys_page_debug(CPUState *cs, vaddr vaddr)

{
@@ -98,14 +95,12 @@ void s390_handle_wait(S390CPU *cpu) 
    CPUState *cs = CPU(cpu);



    if (s390_cpu_halt(cpu) == 0) {

#ifndef CONFIG_USER_ONLY

        if (is_special_wait_psw(cpu->env.psw.addr)) {

            qemu_system_shutdown_request(SHUTDOWN_CAUSE_GUEST_SHUTDOWN);

        } else {

            cpu->env.crash_reason = S390_CRASH_REASON_DISABLED_WAIT;

            qemu_system_guest_panicked(cpu_get_crash_info(cs));

        }

#endif

    }

}