Merge tag 'for-11.0-pull-request' of https://gitlab.com/marcandre.lureau/qemu into staging Gather various audio/ui/dump patches for 11.0-rc # -----BEGIN PGP SIGNATURE----- # # iQIzBAABCgAdFiEEh6m9kz+HxgbSdvYt2ujhCXWWnOUFAmm5jPYACgkQ2ujhCXWW # nOWsxQ/+LOVsrCjxSQTI7Iygo8ICXBKwjBXOHA9g4PHMSZDD5B+WbCXLXRPfSwkj # y+zjJpv13pqXXNFKw0MoEz6kIRKFWYq1XbHLgkXt538QIEJ5h5tff0V8YGtk9U0H # D2ZwUBOWH7OW4VDCFg2BCYNrnC4y2wxFG7lSm5tbeJzkAogsLRDNPf5thvHgdS+U # oYP2g8WdXx5ZgX8/f9tvDApTPXjfg1eATLy8veSZWkgqaCL8pO5E436sVT+cPRii # aFQpiTPms6vutOtQpWLHv6Kvffvkk0A1zrdlRrvlEhhWT3v5sBvF5hVH/iEt+LIL # ldChBtJnzc40ujsdKHSmUV+foCnKQYuWSwzgJaxSg2Rp81yrVZ+L8nz3f8W/raPp # 5dWr+i6e80+2nUvDL3LA6HOJGz2JtQyaRXc4BgiwePEMKT6RfFW9V4mWRp4ItlRv # 3mWhGFjPRLEU8kOefAcT77epe1gwLdlpUH3ZjCqECZYUWNu5FjNjPQUZ1kxD3o0K # 7TyxLrZ6OH9b3mGhum17GBF0tAI3rkErriOxzjQF3UqMsFB9+OZlzQNfQRL/NnYw # NjmV8JMXRe2+tjxS1bfqcUanmKpxYqiDJPJaoWG08VHuhuXBydfhiOhrG61H1u3N # yoq5kb8XZ4LiSin+smSl5a9gCa7qZ17ceAAxuuCbItCXuHZ4nsk= # =K+XO # -----END PGP SIGNATURE----- # gpg: Signature made Tue Mar 17 17:18:46 2026 GMT # gpg: using RSA key 87A9BD933F87C606D276F62DDAE8E10975969CE5 # gpg: Good signature from "Marc-André Lureau <marcandre.lureau@redhat.com>" [full] # gpg: aka "Marc-André Lureau <marcandre.lureau@gmail.com>" [full] # Primary key fingerprint: 87A9 BD93 3F87 C606 D276 F62D DAE8 E109 7596 9CE5 * tag 'for-11.0-pull-request' of https://gitlab.com/marcandre.lureau/qemu: coreaudio: Initialize the buffer for device change audio: Add functions to initialize buffers coreaudio: Commit the result of init in the end coreaudio: Improve naming ui/surface: Avoid including epoxy/gl.h in header files ui/console: Remove DisplaySurface::mem_obj ui/console: Unify pixman-OpenGL format mapping dump: enhance dump_state_prepare fd initialization ui/gtk-egl: Ensure EGL surface is available before drawing ui/dbus-listener: remove dbus_filter on connection close ui/dbus-listener: Fix FBO leak in dbus_cursor_dmabuf virtio-gpu: use computed rowstride instead of deriving it from hostmem virtio-gpu: fix overflow check when allocating 2d image ui/vdagent: add migration blocker when machine version < 10.1 rutabaga: improve error handling, fix potential crash during init audio/mixeng: drop some needless checks Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
diff --git a/block/mirror.c b/block/mirror.c index fa1d975..2fcded9 100644 --- a/block/mirror.c +++ b/block/mirror.c
@@ -1276,23 +1276,25 @@ return; } - /* block all operations on to_replace bs */ - if (s->replaces) { - s->to_replace = bdrv_find_node(s->replaces); - if (!s->to_replace) { - error_setg(errp, "Node name '%s' not found", s->replaces); - return; + if (!s->should_complete) { + /* block all operations on to_replace bs */ + if (s->replaces) { + s->to_replace = bdrv_find_node(s->replaces); + if (!s->to_replace) { + error_setg(errp, "Node name '%s' not found", s->replaces); + return; + } + + /* TODO Translate this into child freeze system. */ + error_setg(&s->replace_blocker, + "block device is in use by block-job-complete"); + bdrv_op_block_all(s->to_replace, s->replace_blocker); + bdrv_ref(s->to_replace); } - /* TODO Translate this into child freeze system. */ - error_setg(&s->replace_blocker, - "block device is in use by block-job-complete"); - bdrv_op_block_all(s->to_replace, s->replace_blocker); - bdrv_ref(s->to_replace); + s->should_complete = true; } - s->should_complete = true; - /* If the job is paused, it will be re-entered when it is resumed */ WITH_JOB_LOCK_GUARD() { if (!job->paused) {
diff --git a/block/throttle-groups.c b/block/throttle-groups.c index 5329ff1..4b1b194 100644 --- a/block/throttle-groups.c +++ b/block/throttle-groups.c
@@ -391,6 +391,7 @@ typedef struct { ThrottleGroupMember *tgm; ThrottleDirection direction; + bool reset_timer_armed; } RestartData; static void coroutine_fn throttle_group_restart_queue_entry(void *opaque) @@ -403,6 +404,9 @@ bool empty_queue; qemu_mutex_lock(&tg->lock); + if (data->reset_timer_armed) { + tg->any_timer_armed[direction] = false; + } empty_queue = !throttle_group_co_restart_queue(tgm, direction); /* If the request queue was empty then we have to take care of @@ -419,18 +423,23 @@ } static void throttle_group_restart_queue(ThrottleGroupMember *tgm, - ThrottleDirection direction) + ThrottleDirection direction, + bool reset_timer_armed) { Coroutine *co; RestartData *rd = g_new0(RestartData, 1); rd->tgm = tgm; rd->direction = direction; + rd->reset_timer_armed = reset_timer_armed; - /* This function is called when a timer is fired or when - * throttle_group_restart_tgm() is called. Either way, there can + /* If reset_timer_armed is set then this means that this function + * was called when a timer was fired (either from timer_cb() or + * from throttle_group_restart_tgm()). In this case there can * be no timer pending on this tgm at this point */ - assert(!timer_pending(tgm->throttle_timers.timers[direction])); + if (reset_timer_armed) { + assert(!timer_pending(tgm->throttle_timers.timers[direction])); + } qatomic_inc(&tgm->restart_pending); @@ -444,15 +453,50 @@ if (tgm->throttle_state) { for (dir = THROTTLE_READ; dir < THROTTLE_MAX; dir++) { - QEMUTimer *t = tgm->throttle_timers.timers[dir]; + QEMUTimer *t; + ThrottleState *ts = tgm->throttle_state; + ThrottleGroup *tg = container_of(ts, ThrottleGroup, ts); + bool reset_timer_armed; + + /* + * This function restarts the tgm's queue immediately. + * This is used for example for callers to drain all requests. + * There are three different scenarios depending on whether + * a timer is armed for this tg and which tgm owns the timer. + */ + + qemu_mutex_lock(&tg->lock); + + t = tgm->throttle_timers.timers[dir]; if (timer_pending(t)) { - /* If there's a pending timer on this tgm, fire it now */ + /* + * Case 1: this tgm has a pending timer. + * We can fire the timer immediately. + */ timer_del(t); - timer_cb(tgm, dir); + reset_timer_armed = true; + } else if (tg->any_timer_armed[dir]) { + /* + * Case 2: another tgm has a pending timer. + * In this case we can still restart the queue but we + * have to leave any_timer_armed untouched so the + * other tgm's timer is not disrupted. + */ + reset_timer_armed = false; } else { - /* Else run the next request from the queue manually */ - throttle_group_restart_queue(tgm, dir); + /* + * Case 3: there is no timer set for this group. + * Here we can simulate a timer that fires immediately, + * so the queue is restarted but no other thread + * can arm a timer in the meantime. + */ + tg->any_timer_armed[dir] = true; + reset_timer_armed = true; } + + qemu_mutex_unlock(&tg->lock); + + throttle_group_restart_queue(tgm, dir, reset_timer_armed); } } } @@ -499,16 +543,13 @@ */ static void timer_cb(ThrottleGroupMember *tgm, ThrottleDirection direction) { - ThrottleState *ts = tgm->throttle_state; - ThrottleGroup *tg = container_of(ts, ThrottleGroup, ts); - - /* The timer has just been fired, so we can update the flag */ - qemu_mutex_lock(&tg->lock); - tg->any_timer_armed[direction] = false; - qemu_mutex_unlock(&tg->lock); - - /* Run the request that was waiting for this timer */ - throttle_group_restart_queue(tgm, direction); + /* + * Run the request that was waiting for this timer. + * tg->any_timer_armed needs to be cleared, but we'll do it later + * when the queue is restarted in order to prevent another thread + * from arming the timer before that. + */ + throttle_group_restart_queue(tgm, direction, true); } static void read_timer_cb(void *opaque)
diff --git a/contrib/plugins/uftrace.c b/contrib/plugins/uftrace.c index e3c65a1..f974090 100644 --- a/contrib/plugins/uftrace.c +++ b/contrib/plugins/uftrace.c
@@ -817,7 +817,8 @@ if (fp == caller.frame_pointer) { /* return */ CallstackEntry e = callstack_pop(cs); - trace_exit_function(t, timestamp, e.pc, callstack_depth(cs)); + /* uftrace convention is to use same depth as entry */ + trace_exit_function(t, timestamp, e.pc, callstack_depth(cs) + 1); return; }
diff --git a/docs/about/build-platforms.rst b/docs/about/build-platforms.rst index 6e3088d..3d23dfb 100644 --- a/docs/about/build-platforms.rst +++ b/docs/about/build-platforms.rst
@@ -114,7 +114,7 @@ bindgen tool, which is too big to package and distribute. The minimum supported version of bindgen is 0.60.x. For distributions that do not include bindgen or have an older version, it is recommended to install - a newer version using ``cargo install bindgen-cli``. + a newer version using ``cargo install --locked bindgen-cli``. QEMU requires Rust 1.83.0. This is available on all supported platforms except for the ``mips64el`` architecture on Debian bookworm. For all other
diff --git a/hw/ppc/pnv.c b/hw/ppc/pnv.c index 1513575..7e54b6b 100644 --- a/hw/ppc/pnv.c +++ b/hw/ppc/pnv.c
@@ -773,26 +773,8 @@ } } - if (machine->fdt) { - fdt = machine->fdt; - } else { - fdt = pnv_dt_create(machine); - /* Pack resulting tree */ - _FDT((fdt_pack(fdt))); - } - + fdt = machine->fdt; cpu_physical_memory_write(PNV_FDT_ADDR, fdt, fdt_totalsize(fdt)); - - /* Update machine->fdt with latest fdt */ - if (machine->fdt != fdt) { - /* - * Set machine->fdt for 'dumpdtb' QMP/HMP command. Free - * the existing machine->fdt to avoid leaking it during - * a reset. - */ - g_free(machine->fdt); - machine->fdt = fdt; - } } static ISABus *pnv_chip_power8_isa_create(PnvChip *chip, Error **errp) @@ -1261,6 +1243,11 @@ if (pmc->i2c_init) { pmc->i2c_init(pnv); } + + if (!machine->fdt) { + machine->fdt = pnv_dt_create(machine); + _FDT((fdt_pack(machine->fdt))); + } } /*
diff --git a/meson.build b/meson.build index b2154bb..b257122 100644 --- a/meson.build +++ b/meson.build
@@ -1,7 +1,11 @@ project('qemu', ['c'], meson_version: '>=1.5.0', default_options: ['warning_level=1', 'c_std=gnu11', 'cpp_std=gnu++23', 'b_colorout=auto', - 'b_staticpic=false', 'stdsplit=false', 'optimization=2', 'b_pie=true', - 'rust_std=2021', 'build.rust_std=2021'], + 'b_staticpic=false', 'stdsplit=false', 'optimization=2', 'b_pie=true'] + + + # build.rust_std breaks with older meson, but Rust does not + # support old meson anyway + (meson.version().version_compare('>= 1.9') ? ['rust_std=2021', 'build.rust_std=2021'] : []), + version: files('VERSION')) add_test_setup('quick', exclude_suites: ['slow', 'thorough'], is_default: true, @@ -110,7 +114,7 @@ bindgen = find_program('bindgen', required: get_option('rust')) if not bindgen.found() or bindgen.version().version_compare('<0.60.0') if get_option('rust').enabled() - error('bindgen version ' + bindgen.version() + ' is unsupported. You can install a new version with "cargo install bindgen-cli"') + error('bindgen version ' + bindgen.version() + ' is unsupported. You can install a new version with "cargo install --locked bindgen-cli"') else if bindgen.found() warning('bindgen version ' + bindgen.version() + ' is unsupported, disabling Rust compilation.') @@ -3491,7 +3495,7 @@ run = configure_file(input: 'run.in', output: 'run', configuration: run_config) -run_command('chmod', 'a+x', meson.current_build_dir() / 'run', check: true) +run_command('chmod', 'a+x', run, check: true) hxtool = find_program('scripts/hxtool') shaderinclude = find_program('scripts/shaderinclude.py')
diff --git a/system/runstate.c b/system/runstate.c index 77cb14a..2d4e95a 100644 --- a/system/runstate.c +++ b/system/runstate.c
@@ -531,10 +531,12 @@ (force_vmfd_change || !cpus_are_resettable())) { if (ac->rebuild_guest) { ret = ac->rebuild_guest(current_machine); - if (ret < 0) { + if (ret < 0 && ret != -EOPNOTSUPP) { error_report("unable to rebuild guest: %s(%d)", strerror(-ret), ret); vm_stop(RUN_STATE_INTERNAL_ERROR); + } else if (ret == -EOPNOTSUPP) { + error_report("accelerator does not support reset!"); } else { info_report("virtual machine state has been rebuilt with new " "guest file handle.");
diff --git a/tests/docker/dockerfiles/fedora-rust-nightly.docker b/tests/docker/dockerfiles/fedora-rust-nightly.docker index 043b42a..38381ef 100644 --- a/tests/docker/dockerfiles/fedora-rust-nightly.docker +++ b/tests/docker/dockerfiles/fedora-rust-nightly.docker
@@ -179,7 +179,7 @@ test "$RUSTDOC" = "$(/usr/local/cargo/bin/rustup +nightly which rustdoc)" && \ test "$RUSTC" = "$(/usr/local/cargo/bin/rustup +nightly which rustc)" ENV PATH=$CARGO_HOME/bin:$PATH -RUN /usr/local/cargo/bin/rustup run nightly cargo install bindgen-cli +RUN /usr/local/cargo/bin/rustup run nightly cargo install --locked bindgen-cli RUN $CARGO --list # As a final step configure the user (if env is defined) ARG USER
diff --git a/tests/docker/dockerfiles/ubuntu2204.docker b/tests/docker/dockerfiles/ubuntu2204.docker index 23b33d6..44e763f 100644 --- a/tests/docker/dockerfiles/ubuntu2204.docker +++ b/tests/docker/dockerfiles/ubuntu2204.docker
@@ -162,7 +162,7 @@ ENV PATH=$CARGO_HOME/bin:$PATH RUN DEBIAN_FRONTEND=noninteractive eatmydata \ apt install -y --no-install-recommends cargo -RUN cargo install bindgen-cli +RUN cargo install --locked bindgen-cli # As a final step configure the user (if env is defined) ARG USER ARG UID
diff --git a/tests/lcitool/refresh b/tests/lcitool/refresh index 259e6ea..79a280f 100755 --- a/tests/lcitool/refresh +++ b/tests/lcitool/refresh
@@ -147,7 +147,7 @@ ' test "$RUSTDOC" = "$(/usr/local/cargo/bin/rustup +nightly which rustdoc)" && \\\n', ' test "$RUSTC" = "$(/usr/local/cargo/bin/rustup +nightly which rustc)"\n', 'ENV PATH=$CARGO_HOME/bin:$PATH\n', - 'RUN /usr/local/cargo/bin/rustup run nightly cargo install bindgen-cli\n', + 'RUN /usr/local/cargo/bin/rustup run nightly cargo install --locked bindgen-cli\n', 'RUN $CARGO --list\n', ] @@ -158,7 +158,7 @@ 'ENV PATH=$CARGO_HOME/bin:$PATH\n', "RUN DEBIAN_FRONTEND=noninteractive eatmydata \\\n", " apt install -y --no-install-recommends cargo\n", - 'RUN cargo install bindgen-cli\n', + 'RUN cargo install --locked bindgen-cli\n', ] debian_all_test_cross_compilers = [