qemu-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Qemu-commits] [qemu/qemu] a9fd16: linux-headers: update to 3.17-rc7


From: GitHub
Subject: [Qemu-commits] [qemu/qemu] a9fd16: linux-headers: update to 3.17-rc7
Date: Fri, 10 Oct 2014 12:30:06 -0700

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: a9fd16544dd3cdc50902ff652e2f57982f113497
      
https://github.com/qemu/qemu/commit/a9fd16544dd3cdc50902ff652e2f57982f113497
  Author: Jens Freimann <address@hidden>
  Date:   2014-10-10 (Fri, 10 Oct 2014)

  Changed paths:
    M linux-headers/asm-mips/kvm_para.h
    M linux-headers/asm-powerpc/kvm.h
    M linux-headers/asm-x86/kvm.h
    M linux-headers/linux/kvm.h
    M linux-headers/linux/kvm_para.h
    M linux-headers/linux/vfio.h
    M linux-headers/linux/vhost.h

  Log Message:
  -----------
  linux-headers: update to 3.17-rc7

Sync headers with 3.17-rc7

Acked-by: Paolo Bonzini <address@hidden>
Signed-off-by: Jens Freimann <address@hidden>
Signed-off-by: Cornelia Huck <address@hidden>


  Commit: 75973bfe415774babe7c1e18fa682c050fdce73b
      
https://github.com/qemu/qemu/commit/75973bfe415774babe7c1e18fa682c050fdce73b
  Author: David Hildenbrand <address@hidden>
  Date:   2014-10-10 (Fri, 10 Oct 2014)

  Changed paths:
    M hw/s390x/s390-virtio.c
    M target-s390x/cpu.c
    M target-s390x/cpu.h

  Log Message:
  -----------
  s390x/kvm: introduce proper states for s390 cpus

Until now, when a s390 cpu was stopped or halted, the number of running
CPUs was tracked in a global variable. This was problematic for migration,
so Jason came up with a per-cpu running state.
As it turns out, we want to track the full logical state of a target vcpu,
so we need real s390 cpu states.

This patch is based on an initial patch by Jason Herne, but was heavily
rewritten when adding the cpu states STOPPED and OPERATING. On the way we
move add_del_running to cpu.c (the declaration is already in cpu.h) and
modify the users where appropriate.

Please note that the cpu is still set to be stopped when it is
halted, which is wrong. This will be fixed in the next patch. The LOAD and
CHECK-STOP state will not be used in the first step.

Signed-off-by: David Hildenbrand <address@hidden>
[folded Jason's patch into David's patch to avoid add/remove same lines]
Signed-off-by: Jens Freimann <address@hidden>
Reviewed-by: Cornelia Huck <address@hidden>
Reviewed-by: Christian Borntraeger <address@hidden>
CC: Andreas Faerber <address@hidden>
Tested-by: Christian Borntraeger <address@hidden>
Signed-off-by: Cornelia Huck <address@hidden>


  Commit: eb24f7c6896e93047f2c58ffd3ba4f453e88280b
      
https://github.com/qemu/qemu/commit/eb24f7c6896e93047f2c58ffd3ba4f453e88280b
  Author: David Hildenbrand <address@hidden>
  Date:   2014-10-10 (Fri, 10 Oct 2014)

  Changed paths:
    M hw/s390x/ipl.c
    M target-s390x/cpu.c
    M target-s390x/cpu.h
    M target-s390x/helper.c
    M target-s390x/kvm.c
    M trace-events

  Log Message:
  -----------
  s390x/kvm: proper use of the cpu states OPERATING and STOPPED

This patch makes sure that halting a cpu and stopping a cpu are two different
things. Stopping a cpu will also set the cpu halted - this is needed for common
infrastructure to work (note that the stop and stopped flag cannot be used for
our purpose because they are already used by other mechanisms).

A cpu can be halted ("waiting") when it is operating. If interrupts are
disabled, this is called a "disabled wait", as it can't be woken up anymore. A
stopped cpu is treated like a "disabled wait" cpu, but in order to prepare for a
proper cpu state synchronization with the kvm part, we need to track the real
logical state of a cpu.

