# HG changeset patch
# User stekloff@xxxxxxxxxxxxxxxxxxxxxxxxxx
# Node ID bf1bbc673d58465ca7ce38b63aff0d114e328446
# Parent  82f1b5364f94a057057ab4bd1953735afa3d237b

Adding SKIP() to tests that aren't supported for VMX domains.

Signed-off-by: Dan Stekloff <dsteklof@xxxxxxxxxx>

diff -r 82f1b5364f94 -r bf1bbc673d58 tools/xm-test/tests/block-create/01_block_attach_device_pos.py
--- a/tools/xm-test/tests/block-create/01_block_attach_device_pos.py	Tue Dec 13 16:01:09 2005
+++ b/tools/xm-test/tests/block-create/01_block_attach_device_pos.py	Tue Dec 13 17:53:36 2005
@@ -9,6 +9,8 @@
 
 from XmTestLib import *
 
+if ENABLE_VMX_SUPPORT:
+    SKIP("Block-attach not supported for VMX domains")
 
 # Create a domain (default XmTestDomain, with our ramdisk)
 domain = XmTestDomain()
diff -r 82f1b5364f94 -r bf1bbc673d58 tools/xm-test/tests/block-create/02_block_attach_file_device_pos.py
--- a/tools/xm-test/tests/block-create/02_block_attach_file_device_pos.py	Tue Dec 13 16:01:09 2005
+++ b/tools/xm-test/tests/block-create/02_block_attach_file_device_pos.py	Tue Dec 13 17:53:36 2005
@@ -9,6 +9,8 @@
 
 from XmTestLib import *
 
+if ENABLE_VMX_SUPPORT:
+    SKIP("Block-attach not supported for VMX domains")
 
 # Create a domain (default XmTestDomain, with our ramdisk)
 domain = XmTestDomain()
diff -r 82f1b5364f94 -r bf1bbc673d58 tools/xm-test/tests/block-create/04_block_attach_device_repeatedly_pos.py
--- a/tools/xm-test/tests/block-create/04_block_attach_device_repeatedly_pos.py	Tue Dec 13 16:01:09 2005
+++ b/tools/xm-test/tests/block-create/04_block_attach_device_repeatedly_pos.py	Tue Dec 13 17:53:36 2005
@@ -9,6 +9,8 @@
 
 from XmTestLib import *
 
+if ENABLE_VMX_SUPPORT:
+    SKIP("Block-attach not supported for VMX domains")
 
 # Create a domain (default XmTestDomain, with our ramdisk)
 domain = XmTestDomain()
diff -r 82f1b5364f94 -r bf1bbc673d58 tools/xm-test/tests/block-create/05_block_attach_and_dettach_device_repeatedly_pos.py
--- a/tools/xm-test/tests/block-create/05_block_attach_and_dettach_device_repeatedly_pos.py	Tue Dec 13 16:01:09 2005
+++ b/tools/xm-test/tests/block-create/05_block_attach_and_dettach_device_repeatedly_pos.py	Tue Dec 13 17:53:36 2005
@@ -9,6 +9,8 @@
 
 from XmTestLib import *
 
+if ENABLE_VMX_SUPPORT:
+    SKIP("Block-attach not supported for VMX domains")
 
 # Create a domain (default XmTestDomain, with our ramdisk)
 domain = XmTestDomain()
diff -r 82f1b5364f94 -r bf1bbc673d58 tools/xm-test/tests/block-create/06_block_attach_baddomain_neg.py
--- a/tools/xm-test/tests/block-create/06_block_attach_baddomain_neg.py	Tue Dec 13 16:01:09 2005
+++ b/tools/xm-test/tests/block-create/06_block_attach_baddomain_neg.py	Tue Dec 13 17:53:36 2005
@@ -4,6 +4,9 @@
 # Author: Murillo F. Bernardes <mfb@xxxxxxxxxx>
 
 from XmTestLib import *
+
+if ENABLE_VMX_SUPPORT:
+    SKIP("Block-attach not supported for VMX domains")
 
 status, output = traceCommand("xm block-attach NOT-EXIST phy:ram1 sdb1 w")
 
