- Devel - libvirt List Archives

[libvirt] [PATCHv2] docs: added initial page for c# binding, with links to it
by Justin Clift 20 Oct '10

20 Oct '10

Adds a new page for the C# language bindings being developed by Arnaud Champion. MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit --- This version includes information on usage, further information on coverage, and the functions missed from the prior version. It doesn't include an example program (yet), as that is still waiting to be developed. It can be provided in a subsequent patch when ready. docs/bindings.html.in | 2 +- docs/csharp.html.in | 459 +++++++++++++++++++++++++++++++++++++++++++++++++ docs/sitemap.html.in | 4 + 3 files changed, 464 insertions(+), 1 deletions(-) create mode 100644 docs/csharp.html.in diff --git a/docs/bindings.html.in b/docs/bindings.html.in index ee63ce3..bdcd231 100644 --- a/docs/bindings.html.in +++ b/docs/bindings.html.in @@ -15,7 +15,7 @@ higher level kind of languages:</p> <li><strong>OCaml</strong>: Richard Jones supplies <a href="http://libvirt.org/ocaml/">bindings for OCaml</a>.</li> <li><strong>Ruby</strong>: David Lutterkort provides <a href="http://libvirt.org/ruby/">bindings for Ruby</a>.</li> <li><strong>Java</strong>: Daniel Veillard maintains <a href="java.html">Java bindings</a>.</li> - <li><strong>C#</strong>: Jaromír Červenka maintains <a href="http://svn.i-tux.cz/listing.php?repname=SharpLibVirt">C# bindings here</a>.</li> + <li><strong>C#</strong>: Arnaud Champion maintains <a href="csharp.html">C# bindings</a>.</li> <li><strong>PHP</strong>: Radek Hladik is developing <a href="http://phplibvirt.cybersales.cz/">PHP bindings</a>.</li> </ul> <p>For information on using libvirt on <strong>Windows</strong> diff --git a/docs/csharp.html.in b/docs/csharp.html.in new file mode 100644 index 0000000..3e15176 --- /dev/null +++ b/docs/csharp.html.in @@ -0,0 +1,459 @@ +<?xml version="1.0"?> +<html> + <body> + <h1>C# API bindings</h1> + + <h2>Description</h2> + + <p> + The C# libvirt bindings are a class library. They use a Microsoft + Visual Studio project architecture, and have been tested with Windows + .NET, and Mono, on both Linux and Windows. + </p> + <p> + Compiling them produces <b>LibvirtBindings.dll</b>, which can + be added as a .NET reference to any .NET project needing access + to libvirt. + </p> + + <p> </p> + + <h2>Requirements</h2> + + <p> + These bindings depend upon the libvirt libraries being installed. + In the .NET case, this is <b>libvirt-0.dll</b>, produced from + compiling libvirt for windows. + </p> + + <p> </p> + + + + <h2>GIT source repository</h2> + <p> + The C# bindings source code is maintained in a <a + href="http://git-scm.com/">git</a> repository available on + <a href="http://libvirt.org/git/">libvirt.org</a>: + </p> + +<pre> +git clone git://libvirt.org/libvirt-csharp.git +</pre> + + <p> + They can also be browsed online: + </p> + +<pre> +<a href="http://libvirt.org/git/?p=libvirt-csharp.git;a=summary">http://libvirt.org/git/?p=libvirt-csharp.git;a=summary</a> +</pre> + + <p> </p> + + <h2>Usage</h2> + + <p> + The class library exposes the <b>LibvirtBindings</b> namespace. + This namespace exposes all of the needed types (enum, struct), + and 2 main classes, <b>libVirt</b> and <b>libvirtError</b>. + </p> + <p> + The <b>libVirt</b> class exposes all of the interfaces of the + libvirt library for handling virtualized domains. + </p> + <p> + The <b>libvirtError</b> class exposes all of the interfaces of + the libvirt library for handling errors raised while using the library. + </p> + + <p> </p> + + <h2>Authors</h2> + + <p> + The C# bindings are the work of Arnaud Champion + <<a href="mailto:arnaud.champion AT devatom.fr">arnaud.champion AT devatom.fr</a>>, + based upon the previous work of Jaromír Červenka. + </p> + + <p> </p> + + <h2>Notes on testing</h2> + + <p> + Windows testing is performed on Windows 7, with .NET 4, Visual Studio 2010, and MonoDevelop 2.4. + </p> + <p> + Linux testing is performed on Fedora 13 i686, with MonoDevelop 2.2. + </p> + + <p> </p> + + <h2>Type Coverage</h2> + + <p> + Coverage of the libvirt types is: + </p> + <table class="top_table"> + <tr><th>Type</th><th>Name</th><th>Binding?</th><th>Tested?</th><th>Sample Code?</th><th>Works?</th><th>Tested .Net/Windows Works?</th><th>Tested Mono/Windows Works?</th><th>Tested Mono/Linux Works?</th></tr> + <tr><td>enum</td><td>virCPUCompareResult</td><td>No</td><td> </td><td> </td><td> </td><td> </td><td> </td><td> </td></tr> + <tr><td>struct</td><td>virConnect</td><td>Yes, an IntPtr as the struct is not public</td><td>Yes</td><td> </td><td>Yes</td><td> </td><td> </td><td> </td></tr> + <tr><td>struct</td><td>virConnectAuth</td><td>Yes</td><td>Yes</td><td>virConnectOpenAuth</td><td>Yes</td><td>Yes</td><td>Yes</td><td>Yes</td></tr> + <tr><td>struct</td><td>virConnectCredential</td><td>Yes</td><td>Yes</td><td>virConnectOpenAuth</td><td>Yes</td><td>Yes</td><td>Yes</td><td>Yes</td></tr> + <tr><td>enum</td><td>virConnectCredentialType</td><td>Yes</td><td>Yes</td><td>virConnectOpenAuth</td><td>Yes</td><td>Yes</td><td>Yes</td><td>Yes</td></tr> + <tr><td>enum</td><td>virConnectFlags</td><td>No</td><td> </td><td> </td><td> </td><td> </td><td> </td><td> </td></tr> + <tr><td>struct</td><td>virDomain</td><td>Yes, an IntPtr as the struct is not public</td><td> </td><td> </td><td> </td><td> </td><td> </td><td> </td></tr> + <tr><td>struct</td><td>virDomainBlockInfo</td><td>No</td><td> </td><td> </td><td> </td><td> </td><td> </td><td> </td></tr> + <tr><td>struct</td><td>virDomainBlockStatsInfo</td><td>No</td><td> </td><td> </td><td> </td><td> </td><td> </td><td> </td></tr> + <tr><td>enum</td><td>virDomainCoreDumpFlags</td><td>No</td><td> </td><td> </td><td> </td><td> </td><td> </td><td> </td></tr> + <tr><td>enum</td><td>virDomainCreateFlags</td><td>No</td><td> </td><td> </td><td> </td><td> </td><td> </td><td> </td></tr> + <tr><td>enum</td><td>virDomainDeviceModifyFlags</td><td>No</td><td> </td><td> </td><td> </td><td> </td><td> </td><td> </td></tr> + <tr><td>enum</td><td>virDomainEventDefinedDetailType</td><td>Yes</td><td> </td><td>Yes</td><td>Yes</td><td> </td><td> </td><td> </td></tr> + <tr><td>struct</td><td>virDomainEventGraphicsAddress</td><td>No</td><td> </td><td> </td><td> </td><td> </td><td> </td><td> </td></tr> + <tr><td>enum</td><td>virDomainEventGraphicsAddressType</td><td>No</td><td> </td><td> </td><td> </td><td> </td><td> </td><td> </td></tr> + <tr><td>enum</td><td>virDomainEventGraphicsPhase</td><td>No</td><td> </td><td> </td><td> </td><td> </td><td> </td><td> </td></tr> + <tr><td>struct</td><td>virDomainEventGraphicsSubject</td><td>No</td><td> </td><td> </td><td> </td><td> </td><td> </td><td> </td></tr> + <tr><td>struct</td><td>virDomainEventGraphicsSubjectIdentity</td><td>No</td><td> </td><td> </td><td> </td><td> </td><td> </td><td> </td></tr> + <tr><td>enum</td><td>virDomainEventID</td><td>No</td><td> </td><td> </td><td> </td><td> </td><td> </td><td> </td></tr> + <tr><td>enum</td><td>virDomainEventIOErrorAction</td><td>No</td><td> </td><td> </td><td> </td><td> </td><td> </td><td> </td></tr> + <tr><td>enum</td><td>virDomainEventResumedDetailType</td><td>Yes</td><td>Yes</td><td> </td><td>Yes</td><td> </td><td> </td><td> </td></tr> + <tr><td>enum</td><td>virDomainEventStartedDetailType</td><td>Yes</td><td>Yes</td><td> </td><td>Yes</td><td> </td><td> </td><td> </td></tr> + <tr><td>enum</td><td>virDomainEventStoppedDetailType</td><td>Yes</td><td>Yes</td><td> </td><td>Yes</td><td> </td><td> </td><td> </td></tr> + <tr><td>enum</td><td>virDomainEventSuspendedDetailType</td><td>Yes</td><td>Yes</td><td> </td><td>Yes</td><td> </td><td> </td><td> </td></tr> + <tr><td>enum</td><td>virDomainEventType</td><td>Yes</td><td>Yes</td><td> </td><td>Yes</td><td> </td><td> </td><td> </td></tr> + <tr><td>enum</td><td>virDomainEventUndefinedDetailType</td><td>Yes</td><td>Yes</td><td> </td><td>Yes</td><td> </td><td> </td><td> </td></tr> + <tr><td>enum</td><td>virDomainEventWatchdogAction</td><td>No</td><td> </td><td> </td><td> </td><td> </td><td> </td><td> </td></tr> + <tr><td>struct</td><td>virDomainInfo</td><td>Yes</td><td>Yes</td><td> </td><td>Yes</td><td> </td><td> </td><td> </td></tr> + <tr><td>struct</td><td>virDomainInterfaceStatsStruct</td><td>Yes</td><td>No</td><td> </td><td>Maybe</td><td> </td><td> </td><td> </td></tr> + <tr><td>struct</td><td>virDomainJobInfo</td><td>No</td><td> </td><td> </td><td> </td><td> </td><td> </td><td> </td></tr> + <tr><td>enum</td><td>virDomainJobType</td><td>No</td><td> </td><td> </td><td> </td><td> </td><td> </td><td> </td></tr> + <tr><td>enum</td><td>virDomainMemoryFlags</td><td>No</td><td> </td><td> </td><td> </td><td> </td><td> </td><td> </td></tr> + <tr><td>struct</td><td>virDomainMemoryStatStruct</td><td>No</td><td> </td><td> </td><td> </td><td> </td><td> </td><td> </td></tr> + <tr><td>enum</td><td>virDomainMemoryStatTags</td><td>Yes</td><td>No</td><td> </td><td>Maybe</td><td> </td><td> </td><td> </td></tr> + <tr><td>enum</td><td>virDomainMigrateFlags</td><td>No</td><td> </td><td> </td><td> </td><td> </td><td> </td><td> </td></tr> + <tr><td>struct</td><td>virDomainSnapshot</td><td>No</td><td> </td><td> </td><td> </td><td> </td><td> </td><td> </td></tr> + <tr><td>enum</td><td>virDomainSnapshotDeleteFlags</td><td> </td><td> </td><td> </td><td> </td><td> </td><td> </td><td> </td></tr> + <tr><td>enum</td><td>virDomainState</td><td>Yes</td><td>Yes</td><td> </td><td>Yes</td><td> </td><td> </td><td> </td></tr> + <tr><td>enum</td><td>virDomainXMLFlags</td><td>Yes</td><td>Yes</td><td> </td><td>Yes</td><td> </td><td> </td><td> </td></tr> + <tr><td>enum</td><td>virEventHandleType</td><td>Yes</td><td>Yes</td><td> </td><td>Yes</td><td> </td><td> </td><td> </td></tr> + <tr><td>struct</td><td>virInterface</td><td>Yes, an IntPtr as the struct is not public</td><td> </td><td> </td><td> </td><td> </td><td> </td><td> </td></tr> + <tr><td>enum</td><td>virInterfaceXMLFlags</td><td>No</td><td> </td><td> </td><td> </td><td> </td><td> </td><td> </td></tr> + <tr><td>struct</td><td>virNWFilter</td><td>No</td><td> </td><td> </td><td> </td><td> </td><td> </td><td> </td></tr> + <tr><td>struct</td><td>virNetwork</td><td>Yes, an IntPtr as the struct is not public</td><td> </td><td> </td><td> </td><td> </td><td> </td><td> </td></tr> + <tr><td>struct</td><td>virNodeDevice</td><td>Yes, an IntPtr as the struct is not public</td><td> </td><td> </td><td> </td><td> </td><td> </td><td> </td></tr> + <tr><td>struct</td><td>virNodeInfo</td><td>Yes</td><td>No</td><td> </td><td>Maybe</td><td> </td><td> </td><td> </td></tr> + <tr><td>struct</td><td>virSchedParameter</td><td>No</td><td> </td><td> </td><td> </td><td> </td><td> </td><td> </td></tr> + <tr><td>enum</td><td>virSchedParameterType</td><td>No</td><td> </td><td> </td><td> </td><td> </td><td> </td><td> </td></tr> + <tr><td>struct</td><td>virSecret</td><td>No</td><td> </td><td> </td><td> </td><td> </td><td> </td><td> </td></tr> + <tr><td>enum</td><td>virSecretUsageType</td><td>No</td><td> </td><td> </td><td> </td><td> </td><td> </td><td> </td></tr> + <tr><td>struct</td><td>virSecurityLabel</td><td>No</td><td> </td><td> </td><td> </td><td> </td><td> </td><td> </td></tr> + <tr><td>struct</td><td>virSecurityModel</td><td>No</td><td> </td><td> </td><td> </td><td> </td><td> </td><td> </td></tr> + <tr><td>struct</td><td>virStoragePool</td><td>Yes, an IntPtr as the struct is not public</td><td> </td><td> </td><td> </td><td> </td><td> </td><td> </td></tr> + <tr><td>enum</td><td>virStoragePoolBuildFlags</td><td>Yes</td><td>No</td><td> </td><td>Maybe</td><td> </td><td> </td><td> </td></tr> + <tr><td>enum</td><td>virStoragePoolDeleteFlags</td><td>Yes</td><td>No</td><td> </td><td>Maybe</td><td> </td><td> </td><td> </td></tr> + <tr><td>struct</td><td>virStoragePoolInfo</td><td>Yes</td><td>Yes</td><td> </td><td>Yes</td><td> </td><td> </td><td> </td></tr> + <tr><td>enum</td><td>virStoragePoolState</td><td>Yes</td><td>Yes</td><td> </td><td>Yes</td><td> </td><td> </td><td> </td></tr> + <tr><td>struct</td><td>virStorageVol</td><td>Yes, an IntPtr as the struct is not public</td><td> </td><td> </td><td> </td><td> </td><td> </td><td> </td></tr> + <tr><td>enum</td><td>virStorageVolDeleteFlags</td><td>No</td><td> </td><td> </td><td> </td><td> </td><td> </td><td> </td></tr> + <tr><td>struct</td><td>virStorageVolInfo</td><td>Yes</td><td>Yes</td><td> </td><td>Yes</td><td> </td><td> </td><td> </td></tr> + <tr><td>enum</td><td>virStorageVolType</td><td>Yes</td><td>Yes</td><td> </td><td>Yes</td><td> </td><td> </td><td> </td></tr> + <tr><td>struct</td><td>virStream</td><td>No</td><td> </td><td> </td><td> </td><td> </td><td> </td><td> </td></tr> + <tr><td>enum</td><td>virStreamEventType</td><td>No</td><td> </td><td> </td><td> </td><td> </td><td> </td><td> </td></tr> + <tr><td>enum</td><td>virStreamFlags</td><td>No</td><td> </td><td> </td><td> </td><td> </td><td> </td><td> </td></tr> + <tr><td>struct</td><td>virVcpuInfo</td><td>No</td><td> </td><td> </td><td> </td><td> </td><td> </td><td> </td></tr> + <tr><td>enum</td><td>virVcpuState</td><td>No</td><td> </td><td> </td><td> </td><td> </td><td> </td><td> </td></tr> + </table> + + <p> </p> + + <h2>Function Coverage</h2> + + <p> + Coverage of the libvirt functions is: + </p> + <table class="top_table"> + <tr><th>Name</th><th>Binding?</th><th>Type?</th><th>Tested?</th><th>Sample Code?</th><th>Working?</th><th>Tested .Net/Windows Works?</th><th>Tested Mono/Windows Works?</th><th>Tested Mono/Linux Works?</th></tr> + <tr><td>virConnectAuthCallbackPtr</td><td>Yes</td><td>delegate</td><td>Yes</td><td>virConnectOpenAuth</td><td>Yes</td><td>Yes</td><td>Yes</td><td> </td></tr> + <tr><td>virConnectBaselineCPU</td><td>No</td><td>function</td><td> </td><td> </td><td> </td><td> </td><td> </td><td> </td></tr> + <tr><td>virConnectClose</td><td>Yes</td><td>function</td><td>Yes</td><td>virConnectOpenAuth</td><td> </td><td>Yes</td><td>Yes</td><td>Yes</td></tr> + <tr><td>virConnectCompareCPU</td><td>No</td><td>function</td><td> </td><td> </td><td> </td><td> </td><td> </td><td> </td></tr> + <tr><td>virConnectDomainEventCallback</td><td>Yes</td><td>delegate</td><td>Yes</td><td> </td><td>Yes</td><td> </td><td> </td><td> </td></tr> + <tr><td>virConnectDomainEventDeregister</td><td>No</td><td>function</td><td> </td><td> </td><td> </td><td> </td><td> </td><td> </td></tr> + <tr><td>virConnectDomainEventDeregisterAny</td><td>No</td><td>function</td><td> </td><td> </td><td> </td><td> </td><td> </td><td> </td></tr> + <tr><td>virConnectDomainEventGenericCallback</td><td>No</td><td>delegate</td><td> </td><td> </td><td> </td><td> </td><td> </td><td> </td></tr> + <tr><td>virConnectDomainEventGraphicsCallback</td><td>No</td><td>delegate</td><td> </td><td> </td><td> </td><td> </td><td> </td><td> </td></tr> + <tr><td>virConnectDomainEventIOErrorCallback</td><td>No</td><td>delegate</td><td> </td><td> </td><td> </td><td> </td><td> </td><td> </td></tr> + <tr><td>virConnectDomainEventIOErrorReasonCallback</td><td>No</td><td>delegate</td><td> </td><td> </td><td> </td><td> </td><td> </td><td> </td></tr> + <tr><td>virConnectDomainEventRTCChangeCallback</td><td>No</td><td>delegate</td><td> </td><td> </td><td> </td><td> </td><td> </td><td> </td></tr> + <tr><td>virConnectDomainEventRegister</td><td>Yes</td><td>function</td><td>Yes</td><td> </td><td>Yes</td><td> </td><td> </td><td> </td></tr> + <tr><td>virConnectDomainEventRegisterAny</td><td>No</td><td>function</td><td> </td><td> </td><td> </td><td> </td><td> </td><td> </td></tr> + <tr><td>virConnectDomainEventWatchdogCallback</td><td>No</td><td>delegate</td><td> </td><td> </td><td> </td><td> </td><td> </td><td> </td></tr> + <tr><td>virConnectDomainXMLFromNative</td><td>No</td><td>function</td><td> </td><td> </td><td> </td><td> </td><td> </td><td> </td></tr> + <tr><td>virConnectDomainXMLToNative</td><td>No</td><td>function</td><td> </td><td> </td><td> </td><td> </td><td> </td><td> </td></tr> + <tr><td>virConnectFindStoragePoolSources</td><td>No</td><td>function</td><td> </td><td> </td><td> </td><td> </td><td> </td><td> </td></tr> + <tr><td>virConnectGetCapabilities</td><td>Yes</td><td>function</td><td>Yes</td><td> </td><td>Yes</td><td> </td><td> </td><td> </td></tr> + <tr><td>virConnectGetHostname</td><td>Yes</td><td>function</td><td>Yes</td><td> </td><td> </td><td> </td><td> </td><td> </td></tr> + <tr><td>virConnectGetLibVersion</td><td>Yes</td><td>function</td><td>No</td><td> </td><td>Maybe</td><td> </td><td> </td><td> </td></tr> + <tr><td>virConnectGetMaxVcpus</td><td>Yes</td><td>function</td><td>No</td><td> </td><td>Maybe</td><td> </td><td> </td><td> </td></tr> + <tr><td>virConnectGetType</td><td>Yes</td><td>function</td><td>No</td><td> </td><td>Maybe</td><td> </td><td> </td><td> </td></tr> + <tr><td>virConnectGetURI</td><td>Yes</td><td>function</td><td>Yes</td><td> </td><td>Yes</td><td> </td><td> </td><td> </td></tr> + <tr><td>virConnectGetVersion</td><td>Yes</td><td>function</td><td>No</td><td> </td><td>Maybe</td><td> </td><td> </td><td> </td></tr> + <tr><td>virConnectIsEncrypted</td><td>Yes</td><td>function</td><td>No</td><td> </td><td>Maybe</td><td> </td><td> </td><td> </td></tr> + <tr><td>virConnectIsSecure</td><td>Yes</td><td>function</td><td>No</td><td> </td><td>Maybe</td><td> </td><td> </td><td> </td></tr> + <tr><td>virConnectListDefinedDomains</td><td>Yes</td><td>function</td><td>Yes</td><td>virConnectOpenAuth</td><td>Yes</td><td>Yes</td><td>Yes</td><td>Yes</td></tr> + <tr><td>virConnectListDefinedInterfaces </td><td>Yes</td><td>function</td><td>Yes</td><td> </td><td>Yes</td><td> </td><td> </td><td> </td></tr> + <tr><td>virConnectListDefinedNetworks</td><td>Yes</td><td>function</td><td>Yes</td><td> </td><td>Yes</td><td> </td><td> </td><td> </td></tr> + <tr><td>virConnectListDefinedStoragePools</td><td>Yes</td><td>function</td><td>Yes</td><td> </td><td>Yes</td><td> </td><td> </td><td> </td></tr> + <tr><td>virConnectListDomains</td><td>Yes</td><td>function</td><td>Yes</td><td>virConnectOpenAuth</td><td>Yes</td><td>Yes</td><td>Yes</td><td>Yes</td></tr> + <tr><td>virConnectListInterfaces</td><td>Yes</td><td>function</td><td>Yes</td><td> </td><td>Yes, if the host handles the method</td><td> </td><td> </td><td> </td></tr> + <tr><td>virConnectListNWFilters </td><td>No</td><td>function</td><td> </td><td> </td><td> </td><td> </td><td> </td><td> </td></tr> + <tr><td>virConnectListNetworks</td><td>Yes</td><td>function</td><td>Yes</td><td> </td><td>Yes</td><td> </td><td> </td><td> </td></tr> + <tr><td>virConnectListSecrets</td><td>Yes</td><td>function</td><td>No</td><td> </td><td>Maybe</td><td> </td><td> </td><td> </td></tr> + <tr><td>virConnectListStoragePools</td><td>Yes</td><td>function</td><td>Yes</td><td> </td><td>Yes</td><td> </td><td> </td><td> </td></tr> + <tr><td>virConnectNumOfDefinedDomains</td><td>Yes</td><td>function</td><td>Yes</td><td>virConnectOpenAuth</td><td>Yes</td><td>Yes</td><td>Yes</td><td>Yes</td></tr> + <tr><td>virConnectNumOfDefinedInterfaces</td><td>Yes</td><td>function</td><td>No</td><td> </td><td>Maybe</td><td> </td><td> </td><td> </td></tr> + <tr><td>virConnectNumOfDefinedNetworks</td><td>Yes</td><td>function</td><td>Yes</td><td> </td><td>Yes</td><td> </td><td> </td><td> </td></tr> + <tr><td>virConnectNumOfDefinedStoragePools</td><td>Yes</td><td>function</td><td>Yes</td><td> </td><td>Yes</td><td> </td><td> </td><td> </td></tr> + <tr><td>virConnectNumOfDomains</td><td>Yes</td><td>function</td><td>Yes</td><td>virConnectOpenAuth</td><td>Yes</td><td>Yes</td><td>Yes</td><td>Yes</td></tr> + <tr><td>virConnectNumOfInterfaces</td><td>Yes</td><td>function</td><td>No</td><td> </td><td>Maybe</td><td> </td><td> </td><td> </td></tr> + <tr><td>virConnectNumOfNWFilters</td><td>No</td><td>function</td><td> </td><td> </td><td> </td><td> </td><td> </td><td> </td></tr> + <tr><td>virConnectNumOfNetworks </td><td>Yes</td><td>function</td><td>Yes</td><td> </td><td>Yes</td><td> </td><td> </td><td> </td></tr> + <tr><td>virConnectNumOfSecrets</td><td>Yes</td><td>function</td><td>No</td><td> </td><td>Maybe</td><td> </td><td> </td><td> </td></tr> + <tr><td>virConnectNumOfStoragePools</td><td>Yes</td><td>function</td><td>Yes</td><td> </td><td>Yes</td><td> </td><td> </td><td> </td></tr> + <tr><td>virConnectOpen</td><td>Yes</td><td>function</td><td>Yes</td><td> </td><td>Yes</td><td> </td><td> </td><td> </td></tr> + <tr><td>virConnectOpenAuth</td><td>Yes</td><td>function</td><td>Yes</td><td>virConnectOpenAuth</td><td>Yes</td><td>Yes</td><td>Yes</td><td>Yes</td></tr> + <tr><td>virConnectOpenReadOnly</td><td>Yes</td><td>function</td><td>No</td><td> </td><td>Maybe</td><td> </td><td> </td><td> </td></tr> + <tr><td>virConnectRef</td><td>Yes</td><td>function</td><td>No</td><td> </td><td>Maybe</td><td> </td><td> </td><td> </td></tr> + <tr><td>virDomainAbortJob</td><td>No</td><td>function</td><td> </td><td> </td><td> </td><td> </td><td> </td><td> </td></tr> + <tr><td>virDomainAttachDevice</td><td>Yes</td><td>function</td><td>No</td><td> </td><td>Maybe</td><td> </td><td> </td><td> </td></tr> + <tr><td>virDomainAttachDeviceFlags</td><td>Yes</td><td>function</td><td>No</td><td> </td><td>Maybe</td><td> </td><td> </td><td> </td></tr> + <tr><td>virDomainBlockPeek</td><td>No</td><td>function</td><td> </td><td> </td><td> </td><td> </td><td> </td><td> </td></tr> + <tr><td>virDomainBlockStats</td><td>Yes</td><td>function</td><td>No</td><td> </td><td>Maybe</td><td> </td><td> </td><td> </td></tr> + <tr><td>virDomainCoreDump</td><td>Yes</td><td>function</td><td>No</td><td> </td><td>Maybe</td><td> </td><td> </td><td> </td></tr> + <tr><td>virDomainCreate</td><td>Yes</td><td>function</td><td>Yes</td><td> </td><td>Yes</td><td> </td><td> </td><td> </td></tr> + <tr><td>virDomainCreateLinux</td><td>No</td><td>function</td><td> </td><td> </td><td> </td><td> </td><td> </td><td> </td></tr> + <tr><td>virDomainCreateWithFlags</td><td>No</td><td>function</td><td> </td><td> </td><td> </td><td> </td><td> </td><td> </td></tr> + <tr><td>virDomainCreateXML</td><td>Yes</td><td>function</td><td>No</td><td> </td><td>Maybe</td><td> </td><td> </td><td> </td></tr> + <tr><td>virDomainDefineXML</td><td>Yes</td><td>function</td><td>Yes</td><td> </td><td>Yes</td><td> </td><td> </td><td> </td></tr> + <tr><td>virDomainDestroy</td><td>Yes</td><td>function</td><td>Yes</td><td> </td><td>Yes</td><td> </td><td> </td><td> </td></tr> + <tr><td>virDomainDetachDevice</td><td>Yes</td><td>function</td><td>No</td><td> </td><td>Maybe</td><td> </td><td> </td><td> </td></tr> + <tr><td>virDomainDetachDeviceFlags</td><td>Yes</td><td>function</td><td>No</td><td> </td><td>Maybe</td><td> </td><td> </td><td> </td></tr> + <tr><td>virDomainFree</td><td>Yes</td><td>function</td><td>Yes</td><td> </td><td>Yes</td><td> </td><td> </td><td> </td></tr> + <tr><td>virDomainGetAutostart</td><td>Yes</td><td>function</td><td>No</td><td> </td><td>Maybe</td><td> </td><td> </td><td> </td></tr> + <tr><td>virDomainGetBlockInfo</td><td>No</td><td>function</td><td> </td><td> </td><td> </td><td> </td><td> </td><td> </td></tr> + <tr><td>virDomainGetConnect</td><td>Yes</td><td>function</td><td>No</td><td> </td><td>Maybe</td><td> </td><td> </td><td> </td></tr> + <tr><td>virDomainGetID</td><td>Yes</td><td>function</td><td>No</td><td> </td><td>Maybe</td><td> </td><td> </td><td> </td></tr> + <tr><td>virDomainGetInfo</td><td>Yes</td><td>function</td><td>Yes</td><td> </td><td>Yes</td><td> </td><td> </td><td> </td></tr> + <tr><td>virDomainGetJobInfo</td><td>No</td><td>function</td><td> </td><td> </td><td> </td><td> </td><td> </td><td> </td></tr> + <tr><td>virDomainGetMaxMemory</td><td>Yes</td><td>function</td><td>No</td><td> </td><td>Maybe</td><td> </td><td> </td><td> </td></tr> + <tr><td>virDomainGetMaxVcpus</td><td>Yes</td><td>function</td><td>No</td><td> </td><td>Maybe</td><td> </td><td> </td><td> </td></tr> + <tr><td>virDomainGetName</td><td>Yes</td><td>function</td><td>Yes</td><td>virConnectOpenAuth</td><td>Yes</td><td>Yes</td><td>Yes</td><td>Yes</td></tr> + <tr><td>virDomainGetOSType</td><td>Yes</td><td>function</td><td>No</td><td> </td><td>Maybe</td><td> </td><td> </td><td> </td></tr> + <tr><td>virDomainGetSchedulerParameters</td><td>No</td><td>function</td><td> </td><td> </td><td> </td><td> </td><td> </td><td> </td></tr> + <tr><td>virDomainGetSchedulerType</td><td>No</td><td>function</td><td> </td><td> </td><td> </td><td> </td><td> </td><td> </td></tr> + <tr><td>virDomainGetSecurityLabel</td><td>No</td><td>function</td><td> </td><td> </td><td> </td><td> </td><td> </td><td> </td></tr> + <tr><td>virDomainGetUUID</td><td>Yes</td><td>function</td><td>No</td><td> </td><td>Maybe</td><td> </td><td> </td><td> </td></tr> + <tr><td>virDomainGetUUIDString</td><td>Yes</td><td>function</td><td>No</td><td> </td><td>Maybe</td><td> </td><td> </td><td> </td></tr> + <tr><td>virDomainGetVcpus</td><td>No</td><td>function</td><td> </td><td> </td><td> </td><td> </td><td> </td><td> </td></tr> + <tr><td>virDomainGetXMLDesc</td><td>Yes</td><td>function</td><td>Yes</td><td> </td><td>Yes</td><td> </td><td> </td><td> </td></tr> + <tr><td>virDomainHasCurrentSnapshot</td><td>No</td><td>function</td><td> </td><td> </td><td> </td><td> </td><td> </td><td> </td></tr> + <tr><td>virDomainHasManagedSaveImage</td><td>No</td><td>function</td><td> </td><td> </td><td> </td><td> </td><td> </td><td> </td></tr> + <tr><td>virDomainInterfaceStats</td><td>No</td><td>function</td><td> </td><td> </td><td> </td><td> </td><td> </td><td> </td></tr> + <tr><td>virDomainIsActive</td><td>Yes</td><td>function</td><td>Yes</td><td> </td><td>Yes</td><td> </td><td> </td><td> </td></tr> + <tr><td>virDomainIsPersistent</td><td>Yes</td><td>function</td><td>No</td><td> </td><td>Maybe</td><td> </td><td> </td><td> </td></tr> + <tr><td>virDomainLookupByID</td><td>Yes</td><td>function</td><td>Yes</td><td>virConnectOpenAuth</td><td>Yes</td><td>Yes</td><td>Yes</td><td>Yes</td></tr> + <tr><td>virDomainLookupByName</td><td>Yes</td><td>function</td><td>Yes</td><td> </td><td>Yes</td><td> </td><td> </td><td> </td></tr> + <tr><td>virDomainLookupByUUID</td><td>Yes</td><td>function</td><td>No</td><td> </td><td>Maybe</td><td> </td><td> </td><td> </td></tr> + <tr><td>virDomainLookupByUUIDString</td><td>Yes</td><td>function</td><td>No</td><td> </td><td>Maybe</td><td> </td><td> </td><td> </td></tr> + <tr><td>virDomainManagedSave</td><td>No</td><td>function</td><td> </td><td> </td><td> </td><td> </td><td> </td><td> </td></tr> + <tr><td>virDomainManagedSaveRemove</td><td>No</td><td>function</td><td> </td><td> </td><td> </td><td> </td><td> </td><td> </td></tr> + <tr><td>virDomainMemoryPeek</td><td>No</td><td>function</td><td> </td><td> </td><td> </td><td> </td><td> </td><td> </td></tr> + <tr><td>virDomainMemoryStats</td><td>No</td><td>function</td><td> </td><td> </td><td> </td><td> </td><td> </td><td> </td></tr> + <tr><td>virDomainMigrate</td><td>No</td><td>function</td><td> </td><td> </td><td> </td><td> </td><td> </td><td> </td></tr> + <tr><td>virDomainMigrateSetMaxDowntime</td><td>No</td><td>function</td><td> </td><td> </td><td> </td><td> </td><td> </td><td> </td></tr> + <tr><td>virDomainMigrateToURI</td><td>No</td><td>function</td><td> </td><td> </td><td> </td><td> </td><td> </td><td> </td></tr> + <tr><td>virDomainPinVcpu</td><td>No</td><td>function</td><td> </td><td> </td><td> </td><td> </td><td> </td><td> </td></tr> + <tr><td>virDomainReboot</td><td>Yes</td><td>function</td><td>Yes</td><td> </td><td>Yes</td><td> </td><td> </td><td> </td></tr> + <tr><td>virDomainRef</td><td>Yes</td><td>function</td><td>No</td><td> </td><td>Maybe</td><td> </td><td> </td><td> </td></tr> + <tr><td>virDomainRestore</td><td>Yes </td><td>function</td><td>No</td><td> </td><td>Maybe</td><td> </td><td> </td><td> </td></tr> + <tr><td>virDomainResume</td><td>Yes</td><td>function</td><td>Yes</td><td> </td><td>Yes</td><td> </td><td> </td><td> </td></tr> + <tr><td>virDomainRevertToSnapshot</td><td>No</td><td>function</td><td> </td><td> </td><td> </td><td> </td><td> </td><td> </td></tr> + <tr><td>virDomainSave</td><td>Yes</td><td>function</td><td>No</td><td> </td><td>Maybe</td><td> </td><td> </td><td> </td></tr> + <tr><td>virDomainSetAutostart</td><td>Yes</td><td>function</td><td>No</td><td> </td><td>Maybe</td><td> </td><td> </td><td> </td></tr> + <tr><td>virDomainSetMaxMemory</td><td>Yes</td><td>function</td><td>No</td><td> </td><td>Maybe</td><td> </td><td> </td><td> </td></tr> + <tr><td>virDomainSetMemory</td><td>Yes</td><td>function</td><td>No</td><td> </td><td>Maybe</td><td> </td><td> </td><td> </td></tr> + <tr><td>virDomainSetSchedulerParameters</td><td>No</td><td>function</td><td> </td><td> </td><td> </td><td> </td><td> </td><td> </td></tr> + <tr><td>virDomainSetVcpus</td><td>Yes</td><td>function</td><td>No</td><td> </td><td>Maybe</td><td> </td><td> </td><td> </td></tr> + <tr><td>virDomainShutdown</td><td>Yes</td><td>function</td><td>Yes</td><td> </td><td>Yes</td><td> </td><td> </td><td> </td></tr> + <tr><td>virDomainSnapshotCreateXML</td><td>No</td><td>function</td><td> </td><td> </td><td> </td><td> </td><td> </td><td> </td></tr> + <tr><td>virDomainSnapshotCurrent</td><td>No</td><td>function</td><td> </td><td> </td><td> </td><td> </td><td> </td><td> </td></tr> + <tr><td>virDomainSnapshotDelete</td><td>No</td><td>function</td><td> </td><td> </td><td> </td><td> </td><td> </td><td> </td></tr> + <tr><td>virDomainSnapshotFree</td><td>No</td><td>function</td><td> </td><td> </td><td> </td><td> </td><td> </td><td> </td></tr> + <tr><td>virDomainSnapshotGetXMLDesc</td><td>No</td><td>function</td><td> </td><td> </td><td> </td><td> </td><td> </td><td> </td></tr> + <tr><td>virDomainSnapshotListNames</td><td>No</td><td>function</td><td> </td><td> </td><td> </td><td> </td><td> </td><td> </td></tr> + <tr><td>virDomainSnapshotLookupByName</td><td>No</td><td>function</td><td> </td><td> </td><td> </td><td> </td><td> </td><td> </td></tr> + <tr><td>virDomainSnapshotNum</td><td>No</td><td>function</td><td> </td><td> </td><td> </td><td> </td><td> </td><td> </td></tr> + <tr><td>virDomainSuspend</td><td>Yes</td><td>function</td><td>Yes</td><td> </td><td>Yes</td><td> </td><td> </td><td> </td></tr> + <tr><td>virDomainUndefine</td><td>Yes</td><td>function</td><td>Yes</td><td> </td><td>Yes</td><td> </td><td> </td><td> </td></tr> + <tr><td>virDomainUpdateDeviceFlags</td><td>No</td><td>function</td><td> </td><td> </td><td> </td><td> </td><td> </td><td> </td></tr> + <tr><td>virEventAddHandleFunc</td><td>Yes</td><td>delegate</td><td>Yes</td><td> </td><td>Yes</td><td> </td><td> </td><td> </td></tr> + <tr><td>virEventAddTimeoutFunc</td><td>Yes</td><td>delegate</td><td>Yes</td><td> </td><td>Yes</td><td> </td><td> </td><td> </td></tr> + <tr><td>virEventHandleCallback</td><td>Yes</td><td>delegate</td><td>Yes</td><td> </td><td>Yes</td><td> </td><td> </td><td> </td></tr> + <tr><td>virEventRegisterImpl</td><td>Yes</td><td>function</td><td>Yes</td><td> </td><td>Yes</td><td> </td><td> </td><td> </td></tr> + <tr><td>virEventRemoveHandleFunc</td><td>Yes</td><td>delegate</td><td>Yes</td><td> </td><td>Yes</td><td> </td><td> </td><td> </td></tr> + <tr><td>virEventRemoveTimeoutFunc</td><td>Yes</td><td>delegate</td><td>Yes</td><td> </td><td>Yes</td><td> </td><td> </td><td> </td></tr> + <tr><td>virEventTimeoutCallback</td><td>Yes</td><td>delegate</td><td>Yes</td><td> </td><td>Yes</td><td> </td><td> </td><td> </td></tr> + <tr><td>virEventUpdateHandleFunc</td><td>Yes</td><td>delegate</td><td>Yes</td><td> </td><td>Yes</td><td> </td><td> </td><td> </td></tr> + <tr><td>virEventUpdateTimeoutFunc</td><td>Yes</td><td>delegate</td><td>Yes</td><td> </td><td>Yes</td><td> </td><td> </td><td> </td></tr> + <tr><td>virFreeCallback</td><td>Yes</td><td>function</td><td>Yes</td><td> </td><td>Yes</td><td> </td><td> </td><td> </td></tr> + <tr><td>virGetVersion</td><td>Yes</td><td>function</td><td>Yes</td><td> </td><td>Yes</td><td> </td><td> </td><td> </td></tr> + <tr><td>virInitialize</td><td>Yes</td><td>function</td><td>Yes</td><td> </td><td>Yes</td><td> </td><td> </td><td> </td></tr> + <tr><td>virInterfaceCreate</td><td>No</td><td>function</td><td> </td><td> </td><td> </td><td> </td><td> </td><td> </td></tr> + <tr><td>virInterfaceDefineXML</td><td>No</td><td>function</td><td> </td><td> </td><td> </td><td> </td><td> </td><td> </td></tr> + <tr><td>virInterfaceDestroy</td><td>No</td><td>function</td><td> </td><td> </td><td> </td><td> </td><td> </td><td> </td></tr> + <tr><td>virInterfaceFree</td><td>No</td><td>function</td><td> </td><td> </td><td> </td><td> </td><td> </td><td> </td></tr> + <tr><td>virInterfaceGetConnect</td><td>No</td><td>function</td><td> </td><td> </td><td> </td><td> </td><td> </td><td> </td></tr> + <tr><td>virInterfaceGetMACString</td><td>No</td><td>function</td><td> </td><td> </td><td> </td><td> </td><td> </td><td> </td></tr> + <tr><td>virInterfaceGetName</td><td>No</td><td>function</td><td> </td><td> </td><td> </td><td> </td><td> </td><td> </td></tr> + <tr><td>virInterfaceGetXMLDesc</td><td>No</td><td>function</td><td> </td><td> </td><td> </td><td> </td><td> </td><td> </td></tr> + <tr><td>virInterfaceIsActive</td><td>No</td><td>function</td><td> </td><td> </td><td> </td><td> </td><td> </td><td> </td></tr> + <tr><td>virInterfaceLookupByMACString</td><td>No</td><td>function</td><td> </td><td> </td><td> </td><td> </td><td> </td><td> </td></tr> + <tr><td>virInterfaceLookupByName</td><td>No</td><td>function</td><td> </td><td> </td><td> </td><td> </td><td> </td><td> </td></tr> + <tr><td>virInterfaceRef</td><td>No</td><td>function</td><td> </td><td> </td><td> </td><td> </td><td> </td><td> </td></tr> + <tr><td>virInterfaceUndefine</td><td>No</td><td>function</td><td> </td><td> </td><td> </td><td> </td><td> </td><td> </td></tr> + <tr><td>virNWFilterDefineXML</td><td>No</td><td>function</td><td> </td><td> </td><td> </td><td> </td><td> </td><td> </td></tr> + <tr><td>virNWFilterFree</td><td>No</td><td>function</td><td> </td><td> </td><td> </td><td> </td><td> </td><td> </td></tr> + <tr><td>virNWFilterGetName</td><td>No</td><td>function</td><td> </td><td> </td><td> </td><td> </td><td> </td><td> </td></tr> + <tr><td>virNWFilterGetUUID</td><td>No</td><td>function</td><td> </td><td> </td><td> </td><td> </td><td> </td><td> </td></tr> + <tr><td>virNWFilterGetUUIDString</td><td>No</td><td>function</td><td> </td><td> </td><td> </td><td> </td><td> </td><td> </td></tr> + <tr><td>virNWFilterGetXMLDesc</td><td>No</td><td>function</td><td> </td><td> </td><td> </td><td> </td><td> </td><td> </td></tr> + <tr><td>virNWFilterLookupByName </td><td>No</td><td>function</td><td> </td><td> </td><td> </td><td> </td><td> </td><td> </td></tr> + <tr><td>virNWFilterLookupByUUID</td><td>No</td><td>function</td><td> </td><td> </td><td> </td><td> </td><td> </td><td> </td></tr> + <tr><td>virNWFilterLookupByUUIDString</td><td>No</td><td>function</td><td> </td><td> </td><td> </td><td> </td><td> </td><td> </td></tr> + <tr><td>virNWFilterRef</td><td>No</td><td>function</td><td> </td><td> </td><td> </td><td> </td><td> </td><td> </td></tr> + <tr><td>virNWFilterUndefine</td><td>No</td><td>function</td><td> </td><td> </td><td> </td><td> </td><td> </td><td> </td></tr> + <tr><td>virNetworkCreate</td><td>Yes</td><td>function</td><td>Yes</td><td> </td><td>Yes</td><td> </td><td> </td><td> </td></tr> + <tr><td>virNetworkCreateXML</td><td>Yes</td><td>function</td><td>No</td><td> </td><td>Maybe</td><td> </td><td> </td><td> </td></tr> + <tr><td>virNetworkDefineXML</td><td>Yes</td><td>function</td><td>Yes</td><td> </td><td>Yes</td><td> </td><td> </td><td> </td></tr> + <tr><td>virNetworkDestroy</td><td>Yes</td><td>function</td><td>Yes</td><td> </td><td>Yes</td><td> </td><td> </td><td> </td></tr> + <tr><td>virNetworkFree</td><td>Yes</td><td>function</td><td>Yes</td><td> </td><td>Yes</td><td> </td><td> </td><td> </td></tr> + <tr><td>virNetworkGetAutostart</td><td>Yes</td><td>function</td><td>No</td><td> </td><td>Maybe</td><td> </td><td> </td><td> </td></tr> + <tr><td>virNetworkGetBridgeName</td><td>Yes</td><td>function</td><td>No</td><td> </td><td>Maybe</td><td> </td><td> </td><td> </td></tr> + <tr><td>virNetworkGetConnect</td><td>Yes</td><td>function</td><td>No</td><td> </td><td>Maybe</td><td> </td><td> </td><td> </td></tr> + <tr><td>virNetworkGetName</td><td>Yes</td><td>function</td><td>No</td><td> </td><td>Maybe</td><td> </td><td> </td><td> </td></tr> + <tr><td>virNetworkGetUUID</td><td>No</td><td>function</td><td> </td><td> </td><td> </td><td> </td><td> </td><td> </td></tr> + <tr><td>virNetworkGetUUIDString </td><td>Yes</td><td>function</td><td>Yes</td><td> </td><td>Yes</td><td> </td><td> </td><td> </td></tr> + <tr><td>virNetworkGetXMLDesc</td><td>Yes</td><td>function</td><td>Yes</td><td> </td><td>Yes</td><td> </td><td> </td><td> </td></tr> + <tr><td>virNetworkIsActive</td><td>Yes</td><td>function</td><td>Yes</td><td> </td><td>Yes</td><td> </td><td> </td><td> </td></tr> + <tr><td>virNetworkIsPersistent</td><td>Yes</td><td>function</td><td>Yes</td><td> </td><td>Yes</td><td> </td><td> </td><td> </td></tr> + <tr><td>virNetworkLookupByName</td><td>Yes</td><td>function</td><td>Yes</td><td> </td><td>Yes</td><td> </td><td> </td><td> </td></tr> + <tr><td>virNetworkLookupByUUID</td><td>Yes</td><td>function</td><td>No</td><td> </td><td>Maybe</td><td> </td><td> </td><td> </td></tr> + <tr><td>virNetworkLookupByUUIDString</td><td>Yes</td><td>function</td><td>No</td><td> </td><td>Maybe</td><td> </td><td> </td><td> </td></tr> + <tr><td>virNetworkRef</td><td>Yes</td><td>function</td><td>No</td><td> </td><td>Maybe</td><td> </td><td> </td><td> </td></tr> + <tr><td>virNetworkSetAutostart</td><td>Yes</td><td>function</td><td>Yes</td><td> </td><td>Yes</td><td> </td><td> </td><td> </td></tr> + <tr><td>virNetworkUndefine</td><td>Yes</td><td>function</td><td>Yes</td><td> </td><td>Yes</td><td> </td><td> </td><td> </td></tr> + <tr><td>virNodeDeviceCreateXML</td><td>No</td><td>function</td><td> </td><td> </td><td> </td><td> </td><td> </td><td> </td></tr> + <tr><td>virNodeDeviceDestroy</td><td>No</td><td>function</td><td> </td><td> </td><td> </td><td> </td><td> </td><td> </td></tr> + <tr><td>virNodeDeviceDettach</td><td>No</td><td>function</td><td> </td><td> </td><td> </td><td> </td><td> </td><td> </td></tr> + <tr><td>virNodeDeviceFree</td><td>No</td><td>function</td><td> </td><td> </td><td> </td><td> </td><td> </td><td> </td></tr> + <tr><td>virNodeDeviceGetName</td><td>No</td><td>function</td><td> </td><td> </td><td> </td><td> </td><td> </td><td> </td></tr> + <tr><td>virNodeDeviceGetParent</td><td>No</td><td>function</td><td> </td><td> </td><td> </td><td> </td><td> </td><td> </td></tr> + <tr><td>virNodeDeviceGetXMLDesc</td><td>Yes</td><td>function</td><td>Yes</td><td> </td><td>Yes</td><td> </td><td> </td><td> </td></tr> + <tr><td>virNodeDeviceListCaps</td><td>No</td><td>function</td><td> </td><td> </td><td> </td><td> </td><td> </td><td> </td></tr> + <tr><td>virNodeDeviceLookupByName</td><td>Yes</td><td>function</td><td>Yes</td><td> </td><td>Yes</td><td> </td><td> </td><td> </td></tr> + <tr><td>virNodeDeviceNumOfCaps</td><td>No</td><td>function</td><td> </td><td> </td><td> </td><td> </td><td> </td><td> </td></tr> + <tr><td>virNodeDeviceReAttach</td><td>No</td><td>function</td><td> </td><td> </td><td> </td><td> </td><td> </td><td> </td></tr> + <tr><td>virNodeDeviceRef</td><td>No</td><td>function</td><td> </td><td> </td><td> </td><td> </td><td> </td><td> </td></tr> + <tr><td>virNodeDeviceReset</td><td>No</td><td>function</td><td> </td><td> </td><td> </td><td> </td><td> </td><td> </td></tr> + <tr><td>virNodeGetCellsFreeMemory</td><td>No</td><td>function</td><td> </td><td> </td><td> </td><td> </td><td> </td><td> </td></tr> + <tr><td>virNodeGetFreeMemory</td><td>Yes</td><td>function</td><td>No</td><td> </td><td>Maybe</td><td> </td><td> </td><td> </td></tr> + <tr><td>virNodeGetInfo</td><td>Yes</td><td>function</td><td>No</td><td> </td><td>Maybe</td><td> </td><td> </td><td> </td></tr> + <tr><td>virNodeGetSecurityModel </td><td>No</td><td>function</td><td> </td><td> </td><td> </td><td> </td><td> </td><td> </td></tr> + <tr><td>virNodeListDevices</td><td>Yes</td><td>function</td><td>Yes</td><td> </td><td>Yes</td><td> </td><td> </td><td> </td></tr> + <tr><td>virNodeNumOfDevices</td><td>Yes</td><td>function</td><td>Yes</td><td> </td><td>Yes</td><td> </td><td> </td><td> </td></tr> + <tr><td>virSecretDefineXML</td><td>No</td><td>function</td><td> </td><td> </td><td> </td><td> </td><td> </td><td> </td></tr> + <tr><td>virSecretFree</td><td>No</td><td>function</td><td> </td><td> </td><td> </td><td> </td><td> </td><td> </td></tr> + <tr><td>virSecretGetConnect</td><td>No</td><td>function</td><td> </td><td> </td><td> </td><td> </td><td> </td><td> </td></tr> + <tr><td>virSecretGetUUID</td><td>No</td><td>function</td><td> </td><td> </td><td> </td><td> </td><td> </td><td> </td></tr> + <tr><td>virSecretGetUUIDString</td><td>No</td><td>function</td><td> </td><td> </td><td> </td><td> </td><td> </td><td> </td></tr> + <tr><td>virSecretGetUsageID</td><td>No</td><td>function</td><td> </td><td> </td><td> </td><td> </td><td> </td><td> </td></tr> + <tr><td>virSecretGetUsageType</td><td>No</td><td>function</td><td> </td><td> </td><td> </td><td> </td><td> </td><td> </td></tr> + <tr><td>virSecretGetValue</td><td>No</td><td>function</td><td> </td><td> </td><td> </td><td> </td><td> </td><td> </td></tr> + <tr><td>virSecretGetXMLDesc</td><td>No</td><td>function</td><td> </td><td> </td><td> </td><td> </td><td> </td><td> </td></tr> + <tr><td>virSecretLookupByUUID</td><td>No</td><td>function</td><td> </td><td> </td><td> </td><td> </td><td> </td><td> </td></tr> + <tr><td>virSecretLookupByUUIDString</td><td>No</td><td>function</td><td> </td><td> </td><td> </td><td> </td><td> </td><td> </td></tr> + <tr><td>virSecretLookupByUsage</td><td>No</td><td>function</td><td> </td><td> </td><td> </td><td> </td><td> </td><td> </td></tr> + <tr><td>virSecretRef</td><td>No</td><td>function</td><td> </td><td> </td><td> </td><td> </td><td> </td><td> </td></tr> + <tr><td>virSecretSetValue</td><td>No</td><td>function</td><td> </td><td> </td><td> </td><td> </td><td> </td><td> </td></tr> + <tr><td>virSecretUndefine</td><td>No</td><td>function</td><td> </td><td> </td><td> </td><td> </td><td> </td><td> </td></tr> + <tr><td>virStoragePoolBuild</td><td>Yes</td><td>function</td><td>No</td><td> </td><td>Maybe</td><td> </td><td> </td><td> </td></tr> + <tr><td>virStoragePoolCreate</td><td>Yes</td><td>function</td><td>Yes</td><td> </td><td>Yes</td><td> </td><td> </td><td> </td></tr> + <tr><td>virStoragePoolCreateXML </td><td>Yes</td><td>function</td><td>No</td><td> </td><td>Maybe</td><td> </td><td> </td><td> </td></tr> + <tr><td>virStoragePoolDefineXML</td><td>Yes</td><td>function</td><td>Yes</td><td> </td><td>Yes</td><td> </td><td> </td><td> </td></tr> + <tr><td>virStoragePoolDelete</td><td>Yes</td><td>function</td><td>No</td><td> </td><td>Maybe</td><td> </td><td> </td><td> </td></tr> + <tr><td>virStoragePoolDestroy</td><td>Yes</td><td>function</td><td>Yes</td><td> </td><td>Yes</td><td> </td><td> </td><td> </td></tr> + <tr><td>virStoragePoolFree</td><td>Yes</td><td>function</td><td>Yes</td><td> </td><td>Yes</td><td> </td><td> </td><td> </td></tr> + <tr><td>virStoragePoolGetAutostart</td><td>Yes</td><td>function</td><td>No</td><td> </td><td>Maybe</td><td> </td><td> </td><td> </td></tr> + <tr><td>virStoragePoolGetConnect</td><td>Yes</td><td>function</td><td>No</td><td> </td><td>Maybe</td><td> </td><td> </td><td> </td></tr> + <tr><td>virStoragePoolGetInfo</td><td>Yes</td><td>function</td><td>Yes</td><td> </td><td>Yes</td><td> </td><td> </td><td> </td></tr> + <tr><td>virStoragePoolGetName</td><td>Yes</td><td>function</td><td>Yes</td><td> </td><td>Yes</td><td> </td><td> </td><td> </td></tr> + <tr><td>virStoragePoolGetUUID</td><td>Yes</td><td>function</td><td>No</td><td> </td><td>Maybe</td><td> </td><td> </td><td> </td></tr> + <tr><td>virStoragePoolGetUUIDString</td><td>Yes</td><td>function</td><td>Yes</td><td> </td><td>Yes</td><td> </td><td> </td><td> </td></tr> + <tr><td>virStoragePoolGetXMLDesc</td><td>Yes</td><td>function</td><td>Yes</td><td> </td><td>Yes</td><td> </td><td> </td><td> </td></tr> + <tr><td>virStoragePoolIsActive</td><td>Yes</td><td>function</td><td>Yes</td><td> </td><td>Yes</td><td> </td><td> </td><td> </td></tr> + <tr><td>virStoragePoolIsPersistent</td><td>Yes</td><td>function</td><td>Yes</td><td> </td><td>Yes</td><td> </td><td> </td><td> </td></tr> + <tr><td>virStoragePoolListVolumes</td><td>Yes</td><td>function</td><td>Yes</td><td> </td><td>Yes</td><td> </td><td> </td><td> </td></tr> + <tr><td>virStoragePoolLookupByName</td><td>Yes</td><td>function</td><td>Yes</td><td> </td><td>Yes</td><td> </td><td> </td><td> </td></tr> + <tr><td>virStoragePoolLookupByUUID</td><td>Yes</td><td>function</td><td>No</td><td> </td><td>Maybe</td><td> </td><td> </td><td> </td></tr> + <tr><td>virStoragePoolLookupByUUIDString</td><td>Yes</td><td>function</td><td>No</td><td> </td><td>Maybe</td><td> </td><td> </td><td> </td></tr> + <tr><td>virStoragePoolLookupByVolume</td><td>Yes</td><td>function</td><td>No</td><td> </td><td>Maybe</td><td> </td><td> </td><td> </td></tr> + <tr><td>virStoragePoolNumOfVolumes</td><td>Yes</td><td>function</td><td>Yes</td><td> </td><td>Yes</td><td> </td><td> </td><td> </td></tr> + <tr><td>virStoragePoolRef</td><td>Yes</td><td>function</td><td>No</td><td> </td><td>Maybe</td><td> </td><td> </td><td> </td></tr> + <tr><td>virStoragePoolRefresh</td><td>Yes</td><td>function</td><td>No</td><td> </td><td>Maybe</td><td> </td><td> </td><td> </td></tr> + <tr><td>virStoragePoolSetAutostart</td><td>Yes</td><td>function</td><td>Yes</td><td> </td><td>Yes</td><td> </td><td> </td><td> </td></tr> + <tr><td>virStoragePoolUndefine</td><td>Yes</td><td>function</td><td>Yes</td><td> </td><td>Yes</td><td> </td><td> </td><td> </td></tr> + <tr><td>virStorageVolCreateXML</td><td>Yes</td><td>function</td><td>Yes</td><td> </td><td>Yes</td><td> </td><td> </td><td> </td></tr> + <tr><td>virStorageVolCreateXMLFrom</td><td>Yes</td><td>function</td><td>No</td><td> </td><td>Maybe</td><td> </td><td> </td><td> </td></tr> + <tr><td>virStorageVolDelete</td><td>Yes</td><td>function</td><td>Yes</td><td> </td><td>Yes</td><td> </td><td> </td><td> </td></tr> + <tr><td>virStorageVolFree</td><td>Yes</td><td>function</td><td>No</td><td> </td><td>Maybe</td><td> </td><td> </td><td> </td></tr> + <tr><td>virStorageVolGetConnect </td><td>Yes</td><td>function</td><td>No</td><td> </td><td>Maybe</td><td> </td><td> </td><td> </td></tr> + <tr><td>virStorageVolGetInfo</td><td>Yes</td><td>function</td><td>Yes</td><td> </td><td>Yes</td><td> </td><td> </td><td> </td></tr> + <tr><td>virStorageVolGetKey</td><td>Yes</td><td>function</td><td>Yes</td><td> </td><td>Yes</td><td> </td><td> </td><td> </td></tr> + <tr><td>virStorageVolGetName</td><td>Yes</td><td>function</td><td>Yes</td><td> </td><td>Yes</td><td> </td><td> </td><td> </td></tr> + <tr><td>virStorageVolGetPath</td><td>Yes</td><td>function</td><td>Yes</td><td> </td><td>Yes</td><td> </td><td> </td><td> </td></tr> + <tr><td>virStorageVolGetXMLDesc </td><td>Yes</td><td>function</td><td>Yes</td><td> </td><td>Yes</td><td> </td><td> </td><td> </td></tr> + <tr><td>virStorageVolLookupByKey</td><td>Yes</td><td>function</td><td>Yes</td><td> </td><td>Yes</td><td> </td><td> </td><td> </td></tr> + <tr><td>virStorageVolLookupByName</td><td>Yes</td><td>function</td><td>Yes</td><td> </td><td>Yes</td><td> </td><td> </td><td> </td></tr> + <tr><td>virStorageVolLookupByPath</td><td>Yes</td><td>function</td><td>Yes</td><td> </td><td>Yes</td><td> </td><td> </td><td> </td></tr> + <tr><td>virStorageVolRef</td><td>Yes</td><td>function</td><td>No</td><td> </td><td>No</td><td> </td><td> </td><td> </td></tr> + <tr><td>virStorageVolWipe</td><td>No</td><td>function</td><td> </td><td> </td><td> </td><td> </td><td> </td><td> </td></tr> + <tr><td>virStreamAbort</td><td>No</td><td>function</td><td> </td><td> </td><td> </td><td> </td><td> </td><td> </td></tr> + <tr><td>virStreamEventAddCallback</td><td>No</td><td>function</td><td> </td><td> </td><td> </td><td> </td><td> </td><td> </td></tr> + <tr><td>virStreamEventCallback</td><td>No</td><td>delegate</td><td> </td><td> </td><td> </td><td> </td><td> </td><td> </td></tr> + <tr><td>virStreamEventRemoveCallback</td><td>No</td><td>function</td><td> </td><td> </td><td> </td><td> </td><td> </td><td> </td></tr> + <tr><td>virStreamEventUpdateCallback</td><td>No</td><td>function</td><td> </td><td> </td><td> </td><td> </td><td> </td><td> </td></tr> + <tr><td>virStreamFinish </td><td>No</td><td>function</td><td> </td><td> </td><td> </td><td> </td><td> </td><td> </td></tr> + <tr><td>virStreamFree</td><td>No</td><td>function</td><td> </td><td> </td><td> </td><td> </td><td> </td><td> </td></tr> + <tr><td>virStreamNew</td><td>No</td><td>function</td><td> </td><td> </td><td> </td><td> </td><td> </td><td> </td></tr> + <tr><td>virStreamRecv</td><td>No</td><td>function</td><td> </td><td> </td><td> </td><td> </td><td> </td><td> </td></tr> + <tr><td>virStreamRecvAll</td><td>No</td><td>function</td><td> </td><td> </td><td> </td><td> </td><td> </td><td> </td></tr> + <tr><td>virStreamRef</td><td>No</td><td>function</td><td> </td><td> </td><td> </td><td> </td><td> </td><td> </td></tr> + <tr><td>virStreamSend</td><td>No</td><td>function</td><td> </td><td> </td><td> </td><td> </td><td> </td><td> </td></tr> + <tr><td>virStreamSendAll</td><td>No</td><td>function</td><td> </td><td> </td><td> </td><td> </td><td> </td><td> </td></tr> + <tr><td>virStreamSinkFunc</td><td>No</td><td>delegate</td><td> </td><td> </td><td> </td><td> </td><td> </td><td> </td></tr> + <tr><td>virStreamSourceFunc</td><td>No</td><td>delegate</td><td> </td><td> </td><td> </td><td> </td><td> </td><td> </td></tr> + </table> + </body> +</html> diff --git a/docs/sitemap.html.in b/docs/sitemap.html.in index 481507e..5f46b59 100644 --- a/docs/sitemap.html.in +++ b/docs/sitemap.html.in @@ -242,6 +242,10 @@ <a href="java.html">Java</a> <span>overview of the Java API bindings</span> </li> + <li> + <a href="csharp.html">C#</a> + <span>overview of the C# API bindings</span> + </li> </ul> </li> <li> -- 1.7.2.3

