[PULL v2 00/14] qtests, kconfig and misc patches

[PULL v2 00/14] qtests, kconfig and misc patches

[Thomas Huth]

 Hi Peter,

the following changes since commit f31160c7d1b89cfb4dd4001a23575b42141cb0ec:

  Merge remote-tracking branch 'remotes/pmaydell/tags/pull-docs-20200203' into staging (2020-02-03 11:14:24 +0000)

are available in the Git repository at:

  https://gitlab.com/huth/qemu.git tags/pull-request-2020-02-04

for you to fetch changes up to 4f67366e3bbe6040998be038156486eed264ea58:

  configure: Fix typo of the have_afalg variable (2020-02-04 09:01:31 +0100)

----------------------------------------------------------------
* Current qtests queue
* Some Kconfig updates
* Some trivial clean-ups here and there
----------------------------------------------------------------

v2: Replaced the hw/bt/Kconfig removal patch with the fix for the
    minikconf inputs and a patch that touches "configure" to make
    sure that all builders regenerate their dependencies afterwards.

Dr. David Alan Gilbert (1):
      tests/vhost-user-bridge: Fix build

Heyi Guo (1):
      tests/qtest: update comments about bios-tables-test-allowed-diff.h

Miroslav Rezanina (1):
      test-logging: Fix -Werror=maybe-uninitialized warning

Pan Nengyuan (1):
      boot-order-test: fix memleaks in boot-order-test

Philippe Mathieu-Daudé (1):
      hw/hppa/Kconfig: LASI chipset requires PARALLEL port

Thomas Huth (9):
      docs/devel: Fix qtest paths and info about check-block in testing.rst
      tests/Makefile: Fix inclusion of the qos dependency files
      gitlab-ci: Refresh the list of iotests
      include/sysemu/sysemu.h: Remove usused variable no_quit
      trivial: Remove xenfb_enabled from sysemu.h
      hw/*/Makefile.objs: Move many .o files to common-objs
      Makefile: Do not use wildcard hw/*/Kconfig as input for minikconf
      hw/input: Do not enable CONFIG_PCKBD by default
      configure: Fix typo of the have_afalg variable

 .gitlab-ci.yml                 | 12 ++++++------
 Makefile                       |  6 +++---
 configure                      |  2 +-
 docs/devel/testing.rst         | 23 ++++++++++++-----------
 hw/adc/Makefile.objs           |  2 +-
 hw/block/Makefile.objs         |  2 +-
 hw/char/Makefile.objs          | 16 ++++++++--------
 hw/core/Makefile.objs          |  2 +-
 hw/display/Makefile.objs       |  2 +-
 hw/dma/Makefile.objs           |  6 +++---
 hw/gpio/Makefile.objs          | 10 +++++-----
 hw/hppa/Kconfig                |  1 +
 hw/i2c/Makefile.objs           |  4 ++--
 hw/i2c/ppc4xx_i2c.c            |  1 -
 hw/input/Kconfig               |  1 -
 hw/input/Makefile.objs         |  8 ++++----
 hw/isa/Kconfig                 |  1 +
 hw/net/Makefile.objs           |  6 +++---
 hw/nvram/Makefile.objs         |  2 +-
 hw/pcmcia/Makefile.objs        |  2 +-
 hw/sd/Makefile.objs            | 10 +++++-----
 hw/ssi/Makefile.objs           |  4 ++--
 hw/usb/Makefile.objs           |  4 ++--
 hw/xenpv/xen_machine_pv.c      |  2 +-
 include/sysemu/sysemu.h        |  2 --
 tests/Makefile.include         |  3 ++-
 tests/qtest/Makefile.include   |  1 -
 tests/qtest/bios-tables-test.c | 10 +++++-----
 tests/qtest/boot-order-test.c  |  6 +++---
 tests/qtest/libqos/fw_cfg.h    |  2 ++
 tests/test-logging.c           |  6 +++---
 31 files changed, 80 insertions(+), 79 deletions(-)

