xen tests: Fix PV-VFB tests with RHEL-5 API

RHEL-5 Xen doesn't support the old style vnc configuration. In sexpr, we
can't really check it with rhel5-api turned on. However, for XM
configuration files it's sufficient to use cfg version 1 instead of 2.

tests/xmconfigtest.c

@@ -204,8 +204,8 @@ mymain(int argc, char **argv)
             ret = -1;                                                   \
     } while (0)
 
-    DO_TEST("paravirt-old-pvfb", 2);
-    DO_TEST("paravirt-old-pvfb-vncdisplay", 2);
+    DO_TEST("paravirt-old-pvfb", 1);
+    DO_TEST("paravirt-old-pvfb-vncdisplay", 1);
     DO_TEST("paravirt-new-pvfb", 3);
     DO_TEST("paravirt-new-pvfb-vncdisplay", 3);
     DO_TEST("paravirt-net-e1000", 3);

tests/xml2sexprtest.c

@@ -109,7 +109,12 @@ mymain(int argc, char **argv)
     DO_TEST("pv", "pv", "pvtest", 2);
     DO_TEST("fv", "fv-v2", "fvtest", 2);
     DO_TEST("fv-vncunused", "fv-vncunused", "fvtest", 2);
+#ifdef WITH_RHEL5_API
+    /* RHEL-5 Xen doesn't support the old style vnc configuration */
+    DO_TEST("pv-vfb-orig", "pv-vfb-new", "pvtest", 2);
+#else
     DO_TEST("pv-vfb-orig", "pv-vfb-orig", "pvtest", 2);
+#endif
     DO_TEST("pv-vfb-new", "pv-vfb-new", "pvtest", 3);
     DO_TEST("pv-vfb-new-auto", "pv-vfb-new-auto", "pvtest", 3);
     DO_TEST("pv-bootloader", "pv-bootloader", "pvtest", 1);