diff -r 82f1b5364f94 -r bf1bbc673d58 tools/xm-test/tests/block-create/07_block_attach_baddevice_neg.py
--- a/tools/xm-test/tests/block-create/07_block_attach_baddevice_neg.py	Tue Dec 13 16:01:09 2005
+++ b/tools/xm-test/tests/block-create/07_block_attach_baddevice_neg.py	Tue Dec 13 17:53:36 2005
@@ -9,6 +9,8 @@
 
 from XmTestLib import *
 
+if ENABLE_VMX_SUPPORT:
+    SKIP("Block-attach not supported for VMX domains")
 
 # Create a domain (default XmTestDomain, with our ramdisk)
 domain = XmTestDomain()
diff -r 82f1b5364f94 -r bf1bbc673d58 tools/xm-test/tests/block-create/08_block_attach_bad_filedevice_neg.py
--- a/tools/xm-test/tests/block-create/08_block_attach_bad_filedevice_neg.py	Tue Dec 13 16:01:09 2005
+++ b/tools/xm-test/tests/block-create/08_block_attach_bad_filedevice_neg.py	Tue Dec 13 17:53:36 2005
@@ -9,6 +9,8 @@
 
 from XmTestLib import *
 
+if ENABLE_VMX_SUPPORT:
+    SKIP("Block-attach not supported for VMX domains")
 
 # Create a domain (default XmTestDomain, with our ramdisk)
 domain = XmTestDomain()
diff -r 82f1b5364f94 -r bf1bbc673d58 tools/xm-test/tests/block-create/09_block_attach_and_dettach_device_check_data_pos.py
--- a/tools/xm-test/tests/block-create/09_block_attach_and_dettach_device_check_data_pos.py	Tue Dec 13 16:01:09 2005
+++ b/tools/xm-test/tests/block-create/09_block_attach_and_dettach_device_check_data_pos.py	Tue Dec 13 17:53:36 2005
@@ -9,6 +9,8 @@
 
 from XmTestLib import *
 
+if ENABLE_VMX_SUPPORT:
+    SKIP("Block-attach not supported for VMX domains")
 
 # Create a domain (default XmTestDomain, with our ramdisk)
 domain = XmTestDomain()
diff -r 82f1b5364f94 -r bf1bbc673d58 tools/xm-test/tests/block-create/10_block_attach_dettach_multiple_devices.py
--- a/tools/xm-test/tests/block-create/10_block_attach_dettach_multiple_devices.py	Tue Dec 13 16:01:09 2005
+++ b/tools/xm-test/tests/block-create/10_block_attach_dettach_multiple_devices.py	Tue Dec 13 17:53:36 2005
@@ -46,6 +46,9 @@
 
     return 0, None
 	
+if ENABLE_VMX_SUPPORT:
+    SKIP("Block-attach not supported for VMX domains")
+
 # Create a domain (default XmTestDomain, with our ramdisk)
 domain = XmTestDomain()
 
diff -r 82f1b5364f94 -r bf1bbc673d58 tools/xm-test/tests/block-create/11_block_attach_shared_dom0.py
--- a/tools/xm-test/tests/block-create/11_block_attach_shared_dom0.py	Tue Dec 13 16:01:09 2005
+++ b/tools/xm-test/tests/block-create/11_block_attach_shared_dom0.py	Tue Dec 13 17:53:36 2005
@@ -4,6 +4,9 @@
 # Author: Dan Smith <danms@xxxxxxxxxx>
 
 from XmTestLib import *
+
+if ENABLE_VMX_SUPPORT:
+    SKIP("Block-attach not supported for VMX domains")
 
 # Mount /dev/ram0
 
diff -r 82f1b5364f94 -r bf1bbc673d58 tools/xm-test/tests/block-create/12_block_attach_shared_domU.py
--- a/tools/xm-test/tests/block-create/12_block_attach_shared_domU.py	Tue Dec 13 16:01:09 2005
+++ b/tools/xm-test/tests/block-create/12_block_attach_shared_domU.py	Tue Dec 13 17:53:36 2005
@@ -4,6 +4,9 @@
 # Author: Dan Smith <danms@xxxxxxxxxx>
 
 from XmTestLib import *
