[Xen-changelog] [xen-unstable] tools: libxl: do not specify protocol node for disk or net

[Xen patchbot-unstable <patchbot@xxxxxxx>]

# HG changeset patch
# User Ian Campbell <ian.campbell@xxxxxxxxxx>
# Date 1303315987 -3600
# Node ID e720a880279810bb1bc815d43308a8a3c2290335
# Parent  faa31730d1c3fee5184fd26a664269737883c976
tools: libxl: do not specify protocol node for disk or net

This node is written by the front/backends as part of their negotiation about
how to speak to each other. The toolstack has no part in this and it certainly
shouldn't be hardcoding the 32 bit protocol!

Signed-off-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
Acked-by: Ian Jackson <ian.jackson.citrix.com>
Committed-by: Ian Jackson <ian.jackson.citrix.com>
---


diff -r faa31730d1c3 -r e720a8802798 tools/libxl/libxl.c
--- a/tools/libxl/libxl.c       Wed Apr 20 17:13:07 2011 +0100
+++ b/tools/libxl/libxl.c       Wed Apr 20 17:13:07 2011 +0100
@@ -1060,11 +1060,6 @@
     flexarray_append(front, "device-type");
     flexarray_append(front, disk->is_cdrom ? "cdrom" : "disk");
 
-    if (0 /* protocol != native*/) {
-        flexarray_append(front, "protocol");
-        flexarray_append(front, "x86_32-abi"); /* hardcoded ! */
-    }
-
     libxl__device_generic_add(&gc, &device,
                              libxl__xs_kvs_of_flexarray(&gc, back, 
back->count),
                              libxl__xs_kvs_of_flexarray(&gc, front, 
front->count));
@@ -1304,11 +1299,6 @@
     flexarray_append(front, libxl__sprintf(&gc, 
"%02x:%02x:%02x:%02x:%02x:%02x",
                                                   nic->mac[0], nic->mac[1], 
nic->mac[2],
                                                   nic->mac[3], nic->mac[4], 
nic->mac[5]));
-    if (0 /* protocol != native*/) {
-        flexarray_append(front, "protocol");
-        flexarray_append(front, "x86_32-abi"); /* hardcoded ! */
-    }
-
     libxl__device_generic_add(&gc, &device,
                              libxl__xs_kvs_of_flexarray(&gc, back, 
back->count),
                              libxl__xs_kvs_of_flexarray(&gc, front, 
front->count));

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog