Revision df32fd1c include/hw/ppc/spapr_vio.h

b/include/hw/ppc/spapr_vio.h
64 64
    target_ulong signal_state;
65 65
    VIOsPAPR_CRQ crq;
66 66
    AddressSpace as;
67
    DMAContext dma;
68 67
    sPAPRTCETable *tcet;
69 68
};
70 69

  
......
93 92
static inline bool spapr_vio_dma_valid(VIOsPAPRDevice *dev, uint64_t taddr,
94 93
                                       uint32_t size, DMADirection dir)
95 94
{
96
    return dma_memory_valid(&dev->dma, taddr, size, dir);
95
    return dma_memory_valid(&dev->as, taddr, size, dir);
97 96
}
98 97

  
99 98
static inline int spapr_vio_dma_read(VIOsPAPRDevice *dev, uint64_t taddr,
100 99
                                     void *buf, uint32_t size)
101 100
{
102
    return (dma_memory_read(&dev->dma, taddr, buf, size) != 0) ?
101
    return (dma_memory_read(&dev->as, taddr, buf, size) != 0) ?
103 102
        H_DEST_PARM : H_SUCCESS;
104 103
}
105 104

  
106 105
static inline int spapr_vio_dma_write(VIOsPAPRDevice *dev, uint64_t taddr,
107 106
                                      const void *buf, uint32_t size)
108 107
{
109
    return (dma_memory_write(&dev->dma, taddr, buf, size) != 0) ?
108
    return (dma_memory_write(&dev->as, taddr, buf, size) != 0) ?
110 109
        H_DEST_PARM : H_SUCCESS;
111 110
}
112 111

  
113 112
static inline int spapr_vio_dma_set(VIOsPAPRDevice *dev, uint64_t taddr,
114 113
                                    uint8_t c, uint32_t size)
115 114
{
116
    return (dma_memory_set(&dev->dma, taddr, c, size) != 0) ?
115
    return (dma_memory_set(&dev->as, taddr, c, size) != 0) ?
117 116
        H_DEST_PARM : H_SUCCESS;
118 117
}
119 118

  
120
#define vio_stb(_dev, _addr, _val) (stb_dma(&(_dev)->dma, (_addr), (_val)))
121
#define vio_sth(_dev, _addr, _val) (stw_be_dma(&(_dev)->dma, (_addr), (_val)))
122
#define vio_stl(_dev, _addr, _val) (stl_be_dma(&(_dev)->dma, (_addr), (_val)))
123
#define vio_stq(_dev, _addr, _val) (stq_be_dma(&(_dev)->dma, (_addr), (_val)))
124
#define vio_ldq(_dev, _addr) (ldq_be_dma(&(_dev)->dma, (_addr)))
119
#define vio_stb(_dev, _addr, _val) (stb_dma(&(_dev)->as, (_addr), (_val)))
120
#define vio_sth(_dev, _addr, _val) (stw_be_dma(&(_dev)->as, (_addr), (_val)))
121
#define vio_stl(_dev, _addr, _val) (stl_be_dma(&(_dev)->as, (_addr), (_val)))
122
#define vio_stq(_dev, _addr, _val) (stq_be_dma(&(_dev)->as, (_addr), (_val)))
123
#define vio_ldq(_dev, _addr) (ldq_be_dma(&(_dev)->as, (_addr)))
125 124

  
126 125
int spapr_vio_send_crq(VIOsPAPRDevice *dev, uint8_t *crq);
127 126

  

Also available in: Unified diff