libxl: autogenerate type definitions and destructor functions

diff -r b2ed7cc08554 -r cafba5708f95 tools/libxl/libxl.c
@@ -410,7 +410,7 @@ int libxl_domain_resume(libxl_ctx *ctx, 
  * Does not modify info so that it may be reused.
  */
 int libxl_domain_preserve(libxl_ctx *ctx, uint32_t domid,
-                          libxl_domain_create_info *info, const char *name_suffix, uint8_t new_uuid[16])
+                          libxl_domain_create_info *info, const char *name_suffix, libxl_uuid new_uuid)
 {
     struct xs_permissions roperm[2];
     xs_transaction_t t;

diff -r b2ed7cc08554 -r cafba5708f95 tools/libxl/libxl.h
@@ -22,8 +22,10 @@
 #include <xs.h>
 #include <sys/wait.h> /* for pid_t */
 
+typedef uint8_t libxl_uuid[16];
+
 typedef struct {
-    uint8_t uuid[16];
+    libxl_uuid uuid;
     uint32_t domid;
     uint8_t running:1;
     uint8_t blocked:1;

@@ -50,7 +52,7 @@ typedef struct {
 } libxl_poolinfo;
 
 typedef struct {
-    uint8_t uuid[16];
+    libxl_uuid uuid;
     uint32_t domid;
 } libxl_vminfo;
 

@@ -93,7 +95,7 @@ typedef struct {
     bool oos;
     int ssidref;
     char *name;
-    uint8_t uuid[16];
+    libxl_uuid uuid;
     char **xsdata;
     char **platformdata;
     uint32_t poolid;

@@ -173,7 +175,7 @@ typedef enum {
 
 typedef struct {
     int domid;
-    uint8_t uuid[16]; /* this is use only with stubdom, and must be different from the domain uuid */
+    libxl_uuid uuid; /* this is use only with stubdom, and must be different from the domain uuid */
     char *dom_name;
     char *device_model;
     char *saved_state;

@@ -338,7 +340,7 @@ int libxl_domain_resume(libxl_ctx *ctx, 
 int libxl_domain_resume(libxl_ctx *ctx, uint32_t domid);
 int libxl_domain_shutdown(libxl_ctx *ctx, uint32_t domid, int req);
 int libxl_domain_destroy(libxl_ctx *ctx, uint32_t domid, int force);
-int libxl_domain_preserve(libxl_ctx *ctx, uint32_t domid, libxl_domain_create_info *info, const char *name_suffix, uint8_t new_uuid[16]);
+int libxl_domain_preserve(libxl_ctx *ctx, uint32_t domid, libxl_domain_create_info *info, const char *name_suffix, libxl_uuid new_uuid);
 
 int libxl_file_reference_map(libxl_ctx *ctx, libxl_file_reference *f);
 int libxl_file_reference_unmap(libxl_ctx *ctx, libxl_file_reference *f);

@@ -360,7 +362,7 @@ int libxl_run_bootloader(libxl_ctx *ctx,
                          libxl_device_disk *disk,
                          uint32_t domid);
 
-char *libxl_uuid2string(libxl_ctx *ctx, const uint8_t uuid[16]);
+char *libxl_uuid2string(libxl_ctx *ctx, const libxl_uuid uuid);
   /* 0 means ERROR_ENOMEM, which we have logged */
 
 /* events handling */

diff -r b2ed7cc08554 -r cafba5708f95 tools/libxl/libxl_dom.c
@@ -427,7 +427,7 @@ int save_device_model(libxl_ctx *ctx, ui
     return 0;
 }
 
-char *libxl_uuid2string(libxl_ctx *ctx, const uint8_t uuid[16]) {
+char *libxl_uuid2string(libxl_ctx *ctx, const libxl_uuid uuid) {
     char *s = string_of_uuid(ctx, uuid);
     if (!s) XL_LOG(ctx, XL_LOG_ERROR, "cannot allocate for uuid");
     return s;

diff -r b2ed7cc08554 -r cafba5708f95 tools/libxl/xl_cmdimpl.c
@@ -265,11 +265,11 @@ static void init_build_info(libxl_domain
     }
 }
 
-static void random_uuid(uint8_t *uuid)
+static void random_uuid(libxl_uuid *uuid)
 {
     int i;
     for (i = 0; i < 16; i++)
-        uuid[i] = rand();
+        (*uuid)[i] = rand();
 }
 
 static void init_dm_info(libxl_device_model_info *dm_info,

@@ -277,7 +277,7 @@ static void init_dm_info(libxl_device_mo
 {
     memset(dm_info, '\0', sizeof(*dm_info));
 
-    random_uuid(&dm_info->uuid[0]);
+    random_uuid(&dm_info->uuid);
 
     dm_info->dom_name = c_info->name;
     dm_info->device_model = "qemu-dm";

@@ -586,7 +586,7 @@ static void parse_config_data(const char
         c_info->name = strdup(buf);
     else
         c_info->name = "test";
-    random_uuid(&c_info->uuid[0]);
+    random_uuid(&c_info->uuid);
 
     if (!xlu_cfg_get_long(config, "oos", &l))
         c_info->oos = l;

@@ -1181,7 +1181,7 @@ static int preserve_domain(libxl_ctx *ct
     struct tm tm;
     char stime[24];
 
-    uint8_t new_uuid[16];
+    libxl_uuid new_uuid;
 
     int rc;
 

@@ -1202,7 +1202,7 @@ static int preserve_domain(libxl_ctx *ct
         return 0;
     }
 
-    random_uuid(&new_uuid[0]);
+    random_uuid(&new_uuid);
 
     LOG("Preserving domain %d %s with suffix%s", domid, d_config->c_info.name, stime);
     rc = libxl_domain_preserve(ctx, domid, &d_config->c_info, stime, new_uuid);

diff -r cafba5708f95 -r 81cc53cbda33 tools/libxl/libxl.h
@@ -23,6 +23,8 @@
 #include <sys/wait.h> /* for pid_t */
 
 typedef uint8_t libxl_uuid[16];
+
+typedef uint8_t libxl_mac[6];
 
 typedef struct {
     libxl_uuid uuid;

@@ -270,7 +272,7 @@ typedef struct {
     int devid;
     int mtu;
     char *model;
-    uint8_t mac[6];
+    libxl_mac mac;
     struct in_addr ip;
     char *bridge;
     char *ifname;

@@ -280,8 +282,8 @@ typedef struct {
 
 typedef struct {
     int devid;
-    uint8_t front_mac[6];
-    uint8_t back_mac[6];
+    libxl_mac front_mac;
+    libxl_mac back_mac;
     uint32_t backend_domid;
     uint32_t domid;
     uint32_t trusted:1;

@@ -498,7 +500,7 @@ typedef struct {
     int devid;
     int state;
     char *script;
-    uint8_t mac[6];
+    libxl_mac mac;
     int evtch;
     int rref_tx;
     int rref_rx;

@@ -654,9 +656,9 @@ typedef struct {
     uint32_t frontend_id;
     int devid;
     int state;
-    uint8_t mac[6];
+    libxl_mac mac;
     int trusted;
-    uint8_t back_mac[6];
+    libxl_mac back_mac;
     int filter_mac;
 } libxl_net2info;

243 lines not on this page · raw message

300 lines not on this page · raw message

diff -r e2888d315d13 -r cce2e854fa97 tools/libxl/_libxl_types.h
@@ -9,7 +9,6 @@ typedef struct {
     uint8_t paused:1;
     uint8_t shutdown:1;
     uint8_t dying:1;
-
     /*
      * Valid SHUTDOWN_* value from xen/sched.h iff (shutdown||dying).
      *

@@ -17,7 +16,6 @@ typedef struct {
      * SHUTDOWN_* constant.
      */
     unsigned int shutdown_reason;
-
     uint64_t max_memkb;
     uint64_t cpu_time;
     uint32_t vcpu_max_id;

@@ -36,16 +34,16 @@ typedef struct {
 typedef struct {
     int xen_version_major;
     int xen_version_minor;
-    char *xen_version_extra;
-    char *compiler;
-    char *compile_by;
-    char *compile_domain;
-    char *compile_date;
-    char *capabilities;
-    char *changeset;
+    char * xen_version_extra;
+    char * compiler;
+    char * compile_by;
+    char * compile_domain;
+    char * compile_date;
+    char * capabilities;
+    char * changeset;
     unsigned long virt_start;
     unsigned long pagesize;
-    char *commandline;
+    char * commandline;
 } libxl_version_info;
 
 typedef struct {

@@ -53,12 +51,12 @@ typedef struct {
     bool hap;
     bool oos;
     int ssidref;
-    char *name;
+    char * name;
     libxl_uuid uuid;
-    char **xsdata;
-    char **platformdata;
+    char ** xsdata;
+    char ** platformdata;
     uint32_t poolid;
-    char *poolname;
+    char * poolname;
 } libxl_domain_create_info;
 
 typedef struct {

@@ -66,9 +64,9 @@ typedef struct {
      * Path is always set if the file refernece is valid. However if
      * mapped is true then the actual file may already be unlinked.
      */
-    char *path;
+    char * path;
     int mapped;
-    void *data;
+    void * data;
     size_t size;
 } libxl_file_reference;
 

@@ -97,18 +95,18 @@ typedef struct {
             bool acpi;
             bool nx;
             bool viridian;
-            char *timeoffset;
+            char * timeoffset;
             bool hpet;
             bool vpt_align;
             int timer_mode;
         } hvm;
         struct {
-            uint32_t   slack_memkb;
-            const char *bootloader;
-            const char *bootloader_args;
-            char *cmdline;
+            uint32_t slack_memkb;
+            const char * bootloader;
+            const char * bootloader_args;
+            char * cmdline;
             libxl_file_reference ramdisk;
-            const char *features;
+            const char * features;
         } pv;
     } u;
 } libxl_domain_build_info;

@@ -120,51 +118,145 @@ typedef struct {
     unsigned long console_mfn;
 } libxl_domain_build_state;
 
+/*
+ * Device Model information.
+ *
+ * Network is missing
+ */
 typedef struct {
     int domid;
-    libxl_uuid uuid; /* this is use only with stubdom, and must be different from the domain uuid */
-    char *dom_name;
-    char *device_model;
-    char *saved_state;
+    /*
+     * this is use only with stubdom, and must be different from the domain uuid
+     */
+    libxl_uuid uuid;
+    char * dom_name;
+    char * device_model;
+    char * saved_state;
     libxl_qemu_machine_type type;
-    int videoram; /* size of the videoram in MB */
-    bool stdvga; /* stdvga enabled or disabled */
-    bool vnc; /* vnc enabled or disabled */
-    char *vnclisten; /* address:port that should be listened on for the VNC server if vnc is set */
-    char *vncpasswd; /* the VNC password */
-    int vncdisplay; /* set VNC display number */
-    bool vncunused; /* try to find an unused port for the VNC server */
-    char *keymap; /* set keyboard layout, default is en-us keyboard */
-    bool sdl; /* sdl enabled or disabled */
-    bool opengl; /* opengl enabled or disabled (if enabled requires sdl enabled) */
-    bool nographic; /* no graphics, use serial port */
-    char *serial; /* serial port re-direct to pty deivce */
-    char *boot; /* boot order, for example dca */
-    bool usb; /* usb support enabled or disabled */
-    char *usbdevice; /* enable usb mouse: tablet for absolute mouse, mouse for PS/2 protocol relative mouse */
-    char *soundhw; /* enable sound hardware */
-    bool apic; /* apic enabled or disabled */
-    int vcpus; /* max number of vcpus */
-    int vcpu_avail; /* vcpus actually available */
-    int xen_platform_pci; /* enable/disable the xen platform pci device */
-    char **extra; /* extra parameters pass directly to qemu, NULL terminated */
-    /* Network is missing */
+    /*
+     * size of the videoram in MB
+     */
+    int videoram;
+    /*
+     * stdvga enabled or disabled
+     */
+    bool stdvga;
+    /*
+     * vnc enabled or disabled
+     */
+    bool vnc;
+    /*
+     * address:port that should be listened on for the VNC server if vnc is set
+     */
+    char * vnclisten;
+    /*
+     * the VNC password
+     */
+    char * vncpasswd;
+    /*
+     * set VNC display number
+     */
+    int vncdisplay;
+    /*
+     * try to find an unused port for the VNC server
+     */
+    bool vncunused;
+    /*
+     * set keyboard layout, default is en-us keyboard
+     */
+    char * keymap;
+    /*
+     * sdl enabled or disabled
+     */
+    bool sdl;
+    /*
+     * opengl enabled or disabled (if enabled requires sdl enabled)
+     */
+    bool opengl;
+    /*
+     * no graphics, use serial port
+     */
+    bool nographic;
+    /*
+     * serial port re-direct to pty deivce
+     */
+    char * serial;
+    /*
+     * boot order, for example dca
+     */
+    char * boot;
+    /*
+     * usb support enabled or disabled
+     */
+    bool usb;
+    /*
+     * enable usb mouse: tablet for absolute mouse, mouse for PS/2 protocol relative mouse
+     */
+    char * usbdevice;
+    /*
+     * enable sound hardware
+     */
+    char * soundhw;
+    /*
+     * apic enabled or disabled
+     */
+    bool apic;
+    /*
+     * max number of vcpus
+     */
+    int vcpus;
+    /*
+     * vcpus actually available
+     */
+    int vcpu_avail;
+    /*
+     * enable/disable the xen platform pci device
+     */
+    int xen_platform_pci;
+    /*
+     * extra parameters pass directly to qemu, NULL terminated
+     */
+    char ** extra;
 } libxl_device_model_info;
 
 typedef struct {
     uint32_t backend_domid;
     uint32_t domid;
     int devid;
-    bool vnc; /* vnc enabled or disabled */
-    char *vnclisten; /* address:port that should be listened on for the VNC server if vnc is set */
-    char *vncpasswd; /* the VNC password */
-    int vncdisplay; /* set VNC display number */
-    bool vncunused; /* try to find an unused port for the VNC server */
-    char *keymap; /* set keyboard layout, default is en-us keyboard */
-    bool sdl; /* sdl enabled or disabled */
-    bool opengl; /* opengl enabled or disabled (if enabled requires sdl enabled) */
-    char *display;
-    char *xauthority;
+    /*
+     * vnc enabled or disabled
+     */
+    bool vnc;
+    /*
+     * address:port that should be listened on for the VNC server if vnc is set
+     */
+    char * vnclisten;
+    /*
+     * the VNC password
+     */
+    char * vncpasswd;
+    /*
+     * set VNC display number
+     */
+    int vncdisplay;
+    /*
+     * try to find an unused port for the VNC server
+     */
+    bool vncunused;
+    /*
+     * set keyboard layout, default is en-us keyboard
+     */
+    char * keymap;
+    /*
+     * sdl enabled or disabled
+     */
+    bool sdl;
+    /*
+     * opengl enabled or disabled (if enabled requires sdl enabled)
+     */
+    bool opengl;
+    char * display;
+    char * xauthority;
 } libxl_device_vfb;
 
 typedef struct {

@@ -178,15 +270,15 @@ typedef struct {
     uint32_t domid;
     int devid;
     libxl_console_constype constype;
-    libxl_domain_build_state *build_state;
+    libxl_domain_build_state * build_state;
 } libxl_device_console;
 
 typedef struct {
     uint32_t backend_domid;
     uint32_t domid;
-    char *physpath;
+    char * physpath;
     libxl_disk_phystype phystype;
-    char *virtpath;
+    char * virtpath;
     int unpluggable;
     int readwrite;
     int is_cdrom;

@@ -197,12 +289,12 @@ typedef struct {
     uint32_t domid;
     int devid;
     int mtu;
-    char *model;
+    char * model;
     libxl_mac mac;
     struct in_addr ip;
-    char *bridge;
-    char *ifname;
-    char *script;
+    char * bridge;
+    char * ifname;
+    char * script;
     libxl_nic_type nictype;
 } libxl_device_nic;
 

@@ -218,7 +310,7 @@ typedef struct {
     uint32_t front_filter_mac:1;
     uint32_t pdev;
     uint32_t max_bypasses;
-    char *bridge;
+    char * bridge;
 } libxl_device_net2;
 
 typedef struct {

335 lines not on this page · raw message

diff -r 6baa8ce2ec5e -r e977c80592ca tools/libxl/libxl_utils.c
@@ -81,7 +81,7 @@ int libxl_name_to_domid(libxl_ctx *ctx, 
     return ret;
 }
 
-char *libxl_poolid_to_name(libxl_ctx *ctx, uint32_t poolid)
+const char *libxl_poolid_to_name(libxl_ctx *ctx, uint32_t poolid)
 {
     unsigned int len;
     char path[strlen("/local/pool") + 12];

@@ -99,7 +99,7 @@ int libxl_name_to_poolid(libxl_ctx *ctx,
                         uint32_t *poolid)
 {
     int i, nb_pools;
-    char *poolname;
+    const char *poolname;
     libxl_poolinfo *poolinfo;
 
     poolinfo = libxl_list_pool(ctx, &nb_pools);

diff -r 6baa8ce2ec5e -r e977c80592ca tools/libxl/libxl_utils.h
@@ -22,7 +22,7 @@ int libxl_name_to_domid(libxl_ctx *ctx, 
 int libxl_name_to_domid(libxl_ctx *ctx, const char *name, uint32_t *domid);
 char *libxl_domid_to_name(libxl_ctx *ctx, uint32_t domid);
 int libxl_name_to_poolid(libxl_ctx *ctx, const char *name, uint32_t *poolid);
-char *libxl_poolid_to_name(libxl_ctx *ctx, uint32_t poolid);
+const char *libxl_poolid_to_name(libxl_ctx *ctx, uint32_t poolid);
 int libxl_get_stubdom_id(libxl_ctx *ctx, int guest_domid);
 int libxl_is_stubdom(libxl_ctx *ctx, uint32_t domid, uint32_t *target_domid);
 int libxl_create_logfile(libxl_ctx *ctx, char *name, char **full_name);

diff -r 6baa8ce2ec5e -r e977c80592ca tools/libxl/xl_cmdimpl.c
@@ -145,12 +145,34 @@ struct domain_config {
 
 static void free_domain_config(struct domain_config *d_config)
 {
+    int i;
+
+    for (i=0; i<d_config->num_disks; i++)
+        libxl_device_disk_destroy(&d_config->disks[i]);
     free(d_config->disks);
+
+    for (i=0; i<d_config->num_vifs; i++)
+        libxl_device_nic_destroy(&d_config->vifs[i]);
     free(d_config->vifs);
+
+    for (i=0; i<d_config->num_vif2s; i++)
+        libxl_device_net2_destroy(&d_config->vif2s[i]);
     free(d_config->vif2s);
+
+    for (i=0; i<d_config->num_pcidevs; i++)
+        libxl_device_pci_destroy(&d_config->pcidevs[i]);
     free(d_config->pcidevs);
+
+    for (i=0; i<d_config->num_vfbs; i++)
+        libxl_device_vfb_destroy(&d_config->vfbs[i]);
     free(d_config->vfbs);
+
+    for (i=0; i<d_config->num_vkbs; i++)
+        libxl_device_vkb_destroy(&d_config->vkbs[i]);
     free(d_config->vkbs);
+
+    libxl_domain_create_info_destroy(&d_config->c_info);
+    libxl_domain_build_info_destroy(&d_config->b_info);
 }
 
 /* Optional data, in order:

@@ -310,7 +332,7 @@ static void init_nic_info(libxl_device_n
     nic_info->domid = 0;
     nic_info->devid = devnum;
     nic_info->mtu = 1492;
-    nic_info->model = "e1000";
+    nic_info->model = strdup("e1000");
     nic_info->mac[0] = 0x00;
     nic_info->mac[1] = 0x16;
     nic_info->mac[2] = 0x3e;

@@ -318,7 +340,7 @@ static void init_nic_info(libxl_device_n
     nic_info->mac[4] = 1 + (int) (0xff * (rand() / (RAND_MAX + 1.0)));
     nic_info->mac[5] = 1 + (int) (0xff * (rand() / (RAND_MAX + 1.0)));
     nic_info->ifname = NULL;
-    nic_info->bridge = "xenbr0";
+    nic_info->bridge = strdup("xenbr0");
     CHK_ERRNO( asprintf(&nic_info->script, "%s/vif-bridge",
                libxl_xen_script_dir_path()) );
     nic_info->nictype = NICTYPE_IOEMU;

@@ -800,6 +822,7 @@ static void parse_config_data(const char
                     break;
                 *p2 = '\0';
                 if (!strcmp(p, "model")) {
+                    free(nic->model);
                     nic->model = strdup(p2 + 1);
                 } else if (!strcmp(p, "mac")) {
                     char *p3 = p2 + 1;

@@ -821,6 +844,7 @@ static void parse_config_data(const char
                     *(p3 + 2) = '\0';
                     nic->mac[5] = strtol(p3, NULL, 16);
                 } else if (!strcmp(p, "bridge")) {
+                    free(nic->bridge);
                     nic->bridge = strdup(p2 + 1);
                 } else if (!strcmp(p, "type")) {
                     if (!strcmp(p2 + 1, "ioemu"))