docs/about/deprecated.rst | 6 ------ docs/about/removed-features.rst | 7 +++++++ hw/misc/sifive_u_otp.c | 7 ------- 3 files changed, 7 insertions(+), 13 deletions(-)
'-drive if=none' is meant for configuring back-end devices only, so this
got marked as deprecated in QEMU 6.2. Users should now only use the new
way with '-drive if=pflash' instead.
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
docs/about/deprecated.rst | 6 ------
docs/about/removed-features.rst | 7 +++++++
hw/misc/sifive_u_otp.c | 7 -------
3 files changed, 7 insertions(+), 13 deletions(-)
diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst
index 68d29642d7..bfe8148490 100644
--- a/docs/about/deprecated.rst
+++ b/docs/about/deprecated.rst
@@ -87,12 +87,6 @@ as short-form boolean values, and passed to plugins as ``arg_name=on``.
However, short-form booleans are deprecated and full explicit ``arg_name=on``
form is preferred.
-``-drive if=none`` for the sifive_u OTP device (since 6.2)
-''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
-
-Using ``-drive if=none`` to configure the OTP device of the sifive_u
-RISC-V machine is deprecated. Use ``-drive if=pflash`` instead.
-
``-no-hpet`` (since 8.0)
''''''''''''''''''''''''
diff --git a/docs/about/removed-features.rst b/docs/about/removed-features.rst
index c918cabd1a..b1cb15f3d9 100644
--- a/docs/about/removed-features.rst
+++ b/docs/about/removed-features.rst
@@ -422,6 +422,13 @@ the value is hexadecimal. That is, '0x20M' should be written either as
``tty`` and ``parport`` used to be aliases for ``serial`` and ``parallel``
respectively. The actual backend names should be used instead.
+``-drive if=none`` for the sifive_u OTP device (removed in 8.0)
+'''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
+
+Using ``-drive if=none`` to configure the OTP device of the sifive_u
+RISC-V machine is deprecated. Use ``-drive if=pflash`` instead.
+
+
QEMU Machine Protocol (QMP) commands
------------------------------------
diff --git a/hw/misc/sifive_u_otp.c b/hw/misc/sifive_u_otp.c
index 6d7fdb040a..8965f5c22a 100644
--- a/hw/misc/sifive_u_otp.c
+++ b/hw/misc/sifive_u_otp.c
@@ -210,13 +210,6 @@ static void sifive_u_otp_realize(DeviceState *dev, Error **errp)
sysbus_init_mmio(SYS_BUS_DEVICE(dev), &s->mmio);
dinfo = drive_get(IF_PFLASH, 0, 0);
- if (!dinfo) {
- dinfo = drive_get(IF_NONE, 0, 0);
- if (dinfo) {
- warn_report("using \"-drive if=none\" for the OTP is deprecated, "
- "use \"-drive if=pflash\" instead.");
- }
- }
if (dinfo) {
int ret;
uint64_t perm;
--
2.31.1On 12/1/23 09:29, Thomas Huth wrote: > '-drive if=none' is meant for configuring back-end devices only, so this > got marked as deprecated in QEMU 6.2. Users should now only use the new > way with '-drive if=pflash' instead. > > Signed-off-by: Thomas Huth <thuth@redhat.com> > --- > docs/about/deprecated.rst | 6 ------ > docs/about/removed-features.rst | 7 +++++++ > hw/misc/sifive_u_otp.c | 7 ------- > 3 files changed, 7 insertions(+), 13 deletions(-) Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
On 12/1/23 10:15, Philippe Mathieu-Daudé wrote: > On 12/1/23 09:29, Thomas Huth wrote: >> '-drive if=none' is meant for configuring back-end devices only, so this >> got marked as deprecated in QEMU 6.2. Users should now only use the new >> way with '-drive if=pflash' instead. >> >> Signed-off-by: Thomas Huth <thuth@redhat.com> >> --- >> docs/about/deprecated.rst | 6 ------ >> docs/about/removed-features.rst | 7 +++++++ >> hw/misc/sifive_u_otp.c | 7 ------- >> 3 files changed, 7 insertions(+), 13 deletions(-) > > Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org> -ENOTENOUGHCOFFEEYET I read v2 and meant to reply there :P
On 12/01/2023 09.29, Thomas Huth wrote: > '-drive if=none' is meant for configuring back-end devices only, so this > got marked as deprecated in QEMU 6.2. Users should now only use the new > way with '-drive if=pflash' instead. > > Signed-off-by: Thomas Huth <thuth@redhat.com> > --- > docs/about/deprecated.rst | 6 ------ > docs/about/removed-features.rst | 7 +++++++ > hw/misc/sifive_u_otp.c | 7 ------- > 3 files changed, 7 insertions(+), 13 deletions(-) > > diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst > index 68d29642d7..bfe8148490 100644 > --- a/docs/about/deprecated.rst > +++ b/docs/about/deprecated.rst > @@ -87,12 +87,6 @@ as short-form boolean values, and passed to plugins as ``arg_name=on``. > However, short-form booleans are deprecated and full explicit ``arg_name=on`` > form is preferred. > > -``-drive if=none`` for the sifive_u OTP device (since 6.2) > -'''''''''''''''''''''''''''''''''''''''''''''''''''''''''' > - > -Using ``-drive if=none`` to configure the OTP device of the sifive_u > -RISC-V machine is deprecated. Use ``-drive if=pflash`` instead. > - > ``-no-hpet`` (since 8.0) > '''''''''''''''''''''''' > > diff --git a/docs/about/removed-features.rst b/docs/about/removed-features.rst > index c918cabd1a..b1cb15f3d9 100644 > --- a/docs/about/removed-features.rst > +++ b/docs/about/removed-features.rst > @@ -422,6 +422,13 @@ the value is hexadecimal. That is, '0x20M' should be written either as > ``tty`` and ``parport`` used to be aliases for ``serial`` and ``parallel`` > respectively. The actual backend names should be used instead. > > +``-drive if=none`` for the sifive_u OTP device (removed in 8.0) > +''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' > + > +Using ``-drive if=none`` to configure the OTP device of the sifive_u > +RISC-V machine is deprecated. Use ``-drive if=pflash`` instead. -ENOTENOUGHCOFFEEYET I think I should adjust that description a little bit instead of blindly copy-n-pasting it... Sorry. I'll send a v2. Thomas
© 2016 - 2023 Red Hat, Inc.