qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Tiejun Chen <tiejun.chen@intel.com>
To: pbonzini@redhat.com, anthony.perard@citrix.com,
	stefano.stabellini@eu.citrix.com, mst@redhat.com,
	Kelly.Zytaruk@amd.com
Cc: peter.maydell@linaro.org, xen-devel@lists.xensource.com,
	allen.m.kay@intel.com, qemu-devel@nongnu.org,
	anthony@codemonkey.ws, yang.z.zhang@intel.com
Subject: [Qemu-devel] [v5][PATCH 4/5] xen, gfx passthrough: create host bridge to passthrough
Date: Wed, 25 Jun 2014 10:17:20 +0800	[thread overview]
Message-ID: <1403662641-28526-5-git-send-email-tiejun.chen@intel.com> (raw)
In-Reply-To: <1403662641-28526-1-git-send-email-tiejun.chen@intel.com>

Implement that pci host bridge to specific to passthrough. Actually
this just inherit the standard one.

Signed-off-by: Tiejun Chen <tiejun.chen@intel.com>
---
v5:

* Nothing is changed.

v4:

* Fix one typo in the patch head description.
* Use (xen_enabled() && xen_has_gfx_passthru) to make sure we only work
  in this scenario.

v3:

* Just fix this patch head description typo.

v2:

* New patch.

 hw/pci-host/piix.c | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 54 insertions(+), 2 deletions(-)

diff --git a/hw/pci-host/piix.c b/hw/pci-host/piix.c
index e0e0946..9acf901 100644
--- a/hw/pci-host/piix.c
+++ b/hw/pci-host/piix.c
@@ -34,6 +34,7 @@
 #include "sysemu/sysemu.h"
 #include "hw/i386/ioapic.h"
 #include "qapi/visitor.h"
+#include "hw/xen/xen_pt.h"
 
 /*
  * I440FX chipset data sheet.
@@ -95,6 +96,10 @@ typedef struct PIIX3State {
 #define I440FX_PCI_DEVICE(obj) \
     OBJECT_CHECK(PCII440FXState, (obj), TYPE_I440FX_PCI_DEVICE)
 
+#define TYPE_I440FX_XEN_PCI_DEVICE "i440FX-xen"
+#define I440FX_XEN_PCI_DEVICE(obj) \
+    OBJECT_CHECK(PCII440FXState, (obj), TYPE_I440FX_XEN_PCI_DEVICE)
+
 struct PCII440FXState {
     /*< private >*/
     PCIDevice parent_obj;
@@ -305,6 +310,16 @@ static int i440fx_initfn(PCIDevice *dev)
     return 0;
 }
 
