Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
libvirt
提交
cb7593bd
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,发现更多精彩内容 >>
提交
cb7593bd
编写于
3月 27, 2009
作者:
D
Daniel P. Berrange
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Support memory ballooning in QEMU
上级
97230f6a
变更
3
显示空白变更内容
内联
并排
Showing
3 changed file
with
137 addition
and
10 deletion
+137
-10
ChangeLog
ChangeLog
+10
-0
src/qemu_conf.c
src/qemu_conf.c
+5
-1
src/qemu_driver.c
src/qemu_driver.c
+122
-9
未找到文件。
ChangeLog
浏览文件 @
cb7593bd
Fri Mar 27 11:44:22 GMT 2009 Daniel P. Berrange <berrange@redhat.com>
Support memory ballooning in QEMU
* src/qemu_conf.c: Fix initial QEMU startup memory allocation
to be based on 'max memory'
* src/qemu_driver.c: Balloon down allocation to 'memory'
setting at startup. Implement virDomainSetMemory() for running
guests via memory balloon. Report mem current usage by querying
memory balloon.
Tue Mar 24 11:14:22 GMT 2009 Daniel P. Berrange <berrange@redhat.com>
* src/capabilities.c, file src/capabilities.h,
...
...
src/qemu_conf.c
浏览文件 @
cb7593bd
...
...
@@ -927,7 +927,11 @@ int qemudBuildCommandLine(virConnectPtr conn,
} \
} while (0)
snprintf
(
memory
,
sizeof
(
memory
),
"%lu"
,
vm
->
def
->
memory
/
1024
);
/* Set '-m MB' based on maxmem, because the lower 'memory' limit
* is set post-startup using the balloon driver. If balloon driver
* is not supported, then they're out of luck anyway
*/
snprintf
(
memory
,
sizeof
(
memory
),
"%lu"
,
vm
->
def
->
maxmem
/
1024
);
snprintf
(
vcpus
,
sizeof
(
vcpus
),
"%lu"
,
vm
->
def
->
vcpus
);
snprintf
(
domid
,
sizeof
(
domid
),
"%d"
,
vm
->
def
->
id
);
pidfile
=
virFilePid
(
driver
->
stateDir
,
vm
->
def
->
name
);
...
...
src/qemu_driver.c
浏览文件 @
cb7593bd
...
...
@@ -122,6 +122,9 @@ static int qemudMonitorCommandExtra(const virDomainObjPtr vm,
const
char
*
extra
,
const
char
*
extraPrompt
,
char
**
reply
);
static
int
qemudDomainSetMemoryBalloon
(
virConnectPtr
conn
,
virDomainObjPtr
vm
,
unsigned
long
newmem
);
static
struct
qemud_driver
*
qemu_driver
=
NULL
;
...
...
@@ -1481,6 +1484,7 @@ static int qemudStartVMDaemon(virConnectPtr conn,
(
qemudDetectVcpuPIDs
(
conn
,
vm
)
<
0
)
||
(
qemudInitCpus
(
conn
,
vm
,
migrateFrom
)
<
0
)
||
(
qemudInitPasswords
(
conn
,
driver
,
vm
)
<
0
)
||
(
qemudDomainSetMemoryBalloon
(
conn
,
vm
,
vm
->
def
->
memory
)
<
0
)
||
(
qemudSaveDomainStatus
(
conn
,
qemu_driver
,
vm
)
<
0
))
{
qemudShutdownVMDaemon
(
conn
,
driver
,
vm
);
return
-
1
;
...
...
@@ -2410,6 +2414,95 @@ cleanup:
return
ret
;
}
/* The reply from QEMU contains 'ballon: actual=421' where value is in MB */
#define BALLOON_PREFIX "balloon: actual="
/*
* Returns: 0 if balloon not supported, +1 if balloon query worked
* or -1 on failure
*/
static
int
qemudDomainGetMemoryBalloon
(
virConnectPtr
conn
,
virDomainObjPtr
vm
,
unsigned
long
*
currmem
)
{
char
*
reply
=
NULL
;
int
ret
=
-
1
;
char
*
offset
;
if
(
qemudMonitorCommand
(
vm
,
"info balloon"
,
&
reply
)
<
0
)
{
qemudReportError
(
conn
,
dom
,
NULL
,
VIR_ERR_OPERATION_FAILED
,
"%s"
,
_
(
"could not query memory balloon allocation"
));
goto
cleanup
;
}
DEBUG
(
"balloon reply: '%s'"
,
reply
);
if
((
offset
=
strstr
(
reply
,
BALLOON_PREFIX
))
!=
NULL
)
{
unsigned
int
memMB
;
char
*
end
;
offset
+=
strlen
(
BALLOON_PREFIX
);
if
(
virStrToLong_ui
(
offset
,
&
end
,
10
,
&
memMB
)
<
0
)
{
qemudReportError
(
conn
,
dom
,
NULL
,
VIR_ERR_OPERATION_FAILED
,
"%s"
,
_
(
"could not parse memory balloon allocation"
));
goto
cleanup
;
}
*
currmem
=
memMB
*
1024
;
ret
=
1
;
}
else
{
/* We don't raise an error here, since its to be expected that
* many QEMU's don't support ballooning
*/
ret
=
0
;
}
cleanup:
VIR_FREE
(
reply
);
return
ret
;
}
/*
* Returns: 0 if balloon not supported, +1 if balloon query worked
* or -1 on failure
*/
static
int
qemudDomainSetMemoryBalloon
(
virConnectPtr
conn
,
virDomainObjPtr
vm
,
unsigned
long
newmem
)
{
char
*
cmd
;
char
*
reply
=
NULL
;
int
ret
=
-
1
;
/*
* 'newmem' is in KB, QEMU monitor works in MB, and we all wish
* we just worked in bytes with unsigned long long everywhere.
*/
if
(
virAsprintf
(
&
cmd
,
"balloon %lu"
,
(
newmem
/
1024
))
<
0
)
{
virReportOOMError
(
conn
);
goto
cleanup
;
}
if
(
qemudMonitorCommand
(
vm
,
cmd
,
&
reply
)
<
0
)
{
qemudReportError
(
conn
,
dom
,
NULL
,
VIR_ERR_OPERATION_FAILED
,
"%s"
,
_
(
"could not balloon memory allocation"
));
VIR_FREE
(
cmd
);
goto
cleanup
;
}
VIR_FREE
(
cmd
);
/* If the command failed qemu prints: 'unknown command'
* No message is printed on success it seems */
DEBUG
(
"balloon reply: %s"
,
reply
);
if
(
strstr
(
reply
,
"
\n
unknown command:"
))
{
/* Don't set error - it is expected memory balloon fails on many qemu */
ret
=
0
;
}
else
{
ret
=
1
;
}
cleanup:
VIR_FREE
(
reply
);
return
ret
;
}
static
int
qemudDomainSetMemory
(
virDomainPtr
dom
,
unsigned
long
newmem
)
{
struct
qemud_driver
*
driver
=
dom
->
conn
->
privateData
;
virDomainObjPtr
vm
;
...
...
@@ -2427,20 +2520,21 @@ static int qemudDomainSetMemory(virDomainPtr dom, unsigned long newmem) {
goto
cleanup
;
}
if
(
virDomainIsActive
(
vm
))
{
qemudReportError
(
dom
->
conn
,
dom
,
NULL
,
VIR_ERR_NO_SUPPORT
,
"%s"
,
_
(
"cannot set memory of an active domain"
));
goto
cleanup
;
}
if
(
newmem
>
vm
->
def
->
maxmem
)
{
qemudReportError
(
dom
->
conn
,
dom
,
NULL
,
VIR_ERR_INVALID_ARG
,
"%s"
,
_
(
"cannot set memory higher than max memory"
));
goto
cleanup
;
}
if
(
virDomainIsActive
(
vm
))
{
ret
=
qemudDomainSetMemoryBalloon
(
dom
->
conn
,
vm
,
newmem
);
if
(
ret
==
0
)
qemudReportError
(
dom
->
conn
,
dom
,
NULL
,
VIR_ERR_NO_SUPPORT
,
"%s"
,
_
(
"cannot set memory of an active domain"
));
}
else
{
vm
->
def
->
memory
=
newmem
;
ret
=
0
;
}
cleanup:
if
(
vm
)
...
...
@@ -2453,6 +2547,8 @@ static int qemudDomainGetInfo(virDomainPtr dom,
struct
qemud_driver
*
driver
=
dom
->
conn
->
privateData
;
virDomainObjPtr
vm
;
int
ret
=
-
1
;
int
err
;
unsigned
long
balloon
;
qemuDriverLock
(
driver
);
vm
=
virDomainFindByUUID
(
&
driver
->
domains
,
dom
->
uuid
);
...
...
@@ -2474,8 +2570,16 @@ static int qemudDomainGetInfo(virDomainPtr dom,
}
}
err
=
qemudDomainGetMemoryBalloon
(
dom
->
conn
,
vm
,
&
balloon
);
if
(
err
<
0
)
goto
cleanup
;
info
->
maxMem
=
vm
->
def
->
maxmem
;
info
->
memory
=
vm
->
def
->
memory
;
if
(
err
==
0
)
/* Balloon not supported, so maxmem is always the allocation */
info
->
memory
=
vm
->
def
->
maxmem
;
else
info
->
memory
=
balloon
;
info
->
nrVirtCpu
=
vm
->
def
->
vcpus
;
ret
=
0
;
...
...
@@ -3170,6 +3274,8 @@ static char *qemudDomainDumpXML(virDomainPtr dom,
struct
qemud_driver
*
driver
=
dom
->
conn
->
privateData
;
virDomainObjPtr
vm
;
char
*
ret
=
NULL
;
unsigned
long
balloon
;
int
err
;
qemuDriverLock
(
driver
);
vm
=
virDomainFindByUUID
(
&
driver
->
domains
,
dom
->
uuid
);
...
...
@@ -3181,6 +3287,13 @@ static char *qemudDomainDumpXML(virDomainPtr dom,
goto
cleanup
;
}
/* Refresh current memory based on balloon info */
err
=
qemudDomainGetMemoryBalloon
(
dom
->
conn
,
vm
,
&
balloon
);
if
(
err
<
0
)
goto
cleanup
;
if
(
err
>
0
)
vm
->
def
->
memory
=
balloon
;
ret
=
virDomainDefFormat
(
dom
->
conn
,
(
flags
&
VIR_DOMAIN_XML_INACTIVE
)
&&
vm
->
newDef
?
vm
->
newDef
:
vm
->
def
,
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录