[Pkg-libvirt-commits] [libguestfs] 02/35: v2v: Prevent conversion of "blocked" and "paused" domains also.

[Hilko Bengen]

This is an automated email from the git hooks/post-receive script.

bengen pushed a commit to annotated tag debian/1%1.27.49-1
in repository libguestfs.

commit 8856fadadb4f10b89f13068d01d40643e31c488d
Author: Richard W.M. Jones <rjones at redhat.com>
Date:   Tue Sep 16 08:36:38 2014 +0100

    v2v: Prevent conversion of "blocked" and "paused" domains also.
    
    Previously only "running" domains were blocked from conversion.
    However "blocked" is essentially the same as running (on Xen it just
    means the domain is running but waiting on an I/O resource).  And
    "paused" domains probably shouldn't be converted either since their
    disks are only crash-consistent.
---
 v2v/domainxml-c.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/v2v/domainxml-c.c b/v2v/domainxml-c.c
index 96ae42b..8a55030 100644
--- a/v2v/domainxml-c.c
+++ b/v2v/domainxml-c.c
@@ -138,9 +138,11 @@ v2v_dumpxml (value connv, value domnamev)
   if (!is_test_uri) {
     int state = get_dom_state (dom);
 
-    if (state == VIR_DOMAIN_RUNNING) {
+    if (state == VIR_DOMAIN_RUNNING ||
+        state == VIR_DOMAIN_BLOCKED ||
+        state == VIR_DOMAIN_PAUSED) {
       snprintf (errmsg, sizeof errmsg,
-                _("libvirt domain '%s' is running, it must be shut down in order to perform virt-v2v conversion"),
+                _("libvirt domain '%s' is running or paused.  It must be shut down in order to perform virt-v2v conversion"),
                 domname);
       virDomainFree (dom);
       virConnectClose (conn);

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-libvirt/libguestfs.git