From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NZtWI-00085g-5v for qemu-devel@nongnu.org; Tue, 26 Jan 2010 17:04:22 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NZtWD-0007z1-88 for qemu-devel@nongnu.org; Tue, 26 Jan 2010 17:04:21 -0500 Received: from [199.232.76.173] (port=42270 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NZtWC-0007yS-Sr for qemu-devel@nongnu.org; Tue, 26 Jan 2010 17:04:16 -0500 Received: from mail-iw0-f188.google.com ([209.85.223.188]:40596) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NZtWC-0000RP-7X for qemu-devel@nongnu.org; Tue, 26 Jan 2010 17:04:16 -0500 Received: by mail-iw0-f188.google.com with SMTP id 26so5377896iwn.14 for ; Tue, 26 Jan 2010 14:04:15 -0800 (PST) Message-ID: <4B5F66DD.9060804@codemonkey.ws> Date: Tue, 26 Jan 2010 16:04:13 -0600 From: Anthony Liguori MIME-Version: 1.0 Subject: Re: [Qemu-devel] [PATCH] virtio-console: Automatically use virtio-serial-bus for the older -virtioconsole invocation References: <1264070963-1722-1-git-send-email-amit.shah@redhat.com> In-Reply-To: <1264070963-1722-1-git-send-email-amit.shah@redhat.com> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Amit Shah Cc: qemu-devel@nongnu.org On 01/21/2010 04:49 AM, Amit Shah wrote: > These hunks got dropped off mysteriously during the rebasing of my > virtio-serial series. Thanks go to Markus for noticing it. > > Without these fixes, -virtioconsole doesn't actually have any effect. > > Signed-off-by: Amit Shah > Reported-by: Markus Armbruster > Applied. Thanks. Regards, Anthony Liguori > --- > roms/seabios | 2 +- > vl.c | 15 +++++++++++++-- > 2 files changed, 14 insertions(+), 3 deletions(-) > > diff --git a/roms/seabios b/roms/seabios > index 5da6833..8362699 160000 > --- a/roms/seabios > +++ b/roms/seabios > @@ -1 +1 @@ > -Subproject commit 5da68339ecf44677b8f4f115cdf3cb1da46a9f6c > +Subproject commit 8362699269d7b3c816981be0e306d7531aa3ea1d > diff --git a/vl.c b/vl.c > index e070ec9..ae3ee0b 100644 > --- a/vl.c > +++ b/vl.c > @@ -288,8 +288,9 @@ static struct { > { .driver = "isa-parallel", .flag =&default_parallel }, > { .driver = "isa-fdc", .flag =&default_floppy }, > { .driver = "ide-drive", .flag =&default_cdrom }, > - { .driver = "virtio-console-pci", .flag =&default_virtcon }, > - { .driver = "virtio-console-s390", .flag =&default_virtcon }, > + { .driver = "virtio-serial-pci", .flag =&default_virtcon }, > + { .driver = "virtio-serial-s390", .flag =&default_virtcon }, > + { .driver = "virtio-serial", .flag =&default_virtcon }, > { .driver = "VGA", .flag =&default_vga }, > { .driver = "cirrus-vga", .flag =&default_vga }, > { .driver = "vmware-svga", .flag =&default_vga }, > @@ -4623,6 +4624,7 @@ static int virtcon_parse(const char *devname) > { > static int index = 0; > char label[32]; > + QemuOpts *bus_opts, *dev_opts; > > if (strcmp(devname, "none") == 0) > return 0; > @@ -4630,6 +4632,13 @@ static int virtcon_parse(const char *devname) > fprintf(stderr, "qemu: too many virtio consoles\n"); > exit(1); > } > + > + bus_opts = qemu_opts_create(&qemu_device_opts, NULL, 0); > + qemu_opt_set(bus_opts, "driver", "virtio-serial"); > + > + dev_opts = qemu_opts_create(&qemu_device_opts, NULL, 0); > + qemu_opt_set(dev_opts, "driver", "virtconsole"); > + > snprintf(label, sizeof(label), "virtcon%d", index); > virtcon_hds[index] = qemu_chr_open(label, devname, NULL); > if (!virtcon_hds[index]) { > @@ -4637,6 +4646,8 @@ static int virtcon_parse(const char *devname) > devname, strerror(errno)); > return -1; > } > + qemu_opt_set(dev_opts, "chardev", label); > + > index++; > return 0; > } >