virtfs: Remove the deprecated "-virtfs_synth" option
diff mbox series

Message ID 20191209145240.9271-1-thuth@redhat.com
State New
Headers show
Series
  • virtfs: Remove the deprecated "-virtfs_synth" option
Related show

Commit Message

Thomas Huth Dec. 9, 2019, 2:52 p.m. UTC
It's been marked as deprecated since QEMU v4.1, time to remove it now.

Signed-off-by: Thomas Huth <thuth@redhat.com>
---
 qemu-deprecated.texi |  5 -----
 qemu-options.hx      | 10 ----------
 vl.c                 | 23 -----------------------
 3 files changed, 38 deletions(-)

Comments

Greg Kurz Dec. 9, 2019, 5:34 p.m. UTC | #1
On Mon,  9 Dec 2019 15:52:40 +0100
Thomas Huth <thuth@redhat.com> wrote:

> It's been marked as deprecated since QEMU v4.1, time to remove it now.
> 
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---

Pushed to 9p-next.

>  qemu-deprecated.texi |  5 -----
>  qemu-options.hx      | 10 ----------
>  vl.c                 | 23 -----------------------
>  3 files changed, 38 deletions(-)
> 
> diff --git a/qemu-deprecated.texi b/qemu-deprecated.texi
> index 2f9efb45ba..3745334e80 100644
> --- a/qemu-deprecated.texi
> +++ b/qemu-deprecated.texi
> @@ -84,11 +84,6 @@ error in the future.
>  The @code{-realtime mlock=on|off} argument has been replaced by the
>  @code{-overcommit mem-lock=on|off} argument.
>  
> -@subsection -virtfs_synth (since 4.1)
> -
> -The ``-virtfs_synth'' argument is now deprecated. Please use ``-fsdev synth''
> -and ``-device virtio-9p-...'' instead.
> -
>  @subsection -numa node,mem=@var{size} (since 4.1)
>  
>  The parameter @option{mem} of @option{-numa node} is used to assign a part of
> diff --git a/qemu-options.hx b/qemu-options.hx
> index 65c9473b73..4cf7751ade 100644
> --- a/qemu-options.hx
> +++ b/qemu-options.hx
> @@ -1468,16 +1468,6 @@ would still return entries from other devices).
>  @end table
>  ETEXI
>  
> -DEF("virtfs_synth", 0, QEMU_OPTION_virtfs_synth,
> -    "-virtfs_synth Create synthetic file system image\n",
> -    QEMU_ARCH_ALL)
> -STEXI
> -@item -virtfs_synth
> -@findex -virtfs_synth
> -Create synthetic file system image. Note that this option is now deprecated.
> -Please use @code{-fsdev synth} and @code{-device virtio-9p-...} instead.
> -ETEXI
> -
>  DEF("iscsi", HAS_ARG, QEMU_OPTION_iscsi,
>      "-iscsi [user=user][,password=password]\n"
>      "       [,header-digest=CRC32C|CR32C-NONE|NONE-CRC32C|NONE\n"
> diff --git a/vl.c b/vl.c
> index 6a65a64bfd..c0904b365b 100644
> --- a/vl.c
> +++ b/vl.c
> @@ -3374,29 +3374,6 @@ int main(int argc, char **argv, char **envp)
>                               qemu_opt_get(opts, "mount_tag"), &error_abort);
>                  break;
>              }
> -            case QEMU_OPTION_virtfs_synth: {
> -                QemuOpts *fsdev;
> -                QemuOpts *device;
> -
> -                warn_report("'-virtfs_synth' is deprecated, please use "
> -                             "'-fsdev synth' and '-device virtio-9p-...' "
> -                            "instead");
> -
> -                fsdev = qemu_opts_create(qemu_find_opts("fsdev"), "v_synth",
> -                                         1, NULL);
> -                if (!fsdev) {
> -                    error_report("duplicate option: %s", "virtfs_synth");
> -                    exit(1);
> -                }
> -                qemu_opt_set(fsdev, "fsdriver", "synth", &error_abort);
> -
> -                device = qemu_opts_create(qemu_find_opts("device"), NULL, 0,
> -                                          &error_abort);
> -                qemu_opt_set(device, "driver", "virtio-9p-pci", &error_abort);
> -                qemu_opt_set(device, "fsdev", "v_synth", &error_abort);
> -                qemu_opt_set(device, "mount_tag", "v_synth", &error_abort);
> -                break;
> -            }
>              case QEMU_OPTION_serial:
>                  add_device_config(DEV_SERIAL, optarg);
>                  default_serial = 0;

