diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2015-06-09 11:07:41 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2015-06-09 11:07:41 +0100 |
| commit | 44ee94e4862603c2b1b21718effc5f17b39f43bc (patch) | |
| tree | ba20ff4eaca1efaeacbe12509a455b46bf058812 /target-s390x | |
| parent | b781a60b1054e06de6733b75dd1489afff9c3276 (diff) | |
| parent | 6028ef075791913228c36f10cb270f1f52e9f076 (diff) | |
| download | qemu-44ee94e4862603c2b1b21718effc5f17b39f43bc.tar.gz | |
Merge remote-tracking branch 'remotes/borntraeger/tags/s390x-20150609' into staging
s390x/virtio-ccw: migration and virtio for 2.4
1. Migration fixups
2. virtio 9pfs
# gpg: Signature made Tue Jun 9 09:00:05 2015 BST using RSA key ID B5A61C7C
# gpg: Good signature from "Christian Borntraeger (IBM) <borntraeger@de.ibm.com>"
* remotes/borntraeger/tags/s390x-20150609:
s390x/migration: add comment about floating point migration
s390x/kvm: always ignore empty vcpu interrupt state
virtio-ccw/migration: Migrate config vector for virtio devices
virtio-ccw: add support for 9pfs
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'target-s390x')
| -rw-r--r-- | target-s390x/kvm.c | 7 | ||||
| -rw-r--r-- | target-s390x/machine.c | 1 |
2 files changed, 5 insertions, 3 deletions
diff --git a/target-s390x/kvm.c b/target-s390x/kvm.c index 2740ec4eef..f6f61b9619 100644 --- a/target-s390x/kvm.c +++ b/target-s390x/kvm.c @@ -2175,13 +2175,14 @@ int kvm_s390_vcpu_interrupt_post_load(S390CPU *cpu) struct kvm_s390_irq_state irq_state; int r; + if (cpu->irqstate_saved_size == 0) { + return 0; + } + if (!kvm_check_extension(kvm_state, KVM_CAP_S390_IRQ_STATE)) { return -ENOSYS; } - if (cpu->irqstate_saved_size == 0) { - return 0; - } irq_state.buf = (uint64_t) cpu->irqstate; irq_state.len = cpu->irqstate_saved_size; diff --git a/target-s390x/machine.c b/target-s390x/machine.c index e52d76032e..004474959a 100644 --- a/target-s390x/machine.c +++ b/target-s390x/machine.c @@ -70,6 +70,7 @@ const VMStateDescription vmstate_fpu = { static inline bool fpu_needed(void *opaque) { + /* This looks odd, but we might want to NOT transfer fprs in the future */ return true; } |