Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
libvirt
提交
a10aa7a9
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,发现更多精彩内容 >>
提交
a10aa7a9
编写于
1月 29, 2009
作者:
J
John Levon
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
correctly enable floppies for HVM guests.
上级
3463c34e
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
42 addition
and
12 deletion
+42
-12
ChangeLog
ChangeLog
+6
-0
src/xend_internal.c
src/xend_internal.c
+36
-12
未找到文件。
ChangeLog
浏览文件 @
a10aa7a9
Thu Jan 29 09:03:17 PST 2009 John Levon <john.levon@sun.com>
* src/xend_internal.c: correctly enable floppies for HVM guests.
Refuse to directly attach disks that won't work via
device_create.
Thu Jan 29 16:41:07 GMT 2009 John Levon <john.levon@sun.com>
* src/util.c: allow strtol replacements for libvirt proxy
...
...
src/xend_internal.c
浏览文件 @
a10aa7a9
...
...
@@ -5020,14 +5020,26 @@ xenDaemonFormatSxprDisk(virConnectPtr conn ATTRIBUTE_UNUSED,
* under the hvm (image (os)) block
*/
if
(
hvm
&&
def
->
device
==
VIR_DOMAIN_DISK_DEVICE_FLOPPY
)
def
->
device
==
VIR_DOMAIN_DISK_DEVICE_FLOPPY
)
{
if
(
isAttach
)
{
virXendError
(
conn
,
VIR_ERR_INVALID_ARG
,
_
(
"Cannot directly attach floppy %s"
),
def
->
src
);
return
-
1
;
}
return
0
;
}
/* Xend <= 3.0.2 doesn't include cdrom config here */
if
(
hvm
&&
def
->
device
==
VIR_DOMAIN_DISK_DEVICE_CDROM
&&
xendConfigVersion
==
1
)
xendConfigVersion
==
1
)
{
if
(
isAttach
)
{
virXendError
(
conn
,
VIR_ERR_INVALID_ARG
,
_
(
"Cannot directly attach CDROM %s"
),
def
->
src
);
return
-
1
;
}
return
0
;
}
if
(
!
isAttach
)
virBufferAddLit
(
buf
,
"(device "
);
...
...
@@ -5376,17 +5388,29 @@ xenDaemonFormatSxpr(virConnectPtr conn,
}
virBufferVSprintf
(
&
buf
,
"(boot %s)"
,
bootorder
);
/* get the cdrom device file */
/* Only XenD <= 3.0.2 wants cdrom config here */
if
(
xendConfigVersion
==
1
)
{
for
(
i
=
0
;
i
<
def
->
ndisks
;
i
++
)
{
if
(
def
->
disks
[
i
]
->
type
==
VIR_DOMAIN_DISK_DEVICE_CDROM
&&
STREQ
(
def
->
disks
[
i
]
->
dst
,
"hdc"
)
&&
def
->
disks
[
i
]
->
src
)
{
virBufferVSprintf
(
&
buf
,
"(cdrom '%s')"
,
def
->
disks
[
i
]
->
src
);
/* some disk devices are defined here */
for
(
i
=
0
;
i
<
def
->
ndisks
;
i
++
)
{
switch
(
def
->
disks
[
i
]
->
device
)
{
case
VIR_DOMAIN_DISK_DEVICE_CDROM
:
/* Only xend <= 3.0.2 wants cdrom config here */
if
(
xendConfigVersion
!=
1
)
break
;
}
if
(
!
STREQ
(
def
->
disks
[
i
]
->
dst
,
"hdc"
)
||
def
->
disks
[
i
]
->
src
==
NULL
)
break
;
virBufferVSprintf
(
&
buf
,
"(cdrom '%s')"
,
def
->
disks
[
i
]
->
src
);
break
;
case
VIR_DOMAIN_DISK_DEVICE_FLOPPY
:
/* all xend versions define floppies here */
virBufferVSprintf
(
&
buf
,
"(%s '%s')"
,
def
->
disks
[
i
]
->
dst
,
def
->
disks
[
i
]
->
src
);
break
;
default:
break
;
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录