search for: check_windows_software_registry

This fixes v1 by checking the correct length field. I have tested this against Windows 10 and it works. Rich.

I wasn't able to test this patch yet, so I'm just going off the description in the bug and in an MSDN posting. Rich.

...cause of previous check above in has_windows_systemroot. */ + char *cmd_exe_path = guestfs_case_sensitive_path (g, cmd_exe); if (!cmd_exe_path) - return 0; + return -1; char *arch = guestfs_file_architecture (g, cmd_exe_path); free (cmd_exe_path); @@ -210,17 +209,24 @@ static int check_windows_software_registry (guestfs_h *g, struct inspect_fs *fs) { int ret = -1; + int r; size_t len = strlen (fs->windows_systemroot) + 64; char software[len]; snprintf (software, len, "%s/system32/config/software", fs->windows_systemroot); - char *software_path = guestfs___ca...

...alue); add_application (g, apps, name, display_name, 0, version ? : "", diff --git a/lib/inspect-fs-windows.c b/lib/inspect-fs-windows.c index 34f33c908..9d31c1e6b 100644 --- a/lib/inspect-fs-windows.c +++ b/lib/inspect-fs-windows.c @@ -355,7 +355,7 @@ check_windows_software_registry (guestfs_h *g, struct inspect_fs *fs) goto out; if (STRCASEEQ (key, "ProductName")) { - fs->product_name = guestfs_hivex_value_utf8 (g, value); + fs->product_name = guestfs_hivex_value_string (g, value); if (!fs->product_name) goto out;...

...rc/inspect-fs-windows.c @@ -25,6 +25,7 @@ #include <string.h> #include <errno.h> #include <iconv.h> +#include <inttypes.h> #ifdef HAVE_ENDIAN_H #include <endian.h> @@ -57,6 +58,8 @@ static int check_windows_arch (guestfs_h *g, struct inspect_fs *fs); static int check_windows_software_registry (guestfs_h *g, struct inspect_fs *fs); static int check_windows_system_registry (guestfs_h *g, struct inspect_fs *fs); static char *map_registry_disk_blob (guestfs_h *g, const void *blob); +static char *map_registry_disk_blob_gpt(guestfs_h *g, const void *blob); +static char *extract_guid_from_re...

...let system_hive = + if Is.is_file system_hive then Some system_hive else None in + data.windows_system_hive <- system_hive; + + match software_hive, system_hive with + | None, _ | Some _, None -> () + | Some software_hive, Some system_hive -> + (* Check software hive. *) + check_windows_software_registry software_hive data; + + (* Check system hive. *) + check_windows_system_registry system_hive data + +(* At the moment, pull just the ProductName and version numbers from + * the registry. In future there is a case for making many more + * registry fields available to callers. + *) +and che...

...rc/inspect-fs-windows.c @@ -25,6 +25,7 @@ #include <string.h> #include <errno.h> #include <iconv.h> +#include <inttypes.h> #ifdef HAVE_ENDIAN_H #include <endian.h> @@ -57,6 +58,8 @@ static int check_windows_arch (guestfs_h *g, struct inspect_fs *fs); static int check_windows_software_registry (guestfs_h *g, struct inspect_fs *fs); static int check_windows_system_registry (guestfs_h *g, struct inspect_fs *fs); static char *map_registry_disk_blob (guestfs_h *g, const void *blob); +static char *map_registry_disk_blob_gpt (guestfs_h *g, const void *blob); +static char *extract_guid_from_r...

...roduct_name, + re_minix) == -1) + return -1; } else { return -1; } diff --git a/src/inspect-fs-windows.c b/src/inspect-fs-windows.c index 3ac9107..8399a90 100644 --- a/src/inspect-fs-windows.c +++ b/src/inspect-fs-windows.c @@ -324,7 +324,7 @@ check_windows_software_registry (guestfs_h *g, struct inspect_fs *fs) goto out; } - fs->major_version = le32toh (*(int32_t *)vbuf); + fs->version.v_major = le32toh (*(int32_t *)vbuf); /* Ignore CurrentVersion if we see it after this key. */ ignore_currentversion = true; @@ -342,7...

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

