- io: remove io watch if TLS channel is closed during handshake - hw/ssi: Fix Linux driver init issue with xilinx_spi - chardev: report the handshake error - vhost: Drop unused eventfd_add|del hooks - virtio-iommu: use-after-free fix - hw/arm/virt: Check for attempt to use TrustZone with KVM or HVF - hw/rx: rx-gdbsim DTB load address aligned of 16byte - vhost-user: Use correct macro name TARGET_PPC64 - accel/kvm: Make kvm_dirty_ring_reaper_init() void - accel/kvm: Free as when an error occurred Signed-off-by: Jiabo Feng <fengjiabo1@huawei.com>
43 lines
1.6 KiB
Diff
43 lines
1.6 KiB
Diff
From f985f564a64e122e55a02f7a22e877f0de2de464 Mon Sep 17 00:00:00 2001
|
|
From: tangbinzy <tangbin_yewu@cmss.chinamobile.com>
|
|
Date: Mon, 21 Aug 2023 06:55:57 +0000
|
|
Subject: [PATCH] vhost-user: Use correct macro name TARGET_PPC64 mainline
|
|
inclusion commit 97252353c1f6ecbb54385c9272378b5788749a16 category: bugfix
|
|
|
|
---------------------------------------------------------------
|
|
|
|
The correct name of the macro is TARGET_PPC64.
|
|
|
|
Fixes: 27598393a232 ("Lift max memory slots limit imposed by vhost-user")
|
|
Reported-by: Fabiano Rosas <farosas@linux.ibm.com>
|
|
Signed-off-by: Murilo Opsfelder Araujo <muriloo@linux.ibm.com>
|
|
Cc: Raphael Norwitz <raphael.norwitz@nutanix.com>
|
|
Cc: Peter Turschmid <peter.turschm@nutanix.com>
|
|
Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com>
|
|
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
|
|
Reviewed-by: Raphael Norwitz <raphael.norwitz@nutanix.com>
|
|
Message-Id: <20220503180108.34506-1-muriloo@linux.ibm.com>
|
|
Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com>
|
|
|
|
Signed-off-by: tangbinzy <tangbin_yewu@cmss.chinamobile.com>
|
|
---
|
|
hw/virtio/vhost-user.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/hw/virtio/vhost-user.c b/hw/virtio/vhost-user.c
|
|
index 42a9e16cd9..24f80d5d18 100644
|
|
--- a/hw/virtio/vhost-user.c
|
|
+++ b/hw/virtio/vhost-user.c
|
|
@@ -52,7 +52,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
|
|
|
|
--
|
|
2.41.0.windows.1
|
|
|