docs: tweak virsh restore warning

* tools/virsh.pod: Fix grammar, and clarify wording.
* src/qemu/qemu_driver.c (qemudDomainObjStart): Drop redundant
condition.

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 6a0bf2422bb9a5698c365ccc3c4a4ba712c09d68..a4b56a72659efd28803d68735fbff9e1529dc29f 100644 (file)
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -3435,7 +3435,7 @@ static int qemudDomainObjStart(virConnectPtr conn,
     if (!managed_save)
         goto cleanup;
 
-    if ((managed_save) && (virFileExists(managed_save))) {
+    if (virFileExists(managed_save)) {
         ret = qemuDomainObjRestore(conn, driver, vm, managed_save);
 
         if ((ret == 0) && (unlink(managed_save) < 0))

diff --git a/tools/virsh.pod b/tools/virsh.pod
index 580e1dcb96b01c34531d81906f06ac60694444d8..16c37ff894fb9dc7596ade89589cd8949b78d05c 100644 (file)
--- a/tools/virsh.pod
+++ b/tools/virsh.pod
@@ -546,11 +546,12 @@ I<on_reboot> parameter in the domain's XML definition.
 
 =item B<restore> I<state-file>
 
-Restores a domain from an B<virsh save> state file. See I<save> for more info.
+Restores a domain from a B<virsh save> state file. See I<save> for more info.
 
 B<Note>: To avoid corrupting file system contents within the domain, you
-should not reuse the saved state file to B<restore> unless you are convinced
-with reverting the domain to the previous state.
+should not reuse the saved state file for a second B<restore> unless you
+have also reverted all storage volumes back to the same contents as when
+the state file was created.
 
 =item B<save> I<domain-id> I<state-file>