[Qemu-commits] [qemu/qemu] d7933e: watchdog: change option wording to allow for more ...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: d7933ef3ac81149a51ba43ddac9fe70405008aba
      
https://github.com/qemu/qemu/commit/d7933ef3ac81149a51ba43ddac9fe70405008aba
  Author: Xu Wang <address@hidden>
  Date:   2015-06-11 (Thu, 11 Jun 2015)

  Changed paths:
    M qemu-options.hx

  Log Message:
  -----------
  watchdog: change option wording to allow for more watchdogs

We will introduce a new watchdog for s390x. Lets adopt
qemu-options.hx to allow more watchdog devices.

Signed-off-by: Xu Wang <address@hidden>
Reviewed-by: David Hildenbrand <address@hidden>
Signed-off-by: Christian Borntraeger <address@hidden>
[split out qemu-option.hx base changes]


  Commit: 188f24c2c149bcb0088c6317e99e09afc007de34
      
https://github.com/qemu/qemu/commit/188f24c2c149bcb0088c6317e99e09afc007de34
  Author: Xu Wang <address@hidden>
  Date:   2015-06-11 (Thu, 11 Jun 2015)

  Changed paths:
    M default-configs/s390x-softmmu.mak
    M hw/watchdog/Makefile.objs
    A hw/watchdog/wdt_diag288.c
    A include/hw/watchdog/wdt_diag288.h
    M qemu-options.hx

  Log Message:
  -----------
  s390x/watchdog: introduce diag288 watchdog device

This patch introduces a new diag288 watchdog device that will, just like
other watchdogs, monitor a guest and take corresponding actions when it
detects that the guest is not responding.

diag288 is s390x specific. The wiring to s390x KVM will be done in
separate patches.

Signed-off-by: Xu Wang <address@hidden>
Reviewed-by: David Hildenbrand <address@hidden>
Signed-off-by: Christian Borntraeger <address@hidden>
[split out qemu-option.hx base changes]


  Commit: 8fc639af4b62930671b6988c1f7eedf9e7c9f7bc
      
https://github.com/qemu/qemu/commit/8fc639af4b62930671b6988c1f7eedf9e7c9f7bc
  Author: Xu Wang <address@hidden>
  Date:   2015-06-11 (Thu, 11 Jun 2015)

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

  Log Message:
  -----------
  s390x/kvm: diag288 instruction interception and handling

Intercept the diag288 requests from kvm guests, and hand the
requested command to the diag288 watchdog device for further
handling.

Signed-off-by: Xu Wang <address@hidden>
Reviewed-by: David Hildenbrand <address@hidden>
Signed-off-by: Christian Borntraeger <address@hidden>


  Commit: d67f5fe63caa0f707fa91c760508c340e050b6f0
      
https://github.com/qemu/qemu/commit/d67f5fe63caa0f707fa91c760508c340e050b6f0
  Author: Xu Wang <address@hidden>
  Date:   2015-06-11 (Thu, 11 Jun 2015)

  Changed paths:
    M hw/watchdog/wdt_diag288.c

  Log Message:
  -----------
  s390x/watchdog: diag288 migration support

Add vmstate structure to keep state and data during migration.

Signed-off-by: Xu Wang <address@hidden>
Reviewed-by: David Hildenbrand <address@hidden>
Signed-off-by: Christian Borntraeger <address@hidden>


  Commit: f9a535e089abcbc7ac99db83c8c6e4644e395b12
      
https://github.com/qemu/qemu/commit/f9a535e089abcbc7ac99db83c8c6e4644e395b12
  Author: Xu Wang <address@hidden>
  Date:   2015-06-11 (Thu, 11 Jun 2015)

  Changed paths:
    M hw/core/nmi.c
    M include/hw/nmi.h

  Log Message:
  -----------
  nmi: Implement inject_nmi() for non-monitor context use

Let's introduce a general "inject_nmi()" function that doesn't rely on the cpu
index of the monitor, but uses cpu index 0 as default (except for x86).
This function can then later be used from a non-monitor context.

