OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

xen_pt: QOMify

Browse Source 
Cc: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Signed-off-by: Gonglei <arei.gonglei@huawei.com>
Tested-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
This commit is contained in:
Gonglei 2015-05-13 08:43:26 +08:00 committed by Michael Tokarev
parent 41fc9050fe
commit f9b9d292af
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
hw/xen/xen_pt.c
View File

@ -125,7 +125,7 @@ int xen_pt_bar_offset_to_index(uint32_t offset)
static uint32_t xen_pt_pci_read_config(PCIDevice *d, uint32_t addr, int len) static uint32_t xen_pt_pci_read_config(PCIDevice *d, uint32_t addr, int len)
{ {
XenPCIPassthroughState *s = DO_UPCAST(XenPCIPassthroughState, dev, d); XenPCIPassthroughState *s = XEN_PT_DEVICE(d);
uint32_t val = 0; uint32_t val = 0;
XenPTRegGroup *reg_grp_entry = NULL; XenPTRegGroup *reg_grp_entry = NULL;
XenPTReg *reg_entry = NULL; XenPTReg *reg_entry = NULL;
@ -230,7 +230,7 @@ exit:
static void xen_pt_pci_write_config(PCIDevice *d, uint32_t addr, static void xen_pt_pci_write_config(PCIDevice *d, uint32_t addr,
uint32_t val, int len) uint32_t val, int len)
{ {
XenPCIPassthroughState *s = DO_UPCAST(XenPCIPassthroughState, dev, d); XenPCIPassthroughState *s = XEN_PT_DEVICE(d);
int index = 0; int index = 0;
XenPTRegGroup *reg_grp_entry = NULL; XenPTRegGroup *reg_grp_entry = NULL;
int rc = 0; int rc = 0;
@ -679,7 +679,7 @@ static const MemoryListener xen_pt_io_listener = {
static int xen_pt_initfn(PCIDevice *d) static int xen_pt_initfn(PCIDevice *d)
{ {
XenPCIPassthroughState *s = DO_UPCAST(XenPCIPassthroughState, dev, d); XenPCIPassthroughState *s = XEN_PT_DEVICE(d);
int rc = 0; int rc = 0;
uint8_t machine_irq = 0; uint8_t machine_irq = 0;
uint16_t cmd = 0; uint16_t cmd = 0;
@ -797,7 +797,7 @@ out:
static void xen_pt_unregister_device(PCIDevice *d) static void xen_pt_unregister_device(PCIDevice *d)
{ {
XenPCIPassthroughState *s = DO_UPCAST(XenPCIPassthroughState, dev, d); XenPCIPassthroughState *s = XEN_PT_DEVICE(d);
uint8_t machine_irq = s->machine_irq; uint8_t machine_irq = s->machine_irq;
uint8_t intx = xen_pt_pci_intx(s); uint8_t intx = xen_pt_pci_intx(s);
int rc; int rc;
@ -868,7 +868,7 @@ static void xen_pci_passthrough_class_init(ObjectClass *klass, void *data)
}; };
static const TypeInfo xen_pci_passthrough_info = { static const TypeInfo xen_pci_passthrough_info = {
.name = "xen-pci-passthrough", .name = TYPE_XEN_PT_DEVICE,
.parent = TYPE_PCI_DEVICE, .parent = TYPE_PCI_DEVICE,
.instance_size = sizeof(XenPCIPassthroughState), .instance_size = sizeof(XenPCIPassthroughState),
.class_init = xen_pci_passthrough_class_init, .class_init = xen_pci_passthrough_class_init,

4
hw/xen/xen_pt.h
View File

@ -36,6 +36,10 @@ typedef struct XenPTReg XenPTReg;
typedef struct XenPCIPassthroughState XenPCIPassthroughState; typedef struct XenPCIPassthroughState XenPCIPassthroughState;
#define TYPE_XEN_PT_DEVICE "xen-pci-passthrough"
#define XEN_PT_DEVICE(obj) \
OBJECT_CHECK(XenPCIPassthroughState, (obj), TYPE_XEN_PT_DEVICE)
/* function type for config reg */ /* function type for config reg */
typedef int (*xen_pt_conf_reg_init) typedef int (*xen_pt_conf_reg_init)
(XenPCIPassthroughState *, XenPTRegInfo *, uint32_t real_offset, (XenPCIPassthroughState *, XenPTRegInfo *, uint32_t real_offset,