Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
libvirt
提交
66c4e153
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看板
提交
66c4e153
编写于
8月 23, 2017
作者:
M
Martin Kletzander
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
qemu: Add capabilities for virtio-vga/gpu's max_outputs= parameter
Signed-off-by:
N
Martin Kletzander
<
mkletzan@redhat.com
>
上级
60135b22
变更
15
隐藏空白更改
内联
并排
Showing
15 changed file
with
16 addition
and
0 deletion
+16
-0
src/qemu/qemu_capabilities.c
src/qemu/qemu_capabilities.c
+2
-0
src/qemu/qemu_capabilities.h
src/qemu/qemu_capabilities.h
+1
-0
tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
+1
-0
tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
+1
-0
tests/qemucapabilitiesdata/caps_2.6.0-gicv2.aarch64.xml
tests/qemucapabilitiesdata/caps_2.6.0-gicv2.aarch64.xml
+1
-0
tests/qemucapabilitiesdata/caps_2.6.0-gicv3.aarch64.xml
tests/qemucapabilitiesdata/caps_2.6.0-gicv3.aarch64.xml
+1
-0
tests/qemucapabilitiesdata/caps_2.6.0.ppc64le.xml
tests/qemucapabilitiesdata/caps_2.6.0.ppc64le.xml
+1
-0
tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
+1
-0
tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml
tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml
+1
-0
tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
+1
-0
tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml
tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml
+1
-0
tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
+1
-0
tests/qemucapabilitiesdata/caps_2.9.0.ppc64le.xml
tests/qemucapabilitiesdata/caps_2.9.0.ppc64le.xml
+1
-0
tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml
tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml
+1
-0
tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
+1
-0
未找到文件。
src/qemu/qemu_capabilities.c
浏览文件 @
66c4e153
...
@@ -438,6 +438,7 @@ VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST,
...
@@ -438,6 +438,7 @@ VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST,
"vnc-multi-servers"
,
"vnc-multi-servers"
,
"virtio-net.tx_queue_size"
,
"virtio-net.tx_queue_size"
,
"chardev-reconnect"
,
"chardev-reconnect"
,
"virtio-gpu.max_outputs"
,
);
);
...
@@ -1787,6 +1788,7 @@ static struct virQEMUCapsStringFlags virQEMUCapsObjectPropsQxl[] = {
...
@@ -1787,6 +1788,7 @@ static struct virQEMUCapsStringFlags virQEMUCapsObjectPropsQxl[] = {
static
struct
virQEMUCapsStringFlags
virQEMUCapsObjectPropsVirtioGpu
[]
=
{
static
struct
virQEMUCapsStringFlags
virQEMUCapsObjectPropsVirtioGpu
[]
=
{
{
"virgl"
,
QEMU_CAPS_VIRTIO_GPU_VIRGL
},
{
"virgl"
,
QEMU_CAPS_VIRTIO_GPU_VIRGL
},
{
"max_outputs"
,
QEMU_CAPS_VIRTIO_GPU_MAX_OUTPUTS
},
};
};
static
struct
virQEMUCapsStringFlags
virQEMUCapsObjectPropsICH9
[]
=
{
static
struct
virQEMUCapsStringFlags
virQEMUCapsObjectPropsICH9
[]
=
{
...
...
src/qemu/qemu_capabilities.h
浏览文件 @
66c4e153
...
@@ -424,6 +424,7 @@ typedef enum {
...
@@ -424,6 +424,7 @@ typedef enum {
QEMU_CAPS_VNC_MULTI_SERVERS
,
/* -vnc vnc=unix:/path */
QEMU_CAPS_VNC_MULTI_SERVERS
,
/* -vnc vnc=unix:/path */
QEMU_CAPS_VIRTIO_NET_TX_QUEUE_SIZE
,
/* virtio-net-*.tx_queue_size */
QEMU_CAPS_VIRTIO_NET_TX_QUEUE_SIZE
,
/* virtio-net-*.tx_queue_size */
QEMU_CAPS_CHARDEV_RECONNECT
,
/* -chardev reconnect */
QEMU_CAPS_CHARDEV_RECONNECT
,
/* -chardev reconnect */
QEMU_CAPS_VIRTIO_GPU_MAX_OUTPUTS
,
/* -device virtio-(vga|gpu-*),max-outputs= */
QEMU_CAPS_LAST
/* this must always be the last item */
QEMU_CAPS_LAST
/* this must always be the last item */
}
virQEMUCapsFlags
;
}
virQEMUCapsFlags
;
...
...
tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
浏览文件 @
66c4e153
...
@@ -187,6 +187,7 @@
...
@@ -187,6 +187,7 @@
<flag
name=
'kernel-irqchip'
/>
<flag
name=
'kernel-irqchip'
/>
<flag
name=
'vnc-multi-servers'
/>
<flag
name=
'vnc-multi-servers'
/>
<flag
name=
'chardev-reconnect'
/>
<flag
name=
'chardev-reconnect'
/>
<flag
name=
'virtio-gpu.max_outputs'
/>
<version>
2004000
</version>
<version>
2004000
</version>
<kvmVersion>
0
</kvmVersion>
<kvmVersion>
0
</kvmVersion>
<package></package>
<package></package>
...
...
tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
浏览文件 @
66c4e153
...
@@ -193,6 +193,7 @@
...
@@ -193,6 +193,7 @@
<flag
name=
'kernel-irqchip'
/>
<flag
name=
'kernel-irqchip'
/>
<flag
name=
'vnc-multi-servers'
/>
<flag
name=
'vnc-multi-servers'
/>
<flag
name=
'chardev-reconnect'
/>
<flag
name=
'chardev-reconnect'
/>
<flag
name=
'virtio-gpu.max_outputs'
/>
<version>
2005000
</version>
<version>
2005000
</version>
<kvmVersion>
0
</kvmVersion>
<kvmVersion>
0
</kvmVersion>
<package></package>
<package></package>
...
...
tests/qemucapabilitiesdata/caps_2.6.0-gicv2.aarch64.xml
浏览文件 @
66c4e153
...
@@ -171,6 +171,7 @@
...
@@ -171,6 +171,7 @@
<flag
name=
'kernel-irqchip.split'
/>
<flag
name=
'kernel-irqchip.split'
/>
<flag
name=
'vnc-multi-servers'
/>
<flag
name=
'vnc-multi-servers'
/>
<flag
name=
'chardev-reconnect'
/>
<flag
name=
'chardev-reconnect'
/>
<flag
name=
'virtio-gpu.max_outputs'
/>
<version>
2006000
</version>
<version>
2006000
</version>
<kvmVersion>
0
</kvmVersion>
<kvmVersion>
0
</kvmVersion>
<package></package>
<package></package>
...
...
tests/qemucapabilitiesdata/caps_2.6.0-gicv3.aarch64.xml
浏览文件 @
66c4e153
...
@@ -171,6 +171,7 @@
...
@@ -171,6 +171,7 @@
<flag
name=
'kernel-irqchip.split'
/>
<flag
name=
'kernel-irqchip.split'
/>
<flag
name=
'vnc-multi-servers'
/>
<flag
name=
'vnc-multi-servers'
/>
<flag
name=
'chardev-reconnect'
/>
<flag
name=
'chardev-reconnect'
/>
<flag
name=
'virtio-gpu.max_outputs'
/>
<version>
2006000
</version>
<version>
2006000
</version>
<kvmVersion>
0
</kvmVersion>
<kvmVersion>
0
</kvmVersion>
<package></package>
<package></package>
...
...
tests/qemucapabilitiesdata/caps_2.6.0.ppc64le.xml
浏览文件 @
66c4e153
...
@@ -166,6 +166,7 @@
...
@@ -166,6 +166,7 @@
<flag
name=
'spapr-pci-host-bridge'
/>
<flag
name=
'spapr-pci-host-bridge'
/>
<flag
name=
'vnc-multi-servers'
/>
<flag
name=
'vnc-multi-servers'
/>
<flag
name=
'chardev-reconnect'
/>
<flag
name=
'chardev-reconnect'
/>
<flag
name=
'virtio-gpu.max_outputs'
/>
<version>
2006000
</version>
<version>
2006000
</version>
<kvmVersion>
0
</kvmVersion>
<kvmVersion>
0
</kvmVersion>
<package></package>
<package></package>
...
...
tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
浏览文件 @
66c4e153
...
@@ -203,6 +203,7 @@
...
@@ -203,6 +203,7 @@
<flag
name=
'kernel-irqchip.split'
/>
<flag
name=
'kernel-irqchip.split'
/>
<flag
name=
'vnc-multi-servers'
/>
<flag
name=
'vnc-multi-servers'
/>
<flag
name=
'chardev-reconnect'
/>
<flag
name=
'chardev-reconnect'
/>
<flag
name=
'virtio-gpu.max_outputs'
/>
<version>
2006000
</version>
<version>
2006000
</version>
<kvmVersion>
0
</kvmVersion>
<kvmVersion>
0
</kvmVersion>
<package></package>
<package></package>
...
...
tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml
浏览文件 @
66c4e153
...
@@ -133,6 +133,7 @@
...
@@ -133,6 +133,7 @@
<flag
name=
'kernel-irqchip.split'
/>
<flag
name=
'kernel-irqchip.split'
/>
<flag
name=
'vnc-multi-servers'
/>
<flag
name=
'vnc-multi-servers'
/>
<flag
name=
'chardev-reconnect'
/>
<flag
name=
'chardev-reconnect'
/>
<flag
name=
'virtio-gpu.max_outputs'
/>
<version>
2007000
</version>
<version>
2007000
</version>
<kvmVersion>
0
</kvmVersion>
<kvmVersion>
0
</kvmVersion>
<package></package>
<package></package>
...
...
tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
浏览文件 @
66c4e153
...
@@ -206,6 +206,7 @@
...
@@ -206,6 +206,7 @@
<flag
name=
'intel-iommu.intremap'
/>
<flag
name=
'intel-iommu.intremap'
/>
<flag
name=
'vnc-multi-servers'
/>
<flag
name=
'vnc-multi-servers'
/>
<flag
name=
'chardev-reconnect'
/>
<flag
name=
'chardev-reconnect'
/>
<flag
name=
'virtio-gpu.max_outputs'
/>
<version>
2007000
</version>
<version>
2007000
</version>
<kvmVersion>
0
</kvmVersion>
<kvmVersion>
0
</kvmVersion>
<package>
(v2.7.0)
</package>
<package>
(v2.7.0)
</package>
...
...
tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml
浏览文件 @
66c4e153
...
@@ -135,6 +135,7 @@
...
@@ -135,6 +135,7 @@
<flag
name=
'kernel-irqchip.split'
/>
<flag
name=
'kernel-irqchip.split'
/>
<flag
name=
'vnc-multi-servers'
/>
<flag
name=
'vnc-multi-servers'
/>
<flag
name=
'chardev-reconnect'
/>
<flag
name=
'chardev-reconnect'
/>
<flag
name=
'virtio-gpu.max_outputs'
/>
<version>
2007093
</version>
<version>
2007093
</version>
<kvmVersion>
0
</kvmVersion>
<kvmVersion>
0
</kvmVersion>
<package></package>
<package></package>
...
...
tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
浏览文件 @
66c4e153
...
@@ -208,6 +208,7 @@
...
@@ -208,6 +208,7 @@
<flag
name=
'intel-iommu.eim'
/>
<flag
name=
'intel-iommu.eim'
/>
<flag
name=
'vnc-multi-servers'
/>
<flag
name=
'vnc-multi-servers'
/>
<flag
name=
'chardev-reconnect'
/>
<flag
name=
'chardev-reconnect'
/>
<flag
name=
'virtio-gpu.max_outputs'
/>
<version>
2008000
</version>
<version>
2008000
</version>
<kvmVersion>
0
</kvmVersion>
<kvmVersion>
0
</kvmVersion>
<package>
(v2.8.0)
</package>
<package>
(v2.8.0)
</package>
...
...
tests/qemucapabilitiesdata/caps_2.9.0.ppc64le.xml
浏览文件 @
66c4e153
...
@@ -171,6 +171,7 @@
...
@@ -171,6 +171,7 @@
<flag
name=
'spapr-pci-host-bridge.numa_node'
/>
<flag
name=
'spapr-pci-host-bridge.numa_node'
/>
<flag
name=
'vnc-multi-servers'
/>
<flag
name=
'vnc-multi-servers'
/>
<flag
name=
'chardev-reconnect'
/>
<flag
name=
'chardev-reconnect'
/>
<flag
name=
'virtio-gpu.max_outputs'
/>
<version>
2009000
</version>
<version>
2009000
</version>
<kvmVersion>
0
</kvmVersion>
<kvmVersion>
0
</kvmVersion>
<package>
(v2.9.0)
</package>
<package>
(v2.9.0)
</package>
...
...
tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml
浏览文件 @
66c4e153
...
@@ -136,6 +136,7 @@
...
@@ -136,6 +136,7 @@
<flag
name=
'virtio.ats'
/>
<flag
name=
'virtio.ats'
/>
<flag
name=
'vnc-multi-servers'
/>
<flag
name=
'vnc-multi-servers'
/>
<flag
name=
'chardev-reconnect'
/>
<flag
name=
'chardev-reconnect'
/>
<flag
name=
'virtio-gpu.max_outputs'
/>
<version>
2009000
</version>
<version>
2009000
</version>
<kvmVersion>
0
</kvmVersion>
<kvmVersion>
0
</kvmVersion>
<package></package>
<package></package>
...
...
tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
浏览文件 @
66c4e153
...
@@ -219,6 +219,7 @@
...
@@ -219,6 +219,7 @@
<flag
name=
'virtio.ats'
/>
<flag
name=
'virtio.ats'
/>
<flag
name=
'vnc-multi-servers'
/>
<flag
name=
'vnc-multi-servers'
/>
<flag
name=
'chardev-reconnect'
/>
<flag
name=
'chardev-reconnect'
/>
<flag
name=
'virtio-gpu.max_outputs'
/>
<version>
2009000
</version>
<version>
2009000
</version>
<kvmVersion>
0
</kvmVersion>
<kvmVersion>
0
</kvmVersion>
<package>
(v2.9.0)
</package>
<package>
(v2.9.0)
</package>
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录