+
+if ENABLE_VMX_SUPPORT:
+    SKIP("Block-attach not supported for VMX domains")
 
 dom1 = XmTestDomain()
 dom2 = XmTestDomain(dom1.getName() + "-2")
diff -r 82f1b5364f94 -r bf1bbc673d58 tools/xm-test/tests/block-destroy/01_block-destroy_btblock_pos.py
--- a/tools/xm-test/tests/block-destroy/01_block-destroy_btblock_pos.py	Tue Dec 13 16:01:09 2005
+++ b/tools/xm-test/tests/block-destroy/01_block-destroy_btblock_pos.py	Tue Dec 13 17:53:36 2005
@@ -4,6 +4,9 @@
 # Author: Dan Smith <danms@xxxxxxxxxx>
 
 from XmTestLib import *
+
+if ENABLE_VMX_SUPPORT:
+    SKIP("Block-detach not supported for VMX domains")
 
 domain = XmTestDomain()
 
diff -r 82f1b5364f94 -r bf1bbc673d58 tools/xm-test/tests/block-destroy/02_block-destroy_rtblock_pos.py
--- a/tools/xm-test/tests/block-destroy/02_block-destroy_rtblock_pos.py	Tue Dec 13 16:01:09 2005
+++ b/tools/xm-test/tests/block-destroy/02_block-destroy_rtblock_pos.py	Tue Dec 13 17:53:36 2005
@@ -4,6 +4,9 @@
 # Author: Dan Smith <danms@xxxxxxxxxx>
 
 from XmTestLib import *
+
+if ENABLE_VMX_SUPPORT:
+    SKIP("Block-detach not supported for VMX domains")
 
 domain = XmTestDomain()
 
diff -r 82f1b5364f94 -r bf1bbc673d58 tools/xm-test/tests/block-destroy/04_block-destroy_nonattached_neg.py
--- a/tools/xm-test/tests/block-destroy/04_block-destroy_nonattached_neg.py	Tue Dec 13 16:01:09 2005
+++ b/tools/xm-test/tests/block-destroy/04_block-destroy_nonattached_neg.py	Tue Dec 13 17:53:36 2005
@@ -6,6 +6,9 @@
 #Negative Test: attempt removal of non-attached device from live domain
 
 from XmTestLib import *
+
+if ENABLE_VMX_SUPPORT:
+    SKIP("Block-detach not supported for VMX domains")
 
 domain = XmTestDomain()
                                                                                                        
diff -r 82f1b5364f94 -r bf1bbc673d58 tools/xm-test/tests/block-destroy/05_block-destroy_byname_pos.py
--- a/tools/xm-test/tests/block-destroy/05_block-destroy_byname_pos.py	Tue Dec 13 16:01:09 2005
+++ b/tools/xm-test/tests/block-destroy/05_block-destroy_byname_pos.py	Tue Dec 13 17:53:36 2005
@@ -4,6 +4,9 @@
 # Author: Dan Smith <danms@xxxxxxxxxx>
 
 from XmTestLib import *
+
+if ENABLE_VMX_SUPPORT:
+    SKIP("Block-detach not supported for VMX domains")
 
 domain = XmTestDomain()
 
diff -r 82f1b5364f94 -r bf1bbc673d58 tools/xm-test/tests/block-destroy/06_block-destroy_check_list_pos.py
--- a/tools/xm-test/tests/block-destroy/06_block-destroy_check_list_pos.py	Tue Dec 13 16:01:09 2005
+++ b/tools/xm-test/tests/block-destroy/06_block-destroy_check_list_pos.py	Tue Dec 13 17:53:36 2005
@@ -25,6 +25,9 @@
         return True
     else:
         return False
+
+if ENABLE_VMX_SUPPORT:
+    SKIP("Block-detach not supported for VMX domains")
 
 domain = XmTestDomain()
 
