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>
This commit is contained in:
parent
dd47a8f654
commit
bd989ed44f
|
@ -756,6 +756,7 @@ static void numa_stat_memory_devices(NumaNodeMem node_mem[])
|
||||||
PCDIMMDeviceInfo *pcdimm_info;
|
PCDIMMDeviceInfo *pcdimm_info;
|
||||||
VirtioPMEMDeviceInfo *vpi;
|
VirtioPMEMDeviceInfo *vpi;
|
||||||
VirtioMEMDeviceInfo *vmi;
|
VirtioMEMDeviceInfo *vmi;
|
||||||
|
SgxEPCDeviceInfo *se;
|
||||||
|
|
||||||
for (info = info_list; info; info = info->next) {
|
for (info = info_list; info; info = info->next) {
|
||||||
MemoryDeviceInfo *value = info->value;
|
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_mem += vmi->size;
|
||||||
node_mem[vmi->node].node_plugged_mem += vmi->size;
|
node_mem[vmi->node].node_plugged_mem += vmi->size;
|
||||||
break;
|
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:
|
default:
|
||||||
g_assert_not_reached();
|
g_assert_not_reached();
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue