Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
libvirt
提交
5900356e
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看板
提交
5900356e
编写于
1月 04, 2016
作者:
C
Cole Robinson
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
qemu: caps: Rename CAPS_DISABLE_S[34] to CAPS_PIIX_DISABLE_S[34]
These settings are specific to PIIX, so clarify it
上级
ab963449
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
10 addition
and
10 deletion
+10
-10
src/qemu/qemu_capabilities.c
src/qemu/qemu_capabilities.c
+2
-2
src/qemu/qemu_capabilities.h
src/qemu/qemu_capabilities.h
+2
-2
src/qemu/qemu_command.c
src/qemu/qemu_command.c
+2
-2
tests/qemuxml2argvtest.c
tests/qemuxml2argvtest.c
+4
-4
未找到文件。
src/qemu/qemu_capabilities.c
浏览文件 @
5900356e
...
...
@@ -1597,8 +1597,8 @@ static struct virQEMUCapsStringFlags virQEMUCapsObjectPropsIDEDrive[] = {
};
static
struct
virQEMUCapsStringFlags
virQEMUCapsObjectPropsPiix4PM
[]
=
{
{
"disable_s3"
,
QEMU_CAPS_DISABLE_S3
},
{
"disable_s4"
,
QEMU_CAPS_DISABLE_S4
},
{
"disable_s3"
,
QEMU_CAPS_
PIIX_
DISABLE_S3
},
{
"disable_s4"
,
QEMU_CAPS_
PIIX_
DISABLE_S4
},
};
static
struct
virQEMUCapsStringFlags
virQEMUCapsObjectPropsUSBRedir
[]
=
{
...
...
src/qemu/qemu_capabilities.h
浏览文件 @
5900356e
...
...
@@ -190,10 +190,10 @@ typedef enum {
QEMU_CAPS_SCSI_LSI
,
/* -device lsi */
QEMU_CAPS_VIRTIO_SCSI
,
/* -device virtio-scsi-* */
QEMU_CAPS_BLOCKIO
,
/* -device ...logical_block_size & co */
QEMU_CAPS_
DISABLE_S3
,
/*
S3 BIOS Advertisement on/off */
QEMU_CAPS_
PIIX_DISABLE_S3
,
/* -M pc
S3 BIOS Advertisement on/off */
/* 105 */
QEMU_CAPS_
DISABLE_S4
,
/*
S4 BIOS Advertisement on/off */
QEMU_CAPS_
PIIX_DISABLE_S4
,
/* -M pc
S4 BIOS Advertisement on/off */
QEMU_CAPS_USB_REDIR_FILTER
,
/* usb-redir.filter */
QEMU_CAPS_IDE_DRIVE_WWN
,
/* Is ide-drive.wwn available? */
QEMU_CAPS_SCSI_DISK_WWN
,
/* Is scsi-disk.wwn available? */
...
...
src/qemu/qemu_command.c
浏览文件 @
5900356e
...
...
@@ -9806,7 +9806,7 @@ qemuBuildCommandLine(virConnectPtr conn,
}
if
(
def
->
pm
.
s3
)
{
if
(
!
virQEMUCapsGet
(
qemuCaps
,
QEMU_CAPS_DISABLE_S3
))
{
if
(
!
virQEMUCapsGet
(
qemuCaps
,
QEMU_CAPS_
PIIX_
DISABLE_S3
))
{
virReportError
(
VIR_ERR_CONFIG_UNSUPPORTED
,
"%s"
,
_
(
"setting ACPI S3 not supported"
));
goto
error
;
...
...
@@ -9817,7 +9817,7 @@ qemuBuildCommandLine(virConnectPtr conn,
}
if
(
def
->
pm
.
s4
)
{
if
(
!
virQEMUCapsGet
(
qemuCaps
,
QEMU_CAPS_DISABLE_S4
))
{
if
(
!
virQEMUCapsGet
(
qemuCaps
,
QEMU_CAPS_
PIIX_
DISABLE_S4
))
{
virReportError
(
VIR_ERR_CONFIG_UNSUPPORTED
,
"%s"
,
_
(
"setting ACPI S4 not supported"
));
goto
error
;
...
...
tests/qemuxml2argvtest.c
浏览文件 @
5900356e
...
...
@@ -702,7 +702,7 @@ mymain(void)
DO_TEST
(
"hugepages"
,
QEMU_CAPS_MEM_PATH
);
DO_TEST
(
"hugepages-numa"
,
QEMU_CAPS_RTC
,
QEMU_CAPS_NO_KVM_PIT
,
QEMU_CAPS_
DISABLE_S3
,
QEMU_CAPS
_DISABLE_S4
,
QEMU_CAPS_
PIIX_DISABLE_S3
,
QEMU_CAPS_PIIX
_DISABLE_S4
,
QEMU_CAPS_DEVICE
,
QEMU_CAPS_VIRTIO_SCSI
,
QEMU_CAPS_ICH9_USB_EHCI1
,
QEMU_CAPS_PCI_MULTIFUNCTION
,
QEMU_CAPS_SPICE
,
QEMU_CAPS_CHARDEV_SPICEVMC
,
...
...
@@ -970,9 +970,9 @@ mymain(void)
DO_TEST
(
"input-usbmouse"
,
NONE
);
DO_TEST
(
"input-usbtablet"
,
NONE
);
DO_TEST
(
"misc-acpi"
,
NONE
);
DO_TEST
(
"misc-disable-s3"
,
QEMU_CAPS_DISABLE_S3
);
DO_TEST
(
"misc-disable-suspends"
,
QEMU_CAPS_
DISABLE_S3
,
QEMU_CAPS
_DISABLE_S4
);
DO_TEST
(
"misc-enable-s4"
,
QEMU_CAPS_DISABLE_S4
);
DO_TEST
(
"misc-disable-s3"
,
QEMU_CAPS_
PIIX_
DISABLE_S3
);
DO_TEST
(
"misc-disable-suspends"
,
QEMU_CAPS_
PIIX_DISABLE_S3
,
QEMU_CAPS_PIIX
_DISABLE_S4
);
DO_TEST
(
"misc-enable-s4"
,
QEMU_CAPS_
PIIX_
DISABLE_S4
);
DO_TEST_FAILURE
(
"misc-enable-s4"
,
NONE
);
DO_TEST
(
"misc-no-reboot"
,
NONE
);
DO_TEST
(
"misc-uuid"
,
NONE
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录