diff --git a/ChangeLog b/ChangeLog
index 0fcdf38d28f74daec62cd059ee10e102a4806b61..404760c4ac376934982ee5e36066ee7acab22b2f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Thu Nov 16 19:36:12 EST 2006 Daniel Berrange <berrange@redhat.com>
+
+	* src/xm_internal.c: Add support for device_model parameter to
+	make HVM guests work. Also support serial console in HVM, since
+	it needs to be explicitly turned on, unlike PV.
+
 Thu Nov 16 18:16:42 EST 2006 Daniel Berrange <berrange@redhat.com>
 
 	* src/xml.c: Mark 'msg' parameter in XML error handler as unused.
diff --git a/src/xm_internal.c b/src/xm_internal.c
index 9268edcd906824967a808b2d43ddffc785091c86..c1910f923b1b1f80c48d304008b0424e05db0fbb 100644
--- a/src/xm_internal.c
+++ b/src/xm_internal.c
@@ -579,6 +579,11 @@ char *xenXMDomainDumpXML(virDomainPtr domain, int flags ATTRIBUTE_UNUSED) {
 
     virBufferAdd(buf, "  <devices>\n", -1);
 
+    if (hvm) {
+        if (xenXMConfigGetString(entry->conf, "device_model", &str) == 0)
+            virBufferVSprintf(buf, "    <emulator>%s</emulator>\n", str);
+    }
+
     list = virConfGetValue(entry->conf, "disk");
     while (list && list->type == VIR_CONF_LIST) {
         virConfValuePtr el = list->list;
@@ -732,6 +737,12 @@ char *xenXMDomainDumpXML(virDomainPtr domain, int flags ATTRIBUTE_UNUSED) {
         virBufferAdd(buf, "    <graphics type='sdl'/>\n", -1);
     }
 
+    if (hvm) {
+        if (xenXMConfigGetString(entry->conf, "serial", &str) == 0 && !strcmp(str, "pty")) {
+            virBufferAdd(buf, "    <console/>\n", -1);
+        }
+    }
+
     virBufferAdd(buf, "  </devices>\n", -1);
 
     virBufferAdd(buf, "</domain>\n", -1);