[PULL v2 11/14] Makefile: Do not use wildcard hw/*/Kconfig as input for minikconf

[Thomas Huth]

The hw/*/Kconfig files should be sourced from hw/Kconfig, so there
is no need to pass them along as input files to minikconfig. We should
use the hw/*/Kconfig wildcard only for build dependencies in the Makefile.

With this change, there are now no duplicate entries in the generated
*-softmmu/config-devices.mak.d files anymore, and there is finally a
chance to get rid of stale Kconfig files like hw/bt/Kconfig, too (once
they do not show up in the config-devices.mak.d files now anymore).

Message-Id: <20200203153905.20544-1-thuth@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
 Makefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index a6f5d44082..461d40bea6 100644
--- a/Makefile
+++ b/Makefile
@@ -397,11 +397,11 @@ MINIKCONF_ARGS = \
     CONFIG_LINUX=$(CONFIG_LINUX) \
     CONFIG_PVRDMA=$(CONFIG_PVRDMA)
 
-MINIKCONF_INPUTS = $(SRC_PATH)/Kconfig.host $(SRC_PATH)/hw/Kconfig \
-                   $(wildcard $(SRC_PATH)/hw/*/Kconfig)
+MINIKCONF_INPUTS = $(SRC_PATH)/Kconfig.host $(SRC_PATH)/hw/Kconfig
+MINIKCONF_DEPS = $(MINIKCONF_INPUTS) $(wildcard $(SRC_PATH)/hw/*/Kconfig)
 MINIKCONF = $(PYTHON) $(SRC_PATH)/scripts/minikconf.py \
 
-$(SUBDIR_DEVICES_MAK): %/config-devices.mak: default-configs/%.mak $(MINIKCONF_INPUTS) $(BUILD_DIR)/config-host.mak
+$(SUBDIR_DEVICES_MAK): %/config-devices.mak: default-configs/%.mak $(MINIKCONF_DEPS) $(BUILD_DIR)/config-host.mak
 	$(call quiet-command, $(MINIKCONF) $(MINIKCONF_ARGS) > $@.tmp, "GEN", "$@.tmp")
 	$(call quiet-command, if test -f $@; then \
 	  if cmp -s $@.old $@; then \
-- 
2.18.1

[PULL v2 14/14] configure: Fix typo of the have_afalg variable

[Thomas Huth]

The variable is called 'have_afalg' and not 'hava_afalg'.

Fixes: f0d92b56d88 ('introduce some common functions for af_alg backend')
Message-Id: <20200203160046.23194-1-thuth@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Longpeng(Mike) <longpeng2@huawei.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
 configure | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure b/configure
index 5095f01728..115dc38085 100755
--- a/configure
+++ b/configure
@@ -5843,7 +5843,7 @@ fi
 
 ##########################################
 # check for usable AF_ALG environment
-hava_afalg=no
+have_afalg=no
 cat > $TMPC << EOF
 #include <errno.h>
 #include <sys/types.h>
-- 
2.18.1

Re: [PULL v2 00/14] qtests, kconfig and misc patches

[Peter Maydell]

On Tue, 4 Feb 2020 at 08:54, Thomas Huth <thuth@redhat.com> wrote:
>
>  Hi Peter,
>
> the following changes since commit f31160c7d1b89cfb4dd4001a23575b42141cb0ec:
>
>   Merge remote-tracking branch 'remotes/pmaydell/tags/pull-docs-20200203' into staging (2020-02-03 11:14:24 +0000)
>
> are available in the Git repository at:
>
>   https://gitlab.com/huth/qemu.git tags/pull-request-2020-02-04
>
> for you to fetch changes up to 4f67366e3bbe6040998be038156486eed264ea58:
>
>   configure: Fix typo of the have_afalg variable (2020-02-04 09:01:31 +0100)
>
> ----------------------------------------------------------------
> * Current qtests queue
> * Some Kconfig updates
> * Some trivial clean-ups here and there
> ----------------------------------------------------------------


Applied, thanks.

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

-- PMM