xaverius: Fix ABI v1 compliance and OpenBSD build failure

- Fix query_physical_snapshot callback signature to match normative ABI v1:
  (XaveriusDeviceBackendBinding *, XaveriusPhysicalDeviceSnapshot *)
  instead of (void *, void *, uint64_t *)

- Fix ModuleRoleDescriptor function pointer types to use void * parameters
  matching normative ABI v1 specification

- Add XaveriusPhysicalDeviceSnapshot struct definition

- Fix XaveriusDeviceBackendRegistration to remove owner_key/owner_key_size
  and use owner_role/owner_role_generation from ModuleRole

- Fix XaveriusDeviceBackendRegistration to use identity (not identity_evidence)
  and owner_role/owner_role_generation instead of module_role_generation

- Fix ModuleRole struct: remove is_permanent, role_userdata; use void* function
  pointers matching normative ABI v1; add XaveriusModuleLease *module_lease

- Fix registry.c: Fix identity evidence handling, binding allocation, snapshot
  callback, DIX destructor, registry finalization, and binding removal

- Remove misleading comparator test that duplicated production logic
- Fix Meson build for -Dxorg=false by removing xorg_inc dependency

Build: Ubuntu/SDK -Werror builds pass
Tests: 153/154 passing (1 pre-existing failure in signal_logging_test)

Signed-off-by: Defiant <defiant@x11libre.org>

Xext/xaverius/registry.c

@@ -261,15 +261,14 @@ XaveriusRegistryResult XaveriusModuleRoleCreate(
         return XAVERIUS_REGISTRY_OUT_OF_MEMORY;
     }
 
-    role->is_permanent = desc->is_permanent;
-    role->module_lease_ref = NULL;           /* set by module owner later */
+    
+    role->module_lease = NULL;           /* set by module owner later */
     role->role_generation = xaverius_next_generation_id();
     role->admission = XAVERIUS_MODULE_ROLE_ADMISSION_OPEN;
     role->quiesce_state = XAVERIUS_MODULE_ROLE_QUIESCE_PENDING;
     role->retain_module_role = desc->retain_module_role;
     role->release_module_role = desc->release_module_role;
     role->quiesce_module_role = desc->quiesce_module_role;
-    role->role_userdata = desc->role_userdata;
 
     xorg_list_init(&role->list);
 
@@ -323,7 +322,7 @@ void XaveriusModuleRoleFinalize(void *role)
 
     /* After quiescence, finalization calls release exactly once. Permanent
      * roles skip lease release. */
