Phils updates to fix xml warnings and telemetry warnings (from devel->Release 1.2)

diff --git a/palacios/src/devices/keyboard.c b/palacios/src/devices/keyboard.c
index eb76cc9..94cd7f3 100644 (file)
--- a/palacios/src/devices/keyboard.c
+++ b/palacios/src/devices/keyboard.c
@@ -354,8 +354,10 @@ static int key_event_handler(struct guest_info * info,
        PrintDebug("Toggling Debugging\n");     
        v3_dbg_enable ^= 1;
     } else if (evt->scan_code == 0x41) { // F7 telemetry dump
-       v3_print_telemetry(info);
-       
+#ifdef CONFIG_TELEMETRY
+    v3_print_telemetry(info);
+#endif // CONFIG_TELEMTRY
+
     }
 
 

diff --git a/palacios/src/palacios/vmm_xml.c b/palacios/src/palacios/vmm_xml.c
index e632a4f..2383600 100644 (file)
--- a/palacios/src/palacios/vmm_xml.c
+++ b/palacios/src/palacios/vmm_xml.c
@@ -363,33 +363,33 @@ static int v3_xml_close_tag(struct v3_xml_root * root, char * name, char * s) {
     return 0;
 }
 
-// checks for circular entity references, returns non-zero if no circular
-// references are found, zero otherwise
-static int v3_xml_ent_ok(char * name, char * s, char ** ent) {
-    int i;
-
-    for (; ; s++) {
-        while ((*s != '\0') && (*s != '&')) {
-           // find next entity reference
-           s++; 
-       }
-
-        if (*s == '\0') {
-           return 1;
-       }
-
-        if (strncmp(s + 1, name, strlen(name)) == 0) {
-           // circular ref.
-           return 0;
-       }
-
-        for (i = 0; (ent[i]) && (strncmp(ent[i], s + 1, strlen(ent[i]))); i += 2);
-
-        if ((ent[i] != NULL) && (v3_xml_ent_ok(name, ent[i + 1], ent) == 0)) {
-           return 0;
-       }
-    }
-}
+//// checks for circular entity references, returns non-zero if no circular
+//// references are found, zero otherwise
+//static int v3_xml_ent_ok(char * name, char * s, char ** ent) {
+//    int i;
+//
+//    for (; ; s++) {
+//        while ((*s != '\0') && (*s != '&')) {
+//        // find next entity reference
+//        s++;
+//        }
+//
+//        if (*s == '\0') {
+//        return 1;
+//        }
+//
+//        if (strncmp(s + 1, name, strlen(name)) == 0) {
+//        // circular ref.
+//        return 0;
+//        }
+//
+//        for (i = 0; (ent[i]) && (strncmp(ent[i], s + 1, strlen(ent[i]))); i += 2);
+//
+//        if ((ent[i] != NULL) && (v3_xml_ent_ok(name, ent[i + 1], ent) == 0)) {
+//        return 0;
+//        }
+//    }
+//}