Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
libvirt
提交
c23ff311
L
libvirt
项目概览
openeuler
/
libvirt
通知
3
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
L
libvirt
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
提交
c23ff311
编写于
16年前
作者:
D
Daniel P. Berrange
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix libnuma use to build with v1 compatability code
上级
a9567e09
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
27 addition
and
9 deletion
+27
-9
ChangeLog
ChangeLog
+8
-0
libvirt.spec.in
libvirt.spec.in
+2
-0
qemud/Makefile.am
qemud/Makefile.am
+3
-1
src/qemu_conf.c
src/qemu_conf.c
+6
-4
src/qemu_driver.c
src/qemu_driver.c
+1
-0
src/uml_conf.c
src/uml_conf.c
+6
-4
src/uml_driver.c
src/uml_driver.c
+1
-0
未找到文件。
ChangeLog
浏览文件 @
c23ff311
Fri Nov 28 11:17:40 GMT 2008 Daniel P. Berrange <berrange@redhat.com>
* libvirt.spec.in: Add missing numa-ctl BuildRequires
* qemud/Makefile.am: Fix libvirtd_DEPENDANCIES to include all libs
* src/qemu_conf.c, src/qemu_driver.c, src/uml_conf.c,
src/uml_driver.c: Define NUMA_VERSION1_COMPATIBILITY and
fix size of array used to get node mapping
Fri Nov 28 08:40:00 CET 2008 Chris Lalancette <clalance@redhat.com>
* src/storage_backend.c: Wait up to 5 seconds for
/dev/disk/by-{id,path} to exist in virStorageBackendStablePath
...
...
This diff is collapsed.
Click to expand it.
libvirt.spec.in
浏览文件 @
c23ff311
...
...
@@ -124,6 +124,8 @@ BuildRequires: lvm2
BuildRequires: iscsi-initiator-utils
# For disk driver
BuildRequires: parted-devel
# For QEMU/LXC numa info
BuildRequires: numactl-devel
Obsoletes: libvir
# Fedora build root suckage
...
...
This diff is collapsed.
Click to expand it.
qemud/Makefile.am
浏览文件 @
c23ff311
...
...
@@ -87,7 +87,6 @@ libvirtd_LDFLAGS = \
$(COVERAGE_LDFLAGS)
\
$(POLKIT_LIBS)
libvirtd_DEPENDENCIES
=
../src/libvirt.la
libvirtd_LDADD
=
\
../gnulib/lib/libgnu.la
...
...
@@ -129,6 +128,9 @@ libvirtd_CFLAGS += $(AVAHI_CFLAGS)
libvirtd_LDADD
+=
$(AVAHI_LIBS)
endif
libvirtd_DEPENDENCIES
=
$(libvirtd_LDADD)
default_xml_dest
=
libvirt/qemu/networks/default.xml
install-data-local
:
install-init install-data-sasl install-data-polkit
mkdir
-p
$(DESTDIR)$(sysconfdir)
/libvirt/qemu/networks/autostart
...
...
This diff is collapsed.
Click to expand it.
src/qemu_conf.c
浏览文件 @
c23ff311
...
...
@@ -37,6 +37,7 @@
#include <sys/utsname.h>
#if HAVE_NUMACTL
#define NUMA_VERSION1_COMPATIBILITY 1
#include <numa.h>
#endif
...
...
@@ -300,11 +301,11 @@ qemudCapsInitGuest(virCapsPtr caps,
#if HAVE_NUMACTL
#define MAX_CPUS 4096
#define MAX_CPUS_MASK_SIZE (sizeof(unsigned long))
#define MAX_CPUS_MASK_
LEN (MAX_CPUS / MAX_CPUS_MASK_SIZE
)
#define MAX_CPUS_MASK_
BYTES (MAX_CPUS / 8
)
#define MAX_CPUS_MASK_
BITS (MAX_CPUS_MASK_SIZE * 8
)
#define MAX_CPUS_MASK_
LEN (MAX_CPUS / (MAX_CPUS_MASK_BITS)
)
#define MASK_CPU_ISSET(mask, cpu) \
(((mask)[((cpu) / MAX_CPUS_MASK_
SIZE)] >> ((cpu) % MAX_CPUS_MASK_SIZE
)) & 1)
(((mask)[((cpu) / MAX_CPUS_MASK_
BITS)] >> ((cpu) % MAX_CPUS_MASK_BITS
)) & 1)
static
int
qemudCapsInitNUMA
(
virCapsPtr
caps
)
...
...
@@ -322,7 +323,8 @@ qemudCapsInitNUMA(virCapsPtr caps)
goto
cleanup
;
for
(
n
=
0
;
n
<=
numa_max_node
()
;
n
++
)
{
if
(
numa_node_to_cpus
(
n
,
mask
,
MAX_CPUS_MASK_BYTES
)
<
0
)
if
(
numa_node_to_cpus
(
n
,
mask
,
MAX_CPUS_MASK_LEN
)
<
0
)
goto
cleanup
;
for
(
ncpus
=
0
,
i
=
0
;
i
<
MAX_CPUS
;
i
++
)
...
...
This diff is collapsed.
Click to expand it.
src/qemu_driver.c
浏览文件 @
c23ff311
...
...
@@ -45,6 +45,7 @@
#include <sys/ioctl.h>
#if HAVE_NUMACTL
#define NUMA_VERSION1_COMPATIBILITY 1
#include <numa.h>
#endif
...
...
This diff is collapsed.
Click to expand it.
src/uml_conf.c
浏览文件 @
c23ff311
...
...
@@ -37,6 +37,7 @@
#include <sys/utsname.h>
#if HAVE_NUMACTL
#define NUMA_VERSION1_COMPATIBILITY 1
#include <numa.h>
#endif
...
...
@@ -56,11 +57,11 @@
#if HAVE_NUMACTL
#define MAX_CPUS 4096
#define MAX_CPUS_MASK_SIZE (sizeof(unsigned long))
#define MAX_CPUS_MASK_
LEN (MAX_CPUS / MAX_CPUS_MASK_SIZE
)
#define MAX_CPUS_MASK_
BYTES (MAX_CPUS / 8
)
#define MAX_CPUS_MASK_
BITS (MAX_CPUS_MASK_SIZE * 8
)
#define MAX_CPUS_MASK_
LEN (MAX_CPUS / (MAX_CPUS_MASK_BITS)
)
#define MASK_CPU_ISSET(mask, cpu) \
(((mask)[((cpu) / MAX_CPUS_MASK_
SIZE)] >> ((cpu) % MAX_CPUS_MASK_SIZE
)) & 1)
(((mask)[((cpu) / MAX_CPUS_MASK_
BITS)] >> ((cpu) % MAX_CPUS_MASK_BITS
)) & 1)
static
int
umlCapsInitNUMA
(
virCapsPtr
caps
)
...
...
@@ -78,7 +79,8 @@ umlCapsInitNUMA(virCapsPtr caps)
goto
cleanup
;
for
(
n
=
0
;
n
<=
numa_max_node
()
;
n
++
)
{
if
(
numa_node_to_cpus
(
n
,
mask
,
MAX_CPUS_MASK_BYTES
)
<
0
)
if
(
numa_node_to_cpus
(
n
,
mask
,
MAX_CPUS_MASK_LEN
)
<
0
)
goto
cleanup
;
for
(
ncpus
=
0
,
i
=
0
;
i
<
MAX_CPUS
;
i
++
)
...
...
This diff is collapsed.
Click to expand it.
src/uml_driver.c
浏览文件 @
c23ff311
...
...
@@ -46,6 +46,7 @@
#include <sys/inotify.h>
#if HAVE_NUMACTL
#define NUMA_VERSION1_COMPATIBILITY 1
#include <numa.h>
#endif
...
...
This diff is collapsed.
Click to expand it.
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录
新手
引导
客服
返回
顶部