[Xen-devel] [PATCH] linux: properly qualify all static 'struct xenbus_device_id' instances

["Jan Beulich" <jbeulich@xxxxxxxxxx>]

include/xen/xenbus.h nicely declares struct xenbus_driver's 'ids'
member as pointer to const...

As usual, written and tested on 2.6.25-rc3 and made apply to the 2.6.18
tree without further testing.

Signed-off-by: Jan Beulich <jbeulich@xxxxxxxxxx>

Index: head-2008-02-26/drivers/xen/blkback/xenbus.c
===================================================================
--- head-2008-02-26.orig/drivers/xen/blkback/xenbus.c   2008-03-05 
16:30:44.000000000 +0100
+++ head-2008-02-26/drivers/xen/blkback/xenbus.c        2008-03-05 
08:58:34.000000000 +0100
@@ -518,7 +518,7 @@ static int connect_ring(struct backend_i
 /* ** Driver Registration ** */
 
 
-static struct xenbus_device_id blkback_ids[] = {
+static const struct xenbus_device_id blkback_ids[] = {
        { "vbd" },
        { "" }
 };
Index: head-2008-02-26/drivers/xen/blkfront/blkfront.c
===================================================================
--- head-2008-02-26.orig/drivers/xen/blkfront/blkfront.c        2008-03-05 
16:30:44.000000000 +0100
+++ head-2008-02-26/drivers/xen/blkfront/blkfront.c     2008-03-05 
08:58:00.000000000 +0100
@@ -879,7 +879,7 @@ int blkfront_is_ready(struct xenbus_devi
 /* ** Driver Registration ** */
 
 
-static struct xenbus_device_id blkfront_ids[] = {
+static const struct xenbus_device_id blkfront_ids[] = {
        { "vbd" },
        { "" }
 };
Index: head-2008-02-26/drivers/xen/blktap/xenbus.c
===================================================================
--- head-2008-02-26.orig/drivers/xen/blktap/xenbus.c    2008-03-05 
16:30:44.000000000 +0100
+++ head-2008-02-26/drivers/xen/blktap/xenbus.c 2008-03-05 08:58:22.000000000 
+0100
@@ -463,7 +463,7 @@ static int connect_ring(struct backend_i
 /* ** Driver Registration ** */
 
 
-static struct xenbus_device_id blktap_ids[] = {
+static const struct xenbus_device_id blktap_ids[] = {
        { "tap" },
        { "" }
 };
Index: head-2008-02-26/drivers/xen/fbfront/xenfb.c
===================================================================
--- head-2008-02-26.orig/drivers/xen/fbfront/xenfb.c    2008-03-05 
16:30:44.000000000 +0100
+++ head-2008-02-26/drivers/xen/fbfront/xenfb.c 2008-03-05 08:57:41.000000000 
+0100
@@ -721,7 +721,7 @@ static void xenfb_backend_changed(struct
        }
 }
 
-static struct xenbus_device_id xenfb_ids[] = {
+static const struct xenbus_device_id xenfb_ids[] = {
        { "vfb" },
        { "" }
 };
Index: head-2008-02-26/drivers/xen/fbfront/xenkbd.c
===================================================================
--- head-2008-02-26.orig/drivers/xen/fbfront/xenkbd.c   2008-03-05 
16:30:44.000000000 +0100
+++ head-2008-02-26/drivers/xen/fbfront/xenkbd.c        2008-03-05 
08:57:46.000000000 +0100
@@ -305,7 +305,7 @@ static void xenkbd_backend_changed(struc
        }
 }
 
-static struct xenbus_device_id xenkbd_ids[] = {
+static const struct xenbus_device_id xenkbd_ids[] = {
        { "vkbd" },
        { "" }
 };
Index: head-2008-02-26/drivers/xen/netback/xenbus.c
===================================================================
--- head-2008-02-26.orig/drivers/xen/netback/xenbus.c   2008-03-05 
16:30:44.000000000 +0100
+++ head-2008-02-26/drivers/xen/netback/xenbus.c        2008-03-05 
08:58:49.000000000 +0100
@@ -423,7 +423,7 @@ static int connect_rings(struct backend_
 /* ** Driver Registration ** */
 
 
-static struct xenbus_device_id netback_ids[] = {
+static const struct xenbus_device_id netback_ids[] = {
        { "vif" },
        { "" }
 };
Index: head-2008-02-26/drivers/xen/netfront/netfront.c
===================================================================
--- head-2008-02-26.orig/drivers/xen/netfront/netfront.c        2008-03-05 
16:29:27.000000000 +0100
+++ head-2008-02-26/drivers/xen/netfront/netfront.c     2008-03-05 
16:30:59.000000000 +0100
@@ -2142,7 +2142,7 @@ static void end_access(int ref, void *pa
 /* ** Driver registration ** */
 
 
-static struct xenbus_device_id netfront_ids[] = {
+static const struct xenbus_device_id netfront_ids[] = {
        { "vif" },
        { "" }
 };
Index: head-2008-02-26/drivers/xen/pciback/xenbus.c
===================================================================
--- head-2008-02-26.orig/drivers/xen/pciback/xenbus.c   2008-03-05 
16:30:44.000000000 +0100
+++ head-2008-02-26/drivers/xen/pciback/xenbus.c        2008-03-05 
08:59:30.000000000 +0100
@@ -651,7 +651,7 @@ static int pciback_xenbus_remove(struct 
        return 0;
 }
 
-static struct xenbus_device_id xenpci_ids[] = {
+static const struct xenbus_device_id xenpci_ids[] = {
        {"pci"},
        {{0}},
 };
Index: head-2008-02-26/drivers/xen/pcifront/xenbus.c
===================================================================
--- head-2008-02-26.orig/drivers/xen/pcifront/xenbus.c  2008-03-05 
16:30:44.000000000 +0100
+++ head-2008-02-26/drivers/xen/pcifront/xenbus.c       2008-03-05 
08:59:36.000000000 +0100
@@ -423,7 +423,7 @@ static int pcifront_xenbus_remove(struct
        return 0;
 }
 
-static struct xenbus_device_id xenpci_ids[] = {
+static const struct xenbus_device_id xenpci_ids[] = {
        {"pci"},
        {{0}},
 };
Index: head-2008-02-26/drivers/xen/tpmback/xenbus.c
===================================================================
--- head-2008-02-26.orig/drivers/xen/tpmback/xenbus.c   2008-03-05 
16:30:44.000000000 +0100
+++ head-2008-02-26/drivers/xen/tpmback/xenbus.c        2008-03-05 
08:59:55.000000000 +0100
@@ -262,7 +262,7 @@ static int connect_ring(struct backend_i
 }
 
 
-static struct xenbus_device_id tpmback_ids[] = {
+static const struct xenbus_device_id tpmback_ids[] = {
        { "vtpm" },
        { "" }
 };



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