From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1LNYUv-0003dK-V6
	for qemu-devel@nongnu.org; Thu, 15 Jan 2009 15:07:26 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1LNYUv-0003cs-5C
	for qemu-devel@nongnu.org; Thu, 15 Jan 2009 15:07:25 -0500
Received: from [199.232.76.173] (port=48277 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1LNYUv-0003ch-0G
	for qemu-devel@nongnu.org; Thu, 15 Jan 2009 15:07:25 -0500
Received: from savannah.gnu.org ([199.232.41.3]:51075 helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <INVALID.NOREPLY@gnu.org>)
	id 1LNYUu-0001VY-AM
	for qemu-devel@nongnu.org; Thu, 15 Jan 2009 15:07:24 -0500
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1LNYUs-000285-Nr
	for qemu-devel@nongnu.org; Thu, 15 Jan 2009 20:07:22 +0000
Received: from aliguori by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <aliguori@savannah.gnu.org>) id 1LNYUs-000280-Ic
	for qemu-devel@nongnu.org; Thu, 15 Jan 2009 20:07:22 +0000
MIME-Version: 1.0
Errors-To: aliguori
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
From: Anthony Liguori <anthony@codemonkey.ws>
Message-Id: <E1LNYUs-000280-Ic@cvs.savannah.gnu.org>
Date: Thu, 15 Jan 2009 20:07:22 +0000
Subject: [Qemu-devel] [6318] add virtio-console initializer for x86
	(Christian Ehrhardt)
Reply-To: qemu-devel@nongnu.org
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: qemu-devel@nongnu.org

Revision: 6318
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=6318
Author:   aliguori
Date:     2009-01-15 20:07:22 +0000 (Thu, 15 Jan 2009)

Log Message:
-----------
add virtio-console initializer for x86 (Christian Ehrhardt)

This adds an intialization of virtio console for pc style hardware.

Signed-off-by: Christian Ehrhardt <ehrhardt@linux.vnet.ibm.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>

Modified Paths:
--------------
    trunk/hw/pc.c

Modified: trunk/hw/pc.c
===================================================================
--- trunk/hw/pc.c	2009-01-15 20:06:40 UTC (rev 6317)
+++ trunk/hw/pc.c	2009-01-15 20:07:22 UTC (rev 6318)
@@ -35,6 +35,7 @@
 #include "fw_cfg.h"
 #include "virtio-blk.h"
 #include "virtio-balloon.h"
+#include "virtio-console.h"
 #include "hpet_emul.h"
 
 /* output Bochs bios info messages */
@@ -1097,6 +1098,14 @@
     /* Add virtio balloon device */
     if (pci_enabled)
         virtio_balloon_init(pci_bus);
+
+    /* Add virtio console devices */
+    if (pci_enabled) {
+        for(i = 0; i < MAX_VIRTIO_CONSOLES; i++) {
+            if (virtcon_hds[i])
+                virtio_console_init(pci_bus, virtcon_hds[i]);
+        }
+    }
 }
 
 static void pc_init_pci(ram_addr_t ram_size, int vga_ram_size,