diff options
author | Blue Swirl <blauwirbel@gmail.com> | 2011-11-19 11:17:58 +0000 |
---|---|---|
committer | Blue Swirl <blauwirbel@gmail.com> | 2011-11-19 11:17:58 +0000 |
commit | 25cc4a768d91817bc3b4bf9b3a270c4791509cd7 (patch) | |
tree | 78a65c66213c777fd87d68192ab82bc0f80b6d1e /tcg/tci/tcg-target.h | |
parent | 05a86f23e5ca83348eface349429341cefb8697b (diff) | |
parent | 326384d5b6dcea69ca44695ee807f8b50234ab71 (diff) |
Merge branch 's390-1.0' of git://repo.or.cz/qemu/agraf
* 's390-1.0' of git://repo.or.cz/qemu/agraf:
s390x: initialize virtio dev region
tcg: Use TCGReg for standard tcg-target entry points.
tcg: Standardize on TCGReg as the enum for hard registers
s390x: Add shutdown for TCG s390-virtio machine
s390: Fix cpu shutdown for KVM
s390: fix short kernel command lines
s390: fix reset hypercall to reset the status
s390x: implement SIGP restart and shutdown
s390x: implement rrbe instruction properly
s390x: update R and C bits in storage key
s390x: make ipte 31-bit aware
s390x: add ldeb instruction
Diffstat (limited to 'tcg/tci/tcg-target.h')
-rw-r--r-- | tcg/tci/tcg-target.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tcg/tci/tcg-target.h b/tcg/tci/tcg-target.h index 81ded86959..cb5858c9cb 100644 --- a/tcg/tci/tcg-target.h +++ b/tcg/tci/tcg-target.h @@ -150,7 +150,7 @@ typedef enum { #endif /* Special value UINT8_MAX is used by TCI to encode constant values. */ TCG_CONST = UINT8_MAX -} TCGRegister; +} TCGReg; void tci_disas(uint8_t opc); |