? COPYING
? build.log
Index: src/xend_internal.c
===================================================================
RCS file: /data/cvs/libvirt/src/xend_internal.c,v
retrieving revision 1.53
diff -c -r1.53 xend_internal.c
*** src/xend_internal.c	11 Aug 2006 14:40:04 -0000	1.53
--- src/xend_internal.c	14 Aug 2006 14:51:39 -0000
***************
*** 1547,1552 ****
--- 1547,1563 ----
      if (tmp != NULL)
  	virBufferVSprintf(&buf, "  <on_crash>%s</on_crash>\n", tmp);
  
+     if (hvm) {
+         virBufferAdd(&buf, "  <features>\n", 13);
+         if (sexpr_int(root, "domain/image/hvm/acpi"))
+             virBufferAdd(&buf, "    <acpi/>\n", 12);
+         if (sexpr_int(root, "domain/image/hvm/apic"))
+             virBufferAdd(&buf, "    <apic/>\n", 12);
+         if (sexpr_int(root, "domain/image/hvm/pae"))
+             virBufferAdd(&buf, "    <pae/>\n", 11);
+         virBufferAdd(&buf, "  </features>\n", 14);
+     }
+        
      virBufferAdd(&buf, "  <devices>\n", 12);
  
      /* in case of HVM we have devices emulation */
Index: src/xml.c
===================================================================
RCS file: /data/cvs/libvirt/src/xml.c,v
retrieving revision 1.32
diff -c -r1.32 xml.c
*** src/xml.c	11 Aug 2006 14:40:04 -0000	1.32
--- src/xml.c	14 Aug 2006 14:51:39 -0000
***************
*** 567,573 ****
      return (ret);
  }
  
! #endif
  
  #ifndef PROXY
  /**
--- 567,573 ----
      return (ret);
  }
  
! #endif /* 0 - UNUSED */
  
  #ifndef PROXY
  /**
***************
*** 695,700 ****
--- 695,722 ----
           xmlXPathFreeObject(obj);
           obj = NULL;
         }
+ 
+        obj = xmlXPathEval(BAD_CAST "/domain/features/acpi", ctxt);
+        if ((obj != NULL) && (obj->type == XPATH_NODESET) &&
+ 	   (obj->nodesetval != NULL) && (obj->nodesetval->nodeNr == 1)) {
+            virBufferAdd(buf, "(acpi 1)", 8);
+ 	   xmlXPathFreeObject(obj);
+ 	   obj = NULL;
+        }
+        obj = xmlXPathEval(BAD_CAST "/domain/features/apic", ctxt);
+        if ((obj != NULL) && (obj->type == XPATH_NODESET) &&
+ 	   (obj->nodesetval != NULL) && (obj->nodesetval->nodeNr == 1)) {
+            virBufferAdd(buf, "(apic 1)", 8);
+ 	   xmlXPathFreeObject(obj);
+ 	   obj = NULL;
+        }
+        obj = xmlXPathEval(BAD_CAST "/domain/features/pae", ctxt);
+        if ((obj != NULL) && (obj->type == XPATH_NODESET) &&
+ 	   (obj->nodesetval != NULL) && (obj->nodesetval->nodeNr == 1)) {
+            virBufferAdd(buf, "(pae 1)", 7);
+ 	   xmlXPathFreeObject(obj);
+ 	   obj = NULL;
+        }
      }
  
      obj = xmlXPathEval(BAD_CAST "count(domain/devices/console) > 0", ctxt);