From: David Scott <dave.scott@citrix.com>
Date: Tue, 22 Jul 2014 15:05:18 +0000 (+0100)
Subject: libxl IDL: the name of a KeyedUnion discriminator need not be 'type'
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~4605
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=9a098f1e87fd1f82e18a750ece4362c06edb3daf;p=xen.git

libxl IDL: the name of a KeyedUnion discriminator need not be 'type'

Signed-off-by: David Scott <dave.scott@citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
---

diff --git a/tools/libxl/gentypes.py b/tools/libxl/gentypes.py
index 4b0c996d0f..3e738215be 100644
--- a/tools/libxl/gentypes.py
+++ b/tools/libxl/gentypes.py
@@ -440,7 +440,7 @@ def libxl_C_type_parse_json(ty, w, v, indent = "    ", parent = None, discrimina
                          (f.type.keyvar.name + "." + x.name, w)
                     s += "    if (x) {\n"
                     (nparent, fexpr) = ty.member(v, f.type.keyvar, parent is None)
-                    s += "        %s_init_type(%s, %s);\n" % (ty.typename, v, x.enumname)
+                    s += "        %s_init_%s(%s, %s);\n" % (ty.typename, f.type.keyvar.name, v, x.enumname)
                     (nparent,fexpr) = ty.member(v, f, parent is None)
                     s += libxl_C_type_parse_json(f.type, "x", fexpr, "  ", nparent, x.enumname)
                     s += "    }\n"