Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
libvirt
提交
c6c5fc0b
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看板
提交
c6c5fc0b
编写于
8年前
作者:
J
John Ferlan
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
qemu: Create helper qemuMonitorJSONGetBlockDev
This will grab the 'dev' from devices and do the common validation checks.
上级
b0ab72bd
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
21 addition
and
16 deletion
+21
-16
src/qemu/qemu_monitor_json.c
src/qemu/qemu_monitor_json.c
+21
-16
未找到文件。
src/qemu/qemu_monitor_json.c
浏览文件 @
c6c5fc0b
...
...
@@ -1807,6 +1807,21 @@ qemuMonitorJSONQueryBlock(qemuMonitorPtr mon)
}
static
virJSONValuePtr
qemuMonitorJSONGetBlockDev
(
virJSONValuePtr
devices
,
size_t
idx
)
{
virJSONValuePtr
dev
=
virJSONValueArrayGet
(
devices
,
idx
);
if
(
!
dev
||
dev
->
type
!=
VIR_JSON_TYPE_OBJECT
)
{
virReportError
(
VIR_ERR_INTERNAL_ERROR
,
"%s"
,
_
(
"query-block device entry was not in expected format"
));
return
NULL
;
}
return
dev
;
}
int
qemuMonitorJSONGetBlockInfo
(
qemuMonitorPtr
mon
,
virHashTablePtr
table
)
{
...
...
@@ -1819,16 +1834,13 @@ int qemuMonitorJSONGetBlockInfo(qemuMonitorPtr mon,
return
-
1
;
for
(
i
=
0
;
i
<
virJSONValueArraySize
(
devices
);
i
++
)
{
virJSONValuePtr
dev
=
virJSONValueArrayGet
(
devices
,
i
)
;
virJSONValuePtr
dev
;
struct
qemuDomainDiskInfo
*
info
;
const
char
*
thisdev
;
const
char
*
status
;
if
(
!
dev
||
dev
->
type
!=
VIR_JSON_TYPE_OBJECT
)
{
virReportError
(
VIR_ERR_INTERNAL_ERROR
,
"%s"
,
_
(
"block info device entry was not in expected format"
));
if
(
!
(
dev
=
qemuMonitorJSONGetBlockDev
(
devices
,
i
)))
goto
cleanup
;
}
if
((
thisdev
=
virJSONValueObjectGetString
(
dev
,
"device"
))
==
NULL
)
{
virReportError
(
VIR_ERR_INTERNAL_ERROR
,
"%s"
,
...
...
@@ -2082,17 +2094,13 @@ qemuMonitorJSONBlockStatsUpdateCapacity(qemuMonitorPtr mon,
return
-
1
;
for
(
i
=
0
;
i
<
virJSONValueArraySize
(
devices
);
i
++
)
{
virJSONValuePtr
dev
=
virJSONValueArrayGet
(
devices
,
i
)
;
virJSONValuePtr
dev
;
virJSONValuePtr
inserted
;
virJSONValuePtr
image
;
const
char
*
dev_name
;
if
(
!
dev
||
dev
->
type
!=
VIR_JSON_TYPE_OBJECT
)
{
virReportError
(
VIR_ERR_INTERNAL_ERROR
,
"%s"
,
_
(
"query-block device entry was not "
"in expected format"
));
if
(
!
(
dev
=
qemuMonitorJSONGetBlockDev
(
devices
,
i
)))
goto
cleanup
;
}
if
(
!
(
dev_name
=
virJSONValueObjectGetString
(
dev
,
"device"
)))
{
virReportError
(
VIR_ERR_INTERNAL_ERROR
,
"%s"
,
...
...
@@ -3997,16 +4005,13 @@ qemuMonitorJSONDiskNameLookup(qemuMonitorPtr mon,
return
NULL
;
for
(
i
=
0
;
i
<
virJSONValueArraySize
(
devices
);
i
++
)
{
virJSONValuePtr
dev
=
virJSONValueArrayGet
(
devices
,
i
)
;
virJSONValuePtr
dev
;
virJSONValuePtr
inserted
;
virJSONValuePtr
image
;
const
char
*
thisdev
;
if
(
!
dev
||
dev
->
type
!=
VIR_JSON_TYPE_OBJECT
)
{
virReportError
(
VIR_ERR_INTERNAL_ERROR
,
"%s"
,
_
(
"block info device entry was not in expected format"
));
if
(
!
(
dev
=
qemuMonitorJSONGetBlockDev
(
devices
,
i
)))
goto
cleanup
;
}
if
(
!
(
thisdev
=
virJSONValueObjectGetString
(
dev
,
"device"
)))
{
virReportError
(
VIR_ERR_INTERNAL_ERROR
,
"%s"
,
...
...
This diff is collapsed.
Click to expand it.
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录
反馈
建议
客服
返回
顶部