qemu-commits
[Top][All Lists]
Advanced
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Qemu-commits] [qemu/qemu] 66fb2d: linux-headers: update against kvm/nex

From: GitHub
Subject: [Qemu-commits] [qemu/qemu] 66fb2d: linux-headers: update against kvm/next
Date: Tue, 01 Mar 2016 06:00:06 -0800 
  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 66fb2d5467cc93feecc12d3bbab860d7615b6616
      
https://github.com/qemu/qemu/commit/66fb2d5467cc93feecc12d3bbab860d7615b6616
  Author: Cornelia Huck <address@hidden>
  Date:   2016-03-01 (Tue, 01 Mar 2016)

  Changed paths:
    M linux-headers/asm-arm/unistd.h
    M linux-headers/asm-powerpc/unistd.h
    M linux-headers/asm-s390/kvm.h
    M linux-headers/asm-s390/unistd.h
    M linux-headers/asm-x86/unistd_32.h
    M linux-headers/asm-x86/unistd_64.h
    M linux-headers/asm-x86/unistd_x32.h
    M linux-headers/linux/kvm.h
    M linux-headers/linux/vfio.h

  Log Message:
  -----------
  linux-headers: update against kvm/next

Update against commit efef127c, but keep userfaultd.h.

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


  Commit: 5ab0e547bf230a6128caf898ef7706bd226514d4
      
https://github.com/qemu/qemu/commit/5ab0e547bf230a6128caf898ef7706bd226514d4
  Author: David Hildenbrand <address@hidden>
  Date:   2016-03-01 (Tue, 01 Mar 2016)

  Changed paths:
    M target-s390x/kvm.c

  Log Message:
  -----------
  s390x/kvm: sync fprs via kvm_run

We can now also sync the fprs via kvm_run, avoiding one ioctl.

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


  Commit: c5b2ee4c7a2fa573042344c9ec5f0f217a099d84
      
https://github.com/qemu/qemu/commit/c5b2ee4c7a2fa573042344c9ec5f0f217a099d84
  Author: David Hildenbrand <address@hidden>
  Date:   2016-03-01 (Tue, 01 Mar 2016)

  Changed paths:
    M target-s390x/mmu_helper.c

  Log Message:
  -----------
  s390x: fix debug statement in trigger_page_fault()

When mmu_translate debugging output is enabled, code won't compile.
Let's just use the same statement as in trigger_prot_fault().

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


  Commit: 8777f6abdbf7017b7aea38dcee2f389f61925ed8
      
https://github.com/qemu/qemu/commit/8777f6abdbf7017b7aea38dcee2f389f61925ed8
  Author: Cornelia Huck <address@hidden>
  Date:   2016-03-01 (Tue, 01 Mar 2016)

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

  Log Message:
  -----------
  s390x: remove {kvm_}s390_virtio_irq()

This interface was only used by the old virtio machine and therefore
is not needed anymore.

Reviewed-by: David Hildenbrand <address@hidden>
Reviewed-by: Halil Pasic <address@hidden>
Signed-off-by: Cornelia Huck <address@hidden>


  Commit: fe345a3d5d7ed4bc2965c65542832b1fa785ae9d
      
https://github.com/qemu/qemu/commit/fe345a3d5d7ed4bc2965c65542832b1fa785ae9d
  Author: Sascha Silbe <address@hidden>
  Date:   2016-03-01 (Tue, 01 Mar 2016)

  Changed paths:
    M hw/watchdog/wdt_diag288.c

  Log Message:
  -----------
  watchdog/diag288: avoid race condition on expired watchdog

When configured to inject an NMI, watchdog_perform_action() may cause
the BQL to be temporarily relinquished (inject_nmi() → ... →
s390_nmi() → s390_cpu_restart() → run_on_cpu()). When the guest issues
diag 288 again in response to the NMI, the diag 288 operation will
race against wdt_diag288_reset(). Depending on scheduler behaviour,
wdt_diag288_reset() may be run after the guest issued a diag 288
Init. As a result, we will cancel the timer the guest just set up. The
effect observed by the guest is that a second expiry does not trigger
the watchdog action and diag 288 Change operations fail.

Fix this by resetting the timer _before_ invoking the action.

Signed-off-by: Sascha Silbe <address@hidden>
Acked-by: David Hildenbrand <address@hidden>
Signed-off-by: Cornelia Huck <address@hidden>


  Commit: 99abd0d6f75109b58dbd662134d8d013999e1e8f
      
