[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [Qemu-block] [PATCH 1/3] block: Remove deprecated -driv
From: |
Jeff Cody |
Subject: |
Re: [Qemu-devel] [Qemu-block] [PATCH 1/3] block: Remove deprecated -drive geometry options |
Date: |
Wed, 13 Jun 2018 11:36:21 -0400 |
User-agent: |
Mutt/1.5.24 (2015-08-30) |
On Wed, Jun 13, 2018 at 02:34:56PM +0200, Kevin Wolf wrote:
> 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.
>
> Signed-off-by: Kevin Wolf <address@hidden>
Reviewed-by: Jeff Cody <address@hidden>
> ---
> include/sysemu/blockdev.h | 1 -
> blockdev.c | 75
> +----------------------------------------------
> hw/block/block.c | 14 ---------
> tests/hd-geo-test.c | 18 ------------
> hmp-commands.hx | 1 -
> qemu-doc.texi | 5 ----
> qemu-options.hx | 7 +----
> 7 files changed, 2 insertions(+), 119 deletions(-)
>
> diff --git a/include/sysemu/blockdev.h b/include/sysemu/blockdev.h
> index ac22f2ae1f..37ea39719e 100644
> --- a/include/sysemu/blockdev.h
> +++ b/include/sysemu/blockdev.h
> @@ -35,7 +35,6 @@ struct DriveInfo {
> int auto_del; /* see blockdev_mark_auto_del() */
> bool is_default; /* Added by default_drive() ? */
> int media_cd;
> - int cyls, heads, secs, trans;
> QemuOpts *opts;
> char *serial;
> QTAILQ_ENTRY(DriveInfo) next;
> diff --git a/blockdev.c b/blockdev.c
> index 4862323012..9c891706ef 100644
> --- a/blockdev.c
> +++ b/blockdev.c
> @@ -730,22 +730,6 @@ QemuOptsList qemu_legacy_drive_opts = {
> .type = QEMU_OPT_STRING,
> .help = "interface (ide, scsi, sd, mtd, floppy, pflash, virtio)",
> },{
> - .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 = "addr",
> .type = QEMU_OPT_STRING,
> .help = "pci address (virtio only)",
> @@ -791,7 +775,6 @@ DriveInfo *drive_new(QemuOpts *all_opts,
> BlockInterfaceType block_default_type)
> QemuOpts *legacy_opts;
> DriveMediaType media = MEDIA_DISK;
> BlockInterfaceType type;
> - int cyls, heads, secs, translation;
> int max_devs, bus_id, unit_id, index;
> const char *devaddr;
> const char *werror, *rerror;
> @@ -802,7 +785,7 @@ DriveInfo *drive_new(QemuOpts *all_opts,
> BlockInterfaceType block_default_type)
> Error *local_err = NULL;
> int i;
> const char *deprecated[] = {
> - "serial", "trans", "secs", "heads", "cyls", "addr"
> + "serial", "addr"
> };
>
> /* Change legacy command line options into QMP ones */
> @@ -931,57 +914,6 @@ DriveInfo *drive_new(QemuOpts *all_opts,
> BlockInterfaceType block_default_type)
> type = block_default_type;
> }
>
> - /* Geometry */
> - cyls = qemu_opt_get_number(legacy_opts, "cyls", 0);
> - heads = qemu_opt_get_number(legacy_opts, "heads", 0);
> - secs = qemu_opt_get_number(legacy_opts, "secs", 0);
> -
> - if (cyls || heads || secs) {
> - if (cyls < 1) {
> - error_report("invalid physical cyls number");
> - goto fail;
> - }
> - if (heads < 1) {
> - error_report("invalid physical heads number");
> - goto fail;
> - }
> - if (secs < 1) {
> - error_report("invalid physical secs number");
> - goto fail;
> - }
> - }
> -
> - translation = BIOS_ATA_TRANSLATION_AUTO;
> - value = qemu_opt_get(legacy_opts, "trans");
> - if (value != NULL) {
> - if (!cyls) {
> - error_report("'%s' trans must be used with cyls, heads and secs",
> - value);
> - goto fail;
> - }
> - if (!strcmp(value, "none")) {
> - translation = BIOS_ATA_TRANSLATION_NONE;
> - } else if (!strcmp(value, "lba")) {
> - translation = BIOS_ATA_TRANSLATION_LBA;
> - } else if (!strcmp(value, "large")) {
> - translation = BIOS_ATA_TRANSLATION_LARGE;
> - } else if (!strcmp(value, "rechs")) {
> - translation = BIOS_ATA_TRANSLATION_RECHS;
> - } else if (!strcmp(value, "auto")) {
> - translation = BIOS_ATA_TRANSLATION_AUTO;
> - } else {
> - error_report("'%s' invalid translation type", value);
> - goto fail;
> - }
> - }
> -
> - if (media == MEDIA_CDROM) {
> - if (cyls || secs || heads) {
> - error_report("CHS can't be set with media=cdrom");
> - goto fail;
> - }
> - }
> -
> /* Device address specified by bus/unit or index.
> * If none was specified, try to find the first free one. */
> bus_id = qemu_opt_get_number(legacy_opts, "bus", 0);
> @@ -1104,11 +1036,6 @@ DriveInfo *drive_new(QemuOpts *all_opts,
> BlockInterfaceType block_default_type)
> dinfo = g_malloc0(sizeof(*dinfo));
> dinfo->opts = all_opts;
>
> - dinfo->cyls = cyls;
> - dinfo->heads = heads;
> - dinfo->secs = secs;
> - dinfo->trans = translation;
> -
> dinfo->type = type;
> dinfo->bus = bus_id;
> dinfo->unit = unit_id;
> diff --git a/hw/block/block.c b/hw/block/block.c
> index b91e2b6d7e..b6c80ab0b7 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,
> diff --git a/tests/hd-geo-test.c b/tests/hd-geo-test.c
> index 24870b38f4..d263a74ec0 100644
> --- a/tests/hd-geo-test.c
> +++ b/tests/hd-geo-test.c
> @@ -347,22 +347,6 @@ static void test_ide_drive_user(const char *dev, bool
> trans)
> }
>
> /*
> - * Test case: IDE device (if=ide) with explicit CHS
> - */
> -static void test_ide_drive_user_chs(void)
> -{
> - test_ide_drive_user(NULL, false);
> -}
> -
> -/*
> - * Test case: IDE device (if=ide) with explicit CHS and translation
> - */
> -static void test_ide_drive_user_chst(void)
> -{
> - test_ide_drive_user(NULL, true);
> -}
> -
> -/*
> * Test case: IDE device (if=none) with explicit CHS
> */
> static void test_ide_device_user_chs(void)
> @@ -422,8 +406,6 @@ int main(int argc, char **argv)
> qtest_add_func("hd-geo/ide/drive/mbr/blank", test_ide_drive_mbr_blank);
> qtest_add_func("hd-geo/ide/drive/mbr/lba", test_ide_drive_mbr_lba);
> qtest_add_func("hd-geo/ide/drive/mbr/chs", test_ide_drive_mbr_chs);
> - qtest_add_func("hd-geo/ide/drive/user/chs", test_ide_drive_user_chs);
> - qtest_add_func("hd-geo/ide/drive/user/chst", test_ide_drive_user_chst);
> qtest_add_func("hd-geo/ide/drive/cd_0", test_ide_drive_cd_0);
> qtest_add_func("hd-geo/ide/device/mbr/blank", test_ide_device_mbr_blank);
> qtest_add_func("hd-geo/ide/device/mbr/lba", test_ide_device_mbr_lba);
> diff --git a/hmp-commands.hx b/hmp-commands.hx
> index 0734fea931..0de7c4c29e 100644
> --- a/hmp-commands.hx
> +++ b/hmp-commands.hx
> @@ -1283,7 +1283,6 @@ ETEXI
> .params = "[-n] [[<domain>:]<bus>:]<slot>\n"
> "[file=file][,if=type][,bus=n]\n"
> "[,unit=m][,media=d][,index=i]\n"
> - "[,cyls=c,heads=h,secs=s[,trans=t]]\n"
> "[,snapshot=on|off][,cache=on|off]\n"
> "[,readonly=on|off][,copy-on-read=on|off]",
> .help = "add drive to PCI storage controller",
> diff --git a/qemu-doc.texi b/qemu-doc.texi
> index cd05760cac..ab95bffc74 100644
> --- a/qemu-doc.texi
> +++ b/qemu-doc.texi
> @@ -2850,11 +2850,6 @@ with ``-device ...,netdev=x''), or ``-nic
> user,smb=/some/dir''
> (for embedded NICs). The new syntax allows different settings to be
> provided per NIC.
>
> address@hidden -drive cyls=...,heads=...,secs=...,trans=... (since 2.10.0)
> -
> -The drive geometry arguments are replaced by the the geometry arguments
> -that can be specified with the ``-device'' parameter.
> -
> @subsection -drive serial=... (since 2.10.0)
>
> The drive serial argument is replaced by the the serial argument
> diff --git a/qemu-options.hx b/qemu-options.hx
> index c0d3951e9f..a14b9655c5 100644
> --- a/qemu-options.hx
> +++ b/qemu-options.hx
> @@ -804,9 +804,8 @@ ETEXI
>
> DEF("drive", HAS_ARG, QEMU_OPTION_drive,
> "-drive [file=file][,if=type][,bus=n][,unit=m][,media=d][,index=i]\n"
> - " [,cyls=c,heads=h,secs=s[,trans=t]][,snapshot=on|off]\n"
> "
> [,cache=writethrough|writeback|none|directsync|unsafe][,format=f]\n"
> - " [,serial=s][,addr=A][,rerror=ignore|stop|report]\n"
> + "
> [,snapshot=on|off][,serial=s][,addr=A][,rerror=ignore|stop|report]\n"
> "
> [,werror=ignore|stop|report|enospc][,id=name][,aio=threads|native]\n"
> " [,readonly=on|off][,copy-on-read=on|off]\n"
> " [,discard=ignore|unmap][,detect-zeroes=on|off|unmap]\n"
> @@ -847,10 +846,6 @@ This option defines where is connected the drive by
> using an index in the list
> of available connectors of a given interface type.
> @item address@hidden
> This option defines the type of the media: disk or cdrom.
> address@hidden address@hidden,address@hidden,address@hidden,address@hidden
> -Force disk physical geometry and the optional BIOS translation (trans=none or
> -lba). These parameters are deprecated, use the corresponding parameters
> -of @code{-device} instead.
> @item address@hidden
> @var{snapshot} is "on" or "off" and controls snapshot mode for the given
> drive
> (see @option{-snapshot}).
> --
> 2.13.6
>
>