diff --git a/ChangeLog b/ChangeLog
index 3ef2c64ab2..72c9e10a25 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Tue Sep  2 16:55:01 CEST 2008 Daniel Veillard <veillard@redhat.com>
+
+	* src/qemu_conf.c: patch from Cole Robinson to report in the
+	  capabilities only the ones where the emulators is actually found
+	* po/libvirt.pot: regenerated
+	* src/libvirt.c: small typo fix
+
 Tue Sep  2 16:12:20 CEST 2008 Daniel Veillard <veillard@redhat.com>
 
 	* src/storage_backend.h src/storage_backend_logical.c
diff --git a/po/libvirt.pot b/po/libvirt.pot
index 2640f64557..67bc78fc5b 100644
--- a/po/libvirt.pot
+++ b/po/libvirt.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-08-20 21:29+0100\n"
+"POT-Creation-Date: 2008-09-02 16:36+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -92,7 +92,7 @@ msgstr ""
 msgid "Unknown error"
 msgstr ""
 
-#: qemud/qemud.c:142 src/remote_internal.c:887
+#: qemud/qemud.c:142 src/remote_internal.c:823
 #, c-format
 msgid "Cannot access %s '%s': %s (%d)"
 msgstr ""
@@ -150,11 +150,11 @@ msgstr ""
 msgid "Received signal %d, dispatching to drivers"
 msgstr ""
 
-#: qemud/qemud.c:284 src/util.c:182 src/util.c:213
+#: qemud/qemud.c:284 src/util.c:183 src/util.c:214
 msgid "Failed to set close-on-exec file descriptor flag"
 msgstr ""
 
-#: qemud/qemud.c:299 src/util.c:176 src/util.c:207
+#: qemud/qemud.c:299 src/util.c:177 src/util.c:208
 msgid "Failed to set non-blocking file descriptor flag"
 msgstr ""
 
@@ -423,7 +423,7 @@ msgstr ""
 msgid "Failed to fork as daemon: %s"
 msgstr ""
 
-#: qemud/qemud.c:2180 src/util.c:200
+#: qemud/qemud.c:2180 src/util.c:201
 #, c-format
 msgid "Failed to create pipe: %s"
 msgstr ""
@@ -574,7 +574,7 @@ msgstr ""
 msgid "network not found"
 msgstr ""
 
-#: qemud/remote.c:2292 src/remote_internal.c:3704
+#: qemud/remote.c:2292 src/remote_internal.c:3705
 #, c-format
 msgid "Cannot resolve address %d: %s"
 msgstr ""
@@ -583,12 +583,12 @@ msgstr ""
 msgid "client tried invalid SASL init request"
 msgstr ""
 
-#: qemud/remote.c:2341 src/remote_internal.c:3932
+#: qemud/remote.c:2341 src/remote_internal.c:3933
 #, c-format
 msgid "failed to get sock address %d (%s)"
 msgstr ""
 
-#: qemud/remote.c:2352 src/remote_internal.c:3944
+#: qemud/remote.c:2352 src/remote_internal.c:3945
 #, c-format
 msgid "failed to get peer address %d (%s)"
 msgstr ""
@@ -621,7 +621,7 @@ msgstr ""
 msgid "cannot allocate mechlist"
 msgstr ""
 
-#: qemud/remote.c:2478 src/remote_internal.c:4209
+#: qemud/remote.c:2478 src/remote_internal.c:4210
 #, c-format
 msgid "cannot query SASL ssf on connection %d (%s)"
 msgstr ""
@@ -736,20 +736,20 @@ msgstr ""
 msgid "maxnames > REMOTE_STORAGE_POOL_NAME_LIST_MAX"
 msgstr ""
 
-#: qemud/remote.c:2972 qemud/remote.c:3032 qemud/remote.c:3057
-#: qemud/remote.c:3081 qemud/remote.c:3105 qemud/remote.c:3130
-#: qemud/remote.c:3161 qemud/remote.c:3187 qemud/remote.c:3270
-#: qemud/remote.c:3294 qemud/remote.c:3354 qemud/remote.c:3390
-#: qemud/remote.c:3421 qemud/remote.c:3557
+#: qemud/remote.c:2993 qemud/remote.c:3053 qemud/remote.c:3078
+#: qemud/remote.c:3102 qemud/remote.c:3126 qemud/remote.c:3151
+#: qemud/remote.c:3182 qemud/remote.c:3208 qemud/remote.c:3291
+#: qemud/remote.c:3315 qemud/remote.c:3375 qemud/remote.c:3411
+#: qemud/remote.c:3442 qemud/remote.c:3578
 msgid "storage_pool not found"
 msgstr ""
 
-#: qemud/remote.c:3348
+#: qemud/remote.c:3369
 msgid "maxnames > REMOTE_STORAGE_VOL_NAME_LIST_MAX"
 msgstr ""
 
-#: qemud/remote.c:3447 qemud/remote.c:3472 qemud/remote.c:3502
-#: qemud/remote.c:3529
+#: qemud/remote.c:3468 qemud/remote.c:3493 qemud/remote.c:3523
+#: qemud/remote.c:3550
 msgid "storage_vol not found"
 msgstr ""
 
@@ -903,367 +903,367 @@ msgstr ""
 msgid "Model name contains invalid characters"
 msgstr ""
 
-#: src/domain_conf.c:1120 src/domain_conf.c:1197
+#: src/domain_conf.c:1118 src/domain_conf.c:1195
 msgid "Missing source path attribute for char device"
 msgstr ""
 
-#: src/domain_conf.c:1137 src/domain_conf.c:1154
+#: src/domain_conf.c:1135 src/domain_conf.c:1152
 msgid "Missing source host attribute for char device"
 msgstr ""
 
-#: src/domain_conf.c:1142 src/domain_conf.c:1159 src/domain_conf.c:1179
+#: src/domain_conf.c:1140 src/domain_conf.c:1157 src/domain_conf.c:1177
 msgid "Missing source service attribute for char device"
 msgstr ""
 
-#: src/domain_conf.c:1249
+#: src/domain_conf.c:1247
 msgid "missing input device type"
 msgstr ""
 
-#: src/domain_conf.c:1255
+#: src/domain_conf.c:1253
 #, c-format
 msgid "unknown input device type '%s'"
 msgstr ""
 
-#: src/domain_conf.c:1262
+#: src/domain_conf.c:1260
 #, c-format
 msgid "unknown input bus type '%s'"
 msgstr ""
 
-#: src/domain_conf.c:1270
+#: src/domain_conf.c:1268
 #, c-format
 msgid "ps2 bus does not support %s input device"
 msgstr ""
 
-#: src/domain_conf.c:1276 src/domain_conf.c:1283
+#: src/domain_conf.c:1274 src/domain_conf.c:1281
 #, c-format
 msgid "unsupported input bus %s"
 msgstr ""
 
-#: src/domain_conf.c:1288
+#: src/domain_conf.c:1286
 #, c-format
 msgid "xen bus does not support %s input device"
 msgstr ""
 
-#: src/domain_conf.c:1333
+#: src/domain_conf.c:1331
 msgid "missing graphics device type"
 msgstr ""
 
-#: src/domain_conf.c:1339
+#: src/domain_conf.c:1337
 #, c-format
 msgid "unknown graphics device type '%s'"
 msgstr ""
 
-#: src/domain_conf.c:1350
+#: src/domain_conf.c:1348
 #, c-format
 msgid "cannot parse vnc port %s"
 msgstr ""
 
-#: src/domain_conf.c:1408
+#: src/domain_conf.c:1406
 #, c-format
 msgid "unknown sound model '%s'"
 msgstr ""
 
-#: src/domain_conf.c:1441
+#: src/domain_conf.c:1439
 #, c-format
 msgid "cannot parse vendor id %s"
 msgstr ""
 
-#: src/domain_conf.c:1448
+#: src/domain_conf.c:1446
 msgid "usb vendor needs id"
 msgstr ""
 
-#: src/domain_conf.c:1458
+#: src/domain_conf.c:1456
 #, c-format
 msgid "cannot parse product %s"
 msgstr ""
 
-#: src/domain_conf.c:1465
+#: src/domain_conf.c:1463
 msgid "usb product needs id"
 msgstr ""
 
-#: src/domain_conf.c:1476
+#: src/domain_conf.c:1474
 #, c-format
 msgid "cannot parse bus %s"
 msgstr ""
 
-#: src/domain_conf.c:1483
+#: src/domain_conf.c:1481
 msgid "usb address needs bus id"
 msgstr ""
 
-#: src/domain_conf.c:1492
+#: src/domain_conf.c:1490
 #, c-format
 msgid "cannot parse device %s"
 msgstr ""
 
-#: src/domain_conf.c:1500
+#: src/domain_conf.c:1498
 msgid "usb address needs device id"
 msgstr ""
 
-#: src/domain_conf.c:1505
+#: src/domain_conf.c:1503
 #, c-format
 msgid "unknown usb source type '%s'"
 msgstr ""
 
-#: src/domain_conf.c:1515
+#: src/domain_conf.c:1513
 msgid "missing vendor"
 msgstr ""
 
-#: src/domain_conf.c:1521
+#: src/domain_conf.c:1519
 msgid "missing product"
 msgstr ""
 
-#: src/domain_conf.c:1549
+#: src/domain_conf.c:1547
 #, c-format
 msgid "unknown hostdev mode '%s'"
 msgstr ""
 
-#: src/domain_conf.c:1560
+#: src/domain_conf.c:1558
 #, c-format
 msgid "unknown host device type '%s'"
 msgstr ""
 
-#: src/domain_conf.c:1565
+#: src/domain_conf.c:1563
 msgid "missing type in hostdev"
 msgstr ""
 
-#: src/domain_conf.c:1580
+#: src/domain_conf.c:1578
 #, c-format
 msgid "unknown node %s"
 msgstr ""
 
-#: src/domain_conf.c:1611
+#: src/domain_conf.c:1609
 #, c-format
 msgid "unknown lifecycle action %s"
 msgstr ""
 
-#: src/domain_conf.c:1639 src/domain_conf.c:2241 src/domain_conf.c:2282
-#: src/network_conf.c:458 src/network_conf.c:498 src/storage_conf.c:424
-#: src/storage_conf.c:795
+#: src/domain_conf.c:1637 src/domain_conf.c:2239 src/domain_conf.c:2280
+#: src/network_conf.c:458 src/network_conf.c:498 src/storage_conf.c:437
+#: src/storage_conf.c:811
 msgid "missing root element"
 msgstr ""
 
-#: src/domain_conf.c:1674
+#: src/domain_conf.c:1672
 msgid "unknown device type"
 msgstr ""
 
-#: src/domain_conf.c:1700
+#: src/domain_conf.c:1698
 msgid "failed to allocate space for xmlXPathContext"
 msgstr ""
 
-#: src/domain_conf.c:1708 src/openvz_conf.c:415
+#: src/domain_conf.c:1706 src/openvz_conf.c:415
 msgid "missing domain type attribute"
 msgstr ""
 
-#: src/domain_conf.c:1714
+#: src/domain_conf.c:1712
 #, c-format
 msgid "invalid domain type %s"
 msgstr ""
 
-#: src/domain_conf.c:1731 src/network_conf.c:316 src/openvz_conf.c:449
+#: src/domain_conf.c:1729 src/network_conf.c:316 src/openvz_conf.c:449
 #, c-format
 msgid "Failed to generate UUID: %s"
 msgstr ""
 
-#: src/domain_conf.c:1738 src/network_conf.c:323 src/openvz_conf.c:456
-#: src/storage_conf.c:267
+#: src/domain_conf.c:1736 src/network_conf.c:323 src/openvz_conf.c:456
+#: src/storage_conf.c:272
 msgid "malformed uuid element"
 msgstr ""
 
-#: src/domain_conf.c:1747
+#: src/domain_conf.c:1745
 msgid "missing memory element"
 msgstr ""
 
-#: src/domain_conf.c:1777
+#: src/domain_conf.c:1775
 #, c-format
 msgid "unexpected feature %s"
 msgstr ""
 
-#: src/domain_conf.c:1817
+#: src/domain_conf.c:1815
 msgid "no OS type"
 msgstr ""
 
-#: src/domain_conf.c:1846 src/xm_internal.c:661
+#: src/domain_conf.c:1844 src/xm_internal.c:661
 #, c-format
 msgid "no supported architecture for os type '%s'"
 msgstr ""
 
-#: src/domain_conf.c:1893
+#: src/domain_conf.c:1891
 msgid "cannot extract boot device"
 msgstr ""
 
-#: src/domain_conf.c:1901
+#: src/domain_conf.c:1899
 msgid "missing boot device"
 msgstr ""
 
-#: src/domain_conf.c:1906
+#: src/domain_conf.c:1904
 #, c-format
 msgid "unknown boot device '%s'"
 msgstr ""
 
-#: src/domain_conf.c:1926 src/xm_internal.c:792
+#: src/domain_conf.c:1924 src/xm_internal.c:792
 msgid "unknown virt type"
 msgstr ""
 
-#: src/domain_conf.c:1944
+#: src/domain_conf.c:1942
 msgid "cannot extract disk devices"
 msgstr ""
 
-#: src/domain_conf.c:1974
+#: src/domain_conf.c:1972
 msgid "cannot extract filesystem devices"
 msgstr ""
 
-#: src/domain_conf.c:1991 src/openvz_conf.c:477
+#: src/domain_conf.c:1989 src/openvz_conf.c:477
 msgid "cannot extract network devices"
 msgstr ""
 
-#: src/domain_conf.c:2009
+#: src/domain_conf.c:2007
 msgid "cannot extract parallel devices"
 msgstr ""
 
-#: src/domain_conf.c:2026
+#: src/domain_conf.c:2024
 msgid "cannot extract serial devices"
 msgstr ""
 
-#: src/domain_conf.c:2070
+#: src/domain_conf.c:2068
 msgid "cannot extract input devices"
 msgstr ""
 
-#: src/domain_conf.c:2102
+#: src/domain_conf.c:2100
 msgid "cannot extract graphics devices"
 msgstr ""
 
-#: src/domain_conf.c:2138
+#: src/domain_conf.c:2136
 msgid "cannot extract sound devices"
 msgstr ""
 
-#: src/domain_conf.c:2169
+#: src/domain_conf.c:2167
 msgid "cannot extract host devices"
 msgstr ""
 
-#: src/domain_conf.c:2205 src/network_conf.c:423 src/storage_conf.c:378
+#: src/domain_conf.c:2203 src/network_conf.c:423 src/storage_conf.c:391
 #, c-format
 msgid "at line %d: %s"
 msgstr ""
 
-#: src/domain_conf.c:2235 src/domain_conf.c:2276 src/network_conf.c:452
-#: src/network_conf.c:492 src/storage_conf.c:410 src/storage_conf.c:781
+#: src/domain_conf.c:2233 src/domain_conf.c:2274 src/network_conf.c:452
+#: src/network_conf.c:492 src/storage_conf.c:423 src/storage_conf.c:797
 msgid "failed to parse xml document"
 msgstr ""
 
-#: src/domain_conf.c:2305 src/network_conf.c:520 src/openvz_conf.c:402
+#: src/domain_conf.c:2303 src/network_conf.c:520 src/openvz_conf.c:402
 msgid "incorrect root element"
 msgstr ""
 
-#: src/domain_conf.c:2514
+#: src/domain_conf.c:2512
 msgid "topology cpuset syntax error"
 msgstr ""
 
-#: src/domain_conf.c:2528
+#: src/domain_conf.c:2526
 #, c-format
 msgid "unexpected lifecycle type %d"
 msgstr ""
 
-#: src/domain_conf.c:2549
+#: src/domain_conf.c:2547
 #, c-format
 msgid "unexpected disk type %d"
 msgstr ""
 
-#: src/domain_conf.c:2554
+#: src/domain_conf.c:2552
 #, c-format
 msgid "unexpected disk device %d"
 msgstr ""
 
-#: src/domain_conf.c:2559
+#: src/domain_conf.c:2557
 #, c-format
 msgid "unexpected disk bus %d"
 msgstr ""
 
-#: src/domain_conf.c:2609
+#: src/domain_conf.c:2607
 #, c-format
 msgid "unexpected filesystem type %d"
 msgstr ""
 
-#: src/domain_conf.c:2660 src/domain_conf.c:2874
+#: src/domain_conf.c:2658 src/domain_conf.c:2872
 #, c-format
 msgid "unexpected net type %d"
 msgstr ""
 
-#: src/domain_conf.c:2728
+#: src/domain_conf.c:2726
 #, c-format
 msgid "unexpected char type %d"
 msgstr ""
 
-#: src/domain_conf.c:2827 src/xend_internal.c:5213
+#: src/domain_conf.c:2825 src/xend_internal.c:5214
 #, c-format
 msgid "unexpected sound model %d"
 msgstr ""
 