Signed-off-by: David Hildenbrand <address@hidden>
Signed-off-by: Jens Freimann <address@hidden>
Reviewed-by: Cornelia Huck <address@hidden>
Reviewed-by: Christian Borntraeger <address@hidden>
CC: Andreas Faerber <address@hidden>
Tested-by: Christian Borntraeger <address@hidden>
Signed-off-by: Cornelia Huck <address@hidden>


  Commit: c9e659c9ee75d33ff11a8573cea738ad26bb6f86
      
https://github.com/qemu/qemu/commit/c9e659c9ee75d33ff11a8573cea738ad26bb6f86
  Author: David Hildenbrand <address@hidden>
  Date:   2014-10-10 (Fri, 10 Oct 2014)

  Changed paths:
    M target-s390x/cpu.c
    M target-s390x/cpu.h
    M target-s390x/kvm.c
    M trace-events

  Log Message:
  -----------
  s390x/kvm: propagate s390 cpu state to kvm

Let QEMU propagate the cpu state to kvm. If kvm doesn't yet support it, it is
silently ignored as kvm will still handle the cpu state itself in that case.

The state is not synced back, thus kvm won't have a chance to actively modify
the cpu state. To do so, control has to be given back to QEMU (which is already
done so in all relevant cases).

Setting of the cpu state can fail either because kvm doesn't support the
interface yet, or because the state is invalid/not supported. Failed attempts
will be traced

Signed-off-by: David Hildenbrand <address@hidden>
Signed-off-by: Jens Freimann <address@hidden>
Reviewed-by: Thomas Huth <address@hidden>
Reviewed-by: Cornelia Huck <address@hidden>
CC: Andreas Faerber <address@hidden>
Tested-by: Christian Borntraeger <address@hidden>
Signed-off-by: Cornelia Huck <address@hidden>


  Commit: 99607144a423dd2cd3113587e36bc4dc65c4ddf1
      
https://github.com/qemu/qemu/commit/99607144a423dd2cd3113587e36bc4dc65c4ddf1
  Author: David Hildenbrand <address@hidden>
  Date:   2014-10-10 (Fri, 10 Oct 2014)

  Changed paths:
    M target-s390x/cpu.c
    M target-s390x/cpu.h
    M target-s390x/kvm.c

  Log Message:
  -----------
  s390x/kvm: reuse kvm_s390_reset_vcpu() to get rid of ifdefs

This patch reuses kvm_s390_reset_vcpu() to get rid of some CONFIG_KVM and
CONFIG_USER_ONLY ifdefs in cpu.c.

In order to get rid of CONFIG_USER_ONLY, kvm_s390_reset_vcpu() has to provide a
dummy implementation - the two definitions are moved to the proper section in
cpu.h.

Signed-off-by: David Hildenbrand <address@hidden>
Signed-off-by: Jens Freimann <address@hidden>
Reviewed-by: Cornelia Huck <address@hidden>
CC: Andreas Faerber <address@hidden>
Tested-by: Christian Borntraeger <address@hidden>
Signed-off-by: Cornelia Huck <address@hidden>


  Commit: 71dd7e69b30dc5024a8d891e7011173a81fe7a72
      
https://github.com/qemu/qemu/commit/71dd7e69b30dc5024a8d891e7011173a81fe7a72
  Author: David Hildenbrand <address@hidden>
  Date:   2014-10-10 (Fri, 10 Oct 2014)

  Changed paths:
    M target-s390x/kvm.c

  Log Message:
  -----------
  s390x/kvm: synchronize the cpu state after SIGP (INITIAL) CPU RESET

We need to synchronize registers after a reset has been performed. The
current code does that in qemu_system_reset(), load_normal_reset() and
modified_clear_reset() for all vcpus. After SIGP (INITIAL) CPU RESET,
this needs to be done for the targeted vcpu as well, so let's call
cpu_synchronize_post_reset() in the respective handlers.

Signed-off-by: David Hildenbrand <address@hidden>
Signed-off-by: Jens Freimann <address@hidden>
Reviewed-by: Cornelia Huck <address@hidden>
CC: Andreas Faerber <address@hidden>
Tested-by: Christian Borntraeger <address@hidden>
Signed-off-by: Cornelia Huck <address@hidden>


  Commit: ef1df13087768c0ab4010355595b0e3dd91bbd3c
      