diff -r 82f1b5364f94 -r bf1bbc673d58 tools/xm-test/tests/block-list/01_block-list_pos.py
--- a/tools/xm-test/tests/block-list/01_block-list_pos.py	Tue Dec 13 16:01:09 2005
+++ b/tools/xm-test/tests/block-list/01_block-list_pos.py	Tue Dec 13 17:53:36 2005
@@ -7,6 +7,9 @@
 
 
 from XmTestLib import *
+
+if ENABLE_VMX_SUPPORT:
+    SKIP("Block-list not supported for VMX domains")
 
 domain = XmTestDomain()
 
diff -r 82f1b5364f94 -r bf1bbc673d58 tools/xm-test/tests/block-list/02_block-list_attachbd_pos.py
--- a/tools/xm-test/tests/block-list/02_block-list_attachbd_pos.py	Tue Dec 13 16:01:09 2005
+++ b/tools/xm-test/tests/block-list/02_block-list_attachbd_pos.py	Tue Dec 13 17:53:36 2005
@@ -7,6 +7,9 @@
 
 
 from XmTestLib import *
+
+if ENABLE_VMX_SUPPORT:
+    SKIP("Block-list not supported for VMX domains")
 
 domain = XmTestDomain()
                                                                                               
diff -r 82f1b5364f94 -r bf1bbc673d58 tools/xm-test/tests/block-list/03_block-list_anotherbd_pos.py
--- a/tools/xm-test/tests/block-list/03_block-list_anotherbd_pos.py	Tue Dec 13 16:01:09 2005
+++ b/tools/xm-test/tests/block-list/03_block-list_anotherbd_pos.py	Tue Dec 13 17:53:36 2005
@@ -7,6 +7,9 @@
 
 
 from XmTestLib import *
+
+if ENABLE_VMX_SUPPORT:
+    SKIP("Block-list not supported for VMX domains")
 
 domain = XmTestDomain()
 
diff -r 82f1b5364f94 -r bf1bbc673d58 tools/xm-test/tests/block-list/04_block-list_nodb_pos.py
--- a/tools/xm-test/tests/block-list/04_block-list_nodb_pos.py	Tue Dec 13 16:01:09 2005
+++ b/tools/xm-test/tests/block-list/04_block-list_nodb_pos.py	Tue Dec 13 17:53:36 2005
@@ -7,6 +7,9 @@
 
 
 from XmTestLib import *
+
+if ENABLE_VMX_SUPPORT:
+    SKIP("Block-list not supported for VMX domains")
 
 domain = XmTestDomain()
 
@@ -21,8 +24,5 @@
 if status != 0:
     FAIL("xm block-list returned bad status, expected 0, status is %i" % status)
 
-if ENABLE_VMX_SUPPORT:
-    SKIP("Using block device for root, so this case does not apply")
-
 if output != "":
     FAIL("xm block-list should not list anything for domain with no block devices")
diff -r 82f1b5364f94 -r bf1bbc673d58 tools/xm-test/tests/block-list/06_block-list_checkremove_pos.py
--- a/tools/xm-test/tests/block-list/06_block-list_checkremove_pos.py	Tue Dec 13 16:01:09 2005
+++ b/tools/xm-test/tests/block-list/06_block-list_checkremove_pos.py	Tue Dec 13 17:53:36 2005
@@ -4,6 +4,9 @@
 # Author: Dan Smith <danms@xxxxxxxxxx>
 
 from XmTestLib import *
+
+if ENABLE_VMX_SUPPORT:
+    SKIP("Block-list not supported for VMX domains")
 
 domain = XmTestDomain()
 
diff -r 82f1b5364f94 -r bf1bbc673d58 tools/xm-test/tests/memmax/01_memmax_badparm_neg.py
--- a/tools/xm-test/tests/memmax/01_memmax_badparm_neg.py	Tue Dec 13 16:01:09 2005
+++ b/tools/xm-test/tests/memmax/01_memmax_badparm_neg.py	Tue Dec 13 17:53:36 2005
@@ -8,6 +8,8 @@
 
 from XmTestLib import *
 
+if ENABLE_VMX_SUPPORT:
+    SKIP("Mem-max not supported for VMX domains")
 
 status, output = traceCommand("xm mem-max")
 eyecatcher = "Error:"
