diff --git a/ChangeLog b/ChangeLog
index 5ad82484adf9e7d7d5b07c685af2230388c3f67e..94c8d8cc7acae8207a024eb873498fb018f39215 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Tue Mar 21 00:40:29 CET 2006 Daniel Veillard <veillard@redhat.com>
+
+	* src/driver.h src/xen_internal.c: just add a driver block for
+	  the Xen hypervisor direct access module. Need to convert
+	  xend_internal.[ch] and make one for the Xenstore now ...
+
 Mon Mar 20 18:43:19 CET 2006 Daniel Veillard <veillard@redhat.com>
 
 	* src/driver.h src/internal.h src/libvirt.c src/xen_internal.c
diff --git a/src/driver.h b/src/driver.h
index 08853704f3cba358ad900175159866b26c43caf0..377af8af1b8037f567a2501cf11567f3be72f830 100644
--- a/src/driver.h
+++ b/src/driver.h
@@ -29,7 +29,7 @@ typedef int
 typedef const char *
 	(*virDrvGetType)		(virConnectPtr conn);
 typedef int
-	(*virDrvGetVersion)		(void * conn,
+	(*virDrvGetVersion)		(virConnectPtr conn,
 					 unsigned long *hvVer);
 typedef int
 	(*virDrvListDomains)		(virConnectPtr conn,
diff --git a/src/xen_internal.c b/src/xen_internal.c
index 316aefd4685d1411527c53ee5f1164513b64353b..e3fc858e1175a30856edcd0ab5a3923b46fb0155 100644
--- a/src/xen_internal.c
+++ b/src/xen_internal.c
@@ -36,6 +36,35 @@ typedef struct hypercall_struct {
 
 #define XEN_HYPERVISOR_SOCKET "/proc/xen/privcmd"
 
+static virDriver xenHypervisorDriver = {
+    "Xen",
+    NULL, /* init */
+    xenHypervisorOpen, /* open */
+    xenHypervisorClose, /* close */
+    NULL, /* type */
+    xenHypervisorGetVersion, /* version */
+    NULL, /* listDomains */
+    NULL, /* numOfDomains */
+    NULL, /* domainCreateLinux */
+    NULL, /* domainLookupByID */
+    NULL, /* domainLookupByUUID */
+    NULL, /* domainLookupByName */
+    xenHypervisorPauseDomain, /* domainSuspend */
+    xenHypervisorResumeDomain, /* domainResume */
+    NULL, /* domainShutdown */
+    xenHypervisorDestroyDomain, /* domainDestroy */
+    NULL, /* domainFree */
+    NULL, /* domainGetName */
+    NULL, /* domainGetID */
+    NULL, /* domainGetUUID */
+    NULL, /* domainGetOSType */
+    NULL, /* domainGetMaxMemory */
+    xenHypervisorSetMaxMemory, /* domainSetMaxMemory */
+    xenHypervisorGetDomainInfo, /* domainGetInfo */
+    NULL, /* domainSave */
+    NULL /* domainRestore */
+};
+
 /**
  * virXenError:
  * @conn: the connection if available