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 /include/hw/virtio/virtio-net.h | |
| 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 'include/hw/virtio/virtio-net.h')
0 files changed, 0 insertions, 0 deletions