Commit a7aff6dd authored by Kevin Wolf's avatar Kevin Wolf
Browse files

block: Remove deprecated -drive geometry options 



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: default avatarKevin Wolf <kwolf@redhat.com>
Reviewed-by: default avatarMarkus Armbruster <armbru@redhat.com>
parent d083f954

blockdev.c

+1 −74
Original line number Diff line number Diff line
@@ -730,22 +730,6 @@ QemuOptsList qemu_legacy_drive_opts = { 
            .name = "if",

            .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,
@@ -792,7 +776,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;
@@ -803,7 +786,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 */
@@ -932,57 +915,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);
@@ -1105,11 +1037,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;

hmp-commands.hx

+0 −1
Original line number Diff line number Diff line
@@ -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",

hw/block/block.c

+0 −14
Original line number Diff line number Diff line
@@ -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,

include/sysemu/blockdev.h

+0 −1
Original line number Diff line number Diff line
@@ -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;

qemu-doc.texi

+0 −5
Original line number Diff line number Diff line
@@ -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.



@subsection -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