>From 5d367d3be510f2bd24cb5a622ed1343528b552df Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Thu, 4 May 2017 13:24:22 +0100
Subject: [PATCH] UPDATE appliance: search all types of appliances

---
 lib/appliance.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/lib/appliance.c b/lib/appliance.c
index 3bc3bc8..68e11ee 100644
--- a/lib/appliance.c
+++ b/lib/appliance.c
@@ -37,23 +37,23 @@
 #include "guestfs.h"
 #include "guestfs-internal.h"
 
-typedef struct appliance_files {
+struct appliance_files {
   char *kernel;
   char *initrd;
   char *image;
-} appliance_files;
+};
 
 /* Old-style appliance is going to be obsoleted. */
 static const char kernel_name[] = "vmlinuz." host_cpu;
 static const char initrd_name[] = "initramfs." host_cpu ".img";
 
-static int search_appliance (guestfs_h *g, appliance_files *appliance);
+static int search_appliance (guestfs_h *g, struct appliance_files *appliance);
 static int dir_contains_file (guestfs_h *g, const char *dir, const char *file);
 static int dir_contains_files (guestfs_h *g, const char *dir, ...);
 static int contains_old_style_appliance (guestfs_h *g, const char *path, void *data);
 static int contains_fixed_appliance (guestfs_h *g, const char *path, void *data);
 static int contains_supermin_appliance (guestfs_h *g, const char *path, void *data);
-static int build_supermin_appliance (guestfs_h *g, const char *supermin_path, appliance_files *appliance);
+static int build_supermin_appliance (guestfs_h *g, const char *supermin_path, struct appliance_files *appliance);
 static int run_supermin_build (guestfs_h *g, const char *lockfile, const char *appliancedir, const char *supermin_path);
 
 /**
@@ -116,7 +116,7 @@ guestfs_int_build_appliance (guestfs_h *g,
 			     char **appliance_rtn)
 {
 
-  appliance_files appliance;
+  struct appliance_files appliance;
 
   if (search_appliance (g, &appliance) != 1)
     return -1;
@@ -144,7 +144,7 @@ guestfs_int_build_appliance (guestfs_h *g,
  */
 static int
 locate_or_build_appliance (guestfs_h *g,
-                           appliance_files *appliance,
+                           struct appliance_files *appliance,
                            const char *path)
 {
   int r;
@@ -197,7 +197,7 @@ locate_or_build_appliance (guestfs_h *g,
  *  -1 = error which aborts the launch process.
  */
 static int
-search_appliance (guestfs_h *g, appliance_files *appliance)
+search_appliance (guestfs_h *g, struct appliance_files *appliance)
 {
   const char *pelem = g->path;
 
@@ -258,7 +258,7 @@ contains_supermin_appliance (guestfs_h *g, const char *path, void *data)
 static int
 build_supermin_appliance (guestfs_h *g,
                           const char *supermin_path,
-                          appliance_files *appliance)
+                          struct appliance_files *appliance)
 {
   CLEANUP_FREE char *cachedir = NULL, *lockfile = NULL, *appliancedir = NULL;
 
-- 
2.9.3