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

block: Remove deprecated -drive option serial 



The -drive option serial was deprecated in QEMU 2.10. It's time to
remove it.

Tests need to be updated to set the serial number with -global instead
of using the -drive option.

Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
Reviewed-by: default avatarMarkus Armbruster <armbru@redhat.com>
Reviewed-by: default avatarJeff Cody <jcody@redhat.com>
parent eae3bd1e

block/block-backend.c

+0 −1
Original line number Diff line number Diff line
@@ -419,7 +419,6 @@ static void drive_info_del(DriveInfo *dinfo) 
        return;

    }

    qemu_opts_del(dinfo->opts);

    g_free(dinfo->serial);

    g_free(dinfo);

}

blockdev.c

+0 −10
Original line number Diff line number Diff line
@@ -730,10 +730,6 @@ QemuOptsList qemu_legacy_drive_opts = { 
            .name = "if",

            .type = QEMU_OPT_STRING,

            .help = "interface (ide, scsi, sd, mtd, floppy, pflash, virtio)",

        },{

            .name = "serial",

            .type = QEMU_OPT_STRING,

            .help = "disk serial number",

        },{

            .name = "file",

            .type = QEMU_OPT_STRING,
@@ -776,12 +772,10 @@ DriveInfo *drive_new(QemuOpts *all_opts, BlockInterfaceType block_default_type) 
    const char *werror, *rerror;

    bool read_only = false;

    bool copy_on_read;

    const char *serial;

    const char *filename;

    Error *local_err = NULL;

    int i;

    const char *deprecated[] = {

        "serial"

    };



    /* Change legacy command line options into QMP ones */
@@ -949,9 +943,6 @@ DriveInfo *drive_new(QemuOpts *all_opts, BlockInterfaceType block_default_type) 
        goto fail;

    }



    /* Serial number */

    serial = qemu_opt_get(legacy_opts, "serial");



    /* no id supplied -> create one */

    if (qemu_opts_id(all_opts) == NULL) {

        char *new_id;
@@ -1026,7 +1017,6 @@ DriveInfo *drive_new(QemuOpts *all_opts, BlockInterfaceType block_default_type) 
    dinfo->type = type;

    dinfo->bus = bus_id;

    dinfo->unit = unit_id;

    dinfo->serial = g_strdup(serial);



    blk_set_legacy_dinfo(blk, dinfo);

hw/block/block.c

+0 −13
Original line number Diff line number Diff line
@@ -15,19 +15,6 @@ 
#include "qapi/qapi-types-block.h"

#include "qemu/error-report.h"



void blkconf_serial(BlockConf *conf, char **serial)

{

    DriveInfo *dinfo;



    if (!*serial) {

        /* try to fall back to value set with legacy -drive serial=... */

        dinfo = blk_legacy_dinfo(conf->blk);

        if (dinfo) {

            *serial = g_strdup(dinfo->serial);

        }

    }

}



void blkconf_blocksizes(BlockConf *conf)

{

    BlockBackend *blk = conf->blk;

hw/block/nvme.c

+0 −1
Original line number Diff line number Diff line
@@ -1215,7 +1215,6 @@ static void nvme_realize(PCIDevice *pci_dev, Error **errp) 
        return;

    }



    blkconf_serial(&n->conf, &n->serial);

    if (!n->serial) {

        error_setg(errp, "serial property not set");

        return;

hw/block/virtio-blk.c

+0 −1
Original line number Diff line number Diff line
@@ -935,7 +935,6 @@ static void virtio_blk_device_realize(DeviceState *dev, Error **errp) 
        return;

    }



    blkconf_serial(&conf->conf, &conf->serial);

    if (!blkconf_apply_backend_options(&conf->conf,

                                       blk_is_read_only(conf->conf.blk), true,

                                       errp)) {