4 6

[libvirt] [PATCH] memtune: Add min_guarantee to the virsh tool
by Nikunj A. Dadhania 20 Oct '10

20 Oct '10

Hi, I am adding the min_guarantee to the memtune command with this patch. I have tested this at the virsh tool level. This parameter is not supported by QEMU or LXC. Can be used by ESX and in future by other hypervisors. Nikunj From: Nikunj A. Dadhania <nikunj(a)linux.vnet.ibm.com> tools/virsh.c: Add new memory tunable "min_guarantee", currently the user would be ESX. tools/virsh.pod: Update the manpage Signed-off-by: Nikunj A. Dadhania <nikunj(a)linux.vnet.ibm.com> --- tools/virsh.c | 17 +++++++++++++++-- tools/virsh.pod | 2 +- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index fe35eb9..e79bfbb 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -2632,6 +2632,8 @@ static const vshCmdOptDef opts_memtune[] = { N_("Memory during contention in kilobytes")}, {VIR_DOMAIN_SWAP_HARD_LIMIT, VSH_OT_STRING, VSH_OFLAG_NONE, N_("Max swap in kilobytes")}, + {VIR_DOMAIN_MEMORY_MIN_GUARANTEE, VSH_OT_STRING, VSH_OFLAG_NONE, + N_("Min guaranteed memory in kilobytes")}, {NULL, 0, 0, NULL} }; @@ -2639,7 +2641,7 @@ static int cmdMemtune(vshControl * ctl, const vshCmd * cmd) { virDomainPtr dom; - int hard_limit, soft_limit, swap_hard_limit; + int hard_limit, soft_limit, swap_hard_limit, min_guarantee; int nparams = 0; unsigned int i = 0; virMemoryParameterPtr params = NULL, temp = NULL; @@ -2667,6 +2669,12 @@ cmdMemtune(vshControl * ctl, const vshCmd * cmd) if (swap_hard_limit) nparams++; + min_guarantee = + vshCommandOptInt(cmd, VIR_DOMAIN_MEMORY_MIN_GUARANTEE, + &min_guarantee); + if (min_guarantee) + nparams++; + if (nparams == 0) { /* get the number of memory parameters */ if ((virDomainGetMemoryParameters(dom, NULL, &nparams, 0) != 0) && @@ -2711,7 +2719,7 @@ cmdMemtune(vshControl * ctl, const vshCmd * cmd) params[i].value.b); break; default: - vshPrint(ctl, "unimplemented scheduler parameter type\n"); + vshPrint(ctl, "unimplemented memory parameter type\n"); } } @@ -2746,6 +2754,11 @@ cmdMemtune(vshControl * ctl, const vshCmd * cmd) strncpy(temp->field, VIR_DOMAIN_SWAP_HARD_LIMIT, sizeof(temp->field)); swap_hard_limit = 0; + } else if (min_guarantee) { + temp->value.ul = min_guarantee; + strncpy(temp->field, VIR_DOMAIN_MEMORY_MIN_GUARANTEE, + sizeof(temp->field)); + min_guarantee = 0; } } if (virDomainSetMemoryParameters(dom, params, nparams, 0) != 0) diff --git a/tools/virsh.pod b/tools/virsh.pod index cb8e942..5f06360 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -460,7 +460,7 @@ kilobytes. Displays the domain memory parameters. -=item B<memtune> I<domain-id> optional I<--hard-limit> B<kilobytes> optional I<--soft-limit> B<kilobytes> optional I<--swap-hard-limit> B<kilobytes> +=item B<memtune> I<domain-id> optional I<--hard-limit> B<kilobytes> optional I<--soft-limit> B<kilobytes> optional I<--swap-hard-limit> B<kilobytes> -I<--min-guarantee> B<kilobytes> Allows you to set the domain memory parameters. LXC and QEMU/KVM supports these parameters.

