[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-commits] [qemu/qemu] e72f95: qemu-config: never call the callback
|
From: |
Peter Maydell |
|
Subject: |
[Qemu-commits] [qemu/qemu] e72f95: qemu-config: never call the callback after an erro... |
|
Date: |
Fri, 23 Jul 2021 03:15:55 -0700 |
Branch: refs/heads/master
Home: https://github.com/qemu/qemu
Commit: e72f9524febb78ee5ae2a201245cd7b1fb97ad08
https://github.com/qemu/qemu/commit/e72f9524febb78ee5ae2a201245cd7b1fb97ad08
Author: Paolo Bonzini <pbonzini@redhat.com>
Date: 2021-07-20 (Tue, 20 Jul 2021)
Changed paths:
M util/qemu-config.c
Log Message:
-----------
qemu-config: never call the callback after an error, fix leak
Ensure that the callback to qemu_config_foreach is never called upon
an error, by moving the invocation before the "out" label.
Cc: armbru@redhat.com
Fixes: 3770141139 ("qemu-config: parse configuration files to a QDict",
2021-06-04)
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Commit: 461fea9bf1db0e122cfc18ea07958ddebea5d9a3
https://github.com/qemu/qemu/commit/461fea9bf1db0e122cfc18ea07958ddebea5d9a3
Author: Paolo Bonzini <pbonzini@redhat.com>
Date: 2021-07-20 (Tue, 20 Jul 2021)
Changed paths:
M util/qemu-config.c
Log Message:
-----------
qemu-config: fix memory leak on ferror()
The leak is basically impossible to reach, since the only common way
to get ferror(fp) is by passing a directory to -readconfig. In that
case, the error occurs before qdict is set to anything non-NULL.
However, it's theoretically possible to get there after an EIO.
Cc: armbru@redhat.com
Reported-by: Peter Maydell <peter.maydell@linaro.org>
Fixes: f7544edcd3 ("qemu-config: add error propagation to qemu_config_parse",
2021-03-06)
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Commit: dadafe6785ada3ec4a2d11410c691458b3c2b39f
https://github.com/qemu/qemu/commit/dadafe6785ada3ec4a2d11410c691458b3c2b39f
Author: Jason Andryuk <jandryuk@gmail.com>
Date: 2021-07-20 (Tue, 20 Jul 2021)
Changed paths:
M softmmu/vl.c
Log Message:
-----------
vl: Parse legacy default_machine_opts
qemu can't start a xen vm after commit d8fb7d0969d5
"vl: switch -M parsing to keyval" with:
$ ./qemu-system-i386 -M xenfv
Unexpected error in object_property_find_err() at ../qom/object.c:1298:
qemu-system-i386: Property 'xenfv-3.1-machine.accel' not found
Aborted (core dumped)
The default_machine_opts handling doesn't process the legacy machine
options like "accel". Call qemu_apply_legacy_machine_options to provide
the legacy handling.
Signed-off-by: Jason Andryuk <jandryuk@gmail.com>
Message-Id: <20210713021552.19110-1-jandryuk@gmail.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Commit: f288d9932c29e8e24f1cbecd95e3539fbca5b90a
https://github.com/qemu/qemu/commit/f288d9932c29e8e24f1cbecd95e3539fbca5b90a
Author: Paolo Bonzini <pbonzini@redhat.com>
Date: 2021-07-22 (Thu, 22 Jul 2021)
Changed paths:
M chardev/spice.c
Log Message:
-----------
chardev-spice: add missing module_obj directive
The chardev-spicevmc class was not listed in chardev/spice.c, causing
"-chardev spicevmc" to fail when modules are enabled.
Reported-by: Frederic Bezies <fredbezies@gmail.com>
Fixes: 9f4a0f0978 ("modules: use modinfo for qom load", 2021-07-09)
Resolves: //gitlab.com/qemu-project/qemu/-/issues/488
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Message-Id: <20210719164435.1227794-1-pbonzini@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Commit: 670b35919301213e45ef42ed689f6ea67004d714
https://github.com/qemu/qemu/commit/670b35919301213e45ef42ed689f6ea67004d714
Author: Gerd Hoffmann <kraxel@redhat.com>
Date: 2021-07-22 (Thu, 22 Jul 2021)
Changed paths:
M hw/usb/meson.build
Log Message:
-----------
usb: fix usb-host dependency check
Fixes: 90540f3289 ("configure, meson: convert libusb detection to meson",
2021-06-25)
Reported-by: Programmingkid <programmingkidx@gmail.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Message-Id: <20210721081718.301343-1-kraxel@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Commit: 40e07370f21f12f020c1eb8a8d8c5321774e488a
https://github.com/qemu/qemu/commit/40e07370f21f12f020c1eb8a8d8c5321774e488a
Author: Stefan Hajnoczi <stefanha@redhat.com>
Date: 2021-07-22 (Thu, 22 Jul 2021)
Changed paths:
M util/qemu-config.c
Log Message:
-----------
qemu-config: restore "machine" in qmp_query_command_line_options()
Commit d8fb7d0969d5c32b3d1b9e20b63ec6c0abe80be4 ("vl: switch -M parsing
to keyval") stopped adding the "machine" QemuOptsList. This causes
"machine" options to not show up in QMP query-command-line-options
output. For example, libvirt cannot detect that kernel_irqchip support
is available.
Adjust the "machine" opts enumeration in
qmp_query_command_line_options() so that options are properly reported.
Fixes: d8fb7d0969d5 ("vl: switch -M parsing to keyval")
Cc: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-Id: <20210721151055.424580-1-stefanha@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Commit: b128b25a5a2b1a7db6965a6d3fd0e4f6f0affc50
https://github.com/qemu/qemu/commit/b128b25a5a2b1a7db6965a6d3fd0e4f6f0affc50
Author: Lara Lazier <laramglazier@gmail.com>
Date: 2021-07-22 (Thu, 22 Jul 2021)
Changed paths:
M target/i386/tcg/sysemu/svm_helper.c
Log Message:
-----------
target/i386: Added V_INTR_PRIO check to virtual interrupts
The APM2 states that The processor takes a virtual INTR interrupt
if V_IRQ and V_INTR_PRIO indicate that there is a virtual interrupt pending
whose priority is greater than the value in V_TPR.
Signed-off-by: Lara Lazier <laramglazier@gmail.com>
Message-Id: <20210721152651.14683-1-laramglazier@gmail.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Commit: 213ff024a2f92020290296cb9dc29c2af3d4a221
https://github.com/qemu/qemu/commit/213ff024a2f92020290296cb9dc29c2af3d4a221
Author: Lara Lazier <laramglazier@gmail.com>
Date: 2021-07-22 (Thu, 22 Jul 2021)
Changed paths:
M target/i386/cpu.h
M target/i386/tcg/sysemu/misc_helper.c
M target/i386/tcg/sysemu/svm_helper.c
Log Message:
-----------
target/i386: Added consistency checks for CR4
All MBZ bits in CR4 must be zero. (APM2 15.5)
Added reserved bitmask and added checks in both
helper_vmrun and helper_write_crN.
Signed-off-by: Lara Lazier <laramglazier@gmail.com>
Message-Id: <20210721152651.14683-2-laramglazier@gmail.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Commit: d499f196fe97a6650ac5bd56811d2985c010e0d7
https://github.com/qemu/qemu/commit/d499f196fe97a6650ac5bd56811d2985c010e0d7
Author: Lara Lazier <laramglazier@gmail.com>
Date: 2021-07-22 (Thu, 22 Jul 2021)
Changed paths:
M target/i386/cpu.h
M target/i386/tcg/sysemu/svm_helper.c
Log Message:
-----------
target/i386: Added consistency checks for EFER
EFER.SVME has to be set, and EFER reserved bits must
be zero.
In addition the combinations
* EFER.LMA or EFER.LME is non-zero and the processor does not support LM
* non-zero EFER.LME and CR0.PG and zero CR4.PAE
* non-zero EFER.LME and CR0.PG and zero CR0.PE
* non-zero EFER.LME, CR0.PG, CR4.PAE, CS.L and CS.D
are all invalid.
(AMD64 Architecture Programmer's Manual, V2, 15.5)
Signed-off-by: Lara Lazier <laramglazier@gmail.com>
Message-Id: <20210721152651.14683-3-laramglazier@gmail.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Commit: c10852afb6a2b84bcc3bffce40c1c0509d6c8e64
https://github.com/qemu/qemu/commit/c10852afb6a2b84bcc3bffce40c1c0509d6c8e64
Author: Thomas Huth <thuth@redhat.com>
Date: 2021-07-22 (Thu, 22 Jul 2021)
Changed paths:
M configure
Log Message:
-----------
configure: Drop obsolete check for the alloc_size attribute
We recently bumped our requirement for Clang to at least version 6.0.
And according to:
https://releases.llvm.org/6.0.0/tools/clang/docs/AttributeReference.html
Clang v6.0 supports the alloc_size attribute. Thus we can drop this
check in the configure script now.
Signed-off-by: Thomas Huth <thuth@redhat.com>
Message-Id: <20210714072855.785566-1-thuth@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Commit: ac34711171f0b350d9125c46691744405b6a54ce
https://github.com/qemu/qemu/commit/ac34711171f0b350d9125c46691744405b6a54ce
Author: Paolo Bonzini <pbonzini@redhat.com>
Date: 2021-07-22 (Thu, 22 Jul 2021)
Changed paths:
M meson.build
Log Message:
-----------
meson: fix dependencies for modinfo
modinfo runs the preprocessor and therefore needs all generated input files
to be there. The "depends" clause does not work in Meson 0.55.3, so for
now use "input".
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Commit: 332008e0b9da33dee2c765db3e4e16b3c3ba3a92
https://github.com/qemu/qemu/commit/332008e0b9da33dee2c765db3e4e16b3c3ba3a92
Author: Thomas Huth <thuth@redhat.com>
Date: 2021-07-22 (Thu, 22 Jul 2021)
Changed paths:
M configure
Log Message:
-----------
configure: Fix --without-default-features propagation to meson
A typo prevents that many features get disabled when the user
runs "configure" with the --without-default-features switch.
Reported-by: Cole Robinson <crobinso@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
Message-Id: <20210713093155.677589-2-thuth@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Commit: 3a6a1256d46daa21210d52b2740121f4ea929e9b
https://github.com/qemu/qemu/commit/3a6a1256d46daa21210d52b2740121f4ea929e9b
Author: Thomas Huth <thuth@redhat.com>
Date: 2021-07-22 (Thu, 22 Jul 2021)
Changed paths:
M configure
M meson.build
Log Message:
-----------
configure: Allow vnc to get disabled with --without-default-features
There's no reason why we should keep VNC enabled when the user
specified --without-default-features.
Reported-by: Cole Robinson <crobinso@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
Message-Id: <20210713093155.677589-3-thuth@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Commit: bcf0a7dabd8fe01f948801c49b9a948560fa346d
https://github.com/qemu/qemu/commit/bcf0a7dabd8fe01f948801c49b9a948560fa346d
Author: Thomas Huth <thuth@redhat.com>
Date: 2021-07-22 (Thu, 22 Jul 2021)
Changed paths:
M configure
Log Message:
-----------
configure: Fix the default setting of the "xen" feature
The "xen" variable should either contain "enabled", "disabled" or
nothing (for auto detection). But when the user currently runs the
configure script with --without-default-features, it gets set to
"no" instead. This does not work as expected, the feature will still
be enabled if the Xen headers are present. Thus set the variable
to "disabled" instead if default_feature switch has been set.
Reported-by: Cole Robinson <crobinso@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
Message-Id: <20210713093155.677589-4-thuth@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Commit: 0848f8aca6f7b13f2a755c2593b0a1cbb39f658e
https://github.com/qemu/qemu/commit/0848f8aca6f7b13f2a755c2593b0a1cbb39f658e
Author: Thomas Huth <thuth@redhat.com>
Date: 2021-07-22 (Thu, 22 Jul 2021)
Changed paths:
M configure
Log Message:
-----------
configure: Let --without-default-features disable vhost-kernel and vhost-vdpa
The vhost_kernel and vhost_vdpa variables should be pre-initialized with
the $default_feature setting so that these features get disabled when
the user runs the configure scripts with --without-default-features.
Reported-by: Cole Robinson <crobinso@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
Message-Id: <20210713093155.677589-5-thuth@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Commit: 7b7ca8ebde4ee6fba171004b2726ae1ff5489c03
https://github.com/qemu/qemu/commit/7b7ca8ebde4ee6fba171004b2726ae1ff5489c03
Author: Peter Maydell <peter.maydell@linaro.org>
Date: 2021-07-22 (Thu, 22 Jul 2021)
Changed paths:
M chardev/spice.c
M configure
M hw/usb/meson.build
M meson.build
M softmmu/vl.c
M target/i386/cpu.h
M target/i386/tcg/sysemu/misc_helper.c
M target/i386/tcg/sysemu/svm_helper.c
M util/qemu-config.c
Log Message:
-----------
Merge remote-tracking branch 'remotes/bonzini-gitlab/tags/for-upstream' into
staging
Bugfixes.
# gpg: Signature made Thu 22 Jul 2021 14:11:27 BST
# 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
* remotes/bonzini-gitlab/tags/for-upstream:
configure: Let --without-default-features disable vhost-kernel and vhost-vdpa
configure: Fix the default setting of the "xen" feature
configure: Allow vnc to get disabled with --without-default-features
configure: Fix --without-default-features propagation to meson
meson: fix dependencies for modinfo
configure: Drop obsolete check for the alloc_size attribute
target/i386: Added consistency checks for EFER
target/i386: Added consistency checks for CR4
target/i386: Added V_INTR_PRIO check to virtual interrupts
qemu-config: restore "machine" in qmp_query_command_line_options()
usb: fix usb-host dependency check
chardev-spice: add missing module_obj directive
vl: Parse legacy default_machine_opts
qemu-config: fix memory leak on ferror()
qemu-config: never call the callback after an error, fix leak
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Compare: https://github.com/qemu/qemu/compare/beb191385882...7b7ca8ebde4e