gwj / at91sam9263 · Commits

Commit a2fa19f92c914caece0b648aeb658fb0f07b5692

Authored by aliguori
1 parent 51ecf136

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
Inline Side-by-side
Showing 1 changed file with 9 additions and 0 deletions
... ... @@ -35,6 +35,7 @@
35 35 #include "fw_cfg.h"
36 36 #include "virtio-blk.h"
37 37 #include "virtio-balloon.h"
  38 +#include "virtio-console.h"
38 39 #include "hpet_emul.h"
39 40  
40 41 /* output Bochs bios info messages */
... ... @@ -1097,6 +1098,14 @@ static void pc_init1(ram_addr_t ram_size, int vga_ram_size,
1097 1098 /* Add virtio balloon device */
1098 1099 if (pci_enabled)
1099 1100 virtio_balloon_init(pci_bus);
  1101 +
  1102 + /* Add virtio console devices */
  1103 + if (pci_enabled) {
  1104 + for(i = 0; i < MAX_VIRTIO_CONSOLES; i++) {
  1105 + if (virtcon_hds[i])
  1106 + virtio_console_init(pci_bus, virtcon_hds[i]);
  1107 + }
  1108 + }
1100 1109 }
1101 1110  
1102 1111 static void pc_init_pci(ram_addr_t ram_size, int vga_ram_size,
... ...