Mailing List Archive

[PATCH 12 of 32] tools: libxl: do not specify protocol node for disk or net
# HG changeset patch
# User Ian Campbell <ian.campbell@citrix.com>
# Date 1303134071 -3600
# Node ID bc8a988a7d78afc2ab1a92effe6267e25308562c
# Parent 51e2379b91a72cfc1e218412100e873e1bc80045
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@citrix.com>

diff -r 51e2379b91a7 -r bc8a988a7d78 tools/libxl/libxl.c
--- a/tools/libxl/libxl.c Mon Apr 18 14:40:44 2011 +0100
+++ b/tools/libxl/libxl.c Mon Apr 18 14:41:11 2011 +0100
@@ -1060,11 +1060,6 @@ int libxl_device_disk_add(libxl_ctx *ctx
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 @@ int libxl_device_nic_add(libxl_ctx *ctx,
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-devel mailing list
Xen-devel@lists.xensource.com
http://lists.xensource.com/xen-devel
[PATCH 12 of 32] tools: libxl: do not specify protocol node for disk or net [ In reply to ]
# HG changeset patch
# User Ian Campbell <ian.campbell@citrix.com>
# Date 1303315987 -3600
# Node ID fe29a8881d30e5da198d191af2a79abf9fcb25bf
# Parent d1a40e34829e71efe8819eead493a2243806efe5
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@citrix.com>

diff -r d1a40e34829e -r fe29a8881d30 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 @@ int libxl_device_disk_add(libxl_ctx *ctx
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 @@ int libxl_device_nic_add(libxl_ctx *ctx,
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-devel mailing list
Xen-devel@lists.xensource.com
http://lists.xensource.com/xen-devel