On 4/29/22 08:22, Paolo Bonzini wrote:
> The following changes since commit f22833602095b05733bceaddeb20f3edfced3c07:
>
> Merge tag 'pull-target-arm-20220428' of https://git.linaro.org/people/pmaydell/qemu-arm into staging (2022-04-28 08:34:17 -0700)
>
> are available in the Git repository at:
>
> https://gitlab.com/bonzini/qemu.git tags/for-upstream
>
> for you to fetch changes up to ec31a2f9b5b128c06a499ad076d8b29d664d3896:
>
> pc: remove -soundhw pcspk (2022-04-29 15:07:21 +0200)
>
> ----------------------------------------------------------------
> * WHPX support for xcr0
> * qga-wss fixes
> * Meson conversions
> * Removed -soundhw pcspk
>
> ----------------------------------------------------------------
> Konstantin Kostiuk (2):
> configure: Add cross prefix for widl tool
> qga-vss: always build qga-vss.tlb when qga-vss.dll is built
>
> Paolo Bonzini (22):
> meson-buildoptions: add support for string options
> meson, configure: move Xen detection to meson
> configure, meson: move iasl detection to meson
> configure: move Windows flags detection to meson
> configure: switch string options to automatic parsing
> meson, configure: move --tls-priority to meson
> meson, configure: move bdrv whitelists to meson
> meson, configure: move --with-pkgversion, CONFIG_STAMP to meson
> meson, configure: move --interp-prefix to meson
> meson: always combine directories with prefix
> configure: switch directory options to automatic parsing
> meson: pass more options directly as -D
> configure: omit options with default values from meson command line
> meson, virtio: place all virtio-pci devices under virtio_pci_ss
> configure: simplify vhost-net-{user, vdpa} configuration
> build: move vhost-vsock configuration to Kconfig
> build: move vhost-scsi configuration to Kconfig
> build: move vhost-user-fs configuration to Kconfig
> meson: create have_vhost_* variables
> meson: use have_vhost_* variables to pick sources
> configure, meson: move vhost options to Meson
> pc: remove -soundhw pcspk
>
> Sunil Muthuswamy (1):
> WHPX: support for xcr0
>
> Kconfig.host | 3 -
> backends/meson.build | 8 +-
> configure | 673 ++-------------------------------------
> docs/meson.build | 2 +-
> hw/audio/pcspk.c | 10 -
> hw/audio/soundhw.c | 27 +-
> hw/net/meson.build | 8 +-
> hw/scsi/Kconfig | 5 +
> hw/virtio/Kconfig | 18 +-
> hw/virtio/meson.build | 34 +-
> include/hw/audio/soundhw.h | 3 -
> include/hw/virtio/virtio-scsi.h | 2 -
> meson.build | 256 +++++++++++----
> meson_options.txt | 28 +-
> net/meson.build | 12 +-
> qga/vss-win32/meson.build | 4 +-
> scripts/meson-buildoptions.py | 86 ++++-
> scripts/meson-buildoptions.sh | 74 ++++-
> scripts/qemu-stamp.py | 24 ++
> scripts/xen-detect.c | 203 ++++++++++++
> target/i386/whpx/whpx-all.c | 89 ++++++
> target/i386/whpx/whpx-internal.h | 3 +
> tests/meson.build | 2 +-
> tests/qtest/meson.build | 4 +-
> tools/meson.build | 2 +-
> 25 files changed, 778 insertions(+), 802 deletions(-)
> create mode 100644 scripts/qemu-stamp.py
> create mode 100644 scripts/xen-detect.c
Fails:
../target/i386/whpx/whpx-all.c: In function 'whpx_set_xcrs':
../target/i386/whpx/whpx-all.c:312:31: error: initialization of 'struct CPUX86State *'
from incompatible pointer type 'CPUArchState *' [-Werror=incompatible-pointer-types]
312 | struct CPUX86State *env = (CPUArchState *)(cpu->env_ptr);
| ^
../target/i386/whpx/whpx-all.c:323:21: error: invalid use of undefined type 'struct
CPUX86State'
323 | xcr0.Reg64 = env->xcr0;
| ^~
../target/i386/whpx/whpx-all.c: In function 'whpx_get_xcrs':
../target/i386/whpx/whpx-all.c:581:31: error: initialization of 'struct CPUX86State *'
from incompatible pointer type 'CPUArchState *' [-Werror=incompatible-pointer-types]
581 | struct CPUX86State *env = (CPUArchState *)(cpu->env_ptr);
| ^
../target/i386/whpx/whpx-all.c:599:8: error: invalid use of undefined type 'struct
CPUX86State'
599 | env->xcr0 = xcr0.Reg64;
| ^~
r~