[PULL 0/2] Build bugfixes for QEMU 7.0, 2022-03-29

[PULL 0/2] Build bugfixes for QEMU 7.0, 2022-03-29

[Paolo Bonzini]

The following changes since commit f345abe36527a8b575482bb5a0616f43952bf1f4:

  Merge tag 'for-upstream' of https://gitlab.com/bonzini/qemu into staging (2022-03-25 10:14:47 +0000)

are available in the Git repository at:

  https://gitlab.com/bonzini/qemu.git tags/for-upstream

for you to fetch changes up to 36e38426ff40c9ba86d4e66027f3a98747890623:

  tests/tcg: really fix path to target configuration (2022-03-29 15:58:39 +0200)

----------------------------------------------------------------
Build bugfixes.

----------------------------------------------------------------
Paolo Bonzini (2):
      virtio: fix --enable-vhost-user build on non-Linux
      tests/tcg: really fix path to target configuration

 hw/virtio/meson.build     | 4 ++--
 tests/tcg/Makefile.target | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)
-- 
2.35.1

[PULL 1/2] virtio: fix --enable-vhost-user build on non-Linux

[Paolo Bonzini]

The vhost-shadow-virtqueue.c build requires include files from
linux-headers/, so it cannot be built on non-Linux systems.
Fortunately it is only needed by vhost-vdpa, so move it there.

Acked-by: Eugenio Pérez <eperezma@redhat.com>
Acked-by: Jason Wang <jasowang@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 hw/virtio/meson.build | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/hw/virtio/meson.build b/hw/virtio/meson.build
index 6047670804..67dc77e00f 100644
--- a/hw/virtio/meson.build
+++ b/hw/virtio/meson.build
@@ -11,9 +11,9 @@ softmmu_ss.add(when: 'CONFIG_ALL', if_true: files('vhost-stub.c'))
 
 virtio_ss = ss.source_set()
 virtio_ss.add(files('virtio.c'))
-virtio_ss.add(when: 'CONFIG_VHOST', if_true: files('vhost.c', 'vhost-backend.c', 'vhost-shadow-virtqueue.c', 'vhost-iova-tree.c'))
+virtio_ss.add(when: 'CONFIG_VHOST', if_true: files('vhost.c', 'vhost-backend.c', 'vhost-iova-tree.c'))
 virtio_ss.add(when: 'CONFIG_VHOST_USER', if_true: files('vhost-user.c'))
-virtio_ss.add(when: 'CONFIG_VHOST_VDPA', if_true: files('vhost-vdpa.c'))
+virtio_ss.add(when: 'CONFIG_VHOST_VDPA', if_true: files('vhost-shadow-virtqueue.c', 'vhost-vdpa.c'))
 virtio_ss.add(when: 'CONFIG_VIRTIO_BALLOON', if_true: files('virtio-balloon.c'))
 virtio_ss.add(when: 'CONFIG_VIRTIO_CRYPTO', if_true: files('virtio-crypto.c'))
 virtio_ss.add(when: ['CONFIG_VIRTIO_CRYPTO', 'CONFIG_VIRTIO_PCI'], if_true: files('virtio-crypto-pci.c'))
-- 
2.35.1

[PULL 2/2] tests/tcg: really fix path to target configuration

[Paolo Bonzini]

This was attempted in commit 533b0a1a41 ("tests/tcg: Fix target-specific
Makefile variables path for user-mode", 2022-01-12) but it also used the
wrong path; default.mak is used for config/devices, not config/targets.

While at it, explain what the inclusion is about.

Cc: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 tests/tcg/Makefile.target | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tests/tcg/Makefile.target b/tests/tcg/Makefile.target
index ae8004c76e..acda5bcec2 100644
--- a/tests/tcg/Makefile.target
+++ b/tests/tcg/Makefile.target
@@ -32,8 +32,10 @@
 all:
 -include ../../../config-host.mak
 -include ../config-$(TARGET).mak
+
+# Get semihosting definitions for user-mode emulation
 ifeq ($(CONFIG_USER_ONLY),y)
--include $(SRC_PATH)/configs/targets/$(TARGET)/default.mak
+-include $(SRC_PATH)/configs/targets/$(TARGET).mak
 endif
 
 # for including , in command strings
-- 
2.35.1

Re: [PULL 0/2] Build bugfixes for QEMU 7.0, 2022-03-29

[Peter Maydell]

On Tue, 29 Mar 2022 at 15:03, Paolo Bonzini <pbonzini@redhat.com> wrote:
>
> The following changes since commit f345abe36527a8b575482bb5a0616f43952bf1f4:
>
>   Merge tag 'for-upstream' of https://gitlab.com/bonzini/qemu into staging (2022-03-25 10:14:47 +0000)
>
> are available in the Git repository at:
>
>   https://gitlab.com/bonzini/qemu.git tags/for-upstream
>
> for you to fetch changes up to 36e38426ff40c9ba86d4e66027f3a98747890623:
>
>   tests/tcg: really fix path to target configuration (2022-03-29 15:58:39 +0200)
>
> ----------------------------------------------------------------
> Build bugfixes.
>
> ----------------------------------------------------------------
> Paolo Bonzini (2):
>       virtio: fix --enable-vhost-user build on non-Linux
>       tests/tcg: really fix path to target configuration

That tag doesn't seem to have these contents (it still has the
patches you sent in your last pullreq last week). Forgot to push?

(Trying to re-merge an already merged tag confuses my merge
scripts, incidentally -- I should fix that...)

-- PMM

Re: [PULL 0/2] Build bugfixes for QEMU 7.0, 2022-03-29

[Peter Maydell]

On Tue, 29 Mar 2022 at 15:03, Paolo Bonzini <pbonzini@redhat.com> wrote:
>
> The following changes since commit f345abe36527a8b575482bb5a0616f43952bf1f4:
>
>   Merge tag 'for-upstream' of https://gitlab.com/bonzini/qemu into staging (2022-03-25 10:14:47 +0000)
>
> are available in the Git repository at:
>
>   https://gitlab.com/bonzini/qemu.git tags/for-upstream
>
> for you to fetch changes up to 36e38426ff40c9ba86d4e66027f3a98747890623:
>
>   tests/tcg: really fix path to target configuration (2022-03-29 15:58:39 +0200)
>
> ----------------------------------------------------------------
> Build bugfixes.
>
> ----------------------------------------------------------------
> Paolo Bonzini (2):
>       virtio: fix --enable-vhost-user build on non-Linux
>       tests/tcg: really fix path to target configuration


Applied, thanks.

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

-- PMM