-#: src/domain_conf.c:2847 src/xend_internal.c:5236
+#: src/domain_conf.c:2845 src/xend_internal.c:5237
 #, c-format
 msgid "unexpected input type %d"
 msgstr ""
 
-#: src/domain_conf.c:2852
+#: src/domain_conf.c:2850
 #, c-format
 msgid "unexpected input bus type %d"
 msgstr ""
 
-#: src/domain_conf.c:2934
+#: src/domain_conf.c:2932
 #, c-format
 msgid "unexpected hostdev mode %d"
 msgstr ""
 
-#: src/domain_conf.c:2941
+#: src/domain_conf.c:2939
 #, c-format
 msgid "unexpected hostdev type %d"
 msgstr ""
 
-#: src/domain_conf.c:2986
+#: src/domain_conf.c:2984
 #, c-format
 msgid "unexpected domain type %d"
 msgstr ""
 
-#: src/domain_conf.c:3071
+#: src/domain_conf.c:3069
 #, c-format
 msgid "unexpected boot device type %d"
 msgstr ""
 
-#: src/domain_conf.c:3089
+#: src/domain_conf.c:3087
 #, c-format
 msgid "unexpected feature %d"
 msgstr ""
 
-#: src/domain_conf.c:3239 src/network_conf.c:651 src/storage_conf.c:1138
+#: src/domain_conf.c:3237 src/network_conf.c:651 src/storage_conf.c:1154
 #, c-format
 msgid "cannot create config directory %s: %s"
 msgstr ""
 
-#: src/domain_conf.c:3248 src/network_conf.c:667 src/storage_conf.c:1181
+#: src/domain_conf.c:3246 src/network_conf.c:667 src/storage_conf.c:1197
 #, c-format
 msgid "cannot create config file %s: %s"
 msgstr ""
 
-#: src/domain_conf.c:3256 src/network_conf.c:675 src/storage_conf.c:1189
+#: src/domain_conf.c:3254 src/network_conf.c:675 src/storage_conf.c:1205
 #, c-format
 msgid "cannot write config file %s: %s"
 msgstr ""
 
-#: src/domain_conf.c:3263 src/network_conf.c:682 src/storage_conf.c:1196
+#: src/domain_conf.c:3261 src/network_conf.c:682 src/storage_conf.c:1212
 #, c-format
 msgid "cannot save config file %s: %s"
 msgstr ""
 
-#: src/domain_conf.c:3331 src/network_conf.c:763
+#: src/domain_conf.c:3329 src/network_conf.c:763
 #, c-format
 msgid "Failed to open dir '%s': %s"
 msgstr ""
 
-#: src/domain_conf.c:3381 src/network_conf.c:803
+#: src/domain_conf.c:3379 src/network_conf.c:803
 #, c-format
 msgid "cannot remove config for %s: %s"
 msgstr ""
 
-#: src/hash.c:691 src/libvirt.c:748
+#: src/hash.c:691
 msgid "allocating connection"
 msgstr ""
 
@@ -1347,205 +1347,239 @@ msgstr ""
 msgid "Failed to add iptables rule '%s' to chain '%s' in table '%s': %s"
 msgstr ""
 
-#: src/libvirt.c:755
+#: src/libvirt.c:754
 msgid "could not parse connection URI"
 msgstr ""
 
-#: src/libvirt.c:773
+#: src/libvirt.c:772
 msgid "allocating conn->name"
 msgstr ""
 
-#: src/libvirt.c:2195
+#: src/libvirt.c:861
+msgid "unable to open connection"
+msgstr ""
+
+#: src/libvirt.c:2208
 msgid "domainMigratePrepare did not set uri"
 msgstr ""
 
-#: src/libvirt.c:2663
+#: src/libvirt.c:2676
 msgid "path is NULL"
 msgstr ""
 
-#: src/libvirt.c:2669
+#: src/libvirt.c:2682
 msgid "flags must be zero"
 msgstr ""
 
-#: src/libvirt.c:2676
+#: src/libvirt.c:2689
 msgid "buffer is NULL"
 msgstr ""
 
-#: src/libvirt.c:2759
+#: src/libvirt.c:2772
 msgid "flags parameter must be VIR_MEMORY_VIRTUAL"
 msgstr ""
 
-#: src/libvirt.c:2766
+#: src/libvirt.c:2779
 msgid "buffer is NULL but size is non-zero"
 msgstr ""
 
-#: src/lxc_container.c:114
+#: src/lxc_container.c:123
 #, c-format
 msgid "setsid failed: %s"
 msgstr ""
 
-#: src/lxc_container.c:121
-#, c-format
-msgid "open(%s) failed: %s"
-msgstr ""
-
-#: src/lxc_container.c:127
+#: src/lxc_container.c:129
 #, c-format
 msgid "ioctl(TIOCSTTY) failed: %s"
 msgstr ""
 
-#: src/lxc_container.c:140
+#: src/lxc_container.c:142
 #, c-format
 msgid "dup2(stdin) failed: %s"
 msgstr ""
 
-#: src/lxc_container.c:146
+#: src/lxc_container.c:148
 #, c-format
 msgid "dup2(stdout) failed: %s"
 msgstr ""
 
-#: src/lxc_container.c:152
+#: src/lxc_container.c:154
 #, c-format
 msgid "dup2(stderr) failed: %s"
 msgstr ""
 
-#: src/lxc_container.c:183
+#: src/lxc_container.c:182
 #, c-format
 msgid "unable to send container continue message: %s"
 msgstr ""
 
-#: src/lxc_container.c:213
+#: src/lxc_container.c:212
 #, c-format
 msgid "Failed to read the container continue message: %s"
 msgstr ""
 
 #: src/lxc_container.c:276
-msgid "lxcChild() passed invalid vm definition"
+#, c-format
+msgid "failed to bind new root %s: %s"
 msgstr ""
 
-#: src/lxc_container.c:294
+#: src/lxc_container.c:290
+#, c-format
+msgid "failed to create %s: %s"
+msgstr ""
+
+#: src/lxc_container.c:300
+#, c-format
+msgid "failed to pivot root %s to %s: %s"
+msgstr ""
+
+#: src/lxc_container.c:334
+#, c-format
+msgid "failed to mount /dev tmpfs for container: %s"
+msgstr ""
+
+#: src/lxc_container.c:348
+#, c-format
+msgid "failed to move /dev/pts into container: %s"
+msgstr ""
+
+#: src/lxc_container.c:359
+#, c-format
+msgid "failed to make device %s: %s"
+msgstr ""
+
+#: src/lxc_container.c:391 src/lxc_container.c:498
 #, c-format
 msgid "failed to mount %s at %s for container: %s"
 msgstr ""
 
-#: src/lxc_container.c:304
+#: src/lxc_container.c:412
+#, c-format
+msgid "failed to read /proc/mounts: %s"
+msgstr ""
+
+#: src/lxc_container.c:439
+#, c-format
+msgid "failed to unmount %s: %s"
+msgstr ""
+
+#: src/lxc_container.c:464 src/lxc_container.c:507
 #, c-format
 msgid "failed to mount /proc for container: %s"
 msgstr ""
 
-#: src/lxc_container.c:363
+#: src/lxc_container.c:553
+msgid "lxcChild() passed invalid vm definition"
+msgstr ""
+
+#: src/lxc_container.c:563
+#, c-format
+msgid "open(%s) failed: %s"
+msgstr ""
+
+#: src/lxc_container.c:624
 #, c-format
 msgid "clone() failed, %s"
 msgstr ""
 
-#: src/lxc_controller.c:72
+#: src/lxc_controller.c:70
+#, c-format
+msgid "failed to create server socket %s: %s"
+msgstr ""
+
+#: src/lxc_controller.c:82
+#, c-format
+msgid "failed to bind server socket %s: %s"
+msgstr ""
+
+#: src/lxc_controller.c:88
+#, c-format
+msgid "failed to listen server socket %s: %s"
+msgstr ""
+
+#: src/lxc_controller.c:122
 #, c-format
 msgid "read of fd %d failed: %s"
 msgstr ""
 
-#: src/lxc_controller.c:78
+#: src/lxc_controller.c:128
 #, c-format
 msgid "write to fd %d failed: %s"
 msgstr ""
 
-#: src/lxc_controller.c:129
+#: src/lxc_controller.c:179
 #, c-format
 msgid "epoll_create(2) failed: %s"
 msgstr ""
 
-#: src/lxc_controller.c:139
+#: src/lxc_controller.c:189
 #, c-format
 msgid "epoll_ctl(appPty) failed: %s"
 msgstr ""
 
-#: src/lxc_controller.c:145 src/lxc_controller.c:153 src/lxc_controller.c:161
-#: src/lxc_controller.c:181 src/lxc_controller.c:187
+#: src/lxc_controller.c:195 src/lxc_controller.c:203 src/lxc_controller.c:211
+#: src/lxc_controller.c:231 src/lxc_controller.c:237
 #, c-format
 msgid "epoll_ctl(contPty) failed: %s"
 msgstr ""
 
-#: src/lxc_controller.c:204
+#: src/lxc_controller.c:254
 #, c-format
 msgid "error event %d"
 msgstr ""
 
-#: src/lxc_controller.c:225
+#: src/lxc_controller.c:275
 #, c-format
 msgid "epoll_wait() failed: %s"
 msgstr ""
 
-#: src/lxc_controller.c:275
+#: src/lxc_controller.c:325
 #, c-format
 msgid "failed to move interface %s to ns %d"
 msgstr ""
 
-#: src/lxc_controller.c:300
+#: src/lxc_controller.c:350
 #, c-format
 msgid "failed to delete veth: %s"
 msgstr ""
 
-#: src/lxc_controller.c:324
+#: src/lxc_controller.c:373
 #, c-format
 msgid "sockpair failed: %s"
 msgstr ""
 
-#: src/lxc_controller.c:332 src/lxc_driver.c:690
+#: src/lxc_controller.c:381 src/lxc_driver.c:753
 #, c-format
 msgid "failed to allocate tty: %s"
 msgstr ""
 
-#: src/lxc_controller.c:399
-#, c-format
-msgid "Unexpected pid %d != %d from waitpid\n"
-msgstr ""
-
-#: src/lxc_controller.c:408
-#, c-format
-msgid "Unexpected status %d from pid %d\n"
-msgstr ""
-
-#: src/lxc_controller.c:436
-#, c-format
-msgid "Unable to change to root dir: %s\n"
-msgstr ""
-
-#: src/lxc_controller.c:442
-#, c-format
-msgid "Unable to become session leader: %s\n"
-msgstr ""
-
-#: src/lxc_controller.c:448
-#, c-format
-msgid "Unable to open %s: %s\n"
-msgstr ""
-
-#: src/lxc_controller.c:464
-#, c-format
-msgid "Unable to redirect stdio: %s\n"
-msgstr ""
-
-#: src/lxc_controller.c:474
-#, c-format
-msgid "Unable to fork controller: %s\n"
-msgstr ""
-
-#: src/lxc_controller.c:481
+#: src/lxc_controller.c:551
 #, c-format
 msgid "Unable to write pid file: %s\n"
 msgstr ""
 
-#: src/lxc_controller.c:494
+#: src/lxc_controller.c:564
+#, c-format
+msgid "Unable to change to root dir: %s\n"
+msgstr ""
+
+#: src/lxc_controller.c:570
+#, c-format
+msgid "Unable to become session leader: %s\n"
+msgstr ""
+
+#: src/lxc_controller.c:578
 #, c-format
 msgid "Failed connection from LXC driver: %s\n"
 msgstr ""
 
-#: src/lxc_driver.c:242 src/lxc_driver.c:793 src/lxc_driver.c:828
+#: src/lxc_driver.c:241 src/lxc_driver.c:857 src/lxc_driver.c:892
 msgid "System lacks NETNS support"
 msgstr ""
 
-#: src/lxc_driver.c:275 src/lxc_driver.c:310 src/lxc_driver.c:336
-#: src/lxc_driver.c:351 src/openvz_driver.c:250 src/openvz_driver.c:615
-#: src/openvz_driver.c:645 src/openvz_driver.c:666 src/openvz_driver.c:714
+#: src/lxc_driver.c:274 src/lxc_driver.c:309 src/lxc_driver.c:335
+#: src/lxc_driver.c:350 src/openvz_driver.c:246 src/openvz_driver.c:611
+#: src/openvz_driver.c:641 src/openvz_driver.c:662 src/openvz_driver.c:710
 #: src/qemu_driver.c:2178 src/qemu_driver.c:2265 src/qemu_driver.c:2814
 #: src/qemu_driver.c:2869 src/qemu_driver.c:2913 src/qemu_driver.c:2991
 #: src/qemu_driver.c:3024 src/qemu_driver.c:3066 src/qemu_driver.c:3116
@@ -1553,11 +1587,11 @@ msgstr ""
 msgid "no domain with matching uuid"
 msgstr ""
 
-#: src/lxc_driver.c:281 src/openvz_driver.c:620 src/qemu_driver.c:2919
+#: src/lxc_driver.c:280 src/openvz_driver.c:616 src/qemu_driver.c:2919
 msgid "cannot delete active domain"
 msgstr ""
 
-#: src/lxc_driver.c:287 src/qemu_driver.c:2925
+#: src/lxc_driver.c:286 src/qemu_driver.c:2925
 msgid "cannot undefine transient domain"
 msgstr ""
 
@@ -1566,75 +1600,75 @@ msgstr ""
 msgid "waitpid failed to wait for container %d: %d %s"
 msgstr ""
 
-#: src/lxc_driver.c:458
+#: src/lxc_driver.c:464
 msgid "failed to get bridge for interface"
 msgstr ""
 
-#: src/lxc_driver.c:469
+#: src/lxc_driver.c:475
 #, c-format
 msgid "failed to create veth device pair: %d"
 msgstr ""
 
-#: src/lxc_driver.c:482
+#: src/lxc_driver.c:488
 msgid "failed to allocate veth names"
 msgstr ""
 
-#: src/lxc_driver.c:488
+#: src/lxc_driver.c:494
 #, c-format
 msgid "failed to add %s device to %s: %s"
 msgstr ""
 
-#: src/lxc_driver.c:497
+#: src/lxc_driver.c:503
 #, c-format
 msgid "failed to enable parent ns veth device: %d"
 msgstr ""
 
-#: src/lxc_driver.c:526
-#, c-format
-msgid "failed to create server socket: %s"
-msgstr ""
-
-#: src/lxc_driver.c:538
-#, c-format
-msgid "failed to bind server socket: %s"
-msgstr ""
-
-#: src/lxc_driver.c:544
-#, c-format
-msgid "failed to listen server socket: %s"
-msgstr ""
-
-#: src/lxc_driver.c:576
+#: src/lxc_driver.c:533
 #, c-format
 msgid "failed to create client socket: %s"
 msgstr ""
 
-#: src/lxc_driver.c:587
+#: src/lxc_driver.c:544
 #, c-format
 msgid "failed to connect to client socket: %s"
 msgstr ""
 
-#: src/lxc_driver.c:614
+#: src/lxc_driver.c:570
+#, c-format
+msgid "invalid PID %d for container"
+msgstr ""
+
+#: src/lxc_driver.c:577
 #, c-format
 msgid "failed to kill pid %d: %s"
 msgstr ""
 
-#: src/lxc_driver.c:673 src/qemu_driver.c:886
+#: src/lxc_driver.c:684 src/util.c:416
+#, c-format
+msgid "cannot wait for '%s': %s"
+msgstr ""
+
+#: src/lxc_driver.c:691
+#, c-format
+msgid "container '%s' unexpectedly shutdown during startup"
+msgstr ""
+
+#: src/lxc_driver.c:739 src/qemu_driver.c:890
 #, c-format
 msgid "cannot create log directory %s: %s"
 msgstr ""
 
-#: src/lxc_driver.c:708
+#: src/lxc_driver.c:777
 #, c-format
 msgid "failed to open %s: %s"
 msgstr ""
 
-#: src/lxc_driver.c:731
+#: src/lxc_driver.c:797
 #, c-format
 msgid "Failed to read pid file %s/%s.pid: %s"
 msgstr ""
 
-#: src/lxc_driver.c:867 src/lxc_driver.c:890
+#: src/lxc_driver.c:931 src/lxc_driver.c:954
 #, c-format
 msgid "no domain with id %d"
 msgstr ""
@@ -1669,7 +1703,7 @@ msgid "unknown forwarding type '%s'"
 msgstr ""
 
 #: src/network_conf.c:658 src/qemu_driver.c:3202 src/qemu_driver.c:3835
-#: src/storage_driver.c:792
+#: src/storage_driver.c:816
 #, c-format
 msgid "cannot create autostart directory %s: %s"
 msgstr ""
@@ -1679,7 +1713,7 @@ msgstr ""
 msgid "Network config filename '%s' does not match network name '%s'"
 msgstr ""
 
