qemu-commits
[Top][All Lists]
Advanced

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

[Qemu-commits] [qemu/qemu] cd20d6: virtio-ccw: sort into categories


From: GitHub
Subject: [Qemu-commits] [qemu/qemu] cd20d6: virtio-ccw: sort into categories
Date: Thu, 30 Apr 2015 07:30:08 -0700

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: cd20d61634092a9fa19c8c6f0a749526e9958374
      
https://github.com/qemu/qemu/commit/cd20d61634092a9fa19c8c6f0a749526e9958374
  Author: Cornelia Huck <address@hidden>
  Date:   2015-04-30 (Thu, 30 Apr 2015)

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

  Log Message:
  -----------
  virtio-ccw: sort into categories

Sort the various virtio-ccw devices into the same categories as their
virtio-pci counterparts.

Reviewed-by: David Hildenbrand <address@hidden>
Acked-by: Christian Borntraeger <address@hidden>
Signed-off-by: Cornelia Huck <address@hidden>


  Commit: 4d1866de9422c4b359f61819ee01efc9b988187b
      
https://github.com/qemu/qemu/commit/4d1866de9422c4b359f61819ee01efc9b988187b
  Author: Cornelia Huck <address@hidden>
  Date:   2015-04-30 (Thu, 30 Apr 2015)

  Changed paths:
    M hw/s390x/s390-virtio-bus.c

  Log Message:
  -----------
  s390-virtio: sort into categories

Sort the various s390-virtio devices into the same categories as their
virtio-pci counterparts.

Reviewed-by: David Hildenbrand <address@hidden>
Acked-by: Christian Borntraeger <address@hidden>
Signed-off-by: Cornelia Huck <address@hidden>


  Commit: 183f6b8d7e7adf6b892523644e38b534c5954be1
      
https://github.com/qemu/qemu/commit/183f6b8d7e7adf6b892523644e38b534c5954be1
  Author: Cornelia Huck <address@hidden>
  Date:   2015-04-30 (Thu, 30 Apr 2015)

  Changed paths:
    M hw/char/sclpconsole-lm.c
    M hw/char/sclpconsole.c
    M hw/s390x/event-facility.c
    M hw/s390x/sclp.c
    M hw/s390x/sclpcpu.c
    M hw/s390x/sclpquiesce.c

  Log Message:
  -----------
  sclp: sort into categories

Sort the sclp consoles into the input category, just as virtio-serial.
Various other sclp devices don't have an obvious category, sort them
into misc.

Reviewed-by: David Hildenbrand <address@hidden>
Acked-by: Christian Borntraeger <address@hidden>
Signed-off-by: Cornelia Huck <address@hidden>


  Commit: b4ab4572b319f2c26435b2ed18cfd3fb602c7439
      
https://github.com/qemu/qemu/commit/b4ab4572b319f2c26435b2ed18cfd3fb602c7439
  Author: Cornelia Huck <address@hidden>
  Date:   2015-04-30 (Thu, 30 Apr 2015)

  Changed paths:
    M hw/s390x/ipl.c

  Log Message:
  -----------
  s390x/ipl: sort into categories

