qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Aurelien Jarno <aurelien@aurel32.net>
To: qemu-devel@nongnu.org
Cc: Anthony Liguori <aliguori@us.ibm.com>,
	Aurelien Jarno <aurelien@aurel32.net>
Subject: [Qemu-devel] [PATCH v3 06/17] pci: add a pci_vga_init() function
Date: Tue, 11 Sep 2012 21:10:31 +0200	[thread overview]
Message-ID: <1347390642-17434-7-git-send-email-aurelien@aurel32.net> (raw)
In-Reply-To: <1347390642-17434-1-git-send-email-aurelien@aurel32.net>

This function create a PCI VGA device according to the value of
vga_interface_type. It returns a PCIDevice (and not a DeviceState).

Cc: Anthony Liguori <aliguori@us.ibm.com>
Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
---
 hw/pci.c |   18 ++++++++++++++++++
 hw/pci.h |    3 +++
 2 files changed, 21 insertions(+)

diff --git a/hw/pci.c b/hw/pci.c
index f855cf3..e5cee87 100644
--- a/hw/pci.c
+++ b/hw/pci.c
@@ -1474,6 +1474,24 @@ PCIDevice *pci_nic_init_nofail(NICInfo *nd, const char *default_model,
     return res;
 }
 
+PCIDevice *pci_vga_init(PCIBus *bus)
+{
+    switch (vga_interface_type) {
+    case VGA_CIRRUS:
+        return pci_create_simple(bus, -1, "cirrus-vga");
+    case VGA_QXL:
+        return pci_create_simple(bus, -1, "qxl-vga");
+    case VGA_STD:
+        return pci_create_simple(bus, -1, "VGA");
+    case VGA_VMWARE:
+        return pci_create_simple(bus, -1, "vmware-svga");
+    case VGA_NONE:
+    default: /* Other non-PCI types. Checking for unsupported types is already
+                done in vl.c. */
+        return NULL;
+    }
+}
+
 /* Whether a given bus number is in range of the secondary
  * bus of the given bridge device. */
 static bool pci_secondary_bus_in_range(PCIDevice *dev, int bus_num)
diff --git a/hw/pci.h b/hw/pci.h
index 4b6ab3d..d50d26c 100644
--- a/hw/pci.h
+++ b/hw/pci.h
@@ -334,6 +334,9 @@ PCIDevice *pci_nic_init(NICInfo *nd, const char *default_model,
                         const char *default_devaddr);
 PCIDevice *pci_nic_init_nofail(NICInfo *nd, const char *default_model,
                                const char *default_devaddr);
+
+PCIDevice *pci_vga_init(PCIBus *bus);
+
 int pci_bus_num(PCIBus *s);
 void pci_for_each_device(PCIBus *bus, int bus_num,
                          void (*fn)(PCIBus *bus, PCIDevice *d, void *opaque),
-- 
1.7.10.4

  parent reply	other threads:[~2012-09-11 20:10 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-09-11 19:10 [Qemu-devel] [PATCH v3 00/17] Rework ISA/PCI video card initialization Aurelien Jarno
2012-09-11 19:10 ` [Qemu-devel] [PATCH v3 01/17] vga: rename pci_vga_init() into pci_std_vga_init() Aurelien Jarno
2012-09-12 16:54   ` Richard Henderson
2012-09-11 19:10 ` [Qemu-devel] [PATCH v3 02/17] vga: rename isa_vga_init() to isa_std_vga_init() Aurelien Jarno
2012-09-11 19:10 ` [Qemu-devel] [PATCH v3 03/17] vl.c: convert *vga_enabled functions to QOM Aurelien Jarno
2012-09-11 19:10 ` [Qemu-devel] [PATCH v3 04/17] vl.c: check for qxl availability Aurelien Jarno
2012-09-11 19:10 ` [Qemu-devel] [PATCH v3 05/17] vl.c: default to std if cirrus is not available Aurelien Jarno
2012-09-11 19:10 ` Aurelien Jarno [this message]
2012-09-11 19:10 ` [Qemu-devel] [PATCH v3 07/17] isa: add a isa_vga_init() function Aurelien Jarno
2012-09-11 19:10 ` [Qemu-devel] [PATCH v3 08/17] mips/malta: use the new pci_vga_init() function Aurelien Jarno
2012-09-11 19:10 ` [Qemu-devel] [PATCH v3 09/17] alpha: " Aurelien Jarno
2012-09-11 19:10 ` [Qemu-devel] [PATCH v3 10/17] ppc/newworld: " Aurelien Jarno
2012-09-11 19:10 ` [Qemu-devel] [PATCH v3 11/17] ppc/oldworld: " Aurelien Jarno
2012-09-11 19:10 ` [Qemu-devel] [PATCH v3 12/17] ppc/prep: " Aurelien Jarno
2012-09-11 19:10 ` [Qemu-devel] [PATCH v3 13/17] ppc/pSeries: " Aurelien Jarno
2012-09-11 19:10 ` [Qemu-devel] [PATCH v3 14/17] sun/sun4u: " Aurelien Jarno
2012-09-11 19:10 ` [Qemu-devel] [PATCH v3 15/17] pc: use the new pci_vga_init() and isa_vga_init() functions Aurelien Jarno
2012-09-11 19:10 ` [Qemu-devel] [PATCH v3 16/17] mips/r4k: use the new is_vga_init() function Aurelien Jarno
2012-09-11 19:10 ` [Qemu-devel] [PATCH v3 17/17] vga: cleanup after isa_vga_init() and pci_vga_init() conversion Aurelien Jarno

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1347390642-17434-7-git-send-email-aurelien@aurel32.net \
    --to=aurelien@aurel32.net \
    --cc=aliguori@us.ibm.com \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).