diff options
| author | Aurelien Jarno <aurelien@aurel32.net> | 2012-10-30 00:35:43 +0100 |
|---|---|---|
| committer | Aurelien Jarno <aurelien@aurel32.net> | 2012-10-30 00:35:43 +0100 |
| commit | 38c4718392fda2bda1e084366b9aa41b49b9d8cf (patch) | |
| tree | 881cb519ffcebc0b458bcbb92338297da19cb914 /hw/s390-virtio.c | |
| parent | 3585317f6fdff0e3ae082f88afb2784d815a07e2 (diff) | |
| parent | 130c57c036fdc2eba8936da1b1dad39e78d5ea32 (diff) | |
| download | focaccia-qemu-38c4718392fda2bda1e084366b9aa41b49b9d8cf.tar.gz focaccia-qemu-38c4718392fda2bda1e084366b9aa41b49b9d8cf.zip | |
Merge branch 's390-for-upstream' of git://repo.or.cz/qemu/agraf
* 's390-for-upstream' of git://repo.or.cz/qemu/agraf: s390: sclp ascii console support s390: sclp signal quiesce support s390: sclp event support s390: sclp base support s390: use sync regs for register transfer s390/kvm_stat: correct sys_perf_event_open syscall number s390x: fix -initrd in virtio machine
Diffstat (limited to 'hw/s390-virtio.c')
| -rw-r--r-- | hw/s390-virtio.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/hw/s390-virtio.c b/hw/s390-virtio.c index 85bd13e06f..685cb5413e 100644 --- a/hw/s390-virtio.c +++ b/hw/s390-virtio.c @@ -32,6 +32,7 @@ #include "exec-memory.h" #include "hw/s390-virtio-bus.h" +#include "hw/s390x/sclp.h" //#define DEBUG_S390 @@ -184,6 +185,7 @@ static void s390_init(QEMUMachineInitArgs *args) /* get a BUS */ s390_bus = s390_virtio_bus_init(&my_ram_size); + s390_sclp_init(); /* allocate RAM */ memory_region_init_ram(ram, "s390.ram", my_ram_size); @@ -285,8 +287,8 @@ static void s390_init(QEMUMachineInitArgs *args) } /* we have to overwrite values in the kernel image, which are "rom" */ - memcpy(rom_ptr(INITRD_PARM_START), &initrd_offset, 8); - memcpy(rom_ptr(INITRD_PARM_SIZE), &initrd_size, 8); + stq_p(rom_ptr(INITRD_PARM_START), initrd_offset); + stq_p(rom_ptr(INITRD_PARM_SIZE), initrd_size); } if (rom_ptr(KERN_PARM_AREA)) { |