- Devel - libvirt List Archives

[libvirt] (no subject)
by cbley＠av-test.de 12 Oct '12

12 Oct '12

>From 2dfe78ef3c2e5e69bb41d8db02eb433379d12fda Mon Sep 17 00:00:00 2001 Message-Id: <2dfe78ef3c2e5e69bb41d8db02eb433379d12fda.1350037981.git.cbley(a)av-test.de> In-Reply-To: <cover.1350037981.git.cbley(a)av-test.de> References: <2DA6F4A3691599408358374D182280F9141CF6(a)xmb-rcd-x04.cisco.com> <cover.1350037981.git.cbley(a)av-test.de> From: cbley(a)av-test.de (Claudio Bley) Date: Mon, 20 Aug 2012 16:50:00 +0200 Subject: [PATCH 06/15] Change visibility of class members to private to enforce encapsulation. To: libvir-list(a)redhat.com Organization: AV-Test GmbH, Germany --- src/main/java/org/libvirt/Error.java | 24 +++++++++++------------ src/main/java/org/libvirt/LibvirtException.java | 2 +- src/main/java/org/libvirt/Stream.java | 2 +- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/main/java/org/libvirt/Error.java b/src/main/java/org/libvirt/Error.java index e3c3246..114e758 100644 --- a/src/main/java/org/libvirt/Error.java +++ b/src/main/java/org/libvirt/Error.java @@ -199,18 +199,18 @@ public class Error implements Serializable { */ private static final long serialVersionUID = -4780109197014633842L; - ErrorNumber code; - ErrorDomain domain; - String message; - ErrorLevel level; - ConnectionPointer VCP; /* Deprecated */ - DomainPointer VDP; /* Deprecated */ - String str1; - String str2; - String str3; - int int1; - int int2; - NetworkPointer VNP; /* Deprecated */ + private ErrorNumber code; + private ErrorDomain domain; + private String message; + private ErrorLevel level; + private ConnectionPointer VCP; /* Deprecated */ + private DomainPointer VDP; /* Deprecated */ + private String str1; + private String str2; + private String str3; + private int int1; + private int int2; + private NetworkPointer VNP; /* Deprecated */ public Error(virError vError) { code = code.wrap(vError.code); diff --git a/src/main/java/org/libvirt/LibvirtException.java b/src/main/java/org/libvirt/LibvirtException.java index 5bd2d6e..f9546be 100644 --- a/src/main/java/org/libvirt/LibvirtException.java +++ b/src/main/java/org/libvirt/LibvirtException.java @@ -11,7 +11,7 @@ public class LibvirtException extends Exception { private static final long serialVersionUID = 5566904363426773529L; - Error virError; + private Error virError; LibvirtException(Error virError) { super(virError.getMessage()); diff --git a/src/main/java/org/libvirt/Stream.java b/src/main/java/org/libvirt/Stream.java index 0056a78..06b67cf 100644 --- a/src/main/java/org/libvirt/Stream.java +++ b/src/main/java/org/libvirt/Stream.java @@ -12,7 +12,7 @@ public class Stream { /** * the native virStreamPtr. */ - StreamPointer VSP; + private StreamPointer VSP; /** * The Connect Object that represents the Hypervisor of this Domain -- AV-Test GmbH, Henricistraße 20, 04155 Leipzig, Germany Phone: +49 341 265 310 19 Web:<http://www.av-test.org> Eingetragen am / Registered at: Amtsgericht Stendal (HRB 114076) Geschaeftsfuehrer (CEO): Andreas Marx, Guido Habicht, Maik Morgenstern

1 0

[libvirt] (no subject)
by cbley＠av-test.de 12 Oct '12

12 Oct '12

>From ed6209290f9f2d03b26705ca3f9c03eb40309a94 Mon Sep 17 00:00:00 2001 Message-Id: <ed6209290f9f2d03b26705ca3f9c03eb40309a94.1350037981.git.cbley(a)av-test.de> In-Reply-To: <cover.1350037981.git.cbley(a)av-test.de> References: <2DA6F4A3691599408358374D182280F9141CF6(a)xmb-rcd-x04.cisco.com> <cover.1350037981.git.cbley(a)av-test.de> From: cbley(a)av-test.de (Claudio Bley) Date: Tue, 21 Aug 2012 16:31:12 +0200 Subject: [PATCH 09/15] Split JUnit tests and use a fixture for Connect. To: libvir-list(a)redhat.com Organization: AV-Test GmbH, Germany The tests have been separated into a test case requiring a libvirt connection and a test case which does not. Every test gets a new Connect instance by using a fixture. This avoids duplicate code and makes tests more consistent. --- build.xml | 9 ++-- src/test/java/org/libvirt/TestJavaBindings.java | 47 +++++++++++---------- src/test/java/org/libvirt/TestLibvirtGlobals.java | 21 +++++++++ 3 files changed, 51 insertions(+), 26 deletions(-) diff --git a/build.xml b/build.xml index 0b147b0..4b73562 100644 --- a/build.xml +++ b/build.xml @@ -49,11 +49,14 @@ </target> <target name="test" depends="build" description="tests the code"> - <junit printsummary="yes" fork="yes"> + <junit printsummary="yes" fork="yes" forkMode="perBatch"> <formatter type="plain" /> <classpath refid="test.classpath" /> - <test name="org.libvirt.TestJavaBindings" outfile="target/testResults"> - </test> + <batchtest todir="target"> + <fileset dir="src/test/java"> + <include name="**/Test*.java" /> + </fileset> + </batchtest> </junit> </target> diff --git a/src/test/java/org/libvirt/TestJavaBindings.java b/src/test/java/org/libvirt/TestJavaBindings.java index bac7a82..55ca64b 100644 --- a/src/test/java/org/libvirt/TestJavaBindings.java +++ b/src/test/java/org/libvirt/TestJavaBindings.java @@ -4,28 +4,35 @@ import java.util.UUID; import junit.framework.TestCase; -public class TestJavaBindings extends TestCase { - - int UUIDArray[] = { Integer.decode("0x00"), Integer.decode("0x4b"), Integer.decode("0x96"), Integer.decode("0xe1"), +public final class TestJavaBindings extends TestCase { + final int UUIDArray[] = { Integer.decode("0x00"), Integer.decode("0x4b"), Integer.decode("0x96"), Integer.decode("0xe1"), Integer.decode("0x2d"), Integer.decode("0x78"), Integer.decode("0xc3"), Integer.decode("0x0f"), Integer.decode("0x5a"), Integer.decode("0xa5"), Integer.decode("0xf0"), Integer.decode("0x3c"), Integer.decode("0x87"), Integer.decode("0xd2"), Integer.decode("0x1e"), Integer.decode("0x67") }; - public void testErrorCallback() throws Exception { + private Connect conn; + + protected void setUp() throws LibvirtException { + conn = new Connect("test:///default", false); + } + + protected void tearDown() throws LibvirtException { + conn.close(); + conn = null; + } + + public void testConnectionErrorCallback() throws LibvirtException { DummyErrorCallback cb = new DummyErrorCallback(); - Connect.setErrorCallback(cb); + conn.setConnectionErrorCallback(cb); + try { - Connect conn = new Connect("test:///someUrl", false); - } catch (Exception e) { - // eat it - } - assertTrue("We should have caught an error", cb.error); - Connect conn = new Connect("test:///default", false); - conn.setConnectionErrorCallback(cb) ; + conn.domainDefineXML("fail, miserably"); + } catch (LibvirtException e) {} // ignore + + assertTrue("Error callback was not called", cb.error); } public void testConnection() throws Exception { - Connect conn = new Connect("test:///default", false); assertEquals("conn.getType()", "Test", conn.getType()); assertEquals("conn.getURI()", "test:///default", conn.getURI()); assertEquals("conn.getMaxVcpus(xen)", 32, conn.getMaxVcpus("xen")); @@ -39,7 +46,6 @@ public class TestJavaBindings extends TestCase { } public void testNodeInfo() throws Exception { - Connect conn = new Connect("test:///default", false); NodeInfo nodeInfo = conn.nodeInfo(); assertEquals("nodeInfo.model", "i686", nodeInfo.model); assertEquals("nodeInfo.memory", 3145728, nodeInfo.memory); @@ -56,8 +62,6 @@ public class TestJavaBindings extends TestCase { } public void testNetworkCreate() throws Exception { - Connect conn = new Connect("test:///default", false); - Network network1 = conn.networkCreateXML("<network>" + " <name>createst</name>" + " <uuid>004b96e1-2d78-c30f-5aa5-f03c87d21e68</uuid>" + " <bridge name='createst'/>" + " <forward dev='eth0'/>" + " <ip address='192.168.66.1' netmask='255.255.255.0'>" + " <dhcp>" @@ -103,8 +107,6 @@ public class TestJavaBindings extends TestCase { } public void testDomainCreate() throws Exception { - Connect conn = new Connect("test:///default", false); - Domain dom1 = conn.domainDefineXML("<domain type='test' id='2'>" + " <name>deftest</name>" + " <uuid>004b96e1-2d78-c30f-5aa5-f03c87d21e70</uuid>" + " <memory>8388608</memory>" + " <vcpu>2</vcpu>" + " <os><type arch='i686'>hvm</type></os>" + " <on_reboot>restart</on_reboot>" @@ -129,7 +131,7 @@ public class TestJavaBindings extends TestCase { this.validateDomainData(conn.domainLookupByUUID(UUID.fromString("004b96e1-2d78-c30f-5aa5-f03c87d21e67"))); } - public void validateDomainData(Domain dom) throws Exception { + private void validateDomainData(Domain dom) throws Exception { assertEquals("dom.getName()", "createst", dom.getName()); assertEquals("dom.getMaxMemory()", 8388608, dom.getMaxMemory()); // Not supported by the test driver @@ -162,7 +164,6 @@ public class TestJavaBindings extends TestCase { } public void testInterfaces() throws Exception { - Connect conn = new Connect("test:///default", false); assertEquals("numOfInterfaces:", 1, conn.numOfInterfaces()); assertEquals("numOfInterfaces:", 0, conn.numOfDefinedInterfaces()); assertEquals("listDefinedInterfaces:", "eth1", conn.listInterfaces()[0]); @@ -188,18 +189,18 @@ public class TestJavaBindings extends TestCase { } public void testAccessAfterClose() throws Exception { - Connect conn = new Connect("test:///default", false); conn.close(); assertTrue("conn.isConnected should be false", !conn.isConnected()); + LibvirtException virException = null; try { conn.getHostName(); } catch (LibvirtException e) { - // eat it + virException = e; } + assertNotNull(virException); } public void testStoragePool() throws Exception { - Connect conn = new Connect("test:///default", false); StoragePool pool1 = conn.storagePoolDefineXML("<pool type='dir'>" + " <name>pool1</name>" + " <target>" diff --git a/src/test/java/org/libvirt/TestLibvirtGlobals.java b/src/test/java/org/libvirt/TestLibvirtGlobals.java new file mode 100644 index 0000000..b2b0d9f --- /dev/null +++ b/src/test/java/org/libvirt/TestLibvirtGlobals.java @@ -0,0 +1,21 @@ +package org.libvirt; + +import java.util.UUID; + +import junit.framework.TestCase; + +/** + * libvirt tests not requiring an active connection + */ +public class TestLibvirtGlobals extends TestCase { + public void testErrorCallback() throws Exception { + DummyErrorCallback cb = new DummyErrorCallback(); + Connect.setErrorCallback(cb); + try { + Connect conn = new Connect("test:///someUrl", false); + } catch (LibvirtException e) { + // eat it + } + assertTrue("We should have caught an error", cb.error); + } +} -- AV-Test GmbH, Henricistraße 20, 04155 Leipzig, Germany Phone: +49 341 265 310 19 Web:<http://www.av-test.org> Eingetragen am / Registered at: Amtsgericht Stendal (HRB 114076) Geschaeftsfuehrer (CEO): Andreas Marx, Guido Habicht, Maik Morgenstern

1 0

[libvirt] (no subject)
by cbley＠av-test.de 12 Oct '12

12 Oct '12

>From 36816ec8660c0bdf964d8d6e745754382c9f001f Mon Sep 17 00:00:00 2001 Message-Id: <36816ec8660c0bdf964d8d6e745754382c9f001f.1350037981.git.cbley(a)av-test.de> In-Reply-To: <cover.1350037981.git.cbley(a)av-test.de> References: <2DA6F4A3691599408358374D182280F9141CF6(a)xmb-rcd-x04.cisco.com> <cover.1350037981.git.cbley(a)av-test.de> From: cbley(a)av-test.de (Claudio Bley) Date: Thu, 23 Aug 2012 09:36:39 +0200 Subject: [PATCH 10/15] Split "build" target and automatically rebuild out of date files. To: libvir-list(a)redhat.com Organization: AV-Test GmbH, Germany The "build" target was split into these individual targets: "build" (default target) only compiles the main files "jar" packages the main files into a jar "buildtests" compiles the test classes The class files are rebuild when any of their dependent source file changed. --- build.xml | 27 +++++++++++++++++++++------ 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/build.xml b/build.xml index 4b73562..970b91a 100644 --- a/build.xml +++ b/build.xml @@ -33,6 +33,7 @@ <target name="init"> <mkdir dir="target/classes" /> <mkdir dir="target/testclasses" /> + <mkdir dir="target/cache" /> <copy file="README.in" tofile="README" overwrite="true" filtering="true"> <filterset filtersfile="build.properties" /> </copy> @@ -42,13 +43,27 @@ <delete dir="target" /> </target> - <target name="build" depends="init" description="builds the code and jar files"> - <javac srcdir="src/main/java" debug="${javac.debug}" includes="**/*.java" classpathref="compile.classpath" destdir="target/classes" includeAntRuntime="false" /> - <javac srcdir="src/test/java" debug="${javac.debug}" includes="**/*.java" classpathref="test.classpath" destdir="target/testclasses" includeAntRuntime="false" /> + <target name="jar" description="build the jar" depends="build"> <jar destfile="${jar.file}" basedir="target/classes" /> </target> - <target name="test" depends="build" description="tests the code"> + <target name="buildtests" description="build test classes" depends="build"> + <depend srcdir="src/test/java" + destdir="target/testclasses" + cache="target/cache" + closure="true" /> + <javac srcdir="src/test/java" debug="${javac.debug}" includes="**/*.java" classpathref="test.classpath" destdir="target/testclasses" includeAntRuntime="false" /> + </target> + + <target name="build" depends="init" description="builds the code"> + <depend srcdir="src/main/java" + destdir="target/classes" + cache="target/cache" + closure="true" /> + <javac srcdir="src/main/java" debug="${javac.debug}" includes="**/*.java" classpathref="compile.classpath" destdir="target/classes" includeAntRuntime="false" /> + </target> + + <target name="test" depends="buildtests" description="tests the code"> <junit printsummary="yes" fork="yes" forkMode="perBatch"> <formatter type="plain" /> <classpath refid="test.classpath" /> @@ -81,7 +96,7 @@ </copy> </target> - <target name="deb" depends="build" description="build a debian Debian package"> + <target name="deb" depends="build,jar" description="build a debian Debian package"> <mkdir dir="${debian.pkgdir}/DEBIAN" /> <copy file="debian/control.in" tofile="${debian.controlfile}" overwrite="true" filtering="true"> <filterset filtersfile="build.properties" /> @@ -103,7 +118,7 @@ <rpm specfile="${spec}" command="-ba" topdir="${rpm.topdir}" /> </target> - <target name="maven" depends="build,docs,src" description="publish the maven repo"> + <target name="maven" depends="build,jar,docs,src" description="publish the maven repo"> <mkdir dir="target/repo" /> <get src="http://repo1.maven.org/maven2/org/apache/maven/maven-ant-tasks/2.1.3/maven-…" dest="target/maven-ant-tasks-2.1.3.jar" /> <copy file="pom.xml.in" tofile="target/pom.xml" overwrite="true" filtering="true"> -- AV-Test GmbH, Henricistraße 20, 04155 Leipzig, Germany Phone: +49 341 265 310 19 Web:<http://www.av-test.org> Eingetragen am / Registered at: Amtsgericht Stendal (HRB 114076) Geschaeftsfuehrer (CEO): Andreas Marx, Guido Habicht, Maik Morgenstern

1 0

[libvirt] (no subject)
by cbley＠av-test.de 12 Oct '12

12 Oct '12

>From 285e443aa24cde2324380ebeac83c97efc456f94 Mon Sep 17 00:00:00 2001 Message-Id: <285e443aa24cde2324380ebeac83c97efc456f94.1350037981.git.cbley(a)av-test.de> In-Reply-To: <cover.1350037981.git.cbley(a)av-test.de> References: <2DA6F4A3691599408358374D182280F9141CF6(a)xmb-rcd-x04.cisco.com> <cover.1350037981.git.cbley(a)av-test.de> From: cbley(a)av-test.de (Claudio Bley) Date: Thu, 11 Oct 2012 14:58:57 +0200 Subject: [PATCH 15/15] Explicitely define the order of a struct's fields. To: libvir-list(a)redhat.com Organization: AV-Test GmbH, Germany The latest JNA version requires us to define the order of the fields in a struct explicitely because the JVM does not guarantee the order of the fields returned by Class.getFields(). --- src/main/java/org/libvirt/jna/virConnectAuth.java | 10 ++++++++++ .../java/org/libvirt/jna/virConnectCredential.java | 12 ++++++++++++ .../java/org/libvirt/jna/virDomainBlockInfo.java | 8 ++++++++ .../java/org/libvirt/jna/virDomainBlockStats.java | 11 +++++++++++ src/main/java/org/libvirt/jna/virDomainInfo.java | 11 +++++++++++ .../org/libvirt/jna/virDomainInterfaceStats.java | 13 +++++++++++++ .../java/org/libvirt/jna/virDomainJobInfo.java | 18 ++++++++++++++++++ .../java/org/libvirt/jna/virDomainMemoryStats.java | 7 +++++++ src/main/java/org/libvirt/jna/virError.java | 19 +++++++++++++++++++ src/main/java/org/libvirt/jna/virNodeInfo.java | 15 +++++++++++++++ .../java/org/libvirt/jna/virSchedParameter.java | 9 +++++++++ .../java/org/libvirt/jna/virStoragePoolInfo.java | 10 ++++++++++ .../java/org/libvirt/jna/virStorageVolInfo.java | 8 ++++++++ src/main/java/org/libvirt/jna/virVcpuInfo.java | 9 +++++++++ 14 files changed, 160 insertions(+) diff --git a/src/main/java/org/libvirt/jna/virConnectAuth.java b/src/main/java/org/libvirt/jna/virConnectAuth.java index 74dd65c..f805b89 100644 --- a/src/main/java/org/libvirt/jna/virConnectAuth.java +++ b/src/main/java/org/libvirt/jna/virConnectAuth.java @@ -3,6 +3,9 @@ package org.libvirt.jna; import com.sun.jna.Pointer; import com.sun.jna.Structure; +import java.util.List; +import java.util.Arrays; + /** * JNA mapping for the virConnectAuth structure */ @@ -11,4 +14,11 @@ public class virConnectAuth extends Structure { public int ncredtype; public Libvirt.VirConnectAuthCallback cb; public Pointer cbdata; + + protected List getFieldOrder() { + return Arrays.asList("credtype", + "ncredtype", + "cb", + "cbdata"); + } } diff --git a/src/main/java/org/libvirt/jna/virConnectCredential.java b/src/main/java/org/libvirt/jna/virConnectCredential.java index ba47482..7a750d1 100644 --- a/src/main/java/org/libvirt/jna/virConnectCredential.java +++ b/src/main/java/org/libvirt/jna/virConnectCredential.java @@ -2,6 +2,9 @@ package org.libvirt.jna; import com.sun.jna.Structure; +import java.util.List; +import java.util.Arrays; + /** * JNA mapping for the virConnectCredential structure */ @@ -13,4 +16,13 @@ public class virConnectCredential extends Structure implements Structure.ByRefer // public Pointer result; public String result; public int resultlen; + + protected List getFieldOrder() { + return Arrays.asList("type", + "prompt", + "challenge", + "defresult", + "result", + "resultlen"); + } } diff --git a/src/main/java/org/libvirt/jna/virDomainBlockInfo.java b/src/main/java/org/libvirt/jna/virDomainBlockInfo.java index 234a381..fdf8bb1 100644 --- a/src/main/java/org/libvirt/jna/virDomainBlockInfo.java +++ b/src/main/java/org/libvirt/jna/virDomainBlockInfo.java @@ -2,9 +2,17 @@ package org.libvirt.jna; import com.sun.jna.Structure; +import java.util.List; +import java.util.Arrays; + public class virDomainBlockInfo extends Structure { public long capacity; public long allocation; public long physical; + protected List getFieldOrder() { + return Arrays.asList("capacity", + "allocation", + "physical"); + } } diff --git a/src/main/java/org/libvirt/jna/virDomainBlockStats.java b/src/main/java/org/libvirt/jna/virDomainBlockStats.java index f29dba0..c7f0d8c 100644 --- a/src/main/java/org/libvirt/jna/virDomainBlockStats.java +++ b/src/main/java/org/libvirt/jna/virDomainBlockStats.java @@ -2,6 +2,9 @@ package org.libvirt.jna; import com.sun.jna.Structure; +import java.util.List; +import java.util.Arrays; + /** * JNA mapping for the virDomainBlockStats structure */ @@ -16,4 +19,12 @@ public class virDomainBlockStats extends Structure { // is correct public long errs; // this is a long long in the code, so a long mapping is // correct + + protected List getFieldOrder() { + return Arrays.asList("rd_req", + "rd_bytes", + "wr_req", + "wr_bytes", + "errs"); + } } diff --git a/src/main/java/org/libvirt/jna/virDomainInfo.java b/src/main/java/org/libvirt/jna/virDomainInfo.java index a93c0a5..8525f37 100644 --- a/src/main/java/org/libvirt/jna/virDomainInfo.java +++ b/src/main/java/org/libvirt/jna/virDomainInfo.java @@ -3,6 +3,9 @@ package org.libvirt.jna; import com.sun.jna.NativeLong; import com.sun.jna.Structure; +import java.util.List; +import java.util.Arrays; + /** * JNA mapping for the virDomainInfo structure */ @@ -12,4 +15,12 @@ public class virDomainInfo extends Structure { public NativeLong memory; public short nrVirtCpu; public long cpuTime; + + protected List getFieldOrder() { + return Arrays.asList("state", + "maxMem", + "memory", + "nrVirtCpu", + "cpuTime"); + } } diff --git a/src/main/java/org/libvirt/jna/virDomainInterfaceStats.java b/src/main/java/org/libvirt/jna/virDomainInterfaceStats.java index 1cb0e66..39ceb52 100644 --- a/src/main/java/org/libvirt/jna/virDomainInterfaceStats.java +++ b/src/main/java/org/libvirt/jna/virDomainInterfaceStats.java @@ -2,6 +2,9 @@ package org.libvirt.jna; import com.sun.jna.Structure; +import java.util.List; +import java.util.Arrays; + /** * JNA mapping for the virDomainInterfaceStats structure */ @@ -23,4 +26,14 @@ public class virDomainInterfaceStats extends Structure { public long tx_drop; // this is a long long in the code, so a long mapping // is correct + protected List getFieldOrder() { + return Arrays.asList("rx_bytes", + "rx_packets", + "rx_errs", + "rx_drop", + "tx_bytes", + "tx_packets", + "tx_errs", + "tx_drop"); + } } diff --git a/src/main/java/org/libvirt/jna/virDomainJobInfo.java b/src/main/java/org/libvirt/jna/virDomainJobInfo.java index 98b4f59..f8b63e0 100644 --- a/src/main/java/org/libvirt/jna/virDomainJobInfo.java +++ b/src/main/java/org/libvirt/jna/virDomainJobInfo.java @@ -2,6 +2,9 @@ package org.libvirt.jna; import com.sun.jna.Structure; +import java.util.List; +import java.util.Arrays; + public class virDomainJobInfo extends Structure { public int type; public long timeElapsed; @@ -15,4 +18,19 @@ public class virDomainJobInfo extends Structure { public long fileTotal; public long fileProcessed; public long fileRemaining; + + protected List getFieldOrder() { + return Arrays.asList("type", + "timeElapsed", + "timeRemaining", + "dataTotal", + "dataProcessed", + "dataRemaining", + "memTotal", + "memProcessed", + "memRemaining", + "fileTotal", + "fileProcessed", + "fileRemaining"); + } } diff --git a/src/main/java/org/libvirt/jna/virDomainMemoryStats.java b/src/main/java/org/libvirt/jna/virDomainMemoryStats.java index 7a9f5d2..1d4e075 100644 --- a/src/main/java/org/libvirt/jna/virDomainMemoryStats.java +++ b/src/main/java/org/libvirt/jna/virDomainMemoryStats.java @@ -2,7 +2,14 @@ package org.libvirt.jna; import com.sun.jna.Structure; +import java.util.List; +import java.util.Arrays; + public class virDomainMemoryStats extends Structure { public int tag ; public long val ; + + protected List getFieldOrder() { + return Arrays.asList("tag", "val"); + } } diff --git a/src/main/java/org/libvirt/jna/virError.java b/src/main/java/org/libvirt/jna/virError.java index e2580dd..b3fad6d 100644 --- a/src/main/java/org/libvirt/jna/virError.java +++ b/src/main/java/org/libvirt/jna/virError.java @@ -3,6 +3,9 @@ package org.libvirt.jna; import com.sun.jna.Pointer; import com.sun.jna.Structure; +import java.util.List; +import java.util.Arrays; + /** * JNA mapping for the virError structure */ @@ -19,4 +22,20 @@ public class virError extends Structure { public int int1; public int int2; public NetworkPointer net; + + protected List getFieldOrder() { + return Arrays.asList( + "code", + "domain", + "message", + "level", + "conn", + "dom", + "str1", + "str2", + "str3", + "int1", + "int2", + "net"); + } } diff --git a/src/main/java/org/libvirt/jna/virNodeInfo.java b/src/main/java/org/libvirt/jna/virNodeInfo.java index 532aad9..6f0d002 100644 --- a/src/main/java/org/libvirt/jna/virNodeInfo.java +++ b/src/main/java/org/libvirt/jna/virNodeInfo.java @@ -3,6 +3,9 @@ package org.libvirt.jna; import com.sun.jna.NativeLong; import com.sun.jna.Structure; +import java.util.List; +import java.util.Arrays; + /** * JNA mapping for the virNodeInfo structure */ @@ -21,4 +24,16 @@ public class virNodeInfo extends Structure { public int sockets; public int cores; public int threads; + + protected List getFieldOrder() { + return Arrays.asList( + "model", + "memory", + "cpus", + "mhz", + "nodes", + "sockets", + "cores", + "threads"); + } } \ No newline at end of file diff --git a/src/main/java/org/libvirt/jna/virSchedParameter.java b/src/main/java/org/libvirt/jna/virSchedParameter.java index 0013fff..e213f04 100644 --- a/src/main/java/org/libvirt/jna/virSchedParameter.java +++ b/src/main/java/org/libvirt/jna/virSchedParameter.java @@ -2,6 +2,9 @@ package org.libvirt.jna; import com.sun.jna.Structure; +import java.util.List; +import java.util.Arrays; + /** * JNA mapping for the virSchedParameter structure */ @@ -9,4 +12,10 @@ public class virSchedParameter extends Structure { public byte field[] = new byte[Libvirt.VIR_DOMAIN_SCHED_FIELD_LENGTH]; public int type; public virSchedParameterValue value; + + protected List getFieldOrder() { + return Arrays.asList("field", + "type", + "value"); + } } diff --git a/src/main/java/org/libvirt/jna/virStoragePoolInfo.java b/src/main/java/org/libvirt/jna/virStoragePoolInfo.java index 5a98e08..860b78e 100644 --- a/src/main/java/org/libvirt/jna/virStoragePoolInfo.java +++ b/src/main/java/org/libvirt/jna/virStoragePoolInfo.java @@ -2,6 +2,9 @@ package org.libvirt.jna; import com.sun.jna.Structure; +import java.util.List; +import java.util.Arrays; + /** * JNA mapping for the virStoragePoolInfo structure */ @@ -13,4 +16,11 @@ public class virStoragePoolInfo extends Structure { // mapping is correct public long available; // this is a long long in the code, so a long mapping // is correct + + protected List getFieldOrder() { + return Arrays.asList("state", + "capacity", + "allocation", + "available"); + } } diff --git a/src/main/java/org/libvirt/jna/virStorageVolInfo.java b/src/main/java/org/libvirt/jna/virStorageVolInfo.java index db8a5bd..d07b22e 100644 --- a/src/main/java/org/libvirt/jna/virStorageVolInfo.java +++ b/src/main/java/org/libvirt/jna/virStorageVolInfo.java @@ -2,6 +2,9 @@ package org.libvirt.jna; import com.sun.jna.Structure; +import java.util.List; +import java.util.Arrays; + /** * JNA mapping for the virStorageVolInfo structure */ @@ -12,4 +15,9 @@ public class virStorageVolInfo extends Structure { public long allocation; // this is a long long in the code, so a long // mapping is correct + protected List getFieldOrder() { + return Arrays.asList("type", + "capacity", + "allocation"); + } } \ No newline at end of file diff --git a/src/main/java/org/libvirt/jna/virVcpuInfo.java b/src/main/java/org/libvirt/jna/virVcpuInfo.java index 16f237d..7bf3448 100644 --- a/src/main/java/org/libvirt/jna/virVcpuInfo.java +++ b/src/main/java/org/libvirt/jna/virVcpuInfo.java @@ -2,6 +2,9 @@ package org.libvirt.jna; import com.sun.jna.Structure; +import java.util.List; +import java.util.Arrays; + /** * JNA mapping for the virVcpuInfo structure */ @@ -12,4 +15,10 @@ public class virVcpuInfo extends Structure { // is correct public int cpu; + protected List getFieldOrder() { + return Arrays.asList("number", + "state", + "cpuTime", + "cpu"); + } } -- AV-Test GmbH, Henricistraße 20, 04155 Leipzig, Germany Phone: +49 341 265 310 19 Web:<http://www.av-test.org> Eingetragen am / Registered at: Amtsgericht Stendal (HRB 114076) Geschaeftsfuehrer (CEO): Andreas Marx, Guido Habicht, Maik Morgenstern

1 0

[libvirt] (no subject)
by cbley＠av-test.de 12 Oct '12

12 Oct '12

>From 7c51b39360f49bb06d36abafe68a9e0ca40556ae Mon Sep 17 00:00:00 2001 Message-Id: <7c51b39360f49bb06d36abafe68a9e0ca40556ae.1350037981.git.cbley(a)av-test.de> In-Reply-To: <cover.1350037981.git.cbley(a)av-test.de> References: <2DA6F4A3691599408358374D182280F9141CF6(a)xmb-rcd-x04.cisco.com> <cover.1350037981.git.cbley(a)av-test.de> From: cbley(a)av-test.de (Claudio Bley) Date: Wed, 10 Oct 2012 11:03:34 +0200 Subject: [PATCH 13/15] Fix memory leaks for libvirt functions returning newly allocated memory. To: libvir-list(a)redhat.com Organization: AV-Test GmbH, Germany Use JNA's Native.free() method to free memory. This requires JNA version 3.3.0 or later. Remove virFree from Libvirt interface. --- src/main/java/org/libvirt/Connect.java | 109 ++++++++++++++++++---------- src/main/java/org/libvirt/Domain.java | 24 ++++-- src/main/java/org/libvirt/Interface.java | 10 ++- src/main/java/org/libvirt/Library.java | 62 ++++++++++++++++ src/main/java/org/libvirt/Network.java | 17 ++++- src/main/java/org/libvirt/jna/Libvirt.java | 37 +++++----- 6 files changed, 187 insertions(+), 72 deletions(-) diff --git a/src/main/java/org/libvirt/Connect.java b/src/main/java/org/libvirt/Connect.java index ae306d6..a775ce1 100644 --- a/src/main/java/org/libvirt/Connect.java +++ b/src/main/java/org/libvirt/Connect.java @@ -19,6 +19,7 @@ import static org.libvirt.Library.libvirt; import com.sun.jna.Memory; import com.sun.jna.NativeLong; +import com.sun.jna.Pointer; import com.sun.jna.ptr.LongByReference; /** @@ -510,8 +511,12 @@ public class Connect { * description</a> */ public String getCapabilities() throws LibvirtException { - String returnValue = libvirt.virConnectGetCapabilities(VCP); - return processError(returnValue); + Pointer ptr = processError(libvirt.virConnectGetCapabilities(VCP)); + try { + return Library.getString(ptr); + } finally { + Library.free(ptr); + } } /** @@ -545,7 +550,12 @@ public class Connect { * @throws LibvirtException */ public String getHostName() throws LibvirtException { - return processError(libvirt.virConnectGetHostname(VCP)); + Pointer ptr = processError(libvirt.virConnectGetHostname(VCP)); + try { + return Library.getString(ptr); + } finally { + Library.free(ptr); + } } /** @@ -701,11 +711,13 @@ public class Connect { */ public String[] listDefinedDomains() throws LibvirtException { int maxnames = numOfDefinedDomains(); - String[] names = new String[maxnames]; if (maxnames > 0) { - processError(libvirt.virConnectListDefinedDomains(VCP, names, maxnames)); + final Pointer[] names = new Pointer[maxnames]; + final int n = processError(libvirt.virConnectListDefinedDomains(VCP, names, maxnames)); + return Library.toStringArray(names, n); + } else { + return Library.NO_STRINGS; } - return names; } /** @@ -716,12 +728,14 @@ public class Connect { * @throws LibvirtException */ public String[] listDefinedInterfaces() throws LibvirtException { - int num = numOfDefinedInterfaces(); - String[] returnValue = new String[num]; - if (num > 0) { - processError(libvirt.virConnectListDefinedInterfaces(VCP, returnValue, num)); + final int max = numOfDefinedInterfaces(); + if (max > 0) { + final Pointer[] ifs = new Pointer[max]; + final int n = processError(libvirt.virConnectListDefinedInterfaces(VCP, ifs, max)); + return Library.toStringArray(ifs, n); + } else { + return Library.NO_STRINGS; } - return returnValue; } /** @@ -733,12 +747,13 @@ public class Connect { */ public String[] listDefinedNetworks() throws LibvirtException { int maxnames = numOfDefinedNetworks(); - String[] names = new String[maxnames]; - if (maxnames > 0) { - processError(libvirt.virConnectListDefinedNetworks(VCP, names, maxnames)); + final Pointer[] names = new Pointer[maxnames]; + final int n = processError(libvirt.virConnectListDefinedNetworks(VCP, names, maxnames)); + return Library.toStringArray(names, n); + } else { + return Library.NO_STRINGS; } - return names; } /** @@ -750,9 +765,13 @@ public class Connect { */ public String[] listDefinedStoragePools() throws LibvirtException { int num = numOfDefinedStoragePools(); - String[] returnValue = new String[num]; - processError(libvirt.virConnectListDefinedStoragePools(VCP, returnValue, num)); - return returnValue; + if (num > 0) { + Pointer[] pools = new Pointer[num]; + final int n = processError(libvirt.virConnectListDefinedStoragePools(VCP, pools, num)); + return Library.toStringArray(pools, n); + } else { + return Library.NO_STRINGS; + } } /** @@ -763,12 +782,13 @@ public class Connect { */ public String[] listDevices(String capabilityName) throws LibvirtException { int maxDevices = numOfDevices(capabilityName); - String[] names = new String[maxDevices]; - if (maxDevices > 0) { - processError(libvirt.virNodeListDevices(VCP, capabilityName, names, maxDevices, 0)); + Pointer[] names = new Pointer[maxDevices]; + final int n = processError(libvirt.virNodeListDevices(VCP, capabilityName, names, maxDevices, 0)); + return Library.toStringArray(names, n); + } else { + return Library.NO_STRINGS; } - return names; } /** @@ -796,11 +816,13 @@ public class Connect { */ public String[] listInterfaces() throws LibvirtException { int num = numOfInterfaces(); - String[] returnValue = new String[num]; if (num > 0) { - processError(libvirt.virConnectListInterfaces(VCP, returnValue, num)); + Pointer[] ifs = new Pointer[num]; + final int n = processError(libvirt.virConnectListInterfaces(VCP, ifs, num)); + return Library.toStringArray(ifs, n); + } else { + return Library.NO_STRINGS; } - return returnValue; } /** @@ -811,11 +833,13 @@ public class Connect { */ public String[] listNetworkFilters() throws LibvirtException { int maxnames = numOfNetworkFilters(); - String[] names = new String[maxnames]; if (maxnames > 0) { - processError(libvirt.virConnectListNWFilters(VCP, names, maxnames)); + Pointer[] names = new Pointer[maxnames]; + final int n = processError(libvirt.virConnectListNWFilters(VCP, names, maxnames)); + return Library.toStringArray(names, n); + } else { + return Library.NO_STRINGS; } - return names; } /** @@ -827,12 +851,13 @@ public class Connect { */ public String[] listNetworks() throws LibvirtException { int maxnames = numOfNetworks(); - String[] names = new String[maxnames]; - if (maxnames > 0) { - processError(libvirt.virConnectListNetworks(VCP, names, maxnames)); + Pointer[] names = new Pointer[maxnames]; + final int n = processError(libvirt.virConnectListNetworks(VCP, names, maxnames)); + return Library.toStringArray(names, n); + } else { + return Library.NO_STRINGS; } - return names; } /** @@ -843,9 +868,13 @@ public class Connect { */ public String[] listSecrets() throws LibvirtException { int num = numOfSecrets(); - String[] returnValue = new String[num]; - processError(libvirt.virConnectListSecrets(VCP, returnValue, num)); - return returnValue; + if (num > 0) { + Pointer[] returnValue = new Pointer[num]; + final int n = processError(libvirt.virConnectListSecrets(VCP, returnValue, num)); + return Library.toStringArray(returnValue, n); + } else { + return Library.NO_STRINGS; + } } /** @@ -857,9 +886,13 @@ public class Connect { */ public String[] listStoragePools() throws LibvirtException { int num = numOfStoragePools(); - String[] returnValue = new String[num]; - processError(libvirt.virConnectListStoragePools(VCP, returnValue, num)); - return returnValue; + if (num > 0) { + Pointer[] returnValue = new Pointer[num]; + final int n = processError(libvirt.virConnectListStoragePools(VCP, returnValue, num)); + return Library.toStringArray(returnValue, n); + } else { + return Library.NO_STRINGS; + } } /** diff --git a/src/main/java/org/libvirt/Domain.java b/src/main/java/org/libvirt/Domain.java index 45fba26..1c86bd4 100644 --- a/src/main/java/org/libvirt/Domain.java +++ b/src/main/java/org/libvirt/Domain.java @@ -426,9 +426,13 @@ public class Domain { * @throws LibvirtException */ public String getOSType() throws LibvirtException { - String returnValue = libvirt.virDomainGetOSType(VDP); + Pointer ptr = libvirt.virDomainGetOSType(VDP); processError(); - return returnValue; + try { + return Library.getString(ptr); + } finally { + Library.free(ptr); + } } /** @@ -443,8 +447,8 @@ public class Domain { Pointer pScheduler = libvirt.virDomainGetSchedulerType(VDP, nParams); processError(); if (pScheduler != null) { - String scheduler = pScheduler.getString(0); - libvirt.virFree(new PointerByReference(pScheduler)); + String scheduler = Library.getString(pScheduler); + Library.free(pScheduler); virSchedParameter[] nativeParams = new virSchedParameter[nParams.getValue()]; returnValue = new SchedParameter[nParams.getValue()]; libvirt.virDomainGetSchedulerParameters(VDP, nativeParams, nParams); @@ -472,8 +476,8 @@ public class Domain { Pointer pScheduler = libvirt.virDomainGetSchedulerType(VDP, nParams); processError(); String[] array = new String[1]; - array[0] = pScheduler.getString(0); - libvirt.virFree(new PointerByReference(pScheduler)); + array[0] = Library.getString(pScheduler); + Library.free(pScheduler); return array; } @@ -569,9 +573,13 @@ public class Domain { * Description format </a> */ public String getXMLDesc(int flags) throws LibvirtException { - String returnValue = libvirt.virDomainGetXMLDesc(VDP, flags); + Pointer ptr = libvirt.virDomainGetXMLDesc(VDP, flags); processError(); - return returnValue; + try { + return Library.getString(ptr); + } finally { + Library.free(ptr); + } } /** diff --git a/src/main/java/org/libvirt/Interface.java b/src/main/java/org/libvirt/Interface.java index 684adca..71ba3da 100644 --- a/src/main/java/org/libvirt/Interface.java +++ b/src/main/java/org/libvirt/Interface.java @@ -4,6 +4,8 @@ import org.libvirt.jna.InterfacePointer; import org.libvirt.jna.Libvirt; import static org.libvirt.Library.libvirt; +import com.sun.jna.Pointer; + /** * A device which is attached to a node */ @@ -113,9 +115,13 @@ public class Interface { * @throws LibvirtException */ public String getXMLDescription(int flags) throws LibvirtException { - String xml = libvirt.virInterfaceGetXMLDesc(VIP, flags); + Pointer xml = libvirt.virInterfaceGetXMLDesc(VIP, flags); processError(); - return xml; + try { + return Library.getString(xml); + } finally { + Library.free(xml); + } } /** diff --git a/src/main/java/org/libvirt/Library.java b/src/main/java/org/libvirt/Library.java index 035ed06..0136095 100644 --- a/src/main/java/org/libvirt/Library.java +++ b/src/main/java/org/libvirt/Library.java @@ -2,15 +2,25 @@ package org.libvirt; import org.libvirt.jna.Libvirt; +import com.sun.jna.Native; +import com.sun.jna.Pointer; + /** * This class represents an instance of the JNA mapped libvirt * library. * * The library will get loaded when first accessing this class. + * + * Additionally, this class contains internal methods to ease + * implementing the public API. */ final class Library { final static Libvirt libvirt; + // an empty string array constant + // prefer this over creating empty arrays dynamically. + final static String[] NO_STRINGS = {}; + // Load the native part static { Libvirt.INSTANCE.virInitialize(); @@ -23,4 +33,56 @@ final class Library { } private Library() {} + + /** + * Free memory pointed to by ptr. + */ + static void free(Pointer ptr) { + Native.free(Pointer.nativeValue(ptr)); + Pointer.nativeValue(ptr, 0L); + } + + /** + * Convert the data pointed to by {@code ptr} to a String. + */ + static String getString(Pointer ptr) { + final long len = ptr.indexOf(0, (byte)0); + assert (len != -1): "C-Strings must be \\0 terminated."; + + final byte[] data = ptr.getByteArray(0, (int)len); + try { + return new String(data, "utf-8"); + } catch (java.io.UnsupportedEncodingException e) { + throw new RuntimeException("Libvirt problem: UTF-8 decoding error.", e); + } + } + + /** + * Calls {@link #toStringArray(Pointer[], int)}. + */ + static String[] toStringArray(Pointer[] ptrArr) { + return toStringArray(ptrArr, ptrArr.length); + } + + /** + * Convert the given array of native pointers to "char" in + * UTF-8 encoding to an array of Strings. + * + * \note The memory used by the elements of the original array + * is freed and ptrArr is modified. + */ + static String[] toStringArray(Pointer[] ptrArr, final int size) { + try { + final String[] result = new String[size]; + for (int i = 0; i < size; ++i) { + result[i] = Library.getString(ptrArr[i]); + } + return result; + } finally { + for (int i = 0; i < size; ++i) { + Library.free(ptrArr[i]); + ptrArr[i] = null; + } + } + } } diff --git a/src/main/java/org/libvirt/Network.java b/src/main/java/org/libvirt/Network.java index bdb0d78..2244c5d 100644 --- a/src/main/java/org/libvirt/Network.java +++ b/src/main/java/org/libvirt/Network.java @@ -5,6 +5,7 @@ import org.libvirt.jna.NetworkPointer; import static org.libvirt.Library.libvirt; import com.sun.jna.Native; +import com.sun.jna.Pointer; import com.sun.jna.ptr.IntByReference; /** @@ -105,9 +106,13 @@ public class Network { * @throws LibvirtException */ public String getBridgeName() throws LibvirtException { - String returnValue = libvirt.virNetworkGetBridgeName(VNP); + final Pointer ptr = libvirt.virNetworkGetBridgeName(VNP); processError(); - return returnValue; + try { + return Library.getString(ptr); + } finally { + Library.free(ptr); + } } /** @@ -178,9 +183,13 @@ public class Network { * @throws LibvirtException */ public String getXMLDesc(int flags) throws LibvirtException { - String returnValue = libvirt.virNetworkGetXMLDesc(VNP, flags); + Pointer ptr = libvirt.virNetworkGetXMLDesc(VNP, flags); processError(); - return returnValue; + try { + return Library.getString(ptr); + } finally { + Library.free(ptr); + } } /** diff --git a/src/main/java/org/libvirt/jna/Libvirt.java b/src/main/java/org/libvirt/jna/Libvirt.java index be0de3b..5d2a291 100644 --- a/src/main/java/org/libvirt/jna/Libvirt.java +++ b/src/main/java/org/libvirt/jna/Libvirt.java @@ -56,9 +56,6 @@ import com.sun.jna.ptr.PointerByReference; * */ public interface Libvirt extends Library { - // Memory management - void virFree(PointerByReference ptr); - // Callbacks /** * Callback interface for authorization @@ -126,23 +123,23 @@ public interface Libvirt extends Library { int virConnectIsEncrypted(ConnectionPointer virConnectPtr) ; int virConnectIsSecure(ConnectionPointer virConnectPtr) ; String virConnectFindStoragePoolSources(ConnectionPointer virConnectPtr, String type, String srcSpec, int flags); - String virConnectGetCapabilities(ConnectionPointer virConnectPtr); - String virConnectGetHostname(ConnectionPointer virConnectPtr); + Pointer virConnectGetCapabilities(ConnectionPointer virConnectPtr); + Pointer virConnectGetHostname(ConnectionPointer virConnectPtr); int virConnectGetLibVersion(ConnectionPointer virConnectPtr, LongByReference libVer); int virConnectGetMaxVcpus(ConnectionPointer virConnectPtr, String type); String virConnectGetType(ConnectionPointer virConnectPtr); String virConnectGetURI(ConnectionPointer virConnectPtr); int virConnectGetVersion(ConnectionPointer virConnectPtr, LongByReference hvVer); - int virConnectListDefinedDomains(ConnectionPointer virConnectPtr, String[] name, int maxnames); - int virConnectListDefinedNetworks(ConnectionPointer virConnectPtr, String[] name, int maxnames); - int virConnectListDefinedStoragePools(ConnectionPointer virConnectPtr, String[] names, int maxnames); - int virConnectListDefinedInterfaces(ConnectionPointer virConnectPtr, String[] name, int maxNames); + int virConnectListDefinedDomains(ConnectionPointer virConnectPtr, Pointer[] name, int maxnames); + int virConnectListDefinedNetworks(ConnectionPointer virConnectPtr, Pointer[] name, int maxnames); + int virConnectListDefinedStoragePools(ConnectionPointer virConnectPtr, Pointer[] names, int maxnames); + int virConnectListDefinedInterfaces(ConnectionPointer virConnectPtr, Pointer[] name, int maxNames); int virConnectListDomains(ConnectionPointer virConnectPtr, int[] ids, int maxnames); - int virConnectListInterfaces(ConnectionPointer virConnectPtr, String[] name, int maxNames); - int virConnectListNetworks(ConnectionPointer virConnectPtr, String[] name, int maxnames); - int virConnectListNWFilters(ConnectionPointer virConnectPtr, String[] name, int maxnames); - int virConnectListSecrets(ConnectionPointer virConnectPtr, String[] uids, int maxUids); - int virConnectListStoragePools(ConnectionPointer virConnectPtr, String[] names, int maxnames); + int virConnectListInterfaces(ConnectionPointer virConnectPtr, Pointer[] name, int maxNames); + int virConnectListNetworks(ConnectionPointer virConnectPtr, Pointer[] name, int maxnames); + int virConnectListNWFilters(ConnectionPointer virConnectPtr, Pointer[] name, int maxnames); + int virConnectListSecrets(ConnectionPointer virConnectPtr, Pointer[] uids, int maxUids); + int virConnectListStoragePools(ConnectionPointer virConnectPtr, Pointer[] names, int maxnames); int virConnectNumOfDefinedDomains(ConnectionPointer virConnectPtr); int virConnectNumOfDefinedNetworks(ConnectionPointer virConnectPtr); int virConnectNumOfDefinedInterfaces(ConnectionPointer virConnectPtr); @@ -203,14 +200,14 @@ public interface Libvirt extends Library { NativeLong virDomainGetMaxMemory(DomainPointer virDomainPtr); int virDomainGetMaxVcpus(DomainPointer virDomainPtr); String virDomainGetName(DomainPointer virDomainPtr); - String virDomainGetOSType(DomainPointer virDomainPtr); + Pointer virDomainGetOSType(DomainPointer virDomainPtr); int virDomainGetSchedulerParameters(DomainPointer virDomainPtr, virSchedParameter[] params, IntByReference nparams); Pointer virDomainGetSchedulerType(DomainPointer virDomainPtr, IntByReference nparams); int virDomainGetUUID(DomainPointer virDomainPtr, byte[] uuidString); int virDomainGetUUIDString(DomainPointer virDomainPtr, byte[] uuidString); int virDomainGetVcpus(DomainPointer virDomainPtr, virVcpuInfo[] info, int maxInfo, byte[] cpumaps, int maplen); - String virDomainGetXMLDesc(DomainPointer virDomainPtr, int flags); + Pointer virDomainGetXMLDesc(DomainPointer virDomainPtr, int flags); int virDomainHasCurrentSnapshot(DomainPointer virDomainPtr, int flags); int virDomainHasManagedSaveImage(DomainPointer virDomainPtr, int flags); int virDomainInterfaceStats(DomainPointer virDomainPtr, String path, virDomainInterfaceStats stats, int size); @@ -252,11 +249,11 @@ public interface Libvirt extends Library { int virNetworkDestroy(NetworkPointer virConnectPtr); int virNetworkFree(NetworkPointer virConnectPtr); int virNetworkGetAutostart(NetworkPointer virNetworkPtr, IntByReference value); - String virNetworkGetBridgeName(NetworkPointer virNetworkPtr); + Pointer virNetworkGetBridgeName(NetworkPointer virNetworkPtr); String virNetworkGetName(NetworkPointer virNetworkPtr); int virNetworkGetUUID(NetworkPointer virNetworkPtr, byte[] uuidString); int virNetworkGetUUIDString(NetworkPointer virNetworkPtr, byte[] uuidString); - String virNetworkGetXMLDesc(NetworkPointer virNetworkPtr, int flags); + Pointer virNetworkGetXMLDesc(NetworkPointer virNetworkPtr, int flags); int virNetworkIsActive(NetworkPointer virNetworkPtr); int virNetworkIsPersistent(NetworkPointer virNetworkPtr); NetworkPointer virNetworkLookupByName(ConnectionPointer virConnectPtr, String name); @@ -273,7 +270,7 @@ public interface Libvirt extends Library { // Node/Device functions int virNodeNumOfDevices(ConnectionPointer virConnectPtr, String capabilityName, int flags); - int virNodeListDevices(ConnectionPointer virConnectPtr, String capabilityName, String[] names, int maxnames, + int virNodeListDevices(ConnectionPointer virConnectPtr, String capabilityName, Pointer[] names, int maxnames, int flags); DevicePointer virNodeDeviceLookupByName(ConnectionPointer virConnectPtr, String name); String virNodeDeviceGetName(DevicePointer virDevicePointer); @@ -337,7 +334,7 @@ public interface Libvirt extends Library { int virInterfaceFree(InterfacePointer virDevicePointer); String virInterfaceGetName(InterfacePointer virInterfacePtr); String virInterfaceGetMACString(InterfacePointer virInterfacePtr); - String virInterfaceGetXMLDesc(InterfacePointer virInterfacePtr, int flags); + Pointer virInterfaceGetXMLDesc(InterfacePointer virInterfacePtr, int flags); int virInterfaceIsActive(InterfacePointer virDevicePointer); InterfacePointer virInterfaceLookupByMACString(ConnectionPointer virConnectPtr, String mac); InterfacePointer virInterfaceLookupByName(ConnectionPointer virConnectPtr, String name); -- AV-Test GmbH, Henricistraße 20, 04155 Leipzig, Germany Phone: +49 341 265 310 19 Web:<http://www.av-test.org> Eingetragen am / Registered at: Amtsgericht Stendal (HRB 114076) Geschaeftsfuehrer (CEO): Andreas Marx, Guido Habicht, Maik Morgenstern

1 0

[libvirt] (no subject)
by cbley＠av-test.de 12 Oct '12

12 Oct '12

>From 6f7b9301dd9983ff9f761e6503cebbdb2d45e750 Mon Sep 17 00:00:00 2001 Message-Id: <6f7b9301dd9983ff9f761e6503cebbdb2d45e750.1350037981.git.cbley(a)av-test.de> In-Reply-To: <cover.1350037981.git.cbley(a)av-test.de> References: <2DA6F4A3691599408358374D182280F9141CF6(a)xmb-rcd-x04.cisco.com> <cover.1350037981.git.cbley(a)av-test.de> From: cbley(a)av-test.de (Claudio Bley) Date: Wed, 10 Oct 2012 11:23:14 +0200 Subject: [PATCH 14/15] Remove functions not intended to be used by libvirt bindings. To: libvir-list(a)redhat.com Organization: AV-Test GmbH, Germany This affects virSecretGetConnect, virNetworkGetConnect and virDomainGetConnect. The libvirt API documentation has this to say about those functions: WARNING: When writing libvirt bindings in other languages, do not use this function. Instead, store the connection and the ... object together. --- src/main/java/org/libvirt/Connect.java | 39 ----------------------- src/main/java/org/libvirt/jna/Libvirt.java | 3 -- src/test/java/org/libvirt/TestJavaBindings.java | 3 -- 3 files changed, 45 deletions(-) diff --git a/src/main/java/org/libvirt/Connect.java b/src/main/java/org/libvirt/Connect.java index a775ce1..b3e29be 100644 --- a/src/main/java/org/libvirt/Connect.java +++ b/src/main/java/org/libvirt/Connect.java @@ -31,45 +31,6 @@ import com.sun.jna.ptr.LongByReference; public class Connect { /** - * Creates a new connection object from the domain. If all you want is the - * existing domain's connection, use the getConnection method directly. Thie - * method returns a new connection. - * - * @param domain - * @return a new connection - */ - public static Connect connectionForDomain(Domain domain) { - ConnectionPointer conn = Libvirt.INSTANCE.virDomainGetConnect(domain.VDP); - return new Connect(conn); - } - - /** - * Creates a new connection object from the network. If all you want is the - * existing network's connection, use the getConnection method directly. - * Thie method returns a new connection. - * - * @param network - * @return a new connection - */ - public static Connect connectionForNetwork(Network network) { - ConnectionPointer conn = Libvirt.INSTANCE.virNetworkGetConnect(network.VNP); - return new Connect(conn); - } - - /** - * Creates a new connection object from the network. If all you want is the - * existing network's connection, use the getConnection method directly. - * Thie method returns a new connection. - * - * @param secret - * @return a new connection - */ - public static Connect connectionForSecret(Secret secret) { - ConnectionPointer conn = Libvirt.INSTANCE.virSecretGetConnect(secret.VSP); - return new Connect(conn); - } - - /** * Get the version of a connection. * * @see <a diff --git a/src/main/java/org/libvirt/jna/Libvirt.java b/src/main/java/org/libvirt/jna/Libvirt.java index 5d2a291..87979cd 100644 --- a/src/main/java/org/libvirt/jna/Libvirt.java +++ b/src/main/java/org/libvirt/jna/Libvirt.java @@ -192,7 +192,6 @@ public interface Libvirt extends Library { int virDomainDetachDeviceFlags(DomainPointer virDomainPtr, String deviceXML, int flags); int virDomainFree(DomainPointer virDomainPtr); int virDomainGetAutostart(DomainPointer virDomainPtr, IntByReference value); - ConnectionPointer virDomainGetConnect(DomainPointer virDomainPtr); int virDomainGetBlockInfo(DomainPointer virDomainPtr, String path, virDomainBlockInfo info, int flags); int virDomainGetID(DomainPointer virDomainPtr); int virDomainGetInfo(DomainPointer virDomainPtr, virDomainInfo vInfo); @@ -242,7 +241,6 @@ public interface Libvirt extends Library { int virDomainUndefine(DomainPointer virDomainPtr); // Network functions - ConnectionPointer virNetworkGetConnect(NetworkPointer virnetworkPtr); int virNetworkCreate(NetworkPointer virConnectPtr); NetworkPointer virNetworkCreateXML(ConnectionPointer virConnectPtr, String xmlDesc); NetworkPointer virNetworkDefineXML(ConnectionPointer virConnectPtr, String xmlDesc); @@ -341,7 +339,6 @@ public interface Libvirt extends Library { int virInterfaceUndefine(InterfacePointer virDevicePointer); // Secret Methods - ConnectionPointer virSecretGetConnect(SecretPointer virSecretPtr); int virSecretFree(SecretPointer virSecretPtr); SecretPointer virSecretDefineXML(ConnectionPointer virConnectPtr, String xml, int flags); int virSecretGetUUID(SecretPointer virSecretPtr, byte[] uuidString); diff --git a/src/test/java/org/libvirt/TestJavaBindings.java b/src/test/java/org/libvirt/TestJavaBindings.java index 55ca64b..bba4cdb 100644 --- a/src/test/java/org/libvirt/TestJavaBindings.java +++ b/src/test/java/org/libvirt/TestJavaBindings.java @@ -158,9 +158,6 @@ public final class TestJavaBindings extends TestCase { dom.setSchedulerParameters(pars); dom.getSchedulerParameters() ; - - assertNotNull(Connect.connectionForDomain(dom)); - assertTrue(Connect.connectionForDomain(dom) != dom.getConnect()); } public void testInterfaces() throws Exception { -- AV-Test GmbH, Henricistraße 20, 04155 Leipzig, Germany Phone: +49 341 265 310 19 Web:<http://www.av-test.org> Eingetragen am / Registered at: Amtsgericht Stendal (HRB 114076) Geschaeftsfuehrer (CEO): Andreas Marx, Guido Habicht, Maik Morgenstern

1 0

[libvirt] (no subject)
by cbley＠av-test.de 12 Oct '12

12 Oct '12

>From 017d4d3ade44f117d4a03747fe1b2d9ee5762c0c Mon Sep 17 00:00:00 2001 Message-Id: <017d4d3ade44f117d4a03747fe1b2d9ee5762c0c.1350037981.git.cbley(a)av-test.de> In-Reply-To: <cover.1350037981.git.cbley(a)av-test.de> References: <2DA6F4A3691599408358374D182280F9141CF6(a)xmb-rcd-x04.cisco.com> <cover.1350037981.git.cbley(a)av-test.de> From: cbley(a)av-test.de (Claudio Bley) Date: Fri, 17 Aug 2012 14:47:38 +0200 Subject: [PATCH 03/15] Add findbugs build file for ant. To: libvir-list(a)redhat.com Organization: AV-Test GmbH, Germany This requires a findbugs installation and the findbugs ant library. --- findbugs.xml | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/findbugs.xml b/findbugs.xml new file mode 100644 index 0000000..18d51f2 --- /dev/null +++ b/findbugs.xml @@ -0,0 +1,36 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + + + + + + + + + + + + +<project name="Libvirt Java Bindings - Findbugs" default="findbugs"> +  + <taskdef name="findbugs" classname="edu.umd.cs.findbugs.anttask.FindBugsTask" /> + +  + <property name="javac.debug" value="on" /> + + <import file="build.xml"/> + + <property name="findbugs.output" value="text" /> + + <target name="findbugs" depends="build"> + <findbugs home="${findbugs.home}" + output="${findbugs.output}" > + <auxClasspath refid="compile.classpath" /> + <sourcePath path="${basedir}/src/main/java" /> + <class location="${jar.file}" /> + </findbugs> + </target> + +</project> -- AV-Test GmbH, Henricistraße 20, 04155 Leipzig, Germany Phone: +49 341 265 310 19 Web:<http://www.av-test.org> Eingetragen am / Registered at: Amtsgericht Stendal (HRB 114076) Geschaeftsfuehrer (CEO): Andreas Marx, Guido Habicht, Maik Morgenstern

1 0

[libvirt] [PATCH] conf: Mark missing optional USB devices in domain XML
by Jiri Denemark 12 Oct '12

12 Oct '12

When startupPolicy set for a USB devices allows such device to be missing, there was no way this could be detected from domain XML. With this patch, libvirt emits a new missing='yes' attribute for such devices when active domain XML is generated. --- docs/schemas/domaincommon.rng | 8 ++++++++ src/conf/domain_conf.c | 5 +++++ 2 files changed, 13 insertions(+) diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index b142716..70bc0e2 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -1654,6 +1654,14 @@ </optional> <interleave> <element name="source"> + <optional> + <attribute name="missing"> + <choice> + <value>yes</value> + <value>no</value> + </choice> + </attribute> + </optional> <choice> <group> <ref name="usbproduct"/> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 1eda551..a2971cd 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -12102,6 +12102,11 @@ virDomainHostdevSourceFormat(virBufferPtr buf, if (def->source.subsys.u.usb.autoAddress && (flags & VIR_DOMAIN_XML_MIGRATABLE)) virBufferAddLit(buf, " autoAddress='yes'"); + + if (def->missing && + !(flags & VIR_DOMAIN_XML_INACTIVE)) + virBufferAddLit(buf, " missing='yes'"); + virBufferAddLit(buf, ">\n"); virBufferAdjustIndent(buf, 2); -- 1.7.12.3

2 2

[libvirt] [PATCH v2 0/3] command line fd passing using fd sets
by Corey Bryant 12 Oct '12

12 Oct '12

This series adds command line file descriptor passing support via a new -add-fd option. This is a follow-on to the existing QMP fd passing support provided in the following patch series: comments.gmane.org/gmane.comp.emulators.qemu/165463 The new -add-fd option is designed to mirror the add-fd QMP option as much as possible. Corey Bryant (3): monitor: Allow add-fd to any specified fd set monitor: Enable adding an inherited fd to an fd set qemu-config: Add new -add-fd command line option monitor.c | 131 +++++++++++++++++++++++++++++++------------------------ monitor.h | 2 + qapi-schema.json | 1 - qemu-config.c | 22 ++++++++++ qemu-options.hx | 35 +++++++++++++++ vl.c | 36 +++++++++++++++ 6 files changed, 170 insertions(+), 57 deletions(-) -- 1.7.11.4

3 17

[libvirt] [PATCH v1 0/3] libvirt: Implement CPU model driver for PowerPC
by Li Zhang 12 Oct '12

12 Oct '12

CPU model driver is to get host's CPU information and it also provides one mechanism to expose host's CPU information to guests during migration. When migrating one guest from one machine to another machine, it will compare the CPU information. If it is incomptible, it won't start the guest. On x86, it uses CPUID instruction to get information. When migrating the guest, if the CPU defined in guest XML file is incompatible with host CPU, cpu-baseline will find out best features to expose to guest. Refer to [http://berrange.com/posts/2010/02/15 /guest-cpu-model-configuration-in-libvirt-with-qemukvm/]. On PowerPC, it can get CPU version by mfpvr instruction. So, if PVR is different from definition in guest XML file by cpu-compare, it will fail to start guest. The CPU infromation can be got by cpu-baseline. But only CPU vendor and model can be shown, there are no features as x86. So on PowrePC, it assumes that migration only occurs between the machines with the same type CPUs on PowerPC. In this driver, there are definitions of models and PVRs for CPUs supported on PowerPC. The relationship between models and PVRs are as the following: For one specific CPU model, its PVR is unique. And also for one PVR code, the PVR code is also unique. So from the PVR code of CPU data, it's easy to get model and vendor information. It is tested on my Power machine which CPU PVR is Power7_v2.3. * cap.xml has the same definition as the host. [root@ltckvmopal2 kvm-test]# /bin/virsh cpu-compare cap.xml CPU described in cap.xml is identical to host CPU [root@ltckvmopal2 kvm-test]# /bin/virsh cpu-baseline cap.xml <cpu mode='custom' match='exact'> <model fallback='allow'>POWER7_v2.3</model> <vendor>IBM</vendor> </cpu> * cap.xml has differnt model as the host. [root@ltckvmopal2 kvm-test]# /bin/virsh cpu-compare cap.xml CPU described in cap.xml is incompatible with host CPU [root@ltckvmopal2 kvm-test]# /bin/virsh cpu-baseline cap.xml <cpu mode='custom' match='exact'> <model fallback='allow'>POWER7_v2.1</model> <vendor>IBM</vendor> </cpu> *v1 -> v2: * Fix coding style's problems in several places. * Seperate doc-fix from the coding Li Zhang (3): libvirt: Add one file cpu_ppc_data.h to define CPU data for PPC libvirt: Implement CPU model driver for PowerPC Doc-fix for PowerPC CPU model driver src/cpu/cpu.h | 3 + src/cpu/cpu_map.xml | 14 ++ src/cpu/cpu_powerpc.c | 589 ++++++++++++++++++++++++++++++++++++++++++++++-- src/cpu/cpu_ppc_data.h | 33 +++ 4 files changed, 621 insertions(+), 18 deletions(-) create mode 100644 src/cpu/cpu_ppc_data.h -- 1.7.7.6

2 11

[libvirt] [PATCHv7 0/9] blockjob: live block migration
by Eric Blake 12 Oct '12

12 Oct '12

v6 of these patches is here: https://www.redhat.com/archives/libvir-list/2012-April/msg01240.html The 'drive-mirror' command not only missed qemu 1.1 (back when I first posted these patches), but also missed qemu 1.2. Paolo is still working on re-posting his patches to the qemu lists (see patch 2/9 for a link to his previous posting, which has had two months of commentary). I'm still not anxious to have these commands committed to upstream libvirt until 'drive-mirror' is at least in qemu.git rather than just Paolo's tree, but thought it would be worth rebasing the series to track the things that have changed since April. In v7, I've adjusted the series to cater to Paolo's proposed QMP semantics (most of the review on his last patch to the qemu list was on the internals, and not the interface itself), as well as to allow working out-of-the-box with the RHEL 6.3 implementation of block copy. Unfortunately, since Paolo's patches are still in flux, I suspect this will need a v8 that has seen further testing with both upstream qemu.git and RHEL 6.3 git. Eric Blake (9): blockjob: react to active block copy blockjob: add qemu capabilities related to block jobs blockjob: return appropriate event and info blockjob: support pivot operation on cancel blockjob: make drive-reopen safer blockjob: implement block copy for qemu blockjob: allow for existing files blockjob: allow mirroring under SELinux and cgroup blockjob: relabel entire existing chain include/libvirt/libvirt.h.in | 1 + src/conf/domain_conf.c | 12 ++ src/conf/domain_conf.h | 1 + src/libvirt.c | 7 +- src/libvirt_private.syms | 1 + src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 2 + src/qemu/qemu_driver.c | 413 ++++++++++++++++++++++++++++++++++++++++++- src/qemu/qemu_hotplug.c | 7 + src/qemu/qemu_monitor.c | 52 ++++++ src/qemu/qemu_monitor.h | 14 ++ src/qemu/qemu_monitor_json.c | 101 ++++++++++- src/qemu/qemu_monitor_json.h | 21 ++- src/qemu/qemu_process.c | 2 + 14 files changed, 625 insertions(+), 11 deletions(-) -- 1.7.11.4

3 18

[libvirt] [PATCH 0/5] udev based backend for virInterface
by Doug Goldstein 12 Oct '12

12 Oct '12

The goal is to provide a read-only virInterface provider when netcf is unavailable. With this patchset it makes virt-manager happy enough that it does not attempt to do anything with HAL to figure out the host's network devices. All patches but 4/5 are really ready for prime time. 4/5 can get merged but it is somewhat incomplete. With regards to bond and devices in a bridge. The patches are all at different versions depending on how many times they've hit the list. Doug Goldstein (5): interface: add udev based backend for virInterface interface: fix netcf based backend naming interface: always build all available backends interface: add virInterfaceGetXMLDesc() in udev interface: add udevIfaceIsActive() to udev backend configure.ac | 18 +- po/POTFILES.in | 1 + src/Makefile.am | 14 +- src/interface/interface_backend_netcf.c | 4 +- src/interface/interface_backend_udev.c | 671 +++++++++++++++++++++++++++++++ src/interface/interface_driver.c | 37 ++ src/interface/interface_driver.h | 3 + tools/virsh.c | 2 + 8 files changed, 734 insertions(+), 16 deletions(-) create mode 100644 src/interface/interface_backend_udev.c create mode 100644 src/interface/interface_driver.c -- 1.7.8.6

3 11

[libvirt] 100+ misspellings
by Jim Meyering 12 Oct '12

12 Oct '12

Hello, In case someone is interested in weeding out the inevitable false positives, here is a slightly filtered list of misspelled words in libvirt, as detected by the misspellings program from here: http://github.com/lyda/misspell-check Here's the output from this command: misspellings $(git ls-files)|grep -vE 'gnulib/|po/|ChangeLog-old' HACKING:456: particulary -> "particularly" configure.ac:1359: presense -> "presence" daemon/libvirtd.conf:254: upto -> "up to" daemon/libvirtd.conf:270: upto -> "up to" daemon/stream.c:692: upto -> "up to" docs/api.html.in:67: garanteed -> "guaranteed" docs/api.html.in:73: garanteed -> "guaranteed" docs/apibuild.py:2476: unkown -> "unknown" docs/apps.html.in:191: upto -> "up to" docs/firewall.html.in:320: managable -> "manageable","manageably" docs/formatdomain.html.in:423: ommitted -> "omitted" docs/hacking.html.in:547: particulary -> "particularly" docs/internals/locking.html.in:153: psuedo -> "pseudo" docs/news.html.in:610: commited -> "committed" docs/news.html.in:1195: dependancy -> "dependency" docs/news.html.in:1459: doesnt -> "doesn't" docs/news.html.in:1570: dependancy -> "dependency" docs/news.html.in:1837: stange -> "strange" docs/news.html.in:1838: dependancy -> "dependency" docs/news.html.in:1892: sucessful -> "successful" docs/news.html.in:1893: sucessful -> "successful" docs/news.html.in:2032: sucessful -> "successful" docs/news.html.in:2472: orginal -> "original" docs/news.html.in:2628: statment -> "statement" docs/news.html.in:2793: controling -> "controlling" docs/news.html.in:3912: Seperate -> "Separate" docs/news.html.in:5025: occurence -> "occurrence" docs/news.html.in:5592: Explictly -> "Explicitly" docs/news.html.in:6508: beeing -> "being" docs/news.html.in:7158: adressing -> "addressing","dressing" docs/news.html.in:7483: Supress -> "Suppress" docs/news.html.in:7542: occurence -> "occurrence" docs/news.html.in:7551: sucess -> "success" docs/news.html.in:7825: neccessary -> "necessary" docs/news.html.in:7902: Occurence -> "Occurrence" docs/news.html.in:7902: occurences -> "occurrences" docs/news.html.in:8472: wierd -> "weird" docs/news.html.in:8535: accomodate -> "accommodate" docs/news.html.in:8598: dependancy -> "dependency" docs/news.html.in:9008: dependancy -> "dependency" docs/news.html.in:9306: dependancy -> "dependency" docs/news.html.in:9324: dependance -> "dependence" docs/news.html.in:9520: extention -> "extension" docs/news.html.in:9587: dependance -> "dependence" docs/remote.html.in:359: agains -> "against" docs/schemas/interface.rng:7: everytime -> "every time" docs/schemas/interface.rng:175: grat -> "great" examples/domain-events/events-python/event-test.py:129: occurr -> "occur" examples/domain-events/events-python/event-test.py:172: upto -> "up to" examples/python/dominfo.py:46: runing -> "running" include/libvirt/libvirt.h.in:642: targetting -> "targeting" include/libvirt/libvirt.h.in:2935: specfic -> "specific" include/libvirt/libvirt.h.in:3207: upto -> "up to" include/libvirt/libvirt.h.in:3639: occuring -> "occurring" src/conf/domain_conf.c:4565: Unkown -> "Unknown" src/conf/domain_conf.c:4933: Unkown -> "Unknown" src/conf/domain_conf.c:6914: Wierd -> "Weird" src/conf/nwfilter_conf.c:2804: definiton -> "definition" src/internal.h:114: conciously -> "consciously" src/libvirt.c:3083: transfered -> "transferred" src/libvirt.c:4390: dependant -> "dependent" src/libvirt.c:4441: dependant -> "dependent" src/libvirt.c:11461: upto -> "up to" src/libvirt.c:11544: upto -> "up to" src/libvirt.c:14119: funtion -> "function" src/libvirt.c:14542: dependant -> "dependent" src/libvirt_internal.h:2: publically -> "publicly" src/phyp/phyp_driver.c:2067: avaliable -> "available" src/phyp/phyp_driver.c:2290: avaliable -> "available" src/phyp/phyp_driver.c:2770: avaliable -> "available" src/qemu/qemu_capabilities.c:659: existance -> "existence" src/qemu/qemu_capabilities.c:1234: targetting -> "targeting" src/qemu/qemu_conf.c:205: lenght -> "length" src/qemu/qemu_driver.c:1235: calulate -> "calculate" src/qemu/qemu_monitor_text.c:2406: everthing -> "everything" src/qemu/qemu_process.c:2657: pased -> "passed" src/rpc/virnetsaslcontext.c:153: Succesful -> "Successful" src/rpc/virnettlscontext.c:377: Succesful -> "Successful" src/storage/storage_backend_disk.c:536: boundry -> "boundary" src/storage/storage_backend_disk.c:561: boundry -> "boundary" src/storage/storage_backend_disk.c:571: boundry -> "boundary" src/storage/storage_backend_disk.c:620: boundry -> "boundary" src/storage/storage_backend_rbd.c:318: occured -> "occurred" src/uml/uml_driver.c:260: upto -> "up to" src/uml/uml_driver.c:1293: calulate -> "calculate" src/util/cgroup.c:69: HIERACHY -> "Hierarchy" src/util/cgroup.c:172: neccessarily -> "necessarily" src/util/cgroup.c:592: HIERACHY -> "Hierarchy" src/util/cgroup.c:1007: HIERACHY -> "Hierarchy" src/util/cgroup.c:2029: existance -> "existence" src/util/processinfo.c:80: upto -> "up to" src/util/processinfo.c:145: upto -> "up to" src/util/virpidfile.c:369: agin -> "again" src/util/virpidfile.c:378: agin -> "again" src/util/virsocketaddr.c:421: recieve -> "receive" src/util/virsocketaddr.c:451: recieve -> "receive" src/util/virtime.c:105: THRU -> "Through" src/util/virtime.c:162: THRU -> "Through" src/util/virtime.c:163: THRU -> "Through" src/vbox/vbox_tmpl.c:7050: becuase -> "because" src/vbox/vbox_tmpl.c:8748: devide -> "divide" src/vbox/vbox_tmpl.c:9262: persistance -> "persistence" src/xen/xend_internal.c:517: targetting -> "targeting" src/xen/xm_internal.c:177: funtion -> "function" src/xen/xm_internal.c:201: funtion -> "function" src/xen/xm_internal.c:310: funtion -> "function" src/xen/xm_internal.c:386: alot -> "a lot","allot" src/xenxs/xen_sxpr.c:814: Subsquent -> "Subsequent" tests/virnettlscontexttest.c:451: suceeds -> "succeeds" tools/virsh.pod:128: specfic -> "specific" tools/virsh.pod:597: folowing -> "following" tools/virsh.pod:2293: occurr -> "occur" tools/virsh.pod:2537: preceed -> "precede"

4 4

[libvirt] libvirt support for dhcp6 .. not time soon
by Gene Czarcinski 12 Oct '12

12 Oct '12

Well, so much for libvirt support for stateful IPv6 addresses (dhcp6). Not with the current design/implementation. The problem is UPD6 server port 547 or rather how it is used. I am not sure what the technical details are yet nor if this is "fixable", but as the situation now stands, there can be only one dhcp6 server on a system. DHCPD6 cannot live with dnsmasq and dnsmasq cannot live with another dnsmasq ... first one started grabs the port and the others die because they cannot get exclusive use. I suppose you could run one dnsmasq which supported all virtual networks but things are going to get messy when virtual networks are started/destroyed/whatever. I kludged together a little patch for libvirt which forced a dhcp-range specification for any net with an ipv6 definition. If anyone has some insight into this, I would appreciate hearing able it. If anyone knew that you could not run two or more dhcp6 servers on the same system, I realy wish that information was more widely known (or obvious). Gene

1 0

[libvirt] Fw:Re:Re: build libvirt error. lack of AppArmor .
by yue 11 Oct '12

11 Oct '12

1.my configure options is "./configure --with-selinux=no --with-secdriver-selinux=no --with-apparmor=no --with-secdriver-apparmor=no --with-init-script=redhat" because i can not start spSP3-guest-OS,infos on the internet tell security-driver should be disabled. i just test it. so --with-XXXXX=no. the second problem is details of my guest-os. 2. /var/log/libvirt/qemu/xpSP3.log. i do not know libvirtd or qemu-kvm which one can not recognize ceph-rbd? --my rbd disk configuration----------- <disk type='network' device='disk'> <driver name='qemu' type='raw'/> <auth username='cloud'> <secret type='ceph' uuid='7a91dc24-b072-43c4-98fb-4b2415322b0f'/> </auth> <source protocol='rbd' name='cloud/testrbd'> <host name='192.168.10.4' port='6789'/> </source> <target dev='vdb' bus='virtio'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x0'/> </disk> ---xpSP3.log---------------- LC_ALL=C PATH=/sbin:/usr/sbin:/bin:/usr/bin HOME=/root USER=root LOGNAME=root QEMU_AUDIO_DRV=none /usr/libexec/qemu-kvm -S -M rhel6.2.0 -enable-kvm -m 512 -smp 1,sockets=1,cores=1,threads=1 -name xpSP3 -uuid b45bd66a-6700-4905-c5f4-4c799413d7b7 -nodefconfig -nodefaults -chardev socket,id=charmonitor,path=/var/lib/libvirt/qemu/xpSP3.monitor,server,nowait -mon chardev=charmonitor,id=monitor,mode=control -rtc base=localtime,driftfix=slew -no-shutdown -device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 -drive file=/var/lib/libvirt/images/xpSP3.img,if=none,id=drive-ide0-0-0,format=raw,cache=none -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 -drive file=rbd:cloud/testrbd:id=cloud:key=AQCGbGRQ+M+NGBAATtylZNiSxqCTQ4uaApd+9w==:auth_supported=cephx none:mon_host=192.168.10.4\:6789,if=none,id=drive-ide0-0-1,format=raw -device ide-drive,bus=ide.0,unit=1,drive=drive-ide0-0-1,id=ide0-0-1 -netdev tap,fd=26,id=hostnet0 -device e1000,netdev=hostnet0,id=net0! ,mac=52:54:00:2a:8c:48,bus=pci.0,addr=0x3 -chardev pty,id=charserial0 -device isa-serial,chardev=charserial0,id=serial0 -device usb-tablet,id=input0 -vnc 0.0.0.0:0 -vga std -device intel-hda,id=sound0,bus=pci.0,addr=0x4 -device hda-duplex,id=sound0-codec0,bus=sound0.0,cad=0 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x5 Domain id=2 is tainted: high-privileges char device redirected to /dev/pts/4 qemu-kvm: -drive file=rbd:cloud/testrbd:id=cloud:key=AQCGbGRQ+M+NGBAATtylZNiSxqCTQ4uaApd+9w==:auth_supported=cephx none:mon_host=192.168.10.4\:6789,if=none,id=drive-ide0-0-1,format=raw: could not open disk image rbd:cloud/testrbd:id=cloud:key=AQCGbGRQ+M+NGBAATtylZNiSxqCTQ4uaApd+9w==:auth_supported=cephx none:mon_host=192.168.10.4\:6789: No such file or directory At 2012-10-11 05:11:58,"Eric Blake" <eblake(a)redhat.com> wrote: >On 10/10/2012 04:04 AM, yue wrote: >> error occur when attach a rbd-disk to domain. >> >> 1.configure: error: You must install the AppArmor development package in order to compile libvirt > >What command line did you pass to configure? AppArmor is optional (and >in fact, Fedora does not use it); so this message should only be >triggered if you passed an explicit --with-apparmor or >--with-secdriver-apparmor to configure, in which case, yes, then you >need the apparmor devel package. > >> 2. >> 2012-10-10 17:36:16.305+0000: 3808: warning : qemuDomainObjTaint:1297 : Domain id=2 name='xpSP3' uuid=b45bd66a-6700-4905-c5f4-4c799413d7b7 is tainted: high-privileges >> 2012-10-10 17:36:16.712+0000: 3808: error : qemuMonitorOpenUnix:266 : failed to connect to monitor socket: No such process > >This usually means that qemu failed to start; can you check the log file >for that guest (perhaps /var/log/libvirt/qemu/xpSP3.log) to see if there >are more details why? > >-- >Eric Blake eblake(a)redhat.com +1-919-301-3266 >Libvirt virtualization library http://libvirt.org >

1 0

[libvirt] [libvirt-glib v2] gconfig: Add API to set domain/pm tree
by Zeeshan Ali (Khattak) 11 Oct '12

11 Oct '12

From: "Zeeshan Ali (Khattak)" <zeeshanak(a)gnome.org> API for new domain power management configuration. --- libvirt-gconfig/Makefile.am | 2 + .../libvirt-gconfig-domain-power-management.c | 100 +++++++++++++++++++++ .../libvirt-gconfig-domain-power-management.h | 73 +++++++++++++++ libvirt-gconfig/libvirt-gconfig-domain.c | 16 ++++ libvirt-gconfig/libvirt-gconfig-domain.h | 3 + libvirt-gconfig/libvirt-gconfig.h | 1 + libvirt-gconfig/libvirt-gconfig.sym | 11 +++ 7 files changed, 206 insertions(+) create mode 100644 libvirt-gconfig/libvirt-gconfig-domain-power-management.c create mode 100644 libvirt-gconfig/libvirt-gconfig-domain-power-management.h diff --git a/libvirt-gconfig/Makefile.am b/libvirt-gconfig/Makefile.am index 5a80123..caa62f0 100644 --- a/libvirt-gconfig/Makefile.am +++ b/libvirt-gconfig/Makefile.am @@ -50,6 +50,7 @@ GCONFIG_HEADER_FILES = \ libvirt-gconfig-domain-memballoon.h \ libvirt-gconfig-domain-os.h \ libvirt-gconfig-domain-parallel.h \ + libvirt-gconfig-domain-power-management.h \ libvirt-gconfig-domain-redirdev.h \ libvirt-gconfig-domain-seclabel.h \ libvirt-gconfig-domain-serial.h \ @@ -121,6 +122,7 @@ GCONFIG_SOURCE_FILES = \ libvirt-gconfig-domain-memballoon.c \ libvirt-gconfig-domain-os.c \ libvirt-gconfig-domain-parallel.c \ + libvirt-gconfig-domain-power-management.c \ libvirt-gconfig-domain-redirdev.c \ libvirt-gconfig-domain-seclabel.c \ libvirt-gconfig-domain-serial.c \ diff --git a/libvirt-gconfig/libvirt-gconfig-domain-power-management.c b/libvirt-gconfig/libvirt-gconfig-domain-power-management.c new file mode 100644 index 0000000..4bc588d --- /dev/null +++ b/libvirt-gconfig/libvirt-gconfig-domain-power-management.c @@ -0,0 +1,100 @@ +/* + * libvirt-gconfig-domain-power-management.c: libvirt domain power management configuration + * + * Copyright (C) 2012 Red Hat, Inc. + * + * 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 + * + * Authors: + * + * Zeeshan Ali (Khattak) <zeeshanak(a)gnome.org> + * Christophe Fergeau <cfergeau(a)redhat.com> + */ + +#include <config.h> + +#include "libvirt-gconfig/libvirt-gconfig.h" +#include "libvirt-gconfig/libvirt-gconfig-private.h" + +#define GVIR_CONFIG_DOMAIN_POWER_MANAGEMENT_GET_PRIVATE(obj) \ + (G_TYPE_INSTANCE_GET_PRIVATE((obj), \ + GVIR_CONFIG_TYPE_DOMAIN_POWER_MANAGEMENT, \ + GVirConfigDomainPowerManagementPrivate)) + +struct _GVirConfigDomainPowerManagementPrivate +{ + gboolean unused; +}; + +G_DEFINE_TYPE(GVirConfigDomainPowerManagement, + gvir_config_domain_power_management, + GVIR_CONFIG_TYPE_OBJECT); + +static void gvir_config_domain_power_management_class_init + (GVirConfigDomainPowerManagementClass *klass) +{ + g_type_class_add_private(klass, sizeof(GVirConfigDomainPowerManagementPrivate)); +} + + +static void +gvir_config_domain_power_management_init(GVirConfigDomainPowerManagement *pm) +{ + g_debug("Init GVirConfigDomainPowerManagement=%p", pm); + + pm->priv = GVIR_CONFIG_DOMAIN_POWER_MANAGEMENT_GET_PRIVATE(pm); +} + + +GVirConfigDomainPowerManagement *gvir_config_domain_power_management_new(void) +{ + GVirConfigObject *object; + + object = gvir_config_object_new(GVIR_CONFIG_TYPE_DOMAIN_POWER_MANAGEMENT, + "pm", NULL); + return GVIR_CONFIG_DOMAIN_POWER_MANAGEMENT(object); +} + +GVirConfigDomainPowerManagement *gvir_config_domain_power_management_new_from_xml(const gchar *xml, + GError **error) +{ + GVirConfigObject *object; + + object = gvir_config_object_new_from_xml(GVIR_CONFIG_TYPE_DOMAIN_POWER_MANAGEMENT, + "pm", NULL, xml, error); + return GVIR_CONFIG_DOMAIN_POWER_MANAGEMENT(object); +} + +void gvir_config_domain_power_management_set_mem_suspend_enabled(GVirConfigDomainPowerManagement *pm, + gboolean enabled) +{ + g_return_if_fail(GVIR_CONFIG_IS_DOMAIN_POWER_MANAGEMENT(pm)); + + gvir_config_object_add_child_with_attribute(GVIR_CONFIG_OBJECT(pm), + "suspend-to-mem", + "enabled", + enabled? "yes" : "no"); +} + +void gvir_config_domain_power_management_set_disk_suspend_enabled(GVirConfigDomainPowerManagement *pm, + gboolean enabled) +{ + g_return_if_fail(GVIR_CONFIG_IS_DOMAIN_POWER_MANAGEMENT(pm)); + + gvir_config_object_add_child_with_attribute(GVIR_CONFIG_OBJECT(pm), + "suspend-to-disk", + "enabled", + enabled? "yes" : "no"); +} diff --git a/libvirt-gconfig/libvirt-gconfig-domain-power-management.h b/libvirt-gconfig/libvirt-gconfig-domain-power-management.h new file mode 100644 index 0000000..59dde79 --- /dev/null +++ b/libvirt-gconfig/libvirt-gconfig-domain-power-management.h @@ -0,0 +1,73 @@ +/* + * libvirt-gconfig-domain-power-management.h: libvirt domain power management configuration + * + * Copyright (C) 2012 Red Hat, Inc. + * + * 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 + * + * Zeeshan Ali (Khattak) <zeeshanak(a)gnome.org> + * Christophe Fergeau <cfergeau(a)redhat.com> + */ + +#if !defined(__LIBVIRT_GCONFIG_H__) && !defined(LIBVIRT_GCONFIG_BUILD) +#error "Only <libvirt-gconfig/libvirt-gconfig.h> can be included directly." +#endif + +#ifndef __LIBVIRT_GCONFIG_DOMAIN_POWER_MANAGEMENT_H__ +#define __LIBVIRT_GCONFIG_DOMAIN_POWER_MANAGEMENT_H__ + +G_BEGIN_DECLS + +#define GVIR_CONFIG_TYPE_DOMAIN_POWER_MANAGEMENT (gvir_config_domain_power_management_get_type ()) +#define GVIR_CONFIG_DOMAIN_POWER_MANAGEMENT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GVIR_CONFIG_TYPE_DOMAIN_POWER_MANAGEMENT, GVirConfigDomainPowerManagement)) +#define GVIR_CONFIG_DOMAIN_POWER_MANAGEMENT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GVIR_CONFIG_TYPE_DOMAIN_POWER_MANAGEMENT, GVirConfigDomainPowerManagementClass)) +#define GVIR_CONFIG_IS_DOMAIN_POWER_MANAGEMENT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GVIR_CONFIG_TYPE_DOMAIN_POWER_MANAGEMENT)) +#define GVIR_CONFIG_IS_DOMAIN_POWER_MANAGEMENT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GVIR_CONFIG_TYPE_DOMAIN_POWER_MANAGEMENT)) +#define GVIR_CONFIG_DOMAIN_POWER_MANAGEMENT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GVIR_CONFIG_TYPE_DOMAIN_POWER_MANAGEMENT, GVirConfigDomainPowerManagementClass)) + +typedef struct _GVirConfigDomainPowerManagement GVirConfigDomainPowerManagement; +typedef struct _GVirConfigDomainPowerManagementPrivate GVirConfigDomainPowerManagementPrivate; +typedef struct _GVirConfigDomainPowerManagementClass GVirConfigDomainPowerManagementClass; + +struct _GVirConfigDomainPowerManagement +{ + GVirConfigObject parent; + + GVirConfigDomainPowerManagementPrivate *priv; + + /* Do not add fields to this struct */ +}; + +struct _GVirConfigDomainPowerManagementClass +{ + GVirConfigObjectClass parent_class; + + gpointer padding[20]; +}; + +GType gvir_config_domain_power_management_get_type(void); + +GVirConfigDomainPowerManagement *gvir_config_domain_power_management_new(void); +GVirConfigDomainPowerManagement *gvir_config_domain_power_management_new_from_xml(const gchar *xml, + GError **error); +void gvir_config_domain_power_management_set_mem_suspend_enabled(GVirConfigDomainPowerManagement *pm, + gboolean enabled); +void gvir_config_domain_power_management_set_disk_suspend_enabled(GVirConfigDomainPowerManagement *pm, + gboolean enabled); + + +G_END_DECLS + +#endif /* __LIBVIRT_GCONFIG_DOMAIN_POWER_MANAGEMENT_H__ */ diff --git a/libvirt-gconfig/libvirt-gconfig-domain.c b/libvirt-gconfig/libvirt-gconfig-domain.c index e679e3a..e664351 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain.c +++ b/libvirt-gconfig/libvirt-gconfig-domain.c @@ -804,3 +804,19 @@ void gvir_config_domain_set_cpu(GVirConfigDomain *domain, "cpu", GVIR_CONFIG_OBJECT(cpu)); } + +/** + * gvir_config_domain_set_power_management: + * @domain: a #GVirConfigDomain + * @pm: (allow-none): a #GVirPowerManagement instance + */ +void gvir_config_domain_set_power_management(GVirConfigDomain *domain, + GVirConfigDomainPowerManagement *pm) +{ + g_return_if_fail(GVIR_CONFIG_IS_DOMAIN(domain)); + g_return_if_fail(pm != NULL || GVIR_CONFIG_IS_DOMAIN_POWER_MANAGEMENT(pm)); + + gvir_config_object_attach_replace(GVIR_CONFIG_OBJECT(domain), + "pm", + GVIR_CONFIG_OBJECT(pm)); +} diff --git a/libvirt-gconfig/libvirt-gconfig-domain.h b/libvirt-gconfig/libvirt-gconfig-domain.h index a7bd73b..3a7be12 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain.h +++ b/libvirt-gconfig/libvirt-gconfig-domain.h @@ -32,6 +32,7 @@ #include <libvirt-gconfig/libvirt-gconfig-domain-device.h> #include <libvirt-gconfig/libvirt-gconfig-domain-seclabel.h> #include <libvirt-gconfig/libvirt-gconfig-domain-cpu.h> +#include <libvirt-gconfig/libvirt-gconfig-domain-power-management.h> G_BEGIN_DECLS @@ -143,6 +144,8 @@ gchar *gvir_config_domain_get_custom_xml(GVirConfigDomain *domain, GVirConfigDomainCpu *gvir_config_domain_get_cpu(GVirConfigDomain *domain); void gvir_config_domain_set_cpu(GVirConfigDomain *domain, GVirConfigDomainCpu *cpu); +void gvir_config_domain_set_power_management(GVirConfigDomain *domain, + GVirConfigDomainPowerManagement *pm); G_END_DECLS diff --git a/libvirt-gconfig/libvirt-gconfig.h b/libvirt-gconfig/libvirt-gconfig.h index 4b5ccbd..0428259 100644 --- a/libvirt-gconfig/libvirt-gconfig.h +++ b/libvirt-gconfig/libvirt-gconfig.h @@ -67,6 +67,7 @@ #include <libvirt-gconfig/libvirt-gconfig-domain-memballoon.h> #include <libvirt-gconfig/libvirt-gconfig-domain-os.h> #include <libvirt-gconfig/libvirt-gconfig-domain-parallel.h> +#include <libvirt-gconfig/libvirt-gconfig-domain-power-management.h> #include <libvirt-gconfig/libvirt-gconfig-domain-redirdev.h> #include <libvirt-gconfig/libvirt-gconfig-domain-seclabel.h> #include <libvirt-gconfig/libvirt-gconfig-domain-serial.h> diff --git a/libvirt-gconfig/libvirt-gconfig.sym b/libvirt-gconfig/libvirt-gconfig.sym index 2ec2e80..622e0f2 100644 --- a/libvirt-gconfig/libvirt-gconfig.sym +++ b/libvirt-gconfig/libvirt-gconfig.sym @@ -472,4 +472,15 @@ LIBVIRT_GCONFIG_0.1.3 { gvir_config_domain_graphics_vnc_set_socket; } LIBVIRT_GCONFIG_0.1.0; +LIBVIRT_GCONFIG_0.1.4 { + global: + gvir_config_domain_power_management_get_type; + gvir_config_domain_power_management_new; + gvir_config_domain_power_management_new_from_xml; + gvir_config_domain_power_management_set_mem_suspend_enabled; + gvir_config_domain_power_management_set_disk_suspend_enabled; + + gvir_config_domain_set_power_management; +} LIBVIRT_GCONFIG_0.1.3; + # .... define new API here using predicted next version number .... -- 1.7.12.1

2 2

[libvirt] [PATCH 0/6] Enhance save/restore/migration of domains with USB devices
by Jiri Denemark 11 Oct '12

11 Oct '12

USB devices can disappear without OS being mad about it, which makes them ideal for startupPolicy so that a domain with USB devices can be migrated to a host that lacks the USB devices. Moreover, this series allows USB devices to be re-plugged or a host to be rebooted while domains with USB devices are (managed)saved. Jiri Denemark (6): conf: Add support for startupPolicy for USB devices qemu: Introduce qemuFindHostdevUSBDevice qemu: Add option to treat missing USB devices as success qemu: Implement startupPolicy for USB passed through devices Add MIGRATABLE flag for virDomainGetXMLDesc qemu: Make save/restore with USB devices usable docs/formatdomain.html.in | 28 ++++++-- docs/schemas/domaincommon.rng | 3 + include/libvirt/libvirt.h.in | 1 + src/conf/domain_conf.c | 45 ++++++++++++- src/conf/domain_conf.h | 4 ++ src/qemu/qemu_cgroup.c | 2 + src/qemu/qemu_command.c | 20 ++++-- src/qemu/qemu_domain.c | 21 +++--- src/qemu/qemu_domain.h | 11 ++-- src/qemu/qemu_driver.c | 19 +++--- src/qemu/qemu_hostdev.c | 137 +++++++++++++++++++++++++++++----------- src/qemu/qemu_hostdev.h | 6 +- src/qemu/qemu_hotplug.c | 33 +--------- src/qemu/qemu_migration.c | 12 ++-- src/qemu/qemu_process.c | 16 ++--- src/security/security_dac.c | 16 +++-- src/security/security_selinux.c | 16 +++-- src/util/hostusb.c | 91 ++++++++++++++++++-------- src/util/hostusb.h | 22 ++++--- tools/virsh-domain.c | 4 ++ tools/virsh.pod | 7 +- 21 files changed, 351 insertions(+), 163 deletions(-) -- 1.7.12

3 20

[libvirt] [PATCH] Make the use of XDG folders variable
by Martin Kletzander 11 Oct '12

11 Oct '12

While ago, commit 32a9aac2e04c991340b66c855a1095e4e6445e54 introduced a change of the folders used to keep information in user home directories. As this can still cause problems, mainly with older SELinux policies, make this change variable with new configuration option '--disable-xdg'. --- Sorry for not splitting this patch, but either having the option and not making it work or the other way around is pretty bad (and having it in repo as a commit even worse). configure.ac | 14 +++++++ daemon/Makefile.am | 2 + daemon/libvirtd-config.c | 11 ++++++ daemon/libvirtd.c | 84 +++++++++++++++++++++++++++++++++++++----- daemon/libvirtd.pod.in | 6 +-- libvirt.spec.in | 11 ++++++ src/libvirt.c | 19 ++++++++-- src/network/bridge_driver.c | 22 ++++++++++- src/nwfilter/nwfilter_driver.c | 15 +++++++- src/qemu/qemu_driver.c | 55 ++++++++++++++++++--------- src/remote/remote_driver.c | 15 +++++++- src/secret/secret_driver.c | 13 +++++++ src/uml/uml_driver.c | 14 +++++++ src/util/virauth.c | 8 ++++ tools/virsh.c | 13 +++++++ 15 files changed, 263 insertions(+), 39 deletions(-) diff --git a/configure.ac b/configure.ac index ee51bb6..cacdefe 100644 --- a/configure.ac +++ b/configure.ac @@ -2545,6 +2545,20 @@ if test "$enable_locking" = "yes"; then fi AM_CONDITIONAL([WITH_CIL],[test "$enable_locking" = "yes"]) +dnl --enable-xdg=(yes|no) +AC_ARG_ENABLE([xdg], + [AC_HELP_STRING([--disable-xdg], + [disable using XDG folders])], + [], [enable_xdg=yes]) +if test x"$enable_xdg" = x"yes"; then + AC_DEFINE([ENABLE_XDG], [], [whether to use XDG folders]) + AC_SUBST([userconfdir], [[XDG_CONFIG_DIR/libvirt]]) + AC_SUBST([userrundir], [[XDG_RUNTIME_DIR/libvirt]]) +else + AC_SUBST([userconfdir], [[HOME/.libvirt]]) + AC_SUBST([userrundir], [HOME/.libvirt]) +fi + dnl Enable building libvirtd? AM_CONDITIONAL([WITH_LIBVIRTD],[test "x$with_libvirtd" = "xyes"]) diff --git a/daemon/Makefile.am b/daemon/Makefile.am index 3405c67..1b9ad7c 100644 --- a/daemon/Makefile.am +++ b/daemon/Makefile.am @@ -87,6 +87,8 @@ libvirtd.8: $(srcdir)/libvirtd.8.in sed \ -e 's!SYSCONFDIR!$(sysconfdir)!g' \ -e 's!LOCALSTATEDIR!$(localstatedir)!g' \ + -e 's!USERCONFDIR!$(userconfdir)!g' \ + -e 's!USERRUNDIR!$(userrundir)!g' \ < $< > $@-t mv $@-t $@ diff --git a/daemon/libvirtd-config.c b/daemon/libvirtd-config.c index d9dfea1..227147d 100644 --- a/daemon/libvirtd-config.c +++ b/daemon/libvirtd-config.c @@ -203,6 +203,7 @@ daemonConfigFilePath(bool privileged, char **configfile) } else { char *configdir = NULL; +#ifdef ENABLE_XDG if (!(configdir = virGetUserConfigDirectory())) goto error; @@ -210,6 +211,16 @@ daemonConfigFilePath(bool privileged, char **configfile) VIR_FREE(configdir); goto no_memory; } +#else + if (!(configdir = virGetUserDirectory())) + goto error; + + if (virAsprintf(configfile, "%s/.libvirt/libvirtd.conf", configdir) < 0) { + VIR_FREE(configdir); + goto no_memory; + } +#endif + VIR_FREE(configdir); } diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c index b49acc5..c87039e 100644 --- a/daemon/libvirtd.c +++ b/daemon/libvirtd.c @@ -245,6 +245,8 @@ daemonPidFilePath(bool privileged, goto no_memory; } else { char *rundir = NULL; + +#ifdef ENABLE_XDG mode_t old_umask; if (!(rundir = virGetUserRuntimeDirectory())) @@ -261,6 +263,15 @@ daemonPidFilePath(bool privileged, VIR_FREE(rundir); goto no_memory; } +#else + if (!(rundir = virGetUserDirectory())) + goto error; + + if (virAsprintf(pidfile, "%s/.libvirt/libvirtd.pid", rundir) < 0) { + VIR_FREE(rundir); + goto no_memory; + } +#endif VIR_FREE(rundir); } @@ -293,8 +304,9 @@ daemonUnixSocketPaths(struct daemonConfig *config, goto no_memory; } else { char *rundir = NULL; - mode_t old_umask; +#ifdef ENABLE_XDG + mode_t old_umask; if (!(rundir = virGetUserRuntimeDirectory())) goto error; @@ -309,6 +321,15 @@ daemonUnixSocketPaths(struct daemonConfig *config, VIR_FREE(rundir); goto no_memory; } +#else + if (!(rundir = virGetUserDirectory())) + goto error; + + if (virAsprintf(sockfile, "@%s/.libvirt/libvirt-sock", rundir) < 0) { + VIR_FREE(rundir); + goto no_memory; + } +#endif VIR_FREE(rundir); } @@ -663,10 +684,12 @@ daemonSetupLogging(struct daemonConfig *config, LOCALSTATEDIR) == -1) goto no_memory; } else { - char *logdir = virGetUserCacheDirectory(); + char *logdir = NULL; + +#ifdef ENABLE_XDG mode_t old_umask; - if (!logdir) + if (!(logdir = virGetUserCacheDirectory())) goto error; old_umask = umask(077); @@ -681,6 +704,17 @@ daemonSetupLogging(struct daemonConfig *config, VIR_FREE(logdir); goto no_memory; } +#else + if (!(logdir = virGetUserDirectory())) + goto error; + + if (virAsprintf(&tmp, "%d:file:%s/.libvirt/libvirtd.log", + virLogGetDefaultPriority(), logdir) == -1) { + VIR_FREE(logdir); + goto no_memory; + } +#endif + VIR_FREE(logdir); } } else { @@ -801,6 +835,7 @@ static int daemonStateInit(virNetServerPtr srv) return 0; } +#ifdef ENABLE_XDG static int migrateProfile(void) { char *old_base = NULL; @@ -876,6 +911,7 @@ static int migrateProfile(void) return ret; } +#endif /* Print command-line usage. */ static void @@ -926,14 +962,14 @@ libvirt management daemon:\n"), argv0); LOCALSTATEDIR); } else { fprintf(stderr, - "%s", _("\n\ + _("\n\ Default paths:\n\ \n\ Configuration file (unless overridden by -f):\n\ - $XDG_CONFIG_HOME/libvirt/libvirtd.conf\n\ + %s/libvirtd.conf\n\ \n\ Sockets:\n\ - $XDG_RUNTIME_DIR/libvirt/libvirt-sock (in UNIX abstract namespace)\n\ + %s/libvirt-sock (in UNIX abstract namespace)\n \ \n\ TLS:\n\ CA certificate: $HOME/.pki/libvirt/cacert.pem\n\ @@ -941,8 +977,18 @@ libvirt management daemon:\n"), argv0); Server private key: $HOME/.pki/libvirt/serverkey.pem\n\ \n\ PID file:\n\ - $XDG_RUNTIME_DIR/libvirt/libvirtd.pid\n\ -\n")); + %s/libvirtd.pid\n \ +\n"), +#ifdef ENABLE_XDG + "$XDG_CONFIG_HOME/libvirt", + "$XDG_RUNTIME_DIR/libvirt", + "$XDG_RUNTIME_DIR/libvirt" +#else + "$HOME/.libvirt", + "$HOME/.libvirt", + "$HOME/.libvirt" +#endif + ); } } @@ -1115,11 +1161,13 @@ int main(int argc, char **argv) { exit(EXIT_FAILURE); } +#ifdef ENABLE_XDG if (!privileged && migrateProfile() < 0) { VIR_ERROR(_("Exiting due to failure to migrate profile")); exit(EXIT_FAILURE); } +#endif if (config->host_uuid && virSetHostUUIDStr(config->host_uuid) < 0) { @@ -1170,22 +1218,38 @@ int main(int argc, char **argv) { if (privileged) { run_dir = strdup(LOCALSTATEDIR "/run/libvirt"); } else { +#ifdef ENABLE_XDG run_dir = virGetUserRuntimeDirectory(); if (!run_dir) { VIR_ERROR(_("Can't determine user directory")); goto cleanup; } +#else + char *user_dir = virGetUserDirectory(); + + if (!user_dir) { + VIR_ERROR(_("Can't determine user directory")); + goto cleanup; + } + ignore_value(virAsprintf(&run_dir, "%s/.libvirt/", user_dir)); + VIR_FREE(user_dir); +#endif } if (!run_dir) { virReportOOMError(); goto cleanup; } - if (privileged) + if (privileged) { old_umask = umask(022); - else + } else { +#ifdef ENABLE_XDG old_umask = umask(077); +#else + old_umask = umask(022); +#endif + } VIR_DEBUG("Ensuring run dir '%s' exists", run_dir); if (virFileMakePath(run_dir) < 0) { char ebuf[1024]; diff --git a/daemon/libvirtd.pod.in b/daemon/libvirtd.pod.in index 930b752..82cb14f 100644 --- a/daemon/libvirtd.pod.in +++ b/daemon/libvirtd.pod.in @@ -112,12 +112,12 @@ The PID file to use, unless overridden by the B<-p>|B<--pid-file> option. =over -=item F<$XDG_CONFIG_HOME/libvirtd.conf> +=item F<$USERCONFDIR/libvirtd.conf> The default configuration file used by libvirtd, unless overridden on the command line using the B<-f>|B<--config> option. -=item F<$XDG_RUNTIME_DIR/libvirt/libvirt-sock> +=item F<$USERRUNDIR/libvirt-sock> The socket libvirtd will use. @@ -133,7 +133,7 @@ The TLS B<Server> certificate libvirtd will use. The TLS B<Server> private key libvirtd will use. -=item F<$XDG_RUNTIME_DIR/libvirt/libvirtd.pid> +=item F<$USERRUNDIR/libvirtd.pid> The PID file to use, unless overridden by the B<-p>|B<--pid-file> option. diff --git a/libvirt.spec.in b/libvirt.spec.in index 318fe92..0ec7e03 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -305,6 +305,12 @@ %endif +# Don't change user directories in older RHELs +%if 0%{?rhel} <= 6 +%define +%endif + + # The RHEL-5 Xen package has some feature backports. This # flag is set to enable use of those special bits on RHEL-5 %if 0%{?rhel} == 5 @@ -1210,6 +1216,10 @@ of recent versions of Linux (and other OSes). %define _with_firewalld --with-firewalld %endif +%if %{disable_xdg} +%define _disable_xdg --enable-xdg=no +%endif + %define when %(date +"%%F-%%T") %define where %(hostname) %define who %{?packager}%{!?packager:Unknown} @@ -1278,6 +1288,7 @@ autoreconf -if %{?_without_dtrace} \ %{?_without_driver_modules} \ %{?_with_firewalld} \ + %{?_disable_xdg} \ %{with_packager} \ %{with_packager_version} \ --with-qemu-user=%{qemu_user} \ diff --git a/src/libvirt.c b/src/libvirt.c index 76e4401..4a15808 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -922,15 +922,26 @@ virConnectGetConfigFilePath(void) SYSCONFDIR) < 0) goto no_memory; } else { - char *userdir = virGetUserConfigDirectory(); - if (!userdir) + char *userdir = NULL; + +#ifdef ENABLE_XDG + if (!(userdir = virGetUserConfigDirectory())) goto error; - if (virAsprintf(&path, "%s/libvirt.conf", - userdir) < 0) { + if (virAsprintf(&path, "%s/libvirt.conf", userdir) < 0) { VIR_FREE(userdir); goto no_memory; } +#else + if (!(userdir = virGetUserDirectory())) + goto error; + + if (virAsprintf(&path, "%s/.libvirt/libvirt.conf", userdir) < 0) { + VIR_FREE(userdir); + goto no_memory; + } +#endif + VIR_FREE(userdir); } diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index e1846ee..874b3be 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -302,9 +302,10 @@ networkStartup(int privileged) { if ((base = strdup (SYSCONFDIR "/libvirt")) == NULL) goto out_of_memory; } else { - char *userdir = virGetUserCacheDirectory(); + char *userdir = NULL; - if (!userdir) +#ifdef ENABLE_XDG + if (!(userdir = virGetUserCacheDirectory())) goto error; if (virAsprintf(&driverState->logDir, @@ -320,6 +321,23 @@ networkStartup(int privileged) { goto out_of_memory; } VIR_FREE(userdir); +#else + if (!(userdir = virGetUserDirectory())) + goto error; + + if (virAsprintf(&driverState->logDir, + "%s/.libvirt/qemu/log", userdir) == -1) { + VIR_FREE(userdir); + goto out_of_memory; + } + + if (virAsprintf(&base, "%s/.libvirt", userdir) == -1) { + VIR_FREE(userdir); + goto out_of_memory; + } + VIR_FREE(userdir); +#endif + } /* Configuration paths are either ~/.libvirt/qemu/... (session) or diff --git a/src/nwfilter/nwfilter_driver.c b/src/nwfilter/nwfilter_driver.c index a80bb66..b0be1c6 100644 --- a/src/nwfilter/nwfilter_driver.c +++ b/src/nwfilter/nwfilter_driver.c @@ -2,7 +2,7 @@ * nwfilter_driver.c: core driver for network filter APIs * (based on storage_driver.c) * - * Copyright (C) 2006-2011 Red Hat, Inc. + * Copyright (C) 2006-2012 Red Hat, Inc. * Copyright (C) 2006-2008 Daniel P. Berrange * Copyright (C) 2010 IBM Corporation * Copyright (C) 2010 Stefan Berger @@ -219,9 +219,22 @@ nwfilterDriverStartup(int privileged) if ((base = strdup (SYSCONFDIR "/libvirt")) == NULL) goto out_of_memory; } else { +#ifdef ENABLE_XDG base = virGetUserConfigDirectory(); if (!base) goto error; +#else + char *userdir = virGetUserDirectory(); + + if (!userdir) + goto error; + + if (virAsprintf(&base, "%s/.libvirt", userdir) == -1) { + VIR_FREE(userdir); + goto out_of_memory; + } + VIR_FREE(userdir); +#endif } if (virAsprintf(&driverState->configDir, diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index decf0fb..cc8185d 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -659,36 +659,57 @@ qemudStartup(int privileged) { "%s/lib/libvirt/qemu/dump", LOCALSTATEDIR) == -1) goto out_of_memory; } else { - char *rundir; - char *cachedir; + char *tmpdir; - cachedir = virGetUserCacheDirectory(); - if (!cachedir) +#ifdef ENABLE_XDG + base = virGetUserConfigDirectory(); + if (!base) + goto error; + + tmpdir = virGetUserCacheDirectory(); + if (!tmpdir) goto error; if (virAsprintf(&qemu_driver->logDir, - "%s/qemu/log", cachedir) == -1) { - VIR_FREE(cachedir); + "%s/qemu/log", tmpdir) == -1) { + VIR_FREE(tmpdir); goto out_of_memory; } - if (virAsprintf(&qemu_driver->cacheDir, "%s/qemu/cache", cachedir) == -1) { - VIR_FREE(cachedir); + if (virAsprintf(&qemu_driver->cacheDir, "%s/qemu/cache", tmpdir) == -1) { + VIR_FREE(tmpdir); goto out_of_memory; } - VIR_FREE(cachedir); + VIR_FREE(tmpdir); - rundir = virGetUserRuntimeDirectory(); - if (!rundir) + tmpdir = virGetUserRuntimeDirectory(); + if (!tmpdir) goto error; - if (virAsprintf(&qemu_driver->stateDir, "%s/qemu/run", rundir) == -1) { - VIR_FREE(rundir); + if (virAsprintf(&qemu_driver->stateDir, "%s/qemu/run", tmpdir) == -1) { + VIR_FREE(tmpdir); goto out_of_memory; } - VIR_FREE(rundir); - - base = virGetUserConfigDirectory(); - if (!base) + VIR_FREE(tmpdir); +#else + if (!(tmpdir = virGetUserDirectory())) goto error; + + if (virAsprintf(&qemu_driver->logDir, + "%s/.libvirt/qemu/log", tmpdir) == -1) { + VIR_FREE(tmpdir); + goto out_of_memory; + } + + if (virAsprintf(&base, "%s/.libvirt", tmpdir) == -1) { + VIR_FREE(tmpdir); + goto out_of_memory; + } + + if (virAsprintf(&qemu_driver->stateDir, "%s/qemu/run", base) == -1) + goto out_of_memory; + if (virAsprintf(&qemu_driver->cacheDir, "%s/qemu/cache", base) == -1) + goto out_of_memory; +#endif + if (virAsprintf(&qemu_driver->libDir, "%s/qemu/lib", base) == -1) goto out_of_memory; if (virAsprintf(&qemu_driver->saveDir, "%s/qemu/save", base) == -1) diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index fc4c696..1b6a360 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -640,15 +640,26 @@ doRemoteOpen(virConnectPtr conn, case trans_unix: if (!sockname) { if (flags & VIR_DRV_OPEN_REMOTE_USER) { - char *userdir = virGetUserRuntimeDirectory(); + char *userdir = NULL; - if (!userdir) +# ifdef ENABLE_XDG + if (!(userdir = virGetUserRuntimeDirectory())) goto failed; if (virAsprintf(&sockname, "%s/" LIBVIRTD_USER_UNIX_SOCKET, userdir) < 0) { VIR_FREE(userdir); goto no_memory; } +# else + if (!(userdir = virGetUserDirectory())) + goto failed; + + if (virAsprintf(&sockname, "%s/.libvirt/" LIBVIRTD_USER_UNIX_SOCKET, userdir) < 0) { + VIR_FREE(userdir); + goto no_memory; + } +# endif + VIR_FREE(userdir); } else { if (flags & VIR_DRV_OPEN_REMOTE_RO) diff --git a/src/secret/secret_driver.c b/src/secret/secret_driver.c index 9ce1e33..846b5cc 100644 --- a/src/secret/secret_driver.c +++ b/src/secret/secret_driver.c @@ -1091,9 +1091,22 @@ secretDriverStartup(int privileged) if (base == NULL) goto out_of_memory; } else { +#ifdef ENABLE_XDG base = virGetUserConfigDirectory(); if (!base) goto error; +#else + char *userdir = virGetUserDirectory(); + + if (!userdir) + goto error; + + if (virAsprintf(&base, "%s/.libvirt", userdir) == -1) { + VIR_FREE(userdir); + goto out_of_memory; + } + VIR_FREE(userdir); +#endif } if (virAsprintf(&driverState->directory, "%s/secrets", base) == -1) goto out_of_memory; diff --git a/src/uml/uml_driver.c b/src/uml/uml_driver.c index c341fab..1cc5c20 100644 --- a/src/uml/uml_driver.c +++ b/src/uml/uml_driver.c @@ -462,9 +462,23 @@ umlStartup(int privileged) "%s/run/libvirt/uml-guest", LOCALSTATEDIR) == -1) goto out_of_memory; } else { + +#ifdef ENABLE_XDG base = virGetUserConfigDirectory(); if (!base) goto error; +#else + userdir = virGetUserDirectory(); + + if (!userdir) + goto error; + + if (virAsprintf(&base, "%s/.libvirt", userdir) == -1) { + VIR_FREE(userdir); + goto out_of_memory; + } + VIR_FREE(userdir); +#endif if (virAsprintf(&uml_driver->logDir, "%s/uml/log", base) == -1) diff --git a/src/util/virauth.c b/src/util/virauth.c index 6d9935d..a5dbc1f 100644 --- a/src/util/virauth.c +++ b/src/util/virauth.c @@ -68,11 +68,19 @@ int virAuthGetConfigFilePath(virConnectPtr conn, } } +#ifdef ENABLE_XDG if (!(userdir = virGetUserConfigDirectory())) goto cleanup; if (virAsprintf(path, "%s/auth.conf", userdir) < 0) goto no_memory; +#else + if (!(userdir = virGetUserDirectory())) + goto cleanup; + + if (virAsprintf(path, "%s/.libvirt/auth.conf", userdir) < 0) + goto no_memory; +#endif VIR_DEBUG("Checking for readability of '%s'", *path); if (access(*path, R_OK) == 0) diff --git a/tools/virsh.c b/tools/virsh.c index f0ec625..2d0e62b 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -2465,18 +2465,31 @@ vshReadlineInit(vshControl *ctl) stifle_history(500); /* Prepare to read/write history from/to the $XDG_CACHE_HOME/virsh/history file */ + +# ifdef ENABLE_XDG userdir = virGetUserCacheDirectory(); +# else + userdir = virGetUserDirectory(); +# endif if (userdir == NULL) { vshError(ctl, "%s", _("Could not determine home directory")); return -1; } +# ifdef ENABLE_XDG if (virAsprintf(&ctl->historydir, "%s/virsh", userdir) < 0) { vshError(ctl, "%s", _("Out of memory")); VIR_FREE(userdir); return -1; } +# else + if (virAsprintf(&ctl->historydir, "%s/.virsh", userdir) < 0) { + vshError(ctl, "%s", _("Out of memory")); + VIR_FREE(userdir); + return -1; + } +# endif if (virAsprintf(&ctl->historyfile, "%s/history", ctl->historydir) < 0) { vshError(ctl, "%s", _("Out of memory")); -- 1.7.12.3

2 1

[libvirt] [PATCH 0/7] External checkpoint support
by Peter Krempa 11 Oct '12

11 Oct '12

This series adds support for external system checkpoints. This series is designed to be applied on top of: http://www.redhat.com/archives/libvir-list/2012-September/msg00594.html This first series adds support for taking the snapshots. I'll follow up with adding support to revert snapshots or to add add snapshots with different parents, but I'd like to start rounds of review on this until the design settles. Peter Peter Krempa (7): qemu: Fix misleading comment for qemuDomainObjBeginJobWithDriver() qemu: Split out code to save domain memory to allow reuse snapshot: Add flag to enable creating checkpoints in paused state snapshot: qemu: Add async job type for snapshots snapshot: qemu: Rename qemuDomainSnapshotCreateActive snapshot: qemu: Add support for external checkpoints snapshot: qemu: Remove restrictions preventing external snapshots include/libvirt/libvirt.h.in | 4 + src/qemu/qemu_domain.c | 6 +- src/qemu/qemu_domain.h | 1 + src/qemu/qemu_driver.c | 474 +++++++++++++++++++++++++------------------ src/qemu/qemu_process.c | 19 ++ tools/virsh-domain-monitor.c | 2 + tools/virsh-snapshot.c | 6 + tools/virsh.pod | 12 +- 8 files changed, 326 insertions(+), 198 deletions(-) -- 1.7.12

2 10

[libvirt] [PATCH v2 0/6] Add support for lock failure action
by Jiri Denemark 11 Oct '12

11 Oct '12

When sanlock is used as a locking driver and sanlock deamon loses access to its lockspace, it automatically kills off the domains that had their locks stored there. Apparently some management apps would like to change this behavior by configuring what should happen when locks are lost. Patch 3/7 from v1 was dropped in v2. Other patches were updated according to review comments. More details may be found in each patch. Jiri Denemark (6): conf: Rename life cycle actions to event actions conf: Add on_lockfailure event configuration locking: Add const char * parameter to avoid ugly typecasts locking: Pass hypervisor driver name when acquiring locks locking: Add support for lock failure action locking: Implement lock failure action in sanlock driver docs/formatdomain.html.in | 37 ++++++++-- docs/internals/locking.html.in | 8 +++ docs/locking.html.in | 24 +++++++ docs/schemas/domaincommon.rng | 30 +++++++-- libvirt.spec.in | 1 + po/POTFILES.in | 1 + src/Makefile.am | 13 +++- src/conf/domain_conf.c | 85 ++++++++++++++--------- src/conf/domain_conf.h | 18 ++++- src/libvirt_private.syms | 2 + src/locking/domain_lock.c | 36 ++++++---- src/locking/domain_lock.h | 4 ++ src/locking/lock_driver.h | 8 ++- src/locking/lock_driver_nop.c | 1 + src/locking/lock_driver_sanlock.c | 114 +++++++++++++++++++++++++++---- src/locking/lock_manager.c | 10 ++- src/locking/lock_manager.h | 1 + src/locking/sanlock_helper.c | 138 ++++++++++++++++++++++++++++++++++++++ src/qemu/qemu_conf.h | 1 + src/qemu/qemu_driver.c | 9 +-- src/qemu/qemu_hotplug.c | 15 +++-- src/qemu/qemu_process.c | 4 +- 22 files changed, 479 insertions(+), 81 deletions(-) create mode 100644 src/locking/sanlock_helper.c -- 1.7.12

2 13

[libvirt] [PATCH 0/3] vcpupin improvements
by Osier Yang 11 Oct '12

11 Oct '12

These 3 patches are to improve vcpu pinning problems: problem 1: vcpu hotplug is supported for some time, but it doesn't set pinning policy for the vcpus onlined, or doesn't remove the pinning policy for offlined vcpus. problem 2: Also each vcpu doesn't inherit the pinning policy from def->cpuset (<vcpu cpuset='0-3,^2'>4</vcpu>) if there is no policy specified explicitly for its own. This is incorrect, as it conflicts with the of def->cpuset. PATCH 3/3 fix problem 1 (based an ACKed but not pushed patch https://www.redhat.com/archives/libvir-list/2012-October/msg00372.html) PATCH 2/3 fix problem 2. Osier Yang (3): conf: Do not allow vcpupin's cpuid exceed current vcpus number conf: Initialize the pinning policy for vcpus qemu: Initialize cpuset for hotplugged vcpu as def->cpuset src/conf/domain_conf.c | 60 +++++++++++++++++++++++++++++++++++- src/conf/domain_conf.h | 3 ++ src/libvirt_private.syms | 1 + src/qemu/qemu_driver.c | 75 ++++++++++++++++++++++++++++++++++++++++----- 4 files changed, 128 insertions(+), 11 deletions(-) Regards, Osier

3 9

[libvirt] [PATCH v9] support offline migration
by liguang 11 Oct '12

11 Oct '12

original migration did not aware of offline case, so, try to support offline migration quietly (did not disturb original migration) by pass VIR_MIGRATE_OFFLINE flag to migration APIs if only the domain is really inactive, and migration process will not puzzled by domain offline and exit unexpectedly. these changes did not take care of disk images the domain required, for them could be transferred by other APIs as suggested, then VIR_MIGRATE_OFFLINE should not combined with VIR_MIGRATE_NON_SHARED_*. so, this migration result is just make domain definition alive at target side. Signed-off-by: liguang <lig.fnst(a)cn.fujitsu.com> --- include/libvirt/libvirt.h.in | 1 + src/qemu/qemu_driver.c | 15 ++++++++++++ src/qemu/qemu_migration.c | 53 ++++++++++++++++++++++++++++++++++++----- src/qemu/qemu_migration.h | 3 +- tools/virsh-domain.c | 6 ++++ 5 files changed, 70 insertions(+), 8 deletions(-) diff --git a/include/libvirt/libvirt.h.in b/include/libvirt/libvirt.h.in index 79c7689..627e9d4 100644 --- a/include/libvirt/libvirt.h.in +++ b/include/libvirt/libvirt.h.in @@ -995,6 +995,7 @@ typedef enum { * whole migration process; this will be used automatically * when supported */ VIR_MIGRATE_UNSAFE = (1 << 9), /* force migration even if it is considered unsafe */ + VIR_MIGRATE_OFFLINE = (1 << 10), /* offline migrate */ } virDomainMigrateFlags; /* Domain migration. */ diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 6848924..105febf 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -9631,6 +9631,15 @@ qemuDomainMigrateBegin3(virDomainPtr domain, } if (!virDomainObjIsActive(vm)) { + if (flags & VIR_MIGRATE_OFFLINE) { + if (flags & (VIR_MIGRATE_NON_SHARED_DISK| + VIR_MIGRATE_NON_SHARED_INC)) { + virReportError(VIR_ERR_OPERATION_INVALID, + "%s", _("migrating storage handled by volume APIs")); + goto endjob; + } + goto offline; + } virReportError(VIR_ERR_OPERATION_INVALID, "%s", _("domain is not running")); goto endjob; @@ -9643,6 +9652,7 @@ qemuDomainMigrateBegin3(virDomainPtr domain, if (qemuDomainCheckEjectableMedia(driver, vm, asyncJob) < 0) goto endjob; +offline: if (!(xml = qemuMigrationBegin(driver, vm, xmlin, dname, cookieout, cookieoutlen, flags))) @@ -9878,6 +9888,11 @@ qemuDomainMigrateConfirm3(virDomainPtr domain, goto cleanup; } + if (flags & VIR_MIGRATE_OFFLINE) { + ret = 0; + goto cleanup; + } + if (!qemuMigrationJobIsActive(vm, QEMU_ASYNC_JOB_MIGRATION_OUT)) goto cleanup; diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 8e85875..411a4c2 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -70,6 +70,7 @@ enum qemuMigrationCookieFlags { QEMU_MIGRATION_COOKIE_FLAG_GRAPHICS, QEMU_MIGRATION_COOKIE_FLAG_LOCKSTATE, QEMU_MIGRATION_COOKIE_FLAG_PERSISTENT, + QEMU_MIGRATION_COOKIE_FLAG_OFFLINE, QEMU_MIGRATION_COOKIE_FLAG_LAST }; @@ -77,12 +78,13 @@ enum qemuMigrationCookieFlags { VIR_ENUM_DECL(qemuMigrationCookieFlag); VIR_ENUM_IMPL(qemuMigrationCookieFlag, QEMU_MIGRATION_COOKIE_FLAG_LAST, - "graphics", "lockstate", "persistent"); + "graphics", "lockstate", "persistent", "offline"); enum qemuMigrationCookieFeatures { QEMU_MIGRATION_COOKIE_GRAPHICS = (1 << QEMU_MIGRATION_COOKIE_FLAG_GRAPHICS), QEMU_MIGRATION_COOKIE_LOCKSTATE = (1 << QEMU_MIGRATION_COOKIE_FLAG_LOCKSTATE), QEMU_MIGRATION_COOKIE_PERSISTENT = (1 << QEMU_MIGRATION_COOKIE_FLAG_PERSISTENT), + QEMU_MIGRATION_COOKIE_OFFLINE = (1 << QEMU_MIGRATION_COOKIE_FLAG_OFFLINE), }; typedef struct _qemuMigrationCookieGraphics qemuMigrationCookieGraphics; @@ -439,6 +441,9 @@ qemuMigrationCookieXMLFormat(struct qemud_driver *driver, virBufferAdjustIndent(buf, -2); } + if (mig->flags & QEMU_MIGRATION_COOKIE_OFFLINE) + virBufferAsprintf(buf, " <offline/>\n"); + virBufferAddLit(buf, "</qemu-migration>\n"); return 0; } @@ -662,6 +667,11 @@ qemuMigrationCookieXMLParse(qemuMigrationCookiePtr mig, VIR_FREE(nodes); } + if ((flags & QEMU_MIGRATION_COOKIE_OFFLINE)) { + if (virXPathBoolean("count(./offline) > 0", ctxt)) + mig->flags |= QEMU_MIGRATION_COOKIE_OFFLINE; + } + return 0; error: @@ -721,6 +731,10 @@ qemuMigrationBakeCookie(qemuMigrationCookiePtr mig, qemuMigrationCookieAddPersistent(mig, dom) < 0) return -1; + if (flags & QEMU_MIGRATION_COOKIE_OFFLINE) { + mig->flags |= QEMU_MIGRATION_COOKIE_OFFLINE; + } + if (!(*cookieout = qemuMigrationCookieXMLFormatStr(driver, mig))) return -1; @@ -1151,6 +1165,13 @@ char *qemuMigrationBegin(struct qemud_driver *driver, QEMU_MIGRATION_COOKIE_LOCKSTATE) < 0) goto cleanup; + if (flags & VIR_MIGRATE_OFFLINE) { + if (qemuMigrationBakeCookie(mig, driver, vm, + cookieout, cookieoutlen, + QEMU_MIGRATION_COOKIE_OFFLINE) < 0) + goto cleanup; + } + if (xmlin) { if (!(def = virDomainDefParseString(driver->caps, xmlin, QEMU_EXPECTED_VIRT_TYPES, @@ -1314,6 +1335,15 @@ qemuMigrationPrepareAny(struct qemud_driver *driver, goto endjob; } + if (!(mig = qemuMigrationEatCookie(driver, vm, cookiein, cookieinlen, + QEMU_MIGRATION_COOKIE_OFFLINE))) + return ret; + + if (mig->flags & QEMU_MIGRATION_COOKIE_OFFLINE) { + ret = 0; + goto cleanup; + } + /* Start the QEMU daemon, with the same command-line arguments plus * -incoming $migrateFrom */ @@ -1856,7 +1886,8 @@ qemuMigrationRun(struct qemud_driver *driver, virLockManagerPluginGetName(driver->lockManager)); return -1; } - + if (flags & VIR_MIGRATE_OFFLINE) + return 0; if (!(mig = qemuMigrationEatCookie(driver, vm, cookiein, cookieinlen, QEMU_MIGRATION_COOKIE_GRAPHICS))) goto cleanup; @@ -2372,6 +2403,8 @@ static int doPeer2PeerMigrate3(struct qemud_driver *driver, qemuDomainObjExitRemoteWithDriver(driver, vm); } VIR_FREE(dom_xml); + if (flags & VIR_MIGRATE_OFFLINE) + goto cleanup; if (ret == -1) goto cleanup; @@ -2477,7 +2510,7 @@ finish: vm->def->name); cleanup: - if (ddomain) { + if (ddomain || (flags & VIR_MIGRATE_OFFLINE)) { virObjectUnref(ddomain); ret = 0; } else { @@ -2554,7 +2587,7 @@ static int doPeer2PeerMigrate(struct qemud_driver *driver, } /* domain may have been stopped while we were talking to remote daemon */ - if (!virDomainObjIsActive(vm)) { + if (!virDomainObjIsActive(vm) && !(flags & VIR_MIGRATE_OFFLINE)) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("guest unexpectedly quit")); goto cleanup; @@ -2617,7 +2650,7 @@ qemuMigrationPerformJob(struct qemud_driver *driver, if (qemuMigrationJobStart(driver, vm, QEMU_ASYNC_JOB_MIGRATION_OUT) < 0) goto cleanup; - if (!virDomainObjIsActive(vm)) { + if (!virDomainObjIsActive(vm) && !(flags & VIR_MIGRATE_OFFLINE)) { virReportError(VIR_ERR_OPERATION_INVALID, "%s", _("domain is not running")); goto endjob; @@ -2941,6 +2974,8 @@ qemuMigrationFinish(struct qemud_driver *driver, */ if (retcode == 0) { if (!virDomainObjIsActive(vm)) { + if (flags & VIR_MIGRATE_OFFLINE) + goto offline; virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("guest unexpectedly quit")); goto endjob; @@ -3038,7 +3073,7 @@ qemuMigrationFinish(struct qemud_driver *driver, goto endjob; } } - + offline: dom = virGetDomain (dconn, vm->def->name, vm->def->uuid); event = virDomainEventNewFromObj(vm, @@ -3074,6 +3109,7 @@ qemuMigrationFinish(struct qemud_driver *driver, endjob: if (qemuMigrationJobFinish(driver, vm) == 0) { vm = NULL; + } else if (flags & VIR_MIGRATE_OFFLINE) { } else if (!vm->persistent && !virDomainObjIsActive(vm)) { qemuDomainRemoveInactive(driver, vm); vm = NULL; @@ -3120,7 +3156,10 @@ int qemuMigrationConfirm(struct qemud_driver *driver, if (!(mig = qemuMigrationEatCookie(driver, vm, cookiein, cookieinlen, 0))) return -1; - + if (flags & VIR_MIGRATE_OFFLINE) { + rv = 0; + goto cleanup; + } /* Did the migration go as planned? If yes, kill off the * domain object, but if no, resume CPUs */ diff --git a/src/qemu/qemu_migration.h b/src/qemu/qemu_migration.h index 7a2269a..b4f6a77 100644 --- a/src/qemu/qemu_migration.h +++ b/src/qemu/qemu_migration.h @@ -36,7 +36,8 @@ VIR_MIGRATE_NON_SHARED_DISK | \ VIR_MIGRATE_NON_SHARED_INC | \ VIR_MIGRATE_CHANGE_PROTECTION | \ - VIR_MIGRATE_UNSAFE) + VIR_MIGRATE_UNSAFE | \ + VIR_MIGRATE_OFFLINE) enum qemuMigrationJobPhase { QEMU_MIGRATION_PHASE_NONE = 0, diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 505169b..2218379 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -6647,6 +6647,7 @@ static const vshCmdOptDef opts_migrate[] = { {"dname", VSH_OT_DATA, 0, N_("rename to new name during migration (if supported)")}, {"timeout", VSH_OT_INT, 0, N_("force guest to suspend if live migration exceeds timeout (in seconds)")}, {"xml", VSH_OT_STRING, 0, N_("filename containing updated XML for the target")}, + {"offline", VSH_OT_BOOL, 0, N_("for offline migration")}, {NULL, 0, 0, NULL} }; @@ -6713,6 +6714,11 @@ doMigrate(void *opaque) if (vshCommandOptBool(cmd, "unsafe")) flags |= VIR_MIGRATE_UNSAFE; + if (vshCommandOptBool(cmd, "offline")) { + if (!virDomainIsActive(dom)) + flags |= VIR_MIGRATE_OFFLINE; + } + if (xmlfile && virFileReadAll(xmlfile, 8192, &xml) < 0) { vshError(ctl, _("file '%s' doesn't exist"), xmlfile); -- 1.7.2.5

3 4

[libvirt] [re-send][PATCH 0/3] non-shared migration without target disk images
by liguang 11 Oct '12

11 Oct '12

by now, if you want a non-shared migration, you have to create same files at target as source side, which seems intorlerable! this issue was reported by Reinier Schoof http://www.redhat.com/archives/libvir-list/2011-December/msg00451.html These patches try to let migrate --copy-storage-* work without pre-exist disk image files at target side. we may also hope qemu to aware of this issue hooks/qemu | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/Makefile.am | 3 ++ src/util/hooks.c | 2 +- 3 files changed, 59 insertions(+), 1 deletions(-)

4 14

[libvirt] build libvirt error. lack of AppArmor .
by yue 11 Oct '12

11 Oct '12

error occur when attach a rbd-disk to domain. 1.configure: error: You must install the AppArmor development package in order to compile libvirt 2. 2012-10-10 17:36:16.305+0000: 3808: warning : qemuDomainObjTaint:1297 : Domain id=2 name='xpSP3' uuid=b45bd66a-6700-4905-c5f4-4c799413d7b7 is tainted: high-privileges 2012-10-10 17:36:16.712+0000: 3808: error : qemuMonitorOpenUnix:266 : failed to connect to monitor socket: No such process 2012-10-10 17:36:16.712+0000: 3808: error : qemuProcessWaitForMonitor:1510 : internal error process exited while connecting to monitor: char device redirected to /dev/pts/4 qemu-kvm: -drive file=rbd:cloud/testrbd:id=cloud:key=AQCGbGRQ+M+NGBAATtylZNiSxqCTQ4uaApd+9w==:auth_supported=cephx none:mon_host=192.168.10.4\:6789,if=none,id=drive-ide0-0-1,format=raw: could not open disk image rbd:cloud/testrbd:id=cloud:key=AQCGbGRQ+M+NGBAATtylZNiSxqCTQ4uaApd+9w==:auth_supported=cephx none:mon_host=192.168.10.4\:6789: No such file or directory centos6.2 2.6.32-220.el6.x86_64

2 1

[libvirt] Correct name of domain/pm/suspend-to-mem in docs
by Zeeshan Ali (Khattak) 11 Oct '12

11 Oct '12

From: "Zeeshan Ali (Khattak)" <zeeshanak(a)gnome.org> --- docs/formatdomain.html.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 3cc6c51..f9fe6ca 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -983,7 +983,7 @@ ... <pm> <suspend-to-disk enabled='no'/> - <suspend-to-ram enabled='yes'/> + <suspend-to-mem enabled='yes'/> </pm> ...</pre> -- 1.7.12.1

2 1