From: Ian Campbell Date: Wed, 20 Apr 2011 16:13:07 +0000 (+0100) Subject: tools: libxl: do not specify protocol node for disk or net X-Git-Tag: 4.2.0-rc1~2321 X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=e83db33a95b0c032b44fbc4e61936981a0ac1c41;p=xen.git 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 Acked-by: Ian Jackson Committed-by: Ian Jackson --- diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 96041e73ba..0146a966e2 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -1060,11 +1060,6 @@ int libxl_device_disk_add(libxl_ctx *ctx, uint32_t domid, libxl_device_disk *dis 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, uint32_t domid, libxl_device_nic *nic) 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));