Signed-off-by: Xu Wang <address@hidden>
Reviewed-by: David Hildenbrand <address@hidden>
CC: Alexey Kardashevskiy <address@hidden>
Signed-off-by: Christian Borntraeger <address@hidden>


  Commit: 795dc6e46d953d70b4b7ddd3f4956f8f4b9d8565
      
https://github.com/qemu/qemu/commit/795dc6e46d953d70b4b7ddd3f4956f8f4b9d8565
  Author: Mao Chuan Li <address@hidden>
  Date:   2015-06-11 (Thu, 11 Jun 2015)

  Changed paths:
    M hw/watchdog/watchdog.c
    M qapi-schema.json

  Log Message:
  -----------
  watchdog: Add new Virtual Watchdog action INJECT-NMI

This patch allows QEMU to inject a NMI into a guest when the
watchdog expires.

Signed-off-by: Mao Chuan Li <address@hidden>
Reviewed-by: David Hildenbrand <address@hidden>
CC: Eric Blake <address@hidden>
CC: Markus Armbruster <address@hidden>
Signed-off-by: Christian Borntraeger <address@hidden>


  Commit: 8369e339d24f365750da456588e742674c153437
      
https://github.com/qemu/qemu/commit/8369e339d24f365750da456588e742674c153437
  Author: Aurelien Jarno <address@hidden>
  Date:   2015-06-15 (Mon, 15 Jun 2015)

  Changed paths:
    M pc-bios/s390-ccw/Makefile

  Log Message:
  -----------
  s390/bios: build with -fdelete-null-pointer-checks

Starting with version 4.9, GCC assumes it can't safely dereference null
pointers, and uses this for some optimizations. On s390, the lowcore
memory is located at address 0, so this assumption is wrong and breaks
the s390-ccw firmware. Pass -fdelete-null-pointer-checks to avoid that.

Cc: Cornelia Huck <address@hidden>
Cc: Christian Borntraeger <address@hidden>
Cc: Alexander Graf <address@hidden>
Signed-off-by: Aurelien Jarno <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Christian Borntraeger <address@hidden>


  Commit: 46bca5404b08201bb9df1ac32bc88fc7e6db1f74
      
https://github.com/qemu/qemu/commit/46bca5404b08201bb9df1ac32bc88fc7e6db1f74
  Author: Peter Maydell <address@hidden>
  Date:   2015-06-15 (Mon, 15 Jun 2015)

  Changed paths:
    M default-configs/s390x-softmmu.mak
    M hw/core/nmi.c
    M hw/watchdog/Makefile.objs
    M hw/watchdog/watchdog.c
    A hw/watchdog/wdt_diag288.c
    M include/hw/nmi.h
    A include/hw/watchdog/wdt_diag288.h
    M pc-bios/s390-ccw/Makefile
    M qapi-schema.json
    M qemu-options.hx
    M target-s390x/cpu.h
    M target-s390x/kvm.c
    M target-s390x/misc_helper.c

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/borntraeger/tags/s390x-20150615' into 
staging

s390x/kvm/watchdog

1. Implement a diag288 based watchdog
2. Fix virtio-ccw BIOS for gcc >= 4.9

# gpg: Signature made Mon Jun 15 12:36:25 2015 BST using RSA key ID B5A61C7C
# gpg: Good signature from "Christian Borntraeger (IBM) <address@hidden>"

* remotes/borntraeger/tags/s390x-20150615:
  s390/bios: build with -fdelete-null-pointer-checks
  watchdog: Add new Virtual Watchdog action INJECT-NMI
  nmi: Implement inject_nmi() for non-monitor context use
  s390x/watchdog: diag288 migration support
  s390x/kvm: diag288 instruction interception and handling
  s390x/watchdog: introduce diag288 watchdog device
  watchdog: change option wording to allow for more watchdogs

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


Compare: https://github.com/qemu/qemu/compare/f3e3b083d4c2...46bca5404b08