diff options
| author | Pierre Morel <pmorel@linux.vnet.ibm.com> | 2015-11-30 16:49:58 +0100 |
|---|---|---|
| committer | Cornelia Huck <cornelia.huck@de.ibm.com> | 2016-01-13 10:53:42 +0100 |
| commit | 7b3fdbd9a826791bd98e649cf44c0a6129a44179 (patch) | |
| tree | 21dc54116f5afd6289c20208ac1245faaf7d0424 /target-s390x | |
| parent | 3538fb6f89dd9bb2e7e59de2bfad52a45321c744 (diff) | |
| download | qemu-7b3fdbd9a826791bd98e649cf44c0a6129a44179.tar.gz | |
s390x: remove s390-virtio devices
The s390-virtio machine has been removed; remove the associated devices
as well.
hw/s390x/s390-virtio-bus.c and hw/s390x/s390-virtio-bus.h
have been deleted and removed from hw/s390x/Makefile.objs
virtio-size has no more meaning for the modern machine
and has been removed from helper.c and cpu.h
virtio-serial-s390 belonging to the old machine is
being removed from vl.c
Signed-off-by: Pierre Morel <pmorel@linux.vnet.ibm.com>
Acked-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Acked-by: Christian Borntraeger <borntraeger@de.ibm.com>
Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Diffstat (limited to 'target-s390x')
| -rw-r--r-- | target-s390x/cpu.h | 3 | ||||
| -rw-r--r-- | target-s390x/helper.c | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/target-s390x/cpu.h b/target-s390x/cpu.h index 658cd9d554..06ca60b25f 100644 --- a/target-s390x/cpu.h +++ b/target-s390x/cpu.h @@ -545,9 +545,6 @@ int gtod_load(QEMUFile *f, void *opaque, int version_id); /* service interrupts are floating therefore we must not pass an cpustate */ void s390_sclp_extint(uint32_t parm); -/* from s390-virtio-bus */ -extern const hwaddr virtio_size; - #else static inline unsigned int s390_cpu_halt(S390CPU *cpu) { diff --git a/target-s390x/helper.c b/target-s390x/helper.c index aa58f39db4..e541d69724 100644 --- a/target-s390x/helper.c +++ b/target-s390x/helper.c @@ -133,7 +133,7 @@ int s390_cpu_handle_mmu_fault(CPUState *cs, vaddr orig_vaddr, } /* check out of RAM access */ - if (raddr > (ram_size + virtio_size)) { + if (raddr > ram_size) { DPRINTF("%s: raddr %" PRIx64 " > ram_size %" PRIx64 "\n", __func__, (uint64_t)raddr, (uint64_t)ram_size); trigger_pgm_exception(env, PGM_ADDRESSING, ILEN_LATER); |