[PULL 0/1] Qtest patches for 2026-05-18

[PULL 0/1] Qtest patches for 2026-05-18

[Fabiano Rosas]

The following changes since commit ac6721b88df944ade0048822b2b74210f543d656:

  Merge tag 'vhost-user-rtc-pr-1' of https://gitlab.com/epilys/qemu into staging (2026-05-16 17:37:33 -0400)

are available in the Git repository at:

  https://gitlab.com/farosas/qemu.git tags/qtest-20260518-pull-request

for you to fetch changes up to e68da5b7a2cd8f4635d3b253ac1581552a3df16f:

  tests/qtest: fix discarded const qualifier warning (2026-05-18 12:15:42 -0300)

----------------------------------------------------------------
QTest pull request

- fix strstr issue

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

Matthew Penney (1):
  tests/qtest: fix discarded const qualifier warning

 tests/qtest/libqtest.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

-- 
2.51.0

[PULL 1/1] tests/qtest: fix discarded const qualifier warning

[Fabiano Rosas]

From: Matthew Penney <matt@matthewpenney.net>

Modern compilers warn that the result of strstr() may discard
const qualifiers when assigned to a non-const pointer.

Make 'found' a const char * to fix the warning.

Signed-off-by: Matthew Penney <matt@matthewpenney.net>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Tested-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Tested-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Pierrick Bouvier <pierrick.bouvier@oss.qualcomm.com>
Signed-off-by: Fabiano Rosas <farosas@suse.de>
---
 tests/qtest/libqtest.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/qtest/libqtest.c b/tests/qtest/libqtest.c
index bf9284b9a1..b1e06ea364 100644
--- a/tests/qtest/libqtest.c
+++ b/tests/qtest/libqtest.c
@@ -2146,7 +2146,7 @@ bool mkimg(const char *file, const char *fmt, unsigned size_mb)
 bool qtest_verbose(const char *domain)
 {
     const char *log = getenv("QTEST_LOG");
-    char *found;
+    const char *found;
 
     assert(domain);
 
-- 
2.51.0

Re: [PULL 0/1] Qtest patches for 2026-05-18

[Stefan Hajnoczi]

[-- Attachment #1: Type: text/plain, Size: 116 bytes --]

Applied, thanks.

Please update the changelog at https://wiki.qemu.org/ChangeLog/11.1 for any user-visible changes.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: [PULL 1/1] tests/qtest: fix discarded const qualifier warning

[Amit Machhiwal]

Hi Matthew,

Thank you for addressing the const qualifier warning in qtest_verbose(). Your
fix correctly resolves the immediate compilation issue with modern compilers.

I had independently worked on this same issue and submitted a similar fix as
part of a patch series:

  https://lore.kernel.org/all/20260518172517.12466-3-amachhiw@linux.ibm.com/

While both our approaches fix the immediate strstr() warning by making 'found'
const, I noticed that getenv() still returns char * despite environment strings
being semantically read-only. This creates a subtle const-correctness gap that
stricter compilers (like GCC 16) may flag in the future.

I've prepared an improved v2 patch [2] that builds upon your merged fix by using
g_getenv() and g_strstr_len() to maintain const correctness throughout. This
approach:

- Uses g_getenv() which returns const gchar *, matching the read-only semantics
  of environment variables
- Employs g_strstr_len() for consistent use of GLib string functions, aligning
  with QEMU conventions
- Eliminates all const-correctness warnings with strict compilers The v2 patch
  supersedes my earlier attempt and is rebased on top of your merged commit
  (e68da5b7a2cd).

Thanks again for the quick fix!

[1] https://lore.kernel.org/all/20260518172517.12466-3-amachhiw@linux.ibm.com/
[2] https://lore.kernel.org/all/20260522082555.54918-1-amachhiw@linux.ibm.com/

Regards,
Amit

On 2026/05/18 12:53 PM, Fabiano Rosas wrote:
> From: Matthew Penney <matt@matthewpenney.net>
> 
> Modern compilers warn that the result of strstr() may discard
> const qualifiers when assigned to a non-const pointer.
> 
> Make 'found' a const char * to fix the warning.
> 
> Signed-off-by: Matthew Penney <matt@matthewpenney.net>
> Reviewed-by: Thomas Huth <thuth@redhat.com>
> Tested-by: Thomas Huth <thuth@redhat.com>
> Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> Tested-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> Reviewed-by: Pierrick Bouvier <pierrick.bouvier@oss.qualcomm.com>
> Signed-off-by: Fabiano Rosas <farosas@suse.de>
> ---
>  tests/qtest/libqtest.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/tests/qtest/libqtest.c b/tests/qtest/libqtest.c
> index bf9284b9a1..b1e06ea364 100644
> --- a/tests/qtest/libqtest.c
> +++ b/tests/qtest/libqtest.c
> @@ -2146,7 +2146,7 @@ bool mkimg(const char *file, const char *fmt, unsigned size_mb)
>  bool qtest_verbose(const char *domain)
>  {
>      const char *log = getenv("QTEST_LOG");
> -    char *found;
> +    const char *found;
>  
>      assert(domain);
>  
> -- 
> 2.51.0
> 
> 

Re: [PULL 1/1] tests/qtest: fix discarded const qualifier warning

[Matthew Penney]

Hi Amit,

Thanks for the follow-up and for working on a more complete solution.

Your approach using g_getenv() and g_strstr_len() makes sense regarding
consistency with GLib/QEMU conventions and avoiding future issues with stricter
compilers.

I appreciate the note and the rebase on top of my merged commit!

Regards,
Matthew

On Friday, 22 May 2026 at 09:27, Amit Machhiwal <amachhiw@linux.ibm.com> wrote:

> Hi Matthew,
> 
> Thank you for addressing the const qualifier warning in qtest_verbose(). Your
> fix correctly resolves the immediate compilation issue with modern compilers.
> 
> I had independently worked on this same issue and submitted a similar fix as
> part of a patch series:
> 
>   https://lore.kernel.org/all/20260518172517.12466-3-amachhiw@linux.ibm.com/
> 
> While both our approaches fix the immediate strstr() warning by making 'found'
> const, I noticed that getenv() still returns char * despite environment strings
> being semantically read-only. This creates a subtle const-correctness gap that
> stricter compilers (like GCC 16) may flag in the future.
> 
> I've prepared an improved v2 patch [2] that builds upon your merged fix by using
> g_getenv() and g_strstr_len() to maintain const correctness throughout. This
> approach:
> 
> - Uses g_getenv() which returns const gchar *, matching the read-only semantics
>   of environment variables
> - Employs g_strstr_len() for consistent use of GLib string functions, aligning
>   with QEMU conventions
> - Eliminates all const-correctness warnings with strict compilers The v2 patch
>   supersedes my earlier attempt and is rebased on top of your merged commit
>   (e68da5b7a2cd).
> 
> Thanks again for the quick fix!
> 
> [1] https://lore.kernel.org/all/20260518172517.12466-3-amachhiw@linux.ibm.com/
> [2] https://lore.kernel.org/all/20260522082555.54918-1-amachhiw@linux.ibm.com/
> 
> Regards,
> Amit
> 
> On 2026/05/18 12:53 PM, Fabiano Rosas wrote:
> > From: Matthew Penney <matt@matthewpenney.net>
> >
> > Modern compilers warn that the result of strstr() may discard
> > const qualifiers when assigned to a non-const pointer.
> >
> > Make 'found' a const char * to fix the warning.
> >
> > Signed-off-by: Matthew Penney <matt@matthewpenney.net>
> > Reviewed-by: Thomas Huth <thuth@redhat.com>
> > Tested-by: Thomas Huth <thuth@redhat.com>
> > Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> > Tested-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> > Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> > Reviewed-by: Pierrick Bouvier <pierrick.bouvier@oss.qualcomm.com>
> > Signed-off-by: Fabiano Rosas <farosas@suse.de>
> > ---
> >  tests/qtest/libqtest.c | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/tests/qtest/libqtest.c b/tests/qtest/libqtest.c
> > index bf9284b9a1..b1e06ea364 100644
> > --- a/tests/qtest/libqtest.c
> > +++ b/tests/qtest/libqtest.c
> > @@ -2146,7 +2146,7 @@ bool mkimg(const char *file, const char *fmt, unsigned size_mb)
> >  bool qtest_verbose(const char *domain)
> >  {
> >      const char *log = getenv("QTEST_LOG");
> > -    char *found;
> > +    const char *found;
> >
> >      assert(domain);
> >
> > --
> > 2.51.0
> >
> >
>