diff options
| author | Richard Henderson | 2022-05-05 20:52:22 +0200 |
|---|---|---|
| committer | Richard Henderson | 2022-05-05 20:52:22 +0200 |
| commit | 31abf61c4929a91275fe32f1fafe6e6b3e840b2a (patch) | |
| tree | 696cb00a00b9bbd23b650af483041cb0922fc996 /hw/virtio/vhost-user.c | |
| parent | Merge tag 'pull-target-arm-20220505' of https://git.linaro.org/people/pmaydel... (diff) | |
| parent | target/ppc: Change MSR_* to follow POWER ISA numbering convention (diff) | |
| download | qemu-31abf61c4929a91275fe32f1fafe6e6b3e840b2a.tar.gz qemu-31abf61c4929a91275fe32f1fafe6e6b3e840b2a.tar.xz qemu-31abf61c4929a91275fe32f1fafe6e6b3e840b2a.zip | |
Merge tag 'pull-ppc-20220505' of https://gitlab.com/danielhb/qemu into staging
ppc patch queue for 2022-05-05:
The star of the show in this PR is the 'Remove hidden usages of *env'
work done by Víctor, which impacts a lot of target/ppc code and we want
to get it landed ASAP so future target/ppc contributions can be based on
it.
Other changes:
- XIVE fixes in guest interrupt handling
- BookE debug interrupt fix
- vhost-user TARGET_PPC64 macro fix
- valgrind fixes in kvmppc functions
# -----BEGIN PGP SIGNATURE-----
#
# iHUEABYKAB0WIQQX6/+ZI9AYAK8oOBk82cqW3gMxZAUCYnQbpgAKCRA82cqW3gMx
# ZM1ZAQChjU/oBVDlhrlfInGjOcdXlM4l0R0pDQZ6dm1NYVqcvgD/WRNWj+tQ2H1V
# xmKXSzrGlDyYFu1uozfU8kvYJeHaKgw=
# =eRrg
# -----END PGP SIGNATURE-----
# gpg: Signature made Thu 05 May 2022 01:47:02 PM CDT
# gpg: using EDDSA key 17EBFF9923D01800AF2838193CD9CA96DE033164
# gpg: Good signature from "Daniel Henrique Barboza <danielhb413@gmail.com>" [unknown]
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg: There is no indication that the signature belongs to the owner.
# Primary key fingerprint: 17EB FF99 23D0 1800 AF28 3819 3CD9 CA96 DE03 3164
* tag 'pull-ppc-20220505' of https://gitlab.com/danielhb/qemu: (30 commits)
target/ppc: Change MSR_* to follow POWER ISA numbering convention
target/ppc: Add unused msr bits FIELDs
target/ppc: Remove msr_de macro
target/ppc: Remove msr_hv macro
target/ppc: Remove msr_ts macro
target/ppc: Remove msr_fe0 and msr_fe1 macros
target/ppc: Remove msr_ep macro
target/ppc: Remove msr_dr macro
target/ppc: Remove msr_ir macro
target/ppc: Remove msr_cm macro
target/ppc: Remove msr_fp macro
target/ppc: Remove msr_gs macro
target/ppc: Remove msr_me macro
target/ppc: Remove msr_pow macro
target/ppc: Remove msr_ce macro
target/ppc: Remove msr_ee macro
target/ppc: Remove msr_ile macro
target/ppc: Remove msr_ds macro
target/ppc: Remove msr_le macro
target/ppc: Remove msr_pr macro
...
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Diffstat (limited to 'hw/virtio/vhost-user.c')
| -rw-r--r-- | hw/virtio/vhost-user.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/virtio/vhost-user.c b/hw/virtio/vhost-user.c index 2d434ff0bc..afd51f79b3 100644 --- a/hw/virtio/vhost-user.c +++ b/hw/virtio/vhost-user.c @@ -51,7 +51,7 @@ #include "hw/acpi/acpi.h" #define VHOST_USER_MAX_RAM_SLOTS ACPI_MAX_RAM_SLOTS -#elif defined(TARGET_PPC) || defined(TARGET_PPC_64) +#elif defined(TARGET_PPC) || defined(TARGET_PPC64) #include "hw/ppc/spapr.h" #define VHOST_USER_MAX_RAM_SLOTS SPAPR_MAX_RAM_SLOTS |