search for: map_registry_disk_blob_gpt

...indows_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_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_regist...

...indows_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_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_regi...

..._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_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 @@ ch...

...Parted.part_get_parttype dev = "msdos" && + pread dev 4 0x01b8 = diskid + with Unix.Unix_error (Unix.EINVAL, _, _) -> false ) devices in (* Next 8 bytes are the offset of the partition in bytes(!) given as @@ -402,7 +404,10 @@ and map_registry_disk_blob_gpt partitions blob = fun part -> let partnum = Devsparts.part_to_partnum part in let device = Devsparts.part_to_dev part in - let typ = Parted.part_get_parttype device in + let typ = + try + Parted.part_get_parttype device +...

...indows_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_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_regi...

...nt 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_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...

...> > TBH I'd rather prefer that we check for the situation explicitly > before, rather than catching a generic EINVAL error. Or, even better, > try to avoid altogether the situation that 7b4d13626ff878 checks, > handling this issue as well. > > > @@ -402,7 +404,10 @@ and map_registry_disk_blob_gpt partitions blob = > > fun part -> > > let partnum = Devsparts.part_to_partnum part in > > let device = Devsparts.part_to_dev part in > > - let typ = Parted.part_get_parttype device in > > + let typ = > > +...

...windows.ml b/daemon/inspect_fs_windows.ml index 8b2aad8d3..af52dee2d 100644 --- a/daemon/inspect_fs_windows.ml +++ b/daemon/inspect_fs_windows.ml @@ -329,7 +329,7 @@ and get_drive_mappings h root data = String.is_prefix blob "DMIO:ID:" (* GPT *) then map_registry_disk_blob_gpt (Lazy.force partitions) blob else if String.length blob = 12 then - map_registry_disk_blob (Lazy.force devices) blob + map_registry_disk_blob_mbr (Lazy.force devices) blob else None ) @@ -356,13 +3...

...disk? *) + let (typ, blob) = Hivex.value_value h value in + let device = + if typ = Hivex.REG_BINARY then ( + if String.length blob >= 24 && + String.is_prefix blob "DMIO:ID:" (* GPT *) then + map_registry_disk_blob_gpt (Lazy.force partitions) blob + else if String.length blob = 12 then + map_registry_disk_blob (Lazy.force devices) blob + else + None + ) + else None in + + match device with + | None -&gt...

...26ff878b124d01ec452a4fd0052934133 TBH I'd rather prefer that we check for the situation explicitly before, rather than catching a generic EINVAL error. Or, even better, try to avoid altogether the situation that 7b4d13626ff878 checks, handling this issue as well. > @@ -402,7 +404,10 @@ and map_registry_disk_blob_gpt partitions blob = > fun part -> > let partnum = Devsparts.part_to_partnum part in > let device = Devsparts.part_to_dev part in > - let typ = Parted.part_get_parttype device in > + let typ = > + try > +...

...windows.ml b/daemon/inspect_fs_windows.ml index 8b2aad8d3..af52dee2d 100644 --- a/daemon/inspect_fs_windows.ml +++ b/daemon/inspect_fs_windows.ml @@ -329,7 +329,7 @@ and get_drive_mappings h root data = String.is_prefix blob "DMIO:ID:" (* GPT *) then map_registry_disk_blob_gpt (Lazy.force partitions) blob else if String.length blob = 12 then - map_registry_disk_blob (Lazy.force devices) blob + map_registry_disk_blob_mbr (Lazy.force devices) blob else None ) @@ -356,13 +3...

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.

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

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

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.