September 2013 - Devel - libvirt List Archives

[libvirt] [PATCH] docs, comments: minor typo fixes
by Oskari Saarenmaa 10 Sep '13

10 Sep '13

Signed-off-by: Oskari Saarenmaa <os(a)ohmu.fi> --- 84 files changed, 97 insertions(+), 97 deletions(-) diff --git a/ChangeLog-old b/ChangeLog-old index b5d44d5..e07b11c 100644 --- a/ChangeLog-old +++ b/ChangeLog-old @@ -5504,7 +5504,7 @@ Tue Nov 11 15:51:42 GMT 2008 Daniel P. Berrange <berrange(a)redhat.com> Mon Nov 10 12:05:42 GMT 2008 Daniel P. Berrange <berrange(a)redhat.com> - * src/openvz_conf.c: Read filesytem template name from config + * src/openvz_conf.c: Read filesystem template name from config files. Increase buffer size when parsing vzctl version number Thu Nov 6 20:45:42 CET 2008 Jim Meyering <meyering(a)redhat.com> diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index f8bfe0b..d656836 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -254,7 +254,7 @@ to the (optional) ramdisk image in the host OS.</dd> <dt><code>cmdline</code></dt> <dd>The contents of this element specify arguments to be passed to - the kernel (or installer) at boottime. This is often used to + the kernel (or installer) at boot time. This is often used to specify an alternate primary console (eg serial port), or the installation media source / kickstart file</dd> <dt><code>dtb</code></dt> @@ -426,7 +426,7 @@ process and virtual CPUs can be specified separately by <code>cputune</code>. If attribute <code>emulatorpin</code> of <code>cputune</code> is specified, <code>cpuset</code> - specified by <code>vcpu</code> here will be ingored; Similarly, + specified by <code>vcpu</code> here will be ignored; Similarly, For virtual CPUs which has <code>vcpupin</code> specified, <code>cpuset</code> specified by <code>cpuset</code> here will be ignored; For virtual CPUs which doesn't have @@ -1235,7 +1235,7 @@ </tr> <tr> <td>relaxed</td> - <td>Relax contstraints on timers</td> + <td>Relax constraints on timers</td> <td> on, off</td> <td><span class="since">1.0.0 (QEMU only)</span></td> </tr> @@ -1358,7 +1358,7 @@ <dd> <p> The <code>tickpolicy</code> attribute determines what - happens whens QEMU misses a deadline for injecting a + happens when QEMU misses a deadline for injecting a tick to the guest: </p> <dl> @@ -2268,7 +2268,7 @@ <dt><code>readonly</code></dt> <dd> - Enables exporting filesytem as a readonly mount for guest, by + Enables exporting filesystem as a readonly mount for guest, by default read-write access is given (currently only works for QEMU/KVM driver). </dd> @@ -2385,7 +2385,7 @@ <h4><a name="elementsControllers">Controllers</a></h4> <p> - Depending on the guest architecture, some device busses can + Depending on the guest architecture, some device buses can appear more than once, with a group of virtual devices tied to a virtual controller. Normally, libvirt can automatically infer such controllers without requiring explicit XML markup, but sometimes @@ -3773,7 +3773,7 @@ qemu-kvm -net nic,model=? /dev/null <span class="since">Since 1.1.0.</span> This uses the optional <code>nativeMode</code> attribute on the <code><tag></code> element: <code>nativeMode</code> may be set to 'tagged' or - 'untagged'. The id atribute of the element sets the native vlan. + 'untagged'. The id attribute of the element sets the native vlan. </p> <h5><a name="elementLink">Modifying virtual link state</a></h5> @@ -4134,7 +4134,7 @@ qemu-kvm -net nic,model=? /dev/null "9216", and <code>heads</code> with value "1". By default, the first video device in domain xml is the primary one, but the optional attribute <code>primary</code> (<span class="since">since 1.0.2</span>) - with value 'yes' can be used to mark the primary in cases of mutiple + with value 'yes' can be used to mark the primary in cases of multiple video device. The non-primary must be type of "qxl". The optional attribute <code>ram</code> (<span class="since">since 1.0.2</span>) is allowed for "qxl" type only and specifies diff --git a/docs/formatnetwork.html.in b/docs/formatnetwork.html.in index 36c381a..63600b3 100644 --- a/docs/formatnetwork.html.in +++ b/docs/formatnetwork.html.in @@ -478,7 +478,7 @@ <span class="since">Since 1.1.0</span>. This uses the optional <code>nativeMode</code> attribute on the <code><tag></code> element: <code>nativeMode</code> may be set to 'tagged' or - 'untagged'. The id atribute of the element sets the native vlan. + 'untagged'. The id attribute of the element sets the native vlan. </p> <p> <code><vlan></code> elements can also be specified in @@ -591,7 +591,7 @@ This particular route would *not* be preferred if there was another existing rout on the system with the same address and prefix but with a lower value for the metric. If there is a - route in the host system configuration that should be overriden + route in the host system configuration that should be overridden by a route in a virtual network whenever the virtual network is running, the configuration for the system-defined route should be modified to have a higher metric, and the route on the diff --git a/docs/news.html.in b/docs/news.html.in index 6a07eb0..8a6d5bd 100644 --- a/docs/news.html.in +++ b/docs/news.html.in @@ -13327,7 +13327,7 @@ and check the <a href="http://libvirt.org/git/?p=libvirt.git;a=log">GIT log</a> <h3>0.1.5: Sep 5 2006</h3> <ul> <li>Support for new hypercalls change in Xen changeset 86d26e6ec89b</li> - <li>bug fixes: virParseUUID() was wrong, netwoking for paravirt guestsi + <li>bug fixes: virParseUUID() was wrong, networking for paravirt guestsi (Daniel Berrange), virsh on non-existent domains (Daniel Berrange), string cast bug when handling error in python (Pete Vetere), HTTP 500 xend error code handling (Pete Vetere and Daniel Berrange)</li> diff --git a/po/af.po b/po/af.po index 84878d6..746bc0e 100644 --- a/po/af.po +++ b/po/af.po @@ -20618,7 +20618,7 @@ msgstr "" #: src/test/test_driver.c:1992 #, c-format -msgid "incomplete metdata in '%s'" +msgid "incomplete metadata in '%s'" msgstr "" #: src/test/test_driver.c:2064 diff --git a/po/am.po b/po/am.po index be63bff..499bff6 100644 --- a/po/am.po +++ b/po/am.po @@ -20618,7 +20618,7 @@ msgstr "" #: src/test/test_driver.c:1992 #, c-format -msgid "incomplete metdata in '%s'" +msgid "incomplete metadata in '%s'" msgstr "" #: src/test/test_driver.c:2064 diff --git a/po/ar.po b/po/ar.po index 0de95c9..f7e75ba 100644 --- a/po/ar.po +++ b/po/ar.po @@ -20619,7 +20619,7 @@ msgstr "" #: src/test/test_driver.c:1992 #, c-format -msgid "incomplete metdata in '%s'" +msgid "incomplete metadata in '%s'" msgstr "" #: src/test/test_driver.c:2064 diff --git a/po/as.po b/po/as.po index fc7944a..66fdd51 100644 --- a/po/as.po +++ b/po/as.po @@ -21030,7 +21030,7 @@ msgstr "মেটাডাতাৰ দৈৰ্ঘ্য সীমাৰ বা #: src/test/test_driver.c:1992 #, c-format -msgid "incomplete metdata in '%s'" +msgid "incomplete metadata in '%s'" msgstr "'%s' ত মিটাডাটা অসম্পূৰ্ণ" #: src/test/test_driver.c:2064 diff --git a/po/be.po b/po/be.po index 681acf7..3f2b73b 100644 --- a/po/be.po +++ b/po/be.po @@ -20619,7 +20619,7 @@ msgstr "" #: src/test/test_driver.c:1992 #, c-format -msgid "incomplete metdata in '%s'" +msgid "incomplete metadata in '%s'" msgstr "" #: src/test/test_driver.c:2064 diff --git a/po/bg.po b/po/bg.po index a3ad765..279be33 100644 --- a/po/bg.po +++ b/po/bg.po @@ -20623,7 +20623,7 @@ msgstr "" #: src/test/test_driver.c:1992 #, c-format -msgid "incomplete metdata in '%s'" +msgid "incomplete metadata in '%s'" msgstr "" #: src/test/test_driver.c:2064 diff --git a/po/bn.po b/po/bn.po index 88a67ac..60ac095 100644 --- a/po/bn.po +++ b/po/bn.po @@ -20618,7 +20618,7 @@ msgstr "" #: src/test/test_driver.c:1992 #, c-format -msgid "incomplete metdata in '%s'" +msgid "incomplete metadata in '%s'" msgstr "" #: src/test/test_driver.c:2064 diff --git a/po/bn_IN.po b/po/bn_IN.po index 5172b20..e718f0b 100644 --- a/po/bn_IN.po +++ b/po/bn_IN.po @@ -20783,7 +20783,7 @@ msgstr "মিটা-ডাটার দৈর্ঘ্য সীমা বহ #: src/test/test_driver.c:1992 #, c-format -msgid "incomplete metdata in '%s'" +msgid "incomplete metadata in '%s'" msgstr "'%s'-র মধ্যে উপস্থিত মিটাডাটা অসম্পূর্ণ" #: src/test/test_driver.c:2064 diff --git a/po/bo.po b/po/bo.po index 32e6ac4..abcf64b 100644 --- a/po/bo.po +++ b/po/bo.po @@ -20592,7 +20592,7 @@ msgstr "" #: src/test/test_driver.c:1992 #, c-format -msgid "incomplete metdata in '%s'" +msgid "incomplete metadata in '%s'" msgstr "" #: src/test/test_driver.c:2064 diff --git a/po/bs.po b/po/bs.po index b7397dd..1390462 100644 --- a/po/bs.po +++ b/po/bs.po @@ -20620,7 +20620,7 @@ msgstr "" #: src/test/test_driver.c:1992 #, c-format -msgid "incomplete metdata in '%s'" +msgid "incomplete metadata in '%s'" msgstr "" #: src/test/test_driver.c:2064 diff --git a/po/ca.po b/po/ca.po index f7e771d..a6bc3ab 100644 --- a/po/ca.po +++ b/po/ca.po @@ -20675,7 +20675,7 @@ msgstr "" #: src/test/test_driver.c:1992 #, c-format -msgid "incomplete metdata in '%s'" +msgid "incomplete metadata in '%s'" msgstr "" #: src/test/test_driver.c:2064 diff --git a/po/cs.po b/po/cs.po index d8b1159..af9d566 100644 --- a/po/cs.po +++ b/po/cs.po @@ -20714,7 +20714,7 @@ msgstr "" #: src/test/test_driver.c:1992 #, c-format -msgid "incomplete metdata in '%s'" +msgid "incomplete metadata in '%s'" msgstr "" #: src/test/test_driver.c:2064 diff --git a/po/cy.po b/po/cy.po index db7d71b..fa07a81 100644 --- a/po/cy.po +++ b/po/cy.po @@ -20619,7 +20619,7 @@ msgstr "" #: src/test/test_driver.c:1992 #, c-format -msgid "incomplete metdata in '%s'" +msgid "incomplete metadata in '%s'" msgstr "" #: src/test/test_driver.c:2064 diff --git a/po/da.po b/po/da.po index 993411b..48c555e 100644 --- a/po/da.po +++ b/po/da.po @@ -20623,7 +20623,7 @@ msgstr "" #: src/test/test_driver.c:1992 #, c-format -msgid "incomplete metdata in '%s'" +msgid "incomplete metadata in '%s'" msgstr "" #: src/test/test_driver.c:2064 diff --git a/po/de.po b/po/de.po index 2433aef..c0e9d17 100644 --- a/po/de.po +++ b/po/de.po @@ -16933,7 +16933,7 @@ msgstr "getunnelte Offline-Migration ist nicht sinnvoll" #: src/qemu/qemu_migration.c:2109 src/qemu/qemu_migration.c:2407 msgid "domain disappeared" -msgstr "Doamin ist verschwunden" +msgstr "Domain ist verschwunden" #: src/qemu/qemu_migration.c:2321 src/qemu/qemu_migration.c:3400 msgid "cannot create pipe for tunnelled migration" @@ -21623,7 +21623,7 @@ msgstr "Metadaten-Länge außerhalb des Bereichs" #: src/test/test_driver.c:1992 #, c-format -msgid "incomplete metdata in '%s'" +msgid "incomplete metadata in '%s'" msgstr "Unvollständige Metadaten in '%s'" #: src/test/test_driver.c:2064 diff --git a/po/el.po b/po/el.po index 1e1803d..71ec4ca 100644 --- a/po/el.po +++ b/po/el.po @@ -20709,7 +20709,7 @@ msgstr "" #: src/test/test_driver.c:1992 #, c-format -msgid "incomplete metdata in '%s'" +msgid "incomplete metadata in '%s'" msgstr "" #: src/test/test_driver.c:2064 diff --git a/po/en_GB.po b/po/en_GB.po index 2e4d418..3c66182 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -20622,7 +20622,7 @@ msgstr "" #: src/test/test_driver.c:1992 #, c-format -msgid "incomplete metdata in '%s'" +msgid "incomplete metadata in '%s'" msgstr "" #: src/test/test_driver.c:2064 diff --git a/po/es.po b/po/es.po index f189277..f9972c8 100644 --- a/po/es.po +++ b/po/es.po @@ -21694,7 +21694,7 @@ msgstr "la longitud de los metadatos está fuera de rango" #: src/test/test_driver.c:1992 #, c-format -msgid "incomplete metdata in '%s'" +msgid "incomplete metadata in '%s'" msgstr "metadatos incompletos en '%s'" #: src/test/test_driver.c:2064 diff --git a/po/et.po b/po/et.po index 5f9c18c..39e766e 100644 --- a/po/et.po +++ b/po/et.po @@ -20618,7 +20618,7 @@ msgstr "" #: src/test/test_driver.c:1992 #, c-format -msgid "incomplete metdata in '%s'" +msgid "incomplete metadata in '%s'" msgstr "" #: src/test/test_driver.c:2064 diff --git a/po/eu_ES.po b/po/eu_ES.po index 703bfed..ecbfc45 100644 --- a/po/eu_ES.po +++ b/po/eu_ES.po @@ -20618,7 +20618,7 @@ msgstr "" #: src/test/test_driver.c:1992 #, c-format -msgid "incomplete metdata in '%s'" +msgid "incomplete metadata in '%s'" msgstr "" #: src/test/test_driver.c:2064 diff --git a/po/fa.po b/po/fa.po index 1d56043..c8d24d2 100644 --- a/po/fa.po +++ b/po/fa.po @@ -20618,7 +20618,7 @@ msgstr "" #: src/test/test_driver.c:1992 #, c-format -msgid "incomplete metdata in '%s'" +msgid "incomplete metadata in '%s'" msgstr "" #: src/test/test_driver.c:2064 diff --git a/po/fi.po b/po/fi.po index b81d916..1db6ccd 100644 --- a/po/fi.po +++ b/po/fi.po @@ -20622,7 +20622,7 @@ msgstr "" #: src/test/test_driver.c:1992 #, c-format -msgid "incomplete metdata in '%s'" +msgid "incomplete metadata in '%s'" msgstr "" #: src/test/test_driver.c:2064 diff --git a/po/fr.po b/po/fr.po index f164fd1..ad9d22b 100644 --- a/po/fr.po +++ b/po/fr.po @@ -20672,7 +20672,7 @@ msgstr "" #: src/test/test_driver.c:1992 #, c-format -msgid "incomplete metdata in '%s'" +msgid "incomplete metadata in '%s'" msgstr "" #: src/test/test_driver.c:2064 diff --git a/po/gl.po b/po/gl.po index 4cc8c36..7d09fab 100644 --- a/po/gl.po +++ b/po/gl.po @@ -20618,7 +20618,7 @@ msgstr "" #: src/test/test_driver.c:1992 #, c-format -msgid "incomplete metdata in '%s'" +msgid "incomplete metadata in '%s'" msgstr "" #: src/test/test_driver.c:2064 diff --git a/po/gu.po b/po/gu.po index 1304ee9..4332c8a 100644 --- a/po/gu.po +++ b/po/gu.po @@ -20945,7 +20945,7 @@ msgstr "સીમા ની બહાર મેટાડેટા ની લં #: src/test/test_driver.c:1992 #, c-format -msgid "incomplete metdata in '%s'" +msgid "incomplete metadata in '%s'" msgstr "'%s' માં અપૂરતુ મેટાડેટા" #: src/test/test_driver.c:2064 diff --git a/po/he.po b/po/he.po index 1bcc34b..1614684 100644 --- a/po/he.po +++ b/po/he.po @@ -20618,7 +20618,7 @@ msgstr "" #: src/test/test_driver.c:1992 #, c-format -msgid "incomplete metdata in '%s'" +msgid "incomplete metadata in '%s'" msgstr "" #: src/test/test_driver.c:2064 diff --git a/po/hi.po b/po/hi.po index d966d2b..2e952bd 100644 --- a/po/hi.po +++ b/po/hi.po @@ -20902,7 +20902,7 @@ msgstr "मेटाडेटा की लंबाई परिसर से #: src/test/test_driver.c:1992 #, c-format -msgid "incomplete metdata in '%s'" +msgid "incomplete metadata in '%s'" msgstr "'%s' में अपूर्ण मेटाडेटा" #: src/test/test_driver.c:2064 diff --git a/po/hr.po b/po/hr.po index e74c8e1..46b83bb 100644 --- a/po/hr.po +++ b/po/hr.po @@ -20623,7 +20623,7 @@ msgstr "" #: src/test/test_driver.c:1992 #, c-format -msgid "incomplete metdata in '%s'" +msgid "incomplete metadata in '%s'" msgstr "" #: src/test/test_driver.c:2064 diff --git a/po/hu.po b/po/hu.po index bfba878..02289d3 100644 --- a/po/hu.po +++ b/po/hu.po @@ -20622,7 +20622,7 @@ msgstr "" #: src/test/test_driver.c:1992 #, c-format -msgid "incomplete metdata in '%s'" +msgid "incomplete metadata in '%s'" msgstr "" #: src/test/test_driver.c:2064 diff --git a/po/hy.po b/po/hy.po index 79d4dd9..ab2e2b3 100644 --- a/po/hy.po +++ b/po/hy.po @@ -20618,7 +20618,7 @@ msgstr "" #: src/test/test_driver.c:1992 #, c-format -msgid "incomplete metdata in '%s'" +msgid "incomplete metadata in '%s'" msgstr "" #: src/test/test_driver.c:2064 diff --git a/po/id.po b/po/id.po index 6f1854a..b7948b2 100644 --- a/po/id.po +++ b/po/id.po @@ -20622,7 +20622,7 @@ msgstr "" #: src/test/test_driver.c:1992 #, c-format -msgid "incomplete metdata in '%s'" +msgid "incomplete metadata in '%s'" msgstr "" #: src/test/test_driver.c:2064 diff --git a/po/is.po b/po/is.po index baef4c6..8bbcec3 100644 --- a/po/is.po +++ b/po/is.po @@ -20618,7 +20618,7 @@ msgstr "" #: src/test/test_driver.c:1992 #, c-format -msgid "incomplete metdata in '%s'" +msgid "incomplete metadata in '%s'" msgstr "" #: src/test/test_driver.c:2064 diff --git a/po/it.po b/po/it.po index d2469c4..271da4e 100644 --- a/po/it.po +++ b/po/it.po @@ -20819,7 +20819,7 @@ msgstr "lunghezza dei metadata fuori dalla gamma" #: src/test/test_driver.c:1992 #, c-format -msgid "incomplete metdata in '%s'" +msgid "incomplete metadata in '%s'" msgstr "metadata incompleti in '%s'" #: src/test/test_driver.c:2064 diff --git a/po/ja.po b/po/ja.po index 7457281..9cd07af 100644 --- a/po/ja.po +++ b/po/ja.po @@ -21449,7 +21449,7 @@ msgstr "メタデータの長さは範囲外です" #: src/test/test_driver.c:1992 #, c-format -msgid "incomplete metdata in '%s'" +msgid "incomplete metadata in '%s'" msgstr "'%s' にあるメタ情報が不完全です" #: src/test/test_driver.c:2064 diff --git a/po/ka.po b/po/ka.po index 0c04465..ecfbbf4 100644 --- a/po/ka.po +++ b/po/ka.po @@ -20618,7 +20618,7 @@ msgstr "" #: src/test/test_driver.c:1992 #, c-format -msgid "incomplete metdata in '%s'" +msgid "incomplete metadata in '%s'" msgstr "" #: src/test/test_driver.c:2064 diff --git a/po/kn.po b/po/kn.po index ae343b0..1b5c86a 100644 --- a/po/kn.po +++ b/po/kn.po @@ -20910,7 +20910,7 @@ msgstr "ಮೆಟಾಡಾಟಾದ ಗಾತ್ರವು ವ್ಯಾಪ್ತ #: src/test/test_driver.c:1992 #, c-format -msgid "incomplete metdata in '%s'" +msgid "incomplete metadata in '%s'" msgstr "'%s' ನಲ್ಲಿ ಅಪೂರ್ಣವಾದ ಮೆಟಾಡಾಟಾ" #: src/test/test_driver.c:2064 diff --git a/po/ko.po b/po/ko.po index 8de0d48..583c149 100644 --- a/po/ko.po +++ b/po/ko.po @@ -20701,7 +20701,7 @@ msgstr "메타데이터 길이가 범위를 벗어남" #: src/test/test_driver.c:1992 #, c-format -msgid "incomplete metdata in '%s'" +msgid "incomplete metadata in '%s'" msgstr "'%s'안에 완전하지 않은 메타데이터" #: src/test/test_driver.c:2064 diff --git a/po/ku.po b/po/ku.po index 422ff15..0bf4cc3 100644 --- a/po/ku.po +++ b/po/ku.po @@ -20618,7 +20618,7 @@ msgstr "" #: src/test/test_driver.c:1992 #, c-format -msgid "incomplete metdata in '%s'" +msgid "incomplete metadata in '%s'" msgstr "" #: src/test/test_driver.c:2064 diff --git a/po/libvirt.pot b/po/libvirt.pot index 8c81c40..b900df6 100644 --- a/po/libvirt.pot +++ b/po/libvirt.pot @@ -20592,7 +20592,7 @@ msgstr "" #: src/test/test_driver.c:1992 #, c-format -msgid "incomplete metdata in '%s'" +msgid "incomplete metadata in '%s'" msgstr "" #: src/test/test_driver.c:2064 diff --git a/po/lo.po b/po/lo.po index 93f5e42..1e04889 100644 --- a/po/lo.po +++ b/po/lo.po @@ -20618,7 +20618,7 @@ msgstr "" #: src/test/test_driver.c:1992 #, c-format -msgid "incomplete metdata in '%s'" +msgid "incomplete metadata in '%s'" msgstr "" #: src/test/test_driver.c:2064 diff --git a/po/lt.po b/po/lt.po index a9902d5..24d9f83 100644 --- a/po/lt.po +++ b/po/lt.po @@ -20619,7 +20619,7 @@ msgstr "" #: src/test/test_driver.c:1992 #, c-format -msgid "incomplete metdata in '%s'" +msgid "incomplete metadata in '%s'" msgstr "" #: src/test/test_driver.c:2064 diff --git a/po/lv.po b/po/lv.po index e83d44c..2a68e75 100644 --- a/po/lv.po +++ b/po/lv.po @@ -20619,7 +20619,7 @@ msgstr "" #: src/test/test_driver.c:1992 #, c-format -msgid "incomplete metdata in '%s'" +msgid "incomplete metadata in '%s'" msgstr "" #: src/test/test_driver.c:2064 diff --git a/po/mk.po b/po/mk.po index 3273217..166fa24 100644 --- a/po/mk.po +++ b/po/mk.po @@ -20623,7 +20623,7 @@ msgstr "" #: src/test/test_driver.c:1992 #, c-format -msgid "incomplete metdata in '%s'" +msgid "incomplete metadata in '%s'" msgstr "" #: src/test/test_driver.c:2064 diff --git a/po/ml.po b/po/ml.po index 8fd9d70..d337f5a 100644 --- a/po/ml.po +++ b/po/ml.po @@ -21159,7 +21159,7 @@ msgstr "മെറ്റാഡേറ്റായുടെ വ്യാപ്ത #: src/test/test_driver.c:1992 #, c-format -msgid "incomplete metdata in '%s'" +msgid "incomplete metadata in '%s'" msgstr "'%s'-ല്‍ പൂര്‍ത്തിയാകാത്ത മെറ്റഡേറ്റാ" #: src/test/test_driver.c:2064 diff --git a/po/mr.po b/po/mr.po index 0b2eae6..d1775a5 100644 --- a/po/mr.po +++ b/po/mr.po @@ -20873,7 +20873,7 @@ msgstr "मेटाडेटा" #: src/test/test_driver.c:1992 #, c-format -msgid "incomplete metdata in '%s'" +msgid "incomplete metadata in '%s'" msgstr "'%s' अंतर्गत अपूर्ण मेटाडेटा आढळले" #: src/test/test_driver.c:2064 diff --git a/po/ms.po b/po/ms.po index d8b067e..2df16a7 100644 --- a/po/ms.po +++ b/po/ms.po @@ -20605,7 +20605,7 @@ msgstr "" #: src/test/test_driver.c:1992 #, c-format -msgid "incomplete metdata in '%s'" +msgid "incomplete metadata in '%s'" msgstr "" #: src/test/test_driver.c:2064 diff --git a/po/my.po b/po/my.po index a4545ba..0abf143 100644 --- a/po/my.po +++ b/po/my.po @@ -20618,7 +20618,7 @@ msgstr "" #: src/test/test_driver.c:1992 #, c-format -msgid "incomplete metdata in '%s'" +msgid "incomplete metadata in '%s'" msgstr "" #: src/test/test_driver.c:2064 diff --git a/po/nb.po b/po/nb.po index 60e7c41..109fc30 100644 --- a/po/nb.po +++ b/po/nb.po @@ -20618,7 +20618,7 @@ msgstr "" #: src/test/test_driver.c:1992 #, c-format -msgid "incomplete metdata in '%s'" +msgid "incomplete metadata in '%s'" msgstr "" #: src/test/test_driver.c:2064 diff --git a/po/nl.po b/po/nl.po index c230958..4c6dc81 100644 --- a/po/nl.po +++ b/po/nl.po @@ -20860,7 +20860,7 @@ msgstr "lengte van metadata buiten de reeks" #: src/test/test_driver.c:1992 #, c-format -msgid "incomplete metdata in '%s'" +msgid "incomplete metadata in '%s'" msgstr "onvolledige metadata in '%s'" #: src/test/test_driver.c:2064 diff --git a/po/nn.po b/po/nn.po index 8989f9b..fa5fc97 100644 --- a/po/nn.po +++ b/po/nn.po @@ -20618,7 +20618,7 @@ msgstr "" #: src/test/test_driver.c:1992 #, c-format -msgid "incomplete metdata in '%s'" +msgid "incomplete metadata in '%s'" msgstr "" #: src/test/test_driver.c:2064 diff --git a/po/nso.po b/po/nso.po index 16246fe..229d76f 100644 --- a/po/nso.po +++ b/po/nso.po @@ -20618,7 +20618,7 @@ msgstr "" #: src/test/test_driver.c:1992 #, c-format -msgid "incomplete metdata in '%s'" +msgid "incomplete metadata in '%s'" msgstr "" #: src/test/test_driver.c:2064 diff --git a/po/or.po b/po/or.po index 934c21e..a8c95f2 100644 --- a/po/or.po +++ b/po/or.po @@ -20663,7 +20663,7 @@ msgstr "ଅଧିତଥ୍ୟ ଲମ୍ବର ସୀମା ବାହାରେ" #: src/test/test_driver.c:1992 #, c-format -msgid "incomplete metdata in '%s'" +msgid "incomplete metadata in '%s'" msgstr "'%s' ରେ ଅସମ୍ପୂର୍ଣ୍ଣ ଅଧିତଥ୍ୟ" #: src/test/test_driver.c:2064 diff --git a/po/pa.po b/po/pa.po index 6345a0f..3eb002b 100644 --- a/po/pa.po +++ b/po/pa.po @@ -20706,7 +20706,7 @@ msgstr "ਮੈਟਾਡਾਟਾ ਦੀ ਲੰਬਾਈ ਰੇਂਜ ਤੋਂ #: src/test/test_driver.c:1992 #, c-format -msgid "incomplete metdata in '%s'" +msgid "incomplete metadata in '%s'" msgstr "'%s' ਅਧੂਰਾ ਮੈਟਾਡਾਟਾ" #: src/test/test_driver.c:2064 diff --git a/po/pl.po b/po/pl.po index 65ad1f0..72f2e50 100644 --- a/po/pl.po +++ b/po/pl.po @@ -21042,7 +21042,7 @@ msgstr "długość metadanych jest spoza zakresu" #: src/test/test_driver.c:1992 #, c-format -msgid "incomplete metdata in '%s'" +msgid "incomplete metadata in '%s'" msgstr "niepełne metadane w \"%s\"" #: src/test/test_driver.c:2064 diff --git a/po/pt.po b/po/pt.po index 4d22356..3bf93b7 100644 --- a/po/pt.po +++ b/po/pt.po @@ -20622,7 +20622,7 @@ msgstr "" #: src/test/test_driver.c:1992 #, c-format -msgid "incomplete metdata in '%s'" +msgid "incomplete metadata in '%s'" msgstr "" #: src/test/test_driver.c:2064 diff --git a/po/pt_BR.po b/po/pt_BR.po index 6b5448e..32c7d06 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -21529,7 +21529,7 @@ msgstr "comprimento dos meta dados fora do intervalo" #: src/test/test_driver.c:1992 #, c-format -msgid "incomplete metdata in '%s'" +msgid "incomplete metadata in '%s'" msgstr "meta dados incompletos em \"%s\"" #: src/test/test_driver.c:2064 diff --git a/po/ro.po b/po/ro.po index c3f5a77..14e1f07 100644 --- a/po/ro.po +++ b/po/ro.po @@ -20619,7 +20619,7 @@ msgstr "" #: src/test/test_driver.c:1992 #, c-format -msgid "incomplete metdata in '%s'" +msgid "incomplete metadata in '%s'" msgstr "" #: src/test/test_driver.c:2064 diff --git a/po/ru.po b/po/ru.po index d757aad..88f5ec7 100644 --- a/po/ru.po +++ b/po/ru.po @@ -20835,7 +20835,7 @@ msgstr "длина метаданных выходит за пределы ди #: src/test/test_driver.c:1992 #, c-format -msgid "incomplete metdata in '%s'" +msgid "incomplete metadata in '%s'" msgstr "незавершенные метаданные в «%s»" #: src/test/test_driver.c:2064 diff --git a/po/si.po b/po/si.po index e216364..078e059 100644 --- a/po/si.po +++ b/po/si.po @@ -20618,7 +20618,7 @@ msgstr "" #: src/test/test_driver.c:1992 #, c-format -msgid "incomplete metdata in '%s'" +msgid "incomplete metadata in '%s'" msgstr "" #: src/test/test_driver.c:2064 diff --git a/po/sk.po b/po/sk.po index 98ac256..cb126fd 100644 --- a/po/sk.po +++ b/po/sk.po @@ -20618,7 +20618,7 @@ msgstr "" #: src/test/test_driver.c:1992 #, c-format -msgid "incomplete metdata in '%s'" +msgid "incomplete metadata in '%s'" msgstr "" #: src/test/test_driver.c:2064 diff --git a/po/sl.po b/po/sl.po index d4a9325..ea0877d 100644 --- a/po/sl.po +++ b/po/sl.po @@ -20619,7 +20619,7 @@ msgstr "" #: src/test/test_driver.c:1992 #, c-format -msgid "incomplete metdata in '%s'" +msgid "incomplete metadata in '%s'" msgstr "" #: src/test/test_driver.c:2064 diff --git a/po/sq.po b/po/sq.po index b1f6a04..e661560 100644 --- a/po/sq.po +++ b/po/sq.po @@ -20618,7 +20618,7 @@ msgstr "" #: src/test/test_driver.c:1992 #, c-format -msgid "incomplete metdata in '%s'" +msgid "incomplete metadata in '%s'" msgstr "" #: src/test/test_driver.c:2064 diff --git a/po/sr.po b/po/sr.po index a26576c..8d50483 100644 --- a/po/sr.po +++ b/po/sr.po @@ -20682,7 +20682,7 @@ msgstr "дужина мета податка је ван опсега" #: src/test/test_driver.c:1992 #, c-format -msgid "incomplete metdata in '%s'" +msgid "incomplete metadata in '%s'" msgstr "" #: src/test/test_driver.c:2064 diff --git a/po/sr(a)latin.po b/po/sr(a)latin.po index 3cfaacb..d2904b8 100644 --- a/po/sr(a)latin.po +++ b/po/sr(a)latin.po @@ -20683,7 +20683,7 @@ msgstr "dužina meta podatka je van opsega" #: src/test/test_driver.c:1992 #, c-format -msgid "incomplete metdata in '%s'" +msgid "incomplete metadata in '%s'" msgstr "" #: src/test/test_driver.c:2064 diff --git a/po/sv.po b/po/sv.po index f239425..55ff394 100644 --- a/po/sv.po +++ b/po/sv.po @@ -20772,7 +20772,7 @@ msgstr "" #: src/test/test_driver.c:1992 #, c-format -msgid "incomplete metdata in '%s'" +msgid "incomplete metadata in '%s'" msgstr "" #: src/test/test_driver.c:2064 diff --git a/po/ta.po b/po/ta.po index 5f6ae0e..ca41fe8 100644 --- a/po/ta.po +++ b/po/ta.po @@ -21240,7 +21240,7 @@ msgstr "மெட்டா தரவின் எண்ணிக்கை அத #: src/test/test_driver.c:1992 #, c-format -msgid "incomplete metdata in '%s'" +msgid "incomplete metadata in '%s'" msgstr "'%s'ல் முடியாத மெட்டாதரவு" #: src/test/test_driver.c:2064 diff --git a/po/te.po b/po/te.po index 4c87855..7b05c7f 100644 --- a/po/te.po +++ b/po/te.po @@ -20818,7 +20818,7 @@ msgstr "మెటాడాటా యొక్క పొడవు స్థాయ #: src/test/test_driver.c:1992 #, c-format -msgid "incomplete metdata in '%s'" +msgid "incomplete metadata in '%s'" msgstr "'%s'నందు అంసపూర్తి మెటాడాటా" #: src/test/test_driver.c:2064 diff --git a/po/th.po b/po/th.po index fb56621..c3a1e90 100644 --- a/po/th.po +++ b/po/th.po @@ -20618,7 +20618,7 @@ msgstr "" #: src/test/test_driver.c:1992 #, c-format -msgid "incomplete metdata in '%s'" +msgid "incomplete metadata in '%s'" msgstr "" #: src/test/test_driver.c:2064 diff --git a/po/tr.po b/po/tr.po index 154278f..122da0e 100644 --- a/po/tr.po +++ b/po/tr.po @@ -20618,7 +20618,7 @@ msgstr "" #: src/test/test_driver.c:1992 #, c-format -msgid "incomplete metdata in '%s'" +msgid "incomplete metadata in '%s'" msgstr "" #: src/test/test_driver.c:2064 diff --git a/po/uk.po b/po/uk.po index 5ea7984..c97d740 100644 --- a/po/uk.po +++ b/po/uk.po @@ -21894,7 +21894,7 @@ msgstr "довжина метаданих не належить діапазон #: src/test/test_driver.c:1992 #, c-format -msgid "incomplete metdata in '%s'" +msgid "incomplete metadata in '%s'" msgstr "неповні метадані у «%s»" #: src/test/test_driver.c:2064 diff --git a/po/ur.po b/po/ur.po index 403bcee..5390817 100644 --- a/po/ur.po +++ b/po/ur.po @@ -20618,7 +20618,7 @@ msgstr "" #: src/test/test_driver.c:1992 #, c-format -msgid "incomplete metdata in '%s'" +msgid "incomplete metadata in '%s'" msgstr "" #: src/test/test_driver.c:2064 diff --git a/po/vi.po b/po/vi.po index ef6a165..01b94da 100644 --- a/po/vi.po +++ b/po/vi.po @@ -20833,7 +20833,7 @@ msgstr "độ dài dữ liệu meta vượt miền" #: src/test/test_driver.c:1992 #, c-format -msgid "incomplete metdata in '%s'" +msgid "incomplete metadata in '%s'" msgstr "dữ liệu meta không hoàn thiện trong '%s'" #: src/test/test_driver.c:2064 diff --git a/po/vi_VN.po b/po/vi_VN.po index 66f5946..d2e69a0 100644 --- a/po/vi_VN.po +++ b/po/vi_VN.po @@ -20834,7 +20834,7 @@ msgstr "độ dài dữ liệu meta vượt miền" #: src/test/test_driver.c:1992 #, c-format -msgid "incomplete metdata in '%s'" +msgid "incomplete metadata in '%s'" msgstr "dữ liệu meta không hoàn thiện trong '%s'" #: src/test/test_driver.c:2064 diff --git a/po/zh_CN.po b/po/zh_CN.po index 28d1411..22c2d6d 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -20697,7 +20697,7 @@ msgstr "元数据长度超出范围" #: src/test/test_driver.c:1992 #, c-format -msgid "incomplete metdata in '%s'" +msgid "incomplete metadata in '%s'" msgstr "'%s' 中不完整的元数据" #: src/test/test_driver.c:2064 @@ -24508,7 +24508,7 @@ msgstr "指定未知驱动程序路径 '%s' (尝试：vbox:///session)" #: src/vbox/vbox_driver.c:182 src/vbox/vbox_tmpl.c:1034 #, c-format msgid "unknown driver path '%s' specified (try vbox:///system)" -msgstr "指定未知驱动程序路径 '%s' (尝试：vbox:///systme)" +msgstr "指定未知驱动程序路径 '%s' (尝试：vbox:///system)" #: src/vbox/vbox_driver.c:188 msgid "unable to initialize VirtualBox driver API" diff --git a/po/zh_TW.po b/po/zh_TW.po index 0edb5b8..d9099b2 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -20625,7 +20625,7 @@ msgstr "" #: src/test/test_driver.c:1992 #, c-format -msgid "incomplete metdata in '%s'" +msgid "incomplete metadata in '%s'" msgstr "" #: src/test/test_driver.c:2064 diff --git a/po/zu.po b/po/zu.po index 3266988..2b0f598 100644 --- a/po/zu.po +++ b/po/zu.po @@ -20618,7 +20618,7 @@ msgstr "" #: src/test/test_driver.c:1992 #, c-format -msgid "incomplete metdata in '%s'" +msgid "incomplete metadata in '%s'" msgstr "" #: src/test/test_driver.c:2064 diff --git a/python/generator.py b/python/generator.py index fb321c6..a91dde8 100755 --- a/python/generator.py +++ b/python/generator.py @@ -510,11 +510,11 @@ skip_function = ( 'virStreamRecv', # overridden in libvirt-override-virStream.py 'virStreamSend', # overridden in libvirt-override-virStream.py - 'virConnectUnregisterCloseCallback', # overriden in virConnect.py - 'virConnectRegisterCloseCallback', # overriden in virConnect.py + 'virConnectUnregisterCloseCallback', # overridden in virConnect.py + 'virConnectRegisterCloseCallback', # overridden in virConnect.py - 'virDomainCreateXMLWithFiles', # overriden in virConnect.py - 'virDomainCreateWithFiles', # overriden in virDomain.py + 'virDomainCreateXMLWithFiles', # overridden in virConnect.py + 'virDomainCreateWithFiles', # overridden in virDomain.py # 'Ref' functions have no use for bindings users. "virConnectRef", diff --git a/src/libvirt.c b/src/libvirt.c index 07a3fd5..665b30b 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -9058,7 +9058,7 @@ error: * Define a domain, but does not start it. * This definition is persistent, until explicitly undefined with * virDomainUndefine(). A previous definition for this domain would be - * overriden if it already exists. + * overridden if it already exists. * * Some hypervisors may prevent this operation if there is a current * block copy operation on a transient domain with the same id as the diff --git a/src/test/test_driver.c b/src/test/test_driver.c index c225618..f9eee44 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -1989,7 +1989,7 @@ testDomainRestoreFlags(virConnectPtr conn, goto cleanup; if (saferead(fd, xml, len) != len) { virReportSystemError(errno, - _("incomplete metdata in '%s'"), path); + _("incomplete metadata in '%s'"), path); goto cleanup; } xml[len] = '\0'; diff --git a/src/util/virpci.c b/src/util/virpci.c index be50b4f..92927aa 100644 --- a/src/util/virpci.c +++ b/src/util/virpci.c @@ -670,7 +670,7 @@ virPCIDeviceIsParent(virPCIDevicePtr dev, virPCIDevicePtr check, void *data) goto cleanup; } - /* otherwise, SRIOV allows VFs to be on different busses then their PFs. + /* otherwise, SRIOV allows VFs to be on different buses than their PFs. * In this case, what we need to do is look for the "best" match; i.e. * the most restrictive match that still satisfies all of the conditions. */ -- 1.8.3.1

