[Xen-changelog] [xen-unstable] xenpaging: add error code to indicate iommem passthrough

[Xen patchbot-unstable <patchbot@xxxxxxx>]

# HG changeset patch
# User Olaf Hering <olaf@xxxxxxxxx>
# Date 1333120147 -7200
# Node ID 4d4c0e57bd83ebf28cff7c3a0fee75a488762753
# Parent  83d3b4e2eb16c7b718f970ffacf62bf8755c6623
xenpaging: add error code to indicate iommem passthrough

Similar to the existing ENODEV and EXDEV error codes, add EMDEV to
indicate that iommu passthrough is not compatible with paging.
All error codes are just made-up return codes to give proper error
messages in the pager.

Also update the HAP related error message now that paging is enabled
also on AMD hosts.

Signed-off-by: Olaf Hering <olaf@xxxxxxxxx>
Acked-by: Ian Jackson <Ian.Jackson@xxxxxxxxxx>
Acked-by: Tim Deegan <tim@xxxxxxx>
Committed-by: Tim Deegan <tim@xxxxxxx>
---


diff -r 83d3b4e2eb16 -r 4d4c0e57bd83 tools/xenpaging/xenpaging.c
--- a/tools/xenpaging/xenpaging.c       Wed Feb 22 17:37:50 2012 +0100
+++ b/tools/xenpaging/xenpaging.c       Fri Mar 30 17:09:07 2012 +0200
@@ -378,7 +378,10 @@ static struct xenpaging *xenpaging_init(
                 ERROR("xenpaging is (or was) active on this domain");
                 break;
             case ENODEV:
-                ERROR("EPT not supported for this guest");
+                ERROR("xenpaging requires Hardware Assisted Paging");
+                break;
+            case EMLINK:
+                ERROR("xenpaging not supported while iommu passthrough is 
enabled");
                 break;
             case EXDEV:
                 ERROR("xenpaging not supported in a PoD guest");
diff -r 83d3b4e2eb16 -r 4d4c0e57bd83 xen/arch/x86/mm/mem_event.c
--- a/xen/arch/x86/mm/mem_event.c       Wed Feb 22 17:37:50 2012 +0100
+++ b/xen/arch/x86/mm/mem_event.c       Fri Mar 30 17:09:07 2012 +0200
@@ -564,10 +564,11 @@ int mem_event_domctl(struct domain *d, x
                 break;
 
             /* No paging if iommu is used */
-            rc = -EXDEV;
+            rc = -EMLINK;
             if ( unlikely(need_iommu(d)) )
                 break;
 
+            rc = -EXDEV;
             /* Disallow paging in a PoD guest */
             if ( p2m->pod.entry_count )
                 break;

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog