search for: get_png

See individual patches. Pino Toscano (3): inspect: bump size limit for Mageia guests inspect: factor out find_png helper function inspect: revamp icon extraction for *SUSE guests lib/inspect-icon.c | 39 +++++++++++++++++++++++++-------------- 1 file changed, 25 insertions(+), 14 deletions(-) -- 2.20.1

...) { r = icon_altlinux (g, &size); } + else if (STREQ (distro, "gentoo")) { + r = icon_gentoo (g, &size); + } } else if (STREQ (type, "windows")) { #if CAN_DO_WINDOWS @@ -440,6 +444,15 @@ icon_altlinux (guestfs_h *g, size_t *size_r) return get_png (g, ALTLINUX_ICON, size_r, 20480); } +/* Installed by x11-themes/gentoo-artwork. */ +#define GENTOO_ICON "/usr/share/icons/gentoo/48x48/gentoo.png" + +static char * +icon_gentoo (guestfs_h *g, size_t *size_r) +{ + return get_png (g, GENTOO_ICON, size_r, 10240); +} + #if CAN_DO_WINDOW...

...p; fs->major_version <= 6) - max_size = 17000; - else - max_size = 66000; - if (fs->major_version <= 6) shadowman = "/usr/share/pixmaps/redhat/shadowman-transparent.png"; else shadowman = "/usr/share/pixmaps/fedora-logo-sprite.png"; - return get_png (g, fs, shadowman, size_r, max_size); + return get_png (g, fs, shadowman, size_r, 102400); } #define DEBIAN_ICON "/usr/share/pixmaps/debian-logo.png" -- 2.1.0

...break; case OS_DISTRO_UBUNTU: - r = icon_ubuntu (g, fs, &size); + if (!highquality) + r = icon_ubuntu (g, fs, &size); break; case OS_DISTRO_MAGEIA: @@ -349,12 +350,29 @@ icon_debian (guestfs_h *g, struct inspect_fs *fs, size_t *size_r) return get_png (g, fs, DEBIAN_ICON, size_r, 2048); } -#define UBUNTU_ICON "/usr/share/icons/gnome/24x24/places/ubuntu-logo.png" - static char * icon_ubuntu (guestfs_h *g, struct inspect_fs *fs, size_t *size_r) { - return get_png (g, fs, UBUNTU_ICON, size_r, 2048); + const char *icons[] = { +...

From: Michael Scherer <misc at zarb.org> Without this, configure will always enable erlang, no matter what argument are passed. Now, we can disable it, even if configure still need the erlang compiler for some obscure reason. --- configure.ac | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index 337a3ed..e0bed2f 100644 ---

...spect-icon.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/inspect-icon.c b/lib/inspect-icon.c index 84d4e4a..695f038 100644 --- a/lib/inspect-icon.c +++ b/lib/inspect-icon.c @@ -455,7 +455,7 @@ icon_voidlinux (guestfs_h *g, struct inspect_fs *fs, size_t *size_r) return get_png (g, fs, VOIDLINUX_ICON, size_r, 20480); } -#define ALTLINUX_ICON "/usr/share/doc/alt-docs/altlogo.png" +#define ALTLINUX_ICON "/usr/share/icons/hicolor/64x64/apps/altlinux.png" static char * icon_altlinux (guestfs_h *g, struct inspect_fs *fs, size_t *size_r) -- 2.9.3

...- lib/inspect-icon.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/lib/inspect-icon.c b/lib/inspect-icon.c index 0cc8e92ad..623591aa6 100644 --- a/lib/inspect-icon.c +++ b/lib/inspect-icon.c @@ -354,12 +354,16 @@ icon_mageia (guestfs_h *g, size_t *size_r) return get_png (g, MAGEIA_ICON, size_r, 10240); } -#define OPENSUSE_ICON "/usr/share/icons/hicolor/24x24/apps/distributor.png" - static char * icon_opensuse (guestfs_h *g, size_t *size_r) { - return get_png (g, OPENSUSE_ICON, size_r, 2048); + const char *icons[] = { + "/usr/share/icons/h...

...r = icon_gentoo (g, &size); } + else if (STREQ (distro, "openmandriva")) { + r = icon_openmandriva (g, &size); + } } else if (STREQ (type, "windows")) { #if CAN_DO_WINDOWS @@ -453,6 +457,18 @@ icon_gentoo (guestfs_h *g, size_t *size_r) return get_png (g, GENTOO_ICON, size_r, 10240); } +static char * +icon_openmandriva (guestfs_h *g, size_t *size_r) +{ + const char *icons[] = { + "/usr/share/icons/large/mandriva.png", + "/usr/share/icons/mandriva.png", + NULL + }; + + return find_png (g, icons, size_r, 10240);...

..., size_t *size_r) if (major < 7) shadowman = "/usr/share/pixmaps/redhat/shadowman-transparent.png"; else - shadowman = "/usr/share/pixmaps/fedora-logo-sprite.png"; + shadowman = "/usr/share/icons/hicolor/96x96/apps/system-logo-icon.png"; return get_png (g, shadowman, size_r, 102400); } -- 2.20.1

Hi, the libguestfs library uses a number of external tools; for some of them, we search for them at build time, enabling some feature only if found, and later on assuming at runtime they are installed. However, the situation is more complex than that: - hardcoding the full path means that there is an incoherency in the way some of the tools are used, as some other tools (e.g. qemu-img) are

Hi, the libguestfs library uses a number of external tools; for some of them, we search for them at build time, enabling some feature only if found, and later on assuming at runtime they are installed. However, the situation is more complex than that: - hardcoding the full path means that there is an incoherency in the way some of the tools are used, as some other tools (e.g. qemu-img) are

v9 was here: https://www.redhat.com/archives/libguestfs/2017-July/msg00139.html This depends on these three series (the first two being single minor patches): https://www.redhat.com/archives/libguestfs/2017-July/msg00207.html https://www.redhat.com/archives/libguestfs/2017-July/msg00209.html https://www.redhat.com/archives/libguestfs/2017-July/msg00215.html There is no substantive change. I

This depends on the patch series "[PATCH 00/27] Reimplement many daemon APIs in OCaml." (https://www.redhat.com/archives/libguestfs/2017-July/msg00098.html) v8 was posted here: https://www.redhat.com/archives/libguestfs/2017-June/msg00274.html v9: - I split up the mega-patch into a more reviewable series of smaller, incremental patches. There are some other changes vs v8, but

This fixes almost everything. Note that it adds an extra commit which fixes the whole utf8/iconv business. It's probably better to list what isn't fixed: (1) I didn't leave the osinfo code around because I'm still haven't looked too closely at virt-builder-repository. Can't we just fetch this code from the git history when we need it? (2) I didn't change the way

v10: https://www.redhat.com/archives/libguestfs/2017-July/msg00245.html No actual change here, but I rebased and retested. Also this series now does not depend on any other patch series since everything else needed is upstream. Rich.

...DROOT: @@ -420,6 +425,14 @@ icon_cirros (guestfs_h *g, struct inspect_fs *fs, size_t *size_r) #endif /* CAN_DO_CIRROS */ +#define VOIDLINUX_ICON "/usr/share/void-artwork/void-logo.png" + +static char * +icon_voidlinux (guestfs_h *g, struct inspect_fs *fs, size_t *size_r) +{ + return get_png (g, fs, VOIDLINUX_ICON, size_r, 20480); +} + #if CAN_DO_WINDOWS /* Windows, as usual, has to be much more complicated and stupid than diff --git a/src/inspect.c b/src/inspect.c index bd32d8f..29b4f85 100644 --- a/src/inspect.c +++ b/src/inspect.c @@ -291,6 +291,7 @@ guestfs_impl_inspect_get_dis...

This patch series changes a small part of the library to use __attribute__((cleanup(...))) to automatically free memory when pointers go out of the current scope. In general terms this seems to be a small win although you do have to use it carefully. For functions where you can completely get rid of the "exit code paths", it can simplify things. For a good example, see the

v6 was posted here: https://www.redhat.com/archives/libguestfs/2017-June/msg00103.html and this requires the utilities refactoring posted here: https://www.redhat.com/archives/libguestfs/2017-June/msg00169.html Inspection is now complete[*], although not very well tested. I'm intending to compare the output of many guests using old & new virt-inspector to see if I can find any

Here is a preliminary fix for this bug. I'm running the test suite on this now. Rich.

v1 -> v2: - Remove the unnecessary calls to guestfs_int_lazy_make_tmpdir in the final patch. Rich.