Merge branch 'upstream-1.7' into tizen_qemu_1.7

[sdk/emulator/qemu.git] / hw / pci / pci.c

diff --git a/hw/pci/pci.c b/hw/pci/pci.c
index 49eca95..642ffed 100644 (file)
--- a/hw/pci/pci.c
+++ b/hw/pci/pci.c
@@ -1655,6 +1655,10 @@ PCIDevice *pci_vga_init(PCIBus *bus)
         return pci_create_simple(bus, -1, "VGA");
     case VGA_VMWARE:
         return pci_create_simple(bus, -1, "vmware-svga");
+#ifdef CONFIG_MARU
+    case VGA_MARU:
+        return pci_create_simple(bus, -1, "MARU_VGA");
+#endif
     case VGA_NONE:
     default: /* Other non-PCI types. Checking for unsupported types is already
                 done in vl.c. */