[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 29/33] s390/kvm: make TOD setting failures fatal for
From: |
Cornelia Huck |
Subject: |
[Qemu-devel] [PULL 29/33] s390/kvm: make TOD setting failures fatal for migration |
Date: |
Fri, 6 Oct 2017 11:59:52 +0200 |
From: "Collin L. Walling" <address@hidden>
If we fail to set a proper TOD clock on the target system, this can
already result in some problematic cases. We print several warn messages
on source and target in that case.
If kvm fails to set a nonzero epoch index, then we must ultimately fail
the migration as this will result in a giant time leap backwards. This
patch lets the migration fail if we can not set the guest time on the
target.
On failure the guest will resume normally on the original host machine.
Signed-off-by: Collin L. Walling <address@hidden>
Reviewed-by: Eric Farman <address@hidden>
Reviewed-by: Claudio Imbrenda <address@hidden>
Signed-off-by: Christian Borntraeger <address@hidden>
[split failure change from epoch index change, minor fixups]
Message-Id: <address@hidden>
Reviewed-by: Thomas Huth <address@hidden>
Signed-off-by: Cornelia Huck <address@hidden>
---
hw/s390x/s390-virtio-ccw.c | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c
index 76156ce873..32d3f11d8a 100644
--- a/hw/s390x/s390-virtio-ccw.c
+++ b/hw/s390x/s390-virtio-ccw.c
@@ -189,13 +189,10 @@ static int gtod_load(QEMUFile *f, void *opaque, int
version_id)
r = s390_set_clock(&tod_high, &tod_low);
if (r) {
- warn_report("Unable to set guest clock for migration: %s",
- strerror(-r));
- error_printf("Guest clock will not be restored "
- "which could cause the guest to hang.");
+ error_report("Unable to set KVM guest TOD clock: %s", strerror(-r));
}
- return 0;
+ return r;
}
static SaveVMHandlers savevm_gtod = {
--
2.13.6
- [Qemu-devel] [PULL 21/33] s390x: raise CPU hotplug irq after really hotplugged, (continued)
- [Qemu-devel] [PULL 21/33] s390x: raise CPU hotplug irq after really hotplugged, Cornelia Huck, 2017/10/06
- [Qemu-devel] [PULL 19/33] s390x/3270: handle writes of arbitrary length, Cornelia Huck, 2017/10/06
- [Qemu-devel] [PULL 22/33] s390x/cpumodel: fix max STFL(E) bit number, Cornelia Huck, 2017/10/06
- [Qemu-devel] [PULL 23/33] target/s390x: get rid of next_core_id, Cornelia Huck, 2017/10/06
- [Qemu-devel] [PULL 24/33] s390x: introduce and use S390_MAX_CPUS, Cornelia Huck, 2017/10/06
- [Qemu-devel] [PULL 27/33] s390x/css: fix css migration compat handling, Cornelia Huck, 2017/10/06
- [Qemu-devel] [PULL 25/33] s390x/tcg: make STFL store into the lowcore, Cornelia Huck, 2017/10/06
- [Qemu-devel] [PULL 26/33] s390x: sort some devices into categories, Cornelia Huck, 2017/10/06
- [Qemu-devel] [PULL 28/33] s390/kvm: Support for get/set of extended TOD-Clock for guest, Cornelia Huck, 2017/10/06
- [Qemu-devel] [PULL 31/33] s390x/sclp: mark sclp-cpu-hotplug as non-usercreatable, Cornelia Huck, 2017/10/06
- [Qemu-devel] [PULL 29/33] s390/kvm: make TOD setting failures fatal for migration,
Cornelia Huck <=
- [Qemu-devel] [PULL 30/33] s390x/sclp: Mark the sclp device with user_creatable = false, Cornelia Huck, 2017/10/06
- [Qemu-devel] [PULL 32/33] s390x/tcg: initialize machine check queue, Cornelia Huck, 2017/10/06
- [Qemu-devel] [PULL 33/33] hw/s390x: Mark the "sclpquiesce" device with user_creatable = false, Cornelia Huck, 2017/10/06
- Re: [Qemu-devel] [PULL 00/33] next batch of s390x patches, Peter Maydell, 2017/10/06