Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
libvirt
提交
24120066
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看板
体验新版 GitCode,发现更多精彩内容 >>
提交
24120066
编写于
9月 20, 2012
作者:
D
Daniel P. Berrange
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Convert HAVE_HAL to WITH_HAL
Signed-off-by:
N
Daniel P. Berrange
<
berrange@redhat.com
>
上级
04ac20df
变更
4
显示空白变更内容
内联
并排
Showing
4 changed file
with
7 addition
and
7 deletion
+7
-7
configure.ac
configure.ac
+2
-2
src/Makefile.am
src/Makefile.am
+1
-1
src/node_device/node_device_driver.c
src/node_device/node_device_driver.c
+3
-3
src/node_device/node_device_driver.h
src/node_device/node_device_driver.h
+1
-1
未找到文件。
configure.ac
浏览文件 @
24120066
...
@@ -2291,11 +2291,11 @@ if test "x$with_hal" = "xyes" || test "x$with_hal" = "xcheck"; then
...
@@ -2291,11 +2291,11 @@ if test "x$with_hal" = "xyes" || test "x$with_hal" = "xcheck"; then
LIBS="$old_LIBS"
LIBS="$old_LIBS"
fi
fi
if test "x$with_hal" = "xyes" ; then
if test "x$with_hal" = "xyes" ; then
AC_DEFINE_UNQUOTED([
HAVE
_HAL], 1,
AC_DEFINE_UNQUOTED([
WITH
_HAL], 1,
[use HAL for host device enumeration])
[use HAL for host device enumeration])
fi
fi
fi
fi
AM_CONDITIONAL([
HAVE
_HAL], [test "x$with_hal" = "xyes"])
AM_CONDITIONAL([
WITH
_HAL], [test "x$with_hal" = "xyes"])
AC_SUBST([HAL_CFLAGS])
AC_SUBST([HAL_CFLAGS])
AC_SUBST([HAL_LIBS])
AC_SUBST([HAL_LIBS])
...
...
src/Makefile.am
浏览文件 @
24120066
...
@@ -1217,7 +1217,7 @@ libvirt_driver_nodedev_la_CFLAGS = \
...
@@ -1217,7 +1217,7 @@ libvirt_driver_nodedev_la_CFLAGS = \
libvirt_driver_nodedev_la_LDFLAGS
=
$(AM_LDFLAGS)
libvirt_driver_nodedev_la_LDFLAGS
=
$(AM_LDFLAGS)
libvirt_driver_nodedev_la_LIBADD
=
libvirt_driver_nodedev_la_LIBADD
=
if
HAVE
_HAL
if
WITH
_HAL
libvirt_driver_nodedev_la_SOURCES
+=
$(NODE_DEVICE_DRIVER_HAL_SOURCES)
libvirt_driver_nodedev_la_SOURCES
+=
$(NODE_DEVICE_DRIVER_HAL_SOURCES)
libvirt_driver_nodedev_la_CFLAGS
+=
$(HAL_CFLAGS)
libvirt_driver_nodedev_la_CFLAGS
+=
$(HAL_CFLAGS)
libvirt_driver_nodedev_la_LIBADD
+=
$(HAL_LIBS)
libvirt_driver_nodedev_la_LIBADD
+=
$(HAL_LIBS)
...
...
src/node_device/node_device_driver.c
浏览文件 @
24120066
...
@@ -58,7 +58,7 @@ static int update_caps(virNodeDeviceObjPtr dev)
...
@@ -58,7 +58,7 @@ static int update_caps(virNodeDeviceObjPtr dev)
}
}
#if defined (__linux__) && defined (
HAVE
_HAL)
#if defined (__linux__) && defined (
WITH
_HAL)
/* Under libudev changes to the driver name should be picked up as
/* Under libudev changes to the driver name should be picked up as
* "change" events, so we don't call update driver name unless we're
* "change" events, so we don't call update driver name unless we're
* using the HAL backend. */
* using the HAL backend. */
...
@@ -681,13 +681,13 @@ out:
...
@@ -681,13 +681,13 @@ out:
}
}
int
nodedevRegister
(
void
)
{
int
nodedevRegister
(
void
)
{
#if defined(
HAVE
_HAL) && defined(WITH_UDEV)
#if defined(
WITH
_HAL) && defined(WITH_UDEV)
/* Register only one of these two - they conflict */
/* Register only one of these two - they conflict */
if
(
udevNodeRegister
()
==
-
1
)
if
(
udevNodeRegister
()
==
-
1
)
return
halNodeRegister
();
return
halNodeRegister
();
return
0
;
return
0
;
#else
#else
# ifdef
HAVE
_HAL
# ifdef
WITH
_HAL
return
halNodeRegister
();
return
halNodeRegister
();
# endif
# endif
# ifdef WITH_UDEV
# ifdef WITH_UDEV
...
...
src/node_device/node_device_driver.h
浏览文件 @
24120066
...
@@ -39,7 +39,7 @@
...
@@ -39,7 +39,7 @@
# define LINUX_NEW_DEVICE_WAIT_TIME 60
# define LINUX_NEW_DEVICE_WAIT_TIME 60
# ifdef
HAVE
_HAL
# ifdef
WITH
_HAL
int
halNodeRegister
(
void
);
int
halNodeRegister
(
void
);
# endif
# endif
# ifdef WITH_UDEV
# ifdef WITH_UDEV
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录