1.1 --- a/tools/libxl/libxl.h	Mon Aug 16 15:31:05 2010 +0100
     1.2 +++ b/tools/libxl/libxl.h	Mon Aug 16 15:31:05 2010 +0100
     1.3 @@ -577,7 +577,7 @@ libxl_dominfo * libxl_list_domain(libxl_
     1.4  libxl_poolinfo * libxl_list_pool(libxl_ctx*, int *nb_pool);
     1.5  libxl_vminfo * libxl_list_vm(libxl_ctx *ctx, int *nb_vm);
     1.6  
     1.7 -typedef struct libxl_device_model_starting libxl_device_model_starting;
     1.8 +typedef struct libxl__device_model_starting libxl_device_model_starting;
     1.9  int libxl_create_device_model(libxl_ctx *ctx,
    1.10                                libxl_device_model_info *info,
    1.11                                libxl_device_disk *disk, int num_disks,

     2.1 --- a/tools/libxl/libxl_internal.h	Mon Aug 16 15:31:05 2010 +0100
     2.2 +++ b/tools/libxl/libxl_internal.h	Mon Aug 16 15:31:05 2010 +0100
     2.3 @@ -199,7 +199,7 @@ typedef struct {
     2.4      char *what; /* malloc'd in spawn_spawn */
     2.5  }  libxl_spawn_starting;
     2.6  
     2.7 -struct libxl_device_model_starting {
     2.8 +struct libxl__device_model_starting {
     2.9      libxl_spawn_starting *for_spawn; /* first! */
    2.10      char *dom_path; /* from libxl_malloc, only for dm_xenstore_record_pid */
    2.11      int domid;