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

[PULL 00/14] 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 1750b7328bd0cf98875df189e9664980db07c692:

  x86: re-initialize RNG seed when selecting kernel (2022-09-29 18:24:13 +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

----------------------------------------------------------------

I couldn't rerun the CI (I did run it about a week ago before rebasing)
because I finished my Gitlab minutes and haven't yet set up a private
runner.  Apologies in advance if it breaks somehow.

Paolo

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 (8):
      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: 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                     |  67 +++++++++++++++++----------
 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, 153 insertions(+), 296 deletions(-)
 mode change 100644 => 100755 pc-bios/qboot.rom
 create mode 100644 scripts/main.c
-- 
2.37.3

[PULL 01/14] x86: return modified setup_data only if read as memory, not as file

[Paolo Bonzini]

From: "Jason A. Donenfeld" <Jason@zx2c4.com>

If setup_data is being read into a specific memory location, then
generally the setup_data address parameter is read first, so that the
caller knows where to read it into. In that case, we should return
setup_data containing the absolute addresses that are hard coded and
determined a priori. This is the case when kernels are loaded by BIOS,
for example. In contrast, when setup_data is read as a file, then we
shouldn't modify setup_data, since the absolute address will be wrong by
definition. This is the case when OVMF loads the image.

This allows setup_data to be used like normal, without crashing when EFI
tries to use it.

(As a small development note, strangely, fw_cfg_add_file_callback() was
exported but fw_cfg_add_bytes_callback() wasn't, so this makes that
consistent.)

Cc: Gerd Hoffmann <kraxel@redhat.com>
Cc: Laurent Vivier <laurent@vivier.eu>
Cc: Michael S. Tsirkin <mst@redhat.com>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Peter Maydell <peter.maydell@linaro.org>
Cc: Philippe Mathieu-Daudé <f4bug@amsat.org>
Cc: Richard Henderson <richard.henderson@linaro.org>
Suggested-by: Ard Biesheuvel <ardb@kernel.org>
Reviewed-by: Ard Biesheuvel <ardb@kernel.org>
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Message-Id: <20220921093134.2936487-1-Jason@zx2c4.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 hw/i386/x86.c             | 46 ++++++++++++++++++++++++++++++---------
 hw/nvram/fw_cfg.c         | 12 +++++-----
 include/hw/nvram/fw_cfg.h | 22 +++++++++++++++++++
 3 files changed, 64 insertions(+), 16 deletions(-)

diff --git a/hw/i386/x86.c b/hw/i386/x86.c
index 050eedc0c8..96d205927e 100644
--- a/hw/i386/x86.c
+++ b/hw/i386/x86.c
@@ -37,6 +37,7 @@
 #include "sysemu/whpx.h"
 #include "sysemu/numa.h"
 #include "sysemu/replay.h"
+#include "sysemu/reset.h"
 #include "sysemu/sysemu.h"
 #include "sysemu/cpu-timers.h"
 #include "sysemu/xen.h"
@@ -764,6 +765,24 @@ static bool load_elfboot(const char *kernel_filename,
     return true;
 }
 
+typedef struct SetupDataFixup {
+    void *pos;
+    hwaddr orig_val, new_val;
+    uint32_t addr;
+} SetupDataFixup;
+
+static void fixup_setup_data(void *opaque)
+{
+    SetupDataFixup *fixup = opaque;
+    stq_p(fixup->pos, fixup->new_val);
+}
+
+static void reset_setup_data(void *opaque)
+{
+    SetupDataFixup *fixup = opaque;
+    stq_p(fixup->pos, fixup->orig_val);
+}
+
 void x86_load_linux(X86MachineState *x86ms,
                     FWCfgState *fw_cfg,
                     int acpi_data_size,
@@ -1088,8 +1107,11 @@ void x86_load_linux(X86MachineState *x86ms,
         qemu_guest_getrandom_nofail(setup_data->data, RNG_SEED_LENGTH);
     }
 
-    /* Offset 0x250 is a pointer to the first setup_data link. */
-    stq_p(header + 0x250, first_setup_data);
+    fw_cfg_add_i32(fw_cfg, FW_CFG_KERNEL_ADDR, prot_addr);
+    fw_cfg_add_i32(fw_cfg, FW_CFG_KERNEL_SIZE, kernel_size);
+    fw_cfg_add_bytes(fw_cfg, FW_CFG_KERNEL_DATA, kernel, kernel_size);
+    sev_load_ctx.kernel_data = (char *)kernel;
+    sev_load_ctx.kernel_size = kernel_size;
 
     /*
      * If we're starting an encrypted VM, it will be OVMF based, which uses the
@@ -1099,16 +1121,20 @@ void x86_load_linux(X86MachineState *x86ms,
      * file the user passed in.
      */
     if (!sev_enabled()) {
+        SetupDataFixup *fixup = g_malloc(sizeof(*fixup));
+
         memcpy(setup, header, MIN(sizeof(header), setup_size));
+        /* Offset 0x250 is a pointer to the first setup_data link. */
+        fixup->pos = setup + 0x250;
+        fixup->orig_val = ldq_p(fixup->pos);
+        fixup->new_val = first_setup_data;
+        fixup->addr = cpu_to_le32(real_addr);
+        fw_cfg_add_bytes_callback(fw_cfg, FW_CFG_SETUP_ADDR, fixup_setup_data, NULL,
+                                  fixup, &fixup->addr, sizeof(fixup->addr), true);
+        qemu_register_reset(reset_setup_data, fixup);
+    } else {
+        fw_cfg_add_i32(fw_cfg, FW_CFG_SETUP_ADDR, real_addr);
     }
-
-    fw_cfg_add_i32(fw_cfg, FW_CFG_KERNEL_ADDR, prot_addr);
-    fw_cfg_add_i32(fw_cfg, FW_CFG_KERNEL_SIZE, kernel_size);
-    fw_cfg_add_bytes(fw_cfg, FW_CFG_KERNEL_DATA, kernel, kernel_size);
-    sev_load_ctx.kernel_data = (char *)kernel;
-    sev_load_ctx.kernel_size = kernel_size;
-
-    fw_cfg_add_i32(fw_cfg, FW_CFG_SETUP_ADDR, real_addr);
     fw_cfg_add_i32(fw_cfg, FW_CFG_SETUP_SIZE, setup_size);
     fw_cfg_add_bytes(fw_cfg, FW_CFG_SETUP_DATA, setup, setup_size);
     sev_load_ctx.setup_data = (char *)setup;
diff --git a/hw/nvram/fw_cfg.c b/hw/nvram/fw_cfg.c
index d605f3f45a..564bda3395 100644
--- a/hw/nvram/fw_cfg.c
+++ b/hw/nvram/fw_cfg.c
@@ -692,12 +692,12 @@ static const VMStateDescription vmstate_fw_cfg = {
     }
 };
 
-static void fw_cfg_add_bytes_callback(FWCfgState *s, uint16_t key,
-                                      FWCfgCallback select_cb,
-                                      FWCfgWriteCallback write_cb,
-                                      void *callback_opaque,
-                                      void *data, size_t len,
-                                      bool read_only)
+void fw_cfg_add_bytes_callback(FWCfgState *s, uint16_t key,
+                               FWCfgCallback select_cb,
+                               FWCfgWriteCallback write_cb,
+                               void *callback_opaque,
+                               void *data, size_t len,
+                               bool read_only)
 {
     int arch = !!(key & FW_CFG_ARCH_LOCAL);
 
diff --git a/include/hw/nvram/fw_cfg.h b/include/hw/nvram/fw_cfg.h
index 0e7a8bc7af..e4fef393be 100644
--- a/include/hw/nvram/fw_cfg.h
+++ b/include/hw/nvram/fw_cfg.h
@@ -117,6 +117,28 @@ struct FWCfgMemState {
  */
 void fw_cfg_add_bytes(FWCfgState *s, uint16_t key, void *data, size_t len);
 
+/**
+ * fw_cfg_add_bytes_callback:
+ * @s: fw_cfg device being modified
+ * @key: selector key value for new fw_cfg item
+ * @select_cb: callback function when selecting
+ * @write_cb: callback function after a write
+ * @callback_opaque: argument to be passed into callback function
+ * @data: pointer to start of item data
+ * @len: size of item data
+ * @read_only: is file read only
+ *
+ * Add a new fw_cfg item, available by selecting the given key, as a raw
+ * "blob" of the given size. The data referenced by the starting pointer
+ * is only linked, NOT copied, into the data structure of the fw_cfg device.
+ */
+void fw_cfg_add_bytes_callback(FWCfgState *s, uint16_t key,
+                               FWCfgCallback select_cb,
+                               FWCfgWriteCallback write_cb,
+                               void *callback_opaque,
+                               void *data, size_t len,
+                               bool read_only);
+
 /**
  * fw_cfg_add_string:
  * @s: fw_cfg device being modified
-- 
2.37.3

[PULL 02/14] x86: use typedef for SetupData struct

[Paolo Bonzini]

From: "Jason A. Donenfeld" <Jason@zx2c4.com>

The preferred style is SetupData as a typedef, not setup_data as a plain
struct.

Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Ard Biesheuvel <ardb@kernel.org>
Suggested-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Message-Id: <20220921093134.2936487-2-Jason@zx2c4.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 hw/i386/x86.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/hw/i386/x86.c b/hw/i386/x86.c
index 96d205927e..1ee0b1b413 100644
--- a/hw/i386/x86.c
+++ b/hw/i386/x86.c
@@ -653,12 +653,12 @@ DeviceState *ioapic_init_secondary(GSIState *gsi_state)
     return dev;
 }
 
-struct setup_data {
+typedef struct SetupData {
     uint64_t next;
     uint32_t type;
     uint32_t len;
     uint8_t data[];
-} __attribute__((packed));
+} __attribute__((packed)) SetupData;
 
 
 /*
@@ -799,7 +799,7 @@ void x86_load_linux(X86MachineState *x86ms,
     FILE *f;
     char *vmode;
     MachineState *machine = MACHINE(x86ms);
-    struct setup_data *setup_data;
+    SetupData *setup_data;
     const char *kernel_filename = machine->kernel_filename;
     const char *initrd_filename = machine->initrd_filename;
     const char *dtb_filename = machine->dtb;
@@ -1082,11 +1082,11 @@ void x86_load_linux(X86MachineState *x86ms,
         }
 
         setup_data_offset = QEMU_ALIGN_UP(kernel_size, 16);
-        kernel_size = setup_data_offset + sizeof(struct setup_data) + dtb_size;
+        kernel_size = setup_data_offset + sizeof(SetupData) + dtb_size;
         kernel = g_realloc(kernel, kernel_size);
 
 
-        setup_data = (struct setup_data *)(kernel + setup_data_offset);
+        setup_data = (SetupData *)(kernel + setup_data_offset);
         setup_data->next = cpu_to_le64(first_setup_data);
         first_setup_data = prot_addr + setup_data_offset;
         setup_data->type = cpu_to_le32(SETUP_DTB);
@@ -1097,9 +1097,9 @@ void x86_load_linux(X86MachineState *x86ms,
 
     if (!legacy_no_rng_seed) {
         setup_data_offset = QEMU_ALIGN_UP(kernel_size, 16);
-        kernel_size = setup_data_offset + sizeof(struct setup_data) + RNG_SEED_LENGTH;
+        kernel_size = setup_data_offset + sizeof(SetupData) + RNG_SEED_LENGTH;
         kernel = g_realloc(kernel, kernel_size);
-        setup_data = (struct setup_data *)(kernel + setup_data_offset);
+        setup_data = (SetupData *)(kernel + setup_data_offset);
         setup_data->next = cpu_to_le64(first_setup_data);
         first_setup_data = prot_addr + setup_data_offset;
         setup_data->type = cpu_to_le32(SETUP_RNG_SEED);
-- 
2.37.3

[PULL 03/14] x86: reinitialize RNG seed on system reboot

[Paolo Bonzini]

From: "Jason A. Donenfeld" <Jason@zx2c4.com>

Since this is read from fw_cfg on each boot, the kernel zeroing it out
alone is insufficient to prevent it from being used twice. And indeed on
reboot we always want a new seed, not the old one. So re-fill it in this
circumstance.

Cc: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Message-Id: <20220921093134.2936487-3-Jason@zx2c4.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 hw/i386/x86.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/hw/i386/x86.c b/hw/i386/x86.c
index 1ee0b1b413..f9a4ddaa4a 100644
--- a/hw/i386/x86.c
+++ b/hw/i386/x86.c
@@ -783,6 +783,12 @@ static void reset_setup_data(void *opaque)
     stq_p(fixup->pos, fixup->orig_val);
 }
 
+static void reset_rng_seed(void *opaque)
+{
+    SetupData *setup_data = opaque;
+    qemu_guest_getrandom_nofail(setup_data->data, le32_to_cpu(setup_data->len));
+}
+
 void x86_load_linux(X86MachineState *x86ms,
                     FWCfgState *fw_cfg,
                     int acpi_data_size,
@@ -1105,6 +1111,7 @@ void x86_load_linux(X86MachineState *x86ms,
         setup_data->type = cpu_to_le32(SETUP_RNG_SEED);
         setup_data->len = cpu_to_le32(RNG_SEED_LENGTH);
         qemu_guest_getrandom_nofail(setup_data->data, RNG_SEED_LENGTH);
+        qemu_register_reset(reset_rng_seed, setup_data);
     }
 
     fw_cfg_add_i32(fw_cfg, FW_CFG_KERNEL_ADDR, prot_addr);
-- 
2.37.3

[PULL 04/14] x86: re-enable rng seeding via SetupData

[Paolo Bonzini]

From: "Jason A. Donenfeld" <Jason@zx2c4.com>

This reverts 3824e25db1 ("x86: disable rng seeding via setup_data"), but
for 7.2 rather than 7.1, now that modifying setup_data is safe to do.

Cc: Laurent Vivier <laurent@vivier.eu>
Cc: Michael S. Tsirkin <mst@redhat.com>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Peter Maydell <peter.maydell@linaro.org>
Cc: Philippe Mathieu-Daudé <f4bug@amsat.org>
Cc: Richard Henderson <richard.henderson@linaro.org>
Cc: Ard Biesheuvel <ardb@kernel.org>
Acked-by: Gerd Hoffmann <kraxel@redhat.com>
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Message-Id: <20220921093134.2936487-4-Jason@zx2c4.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 hw/i386/microvm.c | 2 +-
 hw/i386/pc_piix.c | 3 ++-
 hw/i386/pc_q35.c  | 3 ++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/hw/i386/microvm.c b/hw/i386/microvm.c
index 52cafa003d..7fe8cce03e 100644
--- a/hw/i386/microvm.c
+++ b/hw/i386/microvm.c
@@ -332,7 +332,7 @@ static void microvm_memory_init(MicrovmMachineState *mms)
     rom_set_fw(fw_cfg);
 
     if (machine->kernel_filename != NULL) {
-        x86_load_linux(x86ms, fw_cfg, 0, true, true);
+        x86_load_linux(x86ms, fw_cfg, 0, true, false);
     }
 
     if (mms->option_roms) {
diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
index 8043a250ad..0b1a79c0fa 100644
--- a/hw/i386/pc_piix.c
+++ b/hw/i386/pc_piix.c
@@ -439,7 +439,6 @@ static void pc_i440fx_7_2_machine_options(MachineClass *m)
     m->alias = "pc";
     m->is_default = true;
     pcmc->default_cpu_version = 1;
-    pcmc->legacy_no_rng_seed = true;
 }
 
 DEFINE_I440FX_MACHINE(v7_2, "pc-i440fx-7.2", NULL,
@@ -447,9 +446,11 @@ DEFINE_I440FX_MACHINE(v7_2, "pc-i440fx-7.2", NULL,
 
 static void pc_i440fx_7_1_machine_options(MachineClass *m)
 {
+    PCMachineClass *pcmc = PC_MACHINE_CLASS(m);
     pc_i440fx_7_2_machine_options(m);
     m->alias = NULL;
     m->is_default = false;
+    pcmc->legacy_no_rng_seed = true;
     compat_props_add(m->compat_props, hw_compat_7_1, hw_compat_7_1_len);
     compat_props_add(m->compat_props, pc_compat_7_1, pc_compat_7_1_len);
 }
diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c
index 53eda50e81..a496bd6e74 100644
--- a/hw/i386/pc_q35.c
+++ b/hw/i386/pc_q35.c
@@ -376,7 +376,6 @@ static void pc_q35_7_2_machine_options(MachineClass *m)
     pc_q35_machine_options(m);
     m->alias = "q35";
     pcmc->default_cpu_version = 1;
-    pcmc->legacy_no_rng_seed = true;
 }
 
 DEFINE_Q35_MACHINE(v7_2, "pc-q35-7.2", NULL,
@@ -384,8 +383,10 @@ DEFINE_Q35_MACHINE(v7_2, "pc-q35-7.2", NULL,
 
 static void pc_q35_7_1_machine_options(MachineClass *m)
 {
+    PCMachineClass *pcmc = PC_MACHINE_CLASS(m);
     pc_q35_7_2_machine_options(m);
     m->alias = NULL;
+    pcmc->legacy_no_rng_seed = true;
     compat_props_add(m->compat_props, hw_compat_7_1, hw_compat_7_1_len);
     compat_props_add(m->compat_props, pc_compat_7_1, pc_compat_7_1_len);
 }
-- 
2.37.3

[PULL 05/14] qboot: rebuild based on latest commit

[Paolo Bonzini]

df22fbb751 ("qboot: update to latest submodule") updated the qboot
submodule from a5300c49 to 8ca302e8. However, qboot isn't built during
the QEMU's build process but rather is included in binary form. So
rebuild it here.

Cc: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
[Rebuilt it myself for paranoia. - Paolo]
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 pc-bios/qboot.rom | Bin 65536 -> 65536 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 pc-bios/qboot.rom

diff --git a/pc-bios/qboot.rom b/pc-bios/qboot.rom
old mode 100644
new mode 100755
index 7634106a0766913077e88dfcb1021c1168dcad3c..684000f57aad8925c81890d97345500eb266827e
GIT binary patch
delta 8383
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

delta 9151
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
SEQnQ-4%R&t{Vp*}=KleWh?AlK

-- 
2.37.3

[PULL 06/14] configure: do not invoke as/ld directly for pc-bios/optionrom

[Paolo Bonzini]

Just use using the compiler binary, with -nostdlib in the case of the
linker; the compiler driver (whether i686-*-gcc, or x86_64-*-gcc with
the -m32 option) will then pick the right magic option to as and ld.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 configure                  | 22 +++++-----------------
 pc-bios/optionrom/Makefile | 12 ++++--------
 2 files changed, 9 insertions(+), 25 deletions(-)

diff --git a/configure b/configure
index cc4ecd6008..894e37310f 100755
--- a/configure
+++ b/configure
@@ -2320,23 +2320,11 @@ probe_target_compiler i386-softmmu
 if test -n "$target_cc" &&
         test "$targetos" != "darwin" && test "$targetos" != "sunos" && \
         test "$targetos" != "haiku" && test "$softmmu" = yes ; then
-    # Different host OS linkers have different ideas about the name of the ELF
-    # emulation. Linux and OpenBSD/amd64 use 'elf_i386'; FreeBSD uses the _fbsd
-    # variant; OpenBSD/i386 uses the _obsd variant; and Windows uses i386pe.
-    for emu in elf_i386 elf_i386_fbsd elf_i386_obsd i386pe; do
-        if "$target_ld" -verbose 2>&1 | grep -q "^[[:space:]]*${emu}[[:space:]]*$"; then
-            ld_i386_emulation="$emu"
-            break
-        fi
-    done
-    if test -n "$ld_i386_emulation"; then
-        roms="pc-bios/optionrom"
-        config_mak=pc-bios/optionrom/config.mak
-        echo "# Automatically generated by configure - do not modify" > $config_mak
-        echo "TOPSRC_DIR=$source_path" >> $config_mak
-        echo "LD_I386_EMULATION=$ld_i386_emulation" >> $config_mak
-        write_target_makefile >> $config_mak
-    fi
+    roms="pc-bios/optionrom"
+    config_mak=pc-bios/optionrom/config.mak
+    echo "# Automatically generated by configure - do not modify" > $config_mak
+    echo "TOPSRC_DIR=$source_path" >> $config_mak
+    write_target_makefile >> $config_mak
 fi
 
 probe_target_compiler ppc-softmmu
diff --git a/pc-bios/optionrom/Makefile b/pc-bios/optionrom/Makefile
index e90ca2e1c6..3e06c11dea 100644
--- a/pc-bios/optionrom/Makefile
+++ b/pc-bios/optionrom/Makefile
@@ -20,28 +20,24 @@ override CFLAGS += $(call cc-option, -fcf-protection=none)
 # Flags for dependency generation
 override CPPFLAGS += -MMD -MP -MT $@ -MF $(@D)/$(*F).d
 
-override CFLAGS += $(filter -W%, $(QEMU_CFLAGS))
 override CFLAGS += $(call cc-option, -fno-pie)
+override CFLAGS += $(call cc-option, -no-pie)
 override CFLAGS += -ffreestanding -I$(TOPSRC_DIR)/include
 override CFLAGS += $(call cc-option, -fno-stack-protector)
 override CFLAGS += $(call cc-option, -Wno-array-bounds)
 
-Wa = -Wa,
-override ASFLAGS += -32
-override CFLAGS += $(call cc-option, $(Wa)-32)
-
-override LDFLAGS = -m $(LD_I386_EMULATION) -T $(SRC_DIR)/flat.lds
+override LDFLAGS = -nostdlib -Wl,-T,$(SRC_DIR)/flat.lds
 
 pvh.img: pvh.o pvh_main.o
 
 %.o: %.S
-	$(call quiet-command,$(CC) $(CPPFLAGS) -E -o - $< | $(AS) $(ASFLAGS) -o $@,"AS","$@")
+	$(call quiet-command,$(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $<,"AS","$@")
 
 %.o: %.c
 	$(call quiet-command,$(CC) $(CPPFLAGS) $(CFLAGS) -c $< -o $@,"CC","$@")
 
 %.img: %.o
-	$(call quiet-command,$(LD) $(LDFLAGS) -s -o $@ $^,"BUILD","$@")
+	$(call quiet-command,$(CC) $(CFLAGS) $(LDFLAGS) -s -o $@ $^,"BUILD","$@")
 
 %.raw: %.img
 	$(call quiet-command,$(OBJCOPY) -O binary -j .text $< $@,"BUILD","$@")
-- 
2.37.3

[PULL 07/14] watchdog: remove -watchdog option

[Paolo Bonzini]

This was deprecated in 6.2 and is ready to go.  It removes quite a bit
of code that handled the registration of watchdog models.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 docs/about/deprecated.rst       |  5 ----
 docs/about/removed-features.rst |  5 ++++
 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/sysemu/watchdog.h       | 12 ---------
 qemu-options.hx                 | 33 ++-----------------------
 softmmu/vl.c                    | 16 ------------
 12 files changed, 7 insertions(+), 143 deletions(-)

diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst
index a72fedba5f..93affe3669 100644
--- a/docs/about/deprecated.rst
+++ b/docs/about/deprecated.rst
@@ -81,11 +81,6 @@ the process listing. This is replaced by the new ``password-secret``
 option which lets the password be securely provided on the command
 line using a ``secret`` object instance.
 
-``-watchdog`` (since 6.2)
-'''''''''''''''''''''''''
-
-Use ``-device`` instead.
-
 ``-smp`` ("parameter=0" SMP configurations) (since 6.2)
 '''''''''''''''''''''''''''''''''''''''''''''''''''''''
 
diff --git a/docs/about/removed-features.rst b/docs/about/removed-features.rst
index a4aa3dca69..63df9848fd 100644
--- a/docs/about/removed-features.rst
+++ b/docs/about/removed-features.rst
@@ -403,6 +403,11 @@ Sound card devices should be created using ``-device`` or ``-audio``.
 The exception is ``pcspk`` which can be activated using ``-machine
 pcspk-audiodev=<name>``.
 
+``-watchdog`` (since 7.2)
+'''''''''''''''''''''''''
+
+Use ``-device`` instead.
+
 
 QEMU Machine Protocol (QMP) commands
 ------------------------------------
diff --git a/hw/watchdog/sbsa_gwdt.c b/hw/watchdog/sbsa_gwdt.c
index e49cacd0e2..7aa57a8c51 100644
--- a/hw/watchdog/sbsa_gwdt.c
+++ b/hw/watchdog/sbsa_gwdt.c
@@ -24,11 +24,6 @@
 #include "qemu/log.h"
 #include "qemu/module.h"
 
-static WatchdogTimerModel model = {
-    .wdt_name = TYPE_WDT_SBSA,
-    .wdt_description = "SBSA-compliant generic watchdog device",
-};
-
 static const VMStateDescription vmstate_sbsa_gwdt = {
     .name = "sbsa-gwdt",
     .version_id = 1,
@@ -287,7 +282,6 @@ static const TypeInfo wdt_sbsa_gwdt_info = {
 
 static void wdt_sbsa_gwdt_register_types(void)
 {
-    watchdog_add_model(&model);
     type_register_static(&wdt_sbsa_gwdt_info);
 }
 
diff --git a/hw/watchdog/watchdog.c b/hw/watchdog/watchdog.c
index 1437e6c5b6..6c082a3263 100644
--- a/hw/watchdog/watchdog.c
+++ b/hw/watchdog/watchdog.c
@@ -32,49 +32,6 @@
 #include "qemu/help_option.h"
 
 static WatchdogAction watchdog_action = WATCHDOG_ACTION_RESET;
-static QLIST_HEAD(, WatchdogTimerModel) watchdog_list;
-
-void watchdog_add_model(WatchdogTimerModel *model)
-{
-    QLIST_INSERT_HEAD(&watchdog_list, model, entry);
-}
-
-/* Returns:
- *   0 = continue
- *   1 = exit program with error
- *   2 = exit program without error
- */
-int select_watchdog(const char *p)
-{
-    WatchdogTimerModel *model;
-    QemuOpts *opts;
-
-    /* -watchdog ? lists available devices and exits cleanly. */
-    if (is_help_option(p)) {
-        QLIST_FOREACH(model, &watchdog_list, entry) {
-            fprintf(stderr, "\t%s\t%s\n",
-                     model->wdt_name, model->wdt_description);
-        }
-        return 2;
-    }
-
-    QLIST_FOREACH(model, &watchdog_list, entry) {
-        if (strcasecmp(model->wdt_name, p) == 0) {
-            /* add the device */
-            opts = qemu_opts_create(qemu_find_opts("device"), NULL, 0,
-                                    &error_abort);
-            qemu_opt_set(opts, "driver", p, &error_abort);
-            return 0;
-        }
-    }
-
-    fprintf(stderr, "Unknown -watchdog device. Supported devices are:\n");
-    QLIST_FOREACH(model, &watchdog_list, entry) {
-        fprintf(stderr, "\t%s\t%s\n",
-                 model->wdt_name, model->wdt_description);
-    }
-    return 1;
-}
 
 WatchdogAction get_watchdog_action(void)
 {
diff --git a/hw/watchdog/wdt_aspeed.c b/hw/watchdog/wdt_aspeed.c
index 31855afdf4..d753693a2e 100644
--- a/hw/watchdog/wdt_aspeed.c
+++ b/hw/watchdog/wdt_aspeed.c
@@ -202,11 +202,6 @@ static void aspeed_wdt_write(void *opaque, hwaddr offset, uint64_t data,
     return;
 }
 
-static WatchdogTimerModel model = {
-    .wdt_name = TYPE_ASPEED_WDT,
-    .wdt_description = "Aspeed watchdog device",
-};
-
 static const VMStateDescription vmstate_aspeed_wdt = {
     .name = "vmstate_aspeed_wdt",
     .version_id = 0,
@@ -416,7 +411,6 @@ static const TypeInfo aspeed_1030_wdt_info = {
 
 static void wdt_aspeed_register_types(void)
 {
-    watchdog_add_model(&model);
     type_register_static(&aspeed_wdt_info);
     type_register_static(&aspeed_2400_wdt_info);
     type_register_static(&aspeed_2500_wdt_info);
diff --git a/hw/watchdog/wdt_diag288.c b/hw/watchdog/wdt_diag288.c
index 9e8882a11c..76d89fbf78 100644
--- a/hw/watchdog/wdt_diag288.c
+++ b/hw/watchdog/wdt_diag288.c
@@ -19,11 +19,6 @@
 #include "migration/vmstate.h"
 #include "qemu/log.h"
 
-static WatchdogTimerModel model = {
-    .wdt_name = TYPE_WDT_DIAG288,
-    .wdt_description = "diag288 device for s390x platform",
-};
-
 static const VMStateDescription vmstate_diag288 = {
     .name = "vmstate_diag288",
     .version_id = 0,
@@ -138,7 +133,6 @@ static const TypeInfo wdt_diag288_info = {
 
 static void wdt_diag288_register_types(void)
 {
-    watchdog_add_model(&model);
     type_register_static(&wdt_diag288_info);
 }
 
diff --git a/hw/watchdog/wdt_i6300esb.c b/hw/watchdog/wdt_i6300esb.c
index f99a1c9d29..5693ec6a09 100644
--- a/hw/watchdog/wdt_i6300esb.c
+++ b/hw/watchdog/wdt_i6300esb.c
@@ -457,11 +457,6 @@ static void i6300esb_exit(PCIDevice *dev)
     timer_free(d->timer);
 }
 
-static WatchdogTimerModel model = {
-    .wdt_name = "i6300esb",
-    .wdt_description = "Intel 6300ESB",
-};
-
 static void i6300esb_class_init(ObjectClass *klass, void *data)
 {
     DeviceClass *dc = DEVICE_CLASS(klass);
@@ -493,7 +488,6 @@ static const TypeInfo i6300esb_info = {
 
 static void i6300esb_register_types(void)
 {
-    watchdog_add_model(&model);
     type_register_static(&i6300esb_info);
 }
 
diff --git a/hw/watchdog/wdt_ib700.c b/hw/watchdog/wdt_ib700.c
index 91d1bdc0da..b116c3a3aa 100644
--- a/hw/watchdog/wdt_ib700.c
+++ b/hw/watchdog/wdt_ib700.c
@@ -128,11 +128,6 @@ static void wdt_ib700_reset(DeviceState *dev)
     timer_del(s->timer);
 }
 
-static WatchdogTimerModel model = {
-    .wdt_name = "ib700",
-    .wdt_description = "iBASE 700",
-};
-
 static void wdt_ib700_class_init(ObjectClass *klass, void *data)
 {
     DeviceClass *dc = DEVICE_CLASS(klass);
@@ -153,7 +148,6 @@ static const TypeInfo wdt_ib700_info = {
 
 static void wdt_ib700_register_types(void)
 {
-    watchdog_add_model(&model);
     type_register_static(&wdt_ib700_info);
 }
 
diff --git a/hw/watchdog/wdt_imx2.c b/hw/watchdog/wdt_imx2.c
index c3128370b5..e776a2fbd4 100644
--- a/hw/watchdog/wdt_imx2.c
+++ b/hw/watchdog/wdt_imx2.c
@@ -291,14 +291,8 @@ static const TypeInfo imx2_wdt_info = {
     .class_init    = imx2_wdt_class_init,
 };
 
-static WatchdogTimerModel model = {
-    .wdt_name = "imx2-watchdog",
-    .wdt_description = "i.MX2 Watchdog",
-};
-
 static void imx2_wdt_register_type(void)
 {
-    watchdog_add_model(&model);
     type_register_static(&imx2_wdt_info);
 }
 type_init(imx2_wdt_register_type)
diff --git a/include/sysemu/watchdog.h b/include/sysemu/watchdog.h
index d2d4901dbb..745c89b02b 100644
--- a/include/sysemu/watchdog.h
+++ b/include/sysemu/watchdog.h
@@ -25,20 +25,8 @@
 #include "qemu/queue.h"
 #include "qapi/qapi-types-run-state.h"
 
-struct WatchdogTimerModel {
-    QLIST_ENTRY(WatchdogTimerModel) entry;
-
-    /* Short name of the device - used to select it on the command line. */
-    const char *wdt_name;
-    /* Longer description (eg. manufacturer and full model number). */
-    const char *wdt_description;
-};
-typedef struct WatchdogTimerModel WatchdogTimerModel;
-
 /* in hw/watchdog.c */
-int select_watchdog(const char *p);
 WatchdogAction get_watchdog_action(void);
-void watchdog_add_model(WatchdogTimerModel *model);
 void watchdog_perform_action(void);
 
 #endif /* QEMU_WATCHDOG_H */
diff --git a/qemu-options.hx b/qemu-options.hx
index d8b5ce5b43..df4b8c8f1a 100644
--- a/qemu-options.hx
+++ b/qemu-options.hx
@@ -4330,7 +4330,7 @@ SRST
 
     ``-action panic=none``
     ``-action reboot=shutdown,shutdown=pause``
-    ``-watchdog i6300esb -action watchdog=pause``
+    ``-device i6300esb -action watchdog=pause``
 
 ERST
 
@@ -4448,35 +4448,6 @@ SRST
     specifies the snapshot name used to load the initial VM state.
 ERST
 
-DEF("watchdog", HAS_ARG, QEMU_OPTION_watchdog, \
-    "-watchdog model\n" \
-    "                enable virtual hardware watchdog [default=none]\n",
-    QEMU_ARCH_ALL)
-SRST
-``-watchdog model``
-    Create a virtual hardware watchdog device. Once enabled (by a guest
-    action), the watchdog must be periodically polled by an agent inside
-    the guest or else the guest will be restarted. Choose a model for
-    which your guest has drivers.
-
-    The model is the model of hardware watchdog to emulate. Use
-    ``-watchdog help`` to list available hardware models. Only one
-    watchdog can be enabled for a guest.
-
-    The following models may be available:
-
-    ``ib700``
-        iBASE 700 is a very simple ISA watchdog with a single timer.
-
-    ``i6300esb``
-        Intel 6300ESB I/O controller hub is a much more featureful
-        PCI-based dual-timer watchdog.
-
-    ``diag288``
-        A virtual watchdog for s390x backed by the diagnose 288
-        hypercall (currently KVM only).
-ERST
-
 DEF("watchdog-action", HAS_ARG, QEMU_OPTION_watchdog_action, \
     "-watchdog-action reset|shutdown|poweroff|inject-nmi|pause|debug|none\n" \
     "                action when watchdog fires [default=reset]\n",
@@ -4498,7 +4469,7 @@ SRST
 
     Examples:
 
-    ``-watchdog i6300esb -watchdog-action pause``; \ ``-watchdog ib700``
+    ``-device i6300esb -watchdog-action pause``
 
 ERST
 
diff --git a/softmmu/vl.c b/softmmu/vl.c
index e62b9cc35d..b8788e765a 100644
--- a/softmmu/vl.c
+++ b/softmmu/vl.c
@@ -53,7 +53,6 @@
 #include "hw/isa/isa.h"
 #include "hw/scsi/scsi.h"
 #include "hw/display/vga.h"
-#include "sysemu/watchdog.h"
 #include "hw/firmware/smbios.h"
 #include "hw/acpi/acpi.h"
 #include "hw/xen/xen.h"
@@ -181,7 +180,6 @@ static Chardev **serial_hds;
 static const char *log_mask;
 static const char *log_file;
 static bool list_data_dirs;
-static const char *watchdog;
 static const char *qtest_chrdev;
 static const char *qtest_log;
 
@@ -2329,12 +2327,6 @@ static void qemu_process_sugar_options(void)
         }
         object_register_sugar_prop("memory-backend", "prealloc", "on", false);
     }
-
-    if (watchdog) {
-        int i = select_watchdog(watchdog);
-        if (i > 0)
-            exit (i == 1 ? 1 : 0);
-    }
 }
 
 /* -action processing */
@@ -3107,14 +3099,6 @@ void qemu_init(int argc, char **argv, char **envp)
                     default_monitor = 0;
                 }
                 break;
-            case QEMU_OPTION_watchdog:
-                if (watchdog) {
-                    error_report("only one watchdog option may be given");
-                    exit(1);
-                }
-                warn_report("-watchdog is deprecated; use -device instead.");
-                watchdog = optarg;
-                break;
             case QEMU_OPTION_action:
                 olist = qemu_find_opts("action");
                 if (!qemu_opts_parse_noisily(olist, optarg, false)) {
-- 
2.37.3

[PULL 08/14] ui: fix path to dbus-display1.h

[Paolo Bonzini]

While the source directory is always included in the include path,
the corresponding directory in the build tree is not.  Therefore,
custom_targets (e.g. ui/dbus-display1.h) must be referred to using
the full path.

This avoids a build failure when ui/dbus-chardev.c is not built as
a module:

In file included from ../ui/dbus-chardev.c:32:
../ui/dbus.h:34:10: fatal error: dbus-display1.h: No such file or directory
   34 | #include "dbus-display1.h"
      |          ^~~~~~~~~~~~~~~~~

Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 tests/qtest/dbus-display-test.c | 2 +-
 ui/dbus.h                       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/qtest/dbus-display-test.c b/tests/qtest/dbus-display-test.c
index 8be5974763..cb1b62d1d1 100644
--- a/tests/qtest/dbus-display-test.c
+++ b/tests/qtest/dbus-display-test.c
@@ -3,7 +3,7 @@
 #include <gio/gio.h>
 #include <gio/gunixfdlist.h>
 #include "libqtest.h"
-#include "dbus-display1.h"
+#include "ui/dbus-display1.h"
 
 static GDBusConnection*
 test_dbus_p2p_from_fd(int fd)
diff --git a/ui/dbus.h b/ui/dbus.h
index c001c11f70..9c149e7b41 100644
--- a/ui/dbus.h
+++ b/ui/dbus.h
@@ -31,7 +31,7 @@
 #include "ui/console.h"
 #include "ui/clipboard.h"
 
-#include "dbus-display1.h"
+#include "ui/dbus-display1.h"
 
 typedef struct DBusClipboardRequest {
     GDBusMethodInvocation *invocation;
-- 
2.37.3

[PULL 09/14] meson: require 0.61.3

[Paolo Bonzini]

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>
---
 configure       | 2 +-
 meson           | 2 +-
 meson.build     | 5 +----
 qga/meson.build | 2 +-
 4 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/configure b/configure
index 894e37310f..c5069775db 100755
--- a/configure
+++ b/configure
@@ -1114,7 +1114,7 @@ fi
 python="$python -B"
 
 if test -z "$meson"; then
-    if test "$explicit_python" = no && has meson && version_ge "$(meson --version)" 0.59.3; then
+    if test "$explicit_python" = no && has meson && version_ge "$(meson --version)" 0.61.5; then
         meson=meson
     elif test "$git_submodules_action" != 'ignore' ; then
         meson=git
diff --git a/meson b/meson
index 12f9f04ba0..3a9b285a55 160000
--- a/meson
+++ b/meson
@@ -1 +1 @@
-Subproject commit 12f9f04ba0decfda425dbbf9a501084c153a2d18
+Subproject commit 3a9b285a55b91b53b2acda987192274352ecb5be
diff --git a/meson.build b/meson.build
index 3885fc1076..8c1139a82b 100644
--- a/meson.build
+++ b/meson.build
@@ -1,4 +1,4 @@
-project('qemu', ['c'], meson_version: '>=0.59.3',
+project('qemu', ['c'], meson_version: '>=0.61.3',
         default_options: ['warning_level=1', 'c_std=gnu11', 'cpp_std=gnu++11', 'b_colorout=auto',
                           'b_staticpic=false', 'stdsplit=false', 'optimization=2', 'b_pie=true'],
         version: files('VERSION'))
@@ -1669,12 +1669,9 @@ endif
 have_host_block_device = (targetos != 'darwin' or
     cc.has_header('IOKit/storage/IOMedia.h'))
 
-# FIXME enable_modules shouldn't be necessary, but: https://github.com/mesonbuild/meson/issues/8333
 dbus_display = get_option('dbus_display') \
   .require(gio.version().version_compare('>=2.64'),
            error_message: '-display dbus requires glib>=2.64') \
-  .require(enable_modules,
-           error_message: '-display dbus requires --enable-modules') \
   .require(gdbus_codegen.found(),
            error_message: '-display dbus requires gdbus-codegen') \
   .require(opengl.found() and gbm.found(),
diff --git a/qga/meson.build b/qga/meson.build
index 65c1e93846..a0ffd6d268 100644
--- a/qga/meson.build
+++ b/qga/meson.build
@@ -138,7 +138,7 @@ else
   if get_option('guest_agent_msi').enabled()
     error('MSI guest agent package is available only for MinGW Windows cross-compilation')
   endif
-  install_subdir('run', install_dir: get_option('localstatedir'))
+  install_emptydir(get_option('localstatedir') / 'run')
 endif
 
 alias_target('qemu-ga', all_qga)
-- 
2.37.3

[PULL 10/14] meson: multiple names can be passed to dependency()

[Paolo Bonzini]

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>
---
 meson.build | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/meson.build b/meson.build
index 8c1139a82b..48533ace7b 100644
--- a/meson.build
+++ b/meson.build
@@ -825,14 +825,10 @@ if have_system and get_option('curses').allowed()
     }'''
 
   curses_dep_list = targetos == 'windows' ? ['ncurses', 'ncursesw'] : ['ncursesw']
-  foreach curses_dep : curses_dep_list
-    if not curses.found()
-      curses = dependency(curses_dep,
-                          required: false,
-                          method: 'pkg-config',
-                          kwargs: static_kwargs)
-    endif
-  endforeach
+  curses = dependency(curses_dep_list,
+                      required: false,
+                      method: 'pkg-config',
+                      kwargs: static_kwargs)
   msg = get_option('curses').enabled() ? 'curses library not found' : ''
   curses_compile_args = ['-DNCURSES_WIDECHAR=1']
   if curses.found()
-- 
2.37.3

[PULL 11/14] configure, meson: move C++ compiler detection to meson.build

[Paolo Bonzini]

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>
---
 configure      | 57 --------------------------------------------------
 meson.build    | 37 ++++++++++++++++++++++----------
 scripts/main.c |  1 +
 3 files changed, 27 insertions(+), 68 deletions(-)
 create mode 100644 scripts/main.c

diff --git a/configure b/configure
index c5069775db..3e3c0f36c9 100755
--- a/configure
+++ b/configure
@@ -75,7 +75,6 @@ fi
 TMPB="qemu-conf"
 TMPC="${TMPDIR1}/${TMPB}.c"
 TMPO="${TMPDIR1}/${TMPB}.o"
-TMPCXX="${TMPDIR1}/${TMPB}.cxx"
 TMPM="${TMPDIR1}/${TMPB}.m"
 TMPE="${TMPDIR1}/${TMPB}.exe"
 
@@ -158,10 +157,6 @@ do_cc() {
     do_compiler_werror "$cc" $CPU_CFLAGS "$@"
 }
 
-do_cxx() {
-    do_compiler_werror "$cxx" $CPU_CFLAGS "$@"
-}
-
 do_objc() {
     do_compiler_werror "$objcc" $CPU_CFLAGS "$@"
 }
@@ -171,24 +166,6 @@ add_to() {
     eval $1=\${$1:+\"\$$1 \"}\$2
 }
 
-update_cxxflags() {
-    # Set QEMU_CXXFLAGS from QEMU_CFLAGS by filtering out those
-    # options which some versions of GCC's C++ compiler complain about
-    # because they only make sense for C programs.
-    QEMU_CXXFLAGS="-D__STDC_LIMIT_MACROS -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS"
-    CONFIGURE_CXXFLAGS=$(echo "$CONFIGURE_CFLAGS" | sed s/-std=gnu11/-std=gnu++11/)
-    for arg in $QEMU_CFLAGS; do
-        case $arg in
-            -Wstrict-prototypes|-Wmissing-prototypes|-Wnested-externs|\
-            -Wold-style-declaration|-Wold-style-definition|-Wredundant-decls)
-                ;;
-            *)
-                QEMU_CXXFLAGS=${QEMU_CXXFLAGS:+$QEMU_CXXFLAGS }$arg
-                ;;
-        esac
-    done
-}
-
 compile_object() {
   local_cflags="$1"
   do_cc $CFLAGS $EXTRA_CFLAGS $CONFIGURE_CFLAGS $QEMU_CFLAGS $local_cflags -c -o $TMPO $TMPC
@@ -2362,38 +2339,6 @@ fi
 #######################################
 # generate config-host.mak
 
-# Check that the C++ compiler exists and works with the C compiler.
-# All the QEMU_CXXFLAGS are based on QEMU_CFLAGS. Keep this at the end to don't miss any other that could be added.
-if has $cxx; then
-    cat > $TMPC <<EOF
-int c_function(void);
-int main(void) { return c_function(); }
-EOF
-
-    compile_object
-
-    cat > $TMPCXX <<EOF
-extern "C" {
-   int c_function(void);
-}
-int c_function(void) { return 42; }
-EOF
-
-    update_cxxflags
-
-    if do_cxx $CXXFLAGS $EXTRA_CXXFLAGS $CONFIGURE_CXXFLAGS $QEMU_CXXFLAGS -o $TMPE $TMPCXX $TMPO $QEMU_LDFLAGS; then
-        # C++ compiler $cxx works ok with C compiler $cc
-        :
-    else
-        echo "C++ compiler $cxx does not work with C compiler $cc"
-        echo "Disabling C++ specific optional code"
-        cxx=
-    fi
-else
-    echo "No C++ compiler available; disabling C++ specific optional code"
-    cxx=
-fi
-
 if ! (GIT="$git" "$source_path/scripts/git-submodule.sh" "$git_submodules_action" "$git_submodules"); then
     exit 1
 fi
@@ -2474,7 +2419,6 @@ echo "MESON=$meson" >> $config_host_mak
 echo "NINJA=$ninja" >> $config_host_mak
 echo "CC=$cc" >> $config_host_mak
 echo "QEMU_CFLAGS=$QEMU_CFLAGS" >> $config_host_mak
-echo "QEMU_CXXFLAGS=$QEMU_CXXFLAGS" >> $config_host_mak
 echo "QEMU_OBJCFLAGS=$QEMU_OBJCFLAGS" >> $config_host_mak
 echo "GLIB_CFLAGS=$glib_cflags" >> $config_host_mak
 echo "GLIB_LIBS=$glib_libs" >> $config_host_mak
@@ -2665,7 +2609,6 @@ if test "$skip_meson" = no; then
       echo "${a}-softmmu = '$c'" >> $cross
   done
 
-  test -z "$cxx" && echo "link_language = 'c'" >> $cross
   echo "[built-in options]" >> $cross
   echo "c_args = [$(meson_quote $CFLAGS $EXTRA_CFLAGS)]" >> $cross
   echo "cpp_args = [$(meson_quote $CXXFLAGS $EXTRA_CXXFLAGS)]" >> $cross
diff --git a/meson.build b/meson.build
index 48533ace7b..a1b265b133 100644
--- a/meson.build
+++ b/meson.build
@@ -180,7 +180,6 @@ endif
 ##################
 
 qemu_cflags = config_host['QEMU_CFLAGS'].split()
-qemu_cxxflags = config_host['QEMU_CXXFLAGS'].split()
 qemu_objcflags = config_host['QEMU_OBJCFLAGS'].split()
 qemu_ldflags = config_host['QEMU_LDFLAGS'].split()
 
@@ -194,7 +193,6 @@ endif
 
 if get_option('gprof')
   qemu_cflags += ['-p']
-  qemu_cxxflags += ['-p']
   qemu_objcflags += ['-p']
   qemu_ldflags += ['-p']
 endif
@@ -240,8 +238,33 @@ if get_option('fuzzing')
 endif
 
 add_global_arguments(qemu_cflags, native: false, language: ['c'])
-add_global_arguments(qemu_cxxflags, native: false, language: ['cpp'])
 add_global_arguments(qemu_objcflags, native: false, language: ['objc'])
+
+# Check that the C++ compiler exists and works with the C compiler.
+link_language = 'c'
+linker = cc
+qemu_cxxflags = []
+if add_languages('cpp', required: false, native: false)
+  cxx = meson.get_compiler('cpp')
+  add_global_arguments(['-D__STDC_LIMIT_MACROS', '-D__STDC_CONSTANT_MACROS', '-D__STDC_FORMAT_MACROS'],
+                       native: false, language: 'cpp')
+  foreach k: qemu_cflags
+    if k not in ['-Wstrict-prototypes', '-Wmissing-prototypes', '-Wnested-externs',
+                 '-Wold-style-declaration', '-Wold-style-definition', '-Wredundant-decls']
+      qemu_cxxflags += [k]
+    endif
+  endforeach
+  add_global_arguments(qemu_cxxflags, native: false, language: 'cpp')
+
+  if cxx.links(files('scripts/main.c'), args: qemu_cflags)
+    link_language = 'cpp'
+    linker = cxx
+  else
+    message('C++ compiler does not work with C compiler')
+    message('Disabling C++-specific optional code')
+  endif
+endif
+
 add_global_link_arguments(qemu_ldflags, native: false, language: ['c', 'cpp', 'objc'])
 
 if targetos == 'linux'
@@ -255,14 +278,6 @@ add_project_arguments('-iquote', '.',
                       '-iquote', meson.current_source_dir() / 'include',
                       language: ['c', 'cpp', 'objc'])
 
-link_language = meson.get_external_property('link_language', 'cpp')
-if link_language == 'cpp'
-  add_languages('cpp', required: true, native: false)
-  cxx = meson.get_compiler('cpp')
-  linker = cxx
-else
-  linker = cc
-endif
 if host_machine.system() == 'darwin'
   add_languages('objc', required: false, native: false)
 endif
diff --git a/scripts/main.c b/scripts/main.c
new file mode 100644
index 0000000000..b552c8e4ed
--- /dev/null
+++ b/scripts/main.c
@@ -0,0 +1 @@
+int main(void) {}
-- 
2.37.3

[PULL 12/14] configure, meson: move linker flag detection to meson

[Paolo Bonzini]

Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 configure   | 16 ----------------
 meson.build | 13 +++++++++++++
 2 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/configure b/configure
index 3e3c0f36c9..e032bd0a08 100755
--- a/configure
+++ b/configure
@@ -1342,12 +1342,10 @@ EOF
 if test "$static" = "yes"; then
   if test "$pie" != "no" && compile_prog "-Werror -fPIE -DPIE" "-static-pie"; then
     CONFIGURE_CFLAGS="-fPIE -DPIE $CONFIGURE_CFLAGS"
-    QEMU_LDFLAGS="-static-pie $QEMU_LDFLAGS"
     pie="yes"
   elif test "$pie" = "yes"; then
     error_exit "-static-pie not available due to missing toolchain support"
   else
-    QEMU_LDFLAGS="-static $QEMU_LDFLAGS"
     pie="no"
   fi
 elif test "$pie" = "no"; then
@@ -1369,12 +1367,6 @@ else
   pie="no"
 fi
 
-# Detect support for PT_GNU_RELRO + DT_BIND_NOW.
-# The combination is known as "full relro", because .got.plt is read-only too.
-if compile_prog "" "-Wl,-z,relro -Wl,-z,now" ; then
-  QEMU_LDFLAGS="-Wl,-z,relro -Wl,-z,now $QEMU_LDFLAGS"
-fi
-
 ##########################################
 # __sync_fetch_and_and requires at least -march=i486. Many toolchains
 # use i686 as default anyway, but for those that don't, an explicit
@@ -2242,14 +2234,6 @@ if test "$have_ubsan" = "yes"; then
 fi
 
 ##########################################
-
-# Exclude --warn-common with TSan to suppress warnings from the TSan libraries.
-if test "$solaris" = "no" && test "$tsan" = "no"; then
-    if $ld --version 2>/dev/null | grep "GNU ld" >/dev/null 2>/dev/null ; then
-        QEMU_LDFLAGS="-Wl,--warn-common $QEMU_LDFLAGS"
-    fi
-fi
-
 # Guest agent Windows MSI package
 
 if test "$QEMU_GA_MANUFACTURER" = ""; then
diff --git a/meson.build b/meson.build
index a1b265b133..f6962834a3 100644
--- a/meson.build
+++ b/meson.build
@@ -183,6 +183,14 @@ qemu_cflags = config_host['QEMU_CFLAGS'].split()
 qemu_objcflags = config_host['QEMU_OBJCFLAGS'].split()
 qemu_ldflags = config_host['QEMU_LDFLAGS'].split()
 
+if enable_static
+  qemu_ldflags += get_option('b_pie') ? '-static-pie' : '-static'
+endif
+
+# Detect support for PT_GNU_RELRO + DT_BIND_NOW.
+# The combination is known as "full relro", because .got.plt is read-only too.
+qemu_ldflags += cc.get_supported_link_arguments('-Wl,-z,relro', '-Wl,-z,now')
+
 if targetos == 'windows'
   qemu_ldflags += cc.get_supported_link_arguments('-Wl,--no-seh', '-Wl,--nxcompat')
   # Disable ASLR for debug builds to allow debugging with gdb
@@ -265,6 +273,11 @@ if add_languages('cpp', required: false, native: false)
   endif
 endif
 
+# Exclude --warn-common with TSan to suppress warnings from the TSan libraries.
+if targetos != 'sunos' and not config_host.has_key('CONFIG_TSAN')
+  qemu_ldflags += linker.get_supported_link_arguments('-Wl,--warn-common')
+endif
+
 add_global_link_arguments(qemu_ldflags, native: false, language: ['c', 'cpp', 'objc'])
 
 if targetos == 'linux'
-- 
2.37.3

[PULL 13/14] target/i386/kvm: fix kvmclock_current_nsec: Assertion `time.tsc_timestamp <= migration_tsc' failed

[Paolo Bonzini]

From: Ray Zhang <zhanglei002@gmail.com>

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>
---
 target/i386/kvm/kvm.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/target/i386/kvm/kvm.c b/target/i386/kvm/kvm.c
index a1fd1f5379..9eeee91c2f 100644
--- a/target/i386/kvm/kvm.c
+++ b/target/i386/kvm/kvm.c
@@ -157,7 +157,7 @@ bool kvm_has_adjust_clock_stable(void)
 {
     int ret = kvm_check_extension(kvm_state, KVM_CAP_ADJUST_CLOCK);
 
-    return (ret == KVM_CLOCK_TSC_STABLE);
+    return (ret & KVM_CLOCK_TSC_STABLE);
 }
 
 bool kvm_has_adjust_clock(void)
-- 
2.37.3

[PULL 14/14] x86: re-initialize RNG seed when selecting kernel

[Paolo Bonzini]

From: "Jason A. Donenfeld" <Jason@zx2c4.com>

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>
---
 hw/i386/x86.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/hw/i386/x86.c b/hw/i386/x86.c
index f9a4ddaa4a..1148f70c03 100644
--- a/hw/i386/x86.c
+++ b/hw/i386/x86.c
@@ -1112,11 +1112,14 @@ void x86_load_linux(X86MachineState *x86ms,
         setup_data->len = cpu_to_le32(RNG_SEED_LENGTH);
         qemu_guest_getrandom_nofail(setup_data->data, RNG_SEED_LENGTH);
         qemu_register_reset(reset_rng_seed, setup_data);
+        fw_cfg_add_bytes_callback(fw_cfg, FW_CFG_KERNEL_DATA, reset_rng_seed, NULL,
+                                  setup_data, kernel, kernel_size, true);
+    } else {
+        fw_cfg_add_bytes(fw_cfg, FW_CFG_KERNEL_DATA, kernel, kernel_size);
     }
 
     fw_cfg_add_i32(fw_cfg, FW_CFG_KERNEL_ADDR, prot_addr);
     fw_cfg_add_i32(fw_cfg, FW_CFG_KERNEL_SIZE, kernel_size);
-    fw_cfg_add_bytes(fw_cfg, FW_CFG_KERNEL_DATA, kernel, kernel_size);
     sev_load_ctx.kernel_data = (char *)kernel;
     sev_load_ctx.kernel_size = kernel_size;
 
-- 
2.37.3

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

[Stefan Hajnoczi]

Please see the following check-cfi-x86_64 failure:

>>> QTEST_QEMU_STORAGE_DAEMON_BINARY=./storage-daemon/qemu-storage-daemon QTEST_QEMU_IMG=./qemu-img MALLOC_PERTURB_=30 QTEST_QEMU_BINARY=./qemu-system-x86_64 G_TEST_DBUS_DAEMON=/builds/qemu-project/qemu/tests/dbus-vmstate-daemon.sh /builds/qemu-project/qemu/build/tests/qtest/dbus-display-test --tap -k
――――――――――――――――――――――――――――――――――――― ✀ ―――――――――――――――――――――――――――――――――――――
stderr:
ui/dbus-display1.c:17036:3: runtime error: control flow integrity
check for type 'void (struct _GObject *)' failed during indirect
function call
(/lib64/libgio-2.0.so.0+0x123910): note: (unknown) defined here
ui/dbus-display1.c:17036:3: note: check failed in
/builds/qemu-project/qemu/build/qemu-system-x86_64, destination
function located in /lib64/libgio-2.0.so.0
SUMMARY: UndefinedBehaviorSanitizer: undefined-behavior
ui/dbus-display1.c:17036:3 in
../tests/qtest/libqtest.c:156: kill_qemu() tried to terminate QEMU
process but encountered exit status 1 (expected 0)
TAP parsing error: Too few tests run (expected 3, got 0)
(test program exited with status code -6)

https://gitlab.com/qemu-project/qemu/-/jobs/3106030360