[PATCH 0/3] build: small build system changes

[PATCH 0/3] build: small build system changes

[John Snow]

John Snow (3):
  build: remove vestigial CONFIG_SGA
  build: update CONFIG_PVPANIC
  build: Add "-d keeprsp" to Ninja flags

 Makefile                                 | 2 +-
 configs/devices/i386-softmmu/default.mak | 6 ++++--
 tests/qtest/meson.build                  | 1 -
 3 files changed, 5 insertions(+), 4 deletions(-)

-- 
2.56.0

[PATCH 1/3] build: remove vestigial CONFIG_SGA

[John Snow]

This configuration knob no longer exists as CONFIG_SGA was removed
quite some time ago. Remove it from our sample config files.

Signed-off-by: John Snow <jsnow@redhat.com>
---
 configs/devices/i386-softmmu/default.mak | 1 -
 tests/qtest/meson.build                  | 1 -
 2 files changed, 2 deletions(-)

diff --git a/configs/devices/i386-softmmu/default.mak b/configs/devices/i386-softmmu/default.mak
index bc0479a7e0a..b935ee61332 100644
--- a/configs/devices/i386-softmmu/default.mak
+++ b/configs/devices/i386-softmmu/default.mak
@@ -17,7 +17,6 @@
 #CONFIG_PVPANIC=n
 #CONFIG_QXL=n
 #CONFIG_SEV=n
-#CONFIG_SGA=n
 #CONFIG_TDX=n
 #CONFIG_TEST_DEVICES=n
 #CONFIG_TPM_CRB=n
diff --git a/tests/qtest/meson.build b/tests/qtest/meson.build
index ff4bf9528a7..3f1b5317fed 100644
--- a/tests/qtest/meson.build
+++ b/tests/qtest/meson.build
@@ -74,7 +74,6 @@ qtests_i386 = \
   (config_all_devices.has_key('CONFIG_I440FX') ? ['numa-test'] : []) +                      \
   (config_all_devices.has_key('CONFIG_I440FX') ? ['test-x86-cpuid-compat'] : []) +          \
   (config_all_devices.has_key('CONFIG_ISA_TESTDEV') ? ['endianness-test'] : []) +           \
