Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
libvirt
提交
55d5a9bc
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,发现更多精彩内容 >>
提交
55d5a9bc
编写于
10月 11, 2016
作者:
P
Pavel Hrdina
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
qemu_command: separate code for video device via -vga attribute
Signed-off-by:
N
Pavel Hrdina
<
phrdina@redhat.com
>
上级
33af92a9
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
76 addition
and
67 deletion
+76
-67
src/qemu/qemu_command.c
src/qemu/qemu_command.c
+76
-67
未找到文件。
src/qemu/qemu_command.c
浏览文件 @
55d5a9bc
...
@@ -4329,19 +4329,91 @@ qemuBuildDeviceVideoStr(const virDomainDef *def,
...
@@ -4329,19 +4329,91 @@ qemuBuildDeviceVideoStr(const virDomainDef *def,
}
}
static
int
qemuBuildVgaVideoCommand
(
virCommandPtr
cmd
,
const
virDomainDef
*
def
,
virQEMUCapsPtr
qemuCaps
)
{
const
char
*
vgastr
=
qemuVideoTypeToString
(
def
->
videos
[
0
]
->
type
);
if
(
!
vgastr
||
STREQ
(
vgastr
,
""
))
{
virReportError
(
VIR_ERR_INTERNAL_ERROR
,
_
(
"invalid model for video type '%s'"
),
virDomainVideoTypeToString
(
def
->
videos
[
0
]
->
type
));
return
-
1
;
}
virCommandAddArgList
(
cmd
,
"-vga"
,
vgastr
,
NULL
);
/* If we cannot use --device option to specify the video device
* in QEMU we will fallback to the old --vga option. To get the
* correct device name for the --vga option the 'qemuVideo' is
* used, but to set some device attributes we need to use the
* --global option and for that we need to specify the device
* name the same as for --device option and for that we need to
* use 'qemuDeviceVideo'.
*
* See 'Graphics Devices' section in docs/qdev-device-use.txt in
* QEMU repository.
*/
const
char
*
dev
=
qemuDeviceVideoTypeToString
(
def
->
videos
[
0
]
->
type
);
if
(
def
->
videos
[
0
]
->
type
==
VIR_DOMAIN_VIDEO_TYPE_QXL
&&
(
def
->
videos
[
0
]
->
vram
||
def
->
videos
[
0
]
->
ram
))
{
unsigned
int
ram
=
def
->
videos
[
0
]
->
ram
;
unsigned
int
vram
=
def
->
videos
[
0
]
->
vram
;
unsigned
int
vram64
=
def
->
videos
[
0
]
->
vram64
;
unsigned
int
vgamem
=
def
->
videos
[
0
]
->
vgamem
;
if
(
ram
)
{
virCommandAddArg
(
cmd
,
"-global"
);
virCommandAddArgFormat
(
cmd
,
"%s.ram_size=%u"
,
dev
,
ram
*
1024
);
}
if
(
vram
)
{
virCommandAddArg
(
cmd
,
"-global"
);
virCommandAddArgFormat
(
cmd
,
"%s.vram_size=%u"
,
dev
,
vram
*
1024
);
}
if
(
vram64
&&
virQEMUCapsGet
(
qemuCaps
,
QEMU_CAPS_QXL_VRAM64
))
{
virCommandAddArg
(
cmd
,
"-global"
);
virCommandAddArgFormat
(
cmd
,
"%s.vram64_size_mb=%u"
,
dev
,
vram64
/
1024
);
}
if
(
vgamem
&&
virQEMUCapsGet
(
qemuCaps
,
QEMU_CAPS_QXL_VGAMEM
))
{
virCommandAddArg
(
cmd
,
"-global"
);
virCommandAddArgFormat
(
cmd
,
"%s.vgamem_mb=%u"
,
dev
,
vgamem
/
1024
);
}
}
if
(
def
->
videos
[
0
]
->
vram
&&
((
def
->
videos
[
0
]
->
type
==
VIR_DOMAIN_VIDEO_TYPE_VGA
&&
virQEMUCapsGet
(
qemuCaps
,
QEMU_CAPS_VGA_VGAMEM
))
||
(
def
->
videos
[
0
]
->
type
==
VIR_DOMAIN_VIDEO_TYPE_VMVGA
&&
virQEMUCapsGet
(
qemuCaps
,
QEMU_CAPS_VMWARE_SVGA_VGAMEM
))))
{
unsigned
int
vram
=
def
->
videos
[
0
]
->
vram
;
virCommandAddArg
(
cmd
,
"-global"
);
virCommandAddArgFormat
(
cmd
,
"%s.vgamem_mb=%u"
,
dev
,
vram
/
1024
);
}
return
0
;
}
static
int
static
int
qemuBuildVideoCommandLine
(
virCommandPtr
cmd
,
qemuBuildVideoCommandLine
(
virCommandPtr
cmd
,
const
virDomainDef
*
def
,
const
virDomainDef
*
def
,
virQEMUCapsPtr
qemuCaps
)
virQEMUCapsPtr
qemuCaps
)
{
{
size_t
i
;
size_t
i
;
int
primaryVideoType
;
if
(
!
def
->
videos
)
if
(
!
def
->
videos
)
return
0
;
return
0
;
primaryVideoType
=
def
->
videos
[
0
]
->
type
;
if
(
virQEMUCapsGet
(
qemuCaps
,
QEMU_CAPS_DEVICE_VIDEO_PRIMARY
))
{
if
(
virQEMUCapsGet
(
qemuCaps
,
QEMU_CAPS_DEVICE_VIDEO_PRIMARY
))
{
for
(
i
=
0
;
i
<
def
->
nvideos
;
i
++
)
{
for
(
i
=
0
;
i
<
def
->
nvideos
;
i
++
)
{
char
*
str
;
char
*
str
;
...
@@ -4354,71 +4426,8 @@ qemuBuildVideoCommandLine(virCommandPtr cmd,
...
@@ -4354,71 +4426,8 @@ qemuBuildVideoCommandLine(virCommandPtr cmd,
VIR_FREE
(
str
);
VIR_FREE
(
str
);
}
}
}
else
{
}
else
{
const
char
*
vgastr
=
qemuVideoTypeToString
(
primaryVideoType
);
if
(
qemuBuildVgaVideoCommand
(
cmd
,
def
,
qemuCaps
)
<
0
)
if
(
!
vgastr
||
STREQ
(
vgastr
,
""
))
{
virReportError
(
VIR_ERR_INTERNAL_ERROR
,
_
(
"invalid model for video type '%s'"
),
virDomainVideoTypeToString
(
primaryVideoType
));
return
-
1
;
return
-
1
;
}
virCommandAddArgList
(
cmd
,
"-vga"
,
vgastr
,
NULL
);
/* If we cannot use --device option to specify the video device
* in QEMU we will fallback to the old --vga option. To get the
* correct device name for the --vga option the 'qemuVideo' is
* used, but to set some device attributes we need to use the
* --global option and for that we need to specify the device
* name the same as for --device option and for that we need to
* use 'qemuDeviceVideo'.
*
* See 'Graphics Devices' section in docs/qdev-device-use.txt in
* QEMU repository.
*/
const
char
*
dev
=
qemuDeviceVideoTypeToString
(
primaryVideoType
);
if
(
def
->
videos
[
0
]
->
type
==
VIR_DOMAIN_VIDEO_TYPE_QXL
&&
(
def
->
videos
[
0
]
->
vram
||
def
->
videos
[
0
]
->
ram
))
{
unsigned
int
ram
=
def
->
videos
[
0
]
->
ram
;
unsigned
int
vram
=
def
->
videos
[
0
]
->
vram
;
unsigned
int
vram64
=
def
->
videos
[
0
]
->
vram64
;
unsigned
int
vgamem
=
def
->
videos
[
0
]
->
vgamem
;
if
(
ram
)
{
virCommandAddArg
(
cmd
,
"-global"
);
virCommandAddArgFormat
(
cmd
,
"%s.ram_size=%u"
,
dev
,
ram
*
1024
);
}
if
(
vram
)
{
virCommandAddArg
(
cmd
,
"-global"
);
virCommandAddArgFormat
(
cmd
,
"%s.vram_size=%u"
,
dev
,
vram
*
1024
);
}
if
(
vram64
&&
virQEMUCapsGet
(
qemuCaps
,
QEMU_CAPS_QXL_VRAM64
))
{
virCommandAddArg
(
cmd
,
"-global"
);
virCommandAddArgFormat
(
cmd
,
"%s.vram64_size_mb=%u"
,
dev
,
vram64
/
1024
);
}
if
(
vgamem
&&
virQEMUCapsGet
(
qemuCaps
,
QEMU_CAPS_QXL_VGAMEM
))
{
virCommandAddArg
(
cmd
,
"-global"
);
virCommandAddArgFormat
(
cmd
,
"%s.vgamem_mb=%u"
,
dev
,
vgamem
/
1024
);
}
}
if
(
def
->
videos
[
0
]
->
vram
&&
((
primaryVideoType
==
VIR_DOMAIN_VIDEO_TYPE_VGA
&&
virQEMUCapsGet
(
qemuCaps
,
QEMU_CAPS_VGA_VGAMEM
))
||
(
primaryVideoType
==
VIR_DOMAIN_VIDEO_TYPE_VMVGA
&&
virQEMUCapsGet
(
qemuCaps
,
QEMU_CAPS_VMWARE_SVGA_VGAMEM
))))
{
unsigned
int
vram
=
def
->
videos
[
0
]
->
vram
;
virCommandAddArg
(
cmd
,
"-global"
);
virCommandAddArgFormat
(
cmd
,
"%s.vgamem_mb=%u"
,
dev
,
vram
/
1024
);
}
for
(
i
=
1
;
i
<
def
->
nvideos
;
i
++
)
{
for
(
i
=
1
;
i
<
def
->
nvideos
;
i
++
)
{
char
*
str
;
char
*
str
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录