Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
libvirt
提交
b897973f
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,体验更适合开发者的 AI 搜索 >>
提交
b897973f
编写于
7月 09, 2008
作者:
D
Daniel P. Berrange
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Preserve context node when doing XPath queries to allow relative XPath expressions
上级
1e3e8d14
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
27 addition
and
1 deletion
+27
-1
ChangeLog
ChangeLog
+5
-0
src/xml.c
src/xml.c
+22
-1
未找到文件。
ChangeLog
浏览文件 @
b897973f
Wed Jul 9 09:19:31 BST 2008 Daniel P. Berrange <berrange@redhat.com>
* src/xml.c: Preserve the XPath context node to allow relative
XPath queries to be used
Wed Jul 9 07:23:31 CEST 2008 Jim Meyering <meyering@redhat.com>
give a more useful diagnostic for tap-add failure w/ENOTSUP
...
...
src/xml.c
浏览文件 @
b897973f
...
...
@@ -386,6 +386,7 @@ char *
virXPathString
(
const
char
*
xpath
,
xmlXPathContextPtr
ctxt
)
{
xmlXPathObjectPtr
obj
;
xmlNodePtr
relnode
;
char
*
ret
;
if
((
ctxt
==
NULL
)
||
(
xpath
==
NULL
))
{
...
...
@@ -393,6 +394,7 @@ virXPathString(const char *xpath, xmlXPathContextPtr ctxt)
_
(
"Invalid parameter to virXPathString()"
),
0
);
return
(
NULL
);
}
relnode
=
ctxt
->
node
;
obj
=
xmlXPathEval
(
BAD_CAST
xpath
,
ctxt
);
if
((
obj
==
NULL
)
||
(
obj
->
type
!=
XPATH_STRING
)
||
(
obj
->
stringval
==
NULL
)
||
(
obj
->
stringval
[
0
]
==
0
))
{
...
...
@@ -404,6 +406,7 @@ virXPathString(const char *xpath, xmlXPathContextPtr ctxt)
if
(
ret
==
NULL
)
{
virXMLError
(
NULL
,
VIR_ERR_NO_MEMORY
,
_
(
"strdup failed"
),
0
);
}
ctxt
->
node
=
relnode
;
return
(
ret
);
}
...
...
@@ -422,21 +425,25 @@ int
virXPathNumber
(
const
char
*
xpath
,
xmlXPathContextPtr
ctxt
,
double
*
value
)
{
xmlXPathObjectPtr
obj
;
xmlNodePtr
relnode
;
if
((
ctxt
==
NULL
)
||
(
xpath
==
NULL
)
||
(
value
==
NULL
))
{
virXMLError
(
NULL
,
VIR_ERR_INTERNAL_ERROR
,
_
(
"Invalid parameter to virXPathNumber()"
),
0
);
return
(
-
1
);
}
relnode
=
ctxt
->
node
;
obj
=
xmlXPathEval
(
BAD_CAST
xpath
,
ctxt
);
if
((
obj
==
NULL
)
||
(
obj
->
type
!=
XPATH_NUMBER
)
||
(
isnan
(
obj
->
floatval
)))
{
xmlXPathFreeObject
(
obj
);
ctxt
->
node
=
relnode
;
return
(
-
1
);
}
*
value
=
obj
->
floatval
;
xmlXPathFreeObject
(
obj
);
ctxt
->
node
=
relnode
;
return
(
0
);
}
...
...
@@ -456,6 +463,7 @@ int
virXPathLong
(
const
char
*
xpath
,
xmlXPathContextPtr
ctxt
,
long
*
value
)
{
xmlXPathObjectPtr
obj
;
xmlNodePtr
relnode
;
int
ret
=
0
;
if
((
ctxt
==
NULL
)
||
(
xpath
==
NULL
)
||
(
value
==
NULL
))
{
...
...
@@ -463,6 +471,7 @@ virXPathLong(const char *xpath, xmlXPathContextPtr ctxt, long *value)
_
(
"Invalid parameter to virXPathNumber()"
),
0
);
return
(
-
1
);
}
relnode
=
ctxt
->
node
;
obj
=
xmlXPathEval
(
BAD_CAST
xpath
,
ctxt
);
if
((
obj
!=
NULL
)
&&
(
obj
->
type
==
XPATH_STRING
)
&&
(
obj
->
stringval
!=
NULL
)
&&
(
obj
->
stringval
[
0
]
!=
0
))
{
...
...
@@ -486,6 +495,7 @@ virXPathLong(const char *xpath, xmlXPathContextPtr ctxt, long *value)
}
xmlXPathFreeObject
(
obj
);
ctxt
->
node
=
relnode
;
return
(
ret
);
}
...
...
@@ -502,6 +512,7 @@ int
virXPathBoolean
(
const
char
*
xpath
,
xmlXPathContextPtr
ctxt
)
{
xmlXPathObjectPtr
obj
;
xmlNodePtr
relnode
;
int
ret
;
if
((
ctxt
==
NULL
)
||
(
xpath
==
NULL
))
{
...
...
@@ -509,6 +520,7 @@ virXPathBoolean(const char *xpath, xmlXPathContextPtr ctxt)
_
(
"Invalid parameter to virXPathBoolean()"
),
0
);
return
(
-
1
);
}
relnode
=
ctxt
->
node
;
obj
=
xmlXPathEval
(
BAD_CAST
xpath
,
ctxt
);
if
((
obj
==
NULL
)
||
(
obj
->
type
!=
XPATH_BOOLEAN
)
||
(
obj
->
boolval
<
0
)
||
(
obj
->
boolval
>
1
))
{
...
...
@@ -518,6 +530,7 @@ virXPathBoolean(const char *xpath, xmlXPathContextPtr ctxt)
ret
=
obj
->
boolval
;
xmlXPathFreeObject
(
obj
);
ctxt
->
node
=
relnode
;
return
(
ret
);
}
...
...
@@ -535,6 +548,7 @@ xmlNodePtr
virXPathNode
(
const
char
*
xpath
,
xmlXPathContextPtr
ctxt
)
{
xmlXPathObjectPtr
obj
;
xmlNodePtr
relnode
;
xmlNodePtr
ret
;
if
((
ctxt
==
NULL
)
||
(
xpath
==
NULL
))
{
...
...
@@ -542,16 +556,19 @@ virXPathNode(const char *xpath, xmlXPathContextPtr ctxt)
_
(
"Invalid parameter to virXPathNode()"
),
0
);
return
(
NULL
);
}
relnode
=
ctxt
->
node
;
obj
=
xmlXPathEval
(
BAD_CAST
xpath
,
ctxt
);
if
((
obj
==
NULL
)
||
(
obj
->
type
!=
XPATH_NODESET
)
||
(
obj
->
nodesetval
==
NULL
)
||
(
obj
->
nodesetval
->
nodeNr
<=
0
)
||
(
obj
->
nodesetval
->
nodeTab
==
NULL
))
{
xmlXPathFreeObject
(
obj
);
ctxt
->
node
=
relnode
;
return
(
NULL
);
}
ret
=
obj
->
nodesetval
->
nodeTab
[
0
];
xmlXPathFreeObject
(
obj
);
ctxt
->
node
=
relnode
;
return
(
ret
);
}
...
...
@@ -571,6 +588,7 @@ virXPathNodeSet(const char *xpath, xmlXPathContextPtr ctxt,
xmlNodePtr
**
list
)
{
xmlXPathObjectPtr
obj
;
xmlNodePtr
relnode
;
int
ret
;
if
((
ctxt
==
NULL
)
||
(
xpath
==
NULL
))
{
...
...
@@ -578,6 +596,7 @@ virXPathNodeSet(const char *xpath, xmlXPathContextPtr ctxt,
_
(
"Invalid parameter to virXPathNodeSet()"
),
0
);
return
(
-
1
);
}
relnode
=
ctxt
->
node
;
obj
=
xmlXPathEval
(
BAD_CAST
xpath
,
ctxt
);
if
((
obj
==
NULL
)
||
(
obj
->
type
!=
XPATH_NODESET
)
||
(
obj
->
nodesetval
==
NULL
)
||
(
obj
->
nodesetval
->
nodeNr
<=
0
)
||
...
...
@@ -585,6 +604,7 @@ virXPathNodeSet(const char *xpath, xmlXPathContextPtr ctxt,
xmlXPathFreeObject
(
obj
);
if
(
list
!=
NULL
)
*
list
=
NULL
;
ctxt
->
node
=
relnode
;
return
(
-
1
);
}
...
...
@@ -601,6 +621,7 @@ virXPathNodeSet(const char *xpath, xmlXPathContextPtr ctxt,
}
}
xmlXPathFreeObject
(
obj
);
ctxt
->
node
=
relnode
;
return
(
ret
);
}
...
...
@@ -1139,7 +1160,7 @@ virDomainParseXMLOSDescHVM(virConnectPtr conn, xmlNodePtr node,
goto
error
;
virBufferVSprintf
(
buf
,
"(serial %s)"
,
scratch
);
}
else
{
res
=
virXPathBoolean
(
"count(domain/devices/console) > 0"
,
ctxt
);
res
=
virXPathBoolean
(
"count(
/
domain/devices/console) > 0"
,
ctxt
);
if
(
res
<
0
)
{
virXMLError
(
conn
,
VIR_ERR_XML_ERROR
,
NULL
,
0
);
goto
error
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录