From: "Daniel P. Berrange" <berrange@redhat.com> The 'int fd' variable in gvir_sandbox_builder_machine_mkinitrd was no longer used, causing a coverity warning about dead code. Signed-off-by: Daniel P. Berrange <berrange@redhat.com> --- libvirt-sandbox/libvirt-sandbox-builder-machine.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/libvirt-sandbox/libvirt-sandbox-builder-machine.c b/libvirt-sandbox/libvirt-sandbox-builder-machine.c index 6b9b506..229a6cc 100644 --- a/libvirt-sandbox/libvirt-sandbox-builder-machine.c +++ b/libvirt-sandbox/libvirt-sandbox-builder-machine.c @@ -153,7 +153,6 @@ static gchar *gvir_sandbox_builder_machine_mkinitrd(GVirSandboxConfig *config, GVirSandboxConfigInitrd *initrd = gvir_sandbox_config_initrd_new(); GVirSandboxBuilderInitrd *builder = gvir_sandbox_builder_initrd_new(); gchar *targetfile = g_strdup_printf("%s/initrd.img", statedir); - int fd = -1; gchar *kver = gvir_sandbox_builder_machine_get_kernrelease(config); const gchar *kmodpath = gvir_sandbox_config_get_kmodpath(config); if (!kmodpath) @@ -183,8 +182,6 @@ static gchar *gvir_sandbox_builder_machine_mkinitrd(GVirSandboxConfig *config, goto cleanup; cleanup: - if (fd != -1) - close(fd); if (*error) { g_free(targetfile); targetfile = NULL; -- 1.8.3.1

From: "Daniel P. Berrange" <berrange@redhat.com> Neither virt-sandbox or virt-sandbox-service man pages documented the 'ram' filesystem mount syntax. Fix that, and also add new line breaks in virt-sandbox-service man page. Signed-off-by: Daniel P. Berrange <berrange@redhat.com> --- bin/virt-sandbox-service-create.pod | 49 +++++++++++++++++++++---------------- bin/virt-sandbox.c | 8 ++++++ 2 files changed, 36 insertions(+), 21 deletions(-) diff --git a/bin/virt-sandbox-service-create.pod b/bin/virt-sandbox-service-create.pod index fe0226e..2ab289a 100644 --- a/bin/virt-sandbox-service-create.pod +++ b/bin/virt-sandbox-service-create.pod @@ -77,41 +77,48 @@ Default: C<UID's Homedir>. =item B<-m TYPE:DST=SRC>, B<--mount TYPE:DST=SRC> -Sets up a mount inside the sandbox at B<DST> backed by B<SRC>. The meaning of B<SRC> depends on the value of "TYPE" specified: +Sets up a mount inside the sandbox at B<DST> backed by B<SRC>. The +meaning of B<SRC> depends on the value of C<TYPE> specified: =over 4 -=item host-bind +=item B<host-bind> -If B<TYPE> is B<host-bind>, then B<SRC> is interpreted as the path to a directory on the host filesystem. If "SRC" is the empty string, then a temporary (empty) directory is created on the host before starting the sandbox and deleted afterwards. The "--include" option is useful for populating these temporary directories with copies of host files. +If B<TYPE> is B<host-bind>, then B<SRC> is interpreted as the path +to a directory on the host filesystem. If C<SRC> is the empty string, +then a temporary (empty) directory is created on the host before +starting the sandbox and deleted afterwards. The C<--include> option +is useful for populating these temporary directories with copies of host +files. -=back - -=over 4 +=item B<host-image> -=item host-image +If B<TYPE> is B<host-image>, then B<SRC> is interpreted as the path +to a disk image file on the host filesystem. The image should be +formatted with a filesystem that can be auto-detected by the sandbox, +such as B<ext3>, B<ext4>, etc. The disk image itself should be a raw +file, not qcow2 or any other special format -If B<TYPE> is B<host-image>, then B<SRC> is interpreted as the path to a disk image file on the host filesystem. The image should be formatted with a filesystem that can be auto-detected by the sandbox, such as B<ext3, ext4>, etc. The disk image itself should be a raw file, not qcow2 or any other special format - -=back +=item B<guest-bind> -=over 4 +If B<TYPE> is B<guest-bind>, then B<SRC> is interpreted as the path +to another directory in the container filesystem. -=item guest-bind +=item B<ram> -If B<TYPE> is B<guest-bind>, then B<SRC> is interpreted as the path to another directory in the container filesystem. +If B<TYPE> is B<ram>, then B<SRC> is interpreted as specifying the +size of the RAM disk in bytes. The suffix B<K>, B<KiB>, B<M>, +B<MiB>, B<G>, B<GiB> can used to alter the units from bytes to a +coarser level. =back -=over 4 - -=item Some examples +Some examples - -m host-bind:/tmp=/var/lib/sandbox/demo/tmp - -m host-image:/=/var/lib/sandbox/demo.img - -m guest-bind:/home=/tmp/home - -=back + -m host-bind:/tmp=/var/lib/sandbox/demo/tmp + -m host-image:/=/var/lib/sandbox/demo.img + -m guest-bind:/home=/tmp/home + -m ram:/tmp=500M =item B<-N NETWORK-OPTIONS>, B<--network NETWORK-OPTIONS> diff --git a/bin/virt-sandbox.c b/bin/virt-sandbox.c index ae303d2..b16217b 100644 --- a/bin/virt-sandbox.c +++ b/bin/virt-sandbox.c @@ -332,6 +332,13 @@ file, not qcow2 or any other special format If B<TYPE> is B<guest-bind>, then B<SRC> is interpreted as the path to another directory in the container filesystem. +=item B<ram> + +If B<TYPE> is B<ram>, then B<SRC> is interpreted as specifying the +size of the RAM disk in bytes. The suffix B<K>, B<KiB>, B<M>, +B<MiB>, B<G>, B<GiB> can used to alter the units from bytes to a +coarser level. + =back Some examples @@ -339,6 +346,7 @@ Some examples -m host-bind:/tmp=/var/lib/sandbox/demo/tmp -m host-image:/=/var/lib/sandbox/demo.img -m guest-bind:/home=/tmp/home + -m ram:/tmp=500M =item B<-I HOST-PATH>, B<--includefile=HOST-PATH> -- 1.8.3.1

From: "Daniel P. Berrange" <berrange@redhat.com> If several error cases of the run_interactive method, the sigpipe or host file descriptors could be leaked. Signed-off-by: Daniel P. Berrange <berrange@redhat.com> --- libvirt-sandbox/libvirt-sandbox-init-common.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libvirt-sandbox/libvirt-sandbox-init-common.c b/libvirt-sandbox/libvirt-sandbox-init-common.c index c8e8379..262f4e1 100644 --- a/libvirt-sandbox/libvirt-sandbox-init-common.c +++ b/libvirt-sandbox/libvirt-sandbox-init-common.c @@ -1076,7 +1076,7 @@ run_interactive(GVirSandboxConfig *config) if ((host = open(devname, O_RDWR)) < 0) { g_printerr(_("libvirt-sandbox-init-common: cannot open %s: %s"), devname, strerror(errno)); - return -1; + goto cleanup; } tcgetattr(STDIN_FILENO, &rawattr); @@ -1093,7 +1093,7 @@ run_interactive(GVirSandboxConfig *config) gvir_sandbox_config_get_userid(config), gvir_sandbox_config_get_groupid(config), gvir_sandbox_config_get_homedir(config)) < 0) - return -1; + goto cleanup; command = gvir_sandbox_config_get_command(config); if (!eventloop(gvir_sandbox_config_interactive_get_tty(iconfig), @@ -1112,6 +1112,8 @@ cleanup: close(sigpipe[0]); if (sigpipe[1] != -1) close(sigpipe[1]); + if (host != -1) + close(host); return ret; } -- 1.8.3.1

From: "Daniel P. Berrange" <berrange@redhat.com> The 'config' object in libvirt-sandbox-context-service.c methods cannot be NULL, so checking 'if (config)' is pointless code. Signed-off-by: Daniel P. Berrange <berrange@redhat.com> --- libvirt-sandbox/libvirt-sandbox-context-service.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/libvirt-sandbox/libvirt-sandbox-context-service.c b/libvirt-sandbox/libvirt-sandbox-context-service.c index 0858ffb..b1ee311 100644 --- a/libvirt-sandbox/libvirt-sandbox-context-service.c +++ b/libvirt-sandbox/libvirt-sandbox-context-service.c @@ -179,8 +179,7 @@ cleanup: g_object_unref(builder); if (connection) g_object_unref(connection); - if (config) - g_object_unref(config); + g_object_unref(config); return ret; } @@ -265,8 +264,7 @@ cleanup: g_object_unref(builder); if (connection) g_object_unref(connection); - if (config) - g_object_unref(config); + g_object_unref(config); return ret; } -- 1.8.3.1