Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
libvirt
提交
7f4f1dd4
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看板
提交
7f4f1dd4
编写于
3月 17, 2010
作者:
J
Jiri Denemark
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Implement virDomainMigrateSetMaxDowntime in qemu driver
上级
0ab64235
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
155 addition
and
1 deletion
+155
-1
src/qemu/qemu_driver.c
src/qemu/qemu_driver.c
+75
-1
src/qemu/qemu_monitor.c
src/qemu/qemu_monitor.c
+15
-0
src/qemu/qemu_monitor.h
src/qemu/qemu_monitor.h
+3
-0
src/qemu/qemu_monitor_json.c
src/qemu/qemu_monitor_json.c
+29
-0
src/qemu/qemu_monitor_json.h
src/qemu/qemu_monitor_json.h
+3
-0
src/qemu/qemu_monitor_text.c
src/qemu/qemu_monitor_text.c
+27
-0
src/qemu/qemu_monitor_text.h
src/qemu/qemu_monitor_text.h
+3
-0
未找到文件。
src/qemu/qemu_driver.c
浏览文件 @
7f4f1dd4
...
@@ -99,6 +99,11 @@ enum qemuDomainJob {
...
@@ -99,6 +99,11 @@ enum qemuDomainJob {
enum
qemuDomainJobSignals
{
enum
qemuDomainJobSignals
{
QEMU_JOB_SIGNAL_CANCEL
=
1
<<
0
,
/* Request job cancellation */
QEMU_JOB_SIGNAL_CANCEL
=
1
<<
0
,
/* Request job cancellation */
QEMU_JOB_SIGNAL_SUSPEND
=
1
<<
1
,
/* Request VM suspend to finish live migration offline */
QEMU_JOB_SIGNAL_SUSPEND
=
1
<<
1
,
/* Request VM suspend to finish live migration offline */
QEMU_JOB_SIGNAL_MIGRATE_DOWNTIME
=
1
<<
2
,
/* Request migration downtime change */
};
struct
qemuDomainJobSignalsData
{
unsigned
long
long
migrateDowntime
;
/* Data for QEMU_JOB_SIGNAL_MIGRATE_DOWNTIME */
};
};
typedef
struct
_qemuDomainObjPrivate
qemuDomainObjPrivate
;
typedef
struct
_qemuDomainObjPrivate
qemuDomainObjPrivate
;
...
@@ -107,6 +112,7 @@ struct _qemuDomainObjPrivate {
...
@@ -107,6 +112,7 @@ struct _qemuDomainObjPrivate {
virCond
jobCond
;
/* Use in conjunction with main virDomainObjPtr lock */
virCond
jobCond
;
/* Use in conjunction with main virDomainObjPtr lock */
enum
qemuDomainJob
jobActive
;
/* Currently running job */
enum
qemuDomainJob
jobActive
;
/* Currently running job */
unsigned
int
jobSignals
;
/* Signals for running job */
unsigned
int
jobSignals
;
/* Signals for running job */
struct
qemuDomainJobSignalsData
jobSignalsData
;
/* Signal specific data */
virDomainJobInfo
jobInfo
;
virDomainJobInfo
jobInfo
;
unsigned
long
long
jobStart
;
unsigned
long
long
jobStart
;
...
@@ -352,6 +358,7 @@ static int qemuDomainObjBeginJob(virDomainObjPtr obj)
...
@@ -352,6 +358,7 @@ static int qemuDomainObjBeginJob(virDomainObjPtr obj)
}
}
priv
->
jobActive
=
QEMU_JOB_UNSPECIFIED
;
priv
->
jobActive
=
QEMU_JOB_UNSPECIFIED
;
priv
->
jobSignals
=
0
;
priv
->
jobSignals
=
0
;
memset
(
&
priv
->
jobSignalsData
,
0
,
sizeof
(
priv
->
jobSignalsData
));
priv
->
jobStart
=
(
now
.
tv_sec
*
1000ull
)
+
(
now
.
tv_usec
/
1000
);
priv
->
jobStart
=
(
now
.
tv_sec
*
1000ull
)
+
(
now
.
tv_usec
/
1000
);
memset
(
&
priv
->
jobInfo
,
0
,
sizeof
(
priv
->
jobInfo
));
memset
(
&
priv
->
jobInfo
,
0
,
sizeof
(
priv
->
jobInfo
));
...
@@ -399,6 +406,7 @@ static int qemuDomainObjBeginJobWithDriver(struct qemud_driver *driver,
...
@@ -399,6 +406,7 @@ static int qemuDomainObjBeginJobWithDriver(struct qemud_driver *driver,
}
}
priv
->
jobActive
=
QEMU_JOB_UNSPECIFIED
;
priv
->
jobActive
=
QEMU_JOB_UNSPECIFIED
;
priv
->
jobSignals
=
0
;
priv
->
jobSignals
=
0
;
memset
(
&
priv
->
jobSignalsData
,
0
,
sizeof
(
priv
->
jobSignalsData
));
priv
->
jobStart
=
(
now
.
tv_sec
*
1000ull
)
+
(
now
.
tv_usec
/
1000
);
priv
->
jobStart
=
(
now
.
tv_sec
*
1000ull
)
+
(
now
.
tv_usec
/
1000
);
memset
(
&
priv
->
jobInfo
,
0
,
sizeof
(
priv
->
jobInfo
));
memset
(
&
priv
->
jobInfo
,
0
,
sizeof
(
priv
->
jobInfo
));
...
@@ -424,6 +432,7 @@ static int ATTRIBUTE_RETURN_CHECK qemuDomainObjEndJob(virDomainObjPtr obj)
...
@@ -424,6 +432,7 @@ static int ATTRIBUTE_RETURN_CHECK qemuDomainObjEndJob(virDomainObjPtr obj)
priv
->
jobActive
=
QEMU_JOB_NONE
;
priv
->
jobActive
=
QEMU_JOB_NONE
;
priv
->
jobSignals
=
0
;
priv
->
jobSignals
=
0
;
memset
(
&
priv
->
jobSignalsData
,
0
,
sizeof
(
priv
->
jobSignalsData
));
priv
->
jobStart
=
0
;
priv
->
jobStart
=
0
;
memset
(
&
priv
->
jobInfo
,
0
,
sizeof
(
priv
->
jobInfo
));
memset
(
&
priv
->
jobInfo
,
0
,
sizeof
(
priv
->
jobInfo
));
virCondSignal
(
&
priv
->
jobCond
);
virCondSignal
(
&
priv
->
jobCond
);
...
@@ -4064,6 +4073,17 @@ qemuDomainWaitForMigrationComplete(struct qemud_driver *driver, virDomainObjPtr
...
@@ -4064,6 +4073,17 @@ qemuDomainWaitForMigrationComplete(struct qemud_driver *driver, virDomainObjPtr
VIR_DEBUG0
(
"Pausing domain for non-live migration"
);
VIR_DEBUG0
(
"Pausing domain for non-live migration"
);
if
(
qemuDomainMigrateOffline
(
driver
,
vm
)
<
0
)
if
(
qemuDomainMigrateOffline
(
driver
,
vm
)
<
0
)
VIR_WARN0
(
"Unable to pause domain"
);
VIR_WARN0
(
"Unable to pause domain"
);
}
else
if
(
priv
->
jobSignals
&
QEMU_JOB_SIGNAL_MIGRATE_DOWNTIME
)
{
unsigned
long
long
ms
=
priv
->
jobSignalsData
.
migrateDowntime
;
priv
->
jobSignals
^=
QEMU_JOB_SIGNAL_MIGRATE_DOWNTIME
;
priv
->
jobSignalsData
.
migrateDowntime
=
0
;
VIR_DEBUG
(
"Setting migration downtime to %llums"
,
ms
);
qemuDomainObjEnterMonitorWithDriver
(
driver
,
vm
);
rc
=
qemuMonitorSetMigrationDowntime
(
priv
->
mon
,
ms
);
qemuDomainObjExitMonitorWithDriver
(
driver
,
vm
);
if
(
rc
<
0
)
VIR_WARN0
(
"Unable to set migration downtime"
);
}
}
qemuDomainObjEnterMonitorWithDriver
(
driver
,
vm
);
qemuDomainObjEnterMonitorWithDriver
(
driver
,
vm
);
...
@@ -9520,6 +9540,60 @@ cleanup:
...
@@ -9520,6 +9540,60 @@ cleanup:
}
}
static
int
qemuDomainMigrateSetMaxDowntime
(
virDomainPtr
dom
,
unsigned
long
long
downtime
,
unsigned
int
flags
)
{
struct
qemud_driver
*
driver
=
dom
->
conn
->
privateData
;
virDomainObjPtr
vm
;
qemuDomainObjPrivatePtr
priv
;
int
ret
=
-
1
;
if
(
flags
!=
0
)
{
qemuReportError
(
VIR_ERR_INVALID_ARG
,
_
(
"unsupported flags (0x%x) passed to '%s'"
),
flags
,
__FUNCTION__
);
return
-
1
;
}
qemuDriverLock
(
driver
);
vm
=
virDomainFindByUUID
(
&
driver
->
domains
,
dom
->
uuid
);
if
(
!
vm
)
{
char
uuidstr
[
VIR_UUID_STRING_BUFLEN
];
virUUIDFormat
(
dom
->
uuid
,
uuidstr
);
qemuReportError
(
VIR_ERR_NO_DOMAIN
,
_
(
"no domain with matching uuid '%s'"
),
uuidstr
);
goto
cleanup
;
}
if
(
!
virDomainObjIsActive
(
vm
))
{
qemuReportError
(
VIR_ERR_OPERATION_INVALID
,
"%s"
,
_
(
"domain is not running"
));
goto
cleanup
;
}
priv
=
vm
->
privateData
;
if
(
priv
->
jobActive
!=
QEMU_JOB_MIGRATION
)
{
qemuReportError
(
VIR_ERR_OPERATION_INVALID
,
"%s"
,
_
(
"domain is not being migrated"
));
goto
cleanup
;
}
VIR_DEBUG
(
"Requesting migration downtime change to %llums"
,
downtime
);
priv
->
jobSignals
|=
QEMU_JOB_SIGNAL_MIGRATE_DOWNTIME
;
priv
->
jobSignalsData
.
migrateDowntime
=
downtime
;
ret
=
0
;
cleanup:
if
(
vm
)
virDomainObjUnlock
(
vm
);
qemuDriverUnlock
(
driver
);
return
ret
;
}
static
virDriver
qemuDriver
=
{
static
virDriver
qemuDriver
=
{
VIR_DRV_QEMU
,
VIR_DRV_QEMU
,
"QEMU"
,
"QEMU"
,
...
@@ -9601,7 +9675,7 @@ static virDriver qemuDriver = {
...
@@ -9601,7 +9675,7 @@ static virDriver qemuDriver = {
qemuCPUBaseline
,
/* cpuBaseline */
qemuCPUBaseline
,
/* cpuBaseline */
qemuDomainGetJobInfo
,
/* domainGetJobInfo */
qemuDomainGetJobInfo
,
/* domainGetJobInfo */
qemuDomainAbortJob
,
/* domainAbortJob */
qemuDomainAbortJob
,
/* domainAbortJob */
NULL
,
/* domainMigrateSetMaxDowntime */
qemuDomainMigrateSetMaxDowntime
,
/* domainMigrateSetMaxDowntime */
};
};
...
...
src/qemu/qemu_monitor.c
浏览文件 @
7f4f1dd4
...
@@ -1016,6 +1016,21 @@ int qemuMonitorSetMigrationSpeed(qemuMonitorPtr mon,
...
@@ -1016,6 +1016,21 @@ int qemuMonitorSetMigrationSpeed(qemuMonitorPtr mon,
return
ret
;
return
ret
;
}
}
int
qemuMonitorSetMigrationDowntime
(
qemuMonitorPtr
mon
,
unsigned
long
long
downtime
)
{
int
ret
;
DEBUG
(
"mon=%p, fd=%d downtime=%llu"
,
mon
,
mon
->
fd
,
downtime
);
if
(
mon
->
json
)
ret
=
qemuMonitorJSONSetMigrationDowntime
(
mon
,
downtime
);
else
ret
=
qemuMonitorTextSetMigrationDowntime
(
mon
,
downtime
);
return
ret
;
}
int
qemuMonitorGetMigrationStatus
(
qemuMonitorPtr
mon
,
int
qemuMonitorGetMigrationStatus
(
qemuMonitorPtr
mon
,
int
*
status
,
int
*
status
,
unsigned
long
long
*
transferred
,
unsigned
long
long
*
transferred
,
...
...
src/qemu/qemu_monitor.h
浏览文件 @
7f4f1dd4
...
@@ -176,6 +176,9 @@ int qemuMonitorSavePhysicalMemory(qemuMonitorPtr mon,
...
@@ -176,6 +176,9 @@ int qemuMonitorSavePhysicalMemory(qemuMonitorPtr mon,
int
qemuMonitorSetMigrationSpeed
(
qemuMonitorPtr
mon
,
int
qemuMonitorSetMigrationSpeed
(
qemuMonitorPtr
mon
,
unsigned
long
bandwidth
);
unsigned
long
bandwidth
);
int
qemuMonitorSetMigrationDowntime
(
qemuMonitorPtr
mon
,
unsigned
long
long
downtime
);
enum
{
enum
{
QEMU_MONITOR_MIGRATION_STATUS_INACTIVE
,
QEMU_MONITOR_MIGRATION_STATUS_INACTIVE
,
QEMU_MONITOR_MIGRATION_STATUS_ACTIVE
,
QEMU_MONITOR_MIGRATION_STATUS_ACTIVE
,
...
...
src/qemu/qemu_monitor_json.c
浏览文件 @
7f4f1dd4
...
@@ -1088,6 +1088,35 @@ int qemuMonitorJSONSetMigrationSpeed(qemuMonitorPtr mon,
...
@@ -1088,6 +1088,35 @@ int qemuMonitorJSONSetMigrationSpeed(qemuMonitorPtr mon,
}
}
int
qemuMonitorJSONSetMigrationDowntime
(
qemuMonitorPtr
mon
,
unsigned
long
long
downtime
)
{
int
ret
;
char
*
downtimestr
;
virJSONValuePtr
cmd
;
virJSONValuePtr
reply
=
NULL
;
if
(
virAsprintf
(
&
downtimestr
,
"%llums"
,
downtime
)
<
0
)
{
virReportOOMError
();
return
-
1
;
}
cmd
=
qemuMonitorJSONMakeCommand
(
"migrate_set_downtime"
,
"s:value"
,
downtimestr
,
NULL
);
VIR_FREE
(
downtimestr
);
if
(
!
cmd
)
return
-
1
;
ret
=
qemuMonitorJSONCommand
(
mon
,
cmd
,
&
reply
);
if
(
ret
==
0
)
ret
=
qemuMonitorJSONCheckError
(
cmd
,
reply
);
virJSONValueFree
(
cmd
);
virJSONValueFree
(
reply
);
return
ret
;
}
static
int
static
int
qemuMonitorJSONGetMigrationStatusReply
(
virJSONValuePtr
reply
,
qemuMonitorJSONGetMigrationStatusReply
(
virJSONValuePtr
reply
,
int
*
status
,
int
*
status
,
...
...
src/qemu/qemu_monitor_json.h
浏览文件 @
7f4f1dd4
...
@@ -81,6 +81,9 @@ int qemuMonitorJSONSavePhysicalMemory(qemuMonitorPtr mon,
...
@@ -81,6 +81,9 @@ int qemuMonitorJSONSavePhysicalMemory(qemuMonitorPtr mon,
int
qemuMonitorJSONSetMigrationSpeed
(
qemuMonitorPtr
mon
,
int
qemuMonitorJSONSetMigrationSpeed
(
qemuMonitorPtr
mon
,
unsigned
long
bandwidth
);
unsigned
long
bandwidth
);
int
qemuMonitorJSONSetMigrationDowntime
(
qemuMonitorPtr
mon
,
unsigned
long
long
downtime
);
int
qemuMonitorJSONGetMigrationStatus
(
qemuMonitorPtr
mon
,
int
qemuMonitorJSONGetMigrationStatus
(
qemuMonitorPtr
mon
,
int
*
status
,
int
*
status
,
unsigned
long
long
*
transferred
,
unsigned
long
long
*
transferred
,
...
...
src/qemu/qemu_monitor_text.c
浏览文件 @
7f4f1dd4
...
@@ -999,6 +999,33 @@ cleanup:
...
@@ -999,6 +999,33 @@ cleanup:
}
}
int
qemuMonitorTextSetMigrationDowntime
(
qemuMonitorPtr
mon
,
unsigned
long
long
downtime
)
{
char
*
cmd
=
NULL
;
char
*
info
=
NULL
;
int
ret
=
-
1
;
if
(
virAsprintf
(
&
cmd
,
"migrate_set_downtime %llums"
,
downtime
)
<
0
)
{
virReportOOMError
();
goto
cleanup
;
}
if
(
qemuMonitorCommand
(
mon
,
cmd
,
&
info
)
<
0
)
{
qemuReportError
(
VIR_ERR_OPERATION_FAILED
,
"%s"
,
_
(
"could not set maximum migration downtime"
));
goto
cleanup
;
}
ret
=
0
;
cleanup:
VIR_FREE
(
info
);
VIR_FREE
(
cmd
);
return
ret
;
}
#define MIGRATION_PREFIX "Migration status: "
#define MIGRATION_PREFIX "Migration status: "
#define MIGRATION_TRANSFER_PREFIX "transferred ram: "
#define MIGRATION_TRANSFER_PREFIX "transferred ram: "
#define MIGRATION_REMAINING_PREFIX "remaining ram: "
#define MIGRATION_REMAINING_PREFIX "remaining ram: "
...
...
src/qemu/qemu_monitor_text.h
浏览文件 @
7f4f1dd4
...
@@ -83,6 +83,9 @@ int qemuMonitorTextSavePhysicalMemory(qemuMonitorPtr mon,
...
@@ -83,6 +83,9 @@ int qemuMonitorTextSavePhysicalMemory(qemuMonitorPtr mon,
int
qemuMonitorTextSetMigrationSpeed
(
qemuMonitorPtr
mon
,
int
qemuMonitorTextSetMigrationSpeed
(
qemuMonitorPtr
mon
,
unsigned
long
bandwidth
);
unsigned
long
bandwidth
);
int
qemuMonitorTextSetMigrationDowntime
(
qemuMonitorPtr
mon
,
unsigned
long
long
downtime
);
int
qemuMonitorTextGetMigrationStatus
(
qemuMonitorPtr
mon
,
int
qemuMonitorTextGetMigrationStatus
(
qemuMonitorPtr
mon
,
int
*
status
,
int
*
status
,
unsigned
long
long
*
transferred
,
unsigned
long
long
*
transferred
,
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录