aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoraliguori <aliguori@c046a42c-6fe2-441c-8c8c-71466251a162>2009-01-15 20:07:22 +0000
committeraliguori <aliguori@c046a42c-6fe2-441c-8c8c-71466251a162>2009-01-15 20:07:22 +0000
commita2fa19f92c914caece0b648aeb658fb0f07b5692 (patch)
tree30927f839efde23fd7b61d74ba71894fee4c48de
parent51ecf1368d96123cda9b0023eb68a3801f6d70de (diff)
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> git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6318 c046a42c-6fe2-441c-8c8c-71466251a162
-rw-r--r--hw/pc.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/hw/pc.c b/hw/pc.c
index 6a1c8ec242..efd291dfed 100644
--- a/hw/pc.c
+++ b/hw/pc.c
@@ -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 @@ static void pc_init1(ram_addr_t ram_size, int vga_ram_size,
/* 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,