Patch
diff mbox series

diff --git a/qemu-deprecated.texi b/qemu-deprecated.texi
index 2f9efb45ba..3745334e80 100644
--- a/qemu-deprecated.texi
+++ b/qemu-deprecated.texi
@@ -84,11 +84,6 @@  error in the future.
 The @code{-realtime mlock=on|off} argument has been replaced by the
 @code{-overcommit mem-lock=on|off} argument.
 
-@subsection -virtfs_synth (since 4.1)
-
-The ``-virtfs_synth'' argument is now deprecated. Please use ``-fsdev synth''
-and ``-device virtio-9p-...'' instead.
-
 @subsection -numa node,mem=@var{size} (since 4.1)
 
 The parameter @option{mem} of @option{-numa node} is used to assign a part of
diff --git a/qemu-options.hx b/qemu-options.hx
index 65c9473b73..4cf7751ade 100644
--- a/qemu-options.hx
+++ b/qemu-options.hx
@@ -1468,16 +1468,6 @@  would still return entries from other devices).
 @end table
 ETEXI
 
-DEF("virtfs_synth", 0, QEMU_OPTION_virtfs_synth,
-    "-virtfs_synth Create synthetic file system image\n",
-    QEMU_ARCH_ALL)
-STEXI
-@item -virtfs_synth
-@findex -virtfs_synth
-Create synthetic file system image. Note that this option is now deprecated.
-Please use @code{-fsdev synth} and @code{-device virtio-9p-...} instead.
-ETEXI
-
 DEF("iscsi", HAS_ARG, QEMU_OPTION_iscsi,
     "-iscsi [user=user][,password=password]\n"
     "       [,header-digest=CRC32C|CR32C-NONE|NONE-CRC32C|NONE\n"
diff --git a/vl.c b/vl.c
index 6a65a64bfd..c0904b365b 100644
--- a/vl.c
+++ b/vl.c
@@ -3374,29 +3374,6 @@  int main(int argc, char **argv, char **envp)
                              qemu_opt_get(opts, "mount_tag"), &error_abort);
                 break;
             }
-            case QEMU_OPTION_virtfs_synth: {
-                QemuOpts *fsdev;
-                QemuOpts *device;
-
-                warn_report("'-virtfs_synth' is deprecated, please use "
-                             "'-fsdev synth' and '-device virtio-9p-...' "
-                            "instead");
-
-                fsdev = qemu_opts_create(qemu_find_opts("fsdev"), "v_synth",
-                                         1, NULL);
-                if (!fsdev) {
-                    error_report("duplicate option: %s", "virtfs_synth");
-                    exit(1);
-                }
-                qemu_opt_set(fsdev, "fsdriver", "synth", &error_abort);
-
-                device = qemu_opts_create(qemu_find_opts("device"), NULL, 0,
-                                          &error_abort);
-                qemu_opt_set(device, "driver", "virtio-9p-pci", &error_abort);
-                qemu_opt_set(device, "fsdev", "v_synth", &error_abort);
-                qemu_opt_set(device, "mount_tag", "v_synth", &error_abort);
-                break;
-            }
             case QEMU_OPTION_serial:
                 add_device_config(DEV_SERIAL, optarg);
                 default_serial = 0;