2 1

[libvirt] [PATCH 0/2] fix configure to require yajl if qemu is new enough
by Eric Blake 10 Sep '13

10 Sep '13

After yet another debug session on IRC about failure to use qemu because yajl-devel wasn't installed, I came up with these patches. The first is just preparation (no change to generated code); and with the second, I validated that uninstalling yajl-devel and then trying to configure once again gives me the desired: checking for yajl_tree_parse in -lyajl... no configure: error: You must install the libyajl library & headers to compile libvirt [I can't claim build-breaker or trivial rule for either of these patches, but as I am also the autoconf guru around here, I won't be surprised if the extent of other's reviews is "yep, I installed it and it did what you said"...] And yes, I tested on RHEL 5 that it still works with autoconf 2.59. Eric Blake (2): build: avoid obsolete AC_HELP_STRING build: fix regression in requiring yajl for new enough qemu configure.ac | 221 +++++++++++++++++++++++++++++++++++----------------- m4/virt-apparmor.m4 | 4 +- m4/virt-lib.m4 | 12 +-- m4/virt-selinux.m4 | 3 +- 4 files changed, 158 insertions(+), 82 deletions(-) -- 1.8.3.1

2 5

[libvirt] [PATCH] Fix cgroups when all are mounted on /sys/fs/cgroup
by Daniel P. Berrange 10 Sep '13