https://github.com/qemu/qemu/commit/ef1df13087768c0ab4010355595b0e3dd91bbd3c
  Author: Thomas Huth <address@hidden>
  Date:   2014-10-10 (Fri, 10 Oct 2014)

  Changed paths:
    M target-s390x/Makefile.objs
    M target-s390x/cpu-qom.h
    M target-s390x/cpu.c
    A target-s390x/machine.c

  Log Message:
  -----------
  s390x/migration: migrate CPU state

This patch provides the cpu save information for dumps and later life
migration and enables migration of the CPU state. The code is based on
earlier work from Christian Borntraeger and Jason Herne.

Signed-off-by: Thomas Huth <address@hidden>
Signed-off-by: David Hildenbrand <address@hidden>
[provide cpu_post_load()]
Signed-off-by: Jens Freimann <address@hidden>
CC: Andreas Faerber <address@hidden>
CC: Christian Borntraeger <address@hidden>
CC: Jason J. Herne <address@hidden>
Tested-by: Christian Borntraeger <address@hidden>
[Cornelia Huck: tweaked cpu_post_load() comment]
Signed-off-by: Cornelia Huck <address@hidden>


  Commit: 4b7757bae7c94f980969031119db12d540cf2b61
      
https://github.com/qemu/qemu/commit/4b7757bae7c94f980969031119db12d540cf2b61
  Author: Cornelia Huck <address@hidden>
  Date:   2014-10-10 (Fri, 10 Oct 2014)

  Changed paths:
    M hw/s390x/virtio-ccw.c

  Log Message:
  -----------
  s390x/virtio-ccw: fix vhost-scsi intialization

The vhost-scsi-ccw backend is of type VHostSCSICcw, not VirtIOSCSICcw.

This fixes a segfault when invoking

    qemu-system-s390x -device vhost-scsi-ccw,?

Reviewed-by: Thomas Huth <address@hidden>
Tested-by: Christian Borntraeger <address@hidden>
Signed-off-by: Cornelia Huck <address@hidden>


  Commit: b1d28ec6a7dbdaadda39d29322f0de694aeb0b74
      
https://github.com/qemu/qemu/commit/b1d28ec6a7dbdaadda39d29322f0de694aeb0b74
  Author: Peter Maydell <address@hidden>
  Date:   2014-10-10 (Fri, 10 Oct 2014)

  Changed paths:
    M hw/s390x/ipl.c
    M hw/s390x/s390-virtio.c
    M hw/s390x/virtio-ccw.c
    M linux-headers/asm-mips/kvm_para.h
    M linux-headers/asm-powerpc/kvm.h
    M linux-headers/asm-x86/kvm.h
    M linux-headers/linux/kvm.h
    M linux-headers/linux/kvm_para.h
    M linux-headers/linux/vfio.h
    M linux-headers/linux/vhost.h
    M target-s390x/Makefile.objs
    M target-s390x/cpu-qom.h
    M target-s390x/cpu.c
    M target-s390x/cpu.h
    M target-s390x/helper.c
    M target-s390x/kvm.c
    A target-s390x/machine.c
    M trace-events

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20141010' into staging

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

# gpg: Signature made Fri 10 Oct 2014 14:01:34 BST using RSA key ID C6F02FAF
# gpg: Can't check signature: public key not found

* remotes/cohuck/tags/s390x-20141010:
  s390x/virtio-ccw: fix vhost-scsi intialization
  s390x/migration: migrate CPU state
  s390x/kvm: synchronize the cpu state after SIGP (INITIAL) CPU RESET
  s390x/kvm: reuse kvm_s390_reset_vcpu() to get rid of ifdefs
  s390x/kvm: propagate s390 cpu state to kvm
  s390x/kvm: proper use of the cpu states OPERATING and STOPPED
  s390x/kvm: introduce proper states for s390 cpus
  linux-headers: update to 3.17-rc7

Signed-off-by: Peter Maydell <address@hidden>


Compare: https://github.com/qemu/qemu/compare/9d1c35dfc994...b1d28ec6a7db

reply via email to

[Prev in Thread] Current Thread [Next in Thread]