Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
libvirt
提交
1556ced2
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,发现更多精彩内容 >>
提交
1556ced2
编写于
2月 21, 2011
作者:
M
Markus Groß
提交者:
Eric Blake
2月 21, 2011
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Moved XM parsing functions to xenxs
上级
2f2a88b9
变更
9
展开全部
显示空白变更内容
内联
并排
Showing
9 changed file
with
1058 addition
and
977 deletion
+1058
-977
po/POTFILES.in
po/POTFILES.in
+1
-0
src/Makefile.am
src/Makefile.am
+2
-1
src/xen/xen_driver.c
src/xen/xen_driver.c
+2
-1
src/xen/xm_internal.c
src/xen/xm_internal.c
+3
-973
src/xen/xm_internal.h
src/xen/xm_internal.h
+0
-1
src/xenxs/xen_xm.c
src/xenxs/xen_xm.c
+1010
-0
src/xenxs/xen_xm.h
src/xenxs/xen_xm.h
+36
-0
src/xenxs/xenxs_private.h
src/xenxs/xenxs_private.h
+2
-0
tests/xmconfigtest.c
tests/xmconfigtest.c
+2
-1
未找到文件。
po/POTFILES.in
浏览文件 @
1556ced2
...
@@ -120,6 +120,7 @@ src/xen/xs_internal.c
...
@@ -120,6 +120,7 @@ src/xen/xs_internal.c
src/xenapi/xenapi_driver.c
src/xenapi/xenapi_driver.c
src/xenapi/xenapi_utils.c
src/xenapi/xenapi_utils.c
src/xenxs/xen_sxpr.c
src/xenxs/xen_sxpr.c
src/xenxs/xen_xm.c
tools/console.c
tools/console.c
tools/libvirt-guests.init.sh
tools/libvirt-guests.init.sh
tools/virsh.c
tools/virsh.c
src/Makefile.am
浏览文件 @
1556ced2
...
@@ -425,7 +425,8 @@ VMX_SOURCES = \
...
@@ -425,7 +425,8 @@ VMX_SOURCES = \
XENXS_SOURCES
=
\
XENXS_SOURCES
=
\
xenxs/xenxs_private.h
\
xenxs/xenxs_private.h
\
xenxs/xen_sxpr.c xenxs/xen_sxpr.h
xenxs/xen_sxpr.c xenxs/xen_sxpr.h
\
xenxs/xen_xm.c xenxs/xen_xm.h
pkgdata_DATA
=
cpu/cpu_map.xml
pkgdata_DATA
=
cpu/cpu_map.xml
...
...
src/xen/xen_driver.c
浏览文件 @
1556ced2
...
@@ -34,6 +34,7 @@
...
@@ -34,6 +34,7 @@
#include "xen_driver.h"
#include "xen_driver.h"
#include "xen_sxpr.h"
#include "xen_sxpr.h"
#include "xen_xm.h"
#include "xen_hypervisor.h"
#include "xen_hypervisor.h"
#include "xend_internal.h"
#include "xend_internal.h"
#include "xs_internal.h"
#include "xs_internal.h"
...
@@ -1216,7 +1217,7 @@ xenUnifiedDomainXMLFromNative(virConnectPtr conn,
...
@@ -1216,7 +1217,7 @@ xenUnifiedDomainXMLFromNative(virConnectPtr conn,
if
(
!
conf
)
if
(
!
conf
)
goto
cleanup
;
goto
cleanup
;
def
=
xenXMDomainConfigParse
(
con
n
,
conf
);
def
=
xenXMDomainConfigParse
(
con
f
,
priv
->
xendConfigVersion
,
priv
->
caps
);
}
else
if
(
STREQ
(
format
,
XEN_CONFIG_FORMAT_SEXPR
))
{
}
else
if
(
STREQ
(
format
,
XEN_CONFIG_FORMAT_SEXPR
))
{
id
=
xenGetDomIdFromSxprString
(
config
,
priv
->
xendConfigVersion
);
id
=
xenGetDomIdFromSxprString
(
config
,
priv
->
xendConfigVersion
);
xenUnifiedLock
(
priv
);
xenUnifiedLock
(
priv
);
...
...
src/xen/xm_internal.c
浏览文件 @
1556ced2
此差异已折叠。
点击以展开。
src/xen/xm_internal.h
浏览文件 @
1556ced2
...
@@ -62,7 +62,6 @@ virDomainPtr xenXMDomainDefineXML(virConnectPtr con, const char *xml);
...
@@ -62,7 +62,6 @@ virDomainPtr xenXMDomainDefineXML(virConnectPtr con, const char *xml);
int
xenXMDomainUndefine
(
virDomainPtr
domain
);
int
xenXMDomainUndefine
(
virDomainPtr
domain
);
virConfPtr
xenXMDomainConfigFormat
(
virConnectPtr
conn
,
virDomainDefPtr
def
);
virConfPtr
xenXMDomainConfigFormat
(
virConnectPtr
conn
,
virDomainDefPtr
def
);
virDomainDefPtr
xenXMDomainConfigParse
(
virConnectPtr
conn
,
virConfPtr
conf
);
int
xenXMDomainBlockPeek
(
virDomainPtr
dom
,
const
char
*
path
,
unsigned
long
long
offset
,
size_t
size
,
void
*
buffer
);
int
xenXMDomainBlockPeek
(
virDomainPtr
dom
,
const
char
*
path
,
unsigned
long
long
offset
,
size_t
size
,
void
*
buffer
);
...
...
src/xenxs/xen_xm.c
0 → 100644
浏览文件 @
1556ced2
此差异已折叠。
点击以展开。
src/xenxs/xen_xm.h
0 → 100644
浏览文件 @
1556ced2
/*
* xen_xm.h: Xen XM parsing functions
*
* Copyright (C) 2011 Univention GmbH
* Copyright (C) 2006-2007, 2009-2010 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, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* Author: Daniel P. Berrange <berrange@redhat.com>
* Author: Markus Groß <gross@univention.de>
*/
#ifndef __VIR_XEN_XM_H__
# define __VIR_XEN_XM_H__
# include "internal.h"
# include "conf.h"
# include "domain_conf.h"
virDomainDefPtr
xenXMDomainConfigParse
(
virConfPtr
conf
,
int
xendConfigVersion
,
virCapsPtr
caps
);
#endif
/* __VIR_XEN_XM_H__ */
src/xenxs/xenxs_private.h
浏览文件 @
1556ced2
...
@@ -46,6 +46,8 @@
...
@@ -46,6 +46,8 @@
# define XEND_CONFIG_MIN_VERS_PVFB_NEWCONF 3
# define XEND_CONFIG_MIN_VERS_PVFB_NEWCONF 3
# endif
# endif
# define MIN_XEN_GUEST_SIZE 64
/* 64 megabytes */
# define VIR_FROM_THIS VIR_FROM_NONE
# define VIR_FROM_THIS VIR_FROM_NONE
# define XENXS_ERROR(code, ...) \
# define XENXS_ERROR(code, ...) \
...
...
tests/xmconfigtest.c
浏览文件 @
1556ced2
...
@@ -31,6 +31,7 @@
...
@@ -31,6 +31,7 @@
#include "datatypes.h"
#include "datatypes.h"
#include "xen/xen_driver.h"
#include "xen/xen_driver.h"
#include "xen/xm_internal.h"
#include "xen/xm_internal.h"
#include "xenxs/xen_xm.h"
#include "testutils.h"
#include "testutils.h"
#include "testutilsxen.h"
#include "testutilsxen.h"
#include "memory.h"
#include "memory.h"
...
@@ -127,7 +128,7 @@ static int testCompareFormatXML(const char *xmcfg, const char *xml,
...
@@ -127,7 +128,7 @@ static int testCompareFormatXML(const char *xmcfg, const char *xml,
if
(
!
(
conf
=
virConfReadMem
(
xmcfgPtr
,
strlen
(
xmcfgPtr
),
0
)))
if
(
!
(
conf
=
virConfReadMem
(
xmcfgPtr
,
strlen
(
xmcfgPtr
),
0
)))
goto
fail
;
goto
fail
;
if
(
!
(
def
=
xenXMDomainConfigParse
(
con
n
,
conf
)))
if
(
!
(
def
=
xenXMDomainConfigParse
(
con
f
,
priv
.
xendConfigVersion
,
priv
.
caps
)))
goto
fail
;
goto
fail
;
if
(
!
(
gotxml
=
virDomainDefFormat
(
def
,
VIR_DOMAIN_XML_SECURE
)))
if
(
!
(
gotxml
=
virDomainDefFormat
(
def
,
VIR_DOMAIN_XML_SECURE
)))
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录