[Qemu-devel] [PATCH 0/2] Deprecate -nodefconfig

[Qemu-devel] [PATCH 0/2] Deprecate -nodefconfig

[Eduardo Habkost]

Since 2012 (commit ba6212d8 "Eliminate cpus-x86_64.conf file") we
have no default config files that would be disabled using
-nodefconfig.  This series cleans up the code, updates
documentation, and document -nodefconfig as deprecated.

Eduardo Habkost (2):
  vl: Eliminate defconfig variable
  qemu-options: Deprecate -nodefconfig

 vl.c            |  5 +----
 qemu-options.hx | 13 +++++++------
 2 files changed, 8 insertions(+), 10 deletions(-)

-- 
2.13.5

[Qemu-devel] [PATCH 1/2] vl: Eliminate defconfig variable

[Eduardo Habkost]

Both -nodefconfig and -no-user-config options do the same thing
today, we only need one variable to keep track of them.

Suggested-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
 vl.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/vl.c b/vl.c
index 4fd01fda91..b347a97a5b 100644
--- a/vl.c
+++ b/vl.c
@@ -3093,7 +3093,6 @@ int main(int argc, char **argv, char **envp)
     const char *qtest_log = NULL;
     const char *pid_file = NULL;
     const char *incoming = NULL;
-    bool defconfig = true;
     bool userconfig = true;
     bool nographic = false;
     DisplayType display_type = DT_DEFAULT;
@@ -3194,8 +3193,6 @@ int main(int argc, char **argv, char **envp)
             popt = lookup_opt(argc, argv, &optarg, &optind);
             switch (popt->index) {
             case QEMU_OPTION_nodefconfig:
-                defconfig = false;
-                break;
             case QEMU_OPTION_nouserconfig:
                 userconfig = false;
                 break;
@@ -3203,7 +3200,7 @@ int main(int argc, char **argv, char **envp)
         }
     }
 
