Re: [Qemu-devel] [PATCHv3 0/5] fw_cfg: qdev-related tidy-ups

[Mark Cave-Ayland]

On 16/06/17 13:18, address@hidden wrote:

> In file included from /tmp/qemu-test/src/include/hw/loader.h:5,
>                  from /tmp/qemu-test/src/device_tree.c:27:
> /tmp/qemu-test/src/include/hw/nvram/fw_cfg.h:75: error: redefinition of 
> typedef ‘FWCfgState’
> /tmp/qemu-test/src/include/qemu/typedefs.h:35: note: previous declaration of 
> ‘FWCfgState’ was here
> /tmp/qemu-test/src/include/hw/nvram/fw_cfg.h:84: error: redefinition of 
> typedef ‘FWCfgIoState’
> /tmp/qemu-test/src/include/qemu/typedefs.h:33: note: previous declaration of 
> ‘FWCfgIoState’ was here
> /tmp/qemu-test/src/include/hw/nvram/fw_cfg.h:94: error: redefinition of 
> typedef ‘FWCfgMemState’
> /tmp/qemu-test/src/include/qemu/typedefs.h:34: note: previous declaration of 
> ‘FWCfgMemState’ was here
> make: *** [device_tree.o] Error 1
> make: *** Waiting for unfinished jobs....
> In file included from /tmp/qemu-test/src/include/hw/loader.h:5,
>                  from /tmp/qemu-test/src/vl.c:73:
> /tmp/qemu-test/src/include/hw/nvram/fw_cfg.h:75: error: redefinition of 
> typedef ‘FWCfgState’
> /tmp/qemu-test/src/include/qemu/typedefs.h:35: note: previous declaration of 
> ‘FWCfgState’ was here
> /tmp/qemu-test/src/include/hw/nvram/fw_cfg.h:84: error: redefinition of 
> typedef ‘FWCfgIoState’
> /tmp/qemu-test/src/include/qemu/typedefs.h:33: note: previous declaration of 
> ‘FWCfgIoState’ was here
> /tmp/qemu-test/src/include/hw/nvram/fw_cfg.h:94: error: redefinition of 
> typedef ‘FWCfgMemState’
> /tmp/qemu-test/src/include/qemu/typedefs.h:34: note: previous declaration of 
> ‘FWCfgMemState’ was here
> make: *** [vl.o] Error 1
> tests/docker/Makefile.include:118: recipe for target 'docker-run' failed
> make[1]: *** [docker-run] Error 2
> make[1]: Leaving directory '/var/tmp/patchew-tester-tmp-mjmbvk4m/src'
> tests/docker/Makefile.include:149: recipe for target 'address@hidden' failed
> make: *** address@hidden Error 2
> === OUTPUT END ===

During the rework I accidentally picked up a change from an experimental
branch which (among other changes) added typedefs to the FWCfg*State
structs which I though were needed, but really aren't because they are
already defined in typedefs.h.

Revised version to follow shortly.


ATB,

Mark.