From owner-svn-ports-all@FreeBSD.ORG Wed Apr 29 16:46:55 2015 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 2A42034F; Wed, 29 Apr 2015 16:46:55 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 0B89E183E; Wed, 29 Apr 2015 16:46:55 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3TGks4d005017; Wed, 29 Apr 2015 16:46:54 GMT (envelope-from jgh@FreeBSD.org) Received: (from jgh@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3TGks3p005015; Wed, 29 Apr 2015 16:46:54 GMT (envelope-from jgh@FreeBSD.org) Message-Id: <201504291646.t3TGks3p005015@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: jgh set sender to jgh@FreeBSD.org using -f From: Jason Helfman Date: Wed, 29 Apr 2015 16:46:54 +0000 (UTC) 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 X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 29 Apr 2015 16:46:55 -0000 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 +Date: Sun, 26 Apr 2015 11:50:01 -0400 +Subject: serialcon: Fix opening with xen (bz 1215357) + +Apparently xen doesn't set device alias names, and OpenConsole +just opens the first 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