Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
libvirt
提交
0c8e3b22
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,发现更多精彩内容 >>
提交
0c8e3b22
编写于
2月 29, 2016
作者:
P
Peter Krempa
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
qemu: domain: Move and export qemuDomainDiskChainElement(Prepare|Revoke)
Move the function to qemu_domain.c and export them for further use.
上级
358c18c3
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
73 addition
and
63 deletion
+73
-63
src/qemu/qemu_domain.c
src/qemu/qemu_domain.c
+65
-0
src/qemu/qemu_domain.h
src/qemu/qemu_domain.h
+8
-0
src/qemu/qemu_driver.c
src/qemu/qemu_driver.c
+0
-63
未找到文件。
src/qemu/qemu_domain.c
浏览文件 @
0c8e3b22
...
...
@@ -25,6 +25,7 @@
#include "qemu_domain.h"
#include "qemu_alias.h"
#include "qemu_cgroup.h"
#include "qemu_command.h"
#include "qemu_parse_command.h"
#include "qemu_capabilities.h"
...
...
@@ -45,6 +46,7 @@
#include "viratomic.h"
#include "virprocess.h"
#include "logging/log_manager.h"
#include "locking/domain_lock.h"
#include "storage/storage_driver.h"
...
...
@@ -3369,6 +3371,69 @@ qemuDomainDetermineDiskChain(virQEMUDriverPtr driver,
}
/**
* qemuDomainDiskChainElementRevoke:
*
* Revoke access to a single backing chain element. This restores the labels,
* removes cgroup ACLs for devices and removes locks.
*/
void
qemuDomainDiskChainElementRevoke
(
virQEMUDriverPtr
driver
,
virDomainObjPtr
vm
,
virStorageSourcePtr
elem
)
{
if
(
virSecurityManagerRestoreImageLabel
(
driver
->
securityManager
,
vm
->
def
,
elem
)
<
0
)
VIR_WARN
(
"Unable to restore security label on %s"
,
NULLSTR
(
elem
->
path
));
if
(
qemuTeardownImageCgroup
(
vm
,
elem
)
<
0
)
VIR_WARN
(
"Failed to teardown cgroup for disk path %s"
,
NULLSTR
(
elem
->
path
));
if
(
virDomainLockImageDetach
(
driver
->
lockManager
,
vm
,
elem
)
<
0
)
VIR_WARN
(
"Unable to release lock on %s"
,
NULLSTR
(
elem
->
path
));
}
/**
* qemuDomainDiskChainElementPrepare:
*
* Allow a VM access to a single element of a disk backing chain; this helper
* ensures that the lock manager, cgroup device controller, and security manager
* labelling are all aware of each new file before it is added to a chain */
int
qemuDomainDiskChainElementPrepare
(
virQEMUDriverPtr
driver
,
virDomainObjPtr
vm
,
virStorageSourcePtr
elem
,
bool
readonly
)
{
bool
was_readonly
=
elem
->
readonly
;
virQEMUDriverConfigPtr
cfg
=
NULL
;
int
ret
=
-
1
;
cfg
=
virQEMUDriverGetConfig
(
driver
);
elem
->
readonly
=
readonly
;
if
(
virDomainLockImageAttach
(
driver
->
lockManager
,
cfg
->
uri
,
vm
,
elem
)
<
0
)
goto
cleanup
;
if
(
qemuSetupImageCgroup
(
vm
,
elem
)
<
0
)
goto
cleanup
;
if
(
virSecurityManagerSetImageLabel
(
driver
->
securityManager
,
vm
->
def
,
elem
)
<
0
)
goto
cleanup
;
ret
=
0
;
cleanup:
elem
->
readonly
=
was_readonly
;
virObjectUnref
(
cfg
);
return
ret
;
}
bool
qemuDomainDiskSourceDiffers
(
virConnectPtr
conn
,
virDomainDiskDefPtr
disk
,
...
...
src/qemu/qemu_domain.h
浏览文件 @
0c8e3b22
...
...
@@ -460,6 +460,14 @@ int qemuDomainStorageFileInit(virQEMUDriverPtr driver,
virStorageSourcePtr
src
);
char
*
qemuDomainStorageAlias
(
const
char
*
device
,
int
depth
);
void
qemuDomainDiskChainElementRevoke
(
virQEMUDriverPtr
driver
,
virDomainObjPtr
vm
,
virStorageSourcePtr
elem
);
int
qemuDomainDiskChainElementPrepare
(
virQEMUDriverPtr
driver
,
virDomainObjPtr
vm
,
virStorageSourcePtr
elem
,
bool
readonly
);
int
qemuDomainCleanupAdd
(
virDomainObjPtr
vm
,
qemuDomainCleanupCallback
cb
);
void
qemuDomainCleanupRemove
(
virDomainObjPtr
vm
,
...
...
src/qemu/qemu_driver.c
浏览文件 @
0c8e3b22
...
...
@@ -13503,69 +13503,6 @@ qemuDomainMigrateStartPostCopy(virDomainPtr dom,
}
/**
* qemuDomainDiskChainElementRevoke:
*
* Revoke access to a single backing chain element. This restores the labels,
* removes cgroup ACLs for devices and removes locks.
*/
static void
qemuDomainDiskChainElementRevoke(virQEMUDriverPtr driver,
virDomainObjPtr vm,
virStorageSourcePtr elem)
{
if (virSecurityManagerRestoreImageLabel(driver->securityManager,
vm->def, elem) < 0)
VIR_WARN("Unable to restore security label on %s", NULLSTR(elem->path));
if (qemuTeardownImageCgroup(vm, elem) < 0)
VIR_WARN("Failed to teardown cgroup for disk path %s",
NULLSTR(elem->path));
if (virDomainLockImageDetach(driver->lockManager, vm, elem) < 0)
VIR_WARN("Unable to release lock on %s", NULLSTR(elem->path));
}
/**
* qemuDomainDiskChainElementPrepare:
*
* Allow a VM access to a single element of a disk backing chain; this helper
* ensures that the lock manager, cgroup device controller, and security manager
* labelling are all aware of each new file before it is added to a chain */
static int
qemuDomainDiskChainElementPrepare(virQEMUDriverPtr driver,
virDomainObjPtr vm,
virStorageSourcePtr elem,
bool readonly)
{
bool was_readonly = elem->readonly;
virQEMUDriverConfigPtr cfg = NULL;
int ret = -1;
cfg = virQEMUDriverGetConfig(driver);
elem->readonly = readonly;
if (virDomainLockImageAttach(driver->lockManager, cfg->uri, vm, elem) < 0)
goto cleanup;
if (qemuSetupImageCgroup(vm, elem) < 0)
goto cleanup;
if (virSecurityManagerSetImageLabel(driver->securityManager, vm->def,
elem) < 0)
goto cleanup;
ret = 0;
cleanup:
elem->readonly = was_readonly;
virObjectUnref(cfg);
return ret;
}
/* Return -1 if request is not sent to agent due to misconfig, -2 if request
* is sent but failed, and number of frozen filesystems on success. If -2 is
* returned, FSThaw should be called revert the quiesced status. */
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录