[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-trivial] [PULL 09/21] xen_pt: QOMify
From: |
Michael Tokarev |
Subject: |
[Qemu-trivial] [PULL 09/21] xen_pt: QOMify |
Date: |
Mon, 22 Jun 2015 14:16:16 +0300 |
From: Gonglei <address@hidden>
Cc: Stefano Stabellini <address@hidden>
Signed-off-by: Gonglei <address@hidden>
Tested-by: Stefano Stabellini <address@hidden>
Signed-off-by: Michael Tokarev <address@hidden>
---
hw/xen/xen_pt.c | 10 +++++-----
hw/xen/xen_pt.h | 4 ++++
2 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/hw/xen/xen_pt.c b/hw/xen/xen_pt.c
index 9afcda8..35ddacc 100644
--- a/hw/xen/xen_pt.c
+++ b/hw/xen/xen_pt.c
@@ -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)
{
- XenPCIPassthroughState *s = DO_UPCAST(XenPCIPassthroughState, dev, d);
+ XenPCIPassthroughState *s = XEN_PT_DEVICE(d);
uint32_t val = 0;
XenPTRegGroup *reg_grp_entry = NULL;
XenPTReg *reg_entry = NULL;
@@ -230,7 +230,7 @@ exit:
static void xen_pt_pci_write_config(PCIDevice *d, uint32_t addr,
uint32_t val, int len)
{
- XenPCIPassthroughState *s = DO_UPCAST(XenPCIPassthroughState, dev, d);
+ XenPCIPassthroughState *s = XEN_PT_DEVICE(d);
int index = 0;
XenPTRegGroup *reg_grp_entry = NULL;
int rc = 0;
@@ -679,7 +679,7 @@ static const MemoryListener xen_pt_io_listener = {
static int xen_pt_initfn(PCIDevice *d)
{
- XenPCIPassthroughState *s = DO_UPCAST(XenPCIPassthroughState, dev, d);
+ XenPCIPassthroughState *s = XEN_PT_DEVICE(d);
int rc = 0;
uint8_t machine_irq = 0;
uint16_t cmd = 0;
@@ -797,7 +797,7 @@ out:
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 intx = xen_pt_pci_intx(s);
int rc;
@@ -868,7 +868,7 @@ static void xen_pci_passthrough_class_init(ObjectClass
*klass, void *data)
};
static const TypeInfo xen_pci_passthrough_info = {
- .name = "xen-pci-passthrough",
+ .name = TYPE_XEN_PT_DEVICE,
.parent = TYPE_PCI_DEVICE,
.instance_size = sizeof(XenPCIPassthroughState),
.class_init = xen_pci_passthrough_class_init,
diff --git a/hw/xen/xen_pt.h b/hw/xen/xen_pt.h
index 4bba559..87a6677 100644
--- a/hw/xen/xen_pt.h
+++ b/hw/xen/xen_pt.h
@@ -36,6 +36,10 @@ typedef struct XenPTReg XenPTReg;
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 */
typedef int (*xen_pt_conf_reg_init)
(XenPCIPassthroughState *, XenPTRegInfo *, uint32_t real_offset,
--
2.1.4
- [Qemu-trivial] [PULL 19/21] hw/display/cg3.c: Fix memory leak, (continued)
- [Qemu-trivial] [PULL 19/21] hw/display/cg3.c: Fix memory leak, Michael Tokarev, 2015/06/22
- [Qemu-trivial] [PULL 14/21] throttle: Fix typo in the documentation of block_set_io_throttle, Michael Tokarev, 2015/06/22
- [Qemu-trivial] [PULL 08/21] wdt_i6300esb: QOMify, Michael Tokarev, 2015/06/22
- [Qemu-trivial] [PULL 17/21] Makefile: Fix "make cscope TAGS", Michael Tokarev, 2015/06/22
- [Qemu-trivial] [PULL 18/21] Makefile: Add "make ctags", Michael Tokarev, 2015/06/22
- [Qemu-trivial] [PULL 10/21] vt82c686: QOMify, Michael Tokarev, 2015/06/22
- [Qemu-trivial] [PULL 07/21] piix4: QOMify, Michael Tokarev, 2015/06/22
- [Qemu-trivial] [PULL 04/21] Print error when failing to load PCI config data, Michael Tokarev, 2015/06/22
- [Qemu-trivial] [PULL 20/21] hw/display/tcx.c: Fix memory leak, Michael Tokarev, 2015/06/22
- [Qemu-trivial] [PULL 15/21] qemu-options: Improve -global documentation, Michael Tokarev, 2015/06/22
- [Qemu-trivial] [PULL 09/21] xen_pt: QOMify,
Michael Tokarev <=
- [Qemu-trivial] [PULL 21/21] util/qemu-sockets: improve ai_flag hints for ipv6 hosts, Michael Tokarev, 2015/06/22
- [Qemu-trivial] [PULL 05/21] pci-assign: QOMify, Michael Tokarev, 2015/06/22
- [Qemu-trivial] [PULL 06/21] piix: piix3 QOMify, Michael Tokarev, 2015/06/22
- [Qemu-trivial] [PULL 11/21] libcacard: pkgconfig: tidy dependent libs, Michael Tokarev, 2015/06/22
- [Qemu-trivial] [PULL 13/21] hw/display/qxl-logger.c: Constify some variable, Michael Tokarev, 2015/06/22
- [Qemu-trivial] [PULL 03/21] Grammar: 'as to'->'as for', Michael Tokarev, 2015/06/22
- [Qemu-trivial] [PULL 12/21] configure: rearrange --help and consolidate enable/disable together, Michael Tokarev, 2015/06/22
- [Qemu-trivial] [PULL 16/21] qemu-options: Use @itemx where appropriate, Michael Tokarev, 2015/06/22
- [Qemu-trivial] [PULL 02/21] remove libdecnumber/dpd/decimal128Local.h, Michael Tokarev, 2015/06/22
- Re: [Qemu-trivial] [Qemu-devel] [PULL 00/21] Trivial patches for 2015-06-22, Peter Maydell, 2015/06/22