| Message ID | 20220930091033.34379-1-pbonzini@redhat.com |
|---|---|
| State | New |
| Headers | show |
This pull request doesn't build: ../meson.build:545:95: ERROR: Expecting endif got rparen. gdbus_codegen_error = '@0@ uses gdbus-codegen, which does not support control flow integrity') https://gitlab.com/qemu-project/qemu/-/jobs/3112498668
On Sat, Oct 1, 2022 at 1:01 AM Stefan Hajnoczi <stefanha@gmail.com> wrote: > > This pull request doesn't build: > > ../meson.build:545:95: ERROR: Expecting endif got rparen. > gdbus_codegen_error = '@0@ uses gdbus-codegen, which does not support > control flow integrity') > > https://gitlab.com/qemu-project/qemu/-/jobs/3112498668 I'm really sorry. :( I have now pushed the delta, but I'll wait for CI to pass and send a pull request on Monday. Paolo
The following changes since commit 99d6b11b5b44d7dd64f4cb1973184e40a4a174f8: Merge tag 'pull-target-arm-20220922' of https://git.linaro.org/people/pmaydell/qemu-arm into staging (2022-09-26 13:38:26 -0400) are available in the Git repository at: https://gitlab.com/bonzini/qemu.git tags/for-upstream for you to fetch changes up to 2ddea14f66caa3cb0986ff66ce66b9faeeb54f0b: x86: re-initialize RNG seed when selecting kernel (2022-09-30 09:53:58 +0200) ---------------------------------------------------------------- * x86: re-enable rng seeding via SetupData * x86: reinitialize RNG seed on system reboot and after kernel load * qboot: rebuild based on latest commit * watchdog: remove -watchdog option * update Meson to 0.61.5, move more configure tests ---------------------------------------------------------------- Jason A. Donenfeld (5): x86: return modified setup_data only if read as memory, not as file x86: use typedef for SetupData struct x86: reinitialize RNG seed on system reboot x86: re-enable rng seeding via SetupData x86: re-initialize RNG seed when selecting kernel Paolo Bonzini (9): qboot: rebuild based on latest commit configure: do not invoke as/ld directly for pc-bios/optionrom watchdog: remove -watchdog option ui: fix path to dbus-display1.h meson: -display dbus and CFI are incompatible meson: require 0.61.3 meson: multiple names can be passed to dependency() configure, meson: move C++ compiler detection to meson.build configure, meson: move linker flag detection to meson Ray Zhang (1): target/i386/kvm: fix kvmclock_current_nsec: Assertion `time.tsc_timestamp <= migration_tsc' failed configure | 97 +++------------------------------------- docs/about/deprecated.rst | 5 --- docs/about/removed-features.rst | 5 +++ hw/i386/microvm.c | 2 +- hw/i386/pc_piix.c | 3 +- hw/i386/pc_q35.c | 3 +- hw/i386/x86.c | 70 ++++++++++++++++++++++------- hw/nvram/fw_cfg.c | 12 ++--- hw/watchdog/sbsa_gwdt.c | 6 --- hw/watchdog/watchdog.c | 43 ------------------ hw/watchdog/wdt_aspeed.c | 6 --- hw/watchdog/wdt_diag288.c | 6 --- hw/watchdog/wdt_i6300esb.c | 6 --- hw/watchdog/wdt_ib700.c | 6 --- hw/watchdog/wdt_imx2.c | 6 --- include/hw/nvram/fw_cfg.h | 22 +++++++++ include/sysemu/watchdog.h | 12 ----- meson | 2 +- meson.build | 74 ++++++++++++++++++++---------- pc-bios/optionrom/Makefile | 12 ++--- pc-bios/qboot.rom | Bin 65536 -> 65536 bytes qemu-options.hx | 33 +------------- qga/meson.build | 2 +- scripts/main.c | 1 + softmmu/vl.c | 16 ------- target/i386/kvm/kvm.c | 2 +- tests/qtest/dbus-display-test.c | 2 +- ui/dbus.h | 2 +- 28 files changed, 159 insertions(+), 297 deletions(-) mode change 100644 => 100755 pc-bios/qboot.rom create mode 100644 scripts/main.c