+static int i440fx_xen_initfn(PCIDevice *dev)
+{
+    PCII440FXState *d = I440FX_XEN_PCI_DEVICE(dev);
+
+    dev->config[I440FX_SMRAM] = 0x02;
+
+    cpu_smm_register(&i440fx_set_smm, d);
+    return 0;
+}
+
 PCIBus *i440fx_init(PCII440FXState **pi440fx_state,
                     int *piix3_devfn,
                     ISABus **isa_bus, qemu_irq *pic,
@@ -333,8 +348,15 @@ PCIBus *i440fx_init(PCII440FXState **pi440fx_state,
     object_property_add_child(qdev_get_machine(), "i440fx", OBJECT(dev), NULL);
     qdev_init_nofail(dev);
 
-    d = pci_create_simple(b, 0, TYPE_I440FX_PCI_DEVICE);
-    *pi440fx_state = I440FX_PCI_DEVICE(d);
+    if (xen_enabled() && xen_has_gfx_passthru) {
+        d = pci_create_simple(b, 0, TYPE_I440FX_XEN_PCI_DEVICE);
+        *pi440fx_state = I440FX_XEN_PCI_DEVICE(d);
+        pci_create_pch(b);
+    } else {
+        d = pci_create_simple(b, 0, TYPE_I440FX_PCI_DEVICE);
+        *pi440fx_state = I440FX_PCI_DEVICE(d);
+    }
+
     f = *pi440fx_state;
     f->system_memory = address_space_mem;
     f->pci_address_space = pci_address_space;
@@ -704,6 +726,35 @@ static const TypeInfo i440fx_info = {
     .class_init    = i440fx_class_init,
 };
 
+static void i440fx_xen_class_init(ObjectClass *klass, void *data)
+{
+    DeviceClass *dc = DEVICE_CLASS(klass);
+    PCIDeviceClass *k = PCI_DEVICE_CLASS(klass);
+
+    k->init = i440fx_xen_initfn;
+    k->config_write = igd_pci_write;
+    k->config_read = igd_pci_read;
+    k->vendor_id = PCI_VENDOR_ID_INTEL;
+    k->device_id = PCI_DEVICE_ID_INTEL_82441;
+    k->revision = 0x02;
+    k->class_id = PCI_CLASS_BRIDGE_ISA;
+    dc->desc = "XEN Host bridge";
+    dc->vmsd = &vmstate_i440fx;
+    /*
+     * PCI-facing part of the host bridge, not usable without the
+     * host-facing part, which can't be device_add'ed, yet.
+     */
+    dc->cannot_instantiate_with_device_add_yet = true;
+    dc->hotpluggable   = false;
+}
+
+static const TypeInfo i440fx_xen_info = {
+    .name          = TYPE_I440FX_XEN_PCI_DEVICE,
+    .parent        = TYPE_PCI_DEVICE,
+    .instance_size = sizeof(PCII440FXState),
+    .class_init    = i440fx_xen_class_init,
+};
+
 static const char *i440fx_pcihost_root_bus_path(PCIHostState *host_bridge,
                                                 PCIBus *rootbus)
 {
@@ -745,6 +796,7 @@ static const TypeInfo i440fx_pcihost_info = {
 static void i440fx_register_types(void)
 {
     type_register_static(&i440fx_info);
+    type_register_static(&i440fx_xen_info);
     type_register_static(&piix3_info);
     type_register_static(&piix3_xen_info);
     type_register_static(&i440fx_pcihost_info);
-- 
1.9.1

  parent reply	other threads:[~2014-06-25  2:19 UTC|newest]

Thread overview: 169+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-06-25  2:17 [Qemu-devel] [v5][PATCH 0/5] xen: add Intel IGD passthrough support Tiejun Chen
2014-06-25  2:17 ` [Qemu-devel] [v5][PATCH 1/5] xen, gfx passthrough: basic graphics " Tiejun Chen
2014-06-25  6:21   ` Paolo Bonzini
2014-06-25  7:48     ` Chen, Tiejun
2014-06-25  6:35   ` Michael S. Tsirkin
2014-06-25  9:06     ` Chen, Tiejun
2014-06-25  9:16       ` Michael S. Tsirkin
2014-06-25  2:17 ` [Qemu-devel] [v5][PATCH 2/5] xen, gfx passthrough: create pseudo intel isa bridge Tiejun Chen
2014-06-25  6:22   ` Paolo Bonzini
2014-06-25  7:51     ` Chen, Tiejun
2014-06-25  6:45   ` Michael S. Tsirkin
2014-06-25  8:10     ` Chen, Tiejun
2014-06-25  8:28       ` Michael S. Tsirkin
2014-06-25  8:39         ` Chen, Tiejun
2014-06-25  8:43           ` Michael S. Tsirkin
2014-06-25  8:48             ` Chen, Tiejun
2014-06-25  9:04               ` Michael S. Tsirkin
2014-06-25  9:14                 ` Chen, Tiejun
2014-06-25  9:21                   ` Michael S. Tsirkin
2014-06-25  9:28                     ` Chen, Tiejun
2014-06-25  9:44                       ` Michael S. Tsirkin
2014-06-25  9:58                         ` Chen, Tiejun
2014-06-27  7:22                           ` Chen, Tiejun
2014-06-30 19:34                             ` Stefano Stabellini
2014-07-01  2:21                               ` Chen, Tiejun
2014-07-01  5:47                               ` Michael S. Tsirkin
2014-07-01  9:50                                 ` Chen, Tiejun
2014-07-01 12:34                                   ` Michael S. Tsirkin
2014-07-01 16:51                                 ` Stefano Stabellini
2014-06-25  2:17 ` [Qemu-devel] [v5][PATCH 3/5] xen, gfx passthrough: support Intel IGD passthrough with VT-D Tiejun Chen
2014-06-25  6:25   ` Paolo Bonzini
2014-06-25  7:54     ` Chen, Tiejun
2014-06-25  7:04   ` Michael S. Tsirkin
2014-06-27  9:16     ` Chen, Tiejun
2014-06-25 14:05   ` Michael S. Tsirkin
2014-06-26  5:34     ` Chen, Tiejun
2014-06-26  6:04       ` Michael S. Tsirkin
2014-06-26  8:26         ` Chen, Tiejun
2014-06-25  2:17 ` Tiejun Chen [this message]
2014-06-25  6:24   ` [Qemu-devel] [v5][PATCH 4/5] xen, gfx passthrough: create host bridge to passthrough Paolo Bonzini
2014-06-27  8:34     ` Chen, Tiejun
2014-06-27 11:26       ` Paolo Bonzini
2014-06-29  7:56         ` Chen, Tiejun
2014-06-29 12:14           ` Michael S. Tsirkin
2014-06-30  2:52             ` Chen, Tiejun
2014-06-30 19:42               ` Stefano Stabellini
2014-07-01  2:19                 ` Chen, Tiejun
2014-07-01 16:49                   ` Stefano Stabellini
2014-07-01 18:34                     ` Michael S. Tsirkin
2014-07-01 18:45                       ` Michael S. Tsirkin
2014-06-25  2:17 ` [Qemu-devel] [v5][PATCH 5/5] xen, gfx passthrough: add opregion mapping Tiejun Chen
2014-06-25  7:13   ` Michael S. Tsirkin
2014-06-27  9:22     ` Chen, Tiejun
2014-06-29 11:43       ` Michael S. Tsirkin
2014-06-30  0:57         ` Chen, Tiejun
2014-06-25  6:19 ` [Qemu-devel] [v5][PATCH 0/5] xen: add Intel IGD passthrough support Paolo Bonzini
2014-06-25  7:15   ` Michael S. Tsirkin
2014-06-25  7:56     ` Paolo Bonzini
2014-06-25  7:35   ` Chen, Tiejun
2014-06-25  7:40     ` Michael S. Tsirkin
2014-06-25  7:44     ` Paolo Bonzini
2014-06-25  8:31       ` Michael S. Tsirkin
2014-06-25  8:39         ` Paolo Bonzini
2014-06-25  8:48           ` Michael S. Tsirkin
2014-06-25  8:55             ` Chen, Tiejun
2014-06-25  9:09               ` Michael S. Tsirkin
2014-06-25  9:21                 ` Chen, Tiejun
2014-06-25  9:31                   ` Paolo Bonzini
2014-06-25  9:50                     ` Chen, Tiejun
2014-06-25  9:54                       ` Paolo Bonzini
2014-06-25 10:00                         ` Michael S. Tsirkin
2014-06-26  9:18                         ` Chen, Tiejun
2014-06-26 10:03                           ` Paolo Bonzini
2014-06-26 11:26                             ` Michael S. Tsirkin
2014-06-26 11:30                               ` Paolo Bonzini
2014-06-26 11:36                                 ` Michael S. Tsirkin
2014-06-26 13:30                                   ` Paolo Bonzini
2014-06-26 15:40                                     ` Michael S. Tsirkin
2014-06-30  2:51                             ` Chen, Tiejun
2014-06-30  6:48                               ` Michael S. Tsirkin
2014-06-30  7:24                                 ` Chen, Tiejun
2014-06-30  9:05                                   ` Michael S. Tsirkin
2014-06-30  9:38                                     ` Chen, Tiejun
2014-06-30  9:55                                       ` Michael S. Tsirkin
2014-06-30 10:20                                         ` [Qemu-devel] [Xen-devel] " Chen, Tiejun
2014-06-30 11:18                                           ` Paolo Bonzini
2014-06-30 11:31                                             ` Michael S. Tsirkin
2014-06-30 11:28                                           ` Michael S. Tsirkin
2014-07-01  2:40                                             ` Chen, Tiejun
2014-07-01  9:12                                               ` Michael S. Tsirkin
2014-07-01  9:46                                                 ` Chen, Tiejun
2014-07-01 12:33                                                   ` Michael S. Tsirkin
2014-07-02  0:59                                                     ` Chen, Tiejun
2014-07-02  6:22                                                       ` Michael S. Tsirkin
2014-07-02  8:45                                                         ` Chen, Tiejun
2014-06-30 19:22                                     ` [Qemu-devel] " Stefano Stabellini
2014-06-30 19:31                                       ` [Qemu-devel] [Xen-devel] " Ross Philipson
2014-07-01  2:24                                         ` Chen, Tiejun
2014-07-01  5:39                                         ` Michael S. Tsirkin
2014-07-01 16:47                                           ` Stefano Stabellini
2014-07-01 17:02                                             ` Michael S. Tsirkin
2014-07-01 17:39                                               ` Ross Philipson
2014-07-01 18:06                                                 ` Michael S. Tsirkin
2014-07-01 19:29                                                   ` Ross Philipson
2014-07-02  6:11                                                     ` Michael S. Tsirkin
2014-07-02  7:56                                                       ` Chen, Tiejun
2014-07-02 11:33                                                 ` Paolo Bonzini
2014-07-02 14:00                                                   ` Konrad Rzeszutek Wilk
2014-07-02 14:07                                                     ` Stefano Stabellini
2014-07-03  3:00                                                       ` Chen, Tiejun
2014-07-03 18:25                                                         ` Konrad Rzeszutek Wilk
2014-07-02 14:08                                                     ` Michael S. Tsirkin
2014-07-02 16:05                                                       ` Konrad Rzeszutek Wilk
2014-07-02 17:58                                                         ` Michael S. Tsirkin
2014-07-02 14:50                                                     ` [Qemu-devel] ResettRe: " Paolo Bonzini
2014-07-02 15:12                                                       ` Michael S. Tsirkin
2014-07-02 19:33                                                         ` Alex Williamson
2014-07-02 16:23                                                       ` Konrad Rzeszutek Wilk
2014-07-02 16:27                                                         ` Paolo Bonzini
2014-07-02 16:53                                                         ` Michael S. Tsirkin
2014-07-03  7:32                                                         ` Michael S. Tsirkin
2014-07-03 18:26                                                           ` Konrad Rzeszutek Wilk
2014-07-03 19:09                                                             ` [Qemu-devel] [Intel-gfx] " Jesse Barnes
2014-07-03 20:27                                                               ` Michael S. Tsirkin
2014-07-16 14:20                                                                 ` Konrad Rzeszutek Wilk
2014-07-17  9:42                                                                   ` Chen, Tiejun
2014-07-17 17:37                                                                 ` Kay, Allen M
2014-07-18 13:44                                                                   ` Konrad Rzeszutek Wilk
2014-07-19  0:27                                                                     ` Kay, Allen M
2014-07-23 20:54                                                                       ` Konrad Rzeszutek Wilk
2014-07-24  1:44                                                                         ` Chen, Tiejun
2014-07-25 17:01                                                                           ` Konrad Rzeszutek Wilk
2014-07-29  6:59                                                                             ` Chen, Tiejun
2014-07-29  8:32                                                                               ` Paolo Bonzini
2014-07-29  9:14                                                                                 ` Chen, Tiejun
2014-07-04  6:28                                                               ` [Qemu-devel] " Paolo Bonzini
2014-07-06  6:08                                                                 ` Michael S. Tsirkin
2014-07-02 15:15                                                   ` [Qemu-devel] " Ross Philipson
2014-07-02 15:27                                                     ` Michael S. Tsirkin
2014-07-02 16:29                                                       ` Paolo Bonzini
2014-07-02 16:45                                                         ` Konrad Rzeszutek Wilk
2014-07-02 18:00                                                         ` Michael S. Tsirkin
2014-07-03  5:57                                                       ` Chen, Tiejun
2014-07-03  6:40                                                         ` Michael S. Tsirkin
2014-07-01 18:20                                               ` Stefano Stabellini
2014-07-01 18:38                                                 ` Michael S. Tsirkin
2014-07-02  1:37                                                 ` Chen, Tiejun
2014-07-02  6:09                                                   ` Michael S. Tsirkin
2014-07-02  7:51                                                     ` Chen, Tiejun
2014-06-25  9:55                       ` [Qemu-devel] " Michael S. Tsirkin
2014-06-25  9:59                         ` Paolo Bonzini
2014-06-25 10:06                           ` Chen, Tiejun
2014-06-25 10:21                             ` Michael S. Tsirkin
2014-06-25 10:28                               ` Chen, Tiejun
2014-06-25 10:32                                 ` Michael S. Tsirkin
2014-06-25 10:37                                   ` Chen, Tiejun
2014-06-25 10:55                                     ` Michael S. Tsirkin
2014-06-25 12:11                               ` Paolo Bonzini
2014-06-25 13:47                                 ` Michael S. Tsirkin
2014-06-25 13:53                                   ` Paolo Bonzini
2014-06-25 14:10                                     ` Michael S. Tsirkin
2014-06-25 14:16                                       ` Paolo Bonzini
2014-06-25 14:26                                         ` Michael S. Tsirkin
2014-06-25 10:09                           ` Michael S. Tsirkin
2014-06-25 10:14                             ` Paolo Bonzini
2014-06-25 10:15                             ` Chen, Tiejun
2014-06-25 10:28                               ` Michael S. Tsirkin
2014-06-25  9:43                   ` Michael S. Tsirkin
2014-07-08 10:45 ` [Qemu-devel] [Xen-devel] " Andrew Barnes

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=1403662641-28526-5-git-send-email-tiejun.chen@intel.com \
    --to=tiejun.chen@intel.com \
    --cc=Kelly.Zytaruk@amd.com \
    --cc=allen.m.kay@intel.com \
    --cc=anthony.perard@citrix.com \
    --cc=anthony@codemonkey.ws \
    --cc=mst@redhat.com \
    --cc=pbonzini@redhat.com \
    --cc=peter.maydell@linaro.org \
    --cc=qemu-devel@nongnu.org \
    --cc=stefano.stabellini@eu.citrix.com \
    --cc=xen-devel@lists.xensource.com \
    --cc=yang.z.zhang@intel.com \
    /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).