Improvements to libxl VIF hotplug and ocaml bindings (v2)

PATCH In review David Scott 3 participants 18 messages Mar 30, 2011 – Mar 31, 2011

lore

Share & tools

lore

David Scott

author

2011-03-30 18:05 UTC #0 lore raw

PATCH 1/1 Improvements to libxl VIF hotplug and ocaml bindings (v2)

Improvements to libxl VIF hotplug/unplug and ocaml bindings; xapi can now use these functions

This patch set includes:
1. addition of VIF QoS parameters to libxl (this code is ported from xapi/ xenops)
2. updates to the libxl ocaml bindings to make them more usable and more easily generatable from the IDL
3. bugfixes to the "xl network-attach" command so the QoS settings can be more easily tested.

FYI the corresponding xapi changes are in a branch here:

https://github.com/djs55/xen-api/tree/hackathon

Changes since the last submission include:
* updating the whole ocaml xl module to use the new style for consistency
* some dead ocaml functions were removed
* documentation for the QoS parameters added to the libxl IDL
* the QoS parameter was renamed to have "kb" rather than "kib" for consistency

Signed-off-by David Scott <dave.scott@xxxxxxxxxxxxx>

David Scott

author

2011-03-30 18:05 UTC #1 lore raw

PATCH 1/1 libxl: fix memory management in "xl network-attach"

# HG changeset patch
# User David Scott <[email protected]> # Date 1301507668 -3600
# Node ID 746e49e61dbc79797d1206a96e5b65651874b1bf # Parent a65612bcbb921e98a8843157bf365e4ab16e8144
libxl: fix memory management in "xl network-attach"

The libxl_device_nic struct has strings which are initially strdup()ed and then free()ed in libxl_device_nic_destroy(). In the "network-attach" parser we need to free() the existing string and strdup((*argv) + N), rather than just copying the pointer.

Signed-off-by David Scott <[email protected]>

Acked-by Stefano Stabellini <[email protected]>

Acked-by Ian Campbell <[email protected]>

tools/libxl/xl_cmdimpl.c +8 -4

diff -r a65612bcbb92 -r 746e49e61dbc tools/libxl/xl_cmdimpl.c
@@ -4277,12 +4277,14 @@ int main_networkattach(int argc, char **
                 nic.mac[i] = val;
             }
         } else if (!strncmp("bridge=", *argv, 7)) {
-            nic.bridge = (*argv) + 7;
+            free(nic.bridge);
+            nic.bridge = strdup((*argv) + 7);
         } else if (!strncmp("ip=", *argv, 3)) {
             free(nic.ip);
             nic.ip = strdup((*argv) + 3);
         } else if (!strncmp("script=", *argv, 6)) {
-            nic.script = (*argv) + 6;
+            free(nic.script);
+            nic.script = strdup((*argv) + 6);
         } else if (!strncmp("backend=", *argv, 8)) {
             if(libxl_name_to_domid(&ctx, ((*argv) + 8), &val)) {
                 fprintf(stderr, "Specified backend domain does not exist, defaulting to Dom0\n");

@@ -4290,9 +4292,11 @@ int main_networkattach(int argc, char **
             }
             nic.backend_domid = val;
         } else if (!strncmp("vifname=", *argv, 8)) {
-            nic.ifname = (*argv) + 8;
+            free(nic.ifname);
+            nic.ifname = strdup((*argv) + 8);
         } else if (!strncmp("model=", *argv, 6)) {
-            nic.model = (*argv) + 6;
+            free(nic.model);
+            nic.model = strdup((*argv) + 6);
         } else if (!strncmp("rate=", *argv, 5)) {
         } else if (!strncmp("accel=", *argv, 6)) {
         } else {

David Scott

author

2011-03-30 18:05 UTC #3 lore raw

PATCH 1/1 tools: ocaml: rename the device_nic types and functions