From: Tiejun Chen <tiejun.chen@intel.com>
To: 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,
weidong.han@intel.com, allen.m.kay@intel.com,
qemu-devel@nongnu.org, jean.guyader@eu.citrix.com,
anthony@codemonkey.ws, yang.z.zhang@Intel.com
Subject: [Qemu-devel] [v2][PATCH 7/8] xen, gfx passthrough: create host bridge to passthrough
Date: Fri, 16 May 2014 18:53:43 +0800 [thread overview]
Message-ID: <1400237624-8505-8-git-send-email-tiejun.chen@intel.com> (raw)
In-Reply-To: <1400237624-8505-1-git-send-email-tiejun.chen@intel.com>
Implement that pci host bridge to specific to passthrough. Actually
thsi just inherit the standard one.
Signed-off-by: Tiejun Chen <tiejun.chen@intel.com>
---
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 b6f49bd..f79b582 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,
@@ -341,8 +356,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()) {
+ 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;
@@ -713,6 +735,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)
{
@@ -754,6 +805,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
WARNING: multiple messages have this Message-ID (diff)
From: Tiejun Chen <tiejun.chen@intel.com>
To: 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,
weidong.han@intel.com, allen.m.kay@intel.com,
qemu-devel@nongnu.org, jean.guyader@eu.citrix.com,
anthony@codemonkey.ws, yang.z.zhang@Intel.com
Subject: [v2][PATCH 7/8] xen, gfx passthrough: create host bridge to passthrough
Date: Fri, 16 May 2014 18:53:43 +0800 [thread overview]
Message-ID: <1400237624-8505-8-git-send-email-tiejun.chen@intel.com> (raw)
In-Reply-To: <1400237624-8505-1-git-send-email-tiejun.chen@intel.com>
Implement that pci host bridge to specific to passthrough. Actually
thsi just inherit the standard one.
Signed-off-by: Tiejun Chen <tiejun.chen@intel.com>
---
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 b6f49bd..f79b582 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,
@@ -341,8 +356,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()) {
+ 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;
@@ -713,6 +735,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)
{
@@ -754,6 +805,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
next prev parent reply other threads:[~2014-05-16 10:55 UTC|newest]
Thread overview: 150+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-05-16 10:53 [Qemu-devel] [v2][PATCH 0/8] xen: add Intel IGD passthrough support Tiejun Chen
2014-05-16 10:53 ` Tiejun Chen
2014-05-16 10:53 ` [Qemu-devel] [v2][PATCH 1/8] pci: use bitmap to manage registe/runregister pci device Tiejun Chen
2014-05-16 10:53 ` Tiejun Chen
2014-05-16 10:53 ` [Qemu-devel] [v2][PATCH 2/8] pci: provide a way to reserve some specific devfn Tiejun Chen
2014-05-16 10:53 ` Tiejun Chen
2014-05-16 14:07 ` [Qemu-devel] [Xen-devel] " Konrad Rzeszutek Wilk
2014-05-16 14:07 ` Konrad Rzeszutek Wilk
2014-05-19 9:43 ` [Qemu-devel] " Chen, Tiejun
2014-05-19 9:43 ` Chen, Tiejun
2014-05-16 10:53 ` [Qemu-devel] [v2][PATCH 3/8] xen, gfx passthrough: basic graphics passthrough support Tiejun Chen
2014-05-16 10:53 ` Tiejun Chen
2014-05-16 14:06 ` [Qemu-devel] [Xen-devel] " Konrad Rzeszutek Wilk
2014-05-16 14:06 ` Konrad Rzeszutek Wilk
2014-05-19 9:42 ` [Qemu-devel] " Chen, Tiejun
2014-05-19 9:42 ` Chen, Tiejun
2014-05-19 13:35 ` [Qemu-devel] " Konrad Rzeszutek Wilk
2014-05-19 13:35 ` Konrad Rzeszutek Wilk
2014-05-20 9:32 ` [Qemu-devel] " Chen, Tiejun
2014-05-20 9:32 ` Chen, Tiejun
2014-05-19 12:10 ` [Qemu-devel] " Stefano Stabellini
2014-05-19 12:10 ` Stefano Stabellini
2014-05-20 5:09 ` [Qemu-devel] " Chen, Tiejun
2014-05-20 5:09 ` Chen, Tiejun
2014-05-16 10:53 ` [Qemu-devel] [v2][PATCH 4/8] xen, gfx passthrough: reserve 00:02.0 for INTEL IGD Tiejun Chen
2014-05-16 10:53 ` Tiejun Chen
2014-05-16 14:08 ` [Qemu-devel] [Xen-devel] " Konrad Rzeszutek Wilk
2014-05-16 14:08 ` Konrad Rzeszutek Wilk
2014-05-19 9:54 ` [Qemu-devel] " Chen, Tiejun
2014-05-19 9:54 ` Chen, Tiejun
2014-05-19 6:44 ` [Qemu-devel] " Gerd Hoffmann
2014-05-19 6:44 ` Gerd Hoffmann
2014-05-19 7:48 ` [Qemu-devel] [Xen-devel] " Fabio Fantoni
2014-05-19 7:48 ` Fabio Fantoni
2014-05-19 8:15 ` [Qemu-devel] " Zhang, Yang Z
2014-05-19 8:15 ` Zhang, Yang Z
2014-05-19 9:34 ` [Qemu-devel] " Chen, Tiejun
2014-05-19 9:34 ` Chen, Tiejun
2014-05-19 9:25 ` [Qemu-devel] " Chen, Tiejun
2014-05-19 9:25 ` Chen, Tiejun
2014-05-19 10:13 ` [Qemu-devel] " Michael S. Tsirkin
2014-05-19 10:13 ` Michael S. Tsirkin
2014-05-20 9:34 ` [Qemu-devel] " Chen, Tiejun
2014-05-20 9:34 ` Chen, Tiejun
2014-05-20 11:36 ` [Qemu-devel] " Michael S. Tsirkin
2014-05-20 11:36 ` Michael S. Tsirkin
2014-05-19 11:22 ` [Qemu-devel] " Gerd Hoffmann
2014-05-19 11:22 ` Gerd Hoffmann
2014-05-19 12:04 ` [Qemu-devel] " Chen, Tiejun
2014-05-19 12:04 ` Chen, Tiejun
2014-05-19 13:50 ` [Qemu-devel] " Gerd Hoffmann
2014-05-19 13:50 ` Gerd Hoffmann
2014-05-19 14:00 ` [Qemu-devel] " Daniel P. Berrange
2014-05-19 14:00 ` Daniel P. Berrange
2014-05-21 7:07 ` [Qemu-devel] " Chen, Tiejun
2014-05-21 7:07 ` Chen, Tiejun
2014-05-22 0:31 ` [Qemu-devel] " Chen, Tiejun
2014-05-22 0:31 ` Chen, Tiejun
2014-05-22 5:39 ` [Qemu-devel] " Gerd Hoffmann
2014-05-22 5:39 ` Gerd Hoffmann
2014-05-22 6:18 ` [Qemu-devel] " Chen, Tiejun
2014-05-22 6:18 ` Chen, Tiejun
2014-05-22 6:44 ` [Qemu-devel] " Gerd Hoffmann
2014-05-22 6:44 ` Gerd Hoffmann
2014-05-22 6:49 ` [Qemu-devel] " Michael S. Tsirkin
2014-05-22 6:49 ` Michael S. Tsirkin
2014-05-22 7:11 ` [Qemu-devel] " Chen, Tiejun
2014-05-22 7:11 ` Chen, Tiejun
2014-05-22 10:50 ` [Qemu-devel] " Chen, Tiejun
2014-05-22 10:50 ` Chen, Tiejun
2014-05-22 11:03 ` [Qemu-devel] " Gonglei (Arei)
2014-05-22 11:03 ` Gonglei (Arei)
2014-05-22 11:22 ` [Qemu-devel] " Gerd Hoffmann
2014-05-22 11:22 ` Gerd Hoffmann
2014-05-23 1:07 ` Chen, Tiejun
2014-05-23 1:07 ` Chen, Tiejun
2014-05-22 11:25 ` [Qemu-devel] " Michael S. Tsirkin
2014-05-22 11:25 ` Michael S. Tsirkin
2014-05-22 14:20 ` [Qemu-devel] [Xen-devel] " Igor Mammedov
2014-05-22 14:20 ` Igor Mammedov
2014-05-23 1:18 ` [Qemu-devel] " Chen, Tiejun
2014-05-23 1:18 ` Chen, Tiejun
2014-05-23 7:38 ` [Qemu-devel] " Igor Mammedov
2014-05-23 7:38 ` Igor Mammedov
2014-05-23 10:52 ` [Qemu-devel] " Anthony PERARD
2014-05-23 10:52 ` Anthony PERARD
2014-05-23 11:40 ` [Qemu-devel] " Stefano Stabellini
2014-05-23 11:40 ` Stefano Stabellini
2014-05-23 11:53 ` [Qemu-devel] " Gerd Hoffmann
2014-05-23 11:53 ` Gerd Hoffmann
2014-05-23 12:06 ` [Qemu-devel] " Igor Mammedov
2014-05-23 12:06 ` Igor Mammedov
2014-05-23 12:16 ` [Qemu-devel] " Igor Mammedov
2014-05-23 12:16 ` Igor Mammedov
2014-05-22 9:58 ` [Qemu-devel] " Konrad Rzeszutek Wilk
2014-05-22 9:58 ` Konrad Rzeszutek Wilk
2014-05-20 14:45 ` [Qemu-devel] " Anthony PERARD
2014-05-20 14:45 ` Anthony PERARD
2014-05-21 1:25 ` [Qemu-devel] " Chen, Tiejun
2014-05-21 1:25 ` Chen, Tiejun
2014-06-25 2:49 ` [Qemu-devel] " Chen, Tiejun
2014-06-25 2:49 ` Chen, Tiejun
2014-06-25 23:04 ` [Qemu-devel] " Slutz, Donald Christopher
2014-06-25 23:04 ` Slutz, Donald Christopher
2014-06-26 2:00 ` [Qemu-devel] " Chen, Tiejun
2014-06-26 2:00 ` Chen, Tiejun
2014-06-26 8:23 ` [Qemu-devel] " Chen, Tiejun
2014-06-26 8:23 ` Chen, Tiejun
2014-06-26 16:58 ` [Qemu-devel] " Don Slutz
2014-06-26 16:58 ` Don Slutz
2014-06-30 9:29 ` [Qemu-devel] " Gerd Hoffmann
2014-06-30 9:29 ` Gerd Hoffmann
2014-06-30 10:23 ` [Qemu-devel] " Chen, Tiejun
2014-06-30 10:23 ` Chen, Tiejun
2014-05-16 10:53 ` [Qemu-devel] [v2][PATCH 5/8] xen, gfx passthrough: create intel isa bridge Tiejun Chen
2014-05-16 10:53 ` Tiejun Chen
2014-05-16 14:11 ` [Qemu-devel] [Xen-devel] " Konrad Rzeszutek Wilk
2014-05-16 14:11 ` Konrad Rzeszutek Wilk
2014-05-19 9:59 ` [Qemu-devel] " Chen, Tiejun
2014-05-19 9:59 ` Chen, Tiejun
2014-05-16 10:53 ` [Qemu-devel] [v2][PATCH 6/8] xen, gfx passthrough: support Intel IGD passthrough with VT-D Tiejun Chen
2014-05-16 10:53 ` Tiejun Chen
2014-05-16 14:35 ` [Qemu-devel] [Xen-devel] " Konrad Rzeszutek Wilk
2014-05-16 14:35 ` Konrad Rzeszutek Wilk
2014-05-19 0:58 ` [Qemu-devel] " Zhang, Yang Z
2014-05-19 0:58 ` Zhang, Yang Z
2014-05-19 13:34 ` [Qemu-devel] " Konrad Rzeszutek Wilk
2014-05-19 13:34 ` Konrad Rzeszutek Wilk
2014-05-20 5:13 ` [Qemu-devel] " Chen, Tiejun
2014-05-20 5:13 ` Chen, Tiejun
2014-05-20 13:39 ` [Qemu-devel] " Konrad Rzeszutek Wilk
2014-05-20 13:39 ` Konrad Rzeszutek Wilk
2014-05-19 10:02 ` [Qemu-devel] [Xen-devel] " Chen, Tiejun
2014-05-19 10:02 ` Chen, Tiejun
2014-05-16 10:53 ` Tiejun Chen [this message]
2014-05-16 10:53 ` [v2][PATCH 7/8] xen, gfx passthrough: create host bridge to passthrough Tiejun Chen
2014-05-16 14:37 ` [Qemu-devel] [Xen-devel] " Konrad Rzeszutek Wilk
2014-05-16 14:37 ` Konrad Rzeszutek Wilk
2014-05-19 10:03 ` [Qemu-devel] " Chen, Tiejun
2014-05-19 10:03 ` Chen, Tiejun
2014-05-16 10:53 ` [Qemu-devel] [v2][PATCH 8/8] xen, gfx passthrough: add opregion mapping Tiejun Chen
2014-05-16 10:53 ` Tiejun Chen
2014-05-19 11:53 ` [Qemu-devel] " Stefano Stabellini
2014-05-19 11:53 ` Stefano Stabellini
2014-05-20 9:24 ` [Qemu-devel] " Chen, Tiejun
2014-05-20 9:24 ` Chen, Tiejun
2014-05-20 10:50 ` [Qemu-devel] " Stefano Stabellini
2014-05-20 10:50 ` Stefano Stabellini
2014-05-21 0:57 ` [Qemu-devel] " Chen, Tiejun
2014-05-21 0:57 ` Chen, Tiejun
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=1400237624-8505-8-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=jean.guyader@eu.citrix.com \
--cc=mst@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=stefano.stabellini@eu.citrix.com \
--cc=weidong.han@intel.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.