Fixes for QEMU 10.0 hard freeze
Subsystems (2)
The following changes since commit aa90f1161bb17a4863e16ec2f75104cff0752d4e:
Merge tag 'migration-20250314-pull-request' of https://gitlab.com/farosas/qemu into staging (2025-03-16 02:45:22 -0400)
are available in the Git repository at:
https://gitlab.com/bonzini/qemu.git tags/for-upstream
for you to fetch changes up to f35432a4f699d8e450f65e44ddcd5911f2d8c146:
Revert "meson.build: default to -gsplit-dwarf for debug info" (2025-03-17 14:22:07 +0100)
----------------------------------------------------------------
fixes
----------------------------------------------------------------
Paolo Bonzini (1):
Revert "meson.build: default to -gsplit-dwarf for debug info"
Tigran Sogomonian (1):
hw/misc: use extract64 instead of 1 << i
meson.build | 6 ------ hw/misc/mps2-fpgaio.c | 2 +- meson_options.txt | 2 -- scripts/meson-buildoptions.sh | 2 -- 4 files changed, 1 insertion(+), 11 deletions(-)
Signature · 1 line
2.48.1
[PULL 2/2] Revert "meson.build: default to -gsplit-dwarf for debug info"
This reverts commit 563b1a35ed1f1151505d4fe5f723827d1b3fd4bc.
Split debug info support is broken when cross compiling
(https://gcc.gnu.org/bugzilla/show_bug.cgi?id=99973). People that would like to use it can add it via --extra-cflags.
--- meson.build | 6 ------ meson_options.txt | 2 -- scripts/meson-buildoptions.sh | 2 -- 3 files changed, 10 deletions(-)
meson.build +0 -6
@@ -604,10 +604,6 @@ if get_option('tsan') qemu_ldflags = ['-fsanitize=thread'] + qemu_ldflags endif -if get_option('debug') and get_option('split_debug') - qemu_cflags += '-gsplit-dwarf' -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')
@@ -4599,8 +4595,6 @@ if have_rust summary_info += {'bindgen': bindgen.full_path()} summary_info += {'bindgen version': bindgen.version()} endif -# option_cflags is purely for the summary display, meson will pass -# -g/-O options directly option_cflags = (get_option('debug') ? ['-g'] : []) if get_option('optimization') != 'plain' option_cflags += ['-O' + get_option('optimization')]
meson_options.txt +0 -2
@@ -362,8 +362,6 @@ option('debug_mutex', type: 'boolean', value: false, description: 'mutex debugging support') option('debug_stack_usage', type: 'boolean', value: false, description: 'measure coroutine stack usage') -option('split_debug', type: 'boolean', value: true, - description: 'split debug info from object files') option('qom_cast_debug', type: 'boolean', value: true, description: 'cast debugging support') option('slirp_smbd', type : 'feature', value : 'auto',
scripts/meson-buildoptions.sh +0 -2
@@ -504,8 +504,6 @@ _meson_option_parse() { --disable-strict-rust-lints) printf "%s" -Dstrict_rust_lints=false ;; --enable-strip) printf "%s" -Dstrip=true ;; --disable-strip) printf "%s" -Dstrip=false ;; - --enable-split-debug) printf "%s" -Dsplit_debug=true ;; - --disable-split-debug) printf "%s" -Dsplit_debug=false ;; --sysconfdir=*) quote_sh "-Dsysconfdir=$2" ;; --enable-tcg) printf "%s" -Dtcg=enabled ;; --disable-tcg) printf "%s" -Dtcg=disabled ;;
Signature · 1 line
2.48.1
[PULL 1/2] hw/misc: use extract64 instead of 1 << i
In reply to Paolo BonziniFrom: Tigran Sogomonian <[email protected]>
1 << i is casted to uint64_t while bitwise and with val. So this value may become 0xffffffff80000000 but only 31th "start" bit is required.
Use the bitfield extract() API instead.
Found by Linux Verification Center (linuxtesting.org) with SVACE.
--- hw/misc/mps2-fpgaio.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
hw/misc/mps2-fpgaio.c +1 -1
@@ -198,7 +198,7 @@ static void mps2_fpgaio_write(void *opaque, hwaddr offset, uint64_t value, s->led0 = value &MAKE_64BIT_MASK (0 , s->num_leds);for (i =0 ; i < s->num_leds; i++) { -led_set_state (s->led[i], value & (1 << i)); +led_set_state (s->led[i],extract64 (value, i,1 )); } }break ;
Signature · 1 line
2.48.1