...; #include <string.h> > #include <errno.h> > #include <iconv.h> > +#include <inttypes.h> > > #ifdef HAVE_ENDIAN_H > #include <endian.h> > @@ -57,6 +58,8 @@ static int check_windows_arch (guestfs_h *g, struct inspect_fs *fs); > static int check_windows_software_registry (guestfs_h *g, struct inspect_fs *fs); > static int check_windows_system_registry (guestfs_h *g, struct inspect_fs *fs); > static char *map_registry_disk_blob (guestfs_h *g, const void *blob); > +static char *map_registry_disk_blob_gpt(guestfs_h *g, const void *blob); > +static char *...

Map the HIVEX_OPEN_UNSAFE flag into the libguestfs API and use it in various places. Rich.

...rc/inspect-fs-windows.c @@ -25,6 +25,7 @@ #include <string.h> #include <errno.h> #include <iconv.h> +#include <inttypes.h> #ifdef HAVE_ENDIAN_H #include <endian.h> @@ -57,6 +58,8 @@ static int check_windows_arch (guestfs_h *g, struct inspect_fs *fs); static int check_windows_software_registry (guestfs_h *g, struct inspect_fs *fs); static int check_windows_system_registry (guestfs_h *g, struct inspect_fs *fs); static char *map_registry_disk_blob (guestfs_h *g, const void *blob); +static char *map_registry_disk_blob_gpt (guestfs_h *g, const void *blob); +static char *extract_guid_from_r...

Proposed patches to fix https://bugzilla.redhat.com/show_bug.cgi?id=858126

...lt;errno.h> > >  #include <iconv.h> > > +#include <inttypes.h> > >   > >  #ifdef HAVE_ENDIAN_H > >  #include <endian.h> > > @@ -57,6 +58,8 @@ static int check_windows_arch (guestfs_h *g, > > struct inspect_fs *fs); > >  static int check_windows_software_registry (guestfs_h *g, struct > > inspect_fs *fs); > >  static int check_windows_system_registry (guestfs_h *g, struct > > inspect_fs *fs); > >  static char *map_registry_disk_blob (guestfs_h *g, const void > > *blob); > > +static char *map_registry_disk_blob_gpt(guestfs...

Hi, this adds an helper version struct, and uses it in the backends (for the libvirt and qemu versions) and inspection code. This also moves common code to that, so it is not repeated in many places. This should help with the small refactoring proposed with https://www.redhat.com/archives/libguestfs/2016-May/msg00070.html Thanks, Pino Toscano (2): src: start unifying version handling

Hi, this adds an helper version struct, and uses it in the backends (for the libvirt and qemu versions) and inspection code. This also moves common code to that, so it is not repeated in many places. This should help with the small refactoring proposed with https://www.redhat.com/archives/libguestfs/2016-May/msg00070.html Thanks, Pino Toscano (2): src: start unifying version handling

A very miscellaneous set of cleanups to how we handle the Windows registry in virt-v2v, firstboot, and inspection code. This should all be straightforward non-controversial refactoring. Some highlights: - Add a new mllib Registry module containing various utility functions that are currently scattered all around. - Only compute the software/system hive paths once during inspection, and

This adds most of the hivex APIs directly to the libguestfs API, so that you can read and write Windows Registry hive files from libguestfs without needing to download and upload hive files from the guest. This is analogous to how Augeas APIs are exposed already (guestfs_aug_*) Also, inspection is now done using the new APIs, which fixes the following bug:

Hi, I attached the changes I made to a vanilla libguestfs-1.22.6 in order to make it work in mingw/win32. Added is also the patch required to make QEMU compatible (add a command to QMP that lists the supported devices (the regilat way you do it print it to stderr, which is difficult to redirect in win32)). This is done on behalf of Intel Corp. Thanks, Or (oberon in irc)

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