3 6

[libvirt] [PATCH] nwfilter: changes to rules in VM->host table
by Stefan Berger 20 Oct '10

20 Oct '10

In the table built for traffic coming from the VM going to the host make the following changes: - don't ACCEPT the packets but do a 'RETURN' and let the host-specific firewall rules in subsequent rules evaluate whether the traffic is allowed to enter - use the '-m state' in the rules as everywhere else Signed-off-by: Stefan Berger <stefanb(a)us.ibm.com> --- src/nwfilter/nwfilter_ebiptables_driver.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) Index: libvirt-acl/src/nwfilter/nwfilter_ebiptables_driver.c =================================================================== --- libvirt-acl.orig/src/nwfilter/nwfilter_ebiptables_driver.c +++ libvirt-acl/src/nwfilter/nwfilter_ebiptables_driver.c @@ -1790,6 +1790,10 @@ iptablesCreateRuleInstance(virNWFilterDe return rc; maySkipICMP = directionIn; + if (needState) + matchState = directionIn ? MATCH_STATE_IN : MATCH_STATE_OUT; + else + matchState = NULL; chainPrefix[0] = 'H'; chainPrefix[1] = CHAINPREFIX_HOST_IN_TEMP; @@ -1800,8 +1804,8 @@ iptablesCreateRuleInstance(virNWFilterDe ifname, vars, res, - NULL, true, - "ACCEPT", + matchState, true, + "RETURN", isIPv6, maySkipICMP);

2 2

[libvirt] [PATCH] nwfilter: avoid direction enforcment for certain types of rules
by Stefan Berger 20 Oct '10

20 Oct '10

