On Wed, 10 Dec 2025 at 18:13, Cédric Le Goater <[email protected]> wrote: > > A recent change in glibc 2.42.9000 [1] changes the return type of > strstr() and other string functions to be 'const char *' when the > input is a 'const char *'. This breaks the build in : > > ../hw/i386/x86-common.c:827:11: error: assignment discards ‘const’ > qualifier from pointer target type [-Werror=discarded-qualifiers] > 827 | vmode = strstr(kernel_cmdline, "vga="); > | ^ > > Fix this by changing the type of the variables that store the result > of these functions to 'const char *'. > > [1] > https://sourceware.org/git/?p=glibc.git;a=commit;h=cd748a63ab1a7ae846175c532a3daab341c62690 > > Signed-off-by: Cédric Le Goater <[email protected]> > --- > hw/i386/x86-common.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/hw/i386/x86-common.c b/hw/i386/x86-common.c > index > c844749900a30c9c9c284c529e93c84c9457b128..f77e2e63046ff56d079363e411a9ee0eca365291 > 100644 > --- a/hw/i386/x86-common.c > +++ b/hw/i386/x86-common.c > @@ -654,7 +654,7 @@ void x86_load_linux(X86MachineState *x86ms, > uint8_t header[8192], *setup, *kernel; > hwaddr real_addr, prot_addr, cmdline_addr, initrd_addr = 0; > FILE *f; > - char *vmode; > + const char *vmode; > MachineState *machine = MACHINE(x86ms); > struct setup_data *setup_data; > const char *kernel_filename = machine->kernel_filename; > --
Reviewed-by: Peter Maydell <[email protected]> thanks -- PMM
