[libvirt] [PATCH sandbox 3/3] Add LIBVIRT_SANDBOX_INIT_DEBUG env variable

2015-06-16 Thread Daniel P. Berrange
Allow debugging of the init process separately from debugging
of libvirt sandbox infrastructure, by using the new env var
LIBVIRT_SANDBOX_INIT_DEBUG=1.
---
 libvirt-sandbox/libvirt-sandbox-builder-container.c | 3 +--
 libvirt-sandbox/libvirt-sandbox-builder-machine.c   | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/libvirt-sandbox/libvirt-sandbox-builder-container.c 
b/libvirt-sandbox/libvirt-sandbox-builder-container.c
index c3a58b2..8db69de 100644
--- a/libvirt-sandbox/libvirt-sandbox-builder-container.c
+++ b/libvirt-sandbox/libvirt-sandbox-builder-container.c
@@ -125,8 +125,7 @@ static gchar 
*gvir_sandbox_builder_container_cmdline(GVirSandboxConfig *config G
 gchar *tmp;
 
 /* Now kernel args */
-if (getenv("LIBVIRT_SANDBOX_DEBUG") &&
-g_str_equal(getenv("LIBVIRT_SANDBOX_DEBUG"), "2"))
+if (getenv("LIBVIRT_SANDBOX_INIT_DEBUG"))
 g_string_append(str, "debug");
 
 if ((tmp = getenv("LIBVIRT_SANDBOX_STRACE"))) {
diff --git a/libvirt-sandbox/libvirt-sandbox-builder-machine.c 
b/libvirt-sandbox/libvirt-sandbox-builder-machine.c
index e342ba1..c04dee9 100644
--- a/libvirt-sandbox/libvirt-sandbox-builder-machine.c
+++ b/libvirt-sandbox/libvirt-sandbox-builder-machine.c
@@ -232,8 +232,7 @@ static gchar 
*gvir_sandbox_builder_machine_cmdline(GVirSandboxConfig *config G_G
 
 /* Now kernel args */
 g_string_append(str, " console=ttyS0");
-if (getenv("LIBVIRT_SANDBOX_DEBUG") &&
-g_str_equal(getenv("LIBVIRT_SANDBOX_DEBUG"), "2"))
+if (getenv("LIBVIRT_SANDBOX_INIT_DEBUG"))
 g_string_append(str, " debug loglevel=10 earlyprintk=ttyS0");
 else
 g_string_append(str, " quiet loglevel=0");
-- 
2.4.2

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list


Re: [libvirt] [PATCH sandbox 3/3] Add LIBVIRT_SANDBOX_INIT_DEBUG env variable

2015-06-16 Thread Cedric Bosdonnat
On Tue, 2015-06-16 at 12:25 +0100, Daniel P. Berrange wrote:
> Allow debugging of the init process separately from debugging
> of libvirt sandbox infrastructure, by using the new env var
> LIBVIRT_SANDBOX_INIT_DEBUG=1.
> ---
>  libvirt-sandbox/libvirt-sandbox-builder-container.c | 3 +--
>  libvirt-sandbox/libvirt-sandbox-builder-machine.c   | 3 +--
>  2 files changed, 2 insertions(+), 4 deletions(-)
> 
> diff --git a/libvirt-sandbox/libvirt-sandbox-builder-container.c 
> b/libvirt-sandbox/libvirt-sandbox-builder-container.c
> index c3a58b2..8db69de 100644
> --- a/libvirt-sandbox/libvirt-sandbox-builder-container.c
> +++ b/libvirt-sandbox/libvirt-sandbox-builder-container.c
> @@ -125,8 +125,7 @@ static gchar 
> *gvir_sandbox_builder_container_cmdline(GVirSandboxConfig *config G
>  gchar *tmp;
>  
>  /* Now kernel args */
> -if (getenv("LIBVIRT_SANDBOX_DEBUG") &&
> -g_str_equal(getenv("LIBVIRT_SANDBOX_DEBUG"), "2"))
> +if (getenv("LIBVIRT_SANDBOX_INIT_DEBUG"))
>  g_string_append(str, "debug");
>  
>  if ((tmp = getenv("LIBVIRT_SANDBOX_STRACE"))) {
> diff --git a/libvirt-sandbox/libvirt-sandbox-builder-machine.c 
> b/libvirt-sandbox/libvirt-sandbox-builder-machine.c
> index e342ba1..c04dee9 100644
> --- a/libvirt-sandbox/libvirt-sandbox-builder-machine.c
> +++ b/libvirt-sandbox/libvirt-sandbox-builder-machine.c
> @@ -232,8 +232,7 @@ static gchar 
> *gvir_sandbox_builder_machine_cmdline(GVirSandboxConfig *config G_G
>  
>  /* Now kernel args */
>  g_string_append(str, " console=ttyS0");
> -if (getenv("LIBVIRT_SANDBOX_DEBUG") &&
> -g_str_equal(getenv("LIBVIRT_SANDBOX_DEBUG"), "2"))
> +if (getenv("LIBVIRT_SANDBOX_INIT_DEBUG"))
>  g_string_append(str, " debug loglevel=10 earlyprintk=ttyS0");
>  else
>  g_string_append(str, " quiet loglevel=0");

ACK

--
Cedric

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list