diff -r 82f1b5364f94 -r bf1bbc673d58 tools/xm-test/tests/memset/01_memset_basic_pos.py
--- a/tools/xm-test/tests/memset/01_memset_basic_pos.py	Tue Dec 13 16:01:09 2005
+++ b/tools/xm-test/tests/memset/01_memset_basic_pos.py	Tue Dec 13 17:53:36 2005
@@ -19,6 +19,9 @@
 import re 
 import time 
 from XmTestLib import * 
+
+if ENABLE_VMX_SUPPORT:
+    SKIP("Mem-set not supported for VMX domains")
 
 # Create a domain (default XmTestDomain, with our ramdisk)
 domain = XmTestDomain() 
diff -r 82f1b5364f94 -r bf1bbc673d58 tools/xm-test/tests/memset/02_memset_badparm_neg.py
--- a/tools/xm-test/tests/memset/02_memset_badparm_neg.py	Tue Dec 13 16:01:09 2005
+++ b/tools/xm-test/tests/memset/02_memset_badparm_neg.py	Tue Dec 13 17:53:36 2005
@@ -17,6 +17,9 @@
 import re 
 
 from XmTestLib import * 
+
+if ENABLE_VMX_SUPPORT:
+    SKIP("Mem-set not supported for VMX domains")
 
 # destroy no parm input - negative test
 status, output = traceCommand("xm mem-set")
diff -r 82f1b5364f94 -r bf1bbc673d58 tools/xm-test/tests/memset/03_memset_random_pos.py
--- a/tools/xm-test/tests/memset/03_memset_random_pos.py	Tue Dec 13 16:01:09 2005
+++ b/tools/xm-test/tests/memset/03_memset_random_pos.py	Tue Dec 13 17:53:36 2005
@@ -8,6 +8,8 @@
 
 from XmTestLib import *
 
+if ENABLE_VMX_SUPPORT:
+    SKIP("Mem-set not supported for VMX domains")
 
 domain = XmTestDomain()
 
diff -r 82f1b5364f94 -r bf1bbc673d58 tools/xm-test/tests/memset/04_memset_smallmem_pos.py
--- a/tools/xm-test/tests/memset/04_memset_smallmem_pos.py	Tue Dec 13 16:01:09 2005
+++ b/tools/xm-test/tests/memset/04_memset_smallmem_pos.py	Tue Dec 13 17:53:36 2005
@@ -4,6 +4,9 @@
 # Author: Dan Smith <danms@xxxxxxxxxx>
 
 from XmTestLib import *
+
+if ENABLE_VMX_SUPPORT:
+    SKIP("Mem-set not supported for VMX domains")
 
 domain = XmTestDomain()
 
diff -r 82f1b5364f94 -r bf1bbc673d58 tools/xm-test/tests/migrate/01_migrate_localhost_pos.py
--- a/tools/xm-test/tests/migrate/01_migrate_localhost_pos.py	Tue Dec 13 16:01:09 2005
+++ b/tools/xm-test/tests/migrate/01_migrate_localhost_pos.py	Tue Dec 13 17:53:36 2005
@@ -16,6 +16,9 @@
 import commands
 
 from XmTestLib import *
+
+if ENABLE_VMX_SUPPORT:
+    SKIP("Migrate currently not supported for VMX domains")
 
 # Create a domain (default XmTestDomain, with our ramdisk)
 domain = XmTestDomain()
diff -r 82f1b5364f94 -r bf1bbc673d58 tools/xm-test/tests/network-attach/01_network_attach_pos.py
--- a/tools/xm-test/tests/network-attach/01_network_attach_pos.py	Tue Dec 13 16:01:09 2005
+++ b/tools/xm-test/tests/network-attach/01_network_attach_pos.py	Tue Dec 13 17:53:36 2005
@@ -7,6 +7,9 @@
 
 from XmTestLib import *
 from network_utils import *
+
+if ENABLE_VMX_SUPPORT:
+    SKIP("Network-attach not supported for VMX domains")
 
 # Create a domain (default XmTestDomain, with our ramdisk)
 domain = XmTestDomain()