The s390 ipl device has no real home (it's not really a storage device),
so let's sort it into the misc category.

Reviewed-by: David Hildenbrand <address@hidden>
Acked-by: Christian Borntraeger <address@hidden>
Signed-off-by: Cornelia Huck <address@hidden>


  Commit: 217a4acb211d603f33199cf94ada9fce3ac419b5
      
https://github.com/qemu/qemu/commit/217a4acb211d603f33199cf94ada9fce3ac419b5
  Author: Thomas Huth <address@hidden>
  Date:   2015-04-30 (Thu, 30 Apr 2015)

  Changed paths:
    M target-s390x/helper.c
    M target-s390x/mmu_helper.c

  Log Message:
  -----------
  s390x/mmu: Use access type definitions instead of magic values

Since there are now proper definitions for the MMU access type,
let's use them in the s390x MMU code, too, instead of the
hard-to-understand magic values.

Signed-off-by: Thomas Huth <address@hidden>
Reviewed-by: Jens Freimann <address@hidden>
Acked-by: Cornelia Huck <address@hidden>
Signed-off-by: Cornelia Huck <address@hidden>


  Commit: 7a52ce8a160739c5d37469b0e344d3239eb86462
      
https://github.com/qemu/qemu/commit/7a52ce8a160739c5d37469b0e344d3239eb86462
  Author: Cornelia Huck <address@hidden>
  Date:   2015-04-30 (Thu, 30 Apr 2015)

  Changed paths:
    M include/standard-headers/linux/virtio_balloon.h
    M include/standard-headers/linux/virtio_ids.h
    A include/standard-headers/linux/virtio_input.h
    M linux-headers/asm-arm/kvm.h
    M linux-headers/asm-arm64/kvm.h
    M linux-headers/asm-mips/kvm.h
    M linux-headers/asm-s390/kvm.h
    M linux-headers/asm-x86/hyperv.h
    M linux-headers/linux/kvm.h
    M linux-headers/linux/vfio.h

  Log Message:
  -----------
  linux-headers: update

This updates linux-headers against master 4.1-rc1 (commit
b787f68c36d49bb1d9236f403813641efa74a031).

Signed-off-by: Cornelia Huck <address@hidden>


  Commit: f07177a5599fb204e42a007db4820ceda1bc85ba
      
https://github.com/qemu/qemu/commit/f07177a5599fb204e42a007db4820ceda1bc85ba
  Author: Ekaterina Tumanova <address@hidden>
  Date:   2015-04-30 (Thu, 30 Apr 2015)

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

  Log Message:
  -----------
  s390x/kvm: Put vm name, extended name and UUID into STSI322 SYSIB

KVM prefills the SYSIB, returned by STSI 3.2.2. This patch allows
userspace to intercept execution, and fill in the values, that are
known to qemu: machine name (8 chars), extended machine name (256
chars), extended machine name encoding (equals 2 for UTF-8) and UUID.

STSI322 qemu handler also finds a highest virtualization level in
level-3 virtualization stack that doesn't support Extended Names
(Ext Name delimiter) and propagates zero Ext Name to all levels below,
because this level is not capable of managing Extended Names of lower
levels.

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


  Commit: a9bcd1b8719dea2e91512238d810e2a0037e174d
      
https://github.com/qemu/qemu/commit/a9bcd1b8719dea2e91512238d810e2a0037e174d
  Author: Thomas Huth <address@hidden>
  Date:   2015-04-30 (Thu, 30 Apr 2015)

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

  Log Message:
  -----------
  s390x/mmu: Use ioctl for reading and writing from/to guest memory

Add code to make use of the new ioctl for reading from / writing to
virtual guest memory. By using the ioctl, the memory accesses are now
protected with the so-called ipte-lock in the kernel.

[CH: moved error message into kvm_s390_mem_op()]
Signed-off-by: Thomas Huth <address@hidden>
Acked-by: Christian Borntraeger <address@hidden>
Signed-off-by: Cornelia Huck <address@hidden>


  Commit: 6cb1e49de58cab8f243b05a971a9a1f80ab3223d
      
https://github.com/qemu/qemu/commit/6cb1e49de58cab8f243b05a971a9a1f80ab3223d
  Author: Alexander Yarygin <address@hidden>
  Date:   2015-04-30 (Thu, 30 Apr 2015)

  Changed paths:
    M hw/s390x/s390-pci-inst.c
    M hw/s390x/s390-pci-inst.h
    M target-s390x/cpu.h
    M target-s390x/ioinst.c
    M target-s390x/kvm.c
    M target-s390x/mmu_helper.c

  Log Message:
  -----------
  s390x/kvm: Support access register mode for KVM_S390_MEM_OP ioctl

Access register mode is one of the modes that control dynamic address
translation. In this mode the address space is specified by values of
the access registers. The effective address-space-control element is
obtained from the result of the access register translation. See
the "Access-Register Introduction" section of the chapter 5 "Program
Execution" in "Principles of Operations" for more details.

When the CPU is in AR mode, the s390_cpu_virt_mem_rw() function must
know which access register number to use for address translation.
This patch does several things:
- add new parameter 'uint8_t ar' to that function
- decode ar number from intercepted instructions
- pass the ar number to s390_cpu_virt_mem_rw(), which in turn passes it
to the KVM_S390_MEM_OP ioctl.

Signed-off-by: Alexander Yarygin <address@hidden>
Reviewed-by: Thomas Huth <address@hidden>
Reviewed-by: David Hildenbrand <address@hidden>
Signed-off-by: Cornelia Huck <address@hidden>


  Commit: 2c80e996e427ae31982f3405a762859578a6261d
      
https://github.com/qemu/qemu/commit/2c80e996e427ae31982f3405a762859578a6261d
  Author: Cornelia Huck <address@hidden>
  Date:   2015-04-30 (Thu, 30 Apr 2015)

  Changed paths:
    M kvm-all.c

  Log Message:
  -----------
  kvm: better advice for failed s390x startup

If KVM_CREATE failed on s390x, we print a hint to enable the switch_amode
kernel parameter. This only applies to old kernels, and only if the
error was -EINVAL. Moreover, with new kernels, the most likely reason
for -EINVAL is that pgstes were not enabled.

Let's update the error message to give a better hint on where things
may need fixing.

Acked-by: Christian Borntraeger <address@hidden>
Signed-off-by: Cornelia Huck <address@hidden>


  Commit: 498147529d1f8e902e6528a0115143b53475791e
      
https://github.com/qemu/qemu/commit/498147529d1f8e902e6528a0115143b53475791e
  Author: Peter Maydell <address@hidden>
  Date:   2015-04-30 (Thu, 30 Apr 2015)

  Changed paths:
    M hw/char/sclpconsole-lm.c
    M hw/char/sclpconsole.c
    M hw/s390x/event-facility.c
    M hw/s390x/ipl.c
    M hw/s390x/s390-pci-inst.c
    M hw/s390x/s390-pci-inst.h
    M hw/s390x/s390-virtio-bus.c
    M hw/s390x/sclp.c
    M hw/s390x/sclpcpu.c
    M hw/s390x/sclpquiesce.c
    M hw/s390x/virtio-ccw.c
    M include/standard-headers/linux/virtio_balloon.h
    M include/standard-headers/linux/virtio_ids.h
    A include/standard-headers/linux/virtio_input.h
    M kvm-all.c
    M linux-headers/asm-arm/kvm.h
    M linux-headers/asm-arm64/kvm.h
    M linux-headers/asm-mips/kvm.h
    M linux-headers/asm-s390/kvm.h
    M linux-headers/asm-x86/hyperv.h
    M linux-headers/linux/kvm.h
    M linux-headers/linux/vfio.h
    M target-s390x/cpu.h
    M target-s390x/helper.c
    M target-s390x/ioinst.c
    M target-s390x/kvm.c
    M target-s390x/mmu_helper.c

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

First pile of s390x patches for 2.4, including:
- some cleanup patches
- sort most of the s390x devices into categories
- support for the new STSI post handler, used to insert vm name and
  friends
- support for the new MEM_OP ioctl (including access register mode)
  for accessing guest memory

# gpg: Signature made Thu Apr 30 12:56:58 2015 BST using RSA key ID C6F02FAF
# gpg: Good signature from "Cornelia Huck <address@hidden>"
# gpg:                 aka "Cornelia Huck <address@hidden>"

* remotes/cohuck/tags/s390x-20150430:
  kvm: better advice for failed s390x startup
  s390x/kvm: Support access register mode for KVM_S390_MEM_OP ioctl
  s390x/mmu: Use ioctl for reading and writing from/to guest memory
  s390x/kvm: Put vm name, extended name and UUID into STSI322 SYSIB
  linux-headers: update
  s390x/mmu: Use access type definitions instead of magic values
  s390x/ipl: sort into categories
  sclp: sort into categories
  s390-virtio: sort into categories
  virtio-ccw: sort into categories

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


Compare: https://github.com/qemu/qemu/compare/06feaacfb4cf...498147529d1f

reply via email to

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