Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 28 Nov 2023 13:38:39 GMT
From:      Roger Pau =?utf-8?Q?Monn=C3=A9?= <royger@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org
Subject:   git: 3e5e0e2f1678 - main - xen/dev: switch to DEVMETHOD_END
Message-ID:  <202311281338.3ASDcdkB025523@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by royger:

URL: https://cgit.FreeBSD.org/src/commit/?id=3e5e0e2f16785210d796ea6ece4b69d35a03fe47

commit 3e5e0e2f16785210d796ea6ece4b69d35a03fe47
Author:     Elliott Mitchell <ehem+freebsd@m5p.com>
AuthorDate: 2023-09-11 21:37:20 +0000
Commit:     Roger Pau Monné <royger@FreeBSD.org>
CommitDate: 2023-11-28 12:31:47 +0000

    xen/dev: switch to DEVMETHOD_END
    
    Switch to the preferred end of the device method table.  These hadn't
    been updated previously.
    
    Reviewed by: royger
---
 sys/dev/xen/blkback/blkback.c   | 3 ++-
 sys/dev/xen/blkfront/blkfront.c | 2 +-
 sys/dev/xen/netback/netback.c   | 3 ++-
 sys/dev/xen/xenpci/xenpci.c     | 3 ++-
 sys/xen/xenbus/xenbusb_back.c   | 3 ++-
 sys/xen/xenbus/xenbusb_front.c  | 3 ++-
 6 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/sys/dev/xen/blkback/blkback.c b/sys/dev/xen/blkback/blkback.c
index 43d2134ca5b3..3717264256f3 100644
--- a/sys/dev/xen/blkback/blkback.c
+++ b/sys/dev/xen/blkback/blkback.c
@@ -3777,7 +3777,8 @@ static device_method_t xbb_methods[] = {
 
 	/* Xenbus interface */
 	DEVMETHOD(xenbus_otherend_changed, xbb_frontend_changed),
-	{ 0, 0 }
+
+	DEVMETHOD_END
 };
 
 static driver_t xbb_driver = {
diff --git a/sys/dev/xen/blkfront/blkfront.c b/sys/dev/xen/blkfront/blkfront.c
index f1014d4e2a24..2c5862232b41 100644
--- a/sys/dev/xen/blkfront/blkfront.c
+++ b/sys/dev/xen/blkfront/blkfront.c
@@ -1633,7 +1633,7 @@ static device_method_t xbd_methods[] = {
 	/* Xenbus interface */
 	DEVMETHOD(xenbus_otherend_changed, xbd_backend_changed),
 
-	{ 0, 0 } 
+	DEVMETHOD_END
 }; 
 
 static driver_t xbd_driver = { 
diff --git a/sys/dev/xen/netback/netback.c b/sys/dev/xen/netback/netback.c
index 85e181e005f1..1d0795959efb 100644
--- a/sys/dev/xen/netback/netback.c
+++ b/sys/dev/xen/netback/netback.c
@@ -2485,7 +2485,8 @@ static device_method_t xnb_methods[] = {
 
 	/* Xenbus interface */
 	DEVMETHOD(xenbus_otherend_changed, xnb_frontend_changed),
-	{ 0, 0 }
+
+	DEVMETHOD_END
 };
 
 static driver_t xnb_driver = {
diff --git a/sys/dev/xen/xenpci/xenpci.c b/sys/dev/xen/xenpci/xenpci.c
index ecf50e6a5d3d..b7a810bf9e15 100644
--- a/sys/dev/xen/xenpci/xenpci.c
+++ b/sys/dev/xen/xenpci/xenpci.c
@@ -212,7 +212,8 @@ static device_method_t xenpci_methods[] = {
 	DEVMETHOD(device_attach,	xenpci_attach),
 	DEVMETHOD(device_detach,	xenpci_detach),
 	DEVMETHOD(device_resume,	xenpci_resume),
-	{ 0, 0 }
+
+	DEVMETHOD_END
 };
 
 static driver_t xenpci_driver = {
diff --git a/sys/xen/xenbus/xenbusb_back.c b/sys/xen/xenbus/xenbusb_back.c
index fad2da5d6fd8..7b0d7bd0c0a8 100644
--- a/sys/xen/xenbus/xenbusb_back.c
+++ b/sys/xen/xenbus/xenbusb_back.c
@@ -305,7 +305,8 @@ static device_method_t xenbusb_back_methods[] = {
 	DEVMETHOD(xenbusb_get_otherend_node, xenbusb_back_get_otherend_node),
 	DEVMETHOD(xenbusb_otherend_changed, xenbusb_back_otherend_changed),
 	DEVMETHOD(xenbusb_localend_changed, xenbusb_back_localend_changed),
-	{ 0, 0 } 
+
+	DEVMETHOD_END
 }; 
 
 DEFINE_CLASS_0(xenbusb_back, xenbusb_back_driver, xenbusb_back_methods,
diff --git a/sys/xen/xenbus/xenbusb_front.c b/sys/xen/xenbus/xenbusb_front.c
index 5007c4509e4e..393d9ff87f25 100644
--- a/sys/xen/xenbus/xenbusb_front.c
+++ b/sys/xen/xenbus/xenbusb_front.c
@@ -182,7 +182,8 @@ static device_method_t xenbusb_front_methods[] = {
 	/* XenBus Bus Interface */
 	DEVMETHOD(xenbusb_enumerate_type, xenbusb_front_enumerate_type),
 	DEVMETHOD(xenbusb_get_otherend_node, xenbusb_front_get_otherend_node),
-	{ 0, 0 } 
+
+	DEVMETHOD_END
 }; 
 
 DEFINE_CLASS_0(xenbusb_front, xenbusb_front_driver, xenbusb_front_methods,



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202311281338.3ASDcdkB025523>