diff options
| author | Kevin Wolf <kwolf@redhat.com> | 2018-06-13 11:01:30 +0200 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2018-08-15 12:50:39 +0200 |
| commit | b24ec3c46281286a6a5624d0ceb5fa6f30bd8a4f (patch) | |
| tree | d6af30f95f5f2819928b994720ec52f54953c10e /hw/block/block.c | |
| parent | 497da8236ab2663a8108858ba7ea59aac21c5fe6 (diff) | |
| download | qemu-b24ec3c46281286a6a5624d0ceb5fa6f30bd8a4f.zip qemu-b24ec3c46281286a6a5624d0ceb5fa6f30bd8a4f.tar.gz qemu-b24ec3c46281286a6a5624d0ceb5fa6f30bd8a4f.tar.bz2 | |
block: Remove deprecated -drive geometry options
This reinstates commit a7aff6dd10b16b67e8b142d0c94c5d92c3fe88f6,
which was temporarily reverted for the 3.0 release so that libvirt gets
some extra time to update their command lines.
The -drive options cyls, heads, secs and trans were deprecated in
QEMU 2.10. It's time to remove them.
hd-geo-test tested both the old version with geometry options in -drive
and the new one with -device. Therefore the code using -drive doesn't
have to be replaced there, we just need to remove the -drive test cases.
This in turn allows some simplification of the code.
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Diffstat (limited to 'hw/block/block.c')
| -rw-r--r-- | hw/block/block.c | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/hw/block/block.c b/hw/block/block.c index b91e2b6..b6c80ab 100644 --- a/hw/block/block.c +++ b/hw/block/block.c @@ -108,20 +108,6 @@ bool blkconf_geometry(BlockConf *conf, int *ptrans, unsigned cyls_max, unsigned heads_max, unsigned secs_max, Error **errp) { - DriveInfo *dinfo; - - if (!conf->cyls && !conf->heads && !conf->secs) { - /* try to fall back to value set with legacy -drive cyls=... */ - dinfo = blk_legacy_dinfo(conf->blk); - if (dinfo) { - conf->cyls = dinfo->cyls; - conf->heads = dinfo->heads; - conf->secs = dinfo->secs; - if (ptrans) { - *ptrans = dinfo->trans; - } - } - } if (!conf->cyls && !conf->heads && !conf->secs) { hd_geometry_guess(conf->blk, &conf->cyls, &conf->heads, &conf->secs, |