diff options
| author | Gabriel L. Somlo <somlo@cmu.edu> | 2015-11-05 09:32:51 -0500 |
|---|---|---|
| committer | Gerd Hoffmann <kraxel@redhat.com> | 2015-12-15 11:45:59 +0100 |
| commit | 38bf20931afe761fccda6e1eb91d64c7498ed9c9 (patch) | |
| tree | 5ec403d6462051ec06961da5aafeda072e8d3d36 /trace-events | |
| parent | 66f8fd9dda312191b78d2a2ba2848bcee76127a2 (diff) | |
| download | qemu-38bf20931afe761fccda6e1eb91d64c7498ed9c9.zip qemu-38bf20931afe761fccda6e1eb91d64c7498ed9c9.tar.gz qemu-38bf20931afe761fccda6e1eb91d64c7498ed9c9.tar.bz2 | |
fw_cfg: add generic non-DMA read method
Introduce fw_cfg_data_read(), a generic read method which works
on all access widths (1 through 8 bytes, inclusive), and can be
used during both IOPort and MMIO read accesses.
To maintain legibility, only fw_cfg_data_mem_read() (the MMIO
data read method) is replaced by this patch. The new method
essentially unwinds the fw_cfg_data_mem_read() + fw_cfg_read()
combo, but without unnecessarily repeating all the validity
checks performed by the latter on each byte being read.
This patch also modifies the trace_fw_cfg_read prototype to
accept a 64-bit value argument, allowing it to work properly
with the new read method, but also remain backward compatible
with existing call sites.
Cc: Laszlo Ersek <lersek@redhat.com>
Cc: Gerd Hoffmann <kraxel@redhat.com>
Cc: Marc Marí <markmb@redhat.com>
Signed-off-by: Gabriel Somlo <somlo@cmu.edu>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
Message-id: 1446733972-1602-6-git-send-email-somlo@cmu.edu
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Diffstat (limited to 'trace-events')
| -rw-r--r-- | trace-events | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/trace-events b/trace-events index 2fce98e..7fc4d11 100644 --- a/trace-events +++ b/trace-events @@ -196,7 +196,7 @@ ecc_diag_mem_readb(uint64_t addr, uint32_t ret) "Read diagnostic %"PRId64"= %02x # hw/nvram/fw_cfg.c fw_cfg_select(void *s, uint16_t key, int ret) "%p key %d = %d" -fw_cfg_read(void *s, uint8_t ret) "%p = %d" +fw_cfg_read(void *s, uint64_t ret) "%p = %"PRIx64 fw_cfg_add_file(void *s, int index, char *name, size_t len) "%p #%d: %s (%zd bytes)" # hw/block/hd-geometry.c |