Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
libvirt
提交
7db9ac82
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,发现更多精彩内容 >>
提交
7db9ac82
编写于
9月 20, 2012
作者:
D
Daniel P. Berrange
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Convert HAVE_LIBBLKID to WITH_BLKID
Signed-off-by:
N
Daniel P. Berrange
<
berrange@redhat.com
>
上级
f488ddf4
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
15 addition
and
15 deletion
+15
-15
configure.ac
configure.ac
+4
-4
src/Makefile.am
src/Makefile.am
+3
-3
src/lxc/lxc_container.c
src/lxc/lxc_container.c
+4
-4
src/storage/storage_backend_fs.c
src/storage/storage_backend_fs.c
+4
-4
未找到文件。
configure.ac
浏览文件 @
7db9ac82
...
...
@@ -108,7 +108,7 @@ LIBPCAP_REQUIRED="1.0.0"
LIBNL_REQUIRED="1.1"
LIBSSH2_REQUIRED="1.0"
LIBSSH2_TRANSPORT_REQUIRED="1.3"
LIB
BLKID_REQUIRED="2.17"
BLKID_REQUIRED="2.17"
FUSE_REQUIRED="2.8.6"
dnl Checks for C compiler.
...
...
@@ -2315,15 +2315,15 @@ AC_ARG_WITH([libblkid],
if test "x$with_libblkid" = "xyes" || test "x$with_libblkid" = "xcheck"; then
PKG_CHECK_MODULES([BLKID],
[blkid >= $
LIB
BLKID_REQUIRED],
[blkid >= $BLKID_REQUIRED],
[with_libblkid="yes"],
[with_libblkid="no"])
fi
if test "x$with_libblkid" = "xyes"; then
AC_DEFINE([
HAVE_LIB
BLKID], [1], [libblkid is present])
AC_DEFINE([
WITH_
BLKID], [1], [libblkid is present])
fi
AM_CONDITIONAL([
HAVE_LIB
BLKID], [test "x$with_libblkid" = "xyes"])
AM_CONDITIONAL([
WITH_
BLKID], [test "x$with_libblkid" = "xyes"])
if test $with_freebsd = yes; then
default_qemu_user=root
...
...
src/Makefile.am
浏览文件 @
7db9ac82
...
...
@@ -967,7 +967,7 @@ libvirt_driver_lxc_impl_la_CFLAGS = \
$(FUSE_CFLAGS)
\
-I
$(top_srcdir)
/src/conf
$(AM_CFLAGS)
libvirt_driver_lxc_impl_la_LIBADD
=
$(CAPNG_LIBS)
$(LIBNL_LIBS)
$(FUSE_LIBS)
if
HAVE_LIB
BLKID
if
WITH_
BLKID
libvirt_driver_lxc_impl_la_CFLAGS
+=
$(BLKID_CFLAGS)
libvirt_driver_lxc_impl_la_LIBADD
+=
$(BLKID_LIBS)
endif
...
...
@@ -1149,7 +1149,7 @@ endif
if
WITH_SECDRIVER_APPARMOR
libvirt_driver_storage_impl_la_LIBADD
+=
$(APPARMOR_LIBS)
endif
if
HAVE_LIB
BLKID
if
WITH_
BLKID
libvirt_driver_storage_impl_la_CFLAGS
+=
$(BLKID_CFLAGS)
libvirt_driver_storage_impl_la_LIBADD
+=
$(BLKID_LIBS)
endif
...
...
@@ -1922,7 +1922,7 @@ libvirt_lxc_CFLAGS = \
$(AM_CFLAGS)
\
$(LIBNL_CFLAGS)
\
$(FUSE_CFLAGS)
if
HAVE_LIB
BLKID
if
WITH_
BLKID
libvirt_lxc_CFLAGS
+=
$(BLKID_CFLAGS)
libvirt_lxc_LDADD
+=
$(BLKID_LIBS)
endif
...
...
src/lxc/lxc_container.c
浏览文件 @
7db9ac82
...
...
@@ -49,7 +49,7 @@
# include <cap-ng.h>
#endif
#if
HAVE_LIB
BLKID
#if
WITH_
BLKID
# include <blkid/blkid.h>
#endif
...
...
@@ -826,7 +826,7 @@ cleanup:
}
#ifdef
HAVE_LIB
BLKID
#ifdef
WITH_
BLKID
static
int
lxcContainerMountDetectFilesystem
(
const
char
*
src
,
char
**
type
)
{
...
...
@@ -897,7 +897,7 @@ cleanup:
blkid_free_probe
(
blkid
);
return
ret
;
}
#else
/* !
HAVE_LIB
BLKID */
#else
/* !
WITH_
BLKID */
static
int
lxcContainerMountDetectFilesystem
(
const
char
*
src
ATTRIBUTE_UNUSED
,
char
**
type
)
...
...
@@ -906,7 +906,7 @@ lxcContainerMountDetectFilesystem(const char *src ATTRIBUTE_UNUSED,
*
type
=
NULL
;
return
0
;
}
#endif
/* !
HAVE_LIB
BLKID */
#endif
/* !
WITH_
BLKID */
/*
* This functions attempts to do automatic detection of filesystem
...
...
src/storage/storage_backend_fs.c
浏览文件 @
7db9ac82
...
...
@@ -37,7 +37,7 @@
#include <libxml/tree.h>
#include <libxml/xpath.h>
#if
HAVE_LIB
BLKID
#if
WITH_
BLKID
# include <blkid/blkid.h>
#endif
...
...
@@ -540,7 +540,7 @@ virStorageBackendFileSystemStart(virConnectPtr conn ATTRIBUTE_UNUSED,
}
#endif
/* WITH_STORAGE_FS */
#if
HAVE_LIB
BLKID
#if
WITH_
BLKID
static
virStoragePoolProbeResult
virStorageBackendFileSystemProbe
(
const
char
*
device
,
const
char
*
format
)
{
...
...
@@ -611,7 +611,7 @@ error:
return
ret
;
}
#else
/* #if
HAVE_LIB
BLKID */
#else
/* #if
WITH_
BLKID */
static
virStoragePoolProbeResult
virStorageBackendFileSystemProbe
(
const
char
*
device
ATTRIBUTE_UNUSED
,
...
...
@@ -624,7 +624,7 @@ virStorageBackendFileSystemProbe(const char *device ATTRIBUTE_UNUSED,
return
FILESYSTEM_PROBE_ERROR
;
}
#endif
/* #if
HAVE_LIB
BLKID */
#endif
/* #if
WITH_
BLKID */
/* some platforms don't support mkfs */
#ifdef MKFS
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录