https://github.com/qemu/qemu/commit/99abd0d6f75109b58dbd662134d8d013999e1e8f
  Author: Cornelia Huck <address@hidden>
  Date:   2016-03-01 (Tue, 01 Mar 2016)

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

  Log Message:
  -----------
  s390x/virtio: old machine leftovers

Remove some now unused #defines.

Reviewed-By: Sascha Silbe <address@hidden>
Reviewed-by: Halil Pasic <address@hidden>
Signed-off-by: Cornelia Huck <address@hidden>


  Commit: a28d8391e323ef586c44e9313826097f884eebc6
      
https://github.com/qemu/qemu/commit/a28d8391e323ef586c44e9313826097f884eebc6
  Author: Yi Min Zhao <address@hidden>
  Date:   2016-03-01 (Tue, 01 Mar 2016)

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

  Log Message:
  -----------
  s390x/css: introduce indicator refcounting interfaces

Currently, virtio-ccw uses its own interfaces to keep indicators mapped
just once even if the same address has been registered multiple times.
These interfaces fit the PCI use case as well. Therefore, move them to
css and make them generic interfaces.

Signed-off-by: Yi Min Zhao <address@hidden>
Reviewed-by: Cornelia Huck <address@hidden>
Signed-off-by: Cornelia Huck <address@hidden>


  Commit: 8581c115d2b995e216223f9f9d29fb4810474dc4
      
https://github.com/qemu/qemu/commit/8581c115d2b995e216223f9f9d29fb4810474dc4
  Author: Yi Min Zhao <address@hidden>
  Date:   2016-03-01 (Tue, 01 Mar 2016)

  Changed paths:
    M hw/s390x/s390-pci-bus.h
    M hw/s390x/s390-pci-inst.c

  Log Message:
  -----------
  s390x/pci: fix reg/dereg irq functions

Indicator refcounting interfaces are introduced. This patch fixes
introducing unneeded indicator mappings and failure to release
AISB mappings on deregistration.

Signed-off-by: Yi Min Zhao <address@hidden>
Reviewed-by: Cornelia Huck <address@hidden>
Signed-off-by: Cornelia Huck <address@hidden>


  Commit: 562f5e0b97bf36bec6c22f41f94975a20036edec
      
https://github.com/qemu/qemu/commit/562f5e0b97bf36bec6c22f41f94975a20036edec
  Author: Eduardo Habkost <address@hidden>
  Date:   2016-03-01 (Tue, 01 Mar 2016)

  Changed paths:
    M hw/s390x/css.c

  Log Message:
  -----------
  s390x/css: Allocate channel_subsys statically

There's no need to use g_malloc0() to allocate the channel_subsys
struct, just use a static variable.

Cc: Cornelia Huck <address@hidden>
Cc: Christian Borntraeger <address@hidden>
Cc: Richard Henderson <address@hidden>
Cc: Alexander Graf <address@hidden>
Signed-off-by: Eduardo Habkost <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Cornelia Huck <address@hidden>
[adapted on top of indicator changes]
Signed-off-by: Cornelia Huck <address@hidden>


  Commit: bc994b74ea38579e18f9d9144021c6f8de597a34
      
https://github.com/qemu/qemu/commit/bc994b74ea38579e18f9d9144021c6f8de597a34
  Author: Eduardo Habkost <address@hidden>
  Date:   2016-03-01 (Tue, 01 Mar 2016)

  Changed paths:
    M hw/s390x/css.c

  Log Message:
  -----------
  s390x/css: Use static initialization for channel_subsys fields

machine_init() will be gone, but we don't need it if we just
initialize the channel_subsys fields statically.

Cc: Cornelia Huck <address@hidden>
Cc: Christian Borntraeger <address@hidden>
Cc: Richard Henderson <address@hidden>
Cc: Alexander Graf <address@hidden>
Signed-off-by: Eduardo Habkost <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Cornelia Huck <address@hidden>
[adapted on top of indicator changes]
Signed-off-by: Cornelia Huck <address@hidden>


  Commit: ce1307e180cae11660847581b1927599c1ab8657
      
https://github.com/qemu/qemu/commit/ce1307e180cae11660847581b1927599c1ab8657
  Author: Wei Yang <address@hidden>
  Date:   2016-03-01 (Tue, 01 Mar 2016)

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

  Log Message:
  -----------
  s390x/pci: use PCI_MSIX_FLAGS on retrieving the MSIX entries

Even PCI_CAP_FLAGS has the same value as PCI_MSIX_FLAGS, the later one is
the more proper on retrieving MSIX entries.

This patch uses PCI_MSIX_FLAGS to retrieve the MSIX entries.

