Re: [libvirt] [PATCH 2/5] virCaps: expose huge page info

There are two places where you'll find info on huge pages. The first one is under <cpu/> element, where all supported huge page sizes are listed. Then the second one is under each <cell/> element which refers to concrete NUMA node. At this place, the size of huge page's pool is reported. So the capabilities XML looks something like this: <capabilities> <host> <uuid>01281cda-f352-cb11-a9db-e905fe22010c</uuid> <cpu> <arch>x86_64</arch> <model>Westmere</model> <vendor>Intel</vendor> <topology sockets='1' cores='1' threads='1'/> ... <pages unit='KiB' size='1048576'/> <pages unit='KiB' size='2048'/>

</cpu> ... <topology> <cells num='4'> <cell id='0'> <memory unit='KiB'>4054408</memory> <pages unit='KiB' size='1048576'>1</pages> <pages unit='KiB' size='2048'>3</pages>

<distances/> <cpus num='1'> <cpu id='0' socket_id='0' core_id='0' siblings='0'/> </cpus> </cell> <cell id='1'> <memory unit='KiB'>4071072</memory> <pages unit='KiB' size='1048576'>2</pages> <pages unit='KiB' size='2048'>1024</pages> <distances/> <cpus num='1'> <cpu id='1' socket_id='0' core_id='0' siblings='1'/> </cpus> </cell> ... </cells> </topology> ... </host> <guest/> </capabilities> Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com&gt; --- docs/schemas/capability.rng | 21 +++++++++++++++++++++ src/conf/capabilities.c | 25 ++++++++++++++++++++++--- src/conf/capabilities.h | 15 ++++++++++++++- src/libxl/libxl_conf.c | 1 + src/nodeinfo.c | 41 ++++++++++++++++++++++++++++++++++++++++- src/qemu/qemu_capabilities.c | 29 ++++++++++++++++++++++++++++- src/test/test_driver.c | 2 +- src/xen/xend_internal.c | 1 + tests/vircaps2xmltest.c | 3 ++- tests/vircapstest.c | 1 + 10 files changed, 131 insertions(+), 8 deletions(-)

diff --git a/src/conf/capabilities.h b/src/conf/capabilities.h index 53a83c9..384e256 100644 --- a/src/conf/capabilities.h +++ b/src/conf/capabilities.h @@ -102,6 +102,13 @@ struct _virCapsHostNUMACellSiblingInfo { unsigned int distance; /* distance to the node */ }; +typedef struct _virCapsHostNUMACellHugePageInfo virCapsHostNUMACellHugePageInfo; +typedef virCapsHostNUMACellHugePageInfo *virCapsHostNUMACellHugePageInfoPtr; +struct _virCapsHostNUMACellHugePageInfo { + unsigned int size; /* huge page size in kibibytes */ + size_t avail; /* the size of pool */ +};

+ typedef struct _virCapsHostNUMACell virCapsHostNUMACell; typedef virCapsHostNUMACell *virCapsHostNUMACellPtr; struct _virCapsHostNUMACell { @@ -111,6 +118,8 @@ struct _virCapsHostNUMACell { virCapsHostNUMACellCPUPtr cpus; int nsiblings; virCapsHostNUMACellSiblingInfoPtr siblings; + int nhugepages; + virCapsHostNUMACellHugePageInfoPtr hugepages;