-  (config_all_devices.has_key('CONFIG_SGA') ? ['boot-serial-test'] : []) +                  \
   (config_all_devices.has_key('CONFIG_ISA_IPMI_KCS') ? ['ipmi-kcs-test'] : []) +            \
   (host_os == 'linux' and                                                                  \
    config_all_devices.has_key('CONFIG_ISA_IPMI_BT') and
-- 
2.56.0

Re: [PATCH 1/3] build: remove vestigial CONFIG_SGA

[Daniel P. Berrangé]

On Mon, Nov 09, 2026 at 01:36:03PM -0500, John Snow wrote:
> This configuration knob no longer exists as CONFIG_SGA was removed
> quite some time ago. Remove it from our sample config files.
> 
> Signed-off-by: John Snow <jsnow@redhat.com>
> ---
>  configs/devices/i386-softmmu/default.mak | 1 -
>  tests/qtest/meson.build                  | 1 -
>  2 files changed, 2 deletions(-)
> 
> diff --git a/configs/devices/i386-softmmu/default.mak b/configs/devices/i386-softmmu/default.mak
> index bc0479a7e0a..b935ee61332 100644
> --- a/configs/devices/i386-softmmu/default.mak
> +++ b/configs/devices/i386-softmmu/default.mak
> @@ -17,7 +17,6 @@
>  #CONFIG_PVPANIC=n
>  #CONFIG_QXL=n
>  #CONFIG_SEV=n
> -#CONFIG_SGA=n
>  #CONFIG_TDX=n
>  #CONFIG_TEST_DEVICES=n
>  #CONFIG_TPM_CRB=n
> diff --git a/tests/qtest/meson.build b/tests/qtest/meson.build
> index ff4bf9528a7..3f1b5317fed 100644
> --- a/tests/qtest/meson.build
> +++ b/tests/qtest/meson.build
> @@ -74,7 +74,6 @@ qtests_i386 = \
>    (config_all_devices.has_key('CONFIG_I440FX') ? ['numa-test'] : []) +                      \
>    (config_all_devices.has_key('CONFIG_I440FX') ? ['test-x86-cpuid-compat'] : []) +          \
>    (config_all_devices.has_key('CONFIG_ISA_TESTDEV') ? ['endianness-test'] : []) +           \
> -  (config_all_devices.has_key('CONFIG_SGA') ? ['boot-serial-test'] : []) +                  \

boot-serial-test.c still exists, and IIRC will probably still work,
so we should add it unconditionally instead.

>    (config_all_devices.has_key('CONFIG_ISA_IPMI_KCS') ? ['ipmi-kcs-test'] : []) +            \
>    (host_os == 'linux' and                                                                  \
>     config_all_devices.has_key('CONFIG_ISA_IPMI_BT') and
> -- 
> 2.56.0
> 
> 

With regards,
Daniel
-- 
|: https://berrange.com       ~~        https://hachyderm.io/@berrange :|
|: https://libvirt.org          ~~          https://entangle-photo.org :|
|: https://pixelfed.art/berrange   ~~    https://fstop138.berrange.com :|

[PATCH 2/3] build: update CONFIG_PVPANIC

[John Snow]

The symbol for CONFIG_PVPANIC has been changed, update the dummy
config file to reference the new names.

Signed-off-by: John Snow <jsnow@redhat.com>
---
 configs/devices/i386-softmmu/default.mak | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/configs/devices/i386-softmmu/default.mak b/configs/devices/i386-softmmu/default.mak
index b935ee61332..96716e30b9b 100644
--- a/configs/devices/i386-softmmu/default.mak
+++ b/configs/devices/i386-softmmu/default.mak
@@ -14,7 +14,10 @@
 #CONFIG_PCI_IPMI_BT=n
 #CONFIG_IPMI_SSIF=n
 #CONFIG_PCI_DEVICES=n
-#CONFIG_PVPANIC=n
+#CONFIG_PVPANIC_COMMON=n
+#CONFIG_PVPANIC_ISA=n
+#CONFIG_PVPANIC_PCI=n
+#CONFIG_PVPANIC_MMIO=n
 #CONFIG_QXL=n
 #CONFIG_SEV=n
 #CONFIG_TDX=n
-- 
2.56.0

Re: [PATCH 2/3] build: update CONFIG_PVPANIC

[Daniel P. Berrangé]

On Mon, Nov 09, 2026 at 01:36:04PM -0500, John Snow wrote:
> The symbol for CONFIG_PVPANIC has been changed, update the dummy
> config file to reference the new names.
> 
> Signed-off-by: John Snow <jsnow@redhat.com>
> ---
>  configs/devices/i386-softmmu/default.mak | 5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)

Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>


With regards,
Daniel
-- 
|: https://berrange.com       ~~        https://hachyderm.io/@berrange :|
|: https://libvirt.org          ~~          https://entangle-photo.org :|
|: https://pixelfed.art/berrange   ~~    https://fstop138.berrange.com :|

[PATCH 3/3] build: Add "-d keeprsp" to Ninja flags

[John Snow]

When auditing compilation, it is helpful to be able to see all of the
object files passed during the linking step, which ninja can obscure
behind temporary .rsp "response files". Normally, these are deleted
immediately afterwards - but for debugging purposes, it is helpful to
leave them behind to understand what went wrong.

Signed-off-by: John Snow <jsnow@redhat.com>
---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 54547a37b1a..9dda1b3c89a 100644
--- a/Makefile
+++ b/Makefile
@@ -151,7 +151,7 @@ NINJAFLAGS = \
         $(filter-out -j, \
           $(or $(filter -l% -j%, $(MAKEFLAGS)), \
                $(if $(filter --jobserver-auth=%, $(MAKEFLAGS)),, -j1))) \
-        -d keepdepfile
+        -d keepdepfile $(if $(DEBUG),-d keeprsp)
 ninja-cmd-goals += $(or $(MAKECMDGOALS), all)
 ninja-cmd-goals += $(foreach g, $(MAKECMDGOALS), $(.ninja-goals.$g))
 
-- 
2.56.0

Re: [PATCH 3/3] build: Add "-d keeprsp" to Ninja flags

[Daniel P. Berrangé]

On Mon, Nov 09, 2026 at 01:36:05PM -0500, John Snow wrote:
> When auditing compilation, it is helpful to be able to see all of the
> object files passed during the linking step, which ninja can obscure
> behind temporary .rsp "response files". Normally, these are deleted
> immediately afterwards - but for debugging purposes, it is helpful to
> leave them behind to understand what went wrong.
> 
> Signed-off-by: John Snow <jsnow@redhat.com>
> ---
>  Makefile | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>

> diff --git a/Makefile b/Makefile
> index 54547a37b1a..9dda1b3c89a 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -151,7 +151,7 @@ NINJAFLAGS = \
>          $(filter-out -j, \
>            $(or $(filter -l% -j%, $(MAKEFLAGS)), \
>                 $(if $(filter --jobserver-auth=%, $(MAKEFLAGS)),, -j1))) \
> -        -d keepdepfile
> +        -d keepdepfile $(if $(DEBUG),-d keeprsp)
>  ninja-cmd-goals += $(or $(MAKECMDGOALS), all)
>  ninja-cmd-goals += $(foreach g, $(MAKECMDGOALS), $(.ninja-goals.$g))

Alternatively we hardcode our makefile to raise meson's
annoyingly pessimistic defaults

  export MESON_RSP_THRESHOLD=126976

provided we detect we're not running a build inside Wine, or just
blindly assume no one is quite that crazy :-)

