From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:42044) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tqpx2-00022i-DN for qemu-devel@nongnu.org; Thu, 03 Jan 2013 13:55:37 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Tqpx0-00088U-7v for qemu-devel@nongnu.org; Thu, 03 Jan 2013 13:55:36 -0500 Received: from mail-ia0-f169.google.com ([209.85.210.169]:49047) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tqpx0-00088D-3B for qemu-devel@nongnu.org; Thu, 03 Jan 2013 13:55:34 -0500 Received: by mail-ia0-f169.google.com with SMTP id u20so6629107iag.28 for ; Thu, 03 Jan 2013 10:55:33 -0800 (PST) From: Anthony Liguori In-Reply-To: <20130103133318.GA8926@redhat.com> References: <1357219383-30748-1-git-send-email-kraxel@redhat.com> <20130103133318.GA8926@redhat.com> Date: Thu, 03 Jan 2013 12:55:30 -0600 Message-ID: <871ue2p04d.fsf@codemonkey.ws> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Subject: Re: [Qemu-devel] [PATCH] pty: unbreak libvirt List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: "Daniel P. Berrange" , Gerd Hoffmann Cc: qemu-devel@nongnu.org "Daniel P. Berrange" writes: > On Thu, Jan 03, 2013 at 02:23:03PM +0100, Gerd Hoffmann wrote: >> Commit 586502189edf9fd0f89a83de96717a2ea826fdb0 breaks libvirt pty >> support because it tried to figure the pts name from stderr output. >> >> Fix this by moving the label to the end of the line, this way the >> libvirt parser does still recognise the message. libvirt looks >> for "char device redirected to ${ptsname}". > > FWIW, libvirt was not supposed to be parsing this data still. > We rely on query-chardev to get the PTYs, but we were accidentally > still invoking the stdio parsing code even though we didn't use > the result :-( Thanks for the explanation. I thought about libvirt before applying this but had figured it was using query-chardev. I still think this is a reasonable change to make though even if the latest libvirt doesn't need it so I'll apply it. Regards, Anthony Liguori > > This flaw is fixed in latest libvirt GIT. > >> >> Signed-off-by: Gerd Hoffmann >> --- >> qemu-char.c | 9 +++++---- >> 1 files changed, 5 insertions(+), 4 deletions(-) >> >> diff --git a/qemu-char.c b/qemu-char.c >> index 331ad5c..f41788c 100644 >> --- a/qemu-char.c >> +++ b/qemu-char.c >> @@ -1012,10 +1012,11 @@ static CharDriverState *qemu_chr_open_pty(QemuOpts *opts) >> qemu_opt_set(opts, "path", q_ptsname(master_fd)); >> >> label = qemu_opts_id(opts); >> - fprintf(stderr, "char device%s%s redirected to %s\n", >> - label ? " " : "", >> - label ?: "", >> - q_ptsname(master_fd)); >> + fprintf(stderr, "char device redirected to %s%s%s%s\n", >> + q_ptsname(master_fd), >> + label ? " (label " : "", >> + label ? label : "", >> + label ? ")" : ""); >> >> s = g_malloc0(sizeof(PtyCharDriver)); >> chr->opaque = s; > > > Daniel > -- > |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| > |: http://libvirt.org -o- http://virt-manager.org :| > |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| > |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|