commit 96b88cc3862b9505b2569883d235a76f6b8ea605
Author: Gianluca Cannata <gcannata23@gmail.com>
Date:   Wed Oct 28 08:34:52 2026 +0100

    rumpdisk: Drop hardcoded MAX_DISK_DEV macro

diff --git a/rumpdisk/block-rump.c b/rumpdisk/block-rump.c
index aa4a387ff..262892e5e 100644
--- a/rumpdisk/block-rump.c
+++ b/rumpdisk/block-rump.c
@@ -47,7 +47,10 @@
 #define BLKRRPART  0x125F     /* re-read partition table */
 
 #define DISK_NAME_LEN 32
-#define MAX_DISK_DEV 2
+
+#ifndef countof
+#define countof(arr) (sizeof (arr) / sizeof ((arr)[0]))
+#endif
 
 #ifdef _RUMP_SATA
 #define RUMP_TYPE_STRING "rump SATA/IDE"
@@ -122,7 +125,7 @@ static boolean_t
 is_disk_device (const char *name)
 {
   const char *dev;
-  const char *allowed_devs[MAX_DISK_DEV] = {
+  const char *allowed_devs[] = {
 #ifdef _RUMP_SATA
     "wd",
 #else
@@ -132,7 +135,7 @@ is_disk_device (const char *name)
   };
   uint8_t i;
 
-  for (i = 0; i < MAX_DISK_DEV; i++)
+  for (i = 0; i < countof(allowed_devs); i++)
     {
       dev = allowed_devs[i];
       /* /dev/XXN but we only care about /dev/XX prefix */
commit 496635ce7138f112b46a6c52b4ebc171b69790dc
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date:   Wed Oct 28 23:51:03 2026 +0100

    Use standard countof when available

diff --git a/rumpdisk/block-rump.c b/rumpdisk/block-rump.c
index 262892e5e..9e41dc73e 100644
--- a/rumpdisk/block-rump.c
+++ b/rumpdisk/block-rump.c
@@ -25,6 +25,10 @@
 #include <unistd.h>
 #include <sys/mman.h>
 
+#if __has_include(<stdcountof.h>)
+#include <stdcountof.h>
+#endif
+
 #include <mach.h>
 #include <mach/gnumach.h>
 #include <mach/port.h>
@@ -48,7 +52,7 @@
 
 #define DISK_NAME_LEN 32
 
-#ifndef countof
+#if !__has_include(<stdcountof.h>)
 #define countof(arr) (sizeof (arr) / sizeof ((arr)[0]))
 #endif
 
