|
 |
9bac43 |
From 5fb5d8c2e07d86138ca30bc27b5e454a6a05329b Mon Sep 17 00:00:00 2001
|
|
|
9bac43 |
From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
|
|
|
9bac43 |
Date: Thu, 2 Nov 2017 15:36:57 +0100
|
|
|
9bac43 |
Subject: [PATCH 4/9] snapshot/tests: Try loadvm twice
|
|
|
9bac43 |
|
|
|
9bac43 |
RH-Author: Dr. David Alan Gilbert <dgilbert@redhat.com>
|
|
|
9bac43 |
Message-id: <20171102153657.13452-3-dgilbert@redhat.com>
|
|
|
9bac43 |
Patchwork-id: 77483
|
|
|
9bac43 |
O-Subject: [RHEL-7.5 qemu-kvm-rhev PATCH 2/2] snapshot/tests: Try loadvm twice
|
|
|
9bac43 |
Bugzilla: 1508799
|
|
|
9bac43 |
RH-Acked-by: Peter Xu <peterx@redhat.com>
|
|
|
9bac43 |
RH-Acked-by: Thomas Huth <thuth@redhat.com>
|
|
|
9bac43 |
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
|
9bac43 |
|
|
|
9bac43 |
From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
|
|
|
9bac43 |
|
|
|
9bac43 |
It's legal to loadvm twice, modify the existing save/loadvm test
|
|
|
9bac43 |
to do it twice.
|
|
|
9bac43 |
|
|
|
9bac43 |
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
|
|
|
9bac43 |
Message-Id: <20170825141940.20740-3-dgilbert@redhat.com>
|
|
|
9bac43 |
Reviewed-by: Peter Xu <peterx@redhat.com>
|
|
|
9bac43 |
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
|
|
|
9bac43 |
(cherry picked from commit 04583a9e8fbeb2c5c0607327b853b306aef7465f)
|
|
|
9bac43 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
9bac43 |
---
|
|
|
9bac43 |
tests/qemu-iotests/068 | 2 +-
|
|
|
9bac43 |
tests/qemu-iotests/068.out | 4 ++++
|
|
|
9bac43 |
2 files changed, 5 insertions(+), 1 deletion(-)
|
|
|
9bac43 |
|
|
|
9bac43 |
diff --git a/tests/qemu-iotests/068 b/tests/qemu-iotests/068
|
|
|
9bac43 |
index cfa0f2a..e7fca6a 100755
|
|
|
9bac43 |
--- a/tests/qemu-iotests/068
|
|
|
9bac43 |
+++ b/tests/qemu-iotests/068
|
|
|
9bac43 |
@@ -78,7 +78,7 @@ for extra_args in \
|
|
|
9bac43 |
# Give qemu some time to boot before saving the VM state
|
|
|
9bac43 |
{ sleep 1; printf "savevm 0\nquit\n"; } | _qemu $extra_args
|
|
|
9bac43 |
# Now try to continue from that VM state (this should just work)
|
|
|
9bac43 |
- echo quit | _qemu $extra_args -loadvm 0
|
|
|
9bac43 |
+ { sleep 1; printf "loadvm 0\nloadvm 0\nquit\n"; } | _qemu $extra_args -S
|
|
|
9bac43 |
done
|
|
|
9bac43 |
|
|
|
9bac43 |
# success, all done
|
|
|
9bac43 |
diff --git a/tests/qemu-iotests/068.out b/tests/qemu-iotests/068.out
|
|
|
9bac43 |
index aa063cf..f07a938 100644
|
|
|
9bac43 |
--- a/tests/qemu-iotests/068.out
|
|
|
9bac43 |
+++ b/tests/qemu-iotests/068.out
|
|
|
9bac43 |
@@ -7,6 +7,8 @@ QEMU X.Y.Z monitor - type 'help' for more information
|
|
|
9bac43 |
(qemu) savevm 0
|
|
|
9bac43 |
(qemu) quit
|
|
|
9bac43 |
QEMU X.Y.Z monitor - type 'help' for more information
|
|
|
9bac43 |
+(qemu) loadvm 0
|
|
|
9bac43 |
+(qemu) loadvm 0
|
|
|
9bac43 |
(qemu) quit
|
|
|
9bac43 |
|
|
|
9bac43 |
=== Saving and reloading a VM state to/from a qcow2 image (-object iothread,id=iothread0 -set device.hba0.iothread=iothread0) ===
|
|
|
9bac43 |
@@ -16,5 +18,7 @@ QEMU X.Y.Z monitor - type 'help' for more information
|
|
|
9bac43 |
(qemu) savevm 0
|
|
|
9bac43 |
(qemu) quit
|
|
|
9bac43 |
QEMU X.Y.Z monitor - type 'help' for more information
|
|
|
9bac43 |
+(qemu) loadvm 0
|
|
|
9bac43 |
+(qemu) loadvm 0
|
|
|
9bac43 |
(qemu) quit
|
|
|
9bac43 |
*** done
|
|
|
9bac43 |
--
|
|
|
9bac43 |
1.8.3.1
|
|
|
9bac43 |
|