File beeea90a-xen-hvm-console.patch of Package libvirt.openSUSE_12.1_Update

Index: libvirt-0.9.6/src/xen/xend_internal.c
===================================================================
--- libvirt-0.9.6.orig/src/xen/xend_internal.c
+++ libvirt-0.9.6/src/xen/xend_internal.c
@@ -1761,7 +1761,10 @@ xenDaemonDomainFetch(virConnectPtr conn,
 
     id = xenGetDomIdFromSxpr(root, priv->xendConfigVersion);
     xenUnifiedLock(priv);
-    tty = xenStoreDomainGetConsolePath(conn, id);
+    if (sexpr_lookup(root, "domain/image/hvm"))
+        tty = xenStoreDomainGetSerialConsolePath(conn, id);
+    else
+        tty = xenStoreDomainGetConsolePath(conn, id);
     vncport = xenStoreDomainGetVNCPort(conn, id);
     xenUnifiedUnlock(priv);
     if (!(def = xenParseSxpr(root,
Index: libvirt-0.9.6/src/xen/xs_internal.h
===================================================================
--- libvirt-0.9.6.orig/src/xen/xs_internal.h
+++ libvirt-0.9.6/src/xen/xs_internal.h
@@ -45,6 +45,8 @@ int             xenStoreDomainGetVNCPort
                                          int domid);
 char *          xenStoreDomainGetConsolePath(virConnectPtr conn,
                                          int domid);
+char *          xenStoreDomainGetSerialConsolePath(virConnectPtr conn,
+                                         int domid);
 char *		xenStoreDomainGetNetworkID(virConnectPtr conn,
                                          int id,
                                          const char *mac);
Index: libvirt-0.9.6/src/xen/xs_internal.c
===================================================================
--- libvirt-0.9.6.orig/src/xen/xs_internal.c
+++ libvirt-0.9.6/src/xen/xs_internal.c
@@ -852,6 +852,25 @@ char *          xenStoreDomainGetConsole
   return virDomainDoStoreQuery(conn, domid, "console/tty");
 }
 
+/**
+ * xenStoreDomainGetSerailConsolePath:
+ * @conn: the hypervisor connection
+ * @domid: id of the domain
+ *
+ * Return the path to the pseudo TTY on which the guest domain's
+ * serial console is attached.
+ *
+ * Returns the path to the serial console. It is the callers
+ * responsibilty to free() the return string. Returns NULL
+ * on error
+ *
+ * The caller must hold the lock on the privateData
+ * associated with the 'conn' parameter.
+ */
+char * xenStoreDomainGetSerialConsolePath(virConnectPtr conn, int domid) {
+    return virDomainDoStoreQuery(conn, domid, "serial/0/tty");
+}
+
 
 /*
  * xenStoreDomainGetNetworkID: