aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2021-11-10 13:29:03 +0100
committerPaolo Bonzini <pbonzini@redhat.com>2021-11-10 13:37:36 +0100
commitbd989ed44f847cba20b46a743770c152e188f365 (patch)
tree7abc5587ff2dacc519ea6ffbf71b30f12b5aaa85
parentdd47a8f654d84f666b235ce8891e17ee76f9be8b (diff)
numa: avoid crash with SGX and "info numa"
Add the MEMORY_DEVICE_INFO_KIND_SGX_EPC case, so that enclave memory is included in the output of "info numa" instead of crashing the monitor. Fixes: a7c565a941 ("sgx-epc: Add the fill_device_info() callback support", 2021-09-30) Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
-rw-r--r--hw/core/numa.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/hw/core/numa.c b/hw/core/numa.c
index 510d096a88..e6050b2273 100644
--- a/hw/core/numa.c
+++ b/hw/core/numa.c
@@ -756,6 +756,7 @@ static void numa_stat_memory_devices(NumaNodeMem node_mem[])
PCDIMMDeviceInfo *pcdimm_info;
VirtioPMEMDeviceInfo *vpi;
VirtioMEMDeviceInfo *vmi;
+ SgxEPCDeviceInfo *se;
for (info = info_list; info; info = info->next) {
MemoryDeviceInfo *value = info->value;
@@ -781,6 +782,12 @@ static void numa_stat_memory_devices(NumaNodeMem node_mem[])
node_mem[vmi->node].node_mem += vmi->size;
node_mem[vmi->node].node_plugged_mem += vmi->size;
break;
+ case MEMORY_DEVICE_INFO_KIND_SGX_EPC:
+ se = value->u.sgx_epc.data;
+ /* TODO: once we support numa, assign to right node */
+ node_mem[0].node_mem += se->size;
+ node_mem[0].node_plugged_mem += se->size;
+ break;
default:
g_assert_not_reached();
}