search for: extract_guid_from_registry_blob

...ws_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_registry_blob(guestfs_h *g, const void *blob); /* XXX Handling of boot.ini in the Perl version was pretty broken. It * essentially didn't do anything for modern Windows guests. @@ -386,6 +389,7 @@ check_windows_system_registry (guestfs_h *g, struct inspect_fs *fs) int r; size_t len = strlen (fs-&...

...s_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_registry_blob (guestfs_h *g, const void *blob); /* XXX Handling of boot.ini in the Perl version was pretty broken. It * essentially didn't do anything for modern Windows guests. @@ -386,6 +389,7 @@ check_windows_system_registry (guestfs_h *g, struct inspect_fs *fs) int r; size_t len = strlen (fs-...

...(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_registry_blob(guestfs_h *g, const void *blob); > > /* XXX Handling of boot.ini in the Perl version was pretty broken. It > * essentially didn't do anything for modern Windows guests. > @@ -386,6 +389,7 @@ check_windows_system_registry (guestfs_h *g, struct inspect_fs *fs) > int r; &gt...

...s_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_registry_blob (guestfs_h *g, const void *blob); /* XXX Handling of boot.ini in the Perl version was pretty broken. It * essentially didn't do anything for modern Windows guests. @@ -386,6 +389,7 @@ check_windows_system_registry (guestfs_h *g, struct inspect_fs *fs) int r; size_t len = strlen (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_registry_blob(guestfs_h *g, const > > void *blob); > >   > >  /* XXX Handling of boot.ini in the Perl version was pretty > > broken.  It > >   * essentially didn't do anything for modern Windows guests. > > @@ -386,6 +389,7 @@ check_windows_system_registry (guestfs_h *g, &...

...EXEC] 0 + (fun _ -> true) with _ -> false ) devs in diff --git a/daemon/inspect_fs_windows.ml b/daemon/inspect_fs_windows.ml index 7c42fc5d7..d4d045973 100644 --- a/daemon/inspect_fs_windows.ml +++ b/daemon/inspect_fs_windows.ml @@ -429,16 +429,15 @@ and extract_guid_from_registry_blob blob = (data4 &^ 0xffffffffffff_L) and pread device size offset = - let fd = Unix.openfile device [Unix.O_RDONLY; Unix.O_CLOEXEC] 0 in let ret = - protect ~f:( - fun () -> + with_openfile device [Unix.O_RDONLY; Unix.O_CLOEXEC] 0 ( + fun fd -> ign...

...EXEC] 0 + (fun _ -> true) with _ -> false ) devs in diff --git a/daemon/inspect_fs_windows.ml b/daemon/inspect_fs_windows.ml index 7c42fc5d7..112cc2f92 100644 --- a/daemon/inspect_fs_windows.ml +++ b/daemon/inspect_fs_windows.ml @@ -429,16 +429,14 @@ and extract_guid_from_registry_blob blob = (data4 &^ 0xffffffffffff_L) and pread device size offset = - let fd = Unix.openfile device [Unix.O_RDONLY; Unix.O_CLOEXEC] 0 in - let ret = - protect ~f:( - fun () -> - ignore (Unix.lseek fd offset Unix.SEEK_SET); - let ret = Bytes.create size in...

...s\DosDevices blob to + * to libguestfs GPT partition device. For GPT disks, the blob is made of + * "DMIO:ID:" prefix followed by the GPT partition GUID. + *) +and map_registry_disk_blob_gpt partitions blob = + (* The blob_guid is returned as a lowercase hex string. *) + let blob_guid = extract_guid_from_registry_blob blob in + + if verbose () then + eprintf "map_registry_disk_blob_gpt: searching for GUID %s\n%!" + blob_guid; + + try + let partition = + List.find ( + fun part -> + let partnum = Devsparts.part_to_partnum part in + let device = Devspart...

These safe wrappers around Pervasives.open_in and Pervasives.open_out ensure that exceptions escaping cannot leave unclosed files. --- common/mlstdutils/std_utils.ml | 39 ++++++++++++++++++++-------------- common/mlstdutils/std_utils.mli | 12 +++++++++++ common/mltools/tools_utils.ml | 39 +++++++++++++++++----------------- dib/dib.ml | 9 ++++----

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.

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

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

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

v5: https://www.redhat.com/archives/libguestfs/2017-June/msg00065.html Since v5, this now implements inspection almost completely for Linux and Windows guests. Rich.

v7 was: https://www.redhat.com/archives/libguestfs/2017-June/msg00169.html https://www.redhat.com/archives/libguestfs/2017-June/msg00184.html I believe this addresses all comments received so far. Also it now passes a test where I compared about 100 disk images processed with old and new virt-inspector binaries. The output is identical in all cases except one which is caused by a bug in blkid