svn commit: r384986 - in head/deskutils/virt-manager: . files

[Jason Helfman]

Author: jgh
Date: Wed Apr 29 16:25:58 2015
New Revision: 384986
URL: https://svnweb.freebsd.org/changeset/ports/384986

Log:
  - fix Xen text console issue
  
  PR:		199750
  Submitted by:	lantw44 at gmail.com

Added:
  head/deskutils/virt-manager/files/patch-virtManager_serialcon-bug1215357.py   (contents, props changed)
Modified:
  head/deskutils/virt-manager/Makefile

Modified: head/deskutils/virt-manager/Makefile
==============================================================================
--- head/deskutils/virt-manager/Makefile	Wed Apr 29 16:01:39 2015	(r384985)
+++ head/deskutils/virt-manager/Makefile	Wed Apr 29 16:25:58 2015	(r384986)
@@ -2,7 +2,7 @@
 
 PORTNAME=	virt-manager
 PORTVERSION=	1.1.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	deskutils net-mgmt
 MASTER_SITES=	http://virt-manager.org/download/sources/${PORTNAME}/ \
 		LOCAL/jgh/deskutils/${PORTNAME}/

Added: head/deskutils/virt-manager/files/patch-virtManager_serialcon-bug1215357.py
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/deskutils/virt-manager/files/patch-virtManager_serialcon-bug1215357.py	Wed Apr 29 16:25:58 2015	(r384986)
@@ -0,0 +1,32 @@
+From 0aeee5c449d608d75f5632e9aa47f5e433eb3879 Mon Sep 17 00:00:00 2001
+From: Cole Robinson <crobinso at redhat.com>
+Date: Sun, 26 Apr 2015 11:50:01 -0400
+Subject: serialcon: Fix opening with xen (bz 1215357)
+
+Apparently xen doesn't set <serial> device alias names, and OpenConsole
+just opens the first <console> device unconditionally.
+
+Properly handling that would be to report it in the UI that we can
+only open the first console, but for now just drop the alias check.
+Apparently SUSE already does this as mentioned in the RH bug
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1215357
+
+diff --git a/virtManager/serialcon.py b/virtManager/serialcon.py
+index 92c2029..320811b 100644
+--- ./virtManager/serialcon.py
++++ ./virtManager/serialcon.py
+@@ -205,8 +205,9 @@ class LibvirtConsoleConnection(ConsoleConnection):
+         name = dev and dev.alias.name or None
+         logging.debug("Opening console stream for dev=%s alias=%s",
+                       dev, name)
+-        if not name:
+-            raise RuntimeError(_("Cannot open a device with no alias name"))
++        # libxl doesn't set aliases, their open_console just defaults to
++        # opening the first console device, so don't force prescence of
++        # an alias
+ 
+         stream = self.conn.get_backend().newStream(libvirt.VIR_STREAM_NONBLOCK)
+         self.vm.open_console(name, stream)
+-- 
+cgit v0.10.2