Avoid the enforcement of direction if - icmp rules specify the type/code information - the 'skipMatch' variable is set to 'true' Index: libvirt-acl/src/nwfilter/nwfilter_ebiptables_driver.c =================================================================== --- libvirt-acl.orig/src/nwfilter/nwfilter_ebiptables_driver.c +++ libvirt-acl/src/nwfilter/nwfilter_ebiptables_driver.c @@ -1159,6 +1159,7 @@ _iptablesCreateRuleInstance(int directio bool srcMacSkipped = false; bool skipRule = false; bool skipMatch = false; + bool hasICMPType = false; if (!iptables_cmd) { virNWFilterReportError(VIR_ERR_INTERNAL_ERROR, @@ -1399,6 +1400,8 @@ _iptablesCreateRuleInstance(int directio if (HAS_ENTRY_ITEM(&rule->p.icmpHdrFilter.dataICMPType)) { const char *parm; + hasICMPType = true; + if (maySkipICMP) goto exit_no_error; @@ -1507,7 +1510,7 @@ _iptablesCreateRuleInstance(int directio if (match && !skipMatch) virBufferVSprintf(&buf, " %s", match); - if (defMatch && match != NULL) + if (defMatch && match != NULL && !skipMatch && !hasICMPType) iptablesEnforceDirection(directionIn, rule, &buf);

2 2

[libvirt] [PATCH] Don't fail lxc domain start when memory controller support is missing
by Guido Günther 19 Oct '10

19 Oct '10

Hi, starting of lxc domains currently fails if memory controller support is disabled in the kernel. Attached patch fixes this by ignoring the error in case the files don't exist in the cgroup filesystem. I didn't add the same exceptions for the recent hard and soft limit code since if somebody sets this values he probably wants them enforced. O.k. to apply? Cheers, -- Guido

2 3

[libvirt] KVM Forum 2010: presentations online
by Chris Wright 19 Oct '10

19 Oct '10

KVM Forum 2010 was quite a success, many thanks to all who participated! For those who couldn't attend, the presentations are available online now: (thanks to Andrew Cathrow for pushing them all up) http://www.linux-kvm.org/page/KVM_Forum_2010#Presentations We were also able to video the speakers, and will send a note when the videos are available. (and thanks again to Andrew Cathrow for making this happen) thanks, -chris

1 1

[libvirt] [PATCHv2 00/14] vcpu - distinguish maximum from current
by Eric Blake 19 Oct '10

19 Oct '10

Version 1 had ACKs on most of the patches, but raised several points (not the least of which was a lack of testing). I've now done more testing on xen than on qemu, so there may still be some qemu quirks. Version 2 of the patch series; this addresses most of the points from v1 (http://thread.gmane.org/gmane.comp.emulators.libvirt/28520) I'm thinking that it is possible to backport _just_ patches 1 (add current attribute), 7 (add maxvcpus to xml), and 12 (xen xm and sexpr support) to make RHEL 5 xen support the distinction at the XML layer without the expense of an API addition (that is, the existing dumpxml API is sufficient to expose the core change in this patch series, and the remaining patches in the series are just sugar to make it easier). However, I still have to test that theory. I also have one patch to write - namely, making xen support virDomainSetVcpusFlags. But I'd rather get the review going on the rest of these patches, since it's now the last remaining 0.8.5 candidate feature. Summary of changes in v2 (more details in each patch): - rename flags from _ACTIVE/_PERSISTENT to _LIVE/_CONFIG for consistency with granularity of DeviceAttach - first cut at xen implementation, dealing with fact that vcpu_avail in xen world is a bitmask rather than a count - factor common flag checks out of drivers - add 'virsh maxvcpus' - add support for test:///default I'll send an interdiff for how this series differs from v1, if that helps in the review. Eric Blake (14): vcpu: add current attribute to <vcpu> element vcpu: add new public API vcpu: define internal driver API vcpu: implement the public APIs vcpu: implement the remote protocol vcpu: make old API trivially wrap to new API vcpu: support maxvcpu in domain_conf vcpu: add virsh support vcpu: support all flags in test driver vcpu: improve vcpu support in qemu command line vcpu: complete vcpu support in qemu driver vcpu: improve vcpu support in xen command line vcpu: improve support for getting xen vcpu counts vcpu: remove dead xen code daemon/remote.c | 53 ++++++ daemon/remote_dispatch_args.h | 2 + daemon/remote_dispatch_prototypes.h | 16 ++ daemon/remote_dispatch_ret.h | 1 + daemon/remote_dispatch_table.h | 10 + docs/formatdomain.html.in | 9 +- docs/schemas/domain.rng | 5 + include/libvirt/libvirt.h.in | 15 ++ src/conf/domain_conf.c | 45 ++++- src/conf/domain_conf.h | 3 +- src/driver.h | 9 + src/esx/esx_driver.c | 30 +++- src/esx/esx_vmx.c | 24 ++- src/libvirt.c | 140 ++++++++++++++- src/libvirt_public.syms | 2 + src/lxc/lxc_driver.c | 2 + src/opennebula/one_conf.c | 9 +- src/opennebula/one_driver.c | 2 + src/openvz/openvz_conf.c | 7 +- src/openvz/openvz_driver.c | 47 ++++- src/phyp/phyp_driver.c | 32 +++- src/qemu/qemu_conf.c | 19 ++- src/qemu/qemu_driver.c | 129 ++++++++++++-- src/remote/remote_driver.c | 55 ++++++ src/remote/remote_protocol.c | 33 ++++ src/remote/remote_protocol.h | 26 +++ src/remote/remote_protocol.x | 19 ++- src/remote_protocol-structs | 12 ++ src/test/test_driver.c | 152 ++++++++++++++-- src/uml/uml_driver.c | 2 + src/vbox/vbox_tmpl.c | 46 ++++- src/xen/proxy_internal.c | 1 - src/xen/xen_driver.c | 57 +++++- src/xen/xen_driver.h | 3 +- src/xen/xen_hypervisor.c | 1 - src/xen/xen_inotify.c | 1 - src/xen/xend_internal.c | 79 ++++++++- src/xen/xend_internal.h | 2 + src/xen/xm_internal.c | 65 ++++++- src/xen/xm_internal.h | 1 + src/xen/xs_internal.c | 1 - src/xenapi/xenapi_driver.c | 60 ++++++- src/xenapi/xenapi_utils.c | 4 +- tests/qemuargv2xmltest.c | 2 + tests/qemuxml2argvdata/qemuxml2argv-smp.args | 1 + tests/qemuxml2argvdata/qemuxml2argv-smp.xml | 28 +++ tests/qemuxml2argvtest.c | 2 + tests/qemuxml2xmltest.c | 2 + tests/sexpr2xmldata/sexpr2xml-pv-vcpus.sexpr | 1 + tests/sexpr2xmldata/sexpr2xml-pv-vcpus.xml | 27 +++ tests/sexpr2xmltest.c | 1 + tests/xmconfigdata/test-paravirt-vcpu.cfg | 17 ++ tests/xmconfigdata/test-paravirt-vcpu.xml | 32 ++++ tests/xmconfigtest.c | 1 + tests/xml2sexprdata/xml2sexpr-pv-vcpus.sexpr | 1 + tests/xml2sexprdata/xml2sexpr-pv-vcpus.xml | 22 +++ tests/xml2sexprtest.c | 1 + tools/virsh.c | 247 +++++++++++++++++++++++--- tools/virsh.pod | 38 ++++- 59 files changed, 1511 insertions(+), 143 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-smp.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-smp.xml create mode 100644 tests/sexpr2xmldata/sexpr2xml-pv-vcpus.sexpr create mode 100644 tests/sexpr2xmldata/sexpr2xml-pv-vcpus.xml create mode 100644 tests/xmconfigdata/test-paravirt-vcpu.cfg create mode 100644 tests/xmconfigdata/test-paravirt-vcpu.xml create mode 100644 tests/xml2sexprdata/xml2sexpr-pv-vcpus.sexpr create mode 100644 tests/xml2sexprdata/xml2sexpr-pv-vcpus.xml -- 1.7.2.3

2 20

[libvirt] [PATCH v4] introduce VIR_CLOSE to be used rather than close()
by Stefan Berger 19 Oct '10

19 Oct '10

V4: - pushing #include "ignore-value.h" into files.h V3: - many small nits addressed V2: - following Eric's suggestions and picking up his code suggestions Since bugs due to double-closed file descriptors are difficult to track down in a multi-threaded system, I am introducing the VIR_CLOSE(fd) macro to help avoid mistakes here. There are lots of places where close() is being used. In this patch I am only cleaning up usage of close() in src/conf where the problems were. I also dare to declare close() as being deprecated in libvirt code base (HACKING). Signed-off-by: Stefan Berger <stefanb(a)us.ibm.com> --- HACKING | 17 +++++++++++++ docs/hacking.html.in | 23 ++++++++++++++++++ src/Makefile.am | 3 +- src/conf/domain_conf.c | 16 ++++++++---- src/conf/network_conf.c | 6 ++-- src/conf/nwfilter_conf.c | 12 ++++----- src/conf/storage_conf.c | 7 ++--- src/conf/storage_encryption_conf.c | 5 ++-- src/libvirt_private.syms | 3 ++ src/util/files.c | 46 +++++++++++++++++++++++++++++++++++++ src/util/files.h | 46 +++++++++++++++++++++++++++++++++++++ 11 files changed, 161 insertions(+), 23 deletions(-) Index: libvirt-acl/src/util/files.c =================================================================== --- /dev/null +++ libvirt-acl/src/util/files.c @@ -0,0 +1,46 @@ +/* + * memory.c: safer file handling + * + * Copyright (C) 2010 IBM Corporation + * Copyright (C) 2010 Stefan Berger + * Copyright (C) 2010 RedHat, Inc. + * Copyright (C) 2010 Eric Blake + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + */ + +#include <config.h> + +#include <unistd.h> + +#include "files.h" + +int virClose(int *fdptr, bool preserve_errno) +{ + int saved_errno; + int rc = 0; + + if (*fdptr >= 0) { + if (preserve_errno) + saved_errno = errno; + rc = close(*fdptr); + *fdptr = -1; + if (preserve_errno) + errno = saved_errno; + } + + return rc; +} Index: libvirt-acl/src/util/files.h =================================================================== --- /dev/null +++ libvirt-acl/src/util/files.h @@ -0,0 +1,46 @@ +/* + * files.h: safer file handling + * + * Copyright (C) 2010 IBM Corporation + * Copyright (C) 2010 Stefan Berger + * Copyright (C) 2010 RedHat, Inc. + * Copyright (C) 2010 Eric Blake + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + */ + + +#ifndef __VIR_FILES_H_ +# define __VIR_FILES_H_ + +# include <stdbool.h> + +# include "internal.h" +# include "ignore-value.h" + + +/* Don't call this directly - use the macros below */ +int virClose(int *fdptr, bool preserve_errno) ATTRIBUTE_RETURN_CHECK; + +/* For use on normal paths; caller must check return value, + and failure sets errno per close(). */ +# define VIR_CLOSE(FD) virClose(&(FD), false) + +/* For use on cleanup paths; errno is unaffected by close, + and no return value to worry about. */ +# define VIR_FORCE_CLOSE(FD) ignore_value(virClose(&(FD), true)) + +#endif /* __VIR_FILES_H */ Index: libvirt-acl/src/Makefile.am =================================================================== --- libvirt-acl.orig/src/Makefile.am +++ libvirt-acl/src/Makefile.am @@ -82,7 +82,8 @@ UTIL_SOURCES = \ util/uuid.c util/uuid.h \ util/util.c util/util.h \ util/xml.c util/xml.h \ - util/virterror.c util/virterror_internal.h + util/virterror.c util/virterror_internal.h \ + util/files.c util/files.h EXTRA_DIST += util/threads-pthread.c util/threads-win32.c Index: libvirt-acl/src/conf/domain_conf.c =================================================================== --- libvirt-acl.orig/src/conf/domain_conf.c +++ libvirt-acl/src/conf/domain_conf.c @@ -44,8 +44,8 @@ #include "network.h" #include "macvtap.h" #include "nwfilter_conf.h" -#include "ignore-value.h" #include "storage_file.h" +#include "files.h" #define VIR_FROM_THIS VIR_FROM_DOMAIN @@ -6798,7 +6798,7 @@ int virDomainSaveXML(const char *configD goto cleanup; } - if (close(fd) < 0) { + if (VIR_CLOSE(fd) < 0) { virReportSystemError(errno, _("cannot save config file '%s'"), configFile); @@ -6807,8 +6807,8 @@ int virDomainSaveXML(const char *configD ret = 0; cleanup: - if (fd != -1) - close(fd); + VIR_FORCE_CLOSE(fd); + VIR_FREE(configFile); return ret; } @@ -7765,10 +7765,14 @@ int virDomainDiskDefForeachPath(virDomai } if (virStorageFileGetMetadataFromFD(path, fd, format, &meta) < 0) { - close(fd); + VIR_FORCE_CLOSE(fd); goto cleanup; } - close(fd); + + if (VIR_CLOSE(fd) < 0) + virReportSystemError(errno, + _("could not close file %s"), + path); if (virHashAddEntry(paths, path, (void*)0x1) < 0) { virReportOOMError(); Index: libvirt-acl/src/conf/nwfilter_conf.c =================================================================== --- libvirt-acl.orig/src/conf/nwfilter_conf.c +++ libvirt-acl/src/conf/nwfilter_conf.c @@ -45,6 +45,7 @@ #include "nwfilter_conf.h" #include "domain_conf.h" #include "c-ctype.h" +#include "files.h" #define VIR_FROM_THIS VIR_FROM_NWFILTER @@ -2193,7 +2194,7 @@ int virNWFilterSaveXML(const char *confi goto cleanup; } - if (close(fd) < 0) { + if (VIR_CLOSE(fd) < 0) { virReportSystemError(errno, _("cannot save config file '%s'"), configFile); @@ -2203,9 +2204,7 @@ int virNWFilterSaveXML(const char *confi ret = 0; cleanup: - if (fd != -1) - close(fd); - + VIR_FORCE_CLOSE(fd); VIR_FREE(configFile); return ret; @@ -2604,7 +2603,7 @@ virNWFilterPoolObjSaveDef(virNWFilterDri goto cleanup; } - if (close(fd) < 0) { + if (VIR_CLOSE(fd) < 0) { virReportSystemError(errno, _("cannot save config file %s"), pool->configFile); @@ -2614,8 +2613,7 @@ virNWFilterPoolObjSaveDef(virNWFilterDri ret = 0; cleanup: - if (fd != -1) - close(fd); + VIR_FORCE_CLOSE(fd); VIR_FREE(xml); Index: libvirt-acl/src/conf/storage_conf.c =================================================================== --- libvirt-acl.orig/src/conf/storage_conf.c +++ libvirt-acl/src/conf/storage_conf.c @@ -43,6 +43,7 @@ #include "buf.h" #include "util.h" #include "memory.h" +#include "files.h" #define VIR_FROM_THIS VIR_FROM_STORAGE @@ -1560,7 +1561,7 @@ virStoragePoolObjSaveDef(virStorageDrive goto cleanup; } - if (close(fd) < 0) { + if (VIR_CLOSE(fd) < 0) { virReportSystemError(errno, _("cannot save config file %s"), pool->configFile); @@ -1570,9 +1571,7 @@ virStoragePoolObjSaveDef(virStorageDrive ret = 0; cleanup: - if (fd != -1) - close(fd); - + VIR_FORCE_CLOSE(fd); VIR_FREE(xml); return ret; Index: libvirt-acl/src/conf/network_conf.c =================================================================== --- libvirt-acl.orig/src/conf/network_conf.c +++ libvirt-acl/src/conf/network_conf.c @@ -43,6 +43,7 @@ #include "util.h" #include "buf.h" #include "c-ctype.h" +#include "files.h" #define MAX_BRIDGE_ID 256 #define VIR_FROM_THIS VIR_FROM_NETWORK @@ -687,7 +688,7 @@ int virNetworkSaveXML(const char *config goto cleanup; } - if (close(fd) < 0) { + if (VIR_CLOSE(fd) < 0) { virReportSystemError(errno, _("cannot save config file '%s'"), configFile); @@ -697,8 +698,7 @@ int virNetworkSaveXML(const char *config ret = 0; cleanup: - if (fd != -1) - close(fd); + VIR_FORCE_CLOSE(fd); VIR_FREE(configFile); Index: libvirt-acl/src/conf/storage_encryption_conf.c =================================================================== --- libvirt-acl.orig/src/conf/storage_encryption_conf.c +++ libvirt-acl/src/conf/storage_encryption_conf.c @@ -35,6 +35,7 @@ #include "xml.h" #include "virterror_internal.h" #include "uuid.h" +#include "files.h" #define VIR_FROM_THIS VIR_FROM_STORAGE @@ -286,12 +287,12 @@ virStorageGenerateQcowPassphrase(unsigne if (r <= 0) { virStorageReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Cannot read from /dev/urandom")); - close(fd); + VIR_FORCE_CLOSE(fd); return -1; } if (dest[i] >= 0x20 && dest[i] <= 0x7E) i++; /* Got an acceptable character */ } - close(fd); + VIR_FORCE_CLOSE(fd); return 0; } Index: libvirt-acl/HACKING =================================================================== --- libvirt-acl.orig/HACKING +++ libvirt-acl/HACKING @@ -318,6 +318,23 @@ routines, use the macros from memory.h VIR_FREE(domain); +File handling +============= + +Use of the close() API is deprecated in libvirt code base to help avoiding +double-closing of a file descriptor. Instead of this API, use the macro from +files.h + + - eg close a file descriptor + + if (VIR_CLOSE(fd) < 0) { + virReportSystemError(errno, _("failed to close file")); + } + + - eg close a file descriptor in an error path, without losing the previous + errno value + + VIR_FORCE_CLOSE(fd) String comparisons ================== Index: libvirt-acl/docs/hacking.html.in =================================================================== --- libvirt-acl.orig/docs/hacking.html.in +++ libvirt-acl/docs/hacking.html.in @@ -389,7 +389,30 @@ </pre></li> </ul> + <h2><a name="file_handling">File handling</a></h2> + <p> + Use of the close() API is deprecated in libvirt code base to help + avoiding double-closing of a file descriptor. Instead of this API, + use the macro from files.h + </p> + + <ul> + <li><p>eg close a file descriptor</p> + +<pre> + if (VIR_CLOSE(fd) < 0) { + virReportSystemError(errno, _("failed to close file")); + } +</pre></li> + + <li><p>eg close a file descriptor in an error path, without losing + the previous errno value</p> + +<pre> + VIR_FORCE_CLOSE(fd); +</pre></li> + </ul> <h2><a name="string_comparision">String comparisons</a></h2> Index: libvirt-acl/src/libvirt_private.syms =================================================================== --- libvirt-acl.orig/src/libvirt_private.syms +++ libvirt-acl/src/libvirt_private.syms @@ -769,3 +769,6 @@ virXPathLongLong; virXPathULongLong; virXPathLongHex; virXPathULongHex; + +# files.h +virClose;

2 3

[libvirt] [PATCH] proxy: Fix undefined reference to virClose
by Matthias Bolte 19 Oct '10

19 Oct '10

Add src/util/files.c to libvirt_proxy_SOURCES. --- proxy/Makefile.am | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/proxy/Makefile.am b/proxy/Makefile.am index 4716683..c9859a0 100644 --- a/proxy/Makefile.am +++ b/proxy/Makefile.am @@ -15,6 +15,7 @@ libexec_PROGRAMS = libvirt_proxy libvirt_proxy_SOURCES = libvirt_proxy.c \ @top_srcdir@/src/util/buf.c \ + @top_srcdir@/src/util/files.c \ @top_srcdir@/src/util/hash.c \ @top_srcdir@/src/util/logging.c \ @top_srcdir@/src/util/memory.c \ -- 1.7.0.4

3 3

[libvirt] Need review of new vswitch concept info for technical accuracy
by Justin Clift 19 Oct '10

19 Oct '10

Hi all, Working on the "Foundation Concepts" for virtual switches at the moment. Does anyone have time/inclination to check over the concept graphics thus far, for technical accuracy? Especially the "Routing mode" and "Non-routing" mode ones, as I'm not sure if that's the right terminology for them: http://wiki.libvirt.org/page/VirtualNetworking#Routing_mode http://wiki.libvirt.org/page/VirtualNetworking#Non-routing_mode General feedback, thoughts, and suggestions are welcome too of course. :) Regards and best wishes, Justin Clift

3 3

[libvirt] [PATCH] esx: Handle non-UTF-8 encoded VMX files
by Matthias Bolte 19 Oct '10

19 Oct '10

ESX(i) uses UTF-8, but a Windows based GSX server writes Windows-1252 encoded VMX files. Add a test case to ensure that libxml2 provides Windows-1252 to UTF-8 conversion. --- This more general patch is a replacement for this patch: https://www.redhat.com/archives/libvir-list/2010-October/msg00516.html src/esx/esx_util.c | 48 +++++++++++++++++++++++++++++++++++++++++++++--- src/esx/esx_util.h | 2 ++ src/esx/esx_vmx.c | 30 ++++++++++++++++++++++++++++++ tests/esxutilstest.c | 42 ++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 119 insertions(+), 3 deletions(-) diff --git a/src/esx/esx_util.c b/src/esx/esx_util.c index 5fe72fc..24b931f 100644 --- a/src/esx/esx_util.c +++ b/src/esx/esx_util.c @@ -612,9 +612,9 @@ esxUtil_ReformatUuid(const char *input, char *output) unsigned char uuid[VIR_UUID_BUFLEN]; if (virUUIDParse(input, uuid) < 0) { - ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, - _("Could not parse UUID from string '%s'"), - input); + ESX_ERROR(VIR_ERR_INTERNAL_ERROR, + _("Could not parse UUID from string '%s'"), + input); return -1; } @@ -819,3 +819,45 @@ esxUtil_EscapeDatastoreItem(const char *string) return escaped2; } + + + +char * +esxUtil_ConvertToUTF8(const char *encoding, const char *string) +{ + char *result = NULL; + xmlCharEncodingHandlerPtr handler; + xmlBufferPtr input; + xmlBufferPtr utf8; + + handler = xmlFindCharEncodingHandler(encoding); + + if (handler == NULL) { + ESX_ERROR(VIR_ERR_INTERNAL_ERROR, + _("libxml2 doesn't handle %s encoding"), encoding); + return NULL; + } + + input = xmlBufferCreateStatic((char *)string, strlen(string)); + utf8 = xmlBufferCreate(); + + if (xmlCharEncInFunc(handler, utf8, input) < 0) { + ESX_ERROR(VIR_ERR_INTERNAL_ERROR, + _("Could not convert from %s to UTF-8 encoding"), encoding); + goto cleanup; + } + + result = strdup((const char *)xmlBufferContent(utf8)); + + if (result == NULL) { + virReportOOMError(); + goto cleanup; + } + + cleanup: + xmlCharEncCloseFunc(handler); + xmlBufferFree(input); + xmlBufferFree(utf8); + + return result; +} diff --git a/src/esx/esx_util.h b/src/esx/esx_util.h index 669a4f2..694e935 100644 --- a/src/esx/esx_util.h +++ b/src/esx/esx_util.h @@ -89,4 +89,6 @@ void esxUtil_ReplaceSpecialWindowsPathChars(char *string); char *esxUtil_EscapeDatastoreItem(const char *string); +char *esxUtil_ConvertToUTF8(const char *encoding, const char *string); + #endif /* __ESX_UTIL_H__ */ diff --git a/src/esx/esx_vmx.c b/src/esx/esx_vmx.c index 7dc8e60..7ec8c0e 100644 --- a/src/esx/esx_vmx.c +++ b/src/esx/esx_vmx.c @@ -868,6 +868,8 @@ esxVMX_ParseConfig(esxVMX_Context *ctx, virCapsPtr caps, const char *vmx, { bool success = false; virConfPtr conf = NULL; + char *encoding = NULL; + char *utf8; virDomainDefPtr def = NULL; long long config_version = 0; long long virtualHW_version = 0; @@ -895,6 +897,33 @@ esxVMX_ParseConfig(esxVMX_Context *ctx, virCapsPtr caps, const char *vmx, return NULL; } + /* vmx:.encoding */ + if (esxUtil_GetConfigString(conf, ".encoding", &encoding, true) < 0) { + goto cleanup; + } + + if (encoding == NULL || STRCASEEQ(encoding, "UTF-8")) { + /* nothing */ + } else { + virConfFree(conf); + conf = NULL; + + utf8 = esxUtil_ConvertToUTF8(encoding, vmx); + + if (utf8 == NULL) { + goto cleanup; + } + + conf = virConfReadMem(utf8, strlen(utf8), VIR_CONF_FLAG_VMX_FORMAT); + + VIR_FREE(utf8); + + if (conf == NULL) { + goto cleanup; + } + } + + /* Allocate domain def */ if (VIR_ALLOC(def) < 0) { virReportOOMError(); return NULL; @@ -1359,6 +1388,7 @@ esxVMX_ParseConfig(esxVMX_Context *ctx, virCapsPtr caps, const char *vmx, } virConfFree(conf); + VIR_FREE(encoding); VIR_FREE(sched_cpu_affinity); VIR_FREE(guestOS); diff --git a/tests/esxutilstest.c b/tests/esxutilstest.c index d4042c2..97e154e 100644 --- a/tests/esxutilstest.c +++ b/tests/esxutilstest.c @@ -280,6 +280,47 @@ testEscapeDatastoreItem(const void *data ATTRIBUTE_UNUSED) +struct testWindows1252ToUTF8 { + const char *windows1252; + const char *utf8; +}; + +static struct testWindows1252ToUTF8 windows1252ToUTF8[] = { + { "normal", "normal" }, + { /* "A€Z" */ "A\200Z", "A\342\202\254Z" }, + { /* "Aä1ö2ü3ß4#5~6!7§8/9%Z" */ "A\3441\3662\3743\3374#5~6!7\2478/9%Z", + "A\303\2441\303\2662\303\2743\303\2374#5~6!7\302\2478/9%Z" }, + { /* "hÀÁÂÃÄÅH" */ "h\300\301\302\303\304\305H", + "h\303\200\303\201\303\202\303\203\303\204\303\205H" }, +}; + +static int +testConvertWindows1252ToUTF8(const void *data ATTRIBUTE_UNUSED) +{ + int i; + char *utf8 = NULL; + + for (i = 0; i < ARRAY_CARDINALITY(windows1252ToUTF8); ++i) { + VIR_FREE(utf8); + + utf8 = esxUtil_ConvertToUTF8("Windows-1252", + windows1252ToUTF8[i].windows1252); + + if (utf8 == NULL) { + return -1; + } + + if (STRNEQ(windows1252ToUTF8[i].utf8, utf8)) { + VIR_FREE(utf8); + return -1; + } + } + + return 0; +} + + + static int mymain(int argc, char **argv) { @@ -312,6 +353,7 @@ mymain(int argc, char **argv) DO_TEST(ParseDatastorePath); DO_TEST(ConvertDateTimeToCalendarTime); DO_TEST(EscapeDatastoreItem); + DO_TEST(ConvertWindows1252ToUTF8); return result == 0 ? EXIT_SUCCESS : EXIT_FAILURE; } -- 1.7.0.4

4 5

[libvirt] libvirt library binary name for linux
by arnaud.champion＠devatom.fr 19 Oct '10

19 Oct '10

?Hi, I'm currently working on .Net / Mono bindings of libvirt. I know that under windows environment, the libvirt library binary is named "libvirt-0.dll", what is it under linux ? I suppose libvirt.so, but I can't find it... Arnaud

5 16

[libvirt] [PATCH v3] introduce VIR_CLOSE to be used rather than close()
by Stefan Berger 19 Oct '10

19 Oct '10

V3: - many small nits addressed V2: - following Eric's suggestions and picking up his code suggestions Since bugs due to double-closed file descriptors are difficult to track down in a multi-threaded system, I am introducing the VIR_CLOSE(fd) macro to help avoid mistakes here. There are lots of places where close() is being used. In this patch I am only cleaning up usage of close() in src/conf where the problems were. I also dare to declare close() as being deprecated in libvirt code base (HACKING). Signed-off-by: Stefan Berger <stefanb(a)us.ibm.com> --- HACKING | 17 +++++++++++++ docs/hacking.html.in | 23 ++++++++++++++++++ src/Makefile.am | 3 +- src/conf/domain_conf.c | 15 ++++++++---- src/conf/network_conf.c | 7 +++-- src/conf/nwfilter_conf.c | 13 ++++------ src/conf/storage_conf.c | 8 +++--- src/conf/storage_encryption_conf.c | 6 +++- src/libvirt_private.syms | 3 ++ src/util/files.c | 46 +++++++++++++++++++++++++++++++++++++ src/util/files.h | 45 ++++++++++++++++++++++++++++++++++++ 11 files changed, 164 insertions(+), 22 deletions(-) Index: libvirt-acl/src/util/files.c =================================================================== --- /dev/null +++ libvirt-acl/src/util/files.c @@ -0,0 +1,46 @@ +/* + * memory.c: safer file handling + * + * Copyright (C) 2010 IBM Corporation + * Copyright (C) 2010 Stefan Berger + * Copyright (C) 2010 RedHat, Inc. + * Copyright (C) 2010 Eric Blake + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + */ + +#include <config.h> + +#include <unistd.h> + +#include "files.h" + +int virClose(int *fdptr, bool preserve_errno) +{ + int saved_errno; + int rc = 0; + + if (*fdptr >= 0) { + if (preserve_errno) + saved_errno = errno; + rc = close(*fdptr); + *fdptr = -1; + if (preserve_errno) + errno = saved_errno; + } + + return rc; +} Index: libvirt-acl/src/util/files.h =================================================================== --- /dev/null +++ libvirt-acl/src/util/files.h @@ -0,0 +1,45 @@ +/* + * files.h: safer file handling + * + * Copyright (C) 2010 IBM Corporation + * Copyright (C) 2010 Stefan Berger + * Copyright (C) 2010 RedHat, Inc. + * Copyright (C) 2010 Eric Blake + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + */ + + +#ifndef __VIR_FILES_H_ +# define __VIR_FILES_H_ + +# include <stdbool.h> + +# include "internal.h" + + +/* Don't call this directly - use the macros below */ +int virClose(int *fdptr, bool preserve_errno) ATTRIBUTE_RETURN_CHECK; + +/* For use on normal paths; caller must check return value, + and failure sets errno per close(). */ +# define VIR_CLOSE(FD) virClose(&(FD), false) + +/* For use on cleanup paths; errno is unaffected by close, + and no return value to worry about. */ +# define VIR_FORCE_CLOSE(FD) ignore_value(virClose(&(FD), true)) + +#endif /* __VIR_FILES_H */ Index: libvirt-acl/src/Makefile.am =================================================================== --- libvirt-acl.orig/src/Makefile.am +++ libvirt-acl/src/Makefile.am @@ -82,7 +82,8 @@ UTIL_SOURCES = \ util/uuid.c util/uuid.h \ util/util.c util/util.h \ util/xml.c util/xml.h \ - util/virterror.c util/virterror_internal.h + util/virterror.c util/virterror_internal.h \ + util/files.c util/files.h EXTRA_DIST += util/threads-pthread.c util/threads-win32.c Index: libvirt-acl/src/conf/domain_conf.c =================================================================== --- libvirt-acl.orig/src/conf/domain_conf.c +++ libvirt-acl/src/conf/domain_conf.c @@ -46,6 +46,7 @@ #include "nwfilter_conf.h" #include "ignore-value.h" #include "storage_file.h" +#include "files.h" #define VIR_FROM_THIS VIR_FROM_DOMAIN @@ -6798,7 +6799,7 @@ int virDomainSaveXML(const char *configD goto cleanup; } - if (close(fd) < 0) { + if (VIR_CLOSE(fd) < 0) { virReportSystemError(errno, _("cannot save config file '%s'"), configFile); @@ -6807,8 +6808,8 @@ int virDomainSaveXML(const char *configD ret = 0; cleanup: - if (fd != -1) - close(fd); + VIR_FORCE_CLOSE(fd); + VIR_FREE(configFile); return ret; } @@ -7765,10 +7766,14 @@ int virDomainDiskDefForeachPath(virDomai } if (virStorageFileGetMetadataFromFD(path, fd, format, &meta) < 0) { - close(fd); + VIR_FORCE_CLOSE(fd); goto cleanup; } - close(fd); + + if (VIR_CLOSE(fd) < 0) + virReportSystemError(errno, + _("could not close file %s"), + path); if (virHashAddEntry(paths, path, (void*)0x1) < 0) { virReportOOMError(); Index: libvirt-acl/src/conf/nwfilter_conf.c =================================================================== --- libvirt-acl.orig/src/conf/nwfilter_conf.c +++ libvirt-acl/src/conf/nwfilter_conf.c @@ -45,6 +45,8 @@ #include "nwfilter_conf.h" #include "domain_conf.h" #include "c-ctype.h" +#include "files.h" +#include "ignore-value.h" #define VIR_FROM_THIS VIR_FROM_NWFILTER @@ -2193,7 +2195,7 @@ int virNWFilterSaveXML(const char *confi goto cleanup; } - if (close(fd) < 0) { + if (VIR_CLOSE(fd) < 0) { virReportSystemError(errno, _("cannot save config file '%s'"), configFile); @@ -2203,9 +2205,7 @@ int virNWFilterSaveXML(const char *confi ret = 0; cleanup: - if (fd != -1) - close(fd); - + VIR_FORCE_CLOSE(fd); VIR_FREE(configFile); return ret; @@ -2604,7 +2604,7 @@ virNWFilterPoolObjSaveDef(virNWFilterDri goto cleanup; } - if (close(fd) < 0) { + if (VIR_CLOSE(fd) < 0) { virReportSystemError(errno, _("cannot save config file %s"), pool->configFile); @@ -2614,8 +2614,7 @@ virNWFilterPoolObjSaveDef(virNWFilterDri ret = 0; cleanup: - if (fd != -1) - close(fd); + VIR_FORCE_CLOSE(fd); VIR_FREE(xml); Index: libvirt-acl/src/conf/storage_conf.c =================================================================== --- libvirt-acl.orig/src/conf/storage_conf.c +++ libvirt-acl/src/conf/storage_conf.c @@ -43,6 +43,8 @@ #include "buf.h" #include "util.h" #include "memory.h" +#include "files.h" +#include "ignore-value.h" #define VIR_FROM_THIS VIR_FROM_STORAGE @@ -1560,7 +1562,7 @@ virStoragePoolObjSaveDef(virStorageDrive goto cleanup; } - if (close(fd) < 0) { + if (VIR_CLOSE(fd) < 0) { virReportSystemError(errno, _("cannot save config file %s"), pool->configFile); @@ -1570,9 +1572,7 @@ virStoragePoolObjSaveDef(virStorageDrive ret = 0; cleanup: - if (fd != -1) - close(fd); - + VIR_FORCE_CLOSE(fd); VIR_FREE(xml); return ret; Index: libvirt-acl/src/conf/network_conf.c =================================================================== --- libvirt-acl.orig/src/conf/network_conf.c +++ libvirt-acl/src/conf/network_conf.c @@ -43,6 +43,8 @@ #include "util.h" #include "buf.h" #include "c-ctype.h" +#include "files.h" +#include "ignore-value.h" #define MAX_BRIDGE_ID 256 #define VIR_FROM_THIS VIR_FROM_NETWORK @@ -687,7 +689,7 @@ int virNetworkSaveXML(const char *config goto cleanup; } - if (close(fd) < 0) { + if (VIR_CLOSE(fd) < 0) { virReportSystemError(errno, _("cannot save config file '%s'"), configFile); @@ -697,8 +699,7 @@ int virNetworkSaveXML(const char *config ret = 0; cleanup: - if (fd != -1) - close(fd); + VIR_FORCE_CLOSE(fd); VIR_FREE(configFile); Index: libvirt-acl/src/conf/storage_encryption_conf.c =================================================================== --- libvirt-acl.orig/src/conf/storage_encryption_conf.c +++ libvirt-acl/src/conf/storage_encryption_conf.c @@ -35,6 +35,8 @@ #include "xml.h" #include "virterror_internal.h" #include "uuid.h" +#include "files.h" +#include "ignore-value.h" #define VIR_FROM_THIS VIR_FROM_STORAGE @@ -286,12 +288,12 @@ virStorageGenerateQcowPassphrase(unsigne if (r <= 0) { virStorageReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Cannot read from /dev/urandom")); - close(fd); + VIR_FORCE_CLOSE(fd); return -1; } if (dest[i] >= 0x20 && dest[i] <= 0x7E) i++; /* Got an acceptable character */ } - close(fd); + VIR_FORCE_CLOSE(fd); return 0; } Index: libvirt-acl/HACKING =================================================================== --- libvirt-acl.orig/HACKING +++ libvirt-acl/HACKING @@ -318,6 +318,23 @@ routines, use the macros from memory.h VIR_FREE(domain); +File handling +============= + +Use of the close() API is deprecated in libvirt code base to help avoiding +double-closing of a filedescriptor. Instead of this API, use the macro from +files.h + + - eg close a file descriptor + + if (VIR_CLOSE(fd) < 0) { + virReportSystemError(errno, _("failed to close file")); + } + + - eg close a file descriptor in an error path, without losing the previous + errno value + + VIR_FORCE_CLOSE(fd) String comparisons ================== Index: libvirt-acl/docs/hacking.html.in =================================================================== --- libvirt-acl.orig/docs/hacking.html.in +++ libvirt-acl/docs/hacking.html.in @@ -389,7 +389,30 @@ </pre></li> </ul> + <h2><a name="file_handling">File handling</a></h2> + <p> + Use of the close() API is deprecated in libvirt code base to help + avoiding double-closing of a filedescriptor. Instead of this API, + use the macro from files.h + </p> + + <ul> + <li><p>eg close a file descriptor</p> + +<pre> + if (VIR_CLOSE(fd) < 0) { + virReportSystemError(errno, _("failed to close file")); + } +</pre></li> + + <li><p>eg close a file descriptor in an error path, without losing + the previous errno value</p> + +<pre> + VIR_FORCE_CLOSE(fd); +</pre></li> + </ul> <h2><a name="string_comparision">String comparisons</a></h2> Index: libvirt-acl/src/libvirt_private.syms =================================================================== --- libvirt-acl.orig/src/libvirt_private.syms +++ libvirt-acl/src/libvirt_private.syms @@ -769,3 +769,6 @@ virXPathLongLong; virXPathULongLong; virXPathLongHex; virXPathULongHex; + +# files.h +virClose;

3 3

[libvirt] [PATCH 0/4] Support auditing of guests
by Daniel P. Berrange 19 Oct '10

19 Oct '10

This patch series introduces basic support for auditing of guest operations. The auditing hooks are primarily done in the libvirtd dispatch layer, because we want to hook all stateful drivers like QEMU, LXC, UML, etc. We don't want to audit the remote driver, VMWare, XenAPI etc which are just plain RPC drivers. There is an exception for auditing of the SELinux label assignment. That has to be done right inside the sVirt code since the neccessary info isn't available in the libvirtd dispatch layer. This patch series focuses on lifecycle operations, but there are quite alot of other things that are desirable to audit in the future, so further patches will likely follow. The last patch is semi-related, it fixes up a major screwup in the linking of the daemon that caused duplicated copies of the code to be linked. This was exposed by the audit work. The patches are a combination of work by myself and Miloslav NB, it should compile and run fine with any reasonably recent audit package, but if you want correctly identified log messages you need audit 2.0.5 Also, audit logs only appear if running libvirtd as root. Non root users don't have permissions to generate audit logs. Daniel

3 11

[libvirt] [PATCH] Update docs for memory parameters and memtune command
by Nikunj A. Dadhania 19 Oct '10

19 Oct '10

From: Nikunj A. Dadhania <nikunj(a)linux.vnet.ibm.com> docs/formatdomain.html.in: Add memtune element details src/libvirt.c: Update virDomainGetMemoryParameters api description, make it more clear that the user first needs to call the api to get the number of parameters supported and then call again to get the values. tools/virsh.pod: Add usage of new command memtune in virsh manpage Signed-off-by: Nikunj A. Dadhania <nikunj(a)linux.vnet.ibm.com> --- docs/formatdomain.html.in | 21 +++++++++++++++++++++ src/libvirt.c | 20 +++++++++++++++++--- tools/virsh.pod | 8 ++++++++ 3 files changed, 46 insertions(+), 3 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 8ec7446..9b4c6d7 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -194,6 +194,11 @@ <memoryBacking> <hugepages/> </memoryBacking> + <memtune> + <hard_limit>1048576</hard_limit> + <soft_limit>131072</soft_limit> + <swap_hard_limit>2097152</swap_hard_limit> + </memtune> <vcpu cpuset="1-4,^3,6">2</vcpu> ...</pre> @@ -211,6 +216,22 @@ <code>hugepages</code> element set within it. This tells the hypervisor that the guest should have its memory allocated using hugepages instead of the normal native page size.</dd> + <dt><code>memtune</code></dt> + <dd> The optional <code>memtune</code> element provides details + regarding the memory tuneable parameters for the domain. If this is + omitted, it defaults to the OS provided defaults.</dd> + <dt><code>hard_limit</code></dt> + <dd> The optional <code>hard_limit</code> element is the maximum memory + the guest can use. The units for this value are kilobytes (i.e. blocks + of 1024 bytes)</dd> + <dt><code>soft_limit</code></dt> + <dd> The optional <code>soft_limit</code> element is the memory limit to + enforce during memory contention. The units for this value are + kilobytes (i.e. blocks of 1024 bytes)</dd> + <dt><code>swap_hard_limit</code></dt> + <dd> The optional <code>swap_hard_limit</code> element is the maximum + swap the guest can use. The units for this value are kilobytes + (i.e. blocks of 1024 bytes)</dd> <dt><code>vcpu</code></dt> <dd>The content of this element defines the number of virtual CPUs allocated for the guest OS, which must be between 1 and diff --git a/src/libvirt.c b/src/libvirt.c index 2868460..629d97b 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -3063,9 +3063,23 @@ error: * Get the memory parameters, the @params array will be filled with the values * equal to the number of parameters suggested by @nparams * - * As a special case, if @nparams is zero and @params is NULL, the API will - * set the number of parameters supported by the HV in @nparams and return - * SUCCESS. + * As the value of @nparams is dynamic, call the API setting @nparams to 0 and + * @params as NULL, the API returns the number of parameters supported by the + * HV by updating @nparams on SUCCESS. The caller should then allocate @params + * array, i.e. (sizeof(@virMemoryParameter) * @nparams) bytes and call the API + * again. + * + * Here is the sample code snippet: + * + * if ((virDomainGetMemoryParameters(dom, NULL, &nparams, 0) == 0) && + * (nparams != 0)) { + * params = vshMalloc(ctl, sizeof(virMemoryParameter) * nparams); + * memset(params, 0, sizeof(virMemoryParameter) * nparams); + * if (virDomainGetMemoryParameters(dom, params, &nparams, 0)) { + * vshError(ctl, "%s", _("Unable to get memory parameters")); + * goto error; + * } + * } * * This function requires privileged access to the hypervisor. This function * expects the caller to allocate the @param diff --git a/tools/virsh.pod b/tools/virsh.pod index e0471b1..cb8e942 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -456,6 +456,14 @@ Change the maximum memory allocation limit in the guest domain. This should not change the current memory use. The memory limit is specified in kilobytes. +=item B<memtune> I<domain-id> + +Displays the domain memory parameters. + +=item B<memtune> I<domain-id> optional I<--hard-limit> B<kilobytes> optional I<--soft-limit> B<kilobytes> optional I<--swap-hard-limit> B<kilobytes> + +Allows you to set the domain memory parameters. LXC and QEMU/KVM supports these parameters. + =item B<setvcpus> I<domain-id> I<count> Change the number of virtual CPUs active in the guest domain. Note that

4 5

Re: [libvirt] [libvirt-tck 3/3] Add test case for daemon hook testing
by Osier 19 Oct '10

19 Oct '10

----- "Daniel P. Berrange" <berrange(a)redhat.com> wrote: > On Mon, Oct 18, 2010 at 07:18:09AM +0800, Osier Yang wrote: > > Validate daemon hook is invocated correctly while start, restart, > > stop, reload libvirtd > > --- > > scripts/hooks/051-daemon-hook.t | 156 > +++++++++++++++++++++++++++++++++++++++ > > 1 files changed, 156 insertions(+), 0 deletions(-) > > create mode 100644 scripts/hooks/051-daemon-hook.t > > > > diff --git a/scripts/hooks/051-daemon-hook.t > b/scripts/hooks/051-daemon-hook.t > > new file mode 100644 > > index 0000000..2d44e45 > > --- /dev/null > > +++ b/scripts/hooks/051-daemon-hook.t > > @@ -0,0 +1,156 @@ > > +# -*- perl -*- > > +# > > +# Copyright (C) 203 Red Hat, Inc. > > +# Copyright (C) 203 Osier Yang <jyang(a)redhat.com> > > +# > > +# This program is free software; You can redistribute it and/or > modify > > +# it under the GNU General Public License as published by the Free > > +# Software Foundation; either version 2, or (at your option) any > > +# later version > > +# > > +# The file "LICENSE" distributed along with this file provides > full > > +# details of the terms and conditions > > +# > > + > > +=pod > > + > > +=head1 NAME > > + > > +domain/051-start-daemon.t - hooks testing for daemon > > + > > +=head1 DESCRIPTION > > + > > +The test case validates that the hook script is invocated while > > +start, stop, or reload daemon. > > + > > +=cut > > + > > +use strict; > > +use warnings; > > + > > +use Test::More tests => 12; > > + > > +use Sys::Virt::TCK::Hooks; > > + > > +my $hook = Sys::Virt::TCK::Hooks->new(type => 'daemon', > > + conf_dir => > '/etc/libvirt/hooks', > > + log_name => > '/tmp/daemon.log'); > > + > > +$hook->libvirtd_status; > > +BAIL_OUT "libvirtd is not running, Exit..." > > + if ($hook->{libvirtd_status} eq 'stopped'); > > + > > +eval { $hook->prepare; }; > > +BAIL_OUT "failed to setup hooks testing ENV: $@" if $@; > > + > > +diag "restart libvirtd for hooks scripts taking effect"; > > +$hook->action('restart'); > > +$hook->service_libvirtd; > > +unlink $hook->{log_name} unless -f $hook->{log_name}; > > + > > +# stop libvirtd > > +$hook->action('stop'); > > +$hook->expect_log; > > + > > +diag "$hook->{action} libvirtd"; > > +$hook->service_libvirtd; > > + > > +diag "hook script: $hook->{name}"; > > +system "cat $hook->{name}"; > > These 'cat' calls should all really be reported as diagnostics > rather than just sent to stdout directly. We should probably > just use the standard 'Slurp' module from CPAN. yes, indeed. > > eg, put a 'use Slurp' at the top of the script then > replace those 2 lines with > > my $hookdata = slurp($hook->{name}); > diag "hook script: $hook->{name} '$hookdata'"; > Thanks. will update.. think need to add it in 'Build.pl' as a requirement at the meantime.. > > > + > > +sleep 3; > > +diag "check if $hook->{name} is invocated"; > > +ok(-f "$hook->{name}", "$hook->{name} is invocated"); > > s/invocated/invoked/ (and in a few other places later) yep, will update. > > > + > > +diag "actual log: $hook->{log_name}"; > > +system "cat $hook->{log_name}"; > > + > > +diag "expected log:"; > > +print $hook->{expect_log}."\n"; > > + > > +diag "check if the actual log is same with expected log"; > > +ok($hook->compare_log, "$hook->{name} is invocated correctly while > $hook->{action} libvirtd"); > > + > > +diag "check if libvirtd is stopped"; > > +ok(`service libvirtd status` =~ /stopped/, "libvirtd is stopped"); > > > + > > +# start libvirtd > > +$hook->action('start'); > > +$hook->expect_log; > > + > > +diag "$hook->{action} libvirtd"; > > +$hook->service_libvirtd; > > + > > +diag "hook script: $hook->{name}"; > > +system "cat $hook->{name}"; > > + > > +sleep 3; > > +diag "check if $hook->{name} is invocated"; > > +ok(-f "$hook->{name}", "$hook->{name} is invocated"); > > + > > +diag "actual log: $hook->{log_name}"; > > +system "cat $hook->{log_name}"; > > + > > +diag "expected log:"; > > +print $hook->{expect_log}."\n"; > > + > > +diag "check if the actual log is same with expected log"; > > +ok($hook->compare_log, "$hook->{name} is invocated correctly while > $hook->{action} libvirtd"); > > + > > +diag "check if libvirtd is still running"; > > +ok(`service libvirtd status` =~ /running/, "libvirtd is running"); > > > + > > +# restart libvirtd > > +$hook->action('restart'); > > +$hook->expect_log; > > + > > +diag "$hook->{action} libvirtd"; > > +$hook->service_libvirtd; > > + > > +diag "hook script: $hook->{name}"; > > +system "cat $hook->{name}"; > > + > > +sleep 3; > > +diag "check if $hook->{name} is invocated"; > > +ok(-f "$hook->{name}", "$hook->{name} is invocated"); > > + > > +diag "actual log: $hook->{log_name}"; > > +system "cat $hook->{log_name}"; > > + > > +diag "expected log:"; > > +print $hook->{expect_log}."\n"; > > + > > +diag "check if the actual log is same with expected log"; > > +ok($hook->compare_log, "$hook->{name} is invocated correctly while > $hook->{action} libvirtd"); > > + > > +diag "check if libvirtd is still running"; > > +ok(`service libvirtd status` =~ /running/, "libvirtd is running"); > > > + > > +# reload libvirtd > > +$hook->action('reload'); > > +$hook->expect_log; > > + > > +diag "$hook->{action} libvirtd"; > > +$hook->service_libvirtd; > > + > > +diag "hook script: $hook->{name}"; > > +system "cat $hook->{name}"; > > + > > +sleep 3; > > +diag "check if $hook->{name} is invocated"; > > +ok(-f "$hook->{name}", "$hook->{name} is invocated"); > > + > > +diag "actual log: $hook->{log_name}"; > > +system "cat $hook->{log_name}"; > > + > > +diag "expected log:"; > > +print $hook->{expect_log}."\n"; > > + > > +diag "check if the actual log is same with expected log"; > > +ok($hook->compare_log, "$hook->{name} is invocated correctly while > $hook->{action} libvirtd"); > > + > > +diag "check if libvirtd is still running"; > > +ok(`service libvirtd status` =~ /running/, "libvirtd is running"); > > > + > > +$hook->cleanup; > > As mentioned in the previous patch, it is probably best to wrap the > entire test block in a > > SKIP: { > my $uri = $conn->get_uri(); > skip 12, "Not using QEMU/LXC driver" unless > $uri eq "qemu:///system" or $uri eq "lxc:///"; > > ....all test cases... > } > As explained in previous mail. will not "SKIP" it. :-/ - Osier > Regards, > Daniel > -- > |: Red Hat, Engineering, London -o- > http://people.redhat.com/berrange/ :| > |: http://libvirt.org -o- http://virt-manager.org -o- > http://deltacloud.org :| > |: http://autobuild.org -o- > http://search.cpan.org/~danberr/ :| > |: GnuPG: 7D3B9505 -o- F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B > 9505 :|

1 0

[libvirt] [PATCH] docs: added initial page for c# binding, with links to it
by Justin Clift 18 Oct '10

18 Oct '10

--- docs/bindings.html.in | 2 +- docs/csharp.html.in | 128 +++++++++++++++++++++++++++++++++++++++++++++++++ docs/sitemap.html.in | 4 ++ 3 files changed, 133 insertions(+), 1 deletions(-) create mode 100644 docs/csharp.html.in diff --git a/docs/bindings.html.in b/docs/bindings.html.in index ee63ce3..bdcd231 100644 --- a/docs/bindings.html.in +++ b/docs/bindings.html.in @@ -15,7 +15,7 @@ higher level kind of languages:</p> <li><strong>OCaml</strong>: Richard Jones supplies <a href="http://libvirt.org/ocaml/">bindings for OCaml</a>.</li> <li><strong>Ruby</strong>: David Lutterkort provides <a href="http://libvirt.org/ruby/">bindings for Ruby</a>.</li> <li><strong>Java</strong>: Daniel Veillard maintains <a href="java.html">Java bindings</a>.</li> - <li><strong>C#</strong>: Jaromír Červenka maintains <a href="http://svn.i-tux.cz/listing.php?repname=SharpLibVirt">C# bindings here</a>.</li> + <li><strong>C#</strong>: Arnaud Champion maintains <a href="csharp.html">C# bindings</a>.</li> <li><strong>PHP</strong>: Radek Hladik is developing <a href="http://phplibvirt.cybersales.cz/">PHP bindings</a>.</li> </ul> <p>For information on using libvirt on <strong>Windows</strong> diff --git a/docs/csharp.html.in b/docs/csharp.html.in new file mode 100644 index 0000000..771b8ca --- /dev/null +++ b/docs/csharp.html.in @@ -0,0 +1,128 @@ +<?xml version="1.0"?> +<html> + <body> + <h1>C# API bindings</h1> + + + + <h2>GIT source repository</h2> + <p> + The C# bindings source code is maintained in a <a + href="http://git-scm.com/">git</a> repository available on + <a href="http://libvirt.org/git/">libvirt.org</a>: + </p> + +<pre> +git clone git://libvirt.org/libvirt-csharp.git +</pre> + + <p> + They can also be browsed online: + </p> + +<pre> +<a href="http://libvirt.org/git/?p=libvirt-csharp.git;a=summary">http://libvirt.org/git/?p=libvirt-csharp.git;a=summary</a> +</pre> + + <p> </p> + + <h2>Authors</h2> + + <p> + The C# bindings are the work of Arnaud Champion + <<a href="mailto:arnaud.champion AT devatom.fr">arnaud.champion AT devatom.fr</a>>, + based upon the previous work of Jaromír Červenka. + </p> + + <p> </p> + + <h2>Function Coverage</h2> + + <p> + Coverage for the C# functions is: + </p> + <table> + <tr><th>Type</th><th>Name</th><th>Binding available?</th><th>Tested?</th><th>Works?</th></tr> + <tr><td>enum</td><td>virCPUCompareResult</td><td>No</td></tr> + <tr><td>struct</td><td>virConnect</td><td>Yes, an IntPtr as the struct is not public</td><td>Yes</td><td>Yes</td></tr> + <tr><td>struct</td><td>virConnectAuth</td><td>Yes</td><td>Yes</td><td>Yes</td></tr> + <tr><td>struct</td><td>virConnectCredential</td><td>Yes</td><td>Yes</td><td>Partially, pack problem</td></tr> + <tr><td>enum</td><td>virConnectCredentialType</td><td>Yes</td><td>Yes</td><td>Yes</td></tr> + <tr><td>enum</td><td>virConnectFlags</td><td>No</td></tr> + <tr><td>struct</td><td>virDomain</td><td>Yes, an IntPtr as the struct is not public</td></tr> + <tr><td>struct</td><td>virDomainBlockInfo</td><td>No</td></tr> + <tr><td>struct</td><td>virDomainBlockStatsInfo</td><td>No</td></tr> + <tr><td>enum</td><td>virDomainCoreDumpFlags</td><td>No</td></tr> + <tr><td>enum</td><td>virDomainCreateFlags</td><td>No</td></tr> + <tr><td>enum</td><td>virDomainDeviceModifyFlags</td><td>No</td></tr> + <tr><td>enum</td><td>virDomainEventDefinedDetailType</td><td>Yes</td><td>Yes</td><td>Yes</td></tr> + <tr><td>struct</td><td>virDomainEventGraphicsAddress</td><td>No</td></tr> + <tr><td>enum</td><td>virDomainEventGraphicsAddressType</td><td>No</td></tr> + <tr><td>enum</td><td>virDomainEventGraphicsPhase</td><td>No</td></tr> + <tr><td>struct</td><td>virDomainEventGraphicsSubject</td><td>No</td></tr> + <tr><td>struct</td><td>virDomainEventGraphicsSubjectIdentity</td><td>No</td></tr> + <tr><td>enum</td><td>virDomainEventID</td><td>No</td></tr> + <tr><td>enum</td><td>virDomainEventIOErrorAction</td><td>No</td></tr> + <tr><td>enum</td><td>virDomainEventResumedDetailType</td><td>Yes</td><td>Yes</td><td>Yes</td></tr> + <tr><td>enum</td><td>virDomainEventStartedDetailType</td><td>Yes</td><td>Yes</td><td>Yes</td></tr> + <tr><td>enum</td><td>virDomainEventStoppedDetailType</td><td>Yes</td><td>Yes</td><td>Yes</td></tr> + <tr><td>enum</td><td>virDomainEventSuspendedDetailType</td><td>Yes</td><td>Yes</td><td>Yes</td></tr> + <tr><td>enum</td><td>virDomainEventType</td><td>Yes</td><td>Yes</td><td>Yes</td></tr> + <tr><td>enum</td><td>virDomainEventUndefinedDetailType</td><td>Yes</td><td>Yes</td><td>Yes</td></tr> + <tr><td>enum</td><td>virDomainEventWatchdogAction</td><td>No</td></tr> + <tr><td>struct</td><td>virDomainInfo</td><td>Yes</td><td>Yes</td><td>Yes</td></tr> + <tr><td>struct</td><td>virDomainInterfaceStatsStruct</td><td>Yes</td><td>No</td><td>Maybe</td></tr> + <tr><td>struct</td><td>virDomainJobInfo</td><td>No</td></tr> + <tr><td>enum</td><td>virDomainJobType</td><td>No</td></tr> + <tr><td>enum</td><td>virDomainMemoryFlags</td><td>No</td></tr> + <tr><td>struct</td><td>virDomainMemoryStatStruct</td><td>No</td></tr> + <tr><td>enum</td><td>virDomainMemoryStatTags</td><td>Yes</td><td>No</td><td>Maybe</td></tr> + <tr><td>enum</td><td>virDomainMigrateFlags</td><td>No</td></tr> + <tr><td>struct</td><td>virDomainSnapshot</td><td>No</td></tr> + <tr><td>enum</td><td>virDomainSnapshotDeleteFlags</td></tr> + <tr><td>enum</td><td>virDomainState</td><td>Yes</td><td>Yes</td><td>Yes</td></tr> + <tr><td>enum</td><td>virDomainXMLFlags</td><td>Yes</td><td>Yes</td><td>Yes</td></tr> + <tr><td>enum</td><td>virEventHandleType</td><td>Yes</td><td>Yes</td><td>Yes</td></tr> + <tr><td>struct</td><td>virInterface</td><td>Yes, an IntPtr as the struct is not public</td></tr> + <tr><td>enum</td><td>virInterfaceXMLFlags</td><td>No</td></tr> + <tr><td>struct</td><td>virNWFilter</td><td>No</td></tr> + <tr><td>struct</td><td>virNetwork</td><td>Yes, an IntPtr as the struct is not public</td></tr> + <tr><td>struct</td><td>virNodeDevice</td><td>Yes, an IntPtr as the struct is not public</td></tr> + <tr><td>struct</td><td>virNodeInfo</td><td>Yes</td><td>No</td><td>Maybe</td></tr> + <tr><td>struct</td><td>virSchedParameter</td><td>No</td></tr> + <tr><td>enum</td><td>virSchedParameterType</td><td>No</td></tr> + <tr><td>struct</td><td>virSecret</td><td>No</td></tr> + <tr><td>enum</td><td>virSecretUsageType</td><td>No</td></tr> + <tr><td>struct</td><td>virSecurityLabel</td><td>No</td></tr> + <tr><td>struct</td><td>virSecurityModel</td><td>No</td></tr> + <tr><td>struct</td><td>virStoragePool</td><td>Yes, an IntPtr as the struct is not public</td></tr> + <tr><td>enum</td><td>virStoragePoolBuildFlags</td><td>Yes</td><td>No</td><td>Maybe</td></tr> + <tr><td>enum</td><td>virStoragePoolDeleteFlags</td><td>Yes</td><td>No</td><td>Maybe</td></tr> + <tr><td>struct</td><td>virStoragePoolInfo</td><td>Yes</td><td>Yes</td><td>Yes</td></tr> + <tr><td>struct</td><td>virStoragePool</td><td>Yes, an IntPtr as the struct is not public</td></tr> + <tr><td>enum</td><td>virStoragePoolState</td><td>Yes</td><td>Yes</td><td>Yes</td></tr> + <tr><td>struct</td><td>virStorageVol</td><td>Yes, an IntPtr as the struct is not public</td></tr> + <tr><td>enum</td><td>virStorageVolDeleteFlags</td><td>No</td></tr> + <tr><td>struct</td><td>virStorageVolInfo</td><td>Yes</td><td>Yes</td><td>Yes</td></tr> + <tr><td>struct</td><td>virStorageVol</td><td>Yes, an IntPtr as the struct is not public</td></tr> + <tr><td>enum</td><td>virStorageVolType</td><td>Yes</td><td>Yes</td><td>Yes</td></tr> + <tr><td>struct</td><td>virStream</td><td>No</td></tr> + <tr><td>enum</td><td>virStreamEventType</td><td>No</td></tr> + <tr><td>enum</td><td>virStreamFlags</td><td>No</td></tr> + <tr><td>struct</td><td>virVcpuInfo</td><td>No</td></tr> + <tr><td>enum</td><td>virVcpuState</td><td>No</td></tr> + </table> + + </body> +</html> diff --git a/docs/sitemap.html.in b/docs/sitemap.html.in index 481507e..5f46b59 100644 --- a/docs/sitemap.html.in +++ b/docs/sitemap.html.in @@ -242,6 +242,10 @@ <a href="java.html">Java</a> <span>overview of the Java API bindings</span> </li> + <li> + <a href="csharp.html">C#</a> + <span>overview of the C# API bindings</span> + </li> </ul> </li> <li> -- 1.7.2.3

1 1

[libvirt] [PATCH] qemu: let qemu group look below /var/lib/libvirt/qemu/
by Eric Blake 18 Oct '10

18 Oct '10

From: Dan Kenigsberg <danken(a)redhat.com> Vdsm needs to communicate with its guest agent via unix domain socket, which qemu creates due to the following domain xml device: <channel type='unix'> <target type='virtio' name='com.redhat.rhevm.vdsm'/> <source mode='bind' path='/var/lib/libvirt/qemu/channels/fcp-xp-1.com.redhat.rhevm.vdsm'/> </channel> The location of the socket below /var/lib/libvirt/qemu/channels makes sense, to humans and selinux policy alike. However, that socket should be accessible to vdsm, too. Due to other (storage) reasons, vdsm is to join the "qemu" group. With this patch, vdsm can look below /var/lib/libvirt/qemu and connect to the socket. The socket itself should be chmod'ed to allow qemu group read/write, but that's for another project. BZ#643407 --- libvirt.spec.in | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index e8126b4..55e368e 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -782,8 +782,8 @@ fi %if %{with_qemu} %dir %attr(0700, root, root) %{_localstatedir}/run/libvirt/qemu/ -%dir %attr(0700, %{qemu_user}, %{qemu_group}) %{_localstatedir}/lib/libvirt/qemu/ -%dir %attr(0700, %{qemu_user}, %{qemu_group}) %{_localstatedir}/cache/libvirt/qemu/ +%dir %attr(0750, %{qemu_user}, %{qemu_group}) %{_localstatedir}/lib/libvirt/qemu/ +%dir %attr(0750, %{qemu_user}, %{qemu_group}) %{_localstatedir}/cache/libvirt/qemu/ %endif %if %{with_lxc} %dir %{_localstatedir}/run/libvirt/lxc/ -- 1.7.1

1 1

[libvirt] RFC: automatic setting of ip_forwarding (or not)
by Laine Stump 18 Oct '10

18 Oct '10

Currently libvirt will turn on net.ipv4.ip_forward by writing "1\n" to /proc/sys/net/ipv4/ip_forward whenever a virtual network of with a forward mode of "nat" or "route" is started. This is problematic for two reasons: 1) /etc/sysctl.conf is not updated with this information, so any other process reprocessing /etc/sysctl.conf (with "sysctl -a -p") will potentially turn ip forward back to 0, leaving libvirt-created virtual networks in a non-working state, and 2) it's possible the administrator turned off ip forwarding on purpose for security reasons, and our silently turning it on leaves them mistakenly believing it is still off. We've discussed a few ways of remedying this situation lately, and I thought I should summarize all the mentioned ideas, and take a poll to try and determine which way we should fix this. 1) Leave it as is. The simplest solution, but has the problems outlines above. 2) Turn it on in the same place, but do it by writing net.ipv4.ip_forward = 1 to /etc/sysctl.conf and calling "sysctl -a -p". This gives us the same behavior as currently, but with the advantages that a) our change to the config is documented in /etc/sysctl.conf and b) virtual networked guests won't suddenly have their network fail when some other process runs "sysconfig -a -p". However, it seems rather drastic to be turning this on every time a virtual network is started, especially without alerting the admin that this has been done. 3) Whenever a virtual network that would require ip_forward = 1 to operate properly is started (ie at libvirtd start time, and when a network is newly defined), check if it's currently on, and if not log a warning message, informing the admin that they should turn on ip_forward in sysctl.conf and reload it in order to have properly working networking. This would assure that the admin was informed of the necessity for ip_forward, but eliminate the possibility of two processes fighting over the setting of ip_forward, leaving it up to the admin to make the decision and do the right thing. On the other hand, it would prevent libvirt's networking from "just working" on a new install. 4) Turn ip_forward on during libvirt install. This one doesn't make sense to me, because you don't know at the time of libvirt install whether or not the installation if going to end up with any virtual networks that need forwarding. 5) Make ip_forward a tunable in /etc/libvirt/libvirtd.conf, and set it accordingly every time libvirtd is started. I don't know if this makes sense either - if you have NATed or routed virtual networks, you will need ip_forward=1 for them to work properly, and if you don't have them, you don't care, so it's really redundant. **** I think the important things to accomplish are: 1) Avoid having networking magically stop working when someone else reloads sysctl.conf 2) Make sure that the admin realizes that ip_forward is being turned on (or needs to be turned on). 3) If we're going to turn it on, at least don't do it if it's not needed. 4) Something else we need to consider is the ability to provision a host for proper guest networking purely through the libvirt API, and if we were to stop turning on ip_forward automatically when a network was started, that wouldn't work anymore (unless ip_forward happened to be turned on already). So, what are your opinions? (BTW, the firewall rules added for virtual networks suffer from a similar problem - because they're loaded into the kernel directly with the iptables command, there is no external record of them, and some other process reloading the firewall will flush out all libvirt's rules, leaving the guests with nonworking networking. But that discussion is a bigger one, that probably needs to go outside just libvirt, so I'll avoid that here...)

