diff mbox series

[v3,2/2] vl: Print warning when a default config file is loaded

Message ID 20170927204148.2311-3-ehabkost@redhat.com
State New
Headers show
Series vl: Print warning if a non-empty default config file is found | expand

Commit Message

Eduardo Habkost Sept. 27, 2017, 8:41 p.m. UTC 
In case there were options set in the default config file, print
a warning so users can update their scripts.

If somebody wants to keep the config file as-is, avoid the
warning and use a command-line that will work in future QEMU
versions, they can use:

 $QEMU -no-user-config -readconfig /etc/qemu/qemu.conf

I was going to add an additional message suggesting it as a
solution, but I thought it could make it more confusing. The
solution can be documented in the QEMU 2.11 ChangeLog.

Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
Changes v2 -> v3:
* Rebase (no code changes)
* Commit message update: suggest -no-user-config
---
 vl.c | 6 ++++++
 1 file changed, 6 insertions(+)

Comments

Eric Blake Sept. 27, 2017, 8:47 p.m. UTC | #1 
On 09/27/2017 03:41 PM, Eduardo Habkost wrote:
> In case there were options set in the default config file, print
> a warning so users can update their scripts.
> 
> If somebody wants to keep the config file as-is, avoid the
> warning and use a command-line that will work in future QEMU
> versions, they can use:
> 
>  $QEMU -no-user-config -readconfig /etc/qemu/qemu.conf
> 
> I was going to add an additional message suggesting it as a
> solution, but I thought it could make it more confusing. The
> solution can be documented in the QEMU 2.11 ChangeLog.
> 
> Reviewed-by: Markus Armbruster <armbru@redhat.com>
> Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
> ---
> Changes v2 -> v3:
> * Rebase (no code changes)
> * Commit message update: suggest -no-user-config

> +    if (ret > 0) {
> +        loc_set_none();
> +        error_report("Warning: Future QEMU versions won't load %s automatically",
> +                     CONFIG_QEMU_CONFDIR "/qemu.conf");

Shouldn't we now use warn_report() with no 'Warning:' prefix?
diff mbox series

Patch

diff --git a/vl.c b/vl.c
index 4fd01fda91..888649bbd1 100644
--- a/vl.c
+++ b/vl.c
@@ -3048,6 +3048,12 @@  static int qemu_read_default_config_file(void)
         return ret;
     }
 
+    if (ret > 0) {
+        loc_set_none();
+        error_report("Warning: Future QEMU versions won't load %s automatically",
+                     CONFIG_QEMU_CONFDIR "/qemu.conf");
+    }
+
     return 0;
 }