-    if (defconfig && userconfig) {
+    if (userconfig) {
         if (qemu_read_default_config_file() < 0) {
             exit(1);
         }
-- 
2.13.5

[Qemu-devel] [PATCH 2/2] qemu-options: Deprecate -nodefconfig

[Eduardo Habkost]

Since 2012 (commit ba6212d8 "Eliminate cpus-x86_64.conf file") we
have no default config files that would be disabled using
-nodefconfig.  Update documentation and document -nodefconfig as
deprecated.

Cc: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
 qemu-options.hx | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/qemu-options.hx b/qemu-options.hx
index 39225ae6c3..bc52e79184 100644
--- a/qemu-options.hx
+++ b/qemu-options.hx
@@ -4069,24 +4069,25 @@ output to stdout. This can be later used as input file for @code{-readconfig} op
 ETEXI
 DEF("nodefconfig", 0, QEMU_OPTION_nodefconfig,
     "-nodefconfig\n"
-    "                do not load default config files at startup\n",
+    "                do not load default config files at startup (deprecated)\n",
     QEMU_ARCH_ALL)
 STEXI
 @item -nodefconfig
 @findex -nodefconfig
-Normally QEMU loads configuration files from @var{sysconfdir} and @var{datadir} at startup.
-The @code{-nodefconfig} option will prevent QEMU from loading any of those config files.
+This option was used to disable loading of config files from @var{sysconfdir}
+and @var{datadir}, but it is deprecated as QEMU doesn't load any config files
+from @var{datadir} anymore.  To disable loading of config files from
+@var{sysconfdir}, use @code{-no-user-config} instead.
 ETEXI
 DEF("no-user-config", 0, QEMU_OPTION_nouserconfig,
     "-no-user-config\n"
-    "                do not load user-provided config files at startup\n",
+    "                do not load default user-provided config files at startup\n",
     QEMU_ARCH_ALL)
 STEXI
 @item -no-user-config
 @findex -no-user-config
 The @code{-no-user-config} option makes QEMU not load any of the user-provided
-config files on @var{sysconfdir}, but won't make it skip the QEMU-provided config
-files from @var{datadir}.
+config files on @var{sysconfdir}.
 ETEXI
 DEF("trace", HAS_ARG, QEMU_OPTION_trace,
     "-trace [[enable=]<pattern>][,events=<file>][,file=<file>]\n"
-- 
2.13.5

Re: [Qemu-devel] [PATCH 1/2] vl: Eliminate defconfig variable

[Alistair Francis]

On Wed, Sep 27, 2017 at 1:32 PM, Eduardo Habkost <ehabkost@redhat.com> wrote:
> Both -nodefconfig and -no-user-config options do the same thing
> today, we only need one variable to keep track of them.
>
> Suggested-by: Markus Armbruster <armbru@redhat.com>
> Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>

Acked-by: Alistair Francis <alistair.francis@xilinx.com>

Thanks,
Alistair

> ---
>  vl.c | 5 +----
>  1 file changed, 1 insertion(+), 4 deletions(-)
>
> diff --git a/vl.c b/vl.c
> index 4fd01fda91..b347a97a5b 100644
> --- a/vl.c
> +++ b/vl.c
> @@ -3093,7 +3093,6 @@ int main(int argc, char **argv, char **envp)
>      const char *qtest_log = NULL;
>      const char *pid_file = NULL;
>      const char *incoming = NULL;
> -    bool defconfig = true;
>      bool userconfig = true;
>      bool nographic = false;
>      DisplayType display_type = DT_DEFAULT;
> @@ -3194,8 +3193,6 @@ int main(int argc, char **argv, char **envp)
>              popt = lookup_opt(argc, argv, &optarg, &optind);
>              switch (popt->index) {
>              case QEMU_OPTION_nodefconfig:
> -                defconfig = false;
> -                break;
>              case QEMU_OPTION_nouserconfig:
>                  userconfig = false;
>                  break;
> @@ -3203,7 +3200,7 @@ int main(int argc, char **argv, char **envp)
>          }
>      }
>
> -    if (defconfig && userconfig) {
> +    if (userconfig) {
>          if (qemu_read_default_config_file() < 0) {
>              exit(1);
>          }
> --
> 2.13.5
>
>

Re: [Qemu-devel] [PATCH 2/2] qemu-options: Deprecate -nodefconfig

[Alistair Francis]

On Wed, Sep 27, 2017 at 1:32 PM, Eduardo Habkost <ehabkost@redhat.com> wrote:
> Since 2012 (commit ba6212d8 "Eliminate cpus-x86_64.conf file") we
> have no default config files that would be disabled using
> -nodefconfig.  Update documentation and document -nodefconfig as
> deprecated.
>
> Cc: Markus Armbruster <armbru@redhat.com>
> Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>

Acked-by: Alistair Francis <alistair.francis@xilinx.com>

Thanks,
Alistair

> ---
>  qemu-options.hx | 13 +++++++------
>  1 file changed, 7 insertions(+), 6 deletions(-)
>
> diff --git a/qemu-options.hx b/qemu-options.hx
> index 39225ae6c3..bc52e79184 100644
> --- a/qemu-options.hx
> +++ b/qemu-options.hx
> @@ -4069,24 +4069,25 @@ output to stdout. This can be later used as input file for @code{-readconfig} op
>  ETEXI
>  DEF("nodefconfig", 0, QEMU_OPTION_nodefconfig,
>      "-nodefconfig\n"
> -    "                do not load default config files at startup\n",
> +    "                do not load default config files at startup (deprecated)\n",
>      QEMU_ARCH_ALL)
>  STEXI
>  @item -nodefconfig
>  @findex -nodefconfig
> -Normally QEMU loads configuration files from @var{sysconfdir} and @var{datadir} at startup.
> -The @code{-nodefconfig} option will prevent QEMU from loading any of those config files.
> +This option was used to disable loading of config files from @var{sysconfdir}
> +and @var{datadir}, but it is deprecated as QEMU doesn't load any config files
> +from @var{datadir} anymore.  To disable loading of config files from
> +@var{sysconfdir}, use @code{-no-user-config} instead.
>  ETEXI
>  DEF("no-user-config", 0, QEMU_OPTION_nouserconfig,
>      "-no-user-config\n"
> -    "                do not load user-provided config files at startup\n",
> +    "                do not load default user-provided config files at startup\n",
>      QEMU_ARCH_ALL)
>  STEXI
>  @item -no-user-config
>  @findex -no-user-config
>  The @code{-no-user-config} option makes QEMU not load any of the user-provided
> -config files on @var{sysconfdir}, but won't make it skip the QEMU-provided config
> -files from @var{datadir}.
> +config files on @var{sysconfdir}.
>  ETEXI
>  DEF("trace", HAS_ARG, QEMU_OPTION_trace,
>      "-trace [[enable=]<pattern>][,events=<file>][,file=<file>]\n"
> --
> 2.13.5
>
>

Re: [Qemu-devel] [PATCH 0/2] Deprecate -nodefconfig

[Paolo Bonzini]

On 27/09/2017 22:32, Eduardo Habkost wrote:
> Since 2012 (commit ba6212d8 "Eliminate cpus-x86_64.conf file") we
> have no default config files that would be disabled using
> -nodefconfig.  This series cleans up the code, updates
> documentation, and document -nodefconfig as deprecated.

Don't forget to list this in the 2.11 changelog!

Thanks,

Paolo

> Eduardo Habkost (2):
>   vl: Eliminate defconfig variable
>   qemu-options: Deprecate -nodefconfig
> 
>  vl.c            |  5 +----
>  qemu-options.hx | 13 +++++++------
>  2 files changed, 8 insertions(+), 10 deletions(-)
> 

Re: [Qemu-devel] [PATCH 0/2] Deprecate -nodefconfig

[Daniel P. Berrange]

On Wed, Sep 27, 2017 at 05:32:23PM -0300, Eduardo Habkost wrote:
> Since 2012 (commit ba6212d8 "Eliminate cpus-x86_64.conf file") we
> have no default config files that would be disabled using
> -nodefconfig.  This series cleans up the code, updates
> documentation, and document -nodefconfig as deprecated.
> 
> Eduardo Habkost (2):
>   vl: Eliminate defconfig variable
>   qemu-options: Deprecate -nodefconfig
> 
>  vl.c            |  5 +----
>  qemu-options.hx | 13 +++++++------

This must be listed in the qemu-doc.texi appendix to comply with
the deprecation policy

Regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|

Re: [Qemu-devel] [PATCH 1/2] vl: Eliminate defconfig variable

[Daniel P. Berrange]

On Wed, Sep 27, 2017 at 05:32:24PM -0300, Eduardo Habkost wrote:
> Both -nodefconfig and -no-user-config options do the same thing
> today, we only need one variable to keep track of them.

What reason for picking -nodefconfig instead of -no-user-config to
deprecate ?  -nodefconfig predates -no-user-config by a few years,
and is what libvirt has historically used. So from libvirt POV
we'd have a slight preference to deprecate -no-user-config instead
and keep -nodefconfig, simply to avoid need to add conditional
logic to libvirt to pick which to use.

> 
> Suggested-by: Markus Armbruster <armbru@redhat.com>
> Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
> ---
>  vl.c | 5 +----
>  1 file changed, 1 insertion(+), 4 deletions(-)
> 
> diff --git a/vl.c b/vl.c
> index 4fd01fda91..b347a97a5b 100644
> --- a/vl.c
> +++ b/vl.c
> @@ -3093,7 +3093,6 @@ int main(int argc, char **argv, char **envp)
>      const char *qtest_log = NULL;
>      const char *pid_file = NULL;
>      const char *incoming = NULL;
> -    bool defconfig = true;
>      bool userconfig = true;
>      bool nographic = false;
>      DisplayType display_type = DT_DEFAULT;
> @@ -3194,8 +3193,6 @@ int main(int argc, char **argv, char **envp)
>              popt = lookup_opt(argc, argv, &optarg, &optind);
>              switch (popt->index) {
>              case QEMU_OPTION_nodefconfig:
> -                defconfig = false;
> -                break;
>              case QEMU_OPTION_nouserconfig:
>                  userconfig = false;
>                  break;
> @@ -3203,7 +3200,7 @@ int main(int argc, char **argv, char **envp)
>          }
>      }
>  
> -    if (defconfig && userconfig) {
> +    if (userconfig) {
>          if (qemu_read_default_config_file() < 0) {
>              exit(1);
>          }
> -- 
> 2.13.5
> 
> 

Regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|

Re: [Qemu-devel] [PATCH 1/2] vl: Eliminate defconfig variable

[Daniel P. Berrange]

On Thu, Sep 28, 2017 at 12:42:02PM +0100, Daniel P. Berrange wrote:
> On Wed, Sep 27, 2017 at 05:32:24PM -0300, Eduardo Habkost wrote:
> > Both -nodefconfig and -no-user-config options do the same thing
> > today, we only need one variable to keep track of them.
> 
> What reason for picking -nodefconfig instead of -no-user-config to
> deprecate ?  -nodefconfig predates -no-user-config by a few years,
> and is what libvirt has historically used. So from libvirt POV
> we'd have a slight preference to deprecate -no-user-config instead
> and keep -nodefconfig, simply to avoid need to add conditional
> logic to libvirt to pick which to use.

Actually never mind, I just noticed libvirt actually supports
both options and dynamically detects their existance.


Regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|

Re: [Qemu-devel] [PATCH 1/2] vl: Eliminate defconfig variable

[Eduardo Habkost]

(CCing libvir-list)

On Thu, Sep 28, 2017 at 12:42:02PM +0100, Daniel P. Berrange wrote:
> On Wed, Sep 27, 2017 at 05:32:24PM -0300, Eduardo Habkost wrote:
> > Both -nodefconfig and -no-user-config options do the same thing
> > today, we only need one variable to keep track of them.
> 
> What reason for picking -nodefconfig instead of -no-user-config to
> deprecate ?  -nodefconfig predates -no-user-config by a few years,
> and is what libvirt has historically used. So from libvirt POV
> we'd have a slight preference to deprecate -no-user-config instead
> and keep -nodefconfig, simply to avoid need to add conditional
> logic to libvirt to pick which to use.

libvirt already prefers -no-user-config, which is the right thing
for libvirt because it needs a mechanism to disable user-provided
configuration only, not QEMU-provided data files (in case they
exist).

In other words, we have an important use case for the
-no-user-config semantics in libvirt, and I am not aware of any
existing user of the -nodefconfig semantics.

(For the record, I think the existing documented -nodefconfig
semantics is awful and useless, but that's the one we got.  Old
discussions about this can be seen at:
https://www.mail-archive.com/libvir-list@redhat.com/msg53083.html )

> 
> > 
> > Suggested-by: Markus Armbruster <armbru@redhat.com>
> > Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
> > ---
> >  vl.c | 5 +----
> >  1 file changed, 1 insertion(+), 4 deletions(-)
> > 
> > diff --git a/vl.c b/vl.c
> > index 4fd01fda91..b347a97a5b 100644
> > --- a/vl.c
> > +++ b/vl.c
> > @@ -3093,7 +3093,6 @@ int main(int argc, char **argv, char **envp)
> >      const char *qtest_log = NULL;
> >      const char *pid_file = NULL;
> >      const char *incoming = NULL;
> > -    bool defconfig = true;
> >      bool userconfig = true;
> >      bool nographic = false;
> >      DisplayType display_type = DT_DEFAULT;
> > @@ -3194,8 +3193,6 @@ int main(int argc, char **argv, char **envp)
> >              popt = lookup_opt(argc, argv, &optarg, &optind);
> >              switch (popt->index) {
> >              case QEMU_OPTION_nodefconfig:
> > -                defconfig = false;
> > -                break;
> >              case QEMU_OPTION_nouserconfig:
> >                  userconfig = false;
> >                  break;
> > @@ -3203,7 +3200,7 @@ int main(int argc, char **argv, char **envp)
> >          }
> >      }
> >  
> > -    if (defconfig && userconfig) {
> > +    if (userconfig) {
> >          if (qemu_read_default_config_file() < 0) {
> >              exit(1);
> >          }
> > -- 
> > 2.13.5
> > 
> > 
> 
> Regards,
> Daniel
> -- 
> |: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
> |: https://libvirt.org         -o-            https://fstop138.berrange.com :|
> |: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|

-- 
Eduardo

Re: [Qemu-devel] [PATCH 2/2] qemu-options: Deprecate -nodefconfig

[Markus Armbruster]

Eduardo Habkost <ehabkost@redhat.com> writes:

> Since 2012 (commit ba6212d8 "Eliminate cpus-x86_64.conf file") we
> have no default config files that would be disabled using
> -nodefconfig.  Update documentation and document -nodefconfig as
> deprecated.
>
> Cc: Markus Armbruster <armbru@redhat.com>
> Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
> ---
>  qemu-options.hx | 13 +++++++------
>  1 file changed, 7 insertions(+), 6 deletions(-)
>
> diff --git a/qemu-options.hx b/qemu-options.hx
> index 39225ae6c3..bc52e79184 100644
> --- a/qemu-options.hx
> +++ b/qemu-options.hx
> @@ -4069,24 +4069,25 @@ output to stdout. This can be later used as input file for @code{-readconfig} op
>  ETEXI
>  DEF("nodefconfig", 0, QEMU_OPTION_nodefconfig,
>      "-nodefconfig\n"
> -    "                do not load default config files at startup\n",
> +    "                do not load default config files at startup (deprecated)\n",
>      QEMU_ARCH_ALL)

Suggest to go one step farther:

   HXCOMM Deprecated, same as -no-user-config
   DEF("nodefconfig", 0, QEMU_OPTION_nodefconfig, "", QEMU_ARCH_ALL)

If you do, STEXI ... ETEXI needs to go, too.

>  STEXI
>  @item -nodefconfig
>  @findex -nodefconfig
> -Normally QEMU loads configuration files from @var{sysconfdir} and @var{datadir} at startup.
> -The @code{-nodefconfig} option will prevent QEMU from loading any of those config files.
> +This option was used to disable loading of config files from @var{sysconfdir}
> +and @var{datadir}, but it is deprecated as QEMU doesn't load any config files
> +from @var{datadir} anymore.  To disable loading of config files from
> +@var{sysconfdir}, use @code{-no-user-config} instead.
>  ETEXI

This information needs should (also) go into appendix "Deprecated
features", as Daniel pointed out.

>  DEF("no-user-config", 0, QEMU_OPTION_nouserconfig,
>      "-no-user-config\n"
> -    "                do not load user-provided config files at startup\n",
> +    "                do not load default user-provided config files at startup\n",
>      QEMU_ARCH_ALL)
>  STEXI
>  @item -no-user-config
>  @findex -no-user-config
>  The @code{-no-user-config} option makes QEMU not load any of the user-provided
> -config files on @var{sysconfdir}, but won't make it skip the QEMU-provided config
> -files from @var{datadir}.
> +config files on @var{sysconfdir}.

s/on/in/

>  ETEXI
>  DEF("trace", HAS_ARG, QEMU_OPTION_trace,
>      "-trace [[enable=]<pattern>][,events=<file>][,file=<file>]\n"

Re: [Qemu-devel] [PATCH 1/2] vl: Eliminate defconfig variable

[Markus Armbruster]

Eduardo Habkost <ehabkost@redhat.com> writes:

> Both -nodefconfig and -no-user-config options do the same thing
> today, we only need one variable to keep track of them.
>
> Suggested-by: Markus Armbruster <armbru@redhat.com>
> Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>

Reviewed-by: Markus Armbruster <armbru@redhat.com>