6 9

[libvirt] Suggested schedule for next release
by Daniel Veillard 18 Oct '10

18 Oct '10

Last release was 5 weeks ago so this release cycle will be longuer than usual. There was still a number of patches I wanted to get in for next release, but now it might be time to get ready for next release. I suggest to keep until the end of the week for feature patches but enter the feeze during this week-end. That would lead to a 0.8.5 release by Friday 29, getting back to end-of-month release cycles. I'm wondering a bit if the amount of changes at the API level would not be worth a 0.9.0 release instead, Daniel -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel(a)veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/

1 0

[libvirt] Mac OS X: dyld: lazy symbol binding failed
by Mitchell Hashimoto 18 Oct '10

18 Oct '10

Hi, This is a cross-post from libvirt-users since there didn't seem to be anyone there familiar with what is going on and this is a dev issue as well. I'm using the Ruby/FFI libvirt library and getting this consistently on Mac OS X: ruby-1.9.2-p0 > FFI::Libvirt.virInitialize dyld: lazy symbol binding failed: Symbol not found: _virThreadInitialize Referenced from: /usr/local/lib/libvirt.dylib Expected in: flat namespace dyld: Symbol not found: _virThreadInitialize Referenced from: /usr/local/lib/libvirt.dylib Expected in: flat namespace Trace/BPT trap I exported DYLD_PRINT_LIBRARIES and it shows that libvirt.dylib is loaded in the process space, but the above still occurs. When I statically link into a C program it works fine, however. Anyone have any idea what could be causing this? See this archive if you'd like to catch up on what was said in libvirt-users (its not a long thread): https://www.redhat.com/archives/libvirt-users/2010-October/msg00050.html Thanks, Mitchell

5 13

[libvirt] alignment of data fields when compiling with mingwin
by arnaud.champion＠devatom.fr 17 Oct '10

17 Oct '10

?Hi, I'm currently working on libvirt csharp bindings, and I have some trouble with virConnectOpenAuth marshaling. I need to know what is the alignment of data fields in structure when compiling with mingwin. Anyone know that ? cheers, Arnaud Champion

2 7

[libvirt] [PATCH] esx: Handle Windows-1252 encoded VMX files
by Matthias Bolte 16 Oct '10

16 Oct '10

