Commit fe491fa8 authored Apr 25, 2017 by Peter Maydell

Merge remote-tracking branch 'remotes/agraf/tags/signed-s390-for-upstream' into staging



Patch queue for s390 - 2017-04-25

Two simple fixes this time around:

  - fix BQL for s390 virtio target
  - Fix SIGP emulation

# gpg: Signature made Tue 25 Apr 2017 12:40:38 BST
# gpg:                using RSA key 0x2B33791E03FEDC60
# gpg: Good signature from "Alexander Graf <agraf@suse.de>"
# gpg:                 aka "Alexander Graf <alex@csgraf.de>"
# Primary key fingerprint: 7F2A 4C87 F94C 5EFE DBC3  75DC 1631 30DA 5B24 530A
#      Subkey fingerprint: 54D3 364F A6C3 60FF AF81  EB53 2B33 791E 03FE DC60

* remotes/agraf/tags/signed-s390-for-upstream:
  s390x/misc_helper.c: wrap s390_virtio_hypercall in BQL
  target-s390x: Mask the SIGP order_code to 8bit.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

parents b8c7193f 2cf9953b

target/s390x/misc_helper.c

+4 −1

Original line number	Diff line number	Diff line
		@@ -288,7 +288,9 @@ void HELPER(diag)(CPUS390XState *env, uint32_t r1, uint32_t r3, uint32_t num)
		switch (num) {
		case 0x500:
		/* KVM hypercall */
		qemu_mutex_lock_iothread();
		r = s390_virtio_hypercall(env);
		qemu_mutex_unlock_iothread();
		break;
		case 0x44:
		/* yield */
		@@ -515,7 +517,8 @@ uint32_t HELPER(sigp)(CPUS390XState *env, uint64_t order_code, uint32_t r1,
		/* Remember: Use "R1 or R1 + 1, whichever is the odd-numbered register"
		as parameter (input). Status (output) is always R1. */

		switch (order_code) {
		/* sigp contains the order code in bit positions 56-63, mask it here. */
		switch (order_code & 0xff) {
		case SIGP_SET_ARCH:
		/* switch arch */
		break;