[Xen-devel] [PATCH 2/4] tools/libxc: Use an explicit check for PV MSRs in xc_domain_save()

[Andrew Cooper <andrew.cooper3@xxxxxxxxxx>]

Migrating PV domains using MSRs is not supported.  This uses the new
XEN_DOMCTL_get_vcpu_msrs and will fail the migration with an explicit error.

This is an improvement upon the current failure of
  "No extended context for VCPUxx (ENOBUFS)"

Support for migrating PV domains which are using MSRs will be included in the
migration v2 work.

Signed-off-by: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
CC: Jan Beulich <JBeulich@xxxxxxxx>
CC: Ian Campbell <Ian.Campbell@xxxxxxxxxx>
CC: Ian Jackson <Ian.Jackson@xxxxxxxxxxxxx>
---
 tools/libxc/xc_domain_save.c |   38 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/tools/libxc/xc_domain_save.c b/tools/libxc/xc_domain_save.c
index acf3685..7ef5183 100644
--- a/tools/libxc/xc_domain_save.c
+++ b/tools/libxc/xc_domain_save.c
@@ -1995,6 +1995,44 @@ int xc_domain_save(xc_interface *xch, int io_fd, 
uint32_t dom, uint32_t max_iter
             goto out;
         }
 
+        /* Check there are no PV MSRs in use. */
+        domctl.cmd = XEN_DOMCTL_get_vcpu_msrs;
+        domctl.domain = dom;
+        memset(&domctl.u, 0, sizeof(domctl.u));
+        domctl.u.vcpu_msrs.vcpu = i;
+        if ( xc_domctl(xch, &domctl) < 0 )
+        {
+            PERROR("Error querying maximum number of MSRs for VCPU%d", i);
+            goto out;
+        }
+
+        if ( domctl.u.vcpu_msrs.msr_count )
+        {
+            buffer = xc_hypercall_buffer_alloc(xch, buffer,
+                                               domctl.u.vcpu_msrs.msr_count *
+                                               sizeof(xen_domctl_vcpu_msr_t));
+            if ( !buffer )
+            {
+                PERROR("Insufficient memory for getting MSRs for VCPU%d", i);
+                goto out;
+            }
+            set_xen_guest_handle(domctl.u.vcpu_msrs.msrs, buffer);
+
+            if ( xc_domctl(xch, &domctl) < 0 )
+            {
+                PERROR("Error querying MSRs for VCPU%d", i);
+                goto out;
+            }
+
+            xc_hypercall_buffer_free(xch, buffer);
+            if ( domctl.u.vcpu_msrs.msr_count )
+            {
+                errno = EOPNOTSUPP;
+                PERROR("Unable to migrate PV guest using MSRs (yet)");
+                goto out;
+            }
+        }
+
         /* Start to fetch CPU eXtended States */
         /* Get buffer size first */
         domctl.cmd = XEN_DOMCTL_getvcpuextstate;
-- 
1.7.10.4


_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel