]> xenbits.xensource.com Git - qemu-upstream-4.6-testing.git/commitdiff
s390x/ioinst: CHSC has to set a condition code
authorThomas Huth <thuth@linux.vnet.ibm.com>
Tue, 17 Dec 2013 18:50:01 +0000 (19:50 +0100)
committerAlexander Graf <agraf@suse.de>
Wed, 18 Dec 2013 13:24:11 +0000 (14:24 +0100)
I missed to set the CC in the CHSC instruction when I refactored
the CC setting in the IO instructions with the following commit:
5d9bf1c07c1369ab3506fc82cc65a10f4415d867
s390/ioinst: Moved the CC setting to the IO instruction handlers
This patch now restores the correct behaviour of CHSC by setting the
condition code 0 at the end of the instruction.

Signed-off-by: Thomas Huth <thuth@linux.vnet.ibm.com>
Reviewed-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: Jens Freimann <jfrei@linux.vnet.ibm.com>
Signed-off-by: Alexander Graf <agraf@suse.de>
target-s390x/ioinst.c

index 8d6363df4e74d44a71a7a89ee76b052eb2b3317c..b8a6486f510c1476b26aea72bcdb573c0b66e8fc 100644 (file)
@@ -622,6 +622,7 @@ void ioinst_handle_chsc(S390CPU *cpu, uint32_t ipb)
         break;
     }
 
+    setcc(cpu, 0);    /* Command execution complete */
 out:
     s390_cpu_physical_memory_unmap(env, req, map_size, 1);
 }