qemu-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Qemu-commits] [qemu/qemu] 3b18f4: meson: -display dbus and CFI are inco


From: Paolo Bonzini
Subject: [Qemu-commits] [qemu/qemu] 3b18f4: meson: -display dbus and CFI are incompatible
Date: Fri, 30 Sep 2022 13:17:56 -0700

  Branch: refs/heads/staging
  Home:   https://github.com/qemu/qemu
  Commit: 3b18f4492f7ff21a19dedfd3dd93087713a080a2
      
https://github.com/qemu/qemu/commit/3b18f4492f7ff21a19dedfd3dd93087713a080a2
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   2022-09-30 (Fri, 30 Sep 2022)

  Changed paths:
    M meson.build

  Log Message:
  -----------
  meson: -display dbus and CFI are incompatible

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.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: 6099673423498d6e69240c9f90e4eeebc83fcd65
      
https://github.com/qemu/qemu/commit/6099673423498d6e69240c9f90e4eeebc83fcd65
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   2022-09-30 (Fri, 30 Sep 2022)

  Changed paths:
    M configure
    M meson
    M meson.build
    M qga/meson.build

  Log Message:
  -----------
  meson: require 0.61.3

This removes the dependency of dbus-display on --enable-modules.  It also allows
cleanups in modinfo collection and allows moving C++ compiler detection to
meson.build.

Because it is now deprecated to use install_subdir to create an empty directory,
replace it with install_emptydir.

Updating the Meson submodule to 0.61.5 also removes the message

    WARNING: Broken python installation detected. Python files installed
    by Meson might not be found by python interpreter.

unless using system meson is forced with --meson.

Resolves: https://gitlab.com/qemu-project/qemu/-/issues/873
Resolves: https://gitlab.com/qemu-project/qemu/-/issues/848
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: d8bc336bfe590ee90e88547bb09a1fd96a4e1847
      
https://github.com/qemu/qemu/commit/d8bc336bfe590ee90e88547bb09a1fd96a4e1847
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   2022-09-30 (Fri, 30 Sep 2022)

  Changed paths:
    M meson.build

  Log Message:
  -----------
  meson: multiple names can be passed to dependency()

This is new in Meson 0.60.0.

Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: c35cc0a23a39b2c57a4fa1dd1365d61e3b3e9a3f
      
https://github.com/qemu/qemu/commit/c35cc0a23a39b2c57a4fa1dd1365d61e3b3e9a3f
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   2022-09-30 (Fri, 30 Sep 2022)

  Changed paths:
    M configure
    M meson.build
    A scripts/main.c

  Log Message:
  -----------
  configure, meson: move C++ compiler detection to meson.build

The test is slightly weaker than before, because it does not
call an extern "C" function from a C source file.  However,
in practice what we seek to detect is ABI compatibility of the
various sanitizer flags, and for that it is enough to compile
anything with CC and link it with CXX.

Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: 5d9c2dca2bbe7ebcc0f6fcd4600ee4f23c6bf0c7
      
https://github.com/qemu/qemu/commit/5d9c2dca2bbe7ebcc0f6fcd4600ee4f23c6bf0c7
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   2022-09-30 (Fri, 30 Sep 2022)

  Changed paths:
    M configure
    M meson.build

  Log Message:
  -----------
  configure, meson: move linker flag detection to meson

Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: 57095542b77ea13dc67441dd86288a2c7b29a118
      
https://github.com/qemu/qemu/commit/57095542b77ea13dc67441dd86288a2c7b29a118
  Author: Ray Zhang <zhanglei002@gmail.com>
  Date:   2022-09-30 (Fri, 30 Sep 2022)

  Changed paths:
    M target/i386/kvm/kvm.c

  Log Message:
  -----------
  target/i386/kvm: fix kvmclock_current_nsec: Assertion `time.tsc_timestamp <= 
migration_tsc' failed

New KVM_CLOCK flags were added in the 
kernel.(c68dc1b577eabd5605c6c7c08f3e07ae18d30d5d)
```
+ #define KVM_CLOCK_VALID_FLAGS                                         \
+       (KVM_CLOCK_TSC_STABLE | KVM_CLOCK_REALTIME | KVM_CLOCK_HOST_TSC)

        case KVM_CAP_ADJUST_CLOCK:
