[Qemu-devel] [PULL 0/7] s390 patch queue 2012-10-29

[Qemu-devel] [PULL 0/7] s390 patch queue 2012-10-29

[Alexander Graf]

Hi Blue / Aurelien,

This is my current patch queue for s390.  Please pull.

Alex


The following changes since commit b308c82cbda44e138ef990af64d44a5613c16092:
  Avi Kivity (1):
        pci: avoid destroying bridge address space windows in a transaction

are available in the git repository at:

  git://repo.or.cz/qemu/agraf.git s390-for-upstream

Alexander Graf (1):
      s390x: fix -initrd in virtio machine

Christian Borntraeger (1):
      s390: use sync regs for register transfer

Heinz Graalfs (5):
      s390/kvm_stat: correct sys_perf_event_open syscall number
      s390: sclp base support
      s390: sclp event support
      s390: sclp signal quiesce support
      s390: sclp ascii console support

 hw/s390-virtio.c           |    6 +-
 hw/s390x/Makefile.objs     |    3 +
 hw/s390x/event-facility.c  |  398 ++++++++++++++++++++++++++++++++++++++++++++
 hw/s390x/event-facility.h  |   96 +++++++++++
 hw/s390x/sclp.c            |  163 ++++++++++++++++++
 hw/s390x/sclp.h            |  118 +++++++++++++
 hw/s390x/sclpconsole.c     |  306 ++++++++++++++++++++++++++++++++++
 hw/s390x/sclpquiesce.c     |  123 ++++++++++++++
 scripts/kvm/kvm_stat       |   11 +-
 target-s390x/cpu.h         |   13 +--
 target-s390x/kvm.c         |  117 ++++++++++---
 target-s390x/misc_helper.c |   45 +-----
 12 files changed, 1315 insertions(+), 84 deletions(-)
 create mode 100644 hw/s390x/event-facility.c
 create mode 100644 hw/s390x/event-facility.h
 create mode 100644 hw/s390x/sclp.c
 create mode 100644 hw/s390x/sclp.h
 create mode 100644 hw/s390x/sclpconsole.c
 create mode 100644 hw/s390x/sclpquiesce.c

[Qemu-devel] [PATCH 1/7] s390x: fix -initrd in virtio machine

[Alexander Graf]

When using -initrd in the virtio machine, we need to indicate the initrd
start and size inside the kernel image. These parameters need to be stored
in native endianness.

Signed-off-by: Alexander Graf <agraf@suse.de>
Acked-by: Richard Henderson <rth@twiddle.net>
Acked-by: Christian Borntraeger <borntraeger@de.ibm.com>
---
 hw/s390-virtio.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/hw/s390-virtio.c b/hw/s390-virtio.c
index 85bd13e..52fad37 100644
--- a/hw/s390-virtio.c
+++ b/hw/s390-virtio.c
@@ -285,8 +285,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)) {
-- 
1.6.0.2

[Qemu-devel] [PATCH 1/7] s390x: fix -initrd in virtio machine

[Alexander Graf]

When using -initrd in the virtio machine, we need to indicate the initrd
start and size inside the kernel image. These parameters need to be stored
in native endianness.

Signed-off-by: Alexander Graf <agraf@suse.de>
Acked-by: Richard Henderson <rth@twiddle.net>
Acked-by: Christian Borntraeger <borntraeger@de.ibm.com>
---
 hw/s390-virtio.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/hw/s390-virtio.c b/hw/s390-virtio.c
index 85bd13e..52fad37 100644
--- a/hw/s390-virtio.c
+++ b/hw/s390-virtio.c
@@ -285,8 +285,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)) {
-- 
1.6.0.2