mbox

[PULL,v2,0/8] s390x patches for 2.2

Message ID 1412946556-11820-1-git-send-email-cornelia.huck@de.ibm.com
State New
Headers show

Pull-request

git://github.com/cohuck/qemu.git tags/s390x-20141010

Message

Cornelia Huck Oct. 10, 2014, 1:09 p.m. UTC 
Updates v1->v2:
- rebased against master
- "s390x/migration: migrate CPU state": move vmstate code into
  target-s390x/machine.c and tweak comment

The following changes since commit fcb2cd928f5519b8241e22411a696be1a7272b1c:

  Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging (2014-10-09 15:09:05 +0100)

are available in the git repository at:


  git://github.com/cohuck/qemu.git tags/s390x-20141010

for you to fetch changes up to 4b7757bae7c94f980969031119db12d540cf2b61:

  s390x/virtio-ccw: fix vhost-scsi intialization (2014-10-10 13:32:39 +0200)

----------------------------------------------------------------
various s390x updates:
- cpu state handling in qemu and migration
- vhost-scsi-ccw bugfix

----------------------------------------------------------------

Cornelia Huck (1):
  s390x/virtio-ccw: fix vhost-scsi intialization

David Hildenbrand (5):
  s390x/kvm: introduce proper states for s390 cpus
  s390x/kvm: proper use of the cpu states OPERATING and STOPPED
  s390x/kvm: propagate s390 cpu state to kvm
  s390x/kvm: reuse kvm_s390_reset_vcpu() to get rid of ifdefs
  s390x/kvm: synchronize the cpu state after SIGP (INITIAL) CPU RESET

Jens Freimann (1):
  linux-headers: update to 3.17-rc7

Thomas Huth (1):
  s390x/migration: migrate CPU state

 hw/s390x/ipl.c                    |    2 +-
 hw/s390x/s390-virtio.c            |   32 -----------
 hw/s390x/virtio-ccw.c             |    2 +-
 linux-headers/asm-mips/kvm_para.h |    6 +-
 linux-headers/asm-powerpc/kvm.h   |    2 +
 linux-headers/asm-x86/kvm.h       |    3 +
 linux-headers/linux/kvm.h         |   13 ++++-
 linux-headers/linux/kvm_para.h    |    3 +
 linux-headers/linux/vfio.h        |   34 +++++++++++
 linux-headers/linux/vhost.h       |    2 +-
 target-s390x/Makefile.objs        |    2 +-
 target-s390x/cpu-qom.h            |    4 ++
 target-s390x/cpu.c                |  114 ++++++++++++++++++++++++++++---------
 target-s390x/cpu.h                |   41 ++++++++++---
 target-s390x/helper.c             |   19 +++----
 target-s390x/kvm.c                |   58 ++++++++++++++++---
 target-s390x/machine.c            |   76 +++++++++++++++++++++++++
 trace-events                      |    6 ++
 18 files changed, 323 insertions(+), 96 deletions(-)
 create mode 100644 target-s390x/machine.c

Comments

Peter Maydell Oct. 10, 2014, 7:03 p.m. UTC | #1 
On 10 October 2014 14:09, Cornelia Huck <cornelia.huck@de.ibm.com> wrote:
> Updates v1->v2:
> - rebased against master
> - "s390x/migration: migrate CPU state": move vmstate code into
>   target-s390x/machine.c and tweak comment
>
> The following changes since commit fcb2cd928f5519b8241e22411a696be1a7272b1c:
>
>   Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging (2014-10-09 15:09:05 +0100)
>
> are available in the git repository at:
>
>
>   git://github.com/cohuck/qemu.git tags/s390x-20141010
>
> for you to fetch changes up to 4b7757bae7c94f980969031119db12d540cf2b61:
>
>   s390x/virtio-ccw: fix vhost-scsi intialization (2014-10-10 13:32:39 +0200)
>
> ----------------------------------------------------------------
> various s390x updates:
> - cpu state handling in qemu and migration
> - vhost-scsi-ccw bugfix
>
> ----------------------------------------------------------------

Applied, thanks.

Something I've realised recently would be useful is if v2
respins of a pullrequest could include the fact that it's
a v2 in either the tag commit message or in the tagname
itself it would be easier for me to reassure myself that
the merge I'm about to push to master is indeed the most
recent respin (since it will then appear in the merge
commit message). Not critically important, but it would
be nice.

-- PMM