On 9 June 2015 at 13:27, Gerd Hoffmann <kra...@redhat.com> wrote:
> Hi,
>
> Here comes the fw_cfg patch queue, bringing a patch series from Gabriel
> which drops the (unused) fw_cfg write support and adds a command line
> switch to add blobs to fw_cfg. Also some bugfixes.
>
> New in v2: two additional patches (2+3) to fix the FW_CFG_BOOT_DEVICE
> update on ppc and sparc, which made "make check" fail in v1.
>
> please pull,
> Gerd
>
> The following changes since commit ee09f84e6bf5383a23c9624115c26b72aa1e076c:
>
> Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into
> staging (2015-06-08 15:57:41 +0100)
>
> are available in the git repository at:
>
>
> git://git.kraxel.org/qemu tags/pull-fw_cfg-20150609-1
>
> for you to fetch changes up to 329de1f9e4930130a7374ec8f2daf3976d4a6c8b:
>
> bios-tables-test: handle false-positive smbios signature matches
> (2015-06-09 14:04:14 +0200)
>
> ----------------------------------------------------------------
> fw_cfg: drop write support, qemu cmdline support, bugfixes.
> bios-tables-test: fix smbios test.
>
> ----------------------------------------------------------------
Fails to build:
/home/petmay01/linaro/qemu-for-merges/vl.c: In function ‘main’:
/home/petmay01/linaro/qemu-for-merges/vl.c:4336:27: error: passing
argument 2 of ‘qemu_optts_foreach’ from incompatible pointer type
[-Werror]
parse_fw_cfg, fw_cfg_find(), 1) != 0) {
^
In file included from
/home/petmay01/linaro/qemu-for-merges/include/qemu/sockets.h:29:0,
from /home/petmay01/linaro/qemu-for-merges/vl.c:61:
/home/petmay01/linaro/qemu-for-merges/include/qemu/option.h:131:5:
note: expected ‘qemu_oppts_loopfunc’ but argument is of type ‘int
(*)(struct QemuOpts *, void *)’
int qemu_opts_foreach(QemuOptsList *list, qemu_opts_loopfunc func,
^
/home/petmay01/linaro/qemu-for-merges/vl.c:4336:27: error: passing
argument 4 of ‘qemu_optts_foreach’ makes pointer from integer without
a cast [-Werror]
parse_fw_cfg, fw_cfg_find(), 1) != 0) {
^
In file included from
/home/petmay01/linaro/qemu-for-merges/include/qemu/sockets.h:29:0,
from /home/petmay01/linaro/qemu-for-merges/vl.c:61:
/home/petmay01/linaro/qemu-for-merges/include/qemu/option.h:131:5:
note: expected ‘struct Error **’ but argument is of type ‘int’
int qemu_opts_foreach(QemuOptsList *list, qemu_opts_loopfunc func,
^
cc1: all warnings being treated as errors
I'm afraid you've collided with Markus' "Convert qemu_opt_foreach() to Error"
changes.
thanks
-- PMM