Signed-off-by: Wei Yang <address@hidden>
CC: Cornelia Huck <address@hidden>
CC: Christian Borntraeger <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Cornelia Huck <address@hidden>


  Commit: 6aaa681c9b158bb5116a1de7b474d5997905473e
      
https://github.com/qemu/qemu/commit/6aaa681c9b158bb5116a1de7b474d5997905473e
  Author: Thomas Huth <address@hidden>
  Date:   2016-03-01 (Tue, 01 Mar 2016)

  Changed paths:
    M MAINTAINERS

  Log Message:
  -----------
  MAINTAINERS: Remove the old s390-virtio machine

The old s390-virtio machine has been removed last year, so we don't
need the corresponding section in the MAINTAINERS file anymore.

Signed-off-by: Thomas Huth <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Cornelia Huck <address@hidden>


  Commit: d90527178c424b2634faf6aed4d940b95e03bb57
      
https://github.com/qemu/qemu/commit/d90527178c424b2634faf6aed4d940b95e03bb57
  Author: Thomas Huth <address@hidden>
  Date:   2016-03-01 (Tue, 01 Mar 2016)

  Changed paths:
    M MAINTAINERS

  Log Message:
  -----------
  MAINTAINERS: Remove entry for hw/s390x/s390-virtio-bus.[ch]

The files have been deleted recently, no need to keep these entries
anymore.

Signed-off-by: Thomas Huth <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Cornelia Huck <address@hidden>


  Commit: ce350f32e4bb9638085f585329fb5d751676d2d2
      
https://github.com/qemu/qemu/commit/ce350f32e4bb9638085f585329fb5d751676d2d2
  Author: Cornelia Huck <address@hidden>
  Date:   2016-03-01 (Tue, 01 Mar 2016)

  Changed paths:
    M hw/s390x/css.c

  Log Message:
  -----------
  s390x/css: only suspend when enabled by orb

We must not allow a channel program to suspend if the suspend
control bit in the orb had not been specified.

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


  Commit: 9c279bec754a84c790b70674a5a224379c8dcda2
      
https://github.com/qemu/qemu/commit/9c279bec754a84c790b70674a5a224379c8dcda2
  Author: Peter Maydell <address@hidden>
  Date:   2016-03-01 (Tue, 01 Mar 2016)

  Changed paths:
    M MAINTAINERS
    M hw/s390x/css.c
    M hw/s390x/css.h
    M hw/s390x/s390-pci-bus.c
    M hw/s390x/s390-pci-bus.h
    M hw/s390x/s390-pci-inst.c
    M hw/s390x/s390-virtio.c
    M hw/s390x/virtio-ccw.c
    M hw/s390x/virtio-ccw.h
    M hw/watchdog/wdt_diag288.c
    M linux-headers/asm-arm/unistd.h
    M linux-headers/asm-powerpc/unistd.h
    M linux-headers/asm-s390/kvm.h
    M linux-headers/asm-s390/unistd.h
    M linux-headers/asm-x86/unistd_32.h
    M linux-headers/asm-x86/unistd_64.h
    M linux-headers/asm-x86/unistd_x32.h
    M linux-headers/linux/kvm.h
    M linux-headers/linux/vfio.h
    M target-s390x/cpu.h
    M target-s390x/interrupt.c
    M target-s390x/kvm.c
    M target-s390x/mmu_helper.c

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

Assorted fixes, cleanups and enhancements.

# gpg: Signature made Tue 01 Mar 2016 11:45:12 GMT using RSA key ID C6F02FAF
# gpg: Good signature from "Cornelia Huck <address@hidden>"
# gpg:                 aka "Cornelia Huck <address@hidden>"

* remotes/cohuck/tags/s390x-20160301:
  s390x/css: only suspend when enabled by orb
  MAINTAINERS: Remove entry for hw/s390x/s390-virtio-bus.[ch]
  MAINTAINERS: Remove the old s390-virtio machine
  s390x/pci: use PCI_MSIX_FLAGS on retrieving the MSIX entries
  s390x/css: Use static initialization for channel_subsys fields
  s390x/css: Allocate channel_subsys statically
  s390x/pci: fix reg/dereg irq functions
  s390x/css: introduce indicator refcounting interfaces
  s390x/virtio: old machine leftovers
  watchdog/diag288: avoid race condition on expired watchdog
  s390x: remove {kvm_}s390_virtio_irq()
  s390x: fix debug statement in trigger_page_fault()
  s390x/kvm: sync fprs via kvm_run
  linux-headers: update against kvm/next

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


Compare: https://github.com/qemu/qemu/compare/646fd1686501...9c279bec754a
reply via email to
[Prev in Thread] Current Thread [Next in Thread]