search for: dir_contains_fil

...Looks good. I'll push this if it passes 'make check && make check-valgrind' > >which I'm currently running. > > Thanks. > > > It is not connected with the current patch-set, but I noticed a > possible bug in appliance.c: > > static int > dir_contains_files (guestfs_h *g, const char *dir, ...) > { > va_list args; > const char *file; > > va_start (args, dir); > while ((file = va_arg (args, const char *)) != NULL) { > if (!dir_contains_file (g, dir, file)) { > ... > > static int > contains_fixed_appliance...

...char *initrd_name = "initramfs." host_cpu ".img"; static int build_appliance (guestfs_h *g, char **kernel, char **initrd, char **appliance); static int find_path (guestfs_h *g, int (*pred) (guestfs_h *g, const char *pelem, void *data), void *data, char **pelem); -static int dir_contains_file (const char *dir, const char *file); -static int dir_contains_files (const char *dir, ...); +static int dir_contains_file (guestfs_h *g, const char *dir, const char *file); +static int dir_contains_files (guestfs_h *g, const char *dir, ...); static int contains_old_style_appliance (guestfs_h *g,...

Various changes/fixes to use smaller stack frames. Rich.

...dex f12918573..5738e4e7f 100644 > --- a/lib/appliance.c > +++ b/lib/appliance.c > @@ -199,7 +199,9 @@ contains_fixed_appliance (guestfs_h *g, const char *path, void *data) > static int > contains_supermin_appliance (guestfs_h *g, const char *path, void *data) > { > - return dir_contains_files (g, path, "supermin.d", NULL); > + return dir_contains_files (g, path, > + "supermin.d/base.tar.gz", > + "supermin.d/packages", NULL); > } Thanks - I've pushed this. Rich. -- Richard Jones,...

This attempts to implement the idea proposed in https://www.redhat.com/archives/libguestfs/2010-April/msg00087.html The idea is that an externally managed QEMU (manual, or via libvirt) can boot the appliance kernel/initrd. libguestfs can then be just told of the UNIX domain socket associated with the guest daemon. An example based on guestfish. 1. Step one, find the appliance kernel/initrd

...t;= NULL" here. > diff --git a/src/appliance.c b/src/appliance.c > index dbde35e..d7cc60b 100644 > --- a/src/appliance.c > +++ b/src/appliance.c > @@ -396,27 +386,24 @@ find_path (guestfs_h *g, > > /* Returns true iff file is contained in dir. */ > static int > -dir_contains_file (const char *dir, const char *file) > +dir_contains_file (guestfs_h *g, const char *dir, const char *file) > { > - size_t dirlen = strlen (dir); > - size_t filelen = strlen (file); > - size_t len = dirlen + filelen + 2; > - char path[len]; > + CLEANUP_FREE char *path; M...

This is the libguestfs companion patch to: https://www.redhat.com/archives/libguestfs/2013-September/msg00045.html Rich.

...nstant leak), in part _because_ of the commonality of passing NULL through varargs functions. >> >> In practice, this means that if NULL is defined as integer and we have >> 64 bit architecture, then here as the last argument - 4 bytes are >> written on the stack: >> dir_contains_files (g, path, >> "README.fixed", "kernel", "initrd", "root", NULL); >> >> But va_arg() will read 8 bytes: >> while ((file = va_arg (args, const char *)) != NULL) { >> >> I don't know how real can be t...

...ls-c.c | 27 +++++++++++++++++++++++++++ v2v/utils.ml | 7 +++---- 5 files changed, 48 insertions(+), 25 deletions(-) diff --git a/src/appliance.c b/src/appliance.c index 1dbf9c7..dbde35e 100644 --- a/src/appliance.c +++ b/src/appliance.c @@ -443,32 +443,15 @@ dir_contains_files (const char *dir, ...) * * XXX See also v2v/utils.ml:find_uefi_firmware */ -#ifdef __aarch64__ - -static const char *uefi_firmware[] = { - "/usr/share/AAVMF/AAVMF_CODE.fd", - "/usr/share/AAVMF/AAVMF_VARS.fd", - - "/usr/share/edk2.git/aarch64/QEMU_EFI-pflash.raw&q...

...nternal.h | 1 + src/tmpdirs.c | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 63 insertions(+), 33 deletions(-) diff --git a/src/appliance.c b/src/appliance.c index 2cf6374..d293c2b 100644 --- a/src/appliance.c +++ b/src/appliance.c @@ -48,7 +48,7 @@ static int dir_contains_files (guestfs_h *g, const char *dir, ...); static int contains_old_style_appliance (guestfs_h *g, const char *path, void *data); static int contains_fixed_appliance (guestfs_h *g, const char *path, void *data); static int contains_supermin_appliance (guestfs_h *g, const char *path, void *data); -st...

...ppliance.c +++ b/src/appliance.c @@ -1,5 +1,5 @@ /* libguestfs - * Copyright (C) 2010-2012 Red Hat Inc. + * Copyright (C) 2010-2014 Red Hat Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -459,3 +459,67 @@ dir_contains_files (const char *dir, ...) va_end (args); return 1; } + +#ifdef __aarch64__ + +#define AAVMF_DIR "/usr/share/AAVMF" + +/* Return the location of firmware needed to boot the appliance. This + * is aarch64 only currently, since that's the only architecture where + * UEFI is mandat...

...); + } + } + + int r; + if (waitpid(pid, &r, 0) == -1) { + error (g, _("error waiting for command: %s (%m)"), cmd); + return -1; + } + + if (WEXITSTATUS (r) != 0) { error (g, _("external command failed: %s"), cmd); return -1; } @@ -463,3 +537,45 @@ dir_contains_files (const char *dir, ...) va_end (args); return 1; } + +/* Launch may be called by a seteuid/setegid process (virt-v2v does this). + * Unfortunately, execve resets EGID/EUID to GID/UID. This means that files + * created by a subprocess will have the wrong ownership. To work round this, + * we...

This is only lightly tested. In particularly I only tested that the non-secure-boot path still works. I didn't test it on RHEL 7.3 yet because I haven't got enough free disk space for these giant source *.ova files :-( Will try to give that a go later. Rich.

First version was posted here: https://www.redhat.com/archives/libguestfs/2016-August/thread.html#00100 This is semantically the same as the first version. However I've split the patch up into two parts. In the first part, I factor out the UEFI paths so now they are created by the generator and written in the library and v2v/ directory directly, instead of the complex business of having a C

...(len == 0 || (len == 1 && *pelem == '.')) { if (g->verbose) - fprintf (stderr, - "looking for supermin appliance in current directory\n"); + fprintf (stderr, + "looking for supermin appliance in current directory\n"); if (dir_contains_files (".", - supermin_name, supermin_hostfiles_name, - "kmod.whitelist", NULL)) { - if (build_supermin_appliance (g, ".", &kernel, &initrd) == -1) - return -1; - break; + supermin_name, supermin_hostfiles_name, +...

Doing qemu feature detection in the direct backend takes ~100ms because we need to run `qemu -help' and `qemu -devices ?', and each of those interacts with glibc's very slow link loader. Fixing the link loader is really hard. Instead memoize the output of those two commands. This patch series first separates all the code dealing with qemu into a separate module (src/qemu.c) and

Inspired by libvirt's virCommand* internal mini-library, this adds some internal APIs for running commands. The first patch contains the new APIs. The subsequent patches change various parts of the library over to use it. Rich.

libguestfs has used double and triple underscores in identifiers. These aren't valid for global names in C++. (http://stackoverflow.com/a/228797) These large but completely mechanical patches change the illegal identifiers to legal ones. Rich.