block: Remove deprecated -drive options
v2 cover block: Remove deprecated -drive options
We deprecated a bunch of -drive options in 2.10, so let's remove them for 3.0.
v2:
- Simplified hd-geo-test code after removing test cases [Markus]
- Split patch 3 and 4 so that the deprecation warning code can be easily restored if we ever need it again [Markus]
Kevin Wolf (4):
block: Remove deprecated -drive geometry options
block: Remove deprecated -drive option addr
block: Remove deprecated -drive option serial
block: Remove dead deprecation warning code
include/hw/block/block.h | 1 - include/sysemu/blockdev.h | 3 -- block/block-backend.c | 1 - blockdev.c | 110 ---------------------------------------------- device-hotplug.c | 4 -- hw/block/block.c | 27 ------------ hw/block/nvme.c | 1 - hw/block/virtio-blk.c | 1 - hw/ide/qdev.c | 1 - hw/scsi/scsi-disk.c | 1 - hw/usb/dev-storage.c | 1 - tests/ahci-test.c | 6 +-- tests/hd-geo-test.c | 37 +++------------- tests/ide-test.c | 8 ++-- hmp-commands.hx | 1 - qemu-doc.texi | 15 ------- qemu-options.hx | 14 +----- 17 files changed, 15 insertions(+), 217 deletions(-)
Signature · 1 line
2.13.6
PATCH v2 1/4 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 Kevin Wolf <[email protected]>
--- include/sysemu/blockdev.h | 1 - blockdev.c | 75 +---------------------------------------------- hw/block/block.c | 14 --------- tests/hd-geo-test.c | 37 +++++------------------ hmp-commands.hx | 1 - qemu-doc.texi | 5 ---- qemu-options.hx | 7 +---- 7 files changed, 9 insertions(+), 131 deletions(-)
include/sysemu/blockdev.h +0 -1
@@ -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;
blockdev.c +1 -74
105 lines not on this page · raw message
hw/block/block.c +0 -14
@@ -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,
tests/hd-geo-test.c +7 -30
@@ -201,7 +201,7 @@ static void setup_mbr(int img_idx, MBRcontents mbr)static int setup_ide (int argc,char *argv[],int argv_sz,int ide_idx,const char *dev,int img_idx, -MBRcontents mbr,const char *opts) +MBRcontents mbr) {char *s1, *s2, *s3;
@@ -216,7 +216,7 @@ static int setup_ide(int argc, char *argv[], int argv_sz, s3 =g_strdup (",media=cdrom" ); } argc =append_arg (argc, argv, argv_sz, -g_strdup_printf ("%s%s%s%s" , s1, s2, s3, opts)); +g_strdup_printf ("%s%s%s" , s1, s2, s3));g_free (s1);g_free (s2);g_free (s3);
@@ -260,7 +260,7 @@ static void test_ide_mbr(bool use_device, MBRcontents mbr)for (i =0 ; i < backend_last; i++) { cur_ide[i] = &hd_chst[i][mbr]; dev = use_device ? (is_hd (cur_ide[i]) ?"ide-hd" :"ide-cd" ) :NULL ; - argc =setup_ide (argc, argv,ARGV_SIZE , i, dev, i, mbr,"" ); + argc =setup_ide (argc, argv,ARGV_SIZE , i, dev, i, mbr); } args =g_strjoinv (" " , argv);qtest_start (args);
@@ -327,16 +327,12 @@ static void test_ide_drive_user(const char *dev, bool trans)const CHST expected_chst = { secs / (4 *32 ) ,4 ,32 , trans }; argc =setup_common (argv,ARGV_SIZE ); - opts =g_strdup_printf ("%s,%s%scyls=%d,heads=%d,secs=%d" , - dev ?:"" , - trans && dev ?"bios-chs-" :"" , - trans ?"trans=lba," :"" , + opts =g_strdup_printf ("%s,%scyls=%d,heads=%d,secs=%d" , + dev, trans ?"bios-chs-trans=lba," :"" , expected_chst.cyls, expected_chst.heads, expected_chst.secs); cur_ide[0 ] = &expected_chst; - argc =setup_ide (argc, argv,ARGV_SIZE , -0 , dev ? opts :NULL , backend_small, mbr_chs, - dev ?"" : opts); + argc =setup_ide (argc, argv,ARGV_SIZE ,0 , opts, backend_small, mbr_chs);g_free (opts); args =g_strjoinv (" " , argv);qtest_start (args);
@@ -347,22 +343,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 )
@@ -392,8 +372,7 @@ static void test_ide_drive_cd_0(void)for (i =0 ; i <= backend_empty; i++) { ide_idx = backend_empty - i; cur_ide[ide_idx] = &hd_chst[i][mbr_blank]; - argc =setup_ide (argc, argv,ARGV_SIZE , - ide_idx,NULL , i, mbr_blank,"" ); + argc =setup_ide (argc, argv,ARGV_SIZE , ide_idx,NULL , i, mbr_blank); } args =g_strjoinv (" " , argv);qtest_start (args);
@@ -422,8 +401,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);
hmp-commands.hx +0 -1
@@ -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",
qemu-doc.texi +0 -5
@@ -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
qemu-options.hx +1 -6
@@ -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 media=@var{media} This option defines the type of the media: disk or cdrom. -@item cyls=@var{c},heads=@var{h},secs=@var{s}[,trans=@var{t}] -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 snapshot=@var{snapshot} @var{snapshot} is "on" or "off" and controls snapshot mode for the given drive (see @option{-snapshot}).
Signature · 1 line
2.13.6
Re: [Qemu-devel] [PATCH v2 1/4] block: Remove deprecated -drive geometry options
Quoted 9 lines · Kevin Wolf
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 <[email protected]>
Reviewed-by Markus Armbruster <[email protected]>
PATCH v2 2/4 block: Remove deprecated -drive option addr
In reply to Kevin WolfThe -drive option addr was deprecated in QEMU 2.10. It's time to remove it.
Signed-off-by Kevin Wolf <[email protected]>
Reviewed-by Markus Armbruster <[email protected]>
Reviewed-by Jeff Cody <[email protected]>
--- include/sysemu/blockdev.h | 1 - blockdev.c | 17 +---------------- device-hotplug.c | 4 ---- qemu-doc.texi | 5 ----- qemu-options.hx | 5 +---- 5 files changed, 2 insertions(+), 30 deletions(-)
include/sysemu/blockdev.h +0 -1
@@ -28,7 +28,6 @@ typedef enum { } BlockInterfaceType;struct DriveInfo { -const char *devaddr;BlockInterfaceType type;int bus;int unit;
blockdev.c +1 -16
@@ -730,10 +730,6 @@ QemuOptsList qemu_legacy_drive_opts = { .type = QEMU_OPT_STRING, .help = "interface (ide, scsi, sd, mtd, floppy, pflash, virtio)", },{ - .name = "addr", - .type = QEMU_OPT_STRING, - .help = "pci address (virtio only)", - },{ .name = "serial", .type = QEMU_OPT_STRING, .help = "disk serial number",
@@ -776,7 +772,6 @@ DriveInfo *drive_new(QemuOpts *all_opts, BlockInterfaceType block_default_type)DriveMediaType media =MEDIA_DISK ;BlockInterfaceType type;int max_devs, bus_id, unit_id, index; -const char *devaddr;const char *werror, *rerror;bool read_only = false;bool copy_on_read;
@@ -785,7 +780,7 @@ DriveInfo *drive_new(QemuOpts *all_opts, BlockInterfaceType block_default_type)Error *local_err =NULL ;int i;const char *deprecated[] = { -"serial" ,"addr" +"serial" };/* Change legacy command line options into QMP ones */
@@ -975,12 +970,6 @@ DriveInfo *drive_new(QemuOpts *all_opts, BlockInterfaceType block_default_type) }/* Add virtio block device */ - devaddr =qemu_opt_get (legacy_opts,"addr" ); -if (devaddr && type !=IF_VIRTIO ) { -error_report ("addr is not supported by this bus type" ); - goto fail; - } -if (type ==IF_VIRTIO ) {QemuOpts *devopts; devopts = qemu_opts_create(qemu_find_opts("device"), NULL, 0,
@@ -992,9 +981,6 @@ DriveInfo *drive_new(QemuOpts *all_opts, BlockInterfaceType block_default_type) }qemu_opt_set (devopts,"drive" ,qdict_get_str (bs_opts,"id" ), &error_abort); -if (devaddr) { -qemu_opt_set (devopts,"addr" , devaddr, &error_abort); - } } filename =qemu_opt_get (legacy_opts,"file" );
@@ -1039,7 +1025,6 @@ DriveInfo *drive_new(QemuOpts *all_opts, BlockInterfaceType block_default_type) dinfo->type = type; dinfo->bus = bus_id; dinfo->unit = unit_id; - dinfo->devaddr = devaddr; dinfo->serial =g_strdup (serial);blk_set_legacy_dinfo (blk, dinfo);
device-hotplug.c +0 -4
@@ -69,10 +69,6 @@ void hmp_drive_add(Monitor *mon, const QDict *qdict)if (!dinfo) { goto err; } -if (dinfo->devaddr) { -monitor_printf (mon,"Parameter addr not supported\n" ); - goto err; - }switch (dinfo->type) {case IF_NONE :
qemu-doc.texi +0 -5
@@ -2855,11 +2855,6 @@ provided per NIC. The drive serial argument is replaced by the the serial argument that can be specified with the ``-device'' parameter. -@subsection -drive addr=... (since 2.10.0) - -The drive addr argument is replaced by the the addr argument -that can be specified with the ``-device'' parameter. - @subsection -usbdevice (since 2.10.0) The ``-usbdevice DEV'' argument is now a synonym for setting
qemu-options.hx +1 -4
@@ -805,7 +805,7 @@ ETEXI DEF("drive", HAS_ARG, QEMU_OPTION_drive, "-drive [file=file][,if=type][,bus=n][,unit=m][,media=d][,index=i]\n" " [,cache=writethrough|writeback|none|directsync|unsafe][,format=f]\n" - " [,snapshot=on|off][,serial=s][,addr=A][,rerror=ignore|stop|report]\n" + " [,snapshot=on|off][,serial=s][,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"
@@ -883,9 +883,6 @@ an untrusted format header. This option specifies the serial number to assign to the device. This parameter is deprecated, use the corresponding parameter of @code{-device} instead. -@item addr=@var{addr} -Specify the controller's PCI address (if=virtio only). This parameter is -deprecated, use the corresponding parameter of @code{-device} instead. @item werror=@var{action},rerror=@var{action} Specify which @var{action} to take on write and read errors. Valid actions are: "ignore" (ignore the error and try to continue), "stop" (pause QEMU),
Signature · 1 line
2.13.6
PATCH v2 3/4 block: Remove deprecated -drive option serial
In reply to Kevin WolfThe -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 Kevin Wolf <[email protected]>
Reviewed-by Markus Armbruster <[email protected]>
Reviewed-by Jeff Cody <[email protected]>
Signed-off-by Kevin Wolf <[email protected]>
--- include/hw/block/block.h | 1 - include/sysemu/blockdev.h | 1 - block/block-backend.c | 1 - blockdev.c | 10 ---------- hw/block/block.c | 13 ------------- hw/block/nvme.c | 1 - hw/block/virtio-blk.c | 1 - hw/ide/qdev.c | 1 - hw/scsi/scsi-disk.c | 1 - hw/usb/dev-storage.c | 1 - tests/ahci-test.c | 6 +++--- tests/ide-test.c | 8 ++++---- qemu-doc.texi | 5 ----- qemu-options.hx | 6 +----- 14 files changed, 8 insertions(+), 48 deletions(-)
include/hw/block/block.h +0 -1
@@ -72,7 +72,6 @@ static inline unsigned int get_physical_block_exp(BlockConf *conf)/* Configuration helpers */ -void blkconf_serial (BlockConf *conf,char **serial);bool blkconf_geometry (BlockConf *conf,int *trans,unsigned cyls_max,unsigned heads_max,unsigned secs_max,Error **errp);
include/sysemu/blockdev.h +0 -1
@@ -35,7 +35,6 @@ struct DriveInfo {bool is_default;/* Added by default_drive() ? */ int media_cd;QemuOpts *opts; -char *serial;QTAILQ_ENTRY (DriveInfo) next; };
block/block-backend.c +0 -1
@@ -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
@@ -730,10 +730,6 @@ QemuOptsList qemu_legacy_drive_opts = { .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, .help = "file name",
@@ -775,12 +771,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 */
@@ -948,9 +942,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;
@@ -1025,7 +1016,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
@@ -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
@@ -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
@@ -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)) {
hw/ide/qdev.c +0 -1
@@ -188,7 +188,6 @@ static void ide_dev_initfn(IDEDevice *dev, IDEDriveKind kind, Error **errp)return ; } -blkconf_serial (&dev->conf, &dev->serial);if (kind !=IDE_CD ) {if (!blkconf_geometry (&dev->conf, &dev->chs_trans,65535 ,16 ,255 , errp)) {
hw/scsi/scsi-disk.c +0 -1
@@ -2368,7 +2368,6 @@ static void scsi_realize(SCSIDevice *dev, Error **errp)return ; } -blkconf_serial (&s->qdev.conf, &s->serial);blkconf_blocksizes (&s->qdev.conf); if (s->qdev.conf.logical_block_size >
hw/usb/dev-storage.c +0 -1
@@ -606,7 +606,6 @@ static void usb_msd_storage_realize(USBDevice *dev, Error **errp)return ; } -blkconf_serial (&s->conf, &dev->serial);blkconf_blocksizes (&s->conf);if (!blkconf_apply_backend_options (&s->conf,blk_is_read_only (blk), true, errp)) {
tests/ahci-test.c +3 -3
@@ -180,12 +180,12 @@ static AHCIQState *ahci_boot(const char *cli, ...) s =ahci_vboot (cli, ap);va_end (ap); }else { - cli ="-drive if=none,id=drive0,file=%s,cache=writeback,serial=%s" -",format=%s" + cli ="-drive if=none,id=drive0,file=%s,cache=writeback,format=%s" " -M q35 " "-device ide-hd,drive=drive0 " +"-global ide-hd.serial=%s " "-global ide-hd.ver=%s" ; - s =ahci_boot (cli, tmp_path,"testdisk" , imgfmt,"version" ); + s =ahci_boot (cli, tmp_path, imgfmt,"testdisk" ,"version" ); }return s;
tests/ide-test.c +4 -4
@@ -529,8 +529,8 @@ static void test_bmdma_no_busmaster(void)static void test_bmdma_setup (void ) {ide_test_start ( -"-drive file=%s,if=ide,serial=%s,cache=writeback,format=raw " -"-global ide-hd.ver=%s" , +"-drive file=%s,if=ide,cache=writeback,format=raw " +"-global ide-hd.serial=%s -global ide-hd.ver=%s" , tmp_path,"testdisk" ,"version" );qtest_irq_intercept_in (global_qtest,"ioapic" ); }
@@ -561,8 +561,8 @@ static void test_identify(void)int ret;ide_test_start ( -"-drive file=%s,if=ide,serial=%s,cache=writeback,format=raw " -"-global ide-hd.ver=%s" , +"-drive file=%s,if=ide,cache=writeback,format=raw " +"-global ide-hd.serial=%s -global ide-hd.ver=%s" , tmp_path,"testdisk" ,"version" ); dev =get_pci_device (&bmdma_bar, &ide_bar);
qemu-doc.texi +0 -5
@@ -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 serial=... (since 2.10.0) - -The drive serial argument is replaced by the the serial argument -that can be specified with the ``-device'' parameter. - @subsection -usbdevice (since 2.10.0) The ``-usbdevice DEV'' argument is now a synonym for setting
qemu-options.hx +1 -5
@@ -805,7 +805,7 @@ ETEXI DEF("drive", HAS_ARG, QEMU_OPTION_drive, "-drive [file=file][,if=type][,bus=n][,unit=m][,media=d][,index=i]\n" " [,cache=writethrough|writeback|none|directsync|unsafe][,format=f]\n" - " [,snapshot=on|off][,serial=s][,rerror=ignore|stop|report]\n" + " [,snapshot=on|off][,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"
@@ -879,10 +879,6 @@ The default mode is @option{cache=writeback}. Specify which disk @var{format} will be used rather than detecting the format. Can be used to specify format=raw to avoid interpreting an untrusted format header. -@item serial=@var{serial} -This option specifies the serial number to assign to the device. This -parameter is deprecated, use the corresponding parameter of @code{-device} -instead. @item werror=@var{action},rerror=@var{action} Specify which @var{action} to take on write and read errors. Valid actions are: "ignore" (ignore the error and try to continue), "stop" (pause QEMU),
Signature · 1 line
2.13.6
Re: [Qemu-devel] [PATCH v2 3/4] block: Remove deprecated -drive option serial
Quoted 5 lines · Kevin Wolf
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.
Libguestfs uses this option to set the disk serial/label. What is the alternate syntax?
Rich.
Quoted 276 lines
Signed-off-by Kevin Wolf <[email protected]>Reviewed-by Markus Armbruster <[email protected]>Reviewed-by Jeff Cody <[email protected]>Signed-off-by Kevin Wolf <[email protected]>--- include/hw/block/block.h | 1 - include/sysemu/blockdev.h | 1 - block/block-backend.c | 1 - blockdev.c | 10 ---------- hw/block/block.c | 13 ------------- hw/block/nvme.c | 1 - hw/block/virtio-blk.c | 1 - hw/ide/qdev.c | 1 - hw/scsi/scsi-disk.c | 1 - hw/usb/dev-storage.c | 1 - tests/ahci-test.c | 6 +++--- tests/ide-test.c | 8 ++++---- qemu-doc.texi | 5 ----- qemu-options.hx | 6 +----- 14 files changed, 8 insertions(+), 48 deletions(-)include/hw/block/block.h +0
-1@@ -72,7 +72,6 @@ static inline unsigned int get_physical_block_exp(BlockConf *conf)/* Configuration helpers */ -void blkconf_serial (BlockConf *conf,char **serial);bool blkconf_geometry (BlockConf *conf,int *trans,unsigned cyls_max,unsigned heads_max,unsigned secs_max,Error **errp);include/sysemu/blockdev.h +0
-1@@ -35,7 +35,6 @@ struct DriveInfo {bool is_default;/* Added by default_drive() ? */ int media_cd;QemuOpts *opts; -char *serial;QTAILQ_ENTRY (DriveInfo) next; };block/block-backend.c +0
-1@@ -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@@ -730,10 +730,6 @@ QemuOptsList qemu_legacy_drive_opts = { .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, .help = "file name",@@ -775,12 +771,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 */ @@ -948,9 +942,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;@@ -1025,7 +1016,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@@ -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@@ -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@@ -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)) {hw/ide/qdev.c +0
-1@@ -188,7 +188,6 @@ static void ide_dev_initfn(IDEDevice *dev, IDEDriveKind kind, Error **errp)return ; } -blkconf_serial (&dev->conf, &dev->serial);if (kind !=IDE_CD ) {if (!blkconf_geometry (&dev->conf, &dev->chs_trans,65535 ,16 ,255 , errp)) {hw/scsi/scsi-disk.c +0
-1@@ -2368,7 +2368,6 @@ static void scsi_realize(SCSIDevice *dev, Error **errp)return ; } -blkconf_serial (&s->qdev.conf, &s->serial);blkconf_blocksizes (&s->qdev.conf); if (s->qdev.conf.logical_block_size >hw/usb/dev-storage.c +0
-1@@ -606,7 +606,6 @@ static void usb_msd_storage_realize(USBDevice *dev, Error **errp)return ; } -blkconf_serial (&s->conf, &dev->serial);blkconf_blocksizes (&s->conf);if (!blkconf_apply_backend_options (&s->conf,blk_is_read_only (blk), true, errp)) {tests/ahci-test.c +3
-3@@ -180,12 +180,12 @@ static AHCIQState *ahci_boot(const char *cli, ...) s =ahci_vboot (cli, ap);va_end (ap); }else { - cli ="-drive if=none,id=drive0,file=%s,cache=writeback,serial=%s" -",format=%s" + cli ="-drive if=none,id=drive0,file=%s,cache=writeback,format=%s" " -M q35 " "-device ide-hd,drive=drive0 " +"-global ide-hd.serial=%s " "-global ide-hd.ver=%s" ; - s =ahci_boot (cli, tmp_path,"testdisk" , imgfmt,"version" ); + s =ahci_boot (cli, tmp_path, imgfmt,"testdisk" ,"version" ); }return s;tests/ide-test.c +4
-4@@ -529,8 +529,8 @@ static void test_bmdma_no_busmaster(void)static void test_bmdma_setup (void ) {ide_test_start ( -"-drive file=%s,if=ide,serial=%s,cache=writeback,format=raw " -"-global ide-hd.ver=%s" , +"-drive file=%s,if=ide,cache=writeback,format=raw " +"-global ide-hd.serial=%s -global ide-hd.ver=%s" , tmp_path,"testdisk" ,"version" );qtest_irq_intercept_in (global_qtest,"ioapic" ); }@@ -561,8 +561,8 @@ static void test_identify(void)int ret;ide_test_start ( -"-drive file=%s,if=ide,serial=%s,cache=writeback,format=raw " -"-global ide-hd.ver=%s" , +"-drive file=%s,if=ide,cache=writeback,format=raw " +"-global ide-hd.serial=%s -global ide-hd.ver=%s" , tmp_path,"testdisk" ,"version" ); dev =get_pci_device (&bmdma_bar, &ide_bar);qemu-doc.texi +0
-5@@ -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 serial=... (since 2.10.0) - -The drive serial argument is replaced by the the serial argument -that can be specified with the ``-device'' parameter. - @subsection -usbdevice (since 2.10.0) The ``-usbdevice DEV'' argument is now a synonym for settingqemu-options.hx +1
-5@@ -805,7 +805,7 @@ ETEXI DEF("drive", HAS_ARG, QEMU_OPTION_drive, "-drive [file=file][,if=type][,bus=n][,unit=m][,media=d][,index=i]\n" " [,cache=writethrough|writeback|none|directsync|unsafe][,format=f]\n" - " [,snapshot=on|off][,serial=s][,rerror=ignore|stop|report]\n" + " [,snapshot=on|off][,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"@@ -879,10 +879,6 @@ The default mode is @option{cache=writeback}. Specify which disk @var{format} will be used rather than detecting the format. Can be used to specify format=raw to avoid interpreting an untrusted format header. -@item serial=@var{serial} -This option specifies the serial number to assign to the device. This -parameter is deprecated, use the corresponding parameter of @code{-device} -instead. @item werror=@var{action},rerror=@var{action} Specify which @var{action} to take on write and read errors. Valid actions are: "ignore" (ignore the error and try to continue), "stop" (pause QEMU),Signature · 1 line
2.13.6
Signature · 5 lines
Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones Read my programming and virtualization blog: http://rwmj.wordpress.com Fedora Windows cross-compiler. Compile Windows programs, test, and build Windows installers. Over 100 libraries supported. http://fedoraproject.org/wiki/MinGW
Re: [Qemu-devel] [PATCH v2 3/4] block: Remove deprecated -drive option serial
Am 14.06.2018 um 15:09 hat Richard W.M. Jones geschrieben:
Quoted 9 lines · Kevin Wolf
Quoted 5 lines
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.
Libguestfs uses this option to set the disk serial/label. What is the alternate syntax?
Just set it in -device (for the disk, e.g. the one for ide-hd) rather than -drive.
Kevin
PATCH v2 4/4 block: Remove dead deprecation warning code
In reply to Kevin WolfWe removed all options from the 'deprecated' array, so the code is dead and can be removed as well.
Signed-off-by Kevin Wolf <[email protected]>
--- blockdev.c | 12 ------------ 1 file changed, 12 deletions(-)
blockdev.c +0 -12
@@ -774,8 +774,6 @@ DriveInfo *drive_new(QemuOpts *all_opts, BlockInterfaceType block_default_type)const char *filename;Error *local_err =NULL ;int i; -const char *deprecated[] = { - };/* Change legacy command line options into QMP ones */ static const struct {
@@ -852,16 +850,6 @@ DriveInfo *drive_new(QemuOpts *all_opts, BlockInterfaceType block_default_type) goto fail; } -/* Other deprecated options */ -if (!qtest_enabled ()) { -for (i =0 ; i <ARRAY_SIZE (deprecated); i++) { -if (qemu_opt_get (legacy_opts, deprecated[i]) !=NULL ) { -error_report ("'%s' is deprecated, please use the corresponding " -"option of '-device' instead" , deprecated[i]); - } - } - } -/* Media type */ value =qemu_opt_get (legacy_opts,"media" );if (value) {
Signature · 1 line
2.13.6
Re: [Qemu-devel] [PATCH v2 4/4] block: Remove dead deprecation warning code
Quoted 4 lines · Kevin Wolf
We removed all options from the 'deprecated' array, so the code is dead and can be removed as well.
Signed-off-by Kevin Wolf <[email protected]>
Reviewed-by Markus Armbruster <[email protected]>
Am 14.06.2018 um 11:55 hat Kevin Wolf geschrieben:
Quoted 7 lines
We deprecated a bunch of -drive options in 2.10, so let's remove them for 3.0.
v2:
- Simplified hd-geo-test code after removing test cases [Markus]
- Split patch 3 and 4 so that the deprecation warning code can be easily restored if we ever need it again [Markus]
Thanks for the review, applied to the block branch.
Kevin