[PULL v2 00/15] x86 + misc changes for 2022-09-29

[PULL v2 00/15] x86 + misc changes for 2022-09-29

[Paolo Bonzini]

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
-- 
2.37.3

v1->v2:
$ git range-diff origin/master 1750b7328bd0cf98875df189e9664980db07c692 2ddea14f66caa3cb0986ff66ce66b9faeeb54f0b
 1:  e935b73508 =  1:  e935b73508 x86: return modified setup_data only if read as memory, not as file
 2:  eebb38a563 =  2:  eebb38a563 x86: use typedef for SetupData struct
 3:  763a2828bf =  3:  763a2828bf x86: reinitialize RNG seed on system reboot
 4:  ffe2d2382e =  4:  ffe2d2382e x86: re-enable rng seeding via SetupData
 5:  2fc7eb6897 =  5:  2fc7eb6897 qboot: rebuild based on latest commit
 6:  7089977a24 =  6:  7089977a24 configure: do not invoke as/ld directly for pc-bios/optionrom
 7:  5433af7697 =  7:  5433af7697 watchdog: remove -watchdog option
 8:  0e902f59c1 =  8:  0e902f59c1 ui: fix path to dbus-display1.h
 -:  ---------- >  9:  3b18f4492f meson: -display dbus and CFI are incompatible
 9:  4518e4db3d ! 10:  6099673423 meson: require 0.61.3
    @@ meson.build: endif
     -  .require(enable_modules,
     -           error_message: '-display dbus requires --enable-modules') \
        .require(gdbus_codegen.found(),
    -            error_message: '-display dbus requires gdbus-codegen') \
    +            error_message: gdbus_codegen_error.format('-display dbus')) \
        .require(opengl.found() and gbm.found(),
     
      ## qga/meson.build ##
10:  b7c7a36331 = 11:  d8bc336bfe meson: multiple names can be passed to dependency()
11:  0aaf08e2f1 = 12:  c35cc0a23a configure, meson: move C++ compiler detection to meson.build
12:  48c5c87318 = 13:  5d9c2dca2b configure, meson: move linker flag detection to meson
13:  aec4f65878 = 14:  57095542b7 target/i386/kvm: fix kvmclock_current_nsec: Assertion `time.tsc_timestamp <= migration_tsc' failed
14:  1750b7328b = 15:  2ddea14f66 x86: re-initialize RNG seed when selecting kernel

[PULL v2 09/15] meson: -display dbus and CFI are incompatible

[Paolo Bonzini]

The generated skeletons for DBus call the finalize method of the parent
type using code like

    G_OBJECT_CLASS (qemu_dbus_display1_chardev_skeleton_parent_class)->finalize (object);

However, the finalize method is defined in a shared library that is not
compiled with CFI.  Do not enable anything that uses gdbus-codegen if
--enable-cfi was specified.

Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 meson.build | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/meson.build b/meson.build
index 3885fc1076..ca47ecbffe 100644
--- a/meson.build
+++ b/meson.build
@@ -487,6 +487,7 @@ meson.override_dependency('glib-2.0', glib)
 
 gio = not_found
 gdbus_codegen = not_found
+gdbus_codegen_error = '@0@ requires gdbus-codegen, please install libgio'
 if not get_option('gio').auto() or have_system
   gio = dependency('gio-2.0', required: get_option('gio'),
                    method: 'pkg-config', kwargs: static_kwargs)
@@ -511,6 +512,10 @@ if not get_option('gio').auto() or have_system
                              version: gio.version())
   endif
 endif
+if gdbus_codegen.found() and get_option('cfi')
+  gdbus_codegen = not_found
+  gdbus_codegen_error = '@0@ uses gdbus-codegen, which does not support control flow integrity'
+endif
 
 lttng = not_found
 if 'ust' in get_option('trace_backends')
@@ -1676,7 +1681,7 @@ dbus_display = get_option('dbus_display') \
   .require(enable_modules,
            error_message: '-display dbus requires --enable-modules') \
   .require(gdbus_codegen.found(),
-           error_message: '-display dbus requires gdbus-codegen') \
+           error_message: gdbus_codegen_error.format('-display dbus')) \
   .require(opengl.found() and gbm.found(),
            error_message: '-display dbus requires epoxy/egl and gbm') \
   .allowed()
-- 
2.37.3

Re: [PULL v2 00/15] x86 + misc changes for 2022-09-29

[Stefan Hajnoczi]

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

Re: [PULL v2 00/15] x86 + misc changes for 2022-09-29

[Paolo Bonzini]

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