Date: Wed, 29 Apr 2015 16:46:54 +0000 (UTC) From: Jason Helfman <jgh@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r384993 - in branches/2015Q2/deskutils/virt-manager: . files Message-ID: <201504291646.t3TGks3p005015@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jgh Date: Wed Apr 29 16:46:53 2015 New Revision: 384993 URL: https://svnweb.freebsd.org/changeset/ports/384993 Log: MFH: r384986 - fix Xen text console issue Approved by: ports-secteam With hat: ports-secteam Added: branches/2015Q2/deskutils/virt-manager/files/patch-virtManager_serialcon-bug1215357.py - copied unchanged from r384986, head/deskutils/virt-manager/files/patch-virtManager_serialcon-bug1215357.py Modified: branches/2015Q2/deskutils/virt-manager/Makefile Directory Properties: branches/2015Q2/ (props changed) Modified: branches/2015Q2/deskutils/virt-manager/Makefile ============================================================================== --- branches/2015Q2/deskutils/virt-manager/Makefile Wed Apr 29 16:45:21 2015 (r384992) +++ branches/2015Q2/deskutils/virt-manager/Makefile Wed Apr 29 16:46:53 2015 (r384993) @@ -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}/ Copied: branches/2015Q2/deskutils/virt-manager/files/patch-virtManager_serialcon-bug1215357.py (from r384986, head/deskutils/virt-manager/files/patch-virtManager_serialcon-bug1215357.py) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q2/deskutils/virt-manager/files/patch-virtManager_serialcon-bug1215357.py Wed Apr 29 16:46:53 2015 (r384993, copy of r384986, head/deskutils/virt-manager/files/patch-virtManager_serialcon-bug1215357.py) @@ -0,0 +1,32 @@ +From 0aeee5c449d608d75f5632e9aa47f5e433eb3879 Mon Sep 17 00:00:00 2001 +From: Cole Robinson <crobinso@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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201504291646.t3TGks3p005015>