-#: src/network_conf.c:794 src/storage_conf.c:1217
+#: src/network_conf.c:794 src/storage_conf.c:1233
 #, c-format
 msgid "no config file for %s"
 msgstr ""
@@ -1710,8 +1744,8 @@ msgstr ""
 msgid "Unknown type attribute %s"
 msgstr ""
 
-#: src/openvz_conf.c:395 src/openvz_conf.c:408 src/storage_conf.c:417
-#: src/storage_conf.c:788
+#: src/openvz_conf.c:395 src/openvz_conf.c:408 src/storage_conf.c:430
+#: src/storage_conf.c:804
 msgid "xmlXPathContext"
 msgstr ""
 
@@ -1735,153 +1769,148 @@ msgstr ""
 msgid "popen failed"
 msgstr ""
 
-#: src/openvz_conf.c:528 src/openvz_conf.c:556
+#: src/openvz_conf.c:528 src/openvz_conf.c:559
 msgid "calloc failed"
 msgstr ""
 
-#: src/openvz_conf.c:537
+#: src/openvz_conf.c:540
 msgid "Failed to parse vzlist output"
 msgstr ""
 
-#: src/openvz_conf.c:566
+#: src/openvz_conf.c:569
 msgid "UUID in config file malformed"
 msgstr ""
 
-#: src/openvz_conf.c:575
+#: src/openvz_conf.c:578
 #, c-format
 msgid "Cound not read config for container %d"
 msgstr ""
 
-#: src/openvz_driver.c:126
+#: src/openvz_driver.c:122
 msgid "Container is not defined"
 msgstr ""
 
-#: src/openvz_driver.c:164 src/openvz_driver.c:416
+#: src/openvz_driver.c:160 src/openvz_driver.c:412
 #, c-format
 msgid "Could not put argument to %s"
 msgstr ""
 
-#: src/openvz_driver.c:186 src/openvz_driver.c:214 src/openvz_driver.c:235
+#: src/openvz_driver.c:182 src/openvz_driver.c:210 src/openvz_driver.c:231
 msgid "virDomainPtr"
 msgstr ""
 
-#: src/openvz_driver.c:261
+#: src/openvz_driver.c:257
 #, c-format
 msgid "cannot read cputime for domain %d"
 msgstr ""
 
-#: src/openvz_driver.c:281 src/openvz_driver.c:313 src/openvz_driver.c:582
+#: src/openvz_driver.c:277 src/openvz_driver.c:309 src/openvz_driver.c:578
 msgid "no domain with matching id"
 msgstr ""
 
-#: src/openvz_driver.c:287 src/openvz_driver.c:319
+#: src/openvz_driver.c:283 src/openvz_driver.c:315
 msgid "domain is not in running state"
 msgstr ""
 
-#: src/openvz_driver.c:293 src/openvz_driver.c:325 src/openvz_driver.c:397
-#: src/openvz_driver.c:458 src/openvz_driver.c:527 src/openvz_driver.c:547
-#: src/openvz_driver.c:594 src/openvz_driver.c:626 src/openvz_driver.c:650
-#: src/openvz_driver.c:720 src/openvz_driver.c:813 src/openvz_driver.c:850
+#: src/openvz_driver.c:289 src/openvz_driver.c:321 src/openvz_driver.c:393
+#: src/openvz_driver.c:454 src/openvz_driver.c:523 src/openvz_driver.c:543
+#: src/openvz_driver.c:590 src/openvz_driver.c:622 src/openvz_driver.c:646
+#: src/openvz_driver.c:716 src/openvz_driver.c:811 src/openvz_driver.c:849
 #, c-format
 msgid "Could not exec %s"
 msgstr ""
 
-#: src/openvz_driver.c:353
+#: src/openvz_driver.c:349
 msgid "Container ID is not specified"
 msgstr ""
 
-#: src/openvz_driver.c:439
+#: src/openvz_driver.c:435
 #, c-format
 msgid "Already an OPENVZ VM active with the id '%s'"
 msgstr ""
 
-#: src/openvz_driver.c:445 src/openvz_driver.c:515
+#: src/openvz_driver.c:441 src/openvz_driver.c:511
 msgid "Error creating OPENVZ VM"
 msgstr ""
 
-#: src/openvz_driver.c:450 src/openvz_driver.c:521
+#: src/openvz_driver.c:446 src/openvz_driver.c:517
 msgid "Error creating command for container"
 msgstr ""
 
-#: src/openvz_driver.c:464 src/openvz_driver.c:533
+#: src/openvz_driver.c:460 src/openvz_driver.c:529
 msgid "Could not set UUID"
 msgstr ""
 
-#: src/openvz_driver.c:474 src/openvz_driver.c:539
+#: src/openvz_driver.c:470 src/openvz_driver.c:535
 msgid "Could not configure network"
 msgstr ""
 
-#: src/openvz_driver.c:481 src/openvz_driver.c:563
+#: src/openvz_driver.c:477 src/openvz_driver.c:559
 msgid "Could not set number of virtual cpu"
 msgstr ""
 
-#: src/openvz_driver.c:510
+#: src/openvz_driver.c:506
 #, c-format
 msgid "Already an OPENVZ VM defined with the id '%d'"
 msgstr ""
 
-#: src/openvz_driver.c:588
+#: src/openvz_driver.c:584
 msgid "domain is not in shutoff state"
 msgstr ""
 
-#: src/openvz_driver.c:671
+#: src/openvz_driver.c:667
 msgid "Could not read container config"
 msgstr ""
 
-#: src/openvz_driver.c:687 src/qemu_driver.c:1809
+#: src/openvz_driver.c:683 src/qemu_driver.c:1809
 #, c-format
 msgid "unknown type '%s'"
 msgstr ""
 
-#: src/openvz_driver.c:708
+#: src/openvz_driver.c:704
 msgid "VCPUs should be >= 1"
 msgstr ""
 
-#: src/openvz_driver.c:822 src/openvz_driver.c:859
+#: src/openvz_driver.c:820 src/openvz_driver.c:858
 #, c-format
 msgid "Could not parse VPS ID %s"
 msgstr ""
 
-#: src/proxy_internal.c:186
-#, c-format
-msgid "failed to exec %s\n"
-msgstr ""
-
-#: src/proxy_internal.c:280
+#: src/proxy_internal.c:266
 #, c-format
 msgid "Failed to close socket %d\n"
 msgstr ""
 
-#: src/proxy_internal.c:313
+#: src/proxy_internal.c:299
 #, c-format
 msgid "Failed to read socket %d\n"
 msgstr ""
 
-#: src/proxy_internal.c:340
+#: src/proxy_internal.c:326
 #, c-format
 msgid "Failed to write to socket %d\n"
 msgstr ""
 
-#: src/proxy_internal.c:432 src/proxy_internal.c:453 src/proxy_internal.c:473
+#: src/proxy_internal.c:418 src/proxy_internal.c:439 src/proxy_internal.c:459
 #, c-format
 msgid "Communication error with proxy: got %d bytes of %d\n"
 msgstr ""
 
-#: src/proxy_internal.c:440
+#: src/proxy_internal.c:426
 #, c-format
 msgid "Communication error with proxy: expected %d bytes got %d\n"
 msgstr ""
 
-#: src/proxy_internal.c:462
+#: src/proxy_internal.c:448
 #, c-format
 msgid "Communication error with proxy: got %d bytes packet\n"
 msgstr ""
 
-#: src/proxy_internal.c:486
+#: src/proxy_internal.c:472
 msgid "Communication error with proxy: malformed packet\n"
 msgstr ""
 
-#: src/proxy_internal.c:492
+#: src/proxy_internal.c:478
 #, c-format
 msgid "got asynchronous packet number %d\n"
 msgstr ""
@@ -1894,70 +1923,70 @@ msgstr ""
 msgid "failed to allocate vncTLSx509certdir"
 msgstr ""
 
-#: src/qemu_conf.c:493
+#: src/qemu_conf.c:487
 #, c-format
 msgid "Unexpected exit status from qemu %d pid %lu"
 msgstr ""
 
-#: src/qemu_conf.c:502
+#: src/qemu_conf.c:496
 #, c-format
 msgid "Unexpected exit status '%d', qemu probably failed"
 msgstr ""
 
-#: src/qemu_conf.c:527 src/qemu_driver.c:913
+#: src/qemu_conf.c:519 src/qemu_driver.c:917
 #, c-format
 msgid "Cannot find QEMU binary %s: %s"
 msgstr ""
 
-#: src/qemu_conf.c:558
+#: src/qemu_conf.c:550
 #, c-format
 msgid "Network '%s' not found"
 msgstr ""
 
-#: src/qemu_conf.c:563
+#: src/qemu_conf.c:555
 #, c-format
 msgid "Network '%s' not active"
 msgstr ""
 
-#: src/qemu_conf.c:572
+#: src/qemu_conf.c:564
 #, c-format
 msgid "Network type %d is not supported"
 msgstr ""
 
-#: src/qemu_conf.c:588 src/qemu_driver.c:1493
+#: src/qemu_conf.c:580 src/qemu_driver.c:1501
 #, c-format
 msgid "cannot initialize bridge support: %s"
 msgstr ""
 
-#: src/qemu_conf.c:598
+#: src/qemu_conf.c:590
 #, c-format
 msgid "Failed to add tap interface to bridge. %s is not a bridge device"
 msgstr ""
 
-#: src/qemu_conf.c:602
+#: src/qemu_conf.c:594
 #, c-format
 msgid "Failed to add tap interface '%s' to bridge '%s' : %s"
 msgstr ""
 
-#: src/qemu_conf.c:625
+#: src/qemu_conf.c:617
 msgid "failed to allocate space for tapfds string"
 msgstr ""
 
-#: src/qemu_conf.c:907 src/qemu_conf.c:958
+#: src/qemu_conf.c:899 src/qemu_conf.c:950
 #, c-format
 msgid "unsupported usb disk type for '%s'"
 msgstr ""
 
-#: src/qemu_conf.c:916 src/qemu_conf.c:979
+#: src/qemu_conf.c:908 src/qemu_conf.c:971
 #, c-format
 msgid "unsupported disk type '%s'"
 msgstr ""
 
-#: src/qemu_conf.c:1183
+#: src/qemu_conf.c:1175
 msgid "invalid sound model"
 msgstr ""
 
-#: src/qemu_conf.c:1236
+#: src/qemu_conf.c:1228
 msgid "failed to allocate space for argv string"
 msgstr ""
 
@@ -1996,195 +2025,185 @@ msgstr ""
 msgid "Reloading iptables rules\n"
 msgstr ""
 
-#: src/qemu_driver.c:431
+#: src/qemu_driver.c:432
 #, c-format
 msgid ""
 "QEMU quit during %s startup\n"
 "%s"
 msgstr ""
 
-#: src/qemu_driver.c:441 src/qemu_driver.c:454
+#: src/qemu_driver.c:442 src/qemu_driver.c:455
 #, c-format
 msgid "Failure while reading %s startup output: %s"
 msgstr ""
 
-#: src/qemu_driver.c:449
+#: src/qemu_driver.c:450
 #, c-format
 msgid "Timed out while reading %s startup output"
 msgstr ""
 
-#: src/qemu_driver.c:465
+#: src/qemu_driver.c:466
 #, c-format
 msgid "Failure while reading %s startup output"
 msgstr ""
 
-#: src/qemu_driver.c:477
+#: src/qemu_driver.c:478
 #, c-format
 msgid "Out of space while reading %s startup output"
 msgstr ""
 
-#: src/qemu_driver.c:508
+#: src/qemu_driver.c:509
 #, c-format
 msgid "Unable to open monitor path %s"
 msgstr ""
 
-#: src/qemu_driver.c:513
+#: src/qemu_driver.c:514
 msgid "Unable to set monitor close-on-exec flag"
 msgstr ""
 
-#: src/qemu_driver.c:518
+#: src/qemu_driver.c:519
 msgid "Unable to put monitor into non-blocking mode"
 msgstr ""
 
-#: src/qemu_driver.c:646 src/qemu_driver.c:1012 src/qemu_driver.c:1712
+#: src/qemu_driver.c:647 src/qemu_driver.c:1019 src/qemu_driver.c:1712
 #: src/qemu_driver.c:1722
 #, c-format
 msgid "Unable to log VM console data: %s\n"
 msgstr ""
 
-#: src/qemu_driver.c:669
+#: src/qemu_driver.c:670
 msgid "allocate cpumap"
 msgstr ""
 
-#: src/qemu_driver.c:680
+#: src/qemu_driver.c:681
 msgid "cannot run monitor command to fetch CPU thread info"
 msgstr ""
 
-#: src/qemu_driver.c:784
+#: src/qemu_driver.c:785
 #, c-format
 msgid "failed to set CPU affinity %s"
 msgstr ""
 
-#: src/qemu_driver.c:794 src/qemu_driver.c:2121
+#: src/qemu_driver.c:795 src/qemu_driver.c:2121
 msgid "resume operation failed"
 msgstr ""
 
-#: src/qemu_driver.c:853
+#: src/qemu_driver.c:857
 msgid "VM is already active"
 msgstr ""
 
-#: src/qemu_driver.c:863
+#: src/qemu_driver.c:867
 msgid "Unable to find an unused VNC port"
 msgstr ""
 
-#: src/qemu_driver.c:875
+#: src/qemu_driver.c:879
 #, c-format
 msgid "config file path too long: %s/%s.log"
 msgstr ""
 
-#: src/qemu_driver.c:894
+#: src/qemu_driver.c:898
 #, c-format
 msgid "failed to create logfile %s: %s"
 msgstr ""
 
-#: src/qemu_driver.c:900
+#: src/qemu_driver.c:904
 #, c-format
 msgid "Unable to set VM logfile close-on-exec flag %s"
 msgstr ""
 
-#: src/qemu_driver.c:923
+#: src/qemu_driver.c:927
 #, c-format
 msgid "Cannot determine QEMU argv syntax %s"
 msgstr ""
 
-#: src/qemu_driver.c:939 src/qemu_driver.c:942 src/qemu_driver.c:947
+#: src/qemu_driver.c:943 src/qemu_driver.c:946 src/qemu_driver.c:951
 #, c-format
 msgid "Unable to write argv to logfile %d: %s\n"
 msgstr ""
 
-#: src/qemu_driver.c:1026
+#: src/qemu_driver.c:1033
 #, c-format
 msgid "Shutting down VM '%s'\n"
 msgstr ""
 
-#: src/qemu_driver.c:1037
+#: src/qemu_driver.c:1044
 #, c-format
 msgid "Unable to close logfile %d: %s\n"
 msgstr ""
 
-#: src/qemu_driver.c:1052
+#: src/qemu_driver.c:1059
 msgid "Got unexpected pid, damn\n"
 msgstr ""
 
-#: src/qemu_driver.c:1200
+#: src/qemu_driver.c:1207
 msgid "failed to allocate space for dnsmasq argv"
 msgstr ""
 
-#: src/qemu_driver.c:1214
+#: src/qemu_driver.c:1221
 msgid "cannot start dhcp daemon without IP address for server"
 msgstr ""
 
-#: src/qemu_driver.c:1242
+#: src/qemu_driver.c:1250
 #, c-format
 msgid "failed to add iptables rule to allow forwarding from '%s' : %s\n"
 msgstr ""
 
-#: src/qemu_driver.c:1253
+#: src/qemu_driver.c:1261
 #, c-format
 msgid "failed to add iptables rule to allow forwarding to '%s' : %s\n"
 msgstr ""
 
-#: src/qemu_driver.c:1263
+#: src/qemu_driver.c:1271
 #, c-format
 msgid "failed to add iptables rule to enable masquerading : %s\n"
 msgstr ""
 
-#: src/qemu_driver.c:1295
+#: src/qemu_driver.c:1303
 #, c-format
 msgid "failed to add iptables rule to allow routing from '%s' : %s\n"
 msgstr ""
 
-#: src/qemu_driver.c:1306
+#: src/qemu_driver.c:1314
 #, c-format
 msgid "failed to add iptables rule to allow routing to '%s' : %s\n"
 msgstr ""
 
-#: src/qemu_driver.c:1331
+#: src/qemu_driver.c:1339
 msgid "failed to allocate space for IP tables support"
 msgstr ""
 
-#: src/qemu_driver.c:1339 src/qemu_driver.c:1346
+#: src/qemu_driver.c:1347 src/qemu_driver.c:1354
 #, c-format
 msgid "failed to add iptables rule to allow DHCP requests from '%s' : %s"
 msgstr ""
 
-#: src/qemu_driver.c:1354 src/qemu_driver.c:1361
+#: src/qemu_driver.c:1362 src/qemu_driver.c:1369
 #, c-format
 msgid "failed to add iptables rule to allow DNS requests from '%s' : %s"
 msgstr ""
 
-#: src/qemu_driver.c:1371
+#: src/qemu_driver.c:1379
 #, c-format
 msgid "failed to add iptables rule to block outbound traffic from '%s' : %s"
 msgstr ""
 
