From: "Jan Beulich" <jbeulich@novell.com>
Subject: [PATCH] linux: properly qualify all static 'struct
	xenbus_device_id' instances
Date: Wed, 05 Mar 2008 16:13:23 +0000
Message-ID: <47CED4B3.76E4.0078.0@novell.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable
Return-path: <xen-devel-bounces@lists.xensource.com>
Content-Disposition: inline
List-Unsubscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xensource.com?subject=unsubscribe>
List-Post: <mailto:xen-devel@lists.xensource.com>
List-Help: <mailto:xen-devel-request@lists.xensource.com?subject=help>
List-Subscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xensource.com?subject=subscribe>
Sender: xen-devel-bounces@lists.xensource.com
Errors-To: xen-devel-bounces@lists.xensource.com
To: xen-devel@lists.xensource.com
List-Id: xen-devel@lists.xenproject.org

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@novell.com>

Index: head-2008-02-26/drivers/xen/blkback/xenbus.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- 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 ** */
=20
=20
-static struct xenbus_device_id blkback_ids[] =3D {
+static const struct xenbus_device_id blkback_ids[] =3D {
 	{ "vbd" },
 	{ "" }
 };
Index: head-2008-02-26/drivers/xen/blkfront/blkfront.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- 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 ** */
=20
=20
-static struct xenbus_device_id blkfront_ids[] =3D {
+static const struct xenbus_device_id blkfront_ids[] =3D {
 	{ "vbd" },
 	{ "" }
 };
Index: head-2008-02-26/drivers/xen/blktap/xenbus.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- 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.0000000=
00 +0100
@@ -463,7 +463,7 @@ static int connect_ring(struct backend_i
 /* ** Driver Registration ** */
=20
=20
-static struct xenbus_device_id blktap_ids[] =3D {
+static const struct xenbus_device_id blktap_ids[] =3D {
 	{ "tap" },
 	{ "" }
 };
Index: head-2008-02-26/drivers/xen/fbfront/xenfb.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- 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.0000000=
00 +0100
@@ -721,7 +721,7 @@ static void xenfb_backend_changed(struct
 	}
 }
=20
-static struct xenbus_device_id xenfb_ids[] =3D {
+static const struct xenbus_device_id xenfb_ids[] =3D {
 	{ "vfb" },
 	{ "" }
 };
Index: head-2008-02-26/drivers/xen/fbfront/xenkbd.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- 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
 	}
 }
=20
-static struct xenbus_device_id xenkbd_ids[] =3D {
+static const struct xenbus_device_id xenkbd_ids[] =3D {
 	{ "vkbd" },
 	{ "" }
 };
Index: head-2008-02-26/drivers/xen/netback/xenbus.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- 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 ** */
=20
=20
-static struct xenbus_device_id netback_ids[] =3D {
+static const struct xenbus_device_id netback_ids[] =3D {
 	{ "vif" },
 	{ "" }
 };
Index: head-2008-02-26/drivers/xen/netfront/netfront.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- 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 ** */
=20
=20
-static struct xenbus_device_id netfront_ids[] =3D {
+static const struct xenbus_device_id netfront_ids[] =3D {
 	{ "vif" },
 	{ "" }
 };
Index: head-2008-02-26/drivers/xen/pciback/xenbus.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- 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=20
 	return 0;
 }
=20
-static struct xenbus_device_id xenpci_ids[] =3D {
+static const struct xenbus_device_id xenpci_ids[] =3D {
 	{"pci"},
 	{{0}},
 };
Index: head-2008-02-26/drivers/xen/pcifront/xenbus.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- 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;
 }
=20
-static struct xenbus_device_id xenpci_ids[] =3D {
+static const struct xenbus_device_id xenpci_ids[] =3D {
 	{"pci"},
 	{{0}},
 };
Index: head-2008-02-26/drivers/xen/tpmback/xenbus.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- 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
 }
=20
=20
-static struct xenbus_device_id tpmback_ids[] =3D {
+static const struct xenbus_device_id tpmback_ids[] =3D {
 	{ "vtpm" },
 	{ "" }
 };