Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
libvirt
提交
22d94ca4
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,发现更多精彩内容 >>
提交
22d94ca4
编写于
8月 02, 2016
作者:
M
Martin Kletzander
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
qemu: Add capabilities for ivshmem-{plain,doorbell}
Signed-off-by:
N
Martin Kletzander
<
mkletzan@redhat.com
>
上级
3c06aa7b
变更
7
显示空白变更内容
内联
并排
Showing
7 changed file
with
19 addition
and
0 deletion
+19
-0
src/qemu/qemu_capabilities.c
src/qemu/qemu_capabilities.c
+5
-0
src/qemu/qemu_capabilities.h
src/qemu/qemu_capabilities.h
+4
-0
tests/qemucapabilitiesdata/caps_2.6.0-gicv2.aarch64.xml
tests/qemucapabilitiesdata/caps_2.6.0-gicv2.aarch64.xml
+2
-0
tests/qemucapabilitiesdata/caps_2.6.0-gicv3.aarch64.xml
tests/qemucapabilitiesdata/caps_2.6.0-gicv3.aarch64.xml
+2
-0
tests/qemucapabilitiesdata/caps_2.6.0.ppc64le.xml
tests/qemucapabilitiesdata/caps_2.6.0.ppc64le.xml
+2
-0
tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
+2
-0
tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
+2
-0
未找到文件。
src/qemu/qemu_capabilities.c
浏览文件 @
22d94ca4
...
...
@@ -347,6 +347,9 @@ VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST,
"machine-iommu"
,
"virtio-vga"
,
"drive-iotune-max-length"
,
"ivshmem-plain"
,
"ivshmem-doorbell"
,
/* 240 */
);
...
...
@@ -1588,6 +1591,8 @@ struct virQEMUCapsStringFlags virQEMUCapsObjectTypes[] = {
{
"pxb-pcie"
,
QEMU_CAPS_DEVICE_PXB_PCIE
},
{
"tls-creds-x509"
,
QEMU_CAPS_OBJECT_TLS_CREDS_X509
},
{
"intel-iommu"
,
QEMU_CAPS_DEVICE_INTEL_IOMMU
},
{
"ivshmem-plain"
,
QEMU_CAPS_DEVICE_IVSHMEM_PLAIN
},
{
"ivshmem-doorbell"
,
QEMU_CAPS_DEVICE_IVSHMEM_DOORBELL
},
};
static
struct
virQEMUCapsStringFlags
virQEMUCapsObjectPropsVirtioBalloon
[]
=
{
...
...
src/qemu/qemu_capabilities.h
浏览文件 @
22d94ca4
...
...
@@ -381,6 +381,10 @@ typedef enum {
QEMU_CAPS_MACHINE_IOMMU
,
/* -machine iommu=on */
QEMU_CAPS_DEVICE_VIRTIO_VGA
,
/* -device virtio-vga */
QEMU_CAPS_DRIVE_IOTUNE_MAX_LENGTH
,
/* -drive bps_max_length = and friends */
QEMU_CAPS_DEVICE_IVSHMEM_PLAIN
,
/* -device ivshmem-plain */
/* 240 */
QEMU_CAPS_DEVICE_IVSHMEM_DOORBELL
,
/* -device ivshmem-doorbell */
QEMU_CAPS_LAST
/* this must always be the last item */
}
virQEMUCapsFlags
;
...
...
tests/qemucapabilitiesdata/caps_2.6.0-gicv2.aarch64.xml
浏览文件 @
22d94ca4
...
...
@@ -159,6 +159,8 @@
<flag
name=
'smm'
/>
<flag
name=
'virtio-pci-disable-legacy'
/>
<flag
name=
'drive-iotune-max-length'
/>
<flag
name=
'ivshmem-plain'
/>
<flag
name=
'ivshmem-doorbell'
/>
<version>
2005094
</version>
<kvmVersion>
0
</kvmVersion>
<package></package>
...
...
tests/qemucapabilitiesdata/caps_2.6.0-gicv3.aarch64.xml
浏览文件 @
22d94ca4
...
...
@@ -159,6 +159,8 @@
<flag
name=
'smm'
/>
<flag
name=
'virtio-pci-disable-legacy'
/>
<flag
name=
'drive-iotune-max-length'
/>
<flag
name=
'ivshmem-plain'
/>
<flag
name=
'ivshmem-doorbell'
/>
<version>
2005094
</version>
<kvmVersion>
0
</kvmVersion>
<package></package>
...
...
tests/qemucapabilitiesdata/caps_2.6.0.ppc64le.xml
浏览文件 @
22d94ca4
...
...
@@ -154,6 +154,8 @@
<flag
name=
'virtio-pci-disable-legacy'
/>
<flag
name=
'virtio-vga'
/>
<flag
name=
'drive-iotune-max-length'
/>
<flag
name=
'ivshmem-plain'
/>
<flag
name=
'ivshmem-doorbell'
/>
<version>
2005094
</version>
<kvmVersion>
0
</kvmVersion>
<package></package>
...
...
tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
浏览文件 @
22d94ca4
...
...
@@ -193,6 +193,8 @@
<flag
name=
'machine-iommu'
/>
<flag
name=
'virtio-vga'
/>
<flag
name=
'drive-iotune-max-length'
/>
<flag
name=
'ivshmem-plain'
/>
<flag
name=
'ivshmem-doorbell'
/>
<version>
2006000
</version>
<kvmVersion>
0
</kvmVersion>
<package></package>
...
...
tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
浏览文件 @
22d94ca4
...
...
@@ -194,6 +194,8 @@
<flag
name=
'query-hotpluggable-cpus'
/>
<flag
name=
'virtio-vga'
/>
<flag
name=
'drive-iotune-max-length'
/>
<flag
name=
'ivshmem-plain'
/>
<flag
name=
'ivshmem-doorbell'
/>
<version>
2007000
</version>
<kvmVersion>
0
</kvmVersion>
<package>
(v2.7.0)
</package>
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录