From mboxrd@z Thu Jan 1 00:00:00 1970 From: Rob Hoes Subject: [PATCH v2 04/30] libxl: idl: complete some enums in the IDL with their defaults Date: Thu, 13 Jun 2013 16:24:46 +0100 Message-ID: <1371137112-16692-5-git-send-email-rob.hoes@citrix.com> References: <1371137112-16692-1-git-send-email-rob.hoes@citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1371137112-16692-1-git-send-email-rob.hoes@citrix.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: xen-devel@lists.xen.org Cc: Rob Hoes List-Id: xen-devel@lists.xenproject.org There are several enums in the IDL that are initialised to 0, while the value 0 is not part of the enum itself. This creates problems for language bindings generated from the IDL, such as the OCaml ones. Added an explicit (0, "UNKNOWN") enum value where appropriate, or used init_val to default to a sensible value. Signed-off-by: Rob Hoes --- tools/libxl/libxl_types.idl | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/tools/libxl/libxl_types.idl b/tools/libxl/libxl_types.idl index 1b8fd44..daa8bb9 100644 --- a/tools/libxl/libxl_types.idl +++ b/tools/libxl/libxl_types.idl @@ -32,14 +32,16 @@ libxl_domain_type = Enumeration("domain_type", [ (-1, "INVALID"), (1, "HVM"), (2, "PV"), - ]) + ], init_val = -1) libxl_device_model_version = Enumeration("device_model_version", [ + (0, "UNKNOWN"), (1, "QEMU_XEN_TRADITIONAL"), # Historical qemu-xen device model (qemu-dm) (2, "QEMU_XEN"), # Upstream based qemu-xen device model ]) libxl_console_type = Enumeration("console_type", [ + (0, "UNKNOWN"), (1, "SERIAL"), (2, "PV"), ]) @@ -61,6 +63,7 @@ libxl_disk_backend = Enumeration("disk_backend", [ ]) libxl_nic_type = Enumeration("nic_type", [ + (0, "UNKNOWN"), (1, "VIF_IOEMU"), (2, "VIF"), ]) @@ -75,7 +78,7 @@ libxl_action_on_shutdown = Enumeration("action_on_shutdown", [ (5, "COREDUMP_DESTROY"), (6, "COREDUMP_RESTART"), - ]) + ], init_val = 1) libxl_trigger = Enumeration("trigger", [ (0, "UNKNOWN"), @@ -96,6 +99,7 @@ libxl_tsc_mode = Enumeration("tsc_mode", [ # Consistent with the values defined for HVM_PARAM_TIMER_MODE. libxl_timer_mode = Enumeration("timer_mode", [ + (-1, "unknown"), (0, "delay_for_missed_ticks"), (1, "no_delay_for_missed_ticks"), (2, "no_missed_ticks_pending"), @@ -103,6 +107,7 @@ libxl_timer_mode = Enumeration("timer_mode", [ ], init_val = "LIBXL_TIMER_MODE_DEFAULT") libxl_bios_type = Enumeration("bios_type", [ + (0, "unknown"), (1, "rombios"), (2, "seabios"), (3, "ovmf"), @@ -131,7 +136,7 @@ libxl_shutdown_reason = Enumeration("shutdown_reason", [ libxl_vga_interface_type = Enumeration("vga_interface_type", [ (1, "CIRRUS"), (2, "STD"), - ], init_val = 0) + ], init_val = 1) # # Complex libxl types -- 1.7.10.4