]> xenbits.xensource.com Git - libvirt.git/commitdiff
qemu: Prepare chardevs when starting a domain
authorMichal Privoznik <mprivozn@redhat.com>
Tue, 15 Nov 2016 14:17:05 +0000 (15:17 +0100)
committerMichal Privoznik <mprivozn@redhat.com>
Thu, 15 Dec 2016 08:25:16 +0000 (09:25 +0100)
When starting a domain and separate mount namespace is used, we
have to create all the /dev entries that are configured for the
domain.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
src/qemu/qemu_domain.c

index ebf3538e9eab68b83d6fc21f04d5e61342a2bfdc..66d142ca1676be42ad6ea64a4acdcc1b63cdc452 100644 (file)
@@ -7114,6 +7114,38 @@ qemuDomainSetupAllHostdevs(virQEMUDriverPtr driver,
 }
 
 
+static int
+qemuDomainSetupChardev(virDomainDefPtr def ATTRIBUTE_UNUSED,
+                       virDomainChrDefPtr dev,
+                       void *opaque)
+{
+    const char *devPath = opaque;
+
+    if (dev->source->type != VIR_DOMAIN_CHR_TYPE_DEV)
+        return 0;
+
+    return qemuDomainCreateDevice(dev->source->data.file.path, devPath, false);
+}
+
+
+static int
+qemuDomainSetupAllChardevs(virQEMUDriverPtr driver ATTRIBUTE_UNUSED,
+                           virDomainObjPtr vm,
+                           const char *devPath)
+{
+    VIR_DEBUG("Setting up chardevs");
+
+    if (virDomainChrDefForeach(vm->def,
+                               true,
+                               qemuDomainSetupChardev,
+                               (void *) devPath) < 0)
+        return -1;
+
+    VIR_DEBUG("Setup all chardevs");
+    return 0;
+}
+
+
 int
 qemuDomainBuildNamespace(virQEMUDriverPtr driver,
                          virDomainObjPtr vm)
@@ -7158,6 +7190,9 @@ qemuDomainBuildNamespace(virQEMUDriverPtr driver,
     if (qemuDomainSetupAllHostdevs(driver, vm, devPath) < 0)
         goto cleanup;
 
+    if (qemuDomainSetupAllChardevs(driver, vm, devPath) < 0)
+        goto cleanup;
+
     if (mount(devPath, "/dev", NULL, mount_flags, NULL) < 0) {
         virReportSystemError(errno,
                              _("Failed to mount %s on /dev"),