xl make devid a libxl type

Previously device ids in libxl were treated as integers meaning they were being initialized to 0, which is a valid device id. This patch makes devid its own type in libxl and initializes it to -1, an invalid value.

Signed off by Matthew Fioravante [email protected]

@@ -48,7 +48,7 @@ def gen_rand_init(ty, v, indent = "    ", parent = None):
                                         passby=idl.PASS_BY_REFERENCE))
     elif ty.typename in ["libxl_uuid", "libxl_mac", "libxl_hwcap"]:
         s += "rand_bytes((uint8_t *)%s, sizeof(*%s));\n" % (v,v)
-    elif ty.typename in ["libxl_domid"] or isinstance(ty, idl.Number):
+    elif ty.typename in ["libxl_domid", "libxl_devid"] or

isinstance(ty, idl.Number):
s += "%s = rand() %% (sizeof(%s)*8);\n" % \
(ty.pass_arg(v, parent is None),
ty.pass_arg(v, parent is None))

@@ -299,6 +299,7 @@ void libxl_cpuid_dispose(libxl_cpuid_policy_list

*cpuid_list);
#define LIBXL_PCI_FUNC_ALL (~0U)

typedef uint32_t libxl_domid;
+typedef int libxl_devid;

/*
* Formatting Enumerations.

@@ -8,6 +8,7 @@ namespace("libxl_")
 libxl_defbool = Builtin("defbool", passby=PASS_BY_REFERENCE)
 
 libxl_domid = Builtin("domid", json_fn = "yajl_gen_integer",

autogenerate_json = False)
+libxl_devid = Builtin("devid", json_fn = "yajl_gen_integer", autogenerate_json = False, signed = True, init_val="-1")
libxl_uuid = Builtin("uuid", passby=PASS_BY_REFERENCE) libxl_mac = Builtin("mac", passby=PASS_BY_REFERENCE) libxl_cpumap = Builtin("cpumap", dispose_fn="libxl_cpumap_dispose",
passby=PASS_BY_REFERENCE)
@@ -318,7 +319,7 @@ libxl_domain_build_info = Struct("domain_build_info",[

libxl_device_vfb = Struct("device_vfb", [

     ("backend_domid", libxl_domid),
-    ("devid",         integer),
+    ("devid",         libxl_devid),
     ("vnc",           libxl_vnc_info),
     ("sdl",           libxl_sdl_info),
     # set keyboard layout, default is en-us keyboard
@@ -327,7 +328,7 @@ libxl_device_vfb = Struct("device_vfb", [

libxl_device_vkb = Struct("device_vkb", [

     ("backend_domid", libxl_domid),
-    ("devid", integer),
+    ("devid", libxl_devid),
     ])

libxl_device_disk = Struct("device_disk", [
@@ -344,7 +345,7 @@ libxl_device_disk = Struct("device_disk", [

libxl_device_nic = Struct("device_nic", [

     ("backend_domid", libxl_domid),
-    ("devid", integer),
+    ("devid", libxl_devid),
     ("mtu", integer),
     ("model", string),
     ("mac", libxl_mac),
@@ -374,7 +375,7 @@ libxl_diskinfo = Struct("diskinfo", [
     ("backend_id", uint32),
     ("frontend", string),
     ("frontend_id", uint32),
-    ("devid", integer),
+    ("devid", libxl_devid),
     ("state", integer),
     ("evtch", integer),
     ("rref", integer),
@@ -385,7 +386,7 @@ libxl_nicinfo = Struct("nicinfo", [
     ("backend_id", uint32),
     ("frontend", string),
     ("frontend_id", uint32),
-    ("devid", integer),
+    ("devid", libxl_devid),
     ("state", integer),
     ("evtch", integer),
     ("rref_tx", integer),

@@ -16,6 +16,7 @@
 
 (** *)
 type domid = int
+type devid = int
 
 (* ** xenctrl.h ** *)
 

b/tools/ocaml/libs/xc/xenctrl.mli

@@ -15,6 +15,7 @@
  *)
 
 type domid = int
+type devid = int
 type vcpuinfo = {
   online : bool;
   blocked : bool;

@@ -10,6 +10,7 @@ builtins = {
     "int":                  ("int",                    "%(c)s =

Int_val(%(o)s)", "Val_int(%(c)s)" ),
"char *": ("string", "%(c)s =
dup_String_val(gc, %(o)s)", "caml_copy_string(%(c)s)"),
"libxl_domid": ("domid", "%(c)s =
Int_val(%(o)s)", "Val_int(%(c)s)" ),
+ "libxl_devid": ("devid", "%(c)s =
Int_val(%(o)s)", "Val_int(%(c)s)" ),
"libxl_defbool": ("bool option", "%(c)s =
Defbool_val(%(o)s)", "Val_defbool(%(c)s)" ),
"libxl_uuid": ("int array", "Uuid_val(gc,
lg, &%(c)s, %(o)s)", "Val_uuid(&%(c)s)"),

     "libxl_key_value_list": ("(string * string) list",
None,                                None),
@@ -41,8 +42,8 @@ def stub_fn_name(ty, name):
     return "stub_xl_%s_%s" % (ty.rawname,name)

def ocaml_type_of(ty):
- if ty.rawname == "domid":
- return "domid"
+ if ty.rawname in ["domid","devid"]:
+ return ty.rawname
elif isinstance(ty,idl.UInt):
if ty.width in [8, 16]:
# handle as ints

b/tools/ocaml/libs/xl/xenlight.ml.in

@@ -16,6 +16,7 @@
 exception Error of string
 
 type domid = int
+type devid = int
 
 (* @@LIBXL_TYPES@@ *)
 

b/tools/ocaml/libs/xl/xenlight.mli.in

@@ -16,6 +16,7 @@
 exception Error of string
 
 type domid = int
+type devid = int
 
 (* @@LIBXL_TYPES@@ *)
 

@@ -17,6 +17,7 @@
 type perms = Xsraw.perms
 type con = Xsraw.con
 type domid = int
+type devid = int
 
 type xsh =
 {

@@ -27,6 +27,7 @@ exception Failed_to_connect
 type perms = Xsraw.perms
 
 type domid = int
+type devid = int
 type con
 
 type xsh = {

b/tools/python/xen/lowlevel/xl/xl.c

@@ -281,6 +281,11 @@ int attrib__libxl_domid_set(PyObject *v,

libxl_domid *domid) {
     return 0;

}

+int attrib__libxl_devid_set(PyObject *v, libxl_devid *devid) {
+ *devid = PyInt_AsLong(v);
+ return 0;
+}
+
int attrib__struct_in_addr_set(PyObject *v, struct in_addr *pptr)

 {
     PyErr_SetString(PyExc_NotImplementedError, "Setting in_addr");
@@ -342,6 +347,10 @@ PyObject *attrib__libxl_domid_get(libxl_domid *domid) {
     return PyInt_FromLong(*domid);

}

+PyObject *attrib__libxl_devid_get(libxl_devid *devid) {
+ return PyInt_FromLong(*devid);
+}
+
PyObject *attrib__struct_in_addr_get(struct in_addr *pptr)

 {
     PyErr_SetString(PyExc_NotImplementedError, "Getting in_addr");

1.7.4.4

_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xen.org/xen-devel

Unfortunately it looks like the ocaml makefiles build their list of types by using the libxl_types.idl system. Ocaml xs currently won't compile without this.

Same as above

I based it off of the xen-unstable tree on git, which I now realize is the wrong tree.

The whole purpose of this patch is initialize device ids to -1 instead of zero and the only way I could come up to do that cleanly within libxl's type system was to create a new type. Is there another better way to fix this problem? As long as device ids are initialized to zero, all the xl DEVICE-attach commands will fail for attaching more than 1 device.

_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xen.org/xen-devel

I think that's the right thing to do.

Ian.