ESX(i) uses UTF-8, but a Windows based GSX server writes Windows-1252 encoded VMX files. --- src/esx/esx_util.c | 48 +++++++++++++++++++++++++++++++++++++++++++++--- src/esx/esx_util.h | 2 ++ src/esx/esx_vmx.c | 33 +++++++++++++++++++++++++++++++++ tests/esxutilstest.c | 41 +++++++++++++++++++++++++++++++++++++++++ 4 files changed, 121 insertions(+), 3 deletions(-) diff --git a/src/esx/esx_util.c b/src/esx/esx_util.c index 5fe72fc..b3c927a 100644 --- a/src/esx/esx_util.c +++ b/src/esx/esx_util.c @@ -612,9 +612,9 @@ esxUtil_ReformatUuid(const char *input, char *output) unsigned char uuid[VIR_UUID_BUFLEN]; if (virUUIDParse(input, uuid) < 0) { - ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, - _("Could not parse UUID from string '%s'"), - input); + ESX_ERROR(VIR_ERR_INTERNAL_ERROR, + _("Could not parse UUID from string '%s'"), + input); return -1; } @@ -819,3 +819,45 @@ esxUtil_EscapeDatastoreItem(const char *string) return escaped2; } + + + +char * +esxUtil_ConvertWindows1252ToUTF8(const char *string) +{ + char *result = NULL; + xmlCharEncodingHandlerPtr handler; + xmlBufferPtr windows1252; + xmlBufferPtr utf8; + + handler = xmlFindCharEncodingHandler("Windows-1252"); + + if (handler == NULL) { + ESX_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", + _("libxml2 doesn't handle Windows-1252 encoding")); + return NULL; + } + + windows1252 = xmlBufferCreateStatic((char *)string, strlen(string)); + utf8 = xmlBufferCreate(); + + if (xmlCharEncInFunc(handler, utf8, windows1252) < 0) { + ESX_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", + _("Could not convert from Windows-1252 to UTF-8 encoding")); + goto cleanup; + } + + result = strdup((const char *)xmlBufferContent(utf8)); + + if (result == NULL) { + virReportOOMError(); + goto cleanup; + } + + cleanup: + xmlCharEncCloseFunc(handler); + xmlBufferFree(windows1252); + xmlBufferFree(utf8); + + return result; +} diff --git a/src/esx/esx_util.h b/src/esx/esx_util.h index 669a4f2..9906459 100644 --- a/src/esx/esx_util.h +++ b/src/esx/esx_util.h @@ -89,4 +89,6 @@ void esxUtil_ReplaceSpecialWindowsPathChars(char *string); char *esxUtil_EscapeDatastoreItem(const char *string); +char *esxUtil_ConvertWindows1252ToUTF8(const char *string); + #endif /* __ESX_UTIL_H__ */ diff --git a/src/esx/esx_vmx.c b/src/esx/esx_vmx.c index 7dc8e60..016cb75 100644 --- a/src/esx/esx_vmx.c +++ b/src/esx/esx_vmx.c @@ -868,6 +868,8 @@ esxVMX_ParseConfig(esxVMX_Context *ctx, virCapsPtr caps, const char *vmx, { bool success = false; virConfPtr conf = NULL; + char *encoding = NULL; + char *utf8; virDomainDefPtr def = NULL; long long config_version = 0; long long virtualHW_version = 0; @@ -895,6 +897,36 @@ esxVMX_ParseConfig(esxVMX_Context *ctx, virCapsPtr caps, const char *vmx, return NULL; } + /* vmx:.encoding */ + if (esxUtil_GetConfigString(conf, ".encoding", &encoding, true) < 0) { + goto cleanup; + } + + if (encoding == NULL || STRCASEEQ(encoding, "UTF-8")) { + /* nothing */ + } else if (STRCASEEQ(encoding, "Windows-1252")) { + virConfFree(conf); + + utf8 = esxUtil_ConvertWindows1252ToUTF8(vmx); + + if (utf8 == NULL) { + goto cleanup; + } + + conf = virConfReadMem(utf8, strlen(utf8), VIR_CONF_FLAG_VMX_FORMAT); + + VIR_FREE(utf8); + + if (conf == NULL) { + goto cleanup; + } + } else { + ESX_ERROR(VIR_ERR_INTERNAL_ERROR, + _("VMX file has unsupported encoding '%s'"), encoding); + goto cleanup; + } + + /* Allocate domain def */ if (VIR_ALLOC(def) < 0) { virReportOOMError(); return NULL; @@ -1359,6 +1391,7 @@ esxVMX_ParseConfig(esxVMX_Context *ctx, virCapsPtr caps, const char *vmx, } virConfFree(conf); + VIR_FREE(encoding); VIR_FREE(sched_cpu_affinity); VIR_FREE(guestOS); diff --git a/tests/esxutilstest.c b/tests/esxutilstest.c index d4042c2..5f3b6f2 100644 --- a/tests/esxutilstest.c +++ b/tests/esxutilstest.c @@ -280,6 +280,46 @@ testEscapeDatastoreItem(const void *data ATTRIBUTE_UNUSED) +struct testWindows1252ToUTF8 { + const char *windows1252; + const char *utf8; +}; + +static struct testWindows1252ToUTF8 windows1252ToUTF8[] = { + { "normal", "normal" }, + { /* "A€Z" */ "A\200Z", "A\342\202\254Z" }, + { /* "Aä1ö2ü3ß4#5~6!7§8/9%Z" */ "A\3441\3662\3743\3374#5~6!7\2478/9%Z", + "A\303\2441\303\2662\303\2743\303\2374#5~6!7\302\2478/9%Z" }, + { /* "hÀÁÂÃÄÅH" */ "h\300\301\302\303\304\305H", + "h\303\200\303\201\303\202\303\203\303\204\303\205H" }, +}; + +static int +testConvertWindows1252ToUTF8(const void *data ATTRIBUTE_UNUSED) +{ + int i; + char *utf8 = NULL; + + for (i = 0; i < ARRAY_CARDINALITY(windows1252ToUTF8); ++i) { + VIR_FREE(utf8); + + utf8 = esxUtil_ConvertWindows1252ToUTF8(windows1252ToUTF8[i].windows1252); + + if (utf8 == NULL) { + return -1; + } + + if (STRNEQ(windows1252ToUTF8[i].utf8, utf8)) { + VIR_FREE(utf8); + return -1; + } + } + + return 0; +} + + + static int mymain(int argc, char **argv) { @@ -312,6 +352,7 @@ mymain(int argc, char **argv) DO_TEST(ParseDatastorePath); DO_TEST(ConvertDateTimeToCalendarTime); DO_TEST(EscapeDatastoreItem); + DO_TEST(ConvertWindows1252ToUTF8); return result == 0 ? EXIT_SUCCESS : EXIT_FAILURE; } -- 1.7.0.4

1 1

[libvirt] KVM Windows guest: add hard drive
by Mihamina Rakotomandimby 16 Oct '10

16 Oct '10

Manao ahoana, Hello, Bonjour, I installed a Windows (XP and 2003) guest using one partition as hard drive. I used: sudo virt-install --connect qemu:///system \ --name win2003-01 \ --ram 1024 \ --keymap=fr \ --disk path=/dev/lvm0/win2003-01 \ --cdrom=/home/mihamina/Windows_2003_Server.iso \ --os-type windows \ --os-variant=win2k3 \ --noapic \ --noacpi \ --network=bridge:br0 \ --accelerate \ --vnc \ --force And this works fine. Really fine. The disk section in the definition: <disk type='block' device='disk'> <source dev='/dev/lvm0/win2003-01'/> <target dev='hda' bus='ide'/> </disk> After installation, people asked me to add another hard drive to this installation, and then, I added another "disk" in the definition: <disk type='block' device='disk'> <source dev='/dev/lvm0/win2003-01'/> <target dev='hda' bus='ide'/> </disk> <disk type='block' device='disk'> <source dev='/dev/lvm0/win2003-01-a'/> <target dev='hdb' bus='ide'/> </disk> I destroyed + undefined + defined + started the VM and the definition is OK (dumpxml), but the Windows guest doesnt see any new hard drive. I already tried with replacing "ide" with "virtio", no new hard drive yet. This is my configuration: mihamina@kvm-lxc-02:~$ dpkg -l | grep "virt" ii kvm 72+dfsg-5~lenny5 Full virtualization on x86 hardware ii libvirt-bin 0.4.6-10 the programs for the libvirt library ii libvirt0 0.4.6-10 library for interfacing with different virtualization systems ii python-libvirt 0.4.6-10 libvirt Python bindings ii virt-manager 0.6.0-6 desktop application for managing virtual machines ii virt-viewer 0.0.3-2 Displaying the graphical console of a virtual machine ii virtinst 0.400.0-7 Programs to create and clone virtual machines How to make, with this, new hard drive recognized by the Windows guest? Misaotra, Thanks, Merci. -- Architecte Informatique chez Blueline/Gulfsat: Administration Systeme, Recherche & Developpement +261 34 56 000 19

4 7

[libvirt] [PATCH] esx: Fix check in esxDomainGetInfo's perf metric handling
by Matthias Bolte 16 Oct '10

16 Oct '10

--- src/esx/esx_driver.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c index 8bc3be2..1b4ee29 100644 --- a/src/esx/esx_driver.c +++ b/src/esx/esx_driver.c @@ -2329,15 +2329,17 @@ esxDomainGetInfo(virDomainPtr domain, virDomainInfoPtr info) perfEntityMetric = esxVI_PerfEntityMetric_DynamicCast(perfEntityMetricBase); - if (perfMetricIntSeries == NULL) { - VIR_ERROR0(_("QueryPerf returned object with unexpected type")); + if (perfEntityMetric == NULL) { + VIR_ERROR(_("QueryPerf returned object with unexpected type '%s'"), + esxVI_Type_ToString(perfEntityMetricBase->_type)); } perfMetricIntSeries = esxVI_PerfMetricIntSeries_DynamicCast(perfEntityMetric->value); if (perfMetricIntSeries == NULL) { - VIR_ERROR0(_("QueryPerf returned object with unexpected type")); + VIR_ERROR(_("QueryPerf returned object with unexpected type '%s'"), + esxVI_Type_ToString(perfEntityMetric->value->_type)); } for (; perfMetricIntSeries != NULL; -- 1.7.0.4

2 2

[libvirt] [PATCH v2] introduce VIR_CLOSE to be used rather than close()
by Stefan Berger 16 Oct '10

16 Oct '10

V2: - following Eric's suggestions and picking up his code suggestions Since bugs due to double-closed file descriptors are difficult to track down in a multi-threaded system, I am introducing the VIR_CLOSE(fd) macro to help avoid mistakes here. There are lots of places where close() is being used. In this patch I am only cleaning up usage of close() in src/conf where the problems were. I also dare to declare close() as being deprecated in libvirt code base (HACKING). Signed-off-by: Stefan Berger <stefanb(a)us.ibm.com> --- HACKING | 17 +++++++++++++ docs/hacking.html.in | 22 +++++++++++++++++ src/Makefile.am | 3 +- src/conf/domain_conf.c | 15 +++++++---- src/conf/network_conf.c | 7 +++-- src/conf/nwfilter_conf.c | 13 ++++------ src/conf/storage_conf.c | 8 +++--- src/conf/storage_encryption_conf.c | 6 +++- src/util/files.c | 47 +++++++++++++++++++++++++++++++++++++ src/util/files.h | 45 +++++++++++++++++++++++++++++++++++ 10 files changed, 161 insertions(+), 22 deletions(-) Index: libvirt-acl/src/util/files.c =================================================================== --- /dev/null +++ libvirt-acl/src/util/files.c @@ -0,0 +1,47 @@ +/* + * memory.c: safer file handling + * + * Copyright (C) 2010 IBM Corporation + * Copyright (C) 2010 Stefan Berger + * Copyright (C) 2010 RedHat, Inc. + * Copyright (C) 2010 Eric Blake + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + */ + +#include <config.h> + +#include <unistd.h> + +#include "files.h" + +int virClose(int *fdptr, bool preserve_errno) +{ + int saved_errno; + int rc; + + if (*fdptr >= 0) { + if (preserve_errno) + saved_errno = errno; + rc = close(*fdptr); + *fdptr = -1; + if (preserve_errno) + errno = saved_errno; + } else + rc = 0; + + return rc; +} Index: libvirt-acl/src/util/files.h =================================================================== --- /dev/null +++ libvirt-acl/src/util/files.h @@ -0,0 +1,45 @@ +/* + * files.h: safer file handling + * + * Copyright (C) 2010 IBM Corporation + * Copyright (C) 2010 Stefan Berger + * Copyright (C) 2010 RedHat, Inc. + * Copyright (C) 2010 Eric Blake + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + */ + + +#ifndef __VIR_FILES_H_ +# define __VIR_FILES_H_ + +# include <stdbool.h> + +# include "internal.h" + + +/* Don't call this directly - use the macros below */ +int virClose(int *fdptr, bool preserve_errno) ATTRIBUTE_RETURN_CHECK; + +/* For use on normal paths; caller must check return value, + and failure sets errno per close(). */ +# define VIR_CLOSE(FD) virClose(&(FD),false) + +/* For use on cleanup paths; errno is unaffected by close, + and no return value to worry about. */ +# define VIR_FORCE_CLOSE(FD) ignore_value (virClose(&(FD),true)) + +#endif /* __VIR_FILES_H */ Index: libvirt-acl/src/Makefile.am =================================================================== --- libvirt-acl.orig/src/Makefile.am +++ libvirt-acl/src/Makefile.am @@ -82,7 +82,8 @@ UTIL_SOURCES = \ util/uuid.c util/uuid.h \ util/util.c util/util.h \ util/xml.c util/xml.h \ - util/virterror.c util/virterror_internal.h + util/virterror.c util/virterror_internal.h \ + util/files.c util/files.h EXTRA_DIST += util/threads-pthread.c util/threads-win32.c Index: libvirt-acl/src/conf/domain_conf.c =================================================================== --- libvirt-acl.orig/src/conf/domain_conf.c +++ libvirt-acl/src/conf/domain_conf.c @@ -46,6 +46,7 @@ #include "nwfilter_conf.h" #include "ignore-value.h" #include "storage_file.h" +#include "files.h" #define VIR_FROM_THIS VIR_FROM_DOMAIN @@ -6798,7 +6799,7 @@ int virDomainSaveXML(const char *configD goto cleanup; } - if (close(fd) < 0) { + if (VIR_CLOSE(fd) < 0) { virReportSystemError(errno, _("cannot save config file '%s'"), configFile); @@ -6807,8 +6808,8 @@ int virDomainSaveXML(const char *configD ret = 0; cleanup: - if (fd != -1) - close(fd); + VIR_FORCE_CLOSE(fd); + VIR_FREE(configFile); return ret; } @@ -7765,10 +7766,14 @@ int virDomainDiskDefForeachPath(virDomai } if (virStorageFileGetMetadataFromFD(path, fd, format, &meta) < 0) { - close(fd); + VIR_FORCE_CLOSE(fd); goto cleanup; } - close(fd); + + if (VIR_CLOSE(fd) < 0) + virReportSystemError(errno, + _("could not close file %s"), + path); if (virHashAddEntry(paths, path, (void*)0x1) < 0) { virReportOOMError(); Index: libvirt-acl/src/conf/nwfilter_conf.c =================================================================== --- libvirt-acl.orig/src/conf/nwfilter_conf.c +++ libvirt-acl/src/conf/nwfilter_conf.c @@ -45,6 +45,8 @@ #include "nwfilter_conf.h" #include "domain_conf.h" #include "c-ctype.h" +#include "files.h" +#include "ignore-value.h" #define VIR_FROM_THIS VIR_FROM_NWFILTER @@ -2193,7 +2195,7 @@ int virNWFilterSaveXML(const char *confi goto cleanup; } - if (close(fd) < 0) { + if (VIR_CLOSE(fd) < 0) { virReportSystemError(errno, _("cannot save config file '%s'"), configFile); @@ -2203,9 +2205,7 @@ int virNWFilterSaveXML(const char *confi ret = 0; cleanup: - if (fd != -1) - close(fd); - + VIR_FORCE_CLOSE(fd); VIR_FREE(configFile); return ret; @@ -2604,7 +2604,7 @@ virNWFilterPoolObjSaveDef(virNWFilterDri goto cleanup; } - if (close(fd) < 0) { + if (VIR_CLOSE(fd) < 0) { virReportSystemError(errno, _("cannot save config file %s"), pool->configFile); @@ -2614,8 +2614,7 @@ virNWFilterPoolObjSaveDef(virNWFilterDri ret = 0; cleanup: - if (fd != -1) - close(fd); + VIR_FORCE_CLOSE(fd); VIR_FREE(xml); Index: libvirt-acl/src/conf/storage_conf.c =================================================================== --- libvirt-acl.orig/src/conf/storage_conf.c +++ libvirt-acl/src/conf/storage_conf.c @@ -43,6 +43,8 @@ #include "buf.h" #include "util.h" #include "memory.h" +#include "files.h" +#include "ignore-value.h" #define VIR_FROM_THIS VIR_FROM_STORAGE @@ -1560,7 +1562,7 @@ virStoragePoolObjSaveDef(virStorageDrive goto cleanup; } - if (close(fd) < 0) { + if (VIR_CLOSE(fd) < 0) { virReportSystemError(errno, _("cannot save config file %s"), pool->configFile); @@ -1570,9 +1572,7 @@ virStoragePoolObjSaveDef(virStorageDrive ret = 0; cleanup: - if (fd != -1) - close(fd); - + VIR_FORCE_CLOSE(fd); VIR_FREE(xml); return ret; Index: libvirt-acl/src/conf/network_conf.c =================================================================== --- libvirt-acl.orig/src/conf/network_conf.c +++ libvirt-acl/src/conf/network_conf.c @@ -43,6 +43,8 @@ #include "util.h" #include "buf.h" #include "c-ctype.h" +#include "files.h" +#include "ignore-value.h" #define MAX_BRIDGE_ID 256 #define VIR_FROM_THIS VIR_FROM_NETWORK @@ -687,7 +689,7 @@ int virNetworkSaveXML(const char *config goto cleanup; } - if (close(fd) < 0) { + if (VIR_CLOSE(fd) < 0) { virReportSystemError(errno, _("cannot save config file '%s'"), configFile); @@ -697,8 +699,7 @@ int virNetworkSaveXML(const char *config ret = 0; cleanup: - if (fd != -1) - close(fd); + VIR_FORCE_CLOSE(fd); VIR_FREE(configFile); Index: libvirt-acl/src/conf/storage_encryption_conf.c =================================================================== --- libvirt-acl.orig/src/conf/storage_encryption_conf.c +++ libvirt-acl/src/conf/storage_encryption_conf.c @@ -35,6 +35,8 @@ #include "xml.h" #include "virterror_internal.h" #include "uuid.h" +#include "files.h" +#include "ignore-value.h" #define VIR_FROM_THIS VIR_FROM_STORAGE @@ -286,12 +288,12 @@ virStorageGenerateQcowPassphrase(unsigne if (r <= 0) { virStorageReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Cannot read from /dev/urandom")); - close(fd); + VIR_FORCE_CLOSE(fd); return -1; } if (dest[i] >= 0x20 && dest[i] <= 0x7E) i++; /* Got an acceptable character */ } - close(fd); + VIR_FORCE_CLOSE(fd); return 0; } Index: libvirt-acl/HACKING =================================================================== --- libvirt-acl.orig/HACKING +++ libvirt-acl/HACKING @@ -318,6 +318,23 @@ routines, use the macros from memory.h VIR_FREE(domain); +File handling +============= + +Use of the close() API is deprecated in libvirt code base to help avoiding +double-closing of a filedescriptor. Instead of this API, use the macro from +files.h + + - eg close a file descriptor + + if (VIR_CLOSE(fd) < 0) { + virReportSystemError(errno, _("failed to close file")); + } + + - eg close a file descriptor in an error path; this function + preserves the error code + + VIR_FORCE_CLOSE(fd) String comparisons ================== Index: libvirt-acl/docs/hacking.html.in =================================================================== --- libvirt-acl.orig/docs/hacking.html.in +++ libvirt-acl/docs/hacking.html.in @@ -389,7 +389,29 @@ </pre></li> </ul> + <h2><a name="file_handling">File handling</a></h2> + <p> + Use of the close() API is deprecated in libvirt code base to help + avoiding double-closing of a filedescriptor. Instead of this API, + use the macro from files.h + </p> + + <ul> + <li><p>eg close a file descriptor</p> + +<pre> + if (VIR_CLOSE(fd) < 0) { + virReportSystemError(errno, _("failed to close file")); + } +</pre></li> + + <li><p>eg close a file descriptor in an error path; this function preserves the error code</p> + +<pre> + VIR_FORCE_CLOSE(fd); +</pre></li> + </ul> <h2><a name="string_comparision">String comparisons</a></h2>

3 6

[libvirt] [RFC PATCH] virsh: new echo command
by Eric Blake 15 Oct '10

15 Oct '10

* tools/virsh.c (cmdEcho): New command. (commands): Add it. (vshCmdOptType): Add VSH_OT_ARGV. (vshCmddefGetData): Special case new opt flag. (vshCommandOptArgv): New function. --- Not complete yet, but this shows what I'm thinking of. Adding the echo command has two benefits: 1. It will let me add unit tests for the recent virsh command line improvements - echo back arbitrary strings to make sure quoting is as desired. This part works with what I have here, before I ran out of time to finish this today. 2. Make it easier for a user on the command line to conver an arbitrary string into something safe for shell evalution and/or XML usage, by munging the input in a way that it can be reused in the desired context. Not yet implemented; hence the RFC. It exploits the fact that "--" is consumed as the end-of-options, hence, there is no way for "" to be recognized as a valid option name, so the only way we can encounter VSH_OT_ARGV is via the new argv handling, at which point we can handle all remaining command line arguments. tools/virsh.c | 88 +++++++++++++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 80 insertions(+), 8 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 89c2e1e..f361658 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -119,11 +119,12 @@ typedef enum { * vshCmdOptType - command option type */ typedef enum { - VSH_OT_NONE = 0, /* none */ - VSH_OT_BOOL, /* boolean option */ - VSH_OT_STRING, /* string option */ - VSH_OT_INT, /* int option */ - VSH_OT_DATA /* string data (as non-option) */ + VSH_OT_NONE = 0, /* none */ + VSH_OT_BOOL, /* boolean option */ + VSH_OT_STRING, /* string option */ + VSH_OT_INT, /* int option */ + VSH_OT_DATA, /* string data (as non-option) */ + VSH_OT_ARGV /* remaining arguments, opt->name should be "" */ } vshCmdOptType; /* @@ -230,6 +231,7 @@ static char *vshCommandOptString(const vshCmd *cmd, const char *name, static long long vshCommandOptLongLong(const vshCmd *cmd, const char *name, int *found); static int vshCommandOptBool(const vshCmd *cmd, const char *name); +static char *vshCommandOptArgv(const vshCmd *cmd, int count); #define VSH_BYID (1 << 1) #define VSH_BYUUID (1 << 2) @@ -8917,6 +8919,54 @@ cmdPwd(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) #endif /* + * "echo" command + */ +static const vshCmdInfo info_echo[] = { + {"help", N_("echo arguments")}, + {"desc", N_("Echo back arguments, possibly with quoting.")}, + {NULL, NULL} +}; + +static const vshCmdOptDef opts_echo[] = { + {"shell", VSH_OT_BOOL, 0, N_("escape for shell use")}, + {"xml", VSH_OT_BOOL, 0, N_("escape for XML use")}, + {"", VSH_OT_ARGV, 0, N_("arguments to echo")}, + {NULL, 0, 0, NULL} +}; + +/* Exists mainly for debugging virsh, but also handy for adding back + * quotes for later evaluation. + */ +static int +cmdEcho (vshControl *ctl ATTRIBUTE_UNUSED, const vshCmd *cmd) +{ + bool shell = false; + bool xml = false; + int count = 0; + char *arg; + virBuffer buf = VIR_BUFFER_INITIALIZER; + + if (vshCommandOptBool(cmd, "shell")) + shell = true; + if (vshCommandOptBool(cmd, "xml")) + xml = true; + + while ((arg = vshCommandOptArgv(cmd, count)) != NULL) { + /* TODO - use buf */ + if (xml) { + /* TODO - use virBufferEscapeString */ + } + if (shell) { + /* TODO - add '' and escape embedded ' */ + } + vshPrint(ctl, "%s%s", count ? " " : "", arg); + count++; + } + + return TRUE; +} + +/* * "edit" command */ static const vshCmdInfo info_edit[] = { @@ -9545,6 +9595,7 @@ static const vshCmdDef commands[] = { {"domxml-from-native", cmdDomXMLFromNative, opts_domxmlfromnative, info_domxmlfromnative}, {"domxml-to-native", cmdDomXMLToNative, opts_domxmltonative, info_domxmltonative}, {"dumpxml", cmdDumpXML, opts_dumpxml, info_dumpxml}, + {"echo", cmdEcho, opts_echo, info_echo}, {"edit", cmdEdit, opts_edit, info_edit}, {"find-storage-pool-sources", cmdPoolDiscoverSources, opts_find_storage_pool_sources, info_find_storage_pool_sources}, @@ -9707,8 +9758,8 @@ vshCmddefGetData(const vshCmdDef * cmd, int data_ct) const vshCmdOptDef *opt; for (opt = cmd->opts; opt && opt->name; opt++) { - if (opt->type == VSH_OT_DATA) { - if (data_ct == 0) + if (opt->type >= VSH_OT_DATA) { + if (data_ct == 0 || opt->type == VSH_OT_ARGV) return opt; else data_ct--; @@ -9970,6 +10021,27 @@ vshCommandOptBool(const vshCmd *cmd, const char *name) return vshCommandOpt(cmd, name) ? TRUE : FALSE; } +/* + * Returns the COUNT argv argument, or NULL after last argument. + * + * Requires that a VSH_OT_ARGV option with the name "" be last in the + * list of supported options in CMD->def->opts. + */ +static char * +vshCommandOptArgv(const vshCmd *cmd, int count) +{ + vshCmdOpt *opt = cmd->opts; + + while (opt) { + if (opt->def && opt->def->type == VSH_OT_ARGV) { + if (count-- == 0) + return opt->data; + } + opt = opt->next; + } + return NULL; +} + /* Determine whether CMD->opts includes an option with name OPTNAME. If not, give a diagnostic and return false. If so, return true. */ -- 1.7.2.3

3 8

[libvirt] [PATCH] introduce VIR_CLOSE to be used rather than close()
by Stefan Berger 15 Oct '10

15 Oct '10

Since bugs due to double-closed filedescriptors are difficult to track down in a multi-threaded system, I am introducing the VIR_CLOSE(fd) macro to help avoid mistakes here. There are lots of places where close() is being used. In this patch I am only cleaning up usage of close() in src/conf where the problems were. I also dare to declare close() as being deprecated in libvirt code base (HACKING). :-) Signed-off-by: Stefan Berger <stefanb(a)us.ibm.com> --- HACKING | 11 +++++++++++ src/Makefile.am | 3 ++- src/conf/domain_conf.c | 14 ++++++++------ src/conf/network_conf.c | 9 +++++---- src/conf/nwfilter_conf.c | 17 +++++++++-------- src/conf/storage_conf.c | 9 +++++---- src/conf/storage_encryption_conf.c | 5 +++-- src/util/files.c | 37 +++++++++++++++++++++++++++++++++++++ src/util/files.h | 37 +++++++++++++++++++++++++++++++++++++ 9 files changed, 117 insertions(+), 25 deletions(-) Index: libvirt-acl/src/util/files.c =================================================================== --- /dev/null +++ libvirt-acl/src/util/files.c @@ -0,0 +1,37 @@ +/* + * memory.c: safer file handling + * + * Copyright (C) 2010 IBM Corporation + * Copyright (C) 2010 Stefan Berger + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + */ + +#include <unistd.h> + +#include "files.h" + +int virClose(int *fdptr) +{ + int rc; + + if (*fdptr >= 0) { + rc = close(*fdptr); + *fdptr = -1; + } else + rc = 0; + return rc; +} Index: libvirt-acl/src/util/files.h =================================================================== --- /dev/null +++ libvirt-acl/src/util/files.h @@ -0,0 +1,37 @@ +/* + * files.h: safer file handling + * + * Copyright (C) 2010 IBM Corporation + * Copyright (C) 2010 Stefan Berger + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + */ + + +#ifndef __VIR_FILES_H_ +# define __VIR_FILES_H_ + +# include "internal.h" + +/* Don't call these directly - use the macros below */ +int virClose(int *fdptr); + +# define VIR_CLOSE(FD) \ + virClose(&(FD)) + + +#endif /* __VIR_FILES_H */ + Index: libvirt-acl/src/Makefile.am =================================================================== --- libvirt-acl.orig/src/Makefile.am +++ libvirt-acl/src/Makefile.am @@ -82,7 +82,8 @@ UTIL_SOURCES = \ util/uuid.c util/uuid.h \ util/util.c util/util.h \ util/xml.c util/xml.h \ - util/virterror.c util/virterror_internal.h + util/virterror.c util/virterror_internal.h \ + util/files.c util/files.h EXTRA_DIST += util/threads-pthread.c util/threads-win32.c Index: libvirt-acl/src/conf/domain_conf.c =================================================================== --- libvirt-acl.orig/src/conf/domain_conf.c +++ libvirt-acl/src/conf/domain_conf.c @@ -46,6 +46,7 @@ #include "nwfilter_conf.h" #include "ignore-value.h" #include "storage_file.h" +#include "files.h" #define VIR_FROM_THIS VIR_FROM_DOMAIN @@ -6798,17 +6799,18 @@ int virDomainSaveXML(const char *configD goto cleanup; } - if (close(fd) < 0) { + if (VIR_CLOSE(fd) < 0) { virReportSystemError(errno, _("cannot save config file '%s'"), configFile); - goto cleanup; + goto cleanup_free; } ret = 0; cleanup: - if (fd != -1) - close(fd); + VIR_CLOSE(fd); + + cleanup_free: VIR_FREE(configFile); return ret; } @@ -7765,10 +7767,10 @@ int virDomainDiskDefForeachPath(virDomai } if (virStorageFileGetMetadataFromFD(path, fd, format, &meta) < 0) { - close(fd); + VIR_CLOSE(fd); goto cleanup; } - close(fd); + VIR_CLOSE(fd); if (virHashAddEntry(paths, path, (void*)0x1) < 0) { virReportOOMError(); Index: libvirt-acl/src/conf/nwfilter_conf.c =================================================================== --- libvirt-acl.orig/src/conf/nwfilter_conf.c +++ libvirt-acl/src/conf/nwfilter_conf.c @@ -45,6 +45,7 @@ #include "nwfilter_conf.h" #include "domain_conf.h" #include "c-ctype.h" +#include "files.h" #define VIR_FROM_THIS VIR_FROM_NWFILTER @@ -2193,19 +2194,19 @@ int virNWFilterSaveXML(const char *confi goto cleanup; } - if (close(fd) < 0) { + if (VIR_CLOSE(fd) < 0) { virReportSystemError(errno, _("cannot save config file '%s'"), configFile); - goto cleanup; + goto cleanup_free; } ret = 0; cleanup: - if (fd != -1) - close(fd); + VIR_CLOSE(fd); + cleanup_free: VIR_FREE(configFile); return ret; @@ -2604,19 +2605,19 @@ virNWFilterPoolObjSaveDef(virNWFilterDri goto cleanup; } - if (close(fd) < 0) { + if (VIR_CLOSE(fd) < 0) { virReportSystemError(errno, _("cannot save config file %s"), pool->configFile); - goto cleanup; + goto cleanup_free; } ret = 0; cleanup: - if (fd != -1) - close(fd); + VIR_CLOSE(fd); + cleanup_free: VIR_FREE(xml); return ret; Index: libvirt-acl/src/conf/storage_conf.c =================================================================== --- libvirt-acl.orig/src/conf/storage_conf.c +++ libvirt-acl/src/conf/storage_conf.c @@ -43,6 +43,7 @@ #include "buf.h" #include "util.h" #include "memory.h" +#include "files.h" #define VIR_FROM_THIS VIR_FROM_STORAGE @@ -1560,19 +1561,19 @@ virStoragePoolObjSaveDef(virStorageDrive goto cleanup; } - if (close(fd) < 0) { + if (VIR_CLOSE(fd) < 0) { virReportSystemError(errno, _("cannot save config file %s"), pool->configFile); - goto cleanup; + goto cleanup_free; } ret = 0; cleanup: - if (fd != -1) - close(fd); + VIR_CLOSE(fd); + cleanup_free: VIR_FREE(xml); return ret; Index: libvirt-acl/src/conf/network_conf.c =================================================================== --- libvirt-acl.orig/src/conf/network_conf.c +++ libvirt-acl/src/conf/network_conf.c @@ -43,6 +43,7 @@ #include "util.h" #include "buf.h" #include "c-ctype.h" +#include "files.h" #define MAX_BRIDGE_ID 256 #define VIR_FROM_THIS VIR_FROM_NETWORK @@ -687,19 +688,19 @@ int virNetworkSaveXML(const char *config goto cleanup; } - if (close(fd) < 0) { + if (VIR_CLOSE(fd) < 0) { virReportSystemError(errno, _("cannot save config file '%s'"), configFile); - goto cleanup; + goto cleanup_free; } ret = 0; cleanup: - if (fd != -1) - close(fd); + VIR_CLOSE(fd); + cleanup_free: VIR_FREE(configFile); return ret; Index: libvirt-acl/src/conf/storage_encryption_conf.c =================================================================== --- libvirt-acl.orig/src/conf/storage_encryption_conf.c +++ libvirt-acl/src/conf/storage_encryption_conf.c @@ -35,6 +35,7 @@ #include "xml.h" #include "virterror_internal.h" #include "uuid.h" +#include "files.h" #define VIR_FROM_THIS VIR_FROM_STORAGE @@ -286,12 +287,12 @@ virStorageGenerateQcowPassphrase(unsigne if (r <= 0) { virStorageReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Cannot read from /dev/urandom")); - close(fd); + VIR_CLOSE(fd); return -1; } if (dest[i] >= 0x20 && dest[i] <= 0x7E) i++; /* Got an acceptable character */ } - close(fd); + VIR_CLOSE(fd); return 0; } Index: libvirt-acl/HACKING =================================================================== --- libvirt-acl.orig/HACKING +++ libvirt-acl/HACKING @@ -318,6 +318,17 @@ routines, use the macros from memory.h VIR_FREE(domain); +File handling +============= + +Use of the close() API is deprecated in libvirt code base to help avoiding +double-closing of a filedescriptor. Instead of this API, use the macro from +files.h + + - eg close a filedescriptor + + VIR_CLOSE(fd); + String comparisons ==================

4 9

[libvirt] [PATCH] docs: document how to disable memballoon
by Eric Blake 15 Oct '10

15 Oct '10

https://bugzilla.redhat.com/show_bug.cgi?id=623903 documents a qemu bug that causes libvirt to hang if virt-manager happens to be querying balloon info when a guest is paused. Until the qemu bug is fixed, people need to know how to avoid the issue. * docs/formatdomain.html.in (Memory balloon device): Mention model='none'. --- docs/formatdomain.html.in | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 8ec7446..a4821e1 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -1646,6 +1646,9 @@ qemu-kvm -net nic,model=? /dev/null need to explicitly add this element in the guest XML unless a specific PCI slot needs to be assigned. <span class="since">Since 0.8.3, Xen, QEMU and KVM only</span> + Additionally, <span class="since">since 0.8.4</span>, if the + memballoon device needs to be explicitly disabled, + <code>model='none'</code> may be used. </p> <p> -- 1.7.2.3

2 2

[libvirt] [PATCH] esx: Explictly declare VMX file content as UTF-8
by Matthias Bolte 15 Oct '10

15 Oct '10

--- src/esx/esx_vmx.c | 3 +++ tests/xml2vmxdata/xml2vmx-annotation.vmx | 1 + tests/xml2vmxdata/xml2vmx-cdrom-ide-device.vmx | 1 + tests/xml2vmxdata/xml2vmx-cdrom-ide-file.vmx | 1 + tests/xml2vmxdata/xml2vmx-cdrom-scsi-device.vmx | 1 + tests/xml2vmxdata/xml2vmx-cdrom-scsi-file.vmx | 1 + tests/xml2vmxdata/xml2vmx-esx-in-the-wild-1.vmx | 1 + tests/xml2vmxdata/xml2vmx-esx-in-the-wild-2.vmx | 1 + tests/xml2vmxdata/xml2vmx-esx-in-the-wild-3.vmx | 1 + tests/xml2vmxdata/xml2vmx-esx-in-the-wild-4.vmx | 1 + tests/xml2vmxdata/xml2vmx-ethernet-bridged.vmx | 1 + tests/xml2vmxdata/xml2vmx-ethernet-custom.vmx | 1 + tests/xml2vmxdata/xml2vmx-ethernet-e1000.vmx | 1 + tests/xml2vmxdata/xml2vmx-ethernet-generated.vmx | 1 + tests/xml2vmxdata/xml2vmx-ethernet-other.vmx | 1 + tests/xml2vmxdata/xml2vmx-ethernet-static.vmx | 1 + tests/xml2vmxdata/xml2vmx-ethernet-vmxnet2.vmx | 1 + tests/xml2vmxdata/xml2vmx-ethernet-vpx.vmx | 1 + tests/xml2vmxdata/xml2vmx-floppy-device.vmx | 1 + tests/xml2vmxdata/xml2vmx-floppy-file.vmx | 1 + tests/xml2vmxdata/xml2vmx-graphics-vnc.vmx | 1 + tests/xml2vmxdata/xml2vmx-gsx-in-the-wild-1.vmx | 1 + tests/xml2vmxdata/xml2vmx-gsx-in-the-wild-2.vmx | 1 + tests/xml2vmxdata/xml2vmx-gsx-in-the-wild-3.vmx | 1 + tests/xml2vmxdata/xml2vmx-gsx-in-the-wild-4.vmx | 1 + tests/xml2vmxdata/xml2vmx-harddisk-ide-file.vmx | 1 + tests/xml2vmxdata/xml2vmx-harddisk-scsi-file.vmx | 1 + tests/xml2vmxdata/xml2vmx-minimal-64bit.vmx | 1 + tests/xml2vmxdata/xml2vmx-minimal.vmx | 1 + tests/xml2vmxdata/xml2vmx-parallel-device.vmx | 1 + tests/xml2vmxdata/xml2vmx-parallel-file.vmx | 1 + tests/xml2vmxdata/xml2vmx-scsi-driver.vmx | 1 + tests/xml2vmxdata/xml2vmx-scsi-writethrough.vmx | 1 + tests/xml2vmxdata/xml2vmx-serial-device.vmx | 1 + tests/xml2vmxdata/xml2vmx-serial-file.vmx | 1 + .../xml2vmxdata/xml2vmx-serial-network-client.vmx | 1 + .../xml2vmxdata/xml2vmx-serial-network-server.vmx | 1 + tests/xml2vmxdata/xml2vmx-serial-pipe.vmx | 1 + 38 files changed, 40 insertions(+), 0 deletions(-) diff --git a/src/esx/esx_vmx.c b/src/esx/esx_vmx.c index e17e1e7..7dc8e60 100644 --- a/src/esx/esx_vmx.c +++ b/src/esx/esx_vmx.c @@ -2475,6 +2475,9 @@ esxVMX_FormatConfig(esxVMX_Context *ctx, virCapsPtr caps, virDomainDefPtr def, return NULL; } + /* vmx:.encoding */ + virBufferAddLit(&buffer, ".encoding = \"UTF-8\"\n"); + /* vmx:config.version */ virBufferAddLit(&buffer, "config.version = \"8\"\n"); diff --git a/tests/xml2vmxdata/xml2vmx-annotation.vmx b/tests/xml2vmxdata/xml2vmx-annotation.vmx index 5754c31..3a3e0c9 100644 --- a/tests/xml2vmxdata/xml2vmx-annotation.vmx +++ b/tests/xml2vmxdata/xml2vmx-annotation.vmx @@ -1,3 +1,4 @@ +.encoding = "UTF-8" config.version = "8" virtualHW.version = "4" guestOS = "other" diff --git a/tests/xml2vmxdata/xml2vmx-cdrom-ide-device.vmx b/tests/xml2vmxdata/xml2vmx-cdrom-ide-device.vmx index 2db1bcb..13b91b4 100644 --- a/tests/xml2vmxdata/xml2vmx-cdrom-ide-device.vmx +++ b/tests/xml2vmxdata/xml2vmx-cdrom-ide-device.vmx @@ -1,3 +1,4 @@ +.encoding = "UTF-8" config.version = "8" virtualHW.version = "4" guestOS = "other" diff --git a/tests/xml2vmxdata/xml2vmx-cdrom-ide-file.vmx b/tests/xml2vmxdata/xml2vmx-cdrom-ide-file.vmx index 1adf995..d9b602d 100644 --- a/tests/xml2vmxdata/xml2vmx-cdrom-ide-file.vmx +++ b/tests/xml2vmxdata/xml2vmx-cdrom-ide-file.vmx @@ -1,3 +1,4 @@ +.encoding = "UTF-8" config.version = "8" virtualHW.version = "4" guestOS = "other" diff --git a/tests/xml2vmxdata/xml2vmx-cdrom-scsi-device.vmx b/tests/xml2vmxdata/xml2vmx-cdrom-scsi-device.vmx index d7f1201..705b31b 100644 --- a/tests/xml2vmxdata/xml2vmx-cdrom-scsi-device.vmx +++ b/tests/xml2vmxdata/xml2vmx-cdrom-scsi-device.vmx @@ -1,3 +1,4 @@ +.encoding = "UTF-8" config.version = "8" virtualHW.version = "4" guestOS = "other" diff --git a/tests/xml2vmxdata/xml2vmx-cdrom-scsi-file.vmx b/tests/xml2vmxdata/xml2vmx-cdrom-scsi-file.vmx index bc6d0f7..178f1e1 100644 --- a/tests/xml2vmxdata/xml2vmx-cdrom-scsi-file.vmx +++ b/tests/xml2vmxdata/xml2vmx-cdrom-scsi-file.vmx @@ -1,3 +1,4 @@ +.encoding = "UTF-8" config.version = "8" virtualHW.version = "4" guestOS = "other" diff --git a/tests/xml2vmxdata/xml2vmx-esx-in-the-wild-1.vmx b/tests/xml2vmxdata/xml2vmx-esx-in-the-wild-1.vmx index 5e78a3b..e72ca80 100644 --- a/tests/xml2vmxdata/xml2vmx-esx-in-the-wild-1.vmx +++ b/tests/xml2vmxdata/xml2vmx-esx-in-the-wild-1.vmx @@ -1,3 +1,4 @@ +.encoding = "UTF-8" config.version = "8" virtualHW.version = "4" guestOS = "other" diff --git a/tests/xml2vmxdata/xml2vmx-esx-in-the-wild-2.vmx b/tests/xml2vmxdata/xml2vmx-esx-in-the-wild-2.vmx index 44db410..68f069b 100644 --- a/tests/xml2vmxdata/xml2vmx-esx-in-the-wild-2.vmx +++ b/tests/xml2vmxdata/xml2vmx-esx-in-the-wild-2.vmx @@ -1,3 +1,4 @@ +.encoding = "UTF-8" config.version = "8" virtualHW.version = "4" guestOS = "other-64" diff --git a/tests/xml2vmxdata/xml2vmx-esx-in-the-wild-3.vmx b/tests/xml2vmxdata/xml2vmx-esx-in-the-wild-3.vmx index 5bdf40b..e09c694 100644 --- a/tests/xml2vmxdata/xml2vmx-esx-in-the-wild-3.vmx +++ b/tests/xml2vmxdata/xml2vmx-esx-in-the-wild-3.vmx @@ -1,3 +1,4 @@ +.encoding = "UTF-8" config.version = "8" virtualHW.version = "4" guestOS = "other-64" diff --git a/tests/xml2vmxdata/xml2vmx-esx-in-the-wild-4.vmx b/tests/xml2vmxdata/xml2vmx-esx-in-the-wild-4.vmx index 7decab6..627fcfb 100644 --- a/tests/xml2vmxdata/xml2vmx-esx-in-the-wild-4.vmx +++ b/tests/xml2vmxdata/xml2vmx-esx-in-the-wild-4.vmx @@ -1,3 +1,4 @@ +.encoding = "UTF-8" config.version = "8" virtualHW.version = "4" guestOS = "other" diff --git a/tests/xml2vmxdata/xml2vmx-ethernet-bridged.vmx b/tests/xml2vmxdata/xml2vmx-ethernet-bridged.vmx index 7d8e59b..6effe4a 100644 --- a/tests/xml2vmxdata/xml2vmx-ethernet-bridged.vmx +++ b/tests/xml2vmxdata/xml2vmx-ethernet-bridged.vmx @@ -1,3 +1,4 @@ +.encoding = "UTF-8" config.version = "8" virtualHW.version = "4" guestOS = "other" diff --git a/tests/xml2vmxdata/xml2vmx-ethernet-custom.vmx b/tests/xml2vmxdata/xml2vmx-ethernet-custom.vmx index 2b96c40..ad4f1d6 100644 --- a/tests/xml2vmxdata/xml2vmx-ethernet-custom.vmx +++ b/tests/xml2vmxdata/xml2vmx-ethernet-custom.vmx @@ -1,3 +1,4 @@ +.encoding = "UTF-8" config.version = "8" virtualHW.version = "4" guestOS = "other" diff --git a/tests/xml2vmxdata/xml2vmx-ethernet-e1000.vmx b/tests/xml2vmxdata/xml2vmx-ethernet-e1000.vmx index fb3c755..0c56810 100644 --- a/tests/xml2vmxdata/xml2vmx-ethernet-e1000.vmx +++ b/tests/xml2vmxdata/xml2vmx-ethernet-e1000.vmx @@ -1,3 +1,4 @@ +.encoding = "UTF-8" config.version = "8" virtualHW.version = "4" guestOS = "other" diff --git a/tests/xml2vmxdata/xml2vmx-ethernet-generated.vmx b/tests/xml2vmxdata/xml2vmx-ethernet-generated.vmx index 3c0aa9e..4f5c47b 100644 --- a/tests/xml2vmxdata/xml2vmx-ethernet-generated.vmx +++ b/tests/xml2vmxdata/xml2vmx-ethernet-generated.vmx @@ -1,3 +1,4 @@ +.encoding = "UTF-8" config.version = "8" virtualHW.version = "4" guestOS = "other" diff --git a/tests/xml2vmxdata/xml2vmx-ethernet-other.vmx b/tests/xml2vmxdata/xml2vmx-ethernet-other.vmx index 017cd0b..dd4caa4 100644 --- a/tests/xml2vmxdata/xml2vmx-ethernet-other.vmx +++ b/tests/xml2vmxdata/xml2vmx-ethernet-other.vmx @@ -1,3 +1,4 @@ +.encoding = "UTF-8" config.version = "8" virtualHW.version = "4" guestOS = "other" diff --git a/tests/xml2vmxdata/xml2vmx-ethernet-static.vmx b/tests/xml2vmxdata/xml2vmx-ethernet-static.vmx index a8a2ffb..7d41239 100644 --- a/tests/xml2vmxdata/xml2vmx-ethernet-static.vmx +++ b/tests/xml2vmxdata/xml2vmx-ethernet-static.vmx @@ -1,3 +1,4 @@ +.encoding = "UTF-8" config.version = "8" virtualHW.version = "4" guestOS = "other" diff --git a/tests/xml2vmxdata/xml2vmx-ethernet-vmxnet2.vmx b/tests/xml2vmxdata/xml2vmx-ethernet-vmxnet2.vmx index 27b302f..807040b 100644 --- a/tests/xml2vmxdata/xml2vmx-ethernet-vmxnet2.vmx +++ b/tests/xml2vmxdata/xml2vmx-ethernet-vmxnet2.vmx @@ -1,3 +1,4 @@ +.encoding = "UTF-8" config.version = "8" virtualHW.version = "4" guestOS = "other" diff --git a/tests/xml2vmxdata/xml2vmx-ethernet-vpx.vmx b/tests/xml2vmxdata/xml2vmx-ethernet-vpx.vmx index f9a0112..dd9ae8d 100644 --- a/tests/xml2vmxdata/xml2vmx-ethernet-vpx.vmx +++ b/tests/xml2vmxdata/xml2vmx-ethernet-vpx.vmx @@ -1,3 +1,4 @@ +.encoding = "UTF-8" config.version = "8" virtualHW.version = "4" guestOS = "other" diff --git a/tests/xml2vmxdata/xml2vmx-floppy-device.vmx b/tests/xml2vmxdata/xml2vmx-floppy-device.vmx index b0bb348..add97cf 100644 --- a/tests/xml2vmxdata/xml2vmx-floppy-device.vmx +++ b/tests/xml2vmxdata/xml2vmx-floppy-device.vmx @@ -1,3 +1,4 @@ +.encoding = "UTF-8" config.version = "8" virtualHW.version = "4" guestOS = "other" diff --git a/tests/xml2vmxdata/xml2vmx-floppy-file.vmx b/tests/xml2vmxdata/xml2vmx-floppy-file.vmx index 22a7e03..11ffb01 100644 --- a/tests/xml2vmxdata/xml2vmx-floppy-file.vmx +++ b/tests/xml2vmxdata/xml2vmx-floppy-file.vmx @@ -1,3 +1,4 @@ +.encoding = "UTF-8" config.version = "8" virtualHW.version = "4" guestOS = "other" diff --git a/tests/xml2vmxdata/xml2vmx-graphics-vnc.vmx b/tests/xml2vmxdata/xml2vmx-graphics-vnc.vmx index f233e7b..caab06a 100644 --- a/tests/xml2vmxdata/xml2vmx-graphics-vnc.vmx +++ b/tests/xml2vmxdata/xml2vmx-graphics-vnc.vmx @@ -1,3 +1,4 @@ +.encoding = "UTF-8" config.version = "8" virtualHW.version = "4" guestOS = "other" diff --git a/tests/xml2vmxdata/xml2vmx-gsx-in-the-wild-1.vmx b/tests/xml2vmxdata/xml2vmx-gsx-in-the-wild-1.vmx index 3ad8a94..48476d6 100644 --- a/tests/xml2vmxdata/xml2vmx-gsx-in-the-wild-1.vmx +++ b/tests/xml2vmxdata/xml2vmx-gsx-in-the-wild-1.vmx @@ -1,3 +1,4 @@ +.encoding = "UTF-8" config.version = "8" virtualHW.version = "4" guestOS = "other" diff --git a/tests/xml2vmxdata/xml2vmx-gsx-in-the-wild-2.vmx b/tests/xml2vmxdata/xml2vmx-gsx-in-the-wild-2.vmx index 88dac5d..757083a 100644 --- a/tests/xml2vmxdata/xml2vmx-gsx-in-the-wild-2.vmx +++ b/tests/xml2vmxdata/xml2vmx-gsx-in-the-wild-2.vmx @@ -1,3 +1,4 @@ +.encoding = "UTF-8" config.version = "8" virtualHW.version = "4" guestOS = "other" diff --git a/tests/xml2vmxdata/xml2vmx-gsx-in-the-wild-3.vmx b/tests/xml2vmxdata/xml2vmx-gsx-in-the-wild-3.vmx index 06eac3a..74cd47d 100644 --- a/tests/xml2vmxdata/xml2vmx-gsx-in-the-wild-3.vmx +++ b/tests/xml2vmxdata/xml2vmx-gsx-in-the-wild-3.vmx @@ -1,3 +1,4 @@ +.encoding = "UTF-8" config.version = "8" virtualHW.version = "4" guestOS = "other" diff --git a/tests/xml2vmxdata/xml2vmx-gsx-in-the-wild-4.vmx b/tests/xml2vmxdata/xml2vmx-gsx-in-the-wild-4.vmx index 718ac48..c9da229 100644 --- a/tests/xml2vmxdata/xml2vmx-gsx-in-the-wild-4.vmx +++ b/tests/xml2vmxdata/xml2vmx-gsx-in-the-wild-4.vmx @@ -1,3 +1,4 @@ +.encoding = "UTF-8" config.version = "8" virtualHW.version = "4" guestOS = "other" diff --git a/tests/xml2vmxdata/xml2vmx-harddisk-ide-file.vmx b/tests/xml2vmxdata/xml2vmx-harddisk-ide-file.vmx index daff969..700b242 100644 --- a/tests/xml2vmxdata/xml2vmx-harddisk-ide-file.vmx +++ b/tests/xml2vmxdata/xml2vmx-harddisk-ide-file.vmx @@ -1,3 +1,4 @@ +.encoding = "UTF-8" config.version = "8" virtualHW.version = "4" guestOS = "other" diff --git a/tests/xml2vmxdata/xml2vmx-harddisk-scsi-file.vmx b/tests/xml2vmxdata/xml2vmx-harddisk-scsi-file.vmx index 150aeaf..95b9cf3 100644 --- a/tests/xml2vmxdata/xml2vmx-harddisk-scsi-file.vmx +++ b/tests/xml2vmxdata/xml2vmx-harddisk-scsi-file.vmx @@ -1,3 +1,4 @@ +.encoding = "UTF-8" config.version = "8" virtualHW.version = "4" guestOS = "other" diff --git a/tests/xml2vmxdata/xml2vmx-minimal-64bit.vmx b/tests/xml2vmxdata/xml2vmx-minimal-64bit.vmx index a1118de..b5eef75 100644 --- a/tests/xml2vmxdata/xml2vmx-minimal-64bit.vmx +++ b/tests/xml2vmxdata/xml2vmx-minimal-64bit.vmx @@ -1,3 +1,4 @@ +.encoding = "UTF-8" config.version = "8" virtualHW.version = "4" guestOS = "other-64" diff --git a/tests/xml2vmxdata/xml2vmx-minimal.vmx b/tests/xml2vmxdata/xml2vmx-minimal.vmx index 38004f8..3aba6d6 100644 --- a/tests/xml2vmxdata/xml2vmx-minimal.vmx +++ b/tests/xml2vmxdata/xml2vmx-minimal.vmx @@ -1,3 +1,4 @@ +.encoding = "UTF-8" config.version = "8" virtualHW.version = "4" guestOS = "other" diff --git a/tests/xml2vmxdata/xml2vmx-parallel-device.vmx b/tests/xml2vmxdata/xml2vmx-parallel-device.vmx index 065cf1d..4da65f6 100644 --- a/tests/xml2vmxdata/xml2vmx-parallel-device.vmx +++ b/tests/xml2vmxdata/xml2vmx-parallel-device.vmx @@ -1,3 +1,4 @@ +.encoding = "UTF-8" config.version = "8" virtualHW.version = "4" guestOS = "other" diff --git a/tests/xml2vmxdata/xml2vmx-parallel-file.vmx b/tests/xml2vmxdata/xml2vmx-parallel-file.vmx index d46de16..0618109 100644 --- a/tests/xml2vmxdata/xml2vmx-parallel-file.vmx +++ b/tests/xml2vmxdata/xml2vmx-parallel-file.vmx @@ -1,3 +1,4 @@ +.encoding = "UTF-8" config.version = "8" virtualHW.version = "4" guestOS = "other" diff --git a/tests/xml2vmxdata/xml2vmx-scsi-driver.vmx b/tests/xml2vmxdata/xml2vmx-scsi-driver.vmx index b58dbe6..0b03634 100644 --- a/tests/xml2vmxdata/xml2vmx-scsi-driver.vmx +++ b/tests/xml2vmxdata/xml2vmx-scsi-driver.vmx @@ -1,3 +1,4 @@ +.encoding = "UTF-8" config.version = "8" virtualHW.version = "4" guestOS = "other" diff --git a/tests/xml2vmxdata/xml2vmx-scsi-writethrough.vmx b/tests/xml2vmxdata/xml2vmx-scsi-writethrough.vmx index 9b08c57..ef6b07a 100644 --- a/tests/xml2vmxdata/xml2vmx-scsi-writethrough.vmx +++ b/tests/xml2vmxdata/xml2vmx-scsi-writethrough.vmx @@ -1,3 +1,4 @@ +.encoding = "UTF-8" config.version = "8" virtualHW.version = "4" guestOS = "other" diff --git a/tests/xml2vmxdata/xml2vmx-serial-device.vmx b/tests/xml2vmxdata/xml2vmx-serial-device.vmx index 2f86e83..940e82c 100644 --- a/tests/xml2vmxdata/xml2vmx-serial-device.vmx +++ b/tests/xml2vmxdata/xml2vmx-serial-device.vmx @@ -1,3 +1,4 @@ +.encoding = "UTF-8" config.version = "8" virtualHW.version = "4" guestOS = "other" diff --git a/tests/xml2vmxdata/xml2vmx-serial-file.vmx b/tests/xml2vmxdata/xml2vmx-serial-file.vmx index aae79f1..11c1194 100644 --- a/tests/xml2vmxdata/xml2vmx-serial-file.vmx +++ b/tests/xml2vmxdata/xml2vmx-serial-file.vmx @@ -1,3 +1,4 @@ +.encoding = "UTF-8" config.version = "8" virtualHW.version = "4" guestOS = "other" diff --git a/tests/xml2vmxdata/xml2vmx-serial-network-client.vmx b/tests/xml2vmxdata/xml2vmx-serial-network-client.vmx index d10f403..00ed186 100644 --- a/tests/xml2vmxdata/xml2vmx-serial-network-client.vmx +++ b/tests/xml2vmxdata/xml2vmx-serial-network-client.vmx @@ -1,3 +1,4 @@ +.encoding = "UTF-8" config.version = "8" virtualHW.version = "7" guestOS = "other" diff --git a/tests/xml2vmxdata/xml2vmx-serial-network-server.vmx b/tests/xml2vmxdata/xml2vmx-serial-network-server.vmx index b5d77f4..ff2384f 100644 --- a/tests/xml2vmxdata/xml2vmx-serial-network-server.vmx +++ b/tests/xml2vmxdata/xml2vmx-serial-network-server.vmx @@ -1,3 +1,4 @@ +.encoding = "UTF-8" config.version = "8" virtualHW.version = "7" guestOS = "other" diff --git a/tests/xml2vmxdata/xml2vmx-serial-pipe.vmx b/tests/xml2vmxdata/xml2vmx-serial-pipe.vmx index 64462f6..ce6a356 100644 --- a/tests/xml2vmxdata/xml2vmx-serial-pipe.vmx +++ b/tests/xml2vmxdata/xml2vmx-serial-pipe.vmx @@ -1,3 +1,4 @@ +.encoding = "UTF-8" config.version = "8" virtualHW.version = "4" guestOS = "other" -- 1.7.0.4

2 2

[libvirt] [PATCH] Fix warning about a non-literal format string in qemu_driver.c
by Laine Stump 15 Oct '10

15 Oct '10

I just committed this under the obvious fix rule. --- src/qemu/qemu_driver.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 16f34f7..0ce2d40 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -10385,7 +10385,7 @@ qemuDomainIsMigratable(virDomainDefPtr def) { if (def->nhostdevs > 0) { qemuReportError(VIR_ERR_OPERATION_INVALID, - _("Domain with assigned host devices cannot be migrated")); + "%s", _("Domain with assigned host devices cannot be migrated")); return false; } -- 1.7.3.1

1 0

[libvirt] [PATCH v2] Make sure that filedescriptors are only closed once
by Stefan Berger 15 Oct '10

15 Oct '10

V2: also the path where close() failed needs to be corrected; -> time for a VIR_CLOSE() ? Setting fd=-1 in these places makes sure that the fd is not closed twice later on in 'clean:'. This is of course a recipe for disaster in a multi-threaded system where the filedescriptor can belong to something else right away. At least we have a pattern... (looks like I can close the augeas bug as well...) Signed-off-by: Stefan Berger <stefanb(a)us.ibm.com> --- src/conf/domain_conf.c | 5 ++++- src/conf/network_conf.c | 5 ++++- src/conf/nwfilter_conf.c | 10 ++++++++-- src/conf/storage_conf.c | 5 ++++- 4 files changed, 20 insertions(+), 5 deletions(-) Index: libvirt-acl/src/conf/domain_conf.c =================================================================== --- libvirt-acl.orig/src/conf/domain_conf.c +++ libvirt-acl/src/conf/domain_conf.c @@ -6802,13 +6802,16 @@ int virDomainSaveXML(const char *configD virReportSystemError(errno, _("cannot save config file '%s'"), configFile); - goto cleanup; + goto cleanup_free; } + fd = -1; + ret = 0; cleanup: if (fd != -1) close(fd); + cleanup_free: VIR_FREE(configFile); return ret; } Index: libvirt-acl/src/conf/network_conf.c =================================================================== --- libvirt-acl.orig/src/conf/network_conf.c +++ libvirt-acl/src/conf/network_conf.c @@ -691,15 +691,18 @@ int virNetworkSaveXML(const char *config virReportSystemError(errno, _("cannot save config file '%s'"), configFile); - goto cleanup; + goto cleanup_free; } + fd = -1; + ret = 0; cleanup: if (fd != -1) close(fd); + cleanup_free: VIR_FREE(configFile); return ret; Index: libvirt-acl/src/conf/nwfilter_conf.c =================================================================== --- libvirt-acl.orig/src/conf/nwfilter_conf.c +++ libvirt-acl/src/conf/nwfilter_conf.c @@ -2197,15 +2197,18 @@ int virNWFilterSaveXML(const char *confi virReportSystemError(errno, _("cannot save config file '%s'"), configFile); - goto cleanup; + goto cleanup_free; } + fd = -1; + ret = 0; cleanup: if (fd != -1) close(fd); + cleanup_free: VIR_FREE(configFile); return ret; @@ -2608,15 +2611,18 @@ virNWFilterPoolObjSaveDef(virNWFilterDri virReportSystemError(errno, _("cannot save config file %s"), pool->configFile); - goto cleanup; + goto cleanup_free; } + fd = -1; + ret = 0; cleanup: if (fd != -1) close(fd); + cleanup_free: VIR_FREE(xml); return ret; Index: libvirt-acl/src/conf/storage_conf.c =================================================================== --- libvirt-acl.orig/src/conf/storage_conf.c +++ libvirt-acl/src/conf/storage_conf.c @@ -1564,15 +1564,18 @@ virStoragePoolObjSaveDef(virStorageDrive virReportSystemError(errno, _("cannot save config file %s"), pool->configFile); - goto cleanup; + goto cleanup_free; } + fd = -1; + ret = 0; cleanup: if (fd != -1) close(fd); + cleanup_free: VIR_FREE(xml); return ret;

3 3

[libvirt] [PATCH] build: skip xenapi driver when building for RHEL
by Eric Blake 15 Oct '10

15 Oct '10

https://bugzilla.redhat.com/show_bug.cgi?id=643118 * libvirt.spec.in: Provide xenapi conditionals. --- Hmm - there's probably other things we could do to sync libvirt.spec.in back with RHEL builds; for example, the fact that RHEL 6.0 beta builds ESX by default needs to be updated here. libvirt.spec.in | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index a58be54..e8126b4 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -37,6 +37,7 @@ %define with_lxc 0%{!?_without_lxc:%{server_drivers}} %define with_vbox 0%{!?_without_vbox:%{server_drivers}} %define with_uml 0%{!?_without_uml:%{server_drivers}} +%define with_xenapi 0%{!?_without_xenapi:%{server_drivers}} # XXX this shouldn't be here, but it mistakenly links into libvirtd %define with_one 0%{!?_without_one:%{server_drivers}} @@ -83,7 +84,8 @@ %define with_numactl 0 %endif -# RHEL doesn't ship OpenVZ, VBox, UML, OpenNebula, PowerHypervisor or ESX +# RHEL doesn't ship OpenVZ, VBox, UML, OpenNebula, PowerHypervisor, ESX, +# or libxenserver (xenapi) %if 0%{?rhel} %define with_openvz 0 %define with_vbox 0 @@ -91,6 +93,7 @@ %define with_one 0 %define with_phyp 0 %define with_esx 0 +%define with_xenapi 0 %endif # RHEL-5 has restricted QEMU to x86_64 only and is too old for LXC @@ -445,6 +448,10 @@ of recent versions of Linux (and other OSes). %define _without_vbox --without-vbox %endif +%if ! %{with_xenapi} +%define _without_xenapi --without-xenapi +%endif + %if ! %{with_sasl} %define _without_sasl --without-sasl %endif @@ -550,6 +557,7 @@ of recent versions of Linux (and other OSes). %{?_without_openvz} \ %{?_without_lxc} \ %{?_without_vbox} \ + %{?_without_xenapi} \ %{?_without_sasl} \ %{?_without_avahi} \ %{?_without_polkit} \ -- 1.7.2.3

2 2

[libvirt] libvirt & cgroup support - why are vm cgroups created under libvirt cgroup?
by Nikola Ciprich 15 Oct '10

15 Oct '10

Hello, I'd like to use cgroups for resources counting and management, but I'd like to use blkio-cgroup controller as well. I created simple patch for libvirt adding support for it (and I'd like to submit the patch once it's tested properly). But it seems that blkio-cgroup controller doesn't support cgroups inside cgroups (the way libvirt uses them - /cgroup/libvirt/vmxxx). Is there some possibility libvirt would be adjusted to support separate toplevel cgroup for each vm so blkio-cgroup could be used? Or is there some important reason for the way it works now? thanks a lot in advance for any reply with best regards nik -- ------------------------------------- Ing. Nikola CIPRICH LinuxBox.cz, s.r.o. 28. rijna 168, 709 01 Ostrava tel.: +420 596 603 142 fax: +420 596 621 273 mobil: +420 777 093 799 www.linuxbox.cz mobil servis: +420 737 238 656 email servis: servis(a)linuxbox.cz -------------------------------------

1 0

Re: [libvirt] [virt-tools-list] [PATCH] add AM_MAINTAINER_MODE macro
by Eric Blake 15 Oct '10

15 Oct '10

[adding libvir-list] On 10/15/2010 06:06 AM, Eric Blake wrote: > On 10/15/2010 05:29 AM, Guido Günther wrote: >> Hi, >> On Wed, Sep 29, 2010 at 04:46:23PM +0200, Guido Günther wrote: > > Odd - I cannot find the original mail, even when looking in the archives: > https://www.redhat.com/archives/libvir-list/2010-September/date.html Oh, I see why - I was looking on the wrong list. Libvirt patches should generally be sent to libvir-list. > >>> Hi, >>> Please add the AM_MAINTAINER_MODE macro to configure.ac for >>> virt-manager. This allows downstream distributions to disable this >>> feature so no autotools are required to build the package. The patch >>> doesn't change behaviour for upstream: >>> >>> http://www.gnu.org/software/hello/manual/automake/maintainer_002dmode.html >>> > > The automake manual recommends against maintainer mode: > http://www.gnu.org/software/automake/manual/automake.html#maintainer_002dmo… > > >> Several years ago François Pinard pointed out several arguments >> against this AM_MAINTAINER_MODE macro. Most of them relate to >> insecurity. By removing dependencies you get non-dependable builds: >> changes to sources files can have no effect on generated files and >> this can be very confusing when unnoticed. He adds that security >> shouldn't be reserved to maintainers (what --enable-maintainer-mode >> suggests), on the contrary. If one user has to modify a Makefile.am, >> then either Makefile.in should be updated or a warning should be >> output (this is what Automake uses missing for) but the last thing you >> want is that nothing happens and the user doesn't notice it (this is >> what happens when rebuild rules are disabled by AM_MAINTAINER_MODE). >> >> Jim Meyering, the inventor of the AM_MAINTAINER_MODE macro was swayed >> by François's arguments, and got rid of AM_MAINTAINER_MODE in all of >> his packages. > > Furthermore, downstream distributions should not require autotools to > build a package if they do not make any changes to any of the > configure.ac/Makefile.am source files in the first place; and > conversely, if you ARE patching those files, then you WANT to rerun the > autotools and not silently disable them. > >>> AM_INIT_AUTOMAKE([-Wno-portability]) >>> +AM_MAINTAINER_MODE([enable]) >>> >> >> Any chance this gets applied? > > I'm very reluctant to make this change without a better demonstration > why you think it is needed, and only after exhausting other attempts to > fix the root cause problem that you are really hitting. > -- Eric Blake eblake(a)redhat.com +1-801-349-2682 Libvirt virtualization library http://libvirt.org

1 1

[libvirt] usage of PKG_CHECK_ in libvirt
by Alejandro Mery 15 Oct '10

15 Oct '10

hi, I want to try to add some basic support for (linux-)vserver to libvirt and after reading some old mail threads I noticed you vanished PKG_CHECK_EXISTS back in 2008. is it still not welcomed in libvirt? PKG_CHECK_MODULES also? Thanks, Alejandro Mery

3 3

[libvirt] [PATCH] Make sure that filedescriptors are only closed once
by Stefan Berger 15 Oct '10

15 Oct '10

Setting fd=-1 in these places makes sure that the fd is not closed twice later on in 'clean:'. This is of course a recipe for disaster in a multi-threaded system where the filedescriptor can belong to something else right away. At least we have a pattern... (looks like I can close the augeas bug as well...) Signed-off-by: Stefan Berger <stefanb(a)us.ibm.com> --- src/conf/domain_conf.c | 2 ++ src/conf/network_conf.c | 2 ++ src/conf/nwfilter_conf.c | 4 ++++ src/conf/storage_conf.c | 2 ++ 4 files changed, 10 insertions(+) Index: libvirt-acl/src/conf/domain_conf.c =================================================================== --- libvirt-acl.orig/src/conf/domain_conf.c +++ libvirt-acl/src/conf/domain_conf.c @@ -6805,6 +6805,8 @@ int virDomainSaveXML(const char *configD goto cleanup; } + fd = -1; + ret = 0; cleanup: if (fd != -1) Index: libvirt-acl/src/conf/network_conf.c =================================================================== --- libvirt-acl.orig/src/conf/network_conf.c +++ libvirt-acl/src/conf/network_conf.c @@ -694,6 +694,8 @@ int virNetworkSaveXML(const char *config goto cleanup; } + fd = -1; + ret = 0; cleanup: Index: libvirt-acl/src/conf/nwfilter_conf.c =================================================================== --- libvirt-acl.orig/src/conf/nwfilter_conf.c +++ libvirt-acl/src/conf/nwfilter_conf.c @@ -2200,6 +2200,8 @@ int virNWFilterSaveXML(const char *confi goto cleanup; } + fd = -1; + ret = 0; cleanup: @@ -2611,6 +2613,8 @@ virNWFilterPoolObjSaveDef(virNWFilterDri goto cleanup; } + fd = -1; + ret = 0; cleanup: Index: libvirt-acl/src/conf/storage_conf.c =================================================================== --- libvirt-acl.orig/src/conf/storage_conf.c +++ libvirt-acl/src/conf/storage_conf.c @@ -1567,6 +1567,8 @@ virStoragePoolObjSaveDef(virStorageDrive goto cleanup; } + fd = -1; + ret = 0; cleanup:

2 1

[libvirt] [PATCH] esx: Handle name escaping properly
by Matthias Bolte 15 Oct '10

15 Oct '10

VMware uses a mix of percent-, pipe- and base64-encoding in different combinations in different places. Add a testcase for this. --- src/esx/README | 25 ++++ src/esx/esx_driver.c | 72 ++++++----- src/esx/esx_storage_driver.c | 42 ++++++- src/esx/esx_util.c | 198 ++++++++++++++++++++++++++++++ src/esx/esx_util.h | 18 +++ src/esx/esx_vi.c | 6 + src/esx/esx_vmx.c | 88 +++++--------- tests/esxutilstest.c | 51 ++++++++ tests/xml2vmxdata/xml2vmx-annotation.vmx | 2 +- 9 files changed, 405 insertions(+), 97 deletions(-) diff --git a/src/esx/README b/src/esx/README index 9ae93b1..b7a5865 100644 --- a/src/esx/README +++ b/src/esx/README @@ -86,3 +86,28 @@ It tries to cancel the blocked task, but this may not be possible, because there are task like the power-on task that is marked as non-cancelable. So the driver may leave blocked tasks behind if automatic question handling is disabled. + + + +Different escaping schemes used in different places +=================================================== + +A domain name in the vSphere API has [%/\] escaped as %XX (percent-encoding), +where XX is the ASCII code of the escaped char in hex. + +A domainName entry in a VMX config file is percent-encoded and has [|"] escaped +as |XX (pipe-encoding). + +A annotation entry in a VMX config file is pipe-encoded. + +A datastore item name has the special Windows path characters ["*<>:|?] +replaced by underscores (_). The result is escaped using percent-encoding and +base64-encoding. This isn't a bijective encoding. Therefore, escaped datastore +item names cannot be unescaped completely. + +For base64-encoding sequences of chars that don't match [a-zA-Z0-9'(),. _-] +are replaced by their base64 form (the padding is omitted). An encoded sequence +begins with a plus (+), ends with a minus (-) and can contain a plus (+). The +minus (-) is omitted if the string ends in a base64-encoded sequence. VMware +uses the comma (,) instead of the slash (/) in the base64 alphabet to avoid +conflicts with the slash as path separator. diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c index e959be2..8bc3be2 100644 --- a/src/esx/esx_driver.c +++ b/src/esx/esx_driver.c @@ -2708,7 +2708,6 @@ esxListDefinedDomains(virConnectPtr conn, char **const names, int maxnames) esxVI_String *propertyNameList = NULL; esxVI_ObjectContent *virtualMachineList = NULL; esxVI_ObjectContent *virtualMachine = NULL; - esxVI_DynamicProperty *dynamicProperty = NULL; esxVI_VirtualMachinePowerState powerState; int count = 0; int i; @@ -2745,27 +2744,15 @@ esxListDefinedDomains(virConnectPtr conn, char **const names, int maxnames) continue; } - for (dynamicProperty = virtualMachine->propSet; - dynamicProperty != NULL; - dynamicProperty = dynamicProperty->_next) { - if (STREQ(dynamicProperty->name, "name")) { - if (esxVI_AnyType_ExpectType(dynamicProperty->val, - esxVI_Type_String) < 0) { - goto cleanup; - } - - names[count] = strdup(dynamicProperty->val->string); + names[count] = NULL; - if (names[count] == NULL) { - virReportOOMError(); - goto cleanup; - } - - count++; - break; - } + if (esxVI_GetVirtualMachineIdentity(virtualMachine, NULL, &names[count], + NULL) < 0) { + goto cleanup; } + ++count; + if (count >= maxnames) { break; } @@ -2864,14 +2851,18 @@ esxDomainCreateWithFlags(virDomainPtr domain, unsigned int flags) return result; } + + static int esxDomainCreate(virDomainPtr domain) { return esxDomainCreateWithFlags(domain, 0); } + + static virDomainPtr -esxDomainDefineXML(virConnectPtr conn, const char *xml ATTRIBUTE_UNUSED) +esxDomainDefineXML(virConnectPtr conn, const char *xml) { esxPrivate *priv = conn->privateData; virDomainDefPtr def = NULL; @@ -2883,6 +2874,7 @@ esxDomainDefineXML(virConnectPtr conn, const char *xml ATTRIBUTE_UNUSED) esxVMX_Data data; char *datastoreName = NULL; char *directoryName = NULL; + char *escapedName = NULL; virBuffer buffer = VIR_BUFFER_INITIALIZER; char *url = NULL; char *datastoreRelatedPath = NULL; @@ -2912,6 +2904,13 @@ esxDomainDefineXML(virConnectPtr conn, const char *xml ATTRIBUTE_UNUSED) goto cleanup; } + if (virtualMachine == NULL && + esxVI_LookupVirtualMachineByName(priv->primary, def->name, NULL, + &virtualMachine, + esxVI_Occurrence_OptionalItem) < 0) { + goto cleanup; + } + if (virtualMachine != NULL) { /* FIXME */ ESX_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", @@ -2992,7 +2991,13 @@ esxDomainDefineXML(virConnectPtr conn, const char *xml ATTRIBUTE_UNUSED) virBufferAddChar(&buffer, '/'); } - virBufferURIEncodeString(&buffer, def->name); + escapedName = esxUtil_EscapeDatastoreItem(def->name); + + if (escapedName == NULL) { + goto cleanup; + } + + virBufferURIEncodeString(&buffer, escapedName); virBufferAddLit(&buffer, ".vmx?dcPath="); virBufferURIEncodeString(&buffer, priv->primary->datacenter->name); virBufferAddLit(&buffer, "&dsName="); @@ -3005,29 +3010,31 @@ esxDomainDefineXML(virConnectPtr conn, const char *xml ATTRIBUTE_UNUSED) url = virBufferContentAndReset(&buffer); + /* Check, if VMX file already exists */ + /* FIXME */ + + /* Upload VMX file */ + VIR_DEBUG("Uploading .vmx config, url='%s' vmx='%s'", url, vmx); + + if (esxVI_Context_UploadFile(priv->primary, url, vmx) < 0) { + goto cleanup; + } + + /* Register the domain */ if (directoryName != NULL) { if (virAsprintf(&datastoreRelatedPath, "[%s] %s/%s.vmx", datastoreName, - directoryName, def->name) < 0) { + directoryName, escapedName) < 0) { virReportOOMError(); goto cleanup; } } else { if (virAsprintf(&datastoreRelatedPath, "[%s] %s.vmx", datastoreName, - def->name) < 0) { + escapedName) < 0) { virReportOOMError(); goto cleanup; } } - /* Check, if VMX file already exists */ - /* FIXME */ - - /* Upload VMX file */ - if (esxVI_Context_UploadFile(priv->primary, url, vmx) < 0) { - goto cleanup; - } - - /* Register the domain */ if (esxVI_RegisterVM_Task(priv->primary, priv->primary->datacenter->vmFolder, datastoreRelatedPath, NULL, esxVI_Boolean_False, priv->primary->computeResource->resourcePool, @@ -3061,6 +3068,7 @@ esxDomainDefineXML(virConnectPtr conn, const char *xml ATTRIBUTE_UNUSED) VIR_FREE(vmx); VIR_FREE(datastoreName); VIR_FREE(directoryName); + VIR_FREE(escapedName); VIR_FREE(url); VIR_FREE(datastoreRelatedPath); esxVI_ObjectContent_Free(&virtualMachine); diff --git a/src/esx/esx_storage_driver.c b/src/esx/esx_storage_driver.c index 329020b..72e0d7a 100644 --- a/src/esx/esx_storage_driver.c +++ b/src/esx/esx_storage_driver.c @@ -915,9 +915,13 @@ esxStorageVolumeCreateXML(virStoragePoolPtr pool, const char *xmldesc, virStoragePoolDef poolDef; virStorageVolDefPtr def = NULL; char *tmp; - char *datastorePath = NULL; + char *unescapedDatastorePath = NULL; + char *unescapedDirectoryName = NULL; + char *unescapedDirectoryAndFileName = NULL; char *directoryName = NULL; + char *fileName = NULL; char *datastorePathWithoutFileName = NULL; + char *datastorePath = NULL; esxVI_FileInfo *fileInfo = NULL; esxVI_FileBackedVirtualDiskSpec *virtualDiskSpec = NULL; esxVI_ManagedObjectReference *task = NULL; @@ -995,15 +999,30 @@ esxStorageVolumeCreateXML(virStoragePoolPtr pool, const char *xmldesc, goto cleanup; } - if (virAsprintf(&datastorePath, "[%s] %s", pool->name, def->name) < 0) { + if (virAsprintf(&unescapedDatastorePath, "[%s] %s", pool->name, + def->name) < 0) { virReportOOMError(); goto cleanup; } if (def->target.format == VIR_STORAGE_FILE_VMDK) { - /* Create directory, if it doesn't exist yet */ - if (esxUtil_ParseDatastorePath(datastorePath, NULL, &directoryName, - NULL) < 0) { + /* Parse and escape datastore path */ + if (esxUtil_ParseDatastorePath(unescapedDatastorePath, NULL, + &unescapedDirectoryName, + &unescapedDirectoryAndFileName) < 0) { + goto cleanup; + } + + directoryName = esxUtil_EscapeDatastoreItem(unescapedDirectoryName); + + if (directoryName == NULL) { + goto cleanup; + } + + fileName = esxUtil_EscapeDatastoreItem(unescapedDirectoryAndFileName + + strlen(unescapedDirectoryName) + 1); + + if (fileName == NULL) { goto cleanup; } @@ -1013,6 +1032,13 @@ esxStorageVolumeCreateXML(virStoragePoolPtr pool, const char *xmldesc, goto cleanup; } + if (virAsprintf(&datastorePath, "[%s] %s/%s", pool->name, directoryName, + fileName) < 0) { + virReportOOMError(); + goto cleanup; + } + + /* Create directory, if it doesn't exist yet */ if (esxVI_LookupFileInfoByDatastorePath (priv->primary, datastorePathWithoutFileName, true, &fileInfo, esxVI_Occurrence_OptionalItem) < 0) { @@ -1115,9 +1141,13 @@ esxStorageVolumeCreateXML(virStoragePoolPtr pool, const char *xmldesc, esxVI_ObjectContent_Free(&datastore); esxVI_DatastoreInfo_Free(&datastoreInfo); virStorageVolDefFree(def); - VIR_FREE(datastorePath); + VIR_FREE(unescapedDatastorePath); + VIR_FREE(unescapedDirectoryName); + VIR_FREE(unescapedDirectoryAndFileName); VIR_FREE(directoryName); + VIR_FREE(fileName); VIR_FREE(datastorePathWithoutFileName); + VIR_FREE(datastorePath); esxVI_FileInfo_Free(&fileInfo); esxVI_FileBackedVirtualDiskSpec_Free(&virtualDiskSpec); esxVI_ManagedObjectReference_Free(&task); diff --git a/src/esx/esx_util.c b/src/esx/esx_util.c index 99cc4f6..5fe72fc 100644 --- a/src/esx/esx_util.c +++ b/src/esx/esx_util.c @@ -24,6 +24,7 @@ #include <config.h> +#include <c-ctype.h> #include <netdb.h> #include "internal.h" @@ -621,3 +622,200 @@ esxUtil_ReformatUuid(const char *input, char *output) return 0; } + + + +char * +esxUtil_EscapeHex(const char *string, char escape, const char *special) +{ + char *escaped = NULL; + size_t length = 1; /* 1 byte for termination */ + const char *tmp1 = string; + char *tmp2; + + /* Calculate length of escaped string */ + while (*tmp1 != '\0') { + if (*tmp1 == escape || strspn(tmp1, special) > 0) { + length += 2; + } + + ++tmp1; + ++length; + } + + if (VIR_ALLOC_N(escaped, length) < 0) { + virReportOOMError(); + return NULL; + } + + tmp1 = string; /* reading from this one */ + tmp2 = escaped; /* writing to this one */ + + /* Escape to 'cXX' where c is the escape char and X is a hex digit */ + while (*tmp1 != '\0') { + if (*tmp1 == escape || strspn(tmp1, special) > 0) { + *tmp2++ = escape; + + snprintf(tmp2, 3, "%02x", (unsigned int)*tmp1); + + tmp2 += 2; + } else { + *tmp2++ = *tmp1; + } + + ++tmp1; + } + + *tmp2 = '\0'; + + return escaped; +} + + + +int +esxUtil_UnescapeHex(char *string, char escape) +{ + char *tmp1 = string; /* reading from this one */ + char *tmp2 = string; /* writing to this one */ + + /* Unescape from 'cXX' where c is the escape char and X is a hex digit */ + while (*tmp1 != '\0') { + if (*tmp1 == escape) { + if (!c_isxdigit(tmp1[1]) || !c_isxdigit(tmp1[2])) { + return -1; + } + + *tmp2++ = virHexToBin(tmp1[1]) * 16 + virHexToBin(tmp1[2]); + tmp1 += 3; + } else { + *tmp2++ = *tmp1++; + } + } + + *tmp2 = '\0'; + + return 0; +} + + + +char * +esxUtil_EscapeBase64(const char *string) +{ + /* 'normal' characters don't get base64 encoded */ + static const char *normal = + "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789'(),. _-"; + + /* VMware uses ',' instead of the path separator '/' in the base64 alphabet */ + static const char *base64 = + "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+,"; + + virBuffer buffer = VIR_BUFFER_INITIALIZER; + const char *tmp1 = string; + size_t length; + unsigned char c1, c2, c3; + + /* Escape sequences of non-'normal' characters as base64 without padding */ + while (*tmp1 != '\0') { + length = strspn(tmp1, normal); + + if (length > 0) { + virBufferAdd(&buffer, tmp1, length); + + tmp1 += length; + } else { + length = strcspn(tmp1, normal); + + virBufferAddChar(&buffer, '+'); + + while (length > 0) { + c1 = *tmp1++; + c2 = length > 1 ? *tmp1++ : 0; + c3 = length > 2 ? *tmp1++ : 0; + + virBufferAddChar(&buffer, base64[(c1 >> 2) & 0x3f]); + virBufferAddChar(&buffer, base64[((c1 << 4) + (c2 >> 4)) & 0x3f]); + + if (length > 1) { + virBufferAddChar(&buffer, base64[((c2 << 2) + (c3 >> 6)) & 0x3f]); + } + + if (length > 2) { + virBufferAddChar(&buffer, base64[c3 & 0x3f]); + } + + length -= length > 3 ? 3 : length; + } + + if (*tmp1 != '\0') { + virBufferAddChar(&buffer, '-'); + } + } + } + + if (virBufferError(&buffer)) { + virReportOOMError(); + virBufferFreeAndReset(&buffer); + + return NULL; + } + + return virBufferContentAndReset(&buffer); +} + + + +void +esxUtil_ReplaceSpecialWindowsPathChars(char *string) +{ + /* '/' and '\\' are missing on purpose */ + static const char *specials = "\"*<>:|?"; + + char *tmp = string; + size_t length; + + while (*tmp != '\0') { + length = strspn(tmp, specials); + + while (length > 0) { + *tmp++ = '_'; + --length; + } + + if (*tmp != '\0') { + ++tmp; + } + } +} + + + +char * +esxUtil_EscapeDatastoreItem(const char *string) +{ + char *replaced = strdup(string); + char *escaped1; + char *escaped2 = NULL; + + if (replaced == NULL) { + virReportOOMError(); + return NULL; + } + + esxUtil_ReplaceSpecialWindowsPathChars(replaced); + + escaped1 = esxUtil_EscapeHexPercent(replaced); + + if (escaped1 == NULL) { + goto cleanup; + } + + escaped2 = esxUtil_EscapeBase64(escaped1); + + cleanup: + VIR_FREE(replaced); + VIR_FREE(escaped1); + + return escaped2; +} diff --git a/src/esx/esx_util.h b/src/esx/esx_util.h index 650f145..669a4f2 100644 --- a/src/esx/esx_util.h +++ b/src/esx/esx_util.h @@ -71,4 +71,22 @@ int esxUtil_GetConfigBoolean(virConfPtr conf, const char *name, bool *boolean_, int esxUtil_ReformatUuid(const char *input, char *output); +char *esxUtil_EscapeHex(const char *string, char escape, const char *special); + +# define esxUtil_EscapeHexPipe(_string) esxUtil_EscapeHex(_string, '|', "\"") + +# define esxUtil_EscapeHexPercent(_string) esxUtil_EscapeHex(_string, '%', "/\\") + +int esxUtil_UnescapeHex(char *string, char escape); + +# define esxUtil_UnescapeHexPipe(_string) esxUtil_UnescapeHex(_string, '|') + +# define esxUtil_UnescapeHexPercent(_string) esxUtil_UnescapeHex(_string, '%') + +char *esxUtil_EscapeBase64(const char *string); + +void esxUtil_ReplaceSpecialWindowsPathChars(char *string); + +char *esxUtil_EscapeDatastoreItem(const char *string); + #endif /* __ESX_UTIL_H__ */ diff --git a/src/esx/esx_vi.c b/src/esx/esx_vi.c index d361f01..c450730 100644 --- a/src/esx/esx_vi.c +++ b/src/esx/esx_vi.c @@ -2014,6 +2014,12 @@ esxVI_GetVirtualMachineIdentity(esxVI_ObjectContent *virtualMachine, goto failure; } + if (esxUtil_UnescapeHexPercent(*name) < 0) { + ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", + _("Domain name contains invalid escape sequence")); + goto failure; + } + break; } } diff --git a/src/esx/esx_vmx.c b/src/esx/esx_vmx.c index ece16b2..e17e1e7 100644 --- a/src/esx/esx_vmx.c +++ b/src/esx/esx_vmx.c @@ -876,8 +876,6 @@ esxVMX_ParseConfig(esxVMX_Context *ctx, virCapsPtr caps, const char *vmx, long long numvcpus = 0; char *sched_cpu_affinity = NULL; char *guestOS = NULL; - char *tmp1; - char *tmp2; int controller; int bus; int port; @@ -982,34 +980,28 @@ esxVMX_ParseConfig(esxVMX_Context *ctx, virCapsPtr caps, const char *vmx, goto cleanup; } + if (def->name != NULL) { + if (esxUtil_UnescapeHexPercent(def->name) < 0 || + esxUtil_UnescapeHexPipe(def->name) < 0) { + ESX_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", + _("VMX entry 'name' contains invalid escape sequence")); + goto cleanup; + } + } + /* vmx:annotation -> def:description */ if (esxUtil_GetConfigString(conf, "annotation", &def->description, true) < 0) { goto cleanup; } - /* Unescape '|XX' where X is a hex digit */ if (def->description != NULL) { - tmp1 = def->description; /* reading from this one */ - tmp2 = def->description; /* writing to this one */ - - while (*tmp1 != '\0') { - if (*tmp1 == '|') { - if (!c_isxdigit(tmp1[1]) || !c_isxdigit(tmp1[2])) { - ESX_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", - _("VMX entry 'annotation' contains invalid " - "escape sequence")); - goto cleanup; - } - - *tmp2++ = virHexToBin(tmp1[1]) * 16 + virHexToBin(tmp1[2]); - tmp1 += 3; - } else { - *tmp2++ = *tmp1++; - } + if (esxUtil_UnescapeHexPipe(def->description) < 0) { + ESX_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", + _("VMX entry 'annotation' contains invalid escape " + "sequence")); + goto cleanup; } - - *tmp2 = '\0'; } /* vmx:memsize -> def:mem.max_balloon */ @@ -2460,9 +2452,8 @@ esxVMX_FormatConfig(esxVMX_Context *ctx, virCapsPtr caps, virDomainDefPtr def, int sched_cpu_affinity_length; unsigned char zero[VIR_UUID_BUFLEN]; virBuffer buffer = VIR_BUFFER_INITIALIZER; - size_t length; - char *tmp1; - char *tmp2; + char *preliminaryDisplayName = NULL; + char *displayName = NULL; char *annotation = NULL; bool scsi_present[4] = { false, false, false, false }; int scsi_virtualDev[4] = { -1, -1, -1, -1 }; @@ -2536,44 +2527,23 @@ esxVMX_FormatConfig(esxVMX_Context *ctx, virCapsPtr caps, virDomainDefPtr def, } /* def:name -> vmx:displayName */ - virBufferVSprintf(&buffer, "displayName = \"%s\"\n", def->name); - - /* def:description -> vmx:annotation */ - if (def->description != NULL) { - /* Escape '"' as '|22' and '|' as '|7C' */ - length = 1; /* 1 byte for termination */ - tmp1 = def->description; - - while (*tmp1 != '\0') { - if (*tmp1 == '"' || *tmp1 == '|') { - length += 2; - } - - ++tmp1; - ++length; - } + preliminaryDisplayName = esxUtil_EscapeHexPipe(def->name); - if (VIR_ALLOC_N(annotation, length) < 0) { - virReportOOMError(); - goto cleanup; - } + if (preliminaryDisplayName == NULL) { + goto cleanup; + } - tmp1 = def->description; /* reading from this one */ - tmp2 = annotation; /* writing to this one */ + displayName = esxUtil_EscapeHexPercent(preliminaryDisplayName); - while (*tmp1 != '\0') { - if (*tmp1 == '"') { - *tmp2++ = '|'; *tmp2++ = '2'; *tmp2++ = '2'; - } else if (*tmp1 == '|') { - *tmp2++ = '|'; *tmp2++ = '7'; *tmp2++ = 'C'; - } else { - *tmp2++ = *tmp1; - } + if (displayName == NULL) { + goto cleanup; + } - ++tmp1; - } + virBufferVSprintf(&buffer, "displayName = \"%s\"\n", displayName); - *tmp2 = '\0'; + /* def:description -> vmx:annotation */ + if (def->description != NULL) { + annotation = esxUtil_EscapeHexPipe(def->description); virBufferVSprintf(&buffer, "annotation = \"%s\"\n", annotation); } @@ -2780,6 +2750,8 @@ esxVMX_FormatConfig(esxVMX_Context *ctx, virCapsPtr caps, virDomainDefPtr def, virBufferFreeAndReset(&buffer); } + VIR_FREE(preliminaryDisplayName); + VIR_FREE(displayName); VIR_FREE(annotation); return vmx; diff --git a/tests/esxutilstest.c b/tests/esxutilstest.c index 4906ad4..c9a59c7 100644 --- a/tests/esxutilstest.c +++ b/tests/esxutilstest.c @@ -227,6 +227,56 @@ testConvertDateTimeToCalendarTime(const void *data ATTRIBUTE_UNUSED) +struct testDatastoreItem { + const char *string; + const char *escaped; +}; + +static struct testDatastoreItem datastoreItems[] = { + { "normal", "normal" }, + { "Aä1ö2ü3ß4#5~6!7§8/9%Z", + "A+w6Q-1+w7Y-2+w7w-3+w58-4+Iw-5+fg-6+IQ-7+wqc-8+JQ-2f9+JQ-25Z" }, + { "Z~6!7§8/9%0#1\"2'3`4&A", + "Z+fg-6+IQ-7+wqc-8+JQ-2f9+JQ-250+Iw-1_2'3+YA-4+Jg-A" }, + { "標準語", "+5qiZ5rqW6Kqe" }, + { "!\"#$%&'()*+,-./0123456789:;<=>?", + "+IQ-_+IyQl-25+Jg-'()_+Kw-,-.+JQ-2f0123456789_+Ow-_+PQ-__" }, + { "A Z[\\]^_B", "A Z+WyU-5c+XV4-_B" }, + { "A`B@{|}~DEL", "A+YA-B+QHs-_+fX4-DEL" }, + { "hÀÁÂÃÄÅH", "h+w4DDgcOCw4PDhMOF-H" }, + { "A쿀Z", "A+7L+A-Z" }, + { "!쿀A", "+Iey,gA-A" }, + { "~~~", "+fn5+" }, + { "~~~A", "+fn5+-A" }, + { "K%U/H\\Z", "K+JQ-25U+JQ-2fH+JQ-5cZ" }, +}; + +static int +testEscapeDatastoreItem(const void *data ATTRIBUTE_UNUSED) +{ + int i; + char *escaped = NULL; + + for (i = 0; i < ARRAY_CARDINALITY(datastoreItems); ++i) { + VIR_FREE(escaped); + + escaped = esxUtil_EscapeDatastoreItem(datastoreItems[i].string); + + if (escaped == NULL) { + return -1; + } + + if (STRNEQ(datastoreItems[i].escaped, escaped)) { + VIR_FREE(escaped); + return -1; + } + } + + return 0; +} + + + static int mymain(int argc, char **argv) { @@ -258,6 +308,7 @@ mymain(int argc, char **argv) DO_TEST(DiskNameToIndex); DO_TEST(ParseDatastorePath); DO_TEST(ConvertDateTimeToCalendarTime); + DO_TEST(EscapeDatastoreItem); return result == 0 ? EXIT_SUCCESS : EXIT_FAILURE; } diff --git a/tests/xml2vmxdata/xml2vmx-annotation.vmx b/tests/xml2vmxdata/xml2vmx-annotation.vmx index 47d060d..5754c31 100644 --- a/tests/xml2vmxdata/xml2vmx-annotation.vmx +++ b/tests/xml2vmxdata/xml2vmx-annotation.vmx @@ -3,7 +3,7 @@ virtualHW.version = "4" guestOS = "other" uuid.bios = "56 4d 9b ef ac d9 b4 e0-c8 f0 ae a8 b9 10 35 15" displayName = "annotation" -annotation = "Some |7Ctext|7C to test the |22escaping|22: |7C|7C|22|22|7C|7C|22|7C Unescaped!" +annotation = "Some |7ctext|7c to test the |22escaping|22: |7c|7c|22|22|7c|7c|22|7c Unescaped!" memsize = "4" numvcpus = "1" floppy0.present = "false" -- 1.7.0.4

3 5

[libvirt] [PATCH] nwfilter: prevent multiple filters with different name but same UUID
by Stefan Berger 14 Oct '10

14 Oct '10

Patch to prevent multiple nwfilters with different name but same UUID. Signed-off-by: Stefan Berger <stefanb(a)us.ibm.com> --- src/conf/nwfilter_conf.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) Index: libvirt-acl/src/conf/nwfilter_conf.c =================================================================== --- libvirt-acl.orig/src/conf/nwfilter_conf.c +++ libvirt-acl/src/conf/nwfilter_conf.c @@ -2399,6 +2399,20 @@ virNWFilterPoolObjAssignDef(virConnectPt { virNWFilterPoolObjPtr pool; + pool = virNWFilterPoolObjFindByUUID(pools, def->uuid); + + if (pool) { + if (!STREQ(def->name, pool->def->name)) { + virNWFilterReportError(VIR_ERR_INVALID_NWFILTER, + _("filter with same UUID but different name " + "('%s') already exists"), + pool->def->name); + virNWFilterPoolObjUnlock(pool); + return NULL; + } + virNWFilterPoolObjUnlock(pool); + } + if (virNWFilterDefLoopDetect(conn, pools, def)) { virNWFilterReportError(VIR_ERR_INVALID_NWFILTER, "%s", _("filter would introduce a loop"));

2 2

[libvirt] How to rename a domain?
by Ganesh Pagade 14 Oct '10

14 Oct '10

Hi, I am using libvirt Java bindings. How can I rename a domain? Is there an API to do this? Thanks, -Ganesh

2 1

[libvirt] [PATCH v2] Added new attribute accessmode to filesystem element
by Harsh Prateek Bora 14 Oct '10

14 Oct '10

This patch introduces new attribute to filesystem element to support customizable access mode for mount type. Valid accessmode are: passthrough, mapped and squash. Usage: <filesystem type='mount' accessmode='passthrough'> <source dir='/export/to/guest'/> <target dir='mount_tag'/> </filesystem> Here is the detailed explanation on these access modes: Access mode: mapped -------------------- Fileserver intercepts and maps all the file object create requests. Files on the fileserver will be created with Fileserver's user credentials and the client-user's credentials are stored in extended attributes. During getattr() server extracts the client-user's credentials from extended attributes and sends to the client. This adds a great deal of security in the cloud environments where the guest's(client) user space is kept completely isolated from host's user space. Access mode : passthrough -------------------------- In this security model, Fileserver passes down all requests to the underlying filesystem. File system objects on the fileserver will be created with client-user's credentials. This is done by setting setuid()/setgid() during creation or chmod/chown after file creation. At the end of create protocol request, files on the fileserver will be owned by cleint-user's uid/gid. This model mimic's current NFSv3 level of security. Access mode: squash -------------------- In 'squash' mode, the (filesystem) server attempts to preserve user/group ownership from guest, however: - If the server is running as root this mode is equivalent to passthrough. - If the server is running as non-root, all files just have uid/gid matching the server process. Note: This patch is based on Daniel's patch to support 9pfs. It shall be applied after applying Daniel's patch to support 9pfs. Signed-off-by: Harsh Prateek Bora <harsh(a)linux.vnet.ibm.com> --- v2: - fixed compilation errors missed in v1. docs/schemas/domain.rng | 7 +++++++ src/conf/domain_conf.c | 30 ++++++++++++++++++++++++++++-- src/conf/domain_conf.h | 11 +++++++++++ src/qemu/qemu_conf.c | 11 +++++++++-- 4 files changed, 55 insertions(+), 4 deletions(-) diff --git a/docs/schemas/domain.rng b/docs/schemas/domain.rng index ccb8cf3..c0e5149 100644 --- a/docs/schemas/domain.rng +++ b/docs/schemas/domain.rng @@ -761,6 +761,13 @@ </choice> <optional> <ref name="address"/> + <attribute name="accessmode"> + <choice> + <value>passthrough</value> + <value>mapped</value> + <value>squash</value> + </choice> + </attribute> </optional> </element> </define> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index e05d5d7..991b284 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -161,6 +161,12 @@ VIR_ENUM_IMPL(virDomainFS, VIR_DOMAIN_FS_TYPE_LAST, "file", "template") +VIR_ENUM_IMPL(virDomainFSAccessMode, VIR_DOMAIN_FS_ACCESSMODE_LAST, + "passthrough", + "mapped", + "squash") + + VIR_ENUM_IMPL(virDomainNet, VIR_DOMAIN_NET_TYPE_LAST, "user", "ethernet", @@ -1847,6 +1853,7 @@ virDomainFSDefParseXML(xmlNodePtr node, char *type = NULL; char *source = NULL; char *target = NULL; + char *accessmode = NULL; if (VIR_ALLOC(def) < 0) { virReportOOMError(); @@ -1864,6 +1871,17 @@ virDomainFSDefParseXML(xmlNodePtr node, def->type = VIR_DOMAIN_FS_TYPE_MOUNT; } + accessmode = virXMLPropString(node, "accessmode"); + if (accessmode) { + if ((def->accessmode = virDomainFSAccessModeTypeFromString(accessmode)) < 0) { + virDomainReportError(VIR_ERR_INTERNAL_ERROR, + _("unknown accessmode '%s'"), accessmode); + goto error; + } + } else { + def->accessmode = VIR_DOMAIN_FS_ACCESSMODE_PASSTHROUGH; + } + cur = node->children; while (cur != NULL) { if (cur->type == XML_ELEMENT_NODE) { @@ -5602,6 +5620,7 @@ virDomainFSDefFormat(virBufferPtr buf, int flags) { const char *type = virDomainFSTypeToString(def->type); + const char *accessmode = virDomainFSAccessModeTypeToString(def->accessmode); if (!type) { virDomainReportError(VIR_ERR_INTERNAL_ERROR, @@ -5609,9 +5628,16 @@ virDomainFSDefFormat(virBufferPtr buf, return -1; } + if (!accessmode) { + virDomainReportError(VIR_ERR_INTERNAL_ERROR, + _("unexpected accessmode %d"), def->accessmode); + return -1; + } + + virBufferVSprintf(buf, - " <filesystem type='%s'>\n", - type); + " <filesystem type='%s' accessmode='%s'>\n", + type, accessmode); if (def->src) { switch (def->type) { diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 7195c04..0668ce5 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -236,10 +236,20 @@ enum virDomainFSType { VIR_DOMAIN_FS_TYPE_LAST }; +/* Filesystem mount access mode */ +enum virDomainFSAccessMode { + VIR_DOMAIN_FS_ACCESSMODE_PASSTHROUGH, + VIR_DOMAIN_FS_ACCESSMODE_MAPPED, + VIR_DOMAIN_FS_ACCESSMODE_SQUASH, + + VIR_DOMAIN_FS_ACCESSMODE_LAST +}; + typedef struct _virDomainFSDef virDomainFSDef; typedef virDomainFSDef *virDomainFSDefPtr; struct _virDomainFSDef { int type; + int accessmode; char *src; char *dst; unsigned int readonly : 1; @@ -1167,6 +1177,7 @@ VIR_ENUM_DECL(virDomainDiskErrorPolicy) VIR_ENUM_DECL(virDomainController) VIR_ENUM_DECL(virDomainControllerModel) VIR_ENUM_DECL(virDomainFS) +VIR_ENUM_DECL(virDomainFSAccessMode) VIR_ENUM_DECL(virDomainNet) VIR_ENUM_DECL(virDomainChrDevice) VIR_ENUM_DECL(virDomainChrChannelTarget) diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index 18a302a..110b9e2 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -2783,11 +2783,18 @@ char *qemuBuildFSStr(virDomainFSDefPtr fs, if (fs->type != VIR_DOMAIN_FS_TYPE_MOUNT) { qemuReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("can only passthrough directories")); + _("only supports mount filesystem type")); goto error; } - virBufferAddLit(&opt, "local,security_model=passthrough"); + virBufferAddLit(&opt, "local"); + if (fs->accessmode == VIR_DOMAIN_FS_ACCESSMODE_MAPPED) { + virBufferAddLit(&opt, ",security_model=mapped"); + } else if(fs->accessmode == VIR_DOMAIN_FS_ACCESSMODE_PASSTHROUGH) { + virBufferAddLit(&opt, ",security_model=passthrough"); + } else if(fs->accessmode == VIR_DOMAIN_FS_ACCESSMODE_SQUASH) { + virBufferAddLit(&opt, ",security_model=none"); + } virBufferVSprintf(&opt, ",id=%s%s", QEMU_FSDEV_HOST_PREFIX, fs->info.alias); virBufferVSprintf(&opt, ",path=%s", fs->src); -- 1.7.1.1

4 3

[libvirt] Improving our ChangeLog format?
by Justin Clift 14 Oct '10

14 Oct '10

Hi all, Noticed an entry in a recent LWN.net article about PostgreSQL's conversion to git. One of the things mentioned sounds relevant to us : Robert Haas has documented how to get commit summaries and sizes from Git. He wrote a perl script (which Tom Lane improved) that allows you to produce a changelog suitable for release notes from Git. http://git.postgresql.org/gitweb?p=postgresql.git;a=blob_plain;f=src/tools/… The changelog mention might be useful for us, as the PostgreSQL changelog looks a bunch more useful than ours. The PostgreSQL ChangeLog: http://www.postgresql.org/docs/9.0/static/release-9-0.html Our ChangeLog: http://libvirt.org/news.html Mentioning this in case anyone has the time/inclination to look into it. Any takers? :) Regards and best wishes, Justin Clift

4 7

[libvirt] [PATCH] Fix statstest when driver modules are enabled
by Daniel P. Berrange 14 Oct '10

14 Oct '10

The statstest is xen specific. Instead of filling the code with a huge number of #ifdef WITH_XEN, just make its entire compilation conditional in the Makefile.am. Also ensure it links to the Xen driver so that it builds when driver modules are enabled * tests/Makefile.am: Make statstest xen conditional. Link to xen driver * tests/Makefile.am: Remove all conditionals --- tests/Makefile.am | 8 ++++---- tests/statstest.c | 7 ------- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index 64fac75..44fe579 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -238,6 +238,10 @@ reconnect_SOURCES = \ reconnect.c reconnect_LDADD = $(LDADDS) +statstest_SOURCES = \ + statstest.c testutils.h testutils.c +statstest_LDADD = ../src/libvirt_driver_xen.la $(LDADDS) + else EXTRA_DIST += xml2sexprtest.c sexpr2xmltest.c xmconfigtest.c \ xencapstest.c reconnect.c \ @@ -328,10 +332,6 @@ nodeinfotest_SOURCES = \ nodeinfotest.c testutils.h testutils.c nodeinfotest_LDADD = $(LDADDS) -statstest_SOURCES = \ - statstest.c testutils.h testutils.c -statstest_LDADD = $(LDADDS) - if WITH_SECDRIVER_SELINUX seclabeltest_SOURCES = \ seclabeltest.c diff --git a/tests/statstest.c b/tests/statstest.c index 5fad190..551615b 100644 --- a/tests/statstest.c +++ b/tests/statstest.c @@ -9,15 +9,12 @@ #include "xen/block_stats.h" #include "testutils.h" -#if WITH_XEN static void testQuietError(void *userData ATTRIBUTE_UNUSED, virErrorPtr error ATTRIBUTE_UNUSED) { /* nada */ } -#endif -#if __linux__ && WITH_XEN static int testDevice(const char *path, int expect) { int actual = xenLinuxDomainDeviceID(NULL, 1, path); @@ -43,14 +40,11 @@ static int testDeviceHelper(const void *data) return testDevice(info->dev, info->num); } -#endif - static int mymain(int argc ATTRIBUTE_UNUSED, char **argv ATTRIBUTE_UNUSED) { int ret = 0; -#if __linux__ && WITH_XEN /* Some of our tests delibrately test failure cases, so * register a handler to stop error messages cluttering * up display @@ -201,7 +195,6 @@ mymain(int argc ATTRIBUTE_UNUSED, DO_TEST("/dev/xvda1", 51713); DO_TEST("/dev/xvda15", 51727); -#endif return(ret==0 ? EXIT_SUCCESS : EXIT_FAILURE); } -- 1.7.2.3

2 1

[libvirt] [PATCH] build: provide URL in 'configure --help'
by Eric Blake 14 Oct '10

14 Oct '10

* configure.ac (AC_INIT): Provide email and URL. --- Before: Report bugs to the package provider. After: Report bugs to <libvir-list(a)redhat.com>. libvirt home page: <http://libvirt.org>. configure.ac | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/configure.ac b/configure.ac index b868e50..2803aa3 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT([libvirt], [0.8.4]) +AC_INIT([libvirt], [0.8.4], [libvir-list(a)redhat.com] [], [http://libvirt.org] AC_CONFIG_SRCDIR([src/libvirt.c]) AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_HEADERS([config.h]) -- 1.7.2.3

2 2

[libvirt] [PATCH] Conditionally include termios.h
by Daniel P. Berrange 14 Oct '10

14 Oct '10

The configure.ac file checks for termios.h, but its use is not protected by HAVE_TERMIOS_H. This breaks the build on mingw32 * src/util/util.c: Conditionally include termios.h --- src/util/util.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/src/util/util.c b/src/util/util.c index 586baee..b6b9712 100644 --- a/src/util/util.c +++ b/src/util/util.c @@ -43,7 +43,9 @@ #endif #include <string.h> #include <signal.h> -#include <termios.h> +#if HAVE_TERMIOS_H +# include <termios.h> +#endif #include "c-ctype.h" #ifdef HAVE_PATHS_H -- 1.7.2.3

4 10

[libvirt] [PATCH] Added new attribute accessmode to filesystem element
by Harsh Prateek Bora 14 Oct '10

14 Oct '10

This patch introduces new attribute to filesystem element to support customizable access mode for mount type. Valid accessmode are: passthrough, mapped and squash. Usage: <filesystem type='mount' accessmode='passthrough'> <source dir='/export/to/guest'/> <target dir='mount_tag'/> </filesystem> Here is the detailed explanation on these access modes: Access mode: mapped -------------------- Fileserver intercepts and maps all the file object create requests. Files on the fileserver will be created with Fileserver's user credentials and the client-user's credentials are stored in extended attributes. During getattr() server extracts the client-user's credentials from extended attributes and sends to the client. This adds a great deal of security in the cloud environments where the guest's(client) user space is kept completely isolated from host's user space. Access mode : passthrough -------------------------- In this security model, Fileserver passes down all requests to the underlying filesystem. File system objects on the fileserver will be created with client-user's credentials. This is done by setting setuid()/setgid() during creation or chmod/chown after file creation. At the end of create protocol request, files on the fileserver will be owned by cleint-user's uid/gid. This model mimic's current NFSv3 level of security. Access mode: squash -------------------- In 'squash' mode, the (filesystem) server attempts to preserve user/group ownership from guest, however: - If the server is running as root this mode is equivalent to passthrough. - If the server is running as non-root, all files just have uid/gid matching the server process. Note: This patch is based on Daniel's patch to support 9pfs. It shall be applied after applying Daniel's patch to support 9pfs. Signed-off-by: Harsh Prateek Bora <harsh(a)linux.vnet.ibm.com> --- docs/schemas/domain.rng | 7 +++++++ src/conf/domain_conf.c | 30 ++++++++++++++++++++++++++++-- src/conf/domain_conf.h | 11 +++++++++++ src/qemu/qemu_conf.c | 10 ++++++++-- 4 files changed, 54 insertions(+), 4 deletions(-) diff --git a/docs/schemas/domain.rng b/docs/schemas/domain.rng index ccb8cf3..c0e5149 100644 --- a/docs/schemas/domain.rng +++ b/docs/schemas/domain.rng @@ -761,6 +761,13 @@ </choice> <optional> <ref name="address"/> + <attribute name="accessmode"> + <choice> + <value>passthrough</value> + <value>mapped</value> + <value>squash</value> + </choice> + </attribute> </optional> </element> </define> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index e05d5d7..68c8441 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -161,6 +161,12 @@ VIR_ENUM_IMPL(virDomainFS, VIR_DOMAIN_FS_TYPE_LAST, "file", "template") +VIR_ENUM_IMPL(virDomainFSAccessMode, VIR_DOMAIN_FS_SECURITY_LAST, + "passthrough", + "mapped", + "squash") + + VIR_ENUM_IMPL(virDomainNet, VIR_DOMAIN_NET_TYPE_LAST, "user", "ethernet", @@ -1847,6 +1853,7 @@ virDomainFSDefParseXML(xmlNodePtr node, char *type = NULL; char *source = NULL; char *target = NULL; + char *accessmode = NULL; if (VIR_ALLOC(def) < 0) { virReportOOMError(); @@ -1864,6 +1871,17 @@ virDomainFSDefParseXML(xmlNodePtr node, def->type = VIR_DOMAIN_FS_TYPE_MOUNT; } + accessmode = virXMLPropString(node, "accessmode"); + if (accessmode) { + if ((def->accessmode = virDomainFSAccessModeTypeFromString(accessmode)) < 0) { + virDomainReportError(VIR_ERR_INTERNAL_ERROR, + _("unknown accessmode '%s'"), accessmode); + goto error; + } + } else { + def->accessmode = VIR_DOMAIN_FS_ACCESSMODE_PASSTHROUGH; + } + cur = node->children; while (cur != NULL) { if (cur->type == XML_ELEMENT_NODE) { @@ -5602,6 +5620,7 @@ virDomainFSDefFormat(virBufferPtr buf, int flags) { const char *type = virDomainFSTypeToString(def->type); + const char *accessmode = virDomainFSAccessModeTypeToString(def->accessmode); if (!type) { virDomainReportError(VIR_ERR_INTERNAL_ERROR, @@ -5609,9 +5628,16 @@ virDomainFSDefFormat(virBufferPtr buf, return -1; } + if (!accessmode) { + virDomainReportError(VIR_ERR_INTERNAL_ERROR, + _("unexpected accessmode %d"), def->accessmode); + return -1; + } + + virBufferVSprintf(buf, - " <filesystem type='%s'>\n", - type); + " <filesystem type='%s' accessmode='%s'>\n", + type, accessmode); if (def->src) { switch (def->type) { diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 7195c04..0668ce5 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -236,10 +236,20 @@ enum virDomainFSType { VIR_DOMAIN_FS_TYPE_LAST }; +/* Filesystem mount access mode */ +enum virDomainFSAccessMode { + VIR_DOMAIN_FS_ACCESSMODE_PASSTHROUGH, + VIR_DOMAIN_FS_ACCESSMODE_MAPPED, + VIR_DOMAIN_FS_ACCESSMODE_SQUASH, + + VIR_DOMAIN_FS_ACCESSMODE_LAST +}; + typedef struct _virDomainFSDef virDomainFSDef; typedef virDomainFSDef *virDomainFSDefPtr; struct _virDomainFSDef { int type; + int accessmode; char *src; char *dst; unsigned int readonly : 1; @@ -1167,6 +1177,7 @@ VIR_ENUM_DECL(virDomainDiskErrorPolicy) VIR_ENUM_DECL(virDomainController) VIR_ENUM_DECL(virDomainControllerModel) VIR_ENUM_DECL(virDomainFS) +VIR_ENUM_DECL(virDomainFSAccessMode) VIR_ENUM_DECL(virDomainNet) VIR_ENUM_DECL(virDomainChrDevice) VIR_ENUM_DECL(virDomainChrChannelTarget) diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index 18a302a..0961d8a 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -2783,11 +2783,17 @@ char *qemuBuildFSStr(virDomainFSDefPtr fs, if (fs->type != VIR_DOMAIN_FS_TYPE_MOUNT) { qemuReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("can only passthrough directories")); + _("only supports mount filesystem type")); goto error; } - virBufferAddLit(&opt, "local,security_model=passthrough"); + virBufferAddLit(&opt, "local"); + if (fs->accessmode == VIR_DOMAIN_FS_ACCESSMODE_SQUASH) { + virBufferAddLit(&opt, ",security_model=none"); + } else { + virBufferAddLit(&opt, ",security_model=%s", + virDomainFSAccessModeTypeToString(fs->accessmode)); + } virBufferVSprintf(&opt, ",id=%s%s", QEMU_FSDEV_HOST_PREFIX, fs->info.alias); virBufferVSprintf(&opt, ",path=%s", fs->src); -- 1.7.1.1

3 2

[libvirt] [PATCH] qemu: Prohibit migration of guests with host devices
by Jiri Denemark 14 Oct '10

14 Oct '10

Explicitly raising a nice error in the case user tries to migrate a guest with assigned host devices is much better than waiting for a mysterious error with no clue for the reason. --- src/qemu/qemu_driver.c | 19 +++++++++++++++++++ 1 files changed, 19 insertions(+), 0 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index f68995f..16f34f7 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -10380,6 +10380,19 @@ static void qemuDomainEventQueue(struct qemud_driver *driver, /* Migration support. */ +static bool ATTRIBUTE_NONNULL(1) +qemuDomainIsMigratable(virDomainDefPtr def) +{ + if (def->nhostdevs > 0) { + qemuReportError(VIR_ERR_OPERATION_INVALID, + _("Domain with assigned host devices cannot be migrated")); + return false; + } + + return true; +} + + /* Tunnelled migration stream support */ struct qemuStreamMigFile { int fd; @@ -10709,6 +10722,9 @@ qemudDomainMigratePrepareTunnel(virConnectPtr dconn, goto cleanup; } + if (!qemuDomainIsMigratable(def)) + goto cleanup; + /* Target domain name, maybe renamed. */ if (dname) { VIR_FREE(def->name); @@ -10976,6 +10992,9 @@ qemudDomainMigratePrepare2 (virConnectPtr dconn, goto cleanup; } + if (!qemuDomainIsMigratable(def)) + goto cleanup; + /* Target domain name, maybe renamed. */ if (dname) { VIR_FREE(def->name); -- 1.7.3.1

3 4

[libvirt] Xen string2sexpr and sexpr2string lose quotes?
by Thomas Graves 14 Oct '10

14 Oct '10

Hello all, I am running xen on rhel5 and using libvirt0.7.2 (I also tried 0.7.7) and it looks like the routines string2sexpr and sexpr2string seem to lose the quotes around the image args in the configuration. Has anyone seen this and have a patch for this? I have the following libvirt config: <os> <type>linux</type> <kernel>/usr/lib/xen/boot/pv-grub-x86_64.gz</kernel> <cmdline>(hd0,0)/grub/menu.lst</cmdline> </os> It generates the xm config info: (image (linux (kernel /usr/lib/xen/boot/pv-grub-x86_64.gz) (args '(hd0,0)/grub/menu.lst') (device_model /usr/lib64/xen/bin/qemu-dm) ) ) I call virDomainSetAutostart on the domain and traced it through and saw that it gets the string quoted (args '(hd0,0)/grub/menu.lst') from xen then ends up calling string2sexpr, changes the xend_on_start, and then sexpr2string, and it ends up without quotes (args (hd0,0)/grub/menu.lst) and that is what it sends back to xen. Xen then seems to chop it off to (args ('hd0,0')) Thanks, Tom

3 2

[libvirt] [PATCH] Improve error reporting in test suites
by Daniel P. Berrange 14 Oct '10

14 Oct '10

Before running each test case clear the thread local error indicator. After running each test case, dispatch any error that was reported * tests/testutils.c: Fix error reporting in test suites --- tests/testutils.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/tests/testutils.c b/tests/testutils.c index 8171f10..70e7538 100644 --- a/tests/testutils.c +++ b/tests/testutils.c @@ -124,8 +124,12 @@ virtTestRun(const char *title, int nloops, int (*body)(const void *data), const if (ts) GETTIMEOFDAY(&before); + virResetLastError(); if ((ret = body(data)) != 0) break; + virErrorPtr err = virGetLastError(); + if (err) + virDispatchError(NULL); if (ts) { GETTIMEOFDAY(&after); ts[i] = DIFF_MSEC(&after, &before); -- 1.7.2.3

2 3

[libvirt] [PATCH v3] Added new attribute mount_security to filesystem element
by Harsh Prateek Bora 14 Oct '10

14 Oct '10

This patch introduces new attribute to filesystem element to support customizable security for mount type. Valid mount_security are: passthrough and mapped. Usage: <filesystem type='mount' mount_security='passthrough'> <source dir='/export/to/guest'/> <target dir='mount_tag'/> </filesystem> Here is the detailed explanation on these security models: Security model: mapped ---------------------- Fileserver intercepts and maps all the file object create requests. Files on the fileserver will be created with Fileserver's user credentials and the client-user's credentials are stored in extended attributes. During getattr() server extracts the client-user's credentials from extended attributes and sends to the client. This adds a great deal of security in the cloud environments where the guest's(client) user space is kept completely isolated from host's user space. Security model : passthrough ---------------------------- In this security model, Fileserver passes down all requests to the underlying filesystem. File system objects on the fileserver will be created with client-user's credentials. This is done by setting setuid()/setgid() during creation or chmod/chown after file creation. At the end of create protocol request, files on the fileserver will be owned by cleint-user's uid/gid. This model mimic's current NFSv3 level of security. Note: This patch is based on Daniel's patch to support 9pfs. It shall be applied after applying Daniel's patch to support 9pfs. v3: - QEMU cmdline still uses security_model, changes done by mistake reverted. Signed-off-by: Harsh Prateek Bora <harsh(a)linux.vnet.ibm.com> --- docs/schemas/domain.rng | 6 ++++++ src/conf/domain_conf.c | 29 +++++++++++++++++++++++++++-- src/conf/domain_conf.h | 10 ++++++++++ src/qemu/qemu_conf.c | 9 +++++++-- 4 files changed, 50 insertions(+), 4 deletions(-) diff --git a/docs/schemas/domain.rng b/docs/schemas/domain.rng index ccb8cf3..36eec63 100644 --- a/docs/schemas/domain.rng +++ b/docs/schemas/domain.rng @@ -761,6 +761,12 @@ </choice> <optional> <ref name="address"/> + <attribute name="mount_security"> + <choice> + <value>passthrough</value> + <value>mapped</value> + </choice> + </attribute> </optional> </element> </define> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index e05d5d7..ece6937 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -161,6 +161,11 @@ VIR_ENUM_IMPL(virDomainFS, VIR_DOMAIN_FS_TYPE_LAST, "file", "template") +VIR_ENUM_IMPL(virDomainFSMountSecurity, VIR_DOMAIN_FS_SECURITY_LAST, + "passthrough", + "mapped") + + VIR_ENUM_IMPL(virDomainNet, VIR_DOMAIN_NET_TYPE_LAST, "user", "ethernet", @@ -1847,6 +1852,7 @@ virDomainFSDefParseXML(xmlNodePtr node, char *type = NULL; char *source = NULL; char *target = NULL; + char *mount_security = NULL; if (VIR_ALLOC(def) < 0) { virReportOOMError(); @@ -1864,6 +1870,17 @@ virDomainFSDefParseXML(xmlNodePtr node, def->type = VIR_DOMAIN_FS_TYPE_MOUNT; } + mount_security = virXMLPropString(node, "mount_security"); + if (mount_security) { + if ((def->mount_security = virDomainFSMountSecurityTypeFromString(mount_security)) < 0) { + virDomainReportError(VIR_ERR_INTERNAL_ERROR, + _("unknown mount security '%s'"), mount_security); + goto error; + } + } else { + def->mount_security = VIR_DOMAIN_FS_SECURITY_PASSTHROUGH; + } + cur = node->children; while (cur != NULL) { if (cur->type == XML_ELEMENT_NODE) { @@ -5602,6 +5619,7 @@ virDomainFSDefFormat(virBufferPtr buf, int flags) { const char *type = virDomainFSTypeToString(def->type); + const char *mount_sec = virDomainFSMountSecurityTypeToString(def->mount_security); if (!type) { virDomainReportError(VIR_ERR_INTERNAL_ERROR, @@ -5609,9 +5627,16 @@ virDomainFSDefFormat(virBufferPtr buf, return -1; } + if (!mount_sec) { + virDomainReportError(VIR_ERR_INTERNAL_ERROR, + _("unexpected mount security %d"), def->mount_security); + return -1; + } + + virBufferVSprintf(buf, - " <filesystem type='%s'>\n", - type); + " <filesystem type='%s' mount_security='%s'>\n", + type, mount_sec); if (def->src) { switch (def->type) { diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 7195c04..3463942 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -236,10 +236,19 @@ enum virDomainFSType { VIR_DOMAIN_FS_TYPE_LAST }; +/* Filesystem mount security model */ +enum virDomainFSMountSecurity { + VIR_DOMAIN_FS_SECURITY_PASSTHROUGH, + VIR_DOMAIN_FS_SECURITY_MAPPED, + + VIR_DOMAIN_FS_SECURITY_LAST +}; + typedef struct _virDomainFSDef virDomainFSDef; typedef virDomainFSDef *virDomainFSDefPtr; struct _virDomainFSDef { int type; + int mount_security; char *src; char *dst; unsigned int readonly : 1; @@ -1167,6 +1176,7 @@ VIR_ENUM_DECL(virDomainDiskErrorPolicy) VIR_ENUM_DECL(virDomainController) VIR_ENUM_DECL(virDomainControllerModel) VIR_ENUM_DECL(virDomainFS) +VIR_ENUM_DECL(virDomainFSMountSecurity) VIR_ENUM_DECL(virDomainNet) VIR_ENUM_DECL(virDomainChrDevice) VIR_ENUM_DECL(virDomainChrChannelTarget) diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index 18a302a..53ebe5a 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -2014,6 +2014,7 @@ qemuAssignDeviceAliases(virDomainDefPtr def, unsigned long long qemuCmdFlags) if (virAsprintf(&def->fss[i]->info.alias, "fs%d", i) < 0) goto no_memory; } + for (i = 0; i < def->nsounds ; i++) { if (virAsprintf(&def->sounds[i]->info.alias, "sound%d", i) < 0) goto no_memory; @@ -2783,11 +2784,15 @@ char *qemuBuildFSStr(virDomainFSDefPtr fs, if (fs->type != VIR_DOMAIN_FS_TYPE_MOUNT) { qemuReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("can only passthrough directories")); + _("only supports mount filesystem type")); goto error; } - virBufferAddLit(&opt, "local,security_model=passthrough"); + virBufferAddLit(&opt, "local"); + if (fs->mount_security == VIR_DOMAIN_FS_SECURITY_PASSTHROUGH) + virBufferAddLit(&opt, ",security_model=passthrough"); + else if (fs->mount_security == VIR_DOMAIN_FS_SECURITY_MAPPED) + virBufferAddLit(&opt, ",security_model=mapped"); virBufferVSprintf(&opt, ",id=%s%s", QEMU_FSDEV_HOST_PREFIX, fs->info.alias); virBufferVSprintf(&opt, ",path=%s", fs->src); -- 1.7.1.1

5 5