-               r = KVM_CLOCK_TSC_STABLE;
+               r = KVM_CLOCK_VALID_FLAGS;
```

kvm_has_adjust_clock_stable needs to handle additional flags,
so that s->clock_is_reliable can be true and kvmclock_current_nsec doesn't need 
to be called.

Signed-off-by: Ray Zhang <zhanglei002@gmail.com>
Message-Id: <20220922100523.2362205-1-zhanglei002@gmail.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: 2ddea14f66caa3cb0986ff66ce66b9faeeb54f0b
      
https://github.com/qemu/qemu/commit/2ddea14f66caa3cb0986ff66ce66b9faeeb54f0b
  Author: Jason A. Donenfeld <Jason@zx2c4.com>
  Date:   2022-09-30 (Fri, 30 Sep 2022)

  Changed paths:
    M hw/i386/x86.c

  Log Message:
  -----------
  x86: re-initialize RNG seed when selecting kernel

We don't want it to be possible to re-read the RNG seed after ingesting
it, because this ruins forward secrecy. Currently, however, the setup
data section can just be re-read. Since the kernel is always read after
the setup data, use the selection of the kernel as a trigger to
re-initialize the RNG seed, just like we do on reboot, to preserve
forward secrecy.

Cc: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Message-Id: <20220922152847.3670513-1-Jason@zx2c4.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: 47279b0f5ec432d13beb89d70691d90ff17de1c2
      
https://github.com/qemu/qemu/commit/47279b0f5ec432d13beb89d70691d90ff17de1c2
  Author: Stefan Hajnoczi <stefanha@redhat.com>
  Date:   2022-09-30 (Fri, 30 Sep 2022)

  Changed paths:
    M configure
    M docs/about/deprecated.rst
    M docs/about/removed-features.rst
    M hw/i386/microvm.c
    M hw/i386/pc_piix.c
    M hw/i386/pc_q35.c
    M hw/i386/x86.c
    M hw/nvram/fw_cfg.c
    M hw/watchdog/sbsa_gwdt.c
    M hw/watchdog/watchdog.c
    M hw/watchdog/wdt_aspeed.c
    M hw/watchdog/wdt_diag288.c
    M hw/watchdog/wdt_i6300esb.c
    M hw/watchdog/wdt_ib700.c
    M hw/watchdog/wdt_imx2.c
    M include/hw/nvram/fw_cfg.h
    M include/sysemu/watchdog.h
    M meson
    M meson.build
    M pc-bios/optionrom/Makefile
    M pc-bios/qboot.rom
    M qemu-options.hx
    M qga/meson.build
    A scripts/main.c
    M softmmu/vl.c
    M target/i386/kvm/kvm.c
    M tests/qtest/dbus-display-test.c
    M ui/dbus.h

  Log Message:
  -----------
  Merge tag 'for-upstream' of https://gitlab.com/bonzini/qemu into staging

* 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

# -----BEGIN PGP SIGNATURE-----
#
# iQFIBAABCAAyFiEE8TM4V0tmI4mGbHaCv/vSX3jHroMFAmM2oLcUHHBib256aW5p
# QHJlZGhhdC5jb20ACgkQv/vSX3jHroOhEgf8CbE9CA+5oQw5NJPlNbnNYITuZaAF
# Ta0JL3pqrVdsLC9sOPPww5klT4/U9RP6nGtAiBk//gGZNC5W0u5l4d1+bSRjqGo1
# 8IWedgvfO6fYVjwY08DNrfFjw9rx4WnBP8/aURu/g59BX19yVRDcSOTx0EaPIi1h
# DW8VQ7+otDhgp5eccWHwd/rxEEMW+EX/4hRsqEwm00PmrDLGypE7pdjN9Ww4XLmR
# HqnYWuMbOtH9wWaf6U5fJgroC9j9pkEdm33VezLADmH3W2EoD+AOfzDFcrDkctAi
# h3fl4AiwyLIgPdD11FUy4IxbbV28AEjupwNKIPKbXbSThSPPHYL+ygTrLg==
# =iq5Z
# -----END PGP SIGNATURE-----
# gpg: Signature made Fri 30 Sep 2022 03:54:31 EDT
# gpg:                using RSA key F13338574B662389866C7682BFFBD25F78C7AE83
# gpg:                issuer "pbonzini@redhat.com"
# gpg: Good signature from "Paolo Bonzini <bonzini@gnu.org>" [full]
# gpg:                 aka "Paolo Bonzini <pbonzini@redhat.com>" [full]
# Primary key fingerprint: 46F5 9FBD 57D6 12E7 BFD4  E2F7 7E15 100C CD36 69B1
#      Subkey fingerprint: F133 3857 4B66 2389 866C  7682 BFFB D25F 78C7 AE83

* tag 'for-upstream' of https://gitlab.com/bonzini/qemu:
  x86: re-initialize RNG seed when selecting kernel
  target/i386/kvm: fix kvmclock_current_nsec: Assertion `time.tsc_timestamp <= 
migration_tsc' failed
  configure, meson: move linker flag detection to meson
  configure, meson: move C++ compiler detection to meson.build
  meson: multiple names can be passed to dependency()
  meson: require 0.61.3
  meson: -display dbus and CFI are incompatible
  ui: fix path to dbus-display1.h
  watchdog: remove -watchdog option
  configure: do not invoke as/ld directly for pc-bios/optionrom
  qboot: rebuild based on latest commit
  x86: re-enable rng seeding via SetupData
  x86: reinitialize RNG seed on system reboot
  x86: use typedef for SetupData struct
  x86: return modified setup_data only if read as memory, not as file

Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>


Compare: https://github.com/qemu/qemu/compare/415873b68f06...47279b0f5ec4



reply via email to

[Prev in Thread] Current Thread [Next in Thread]