Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
libvirt
提交
936b8652
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,发现更多精彩内容 >>
提交
936b8652
编写于
5月 19, 2016
作者:
J
Ján Tomko
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Remove DISK_BUS_XEN support from qemuBuildDiskDriveCommandLine
We have stopped supporting Xenner some time ago.
上级
0586cf98
变更
9
显示空白变更内容
内联
并排
Showing
9 changed file
with
2 addition
and
206 deletion
+2
-206
src/qemu/qemu_command.c
src/qemu/qemu_command.c
+2
-3
tests/qemuargv2xmldata/qemuargv2xml-disk-xenvbd.args
tests/qemuargv2xmldata/qemuargv2xml-disk-xenvbd.args
+0
-25
tests/qemuargv2xmldata/qemuargv2xml-disk-xenvbd.xml
tests/qemuargv2xmldata/qemuargv2xml-disk-xenvbd.xml
+0
-51
tests/qemuargv2xmltest.c
tests/qemuargv2xmltest.c
+0
-1
tests/qemuxml2argvdata/qemuxml2argv-disk-xenvbd.args
tests/qemuxml2argvdata/qemuxml2argv-disk-xenvbd.args
+0
-26
tests/qemuxml2argvdata/qemuxml2argv-disk-xenvbd.xml
tests/qemuxml2argvdata/qemuxml2argv-disk-xenvbd.xml
+0
-47
tests/qemuxml2argvtest.c
tests/qemuxml2argvtest.c
+0
-1
tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-xenvbd.xml
tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-xenvbd.xml
+0
-51
tests/qemuxml2xmltest.c
tests/qemuxml2xmltest.c
+0
-1
未找到文件。
src/qemu/qemu_command.c
浏览文件 @
936b8652
...
...
@@ -1951,13 +1951,12 @@ qemuBuildDiskDriveCommandLine(virCommandPtr cmd,
virCommandAddArg
(
cmd
,
"-drive"
);
/* Unfortunately it is not possible to use
-device for floppies,
xen PV,
or SD
-device for floppies, or SD
devices. Fortunately, those don't need
static PCI addresses, so we don't really
care that we can't use -device */
if
(
virQEMUCapsGet
(
qemuCaps
,
QEMU_CAPS_DEVICE
))
{
if
(
disk
->
bus
!=
VIR_DOMAIN_DISK_BUS_XEN
&&
disk
->
bus
!=
VIR_DOMAIN_DISK_BUS_SD
)
{
if
(
disk
->
bus
!=
VIR_DOMAIN_DISK_BUS_SD
)
{
withDeviceArg
=
true
;
}
else
{
virQEMUCapsClear
(
qemuCaps
,
QEMU_CAPS_DEVICE
);
...
...
tests/qemuargv2xmldata/qemuargv2xml-disk-xenvbd.args
已删除
100644 → 0
浏览文件 @
0586cf98
LC_ALL=C \
PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu \
-name QEMUGuest1 \
-S \
-M pc \
-m 214 \
-smp 1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
-boot c \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=ide,bus=0,unit=0 \
-drive file=/dev/HostVG/QEMUGuest2,format=raw,if=ide,media=cdrom,bus=1,unit=0 \
-drive file=/tmp/data.img,format=raw,if=xen,index=0 \
-drive file=/tmp/logs.img,format=raw,if=xen,index=6 \
-net none \
-serial none \
-parallel none
tests/qemuargv2xmldata/qemuargv2xml-disk-xenvbd.xml
已删除
100644 → 0
浏览文件 @
0586cf98
<domain
type=
'qemu'
>
<name>
QEMUGuest1
</name>
<uuid>
c7a5fdbd-edaf-9455-926a-d65c16db1809
</uuid>
<memory
unit=
'KiB'
>
219136
</memory>
<currentMemory
unit=
'KiB'
>
219136
</currentMemory>
<vcpu
placement=
'static'
>
1
</vcpu>
<os>
<type
arch=
'i686'
machine=
'pc'
>
hvm
</type>
<boot
dev=
'hd'
/>
</os>
<clock
offset=
'utc'
/>
<on_poweroff>
destroy
</on_poweroff>
<on_reboot>
restart
</on_reboot>
<on_crash>
destroy
</on_crash>
<devices>
<emulator>
/usr/bin/qemu
</emulator>
<disk
type=
'block'
device=
'disk'
>
<driver
name=
'qemu'
type=
'raw'
/>
<source
dev=
'/dev/HostVG/QEMUGuest1'
/>
<target
dev=
'hda'
bus=
'ide'
/>
<address
type=
'drive'
controller=
'0'
bus=
'0'
target=
'0'
unit=
'0'
/>
</disk>
<disk
type=
'block'
device=
'cdrom'
>
<driver
name=
'qemu'
type=
'raw'
/>
<source
dev=
'/dev/HostVG/QEMUGuest2'
/>
<target
dev=
'hdc'
bus=
'ide'
/>
<readonly/>
<address
type=
'drive'
controller=
'0'
bus=
'1'
target=
'0'
unit=
'0'
/>
</disk>
<disk
type=
'file'
device=
'disk'
>
<driver
name=
'qemu'
type=
'raw'
/>
<source
file=
'/tmp/data.img'
/>
<target
dev=
'xvda'
bus=
'xen'
/>
</disk>
<disk
type=
'file'
device=
'disk'
>
<driver
name=
'qemu'
type=
'raw'
/>
<source
file=
'/tmp/logs.img'
/>
<target
dev=
'xvdg'
bus=
'xen'
/>
</disk>
<controller
type=
'usb'
index=
'0'
>
<address
type=
'pci'
domain=
'0x0000'
bus=
'0x00'
slot=
'0x01'
function=
'0x2'
/>
</controller>
<controller
type=
'pci'
index=
'0'
model=
'pci-root'
/>
<controller
type=
'ide'
index=
'0'
>
<address
type=
'pci'
domain=
'0x0000'
bus=
'0x00'
slot=
'0x01'
function=
'0x1'
/>
</controller>
<input
type=
'mouse'
bus=
'ps2'
/>
<input
type=
'keyboard'
bus=
'ps2'
/>
<memballoon
model=
'none'
/>
</devices>
</domain>
tests/qemuargv2xmltest.c
浏览文件 @
936b8652
...
...
@@ -195,7 +195,6 @@ mymain(void)
DO_TEST
(
"disk-floppy"
);
DO_TEST
(
"disk-many"
);
DO_TEST
(
"disk-virtio"
);
DO_TEST
(
"disk-xenvbd"
);
DO_TEST
(
"disk-drive-boot-disk"
);
DO_TEST
(
"disk-drive-boot-cdrom"
);
DO_TEST
(
"disk-drive-fmt-qcow"
);
...
...
tests/qemuxml2argvdata/qemuxml2argv-disk-xenvbd.args
已删除
100644 → 0
浏览文件 @
0586cf98
LC_ALL=C \
PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu \
-name QEMUGuest1 \
-S \
-M pc \
-m 214 \
-smp 1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefaults \
-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \
-no-acpi \
-boot c \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
-drive file=/dev/HostVG/QEMUGuest2,format=raw,if=none,media=cdrom,\
id=drive-ide0-1-0 \
-device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0 \
-drive file=/tmp/data.img,format=raw,if=xen,index=0 \
-drive file=/tmp/logs.img,format=raw,if=xen,index=6
tests/qemuxml2argvdata/qemuxml2argv-disk-xenvbd.xml
已删除
100644 → 0
浏览文件 @
0586cf98
<domain
type=
'qemu'
>
<name>
QEMUGuest1
</name>
<uuid>
c7a5fdbd-edaf-9455-926a-d65c16db1809
</uuid>
<memory
unit=
'KiB'
>
219136
</memory>
<currentMemory
unit=
'KiB'
>
219136
</currentMemory>
<vcpu
placement=
'static'
>
1
</vcpu>
<os>
<type
arch=
'i686'
machine=
'pc'
>
hvm
</type>
<boot
dev=
'hd'
/>
</os>
<clock
offset=
'utc'
/>
<on_poweroff>
destroy
</on_poweroff>
<on_reboot>
restart
</on_reboot>
<on_crash>
destroy
</on_crash>
<devices>
<emulator>
/usr/bin/qemu
</emulator>
<disk
type=
'block'
device=
'disk'
>
<driver
name=
'qemu'
type=
'raw'
/>
<source
dev=
'/dev/HostVG/QEMUGuest1'
/>
<target
dev=
'hda'
bus=
'ide'
/>
<address
type=
'drive'
controller=
'0'
bus=
'0'
target=
'0'
unit=
'0'
/>
</disk>
<disk
type=
'block'
device=
'cdrom'
>
<driver
name=
'qemu'
type=
'raw'
/>
<source
dev=
'/dev/HostVG/QEMUGuest2'
/>
<target
dev=
'hdc'
bus=
'ide'
/>
<readonly/>
<address
type=
'drive'
controller=
'0'
bus=
'1'
target=
'0'
unit=
'0'
/>
</disk>
<disk
type=
'file'
device=
'disk'
>
<driver
name=
'qemu'
type=
'raw'
/>
<source
file=
'/tmp/data.img'
/>
<target
dev=
'xvda'
bus=
'xen'
/>
</disk>
<disk
type=
'file'
device=
'disk'
>
<driver
name=
'qemu'
type=
'raw'
/>
<source
file=
'/tmp/logs.img'
/>
<target
dev=
'xvdg'
bus=
'xen'
/>
</disk>
<controller
type=
'usb'
index=
'0'
/>
<controller
type=
'ide'
index=
'0'
/>
<controller
type=
'pci'
index=
'0'
model=
'pci-root'
/>
<input
type=
'mouse'
bus=
'ps2'
/>
<input
type=
'keyboard'
bus=
'ps2'
/>
<memballoon
model=
'none'
/>
</devices>
</domain>
tests/qemuxml2argvtest.c
浏览文件 @
936b8652
...
...
@@ -752,7 +752,6 @@ mymain(void)
QEMU_CAPS_VIRTIO_CCW
,
QEMU_CAPS_VIRTIO_S390
);
DO_TEST
(
"disk-order"
,
QEMU_CAPS_DRIVE_BOOT
,
QEMU_CAPS_VIRTIO_BLK_SCSI
);
DO_TEST
(
"disk-xenvbd"
,
QEMU_CAPS_DRIVE_BOOT
);
DO_TEST
(
"disk-drive-boot-disk"
,
QEMU_CAPS_DRIVE_BOOT
);
DO_TEST
(
"disk-drive-boot-cdrom"
,
...
...
tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-xenvbd.xml
已删除
100644 → 0
浏览文件 @
0586cf98
<domain
type=
'qemu'
>
<name>
QEMUGuest1
</name>
<uuid>
c7a5fdbd-edaf-9455-926a-d65c16db1809
</uuid>
<memory
unit=
'KiB'
>
219136
</memory>
<currentMemory
unit=
'KiB'
>
219136
</currentMemory>
<vcpu
placement=
'static'
>
1
</vcpu>
<os>
<type
arch=
'i686'
machine=
'pc'
>
hvm
</type>
<boot
dev=
'hd'
/>
</os>
<clock
offset=
'utc'
/>
<on_poweroff>
destroy
</on_poweroff>
<on_reboot>
restart
</on_reboot>
<on_crash>
destroy
</on_crash>
<devices>
<emulator>
/usr/bin/qemu
</emulator>
<disk
type=
'block'
device=
'disk'
>
<driver
name=
'qemu'
type=
'raw'
/>
<source
dev=
'/dev/HostVG/QEMUGuest1'
/>
<target
dev=
'hda'
bus=
'ide'
/>
<address
type=
'drive'
controller=
'0'
bus=
'0'
target=
'0'
unit=
'0'
/>
</disk>
<disk
type=
'block'
device=
'cdrom'
>
<driver
name=
'qemu'
type=
'raw'
/>
<source
dev=
'/dev/HostVG/QEMUGuest2'
/>
<target
dev=
'hdc'
bus=
'ide'
/>
<readonly/>
<address
type=
'drive'
controller=
'0'
bus=
'1'
target=
'0'
unit=
'0'
/>
</disk>
<disk
type=
'file'
device=
'disk'
>
<driver
name=
'qemu'
type=
'raw'
/>
<source
file=
'/tmp/data.img'
/>
<target
dev=
'xvda'
bus=
'xen'
/>
</disk>
<disk
type=
'file'
device=
'disk'
>
<driver
name=
'qemu'
type=
'raw'
/>
<source
file=
'/tmp/logs.img'
/>
<target
dev=
'xvdg'
bus=
'xen'
/>
</disk>
<controller
type=
'usb'
index=
'0'
>
<address
type=
'pci'
domain=
'0x0000'
bus=
'0x00'
slot=
'0x01'
function=
'0x2'
/>
</controller>
<controller
type=
'ide'
index=
'0'
>
<address
type=
'pci'
domain=
'0x0000'
bus=
'0x00'
slot=
'0x01'
function=
'0x1'
/>
</controller>
<controller
type=
'pci'
index=
'0'
model=
'pci-root'
/>
<input
type=
'mouse'
bus=
'ps2'
/>
<input
type=
'keyboard'
bus=
'ps2'
/>
<memballoon
model=
'none'
/>
</devices>
</domain>
tests/qemuxml2xmltest.c
浏览文件 @
936b8652
...
...
@@ -365,7 +365,6 @@ mymain(void)
DO_TEST
(
"disk-cdrom-empty"
);
DO_TEST
(
"disk-floppy"
);
DO_TEST
(
"disk-many"
);
DO_TEST
(
"disk-xenvbd"
);
DO_TEST
(
"disk-usb-device"
);
DO_TEST
(
"disk-virtio"
);
DO_TEST
(
"floppy-drive-fat"
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录