Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
libvirt
提交
bfa2bd7e
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看板
提交
bfa2bd7e
编写于
11月 20, 2018
作者:
A
Andrea Bolognani
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
conf: Parse and format nested-hv feature
Signed-off-by:
N
Andrea Bolognani
<
abologna@redhat.com
>
上级
0029eace
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
25 addition
and
0 deletion
+25
-0
docs/formatdomain.html.in
docs/formatdomain.html.in
+12
-0
docs/schemas/domaincommon.rng
docs/schemas/domaincommon.rng
+5
-0
src/conf/domain_conf.c
src/conf/domain_conf.c
+4
-0
src/conf/domain_conf.h
src/conf/domain_conf.h
+1
-0
src/qemu/qemu_domain.c
src/qemu/qemu_domain.c
+1
-0
tests/qemuxml2argvdata/pseries-features.xml
tests/qemuxml2argvdata/pseries-features.xml
+1
-0
tests/qemuxml2xmloutdata/pseries-features.xml
tests/qemuxml2xmloutdata/pseries-features.xml
+1
-0
未找到文件。
docs/formatdomain.html.in
浏览文件 @
bfa2bd7e
...
@@ -2295,6 +2295,18 @@
...
@@ -2295,6 +2295,18 @@
defined, the hypervisor default will be used.
defined, the hypervisor default will be used.
<span
class=
"since"
>
Since 4.6.0
</span>
(QEMU/KVM only)
<span
class=
"since"
>
Since 4.6.0
</span>
(QEMU/KVM only)
</dd>
</dd>
<dt><code>
nested-hv
</code></dt>
<dd>
Configure nested HV availability for pSeries guests. This needs to
be enabled from the host (L0) in order to be effective; having HV
support in the (L1) guest is very desiderable if it's planned to
run nested (L2) guests inside it, because it will result in those
nested guests having much better performance than they would when
using KVM PR or TCG.
Possible values for the
<code>
state
</code>
attribute are
<code>
on
</code>
and
<code>
off
</code>
. If the attribute is not
defined, the hypervisor default will be used.
<span
class=
"since"
>
Since 4.10.0
</span>
(QEMU/KVM only)
</dd>
</dl>
</dl>
<h3><a
id=
"elementsTime"
>
Time keeping
</a></h3>
<h3><a
id=
"elementsTime"
>
Time keeping
</a></h3>
...
...
docs/schemas/domaincommon.rng
浏览文件 @
bfa2bd7e
...
@@ -4978,6 +4978,11 @@
...
@@ -4978,6 +4978,11 @@
<ref
name=
"featurestate"
/>
<ref
name=
"featurestate"
/>
</element>
</element>
</optional>
</optional>
<optional>
<element
name=
"nested-hv"
>
<ref
name=
"featurestate"
/>
</element>
</optional>
</interleave>
</interleave>
</element>
</element>
</optional>
</optional>
...
...
src/conf/domain_conf.c
浏览文件 @
bfa2bd7e
...
@@ -154,6 +154,7 @@ VIR_ENUM_IMPL(virDomainFeature, VIR_DOMAIN_FEATURE_LAST,
...
@@ -154,6 +154,7 @@ VIR_ENUM_IMPL(virDomainFeature, VIR_DOMAIN_FEATURE_LAST,
"hpt",
"hpt",
"vmcoreinfo",
"vmcoreinfo",
"htm",
"htm",
"nested-hv",
);
);
VIR_ENUM_IMPL(virDomainCapabilitiesPolicy, VIR_DOMAIN_CAPABILITIES_POLICY_LAST,
VIR_ENUM_IMPL(virDomainCapabilitiesPolicy, VIR_DOMAIN_CAPABILITIES_POLICY_LAST,
...
@@ -20159,6 +20160,7 @@ virDomainDefParseXML(xmlDocPtr xml,
...
@@ -20159,6 +20160,7 @@ virDomainDefParseXML(xmlDocPtr xml,
break;
break;
case VIR_DOMAIN_FEATURE_HTM:
case VIR_DOMAIN_FEATURE_HTM:
case VIR_DOMAIN_FEATURE_NESTED_HV:
if (!(tmp = virXMLPropString(nodes[i], "state"))) {
if (!(tmp = virXMLPropString(nodes[i], "state"))) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("missing state attribute '%s' of feature '%s'"),
_("missing state attribute '%s' of feature '%s'"),
...
@@ -22321,6 +22323,7 @@ virDomainDefFeaturesCheckABIStability(virDomainDefPtr src,
...
@@ -22321,6 +22323,7 @@ virDomainDefFeaturesCheckABIStability(virDomainDefPtr src,
case VIR_DOMAIN_FEATURE_SMM:
case VIR_DOMAIN_FEATURE_SMM:
case VIR_DOMAIN_FEATURE_VMCOREINFO:
case VIR_DOMAIN_FEATURE_VMCOREINFO:
case VIR_DOMAIN_FEATURE_HTM:
case VIR_DOMAIN_FEATURE_HTM:
case VIR_DOMAIN_FEATURE_NESTED_HV:
if (src->features[i] != dst->features[i]) {
if (src->features[i] != dst->features[i]) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("State of feature '%s' differs: "
_("State of feature '%s' differs: "
...
@@ -28236,6 +28239,7 @@ virDomainDefFormatInternal(virDomainDefPtr def,
...
@@ -28236,6 +28239,7 @@ virDomainDefFormatInternal(virDomainDefPtr def,
case VIR_DOMAIN_FEATURE_PVSPINLOCK:
case VIR_DOMAIN_FEATURE_PVSPINLOCK:
case VIR_DOMAIN_FEATURE_VMPORT:
case VIR_DOMAIN_FEATURE_VMPORT:
case VIR_DOMAIN_FEATURE_HTM:
case VIR_DOMAIN_FEATURE_HTM:
case VIR_DOMAIN_FEATURE_NESTED_HV:
switch ((virTristateSwitch) def->features[i]) {
switch ((virTristateSwitch) def->features[i]) {
case VIR_TRISTATE_SWITCH_LAST:
case VIR_TRISTATE_SWITCH_LAST:
case VIR_TRISTATE_SWITCH_ABSENT:
case VIR_TRISTATE_SWITCH_ABSENT:
...
...
src/conf/domain_conf.h
浏览文件 @
bfa2bd7e
...
@@ -1778,6 +1778,7 @@ typedef enum {
...
@@ -1778,6 +1778,7 @@ typedef enum {
VIR_DOMAIN_FEATURE_HPT
,
VIR_DOMAIN_FEATURE_HPT
,
VIR_DOMAIN_FEATURE_VMCOREINFO
,
VIR_DOMAIN_FEATURE_VMCOREINFO
,
VIR_DOMAIN_FEATURE_HTM
,
VIR_DOMAIN_FEATURE_HTM
,
VIR_DOMAIN_FEATURE_NESTED_HV
,
VIR_DOMAIN_FEATURE_LAST
VIR_DOMAIN_FEATURE_LAST
}
virDomainFeature
;
}
virDomainFeature
;
...
...
src/qemu/qemu_domain.c
浏览文件 @
bfa2bd7e
...
@@ -3890,6 +3890,7 @@ qemuDomainDefValidateFeatures(const virDomainDef *def,
...
@@ -3890,6 +3890,7 @@ qemuDomainDefValidateFeatures(const virDomainDef *def,
case
VIR_DOMAIN_FEATURE_HPT
:
case
VIR_DOMAIN_FEATURE_HPT
:
case
VIR_DOMAIN_FEATURE_HTM
:
case
VIR_DOMAIN_FEATURE_HTM
:
case
VIR_DOMAIN_FEATURE_NESTED_HV
:
if
(
def
->
features
[
i
]
!=
VIR_TRISTATE_SWITCH_ABSENT
&&
if
(
def
->
features
[
i
]
!=
VIR_TRISTATE_SWITCH_ABSENT
&&
!
qemuDomainIsPSeries
(
def
))
{
!
qemuDomainIsPSeries
(
def
))
{
virReportError
(
VIR_ERR_CONFIG_UNSUPPORTED
,
virReportError
(
VIR_ERR_CONFIG_UNSUPPORTED
,
...
...
tests/qemuxml2argvdata/pseries-features.xml
浏览文件 @
bfa2bd7e
...
@@ -11,6 +11,7 @@
...
@@ -11,6 +11,7 @@
<maxpagesize
unit=
'GiB'
>
1
</maxpagesize>
<maxpagesize
unit=
'GiB'
>
1
</maxpagesize>
</hpt>
</hpt>
<htm
state=
'on'
/>
<htm
state=
'on'
/>
<nested-hv
state=
'off'
/>
</features>
</features>
<devices>
<devices>
<emulator>
/usr/bin/qemu-system-ppc64
</emulator>
<emulator>
/usr/bin/qemu-system-ppc64
</emulator>
...
...
tests/qemuxml2xmloutdata/pseries-features.xml
浏览文件 @
bfa2bd7e
...
@@ -13,6 +13,7 @@
...
@@ -13,6 +13,7 @@
<maxpagesize
unit=
'KiB'
>
1048576
</maxpagesize>
<maxpagesize
unit=
'KiB'
>
1048576
</maxpagesize>
</hpt>
</hpt>
<htm
state=
'on'
/>
<htm
state=
'on'
/>
<nested-hv
state=
'off'
/>
</features>
</features>
<clock
offset=
'utc'
/>
<clock
offset=
'utc'
/>
<on_poweroff>
destroy
</on_poweroff>
<on_poweroff>
destroy
</on_poweroff>
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录