10 Sep '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> Some users in Ubuntu/Debian seem to have a setup where all the cgroup controllers are mounted on /sys/fs/cgroup rather than any /sys/fs/cgroup/<controller> name. In the loop which detects which controllers are present for a mount point we were modifying 'mnt_dir' field in the 'struct mntent' var, but not always restoring the original value. This caused detection to break in the all-in-one mount setup. Fix that logic bug and add test case coverage for this mount setup. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/util/vircgroup.c | 3 ++- tests/vircgroupmock.c | 42 ++++++++++++++++++++++++++++++++++++--- tests/vircgrouptest.c | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 96 insertions(+), 4 deletions(-) diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c index 16458a3..a260356 100644 --- a/src/util/vircgroup.c +++ b/src/util/vircgroup.c @@ -342,10 +342,11 @@ virCgroupDetectMounts(virCgroupPtr group) entry.mnt_dir); goto error; } - *tmp2 = '\0'; + /* If it is a co-mount it has a filename like "cpu,cpuacct" * and we must identify the symlink path */ if (strchr(tmp2 + 1, ',')) { + *tmp2 = '\0'; if (virAsprintf(&linksrc, "%s/%s", entry.mnt_dir, typestr) < 0) goto error; diff --git a/tests/vircgroupmock.c b/tests/vircgroupmock.c index f1a5700..bf52843 100644 --- a/tests/vircgroupmock.c +++ b/tests/vircgroupmock.c @@ -103,6 +103,27 @@ const char *proccgroups = "blkio 8 4 1\n"; +const char *procmountsallinone = + "rootfs / rootfs rw 0 0\n" + "sysfs /sys sysfs rw,nosuid,nodev,noexec,relatime 0 0\n" + "proc /proc proc rw,nosuid,nodev,noexec,relatime 0 0\n" + "udev /dev devtmpfs rw,relatime,size=16458560k,nr_inodes=4114640,mode=755 0 0\n" + "devpts /dev/pts devpts rw,nosuid,noexec,relatime,gid=5,mode=620,ptmxmode=000 0 0\n" + "nfsd /proc/fs/nfsd nfsd rw,relatime 0 0\n" + "cgroup /not/really/sys/fs/cgroup cgroup rw,relatime,blkio,devices,memory,cpuacct,cpu,cpuset 0 0\n"; + +const char *procselfcgroupsallinone = + "6:blkio,devices,memory,cpuacct,cpu,cpuset:/"; + +const char *proccgroupsallinone = + "#subsys_name hierarchy num_cgroups enabled\n" + "cpuset 6 1 1\n" + "cpu 6 1 1\n" + "cpuacct 6 1 1\n" + "memory 6 1 1\n" + "devices 6 1 1\n" + "blkio 6 1 1\n"; + static int make_file(const char *path, const char *name, const char *value) @@ -378,11 +399,20 @@ static void init_sysfs(void) FILE *fopen(const char *path, const char *mode) { + const char *mock; + bool allinone = false; init_syms(); + mock = getenv("VIR_CGROUP_MOCK_MODE"); + if (mock && STREQ(mock, "allinone")) + allinone = true; + if (STREQ(path, "/proc/mounts")) { if (STREQ(mode, "r")) { - return fmemopen((void *)procmounts, strlen(procmounts), mode); + if (allinone) + return fmemopen((void *)procmountsallinone, strlen(procmountsallinone), mode); + else + return fmemopen((void *)procmounts, strlen(procmounts), mode); } else { errno = EACCES; return NULL; @@ -390,7 +420,10 @@ FILE *fopen(const char *path, const char *mode) } if (STREQ(path, "/proc/cgroups")) { if (STREQ(mode, "r")) { - return fmemopen((void *)proccgroups, strlen(proccgroups), mode); + if (allinone) + return fmemopen((void *)proccgroupsallinone, strlen(proccgroupsallinone), mode); + else + return fmemopen((void *)proccgroups, strlen(proccgroups), mode); } else { errno = EACCES; return NULL; @@ -398,7 +431,10 @@ FILE *fopen(const char *path, const char *mode) } if (STREQ(path, "/proc/self/cgroup")) { if (STREQ(mode, "r")) { - return fmemopen((void *)procselfcgroups, strlen(procselfcgroups), mode); + if (allinone) + return fmemopen((void *)procselfcgroupsallinone, strlen(procselfcgroupsallinone), mode); + else + return fmemopen((void *)procselfcgroups, strlen(procselfcgroups), mode); } else { errno = EACCES; return NULL; diff --git a/tests/vircgrouptest.c b/tests/vircgrouptest.c index 4bdd4c9..f12587c 100644 --- a/tests/vircgrouptest.c +++ b/tests/vircgrouptest.c @@ -99,6 +99,16 @@ const char *mountsFull[VIR_CGROUP_CONTROLLER_LAST] = { [VIR_CGROUP_CONTROLLER_BLKIO] = "/not/really/sys/fs/cgroup/blkio", [VIR_CGROUP_CONTROLLER_SYSTEMD] = "/not/really/sys/fs/cgroup/systemd", }; +const char *mountsAllInOne[VIR_CGROUP_CONTROLLER_LAST] = { + [VIR_CGROUP_CONTROLLER_CPU] = "/not/really/sys/fs/cgroup", + [VIR_CGROUP_CONTROLLER_CPUACCT] = "/not/really/sys/fs/cgroup", + [VIR_CGROUP_CONTROLLER_CPUSET] = "/not/really/sys/fs/cgroup", + [VIR_CGROUP_CONTROLLER_MEMORY] = "/not/really/sys/fs/cgroup", + [VIR_CGROUP_CONTROLLER_DEVICES] = "/not/really/sys/fs/cgroup", + [VIR_CGROUP_CONTROLLER_FREEZER] = NULL, + [VIR_CGROUP_CONTROLLER_BLKIO] = "/not/really/sys/fs/cgroup", + [VIR_CGROUP_CONTROLLER_SYSTEMD] = NULL, +}; const char *links[VIR_CGROUP_CONTROLLER_LAST] = { [VIR_CGROUP_CONTROLLER_CPU] = "/not/really/sys/fs/cgroup/cpu", @@ -108,6 +118,18 @@ const char *links[VIR_CGROUP_CONTROLLER_LAST] = { [VIR_CGROUP_CONTROLLER_DEVICES] = NULL, [VIR_CGROUP_CONTROLLER_FREEZER] = NULL, [VIR_CGROUP_CONTROLLER_BLKIO] = NULL, + [VIR_CGROUP_CONTROLLER_SYSTEMD] = NULL, +}; + +const char *linksAllInOne[VIR_CGROUP_CONTROLLER_LAST] = { + [VIR_CGROUP_CONTROLLER_CPU] = NULL, + [VIR_CGROUP_CONTROLLER_CPUACCT] = NULL, + [VIR_CGROUP_CONTROLLER_CPUSET] = NULL, + [VIR_CGROUP_CONTROLLER_MEMORY] = NULL, + [VIR_CGROUP_CONTROLLER_DEVICES] = NULL, + [VIR_CGROUP_CONTROLLER_FREEZER] = NULL, + [VIR_CGROUP_CONTROLLER_BLKIO] = NULL, + [VIR_CGROUP_CONTROLLER_SYSTEMD] = NULL, }; @@ -417,6 +439,34 @@ cleanup: return ret; } +static int testCgroupNewForSelfAllInOne(const void *args ATTRIBUTE_UNUSED) +{ + virCgroupPtr cgroup = NULL; + int ret = -1; + const char *placement[VIR_CGROUP_CONTROLLER_LAST] = { + [VIR_CGROUP_CONTROLLER_CPU] = "/", + [VIR_CGROUP_CONTROLLER_CPUACCT] = "/", + [VIR_CGROUP_CONTROLLER_CPUSET] = "/", + [VIR_CGROUP_CONTROLLER_MEMORY] = "/", + [VIR_CGROUP_CONTROLLER_DEVICES] = "/", + [VIR_CGROUP_CONTROLLER_FREEZER] = NULL, + [VIR_CGROUP_CONTROLLER_BLKIO] = "/", + }; + + if (virCgroupNewSelf(&cgroup) < 0) { + fprintf(stderr, "Cannot create cgroup for self\n"); + goto cleanup; + } + + ret = validateCgroup(cgroup, "", mountsAllInOne, linksAllInOne, placement); + +cleanup: + virCgroupFree(&cgroup); + return ret; +} + + + # define FAKESYSFSDIRTEMPLATE abs_builddir "/fakesysfsdir-XXXXXX" static int @@ -455,6 +505,11 @@ mymain(void) if (virtTestRun("New cgroup for domain partition escaped", 1, testCgroupNewForPartitionDomainEscaped, NULL) < 0) ret = -1; + setenv("VIR_CGROUP_MOCK_MODE", "allinone", 1); + if (virtTestRun("New cgroup for self (allinone)", 1, testCgroupNewForSelfAllInOne, NULL) < 0) + ret = -1; + unsetenv("VIR_CGROUP_MOCK_MODE"); + if (getenv("LIBVIRT_SKIP_CLEANUP") == NULL) virFileDeleteTree(fakesysfsdir); -- 1.8.3.1