-#: src/qemu_driver.c:1378
+#: src/qemu_driver.c:1386
 #, c-format
 msgid "failed to add iptables rule to block inbound traffic to '%s' : %s"
 msgstr ""
 
-#: src/qemu_driver.c:1386
+#: src/qemu_driver.c:1394
 #, c-format
 msgid "failed to add iptables rule to allow cross bridge traffic on '%s' : %s"
 msgstr ""
 
-#: src/qemu_driver.c:1487
+#: src/qemu_driver.c:1495
 msgid "network is already active"
 msgstr ""
 
-#: src/qemu_driver.c:1499
-#, c-format
-msgid "cannot create bridge '%s' : %s"
-msgstr ""
-
 #: src/qemu_driver.c:1507
 #, c-format
-msgid "failed to set bridge forward delay to %ld"
-msgstr ""
-
-#: src/qemu_driver.c:1514
-#, c-format
-msgid "failed to set bridge STP to %s"
+msgid "cannot create bridge '%s' : %s"
 msgstr ""
 
 #: src/qemu_driver.c:1522
@@ -2313,7 +2332,7 @@ msgstr ""
 
 #: src/qemu_driver.c:2456 src/qemu_driver.c:2463 src/qemu_driver.c:2734
 #: src/qemu_driver.c:2949 src/qemu_driver.c:2957 src/qemu_driver.c:2965
-#: src/remote_internal.c:2281 src/virterror.c:441
+#: src/remote_internal.c:2241 src/virterror.c:441
 msgid "out of memory"
 msgstr ""
 
@@ -2450,7 +2469,7 @@ msgstr ""
 msgid "Failed to create symlink '%s to '%s': %s"
 msgstr ""
 
-#: src/qemu_driver.c:3216 src/qemu_driver.c:3849 src/storage_driver.c:808
+#: src/qemu_driver.c:3216 src/qemu_driver.c:3849 src/storage_driver.c:832
 #, c-format
 msgid "Failed to delete symlink '%s': %s"
 msgstr ""
@@ -2512,299 +2531,406 @@ msgstr ""
 msgid "failed to allocate space for network bridge string"
 msgstr ""
 
-#: src/qemu_driver.c:3842 src/storage_driver.c:799
+#: src/qemu_driver.c:3842 src/storage_driver.c:823
 #, c-format
 msgid "Failed to create symlink '%s' to '%s': %s"
 msgstr ""
 
-#: src/remote_internal.c:108 src/remote_internal.c:116
+#: src/remote_internal.c:109 src/remote_internal.c:117
 msgid "tried to use a closed or uninitialised handle"
 msgstr ""
 
-#: src/remote_internal.c:227
+#: src/remote_internal.c:229
 msgid "failed to find libvirtd binary"
 msgstr ""
 
-#: src/remote_internal.c:334
+#: src/remote_internal.c:290
 msgid ""
 "remote_open: transport in URL not recognised (should be tls|unix|ssh|ext|tcp)"
 msgstr ""
 
-#: src/remote_internal.c:375
-msgid "allocating priv->hostname"
-msgstr ""
-
-#: src/remote_internal.c:457
+#: src/remote_internal.c:412
 msgid "remote_open: for 'ext' transport, command is required"
 msgstr ""
 
-#: src/remote_internal.c:730
+#: src/remote_internal.c:456
+#, c-format
+msgid "unable to resolve hostname '%s': %s"
+msgstr ""
+
+#: src/remote_internal.c:507 src/remote_internal.c:587
+#, c-format
+msgid "unable to connect to '%s': %s"
+msgstr ""
+
+#: src/remote_internal.c:528
+#, c-format
+msgid "unable to lookup user '%d': %s"
+msgstr ""
+
+#: src/remote_internal.c:563
+#, c-format
+msgid "unable to create socket %s"
+msgstr ""
+
+#: src/remote_internal.c:647
+#, c-format
+msgid "unable to create socket pair %s"
+msgstr ""
+
+#: src/remote_internal.c:667
 msgid "transport methods unix, ssh and ext are not supported under Windows"
 msgstr ""
 
-#: src/remote_internal.c:773
-msgid "uri params"
-msgstr ""
-
-#: src/remote_internal.c:816 src/remote_internal.c:2494
-#: src/remote_internal.c:2900
+#: src/remote_internal.c:753 src/remote_internal.c:2454
+#: src/remote_internal.c:2860
 msgid "struct private_data"
 msgstr ""
 
-#: src/remote_internal.c:1026
+#: src/remote_internal.c:845
+#, c-format
+msgid "unable to allocate TLS credentials: %s"
+msgstr ""
+
+#: src/remote_internal.c:865
+#, c-format
+msgid "unable to load CA certificate: %s"
+msgstr ""
+
+#: src/remote_internal.c:880
+#, c-format
+msgid "unable to load private key/certificate: %s"
+msgstr ""
+
+#: src/remote_internal.c:909
+#, c-format
+msgid "unable to initialize TLS client: %s"
+msgstr ""
+
+#: src/remote_internal.c:918
+#, c-format
+msgid "unable to set TLS algorithm priority: %s"
+msgstr ""
+
+#: src/remote_internal.c:927
+#, c-format
+msgid "unable to set certificate priority: %s"
+msgstr ""
+
+#: src/remote_internal.c:937
+#, c-format
+msgid "unable to set session credentials: %s"
+msgstr ""
+
+#: src/remote_internal.c:952
+#, c-format
+msgid "unable to complete TLS handshake: %s"
+msgstr ""
+
+#: src/remote_internal.c:974
+#, c-format
+msgid "unable to complete TLS initialization: %s"
+msgstr ""
+
+#: src/remote_internal.c:980
 msgid "server verification (of our certificate or IP address) failed\n"
 msgstr ""
 
-#: src/remote_internal.c:1081
+#: src/remote_internal.c:1005
+#, c-format
+msgid "unable to verify server certificate: %s"
+msgstr ""
+
+#: src/remote_internal.c:1012
+#, c-format
+msgid "cannot get current time: %s"
+msgstr ""
+
+#: src/remote_internal.c:1018
+msgid "Invalid certificate"
+msgstr ""
+
+#: src/remote_internal.c:1021
+msgid "The certificate is not trusted."
+msgstr ""
+
+#: src/remote_internal.c:1024
+msgid "The certificate hasn't got a known issuer."
+msgstr ""
+
+#: src/remote_internal.c:1027
+msgid "The certificate has been revoked."
+msgstr ""
+
+#: src/remote_internal.c:1031
+msgid "The certificate uses an insecure algorithm"
+msgstr ""
+
+#: src/remote_internal.c:1035
+#, c-format
+msgid "server certificate failed validation: %s"
+msgstr ""
+
+#: src/remote_internal.c:1041
 msgid "Certificate type is not X.509"
 msgstr ""
 
-#: src/remote_internal.c:1086
+#: src/remote_internal.c:1046
 msgid "gnutls_certificate_get_peers failed"
 msgstr ""
 
-#: src/remote_internal.c:1107
+#: src/remote_internal.c:1056
+#, c-format
+msgid "unable to initialize certificate: %s"
+msgstr ""
+
+#: src/remote_internal.c:1064
+#, c-format
+msgid "unable to import certificate: %s"
+msgstr ""
+
+#: src/remote_internal.c:1071
 msgid "The certificate has expired"
 msgstr ""
 
-#: src/remote_internal.c:1113
+#: src/remote_internal.c:1077
 msgid "The certificate is not yet activated"
 msgstr ""
 
-#: src/remote_internal.c:1125
+#: src/remote_internal.c:1085
 #, c-format
 msgid "Certificate's owner does not match the hostname (%s)"
 msgstr ""
 
-#: src/remote_internal.c:1344
+#: src/remote_internal.c:1304
 #, c-format
 msgid "too many NUMA cells: %d > %d"
 msgstr ""
 
-#: src/remote_internal.c:1393 src/remote_internal.c:1407
+#: src/remote_internal.c:1353 src/remote_internal.c:1367
 #, c-format
 msgid "too many remote domain IDs: %d > %d"
 msgstr ""
 
-#: src/remote_internal.c:1781
+#: src/remote_internal.c:1741
 #, c-format
 msgid "map length greater than maximum: %d > %d"
 msgstr ""
 
-#: src/remote_internal.c:1813
+#: src/remote_internal.c:1773
 #, c-format
 msgid "vCPU count exceeds maximum: %d > %d"
 msgstr ""
 
-#: src/remote_internal.c:1819
+#: src/remote_internal.c:1779
 #, c-format
 msgid "vCPU map buffer length exceeds maximum: %d > %d"
 msgstr ""
 
-#: src/remote_internal.c:1836
+#: src/remote_internal.c:1796
 #, c-format
 msgid "host reports too many vCPUs: %d > %d"
 msgstr ""
 
-#: src/remote_internal.c:1843
+#: src/remote_internal.c:1803
 #, c-format
 msgid "host reports map buffer length exceeds maximum: %d > %d"
 msgstr ""
 
-#: src/remote_internal.c:2005 src/remote_internal.c:2019
+#: src/remote_internal.c:1965 src/remote_internal.c:1979
 #, c-format
 msgid "too many remote domain names: %d > %d"
 msgstr ""
 
-#: src/remote_internal.c:2221
+#: src/remote_internal.c:2181
 msgid ""
 "remoteDomainGetSchedulerParameters: returned number of parameters exceeds "
 "limit"
 msgstr ""
 
-#: src/remote_internal.c:2249
+#: src/remote_internal.c:2209
 msgid "remoteDomainGetSchedulerParameters: unknown parameter type"
 msgstr ""
 
-#: src/remote_internal.c:2272
+#: src/remote_internal.c:2232
 msgid "out of memory allocating array"
 msgstr ""
 
-#: src/remote_internal.c:2299
+#: src/remote_internal.c:2259
 msgid "unknown parameter type"
 msgstr ""
 
-#: src/remote_internal.c:2389
+#: src/remote_internal.c:2349
 #, c-format
 msgid "block peek request too large for remote protocol, %zi > %d"
 msgstr ""
 
-#: src/remote_internal.c:2410 src/remote_internal.c:2454
+#: src/remote_internal.c:2370 src/remote_internal.c:2414
 msgid "returned buffer is not same size as requested"
 msgstr ""
 
-#: src/remote_internal.c:2434
+#: src/remote_internal.c:2394
 #, c-format
 msgid "memory peek request too large for remote protocol, %zi > %d"
 msgstr ""
 
-#: src/remote_internal.c:2557 src/remote_internal.c:2571
-#: src/remote_internal.c:2616 src/remote_internal.c:2630
+#: src/remote_internal.c:2517 src/remote_internal.c:2531
+#: src/remote_internal.c:2576 src/remote_internal.c:2590
 #, c-format
 msgid "too many remote networks: %d > %d"
 msgstr ""
 
-#: src/remote_internal.c:2962 src/remote_internal.c:3017
+#: src/remote_internal.c:2922 src/remote_internal.c:2977
 msgid "too many storage pools requested"
 msgstr ""
 
-#: src/remote_internal.c:2974 src/remote_internal.c:3029
+#: src/remote_internal.c:2934 src/remote_internal.c:2989
 msgid "too many storage pools received"
 msgstr ""
 
-#: src/remote_internal.c:3374
+#: src/remote_internal.c:3375
 msgid "too many storage volumes requested"
 msgstr ""
 
-#: src/remote_internal.c:3387
+#: src/remote_internal.c:3388
 msgid "too many storage volumes received"
 msgstr ""
 
-#: src/remote_internal.c:3623
+#: src/remote_internal.c:3624
 #, c-format
 msgid "unknown authentication type %s"
 msgstr ""
 
-#: src/remote_internal.c:3633
+#: src/remote_internal.c:3634
 #, c-format
 msgid "requested authentication type %s rejected"
 msgstr ""
 
-#: src/remote_internal.c:3674
+#: src/remote_internal.c:3675
 #, c-format
 msgid "unsupported authentication type %d"
 msgstr ""
 
-#: src/remote_internal.c:3922
+#: src/remote_internal.c:3923
 #, c-format
 msgid "failed to initialize SASL library: %d (%s)"
 msgstr ""
 
-#: src/remote_internal.c:3970
+#: src/remote_internal.c:3971
 #, c-format
 msgid "Failed to create SASL client context: %d (%s)"
 msgstr ""
 
-#: src/remote_internal.c:3983
+#: src/remote_internal.c:3984
 msgid "invalid cipher size for TLS session"
 msgstr ""
 
-#: src/remote_internal.c:3993
+#: src/remote_internal.c:3994
 #, c-format
 msgid "cannot set external SSF %d (%s)"
 msgstr ""
 
-#: src/remote_internal.c:4012
+#: src/remote_internal.c:4013
 #, c-format
 msgid "cannot set security props %d (%s)"
 msgstr ""
 
-#: src/remote_internal.c:4031
+#: src/remote_internal.c:4032
 #, c-format
 msgid "SASL mechanism %s not supported by server"
 msgstr ""
 
-#: src/remote_internal.c:4050
+#: src/remote_internal.c:4051
 #, c-format
 msgid "Failed to start SASL negotiation: %d (%s)"
 msgstr ""
 
-#: src/remote_internal.c:4068 src/remote_internal.c:4146
+#: src/remote_internal.c:4069 src/remote_internal.c:4147
 msgid "Failed to make auth credentials"
 msgstr ""
 
-#: src/remote_internal.c:4092
+#: src/remote_internal.c:4093
 #, c-format
 msgid "SASL negotiation data too long: %d bytes"
 msgstr ""
 
-#: src/remote_internal.c:4132
+#: src/remote_internal.c:4133
 #, c-format
 msgid "Failed SASL step: %d (%s)"
 msgstr ""
 
-#: src/remote_internal.c:4218
+#: src/remote_internal.c:4219
 #, c-format
 msgid "negotiation SSF %d was not strong enough"
 msgstr ""
 
-#: src/remote_internal.c:4272
+#: src/remote_internal.c:4273
 msgid "Failed to collect auth credentials"
 msgstr ""
 
-#: src/remote_internal.c:4339
+#: src/remote_internal.c:4340
 msgid "xdr_remote_message_header failed"
 msgstr ""
 
-#: src/remote_internal.c:4345
+#: src/remote_internal.c:4346
 msgid "marshalling args"
 msgstr ""
 
-#: src/remote_internal.c:4362
+#: src/remote_internal.c:4363
 msgid "xdr_int (length word)"
 msgstr ""
 
-#: src/remote_internal.c:4379
+#: src/remote_internal.c:4380
 msgid "xdr_int (length word, reply)"
 msgstr ""
 
-#: src/remote_internal.c:4389
+#: src/remote_internal.c:4390
 msgid "packet received from server too large"
 msgstr ""
 
-#: src/remote_internal.c:4401
+#: src/remote_internal.c:4402
 msgid "invalid header in reply"
 msgstr ""
 
-#: src/remote_internal.c:4410
+#: src/remote_internal.c:4411
 #, c-format
 msgid "unknown program (received %x, expected %x)"
 msgstr ""
 
-#: src/remote_internal.c:4418
+#: src/remote_internal.c:4419
 #, c-format
 msgid "unknown protocol version (received %x, expected %x)"
 msgstr ""
 
-#: src/remote_internal.c:4431
+#: src/remote_internal.c:4432
 #, c-format
 msgid "unknown procedure (received %x, expected %x)"
 msgstr ""
 
-#: src/remote_internal.c:4439
+#: src/remote_internal.c:4440
 #, c-format
 msgid "unknown direction (received %x, expected %x)"
 msgstr ""
 
-#: src/remote_internal.c:4446
+#: src/remote_internal.c:4447
 #, c-format
 msgid "unknown serial (received %x, expected %x)"
 msgstr ""
 
-#: src/remote_internal.c:4459
+#: src/remote_internal.c:4460
 msgid "unmarshalling ret"
 msgstr ""
 
-#: src/remote_internal.c:4469
+#: src/remote_internal.c:4470
 msgid "unmarshalling remote_error"
 msgstr ""
 
-#: src/remote_internal.c:4489
+#: src/remote_internal.c:4490
 #, c-format
 msgid "unknown status (received %x)"
 msgstr ""
 
-#: src/remote_internal.c:4598 src/remote_internal.c:4615
+#: src/remote_internal.c:4599 src/remote_internal.c:4616
 msgid "socket closed unexpectedly"
 msgstr ""
 
@@ -2831,7 +2957,7 @@ msgstr ""
 msgid "unknown storage backend type %d"
 msgstr ""
 
-#: src/storage_backend.c:173 src/storage_backend_fs.c:341
+#: src/storage_backend.c:173 src/storage_backend_fs.c:346
 #, c-format
 msgid "cannot open volume '%s': %s"
 msgstr ""
