Re: [Qemu-devel] [PULL 00/29] Header cleanup patches for 2019-08-13
Philippe Mathieu-Daudé writes: > On 8/16/19 1:23 PM, Philippe Mathieu-Daudé wrote: >> On 8/16/19 12:59 PM, Peter Maydell wrote: >>> On Tue, 13 Aug 2019 at 16:54, Markus Armbruster wrote: The following changes since commit 864ab314f1d924129d06ac7b571f105a2b76a4b2: Update version for v4.1.0-rc4 release (2019-08-06 17:05:21 +0100) are available in the Git repository at: git://repo.or.cz/qemu/armbru.git tags/pull-include-2019-08-13 for you to fetch changes up to 8d111fd683b678d3826e192bc07ffcc349a118b5: sysemu: Split sysemu/runstate.h off sysemu/sysemu.h (2019-08-13 13:16:20 +0200) Header cleanup patches for 2019-08-13 These patches are rather bothersome to rebase, so I'd like to get them into 4.2 early. >>> >>> Fails to build on OSX I'm afraid: >>> /Users/pm215/src/qemu-for-merges/ui/cocoa.m:1166:5: error: implicit >>> declaration of function 'qemu_system_shutdown_request' is invalid in >>> C99 [-Werror,-Wimplicit-function-declaration] >>> qemu_system_shutdown_request(SHUTDOWN_CAUSE_HOST_UI); >>> ^ >> >> Ah I reported this one while reviewing v2: >> https://lists.gnu.org/archive/html/qemu-devel/2019-08/msg01150.html >> >> Then didn't take the time to test OSX on v4 :( >> >> BTW Travis should find this. > > Actually I did try v4 on Travis and it succeeded: > https://travis-ci.org/philmd/qemu/builds/570743079 > > But Travis seems to have updated smth on their OSX images (or brew is > down?), now I get: > > ERROR: glib-2.40 gthread-2.0 is required to compile QEMU > > Anyway, the culprit is: > > commit 8d111fd683b678d3826e192bc07ffcc349a118b5 (tag: > pull-include-2019-08-13) > Author: Markus Armbruster > Date: Mon Aug 12 07:23:59 2019 +0200 > > sysemu: Split sysemu/runstate.h off sysemu/sysemu.h > > sysemu/sysemu.h is a rather unfocused dumping ground for stuff related > to the system-emulator. Evidence: > > * It's included widely: in my "build everything" tree, changing > sysemu/sysemu.h still triggers a recompile of some 1100 out of 6600 > objects (not counting tests and objects that don't depend on > qemu/osdep.h, down from 5400 due to the previous two commits). > > * It pulls in more than a dozen additional headers. > > ui/cocoa.m now needs to include "sysemu/runstate.h". v2 sent. Thanks!
Re: [Qemu-devel] [PULL 00/29] Header cleanup patches for 2019-08-13
On 8/16/19 1:23 PM, Philippe Mathieu-Daudé wrote: > On 8/16/19 12:59 PM, Peter Maydell wrote: >> On Tue, 13 Aug 2019 at 16:54, Markus Armbruster wrote: >>> >>> The following changes since commit 864ab314f1d924129d06ac7b571f105a2b76a4b2: >>> >>> Update version for v4.1.0-rc4 release (2019-08-06 17:05:21 +0100) >>> >>> are available in the Git repository at: >>> >>> git://repo.or.cz/qemu/armbru.git tags/pull-include-2019-08-13 >>> >>> for you to fetch changes up to 8d111fd683b678d3826e192bc07ffcc349a118b5: >>> >>> sysemu: Split sysemu/runstate.h off sysemu/sysemu.h (2019-08-13 13:16:20 >>> +0200) >>> >>> >>> Header cleanup patches for 2019-08-13 >>> >>> >>> These patches are rather bothersome to rebase, so I'd like to get them >>> into 4.2 early. >>> >> >> Fails to build on OSX I'm afraid: >> /Users/pm215/src/qemu-for-merges/ui/cocoa.m:1166:5: error: implicit >> declaration of function 'qemu_system_shutdown_request' is invalid in >> C99 [-Werror,-Wimplicit-function-declaration] >> qemu_system_shutdown_request(SHUTDOWN_CAUSE_HOST_UI); >> ^ > > Ah I reported this one while reviewing v2: > https://lists.gnu.org/archive/html/qemu-devel/2019-08/msg01150.html > > Then didn't take the time to test OSX on v4 :( > > BTW Travis should find this. Actually I did try v4 on Travis and it succeeded: https://travis-ci.org/philmd/qemu/builds/570743079 But Travis seems to have updated smth on their OSX images (or brew is down?), now I get: ERROR: glib-2.40 gthread-2.0 is required to compile QEMU Anyway, the culprit is: commit 8d111fd683b678d3826e192bc07ffcc349a118b5 (tag: pull-include-2019-08-13) Author: Markus Armbruster Date: Mon Aug 12 07:23:59 2019 +0200 sysemu: Split sysemu/runstate.h off sysemu/sysemu.h sysemu/sysemu.h is a rather unfocused dumping ground for stuff related to the system-emulator. Evidence: * It's included widely: in my "build everything" tree, changing sysemu/sysemu.h still triggers a recompile of some 1100 out of 6600 objects (not counting tests and objects that don't depend on qemu/osdep.h, down from 5400 due to the previous two commits). * It pulls in more than a dozen additional headers. ui/cocoa.m now needs to include "sysemu/runstate.h".
Re: [Qemu-devel] [PULL 00/29] Header cleanup patches for 2019-08-13
On 8/16/19 12:59 PM, Peter Maydell wrote: > On Tue, 13 Aug 2019 at 16:54, Markus Armbruster wrote: >> >> The following changes since commit 864ab314f1d924129d06ac7b571f105a2b76a4b2: >> >> Update version for v4.1.0-rc4 release (2019-08-06 17:05:21 +0100) >> >> are available in the Git repository at: >> >> git://repo.or.cz/qemu/armbru.git tags/pull-include-2019-08-13 >> >> for you to fetch changes up to 8d111fd683b678d3826e192bc07ffcc349a118b5: >> >> sysemu: Split sysemu/runstate.h off sysemu/sysemu.h (2019-08-13 13:16:20 >> +0200) >> >> >> Header cleanup patches for 2019-08-13 >> >> >> These patches are rather bothersome to rebase, so I'd like to get them >> into 4.2 early. >> > > Fails to build on OSX I'm afraid: > /Users/pm215/src/qemu-for-merges/ui/cocoa.m:1166:5: error: implicit > declaration of function 'qemu_system_shutdown_request' is invalid in > C99 [-Werror,-Wimplicit-function-declaration] > qemu_system_shutdown_request(SHUTDOWN_CAUSE_HOST_UI); > ^ Ah I reported this one while reviewing v2: https://lists.gnu.org/archive/html/qemu-devel/2019-08/msg01150.html Then didn't take the time to test OSX on v4 :( BTW Travis should find this.
Re: [Qemu-devel] [PULL 00/29] Header cleanup patches for 2019-08-13
On Tue, 13 Aug 2019 at 16:54, Markus Armbruster wrote: > > The following changes since commit 864ab314f1d924129d06ac7b571f105a2b76a4b2: > > Update version for v4.1.0-rc4 release (2019-08-06 17:05:21 +0100) > > are available in the Git repository at: > > git://repo.or.cz/qemu/armbru.git tags/pull-include-2019-08-13 > > for you to fetch changes up to 8d111fd683b678d3826e192bc07ffcc349a118b5: > > sysemu: Split sysemu/runstate.h off sysemu/sysemu.h (2019-08-13 13:16:20 > +0200) > > > Header cleanup patches for 2019-08-13 > > > These patches are rather bothersome to rebase, so I'd like to get them > into 4.2 early. > Fails to build on OSX I'm afraid: /Users/pm215/src/qemu-for-merges/ui/cocoa.m:1166:5: error: implicit declaration of function 'qemu_system_shutdown_request' is invalid in C99 [-Werror,-Wimplicit-function-declaration] qemu_system_shutdown_request(SHUTDOWN_CAUSE_HOST_UI); ^ thanks -- PMM
[Qemu-devel] [PULL 00/29] Header cleanup patches for 2019-08-13
The following changes since commit 864ab314f1d924129d06ac7b571f105a2b76a4b2: Update version for v4.1.0-rc4 release (2019-08-06 17:05:21 +0100) are available in the Git repository at: git://repo.or.cz/qemu/armbru.git tags/pull-include-2019-08-13 for you to fetch changes up to 8d111fd683b678d3826e192bc07ffcc349a118b5: sysemu: Split sysemu/runstate.h off sysemu/sysemu.h (2019-08-13 13:16:20 +0200) Header cleanup patches for 2019-08-13 These patches are rather bothersome to rebase, so I'd like to get them into 4.2 early. Markus Armbruster (29): include: Make headers more self-contained Include generated QAPI headers less qapi: Split error.json off common.json memory: Fix type of IOMMUMemoryRegionClass member @parent_class queue: Drop superfluous #include qemu/atomic.h trace: Eliminate use of TARGET_FMT_plx trace: Do not include qom/cpu.h into generated trace.h Include sysemu/reset.h a lot less Include migration/qemu-file-types.h a lot less ide: Include hw/ide/internal a bit less outside hw/ide/ typedefs: Separate incomplete types and function types Include hw/irq.h a lot less Clean up inclusion of exec/cpu-common.h migration: Move the VMStateDescription typedef to typedefs.h Include migration/vmstate.h less Include exec/memory.h slightly less Include qom/object.h slightly less Include hw/hw.h exactly where needed Include qemu/queue.h slightly less Include qemu/main-loop.h less Include hw/qdev-properties.h less Include hw/boards.h a bit less numa: Don't include hw/boards.h into sysemu/numa.h Include sysemu/hostmem.h less numa: Move remaining NUMA declarations from sysemu.h to numa.h Clean up inclusion of sysemu/sysemu.h Include sysemu/sysemu.h a lot less sysemu: Move the VMChangeStateEntry typedef to qemu/typedefs.h sysemu: Split sysemu/runstate.h off sysemu/sysemu.h qapi/common.json | 24 --- qapi/error.json | 29 ++ qapi/qapi-schema.json| 1 + fsdev/qemu-fsdev-throttle.h | 1 - hw/9pfs/coth.h | 1 - hw/alpha/alpha_sys.h | 1 - hw/audio/intel-hda.h | 2 +- hw/audio/lm4549.h| 1 + hw/display/qxl.h | 1 - hw/hppa/hppa_sys.h | 1 - hw/i386/amd_iommu.h | 1 - hw/ide/ahci_internal.h | 1 + hw/lm32/lm32.h | 1 + hw/lm32/milkymist-hw.h | 2 +- hw/microblaze/boot.h | 1 - hw/net/can/can_sja1000.h | 1 + hw/net/fsl_etsec/etsec.h | 1 - hw/net/ne2000.h | 1 - hw/net/pcnet.h | 1 + hw/nios2/boot.h | 1 - hw/ppc/mac.h | 1 - hw/s390x/ipl.h | 2 +- hw/usb/ccid.h| 2 +- hw/usb/hcd-ehci.h| 2 - hw/xtensa/xtensa_memory.h| 1 - include/authz/listfile.h | 1 - include/block/block.h| 1 - include/block/block_int.h| 1 - include/block/raw-aio.h | 2 + include/block/write-threshold.h | 2 + include/chardev/char-fe.h| 1 + include/chardev/char-io.h| 1 + include/chardev/char.h | 2 +- include/disas/disas.h| 1 + include/exec/cpu-defs.h | 1 - include/exec/cputlb.h| 3 ++ include/exec/exec-all.h | 1 + include/exec/ioport.h| 2 + include/exec/memory-internal.h | 2 + include/exec/memory.h| 10 - include/exec/ram_addr.h | 1 + include/exec/softmmu-semi.h | 2 + include/exec/tb-hash.h | 2 + include/exec/user/thunk.h| 2 + include/fpu/softfloat-macros.h | 2 + include/hw/acpi/acpi.h | 1 - include/hw/acpi/acpi_dev_interface.h | 2 + include/hw/acpi/pci.h| 3 ++ include/hw/acpi/tco.h| 2 + include/hw/acpi/vmgenid.h| 2 +- include/hw/adc/stm32f2xx_adc.h | 2 + include/hw/arm/allwinner-a10.h | 3 +- include/hw/arm/aspeed_soc.h | 1 + include/hw/arm/bcm2836.h | 1 + include/hw/arm/boot.h| 2 - include/hw/arm/exynos4210.h | 3 +- include/hw/arm/fsl-imx25.h | 1 + include/hw/arm/fsl-imx31.h | 1 +
