  
      virCapabilitiesFree(qemu_driver->caps);
      qemu_driver->caps = caps;
-@@ -3275,11 +3276,6 @@ cleanup:
+@@ -2879,11 +2880,6 @@ cleanup:
      qemuDriverUnlock(driver);
  
      return xml;

 qemudSecurityInit(struct qemud_driver *qemud_drv)
 {
     int ret;
@@ -940,15 +912,52 @@ qemudSecurityInit(struct qemud_driver *qemud_drv)
     qemud_drv->securityDriver = security_drv;
 
     VIR_INFO("Initialized security driver %s", security_drv->name);

     /* If hugetlbfs is present, then we need to create a sub-directory within
      * it, since we can't assume the root mount point has permissions that
      * will let our spawned QEMU instances use it.
@@ -2859,15 +2863,12 @@ static char *qemudGetCapabilities(virConnectPtr conn) {
     char *xml = NULL;
 
     qemuDriverLock(driver);