@@ -2860,7 +2986,7 @@ msgstr ""
 msgid "cannot read dir %s: %s"
 msgstr ""
 
-#: src/storage_backend.c:315 src/storage_driver.c:1197
+#: src/storage_backend.c:315 src/storage_driver.c:1221
 msgid "path"
 msgstr ""
 
@@ -2874,33 +3000,33 @@ msgid "Failed to compile regex %s"
 msgstr ""
 
 #: src/storage_backend.c:395 src/storage_backend.c:400
-#: src/storage_backend.c:436
+#: src/storage_backend.c:437
 msgid "regex groups"
 msgstr ""
 
-#: src/storage_backend.c:412 src/storage_backend.c:546
+#: src/storage_backend.c:413 src/storage_backend.c:548
 msgid "cannot read fd"
 msgstr ""
 
-#: src/storage_backend.c:484 src/storage_backend.c:601
+#: src/storage_backend.c:485 src/storage_backend.c:603
 #, c-format
 msgid "failed to wait for command: %s"
 msgstr ""
 
-#: src/storage_backend.c:493 src/storage_backend.c:614
+#: src/storage_backend.c:494 src/storage_backend.c:616
 msgid "command did not exit cleanly"
 msgstr ""
 
-#: src/storage_backend.c:533
+#: src/storage_backend.c:534
 msgid "n_columns too large"
 msgstr ""
 
-#: src/storage_backend.c:580
+#: src/storage_backend.c:582
 #, c-format
 msgid "read error: %s"
 msgstr ""
 
-#: src/storage_backend.c:608
+#: src/storage_backend.c:610
 #, c-format
 msgid "non-zero exit status from command %d"
 msgstr ""
@@ -2915,24 +3041,24 @@ msgstr ""
 msgid "unsupported pool format %d"
 msgstr ""
 
-#: src/storage_backend_disk.c:138 src/storage_backend_fs.c:187
-#: src/storage_backend_fs.c:257 src/storage_backend_fs.c:309
+#: src/storage_backend_disk.c:138 src/storage_backend_fs.c:192
+#: src/storage_backend_fs.c:262 src/storage_backend_fs.c:314
 #, c-format
 msgid "unsupported volume format %s"
 msgstr ""
 
-#: src/storage_backend_disk.c:165 src/storage_backend_fs.c:220
-#: src/storage_backend_fs.c:292 src/storage_backend_fs.c:324
+#: src/storage_backend_disk.c:165 src/storage_backend_fs.c:225
+#: src/storage_backend_fs.c:297 src/storage_backend_fs.c:329
 #, c-format
 msgid "unsupported volume format %d"
 msgstr ""
 
 #: src/storage_backend_disk.c:179 src/storage_backend_disk.c:192
 #: src/storage_backend_disk.c:199 src/storage_backend_disk.c:221
-#: src/storage_backend_fs.c:711 src/storage_backend_iscsi.c:177
+#: src/storage_backend_fs.c:839 src/storage_backend_iscsi.c:177
 #: src/storage_backend_logical.c:116 src/storage_backend_logical.c:121
 #: src/storage_backend_logical.c:133 src/storage_backend_logical.c:143
-#: src/storage_backend_logical.c:462
+#: src/storage_backend_logical.c:531
 msgid "volume"
 msgstr ""
 
@@ -2961,121 +3087,155 @@ msgstr ""
 msgid "Disk pools are not yet supported"
 msgstr ""
 
-#: src/storage_backend_fs.c:353
+#: src/storage_backend_fs.c:358
 #, c-format
 msgid "cannot read header '%s': %s"
 msgstr ""
 
-#: src/storage_backend_fs.c:461
+#: src/storage_backend_fs.c:472
+#, c-format
+msgid "invalid netfs path (no /): %s"
+msgstr ""
+
+#: src/storage_backend_fs.c:478
+#, c-format
+msgid "invalid netfs path (ends in /): %s"
+msgstr ""
+
+#: src/storage_backend_fs.c:485 src/storage_backend_logical.c:274
+msgid "new xml desc"
+msgstr ""
+
+#: src/storage_backend_fs.c:492 src/storage_backend_logical.c:279
+msgid "asprintf failed"
+msgstr ""
+
+#: src/storage_backend_fs.c:534
+msgid "bad <source> spec"
+msgstr ""
+
+#: src/storage_backend_fs.c:540
+msgid "xpath_ctxt"
+msgstr ""
+
+#: src/storage_backend_fs.c:547
+msgid "missing <host> in <source> spec"
+msgstr ""
+
+#: src/storage_backend_fs.c:559 src/storage_backend_logical.c:319
+msgid "retval"
+msgstr ""
+
+#: src/storage_backend_fs.c:589
 #, c-format
 msgid "cannot read %s: %s"
 msgstr ""
 
-#: src/storage_backend_fs.c:533 src/storage_backend_fs.c:600
+#: src/storage_backend_fs.c:661 src/storage_backend_fs.c:728
 #: src/storage_backend_iscsi.c:573
 msgid "missing source host"
 msgstr ""
 
-#: src/storage_backend_fs.c:538 src/storage_conf.c:319
+#: src/storage_backend_fs.c:666
 msgid "missing source path"
 msgstr ""
 
-#: src/storage_backend_fs.c:544 src/storage_backend_fs.c:611
+#: src/storage_backend_fs.c:672 src/storage_backend_fs.c:739
 #: src/storage_backend_iscsi.c:580
 msgid "missing source device"
 msgstr ""
 
-#: src/storage_backend_fs.c:560 src/storage_backend_fs.c:568
+#: src/storage_backend_fs.c:688 src/storage_backend_fs.c:696
 msgid "source"
 msgstr ""
 
-#: src/storage_backend_fs.c:605
+#: src/storage_backend_fs.c:733
 msgid "missing source dir"
 msgstr ""
 
-#: src/storage_backend_fs.c:677 src/storage_backend_fs.c:868
-#: src/storage_backend_fs.c:907
+#: src/storage_backend_fs.c:805 src/storage_backend_fs.c:996
+#: src/storage_backend_fs.c:1035
 #, c-format
 msgid "cannot create path '%s': %s"
 msgstr ""
 
-#: src/storage_backend_fs.c:700
+#: src/storage_backend_fs.c:828
 #, c-format
 msgid "cannot open path '%s': %s"
 msgstr ""
 
-#: src/storage_backend_fs.c:719 src/storage_backend_fs.c:729
+#: src/storage_backend_fs.c:847 src/storage_backend_fs.c:857
 msgid "volume name"
 msgstr ""
 
-#: src/storage_backend_fs.c:740
+#: src/storage_backend_fs.c:868
 msgid "volume key"
 msgstr ""
 
-#: src/storage_backend_fs.c:767
+#: src/storage_backend_fs.c:895
 #, c-format
 msgid "cannot statvfs path '%s': %s"
 msgstr ""
 
-#: src/storage_backend_fs.c:828
+#: src/storage_backend_fs.c:956
 #, c-format
 msgid "cannot unlink path '%s': %s"
 msgstr ""
 
-#: src/storage_backend_fs.c:851
+#: src/storage_backend_fs.c:979
 msgid "target"
 msgstr ""
 
-#: src/storage_backend_fs.c:860
+#: src/storage_backend_fs.c:988
 msgid "storage vol key"
 msgstr ""
 
-#: src/storage_backend_fs.c:885
+#: src/storage_backend_fs.c:1013
 #, c-format
 msgid "cannot fill file '%s': %s"
 msgstr ""
 
-#: src/storage_backend_fs.c:898
+#: src/storage_backend_fs.c:1026
 #, c-format
 msgid "cannot extend file '%s': %s"
 msgstr ""
 
-#: src/storage_backend_fs.c:914 src/storage_backend_fs.c:950
-#: src/storage_backend_fs.c:985 src/storage_backend_logical.c:474
+#: src/storage_backend_fs.c:1042 src/storage_backend_fs.c:1078
+#: src/storage_backend_fs.c:1113 src/storage_backend_logical.c:543
 #, c-format
 msgid "cannot read path '%s': %s"
 msgstr ""
 
-#: src/storage_backend_fs.c:927
+#: src/storage_backend_fs.c:1055
 #, c-format
 msgid "unknown storage vol type %d"
 msgstr ""
 
-#: src/storage_backend_fs.c:965
+#: src/storage_backend_fs.c:1093
 #, c-format
 msgid "unsupported storage vol type %d"
 msgstr ""
 
-#: src/storage_backend_fs.c:992
+#: src/storage_backend_fs.c:1120
 msgid "creation of non-raw images is not supported without qemu-img"
 msgstr ""
 
-#: src/storage_backend_fs.c:1002 src/storage_backend_logical.c:483
+#: src/storage_backend_fs.c:1130 src/storage_backend_logical.c:552
 #, c-format
 msgid "cannot set file owner '%s': %s"
 msgstr ""
 
-#: src/storage_backend_fs.c:1011 src/storage_backend_logical.c:490
+#: src/storage_backend_fs.c:1139 src/storage_backend_logical.c:559
 #, c-format
 msgid "cannot set file mode '%s': %s"
 msgstr ""
 
-#: src/storage_backend_fs.c:1027 src/storage_backend_logical.c:497
+#: src/storage_backend_fs.c:1155 src/storage_backend_logical.c:566
 #, c-format
 msgid "cannot close file '%s': %s"
 msgstr ""
 
-#: src/storage_backend_fs.c:1050
+#: src/storage_backend_fs.c:1178
 #, c-format
 msgid "cannot unlink file '%s': %s"
 msgstr ""
@@ -3103,7 +3263,7 @@ msgstr ""
 msgid "cannot find session"
 msgstr ""
 
-#: src/storage_backend_iscsi.c:182 src/storage_driver.c:869
+#: src/storage_backend_iscsi.c:182 src/storage_driver.c:893
 msgid "name"
 msgstr ""
 
@@ -3111,7 +3271,7 @@ msgstr ""
 msgid "devpath"
 msgstr ""
 
-#: src/storage_backend_iscsi.c:206 src/util.c:160
+#: src/storage_backend_iscsi.c:206 src/util.c:161
 #, c-format
 msgid "cannot open %s: %s"
 msgstr ""
@@ -3180,154 +3340,166 @@ msgstr ""
 msgid "lvs command failed with exitstatus %d"
 msgstr ""
 
-#: src/storage_backend_logical.c:286
+#: src/storage_backend_logical.c:355
 msgid "command line"
 msgstr ""
 
-#: src/storage_backend_logical.c:303
+#: src/storage_backend_logical.c:372
 #, c-format
 msgid "cannot open device %s"
 msgstr ""
 
-#: src/storage_backend_logical.c:309
+#: src/storage_backend_logical.c:378
 #, c-format
 msgid "cannot clear device header %s"
 msgstr ""
 
-#: src/storage_backend_logical.c:316
+#: src/storage_backend_logical.c:385
 #, c-format
 msgid "cannot close device %s"
 msgstr ""
 
-#: src/storage_backend_logical.c:506
+#: src/storage_backend_logical.c:575
 #, c-format
 msgid "cannot find newly created volume '%s': %s"
 msgstr ""
 
-#: src/storage_conf.c:155
+#: src/storage_conf.c:156
 msgid "missing auth host attribute"
 msgstr ""
 
-#: src/storage_conf.c:162
+#: src/storage_conf.c:163
 msgid "missing auth passwd attribute"
 msgstr ""
 
-#: src/storage_conf.c:185 src/storage_conf.c:566
+#: src/storage_conf.c:186 src/storage_conf.c:582
 msgid "malformed octal mode"
 msgstr ""
 
-#: src/storage_conf.c:195
+#: src/storage_conf.c:196
 msgid "malformed owner element"
 msgstr ""
 
-#: src/storage_conf.c:206
+#: src/storage_conf.c:207
 msgid "malformed group element"
 msgstr ""
 
-#: src/storage_conf.c:231
+#: src/storage_conf.c:232
 msgid "cannot allocate storage pool"
 msgstr ""
 
-#: src/storage_conf.c:237 src/storage_conf.c:694
-msgid "unknown root element"
+#: src/storage_conf.c:238
+msgid "unknown root elementi for storage pool"
 msgstr ""
 
-#: src/storage_conf.c:253 src/storage_conf.c:701
-msgid "missing name element"
+#: src/storage_conf.c:258
+msgid "missing pool source name element"
 msgstr ""
 
-#: src/storage_conf.c:261
+#: src/storage_conf.c:266
 msgid "unable to generate uuid"
 msgstr ""
 
-#: src/storage_conf.c:285
-msgid "missing source host name"
-msgstr ""
-
-#: src/storage_conf.c:295
-msgid "cannot extract source devices"
+#: src/storage_conf.c:290
+msgid "missing storage pool source host name"
 msgstr ""
 
 #: src/storage_conf.c:300
+msgid "cannot extract storage pool source devices"
+msgstr ""
+
+#: src/storage_conf.c:305
 msgid "device"
 msgstr ""
 
-#: src/storage_conf.c:308
-msgid "missing source device path"
+#: src/storage_conf.c:313
+msgid "missing storage pool source device path"
 msgstr ""
 
-#: src/storage_conf.c:333
+#: src/storage_conf.c:324
+msgid "missing storage pool source path"
+msgstr ""
+
+#: src/storage_conf.c:346
 #, c-format
 msgid "unknown auth type '%s'"
 msgstr ""
 
-#: src/storage_conf.c:348
-msgid "missing target path"
+#: src/storage_conf.c:361
+msgid "missing storage pool target path"
 msgstr ""
 
-#: src/storage_conf.c:460
+#: src/storage_conf.c:473
 msgid "unexpected pool type"
 msgstr ""
 
-#: src/storage_conf.c:544 src/storage_conf.c:898
+#: src/storage_conf.c:560 src/storage_conf.c:914
 msgid "xml"
 msgstr ""
 
-#: src/storage_conf.c:576 src/storage_conf.c:586
+#: src/storage_conf.c:592 src/storage_conf.c:602
 msgid "missing owner element"
 msgstr ""
 
-#: src/storage_conf.c:650
+#: src/storage_conf.c:666
 #, c-format
 msgid "unknown size units '%s'"
 msgstr ""
 
-#: src/storage_conf.c:657
+#: src/storage_conf.c:673
 msgid "malformed capacity element"
 msgstr ""
 
-#: src/storage_conf.c:662
+#: src/storage_conf.c:678
 msgid "capacity element value too large"
 msgstr ""
 
-#: src/storage_conf.c:688
+#: src/storage_conf.c:704
 msgid "cannot allocate storage vol"
 msgstr ""
 
-#: src/storage_conf.c:712
+#: src/storage_conf.c:710
+msgid "unknown root element"
+msgstr ""
+
+#: src/storage_conf.c:717
+msgid "missing volume name element"
+msgstr ""
+
+#: src/storage_conf.c:728
 msgid "missing capacity element"
 msgstr ""
 
-#: src/storage_conf.c:1009
+#: src/storage_conf.c:1025
 msgid "pool"
 msgstr ""
 
-#: src/storage_conf.c:1146
+#: src/storage_conf.c:1162
 msgid "cannot construct config file path"
 msgstr ""
 
-#: src/storage_conf.c:1151
+#: src/storage_conf.c:1167
 msgid "configFile"
 msgstr ""
 
-#: src/storage_conf.c:1158
+#: src/storage_conf.c:1174
 msgid "cannot construct autostart link path"
 msgstr ""
 
-#: src/storage_conf.c:1165
+#: src/storage_conf.c:1181
 msgid "config file"
 msgstr ""
 
-#: src/storage_conf.c:1173
+#: src/storage_conf.c:1189
 msgid "failed to generate XML"
 msgstr ""
 
-#: src/storage_conf.c:1223
+#: src/storage_conf.c:1239
 #, c-format
 msgid "cannot remove config for %s"
 msgstr ""
 
-#: src/storage_driver.c:266 src/storage_driver.c:750 src/storage_driver.c:772
+#: src/storage_driver.c:266 src/storage_driver.c:774 src/storage_driver.c:796
 msgid "no pool with matching uuid"
 msgstr ""
 
@@ -3339,73 +3511,73 @@ msgstr ""
 msgid "names"
 msgstr ""
 
-#: src/storage_driver.c:406
+#: src/storage_driver.c:430
 msgid "storage pool already exists"
 msgstr ""
 
-#: src/storage_driver.c:479 src/storage_driver.c:516 src/storage_driver.c:555
-#: src/storage_driver.c:586 src/storage_driver.c:627 src/storage_driver.c:664
-#: src/storage_driver.c:705 src/storage_driver.c:734 src/storage_driver.c:828
-#: src/storage_driver.c:853 src/storage_driver.c:898 src/storage_driver.c:982
-#: src/storage_driver.c:1036 src/storage_driver.c:1099
-#: src/storage_driver.c:1143 src/storage_driver.c:1177
+#: src/storage_driver.c:503 src/storage_driver.c:540 src/storage_driver.c:579
+#: src/storage_driver.c:610 src/storage_driver.c:651 src/storage_driver.c:688
+#: src/storage_driver.c:729 src/storage_driver.c:758 src/storage_driver.c:852
+#: src/storage_driver.c:877 src/storage_driver.c:922 src/storage_driver.c:1006
+#: src/storage_driver.c:1060 src/storage_driver.c:1123
+#: src/storage_driver.c:1167 src/storage_driver.c:1201
 msgid "no storage pool with matching uuid"
 msgstr ""
 
