[Xen-changelog] [linux-2.6.18-xen] Revert 341:424f7b772301d501af6952507b2731e4b8c6da0a

["Xen patchbot-linux-2.6.18-xen" <patchbot-linux-2.6.18-xen@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1196987920 0
# Node ID 69d413abd6c067d688c693004f46f79d1169f0ce
# Parent  3938ff4b3fc2e84518719bea706a412983155a2a
Revert 341:424f7b772301d501af6952507b2731e4b8c6da0a
xenbus uevent environment handling code is very much alive.
---
 drivers/xen/netback/xenbus.c              |    2 ++
 drivers/xen/xenbus/xenbus_probe_backend.c |    7 +++++++
 2 files changed, 9 insertions(+)

diff -r 3938ff4b3fc2 -r 69d413abd6c0 drivers/xen/netback/xenbus.c
--- a/drivers/xen/netback/xenbus.c      Thu Dec 06 16:02:51 2007 +0000
+++ b/drivers/xen/netback/xenbus.c      Fri Dec 07 00:38:40 2007 +0000
@@ -173,6 +173,8 @@ static int netback_uevent(struct xenbus_
        add_uevent_var(envp, num_envp, &i, buffer, buffer_size, &length,
                       "vif=%s", netif->dev->name);
 
+       envp[i] = NULL;
+
        return 0;
 }
 
diff -r 3938ff4b3fc2 -r 69d413abd6c0 drivers/xen/xenbus/xenbus_probe_backend.c
--- a/drivers/xen/xenbus/xenbus_probe_backend.c Thu Dec 06 16:02:51 2007 +0000
+++ b/drivers/xen/xenbus/xenbus_probe_backend.c Fri Dec 07 00:38:40 2007 +0000
@@ -156,6 +156,13 @@ static int xenbus_uevent_backend(struct 
        add_uevent_var(envp, num_envp, &i, buffer, buffer_size, &length,
                       "XENBUS_BASE_PATH=%s", xenbus_backend.root);
 
+       /* terminate, set to next free slot, shrink available space */
+       envp[i] = NULL;
+       envp = &envp[i];
+       num_envp -= i;
+       buffer = &buffer[length];
+       buffer_size -= length;
+
        if (dev->driver) {
                drv = to_xenbus_driver(dev->driver);
                if (drv && drv->uevent)

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