* [Qemu-devel] [PATCH v3 0/2] Deprecate -nodefconfig
@ 2017-10-04 3:00 Eduardo Habkost
2017-10-04 3:00 ` [Qemu-devel] [PATCH v3 1/2] vl: Eliminate defconfig variable Eduardo Habkost
` (2 more replies)
0 siblings, 3 replies; 7+ messages in thread
From: Eduardo Habkost @ 2017-10-04 3:00 UTC (permalink / raw)
To: qemu-devel
Cc: Markus Armbruster, Paolo Bonzini, Alistair Francis, Daniel P. Berrange
Changes v2 -> v3:
* Move documentation to the right section of qemu-doc.texi
Changes v1 -> v2:
* Document at "Deprecated features" section in qemu-doc.texi
(Daniel)
* Remove documentation for the option from qemu-options.hx
(Markus)
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-doc.texi | 4 ++++
qemu-options.hx | 17 ++++-------------
3 files changed, 9 insertions(+), 17 deletions(-)
--
2.13.5
^ permalink raw reply [flat|nested] 7+ messages in thread
* [Qemu-devel] [PATCH v3 1/2] vl: Eliminate defconfig variable
2017-10-04 3:00 [Qemu-devel] [PATCH v3 0/2] Deprecate -nodefconfig Eduardo Habkost
@ 2017-10-04 3:00 ` Eduardo Habkost
2017-10-04 8:37 ` Daniel P. Berrange
2017-10-04 3:00 ` [Qemu-devel] [PATCH v3 2/2] qemu-options: Deprecate -nodefconfig Eduardo Habkost
2017-10-04 20:46 ` [Qemu-devel] [PATCH v3 0/2] " Eduardo Habkost
2 siblings, 1 reply; 7+ messages in thread
From: Eduardo Habkost @ 2017-10-04 3:00 UTC (permalink / raw)
To: qemu-devel
Cc: Markus Armbruster, Paolo Bonzini, Alistair Francis, Daniel P. Berrange
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>
Acked-by: Alistair Francis <alistair.francis@xilinx.com>
Reviewed-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 3fed457921..ebea42e0ea 100644
--- a/vl.c
+++ b/vl.c
@@ -3111,7 +3111,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;
@@ -3213,8 +3212,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;
@@ -3222,7 +3219,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
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [Qemu-devel] [PATCH v3 2/2] qemu-options: Deprecate -nodefconfig
2017-10-04 3:00 [Qemu-devel] [PATCH v3 0/2] Deprecate -nodefconfig Eduardo Habkost
2017-10-04 3:00 ` [Qemu-devel] [PATCH v3 1/2] vl: Eliminate defconfig variable Eduardo Habkost
@ 2017-10-04 3:00 ` Eduardo Habkost
2017-10-04 5:44 ` Markus Armbruster
2017-10-04 8:36 ` Daniel P. Berrange
2017-10-04 20:46 ` [Qemu-devel] [PATCH v3 0/2] " Eduardo Habkost
2 siblings, 2 replies; 7+ messages in thread
From: Eduardo Habkost @ 2017-10-04 3:00 UTC (permalink / raw)
To: qemu-devel
Cc: Markus Armbruster, Paolo Bonzini, Alistair Francis, Daniel P. Berrange
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>
Acked-by: Alistair Francis <alistair.francis@xilinx.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
Changes v2 -> v3:
* Move documentation to the right section of qemu-doc.texi
Changes v1 -> v2:
* Document at "Deprecated features" section in qemu-doc.texi
(Daniel)
* Remove documentation for the option from qemu-options.hx
(Markus)
---
qemu-doc.texi | 4 ++++
qemu-options.hx | 17 ++++-------------
2 files changed, 8 insertions(+), 13 deletions(-)
diff --git a/qemu-doc.texi b/qemu-doc.texi
index ecd186a159..d8bb2c664f 100644
--- a/qemu-doc.texi
+++ b/qemu-doc.texi
@@ -2496,6 +2496,10 @@ would automatically enable USB support on the machine type.
If using the new syntax, USB support must be explicitly
enabled via the ``-machine usb=on'' argument.
+@subsection -nodefconfig (since 2.11.0)
+
+The ``-nodefconfig`` argument is a synonym for ``-no-user-config``.
+
@section qemu-img command line arguments
@subsection convert -s (since 2.0.0)
diff --git a/qemu-options.hx b/qemu-options.hx
index 39225ae6c3..981742d191 100644
--- a/qemu-options.hx
+++ b/qemu-options.hx
@@ -4067,26 +4067,17 @@ Write device configuration to @var{file}. The @var{file} can be either filename
command line and device configuration into file or dash @code{-}) character to print the
output to stdout. This can be later used as input file for @code{-readconfig} option.
ETEXI
-DEF("nodefconfig", 0, QEMU_OPTION_nodefconfig,
- "-nodefconfig\n"
- " do not load default config files at startup\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.
-ETEXI
+HXCOMM Deprecated, same as -no-user-config
+DEF("nodefconfig", 0, QEMU_OPTION_nodefconfig, "", QEMU_ARCH_ALL)
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
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [Qemu-devel] [PATCH v3 2/2] qemu-options: Deprecate -nodefconfig
2017-10-04 3:00 ` [Qemu-devel] [PATCH v3 2/2] qemu-options: Deprecate -nodefconfig Eduardo Habkost
@ 2017-10-04 5:44 ` Markus Armbruster
2017-10-04 8:36 ` Daniel P. Berrange
1 sibling, 0 replies; 7+ messages in thread
From: Markus Armbruster @ 2017-10-04 5:44 UTC (permalink / raw)
To: Eduardo Habkost; +Cc: qemu-devel, Paolo Bonzini, Alistair Francis
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>
> Acked-by: Alistair Francis <alistair.francis@xilinx.com>
> Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [Qemu-devel] [PATCH v3 2/2] qemu-options: Deprecate -nodefconfig
2017-10-04 3:00 ` [Qemu-devel] [PATCH v3 2/2] qemu-options: Deprecate -nodefconfig Eduardo Habkost
2017-10-04 5:44 ` Markus Armbruster
@ 2017-10-04 8:36 ` Daniel P. Berrange
1 sibling, 0 replies; 7+ messages in thread
From: Daniel P. Berrange @ 2017-10-04 8:36 UTC (permalink / raw)
To: Eduardo Habkost
Cc: qemu-devel, Markus Armbruster, Paolo Bonzini, Alistair Francis
On Wed, Oct 04, 2017 at 12:00:25AM -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. Update documentation and document -nodefconfig as
> deprecated.
>
> Cc: Markus Armbruster <armbru@redhat.com>
> Acked-by: Alistair Francis <alistair.francis@xilinx.com>
> Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
> ---
> Changes v2 -> v3:
> * Move documentation to the right section of qemu-doc.texi
>
> Changes v1 -> v2:
> * Document at "Deprecated features" section in qemu-doc.texi
> (Daniel)
> * Remove documentation for the option from qemu-options.hx
> (Markus)
> ---
> qemu-doc.texi | 4 ++++
> qemu-options.hx | 17 ++++-------------
> 2 files changed, 8 insertions(+), 13 deletions(-)
Reviewed-by: Daniel P. Berrange <berrange@redhat.com>
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 :|
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [Qemu-devel] [PATCH v3 1/2] vl: Eliminate defconfig variable
2017-10-04 3:00 ` [Qemu-devel] [PATCH v3 1/2] vl: Eliminate defconfig variable Eduardo Habkost
@ 2017-10-04 8:37 ` Daniel P. Berrange
0 siblings, 0 replies; 7+ messages in thread
From: Daniel P. Berrange @ 2017-10-04 8:37 UTC (permalink / raw)
To: Eduardo Habkost
Cc: qemu-devel, Markus Armbruster, Paolo Bonzini, Alistair Francis
On Wed, Oct 04, 2017 at 12:00:24AM -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.
>
> Suggested-by: Markus Armbruster <armbru@redhat.com>
> Acked-by: Alistair Francis <alistair.francis@xilinx.com>
> Reviewed-by: Markus Armbruster <armbru@redhat.com>
> Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
> ---
> vl.c | 5 +----
> 1 file changed, 1 insertion(+), 4 deletions(-)
Reviewed-by: Daniel P. Berrange <berrange@redhat.com>
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 :|
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [Qemu-devel] [PATCH v3 0/2] Deprecate -nodefconfig
2017-10-04 3:00 [Qemu-devel] [PATCH v3 0/2] Deprecate -nodefconfig Eduardo Habkost
2017-10-04 3:00 ` [Qemu-devel] [PATCH v3 1/2] vl: Eliminate defconfig variable Eduardo Habkost
2017-10-04 3:00 ` [Qemu-devel] [PATCH v3 2/2] qemu-options: Deprecate -nodefconfig Eduardo Habkost
@ 2017-10-04 20:46 ` Eduardo Habkost
2 siblings, 0 replies; 7+ messages in thread
From: Eduardo Habkost @ 2017-10-04 20:46 UTC (permalink / raw)
To: qemu-devel; +Cc: Paolo Bonzini, Markus Armbruster, Alistair Francis
On Wed, Oct 04, 2017 at 12:00:23AM -0300, Eduardo Habkost wrote:
> Changes v2 -> v3:
> * Move documentation to the right section of qemu-doc.texi
>
> Changes v1 -> v2:
> * Document at "Deprecated features" section in qemu-doc.texi
> (Daniel)
> * Remove documentation for the option from qemu-options.hx
> (Markus)
>
> 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.
Paolo, if you are OK with it I'm queueing this series on
machine-next.
--
Eduardo
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2017-10-04 20:46 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-10-04 3:00 [Qemu-devel] [PATCH v3 0/2] Deprecate -nodefconfig Eduardo Habkost
2017-10-04 3:00 ` [Qemu-devel] [PATCH v3 1/2] vl: Eliminate defconfig variable Eduardo Habkost
2017-10-04 8:37 ` Daniel P. Berrange
2017-10-04 3:00 ` [Qemu-devel] [PATCH v3 2/2] qemu-options: Deprecate -nodefconfig Eduardo Habkost
2017-10-04 5:44 ` Markus Armbruster
2017-10-04 8:36 ` Daniel P. Berrange
2017-10-04 20:46 ` [Qemu-devel] [PATCH v3 0/2] " Eduardo Habkost
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.