diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index 66d142ca1676be42ad6ea64a4acdcc1b63cdc452..9aa1a9f90fa8197080260158358b11bbec9c0828 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -7146,6 +7146,35 @@ qemuDomainSetupAllChardevs(virQEMUDriverPtr driver ATTRIBUTE_UNUSED,
 }
 
 
+static int
+qemuDomainSetupTPM(virQEMUDriverPtr driver ATTRIBUTE_UNUSED,
+                   virDomainObjPtr vm,
+                   const char *devPath)
+{
+    virDomainTPMDefPtr dev = vm->def->tpm;
+
+    if (!dev)
+        return 0;
+
+    VIR_DEBUG("Setting up TPM");
+
+    switch (dev->type) {
+    case VIR_DOMAIN_TPM_TYPE_PASSTHROUGH:
+        if (qemuDomainCreateDevice(dev->data.passthrough.source.data.file.path,
+                                   devPath, false) < 0)
+            return -1;
+        break;
+
+    case VIR_DOMAIN_TPM_TYPE_LAST:
+        /* nada */
+        break;
+    }
+
+    VIR_DEBUG("Setup TPM");
+    return 0;
+}
+
+
 int
 qemuDomainBuildNamespace(virQEMUDriverPtr driver,
                          virDomainObjPtr vm)
@@ -7193,6 +7222,9 @@ qemuDomainBuildNamespace(virQEMUDriverPtr driver,
     if (qemuDomainSetupAllChardevs(driver, vm, devPath) < 0)
         goto cleanup;
 
+    if (qemuDomainSetupTPM(driver, vm, devPath) < 0)
+        goto cleanup;
+
     if (mount(devPath, "/dev", NULL, mount_flags, NULL) < 0) {
         virReportSystemError(errno,
                              _("Failed to mount %s on /dev"),