From nobody Tue Oct 28 12:14:06 2025 Delivered-To: importer@patchew.org Received-SPF: temperror (zoho.com: Error in retrieving data from DNS) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=temperror (zoho.com: Error in retrieving data from DNS) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1513617409385543.3799319783122; Mon, 18 Dec 2017 09:16:49 -0800 (PST) Received: from localhost ([::1]:58220 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eQz1i-00071I-C3 for importer@patchew.org; Mon, 18 Dec 2017 12:16:30 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:32984) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eQz00-0005s4-8X for qemu-devel@nongnu.org; Mon, 18 Dec 2017 12:14:45 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eQyzz-0003jp-Ea for qemu-devel@nongnu.org; Mon, 18 Dec 2017 12:14:44 -0500 Received: from mx1.redhat.com ([209.132.183.28]:35424) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eQyzx-0003fg-1H; Mon, 18 Dec 2017 12:14:41 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 468297F7B0; Mon, 18 Dec 2017 17:14:40 +0000 (UTC) Received: from thh440s.redhat.com (ovpn-116-92.ams2.redhat.com [10.36.116.92]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1B5DC612B0; Mon, 18 Dec 2017 17:14:37 +0000 (UTC) From: Thomas Huth To: qemu-block@nongnu.org, Kevin Wolf , Max Reitz Date: Mon, 18 Dec 2017 18:14:31 +0100 Message-Id: <1513617273-7988-2-git-send-email-thuth@redhat.com> In-Reply-To: <1513617273-7988-1-git-send-email-thuth@redhat.com> References: <1513617273-7988-1-git-send-email-thuth@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Mon, 18 Dec 2017 17:14:40 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 1/3] block: Remove the obsolete -drive boot=on|off parameter X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-devel@nongnu.org, Markus Armbruster Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_6 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" It's not working anymore since QEMU v1.3.0 - time to remove it now. Signed-off-by: Thomas Huth Reviewed-by: John Snow Reviewed-by: Markus Armbruster --- blockdev.c | 11 ----------- qemu-doc.texi | 6 ------ 2 files changed, 17 deletions(-) diff --git a/blockdev.c b/blockdev.c index 56a6b24..c21ba27 100644 --- a/blockdev.c +++ b/blockdev.c @@ -734,10 +734,6 @@ QemuOptsList qemu_legacy_drive_opts =3D { .type =3D QEMU_OPT_STRING, .help =3D "chs translation (auto, lba, none)", },{ - .name =3D "boot", - .type =3D QEMU_OPT_BOOL, - .help =3D "(deprecated, ignored)", - },{ .name =3D "addr", .type =3D QEMU_OPT_STRING, .help =3D "pci address (virtio only)", @@ -872,13 +868,6 @@ DriveInfo *drive_new(QemuOpts *all_opts, BlockInterfac= eType block_default_type) goto fail; } =20 - /* Deprecated option boot=3D[on|off] */ - if (qemu_opt_get(legacy_opts, "boot") !=3D NULL) { - fprintf(stderr, "qemu-kvm: boot=3Don|off is deprecated and will be= " - "ignored. Future versions will reject this parameter. Plea= se " - "update your scripts.\n"); - } - /* Other deprecated options */ if (!qtest_enabled()) { for (i =3D 0; i < ARRAY_SIZE(deprecated); i++) { diff --git a/qemu-doc.texi b/qemu-doc.texi index f7317df..e313bf1 100644 --- a/qemu-doc.texi +++ b/qemu-doc.texi @@ -2373,12 +2373,6 @@ deprecated. =20 @section System emulator command line arguments =20 -@subsection -drive boot=3Don|off (since 1.3.0) - -The ``boot=3Don|off'' option to the ``-drive'' argument is -ignored. Applications should use the ``bootindex=3DN'' parameter -to set an absolute ordering between devices instead. - @subsection -tdf (since 1.3.0) =20 The ``-tdf'' argument is ignored. The behaviour implemented --=20 1.8.3.1 From nobody Tue Oct 28 12:14:06 2025 Delivered-To: importer@patchew.org Received-SPF: temperror (zoho.com: Error in retrieving data from DNS) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=temperror (zoho.com: Error in retrieving data from DNS) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1513617426113926.125044530191; Mon, 18 Dec 2017 09:17:06 -0800 (PST) Received: from localhost ([::1]:58224 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eQz1w-0007AY-VJ for importer@patchew.org; Mon, 18 Dec 2017 12:16:45 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33078) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eQz04-0005yQ-Ok for qemu-devel@nongnu.org; Mon, 18 Dec 2017 12:14:52 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eQz03-0003o4-C1 for qemu-devel@nongnu.org; Mon, 18 Dec 2017 12:14:48 -0500 Received: from mx1.redhat.com ([209.132.183.28]:37300) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eQyzz-0003jU-St; Mon, 18 Dec 2017 12:14:44 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 297A337E68; Mon, 18 Dec 2017 17:14:43 +0000 (UTC) Received: from thh440s.redhat.com (ovpn-116-92.ams2.redhat.com [10.36.116.92]) by smtp.corp.redhat.com (Postfix) with ESMTP id D522361289; Mon, 18 Dec 2017 17:14:40 +0000 (UTC) From: Thomas Huth To: qemu-block@nongnu.org, Kevin Wolf , Max Reitz Date: Mon, 18 Dec 2017 18:14:32 +0100 Message-Id: <1513617273-7988-3-git-send-email-thuth@redhat.com> In-Reply-To: <1513617273-7988-1-git-send-email-thuth@redhat.com> References: <1513617273-7988-1-git-send-email-thuth@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Mon, 18 Dec 2017 17:14:43 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 2/3] block: Remove the deprecated -hdachs option X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-devel@nongnu.org, Markus Armbruster Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_6 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" It's been marked as deprecated since QEMU v2.10.0, and so far nobody complained that we should keep it, so let's remove this legacy option now to simplify the code quite a bit. Signed-off-by: Thomas Huth Reviewed-by: John Snow Reviewed-by: Markus Armbruster --- qemu-doc.texi | 8 ------ qemu-options.hx | 19 ++----------- vl.c | 86 ++---------------------------------------------------= ---- 3 files changed, 4 insertions(+), 109 deletions(-) diff --git a/qemu-doc.texi b/qemu-doc.texi index e313bf1..af495ad 100644 --- a/qemu-doc.texi +++ b/qemu-doc.texi @@ -2475,14 +2475,6 @@ The ``--net dump'' argument is now replaced with the ``-object filter-dump'' argument which works in combination with the modern ``-netdev`` backends instead. =20 -@subsection -hdachs (since 2.10.0) - -The ``-hdachs'' argument is now a synonym for setting -the ``cyls'', ``heads'', ``secs'', and ``trans'' properties -on the ``ide-hd'' device using the ``-device'' argument. -The new syntax allows different settings to be provided -per disk. - @subsection -usbdevice (since 2.10.0) =20 The ``-usbdevice DEV'' argument is now a synonym for setting diff --git a/qemu-options.hx b/qemu-options.hx index 32d9378..828546c 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -846,8 +846,8 @@ of available connectors of a given interface type. @item media=3D@var{media} This option defines the type of the media: disk or cdrom. @item cyls=3D@var{c},heads=3D@var{h},secs=3D@var{s}[,trans=3D@var{t}] -These options have the same definition as they have in @option{-hdachs}. -These parameters are deprecated, use the corresponding parameters +Force disk physical geometry and the optional BIOS translation (trans=3Dno= ne or +lba). These parameters are deprecated, use the corresponding parameters of @code{-device} instead. @item snapshot=3D@var{snapshot} @var{snapshot} is "on" or "off" and controls snapshot mode for the given d= rive @@ -1027,21 +1027,6 @@ the raw disk image you use is not written back. You = can however force the write back by pressing @key{C-a s} (@pxref{disk_images}). ETEXI =20 -DEF("hdachs", HAS_ARG, QEMU_OPTION_hdachs, \ - "-hdachs c,h,s[,t]\n" \ - " force hard disk 0 physical geometry and the optional = BIOS\n" \ - " translation (t=3Dnone or lba) (usually QEMU can guess= them)\n", - QEMU_ARCH_ALL) -STEXI -@item -hdachs @var{c},@var{h},@var{s},[,@var{t}] -@findex -hdachs -Force hard disk 0 physical geometry (1 <=3D @var{c} <=3D 16383, 1 <=3D -@var{h} <=3D 16, 1 <=3D @var{s} <=3D 63) and optionally force the BIOS -translation mode (@var{t}=3Dnone, lba or auto). Usually QEMU can guess -all those parameters. This option is deprecated, please use -@code{-device ide-hd,cyls=3Dc,heads=3Dh,secs=3Ds,...} instead. -ETEXI - DEF("fsdev", HAS_ARG, QEMU_OPTION_fsdev, "-fsdev fsdriver,id=3Did[,path=3Dpath,][security_model=3D{mapped-xattr= |mapped-file|passthrough|none}]\n" " [,writeout=3Dimmediate][,readonly][,socket=3Dsocket|sock_fd=3Dsock_f= d][,fmode=3Dfmode][,dmode=3Ddmode]\n" diff --git a/vl.c b/vl.c index e9012bb..a797243 100644 --- a/vl.c +++ b/vl.c @@ -3052,9 +3052,8 @@ int main(int argc, char **argv, char **envp) const char *boot_order =3D NULL; const char *boot_once =3D NULL; DisplayState *ds; - int cyls, heads, secs, translation; QemuOpts *opts, *machine_opts; - QemuOpts *hda_opts =3D NULL, *icount_opts =3D NULL, *accel_opts =3D NU= LL; + QemuOpts *icount_opts =3D NULL, *accel_opts =3D NULL; QemuOptsList *olist; int optind; const char *optarg; @@ -3146,8 +3145,6 @@ int main(int argc, char **argv, char **envp) =20 cpu_model =3D NULL; snapshot =3D 0; - cyls =3D heads =3D secs =3D 0; - translation =3D BIOS_ATA_TRANSLATION_AUTO; =20 nb_nics =3D 0; =20 @@ -3186,7 +3183,7 @@ int main(int argc, char **argv, char **envp) if (optind >=3D argc) break; if (argv[optind][0] !=3D '-') { - hda_opts =3D drive_add(IF_DEFAULT, 0, argv[optind++], HD_OPTS); + drive_add(IF_DEFAULT, 0, argv[optind++], HD_OPTS); } else { const QEMUOption *popt; =20 @@ -3206,21 +3203,6 @@ int main(int argc, char **argv, char **envp) cpu_model =3D optarg; break; case QEMU_OPTION_hda: - { - char buf[256]; - if (cyls =3D=3D 0) - snprintf(buf, sizeof(buf), "%s", HD_OPTS); - else - snprintf(buf, sizeof(buf), - "%s,cyls=3D%d,heads=3D%d,secs=3D%d%s", - HD_OPTS , cyls, heads, secs, - translation =3D=3D BIOS_ATA_TRANSLATION_L= BA ? - ",trans=3Dlba" : - translation =3D=3D BIOS_ATA_TRANSLATION_N= ONE ? - ",trans=3Dnone" : ""); - drive_add(IF_DEFAULT, 0, optarg, buf); - break; - } case QEMU_OPTION_hdb: case QEMU_OPTION_hdc: case QEMU_OPTION_hdd: @@ -3271,70 +3253,6 @@ int main(int argc, char **argv, char **envp) case QEMU_OPTION_snapshot: snapshot =3D 1; break; - case QEMU_OPTION_hdachs: - { - const char *p; - p =3D optarg; - cyls =3D strtol(p, (char **)&p, 0); - if (cyls < 1 || cyls > 16383) - goto chs_fail; - if (*p !=3D ',') - goto chs_fail; - p++; - heads =3D strtol(p, (char **)&p, 0); - if (heads < 1 || heads > 16) - goto chs_fail; - if (*p !=3D ',') - goto chs_fail; - p++; - secs =3D strtol(p, (char **)&p, 0); - if (secs < 1 || secs > 63) - goto chs_fail; - if (*p =3D=3D ',') { - p++; - if (!strcmp(p, "large")) { - translation =3D BIOS_ATA_TRANSLATION_LARGE; - } else if (!strcmp(p, "rechs")) { - translation =3D BIOS_ATA_TRANSLATION_RECHS; - } else if (!strcmp(p, "none")) { - translation =3D BIOS_ATA_TRANSLATION_NONE; - } else if (!strcmp(p, "lba")) { - translation =3D BIOS_ATA_TRANSLATION_LBA; - } else if (!strcmp(p, "auto")) { - translation =3D BIOS_ATA_TRANSLATION_AUTO; - } else { - goto chs_fail; - } - } else if (*p !=3D '\0') { - chs_fail: - error_report("invalid physical CHS format"); - exit(1); - } - if (hda_opts !=3D NULL) { - qemu_opt_set_number(hda_opts, "cyls", cyls, - &error_abort); - qemu_opt_set_number(hda_opts, "heads", heads, - &error_abort); - qemu_opt_set_number(hda_opts, "secs", secs, - &error_abort); - if (translation =3D=3D BIOS_ATA_TRANSLATION_LARGE)= { - qemu_opt_set(hda_opts, "trans", "large", - &error_abort); - } else if (translation =3D=3D BIOS_ATA_TRANSLATION= _RECHS) { - qemu_opt_set(hda_opts, "trans", "rechs", - &error_abort); - } else if (translation =3D=3D BIOS_ATA_TRANSLATION= _LBA) { - qemu_opt_set(hda_opts, "trans", "lba", - &error_abort); - } else if (translation =3D=3D BIOS_ATA_TRANSLATION= _NONE) { - qemu_opt_set(hda_opts, "trans", "none", - &error_abort); - } - } - } - error_report("'-hdachs' is deprecated, please use '-device" - " ide-hd,cyls=3Dc,heads=3Dh,secs=3Ds,...' ins= tead"); - break; case QEMU_OPTION_numa: opts =3D qemu_opts_parse_noisily(qemu_find_opts("numa"), optarg, true); --=20 1.8.3.1 From nobody Tue Oct 28 12:14:06 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1513617575429752.7980847134145; Mon, 18 Dec 2017 09:19:35 -0800 (PST) Received: from localhost ([::1]:58433 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eQz4Y-0000lA-7V for importer@patchew.org; Mon, 18 Dec 2017 12:19:26 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33110) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eQz08-000636-Qw for qemu-devel@nongnu.org; Mon, 18 Dec 2017 12:14:53 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eQz04-0003p5-Ji for qemu-devel@nongnu.org; Mon, 18 Dec 2017 12:14:52 -0500 Received: from mx1.redhat.com ([209.132.183.28]:49704) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eQz02-0003mZ-Gc; Mon, 18 Dec 2017 12:14:46 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id B12766565E; Mon, 18 Dec 2017 17:14:45 +0000 (UTC) Received: from thh440s.redhat.com (ovpn-116-92.ams2.redhat.com [10.36.116.92]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7D97061289; Mon, 18 Dec 2017 17:14:43 +0000 (UTC) From: Thomas Huth To: qemu-block@nongnu.org, Kevin Wolf , Max Reitz Date: Mon, 18 Dec 2017 18:14:33 +0100 Message-Id: <1513617273-7988-4-git-send-email-thuth@redhat.com> In-Reply-To: <1513617273-7988-1-git-send-email-thuth@redhat.com> References: <1513617273-7988-1-git-send-email-thuth@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Mon, 18 Dec 2017 17:14:45 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 3/3] block: Mention -drive cyls/heads/secs/trans/serial/addr in deprecation chapter X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-devel@nongnu.org, Markus Armbruster Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Looks like we forgot to announce the deprecation of these options in the corresponding chapter of the qemu-doc text, so let's do that now. Signed-off-by: Thomas Huth Reviewed-by: John Snow Reviewed-by: Markus Armbruster --- qemu-doc.texi | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/qemu-doc.texi b/qemu-doc.texi index af495ad..f6afe01 100644 --- a/qemu-doc.texi +++ b/qemu-doc.texi @@ -2469,6 +2469,21 @@ longer be directly supported in QEMU. The ``-drive if=3Dscsi'' argument is replaced by the the ``-device BUS-TYPE'' argument combined with ``-drive if=3Dnone''. =20 +@subsection -drive cyls=3D...,heads=3D...,secs=3D...,trans=3D... (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=3D... (since 2.10.0) + +The drive serial argument is replaced by the the serial argument +that can be specified with the ``-device'' parameter. + +@subsection -drive addr=3D... (since 2.10.0) + +The drive addr argument is replaced by the the addr argument +that can be specified with the ``-device'' parameter. + @subsection -net dump (since 2.10.0) =20 The ``--net dump'' argument is now replaced with the --=20 1.8.3.1