diff options
| author | Blue Swirl <blauwirbel@gmail.com> | 2013-03-09 11:02:23 +0000 |
|---|---|---|
| committer | Blue Swirl <blauwirbel@gmail.com> | 2013-03-09 11:02:23 +0000 |
| commit | eb839909aa22069e04e1c910fcdf7feaa5581af6 (patch) | |
| tree | dbe8648a2a0d7568109ba143e51ed40185e6cdda /target-s390x | |
| parent | 62e1aeaee4d0450222a0ea43c713b59526e3e0fe (diff) | |
| parent | 8a7df84f9ff4342cae30f4e515e6ac82a0eb0bea (diff) | |
| download | focaccia-qemu-eb839909aa22069e04e1c910fcdf7feaa5581af6.tar.gz focaccia-qemu-eb839909aa22069e04e1c910fcdf7feaa5581af6.zip | |
Merge branch 's390-for-upstream' of git://github.com/agraf/qemu
* 's390-for-upstream' of git://github.com/agraf/qemu: 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
Diffstat (limited to 'target-s390x')
| -rw-r--r-- | target-s390x/cpu.h | 2 | ||||
| -rw-r--r-- | target-s390x/ioinst.c | 2 | ||||
| -rw-r--r-- | target-s390x/kvm.c | 9 |
3 files changed, 4 insertions, 9 deletions
diff --git a/target-s390x/cpu.h b/target-s390x/cpu.h index e450db74a2..9cb739da1e 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); diff --git a/target-s390x/ioinst.c b/target-s390x/ioinst.c index e3531f365e..28c508d541 100644 --- a/target-s390x/ioinst.c +++ b/target-s390x/ioinst.c @@ -316,7 +316,7 @@ int ioinst_handle_stsch(CPUS390XState *env, uint64_t reg1, uint32_t ipb) cc = 3; } } else { - if (css_schid_final(cssid, ssid, schid)) { + if (css_schid_final(m, cssid, ssid, schid)) { cc = 3; /* No more subchannels in this css/ss */ } else { /* Store an empty schib. */ diff --git a/target-s390x/kvm.c b/target-s390x/kvm.c index 3929771182..8f111ae732 100644 --- a/target-s390x/kvm.c +++ b/target-s390x/kvm.c @@ -103,13 +103,8 @@ unsigned long kvm_arch_vcpu_id(CPUState *cpu) int kvm_arch_init_vcpu(CPUState *cpu) { - int ret = 0; - - if (kvm_vcpu_ioctl(cpu, KVM_S390_INITIAL_RESET, NULL) < 0) { - perror("cannot init reset vcpu"); - } - - return ret; + /* nothing todo yet */ + return 0; } void kvm_arch_reset_vcpu(CPUState *cpu) |