diff options
| author | Peter Maydell | 2015-06-10 17:52:34 +0200 |
|---|---|---|
| committer | Peter Maydell | 2015-06-10 17:52:35 +0200 |
| commit | 3974c9d8ccfccbd81edc9df271fcae7082f3921d (patch) | |
| tree | 220d33e6b92aa3b3e68de39a80ed277a820c3e92 /trace-events | |
| parent | Merge remote-tracking branch 'remotes/awilliam/tags/vfio-update-20150609.0' i... (diff) | |
| parent | bios-tables-test: handle false-positive smbios signature matches (diff) | |
| download | qemu-3974c9d8ccfccbd81edc9df271fcae7082f3921d.tar.gz qemu-3974c9d8ccfccbd81edc9df271fcae7082f3921d.tar.xz qemu-3974c9d8ccfccbd81edc9df271fcae7082f3921d.zip | |
Merge remote-tracking branch 'remotes/kraxel/tags/pull-fw_cfg-20150610-1' into staging
fw_cfg: drop write support, qemu cmdline support, bugfixes.
bios-tables-test: fix smbios test.
# gpg: Signature made Wed Jun 10 07:29:53 2015 BST using RSA key ID D3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>"
# gpg: aka "Gerd Hoffmann <gerd@kraxel.org>"
# gpg: aka "Gerd Hoffmann (private) <kraxel@gmail.com>"
* remotes/kraxel/tags/pull-fw_cfg-20150610-1:
bios-tables-test: handle false-positive smbios signature matches
fw_cfg: insert fw_cfg file blobs via qemu cmdline
fw_cfg: prohibit insertion of duplicate fw_cfg file names
fw_cfg: prevent selector key conflict
fw_cfg: remove support for guest-side data writes
fw_cfg: fix FW_CFG_BOOT_DEVICE update on ppc and sparc
fw_cfg: add fw_cfg_modify_i16 (update) method
QemuOpts: increase number of vm_config_groups
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'trace-events')
| -rw-r--r-- | trace-events | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/trace-events b/trace-events index 7af9f19a33..09d94ea980 100644 --- a/trace-events +++ b/trace-events @@ -193,10 +193,8 @@ ecc_diag_mem_writeb(uint64_t addr, uint32_t val) "Write diagnostic %"PRId64" = % ecc_diag_mem_readb(uint64_t addr, uint32_t ret) "Read diagnostic %"PRId64"= %02x" # hw/nvram/fw_cfg.c -fw_cfg_write(void *s, uint8_t value) "%p %d" 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_add_file_dupe(void *s, char *name) "%p %s" fw_cfg_add_file(void *s, int index, char *name, size_t len) "%p #%d: %s (%zd bytes)" # hw/block/hd-geometry.c |