diff options
| author |   Justin M. Forbes <jforbes@redhat.com> | 2012-02-01 11:25:23 -0600 |
|---|---|---|
| committer | Justin M. Forbes <jforbes@redhat.com> | 2012-02-01 11:25:23 -0600 |
| commit | 86a8d63bc11431509506b95c1481e1a023302cbc (patch) | |
| tree | 4dbea300945a58a02398d7b95872933d8a6ae0bb | |
| parent | 102dd9167c121d09c78d6b98da0ff8ed1001590a (diff) | |
| parent | d194ba1cdbeee54166845b75f9186a8e401e5f07 (diff) | |
Merge branch 's390-1.0' of git://repo.or.cz/qemu/agraf
| -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 40b0ab192..b1404bfd2 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 137bae74a..5ddc7b93c 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; |