mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-05 16:53:55 -06:00
dma: Let ld*_dma() propagate MemTxResult
dma_memory_read() returns a MemTxResult type. Do not discard it, return it to the caller. Update the few callers. Reviewed-by: Richard Henderson <richard.henderson@linaro.org> Reviewed-by: Cédric Le Goater <clg@kaod.org> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> Message-Id: <20211223115554.3155328-19-philmd@redhat.com>
This commit is contained in:
parent
24aed6bcb6
commit
cd1db8df74
5 changed files with 29 additions and 23 deletions
|
@ -240,14 +240,15 @@ static inline void dma_memory_unmap(AddressSpace *as,
|
|||
}
|
||||
|
||||
#define DEFINE_LDST_DMA(_lname, _sname, _bits, _end) \
|
||||
static inline uint##_bits##_t ld##_lname##_##_end##_dma(AddressSpace *as, \
|
||||
dma_addr_t addr, \
|
||||
MemTxAttrs attrs) \
|
||||
{ \
|
||||
uint##_bits##_t val; \
|
||||
dma_memory_read(as, addr, &val, (_bits) / 8, attrs); \
|
||||
return _end##_bits##_to_cpu(val); \
|
||||
} \
|
||||
static inline MemTxResult ld##_lname##_##_end##_dma(AddressSpace *as, \
|
||||
dma_addr_t addr, \
|
||||
uint##_bits##_t *pval, \
|
||||
MemTxAttrs attrs) \
|
||||
{ \
|
||||
MemTxResult res = dma_memory_read(as, addr, pval, (_bits) / 8, attrs); \
|
||||
_end##_bits##_to_cpus(pval); \
|
||||
return res; \
|
||||
} \
|
||||
static inline MemTxResult st##_sname##_##_end##_dma(AddressSpace *as, \
|
||||
dma_addr_t addr, \
|
||||
uint##_bits##_t val, \
|
||||
|
@ -257,12 +258,10 @@ static inline void dma_memory_unmap(AddressSpace *as,
|
|||
return dma_memory_write(as, addr, &val, (_bits) / 8, attrs); \
|
||||
}
|
||||
|
||||
static inline uint8_t ldub_dma(AddressSpace *as, dma_addr_t addr, MemTxAttrs attrs)
|
||||
static inline MemTxResult ldub_dma(AddressSpace *as, dma_addr_t addr,
|
||||
uint8_t *val, MemTxAttrs attrs)
|
||||
{
|
||||
uint8_t val;
|
||||
|
||||
dma_memory_read(as, addr, &val, 1, attrs);
|
||||
return val;
|
||||
return dma_memory_read(as, addr, val, 1, attrs);
|
||||
}
|
||||
|
||||
static inline MemTxResult stb_dma(AddressSpace *as, dma_addr_t addr,
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue