Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
libvirt
提交
8c6f5a54
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看板
提交
8c6f5a54
编写于
7月 25, 2008
作者:
D
Daniel P. Berrange
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Convert XenD XML->SEXPR conversion to new domain XML APIs
上级
5ee15074
变更
55
展开全部
隐藏空白更改
内联
并排
Showing
55 changed file
with
1222 addition
and
1854 deletion
+1222
-1854
ChangeLog
ChangeLog
+22
-1
proxy/Makefile.am
proxy/Makefile.am
+1
-1
proxy/libvirt_proxy.c
proxy/libvirt_proxy.c
+17
-9
src/domain_conf.c
src/domain_conf.c
+6
-0
src/xen_internal.c
src/xen_internal.c
+38
-26
src/xen_internal.h
src/xen_internal.h
+9
-5
src/xen_unified.c
src/xen_unified.c
+7
-1
src/xen_unified.h
src/xen_unified.h
+2
-0
src/xend_internal.c
src/xend_internal.c
+854
-117
src/xend_internal.h
src/xend_internal.h
+16
-17
src/xm_internal.c
src/xm_internal.c
+12
-10
src/xml.c
src/xml.c
+105
-1569
src/xml.h
src/xml.h
+8
-40
tests/Makefile.am
tests/Makefile.am
+1
-1
tests/testutilsxen.c
tests/testutilsxen.c
+53
-0
tests/testutilsxen.h
tests/testutilsxen.h
+5
-0
tests/xencapstest.c
tests/xencapstest.c
+10
-5
tests/xml2sexprdata/xml2sexpr-curmem.sexpr
tests/xml2sexprdata/xml2sexpr-curmem.sexpr
+1
-1
tests/xml2sexprdata/xml2sexpr-disk-block-shareable.sexpr
tests/xml2sexprdata/xml2sexpr-disk-block-shareable.sexpr
+1
-1
tests/xml2sexprdata/xml2sexpr-disk-block.sexpr
tests/xml2sexprdata/xml2sexpr-disk-block.sexpr
+1
-1
tests/xml2sexprdata/xml2sexpr-disk-drv-blkback.sexpr
tests/xml2sexprdata/xml2sexpr-disk-drv-blkback.sexpr
+1
-1
tests/xml2sexprdata/xml2sexpr-disk-drv-blktap-qcow.sexpr
tests/xml2sexprdata/xml2sexpr-disk-drv-blktap-qcow.sexpr
+1
-1
tests/xml2sexprdata/xml2sexpr-disk-drv-blktap-raw.sexpr
tests/xml2sexprdata/xml2sexpr-disk-drv-blktap-raw.sexpr
+1
-1
tests/xml2sexprdata/xml2sexpr-disk-drv-blktap.sexpr
tests/xml2sexprdata/xml2sexpr-disk-drv-blktap.sexpr
+1
-1
tests/xml2sexprdata/xml2sexpr-disk-drv-loop.sexpr
tests/xml2sexprdata/xml2sexpr-disk-drv-loop.sexpr
+1
-1
tests/xml2sexprdata/xml2sexpr-disk-file.sexpr
tests/xml2sexprdata/xml2sexpr-disk-file.sexpr
+1
-1
tests/xml2sexprdata/xml2sexpr-fv-kernel.sexpr
tests/xml2sexprdata/xml2sexpr-fv-kernel.sexpr
+1
-1
tests/xml2sexprdata/xml2sexpr-fv-localtime.sexpr
tests/xml2sexprdata/xml2sexpr-fv-localtime.sexpr
+1
-1
tests/xml2sexprdata/xml2sexpr-fv-parallel-tcp.sexpr
tests/xml2sexprdata/xml2sexpr-fv-parallel-tcp.sexpr
+1
-1
tests/xml2sexprdata/xml2sexpr-fv-serial-file.sexpr
tests/xml2sexprdata/xml2sexpr-fv-serial-file.sexpr
+1
-1
tests/xml2sexprdata/xml2sexpr-fv-serial-null.sexpr
tests/xml2sexprdata/xml2sexpr-fv-serial-null.sexpr
+1
-1
tests/xml2sexprdata/xml2sexpr-fv-serial-pipe.sexpr
tests/xml2sexprdata/xml2sexpr-fv-serial-pipe.sexpr
+1
-1
tests/xml2sexprdata/xml2sexpr-fv-serial-pty.sexpr
tests/xml2sexprdata/xml2sexpr-fv-serial-pty.sexpr
+1
-1
tests/xml2sexprdata/xml2sexpr-fv-serial-stdio.sexpr
tests/xml2sexprdata/xml2sexpr-fv-serial-stdio.sexpr
+1
-1
tests/xml2sexprdata/xml2sexpr-fv-serial-tcp-telnet.sexpr
tests/xml2sexprdata/xml2sexpr-fv-serial-tcp-telnet.sexpr
+1
-1
tests/xml2sexprdata/xml2sexpr-fv-serial-tcp.sexpr
tests/xml2sexprdata/xml2sexpr-fv-serial-tcp.sexpr
+1
-1
tests/xml2sexprdata/xml2sexpr-fv-serial-udp.sexpr
tests/xml2sexprdata/xml2sexpr-fv-serial-udp.sexpr
+1
-1
tests/xml2sexprdata/xml2sexpr-fv-serial-unix.sexpr
tests/xml2sexprdata/xml2sexpr-fv-serial-unix.sexpr
+1
-1
tests/xml2sexprdata/xml2sexpr-fv-sound.sexpr
tests/xml2sexprdata/xml2sexpr-fv-sound.sexpr
+1
-1
tests/xml2sexprdata/xml2sexpr-fv-usbmouse.sexpr
tests/xml2sexprdata/xml2sexpr-fv-usbmouse.sexpr
+1
-1
tests/xml2sexprdata/xml2sexpr-fv-usbtablet.sexpr
tests/xml2sexprdata/xml2sexpr-fv-usbtablet.sexpr
+1
-1
tests/xml2sexprdata/xml2sexpr-fv-utc.sexpr
tests/xml2sexprdata/xml2sexpr-fv-utc.sexpr
+1
-1
tests/xml2sexprdata/xml2sexpr-fv-v2.sexpr
tests/xml2sexprdata/xml2sexpr-fv-v2.sexpr
+1
-1
tests/xml2sexprdata/xml2sexpr-fv-vncunused.sexpr
tests/xml2sexprdata/xml2sexpr-fv-vncunused.sexpr
+1
-1
tests/xml2sexprdata/xml2sexpr-fv.sexpr
tests/xml2sexprdata/xml2sexpr-fv.sexpr
+1
-1
tests/xml2sexprdata/xml2sexpr-net-bridged.sexpr
tests/xml2sexprdata/xml2sexpr-net-bridged.sexpr
+1
-1
tests/xml2sexprdata/xml2sexpr-net-e1000.sexpr
tests/xml2sexprdata/xml2sexpr-net-e1000.sexpr
+1
-1
tests/xml2sexprdata/xml2sexpr-net-routed.sexpr
tests/xml2sexprdata/xml2sexpr-net-routed.sexpr
+1
-1
tests/xml2sexprdata/xml2sexpr-no-source-cdrom.sexpr
tests/xml2sexprdata/xml2sexpr-no-source-cdrom.sexpr
+1
-1
tests/xml2sexprdata/xml2sexpr-no-source-cdrom.xml
tests/xml2sexprdata/xml2sexpr-no-source-cdrom.xml
+1
-1
tests/xml2sexprdata/xml2sexpr-pv-bootloader.sexpr
tests/xml2sexprdata/xml2sexpr-pv-bootloader.sexpr
+1
-1
tests/xml2sexprdata/xml2sexpr-pv-vfb-new.sexpr
tests/xml2sexprdata/xml2sexpr-pv-vfb-new.sexpr
+1
-1
tests/xml2sexprdata/xml2sexpr-pv-vfb-orig.sexpr
tests/xml2sexprdata/xml2sexpr-pv-vfb-orig.sexpr
+1
-1
tests/xml2sexprdata/xml2sexpr-pv.sexpr
tests/xml2sexprdata/xml2sexpr-pv.sexpr
+1
-1
tests/xml2sexprtest.c
tests/xml2sexprtest.c
+19
-15
未找到文件。
ChangeLog
浏览文件 @
8c6f5a54
Fri Jul 25 14:00:27 BST 2008 Daniel P. Berrange <berrange@redhat.com>
Convert XenD XML->SEXPR conversion to new domain XML APIs
* proxy/Makefile.am: no longer need to link xml.c
* proxy/libvirt_proxy.c: Adapt to use new domain XML
API contract
* src/xen_internal.c, src/xen_internal.h: Don't pass a
connection object when building capabilities.
* src/xen_unified.c, src/xen_unified.h: Initialize
a virCapsPtr object when opening the connection
* src/xend_internal.c, src/xend_internal.h: Add code
for converting from XML to SEXPR.
* src/xml.h, src/xml.c: Remove code for generating SXPR
* src/xm_intenral.c: Adapt to new SXPR generation
* tests/xml2sexprdata/*: Update to match new ordering
for XML / SXPR generation
* tests/xencapstest.c, tests/xml2sexprtest.c: Fix up
to work with new internal APIs
* src/domain_conf.c: Back compat workaround for Xen
Fri Jul 25 14:35:47 CEST 2008 Daniel Veillard <veillard@redhat.com>
* python/generator.py: skip generation for virDomainBlockPeek and
...
...
@@ -5,7 +26,7 @@ Fri Jul 25 14:35:47 CEST 2008 Daniel Veillard <veillard@redhat.com>
Fri Jul 25 11:45:27 BST 2008 Daniel P. Berrange <berrange@redhat.com>
Convert XenD SEXPR->XML convesion to new domain XML APIs
Convert XenD SEXPR->XML conve
r
sion to new domain XML APIs
* proxy/Makefile.am: Link to domain XML formatting APIs
* src/domain_conf.c, src/domain_conf.h: Disable XML parsing
...
...
proxy/Makefile.am
浏览文件 @
8c6f5a54
...
...
@@ -11,7 +11,7 @@ libexec_PROGRAMS = libvirt_proxy
libvirt_proxy_SOURCES
=
libvirt_proxy.c @top_srcdir@/src/xend_internal.c
\
@top_srcdir@/src/xen_internal.c @top_srcdir@/src/virterror.c
\
@top_srcdir@/src/sexpr.c
@top_srcdir@/src/xml.c
\
@top_srcdir@/src/sexpr.c
\
@top_srcdir@/src/xs_internal.c @top_srcdir@/src/buf.c
\
@top_srcdir@/src/capabilities.c
\
@top_srcdir@/src/memory.c
\
...
...
proxy/libvirt_proxy.c
浏览文件 @
8c6f5a54
...
...
@@ -358,6 +358,7 @@ proxyWriteClientSocket(int nr, virProxyPacketPtr req) {
*/
static
int
proxyReadClientSocket
(
int
nr
)
{
virDomainDefPtr
def
;
virProxyFullPacket
request
;
virProxyPacketPtr
req
=
(
virProxyPacketPtr
)
&
request
;
int
ret
;
...
...
@@ -622,22 +623,29 @@ retry2:
* rather hard to get from that code path. So proxy
* users won't see CPU pinning (last NULL arg)
*/
xml
=
xenDaemonDomainDumpXMLByID
(
conn
,
request
.
data
.
arg
,
0
,
NULL
);
if
(
!
xml
)
{
def
=
xenDaemonDomainFetch
(
conn
,
request
.
data
.
arg
,
NULL
,
NULL
);
if
(
!
def
)
{
req
->
data
.
arg
=
-
1
;
req
->
len
=
sizeof
(
virProxyPacket
);
}
else
{
int
xmllen
=
strlen
(
xml
);
if
(
xmllen
>
(
int
)
sizeof
(
request
.
extra
.
str
)
)
{
req
->
data
.
arg
=
-
2
;
xml
=
virDomainDefFormat
(
conn
,
def
,
0
);
if
(
!
xml
)
{
req
->
data
.
arg
=
-
1
;
req
->
len
=
sizeof
(
virProxyPacket
);
}
else
{
req
->
data
.
arg
=
0
;
memmove
(
&
request
.
extra
.
str
[
0
],
xml
,
xmllen
);
req
->
len
=
sizeof
(
virProxyPacket
)
+
xmllen
;
int
xmllen
=
strlen
(
xml
);
if
(
xmllen
>
(
int
)
sizeof
(
request
.
extra
.
str
))
{
req
->
data
.
arg
=
-
2
;
req
->
len
=
sizeof
(
virProxyPacket
);
}
else
{
req
->
data
.
arg
=
0
;
memmove
(
&
request
.
extra
.
str
[
0
],
xml
,
xmllen
);
req
->
len
=
sizeof
(
virProxyPacket
)
+
xmllen
;
}
free
(
xml
);
}
free
(
xml
);
}
virDomainDefFree
(
def
);
break
;
case
VIR_PROXY_DOMAIN_OSTYPE
:
if
(
req
->
len
!=
sizeof
(
virProxyPacket
))
...
...
src/domain_conf.c
浏览文件 @
8c6f5a54
...
...
@@ -495,6 +495,12 @@ virDomainDiskDefParseXML(virConnectPtr conn,
(
xmlStrEqual
(
cur
->
name
,
BAD_CAST
"target"
)))
{
target
=
virXMLPropString
(
cur
,
"dev"
);
bus
=
virXMLPropString
(
cur
,
"bus"
);
/* HACK: Work around for compat with Xen
* driver in previous libvirt releases */
if
(
target
&&
STRPREFIX
(
target
,
"ioemu:"
))
memmove
(
target
,
target
+
6
,
strlen
(
target
)
-
5
);
}
else
if
((
driverName
==
NULL
)
&&
(
xmlStrEqual
(
cur
->
name
,
BAD_CAST
"driver"
)))
{
driverName
=
virXMLPropString
(
cur
,
"name"
);
...
...
src/xen_internal.c
浏览文件 @
8c6f5a54
...
...
@@ -2161,8 +2161,7 @@ struct guest_arch {
static
virCapsPtr
xenHypervisorBuildCapabilities
(
virConnectPtr
conn
,
const
char
*
hostmachine
,
xenHypervisorBuildCapabilities
(
const
char
*
hostmachine
,
int
host_pae
,
char
*
hvm_type
,
struct
guest_arch
*
guest_archs
,
...
...
@@ -2188,7 +2187,7 @@ xenHypervisorBuildCapabilities(virConnectPtr conn,
if
(
sys_interface_version
>=
4
)
{
if
(
xenDaemonNodeGetTopology
(
conn
,
caps
)
!=
0
)
{
if
(
xenDaemonNodeGetTopology
(
NULL
,
caps
)
!=
0
)
{
virCapabilitiesFree
(
caps
);
return
NULL
;
}
...
...
@@ -2273,10 +2272,9 @@ xenHypervisorBuildCapabilities(virConnectPtr conn,
*
* Return the capabilities of this hypervisor.
*/
char
*
xenHypervisorMakeCapabilitiesXML
(
virConnectPtr
conn
,
const
char
*
hostmachine
,
FILE
*
cpuinfo
,
FILE
*
capabilities
)
virCapsPtr
xenHypervisorMakeCapabilitiesInternal
(
const
char
*
hostmachine
,
FILE
*
cpuinfo
,
FILE
*
capabilities
)
{
char
line
[
1024
],
*
str
,
*
token
;
regmatch_t
subs
[
4
];
...
...
@@ -2287,10 +2285,6 @@ xenHypervisorMakeCapabilitiesXML(virConnectPtr conn,
int
host_pae
=
0
;
struct
guest_arch
guest_archs
[
32
];
int
nr_guest_archs
=
0
;
char
*
xml
;
virCapsPtr
caps
=
NULL
;
memset
(
guest_archs
,
0
,
sizeof
(
guest_archs
));
...
...
@@ -2412,35 +2406,30 @@ xenHypervisorMakeCapabilitiesXML(virConnectPtr conn,
}
}
if
((
caps
=
xenHypervisorBuildCapabilities
(
conn
,
hostmachine
,
if
((
caps
=
xenHypervisorBuildCapabilities
(
hostmachine
,
host_pae
,
hvm_type
,
guest_archs
,
nr_guest_archs
))
==
NULL
)
goto
no_memory
;
if
((
xml
=
virCapabilitiesFormatXML
(
caps
))
==
NULL
)
goto
no_memory
;
virCapabilitiesFree
(
caps
);
return
xml
;
return
caps
;
no_memory:
virXenError
(
conn
,
VIR_ERR_NO_MEMORY
,
__FUNCTION__
,
0
);
virXenError
(
NULL
,
VIR_ERR_NO_MEMORY
,
__FUNCTION__
,
0
);
virCapabilitiesFree
(
caps
);
return
NULL
;
}
/**
* xenHypervisorGetCapabilities:
* @conn: pointer to the connection block
* xenHypervisorMakeCapabilities:
*
* Return the capabilities of this hypervisor.
*/
char
*
xenHypervisor
GetCapabilities
(
virConnectPtr
conn
)
virCapsPtr
xenHypervisor
MakeCapabilities
(
void
)
{
char
*
xml
;
virCapsPtr
caps
;
FILE
*
cpuinfo
,
*
capabilities
;
struct
utsname
utsname
;
...
...
@@ -2450,7 +2439,7 @@ xenHypervisorGetCapabilities (virConnectPtr conn)
cpuinfo
=
fopen
(
"/proc/cpuinfo"
,
"r"
);
if
(
cpuinfo
==
NULL
)
{
if
(
errno
!=
ENOENT
)
{
virXenPerror
(
conn
,
"/proc/cpuinfo"
);
virXenPerror
(
NULL
,
"/proc/cpuinfo"
);
return
NULL
;
}
}
...
...
@@ -2459,21 +2448,44 @@ xenHypervisorGetCapabilities (virConnectPtr conn)
if
(
capabilities
==
NULL
)
{
if
(
errno
!=
ENOENT
)
{
fclose
(
cpuinfo
);
virXenPerror
(
conn
,
"/sys/hypervisor/properties/capabilities"
);
virXenPerror
(
NULL
,
"/sys/hypervisor/properties/capabilities"
);
return
NULL
;
}
}
xml
=
xenHypervisorMakeCapabilitiesXML
(
conn
,
utsname
.
machine
,
cpuinfo
,
capabilities
);
caps
=
xenHypervisorMakeCapabilitiesInternal
(
utsname
.
machine
,
cpuinfo
,
capabilities
);
if
(
cpuinfo
)
fclose
(
cpuinfo
);
if
(
capabilities
)
fclose
(
capabilities
);
return
caps
;
}
/**
* xenHypervisorGetCapabilities:
* @conn: pointer to the connection block
*
* Return the capabilities of this hypervisor.
*/
char
*
xenHypervisorGetCapabilities
(
virConnectPtr
conn
)
{
xenUnifiedPrivatePtr
priv
=
(
xenUnifiedPrivatePtr
)
conn
->
privateData
;
char
*
xml
;
if
(
!
(
xml
=
virCapabilitiesFormatXML
(
priv
->
caps
)))
{
virXenError
(
conn
,
VIR_ERR_NO_MEMORY
,
NULL
,
0
);
return
NULL
;
}
return
xml
;
}
/**
* xenHypervisorNumOfDomains:
* @conn: pointer to the connection block
...
...
src/xen_internal.h
浏览文件 @
8c6f5a54
...
...
@@ -15,9 +15,14 @@
extern
"C"
{
#endif
#include "internal.h"
#include "capabilities.h"
extern
struct
xenUnifiedDriver
xenHypervisorDriver
;
int
xenHypervisorInit
(
void
);
virCapsPtr
xenHypervisorMakeCapabilities
(
void
);
/* The following calls are made directly by the Xen proxy: */
virDomainPtr
...
...
@@ -36,11 +41,10 @@ int xenHypervisorOpen (virConnectPtr conn,
int
xenHypervisorClose
(
virConnectPtr
conn
);
int
xenHypervisorGetVersion
(
virConnectPtr
conn
,
unsigned
long
*
hvVer
);
char
*
xenHypervisorMakeCapabilitiesXML
(
virConnectPtr
conn
,
const
char
*
hostmachine
,
FILE
*
cpuinfo
,
FILE
*
capabilities
);
virCapsPtr
xenHypervisorMakeCapabilitiesInternal
(
const
char
*
hostmachine
,
FILE
*
cpuinfo
,
FILE
*
capabilities
);
char
*
xenHypervisorGetCapabilities
(
virConnectPtr
conn
);
unsigned
long
...
...
src/xen_unified.c
浏览文件 @
8c6f5a54
...
...
@@ -197,7 +197,7 @@ xenDomainUsedCpus(virDomainPtr dom)
}
}
}
res
=
vir
SaveCpuSe
t
(
dom
->
conn
,
cpulist
,
nb_cpu
);
res
=
vir
DomainCpuSetForma
t
(
dom
->
conn
,
cpulist
,
nb_cpu
);
}
done:
...
...
@@ -335,6 +335,11 @@ xenUnifiedOpen (virConnectPtr conn, xmlURIPtr uri, virConnectAuthPtr auth, int f
}
}
if
(
!
(
priv
->
caps
=
xenHypervisorMakeCapabilities
()))
{
DEBUG0
(
"Failed to make capabilities"
);
goto
fail
;
}
return
VIR_DRV_OPEN_SUCCESS
;
fail:
...
...
@@ -358,6 +363,7 @@ xenUnifiedClose (virConnectPtr conn)
GET_PRIVATE
(
conn
);
int
i
;
virCapabilitiesFree
(
priv
->
caps
);
for
(
i
=
0
;
i
<
XEN_UNIFIED_NR_DRIVERS
;
++
i
)
if
(
priv
->
opened
[
i
]
&&
drivers
[
i
]
->
close
)
(
void
)
drivers
[
i
]
->
close
(
conn
);
...
...
src/xen_unified.h
浏览文件 @
8c6f5a54
...
...
@@ -12,6 +12,7 @@
#define __VIR_XEN_UNIFIED_H__
#include "internal.h"
#include "capabilities.h"
#ifndef HAVE_WINSOCK2_H
#include <sys/un.h>
...
...
@@ -91,6 +92,7 @@ struct xenUnifiedDriver {
* low-level drivers access parts of this structure.
*/
struct
_xenUnifiedPrivate
{
virCapsPtr
caps
;
#ifdef WITH_XEN
int
handle
;
/* Xen hypervisor handle */
...
...
src/xend_internal.c
浏览文件 @
8c6f5a54
此差异已折叠。
点击以展开。
src/xend_internal.h
浏览文件 @
8c6f5a54
/*
*
libxend/xend.h -- Xend library
*
xend_internal.h
*
* Copyright (C) 2005,2006
*
* Anthony Liguori <aliguori@us.ibm.com>
* Daniel Veillard <veillard@redhat.com>
*
* Copyright 2006-2008 Red Hat
*
* This file is subject to the terms and conditions of the GNU Lesser General
* Public License. See the file COPYING in the main directory of this archive
* for more details.
*/
#ifndef _
LIBXEND_XEND
_H_
#define _
LIBXEND_XEND
_H_
#ifndef _
_XEND_INTERNAL
_H_
#define _
_XEND_INTERNAL
_H_
#include <sys/types.h>
#include <stdint.h>
#include <stdbool.h>
#include "
libvirt/libvirt
.h"
#include "
internal
.h"
#include "capabilities.h"
#include "domain_conf.h"
#include "buf.h"
...
...
@@ -84,15 +86,11 @@ int xenDaemonDomainLookupByID(virConnectPtr xend,
char
**
name
,
unsigned
char
*
uuid
);
char
*
xenDaemonDomainDumpXMLByID
(
virConnectPtr
xend
,
int
domid
,
int
flags
,
const
char
*
cpus
);
char
*
xenDaemonDomainDumpXMLByName
(
virConnectPtr
xend
,
const
char
*
name
,
int
flags
,
const
char
*
cpus
);
virDomainDefPtr
xenDaemonDomainFetch
(
virConnectPtr
xend
,
int
domid
,
const
char
*
name
,
const
char
*
cpus
);
int
xend_parse_sexp_desc_char
(
virConnectPtr
conn
,
virBufferPtr
buf
,
...
...
@@ -105,6 +103,10 @@ virDomainDefPtr
xenDaemonParseSxprString
(
virConnectPtr
conn
,
const
char
*
sexpr
,
int
xendConfigVersion
);
char
*
xenDaemonFormatSxpr
(
virConnectPtr
conn
,
virDomainDefPtr
def
,
int
xendConfigVersion
);
int
is_sound_model_valid
(
const
char
*
model
);
int
is_sound_model_conflict
(
const
char
*
model
,
const
char
*
soundstr
);
...
...
@@ -163,7 +165,4 @@ int xenDaemonDomainMigratePerform (virDomainPtr domain, const char *cookie, int
int
xenDaemonDomainBlockPeek
(
virDomainPtr
domain
,
const
char
*
path
,
unsigned
long
long
offset
,
size_t
size
,
void
*
buffer
);
#ifdef __cplusplus
}
#endif
#endif
#endif
/* __XEND_INTERNAL_H_ */
src/xm_internal.c
浏览文件 @
8c6f5a54
...
...
@@ -1475,29 +1475,31 @@ int xenXMDomainCreate(virDomainPtr domain) {
int
ret
;
unsigned
char
uuid
[
VIR_UUID_BUFLEN
];
xenUnifiedPrivatePtr
priv
;
if
((
domain
==
NULL
)
||
(
domain
->
conn
==
NULL
)
||
(
domain
->
name
==
NULL
))
{
xenXMError
((
domain
?
domain
->
conn
:
NULL
),
VIR_ERR_INVALID_ARG
,
__FUNCTION__
);
return
(
-
1
);
}
virDomainDefPtr
def
;
if
(
domain
->
id
!=
-
1
)
return
(
-
1
);
if
(
domain
->
conn
->
flags
&
VIR_CONNECT_RO
)
return
(
-
1
);
if
(
!
(
xml
=
xenXMDomainDumpXML
(
domain
,
0
)))
return
(
-
1
);
priv
=
(
xenUnifiedPrivatePtr
)
domain
->
conn
->
privateData
;
if
(
!
(
sexpr
=
virDomainParseXMLDesc
(
domain
->
conn
,
xml
,
NULL
,
priv
->
xendConfigVersion
)))
{
VIR_FREE
(
xml
);
if
(
!
(
def
=
virDomainDefParseString
(
domain
->
conn
,
priv
->
caps
,
xml
)))
{
xenXMError
(
domain
->
conn
,
VIR_ERR_XML_ERROR
,
_
(
"failed to parse domain description"
));
return
(
-
1
);
}
VIR_FREE
(
xml
);
if
(
!
(
sexpr
=
xenDaemonFormatSxpr
(
domain
->
conn
,
def
,
priv
->
xendConfigVersion
)))
{
virDomainDefFree
(
def
);
xenXMError
(
domain
->
conn
,
VIR_ERR_XML_ERROR
,
_
(
"failed to build sexpr"
));
return
(
-
1
);
}
virDomainDefFree
(
def
);
ret
=
xenDaemonDomainCreateLinux
(
domain
->
conn
,
sexpr
);
VIR_FREE
(
sexpr
);
if
(
ret
!=
0
)
{
...
...
src/xml.c
浏览文件 @
8c6f5a54
此差异已折叠。
点击以展开。
src/xml.h
浏览文件 @
8c6f5a54
...
...
@@ -5,16 +5,11 @@
#ifndef __VIR_XML_H__
#define __VIR_XML_H__
#include "libvirt/libvirt.h"
#include "internal.h"
#include "buf.h"
#include <libxml/parser.h>
#include <libxml/tree.h>
#include <libxml/xpath.h>
#ifdef __cplusplus
extern
"C"
{
#endif
int
virXPathBoolean
(
const
char
*
xpath
,
xmlXPathContextPtr
ctxt
);
...
...
@@ -44,43 +39,16 @@ int virXPathNodeSet (const char *xpath,
char
*
virXMLPropString
(
xmlNodePtr
node
,
const
char
*
name
);
char
*
virConvertCpuSet
(
virConnectPtr
conn
,
const
char
*
str
,
int
maxcpu
);
#if WITH_XEN || WITH_QEMU
int
virParseCpuSet
(
virConnectPtr
conn
,
const
char
**
str
,
char
sep
,
char
*
cpuset
,
int
maxcpu
);
char
*
virSaveCpuSet
(
virConnectPtr
conn
,
char
*
cpuset
,
int
maxcpu
);
#endif
#if WITH_XEN
char
*
virConvertCpuSet
(
virConnectPtr
conn
,
const
char
*
str
,
int
maxcpu
);
int
virDomainParseXMLOSDescHVMChar
(
virConnectPtr
conn
,
char
*
buf
,
size_t
buflen
,
xmlNodePtr
node
);
char
*
virDomainParseXMLDesc
(
virConnectPtr
conn
,
const
char
*
xmldesc
,
char
**
name
,
int
xendConfigVersion
);
char
*
virParseXMLDevice
(
virConnectPtr
conn
,
const
char
*
xmldesc
,
int
hvm
,
int
xendConfigVersion
);
int
virDomainXMLDevID
(
virDomainPtr
domain
,
const
char
*
xmldesc
,
char
*
class
,
char
*
ref
,
int
ref_len
);
char
*
virBuildSoundStringFromXML
(
virConnectPtr
conn
,
xmlXPathContextPtr
ctxt
);
#endif
#ifdef __cplusplus
}
#endif
/* __cplusplus */
int
virDomainParseXMLOSDescHVMChar
(
virConnectPtr
conn
,
char
*
buf
,
size_t
buflen
,
xmlNodePtr
node
);
#endif
/* __VIR_XML_H__ */
tests/Makefile.am
浏览文件 @
8c6f5a54
...
...
@@ -91,7 +91,7 @@ xmlrpctest_SOURCES = \
xmlrpctest_LDADD
=
$(LDADDS)
xml2sexprtest_SOURCES
=
\
xml2sexprtest.c
\
xml2sexprtest.c
testutilsxen.c testutilsxen.h
\
testutils.c testutils.h
xml2sexprtest_LDADD
=
$(LDADDS)
...
...
tests/testutilsxen.c
0 → 100644
浏览文件 @
8c6f5a54
#include <config.h>
#include <sys/utsname.h>
#include <stdlib.h>
#include "testutilsxen.h"
virCapsPtr
testXenCapsInit
(
void
)
{
struct
utsname
utsname
;
virCapsPtr
caps
;
virCapsGuestPtr
guest
;
static
const
char
*
const
x86_machines
[]
=
{
"xenfv"
};
static
const
char
*
const
xen_machines
[]
=
{
"xenpv"
};
uname
(
&
utsname
);
if
((
caps
=
virCapabilitiesNew
(
utsname
.
machine
,
0
,
0
))
==
NULL
)
return
NULL
;
if
((
guest
=
virCapabilitiesAddGuest
(
caps
,
"hvm"
,
"i686"
,
32
,
"/usr/lib/xen/bin/qemu-dm"
,
NULL
,
1
,
x86_machines
))
==
NULL
)
goto
cleanup
;
if
(
virCapabilitiesAddGuestDomain
(
guest
,
"xen"
,
NULL
,
NULL
,
0
,
NULL
)
==
NULL
)
goto
cleanup
;
if
((
guest
=
virCapabilitiesAddGuest
(
caps
,
"xen"
,
"i686"
,
32
,
"/usr/lib/xen/bin/qemu-dm"
,
NULL
,
1
,
xen_machines
))
==
NULL
)
goto
cleanup
;
if
(
virCapabilitiesAddGuestDomain
(
guest
,
"xen"
,
NULL
,
NULL
,
0
,
NULL
)
==
NULL
)
goto
cleanup
;
return
caps
;
cleanup:
virCapabilitiesFree
(
caps
);
return
NULL
;
}
tests/testutilsxen.h
0 → 100644
浏览文件 @
8c6f5a54
#include "capabilities.h"
virCapsPtr
testXenCapsInit
(
void
);
tests/xencapstest.c
浏览文件 @
8c6f5a54
...
...
@@ -25,6 +25,7 @@ static int testCompareFiles(const char *hostmachine,
char
*
expectxml
=
&
(
xmlData
[
0
]);
char
*
actualxml
=
NULL
;
FILE
*
fp1
=
NULL
,
*
fp2
=
NULL
;
virCapsPtr
caps
=
NULL
;
int
ret
=
-
1
;
...
...
@@ -40,16 +41,19 @@ static int testCompareFiles(const char *hostmachine,
abs_srcdir
,
capabilities_rel
);
if
(
virtTestLoadFile
(
xml
,
&
expectxml
,
MAX_FILE
)
<
0
)
goto
fail
;
goto
fail
;
if
(
!
(
fp1
=
fopen
(
cpuinfo
,
"r"
)))
goto
fail
;
goto
fail
;
if
(
!
(
fp2
=
fopen
(
capabilities
,
"r"
)))
goto
fail
;
goto
fail
;
if
(
!
(
actualxml
=
xenHypervisorMakeCapabilitiesXML
(
NULL
,
hostmachine
,
fp1
,
fp2
)))
goto
fail
;
if
(
!
(
caps
=
xenHypervisorMakeCapabilitiesInternal
(
hostmachine
,
fp1
,
fp2
)))
goto
fail
;
if
(
!
(
actualxml
=
virCapabilitiesFormatXML
(
caps
)))
goto
fail
;
if
(
STRNEQ
(
expectxml
,
actualxml
))
{
virtTestDifference
(
stderr
,
expectxml
,
actualxml
);
...
...
@@ -66,6 +70,7 @@ static int testCompareFiles(const char *hostmachine,
if
(
fp2
)
fclose
(
fp2
);
virCapabilitiesFree
(
caps
);
return
ret
;
}
...
...
tests/xml2sexprdata/xml2sexpr-curmem.sexpr
浏览文件 @
8c6f5a54
(vm (name 'rhel5')(memory 175)(maxmem 385)(vcpus 1)(uuid '4f77abd2301958e83bab6fbf2118f880')(bootloader '/usr/bin/pygrub')(on_poweroff 'destroy')(on_reboot 'restart')(on_crash 'restart')(device (tap (dev 'xvda:disk')(uname 'tap:aio:/xen/rhel5.img')(mode 'w')))(device (vif (mac '00:16:3e:1d:06:15')(bridge 'xenbr0')(script 'vif-bridge'))))
\ No newline at end of file
(vm (name 'rhel5')(memory 175)(maxmem 385)(vcpus 1)(uuid '4f77abd2-3019-58e8-3bab-6fbf2118f880')(bootloader '/usr/bin/pygrub')(on_poweroff 'destroy')(on_reboot 'restart')(on_crash 'restart')(device (tap (dev 'xvda:disk')(uname 'tap:aio:/xen/rhel5.img')(mode 'w')))(device (vif (mac '00:16:3e:1d:06:15')(bridge 'xenbr0')(script 'vif-bridge'))))
\ No newline at end of file
tests/xml2sexprdata/xml2sexpr-disk-block-shareable.sexpr
浏览文件 @
8c6f5a54
(vm (name 'pvtest')(memory 384)(maxmem 512)(vcpus 1)(uuid '49a0c6ffc066539264983632d093c2e7')(bootloader '/usr/bin/pygrub')(on_poweroff 'destroy')(on_reboot 'restart')(on_crash 'restart')(device (tap (dev 'xvda')(uname 'tap:aio:/var/lib/xen/images/rhel5pv.img')(mode 'w!')))(device (vif (mac '00:16:3e:23:9e:eb')(bridge 'xenbr0')(script 'vif-bridge'))))
\ No newline at end of file
(vm (name 'pvtest')(memory 384)(maxmem 512)(vcpus 1)(uuid '49a0c6ff-c066-5392-6498-3632d093c2e7')(bootloader '/usr/bin/pygrub')(on_poweroff 'destroy')(on_reboot 'restart')(on_crash 'restart')(device (tap (dev 'xvda')(uname 'tap:aio:/var/lib/xen/images/rhel5pv.img')(mode 'w!')))(device (vif (mac '00:16:3e:23:9e:eb')(bridge 'xenbr0')(script 'vif-bridge'))))
\ No newline at end of file
tests/xml2sexprdata/xml2sexpr-disk-block.sexpr
浏览文件 @
8c6f5a54
(vm (name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)(uuid '596a5d2171f48fb2e068e2386a5c413e')(on_poweroff 'destroy')(on_reboot 'destroy')(on_crash 'destroy')(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5.91/x86_64/os ')))(device (vbd (dev 'xvda')(uname 'phy:/dev/MainVG/GuestLV')(mode 'w'))))
\ No newline at end of file
(vm (name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)(uuid '596a5d21-71f4-8fb2-e068-e2386a5c413e')(on_poweroff 'destroy')(on_reboot 'destroy')(on_crash 'destroy')(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5.91/x86_64/os ')))(device (vbd (dev 'xvda')(uname 'phy:/dev/MainVG/GuestLV')(mode 'w'))))
\ No newline at end of file
tests/xml2sexprdata/xml2sexpr-disk-drv-blkback.sexpr
浏览文件 @
8c6f5a54
(vm (name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)(uuid '596a5d2171f48fb2e068e2386a5c413e')(on_poweroff 'destroy')(on_reboot 'destroy')(on_crash 'destroy')(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5.91/x86_64/os ')))(device (vbd (dev 'xvda')(uname 'phy:/dev/MainVG/GuestLV')(mode 'w'))))
\ No newline at end of file
(vm (name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)(uuid '596a5d21-71f4-8fb2-e068-e2386a5c413e')(on_poweroff 'destroy')(on_reboot 'destroy')(on_crash 'destroy')(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5.91/x86_64/os ')))(device (vbd (dev 'xvda')(uname 'phy:/dev/MainVG/GuestLV')(mode 'w'))))
\ No newline at end of file
tests/xml2sexprdata/xml2sexpr-disk-drv-blktap-qcow.sexpr
浏览文件 @
8c6f5a54
(vm (name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)(uuid '596a5d2171f48fb2e068e2386a5c413e')(on_poweroff 'destroy')(on_reboot 'destroy')(on_crash 'destroy')(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5.91/x86_64/os ')))(device (tap (dev 'xvda')(uname 'tap:qcow:/root/some.img')(mode 'w'))))
\ No newline at end of file
(vm (name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)(uuid '596a5d21-71f4-8fb2-e068-e2386a5c413e')(on_poweroff 'destroy')(on_reboot 'destroy')(on_crash 'destroy')(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5.91/x86_64/os ')))(device (tap (dev 'xvda')(uname 'tap:qcow:/root/some.img')(mode 'w'))))
\ No newline at end of file
tests/xml2sexprdata/xml2sexpr-disk-drv-blktap-raw.sexpr
浏览文件 @
8c6f5a54
(vm (name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)(uuid '596a5d2171f48fb2e068e2386a5c413e')(on_poweroff 'destroy')(on_reboot 'destroy')(on_crash 'destroy')(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5.91/x86_64/os ')))(device (tap (dev 'xvda')(uname 'tap:aio:/root/some.img')(mode 'w'))))
\ No newline at end of file
(vm (name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)(uuid '596a5d21-71f4-8fb2-e068-e2386a5c413e')(on_poweroff 'destroy')(on_reboot 'destroy')(on_crash 'destroy')(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5.91/x86_64/os ')))(device (tap (dev 'xvda')(uname 'tap:aio:/root/some.img')(mode 'w'))))
\ No newline at end of file
tests/xml2sexprdata/xml2sexpr-disk-drv-blktap.sexpr
浏览文件 @
8c6f5a54
(vm (name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)(uuid '596a5d2171f48fb2e068e2386a5c413e')(on_poweroff 'destroy')(on_reboot 'destroy')(on_crash 'destroy')(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5.91/x86_64/os ')))(device (tap (dev 'xvda')(uname 'tap:aio:/root/some.img')(mode 'w'))))
\ No newline at end of file
(vm (name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)(uuid '596a5d21-71f4-8fb2-e068-e2386a5c413e')(on_poweroff 'destroy')(on_reboot 'destroy')(on_crash 'destroy')(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5.91/x86_64/os ')))(device (tap (dev 'xvda')(uname 'tap:aio:/root/some.img')(mode 'w'))))
\ No newline at end of file
tests/xml2sexprdata/xml2sexpr-disk-drv-loop.sexpr
浏览文件 @
8c6f5a54
(vm (name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)(uuid '596a5d2171f48fb2e068e2386a5c413e')(on_poweroff 'destroy')(on_reboot 'destroy')(on_crash 'destroy')(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5.91/x86_64/os ')))(device (vbd (dev 'xvda')(uname 'file:/root/some.img')(mode 'w'))))
\ No newline at end of file
(vm (name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)(uuid '596a5d21-71f4-8fb2-e068-e2386a5c413e')(on_poweroff 'destroy')(on_reboot 'destroy')(on_crash 'destroy')(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5.91/x86_64/os ')))(device (vbd (dev 'xvda')(uname 'file:/root/some.img')(mode 'w'))))
\ No newline at end of file
tests/xml2sexprdata/xml2sexpr-disk-file.sexpr
浏览文件 @
8c6f5a54
(vm (name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)(uuid '596a5d2171f48fb2e068e2386a5c413e')(on_poweroff 'destroy')(on_reboot 'destroy')(on_crash 'destroy')(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5.91/x86_64/os ')))(device (vbd (dev 'xvda')(uname 'file:/root/some.img')(mode 'w'))))
\ No newline at end of file
(vm (name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)(uuid '596a5d21-71f4-8fb2-e068-e2386a5c413e')(on_poweroff 'destroy')(on_reboot 'destroy')(on_crash 'destroy')(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5.91/x86_64/os ')))(device (vbd (dev 'xvda')(uname 'file:/root/some.img')(mode 'w'))))
\ No newline at end of file
tests/xml2sexprdata/xml2sexpr-fv-kernel.sexpr
浏览文件 @
8c6f5a54
(vm (name 'fvtest')(memory 420)(maxmem 420)(vcpus 2)(uuid '596a5d2171f48fb2e068e2386a5c413e')(on_poweroff 'destroy')(on_reboot 'destroy')(on_crash 'destroy')(image (hvm (kernel '/var/lib/xen/vmlinuz.2Dn2YT')(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5.91/x86_64/os ')(loader '/usr/lib/xen/boot/hvmloader')(vcpus 2)(boot c)(usb 1)(parallel none)(serial pty)))(device (vbd (dev 'ioemu:xvda')(uname 'file:/root/some.img')(mode 'w'))))
\ No newline at end of file
(vm (name 'fvtest')(memory 420)(maxmem 420)(vcpus 2)(uuid '596a5d21-71f4-8fb2-e068-e2386a5c413e')(on_poweroff 'destroy')(on_reboot 'destroy')(on_crash 'destroy')(image (hvm (kernel '/var/lib/xen/vmlinuz.2Dn2YT')(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5.91/x86_64/os ')(loader '/usr/lib/xen/boot/hvmloader')(vcpus 2)(boot c)(usb 1)(parallel none)(serial pty)(device_model '/usr/lib/xen/bin/qemu-dm')))(device (vbd (dev 'ioemu:xvda')(uname 'file:/root/some.img')(mode 'w'))))
\ No newline at end of file
tests/xml2sexprdata/xml2sexpr-fv-localtime.sexpr
浏览文件 @
8c6f5a54
(vm (name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)(uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')(on_reboot 'restart')(on_crash 'restart')(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)(cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)(serial none)(localtime 1)(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')(type ioemu))))
\ No newline at end of file
(vm (name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)(uuid 'b5d70dd2-75cd-aca5-1776-9660b059d8bc')(on_poweroff 'destroy')(on_reboot 'restart')(on_crash 'restart')(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)(cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)(serial none)(localtime 1)(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')(type ioemu))))
\ No newline at end of file
tests/xml2sexprdata/xml2sexpr-fv-parallel-tcp.sexpr
浏览文件 @
8c6f5a54
(vm (name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)(uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')(on_reboot 'restart')(on_crash 'restart')(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)(cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel tcp:localhost:9999)(serial none)(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')(type ioemu))))
\ No newline at end of file
(vm (name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)(uuid 'b5d70dd2-75cd-aca5-1776-9660b059d8bc')(on_poweroff 'destroy')(on_reboot 'restart')(on_crash 'restart')(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)(cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel tcp:localhost:9999)(serial none)(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')(type ioemu))))
\ No newline at end of file
tests/xml2sexprdata/xml2sexpr-fv-serial-file.sexpr
浏览文件 @
8c6f5a54
(vm (name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)(uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')(on_reboot 'restart')(on_crash 'restart')(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)(cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)(serial file:/tmp/serial.log)(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')(type ioemu))))
\ No newline at end of file
(vm (name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)(uuid 'b5d70dd2-75cd-aca5-1776-9660b059d8bc')(on_poweroff 'destroy')(on_reboot 'restart')(on_crash 'restart')(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)(cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)(serial file:/tmp/serial.log)(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')(type ioemu))))
\ No newline at end of file
tests/xml2sexprdata/xml2sexpr-fv-serial-null.sexpr
浏览文件 @
8c6f5a54
(vm (name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)(uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')(on_reboot 'restart')(on_crash 'restart')(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)(cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)(serial null)(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')(type ioemu))))
\ No newline at end of file
(vm (name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)(uuid 'b5d70dd2-75cd-aca5-1776-9660b059d8bc')(on_poweroff 'destroy')(on_reboot 'restart')(on_crash 'restart')(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)(cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)(serial null)(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')(type ioemu))))
\ No newline at end of file
tests/xml2sexprdata/xml2sexpr-fv-serial-pipe.sexpr
浏览文件 @
8c6f5a54
(vm (name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)(uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')(on_reboot 'restart')(on_crash 'restart')(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)(cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)(serial pipe:/tmp/serial.pipe)(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')(type ioemu))))
\ No newline at end of file
(vm (name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)(uuid 'b5d70dd2-75cd-aca5-1776-9660b059d8bc')(on_poweroff 'destroy')(on_reboot 'restart')(on_crash 'restart')(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)(cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)(serial pipe:/tmp/serial.pipe)(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')(type ioemu))))
\ No newline at end of file
tests/xml2sexprdata/xml2sexpr-fv-serial-pty.sexpr
浏览文件 @
8c6f5a54
(vm (name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)(uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')(on_reboot 'restart')(on_crash 'restart')(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)(cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)(serial pty)(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')(type ioemu))))
\ No newline at end of file
(vm (name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)(uuid 'b5d70dd2-75cd-aca5-1776-9660b059d8bc')(on_poweroff 'destroy')(on_reboot 'restart')(on_crash 'restart')(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)(cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)(serial pty)(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')(type ioemu))))
\ No newline at end of file
tests/xml2sexprdata/xml2sexpr-fv-serial-stdio.sexpr
浏览文件 @
8c6f5a54
(vm (name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)(uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')(on_reboot 'restart')(on_crash 'restart')(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)(cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)(serial stdio)(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')(type ioemu))))
\ No newline at end of file
(vm (name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)(uuid 'b5d70dd2-75cd-aca5-1776-9660b059d8bc')(on_poweroff 'destroy')(on_reboot 'restart')(on_crash 'restart')(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)(cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)(serial stdio)(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')(type ioemu))))
\ No newline at end of file
tests/xml2sexprdata/xml2sexpr-fv-serial-tcp-telnet.sexpr
浏览文件 @
8c6f5a54
(vm (name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)(uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')(on_reboot 'restart')(on_crash 'restart')(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)(cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)(serial telnet:localhost:9999,listen)(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')(type ioemu))))
\ No newline at end of file
(vm (name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)(uuid 'b5d70dd2-75cd-aca5-1776-9660b059d8bc')(on_poweroff 'destroy')(on_reboot 'restart')(on_crash 'restart')(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)(cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)(serial telnet:localhost:9999,listen)(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')(type ioemu))))
\ No newline at end of file
tests/xml2sexprdata/xml2sexpr-fv-serial-tcp.sexpr
浏览文件 @
8c6f5a54
(vm (name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)(uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')(on_reboot 'restart')(on_crash 'restart')(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)(cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)(serial tcp:localhost:9999,listen)(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')(type ioemu))))
\ No newline at end of file
(vm (name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)(uuid 'b5d70dd2-75cd-aca5-1776-9660b059d8bc')(on_poweroff 'destroy')(on_reboot 'restart')(on_crash 'restart')(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)(cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)(serial tcp:localhost:9999,listen)(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')(type ioemu))))
\ No newline at end of file
tests/xml2sexprdata/xml2sexpr-fv-serial-udp.sexpr
浏览文件 @
8c6f5a54
(vm (name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)(uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')(on_reboot 'restart')(on_crash 'restart')(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)(cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)(serial udp:localhost:9998@localhost:9999)(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')(type ioemu))))
\ No newline at end of file
(vm (name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)(uuid 'b5d70dd2-75cd-aca5-1776-9660b059d8bc')(on_poweroff 'destroy')(on_reboot 'restart')(on_crash 'restart')(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)(cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)(serial udp:localhost:9998@localhost:9999)(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')(type ioemu))))
\ No newline at end of file
tests/xml2sexprdata/xml2sexpr-fv-serial-unix.sexpr
浏览文件 @
8c6f5a54
(vm (name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)(uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')(on_reboot 'restart')(on_crash 'restart')(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)(cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)(serial unix:/tmp/serial.sock,listen)(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')(type ioemu))))
\ No newline at end of file
(vm (name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)(uuid 'b5d70dd2-75cd-aca5-1776-9660b059d8bc')(on_poweroff 'destroy')(on_reboot 'restart')(on_crash 'restart')(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)(cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)(serial unix:/tmp/serial.sock,listen)(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')(type ioemu))))
\ No newline at end of file
tests/xml2sexprdata/xml2sexpr-fv-sound.sexpr
浏览文件 @
8c6f5a54
(vm (name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)(uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')(on_reboot 'restart')(on_crash 'restart')(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)(cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)(serial none)(soundhw 'sb16,es1370')(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')(type ioemu))))
\ No newline at end of file
(vm (name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)(uuid 'b5d70dd2-75cd-aca5-1776-9660b059d8bc')(on_poweroff 'destroy')(on_reboot 'restart')(on_crash 'restart')(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)(cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)(serial none)(soundhw 'sb16,es1370')(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')(type ioemu))))
\ No newline at end of file
tests/xml2sexprdata/xml2sexpr-fv-usbmouse.sexpr
浏览文件 @
8c6f5a54
(vm (name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)(uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')(on_reboot 'restart')(on_crash 'restart')(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)(cdrom '/root/boot.iso')(acpi 1)(usb 1)(usbdevice mouse)(parallel none)(serial none)(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')(type ioemu))))
\ No newline at end of file
(vm (name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)(uuid 'b5d70dd2-75cd-aca5-1776-9660b059d8bc')(on_poweroff 'destroy')(on_reboot 'restart')(on_crash 'restart')(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)(cdrom '/root/boot.iso')(acpi 1)(usb 1)(usbdevice mouse)(parallel none)(serial none)(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')(type ioemu))))
\ No newline at end of file
tests/xml2sexprdata/xml2sexpr-fv-usbtablet.sexpr
浏览文件 @
8c6f5a54
(vm (name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)(uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')(on_reboot 'restart')(on_crash 'restart')(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)(cdrom '/root/boot.iso')(acpi 1)(usb 1)(usbdevice tablet)(parallel none)(serial none)(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')(type ioemu))))
\ No newline at end of file
(vm (name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)(uuid 'b5d70dd2-75cd-aca5-1776-9660b059d8bc')(on_poweroff 'destroy')(on_reboot 'restart')(on_crash 'restart')(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)(cdrom '/root/boot.iso')(acpi 1)(usb 1)(usbdevice tablet)(parallel none)(serial none)(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')(type ioemu))))
\ No newline at end of file
tests/xml2sexprdata/xml2sexpr-fv-utc.sexpr
浏览文件 @
8c6f5a54
(vm (name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)(uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')(on_reboot 'restart')(on_crash 'restart')(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)(cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)(serial none)(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')(type ioemu))))
\ No newline at end of file
(vm (name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)(uuid 'b5d70dd2-75cd-aca5-1776-9660b059d8bc')(on_poweroff 'destroy')(on_reboot 'restart')(on_crash 'restart')(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)(cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)(serial none)(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')(type ioemu))))
\ No newline at end of file
tests/xml2sexprdata/xml2sexpr-fv-v2.sexpr
浏览文件 @
8c6f5a54
(vm (name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)(uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')(on_reboot 'restart')(on_crash 'restart')(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)(acpi 1)(usb 1)(parallel none)(serial none)(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)(vncdisplay 17)(keymap ja)))(device (vbd (dev 'hdc:cdrom')(uname 'file:/root/boot.iso')(mode 'r')))(device (vbd (dev 'hda:disk')(uname 'file:/root/foo.img')(mode 'w')))(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')(type ioemu))))
\ No newline at end of file
(vm (name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)(uuid 'b5d70dd2-75cd-aca5-1776-9660b059d8bc')(on_poweroff 'destroy')(on_reboot 'restart')(on_crash 'restart')(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)(acpi 1)(usb 1)(parallel none)(serial none)(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)(vncunused 0)(vncdisplay 17)(keymap 'ja')))(device (vbd (dev 'hdc:cdrom')(uname 'file:/root/boot.iso')(mode 'r')))(device (vbd (dev 'hda:disk')(uname 'file:/root/foo.img')(mode 'w')))(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')(type ioemu))))
\ No newline at end of file
tests/xml2sexprdata/xml2sexpr-fv-vncunused.sexpr
浏览文件 @
8c6f5a54
(vm (name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)(uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')(on_reboot 'restart')(on_crash 'restart')(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)(acpi 1)(usb 1)(parallel none)(serial none)(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)(vncunused 1)(keymap ja)))(device (vbd (dev 'hdc:cdrom')(uname 'file:/root/boot.iso')(mode 'r')))(device (vbd (dev 'hda:disk')(uname 'file:/root/foo.img')(mode 'w')))(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')(type ioemu))))
\ No newline at end of file
(vm (name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)(uuid 'b5d70dd2-75cd-aca5-1776-9660b059d8bc')(on_poweroff 'destroy')(on_reboot 'restart')(on_crash 'restart')(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)(acpi 1)(usb 1)(parallel none)(serial none)(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)(vncunused 1)(keymap 'ja')))(device (vbd (dev 'hdc:cdrom')(uname 'file:/root/boot.iso')(mode 'r')))(device (vbd (dev 'hda:disk')(uname 'file:/root/foo.img')(mode 'w')))(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')(type ioemu))))
\ No newline at end of file
tests/xml2sexprdata/xml2sexpr-fv.sexpr
浏览文件 @
8c6f5a54
(vm (name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)(uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')(on_reboot 'restart')(on_crash 'restart')(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)(cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)(serial none)(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')(type ioemu))))
\ No newline at end of file
(vm (name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)(uuid 'b5d70dd2-75cd-aca5-1776-9660b059d8bc')(on_poweroff 'destroy')(on_reboot 'restart')(on_crash 'restart')(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)(cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)(serial none)(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')(type ioemu))))
\ No newline at end of file
tests/xml2sexprdata/xml2sexpr-net-bridged.sexpr
浏览文件 @
8c6f5a54
(vm (name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)(uuid '596a5d2171f48fb2e068e2386a5c413e')(on_poweroff 'destroy')(on_reboot 'destroy')(on_crash 'destroy')(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5.91/x86_64/os ')))(device (vbd (dev 'xvda')(uname 'file:/root/some.img')(mode 'w')))(device (vif (mac '00:11:22:33:44:55')(bridge 'xenbr2')(script 'vif-bridge'))))
\ No newline at end of file
(vm (name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)(uuid '596a5d21-71f4-8fb2-e068-e2386a5c413e')(on_poweroff 'destroy')(on_reboot 'destroy')(on_crash 'destroy')(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5.91/x86_64/os ')))(device (vbd (dev 'xvda')(uname 'file:/root/some.img')(mode 'w')))(device (vif (mac '00:11:22:33:44:55')(bridge 'xenbr2')(script 'vif-bridge'))))
\ No newline at end of file
tests/xml2sexprdata/xml2sexpr-net-e1000.sexpr
浏览文件 @
8c6f5a54
(vm (name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)(uuid '596a5d2171f48fb2e068e2386a5c413e')(on_poweroff 'destroy')(on_reboot 'destroy')(on_crash 'destroy')(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5.91/x86_64/os ')))(device (vbd (dev 'xvda')(uname 'file:/root/some.img')(mode 'w')))(device (vif (mac '00:11:22:33:44:55')(bridge 'xenbr2')(script 'vif-bridge')(model 'e1000'))))
\ No newline at end of file
(vm (name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)(uuid '596a5d21-71f4-8fb2-e068-e2386a5c413e')(on_poweroff 'destroy')(on_reboot 'destroy')(on_crash 'destroy')(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5.91/x86_64/os ')))(device (vbd (dev 'xvda')(uname 'file:/root/some.img')(mode 'w')))(device (vif (mac '00:11:22:33:44:55')(bridge 'xenbr2')(script 'vif-bridge')(model 'e1000'))))
\ No newline at end of file
tests/xml2sexprdata/xml2sexpr-net-routed.sexpr
浏览文件 @
8c6f5a54
(vm (name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)(uuid '596a5d2171f48fb2e068e2386a5c413e')(on_poweroff 'destroy')(on_reboot 'destroy')(on_crash 'destroy')(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5.91/x86_64/os ')))(device (vbd (dev 'xvda')(uname 'file:/root/some.img')(mode 'w')))(device (vif (mac '00:11:22:33:44:55')(dev 'eth3')(script 'vif-routed')(ip '172.14.5.6'))))
\ No newline at end of file
(vm (name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)(uuid '596a5d21-71f4-8fb2-e068-e2386a5c413e')(on_poweroff 'destroy')(on_reboot 'destroy')(on_crash 'destroy')(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5.91/x86_64/os ')))(device (vbd (dev 'xvda')(uname 'file:/root/some.img')(mode 'w')))(device (vif (mac '00:11:22:33:44:55')(script 'vif-routed')(ip '172.14.5.6'))))
\ No newline at end of file
tests/xml2sexprdata/xml2sexpr-no-source-cdrom.sexpr
浏览文件 @
8c6f5a54
(vm (name 'test')(memory 350)(maxmem 382)(vcpus 1)(uuid 'cc2315e7d26a307a438c6d188ec4c09c')(on_poweroff 'destroy')(on_reboot 'destroy')(on_crash 'destroy')(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)(acpi 1)(apic 1)(pae 1)(usb 1)(parallel none)(serial none)(device_model '/usr/lib/xen/bin/qemu-dm')(vnc 1)(vncdisplay 6)))(device (vbd (dev 'hda:disk:disk')(uname 'phy:/dev/sda8')(mode 'w')))(device (vbd (dev 'hdc:cdrom')(mode 'r')))(device (vif (mac '00:16:3e:0a:7b:39')(type ioemu))))
\ No newline at end of file
(vm (name 'test')(memory 350)(maxmem 382)(vcpus 1)(uuid 'cc2315e7-d26a-307a-438c-6d188ec4c09c')(on_poweroff 'destroy')(on_reboot 'destroy')(on_crash 'destroy')(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)(acpi 1)(apic 1)(pae 1)(usb 1)(parallel none)(serial none)(device_model '/usr/lib/xen/bin/qemu-dm')(vnc 1)(vncunused 0)(vncdisplay 6)))(device (vbd (dev 'hda:disk')(uname 'phy:/dev/sda8')(mode 'w')))(device (vbd (dev 'hdc:cdrom')(mode 'r')))(device (vif (mac '00:16:3e:0a:7b:39')(type ioemu))))
\ No newline at end of file
tests/xml2sexprdata/xml2sexpr-no-source-cdrom.xml
浏览文件 @
8c6f5a54
...
...
@@ -25,7 +25,7 @@
<disk
type=
'block'
device=
'disk'
>
<driver
name=
'phy'
/>
<source
dev=
'/dev/sda8'
/>
<target
dev=
'hda
:disk
'
/>
<target
dev=
'hda'
/>
</disk>
<disk
device=
'cdrom'
>
<target
dev=
'hdc'
/>
...
...
tests/xml2sexprdata/xml2sexpr-pv-bootloader.sexpr
浏览文件 @
8c6f5a54
(vm (name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)(uuid '596a5d2171f48fb2e068e2386a5c413e')(bootloader '/usr/bin/pypxeboot')(bootloader_args 'mac=AA:00:86:e2:35:72')(on_poweroff 'destroy')(on_reboot 'destroy')(on_crash 'destroy')(device (vbd (dev 'xvda')(uname 'file:/root/some.img')(mode 'w'))))
\ No newline at end of file
(vm (name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)(uuid '596a5d21-71f4-8fb2-e068-e2386a5c413e')(bootloader '/usr/bin/pypxeboot')(bootloader_args 'mac=AA:00:86:e2:35:72')(on_poweroff 'destroy')(on_reboot 'destroy')(on_crash 'destroy')(device (vbd (dev 'xvda')(uname 'file:/root/some.img')(mode 'w'))))
\ No newline at end of file
tests/xml2sexprdata/xml2sexpr-pv-vfb-new.sexpr
浏览文件 @
8c6f5a54
(vm (name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)(uuid '596a5d2171f48fb2e068e2386a5c413e')(on_poweroff 'destroy')(on_reboot 'destroy')(on_crash 'destroy')(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5.91/x86_64/os ')))(device (vbd (dev 'xvda')(uname 'file:/root/some.img')(mode 'w')))(device (vkbd))(device (vfb (type vnc)(vncdisplay 6)(vnclisten 127.0.0.1)(vncpasswd 123456)(keymap ja))))
\ No newline at end of file
(vm (name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)(uuid '596a5d21-71f4-8fb2-e068-e2386a5c413e')(on_poweroff 'destroy')(on_reboot 'destroy')(on_crash 'destroy')(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5.91/x86_64/os ')(device_model '/usr/lib/xen/bin/qemu-dm')))(device (vbd (dev 'xvda')(uname 'file:/root/some.img')(mode 'w')))(device (vkbd))(device (vfb (type vnc)(vncunused 0)(vncdisplay 6)(vnclisten '127.0.0.1')(vncpasswd '123456')(keymap 'ja'))))
\ No newline at end of file
tests/xml2sexprdata/xml2sexpr-pv-vfb-orig.sexpr
浏览文件 @
8c6f5a54
(vm (name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)(uuid '596a5d2171f48fb2e068e2386a5c413e')(on_poweroff 'destroy')(on_reboot 'destroy')(on_crash 'destroy')(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5.91/x86_64/os ')(vnc 1)(vncdisplay 6)(vnclisten 127.0.0.1)(vncpasswd 123456)(keymap ja)))(device (vbd (dev 'xvda')(uname 'file:/root/some.img')(mode 'w'))))
\ No newline at end of file
(vm (name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)(uuid '596a5d21-71f4-8fb2-e068-e2386a5c413e')(on_poweroff 'destroy')(on_reboot 'destroy')(on_crash 'destroy')(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5.91/x86_64/os ')(vnc 1)(vncunused 0)(vncdisplay 6)(vnclisten '127.0.0.1')(vncpasswd '123456')(keymap 'ja')))(device (vbd (dev 'xvda')(uname 'file:/root/some.img')(mode 'w'))))
\ No newline at end of file
tests/xml2sexprdata/xml2sexpr-pv.sexpr
浏览文件 @
8c6f5a54
(vm (name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)(uuid '596a5d2171f48fb2e068e2386a5c413e')(on_poweroff 'destroy')(on_reboot 'destroy')(on_crash 'destroy')(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5.91/x86_64/os ')))(device (vbd (dev 'xvda')(uname 'file:/root/some.img')(mode 'w'))))
\ No newline at end of file
(vm (name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)(uuid '596a5d21-71f4-8fb2-e068-e2386a5c413e')(on_poweroff 'destroy')(on_reboot 'destroy')(on_crash 'destroy')(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5.91/x86_64/os ')))(device (vbd (dev 'xvda')(uname 'file:/root/some.img')(mode 'w'))))
\ No newline at end of file
tests/xml2sexprtest.c
浏览文件 @
8c6f5a54
...
...
@@ -11,48 +11,47 @@
#if WITH_XEN
#include "internal.h"
#include "x
m
l.h"
#include "x
end_interna
l.h"
#include "testutils.h"
#include "testutilsxen.h"
static
char
*
progname
;
static
char
*
abs_srcdir
;
static
virCapsPtr
caps
;
#define MAX_FILE 4096
static
int
testCompareFiles
(
const
char
*
xml
,
const
char
*
sexpr
,
const
char
*
name
,
int
xendConfigVersion
)
{
int
xendConfigVersion
)
{
char
xmlData
[
MAX_FILE
];
char
sexprData
[
MAX_FILE
];
char
*
gotname
=
NULL
;
char
*
gotsexpr
=
NULL
;
char
*
xmlPtr
=
&
(
xmlData
[
0
]);
char
*
sexprPtr
=
&
(
sexprData
[
0
]);
int
ret
=
-
1
;
virDomainDefPtr
def
=
NULL
;
if
(
virtTestLoadFile
(
xml
,
&
xmlPtr
,
MAX_FILE
)
<
0
)
goto
fail
;
goto
fail
;
if
(
virtTestLoadFile
(
sexpr
,
&
sexprPtr
,
MAX_FILE
)
<
0
)
goto
fail
;
goto
fail
;
if
(
!
(
gotsexpr
=
virDomainParseXMLDesc
(
NULL
,
xmlData
,
&
gotname
,
xendConfigVersion
)))
goto
fail
;
if
(
!
(
def
=
virDomainDefParseString
(
NULL
,
caps
,
xmlData
)))
goto
fail
;
if
(
STRNEQ
(
sexprData
,
gotsexpr
))
{
virtTestDifference
(
stderr
,
sexprData
,
gotsexpr
);
if
(
!
(
gotsexpr
=
xenDaemonFormatSxpr
(
NULL
,
def
,
xendConfigVersion
)))
goto
fail
;
}
if
(
STRNEQ
(
name
,
gotname
))
{
printf
(
"Got wrong name: expected %s, got %s
\n
"
,
name
,
gotname
);
if
(
STRNEQ
(
sexprData
,
gotsexpr
))
{
virtTestDifference
(
stderr
,
sexprData
,
gotsexpr
);
goto
fail
;
}
ret
=
0
;
fail:
free
(
gotname
);
virDomainDefFree
(
def
);
free
(
gotsexpr
);
return
ret
;
...
...
@@ -73,7 +72,7 @@ static int testCompareHelper(const void *data) {
abs_srcdir
,
info
->
input
);
snprintf
(
args
,
PATH_MAX
,
"%s/xml2sexprdata/xml2sexpr-%s.sexpr"
,
abs_srcdir
,
info
->
output
);
return
testCompareFiles
(
xml
,
args
,
info
->
name
,
info
->
version
);
return
testCompareFiles
(
xml
,
args
,
info
->
version
);
}
...
...
@@ -102,6 +101,9 @@ mymain(int argc, char **argv)
ret = -1; \
} while (0)
if
(
!
(
caps
=
testXenCapsInit
()))
return
(
EXIT_FAILURE
);
DO_TEST
(
"pv"
,
"pv"
,
"pvtest"
,
1
);
DO_TEST
(
"fv"
,
"fv"
,
"fvtest"
,
1
);
DO_TEST
(
"pv"
,
"pv"
,
"pvtest"
,
2
);
...
...
@@ -145,6 +147,8 @@ mymain(int argc, char **argv)
DO_TEST
(
"fv-sound"
,
"fv-sound"
,
"fvtest"
,
1
);
virCapabilitiesFree
(
caps
);
return
(
ret
==
0
?
EXIT_SUCCESS
:
EXIT_FAILURE
);
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录