Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
libvirt
提交
fc41e003
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,发现更多精彩内容 >>
提交
fc41e003
编写于
10月 24, 2014
作者:
T
Taowei Luo
提交者:
Michal Privoznik
10月 29, 2014
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
vbox: Rewrite vboxStorageVolLookupByPath
上级
1599319c
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
78 addition
and
77 deletion
+78
-77
src/vbox/vbox_storage.c
src/vbox/vbox_storage.c
+77
-0
src/vbox/vbox_tmpl.c
src/vbox/vbox_tmpl.c
+0
-77
src/vbox/vbox_uniformed_api.h
src/vbox/vbox_uniformed_api.h
+1
-0
未找到文件。
src/vbox/vbox_storage.c
浏览文件 @
fc41e003
...
...
@@ -343,3 +343,80 @@ virStorageVolPtr vboxStorageVolLookupByKey(virConnectPtr conn, const char *key)
vboxIIDUnalloc
(
&
hddIID
);
return
ret
;
}
virStorageVolPtr
vboxStorageVolLookupByPath
(
virConnectPtr
conn
,
const
char
*
path
)
{
vboxGlobalData
*
data
=
conn
->
privateData
;
PRUnichar
*
hddPathUtf16
=
NULL
;
IHardDisk
*
hardDisk
=
NULL
;
PRUnichar
*
hddNameUtf16
=
NULL
;
char
*
hddNameUtf8
=
NULL
;
unsigned
char
uuid
[
VIR_UUID_BUFLEN
];
char
key
[
VIR_UUID_STRING_BUFLEN
]
=
""
;
vboxIIDUnion
hddIID
;
PRUint32
hddstate
;
nsresult
rc
;
virStorageVolPtr
ret
=
NULL
;
if
(
!
data
->
vboxObj
)
{
return
ret
;
}
VBOX_IID_INITIALIZE
(
&
hddIID
);
if
(
!
path
)
return
ret
;
VBOX_UTF8_TO_UTF16
(
path
,
&
hddPathUtf16
);
if
(
!
hddPathUtf16
)
return
ret
;
rc
=
gVBoxAPI
.
UIVirtualBox
.
FindHardDisk
(
data
->
vboxObj
,
hddPathUtf16
,
DeviceType_HardDisk
,
AccessMode_ReadWrite
,
&
hardDisk
);
if
(
NS_FAILED
(
rc
))
goto
cleanup
;
gVBoxAPI
.
UIMedium
.
GetState
(
hardDisk
,
&
hddstate
);
if
(
hddstate
==
MediaState_Inaccessible
)
goto
cleanup
;
gVBoxAPI
.
UIMedium
.
GetName
(
hardDisk
,
&
hddNameUtf16
);
if
(
!
hddNameUtf16
)
goto
cleanup
;
VBOX_UTF16_TO_UTF8
(
hddNameUtf16
,
&
hddNameUtf8
);
VBOX_UTF16_FREE
(
hddNameUtf16
);
if
(
!
hddNameUtf8
)
goto
cleanup
;
rc
=
gVBoxAPI
.
UIMedium
.
GetId
(
hardDisk
,
&
hddIID
);
if
(
NS_FAILED
(
rc
))
{
VBOX_UTF8_FREE
(
hddNameUtf8
);
goto
cleanup
;
}
vboxIIDToUUID
(
&
hddIID
,
uuid
);
virUUIDFormat
(
uuid
,
key
);
/* TODO: currently only one default pool and thus
* the check below, change it when pools are supported
*/
if
(
vboxConnectNumOfStoragePools
(
conn
)
==
1
)
ret
=
virGetStorageVol
(
conn
,
"default-pool"
,
hddNameUtf8
,
key
,
NULL
,
NULL
);
VIR_DEBUG
(
"Storage Volume Pool: %s"
,
"default-pool"
);
VIR_DEBUG
(
"Storage Volume Name: %s"
,
hddNameUtf8
);
VIR_DEBUG
(
"Storage Volume key : %s"
,
key
);
vboxIIDUnalloc
(
&
hddIID
);
VBOX_UTF8_FREE
(
hddNameUtf8
);
cleanup:
VBOX_MEDIUM_RELEASE
(
hardDisk
);
VBOX_UTF16_FREE
(
hddPathUtf16
);
return
ret
;
}
src/vbox/vbox_tmpl.c
浏览文件 @
fc41e003
...
...
@@ -2034,83 +2034,6 @@ _registerDomainEvent(virHypervisorDriverPtr driver)
* The Storage Functions here on
*/
static
virStorageVolPtr
vboxStorageVolLookupByPath
(
virConnectPtr
conn
,
const
char
*
path
)
{
VBOX_OBJECT_CHECK
(
conn
,
virStorageVolPtr
,
NULL
);
PRUnichar
*
hddPathUtf16
=
NULL
;
IHardDisk
*
hardDisk
=
NULL
;
nsresult
rc
;
if
(
!
path
)
return
ret
;
VBOX_UTF8_TO_UTF16
(
path
,
&
hddPathUtf16
);
if
(
!
hddPathUtf16
)
return
ret
;
#if VBOX_API_VERSION < 4000000
rc
=
data
->
vboxObj
->
vtbl
->
FindHardDisk
(
data
->
vboxObj
,
hddPathUtf16
,
&
hardDisk
);
#elif VBOX_API_VERSION >= 4000000 && VBOX_API_VERSION < 4002000
rc
=
data
->
vboxObj
->
vtbl
->
FindMedium
(
data
->
vboxObj
,
hddPathUtf16
,
DeviceType_HardDisk
,
&
hardDisk
);
#else
rc
=
data
->
vboxObj
->
vtbl
->
OpenMedium
(
data
->
vboxObj
,
hddPathUtf16
,
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
*
hddNameUtf16
=
NULL
;
char
*
hddNameUtf8
=
NULL
;
VBOX_MEDIUM_FUNC_ARG1
(
hardDisk
,
GetName
,
&
hddNameUtf16
);
if
(
hddNameUtf16
)
{
VBOX_UTF16_TO_UTF8
(
hddNameUtf16
,
&
hddNameUtf8
);
VBOX_UTF16_FREE
(
hddNameUtf16
);
}
if
(
hddNameUtf8
)
{
vboxIID
hddIID
=
VBOX_IID_INITIALIZER
;
unsigned
char
uuid
[
VIR_UUID_BUFLEN
];
char
key
[
VIR_UUID_STRING_BUFLEN
]
=
""
;
rc
=
VBOX_MEDIUM_FUNC_ARG1
(
hardDisk
,
GetId
,
&
hddIID
.
value
);
if
(
NS_SUCCEEDED
(
rc
))
{
vboxIIDToUUID
(
&
hddIID
,
uuid
);
virUUIDFormat
(
uuid
,
key
);
/* TODO: currently only one default pool and thus
* the check below, change it when pools are supported
*/
if
(
vboxConnectNumOfStoragePools
(
conn
)
==
1
)
ret
=
virGetStorageVol
(
conn
,
"default-pool"
,
hddNameUtf8
,
key
,
NULL
,
NULL
);
VIR_DEBUG
(
"Storage Volume Pool: %s"
,
"default-pool"
);
VIR_DEBUG
(
"Storage Volume Name: %s"
,
hddNameUtf8
);
VIR_DEBUG
(
"Storage Volume key : %s"
,
key
);
}
vboxIIDUnalloc
(
&
hddIID
);
}
VBOX_UTF8_FREE
(
hddNameUtf8
);
}
VBOX_MEDIUM_RELEASE
(
hardDisk
);
}
VBOX_UTF16_FREE
(
hddPathUtf16
);
return
ret
;
}
static
virStorageVolPtr
vboxStorageVolCreateXML
(
virStoragePoolPtr
pool
,
const
char
*
xml
,
unsigned
int
flags
)
...
...
src/vbox/vbox_uniformed_api.h
浏览文件 @
fc41e003
...
...
@@ -601,6 +601,7 @@ int vboxStoragePoolNumOfVolumes(virStoragePoolPtr pool);
int
vboxStoragePoolListVolumes
(
virStoragePoolPtr
pool
,
char
**
const
names
,
int
nnames
);
virStorageVolPtr
vboxStorageVolLookupByName
(
virStoragePoolPtr
pool
,
const
char
*
name
);
virStorageVolPtr
vboxStorageVolLookupByKey
(
virConnectPtr
conn
,
const
char
*
key
);
virStorageVolPtr
vboxStorageVolLookupByPath
(
virConnectPtr
conn
,
const
char
*
path
);
/* 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.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录