-/* Convert output from 'file' command on ELF files to the canonical
- * architecture string. Caller must free the result.
- */
-static char *
-canonical_elf_arch (guestfs_h *g, const char *elf_arch)
-{
- const char *r;
-
- if (strstr (elf_arch, "Intel 80386"))
- r = "i386";
- else if (strstr (elf_arch, "Intel 80486"))
- r = "i486";
- else if (strstr (elf_arch, "x86-64"))
- r = "x86_64";
- else if (strstr (elf_arch, "AMD x86-64"))
- r = "x86_64";
- else if (strstr (elf_arch, "SPARC32"))
- r = "sparc";
- else if (strstr (elf_arch, "SPARC V9"))
- r = "sparc64";
- else if (strstr (elf_arch, "IA-64"))
- r = "ia64";
- else if (match (g, elf_arch, re_elf_ppc64))
- r = "ppc64";
- else if (strstr (elf_arch, "PowerPC"))
- r = "ppc";
- else
- r = elf_arch;
-
- char *ret = safe_strdup (g, r);
+int
+guestfs__inspect_get_major_version (guestfs_h *g, const char *root)
+{
+ struct inspect_fs *fs = guestfs___search_for_root (g, root);
+ if (!fs)
+ return -1;
+
+ return fs->major_version;
+}
+
+int
+guestfs__inspect_get_minor_version (guestfs_h *g, const char *root)
+{
+ struct inspect_fs *fs = guestfs___search_for_root (g, root);
+ if (!fs)
+ return -1;
+
+ return fs->minor_version;
+}
+
+char *
+guestfs__inspect_get_product_name (guestfs_h *g, const char *root)
+{
+ struct inspect_fs *fs = guestfs___search_for_root (g, root);
+ if (!fs)
+ return NULL;
+
+ return safe_strdup (g, fs->product_name ? : "unknown");
+}
+
+char *
+guestfs__inspect_get_product_variant (guestfs_h *g, const char *root)
+{
+ struct inspect_fs *fs = guestfs___search_for_root (g, root);
+ if (!fs)
+ return NULL;
+
+ return safe_strdup (g, fs->product_variant ? : "unknown");
+}
+
+char *
+guestfs__inspect_get_windows_systemroot (guestfs_h *g, const char *root)
+{
+ struct inspect_fs *fs = guestfs___search_for_root (g, root);
+ if (!fs)
+ return NULL;
+
+ if (!fs->windows_systemroot) {
+ error (g, _("not a Windows guest, or systemroot could not be determined"));
+ return NULL;
+ }
+
+ return safe_strdup (g, fs->windows_systemroot);
+}
+
+char *
+guestfs__inspect_get_windows_current_control_set (guestfs_h *g,
+ const char *root)
+{
+ struct inspect_fs *fs = guestfs___search_for_root (g, root);
+ if (!fs)
+ return NULL;
+
+ if (!fs->windows_current_control_set) {
+ error (g, _("not a Windows guest, or CurrentControlSet could not be determined"));
+ return NULL;
+ }
+
+ return safe_strdup (g, fs->windows_current_control_set);
+}
+
+char *
+guestfs__inspect_get_format (guestfs_h *g, const char *root)
+{
+ struct inspect_fs *fs = guestfs___search_for_root (g, root);
+ if (!fs)
+ return NULL;
+
+ char *ret;
+ switch (fs->format) {
+ case OS_FORMAT_INSTALLED: ret = safe_strdup (g, "installed"); break;
+ case OS_FORMAT_INSTALLER: ret = safe_strdup (g, "installer"); break;
+ case OS_FORMAT_UNKNOWN: default: ret = safe_strdup (g, "unknown"); break;
+ }
+