diff options
| author | Aurelien Jarno <aurelien@aurel32.net> | 2012-01-10 18:24:11 +0100 |
|---|---|---|
| committer | Aurelien Jarno <aurelien@aurel32.net> | 2012-01-10 18:24:11 +0100 |
| commit | 14763ec87340322eba5fe4be35a2c8790c0d1b94 (patch) | |
| tree | 65b677bb455823d0714d50105e0d4bfcaffc7d1e /target-s390x | |
| parent | 665a04ae1cbfa8004a38cf0fe99ba799c978a1fe (diff) | |
| parent | 93116ac0cf9734e7b28886aedf03848b37d6785e (diff) | |
Merge branch 's390-next' of git://repo.or.cz/qemu/agraf
* 's390-next' of git://repo.or.cz/qemu/agraf:
s390: fix cpu hotplug / cpu activity on interrupts
s390x: add TR function for EXECUTE
Expose drive_add on all architectures
Add generic drive hotplugging
Compile device-hotplug on all targets
[S390] Add hotplug support
Diffstat (limited to 'target-s390x')
| -rw-r--r-- | target-s390x/kvm.c | 3 | ||||
| -rw-r--r-- | target-s390x/op_helper.c | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/target-s390x/kvm.c b/target-s390x/kvm.c index 40b0ab1922..b1404bfd2f 100644 --- a/target-s390x/kvm.c +++ b/target-s390x/kvm.c @@ -185,9 +185,6 @@ void kvm_s390_interrupt_internal(CPUState *env, int type, uint32_t parm, return; } - s390_add_running_cpu(env); - qemu_cpu_kick(env); - kvmint.type = type; kvmint.parm = parm; kvmint.parm64 = parm64; diff --git a/target-s390x/op_helper.c b/target-s390x/op_helper.c index b8a1a8a54f..cf26b29ee9 100644 --- a/target-s390x/op_helper.c +++ b/target-s390x/op_helper.c @@ -636,6 +636,9 @@ uint32_t HELPER(ex)(uint32_t cc, uint64_t v1, uint64_t addr, uint64_t ret) case 0x700: cc = helper_xc(l, get_address(0, b1, d1), get_address(0, b2, d2)); break; + case 0xc00: + helper_tr(l, get_address(0, b1, d1), get_address(0, b2, d2)); + break; default: goto abort; break; |