Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
qemu
提交
c0447d87
Q
qemu
项目概览
openeuler
/
qemu
通知
10
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
Q
qemu
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
c0447d87
编写于
8月 28, 2013
作者:
K
Kevin Wolf
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Revert "block: Disable driver-specific options for 1.6"
This reverts commit
8afaefb8
. Signed-off-by:
N
Kevin Wolf
<
kwolf@redhat.com
>
上级
01537030
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
1 addition
and
144 deletion
+1
-144
blockdev.c
blockdev.c
+0
-143
tests/qemu-iotests/group
tests/qemu-iotests/group
+1
-1
未找到文件。
blockdev.c
浏览文件 @
c0447d87
...
...
@@ -46,7 +46,6 @@
static
QTAILQ_HEAD
(
drivelist
,
DriveInfo
)
drives
=
QTAILQ_HEAD_INITIALIZER
(
drives
);
extern
QemuOptsList
qemu_common_drive_opts
;
extern
QemuOptsList
qemu_old_drive_opts
;
static
const
char
*
const
if_name
[
IF_COUNT
]
=
{
[
IF_NONE
]
=
"none"
,
...
...
@@ -755,26 +754,6 @@ DriveInfo *drive_init(QemuOpts *all_opts, BlockInterfaceType block_default_type)
{
const
char
*
value
;
/*
* Check that only old options are used by copying into a QemuOpts with
* stricter checks. Going through a QDict seems to be the easiest way to
* achieve this...
*/
QemuOpts
*
check_opts
;
QDict
*
qdict
;
Error
*
local_err
=
NULL
;
qdict
=
qemu_opts_to_qdict
(
all_opts
,
NULL
);
check_opts
=
qemu_opts_from_qdict
(
&
qemu_old_drive_opts
,
qdict
,
&
local_err
);
QDECREF
(
qdict
);
if
(
error_is_set
(
&
local_err
))
{
qerror_report_err
(
local_err
);
error_free
(
local_err
);
return
NULL
;
}
qemu_opts_del
(
check_opts
);
/* Change legacy command line options into QMP ones */
qemu_opt_rename
(
all_opts
,
"iops"
,
"throttling.iops-total"
);
qemu_opt_rename
(
all_opts
,
"iops_rd"
,
"throttling.iops-read"
);
...
...
@@ -2001,128 +1980,6 @@ QemuOptsList qemu_common_drive_opts = {
},
};
QemuOptsList
qemu_old_drive_opts
=
{
.
name
=
"drive"
,
.
head
=
QTAILQ_HEAD_INITIALIZER
(
qemu_old_drive_opts
.
head
),
.
desc
=
{
{
.
name
=
"bus"
,
.
type
=
QEMU_OPT_NUMBER
,
.
help
=
"bus number"
,
},{
.
name
=
"unit"
,
.
type
=
QEMU_OPT_NUMBER
,
.
help
=
"unit number (i.e. lun for scsi)"
,
},{
.
name
=
"if"
,
.
type
=
QEMU_OPT_STRING
,
.
help
=
"interface (ide, scsi, sd, mtd, floppy, pflash, virtio)"
,
},{
.
name
=
"index"
,
.
type
=
QEMU_OPT_NUMBER
,
.
help
=
"index number"
,
},{
.
name
=
"cyls"
,
.
type
=
QEMU_OPT_NUMBER
,
.
help
=
"number of cylinders (ide disk geometry)"
,
},{
.
name
=
"heads"
,
.
type
=
QEMU_OPT_NUMBER
,
.
help
=
"number of heads (ide disk geometry)"
,
},{
.
name
=
"secs"
,
.
type
=
QEMU_OPT_NUMBER
,
.
help
=
"number of sectors (ide disk geometry)"
,
},{
.
name
=
"trans"
,
.
type
=
QEMU_OPT_STRING
,
.
help
=
"chs translation (auto, lba. none)"
,
},{
.
name
=
"media"
,
.
type
=
QEMU_OPT_STRING
,
.
help
=
"media type (disk, cdrom)"
,
},{
.
name
=
"snapshot"
,
.
type
=
QEMU_OPT_BOOL
,
.
help
=
"enable/disable snapshot mode"
,
},{
.
name
=
"file"
,
.
type
=
QEMU_OPT_STRING
,
.
help
=
"disk image"
,
},{
.
name
=
"discard"
,
.
type
=
QEMU_OPT_STRING
,
.
help
=
"discard operation (ignore/off, unmap/on)"
,
},{
.
name
=
"cache"
,
.
type
=
QEMU_OPT_STRING
,
.
help
=
"host cache usage (none, writeback, writethrough, "
"directsync, unsafe)"
,
},{
.
name
=
"aio"
,
.
type
=
QEMU_OPT_STRING
,
.
help
=
"host AIO implementation (threads, native)"
,
},{
.
name
=
"format"
,
.
type
=
QEMU_OPT_STRING
,
.
help
=
"disk format (raw, qcow2, ...)"
,
},{
.
name
=
"serial"
,
.
type
=
QEMU_OPT_STRING
,
.
help
=
"disk serial number"
,
},{
.
name
=
"rerror"
,
.
type
=
QEMU_OPT_STRING
,
.
help
=
"read error action"
,
},{
.
name
=
"werror"
,
.
type
=
QEMU_OPT_STRING
,
.
help
=
"write error action"
,
},{
.
name
=
"addr"
,
.
type
=
QEMU_OPT_STRING
,
.
help
=
"pci address (virtio only)"
,
},{
.
name
=
"readonly"
,
.
type
=
QEMU_OPT_BOOL
,
.
help
=
"open drive file as read-only"
,
},{
.
name
=
"iops"
,
.
type
=
QEMU_OPT_NUMBER
,
.
help
=
"limit total I/O operations per second"
,
},{
.
name
=
"iops_rd"
,
.
type
=
QEMU_OPT_NUMBER
,
.
help
=
"limit read operations per second"
,
},{
.
name
=
"iops_wr"
,
.
type
=
QEMU_OPT_NUMBER
,
.
help
=
"limit write operations per second"
,
},{
.
name
=
"bps"
,
.
type
=
QEMU_OPT_NUMBER
,
.
help
=
"limit total bytes per second"
,
},{
.
name
=
"bps_rd"
,
.
type
=
QEMU_OPT_NUMBER
,
.
help
=
"limit read bytes per second"
,
},{
.
name
=
"bps_wr"
,
.
type
=
QEMU_OPT_NUMBER
,
.
help
=
"limit write bytes per second"
,
},{
.
name
=
"copy-on-read"
,
.
type
=
QEMU_OPT_BOOL
,
.
help
=
"copy read data from backing file into image file"
,
},{
.
name
=
"boot"
,
.
type
=
QEMU_OPT_BOOL
,
.
help
=
"(deprecated, ignored)"
,
},
{
/* end of list */
}
},
};
QemuOptsList
qemu_drive_opts
=
{
.
name
=
"drive"
,
.
head
=
QTAILQ_HEAD_INITIALIZER
(
qemu_drive_opts
.
head
),
...
...
tests/qemu-iotests/group
浏览文件 @
c0447d87
...
...
@@ -57,7 +57,7 @@
048 img auto quick
049 rw auto
050 rw auto backing quick
#
051 rw auto
051 rw auto
052 rw auto backing
053 rw auto
054 rw auto
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录