Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
libvirt
提交
013aa081
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 搜索 >>
提交
013aa081
编写于
10月 24, 2014
作者:
T
Taowei Luo
提交者:
Michal Privoznik
10月 29, 2014
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
vbox: Rewrite vboxStorageVolGetPath
上级
4df7b206
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
56 addition
and
61 deletion
+56
-61
src/vbox/vbox_storage.c
src/vbox/vbox_storage.c
+55
-0
src/vbox/vbox_tmpl.c
src/vbox/vbox_tmpl.c
+0
-61
src/vbox/vbox_uniformed_api.h
src/vbox/vbox_uniformed_api.h
+1
-0
未找到文件。
src/vbox/vbox_storage.c
浏览文件 @
013aa081
...
...
@@ -839,3 +839,58 @@ char *vboxStorageVolGetXMLDesc(virStorageVolPtr vol, unsigned int flags)
vboxIIDUnalloc
(
&
hddIID
);
return
ret
;
}
char
*
vboxStorageVolGetPath
(
virStorageVolPtr
vol
)
{
vboxGlobalData
*
data
=
vol
->
conn
->
privateData
;
IHardDisk
*
hardDisk
=
NULL
;
PRUnichar
*
hddLocationUtf16
=
NULL
;
char
*
hddLocationUtf8
=
NULL
;
unsigned
char
uuid
[
VIR_UUID_BUFLEN
];
vboxIIDUnion
hddIID
;
PRUint32
hddstate
;
nsresult
rc
;
char
*
ret
=
NULL
;
if
(
!
data
->
vboxObj
)
{
return
ret
;
}
if
(
virUUIDParse
(
vol
->
key
,
uuid
)
<
0
)
{
virReportError
(
VIR_ERR_INVALID_ARG
,
_
(
"Could not parse UUID from '%s'"
),
vol
->
key
);
return
ret
;
}
VBOX_IID_INITIALIZE
(
&
hddIID
);
vboxIIDFromUUID
(
&
hddIID
,
uuid
);
rc
=
gVBoxAPI
.
UIVirtualBox
.
GetHardDiskByIID
(
data
->
vboxObj
,
&
hddIID
,
&
hardDisk
);
if
(
NS_FAILED
(
rc
))
goto
cleanup
;
gVBoxAPI
.
UIMedium
.
GetState
(
hardDisk
,
&
hddstate
);
if
(
hddstate
==
MediaState_Inaccessible
)
goto
cleanup
;
gVBoxAPI
.
UIMedium
.
GetLocation
(
hardDisk
,
&
hddLocationUtf16
);
if
(
!
hddLocationUtf16
)
goto
cleanup
;
VBOX_UTF16_TO_UTF8
(
hddLocationUtf16
,
&
hddLocationUtf8
);
if
(
!
hddLocationUtf8
)
goto
cleanup
;
ignore_value
(
VIR_STRDUP
(
ret
,
hddLocationUtf8
));
VIR_DEBUG
(
"Storage Volume Name: %s"
,
vol
->
name
);
VIR_DEBUG
(
"Storage Volume Path: %s"
,
hddLocationUtf8
);
VIR_DEBUG
(
"Storage Volume Pool: %s"
,
vol
->
pool
);
VBOX_UTF8_FREE
(
hddLocationUtf8
);
cleanup:
VBOX_UTF16_FREE
(
hddLocationUtf16
);
VBOX_MEDIUM_RELEASE
(
hardDisk
);
vboxIIDUnalloc
(
&
hddIID
);
return
ret
;
}
src/vbox/vbox_tmpl.c
浏览文件 @
013aa081
...
...
@@ -2029,67 +2029,6 @@ _registerDomainEvent(virHypervisorDriverPtr driver)
#endif
/* !(VBOX_API_VERSION == 2002000 || VBOX_API_VERSION >= 4000000) */
/**
* The Storage Functions here on
*/
static
char
*
vboxStorageVolGetPath
(
virStorageVolPtr
vol
)
{
VBOX_OBJECT_CHECK
(
vol
->
conn
,
char
*
,
NULL
);
IHardDisk
*
hardDisk
=
NULL
;
unsigned
char
uuid
[
VIR_UUID_BUFLEN
];
vboxIID
hddIID
=
VBOX_IID_INITIALIZER
;
nsresult
rc
;
if
(
virUUIDParse
(
vol
->
key
,
uuid
)
<
0
)
{
virReportError
(
VIR_ERR_INVALID_ARG
,
_
(
"Could not parse UUID from '%s'"
),
vol
->
key
);
return
ret
;
}
vboxIIDFromUUID
(
&
hddIID
,
uuid
);
#if VBOX_API_VERSION < 4000000
rc
=
data
->
vboxObj
->
vtbl
->
GetHardDisk
(
data
->
vboxObj
,
hddIID
.
value
,
&
hardDisk
);
#elif VBOX_API_VERSION >= 4000000 && VBOX_API_VERSION < 4002000
rc
=
data
->
vboxObj
->
vtbl
->
FindMedium
(
data
->
vboxObj
,
hddIID
.
value
,
DeviceType_HardDisk
,
&
hardDisk
);
#else
rc
=
data
->
vboxObj
->
vtbl
->
OpenMedium
(
data
->
vboxObj
,
hddIID
.
value
,
DeviceType_HardDisk
,
AccessMode_ReadWrite
,
PR_FALSE
,
&
hardDisk
);
#endif
/* VBOX_API_VERSION >= 4000000 */
if
(
NS_SUCCEEDED
(
rc
))
{
PRUint32
hddstate
;
VBOX_MEDIUM_FUNC_ARG1
(
hardDisk
,
GetState
,
&
hddstate
);
if
(
hddstate
!=
MediaState_Inaccessible
)
{
PRUnichar
*
hddLocationUtf16
=
NULL
;
char
*
hddLocationUtf8
=
NULL
;
VBOX_MEDIUM_FUNC_ARG1
(
hardDisk
,
GetLocation
,
&
hddLocationUtf16
);
VBOX_UTF16_TO_UTF8
(
hddLocationUtf16
,
&
hddLocationUtf8
);
if
(
hddLocationUtf8
)
{
ignore_value
(
VIR_STRDUP
(
ret
,
hddLocationUtf8
));
VIR_DEBUG
(
"Storage Volume Name: %s"
,
vol
->
name
);
VIR_DEBUG
(
"Storage Volume Path: %s"
,
hddLocationUtf8
);
VIR_DEBUG
(
"Storage Volume Pool: %s"
,
vol
->
pool
);
VBOX_UTF8_FREE
(
hddLocationUtf8
);
}
VBOX_UTF16_FREE
(
hddLocationUtf16
);
}
VBOX_MEDIUM_RELEASE
(
hardDisk
);
}
vboxIIDUnalloc
(
&
hddIID
);
return
ret
;
}
static
int
_pfnInitialize
(
vboxGlobalData
*
data
)
{
data
->
pFuncs
=
g_pfnGetFunctions
(
VBOX_XPCOMC_VERSION
);
...
...
src/vbox/vbox_uniformed_api.h
浏览文件 @
013aa081
...
...
@@ -624,6 +624,7 @@ virStorageVolPtr vboxStorageVolCreateXML(virStoragePoolPtr pool,
int
vboxStorageVolDelete
(
virStorageVolPtr
vol
,
unsigned
int
flags
);
int
vboxStorageVolGetInfo
(
virStorageVolPtr
vol
,
virStorageVolInfoPtr
info
);
char
*
vboxStorageVolGetXMLDesc
(
virStorageVolPtr
vol
,
unsigned
int
flags
);
char
*
vboxStorageVolGetPath
(
virStorageVolPtr
vol
);
/* Version specified functions for installing uniformed API */
void
vbox22InstallUniformedAPI
(
vboxUniformedAPI
*
pVBoxAPI
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录