Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
libvirt
提交
34b9fe61
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 搜索 >>
提交
34b9fe61
编写于
10月 20, 2015
作者:
J
Jiri Denemark
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
qemu: Move incoming URI code to qemu_migration
Signed-off-by:
N
Jiri Denemark
<
jdenemar@redhat.com
>
上级
08600de3
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
51 addition
and
48 deletion
+51
-48
src/qemu/qemu_command.c
src/qemu/qemu_command.c
+0
-39
src/qemu/qemu_command.h
src/qemu/qemu_command.h
+0
-5
src/qemu/qemu_migration.c
src/qemu/qemu_migration.c
+40
-0
src/qemu/qemu_migration.h
src/qemu/qemu_migration.h
+6
-0
src/qemu/qemu_process.c
src/qemu/qemu_process.c
+2
-2
tests/qemuxml2argvtest.c
tests/qemuxml2argvtest.c
+3
-2
未找到文件。
src/qemu/qemu_command.c
浏览文件 @
34b9fe61
...
...
@@ -9088,45 +9088,6 @@ qemuBuildTPMCommandLine(virDomainDefPtr def,
return
0
;
}
int
qemuBuildIncomingCheckProtocol
(
virQEMUCapsPtr
qemuCaps
,
const
char
*
migrateFrom
)
{
if
(
STRPREFIX
(
migrateFrom
,
"rdma"
))
{
if
(
!
virQEMUCapsGet
(
qemuCaps
,
QEMU_CAPS_MIGRATE_RDMA
))
{
virReportError
(
VIR_ERR_OPERATION_UNSUPPORTED
,
"%s"
,
_
(
"incoming RDMA migration is not supported "
"with this QEMU binary"
));
return
-
1
;
}
}
else
if
(
!
STRPREFIX
(
migrateFrom
,
"tcp"
)
&&
!
STRPREFIX
(
migrateFrom
,
"exec"
)
&&
!
STRPREFIX
(
migrateFrom
,
"fd"
)
&&
!
STRPREFIX
(
migrateFrom
,
"unix"
)
&&
STRNEQ
(
migrateFrom
,
"stdio"
))
{
virReportError
(
VIR_ERR_OPERATION_UNSUPPORTED
,
"%s"
,
_
(
"unknown migration protocol"
));
return
-
1
;
}
return
0
;
}
char
*
qemuBuildIncomingURI
(
const
char
*
migrateFrom
,
int
migrateFd
)
{
char
*
uri
=
NULL
;
if
(
STREQ
(
migrateFrom
,
"stdio"
))
ignore_value
(
virAsprintf
(
&
uri
,
"fd:%d"
,
migrateFd
));
else
ignore_value
(
VIR_STRDUP
(
uri
,
migrateFrom
));
return
uri
;
}
qemuBuildCommandLineCallbacks
buildCommandLineCallbacks
=
{
.
qemuGetSCSIDeviceSgName
=
virSCSIDeviceGetSgName
,
...
...
src/qemu/qemu_command.h
浏览文件 @
34b9fe61
...
...
@@ -319,10 +319,5 @@ bool qemuCheckCCWS390AddressSupport(virDomainDefPtr def,
virDomainDeviceInfo
info
,
virQEMUCapsPtr
qemuCaps
,
const
char
*
devicename
);
int
qemuBuildIncomingCheckProtocol
(
virQEMUCapsPtr
qemuCaps
,
const
char
*
migrateFrom
);
char
*
qemuBuildIncomingURI
(
const
char
*
migrateFrom
,
int
migrateFd
);
#endif
/* __QEMU_COMMAND_H__*/
src/qemu/qemu_migration.c
浏览文件 @
34b9fe61
...
...
@@ -2911,6 +2911,46 @@ qemuDomainMigrateOPDRelocate(virQEMUDriverPtr driver ATTRIBUTE_UNUSED,
}
int
qemuMigrationCheckIncoming
(
virQEMUCapsPtr
qemuCaps
,
const
char
*
migrateFrom
)
{
if
(
STRPREFIX
(
migrateFrom
,
"rdma"
))
{
if
(
!
virQEMUCapsGet
(
qemuCaps
,
QEMU_CAPS_MIGRATE_RDMA
))
{
virReportError
(
VIR_ERR_OPERATION_UNSUPPORTED
,
"%s"
,
_
(
"incoming RDMA migration is not supported "
"with this QEMU binary"
));
return
-
1
;
}
}
else
if
(
!
STRPREFIX
(
migrateFrom
,
"tcp"
)
&&
!
STRPREFIX
(
migrateFrom
,
"exec"
)
&&
!
STRPREFIX
(
migrateFrom
,
"fd"
)
&&
!
STRPREFIX
(
migrateFrom
,
"unix"
)
&&
STRNEQ
(
migrateFrom
,
"stdio"
))
{
virReportError
(
VIR_ERR_OPERATION_UNSUPPORTED
,
"%s"
,
_
(
"unknown migration protocol"
));
return
-
1
;
}
return
0
;
}
char
*
qemuMigrationIncomingURI
(
const
char
*
migrateFrom
,
int
migrateFd
)
{
char
*
uri
=
NULL
;
if
(
STREQ
(
migrateFrom
,
"stdio"
))
ignore_value
(
virAsprintf
(
&
uri
,
"fd:%d"
,
migrateFd
));
else
ignore_value
(
VIR_STRDUP
(
uri
,
migrateFrom
));
return
uri
;
}
/* This is called for outgoing non-p2p migrations when a connection to the
* client which initiated the migration was closed but we were waiting for it
* to follow up with the next phase, that is, in between
...
...
src/qemu/qemu_migration.h
浏览文件 @
34b9fe61
...
...
@@ -199,4 +199,10 @@ void qemuMigrationErrorSave(virQEMUDriverPtr driver,
void
qemuMigrationErrorReport
(
virQEMUDriverPtr
driver
,
const
char
*
name
);
int
qemuMigrationCheckIncoming
(
virQEMUCapsPtr
qemuCaps
,
const
char
*
migrateFrom
);
char
*
qemuMigrationIncomingURI
(
const
char
*
migrateFrom
,
int
migrateFd
);
#endif
/* __QEMU_MIGRATION_H__ */
src/qemu/qemu_process.c
浏览文件 @
34b9fe61
...
...
@@ -4514,10 +4514,10 @@ int qemuProcessStart(virConnectPtr conn,
}
if
(
migrateFrom
)
{
if
(
qemu
BuildIncomingCheckProtocol
(
priv
->
qemuCaps
,
migrateFrom
)
<
0
)
if
(
qemu
MigrationCheckIncoming
(
priv
->
qemuCaps
,
migrateFrom
)
<
0
)
goto
error
;
if
(
!
(
migrateURI
=
qemu
Build
IncomingURI
(
migrateFrom
,
stdin_fd
)))
if
(
!
(
migrateURI
=
qemu
Migration
IncomingURI
(
migrateFrom
,
stdin_fd
)))
goto
error
;
}
...
...
tests/qemuxml2argvtest.c
浏览文件 @
34b9fe61
...
...
@@ -17,6 +17,7 @@
# include "qemu/qemu_capabilities.h"
# include "qemu/qemu_command.h"
# include "qemu/qemu_domain.h"
# include "qemu/qemu_migration.h"
# include "datatypes.h"
# include "conf/storage_conf.h"
# include "cpu/cpu_map.h"
...
...
@@ -410,8 +411,8 @@ testCompareXMLToArgvHelper(const void *data)
char
*
migrateURI
=
NULL
;
if
(
info
->
migrateFrom
&&
!
(
migrateURI
=
qemu
Build
IncomingURI
(
info
->
migrateFrom
,
info
->
migrateFd
)))
!
(
migrateURI
=
qemu
Migration
IncomingURI
(
info
->
migrateFrom
,
info
->
migrateFd
)))
goto
cleanup
;
if
(
virAsprintf
(
&
xml
,
"%s/qemuxml2argvdata/qemuxml2argv-%s.xml"
,
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录