-#: src/storage_driver.c:485
+#: src/storage_driver.c:509
 msgid "pool is still active"
 msgstr ""
 
-#: src/storage_driver.c:526
+#: src/storage_driver.c:550
 msgid "pool already active"
 msgstr ""
 
-#: src/storage_driver.c:565
+#: src/storage_driver.c:589
 msgid "storage pool is already active"
 msgstr ""
 
-#: src/storage_driver.c:596 src/storage_driver.c:674 src/storage_driver.c:834
-#: src/storage_driver.c:859 src/storage_driver.c:904 src/storage_driver.c:988
-#: src/storage_driver.c:1042 src/storage_driver.c:1105
-#: src/storage_driver.c:1149 src/storage_driver.c:1183
+#: src/storage_driver.c:620 src/storage_driver.c:698 src/storage_driver.c:858
+#: src/storage_driver.c:883 src/storage_driver.c:928 src/storage_driver.c:1012
+#: src/storage_driver.c:1066 src/storage_driver.c:1129
+#: src/storage_driver.c:1173 src/storage_driver.c:1207
 msgid "storage pool is not active"
 msgstr ""
 
-#: src/storage_driver.c:637
+#: src/storage_driver.c:661
 msgid "storage pool is still active"
 msgstr ""
 
-#: src/storage_driver.c:643
+#: src/storage_driver.c:667
 msgid "pool does not support volume delete"
 msgstr ""
 
-#: src/storage_driver.c:778
+#: src/storage_driver.c:802
 msgid "pool has no config file"
 msgstr ""
 
-#: src/storage_driver.c:912 src/storage_driver.c:1053
-#: src/storage_driver.c:1113 src/storage_driver.c:1157
-#: src/storage_driver.c:1191
+#: src/storage_driver.c:936 src/storage_driver.c:1077
+#: src/storage_driver.c:1137 src/storage_driver.c:1181
+#: src/storage_driver.c:1215
 msgid "no storage vol with matching name"
 msgstr ""
 
-#: src/storage_driver.c:941
+#: src/storage_driver.c:965
 msgid "no storage vol with matching key"
 msgstr ""
 
-#: src/storage_driver.c:966
+#: src/storage_driver.c:990
 msgid "no storage vol with matching path"
 msgstr ""
 
-#: src/storage_driver.c:1001
+#: src/storage_driver.c:1025
 msgid "storage vol already exists"
 msgstr ""
 
-#: src/storage_driver.c:1008
+#: src/storage_driver.c:1032
 msgid "storage pool does not support volume creation"
 msgstr ""
 
-#: src/storage_driver.c:1059
+#: src/storage_driver.c:1083
 msgid "storage pool does not support vol deletion"
 msgstr ""
 
@@ -3553,62 +3725,57 @@ msgstr ""
 msgid "Network is already running"
 msgstr ""
 
-#: src/util.c:153
+#: src/util.c:154
 #, c-format
 msgid "cannot block signals: %s"
 msgstr ""
 
-#: src/util.c:169
+#: src/util.c:170
 #, c-format
 msgid "cannot create pipe: %s"
 msgstr ""
 
-#: src/util.c:229 src/util.c:317
+#: src/util.c:230 src/util.c:320
 #, c-format
 msgid "cannot fork child process: %s"
 msgstr ""
 
-#: src/util.c:248 src/util.c:286
+#: src/util.c:249 src/util.c:287
 #, c-format
 msgid "cannot unblock signals: %s"
 msgstr ""
 
-#: src/util.c:302
+#: src/util.c:305
 #, c-format
 msgid "cannot become session leader: %s"
 msgstr ""
 
-#: src/util.c:309
+#: src/util.c:312
 #, c-format
 msgid "cannot change to root directory: %s"
 msgstr ""
 
-#: src/util.c:329
+#: src/util.c:332
 #, c-format
 msgid "failed to setup stdin file handle: %s"
 msgstr ""
 
-#: src/util.c:335
+#: src/util.c:338
 #, c-format
 msgid "failed to setup stdout file handle: %s"
 msgstr ""
 
-#: src/util.c:341
+#: src/util.c:344
 #, c-format
 msgid "failed to setup stderr file handle: %s"
 msgstr ""
 
-#: src/util.c:358
+#: src/util.c:361
 #, c-format
 msgid "cannot execute binary '%s': %s"
 msgstr ""
 
-#: src/util.c:412
-#, c-format
-msgid "cannot wait for '%s': %s"
-msgstr ""
-
-#: src/util.c:423
+#: src/util.c:427
 #, c-format
 msgid "%s exited with non-zero status %d and signal %d"
 msgstr ""
@@ -3649,9 +3816,9 @@ msgstr ""
 #: src/virsh.c:1303 src/virsh.c:1348 src/virsh.c:1387 src/virsh.c:1426
 #: src/virsh.c:1465 src/virsh.c:1504 src/virsh.c:1628 src/virsh.c:1715
 #: src/virsh.c:1849 src/virsh.c:1906 src/virsh.c:1963 src/virsh.c:2085
-#: src/virsh.c:2226 src/virsh.c:4317 src/virsh.c:4393 src/virsh.c:4454
-#: src/virsh.c:4511 src/virsh.c:4568 src/virsh.c:4682 src/virsh.c:4801
-#: src/virsh.c:4964 src/virsh.c:5193
+#: src/virsh.c:2226 src/virsh.c:4454 src/virsh.c:4530 src/virsh.c:4591
+#: src/virsh.c:4648 src/virsh.c:4705 src/virsh.c:4819 src/virsh.c:4938
+#: src/virsh.c:5101 src/virsh.c:5330
 msgid "domain name, id or uuid"
 msgstr ""
 
@@ -3748,15 +3915,15 @@ msgstr ""
 msgid "Id"
 msgstr ""
 
-#: src/virsh.c:614 src/virsh.c:2573 src/virsh.c:3370 src/virsh.c:4033
+#: src/virsh.c:614 src/virsh.c:2573 src/virsh.c:3374 src/virsh.c:4170
 msgid "Name"
 msgstr ""
 
-#: src/virsh.c:614 src/virsh.c:2573 src/virsh.c:3370
+#: src/virsh.c:614 src/virsh.c:2573 src/virsh.c:3374
 msgid "State"
 msgstr ""
 
-#: src/virsh.c:627 src/virsh.c:649 src/virsh.c:6150 src/virsh.c:6166
+#: src/virsh.c:627 src/virsh.c:649 src/virsh.c:6291 src/virsh.c:6307
 msgid "no state"
 msgstr ""
 
@@ -4097,11 +4264,11 @@ msgstr ""
 msgid "Id:"
 msgstr ""
 
-#: src/virsh.c:1528 src/virsh.c:3475 src/virsh.c:3921
+#: src/virsh.c:1528 src/virsh.c:3612 src/virsh.c:4058
 msgid "Name:"
 msgstr ""
 
-#: src/virsh.c:1531 src/virsh.c:3478
+#: src/virsh.c:1531 src/virsh.c:3615
 msgid "UUID:"
 msgstr ""
 
@@ -4109,8 +4276,8 @@ msgstr ""
 msgid "OS Type:"
 msgstr ""
 
-#: src/virsh.c:1539 src/virsh.c:1672 src/virsh.c:3485 src/virsh.c:3489
-#: src/virsh.c:3493 src/virsh.c:3497
+#: src/virsh.c:1539 src/virsh.c:1672 src/virsh.c:3622 src/virsh.c:3626
+#: src/virsh.c:3630 src/virsh.c:3634
 msgid "State:"
 msgstr ""
 
@@ -4498,7 +4665,7 @@ msgstr ""
 msgid "Destroy a given network."
 msgstr ""
 
-#: src/virsh.c:2435 src/virsh.c:2475 src/virsh.c:5296
+#: src/virsh.c:2435 src/virsh.c:2475 src/virsh.c:5433
 msgid "network name, id or uuid"
 msgstr ""
 
@@ -4544,19 +4711,19 @@ msgstr ""
 msgid "Failed to list inactive networks"
 msgstr ""
 
-#: src/virsh.c:2573 src/virsh.c:3370
+#: src/virsh.c:2573 src/virsh.c:3374
 msgid "Autostart"
 msgstr ""
 
-#: src/virsh.c:2588 src/virsh.c:2611 src/virsh.c:3385 src/virsh.c:3408
+#: src/virsh.c:2588 src/virsh.c:2611 src/virsh.c:3389 src/virsh.c:3412
 msgid "no autostart"
 msgstr ""
 
-#: src/virsh.c:2594 src/virsh.c:3391
+#: src/virsh.c:2594 src/virsh.c:3395
 msgid "active"
 msgstr ""
 
-#: src/virsh.c:2617 src/virsh.c:3414 src/virsh.c:3486
+#: src/virsh.c:2617 src/virsh.c:3418 src/virsh.c:3623
 msgid "inactive"
 msgstr ""
 
@@ -4628,10 +4795,10 @@ msgstr ""
 msgid "Configure a pool to be automatically started at boot."
 msgstr ""
 
-#: src/virsh.c:2786 src/virsh.c:3112 src/virsh.c:3152 src/virsh.c:3192
-#: src/virsh.c:3232 src/virsh.c:3272 src/virsh.c:3457 src/virsh.c:3725
-#: src/virsh.c:3861 src/virsh.c:3903 src/virsh.c:3955 src/virsh.c:3997
-#: src/virsh.c:4141 src/virsh.c:5314
+#: src/virsh.c:2786 src/virsh.c:3116 src/virsh.c:3156 src/virsh.c:3196
+#: src/virsh.c:3236 src/virsh.c:3276 src/virsh.c:3594 src/virsh.c:3862
+#: src/virsh.c:3998 src/virsh.c:4040 src/virsh.c:4092 src/virsh.c:4134
+#: src/virsh.c:4278 src/virsh.c:5451
 msgid "pool name or uuid"
 msgstr ""
 
@@ -4701,11 +4868,11 @@ msgstr ""
 msgid "source device for underlying storage"
 msgstr ""
 
-#: src/virsh.c:2888 src/virsh.c:3027
+#: src/virsh.c:2888 src/virsh.c:3028
 msgid "target for underlying storage"
 msgstr ""
 
-#: src/virsh.c:2940 src/virsh.c:3078 src/virsh.c:3690
+#: src/virsh.c:2940 src/virsh.c:3082 src/virsh.c:3827
 msgid "Failed to allocate XML buffer"
 msgstr ""
 
@@ -4741,771 +4908,821 @@ msgstr ""
 msgid "define a pool from a set of args"
 msgstr ""
 
-#: src/virsh.c:3087
-#, c-format
-msgid "Pool %s defined\n"
+#: src/virsh.c:3027
+msgid "source name for underlying storage"
 msgstr ""
 
 #: src/virsh.c:3091
 #, c-format
+msgid "Pool %s defined\n"
+msgstr ""
+
+#: src/virsh.c:3095
+#, c-format
 msgid "Failed to define pool %s"
 msgstr ""
 
-#: src/virsh.c:3106
+#: src/virsh.c:3110
 msgid "build a pool"
 msgstr ""
 
-#: src/virsh.c:3107
+#: src/virsh.c:3111
 msgid "Build a given pool."
 msgstr ""
 
-#: src/virsh.c:3130
+#: src/virsh.c:3134
 #, c-format
 msgid "Pool %s builded\n"
 msgstr ""
 
-#: src/virsh.c:3132
+#: src/virsh.c:3136
 #, c-format
 msgid "Failed to build pool %s"
 msgstr ""
 
-#: src/virsh.c:3146
+#: src/virsh.c:3150
 msgid "destroy a pool"
 msgstr ""
 
-#: src/virsh.c:3147
+#: src/virsh.c:3151
 msgid "Destroy a given pool."
 msgstr ""
 
-#: src/virsh.c:3170
+#: src/virsh.c:3174
 #, c-format
 msgid "Pool %s destroyed\n"
 msgstr ""
 
-#: src/virsh.c:3172
+#: src/virsh.c:3176
 #, c-format
 msgid "Failed to destroy pool %s"
 msgstr ""
 
-#: src/virsh.c:3186
+#: src/virsh.c:3190
 msgid "delete a pool"
 msgstr ""
 
-#: src/virsh.c:3187
+#: src/virsh.c:3191
 msgid "Delete a given pool."
 msgstr ""
 
-#: src/virsh.c:3210
+#: src/virsh.c:3214
 #, c-format
 msgid "Pool %s deleted\n"
 msgstr ""
 
-#: src/virsh.c:3212
+#: src/virsh.c:3216
 #, c-format
 msgid "Failed to delete pool %s"
 msgstr ""
 
-#: src/virsh.c:3226
+#: src/virsh.c:3230
 msgid "refresh a pool"
 msgstr ""
 
-#: src/virsh.c:3227
+#: src/virsh.c:3231
 msgid "Refresh a given pool."
 msgstr ""
 
-#: src/virsh.c:3250
+#: src/virsh.c:3254
 #, c-format
 msgid "Pool %s refreshed\n"
 msgstr ""
 
-#: src/virsh.c:3252
+#: src/virsh.c:3256
 #, c-format
 msgid "Failed to refresh pool %s"
 msgstr ""
 
-#: src/virsh.c:3266
+#: src/virsh.c:3270
 msgid "pool information in XML"
 msgstr ""
 
-#: src/virsh.c:3267
+#: src/virsh.c:3271
 msgid "Output the pool information as an XML dump to stdout."
 msgstr ""
 
-#: src/virsh.c:3307
+#: src/virsh.c:3311
 msgid "list pools"
 msgstr ""
 
-#: src/virsh.c:3308
+#: src/virsh.c:3312
 msgid "Returns list of pools."
 msgstr ""
 
-#: src/virsh.c:3313
+#: src/virsh.c:3317
 msgid "list inactive pools"
 msgstr ""
 
-#: src/virsh.c:3314
+#: src/virsh.c:3318
 msgid "list inactive & active pools"
 msgstr ""
 
-#: src/virsh.c:3334 src/virsh.c:3342
+#: src/virsh.c:3338 src/virsh.c:3346
 msgid "Failed to list active pools"
 msgstr ""
 
-#: src/virsh.c:3353 src/virsh.c:3361
+#: src/virsh.c:3357 src/virsh.c:3365
 msgid "Failed to list inactive pools"
 msgstr ""
 
-#: src/virsh.c:3451
+#: src/virsh.c:3434
+msgid "find potential storage pool sources"
+msgstr ""
+
+#: src/virsh.c:3435 src/virsh.c:3516
+msgid "Returns XML <sources> document."
+msgstr ""
+
+#: src/virsh.c:3441
+msgid "type of storage pool sources to find"
+msgstr ""
+
+#: src/virsh.c:3442
+msgid "optional host to query"
+msgstr ""
+
+#: src/virsh.c:3443
+msgid "optional port to query"
+msgstr ""
+
+#: src/virsh.c:3488
+msgid "Out of memory"
+msgstr ""
+
+#: src/virsh.c:3491
+#, c-format
+msgid "asprintf failed (errno %d)"
+msgstr ""
+
+#: src/virsh.c:3500 src/virsh.c:3552
+#, c-format
+msgid "Failed to find any %s pool sources"
+msgstr ""
+
+#: src/virsh.c:3515
+msgid "discover potential storage pool sources"
+msgstr ""
+
+#: src/virsh.c:3522
+msgid "type of storage pool sources to discover"
+msgstr ""
+
+#: src/virsh.c:3524
+msgid "optional file of source xml to query for pools"
+msgstr ""
+
+#: src/virsh.c:3588
 msgid "storage pool information"
 msgstr ""
 
-#: src/virsh.c:3452
+#: src/virsh.c:3589
 msgid "Returns basic information about the storage pool."
 msgstr ""
 
-#: src/virsh.c:3490
+#: src/virsh.c:3627
 msgid "building"
 msgstr ""
 
-#: src/virsh.c:3494 src/virsh.c:6136 src/virsh.c:6162
+#: src/virsh.c:3631 src/virsh.c:6277 src/virsh.c:6303
 msgid "running"
 msgstr ""
 
-#: src/virsh.c:3498
+#: src/virsh.c:3635
 msgid "degraded"
 msgstr ""
 
-#: src/virsh.c:3505 src/virsh.c:3931
+#: src/virsh.c:3642 src/virsh.c:4068
 msgid "Capacity:"
 msgstr ""
 
-#: src/virsh.c:3508 src/virsh.c:3934
+#: src/virsh.c:3645 src/virsh.c:4071
 msgid "Allocation:"
 msgstr ""
 
-#: src/virsh.c:3511
+#: src/virsh.c:3648
 msgid "Available:"
 msgstr ""
 
-#: src/virsh.c:3527
+#: src/virsh.c:3664
 msgid "convert a pool UUID to pool name"
 msgstr ""
 
-#: src/virsh.c:3532
+#: src/virsh.c:3669
 msgid "pool uuid"
 msgstr ""
 
-#: src/virsh.c:3558
+#: src/virsh.c:3695
 msgid "start a (previously defined) inactive pool"
 msgstr ""
 
-#: src/virsh.c:3559
+#: src/virsh.c:3696
 msgid "Start a pool."
 msgstr ""
 
-#: src/virsh.c:3564
+#: src/virsh.c:3701
 msgid "name of the inactive pool"
 msgstr ""
 
-#: src/virsh.c:3581
+#: src/virsh.c:3718
 #, c-format
 msgid "Pool %s started\n"
 msgstr ""
 
-#: src/virsh.c:3584
+#: src/virsh.c:3721
 #, c-format
 msgid "Failed to start pool %s"
 msgstr ""
 
-#: src/virsh.c:3597
+#: src/virsh.c:3734
 msgid "create a volume from a set of args"
 msgstr ""
 
-#: src/virsh.c:3598 src/virsh.c:3797
+#: src/virsh.c:3735 src/virsh.c:3934
 msgid "Create a vol."
 msgstr ""
 
-#: src/virsh.c:3603 src/virsh.c:3763 src/virsh.c:3802
+#: src/virsh.c:3740 src/virsh.c:3900 src/virsh.c:3939
 msgid "pool name"
 msgstr ""
 
-#: src/virsh.c:3604
+#: src/virsh.c:3741
 msgid "name of the volume"
 msgstr ""
 
-#: src/virsh.c:3605
+#: src/virsh.c:3742
 msgid "size of the vol with optional k,M,G,T suffix"
 msgstr ""
 
-#: src/virsh.c:3606
+#: src/virsh.c:3743
 msgid "initial allocation size with optional k,M,G,T suffix"
 msgstr ""
 
-#: src/virsh.c:3607
+#: src/virsh.c:3744
 msgid "file format type raw,bochs,qcow,qcow2,vmdk"
 msgstr ""
 
-#: src/virsh.c:3665 src/virsh.c:3670
+#: src/virsh.c:3802 src/virsh.c:3807
 #, c-format
 msgid "Malformed size %s"
 msgstr ""
 
-#: src/virsh.c:3699
+#: src/virsh.c:3836
 #, c-format
 msgid "Vol %s created\n"
 msgstr ""
 
-#: src/virsh.c:3703
+#: src/virsh.c:3840
 #, c-format
 msgid "Failed to create vol %s"
 msgstr ""
 
-#: src/virsh.c:3719
+#: src/virsh.c:3856
 msgid "undefine an inactive pool"
 msgstr ""
 
-#: src/virsh.c:3720
+#: src/virsh.c:3857
 msgid "Undefine the configuration for an inactive pool."
 msgstr ""
 
-#: src/virsh.c:3743
+#: src/virsh.c:3880
 #, c-format
 msgid "Pool %s has been undefined\n"
 msgstr ""
 
-#: src/virsh.c:3745
+#: src/virsh.c:3882
 #, c-format
 msgid "Failed to undefine pool %s"
 msgstr ""
 
-#: src/virsh.c:3758
+#: src/virsh.c:3895
 msgid "convert a pool name to pool UUID"
 msgstr ""
 
-#: src/virsh.c:3783
+#: src/virsh.c:3920
 msgid "failed to get pool UUID"
 msgstr ""
 
-#: src/virsh.c:3796
+#: src/virsh.c:3933
 msgid "create a vol from an XML file"
 msgstr ""
 
-#: src/virsh.c:3803
+#: src/virsh.c:3940
 msgid "file containing an XML vol description"
 msgstr ""
 
-#: src/virsh.c:3840
+#: src/virsh.c:3977
 #, c-format
 msgid "Vol %s created from %s\n"
 msgstr ""
 
-#: src/virsh.c:3844
+#: src/virsh.c:3981
 #, c-format
 msgid "Failed to create vol from %s"
 msgstr ""
 
-#: src/virsh.c:3855
+#: src/virsh.c:3992
 msgid "delete a vol"
 msgstr ""
 
-#: src/virsh.c:3856
+#: src/virsh.c:3993
 msgid "Delete a given vol."
 msgstr ""
 
-#: src/virsh.c:3862 src/virsh.c:3904 src/virsh.c:3956
+#: src/virsh.c:3999 src/virsh.c:4041 src/virsh.c:4093
 msgid "vol name, key or path"
 msgstr ""
 
-#: src/virsh.c:3881
+#: src/virsh.c:4018
 #, c-format
 msgid "Vol %s deleted\n"
 msgstr ""
 
-#: src/virsh.c:3883
+#: src/virsh.c:4020
 #, c-format
 msgid "Failed to delete vol %s"
 msgstr ""
 
-#: src/virsh.c:3897
+#: src/virsh.c:4034
 msgid "storage vol information"
 msgstr ""
 
-#: src/virsh.c:3898
+#: src/virsh.c:4035
 msgid "Returns basic information about the storage vol."
 msgstr ""
 
-#: src/virsh.c:3926
+#: src/virsh.c:4063
 msgid "Type:"
 msgstr ""
 
-#: src/virsh.c:3928
+#: src/virsh.c:4065
 msgid "file"
 msgstr ""
 
-#: src/virsh.c:3928
+#: src/virsh.c:4065
 msgid "block"
 msgstr ""
 
-#: src/virsh.c:3949
+#: src/virsh.c:4086
 msgid "vol information in XML"
 msgstr ""
 
-#: src/virsh.c:3950
+#: src/virsh.c:4087
 msgid "Output the vol information as an XML dump to stdout."
 msgstr ""
 
-#: src/virsh.c:3991
+#: src/virsh.c:4128
 msgid "list vols"
 msgstr ""
 
-#: src/virsh.c:3992
+#: src/virsh.c:4129
 msgid "Returns list of vols by pool."
 msgstr ""
 
-#: src/virsh.c:4017 src/virsh.c:4025
+#: src/virsh.c:4154 src/virsh.c:4162
 msgid "Failed to list active vols"
 msgstr ""
 
-#: src/virsh.c:4033
+#: src/virsh.c:4170
 msgid "Path"
 msgstr ""
 
-#: src/virsh.c:4070
+#: src/virsh.c:4207
 msgid "convert a vol UUID to vol name"
 msgstr ""
 
-#: src/virsh.c:4075
+#: src/virsh.c:4212
 msgid "vol key or path"
 msgstr ""
 
-#: src/virsh.c:4103
+#: src/virsh.c:4240
 msgid "convert a vol UUID to vol key"
 msgstr ""
 
-#: src/virsh.c:4108
+#: src/virsh.c:4245
 msgid "vol uuid"
 msgstr ""
 
-#: src/virsh.c:4136
+#: src/virsh.c:4273
 msgid "convert a vol UUID to vol path"
 msgstr ""
 
-#: src/virsh.c:4142
+#: src/virsh.c:4279
 msgid "vol name or key"
 msgstr ""
 
-#: src/virsh.c:4173
+#: src/virsh.c:4310
 msgid "show version"
 msgstr ""
 
-#: src/virsh.c:4174
+#: src/virsh.c:4311
 msgid "Display the system version information."
 msgstr ""
 
-#: src/virsh.c:4197
+#: src/virsh.c:4334
 msgid "failed to get hypervisor type"
 msgstr ""
 
-#: src/virsh.c:4206
+#: src/virsh.c:4343
 #, c-format
 msgid "Compiled against library: libvir %d.%d.%d\n"
 msgstr ""
 
-#: src/virsh.c:4211
+#: src/virsh.c:4348
 msgid "failed to get the library version"
 msgstr ""
 
-#: src/virsh.c:4218
+#: src/virsh.c:4355
 #, c-format
 msgid "Using library: libvir %d.%d.%d\n"
 msgstr ""
 
-#: src/virsh.c:4225
+#: src/virsh.c:4362
 #, c-format
 msgid "Using API: %s %d.%d.%d\n"
 msgstr ""
 
-#: src/virsh.c:4230
+#: src/virsh.c:4367
 msgid "failed to get the hypervisor version"
 msgstr ""
 
-#: src/virsh.c:4235
+#: src/virsh.c:4372
 #, c-format
 msgid "Cannot extract running %s hypervisor version\n"
 msgstr ""
 
-#: src/virsh.c:4242
+#: src/virsh.c:4379
 #, c-format
 msgid "Running hypervisor: %s %d.%d.%d\n"
 msgstr ""
 
-#: src/virsh.c:4253
+#: src/virsh.c:4390
 msgid "print the hypervisor hostname"
 msgstr ""
 
-#: src/virsh.c:4267
+#: src/virsh.c:4404
 msgid "failed to get hostname"
 msgstr ""
 
-#: src/virsh.c:4282
+#: src/virsh.c:4419
 msgid "print the hypervisor canonical URI"
 msgstr ""
 
-#: src/virsh.c:4296
+#: src/virsh.c:4433
 msgid "failed to get URI"
 msgstr ""
 
-#: src/virsh.c:4311
+#: src/virsh.c:4448
 msgid "vnc display"
 msgstr ""
 
-#: src/virsh.c:4312
+#: src/virsh.c:4449
 msgid "Output the IP address and port number for the VNC display."
 msgstr ""
 
-#: src/virsh.c:4387
+#: src/virsh.c:4524
 msgid "tty console"
 msgstr ""
 
-#: src/virsh.c:4388
+#: src/virsh.c:4525
 msgid "Output the device for the TTY console."
 msgstr ""
 
-#: src/virsh.c:4448
+#: src/virsh.c:4585
 msgid "attach device from an XML file"
 msgstr ""
 
-#: src/virsh.c:4449
+#: src/virsh.c:4586
 msgid "Attach device from an XML <file>."
 msgstr ""
 
-#: src/virsh.c:4455 src/virsh.c:4512
+#: src/virsh.c:4592 src/virsh.c:4649
 msgid "XML file"
 msgstr ""
 
-#: src/virsh.c:4476
+#: src/virsh.c:4613
 msgid "attach-device: Missing <file> option"
 msgstr ""
 
-#: src/virsh.c:4490
+#: src/virsh.c:4627
 #, c-format
 msgid "Failed to attach device from %s"
 msgstr ""
 
-#: src/virsh.c:4505
+#: src/virsh.c:4642
 msgid "detach device from an XML file"
 msgstr ""
 
-#: src/virsh.c:4506
+#: src/virsh.c:4643
 msgid "Detach device from an XML <file>"
 msgstr ""
 
-#: src/virsh.c:4533
+#: src/virsh.c:4670
 msgid "detach-device: Missing <file> option"
 msgstr ""
 
-#: src/virsh.c:4547
+#: src/virsh.c:4684
 #, c-format
 msgid "Failed to detach device from %s"
 msgstr ""
 
-#: src/virsh.c:4562
+#: src/virsh.c:4699
 msgid "attach network interface"
 msgstr ""
 
-#: src/virsh.c:4563
+#: src/virsh.c:4700
 msgid "Attach new network interface."
 msgstr ""
 
-#: src/virsh.c:4569 src/virsh.c:4683
+#: src/virsh.c:4706 src/virsh.c:4820
 msgid "network interface type"
 msgstr ""
 
-#: src/virsh.c:4570
+#: src/virsh.c:4707
 msgid "source of network interface"
 msgstr ""
 
-#: src/virsh.c:4571
+#: src/virsh.c:4708
 msgid "target network name"
 msgstr ""
 
-#: src/virsh.c:4572 src/virsh.c:4684
+#: src/virsh.c:4709 src/virsh.c:4821
 msgid "MAC address"
 msgstr ""
 
-#: src/virsh.c:4573
+#: src/virsh.c:4710
 msgid "script used to bridge network interface"
 msgstr ""
 
-#: src/virsh.c:4605
+#: src/virsh.c:4742
 #, c-format
 msgid "No support %s in command 'attach-interface'"
 msgstr ""
 
-#: src/virsh.c:4676
+#: src/virsh.c:4813
 msgid "detach network interface"
 msgstr ""
 
-#: src/virsh.c:4677
+#: src/virsh.c:4814
 msgid "Detach network interface."
 msgstr ""
 
-#: src/virsh.c:4722 src/virsh.c:4727
+#: src/virsh.c:4859 src/virsh.c:4864
 msgid "Failed to get interface information"
 msgstr ""
 
-#: src/virsh.c:4735
+#: src/virsh.c:4872
 #, c-format
 msgid "No found interface whose type is %s"
 msgstr ""
 
-#: src/virsh.c:4757
+#: src/virsh.c:4894
 #, c-format
 msgid "No found interface whose MAC address is %s"
 msgstr ""
 
-#: src/virsh.c:4763 src/virsh.c:5037
+#: src/virsh.c:4900 src/virsh.c:5174
 msgid "Failed to allocate memory"
 msgstr ""
 
-#: src/virsh.c:4768 src/virsh.c:5042
+#: src/virsh.c:4905 src/virsh.c:5179
 msgid "Failed to create XML"
 msgstr ""
 
-#: src/virsh.c:4795
+#: src/virsh.c:4932
 msgid "attach disk device"
 msgstr ""
 
-#: src/virsh.c:4796
+#: src/virsh.c:4933
 msgid "Attach new disk device."
 msgstr ""
 
-#: src/virsh.c:4802
+#: src/virsh.c:4939
 msgid "source of disk device"
 msgstr ""
 
-#: src/virsh.c:4803 src/virsh.c:4965
+#: src/virsh.c:4940 src/virsh.c:5102
 msgid "target of disk device"
 msgstr ""
 
-#: src/virsh.c:4804
+#: src/virsh.c:4941
 msgid "driver of disk device"
 msgstr ""
 
-#: src/virsh.c:4805
+#: src/virsh.c:4942
 msgid "subdriver of disk device"
 msgstr ""
 
-#: src/virsh.c:4806
+#: src/virsh.c:4943
 msgid "target device type"
 msgstr ""
 
-#: src/virsh.c:4807
+#: src/virsh.c:4944
 msgid "mode of device reading and writing"
 msgstr ""
 
-#: src/virsh.c:4838 src/virsh.c:4847 src/virsh.c:4854
+#: src/virsh.c:4975 src/virsh.c:4984 src/virsh.c:4991
 #, c-format
 msgid "No support %s in command 'attach-disk'"
 msgstr ""
 
-#: src/virsh.c:4958
+#: src/virsh.c:5095
 msgid "detach disk device"
 msgstr ""
 
-#: src/virsh.c:4959
+#: src/virsh.c:5096
 msgid "Detach disk device."
 msgstr ""
 
-#: src/virsh.c:5000 src/virsh.c:5005 src/virsh.c:5012
+#: src/virsh.c:5137 src/virsh.c:5142 src/virsh.c:5149
 msgid "Failed to get disk information"
 msgstr ""
 
-#: src/virsh.c:5031
+#: src/virsh.c:5168
 #, c-format
 msgid "No found disk whose target is %s"
 msgstr ""
 
-#: src/virsh.c:5075
+#: src/virsh.c:5212
 #, c-format
 msgid "malloc: failed to allocate temporary file name: %s"
 msgstr ""
 
-#: src/virsh.c:5086
+#: src/virsh.c:5223
 #, c-format
 msgid "mkstemp: failed to create temporary file: %s"
 msgstr ""
 
-#: src/virsh.c:5093
+#: src/virsh.c:5230
 #, c-format
 msgid "write: %s: failed to write to temporary file: %s"
 msgstr ""
 
-#: src/virsh.c:5102
+#: src/virsh.c:5239
 #, c-format
 msgid "close: %s: failed to write or close temporary file: %s"
 msgstr ""
 
-#: src/virsh.c:5132
+#: src/virsh.c:5269
 #, c-format
 msgid ""
 "%s: $EDITOR environment variable contains shell meta or other unacceptable "
 "characters"
 msgstr ""
 
-#: src/virsh.c:5139
+#: src/virsh.c:5276
 #, c-format
 msgid ""
 "%s: temporary filename contains shell meta or other unacceptable characters "
 "(is $TMPDIR wrong?)"
 msgstr ""
 
-#: src/virsh.c:5146
+#: src/virsh.c:5283
 #, c-format
 msgid "asprintf: could not create editing command: %s"
 msgstr ""
 
-#: src/virsh.c:5154
+#: src/virsh.c:5291
 #, c-format
 msgid "%s: edit command failed: %s"
 msgstr ""
 
-#: src/virsh.c:5160
+#: src/virsh.c:5297
 #, c-format
 msgid "%s: command exited with non-zero status"
 msgstr ""
 
