mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-10-06 22:35:46 +00:00
7b79ee2f78
Update the host CPU code to report the die_id in the NUMA topology capabilities. On systems with multiple dies, this fixes the bug where CPU cores can't be distinguished: <cpus num='12'> <cpu id='0' socket_id='0' core_id='0' siblings='0'/> <cpu id='1' socket_id='0' core_id='1' siblings='1'/> <cpu id='2' socket_id='0' core_id='0' siblings='2'/> <cpu id='3' socket_id='0' core_id='1' siblings='3'/> </cpus> Notice how core_id is repeated within the scope of the same socket_id. It now reports <cpus num='12'> <cpu id='0' socket_id='0' die_id='0' core_id='0' siblings='0'/> <cpu id='1' socket_id='0' die_id='0' core_id='1' siblings='1'/> <cpu id='2' socket_id='0' die_id='1' core_id='0' siblings='2'/> <cpu id='3' socket_id='0' die_id='1' core_id='1' siblings='3'/> </cpus> So core_id is now unique within a (socket_id, die_id) pair. Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com> Reviewed-by: Jiri Denemark <jdenemar@redhat.com> Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
82 lines
2.6 KiB
C
82 lines
2.6 KiB
C
/*
|
|
* virhostcpu.h: helper APIs for host CPU info
|
|
*
|
|
* Copyright (C) 2006-2016 Red Hat, Inc.
|
|
* Copyright (C) 2006 Daniel P. Berrange
|
|
*
|
|
* This library is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU Lesser General Public
|
|
* License as published by the Free Software Foundation; either
|
|
* version 2.1 of the License, or (at your option) any later version.
|
|
*
|
|
* This library is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* Lesser General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
* License along with this library. If not, see
|
|
* <http://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
#pragma once
|
|
|
|
#include "internal.h"
|
|
#include "virarch.h"
|
|
#include "virbitmap.h"
|
|
#include "virenum.h"
|
|
|
|
|
|
typedef struct _virHostCPUTscInfo virHostCPUTscInfo;
|
|
typedef virHostCPUTscInfo *virHostCPUTscInfoPtr;
|
|
struct _virHostCPUTscInfo {
|
|
unsigned long long frequency;
|
|
virTristateBool scaling;
|
|
};
|
|
|
|
|
|
int virHostCPUGetStats(int cpuNum,
|
|
virNodeCPUStatsPtr params,
|
|
int *nparams,
|
|
unsigned int flags);
|
|
|
|
bool virHostCPUHasBitmap(void);
|
|
virBitmapPtr virHostCPUGetPresentBitmap(void);
|
|
virBitmapPtr virHostCPUGetOnlineBitmap(void);
|
|
int virHostCPUGetCount(void);
|
|
int virHostCPUGetThreadsPerSubcore(virArch arch) G_GNUC_NO_INLINE;
|
|
|
|
int virHostCPUGetMap(unsigned char **cpumap,
|
|
unsigned int *online,
|
|
unsigned int flags);
|
|
int virHostCPUGetInfo(virArch hostarch,
|
|
unsigned int *cpus,
|
|
unsigned int *mhz,
|
|
unsigned int *nodes,
|
|
unsigned int *sockets,
|
|
unsigned int *cores,
|
|
unsigned int *threads);
|
|
|
|
int virHostCPUGetKVMMaxVCPUs(void) G_GNUC_NO_INLINE;
|
|
|
|
int virHostCPUStatsAssign(virNodeCPUStatsPtr param,
|
|
const char *name,
|
|
unsigned long long value);
|
|
|
|
#ifdef __linux__
|
|
int virHostCPUGetSocket(unsigned int cpu, unsigned int *socket);
|
|
int virHostCPUGetDie(unsigned int cpu, unsigned int *die);
|
|
int virHostCPUGetCore(unsigned int cpu, unsigned int *core);
|
|
|
|
virBitmapPtr virHostCPUGetSiblingsList(unsigned int cpu);
|
|
#endif
|
|
|
|
int virHostCPUGetOnline(unsigned int cpu, bool *online);
|
|
|
|
unsigned int virHostCPUGetMicrocodeVersion(void);
|
|
|
|
int virHostCPUGetMSR(unsigned long index,
|
|
uint64_t *msr);
|
|
|
|
virHostCPUTscInfoPtr virHostCPUGetTscInfo(void);
|