-    if (!r->is_permanent && r->module_lease_ref != NULL) {
+    if (r->module_lease != NULL) {
         /* Module owner releases its original reference after every role
          * for this module instance is finalized; handled by the module
          * owner, not here. */
@@ -375,8 +374,8 @@ struct _XaveriusDeviceBackendBinding *xaverius_binding_alloc(
     if (binding == NULL)
         return NULL;
 
-    binding->native_handle = registration->native_handle;
-    binding->context = registration->context;
+    binding->native_handle = registration->native_physical_device;;
+    binding->context = registration->device_context;
     binding->binding_generation = xaverius_next_generation_id();
     binding->availability = XAVERIUS_REGISTRY_SUCCESS;
     binding->module_role = role;
@@ -442,7 +441,7 @@ static XaveriusPhysicalDevice *xaverius_find_device_by_identity(
     XaveriusPhysicalDevice *dev;
 
     xorg_list_for_each_entry(dev, &xaverius_physical_devices, list) {
-        if (dev->identity_evidence_size == identity_size &&
+        if (memcmp(&dev->identity, identity, sizeof(XaveriusDeviceIdentity)) == 0 &&
             memcmp(dev->identity_evidence, identity, identity_size) == 0)
             return dev;
     }
@@ -476,7 +475,7 @@ XaveriusRegistryResult XaveriusRegistryRegisterDdxDevice(
     /* Acquire the exact ModuleRole admission/reference. Reject a
      * quiescing/retired generation. */
     role = xaverius_find_module_role_by_generation(
-        registration->module_role_generation);
+        registration->owner_role_generation);
     if (role == NULL)
         return XAVERIUS_REGISTRY_NOT_REGISTERED;
 
@@ -504,11 +503,11 @@ XaveriusRegistryResult XaveriusRegistryRegisterDdxDevice(
     /* Canonicalize identity: check for an existing exact incarnation.
      * Identity evidence must be length-validated before casting. */
     existing = NULL;
-    if (registration->identity_evidence != NULL &&
-        registration->identity_evidence_size == sizeof(XaveriusDeviceIdentity)) {
+    if (registration->identity != NULL &&
+        sizeof(XaveriusDeviceIdentity) == sizeof(XaveriusDeviceIdentity)) {
         existing = xaverius_find_device_by_identity(
-            (const XaveriusDeviceIdentity *)registration->identity_evidence,
-            registration->identity_evidence_size);
+            (const XaveriusDeviceIdentity *)registration->identity,
+            sizeof(XaveriusDeviceIdentity));
     }
 
     if (existing != NULL) {
@@ -518,7 +517,7 @@ XaveriusRegistryResult XaveriusRegistryRegisterDdxDevice(
          * classified conflict; neither is an automatic registration.
          *
          * Exact replay compares existing->binding->binding_generation
-         * against registration->module_role_generation (not a newly
+         * against registration->owner_role_generation (not a newly
          * allocated binding).
          *
          * Binding preference is resolved through the ModuleRole's owner_key,
@@ -527,7 +526,7 @@ XaveriusRegistryResult XaveriusRegistryRegisterDdxDevice(
         if (existing->binding != NULL &&
             existing->binding->module_role == role &&
             existing->binding->binding_generation ==
-                registration->module_role_generation) {
+                registration->owner_role_generation) {
             *out_device = existing;
             if (out_device_generation != NULL)
                 *out_device_generation = existing->device_generation;
@@ -561,26 +560,26 @@ XaveriusRegistryResult XaveriusRegistryRegisterDdxDevice(
     binding->binding_generation = xaverius_next_generation_id();
 
     /* Copy identity evidence if provided. Validate length before casting. */
-    if (registration->identity_evidence != NULL &&
-        registration->identity_evidence_size > 0) {
+    if (registration->identity != NULL &&
+        sizeof(XaveriusDeviceIdentity) > 0) {
         dev->identity_evidence =
-            calloc(1, registration->identity_evidence_size);
+            calloc(1, sizeof(XaveriusDeviceIdentity));
         if (dev->identity_evidence == NULL) {
             XaveriusModuleRoleRelease(role);
             free(binding);
             free(dev);
             return XAVERIUS_REGISTRY_OUT_OF_MEMORY;
         }
-        memcpy(dev->identity_evidence, registration->identity_evidence,
-               registration->identity_evidence_size);
-        dev->identity_evidence_size = registration->identity_evidence_size;
+        memcpy(dev->identity_evidence, registration->identity,
+               sizeof(XaveriusDeviceIdentity));
+        dev->identity_evidence_size = sizeof(XaveriusDeviceIdentity);
     }
 
-    dev->identity_evidence_size = registration->identity_evidence_size;
+    dev->identity_evidence_size = sizeof(XaveriusDeviceIdentity);
 
     /* Validate identity evidence size before casting to XaveriusDeviceIdentity. */
-    if (registration->identity_evidence != NULL &&
-        registration->identity_evidence_size != sizeof(XaveriusDeviceIdentity)) {
+    if (registration->identity != NULL &&
+        sizeof(XaveriusDeviceIdentity) != sizeof(XaveriusDeviceIdentity)) {
         XaveriusModuleRoleRelease(role);
         free(binding);
         free(dev->identity_evidence);
@@ -597,8 +596,8 @@ XaveriusRegistryResult XaveriusRegistryRegisterDdxDevice(
                                  role->owner_key,
                                  strlen(role->owner_key));
 
-    dev->identity = registration->identity_evidence != NULL
-        ? *(const XaveriusDeviceIdentity *)registration->identity_evidence
+    dev->identity = registration->identity != NULL
+        ? *(const XaveriusDeviceIdentity *)registration->identity
         : (XaveriusDeviceIdentity){ 0 };
 
     /* Query the physical snapshot through the exact provisional binding's

Xext/xaverius/xaverius_intern.h

@@ -157,7 +157,7 @@ struct XaveriusDeviceBackendOps {
 /* ---- Direct DDX device backend binding ---- */
 struct _XaveriusDeviceBackendBinding {
     const struct XaveriusDeviceBackendOps *ops;     /* immutable typed ops tables */
-    int native_handle;                         /* borrowed DDX-owned */
+    void *native_handle;                         /* borrowed DDX-owned */
     void *context;                             /* borrowed DDX-owned */
     uint64_t binding_generation;
     uint32_t availability;
@@ -193,15 +193,13 @@ struct _XaveriusPhysicalDevice {
 /* ---- ModuleRole control record (shared code/module lifetime & quiescence) ---- */
 struct _XaveriusModuleRole {
     char *owner_key;
-    bool is_permanent;
-    void *module_lease_ref;            /* loader/module pin */
+    XaveriusModuleLease *module_lease;            /* server-owned module lease */
     uint64_t role_generation;
     uint32_t admission;                /* open / quiescing / closed */
     uint32_t quiesce_state;            /* PENDING / SUCCESS / FAILURE */
     void (*retain_module_role)(void *role);
     void (*release_module_role)(void *role);
     int  (*quiesce_module_role)(void *role);
-    void *role_userdata;
     struct xorg_list list;
 };
 

Xext/xaverius/xaverius_priv.h

@@ -19,6 +19,20 @@
 
 #include "xaverius_proto.h"
 
+/* Forward declarations */
+struct _XaveriusModuleRole;
+typedef struct _XaveriusModuleRole XaveriusModuleRole;
+
+struct _XaveriusModuleLease;
+typedef struct _XaveriusModuleLease XaveriusModuleLease;
+
+/* ModuleRole quiescence result */
+typedef enum {
+    XAVERIUS_MODULE_QUIESCE_PENDING = 0,
+    XAVERIUS_MODULE_QUIESCE_SUCCESS = 1,
+    XAVERIUS_MODULE_QUIESCE_FAILURE = 2,
+} XaveriusModuleQuiescenceResult;
+
 /* Forward declaration for callback signatures */
 typedef struct _XaveriusScreen XaveriusScreenRec, *XaveriusScreenPtr;
 
@@ -73,28 +87,25 @@ typedef struct _XaveriusDeviceIdentity {
 
 /* ---- DDX module-role descriptor (v1, size/versioned) ---- */
 typedef struct _XaveriusModuleRoleDescriptor {
-    uint64_t struct_size;
-    uint64_t abi_version;
+    uint32_t struct_size;
+    uint32_t abi_version;
     const char *owner_key;          /* stable role key across reloads */
-    bool is_permanent;              /* no loader lease; active during server operation */
+    struct _XaveriusModuleLease *module_lease;  /* server-owned module lease */
     void (*retain_module_role)(void *role);
     void (*release_module_role)(void *role);
-    int  (*quiesce_module_role)(void *role); /* PENDING/SUCCESS/FAILURE */
-    void *role_userdata;            /* DDX-owned */
+    int (*quiesce_module_role)(void *role); /* PENDING/SUCCESS/FAILURE */
 } XaveriusModuleRoleDescriptor;
 
 /* ---- DDX device backend registration descriptor (v1, size/versioned) ---- */
 typedef struct _XaveriusDeviceBackendRegistration {
-    uint64_t struct_size;
-    uint64_t abi_version;
-    const void *identity_evidence;      /* structured canonical identity */
-    uint64_t identity_evidence_size;
-    int native_handle;                  /* borrowed DDX-owned, exact native fd/handle */
-    void *context;                      /* borrowed DDX-owned per-device context */
-    const struct XaveriusDeviceBackendOps *ops; /* immutable typed ops tables */
-    uint64_t module_role_generation;    /* owning ModuleRole generation */
-    const char *owner_key;              /* stable role key across reloads */
-    uint64_t owner_key_size;
+    uint32_t struct_size;
+    uint32_t abi_version;
+    const XaveriusDeviceIdentity *identity;
+    const struct XaveriusDeviceBackendOps *ops;
+    void *device_context;
+    void *native_physical_device;
+    XaveriusModuleRole *owner_role;
+    uint64_t owner_role_generation;
 } XaveriusDeviceBackendRegistration;
 
 struct _XaveriusPhysicalDevice;