With regards,
Daniel
-- 
|: https://berrange.com       ~~        https://hachyderm.io/@berrange :|
|: https://libvirt.org          ~~          https://entangle-photo.org :|
|: https://pixelfed.art/berrange   ~~    https://fstop138.berrange.com :|

Re: [PATCH 3/3] build: Add "-d keeprsp" to Ninja flags

[John Snow]

On Mon, Nov 9, 2026 at 2:28 PM Daniel P. Berrangé <berrange@redhat.com> wrote:
>
> On Mon, Nov 09, 2026 at 01:36:05PM -0500, John Snow wrote:
> > When auditing compilation, it is helpful to be able to see all of the
> > object files passed during the linking step, which ninja can obscure
> > behind temporary .rsp "response files". Normally, these are deleted
> > immediately afterwards - but for debugging purposes, it is helpful to
> > leave them behind to understand what went wrong.
> >
> > Signed-off-by: John Snow <jsnow@redhat.com>
> > ---
> >  Makefile | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
>
> Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
>

Thanks!

> > diff --git a/Makefile b/Makefile
> > index 54547a37b1a..9dda1b3c89a 100644
> > --- a/Makefile
> > +++ b/Makefile
> > @@ -151,7 +151,7 @@ NINJAFLAGS = \
> >          $(filter-out -j, \
> >            $(or $(filter -l% -j%, $(MAKEFLAGS)), \
> >                 $(if $(filter --jobserver-auth=%, $(MAKEFLAGS)),, -j1))) \
> > -        -d keepdepfile
> > +        -d keepdepfile $(if $(DEBUG),-d keeprsp)
> >  ninja-cmd-goals += $(or $(MAKECMDGOALS), all)
> >  ninja-cmd-goals += $(foreach g, $(MAKECMDGOALS), $(.ninja-goals.$g))
>
> Alternatively we hardcode our makefile to raise meson's
> annoyingly pessimistic defaults
>
>   export MESON_RSP_THRESHOLD=126976
>
> provided we detect we're not running a build inside Wine, or just
> blindly assume no one is quite that crazy :-)

I'll leave this to someone braver than me :')

>
> With regards,
> Daniel
> --
> |: https://berrange.com       ~~        https://hachyderm.io/@berrange :|
> |: https://libvirt.org          ~~          https://entangle-photo.org :|
> |: https://pixelfed.art/berrange   ~~    https://fstop138.berrange.com :|
>