mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-08-27 02:51:16 +00:00
d010b68962
qemudCapsInitNUMA and umlCapsInitNUMA were identical, so this change factors them into a new function, virCapsInitNUMA, and puts it in nodeinfo.c. In addition to factoring out the duplicates, this change also adjusts that function definition (along with its macros) so that it works with Fedora 9's numactl version 1, and makes it so the code will work even if someone builds the kernel with CONFIG_NR_CPUS > 4096. Finally, also perform this NUMA initialization for the lxc and openvz drivers. * src/nodeinfo.c: Include <stdint.h>, <numa.h> and "memory.h". (virCapsInitNUMA): Rename from qemudCapsInitNUMA and umlCapsInitNUMA. (NUMA_MAX_N_CPUS): Define depending on NUMA API version. (n_bits, MASK_CPU_ISSET): Define, adjust, use uint64 rather than long. * src/nodeinfo.h: Include "capabilities.h". (virCapsInitNUMA): Declare it. * examples/domain-events/events-c/Makefile.am: * src/Makefile.am: Add $(NUMACTL_CFLAGS) and $(NUMACTL_LIBS) to various compile/link-related variables. * src/qemu_conf.c: Include "nodeinfo.h". (qemudCapsInitNUMA): Remove duplicate code. Adjust caller. * src/uml_conf.c (umlCapsInitNUMA): Likewise. Include "nodeinfo.h". * src/lxc_conf.c: Include "nodeinfo.h". (lxcCapsInit): Perform NUMA initialization here, too. * src/openvz_conf.c (openvzCapsInit): And here. Include "nodeinfo.h". * src/libvirt_sym.version.in: Add virCapsInitNUMA so that libvirtd can link to this function.
94 lines
2.8 KiB
C
94 lines
2.8 KiB
C
/*
|
|
* Copyright IBM Corp. 2008
|
|
*
|
|
* lxc_conf.c: config functions for managing linux containers
|
|
*
|
|
* Authors:
|
|
* David L. Leskovec <dlesko at linux.vnet.ibm.com>
|
|
*
|
|
* 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, write to the Free Software
|
|
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
*
|
|
*/
|
|
|
|
/* includes */
|
|
#include <config.h>
|
|
|
|
#include <sys/utsname.h>
|
|
|
|
#include "lxc_conf.h"
|
|
#include "nodeinfo.h"
|
|
#include "virterror_internal.h"
|
|
|
|
/* Functions */
|
|
virCapsPtr lxcCapsInit(void)
|
|
{
|
|
struct utsname utsname;
|
|
virCapsPtr caps;
|
|
virCapsGuestPtr guest;
|
|
|
|
uname(&utsname);
|
|
|
|
if ((caps = virCapabilitiesNew(utsname.machine,
|
|
0, 0)) == NULL)
|
|
goto no_memory;
|
|
|
|
if (virCapsInitNUMA(caps) < 0)
|
|
goto no_memory;
|
|
|
|
/* XXX shouldn't 'borrow' KVM's prefix */
|
|
virCapabilitiesSetMacPrefix(caps, (unsigned char []){ 0x52, 0x54, 0x00 });
|
|
|
|
if ((guest = virCapabilitiesAddGuest(caps,
|
|
"exe",
|
|
utsname.machine,
|
|
sizeof(int) == 4 ? 32 : 8,
|
|
BINDIR "/libvirt_lxc",
|
|
NULL,
|
|
0,
|
|
NULL)) == NULL)
|
|
goto no_memory;
|
|
|
|
if (virCapabilitiesAddGuestDomain(guest,
|
|
"lxc",
|
|
NULL,
|
|
NULL,
|
|
0,
|
|
NULL) == NULL)
|
|
goto no_memory;
|
|
return caps;
|
|
|
|
no_memory:
|
|
virCapabilitiesFree(caps);
|
|
return NULL;
|
|
}
|
|
|
|
int lxcLoadDriverConfig(lxc_driver_t *driver)
|
|
{
|
|
/* Set the container configuration directory */
|
|
if ((driver->configDir = strdup(LXC_CONFIG_DIR)) == NULL)
|
|
goto no_memory;
|
|
if ((driver->stateDir = strdup(LXC_STATE_DIR)) == NULL)
|
|
goto no_memory;
|
|
if ((driver->logDir = strdup(LXC_LOG_DIR)) == NULL)
|
|
goto no_memory;
|
|
|
|
return 0;
|
|
|
|
no_memory:
|
|
lxcError(NULL, NULL, VIR_ERR_NO_MEMORY,
|
|
"%s", _("while loading LXC driver config"));
|
|
return -1;
|
|
}
|