search for: product_vari

...9,6 +69,66 @@ guestfs_impl_inspect_get_osinfo (guestfs_h *g, const char *root) if (STREQ (distro, "msdos")) return safe_strdup (g, "msdos6.22"); } + else if (STREQ (type, "windows")) { + CLEANUP_FREE char *product_name = NULL; + CLEANUP_FREE char *product_variant = NULL; + + product_name = guestfs_inspect_get_product_name (g, root); + if (!product_name) + return NULL; + product_variant = guestfs_inspect_get_product_variant (g, root); + if (!product_variant) + return NULL; + + switch (major) { + case 5: + switch (minor) {...

...9,6 +69,69 @@ guestfs_impl_inspect_get_osinfo (guestfs_h *g, const char *root) if (STREQ (distro, "msdos")) return safe_strdup (g, "msdos6.22"); } + else if (STREQ (type, "windows")) { + CLEANUP_FREE char *product_name = NULL; + CLEANUP_FREE char *product_variant = NULL; + + product_name = guestfs_inspect_get_product_name (g, root); + if (!product_name) + return NULL; + product_variant = guestfs_inspect_get_product_variant (g, root); + if (!product_variant) + return NULL; + + switch (major) { + case 5: + switch (minor) {...

...).times print %Q{\s\s\s\s<td class="blank">&nbsp;</td>\n} end print %Q{\s\s</tr>\n} end The problem I am having is with the yield statement. In the template I want my block to be the html for the cell, like so: <% print_grid_layout(@product.product_variations, "variations", 3) do |product_variation| %> <td class="normal" id="ProductVariation_<%= product_variation.id %>"> <strong><%=h product_variation.title %></strong> <br /> Catalog Num: <%=h product_varia...

...dst->package_format = src->package_format; + + if (dst->package_management == 0) + dst->package_management = src->package_management; + + if (dst->product_name == NULL) { + dst->product_name = src->product_name; + src->product_name = NULL; + } + + if (dst->product_variant == NULL) { + dst->product_variant= src->product_variant; + src->product_variant = NULL; + } + + if (dst->major_version == 0 && dst->minor_version == 0) { + dst->major_version = src->major_version; + dst->minor_version = src->minor_version; + } +...

...dst->package_format = src->package_format; + + if (dst->package_management == 0) + dst->package_management = src->package_management; + + if (dst->product_name == NULL) { + dst->product_name = src->product_name; + src->product_name = NULL; + } + + if (dst->product_variant == NULL) { + dst->product_variant= src->product_variant; + src->product_variant = NULL; + } + + if (dst->major_version == 0 && dst->minor_version == 0) { + dst->major_version = src->major_version; + dst->minor_version = src->minor_version; + } +...

...ection_data + | RoleSwap + | RoleOther +and inspection_data = { + mutable os_type : os_type option; + mutable distro : distro option; + mutable package_format : package_format option; + mutable package_management : package_management option; + mutable product_name : string option; + mutable product_variant : string option; + mutable version : version option; + mutable arch : string option; + mutable hostname : string option; + mutable fstab : fstab_entry list; + mutable windows_systemroot : string option; + mutable windows_software_hive : string option; + mutable windows_system_hive : strin...

...package_format v)) - data.package_format; - may (fun v -> bpf " package_management: %s\n" (string_of_package_management v)) - data.package_management; - may (fun v -> bpf " product_name: %s\n" v) - data.product_name; - may (fun v -> bpf " product_variant: %s\n" v) - data.product_variant; - may (fun (major, minor) -> bpf " version: %d.%d\n" major minor) - data.version; - may (fun v -> bpf " arch: %s\n" v) - data.arch; - may (fun v -> bpf " hostname: %s\n" v) - data.hostna...

...(!version) goto out; if (guestfs_int_version_from_x_y_re (g, &fs->version, version, @@ -404,7 +404,7 @@ check_windows_software_registry (guestfs_h *g, struct inspect_fs *fs) goto out; } else if (STRCASEEQ (key, "InstallationType")) { - fs->product_variant = guestfs_hivex_value_utf8 (g, value); + fs->product_variant = guestfs_hivex_value_string (g, value); if (!fs->product_variant) goto out; } @@ -568,7 +568,7 @@ check_windows_system_registry (guestfs_h *g, struct inspect_fs *fs) goto out; if (STRCASEE...

...), 210 deletions(-) diff --git a/src/guestfs-internal.h b/src/guestfs-internal.h index 6b3cfdf..0b207b2 100644 --- a/src/guestfs-internal.h +++ b/src/guestfs-internal.h @@ -605,8 +605,7 @@ struct inspect_fs { enum inspect_os_package_management package_management; char *product_name; char *product_variant; - int major_version; - int minor_version; + struct version version; char *arch; char *hostname; char *windows_systemroot; @@ -933,7 +932,12 @@ extern void guestfs_int_waitpid_noerror (pid_t pid); /* version.c */ extern void guestfs_int_version_from_libvirt (struct version *v, int...

...; + my $minor = $g->inspect_get_minor_version($root); + my $product = $g->inspect_get_product_name($root); if ($major == 5) { if ($minor == 1 || @@ -847,7 +848,7 @@ sub _get_os_type_windows } if ($major == 6 && $minor == 1) { - if ($desc->{product_variant} eq 'Client') { + if ($g->inspect_get_product_variant($root) eq 'Client') { return "Windows7".$arch_suffix; } @@ -861,10 +862,10 @@ sub _get_os_type_windows sub _get_os_type_linux { - my ($desc, $arch_suffix) = @_; + my ($g, $...

...free (str); - - str = guestfs_inspect_get_product_name (g, root); - if (!str) exit (EXIT_FAILURE); - if (STRNEQ (str, "unknown")) - XMLERROR (-1, - xmlTextWriterWriteElement (xo, BAD_CAST "product_name", BAD_CAST str)); - free (str); - - str = guestfs_inspect_get_product_variant (g, root); - if (!str) exit (EXIT_FAILURE); - if (STRNEQ (str, "unknown")) - XMLERROR (-1, - xmlTextWriterWriteElement (xo, BAD_CAST "product_variant", BAD_CAST str)); - free (str); - - i = guestfs_inspect_get_major_version (g, root); - snprintf (buf, sizeof buf...

...data.version <- Some (major, minor) + with + Not_found -> + let v = List.assoc "CurrentVersion" values in + let v = hivex_value_as_utf8 h v in + parse_version_from_major_minor v data + ); + + (* InstallationType (product_variant). *) + (try + let v = List.assoc "InstallationType" values in + data.product_variant <- Some (hivex_value_as_utf8 h v) + with + Not_found -> () + ); + with + | Not_found -> + if verbose () then + e...

This is the (incomplete) patch which reimplements inspection APIs in the daemon. All ‘XXX’s in this patch indicate areas which are not yet implemented or need further work. Rich.

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

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

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.

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