2 1

[libvirt] [PATCH] qemu: endjob returns a bool
by Eric Blake 10 Sep '13

10 Sep '13

Osier Yang pointed out that ever since commit 31cb030, the signature of qemuDomainObjEndJob was changed to return a bool. While comparison against 0 or > 0 still gives the right results, it looks fishy; we also had one place that was comparing < 0 which is effectively dead code. * src/qemu/qemu_migration.c (qemuMigrationPrepareAny): Fix dead code bug. (qemuMigrationBegin): Use more canonical form of bool check. * src/qemu/qemu_driver.c (qemuAutostartDomain) (qemuDomainCreateXML, qemuDomainSuspend, qemuDomainResume) (qemuDomainShutdownFlags, qemuDomainReboot, qemuDomainReset) (qemuDomainDestroyFlags, qemuDomainSetMemoryFlags) (qemuDomainSetMemoryStatsPeriod, qemuDomainInjectNMI) (qemuDomainSendKey, qemuDomainGetInfo, qemuDomainScreenshot) (qemuDomainSetVcpusFlags, qemuDomainGetVcpusFlags) (qemuDomainRestoreFlags, qemuDomainGetXMLDesc) (qemuDomainCreateWithFlags, qemuDomainAttachDeviceFlags) (qemuDomainUpdateDeviceFlags, qemuDomainDetachDeviceFlags) (qemuDomainBlockResize, qemuDomainBlockStats) (qemuDomainBlockStatsFlags, qemuDomainMemoryStats) (qemuDomainMemoryPeek, qemuDomainGetBlockInfo) (qemuDomainAbortJob, qemuDomainMigrateSetMaxDowntime) (qemuDomainMigrateGetCompressionCache) (qemuDomainMigrateSetCompressionCache) (qemuDomainMigrateSetMaxSpeed) (qemuDomainSnapshotCreateActiveInternal) (qemuDomainRevertToSnapshot, qemuDomainSnapshotDelete) (qemuDomainQemuMonitorCommand, qemuDomainQemuAttach) (qemuDomainBlockJobImpl, qemuDomainBlockCopy) (qemuDomainBlockCommit, qemuDomainOpenGraphics) (qemuDomainGetBlockIoTune, qemuDomainGetDiskErrors) (qemuDomainPMSuspendForDuration, qemuDomainPMWakeup) (qemuDomainQemuAgentCommand, qemuDomainFSTrim): Likewise. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Most of this is mechanical, but the change to qemuMigrationPrepareAny requires special care to ensure that checking for 0 instead of negative isn't introducing a bug on failure to start incoming migration. src/qemu/qemu_driver.c | 115 +++++++++++++++++++++------------------------- src/qemu/qemu_migration.c | 4 +- 2 files changed, 55 insertions(+), 64 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 9b5d126..bbf2d23 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -293,7 +293,7 @@ qemuAutostartDomain(virDomainObjPtr vm, err ? err->message : _("unknown error")); } - if (qemuDomainObjEndJob(data->driver, vm) == 0) + if (!qemuDomainObjEndJob(data->driver, vm)) vm = NULL; } @@ -1612,7 +1612,7 @@ static virDomainPtr qemuDomainCreateXML(virConnectPtr conn, VIR_NETDEV_VPORT_PROFILE_OP_CREATE, start_flags) < 0) { virDomainAuditStart(vm, "booted", false); - if (qemuDomainObjEndJob(driver, vm) > 0) + if (qemuDomainObjEndJob(driver, vm)) qemuDomainRemoveInactive(driver, vm); vm = NULL; goto cleanup; @@ -1637,7 +1637,7 @@ static virDomainPtr qemuDomainCreateXML(virConnectPtr conn, if (dom) dom->id = vm->def->id; - if (qemuDomainObjEndJob(driver, vm) == 0) + if (!qemuDomainObjEndJob(driver, vm)) vm = NULL; cleanup: @@ -1722,7 +1722,7 @@ static int qemuDomainSuspend(virDomainPtr dom) { ret = 0; endjob: - if (qemuDomainObjEndJob(driver, vm) == 0) + if (!qemuDomainObjEndJob(driver, vm)) vm = NULL; cleanup: @@ -1787,7 +1787,7 @@ static int qemuDomainResume(virDomainPtr dom) { ret = 0; endjob: - if (qemuDomainObjEndJob(driver, vm) == 0) + if (!qemuDomainObjEndJob(driver, vm)) vm = NULL; cleanup: @@ -1882,7 +1882,7 @@ static int qemuDomainShutdownFlags(virDomainPtr dom, unsigned int flags) { } endjob: - if (qemuDomainObjEndJob(driver, vm) == 0) + if (!qemuDomainObjEndJob(driver, vm)) vm = NULL; cleanup: @@ -1992,7 +1992,7 @@ qemuDomainReboot(virDomainPtr dom, unsigned int flags) } endjob: - if (qemuDomainObjEndJob(driver, vm) == 0) + if (!qemuDomainObjEndJob(driver, vm)) vm = NULL; cleanup: @@ -2035,7 +2035,7 @@ qemuDomainReset(virDomainPtr dom, unsigned int flags) priv->fakeReboot = false; endjob: - if (qemuDomainObjEndJob(driver, vm) == 0) + if (!qemuDomainObjEndJob(driver, vm)) vm = NULL; cleanup: @@ -2121,15 +2121,14 @@ qemuDomainDestroyFlags(virDomainPtr dom, virDomainAuditStop(vm, "destroyed"); if (!vm->persistent) { - if (qemuDomainObjEndJob(driver, vm) > 0) + if (qemuDomainObjEndJob(driver, vm)) qemuDomainRemoveInactive(driver, vm); vm = NULL; } ret = 0; endjob: - if (vm && - qemuDomainObjEndJob(driver, vm) == 0) + if (vm && !qemuDomainObjEndJob(driver, vm)) vm = NULL; cleanup: @@ -2274,7 +2273,7 @@ static int qemuDomainSetMemoryFlags(virDomainPtr dom, unsigned long newmem, ret = 0; endjob: - if (qemuDomainObjEndJob(driver, vm) == 0) + if (!qemuDomainObjEndJob(driver, vm)) vm = NULL; cleanup: @@ -2348,7 +2347,7 @@ static int qemuDomainSetMemoryStatsPeriod(virDomainPtr dom, int period, ret = 0; endjob: - if (qemuDomainObjEndJob(driver, vm) == 0) + if (!qemuDomainObjEndJob(driver, vm)) vm = NULL; cleanup: @@ -2396,10 +2395,8 @@ static int qemuDomainInjectNMI(virDomainPtr domain, unsigned int flags) qemuDomainObjExitMonitor(driver, vm); endjob: - if (qemuDomainObjEndJob(driver, vm) == 0) { + if (!qemuDomainObjEndJob(driver, vm)) vm = NULL; - goto cleanup; - } cleanup: if (vm) @@ -2462,7 +2459,7 @@ static int qemuDomainSendKey(virDomainPtr domain, qemuDomainObjExitMonitor(driver, vm); endjob: - if (qemuDomainObjEndJob(driver, vm) == 0) + if (!qemuDomainObjEndJob(driver, vm)) vm = NULL; cleanup: @@ -2518,7 +2515,7 @@ static int qemuDomainGetInfo(virDomainPtr dom, err = qemuMonitorGetBalloonInfo(priv->mon, &balloon); qemuDomainObjExitMonitor(driver, vm); } - if (qemuDomainObjEndJob(driver, vm) == 0) { + if (!qemuDomainObjEndJob(driver, vm)) { vm = NULL; goto cleanup; } @@ -3670,7 +3667,7 @@ endjob: unlink(tmp); VIR_FREE(tmp); - if (qemuDomainObjEndJob(driver, vm) == 0) + if (!qemuDomainObjEndJob(driver, vm)) vm = NULL; cleanup: @@ -4225,7 +4222,7 @@ qemuDomainSetVcpusFlags(virDomainPtr dom, unsigned int nvcpus, ret = 0; endjob: - if (qemuDomainObjEndJob(driver, vm) == 0) + if (!qemuDomainObjEndJob(driver, vm)) vm = NULL; cleanup: @@ -4919,7 +4916,7 @@ qemuDomainGetVcpusFlags(virDomainPtr dom, unsigned int flags) qemuDomainObjExitAgent(vm); endjob: - if (qemuDomainObjEndJob(driver, vm) == 0) + if (!qemuDomainObjEndJob(driver, vm)) vm = NULL; if (ncpuinfo < 0) @@ -5446,7 +5443,7 @@ qemuDomainRestoreFlags(virConnectPtr conn, if (virFileWrapperFdClose(wrapperFd) < 0) VIR_WARN("Failed to close %s", path); - if (qemuDomainObjEndJob(driver, vm) == 0) + if (!qemuDomainObjEndJob(driver, vm)) vm = NULL; else if (ret < 0 && !vm->persistent) { qemuDomainRemoveInactive(driver, vm); @@ -5666,7 +5663,7 @@ static char *qemuDomainGetXMLDesc(virDomainPtr dom, qemuDomainObjExitMonitor(driver, vm); endjob: - if (qemuDomainObjEndJob(driver, vm) == 0) { + if (!qemuDomainObjEndJob(driver, vm)) { vm = NULL; goto cleanup; } @@ -6065,7 +6062,7 @@ qemuDomainCreateWithFlags(virDomainPtr dom, unsigned int flags) ret = 0; endjob: - if (qemuDomainObjEndJob(driver, vm) == 0) + if (!qemuDomainObjEndJob(driver, vm)) vm = NULL; cleanup: @@ -6937,7 +6934,7 @@ static int qemuDomainAttachDeviceFlags(virDomainPtr dom, const char *xml, } endjob: - if (qemuDomainObjEndJob(driver, vm) == 0) + if (!qemuDomainObjEndJob(driver, vm)) vm = NULL; cleanup: @@ -7081,7 +7078,7 @@ static int qemuDomainUpdateDeviceFlags(virDomainPtr dom, } endjob: - if (qemuDomainObjEndJob(driver, vm) == 0) + if (!qemuDomainObjEndJob(driver, vm)) vm = NULL; cleanup: @@ -7219,7 +7216,7 @@ static int qemuDomainDetachDeviceFlags(virDomainPtr dom, const char *xml, } endjob: - if (qemuDomainObjEndJob(driver, vm) == 0) + if (!qemuDomainObjEndJob(driver, vm)) vm = NULL; cleanup: @@ -8917,7 +8914,7 @@ qemuDomainBlockResize(virDomainPtr dom, ret = 0; endjob: - if (qemuDomainObjEndJob(driver, vm) == 0) + if (!qemuDomainObjEndJob(driver, vm)) vm = NULL; cleanup: @@ -8993,7 +8990,7 @@ qemuDomainBlockStats(virDomainPtr dom, qemuDomainObjExitMonitor(driver, vm); endjob: - if (qemuDomainObjEndJob(driver, vm) == 0) + if (!qemuDomainObjEndJob(driver, vm)) vm = NULL; cleanup: @@ -9161,7 +9158,7 @@ qemuDomainBlockStatsFlags(virDomainPtr dom, *nparams = tmp; endjob: - if (qemuDomainObjEndJob(driver, vm) == 0) + if (!qemuDomainObjEndJob(driver, vm)) vm = NULL; cleanup: @@ -9556,7 +9553,7 @@ qemuDomainMemoryStats(virDomainPtr dom, } } - if (qemuDomainObjEndJob(driver, vm) == 0) + if (!qemuDomainObjEndJob(driver, vm)) vm = NULL; cleanup: @@ -9699,7 +9696,7 @@ qemuDomainMemoryPeek(virDomainPtr dom, ret = 0; endjob: - if (qemuDomainObjEndJob(driver, vm) == 0) + if (!qemuDomainObjEndJob(driver, vm)) vm = NULL; cleanup: @@ -9848,7 +9845,7 @@ static int qemuDomainGetBlockInfo(virDomainPtr dom, ret = 0; } - if (qemuDomainObjEndJob(driver, vm) == 0) + if (!qemuDomainObjEndJob(driver, vm)) vm = NULL; } else { ret = 0; @@ -11145,7 +11142,7 @@ static int qemuDomainAbortJob(virDomainPtr dom) { qemuDomainObjExitMonitor(driver, vm); endjob: - if (qemuDomainObjEndJob(driver, vm) == 0) + if (!qemuDomainObjEndJob(driver, vm)) vm = NULL; cleanup: @@ -11196,7 +11193,7 @@ qemuDomainMigrateSetMaxDowntime(virDomainPtr dom, qemuDomainObjExitMonitor(driver, vm); endjob: - if (qemuDomainObjEndJob(driver, vm) == 0) + if (!qemuDomainObjEndJob(driver, vm)) vm = NULL; cleanup: @@ -11251,7 +11248,7 @@ qemuDomainMigrateGetCompressionCache(virDomainPtr dom, qemuDomainObjExitMonitor(driver, vm); endjob: - if (qemuDomainObjEndJob(driver, vm) == 0) + if (!qemuDomainObjEndJob(driver, vm)) vm = NULL; cleanup: @@ -11307,7 +11304,7 @@ qemuDomainMigrateSetCompressionCache(virDomainPtr dom, qemuDomainObjExitMonitor(driver, vm); endjob: - if (qemuDomainObjEndJob(driver, vm) == 0) + if (!qemuDomainObjEndJob(driver, vm)) vm = NULL; cleanup: @@ -11355,7 +11352,7 @@ qemuDomainMigrateSetMaxSpeed(virDomainPtr dom, priv->migMaxBandwidth = bandwidth; endjob: - if (qemuDomainObjEndJob(driver, vm) == 0) + if (!qemuDomainObjEndJob(driver, vm)) vm = NULL; } else { priv->migMaxBandwidth = bandwidth; @@ -11708,7 +11705,7 @@ cleanup: } endjob: - if (vm && qemuDomainObjEndJob(driver, vm) == 0) { + if (vm && !qemuDomainObjEndJob(driver, vm)) { /* Only possible if a transient vm quit while our locks were down, * in which case we don't want to save snapshot metadata. */ *vmptr = NULL; @@ -13290,7 +13287,7 @@ static int qemuDomainRevertToSnapshot(virDomainSnapshotPtr snapshot, if (qemuDomainSnapshotRevertInactive(driver, vm, snap) < 0) { if (!vm->persistent) { - if (qemuDomainObjEndJob(driver, vm) > 0) + if (qemuDomainObjEndJob(driver, vm)) qemuDomainRemoveInactive(driver, vm); vm = NULL; goto cleanup; @@ -13317,7 +13314,7 @@ static int qemuDomainRevertToSnapshot(virDomainSnapshotPtr snapshot, virDomainAuditStart(vm, "from-snapshot", rc >= 0); if (rc < 0) { if (!vm->persistent) { - if (qemuDomainObjEndJob(driver, vm) > 0) + if (qemuDomainObjEndJob(driver, vm)) qemuDomainRemoveInactive(driver, vm); vm = NULL; goto cleanup; @@ -13340,7 +13337,7 @@ static int qemuDomainRevertToSnapshot(virDomainSnapshotPtr snapshot, ret = 0; endjob: - if (vm && qemuDomainObjEndJob(driver, vm) == 0) + if (vm && !qemuDomainObjEndJob(driver, vm)) vm = NULL; cleanup: @@ -13506,7 +13503,7 @@ static int qemuDomainSnapshotDelete(virDomainSnapshotPtr snapshot, } endjob: - if (qemuDomainObjEndJob(driver, vm) == 0) + if (!qemuDomainObjEndJob(driver, vm)) vm = NULL; cleanup: @@ -13559,7 +13556,7 @@ static int qemuDomainQemuMonitorCommand(virDomainPtr domain, const char *cmd, qemuDomainObjExitMonitor(driver, vm); endjob: - if (qemuDomainObjEndJob(driver, vm) == 0) { + if (!qemuDomainObjEndJob(driver, vm)) { vm = NULL; } @@ -13641,7 +13638,7 @@ static virDomainPtr qemuDomainQemuAttach(virConnectPtr conn, if (qemuProcessAttach(conn, driver, vm, pid, pidfile, monConfig, monJSON) < 0) { - if (qemuDomainObjEndJob(driver, vm) > 0) + if (qemuDomainObjEndJob(driver, vm)) qemuDomainRemoveInactive(driver, vm); vm = NULL; monConfig = NULL; @@ -13654,7 +13651,7 @@ static virDomainPtr qemuDomainQemuAttach(virConnectPtr conn, if (dom) dom->id = vm->def->id; - if (qemuDomainObjEndJob(driver, vm) == 0) + if (!qemuDomainObjEndJob(driver, vm)) vm = NULL; cleanup: @@ -14149,7 +14146,7 @@ qemuDomainBlockJobImpl(virDomainObjPtr vm, } endjob: - if (qemuDomainObjEndJob(driver, vm) == 0) { + if (!qemuDomainObjEndJob(driver, vm)) { vm = NULL; goto cleanup; } @@ -14380,10 +14377,8 @@ endjob: if (ret < 0) disk->mirrorFormat = VIR_STORAGE_FILE_NONE; VIR_FREE(mirror); - if (qemuDomainObjEndJob(driver, vm) == 0) { + if (!qemuDomainObjEndJob(driver, vm)) vm = NULL; - goto cleanup; - } cleanup: VIR_FREE(device); @@ -14572,10 +14567,8 @@ endjob: top_parent, VIR_DISK_CHAIN_READ_ONLY); } - if (qemuDomainObjEndJob(driver, vm) == 0) { + if (!qemuDomainObjEndJob(driver, vm)) vm = NULL; - goto cleanup; - } cleanup: VIR_FREE(device); @@ -14641,10 +14634,8 @@ qemuDomainOpenGraphics(virDomainPtr dom, ret = qemuMonitorOpenGraphics(priv->mon, protocol, fd, "graphicsfd", (flags & VIR_DOMAIN_OPEN_GRAPHICS_SKIPAUTH) != 0); qemuDomainObjExitMonitor(driver, vm); - if (qemuDomainObjEndJob(driver, vm) == 0) { + if (!qemuDomainObjEndJob(driver, vm)) vm = NULL; - goto cleanup; - } cleanup: if (vm) @@ -14956,7 +14947,7 @@ qemuDomainGetBlockIoTune(virDomainPtr dom, ret = 0; endjob: - if (qemuDomainObjEndJob(driver, vm) == 0) + if (!qemuDomainObjEndJob(driver, vm)) vm = NULL; cleanup: @@ -15030,7 +15021,7 @@ qemuDomainGetDiskErrors(virDomainPtr dom, ret = n; endjob: - if (qemuDomainObjEndJob(driver, vm) == 0) + if (!qemuDomainObjEndJob(driver, vm)) vm = NULL; cleanup: @@ -15561,7 +15552,7 @@ qemuDomainPMSuspendForDuration(virDomainPtr dom, qemuDomainObjExitAgent(vm); endjob: - if (qemuDomainObjEndJob(driver, vm) == 0) + if (!qemuDomainObjEndJob(driver, vm)) vm = NULL; cleanup: @@ -15610,7 +15601,7 @@ qemuDomainPMWakeup(virDomainPtr dom, qemuDomainObjExitMonitor(driver, vm); endjob: - if (qemuDomainObjEndJob(driver, vm) == 0) + if (!qemuDomainObjEndJob(driver, vm)) vm = NULL; cleanup: @@ -15696,7 +15687,7 @@ qemuDomainQemuAgentCommand(virDomainPtr domain, VIR_FREE(result); endjob: - if (qemuDomainObjEndJob(driver, vm) == 0) + if (!qemuDomainObjEndJob(driver, vm)) vm = NULL; cleanup: @@ -15766,7 +15757,7 @@ qemuDomainFSTrim(virDomainPtr dom, qemuDomainObjExitAgent(vm); endjob: - if (qemuDomainObjEndJob(driver, vm) == 0) + if (!qemuDomainObjEndJob(driver, vm)) vm = NULL; cleanup: diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 3177756..69a9013 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -2125,7 +2125,7 @@ endjob: if (qemuMigrationJobFinish(driver, vm) == 0) vm = NULL; } else { - if (qemuDomainObjEndJob(driver, vm) == 0) + if (!qemuDomainObjEndJob(driver, vm)) vm = NULL; } goto cleanup; @@ -2334,7 +2334,7 @@ qemuMigrationPrepareAny(virQEMUDriverPtr driver, VIR_QEMU_PROCESS_START_PAUSED | VIR_QEMU_PROCESS_START_AUTODESTROY) < 0) { virDomainAuditStart(vm, "migrated", false); - if (qemuDomainObjEndJob(driver, vm) < 0) + if (!qemuDomainObjEndJob(driver, vm)) vm = NULL; goto endjob; } -- 1.8.3.1

2 2

[libvirt] [libvirt-php] bug in libvirt_domain_change_vcpus()
by Olivier Doucet 10 Sep '13

10 Sep '13

Hello everyone, I think there is a bug in the current implementation of function libvirt_domain_change_vcpu(). When using this function (with second parameter = 2), I have the following error : Error setting maxvcpus=2: (domain_definition):8: Specification mandate value for attribute curre <vcpu>2</vcpu> --^ If I'm right, the equivalent with 'virsh' binary is 'setvcpus', and this is working. If I look into source code (http://libvirt.org/git/?p=libvirt-php.git;a=blob;f=src/libvirt-php.c;h=7ce2…) it seems this operation is done by rewriting the whole XML. I think we should use instead C function virDomainSetVcpus http://libvirt.org/html/libvirt-libvirt.html#virDomainSetVcpus What do you think ? Olivier

3 5

[libvirt] [PATCH] qemu: Fix connectGetType() API
by Michal Novotny 10 Sep '13

10 Sep '13

This patch fixes qemuConnectGetType() API function to return KVM if appropriate, i.e. when /dev/kvm exists as the KVM module is loaded. No further check is being done so it's merely showing the possibility that KVM virtualization is available on the host however we don't have any guest information (as it's connection-only related) so we cannot sure we can use KVM. This can be useful to identify we have KVM (Virt Support) available on the host if host and guest archs are the same. Testing: Done using a simple application with C source code below. [before patch applied]$ ./test Hypervisor type: QEMU [after patch applied]$ ./test Hypervisor type: KVM $ Testing C code: int main() { virConnectPtr conn = NULL; conn = virConnectOpen("qemu:///system"); if (!conn) return 1; printf("Hypervisor type: %s\n", virConnectGetType(conn)); virConnectClose(conn); return 0; } Compiled on F-17 x86_64 host using: gcc -o test test.c -lvirt Signed-off-by: Michal Novotny <minovotn(a)redhat.com> --- src/qemu/qemu_driver.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 9b5d126..b770967 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -1132,6 +1132,16 @@ static const char *qemuConnectGetType(virConnectPtr conn ATTRIBUTE_UNUSED) { if (virConnectGetTypeEnsureACL(conn) < 0) return NULL; + /* + * If KVM is available for the host architecture then report KVM support. + * This approach merely shows it is possible to have KVM support as module is + * loaded however if you select different architecture, e.g. ARM on x86_64 host, + * the KVM option will not be available as there is no KVM virtualization + * support for ARM architecture that could be running on top of x86_64 host. + */ + if (access("/dev/kvm", F_OK) == 0) + return "KVM"; + return "QEMU"; } -- 1.7.11.7

3 3

[libvirt] [PATCH] systemd: add debug message when virDBusCallMethod failed
by Gao feng 10 Sep '13

10 Sep '13

Generate debug message when systemd doesn't support interface org.freedesktop.machine1.Manager. Signed-off-by: Gao feng <gaofeng(a)cn.fujitsu.com> --- src/util/virsystemd.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/util/virsystemd.c b/src/util/virsystemd.c index 3e69ef6..c631557 100644 --- a/src/util/virsystemd.c +++ b/src/util/virsystemd.c @@ -233,6 +233,7 @@ int virSystemdCreateMachine(const char *name, if (err->code == VIR_ERR_DBUS_SERVICE && STREQ(err->str2, "org.freedesktop.DBus.Error.ServiceUnknown")) { virResetLastError(); + VIR_DEBUG("systemd doesn't support interface org.freedesktop.machine1.Manager"); ret = -2; } goto cleanup; -- 1.8.3.1

3 5

[libvirt] link fow downloading libvirt-0.10.2-19.el6
by arun abhinay 10 Sep '13

10 Sep '13

Hi, In reference to comment28 in below link https://bugzilla.redhat.com/show_bug.cgi?id=911609#c28 The issue was fixed in libvirt-0.10.2-19.el6 version. I am facing similar crash and want to check with libvirt-0.10.2-19.el6 version. But i couldnt find this version from opensource. We could only find below version of libvirt from http://libvirt.org/sources/ *libvirt-0.10.2-1.fc17.src.rpm 24-Sep-2012 07:32 21M libvirt-0.10.2-1.fc17.x86_64.rpm 24-Sep-2012 07:32 21K libvirt-0.10.2.tar.gz 24-Sep-2012 07:53 21M** * *Can any one please provide me a link from where i can download libvirt-0.10.2-19.el6 version.* I am pasting my BT of my core ffor reference below #0 0x00007f068e9f951b in remoteClientCloseFunc (client=<value optimized out>, reason=1, opaque=0x2100110) at remote/remote_driver.c:340 #1 0x00007f068ea1a152 in virNetClientIOHandleOutput (client=0x2100110) at rpc/virnetclient.c:1200 #2 0x0000000000000009 in ?? () #3 0x0000000002100a50 in ?? () #4 0x0000000000000002 in ?? () #5 0x00007f0684000988 in ?? () #6 0x00007f068ea1caa1 in virNetClientIOEventLoop (client=0x2100890, thiscall=0xc02179369c522bee) at rpc/virnetclient.c:1525 #7 0x0000000000000000 in ?? () Thanks Abhinay

5 8

[libvirt] [PATCH 0/4] build: use subdir-objects
by Eric Blake 10 Sep '13

10 Sep '13

Automake 1.14 is annoyingly loud about warning that the future automake 2.0 will turn on subdir-objects by default. Since automake 1.9 also supports subdir-objects, the best course of action is to enable the feature. But we have to fix some problems before doing so. Also, I noticed some issues with .x files while searching for places that needed fixing. Eric Blake (4): build: avoid $(srcdir) in *_SOURCES build: use library rather than cross-directory compilation tests: check remaining .x files build: use automake subdir-objects .gitignore | 1 + cfg.mk | 3 +- configure.ac | 2 +- daemon/Makefile.am | 55 +++++++++++----- src/Makefile.am | 139 +++++++++++++++++++++++---------------- src/lock_protocol-structs | 55 ++++++++++++++++ src/lxc_monitor_protocol-structs | 16 +++++ tests/Makefile.am | 4 +- 8 files changed, 198 insertions(+), 77 deletions(-) create mode 100644 src/lock_protocol-structs create mode 100644 src/lxc_monitor_protocol-structs -- 1.8.3.1

2 7

[libvirt] [PATCH]LXC doc: Add warns if net namespace not enabled
by Chen Hanxiao 10 Sep '13

10 Sep '13

From: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> If we don't enable network namespace, we could shutdown host by executing command 'shutdown' inside container. This patch will add some warnings in LXC docs and give some advice to readers. Signed-off-by: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> --- docs/drvlxc.html.in | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/docs/drvlxc.html.in b/docs/drvlxc.html.in index 640968f..8f3a36a 100644 --- a/docs/drvlxc.html.in +++ b/docs/drvlxc.html.in @@ -50,6 +50,13 @@ processes inside containers cannot be securely isolated from host process without the use of a mandatory access control technology such as SELinux or AppArmor.</strong> </p> +<p> +<strong>WARNING: If 'net' namespace <i>not</i> enabled for container, +host OS could be <i>shutdown</i> by executing command like 'reboot' +inside container.<br/>So make sure 'net' namespace was available and +set the <privnet/> feature in the XML, or configure virtual NICs. +Then this issue could be circumvented.</strong> +</p> <h2><a name="init">Default container setup</a></h2> -- 1.7.1

3 5