From: Peter Maydell Date: Wed, 10 Jun 2015 15:52:34 +0000 (+0100) Subject: Merge remote-tracking branch 'remotes/kraxel/tags/pull-fw_cfg-20150610-1' into staging X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=3974c9d8ccfccbd81edc9df271fcae7082f3921d;p=qemu.git 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) " # gpg: aka "Gerd Hoffmann " # gpg: aka "Gerd Hoffmann (private) " * 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 --- 3974c9d8ccfccbd81edc9df271fcae7082f3921d