diff -r 82f1b5364f94 -r bf1bbc673d58 tools/xm-test/tests/network-attach/02_network_attach_detach_pos.py
--- a/tools/xm-test/tests/network-attach/02_network_attach_detach_pos.py	Tue Dec 13 16:01:09 2005
+++ b/tools/xm-test/tests/network-attach/02_network_attach_detach_pos.py	Tue Dec 13 17:53:36 2005
@@ -9,6 +9,9 @@
 
 from XmTestLib import *
 from network_utils import *
+
+if ENABLE_VMX_SUPPORT:
+    SKIP("Network-attach not supported for VMX domains")
 
 # Create a domain (default XmTestDomain, with our ramdisk)
 domain = XmTestDomain()
diff -r 82f1b5364f94 -r bf1bbc673d58 tools/xm-test/tests/network-attach/03_network_attach_detach_multiple_pos.py
--- a/tools/xm-test/tests/network-attach/03_network_attach_detach_multiple_pos.py	Tue Dec 13 16:01:09 2005
+++ b/tools/xm-test/tests/network-attach/03_network_attach_detach_multiple_pos.py	Tue Dec 13 17:53:36 2005
@@ -9,6 +9,9 @@
 
 from XmTestLib import *
 from network_utils import *
+
+if ENABLE_VMX_SUPPORT:
+    SKIP("Network-attach not supported for VMX domains")
 
 # Create a domain (default XmTestDomain, with our ramdisk)
 domain = XmTestDomain()
diff -r 82f1b5364f94 -r bf1bbc673d58 tools/xm-test/tests/restore/01_restore_basic_pos.py
--- a/tools/xm-test/tests/restore/01_restore_basic_pos.py	Tue Dec 13 16:01:09 2005
+++ b/tools/xm-test/tests/restore/01_restore_basic_pos.py	Tue Dec 13 17:53:36 2005
@@ -11,6 +11,9 @@
 import time
 
 from XmTestLib import *
+
+if ENABLE_VMX_SUPPORT:
+    SKIP("Restore currently not supported for VMX domains")
 
 domain = XmTestDomain()
 
diff -r 82f1b5364f94 -r bf1bbc673d58 tools/xm-test/tests/restore/02_restore_badparm_neg.py
--- a/tools/xm-test/tests/restore/02_restore_badparm_neg.py	Tue Dec 13 16:01:09 2005
+++ b/tools/xm-test/tests/restore/02_restore_badparm_neg.py	Tue Dec 13 17:53:36 2005
@@ -12,6 +12,9 @@
 
 from XmTestLib import *
 
+if ENABLE_VMX_SUPPORT:
+    SKIP("Restore currently not supported for VMX domains")
+
 status, output = traceCommand("xm restore -x")
 eyecatcher1 = "Error:"
 eyecatcher2 = "Traceback"
diff -r 82f1b5364f94 -r bf1bbc673d58 tools/xm-test/tests/restore/03_restore_badfilename_neg.py
--- a/tools/xm-test/tests/restore/03_restore_badfilename_neg.py	Tue Dec 13 16:01:09 2005
+++ b/tools/xm-test/tests/restore/03_restore_badfilename_neg.py	Tue Dec 13 17:53:36 2005
@@ -12,6 +12,9 @@
 
 from XmTestLib import *
 
+if ENABLE_VMX_SUPPORT:
+    SKIP("Restore currently not supported for VMX domains")
+
 status, output = traceCommand("xm restore /tmp/NON_EXIST")
 eyecatcher1 = "Error:"
 eyecatcher2 = "Traceback"
diff -r 82f1b5364f94 -r bf1bbc673d58 tools/xm-test/tests/restore/04_restore_withdevices_pos.py
--- a/tools/xm-test/tests/restore/04_restore_withdevices_pos.py	Tue Dec 13 16:01:09 2005
+++ b/tools/xm-test/tests/restore/04_restore_withdevices_pos.py	Tue Dec 13 17:53:36 2005
@@ -6,6 +6,9 @@
 from XmTestLib import *
 
 import re
