diff options
author | Anthony Liguori <aliguori@us.ibm.com> | 2013-03-10 20:39:17 -0500 |
---|---|---|
committer | Anthony Liguori <aliguori@us.ibm.com> | 2013-03-10 20:39:17 -0500 |
commit | fa3889162ff724d09eb6b6bd06ba54769100a77f (patch) | |
tree | 25b0ed35ec1016a1d69dec4520e7e3611f361c07 /target-s390x/cpu.h | |
parent | 6e72a00f909dcd093fbdd1faa2b3c8caa1697a6c (diff) | |
parent | a4960ef34829c355fdf25b8ee6b869c92393e366 (diff) | |
download | hqemu-fa3889162ff724d09eb6b6bd06ba54769100a77f.zip hqemu-fa3889162ff724d09eb6b6bd06ba54769100a77f.tar.gz |
Merge remote-tracking branch 'origin/master' into staging
* origin/master: (75 commits)
tcg: Don't make exitreq flag a local temporary
Makefile: Add subdir dependency on config-devices-all.mak
make_device_config.sh: Emit dependency file to directory where included
Revert "make_device_config.sh: Fix target path in generated dependency file"
s390/virtio-ccw: remove redundant call to blockdev_mark_auto_del
s390/css: Fix subchannel detection
Allow virtio-net features for legacy s390 virtio bus
s390: virtio-ccw maintainer
s390: simplify kvm cpu init
pseries: Add compatible property to root of device tree
target-ppc: Move CPU aliases out of translate_init.c
target-ppc: Report CPU aliases for QMP
target-ppc: List alias names alongside CPU models
target-ppc: Make host CPU a subclass of the host's CPU model
PPC: xnu kernel expects FLUSH to be cleared on STOP
PPC: Fix dma interrupt
target-ppc: Fix PPC_DUMP_SPR_ACCESS build
target-ppc: Synchronize FPU state with KVM
target-ppc: Add mechanism for synchronizing SPRs with KVM
Save memory allocation in the elf loader
...
Diffstat (limited to 'target-s390x/cpu.h')
-rw-r--r-- | target-s390x/cpu.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/target-s390x/cpu.h b/target-s390x/cpu.h index e450db7..9cb739d 100644 --- a/target-s390x/cpu.h +++ b/target-s390x/cpu.h @@ -404,7 +404,7 @@ SubchDev *css_find_subch(uint8_t m, uint8_t cssid, uint8_t ssid, bool css_subch_visible(SubchDev *sch); void css_conditional_io_interrupt(SubchDev *sch); int css_do_stsch(SubchDev *sch, SCHIB *schib); -bool css_schid_final(uint8_t cssid, uint8_t ssid, uint16_t schid); +bool css_schid_final(int m, uint8_t cssid, uint8_t ssid, uint16_t schid); int css_do_msch(SubchDev *sch, SCHIB *schib); int css_do_xsch(SubchDev *sch); int css_do_csch(SubchDev *sch); |