From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45679) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XEv6j-0004hd-4S for qemu-devel@nongnu.org; Wed, 06 Aug 2014 02:54:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XEv6c-0007mj-FU for qemu-devel@nongnu.org; Wed, 06 Aug 2014 02:53:57 -0400 Received: from mga01.intel.com ([192.55.52.88]:48322) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XEv6c-0007m7-9T for qemu-devel@nongnu.org; Wed, 06 Aug 2014 02:53:50 -0400 From: Tiejun Chen Date: Wed, 6 Aug 2014 14:50:34 +0800 Message-Id: <1407307835-9692-5-git-send-email-tiejun.chen@intel.com> In-Reply-To: <1407307835-9692-1-git-send-email-tiejun.chen@intel.com> References: <1407307835-9692-1-git-send-email-tiejun.chen@intel.com> Subject: [Qemu-devel] [v4][PATCH 4/5] xen:hw:pci-host:piix: create host bridge to passthrough List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: mst@redhat.com Cc: pbonzini@redhat.com, xen-devel@lists.xensource.com, qemu-devel@nongnu.org, stefano.stabellini@eu.citrix.com Implement a pci host bridge specific to passthrough. Actually this just inherits the standard one. This is based on http://patchwork.ozlabs.org/patch/363810/. Signed-off-by: Tiejun Chen --- hw/pci-host/piix.c | 39 +++++++++++++++++++++++++++++++++++++++ include/hw/i386/pc.h | 2 ++ 2 files changed, 41 insertions(+) v4: * Rebase v3: * Rebase v2: * Just add prefix with XEN_IGD_PASSTHROUGH/xen_igd_passthrough diff --git a/hw/pci-host/piix.c b/hw/pci-host/piix.c index 4330599..5cac398 100644 --- a/hw/pci-host/piix.c +++ b/hw/pci-host/piix.c @@ -303,6 +303,17 @@ static int i440fx_initfn(PCIDevice *dev) return 0; } +static int xen_igd_passthrough_i440fx_initfn(PCIDevice *dev) +{ + PCII440FXState *d = I440FX_PCI_DEVICE(dev, + TYPE_XEN_IGD_PASSTHROUGH_I440FX_PCI_DEVICE); + + dev->config[I440FX_SMRAM] = 0x02; + + cpu_smm_register(&i440fx_set_smm, d); + return 0; +} + PCIBus *i440fx_init(const char *host_type, const char *pci_type, PCII440FXState **pi440fx_state, int *piix3_devfn, @@ -703,6 +714,33 @@ static const TypeInfo i440fx_info = { .class_init = i440fx_class_init, }; +static void xen_igd_passthrough_i440fx_class_init(ObjectClass *klass, void *data) +{ + DeviceClass *dc = DEVICE_CLASS(klass); + PCIDeviceClass *k = PCI_DEVICE_CLASS(klass); + + k->init = xen_igd_passthrough_i440fx_initfn; + k->vendor_id = PCI_VENDOR_ID_INTEL; + k->device_id = PCI_DEVICE_ID_INTEL_82441; + k->revision = 0x02; + k->class_id = PCI_CLASS_BRIDGE_HOST; + dc->desc = "IGD PT 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 xen_igd_passthrough_i440fx_info = { + .name = TYPE_XEN_IGD_PASSTHROUGH_I440FX_PCI_DEVICE, + .parent = TYPE_PCI_DEVICE, + .instance_size = sizeof(PCII440FXState), + .class_init = xen_igd_passthrough_i440fx_class_init, +}; + static const char *i440fx_pcihost_root_bus_path(PCIHostState *host_bridge, PCIBus *rootbus) { @@ -744,6 +782,7 @@ static const TypeInfo i440fx_pcihost_info = { static void i440fx_register_types(void) { type_register_static(&i440fx_info); + type_register_static(&xen_igd_passthrough_i440fx_info); type_register_static(&piix3_info); type_register_static(&piix3_xen_info); type_register_static(&i440fx_pcihost_info); diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index 11fb72f..de34aa6 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -238,6 +238,8 @@ typedef struct PCII440FXState PCII440FXState; #define TYPE_I440FX_PCI_HOST_BRIDGE "i440FX-pcihost" #define TYPE_I440FX_PCI_DEVICE "i440FX" +#define TYPE_XEN_IGD_PASSTHROUGH_I440FX_PCI_DEVICE "xen-igd-passthrough-i440FX" + PCIBus *i440fx_init(const char *host_type, const char *pci_type, PCII440FXState **pi440fx_state, int *piix_devfn, ISABus **isa_bus, qemu_irq *pic, -- 1.9.1 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tiejun Chen Subject: [v4][PATCH 4/5] xen:hw:pci-host:piix: create host bridge to passthrough Date: Wed, 6 Aug 2014 14:50:34 +0800 Message-ID: <1407307835-9692-5-git-send-email-tiejun.chen@intel.com> References: <1407307835-9692-1-git-send-email-tiejun.chen@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1407307835-9692-1-git-send-email-tiejun.chen@intel.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: mst@redhat.com Cc: pbonzini@redhat.com, xen-devel@lists.xensource.com, qemu-devel@nongnu.org, stefano.stabellini@eu.citrix.com List-Id: xen-devel@lists.xenproject.org Implement a pci host bridge specific to passthrough. Actually this just inherits the standard one. This is based on http://patchwork.ozlabs.org/patch/363810/. Signed-off-by: Tiejun Chen --- hw/pci-host/piix.c | 39 +++++++++++++++++++++++++++++++++++++++ include/hw/i386/pc.h | 2 ++ 2 files changed, 41 insertions(+) v4: * Rebase v3: * Rebase v2: * Just add prefix with XEN_IGD_PASSTHROUGH/xen_igd_passthrough diff --git a/hw/pci-host/piix.c b/hw/pci-host/piix.c index 4330599..5cac398 100644 --- a/hw/pci-host/piix.c +++ b/hw/pci-host/piix.c @@ -303,6 +303,17 @@ static int i440fx_initfn(PCIDevice *dev) return 0; } +static int xen_igd_passthrough_i440fx_initfn(PCIDevice *dev) +{ + PCII440FXState *d = I440FX_PCI_DEVICE(dev, + TYPE_XEN_IGD_PASSTHROUGH_I440FX_PCI_DEVICE); + + dev->config[I440FX_SMRAM] = 0x02; + + cpu_smm_register(&i440fx_set_smm, d); + return 0; +} + PCIBus *i440fx_init(const char *host_type, const char *pci_type, PCII440FXState **pi440fx_state, int *piix3_devfn, @@ -703,6 +714,33 @@ static const TypeInfo i440fx_info = { .class_init = i440fx_class_init, }; +static void xen_igd_passthrough_i440fx_class_init(ObjectClass *klass, void *data) +{ + DeviceClass *dc = DEVICE_CLASS(klass); + PCIDeviceClass *k = PCI_DEVICE_CLASS(klass); + + k->init = xen_igd_passthrough_i440fx_initfn; + k->vendor_id = PCI_VENDOR_ID_INTEL; + k->device_id = PCI_DEVICE_ID_INTEL_82441; + k->revision = 0x02; + k->class_id = PCI_CLASS_BRIDGE_HOST; + dc->desc = "IGD PT 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 xen_igd_passthrough_i440fx_info = { + .name = TYPE_XEN_IGD_PASSTHROUGH_I440FX_PCI_DEVICE, + .parent = TYPE_PCI_DEVICE, + .instance_size = sizeof(PCII440FXState), + .class_init = xen_igd_passthrough_i440fx_class_init, +}; + static const char *i440fx_pcihost_root_bus_path(PCIHostState *host_bridge, PCIBus *rootbus) { @@ -744,6 +782,7 @@ static const TypeInfo i440fx_pcihost_info = { static void i440fx_register_types(void) { type_register_static(&i440fx_info); + type_register_static(&xen_igd_passthrough_i440fx_info); type_register_static(&piix3_info); type_register_static(&piix3_xen_info); type_register_static(&i440fx_pcihost_info); diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index 11fb72f..de34aa6 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -238,6 +238,8 @@ typedef struct PCII440FXState PCII440FXState; #define TYPE_I440FX_PCI_HOST_BRIDGE "i440FX-pcihost" #define TYPE_I440FX_PCI_DEVICE "i440FX" +#define TYPE_XEN_IGD_PASSTHROUGH_I440FX_PCI_DEVICE "xen-igd-passthrough-i440FX" + PCIBus *i440fx_init(const char *host_type, const char *pci_type, PCII440FXState **pi440fx_state, int *piix_devfn, ISABus **isa_bus, qemu_irq *pic, -- 1.9.1