[PATCH] xl: fix strtok() call in vif2 parsing

[Andre Przywara <andre.przywara@amd.com>]

[-- Attachment #1: Type: text/plain, Size: 356 bytes --]

Hi,

according to the manpage subsequent calls to strtok() must use
NULL in the string parameter to keep the iteration going.
Fix fixes a hang when parsing the vif2 parameter.

Regards,
Andre.

Signed-off-by: Andre Przywara <andre.przywara@amd.com>

-- 
Andre Przywara
AMD-Operating System Research Center (OSRC), Dresden, Germany
Tel: +49 351 448-3567-12

[-- Attachment #2: xl-fix-strtok-call-in-vif2-parsing.patch --]
[-- Type: text/x-patch, Size: 1043 bytes --]

>From 1abc666eb715b06c829491626e246fa8b9c8e6e9 Mon Sep 17 00:00:00 2001
From: Andre Przywara <andre.przywara@amd.com>
Date: Fri, 20 Aug 2010 09:55:43 +0200
Subject: [PATCH 2/4] xl: fix strtok() call in vif2 parsing

According to the manpage subsequent calls to strtok() must use
NULL in the string parameter to keep the iteration going.
Fix fixes a hang when parsing the vif2 parameter.

Signed-off-by: Andre Przywara <andre.przywara@amd.com>
---
 tools/libxl/xl_cmdimpl.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c
index 323dd04..c291879 100644
--- a/tools/libxl/xl_cmdimpl.c
+++ b/tools/libxl/xl_cmdimpl.c
@@ -859,7 +859,7 @@ skip:
 
             init_net2_info(net2, d_config->num_vif2s);
 
-            for (p = strtok(buf2, ","); p; p = strtok(buf2, ",")) {
+            for (p = strtok(buf2, ","); p; p = strtok(NULL, ",")) {
                 while (isblank(*p))
                     p++;
                 if (!strncmp("front_mac=", p, 10)) {
-- 
1.6.4


[-- Attachment #3: Type: text/plain, Size: 138 bytes --]

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