+
+if ENABLE_VMX_SUPPORT:
+    SKIP("Restore currently not supported for VMX domains")
 
 domain = XmTestDomain()
 
diff -r 82f1b5364f94 -r bf1bbc673d58 tools/xm-test/tests/save/01_save_basic_pos.py
--- a/tools/xm-test/tests/save/01_save_basic_pos.py	Tue Dec 13 16:01:09 2005
+++ b/tools/xm-test/tests/save/01_save_basic_pos.py	Tue Dec 13 17:53:36 2005
@@ -6,6 +6,9 @@
 import time
 
 from XmTestLib import *
+
+if ENABLE_VMX_SUPPORT:
+    SKIP("Save currently not supported for VMX domains")
 
 domain = XmTestDomain()
 
diff -r 82f1b5364f94 -r bf1bbc673d58 tools/xm-test/tests/save/02_save_badparm_neg.py
--- a/tools/xm-test/tests/save/02_save_badparm_neg.py	Tue Dec 13 16:01:09 2005
+++ b/tools/xm-test/tests/save/02_save_badparm_neg.py	Tue Dec 13 17:53:36 2005
@@ -12,6 +12,9 @@
 
 from XmTestLib import *
 
+if ENABLE_VMX_SUPPORT:
+    SKIP("Save currently not supported for VMX domains")
+
 status, output = traceCommand("xm save -x")
 eyecatcher1 = "Error:"
 eyecatcher2 = "Traceback"
diff -r 82f1b5364f94 -r bf1bbc673d58 tools/xm-test/tests/save/03_save_bogusfile_neg.py
--- a/tools/xm-test/tests/save/03_save_bogusfile_neg.py	Tue Dec 13 16:01:09 2005
+++ b/tools/xm-test/tests/save/03_save_bogusfile_neg.py	Tue Dec 13 17:53:36 2005
@@ -9,6 +9,9 @@
 import time
 
 from XmTestLib import *
+
+if ENABLE_VMX_SUPPORT:
+    SKIP("Save currently not supported for VMX domains")
 
 domain = XmTestDomain()
 
diff -r 82f1b5364f94 -r bf1bbc673d58 tools/xm-test/tests/sysrq/01_sysrq_basic_neg.py
--- a/tools/xm-test/tests/sysrq/01_sysrq_basic_neg.py	Tue Dec 13 16:01:09 2005
+++ b/tools/xm-test/tests/sysrq/01_sysrq_basic_neg.py	Tue Dec 13 17:53:36 2005
@@ -9,6 +9,9 @@
 
 from XmTestLib import *
 
+if ENABLE_VMX_SUPPORT:
+    SKIP("Sysrq not supported for VMX domains")
+
 status, output = traceCommand("xm sysrq does_not_exist s");
 
 if status == 0:
diff -r 82f1b5364f94 -r bf1bbc673d58 tools/xm-test/tests/sysrq/02_sysrq_sync_pos.py
--- a/tools/xm-test/tests/sysrq/02_sysrq_sync_pos.py	Tue Dec 13 16:01:09 2005
+++ b/tools/xm-test/tests/sysrq/02_sysrq_sync_pos.py	Tue Dec 13 17:53:36 2005
@@ -8,6 +8,9 @@
 import time
 
 from XmTestLib import *
+
+if ENABLE_VMX_SUPPORT:
+    SKIP("Sysrq not supported for VMX domains")
 
 # Create a domain (default XmTestDomain, with our ramdisk)
 domain = XmTestDomain()
diff -r 82f1b5364f94 -r bf1bbc673d58 tools/xm-test/tests/sysrq/03_sysrq_withreboot_pos.py
--- a/tools/xm-test/tests/sysrq/03_sysrq_withreboot_pos.py	Tue Dec 13 16:01:09 2005
+++ b/tools/xm-test/tests/sysrq/03_sysrq_withreboot_pos.py	Tue Dec 13 17:53:36 2005
@@ -6,6 +6,9 @@
 from XmTestLib import *
 
 import time
+
+if ENABLE_VMX_SUPPORT:
+    SKIP("Sysrq not supported for VMX domains")
 
 domain = XmTestDomain()