WARNING - OLD ARCHIVES

This is an archived copy of the Xen.org mailing list, which we have preserved to ensure that existing links to archives are not broken. The live archive, which contains the latest emails, can be found at http://lists.xen.org/
   
 
 
Xen 
 
Home Products Support Community News
 
   
 

xen-changelog

[Xen-changelog] Remove support for xenbus driver subtypes since with the

To: xen-changelog@xxxxxxxxxxxxxxxxxxx
Subject: [Xen-changelog] Remove support for xenbus driver subtypes since with the subtype field there's no fallback.
From: Xen patchbot -unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>
Date: Thu, 18 Aug 2005 15:50:10 -0400
Delivery-date: Thu, 18 Aug 2005 19:50:41 +0000
Envelope-to: www-data@xxxxxxxxxxxxxxxxxxx
List-help: <mailto:xen-changelog-request@lists.xensource.com?subject=help>
List-id: BK change log <xen-changelog.lists.xensource.com>
List-post: <mailto:xen-changelog@lists.xensource.com>
List-subscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-changelog>, <mailto:xen-changelog-request@lists.xensource.com?subject=subscribe>
List-unsubscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-changelog>, <mailto:xen-changelog-request@lists.xensource.com?subject=unsubscribe>
Reply-to: xen-devel@xxxxxxxxxxxxxxxxxxx
Sender: xen-changelog-bounces@xxxxxxxxxxxxxxxxxxx
# HG changeset patch
# User cl349@xxxxxxxxxxxxxxxxxxxx
# Node ID dfbeb7da829f48128738b35efece3f9b0253facc
# Parent  5a97aa8698d925b2efc047c805cab9c892168271
Remove support for xenbus driver subtypes since with the subtype field there's 
no fallback.
Signed-off-by: Christian Limpach <Christian.Limpach@xxxxxxxxxxxx>

diff -r 5a97aa8698d9 -r dfbeb7da829f 
linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_probe.c
--- a/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_probe.c    Thu Aug 18 
19:24:42 2005
+++ b/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_probe.c    Thu Aug 18 
19:51:46 2005
@@ -48,8 +48,7 @@
 match_device(const struct xenbus_device_id *arr, struct xenbus_device *dev)
 {
        for (; !streq(arr->devicetype, ""); arr++) {
-               if (streq(arr->devicetype, dev->devicetype) &&
-                   streq(arr->subtype, dev->subtype ?: ""))
+               if (streq(arr->devicetype, dev->devicetype))
                        return arr;
        }
        return NULL;
@@ -284,8 +283,6 @@
        if (dev) {
                struct xenbus_device *xendev = to_xenbus_device(dev);
 
-               if (xendev->subtype)
-                       kfree(xendev->subtype);
                kfree(xendev);
        }
 }
@@ -330,11 +327,6 @@
        strcpy(xendev->nodename, nodename);
        xendev->devicetype = xendev->nodename + strlen(xendev->nodename) + 1;
        strcpy(xendev->devicetype, type);
-
-       /* This might not exist, but that's OK. */
-       xendev->subtype = xenbus_read(xendev->nodename, "subtype", NULL);
-       if (IS_ERR(xendev->subtype))
-               xendev->subtype = NULL;
 
        xendev->dev.parent = &bus->dev;
        xendev->dev.bus = &bus->bus;
diff -r 5a97aa8698d9 -r dfbeb7da829f 
linux-2.6-xen-sparse/include/asm-xen/xenbus.h
--- a/linux-2.6-xen-sparse/include/asm-xen/xenbus.h     Thu Aug 18 19:24:42 2005
+++ b/linux-2.6-xen-sparse/include/asm-xen/xenbus.h     Thu Aug 18 19:51:46 2005
@@ -37,7 +37,6 @@
 /* A xenbus device. */
 struct xenbus_device {
        char *devicetype;
-       char *subtype;
        char *nodename;
        struct device dev;
        int has_error;
@@ -53,7 +52,6 @@
 {
        /* .../device/<device_type>/<identifier> */
        char devicetype[32];    /* General class of device. */
-       char subtype[32];       /* Contents of "subtype" for this device */
 };
 
 /* A xenbus driver. */

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

<Prev in Thread] Current Thread [Next in Thread>
  • [Xen-changelog] Remove support for xenbus driver subtypes since with the subtype field there's no fallback., Xen patchbot -unstable <=