-#: src/virsh.c:5175
+#: src/virsh.c:5312
 #, c-format
 msgid "%s: failed to read temporary file: %s"
 msgstr ""
 
-#: src/virsh.c:5187
+#: src/virsh.c:5324
 msgid "edit XML configuration for a domain"
 msgstr ""
 
-#: src/virsh.c:5188
+#: src/virsh.c:5325
 msgid "Edit the XML configuration for a domain."
 msgstr ""
 
-#: src/virsh.c:5238
+#: src/virsh.c:5375
 #, c-format
 msgid "Domain %s XML configuration not changed.\n"
 msgstr ""
 
-#: src/virsh.c:5254
+#: src/virsh.c:5391
 msgid "ERROR: the XML configuration was changed by another user"
 msgstr ""
 
-#: src/virsh.c:5264
+#: src/virsh.c:5401
 #, c-format
 msgid "Domain %s XML configuration edited.\n"
 msgstr ""
 
-#: src/virsh.c:5290
+#: src/virsh.c:5427
 msgid "edit XML configuration for a network"
 msgstr ""
 
-#: src/virsh.c:5291
+#: src/virsh.c:5428
 msgid "Edit the XML configuration for a network."
 msgstr ""
 
-#: src/virsh.c:5308
+#: src/virsh.c:5445
 msgid "edit XML configuration for a storage pool"
 msgstr ""
 
-#: src/virsh.c:5309
+#: src/virsh.c:5446
 msgid "Edit the XML configuration for a storage pool."
 msgstr ""
 
-#: src/virsh.c:5326
+#: src/virsh.c:5463
 msgid "quit this interactive terminal"
 msgstr ""
 
-#: src/virsh.c:5500
+#: src/virsh.c:5641
 #, c-format
 msgid "command '%s' requires <%s> option"
 msgstr ""
 
-#: src/virsh.c:5501
+#: src/virsh.c:5642
 #, c-format
 msgid "command '%s' requires --%s option"
 msgstr ""
 
-#: src/virsh.c:5528
+#: src/virsh.c:5669
 #, c-format
 msgid "command '%s' doesn't exist"
 msgstr ""
 
-#: src/virsh.c:5536
+#: src/virsh.c:5677
 msgid "  NAME\n"
 msgstr ""
 
-#: src/virsh.c:5540
+#: src/virsh.c:5681
 msgid ""
 "\n"
 "  SYNOPSIS\n"
 msgstr ""
 
-#: src/virsh.c:5547
+#: src/virsh.c:5688
 msgid ""
 "\n"
 "  DESCRIPTION\n"
 msgstr ""
 
-#: src/virsh.c:5551
+#: src/virsh.c:5692
 msgid ""
 "\n"
 "  OPTIONS\n"
 msgstr ""
 
-#: src/virsh.c:5558
+#: src/virsh.c:5699
 #, c-format
 msgid "--%s <number>"
 msgstr ""
 
-#: src/virsh.c:5560
+#: src/virsh.c:5701
 #, c-format
 msgid "--%s <string>"
 msgstr ""
 
-#: src/virsh.c:5704
+#: src/virsh.c:5845
 msgid "undefined domain name or id"
 msgstr ""
 
-#: src/virsh.c:5736
+#: src/virsh.c:5877
 #, c-format
 msgid "failed to get domain '%s'"
 msgstr ""
 
-#: src/virsh.c:5749
+#: src/virsh.c:5890
 msgid "undefined network name"
 msgstr ""
 
-#: src/virsh.c:5773
+#: src/virsh.c:5914
 #, c-format
 msgid "failed to get network '%s'"
 msgstr ""
 
-#: src/virsh.c:5786 src/virsh.c:5832
+#: src/virsh.c:5927 src/virsh.c:5973
 msgid "undefined pool name"
 msgstr ""
 
-#: src/virsh.c:5810
+#: src/virsh.c:5951
 #, c-format
 msgid "failed to get pool '%s'"
 msgstr ""
 
-#: src/virsh.c:5827
+#: src/virsh.c:5968
 msgid "undefined vol name"
 msgstr ""
 
-#: src/virsh.c:5863
+#: src/virsh.c:6004
 #, c-format
 msgid "failed to get vol '%s'"
 msgstr ""
 
-#: src/virsh.c:5894
+#: src/virsh.c:6035
 #, c-format
 msgid ""
 "\n"
@@ -5513,128 +5730,128 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/virsh.c:5968
+#: src/virsh.c:6109
 msgid "missing \""
 msgstr ""
 
-#: src/virsh.c:6029
+#: src/virsh.c:6170
 #, c-format
 msgid "unexpected token (command name): '%s'"
 msgstr ""
 
-#: src/virsh.c:6034
+#: src/virsh.c:6175
 #, c-format
 msgid "unknown command: '%s'"
 msgstr ""
 
-#: src/virsh.c:6041
+#: src/virsh.c:6182
 #, c-format
 msgid "command '%s' doesn't support option --%s"
 msgstr ""
 
-#: src/virsh.c:6056
+#: src/virsh.c:6197
 #, c-format
 msgid "expected syntax: --%s <%s>"
 msgstr ""
 
-#: src/virsh.c:6059
+#: src/virsh.c:6200
 msgid "number"
 msgstr ""
 
-#: src/virsh.c:6059
+#: src/virsh.c:6200
 msgid "string"
 msgstr ""
 
-#: src/virsh.c:6065
+#: src/virsh.c:6206
 #, c-format
 msgid "unexpected data '%s'"
 msgstr ""
 
-#: src/virsh.c:6087
+#: src/virsh.c:6228
 msgid "OPTION"
 msgstr ""
 
-#: src/virsh.c:6087
+#: src/virsh.c:6228
 msgid "DATA"
 msgstr ""
 
-#: src/virsh.c:6138 src/virsh.c:6160
+#: src/virsh.c:6279 src/virsh.c:6301
 msgid "blocked"
 msgstr ""
 
-#: src/virsh.c:6140
+#: src/virsh.c:6281
 msgid "paused"
 msgstr ""
 
-#: src/virsh.c:6142
+#: src/virsh.c:6283
 msgid "in shutdown"
 msgstr ""
 
-#: src/virsh.c:6144
+#: src/virsh.c:6285
 msgid "shut off"
 msgstr ""
 
-#: src/virsh.c:6146
+#: src/virsh.c:6287
 msgid "crashed"
 msgstr ""
 
-#: src/virsh.c:6158
+#: src/virsh.c:6299
 msgid "offline"
 msgstr ""
 
-#: src/virsh.c:6177
+#: src/virsh.c:6318
 msgid "no valid connection"
 msgstr ""
 
-#: src/virsh.c:6224
+#: src/virsh.c:6365
 #, c-format
 msgid "%s: error: "
 msgstr ""
 
-#: src/virsh.c:6226
+#: src/virsh.c:6367
 msgid "error: "
 msgstr ""
 
-#: src/virsh.c:6248 src/virsh.c:6260 src/virsh.c:6273
+#: src/virsh.c:6389 src/virsh.c:6401 src/virsh.c:6414
 #, c-format
 msgid "%s: %d: failed to allocate %d bytes"
 msgstr ""
 
-#: src/virsh.c:6287
+#: src/virsh.c:6428
 #, c-format
 msgid "%s: %d: failed to allocate %lu bytes"
 msgstr ""
 
-#: src/virsh.c:6316
+#: src/virsh.c:6457
 msgid "failed to connect to the hypervisor"
 msgstr ""
 
-#: src/virsh.c:6348
+#: src/virsh.c:6489
 msgid "failed to get the log file information"
 msgstr ""
 
-#: src/virsh.c:6353
+#: src/virsh.c:6494
 msgid "the log path is not a file"
 msgstr ""
 
-#: src/virsh.c:6360
+#: src/virsh.c:6501
 msgid "failed to open the log file. check the log file path"
 msgstr ""
 
-#: src/virsh.c:6428
+#: src/virsh.c:6569
 msgid "failed to write the log file"
 msgstr ""
 
-#: src/virsh.c:6443
+#: src/virsh.c:6584
 #, c-format
 msgid "%s: failed to write log file: %s"
 msgstr ""
 
-#: src/virsh.c:6620
+#: src/virsh.c:6761
 msgid "failed to disconnect from the hypervisor"
 msgstr ""
 
-#: src/virsh.c:6638
+#: src/virsh.c:6779
 #, c-format
 msgid ""
 "\n"
@@ -5653,26 +5870,26 @@ msgid ""
 "  commands (non interactive mode):\n"
 msgstr ""
 
-#: src/virsh.c:6656
+#: src/virsh.c:6797
 msgid ""
 "\n"
 "  (specify help <command> for details about the command)\n"
 "\n"
 msgstr ""
 
-#: src/virsh.c:6752
+#: src/virsh.c:6893
 #, c-format
 msgid "unsupported option '-%c'. See --help."
 msgstr ""
 
-#: src/virsh.c:6838
+#: src/virsh.c:6979
 #, c-format
 msgid ""
 "Welcome to %s, the virtualization interactive terminal.\n"
 "\n"
 msgstr ""
 
-#: src/virsh.c:6841
+#: src/virsh.c:6982
 msgid ""
 "Type:  'help' for help with commands\n"
 "       'quit' to quit\n"
@@ -6247,7 +6464,7 @@ msgstr ""
 msgid "xenDaemonDomainFetch failed to find this domain"
 msgstr ""
 
-#: src/xend_internal.c:3815 src/xend_internal.c:4291 src/xm_internal.c:1637
+#: src/xend_internal.c:3815 src/xend_internal.c:4290 src/xm_internal.c:1637
 msgid "failed to build sexpr"
 msgstr ""
 
@@ -6322,7 +6539,7 @@ msgid "xenDaemonDomainMigrate: a hostname must be specified in the URI"
 msgstr ""
 
 #: src/xend_internal.c:4218 src/xend_internal.c:4240 src/xend_internal.c:4248
-#: src/xend_internal.c:4473 src/xend_internal.c:4480 src/xml.c:89
+#: src/xend_internal.c:4474 src/xend_internal.c:4481 src/xml.c:89
 msgid "strdup failed"
 msgstr ""
 
@@ -6330,82 +6547,82 @@ msgstr ""
 msgid "xenDaemonDomainMigrate: invalid port number"
 msgstr ""
 
-#: src/xend_internal.c:4285
+#: src/xend_internal.c:4284
 msgid "failed to parse domain description"
 msgstr ""
 
-#: src/xend_internal.c:4299
+#: src/xend_internal.c:4300
 #, c-format
 msgid "Failed to create inactive domain %s\n"
 msgstr ""
 
-#: src/xend_internal.c:4455 src/xend_internal.c:4531 src/xend_internal.c:4621
+#: src/xend_internal.c:4456 src/xend_internal.c:4532 src/xend_internal.c:4622
 msgid "unsupported in xendConfigVersion < 4"
 msgstr ""
 
-#: src/xend_internal.c:4467
+#: src/xend_internal.c:4468
 msgid "node information incomplete, missing scheduler name"
 msgstr ""
 
-#: src/xend_internal.c:4485 src/xend_internal.c:4579 src/xend_internal.c:4691
+#: src/xend_internal.c:4486 src/xend_internal.c:4580 src/xend_internal.c:4692
 msgid "Unknown scheduler"
 msgstr ""
 
-#: src/xend_internal.c:4544 src/xend_internal.c:4634
+#: src/xend_internal.c:4545 src/xend_internal.c:4635
 msgid "Failed to get a scheduler name"
 msgstr ""
 
-#: src/xend_internal.c:4557 src/xend_internal.c:4670
+#: src/xend_internal.c:4558 src/xend_internal.c:4671
 msgid "domain information incomplete, missing cpu_weight"
 msgstr ""
 
-#: src/xend_internal.c:4562 src/xend_internal.c:4679
+#: src/xend_internal.c:4563 src/xend_internal.c:4680
 msgid "domain information incomplete, missing cpu_cap"
 msgstr ""
 
-#: src/xend_internal.c:4738
+#: src/xend_internal.c:4739
 msgid "domainBlockPeek is not supported for dom0"
 msgstr ""
 
-#: src/xend_internal.c:4761
+#: src/xend_internal.c:4762
 #, c-format
 msgid "%s: invalid path"
 msgstr ""
 
-#: src/xend_internal.c:4769
+#: src/xend_internal.c:4770
 #, c-format
 msgid "failed to open for reading: %s: %s"
 msgstr ""
 
-#: src/xend_internal.c:4781
+#: src/xend_internal.c:4782
 #, c-format
 msgid "failed to lseek or read from file: %s: %s"
 msgstr ""
 
-#: src/xend_internal.c:4864 src/xend_internal.c:4910
+#: src/xend_internal.c:4865 src/xend_internal.c:4911
 #, c-format
 msgid "unexpected graphics type %d"
 msgstr ""
 
-#: src/xend_internal.c:4953
+#: src/xend_internal.c:4954
 msgid "unexpected chr device type"
 msgstr ""
 
-#: src/xend_internal.c:5127 src/xm_internal.c:1799
+#: src/xend_internal.c:5128 src/xm_internal.c:1799
 #, c-format
 msgid "unsupported network type %d"
 msgstr ""
 
-#: src/xend_internal.c:5301 src/xend_internal.c:5308 src/xend_internal.c:5315
+#: src/xend_internal.c:5302 src/xend_internal.c:5309 src/xend_internal.c:5316
 #, c-format
 msgid "unexpected lifecycle value %d"
 msgstr ""
 
-#: src/xend_internal.c:5332
+#: src/xend_internal.c:5333
 msgid "no HVM domain loader"
 msgstr ""
 
-#: src/xend_internal.c:5543
+#: src/xend_internal.c:5544
 msgid "hotplug of device type not supported"
 msgstr ""
 
diff --git a/src/libvirt.c b/src/libvirt.c
index 9bf9373e48..54ed8cf3ba 100644
--- a/src/libvirt.c
+++ b/src/libvirt.c
@@ -848,7 +848,7 @@ failed:
     if (ret->driver) ret->driver->close (ret);
     if (uri) xmlFreeURI(uri);
 
-    /* If not global error was set, copy any error set
+    /* If no global error was set, copy any error set
        in the connection object we're about to dispose of */
     if (__lastErr.code == VIR_ERR_OK) {
         memcpy(&__lastErr, &ret->err, sizeof(ret->err));
diff --git a/src/qemu_conf.c b/src/qemu_conf.c
index 0686978aad..22a99ecb04 100644
--- a/src/qemu_conf.c
+++ b/src/qemu_conf.c
@@ -226,7 +226,29 @@ qemudCapsInitGuest(virCapsPtr caps,
                    const struct qemu_arch_info *info,
                    int hvm) {
     virCapsGuestPtr guest;
-    int i;
+    int i, haskvm, hasbase, samearch;
+    const char *kvmbin = NULL;
+
+    /* Check for existance of base emulator */
+    hasbase = (access(info->binary, X_OK) == 0);
+
+    samearch = STREQ(info->arch, hostmachine);
+    if (samearch) {
+        const char *const kvmbins[] = { "/usr/bin/qemu-kvm", /* Fedora */
+                                        "/usr/bin/kvm" }; /* Upstream .spec */
+
+        for (i = 0; i < ARRAY_CARDINALITY(kvmbins); ++i) {
+            if ((haskvm = (access(kvmbins[i], X_OK) == 0))) {
+                kvmbin = kvmbins[i];
+                break;
+            }
+        }
+    } else {
+        haskvm = 0;
+    }
+
+    if (!hasbase && !haskvm)
+        return 0;
 
     if ((guest = virCapabilitiesAddGuest(caps,
                                          hvm ? "hvm" : "xen",
@@ -239,8 +261,7 @@ qemudCapsInitGuest(virCapsPtr caps,
         return -1;
 
     if (hvm) {
-        /* Check for existance of base emulator */
-        if (access(info->binary, X_OK) == 0 &&
+        if (hasbase &&
             virCapabilitiesAddGuestDomain(guest,
                                           "qemu",
                                           NULL,
@@ -250,7 +271,7 @@ qemudCapsInitGuest(virCapsPtr caps,
             return -1;
 
         /* If guest & host match, then we can accelerate */
-        if (STREQ(info->arch, hostmachine)) {
+        if (samearch) {
             if (access("/dev/kqemu", F_OK) == 0 &&
                 virCapabilitiesAddGuestDomain(guest,
                                               "kqemu",
@@ -261,9 +282,10 @@ qemudCapsInitGuest(virCapsPtr caps,
                 return -1;
 
             if (access("/dev/kvm", F_OK) == 0 &&
+                haskvm &&
                 virCapabilitiesAddGuestDomain(guest,
                                               "kvm",
-                                              "/usr/bin/qemu-kvm",
+                                              kvmbin,
                                               NULL,
                                               0,
                                               NULL) == NULL)