Eclipse generates this kind of warning: org/libvirt/jna/virConnectCredential.java:20: List is a raw type. References to generic type List<E> should be parameterized Signed-off-by: Claudio Bley <cbley@av-test.de> --- src/main/java/org/libvirt/jna/virConnectAuth.java | 4 ++-- .../java/org/libvirt/jna/virConnectCredential.java | 4 ++-- .../java/org/libvirt/jna/virDomainBlockInfo.java | 4 ++-- .../java/org/libvirt/jna/virDomainBlockStats.java | 4 ++-- src/main/java/org/libvirt/jna/virDomainInfo.java | 4 ++-- .../org/libvirt/jna/virDomainInterfaceStats.java | 4 ++-- .../java/org/libvirt/jna/virDomainJobInfo.java | 4 ++-- .../java/org/libvirt/jna/virDomainMemoryStats.java | 4 ++-- src/main/java/org/libvirt/jna/virError.java | 4 ++-- src/main/java/org/libvirt/jna/virNodeInfo.java | 4 ++-- .../java/org/libvirt/jna/virSchedParameter.java | 4 ++-- .../java/org/libvirt/jna/virStoragePoolInfo.java | 4 ++-- .../java/org/libvirt/jna/virStorageVolInfo.java | 4 ++-- src/main/java/org/libvirt/jna/virVcpuInfo.java | 4 ++-- 14 files changed, 28 insertions(+), 28 deletions(-) diff --git a/src/main/java/org/libvirt/jna/virConnectAuth.java b/src/main/java/org/libvirt/jna/virConnectAuth.java index ece61f6..0451348 100644 --- a/src/main/java/org/libvirt/jna/virConnectAuth.java +++ b/src/main/java/org/libvirt/jna/virConnectAuth.java @@ -15,11 +15,11 @@ public class virConnectAuth extends Structure { public Libvirt.VirConnectAuthCallback cb; public Pointer cbdata; - private static final List fields = Arrays.asList( + private static final List<String> fields = Arrays.asList( "credtype", "ncredtype", "cb", "cbdata"); @Override - protected List getFieldOrder() { + protected List<String> getFieldOrder() { return fields; } } diff --git a/src/main/java/org/libvirt/jna/virConnectCredential.java b/src/main/java/org/libvirt/jna/virConnectCredential.java index 6dd4a75..316b1f4 100644 --- a/src/main/java/org/libvirt/jna/virConnectCredential.java +++ b/src/main/java/org/libvirt/jna/virConnectCredential.java @@ -17,12 +17,12 @@ public class virConnectCredential extends Structure implements Structure.ByRefer public String result; public int resultlen; - private static final List fields = Arrays.asList( + private static final List<String> fields = Arrays.asList( "type", "prompt", "challenge", "defresult", "result", "resultlen"); @Override - protected List getFieldOrder() { + protected List<String> getFieldOrder() { return fields; } } diff --git a/src/main/java/org/libvirt/jna/virDomainBlockInfo.java b/src/main/java/org/libvirt/jna/virDomainBlockInfo.java index fb1b845..5a88ba3 100644 --- a/src/main/java/org/libvirt/jna/virDomainBlockInfo.java +++ b/src/main/java/org/libvirt/jna/virDomainBlockInfo.java @@ -10,11 +10,11 @@ public class virDomainBlockInfo extends Structure { public long allocation; public long physical; - private static final List fields = Arrays.asList( + private static final List<String> fields = Arrays.asList( "capacity", "allocation", "physical"); @Override - protected List getFieldOrder() { + protected List<String> getFieldOrder() { return fields; } } diff --git a/src/main/java/org/libvirt/jna/virDomainBlockStats.java b/src/main/java/org/libvirt/jna/virDomainBlockStats.java index a7331f6..e48629a 100644 --- a/src/main/java/org/libvirt/jna/virDomainBlockStats.java +++ b/src/main/java/org/libvirt/jna/virDomainBlockStats.java @@ -20,11 +20,11 @@ public class virDomainBlockStats extends Structure { public long errs; // this is a long long in the code, so a long mapping is // correct - private static final List fields = Arrays.asList( + private static final List<String> fields = Arrays.asList( "rd_req", "rd_bytes", "wr_req", "wr_bytes", "errs"); @Override - protected List getFieldOrder() { + protected List<String> getFieldOrder() { return fields; } } diff --git a/src/main/java/org/libvirt/jna/virDomainInfo.java b/src/main/java/org/libvirt/jna/virDomainInfo.java index 0b667f6..ff20d16 100644 --- a/src/main/java/org/libvirt/jna/virDomainInfo.java +++ b/src/main/java/org/libvirt/jna/virDomainInfo.java @@ -16,11 +16,11 @@ public class virDomainInfo extends Structure { public short nrVirtCpu; public long cpuTime; - private static final List fields = Arrays.asList( + private static final List<String> fields = Arrays.asList( "state", "maxMem", "memory", "nrVirtCpu", "cpuTime"); @Override - protected List getFieldOrder() { + protected List<String> getFieldOrder() { return fields; } } diff --git a/src/main/java/org/libvirt/jna/virDomainInterfaceStats.java b/src/main/java/org/libvirt/jna/virDomainInterfaceStats.java index eea6a49..9b98aa8 100644 --- a/src/main/java/org/libvirt/jna/virDomainInterfaceStats.java +++ b/src/main/java/org/libvirt/jna/virDomainInterfaceStats.java @@ -26,12 +26,12 @@ public class virDomainInterfaceStats extends Structure { public long tx_drop; // this is a long long in the code, so a long mapping // is correct - private static final List fields = Arrays.asList( + private static final List<String> fields = Arrays.asList( "rx_bytes", "rx_packets", "rx_errs", "rx_drop", "tx_bytes", "tx_packets", "tx_errs", "tx_drop"); @Override - protected List getFieldOrder() { + protected List<String> getFieldOrder() { return fields; } } diff --git a/src/main/java/org/libvirt/jna/virDomainJobInfo.java b/src/main/java/org/libvirt/jna/virDomainJobInfo.java index 0398901..1bab587 100644 --- a/src/main/java/org/libvirt/jna/virDomainJobInfo.java +++ b/src/main/java/org/libvirt/jna/virDomainJobInfo.java @@ -19,13 +19,13 @@ public class virDomainJobInfo extends Structure { public long fileProcessed; public long fileRemaining; - private static final List fields = Arrays.asList( + private static final List<String> fields = Arrays.asList( "type", "timeElapsed", "timeRemaining", "dataTotal", "dataProcessed", "dataRemaining", "memTotal", "memProcessed", "memRemaining", "fileTotal", "fileProcessed", "fileRemaining"); @Override - protected List getFieldOrder() { + protected List<String> getFieldOrder() { return fields; } } diff --git a/src/main/java/org/libvirt/jna/virDomainMemoryStats.java b/src/main/java/org/libvirt/jna/virDomainMemoryStats.java index b14fb95..dfbd3f9 100644 --- a/src/main/java/org/libvirt/jna/virDomainMemoryStats.java +++ b/src/main/java/org/libvirt/jna/virDomainMemoryStats.java @@ -9,10 +9,10 @@ public class virDomainMemoryStats extends Structure { public int tag ; public long val ; - private static final List fields = Arrays.asList( "tag", "val"); + private static final List<String> fields = Arrays.asList( "tag", "val"); @Override - protected List getFieldOrder() { + protected List<String> getFieldOrder() { return fields; } } diff --git a/src/main/java/org/libvirt/jna/virError.java b/src/main/java/org/libvirt/jna/virError.java index 36b9f69..e58f5f3 100644 --- a/src/main/java/org/libvirt/jna/virError.java +++ b/src/main/java/org/libvirt/jna/virError.java @@ -22,12 +22,12 @@ public class virError extends Structure { public int int2; public NetworkPointer net; - private static final List fields = Arrays.asList( + private static final List<String> fields = Arrays.asList( "code", "domain", "message", "level", "conn", "dom", "str1", "str2", "str3", "int1", "int2", "net"); @Override - protected List getFieldOrder() { + protected List<String> getFieldOrder() { return fields; } } diff --git a/src/main/java/org/libvirt/jna/virNodeInfo.java b/src/main/java/org/libvirt/jna/virNodeInfo.java index 9ff1251..7a7716e 100644 --- a/src/main/java/org/libvirt/jna/virNodeInfo.java +++ b/src/main/java/org/libvirt/jna/virNodeInfo.java @@ -25,12 +25,12 @@ public class virNodeInfo extends Structure { public int cores; public int threads; - private static final List fields = Arrays.asList( + private static final List<String> fields = Arrays.asList( "model", "memory", "cpus", "mhz", "nodes", "sockets", "cores", "threads"); @Override - protected List getFieldOrder() { + protected List<String> getFieldOrder() { return fields; } } diff --git a/src/main/java/org/libvirt/jna/virSchedParameter.java b/src/main/java/org/libvirt/jna/virSchedParameter.java index f579ef0..f3787a9 100644 --- a/src/main/java/org/libvirt/jna/virSchedParameter.java +++ b/src/main/java/org/libvirt/jna/virSchedParameter.java @@ -13,11 +13,11 @@ public class virSchedParameter extends Structure { public int type; public virSchedParameterValue value; - private static final List fields = Arrays.asList( + private static final List<String> fields = Arrays.asList( "field", "type", "value"); @Override - protected List getFieldOrder() { + protected List<String> getFieldOrder() { return fields; } } diff --git a/src/main/java/org/libvirt/jna/virStoragePoolInfo.java b/src/main/java/org/libvirt/jna/virStoragePoolInfo.java index fe20f0f..7077175 100644 --- a/src/main/java/org/libvirt/jna/virStoragePoolInfo.java +++ b/src/main/java/org/libvirt/jna/virStoragePoolInfo.java @@ -17,11 +17,11 @@ public class virStoragePoolInfo extends Structure { public long available; // this is a long long in the code, so a long mapping // is correct - private static final List fields = Arrays.asList( + private static final List<String> fields = Arrays.asList( "state", "capacity", "allocation", "available"); @Override - protected List getFieldOrder() { + protected List<String> getFieldOrder() { return fields; } } diff --git a/src/main/java/org/libvirt/jna/virStorageVolInfo.java b/src/main/java/org/libvirt/jna/virStorageVolInfo.java index 93132ea..8bf2d5c 100644 --- a/src/main/java/org/libvirt/jna/virStorageVolInfo.java +++ b/src/main/java/org/libvirt/jna/virStorageVolInfo.java @@ -15,11 +15,11 @@ public class virStorageVolInfo extends Structure { public long allocation; // this is a long long in the code, so a long // mapping is correct - private static final List fields = Arrays.asList( + private static final List<String> fields = Arrays.asList( "type", "capacity", "allocation"); @Override - protected List getFieldOrder() { + protected List<String> getFieldOrder() { return fields; } } diff --git a/src/main/java/org/libvirt/jna/virVcpuInfo.java b/src/main/java/org/libvirt/jna/virVcpuInfo.java index 96eca2f..bc1a539 100644 --- a/src/main/java/org/libvirt/jna/virVcpuInfo.java +++ b/src/main/java/org/libvirt/jna/virVcpuInfo.java @@ -15,11 +15,11 @@ public class virVcpuInfo extends Structure { // is correct public int cpu; - private static final List fields = Arrays.asList( + private static final List<String> fields = Arrays.asList( "number", "state", "cpuTime", "cpu"); @Override - protected List getFieldOrder() { + protected List<String> getFieldOrder() { return fields; } } -- 1.7.9.5

java/org/libvirt/Error.java:217: The static method wrap(int) from the type Error.ErrorDomain should be accessed in a static way Signed-off-by: Claudio Bley <cbley@av-test.de> --- src/main/java/org/libvirt/Error.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/libvirt/Error.java b/src/main/java/org/libvirt/Error.java index 114e758..6f68f57 100644 --- a/src/main/java/org/libvirt/Error.java +++ b/src/main/java/org/libvirt/Error.java @@ -213,9 +213,9 @@ public class Error implements Serializable { private NetworkPointer VNP; /* Deprecated */ public Error(virError vError) { - code = code.wrap(vError.code); - domain = domain.wrap(vError.domain); - level = level.wrap(vError.level); + code = ErrorNumber.wrap(vError.code); + domain = ErrorDomain.wrap(vError.domain); + level = ErrorLevel.wrap(vError.level); message = vError.message; str1 = vError.str1; str2 = vError.str2; -- 1.7.9.5

Signed-off-by: Claudio Bley <cbley@av-test.de> --- src/main/java/org/libvirt/Error.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/libvirt/Error.java b/src/main/java/org/libvirt/Error.java index 6f68f57..ef339bd 100644 --- a/src/main/java/org/libvirt/Error.java +++ b/src/main/java/org/libvirt/Error.java @@ -228,9 +228,9 @@ public class Error implements Serializable { } /** - * Gets he error code + * Gets the error code * - * @return a VirErroNumber + * @return a VirErrorNumber */ public ErrorNumber getCode() { return code; @@ -294,7 +294,7 @@ public class Error implements Serializable { } /** - * Returns human-readable informative error messag + * Returns a human-readable informative error message * * @return error message */ -- 1.7.9.5

Signed-off-by: Claudio Bley <cbley@av-test.de> --- src/test/java/org/libvirt/TestJavaBindings.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/java/org/libvirt/TestJavaBindings.java b/src/test/java/org/libvirt/TestJavaBindings.java index bba4cdb..9e7fa82 100644 --- a/src/test/java/org/libvirt/TestJavaBindings.java +++ b/src/test/java/org/libvirt/TestJavaBindings.java @@ -40,7 +40,7 @@ public final class TestJavaBindings extends TestCase { assertNotNull("conn.getCapabilities()", conn.getCapabilities()); assertTrue("conn.getLibVirVersion()", conn.getLibVirVersion() > 6000); assertTrue("conn.connectionVersion()", Connect.connectionVersion(conn) > 6000); - assertEquals("conn.getLibVirVersion()", 2, conn.getVersion()); + assertEquals("conn.getVersion()", 2, conn.getVersion()); assertTrue("conn.isEncrypted", conn.isEncrypted() == 0); assertTrue("conn.isSecure", conn.isSecure() == 1); } -- 1.7.9.5

Specify a version range for the net.java.dev.jna / jna artifact in order to accept any version we tested the libvirt Java bindings against. Signed-off-by: Claudio Bley <cbley@av-test.de> --- As discussed previously[1], with a little delay, here's the patch. [1]: http://www.redhat.com/archives/libvir-list/2013-September/msg00929.html pom.xml.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml.in b/pom.xml.in index 25b2ae7..4f49a3a 100644 --- a/pom.xml.in +++ b/pom.xml.in @@ -27,7 +27,7 @@ <groupId>net.java.dev.jna</groupId> <artifactId>jna</artifactId> <scope>provided</scope> - <version>3.5.0</version> + <version>[3.4.1,4.0.0]</version> </dependency> </dependencies> -- 1.7.9.5

Libvirt function parameters having type (pointer to) size_t were wrapped via JNA using int, long or even NativeLong. Alas, none of these is actually correct as the size of size_t may be the same as the size of either (unsigned) int, long or even long long on different platforms. JNA provides the size of a native size_t to us, so using this information we define and use class SizeT and class SizeTByReference for wrapping a native size_t and size_t*, respectively. Signed-off-by: Claudio Bley <cbley@av-test.de> --- src/main/java/org/libvirt/Domain.java | 5 +- src/main/java/org/libvirt/Secret.java | 10 ++-- src/main/java/org/libvirt/Stream.java | 7 ++- src/main/java/org/libvirt/jna/Libvirt.java | 14 +++--- src/main/java/org/libvirt/jna/SizeT.java | 19 ++++++++ .../java/org/libvirt/jna/SizeTByReference.java | 50 ++++++++++++++++++++ 6 files changed, 87 insertions(+), 18 deletions(-) create mode 100644 src/main/java/org/libvirt/jna/SizeT.java create mode 100644 src/main/java/org/libvirt/jna/SizeTByReference.java diff --git a/src/main/java/org/libvirt/Domain.java b/src/main/java/org/libvirt/Domain.java index 2f70bf2..b50e182 100644 --- a/src/main/java/org/libvirt/Domain.java +++ b/src/main/java/org/libvirt/Domain.java @@ -3,6 +3,7 @@ package org.libvirt; import org.libvirt.jna.DomainPointer; import org.libvirt.jna.DomainSnapshotPointer; import org.libvirt.jna.Libvirt; +import org.libvirt.jna.SizeT; import org.libvirt.jna.virDomainBlockInfo; import org.libvirt.jna.virDomainBlockStats; import org.libvirt.jna.virDomainInfo; @@ -233,7 +234,7 @@ public class Domain { */ public DomainBlockStats blockStats(String path) throws LibvirtException { virDomainBlockStats stats = new virDomainBlockStats(); - int success = libvirt.virDomainBlockStats(VDP, path, stats, stats.size()); + int success = libvirt.virDomainBlockStats(VDP, path, stats, new SizeT(stats.size())); processError(); return success == 0 ? new DomainBlockStats(stats) : null; } @@ -694,7 +695,7 @@ public class Domain { */ public DomainInterfaceStats interfaceStats(String path) throws LibvirtException { virDomainInterfaceStats stats = new virDomainInterfaceStats(); - libvirt.virDomainInterfaceStats(VDP, path, stats, stats.size()); + libvirt.virDomainInterfaceStats(VDP, path, stats, new SizeT(stats.size())); processError(); return new DomainInterfaceStats(stats); } diff --git a/src/main/java/org/libvirt/Secret.java b/src/main/java/org/libvirt/Secret.java index 5332e02..4edb515 100644 --- a/src/main/java/org/libvirt/Secret.java +++ b/src/main/java/org/libvirt/Secret.java @@ -2,11 +2,11 @@ package org.libvirt; import org.libvirt.jna.Libvirt; import org.libvirt.jna.SecretPointer; +import org.libvirt.jna.SizeT; +import org.libvirt.jna.SizeTByReference; import static org.libvirt.Library.libvirt; import com.sun.jna.Native; -import com.sun.jna.NativeLong; -import com.sun.jna.ptr.LongByReference; import com.sun.jna.Pointer; import java.nio.ByteBuffer; @@ -120,7 +120,7 @@ public class Secret { * @return the value of the secret, or null on failure. */ public byte[] getByteValue() throws LibvirtException { - LongByReference value_size = new LongByReference(); + SizeTByReference value_size = new SizeTByReference(); Pointer value = libvirt.virSecretGetValue(VSP, value_size, 0); processError(); ByteBuffer bb = value.getByteBuffer(0, value_size.getValue()); @@ -154,7 +154,7 @@ public class Secret { * @return 0 on success, -1 on failure. */ public int setValue(String value) throws LibvirtException { - int returnValue = libvirt.virSecretSetValue(VSP, value, new NativeLong(value.length()), 0); + int returnValue = libvirt.virSecretSetValue(VSP, value, new SizeT(value.length()), 0); processError(); return returnValue; } @@ -165,7 +165,7 @@ public class Secret { * @return 0 on success, -1 on failure. */ public int setValue(byte[] value) throws LibvirtException { - int returnValue = libvirt.virSecretSetValue(VSP, value, new NativeLong(value.length), 0); + int returnValue = libvirt.virSecretSetValue(VSP, value, new SizeT(value.length), 0); processError(); return returnValue; } diff --git a/src/main/java/org/libvirt/Stream.java b/src/main/java/org/libvirt/Stream.java index bd8e87f..6d488e3 100644 --- a/src/main/java/org/libvirt/Stream.java +++ b/src/main/java/org/libvirt/Stream.java @@ -1,11 +1,10 @@ package org.libvirt; import org.libvirt.jna.Libvirt; +import org.libvirt.jna.SizeT; import org.libvirt.jna.StreamPointer; import static org.libvirt.Library.libvirt; -import com.sun.jna.NativeLong; - public class Stream { public static int VIR_STREAM_NONBLOCK = (1 << 0); @@ -108,7 +107,7 @@ public class Stream { * @throws LibvirtException */ public int receive(byte[] data) throws LibvirtException { - int returnValue = libvirt.virStreamRecv(VSP, data, new NativeLong(data.length)); + int returnValue = libvirt.virStreamRecv(VSP, data, new SizeT(data.length)); processError(); return returnValue; } @@ -151,7 +150,7 @@ public class Stream { * @throws LibvirtException */ public int send(String data) throws LibvirtException { - int returnValue = libvirt.virStreamSend(VSP, data, new NativeLong(data.length())); + int returnValue = libvirt.virStreamSend(VSP, data, new SizeT(data.length())); processError(); return returnValue; } diff --git a/src/main/java/org/libvirt/jna/Libvirt.java b/src/main/java/org/libvirt/jna/Libvirt.java index 1be7c4f..ffbb5a0 100644 --- a/src/main/java/org/libvirt/jna/Libvirt.java +++ b/src/main/java/org/libvirt/jna/Libvirt.java @@ -180,7 +180,7 @@ public interface Libvirt extends Library { int virDomainAbortJob(DomainPointer virDomainPtr); int virDomainAttachDevice(DomainPointer virDomainPtr, String deviceXML); int virDomainAttachDeviceFlags(DomainPointer virDomainPtr, String deviceXML, int flags); - int virDomainBlockStats(DomainPointer virDomainPtr, String path, virDomainBlockStats stats, int size); + int virDomainBlockStats(DomainPointer virDomainPtr, String path, virDomainBlockStats stats, SizeT size); int virDomainBlockResize(DomainPointer virDomainPtr, String disk, long size, int flags); int virDomainCoreDump(DomainPointer virDomainPtr, String to, int flags); int virDomainCreate(DomainPointer virDomainPtr); @@ -210,7 +210,7 @@ public interface Libvirt extends Library { 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); + int virDomainInterfaceStats(DomainPointer virDomainPtr, String path, virDomainInterfaceStats stats, SizeT size); int virDomainIsActive(DomainPointer virDomainPtr); int virDomainIsPersistent(DomainPointer virDomainPtr); DomainPointer virDomainLookupByID(ConnectionPointer virConnectPtr, int id); @@ -351,13 +351,13 @@ public interface Libvirt extends Library { int virSecretGetUUID(SecretPointer virSecretPtr, byte[] uuidString); int virSecretGetUUIDString(SecretPointer virSecretPtr, byte[] uuidString); String virSecretGetUsageID(SecretPointer virSecretPtr); - Pointer virSecretGetValue(SecretPointer virSecretPtr, LongByReference value_size, int flags); + Pointer virSecretGetValue(SecretPointer virSecretPtr, SizeTByReference value_size, int flags); String virSecretGetXMLDesc(SecretPointer virSecretPtr, int flags); SecretPointer virSecretLookupByUsage(ConnectionPointer virConnectPtr, int usageType, String usageID); SecretPointer virSecretLookupByUUID(ConnectionPointer virConnectPtr, byte[] uuidBytes); SecretPointer virSecretLookupByUUIDString(ConnectionPointer virConnectPtr, String uuidstr); - int virSecretSetValue(SecretPointer virSecretPtr, String value, NativeLong value_size, int flags); - int virSecretSetValue(SecretPointer virSecretPtr, byte[] value, NativeLong value_size, int flags); + int virSecretSetValue(SecretPointer virSecretPtr, String value, SizeT value_size, int flags); + int virSecretSetValue(SecretPointer virSecretPtr, byte[] value, SizeT value_size, int flags); int virSecretUndefine(SecretPointer virSecretPtr); //Stream Methods @@ -369,9 +369,9 @@ public interface Libvirt extends Library { int virStreamFinish(StreamPointer virStreamPtr) ; int virStreamFree(StreamPointer virStreamPtr) ; StreamPointer virStreamNew(ConnectionPointer virConnectPtr, int flags) ; - int virStreamSend(StreamPointer virStreamPtr, String data, NativeLong size); + int virStreamSend(StreamPointer virStreamPtr, String data, SizeT size); int virStreamSendAll(StreamPointer virStreamPtr, Libvirt.VirStreamSourceFunc handler, Pointer opaque); - int virStreamRecv(StreamPointer virStreamPtr, byte[] data, NativeLong length); + int virStreamRecv(StreamPointer virStreamPtr, byte[] data, SizeT length); int virStreamRecvAll(StreamPointer virStreamPtr, Libvirt.VirStreamSinkFunc handler, Pointer opaque); //DomainSnapshot Methods diff --git a/src/main/java/org/libvirt/jna/SizeT.java b/src/main/java/org/libvirt/jna/SizeT.java new file mode 100644 index 0000000..02e8f18 --- /dev/null +++ b/src/main/java/org/libvirt/jna/SizeT.java @@ -0,0 +1,19 @@ +package org.libvirt.jna; + +import com.sun.jna.Native; +import com.sun.jna.IntegerType; + +/** + * Represents the native {@code size_t} data type. + */ +public final class SizeT extends IntegerType { + public SizeT() { this(0); } + public SizeT(long value) { + /* The third argument determines whether this class represents + * an unsigned integer type. When extracting a value into a + * larger-sized container (e.g. 4 byte native type into Java + * long), the value is properly converted as unsigned. + */ + super(Native.SIZE_T_SIZE, value, true); + } +} diff --git a/src/main/java/org/libvirt/jna/SizeTByReference.java b/src/main/java/org/libvirt/jna/SizeTByReference.java new file mode 100644 index 0000000..474527f --- /dev/null +++ b/src/main/java/org/libvirt/jna/SizeTByReference.java @@ -0,0 +1,50 @@ +package org.libvirt.jna; + +import com.sun.jna.Native; +import com.sun.jna.Pointer; +import com.sun.jna.ptr.ByReference; + +/** + * Represents a native (call-by-reference) pointer to {@code size_t} data type. + */ +public final class SizeTByReference extends ByReference { + public SizeTByReference() { + this(0); + } + + public SizeTByReference(long value) { + super(Native.SIZE_T_SIZE); + setValue(value); + } + + public void setValue(long value) { + Pointer p = getPointer(); + switch (Native.SIZE_T_SIZE) { + case 2: + p.setShort(0, (short)value); + break; + case 4: + p.setInt(0, (int)value); + break; + case 8: + p.setLong(0, value); + break; + default: + throw new IllegalArgumentException("Unsupported size: " + Native.SIZE_T_SIZE); + } + } + + public long getValue() { + Pointer p = getPointer(); + switch (Native.SIZE_T_SIZE) { + case 2: + return p.getShort(0) & 0xFFFFL; + case 4: + return p.getInt(0) & 0xFFFFFFFFL; + case 8: + return p.getLong(0); + default: + throw new IllegalArgumentException("Unsupported size: " + Native.SIZE_T_SIZE); + } + } +} -- 1.7.9.5

When JNA is linked to a different runtime library than libvirt, using JNA's Native.free will probably lead to crashes as witnessed on Windows: # A fatal error has been detected by the Java Runtime Environment: # # EXCEPTION_ACCESS_VIOLATION (0xc0000005) at pc=0x0000000077363290, pid=10180, tid=9908 # # JRE version: 7.0_25-b16 # Java VM: Java HotSpot(TM) 64-Bit Server VM (23.25-b01 mixed mode windows-amd64 compressed oops) # Problematic frame: # C [ntdll.dll+0x53290] RtlFreeHeap+0xd0 The root cause is that the libvirt DLL uses MSVCRT as its runtime library, whereas the jnidispatch DLL of JNA uses a different one. At runtime, when calling org.sun.com.jna.Native.free() the OS function RtlFreeHeap is called with an invalid Pointer that was actually allocated by MSVCRT's malloc. Basically, we cannot simply mix and match memory allocation functions from different runtime libraries, but have to call virFree for pointers orignating from libvirt itself. So, this patch re-adds and uses the virFree method which had been removed in commit 3220de292990bed71828fba2f3700bc846d440f2. Signed-off-by: Claudio Bley <cbley@av-test.de> --- src/main/java/org/libvirt/Library.java | 4 ++-- src/main/java/org/libvirt/jna/Libvirt.java | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/libvirt/Library.java b/src/main/java/org/libvirt/Library.java index 0136095..33d3042 100644 --- a/src/main/java/org/libvirt/Library.java +++ b/src/main/java/org/libvirt/Library.java @@ -4,6 +4,7 @@ import org.libvirt.jna.Libvirt; import com.sun.jna.Native; import com.sun.jna.Pointer; +import com.sun.jna.ptr.PointerByReference; /** * This class represents an instance of the JNA mapped libvirt @@ -38,8 +39,7 @@ final class Library { * Free memory pointed to by ptr. */ static void free(Pointer ptr) { - Native.free(Pointer.nativeValue(ptr)); - Pointer.nativeValue(ptr, 0L); + libvirt.virFree(new PointerByReference(ptr)); } /** diff --git a/src/main/java/org/libvirt/jna/Libvirt.java b/src/main/java/org/libvirt/jna/Libvirt.java index ffbb5a0..78dd9bc 100644 --- a/src/main/java/org/libvirt/jna/Libvirt.java +++ b/src/main/java/org/libvirt/jna/Libvirt.java @@ -8,6 +8,7 @@ import com.sun.jna.Platform; import com.sun.jna.Pointer; import com.sun.jna.ptr.IntByReference; import com.sun.jna.ptr.LongByReference; +import com.sun.jna.ptr.PointerByReference; /** * The libvirt interface which is exposed via JNA. The complete API is @@ -172,6 +173,7 @@ public interface Libvirt extends Library { int virGetVersion(LongByReference libVer, String type, LongByReference typeVer); int virInitialize(); int virCopyLastError(virError error); + void virFree(PointerByReference ptr); virError virGetLastError(); void virResetLastError(); void virSetErrorFunc(Pointer userData, VirErrorCallback callback); -- 1.7.9.5

JUnit is used for quite some time now, which supercedes the tests defined in the old "test" class. Signed-off-by: Claudio Bley <cbley@av-test.de> --- src/test/java/test.java | 280 ----------------------------------------------- 1 file changed, 280 deletions(-) delete mode 100644 src/test/java/test.java diff --git a/src/test/java/test.java b/src/test/java/test.java deleted file mode 100644 index 3442bec..0000000 --- a/src/test/java/test.java +++ /dev/null @@ -1,280 +0,0 @@ -import java.util.UUID; - -import org.libvirt.*; - -public class test { - - // Use this to flag errors in the test run. - public static String FIXME = "\n<=====================================>\n<============== FIXME ================> "; - - public static void main(String[] args) { - // Create the connection - Connect conn = null; - Network testNetwork = null; - - // The array below is to support the uuid lookup based on an array of - // ints. - // This is deprectaed, but is kept here until the code is removed. - 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") }; - - /* - * Test Authentication - * - * If you want to test authentication, uncomment the try catch block and - * one of the conn lines. You need to configure your libvirtd for - * remote/authenticated connections before this will work. - */ - /* - * ConnectAuth defaultAuth = new ConnectAuthDefault(); - * - * try{ conn = new Connect("test+tcp://localhost/default", defaultAuth, - * 0); conn = new Connect("qemu+tcp://localhost/system", defaultAuth, - * 0); conn = new Connect("test:///default", defaultAuth, 0); - * System.out.println("Encrypted connection successful!"); } catch - * (LibvirtException e){ System.out.println("exception caught:"+e); - * System.out.println(e.getError()); } - */ - - try { - conn = new Connect("test:///default", false); - } catch (LibvirtException e) { - System.out.println("exception caught:" + e); - System.out.println(e.getError()); - } - try { - // Check nodeinfo - NodeInfo nodeInfo = conn.nodeInfo(); - System.out.println("virNodeInfo.model:" + nodeInfo.model); - System.out.println("virNodeInfo.memory:" + nodeInfo.memory); - System.out.println("virNodeInfo.cpus:" + nodeInfo.cpus); - System.out.println("virNodeInfo.nodes:" + nodeInfo.nodes); - System.out.println("virNodeInfo.sockets:" + nodeInfo.sockets); - System.out.println("virNodeInfo.cores:" + nodeInfo.cores); - System.out.println("virNodeInfo.threads:" + nodeInfo.threads); - - // Exercise the information getter methods - System.out.println("getHostName:" + conn.getHostName()); - System.out.println("getCapabilities:" + conn.getCapabilities()); - System.out.println("getMaxVcpus:" + conn.getMaxVcpus("xen")); - System.out.println("getType:" + conn.getType()); - System.out.println("getURI:" + conn.getURI()); - System.out.println("getVersion:" + conn.getVersion()); - System.out.println("getLibVirVersion:" + conn.getLibVirVersion()); - - // By default, there are 1 created and 0 defined networks - - // Create a new network to test the create method - System.out.println("conn.networkCreateXML: " - + 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>" + " <range start='192.168.66.128' end='192.168.66.253'/>" - + " </dhcp>" + " </ip>" + "</network>")); - - // Same for the define method - System.out.println("conn.networkDefineXML: " - + conn.networkDefineXML("<network>" + " <name>deftest</name>" - + " <uuid>004b96e1-2d78-c30f-5aa5-f03c87d21e67</uuid>" + " <bridge name='deftest'/>" - + " <forward dev='eth0'/>" + " <ip address='192.168.88.1' netmask='255.255.255.0'>" - + " <dhcp>" + " <range start='192.168.88.128' end='192.168.88.253'/>" - + " </dhcp>" + " </ip>" + "</network>")); - - // We should have 2:1 but it shows up 3:0 hopefully a bug in the - // test driver - System.out.println("numOfDefinedNetworks:" + conn.numOfDefinedNetworks()); - System.out.println("listDefinedNetworks:" + conn.listDefinedNetworks()); - for (String c : conn.listDefinedNetworks()) - System.out.println(" -> " + c); - System.out.println("numOfNetworks:" + conn.numOfNetworks()); - System.out.println("listNetworks:" + conn.listNetworks()); - for (String c : conn.listNetworks()) - System.out.println(" -> " + c); - - // Look at the interfaces - // TODO Post 0.5.1 - // System.out.println("numOfInterfaces:" + conn.numOfInterfaces()); - // System.out.println("listDefinedInterfaces:" + - // conn.listInterfaces()); - // for(String c: conn.listInterfaces()) - // System.out.println(" -> "+c); - - // Define a new Domain - System.out.println("conn.domainDefineXML:" - + 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>" + " <on_poweroff>destroy</on_poweroff>" - + " <on_crash>restart</on_crash>" + "</domain>")); - - System.out.println("conn.domainCreateLinux:" - + conn.domainCreateLinux("<domain type='test' id='3'>" + " <name>createst</name>" - + " <uuid>004b96e1-2d78-c30f-5aa5-f03c87d21e67</uuid>" + " <memory>8388608</memory>" - + " <vcpu>2</vcpu>" + " <os><type arch='i686'>hvm</type></os>" - + " <on_reboot>restart</on_reboot>" + " <on_poweroff>destroy</on_poweroff>" - + " <on_crash>restart</on_crash>" + "</domain>", 0)); - - // Domain enumeration stuff - System.out.println("numOfDefinedDomains:" + conn.numOfDefinedDomains()); - System.out.println("listDefinedDomains:" + conn.listDefinedDomains()); - for (String c : conn.listDefinedDomains()) - System.out.println(" " + c); - System.out.println("numOfDomains:" + conn.numOfDomains()); - System.out.println("listDomains:" + conn.listDomains()); - for (int c : conn.listDomains()) - System.out.println(" -> " + c); - - } catch (LibvirtException e) { - System.out.println(FIXME); - System.out.println("exception caught:" + e); - System.out.println(e.getError()); - } - - // Network Object - - try { - // Choose one, they should have the exact same effect - testNetwork = conn.networkLookupByName("deftest"); - System.out.println("networkLookupByName: " + testNetwork.getName()); - testNetwork = conn.networkLookupByUUID(UUIDArray); - System.out.println("networkLookupByUUID: " + testNetwork.getName()); - testNetwork = conn.networkLookupByUUIDString("004b96e1-2d78-c30f-5aa5-f03c87d21e67"); - System.out.println("networkLookupByUUIDString: " + testNetwork.getName()); - testNetwork = conn.networkLookupByUUID(UUID.fromString("004b96e1-2d78-c30f-5aa5-f03c87d21e67")); - System.out.println("networkLookupByUUID (Java UUID): " + testNetwork.getName()); - - // Exercise the getter methods on the default network - System.out.println("virNetworkGetXMLDesc:" + testNetwork.getXMLDesc(0)); - System.out.println("virNetworkGetAutostart:" + testNetwork.getAutostart()); - System.out.println("virNetworkGetBridgeName:" + testNetwork.getBridgeName()); - System.out.println("virNetworkGetName:" + testNetwork.getName()); - System.out.println("virNetworkGetUUID:" + testNetwork.getUUID() + " "); - for (int c : testNetwork.getUUID()) - System.out.print(String.format("%02x", c)); - System.out.println(); - System.out.println("virNetworkGetName:" + testNetwork.getUUIDString()); - - // Destroy and create the network - System.out.println("virNetworkDestroy:"); - testNetwork.destroy(); - System.out.println("virNetworkCreate:"); - testNetwork.create(); - } catch (LibvirtException e) { - System.out.println(FIXME); - System.out.println("exception caught:" + e); - System.out.println(e.getError()); - } - // This should raise an excpetion - try { - System.out.println("virNetworkCreate (should error):"); - testNetwork.create(); - } catch (LibvirtException e) { - System.out.println("exception caught:" + e); - System.out.println(e.getError()); - } - - // Domain stuff - - try { - // Domain lookup - Domain testDomain = conn.domainLookupByID(1); - System.out.println("domainLookupByID: " + testDomain.getName()); - testDomain = conn.domainLookupByName("test"); - System.out.println("domainLookupByName: " + testDomain.getName()); - testDomain = conn.domainLookupByUUIDString("004b96e1-2d78-c30f-5aa5-f03c87d21e67"); - System.out.println("domainLookupByUUIDString: " + testDomain.getName()); - testDomain = conn.domainLookupByUUID(UUIDArray); - System.out.println("domainLookupByUUID: " + testDomain.getName()); - testDomain = conn.domainLookupByUUID(UUID.fromString("004b96e1-2d78-c30f-5aa5-f03c87d21e67")); - System.out.println("domainLookupByUUID (JAVA UID): " + testDomain.getName()); - - // Exercise the getter methods on the default domain - System.out.println("virDomainGetXMLDesc:" + testDomain.getXMLDesc(0)); - System.out.println("virDomainGetAutostart:" + testDomain.getAutostart()); - System.out.println("virDomainGetConnect:" + testDomain.getConnect()); - System.out.println("virDomainGetID:" + testDomain.getID()); - System.out.println("virDomainGetInfo:" + testDomain.getInfo()); - System.out.println("virDomainGetMaxMemory:" + testDomain.getMaxMemory()); - // Should fail, test driver does not support it - try { - System.out.println("virDomainGetMaxVcpus:" + testDomain.getMaxVcpus()); - System.out.println(FIXME); - } catch (LibvirtException e) { - - } - System.out.println("virDomainGetName:" + testDomain.getName()); - System.out.println("virDomainGetOSType:" + testDomain.getOSType()); - System.out.println("virDomainGetSchedulerType:" + testDomain.getSchedulerType()); - System.out.println("virDomainGetSchedulerParameters:" + testDomain.getSchedulerParameters()); - // Iterate over the parameters the painful way - for (SchedParameter c : testDomain.getSchedulerParameters()) { - if (c instanceof SchedIntParameter) - System.out.println("Int:" + ((SchedIntParameter) c).field + ":" + ((SchedIntParameter) c).value); - if (c instanceof SchedUintParameter) - System.out.println("Uint:" + ((SchedUintParameter) c).field + ":" + ((SchedUintParameter) c).value); - if (c instanceof SchedLongParameter) - System.out.println("Long:" + ((SchedLongParameter) c).field + ":" + ((SchedLongParameter) c).value); - if (c instanceof SchedUlongParameter) - System.out.println("Ulong:" + ((SchedUlongParameter) c).field + ":" - + ((SchedUlongParameter) c).value); - if (c instanceof SchedDoubleParameter) - System.out.println("Double:" + ((SchedDoubleParameter) c).field + ":" - + ((SchedDoubleParameter) c).value); - if (c instanceof SchedBooleanParameter) - System.out.println("Boolean:" + ((SchedBooleanParameter) c).field + ":" - + ((SchedBooleanParameter) c).value); - } - // Iterate over the parameters the easy way - for (SchedParameter c : testDomain.getSchedulerParameters()) { - System.out.println(c.getTypeAsString() + ":" + c.field + ":" + c.getValueAsString()); - } - - // test setting a scheduled parameter - SchedUintParameter[] pars = new SchedUintParameter[1]; - pars[0] = new SchedUintParameter(); - pars[0].field = "weight"; - pars[0].value = 100; - testDomain.setSchedulerParameters(pars); - - System.out.println("virDomainGetUUID:" + testDomain.getUUID()); - for (int c : testDomain.getUUID()) - System.out.print(String.format("%02x", c)); - System.out.println(); - System.out.println("virDomainGetUUIDString:" + testDomain.getUUIDString()); - // Should fail, unimplemented in test driver - // System.out.println("virDomainGetVcpusInfo:" + - // testDomain.getVcpusInfo()); - // Same as above - // System.out.println("virDomainGetVcpusCpuMap:" + - // testDomain.getVcpusCpuMaps()); - // Should test pinVcpu, when we test with real xen - // Here - // Attach default network to test domain - // System.out.println("virDomainGetVcpusCpuMap:" + - // testDomain.getVcpusCpuMaps()); - - // Should test interfacestats and blockstats with real xen - - // Close the connection - - conn.close(); - } catch (LibvirtException e) { - System.out.println(FIXME); - System.out.println("exception caught:" + e); - System.out.println(e.getError()); - } - - try { - // We should get an exception, not a crash - System.out.println(conn.getHostName()); - } catch (LibvirtException e) { - System.out.println("exception caught:" + e); - System.out.println(e.getError()); - } - System.out.println("Fini!"); - } - -} -- 1.7.9.5

Signed-off-by: Claudio Bley <cbley@av-test.de> --- src/test/java/org/libvirt/TestJavaBindings.java | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/test/java/org/libvirt/TestJavaBindings.java b/src/test/java/org/libvirt/TestJavaBindings.java index a25c4f3..0123e6a 100644 --- a/src/test/java/org/libvirt/TestJavaBindings.java +++ b/src/test/java/org/libvirt/TestJavaBindings.java @@ -46,6 +46,20 @@ public final class TestJavaBindings extends TestCase { assertTrue("conn.isSecure", conn.isSecure() == 1); } + /* + * Excercise the listCapabilities method of the Device class. + */ + public void testDeviceListCapabilities() throws Exception { + Device dev = this.conn.deviceLookupByName("computer"); + String[] caps = dev.listCapabilities(); + + // check that all caps are non-empty strings + for (String c: caps) { + assertNotNull("capability is null", c); + assertFalse("capability is empty", c.isEmpty()); + } + } + public void testNodeInfo() throws Exception { NodeInfo nodeInfo = conn.nodeInfo(); assertEquals("nodeInfo.model", "i686", nodeInfo.model); -- 1.7.9.5

Wrap any fallible libvirt function in a call to ErrorHandler.processError(..). Signed-off-by: Claudio Bley <cbley@av-test.de> --- src/main/java/org/libvirt/Device.java | 49 ++++++++++----------------------- 1 file changed, 14 insertions(+), 35 deletions(-) diff --git a/src/main/java/org/libvirt/Device.java b/src/main/java/org/libvirt/Device.java index d55321e..a3b20b8 100644 --- a/src/main/java/org/libvirt/Device.java +++ b/src/main/java/org/libvirt/Device.java @@ -2,6 +2,9 @@ package org.libvirt; import org.libvirt.jna.DevicePointer; import static org.libvirt.Library.libvirt; +import static org.libvirt.ErrorHandler.processError; + +import com.sun.jna.Pointer; import com.sun.jna.Pointer; @@ -43,8 +46,7 @@ public class Device { public int destroy() throws LibvirtException { int success = 0; if (VDP != null) { - success = libvirt.virNodeDeviceDestroy(VDP); - processError(); + success = processError(libvirt.virNodeDeviceDestroy(VDP)); VDP = null; } @@ -58,9 +60,7 @@ public class Device { * @throws LibvirtException */ public int detach() throws LibvirtException { - int num = libvirt.virNodeDeviceDettach(VDP); - processError(); - return num; + return processError(libvirt.virNodeDeviceDettach(VDP)); } @Override @@ -78,8 +78,7 @@ public class Device { public int free() throws LibvirtException { int success = 0; if (VDP != null) { - success = libvirt.virNodeDeviceFree(VDP); - processError(); + success = processError(libvirt.virNodeDeviceFree(VDP)); VDP = null; } @@ -92,9 +91,7 @@ public class Device { * @throws LibvirtException */ public String getName() throws LibvirtException { - String name = libvirt.virNodeDeviceGetName(VDP); - processError(); - return name; + return processError(libvirt.virNodeDeviceGetName(VDP)); } /** @@ -103,9 +100,7 @@ public class Device { * @throws LibvirtException */ public int getNumberOfCapabilities() throws LibvirtException { - int num = libvirt.virNodeDeviceNumOfCaps(VDP); - processError(); - return num; + return processError(libvirt.virNodeDeviceNumOfCaps(VDP)); } /** @@ -114,9 +109,7 @@ public class Device { * @throws LibvirtException */ public String getParent() throws LibvirtException { - String parent = libvirt.virNodeDeviceGetParent(VDP); - processError(); - return parent; + return processError(libvirt.virNodeDeviceGetParent(VDP)); } /** @@ -125,9 +118,7 @@ public class Device { * @throws LibvirtException */ public String getXMLDescription() throws LibvirtException { - String desc = libvirt.virNodeDeviceGetXMLDesc(VDP); - processError(); - return desc; + return processError(libvirt.virNodeDeviceGetXMLDesc(VDP)); } /** @@ -140,8 +131,8 @@ public class Device { if (maxCaps > 0) { Pointer[] ptrs = new Pointer[maxCaps]; - int got = libvirt.virNodeDeviceListCaps(VDP, ptrs, maxCaps); - processError(); + int got = processError(libvirt.virNodeDeviceListCaps(VDP, ptrs, maxCaps)); + return Library.toStringArray(ptrs, got); } else { return Library.NO_STRINGS; @@ -149,22 +140,12 @@ public class Device { } /** - * Error handling logic to throw errors. Must be called after every libvirt - * call. - */ - protected void processError() throws LibvirtException { - virConnect.processError(); - } - - /** * ReAttach a device to the node. * * @throws LibvirtException */ public int reAttach() throws LibvirtException { - int num = libvirt.virNodeDeviceReAttach(VDP); - processError(); - return num; + return processError(libvirt.virNodeDeviceReAttach(VDP)); } /** @@ -174,8 +155,6 @@ public class Device { * @throws LibvirtException */ public int reset() throws LibvirtException { - int num = libvirt.virNodeDeviceReset(VDP); - processError(); - return num; + return processError(libvirt.virNodeDeviceReset(VDP)); } } -- 1.7.9.5

Wrap any fallible libvirt function in a call to ErrorHandler.processError(..). Also correct wrong javadoc comments stating that methods would return a value in case an error happens. Signed-off-by: Claudio Bley <cbley@av-test.de> --- src/main/java/org/libvirt/DomainSnapshot.java | 23 ++++++----------------- 1 file changed, 6 insertions(+), 17 deletions(-) diff --git a/src/main/java/org/libvirt/DomainSnapshot.java b/src/main/java/org/libvirt/DomainSnapshot.java index 9409fef..4736a71 100644 --- a/src/main/java/org/libvirt/DomainSnapshot.java +++ b/src/main/java/org/libvirt/DomainSnapshot.java @@ -2,6 +2,7 @@ package org.libvirt; import org.libvirt.jna.DomainSnapshotPointer; import static org.libvirt.Library.libvirt; +import static org.libvirt.ErrorHandler.processError; public class DomainSnapshot { @@ -28,14 +29,13 @@ public class DomainSnapshot { * Documentation</a> * @param flags * controls the deletion - * @return 0 if the selected snapshot(s) were successfully deleted, -1 on error. + * @return <em>ignore</em> (always 0) * @throws LibvirtException */ public int delete(int flags) throws LibvirtException { int success = 0; if (VDSP != null) { - success = libvirt.virDomainSnapshotDelete(VDSP, flags); - processError(); + success = processError(libvirt.virDomainSnapshotDelete(VDSP, flags)); VDSP = null; } @@ -52,13 +52,12 @@ public class DomainSnapshot { * exist. * * @throws LibvirtException - * @return 0 on success, or -1 on error. + * @return 0 on success */ public int free() throws LibvirtException { int success = 0; if (VDSP != null) { - success = libvirt.virDomainSnapshotFree(VDSP); - processError(); + success = processError(libvirt.virDomainSnapshotFree(VDSP)); VDSP = null; } @@ -72,16 +71,6 @@ public class DomainSnapshot { * @return the XML document */ public String getXMLDesc() throws LibvirtException { - String returnValue = libvirt.virDomainSnapshotGetXMLDesc(VDSP, 0); - processError(); - return returnValue; - } - - /** - * Error handling logic to throw errors. Must be called after every libvirt - * call. - */ - protected void processError() throws LibvirtException { - virConnect.processError(); + return processError(libvirt.virDomainSnapshotGetXMLDesc(VDSP, 0)); } } -- 1.7.9.5

Wrap any fallible libvirt function in a call to ErrorHandler.processError(..). Also correct wrong javadoc comments stating that methods would return a value in case an error occurs. Signed-off-by: Claudio Bley <cbley@av-test.de> --- src/main/java/org/libvirt/Network.java | 61 +++++++++----------------------- 1 file changed, 17 insertions(+), 44 deletions(-) diff --git a/src/main/java/org/libvirt/Network.java b/src/main/java/org/libvirt/Network.java index 2244c5d..2a77028 100644 --- a/src/main/java/org/libvirt/Network.java +++ b/src/main/java/org/libvirt/Network.java @@ -3,6 +3,7 @@ package org.libvirt; import org.libvirt.jna.Libvirt; import org.libvirt.jna.NetworkPointer; import static org.libvirt.Library.libvirt; +import static org.libvirt.ErrorHandler.processError; import com.sun.jna.Native; import com.sun.jna.Pointer; @@ -43,8 +44,7 @@ public class Network { * @throws LibvirtException */ public void create() throws LibvirtException { - libvirt.virNetworkCreate(VNP); - processError(); + processError(libvirt.virNetworkCreate(VNP)); } /** @@ -56,8 +56,7 @@ public class Network { * @throws LibvirtException */ public void destroy() throws LibvirtException { - libvirt.virNetworkDestroy(VNP); - processError(); + processError(libvirt.virNetworkDestroy(VNP)); } @Override @@ -71,13 +70,12 @@ public class Network { * return an error. * * @throws LibvirtException - * @return number of references left (>= 0) for success, -1 for failure. + * @return number of references left (>= 0) */ public int free() throws LibvirtException { int success = 0; if (VNP != null) { - success = libvirt.virNetworkFree(VNP); - processError(); + success = processError(libvirt.virNetworkFree(VNP)); VNP = null; } @@ -93,8 +91,7 @@ public class Network { */ public boolean getAutostart() throws LibvirtException { IntByReference autoStart = new IntByReference(); - libvirt.virNetworkGetAutostart(VNP, autoStart); - processError(); + processError(libvirt.virNetworkGetAutostart(VNP, autoStart)); return (autoStart.getValue() != 0) ? true : false; } @@ -106,8 +103,7 @@ public class Network { * @throws LibvirtException */ public String getBridgeName() throws LibvirtException { - final Pointer ptr = libvirt.virNetworkGetBridgeName(VNP); - processError(); + final Pointer ptr = processError(libvirt.virNetworkGetBridgeName(VNP)); try { return Library.getString(ptr); } finally { @@ -131,9 +127,7 @@ public class Network { * @throws LibvirtException */ public String getName() throws LibvirtException { - String returnValue = libvirt.virNetworkGetName(VNP); - processError(); - return returnValue; + return processError(libvirt.virNetworkGetName(VNP)); } /** @@ -145,13 +139,8 @@ public class Network { */ public int[] getUUID() throws LibvirtException { byte[] bytes = new byte[Libvirt.VIR_UUID_BUFLEN]; - int success = libvirt.virNetworkGetUUID(VNP, bytes); - processError(); - int[] returnValue = new int[0]; - if (success == 0) { - returnValue = Connect.convertUUIDBytes(bytes); - } - return returnValue; + processError(libvirt.virNetworkGetUUID(VNP, bytes)); + return Connect.convertUUIDBytes(bytes); } /** @@ -163,13 +152,8 @@ public class Network { */ public String getUUIDString() throws LibvirtException { byte[] bytes = new byte[Libvirt.VIR_UUID_STRING_BUFLEN]; - int success = libvirt.virNetworkGetUUIDString(VNP, bytes); - processError(); - String returnValue = null; - if (success == 0) { - returnValue = Native.toString(bytes); - } - return returnValue; + processError(libvirt.virNetworkGetUUIDString(VNP, bytes)); + return Native.toString(bytes); } /** @@ -183,8 +167,7 @@ public class Network { * @throws LibvirtException */ public String getXMLDesc(int flags) throws LibvirtException { - Pointer ptr = libvirt.virNetworkGetXMLDesc(VNP, flags); - processError(); + Pointer ptr = processError(libvirt.virNetworkGetXMLDesc(VNP, flags)); try { return Library.getString(ptr); } finally { @@ -202,9 +185,7 @@ public class Network { * @throws LibvirtException */ public int isActive() throws LibvirtException { - int returnValue = libvirt.virNetworkIsActive(VNP); - processError(); - return returnValue; + return processError(libvirt.virNetworkIsActive(VNP)); } /** @@ -218,13 +199,7 @@ public class Network { * @throws LibvirtException */ public int isPersistent() throws LibvirtException { - int returnValue = libvirt.virNetworkIsPersistent(VNP); - processError(); - return returnValue; - } - - protected void processError() throws LibvirtException { - virConnect.processError(); + return processError(libvirt.virNetworkIsPersistent(VNP)); } /** @@ -237,8 +212,7 @@ public class Network { */ public void setAutostart(boolean autostart) throws LibvirtException { int autoValue = autostart ? 1 : 0; - libvirt.virNetworkSetAutostart(VNP, autoValue); - processError(); + processError(libvirt.virNetworkSetAutostart(VNP, autoValue)); } /** @@ -247,8 +221,7 @@ public class Network { * @throws LibvirtException */ public void undefine() throws LibvirtException { - libvirt.virNetworkUndefine(VNP); - processError(); + processError(libvirt.virNetworkUndefine(VNP)); } } -- 1.7.9.5

Wrap any fallible libvirt function in a call to ErrorHandler.processError(..). Also correct wrong javadoc comments stating that methods would return a value in case an error occurs. Signed-off-by: Claudio Bley <cbley@av-test.de> --- src/main/java/org/libvirt/Secret.java | 61 +++++++++------------------------ 1 file changed, 16 insertions(+), 45 deletions(-) diff --git a/src/main/java/org/libvirt/Secret.java b/src/main/java/org/libvirt/Secret.java index 4edb515..868fcc8 100644 --- a/src/main/java/org/libvirt/Secret.java +++ b/src/main/java/org/libvirt/Secret.java @@ -5,6 +5,7 @@ import org.libvirt.jna.SecretPointer; import org.libvirt.jna.SizeT; import org.libvirt.jna.SizeTByReference; import static org.libvirt.Library.libvirt; +import static org.libvirt.ErrorHandler.processError; import com.sun.jna.Native; import com.sun.jna.Pointer; @@ -39,13 +40,12 @@ public class Secret { * Release the secret handle. The underlying secret continues to exist. * * @throws LibvirtException - * @return 0 on success, or -1 on error. + * @return <em>ignore</em> (always 0) */ public int free() throws LibvirtException { int success = 0; if (VSP != null) { - success = libvirt.virSecretFree(VSP); - processError(); + success = processError(libvirt.virSecretFree(VSP)); VSP = null; } @@ -61,9 +61,7 @@ public class Secret { * @throws LibvirtException */ public String getUsageID() throws LibvirtException { - String returnValue = libvirt.virSecretGetUsageID(VSP); - processError(); - return returnValue; + return processError(libvirt.virSecretGetUsageID(VSP)); } /** @@ -75,13 +73,8 @@ public class Secret { */ public int[] getUUID() throws LibvirtException { byte[] bytes = new byte[Libvirt.VIR_UUID_BUFLEN]; - int success = libvirt.virSecretGetUUID(VSP, bytes); - processError(); - int[] returnValue = new int[0]; - if (success == 0) { - returnValue = Connect.convertUUIDBytes(bytes); - } - return returnValue; + processError(libvirt.virSecretGetUUID(VSP, bytes)); + return Connect.convertUUIDBytes(bytes); } /** @@ -93,13 +86,8 @@ public class Secret { */ public String getUUIDString() throws LibvirtException { byte[] bytes = new byte[Libvirt.VIR_UUID_STRING_BUFLEN]; - int success = libvirt.virSecretGetUUIDString(VSP, bytes); - processError(); - String returnValue = null; - if (success == 0) { - returnValue = Native.toString(bytes); - } - return returnValue; + processError(libvirt.virSecretGetUUIDString(VSP, bytes)); + return Native.toString(bytes); } /** @@ -121,8 +109,7 @@ public class Secret { */ public byte[] getByteValue() throws LibvirtException { SizeTByReference value_size = new SizeTByReference(); - Pointer value = libvirt.virSecretGetValue(VSP, value_size, 0); - processError(); + Pointer value = processError(libvirt.virSecretGetValue(VSP, value_size, 0)); ByteBuffer bb = value.getByteBuffer(0, value_size.getValue()); byte[] returnValue = new byte[bb.remaining()]; bb.get(returnValue); @@ -135,49 +122,33 @@ public class Secret { * @return the XML document */ public String getXMLDesc() throws LibvirtException { - String returnValue = libvirt.virSecretGetXMLDesc(VSP, 0); - processError(); - return returnValue; - } - - /** - * Error handling logic to throw errors. Must be called after every libvirt - * call. - */ - protected void processError() throws LibvirtException { - virConnect.processError(); + return processError(libvirt.virSecretGetXMLDesc(VSP, 0)); } /** * Sets the value of the secret * - * @return 0 on success, -1 on failure. + * @return <em>ignore</em> (always 0) */ public int setValue(String value) throws LibvirtException { - int returnValue = libvirt.virSecretSetValue(VSP, value, new SizeT(value.length()), 0); - processError(); - return returnValue; + return processError(libvirt.virSecretSetValue(VSP, value, new SizeT(value.length()), 0)); } /** * Sets the value of the secret * - * @return 0 on success, -1 on failure. + * @return <em>ignore</em> (always 0) */ public int setValue(byte[] value) throws LibvirtException { - int returnValue = libvirt.virSecretSetValue(VSP, value, new SizeT(value.length), 0); - processError(); - return returnValue; + return processError(libvirt.virSecretSetValue(VSP, value, new SizeT(value.length), 0)); } /** * Undefines, but does not free, the Secret. * - * @return 0 on success, -1 on failure. + * @return <em>ignore</em> (always 0) */ public int undefine() throws LibvirtException { - int returnValue = libvirt.virSecretUndefine(VSP); - processError(); - return returnValue; + return processError(libvirt.virSecretUndefine(VSP)); } } -- 1.7.9.5

Wrap any fallible libvirt function in a call to ErrorHandler.processError(..). Also correct wrong javadoc comments stating that methods would return a value in case an error occurs. Signed-off-by: Claudio Bley <cbley@av-test.de> --- src/main/java/org/libvirt/StorageVol.java | 56 +++++++++-------------------- 1 file changed, 16 insertions(+), 40 deletions(-) diff --git a/src/main/java/org/libvirt/StorageVol.java b/src/main/java/org/libvirt/StorageVol.java index 561cb4d..1573070 100644 --- a/src/main/java/org/libvirt/StorageVol.java +++ b/src/main/java/org/libvirt/StorageVol.java @@ -4,6 +4,7 @@ import org.libvirt.jna.StoragePoolPointer; import org.libvirt.jna.StorageVolPointer; import org.libvirt.jna.virStorageVolInfo; import static org.libvirt.Library.libvirt; +import static org.libvirt.ErrorHandler.processError; /** * An acutal storage bucket. @@ -82,8 +83,7 @@ public class StorageVol { * @throws LibvirtException */ public void delete(int flags) throws LibvirtException { - libvirt.virStorageVolDelete(VSVP, flags); - processError(); + processError(libvirt.virStorageVolDelete(VSVP, flags)); } @Override @@ -96,13 +96,12 @@ public class StorageVol { * to exist * * @throws LibvirtException - * @return number of references left (>= 0) for success, -1 for failure. + * @return number of references left (>= 0) */ public int free() throws LibvirtException { int success = 0; if (VSVP != null) { - libvirt.virStorageVolFree(VSVP); - processError(); + success = processError(libvirt.virStorageVolFree(VSVP)); VSVP = null; } return success; @@ -127,8 +126,7 @@ public class StorageVol { */ public StorageVolInfo getInfo() throws LibvirtException { virStorageVolInfo vInfo = new virStorageVolInfo(); - libvirt.virStorageVolGetInfo(VSVP, vInfo); - processError(); + processError(libvirt.virStorageVolGetInfo(VSVP, vInfo)); return new StorageVolInfo(vInfo); } @@ -140,9 +138,7 @@ public class StorageVol { * @throws LibvirtException */ public String getKey() throws LibvirtException { - String returnValue = libvirt.virStorageVolGetKey(VSVP); - processError(); - return returnValue; + return processError(libvirt.virStorageVolGetKey(VSVP)); } /** @@ -152,9 +148,7 @@ public class StorageVol { * @throws LibvirtException */ public String getName() throws LibvirtException { - String returnValue = libvirt.virStorageVolGetName(VSVP); - processError(); - return returnValue; + return processError(libvirt.virStorageVolGetName(VSVP)); } /** @@ -167,9 +161,7 @@ public class StorageVol { * @throws LibvirtException */ public String getPath() throws LibvirtException { - String returnValue = libvirt.virStorageVolGetPath(VSVP); - processError(); - return returnValue; + return processError(libvirt.virStorageVolGetPath(VSVP)); } /** @@ -181,43 +173,29 @@ public class StorageVol { * @throws LibvirtException */ public String getXMLDesc(int flags) throws LibvirtException { - String returnValue = libvirt.virStorageVolGetXMLDesc(VSVP, flags); - processError(); - return returnValue; - } - - /** - * Error handling logic which should be called after every libvirt call - * - * @throws LibvirtException - */ - protected void processError() throws LibvirtException { - virConnect.processError(); + return processError(libvirt.virStorageVolGetXMLDesc(VSVP, flags)); } /** * Fetch a storage pool which contains this volume * - * @return StoragePool object, + * @return StoragePool object, or {@code null} if not found. * @throws LibvirtException */ public StoragePool storagePoolLookupByVolume() throws LibvirtException { - StoragePoolPointer ptr = libvirt.virStoragePoolLookupByVolume(VSVP); - processError(); - return new StoragePool(virConnect, ptr); + StoragePoolPointer ptr = processError(libvirt.virStoragePoolLookupByVolume(VSVP)); + return (ptr == null) ? null : new StoragePool(virConnect, ptr); } /** * Ensure data previously on a volume is not accessible to future reads * * @see <a href="http://www.libvirt.org/html/libvirt-libvirt.html#virStorageVolWipe">Libvirt Documentation</a> - * @return 0 on success, or -1 on error + * @return <em>ignore</em> (always 0) * @throws LibvirtException */ public int wipe() throws LibvirtException { - int returnValue = libvirt.virStorageVolWipe(VSVP, 0); - processError(); - return returnValue; + return processError(libvirt.virStorageVolWipe(VSVP, 0)); } /** @@ -228,12 +206,10 @@ public class StorageVol { * new capacity for volume * @param flags * flags for resizing, see libvirt API for exact flags - * @return 0 on success, or -1 on error + * @return <em>ignore</em> (always 0) * @throws LibvirtException */ public int resize(long capacity, int flags) throws LibvirtException { - int returnValue = libvirt.virStorageVolResize(VSVP, capacity, flags); - processError(); - return returnValue; + return processError(libvirt.virStorageVolResize(VSVP, capacity, flags)); } } -- 1.7.9.5

Wrap any fallible libvirt function in a call to ErrorHandler.processError(..) and remove calls to the deprecated ErrorHandler.processError(Libvirt) method. Also correct wrong javadoc comments stating that methods would return a value in case an error occurs. Signed-off-by: Claudio Bley <cbley@av-test.de> --- src/main/java/org/libvirt/Connect.java | 69 +++++--------------------------- 1 file changed, 11 insertions(+), 58 deletions(-) diff --git a/src/main/java/org/libvirt/Connect.java b/src/main/java/org/libvirt/Connect.java index b3e29be..fedc60e 100644 --- a/src/main/java/org/libvirt/Connect.java +++ b/src/main/java/org/libvirt/Connect.java @@ -15,7 +15,10 @@ import org.libvirt.jna.StorageVolPointer; import org.libvirt.jna.StreamPointer; import org.libvirt.jna.virConnectAuth; import org.libvirt.jna.virNodeInfo; + import static org.libvirt.Library.libvirt; +import static org.libvirt.ErrorHandler.processError; +import static org.libvirt.ErrorHandler.processErrorIfZero; import com.sun.jna.Memory; import com.sun.jna.NativeLong; @@ -79,7 +82,6 @@ public class Connect { */ public static void setErrorCallback(Libvirt.VirErrorCallback callback) throws LibvirtException { Libvirt.INSTANCE.virSetErrorFunc(null, callback); - ErrorHandler.processError(Libvirt.INSTANCE); } /** @@ -119,7 +121,6 @@ public class Connect { VCP = libvirt.virConnectOpen(uri); // Check for an error processError(VCP); - ErrorHandler.processError(Libvirt.INSTANCE); } /** @@ -140,7 +141,6 @@ public class Connect { } // Check for an error processError(VCP); - ErrorHandler.processError(Libvirt.INSTANCE); } /** @@ -173,7 +173,6 @@ public class Connect { VCP = libvirt.virConnectOpenAuth(uri, vAuth, flags); // Check for an error processError(VCP); - ErrorHandler.processError(Libvirt.INSTANCE); } /** @@ -220,8 +219,7 @@ public class Connect { * @throws LibvirtException */ public CPUCompareResult compareCPU(String xmlDesc) throws LibvirtException { - int rawResult = libvirt.virConnectCompareCPU(VCP, xmlDesc, 0); - processError(); + int rawResult = processError(libvirt.virConnectCompareCPU(VCP, xmlDesc, 0)); return CPUCompareResult.get(rawResult); } @@ -308,13 +306,11 @@ public class Connect { * Documentation</a> * @param callbackID * the callback to deregister - * @return 0 on success, -1 on failure + * @return <em>ignore</em> (always 0) * @throws LibvirtException */ public int domainEventDeregisterAny(int callbackID) throws LibvirtException { - int returnValue = libvirt.virConnectDomainEventDeregisterAny(VCP, callbackID); - processError(); - return returnValue; + return processError(libvirt.virConnectDomainEventDeregisterAny(VCP, callbackID)); } /** @@ -496,10 +492,7 @@ public class Connect { * Returns the free memory for the connection */ public long getFreeMemory() throws LibvirtException { - long returnValue = 0; - returnValue = libvirt.virNodeGetFreeMemory(VCP); - if (returnValue == 0) processError(); - return returnValue; + return processErrorIfZero(libvirt.virNodeGetFreeMemory(VCP)); } /** @@ -639,13 +632,11 @@ public class Connect { * @see <a * href="http://www.libvirt.org/html/libvirt-libvirt.html#virConnectIsEncrypted">Libvirt * Documentation</a> - * @return 1 if encrypted, 0 if not encrypted, -1 on error + * @return 1 if encrypted, 0 if not encrypted * @throws LibvirtException */ public int isEncrypted() throws LibvirtException { - int returnValue = libvirt.virConnectIsEncrypted(VCP); - processError(); - return returnValue; + return processError(libvirt.virConnectIsEncrypted(VCP)); } /** @@ -654,13 +645,11 @@ public class Connect { * @see <a * href="http://www.libvirt.org/html/libvirt-libvirt.html#virConnectIsSecure">Libvirt * Documentation</a> - * @return 1 if secure, 0 if not secure, -1 on error + * @return 1 if secure, 0 if not secure * @throws LibvirtException */ public int isSecure() throws LibvirtException { - int returnValue = libvirt.virConnectIsSecure(VCP); - processError(); - return returnValue; + return processError(libvirt.virConnectIsSecure(VCP)); } /** @@ -1141,41 +1130,6 @@ public class Connect { } /** - * call the error handling logic. Should be called after every libvirt call - * - * @throws LibvirtException - */ - protected void processError() throws LibvirtException { - ErrorHandler.processError(libvirt); - } - - /** - * Calls {@link #processError()} when the given libvirt return code - * indicates an error. - * - * @param ret libvirt return code, indicating error if negative. - * @return {@code ret} - * @throws LibvirtException - */ - protected final int processError(int ret) throws LibvirtException { - if (ret < 0) processError(); - return ret; - } - - /** - * Calls {@link #processError()} if {@code arg} is null. - * - * @param arg An arbitrary object returned by libvirt. - * @return {@code arg} - * @throws LibvirtException - */ - protected final <T> T processError(T arg) throws LibvirtException { - if (arg == null) processError(); - return arg; - } - - - /** * Restores a domain saved to disk by Domain.save(). * * @param from @@ -1246,7 +1200,6 @@ public class Connect { public void setConnectionErrorCallback(Libvirt.VirErrorCallback callback) throws LibvirtException { libvirt.virConnSetErrorFunc(VCP, null, callback); - processError(); } /** -- 1.7.9.5

It was deprecated and is no longer used. Signed-off-by: Claudio Bley <cbley@av-test.de> --- src/main/java/org/libvirt/ErrorHandler.java | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/src/main/java/org/libvirt/ErrorHandler.java b/src/main/java/org/libvirt/ErrorHandler.java index 01e25d6..c2e7337 100644 --- a/src/main/java/org/libvirt/ErrorHandler.java +++ b/src/main/java/org/libvirt/ErrorHandler.java @@ -16,18 +16,6 @@ import com.sun.jna.PointerType; */ public class ErrorHandler { - /** - * Look for the latest error from libvirt not tied to a connection - * - * @param libvirt - * the active connection - * @throws LibvirtException - */ - @Deprecated - static void processError(Libvirt libvirt) throws LibvirtException { - processError(); - } - private static final void processError() throws LibvirtException { virError vError = libvirt.virGetLastError(); if (vError != null) { -- 1.7.9.5

The getSchedulerType method returns a String (the name of the scheduler), not a String array containing a single element. It's OK to just pass null for the second argument to virDomainGetSchedulerType. Ensure to free the returned string. Signed-off-by: Claudio Bley <cbley@av-test.de> --- src/main/java/org/libvirt/Domain.java | 43 +++++++++++++++++++-------------- 1 file changed, 25 insertions(+), 18 deletions(-) diff --git a/src/main/java/org/libvirt/Domain.java b/src/main/java/org/libvirt/Domain.java index ab6f9f0..6db8745 100644 --- a/src/main/java/org/libvirt/Domain.java +++ b/src/main/java/org/libvirt/Domain.java @@ -528,18 +528,25 @@ public class Domain { */ public SchedParameter[] getSchedulerParameters() throws LibvirtException { IntByReference nParams = new IntByReference(); - SchedParameter[] returnValue = new SchedParameter[0]; - Pointer pScheduler = processError(libvirt.virDomainGetSchedulerType(VDP, nParams)); - String scheduler = Library.getString(pScheduler); - Library.free(pScheduler); - virSchedParameter[] nativeParams = new virSchedParameter[nParams.getValue()]; - returnValue = new SchedParameter[nParams.getValue()]; - processError(libvirt.virDomainGetSchedulerParameters(VDP, nativeParams, nParams)); - for (int x = 0; x < nParams.getValue(); x++) { - returnValue[x] = SchedParameter.create(nativeParams[x]); - } + Library.free(processError(libvirt.virDomainGetSchedulerType(VDP, nParams))); - return returnValue; + int n = nParams.getValue(); + + if (n > 0) { + virSchedParameter[] nativeParams = new virSchedParameter[n]; + + processError(libvirt.virDomainGetSchedulerParameters(VDP, nativeParams, nParams)); + n = nParams.getValue(); + + SchedParameter[] returnValue = new SchedParameter[n]; + + for (int x = 0; x < n; x++) { + returnValue[x] = SchedParameter.create(nativeParams[x]); + } + return returnValue; + } else { + return new SchedParameter[] {}; + } } // getSchedulerType @@ -552,13 +559,13 @@ public class Domain { * @return the type of the scheduler * @throws LibvirtException */ - public String[] getSchedulerType() throws LibvirtException { - IntByReference nParams = new IntByReference(); - Pointer pScheduler = processError(libvirt.virDomainGetSchedulerType(VDP, nParams)); - String[] array = new String[1]; - array[0] = Library.getString(pScheduler); - Library.free(pScheduler); - return array; + public String getSchedulerType() throws LibvirtException { + Pointer pScheduler = processError(libvirt.virDomainGetSchedulerType(VDP, null)); + try { + return Library.getString(pScheduler); + } finally { + Library.free(pScheduler); + } } /** -- 1.7.9.5

We need to free the char* entries of the result array returned ourselves. Signed-off-by: Claudio Bley <cbley@av-test.de> --- src/main/java/org/libvirt/StoragePool.java | 13 ++++++++++--- src/main/java/org/libvirt/jna/Libvirt.java | 2 +- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/libvirt/StoragePool.java b/src/main/java/org/libvirt/StoragePool.java index bb608e3..14ecab8 100644 --- a/src/main/java/org/libvirt/StoragePool.java +++ b/src/main/java/org/libvirt/StoragePool.java @@ -8,6 +8,7 @@ import static org.libvirt.Library.libvirt; import static org.libvirt.ErrorHandler.processError; import com.sun.jna.Native; +import com.sun.jna.Pointer; import com.sun.jna.ptr.IntByReference; /** @@ -245,9 +246,15 @@ public class StoragePool { */ public String[] listVolumes() throws LibvirtException { int num = numOfVolumes(); - String[] returnValue = new String[num]; - processError(libvirt.virStoragePoolListVolumes(VSPP, returnValue, num)); - return returnValue; + if (num > 0) { + Pointer[] ptrs = new Pointer[num]; + + int got = processError(libvirt.virStoragePoolListVolumes(VSPP, ptrs, num)); + + return Library.toStringArray(ptrs, got); + } else { + return Library.NO_STRINGS; + } } /** diff --git a/src/main/java/org/libvirt/jna/Libvirt.java b/src/main/java/org/libvirt/jna/Libvirt.java index 5666c66..2eb1cdc 100644 --- a/src/main/java/org/libvirt/jna/Libvirt.java +++ b/src/main/java/org/libvirt/jna/Libvirt.java @@ -305,7 +305,7 @@ public interface Libvirt extends Library { int virStoragePoolGetUUID(StoragePoolPointer storagePoolPtr, byte[] uuidString); int virStoragePoolGetUUIDString(StoragePoolPointer storagePoolPtr, byte[] uuidString); String virStoragePoolGetXMLDesc(StoragePoolPointer storagePoolPtr, int flags); - int virStoragePoolListVolumes(StoragePoolPointer storagePoolPtr, String[] names, int maxnames); + int virStoragePoolListVolumes(StoragePoolPointer storagePoolPtr, Pointer[] names, int maxnames); int virStoragePoolIsActive(StoragePoolPointer storagePoolPtr); int virStoragePoolIsPersistent(StoragePoolPointer storagePoolPtr); StoragePoolPointer virStoragePoolLookupByName(ConnectionPointer virConnectPtr, String name); -- 1.7.9.5

Signed-off-by: Claudio Bley <cbley@av-test.de> --- src/main/java/org/libvirt/StorageVol.java | 10 +++++++++- src/main/java/org/libvirt/jna/Libvirt.java | 2 +- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/libvirt/StorageVol.java b/src/main/java/org/libvirt/StorageVol.java index 1573070..7035c93 100644 --- a/src/main/java/org/libvirt/StorageVol.java +++ b/src/main/java/org/libvirt/StorageVol.java @@ -6,6 +6,8 @@ import org.libvirt.jna.virStorageVolInfo; import static org.libvirt.Library.libvirt; import static org.libvirt.ErrorHandler.processError; +import com.sun.jna.Pointer; + /** * An acutal storage bucket. */ @@ -161,7 +163,13 @@ public class StorageVol { * @throws LibvirtException */ public String getPath() throws LibvirtException { - return processError(libvirt.virStorageVolGetPath(VSVP)); + Pointer p = processError(libvirt.virStorageVolGetPath(VSVP)); + + try { + return Library.getString(p); + } finally { + Library.free(p); + } } /** diff --git a/src/main/java/org/libvirt/jna/Libvirt.java b/src/main/java/org/libvirt/jna/Libvirt.java index 33b5f8c..97907d0 100644 --- a/src/main/java/org/libvirt/jna/Libvirt.java +++ b/src/main/java/org/libvirt/jna/Libvirt.java @@ -326,7 +326,7 @@ public interface Libvirt extends Library { int virStorageVolGetInfo(StorageVolPointer storageVolPtr, virStorageVolInfo info); String virStorageVolGetKey(StorageVolPointer storageVolPtr); String virStorageVolGetName(StorageVolPointer storageVolPtr); - String virStorageVolGetPath(StorageVolPointer storageVolPtr); + Pointer virStorageVolGetPath(StorageVolPointer storageVolPtr); String virStorageVolGetXMLDesc(StorageVolPointer storageVolPtr, int flags); StorageVolPointer virStorageVolLookupByKey(ConnectionPointer virConnectPtr, String name); StorageVolPointer virStorageVolLookupByName(StoragePoolPointer storagePoolPtr, String name); -- 1.7.9.5

These functions are not (yet) exposed in the public org.libvirt package but only used internally. Signed-off-by: Claudio Bley <cbley@av-test.de> --- src/main/java/org/libvirt/jna/Libvirt.java | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/main/java/org/libvirt/jna/Libvirt.java b/src/main/java/org/libvirt/jna/Libvirt.java index 67b6053..ae03f18 100644 --- a/src/main/java/org/libvirt/jna/Libvirt.java +++ b/src/main/java/org/libvirt/jna/Libvirt.java @@ -98,6 +98,13 @@ public interface Libvirt extends Library { void eventCallback(ConnectionPointer virConnectPtr, DomainPointer virDomainPointer, Pointer opaque) ; } + /* + * Timeout Callback + */ + interface VirEventTimeoutCallback extends Callback { + void tick(int timerID, Pointer opaque); + } + Libvirt INSTANCE = (Libvirt) Native.loadLibrary(Platform.isWindows() ? "virt-0" : "virt", Libvirt.class); // Constants we need @@ -397,4 +404,8 @@ public interface Libvirt extends Library { int virNWFilterGetUUID(NetworkFilterPointer virNWFilterPtr, byte[] uuidString); int virNWFilterGetUUIDString(NetworkFilterPointer virNWFilterPtr, byte[] uuidString); int virNWFilterUndefine(NetworkFilterPointer virNWFilterPtr); + + // Event functions + int virEventAddTimeout(int milliSeconds, VirEventTimeoutCallback cb, Pointer opaque, Pointer ff); + int virEventRemoveTimeout(int timer); } -- 1.7.9.5

This wraps the virConnectIsAlive libvirt function available since version 0.9.8. Signed-off-by: Claudio Bley <cbley@av-test.de> --- src/main/java/org/libvirt/Connect.java | 12 ++++++++++++ src/main/java/org/libvirt/jna/Libvirt.java | 1 + src/test/java/org/libvirt/TestJavaBindings.java | 1 + 3 files changed, 14 insertions(+) diff --git a/src/main/java/org/libvirt/Connect.java b/src/main/java/org/libvirt/Connect.java index d92976e..d4868f0 100644 --- a/src/main/java/org/libvirt/Connect.java +++ b/src/main/java/org/libvirt/Connect.java @@ -1383,4 +1383,16 @@ public class Connect { public boolean isConnected() throws LibvirtException { return ( ( VCP != null ) ? true : false ); } + + /** + * Determine if the connection to the hypervisor is still alive. + * <p> + * A connection will be classed as alive if it is either local, + * or running over a channel (TCP or UNIX socket) which is not closed. + * + * @return {@code true} if alive, {@code false} otherwise. + */ + public boolean isAlive() throws LibvirtException { + return (1 == processError(libvirt.virConnectIsAlive(VCP))); + } } diff --git a/src/main/java/org/libvirt/jna/Libvirt.java b/src/main/java/org/libvirt/jna/Libvirt.java index ae03f18..69dabe2 100644 --- a/src/main/java/org/libvirt/jna/Libvirt.java +++ b/src/main/java/org/libvirt/jna/Libvirt.java @@ -128,6 +128,7 @@ public interface Libvirt extends Library { int virConnectDomainEventRegisterAny(ConnectionPointer virConnectPtr, DomainPointer virDomainPtr, int eventID, Libvirt.VirConnectDomainEventGenericCallback cb, Pointer opaque, Libvirt.VirFreeCallback freecb); int virConnectDomainEventDeregisterAny(ConnectionPointer virConnectPtr, int callbackID) ; void virConnSetErrorFunc(ConnectionPointer virConnectPtr, Pointer userData, VirErrorCallback callback); + int virConnectIsAlive(ConnectionPointer virConnectPtr); int virConnectIsEncrypted(ConnectionPointer virConnectPtr) ; int virConnectIsSecure(ConnectionPointer virConnectPtr) ; String virConnectFindStoragePoolSources(ConnectionPointer virConnectPtr, String type, String srcSpec, int flags); diff --git a/src/test/java/org/libvirt/TestJavaBindings.java b/src/test/java/org/libvirt/TestJavaBindings.java index 91f8df4..5cc77e7 100644 --- a/src/test/java/org/libvirt/TestJavaBindings.java +++ b/src/test/java/org/libvirt/TestJavaBindings.java @@ -42,6 +42,7 @@ public final class TestJavaBindings extends TestCase { assertTrue("conn.getLibVirVersion()", conn.getLibVirVersion() > 6000); assertTrue("conn.connectionVersion()", Connect.connectionVersion(conn) > 6000); assertEquals("conn.getVersion()", 2, conn.getVersion()); + assertTrue("conn.isAlive", conn.isAlive()); assertTrue("conn.isEncrypted", conn.isEncrypted() == 0); assertTrue("conn.isSecure", conn.isSecure() == 1); } -- 1.7.9.5

This wraps the virConnectSetKeepAlive libvirt function available since version 0.9.8. Signed-off-by: Claudio Bley <cbley@av-test.de> --- src/main/java/org/libvirt/Connect.java | 34 ++++++++++++++++++++++++++++ src/main/java/org/libvirt/jna/Libvirt.java | 1 + 2 files changed, 35 insertions(+) diff --git a/src/main/java/org/libvirt/Connect.java b/src/main/java/org/libvirt/Connect.java index d4868f0..0a45ac8 100644 --- a/src/main/java/org/libvirt/Connect.java +++ b/src/main/java/org/libvirt/Connect.java @@ -1395,4 +1395,38 @@ public class Connect { public boolean isAlive() throws LibvirtException { return (1 == processError(libvirt.virConnectIsAlive(VCP))); } + + /** + * Start sending keepalive messages. + * + * After {@code interval} seconds of inactivity, consider the + * connection to be broken when no response is received after + * {@code count} keepalive messages sent in a row. + * <p> + * In other words, sending {@code count + 1} keepalive message + * results in closing the connection. + * <p> + * When interval is <= 0, no keepalive messages will be sent. + * <p> + * When count is 0, the connection will be automatically closed after + * interval seconds of inactivity without sending any keepalive + * messages. + * <p> + * <em>Note</em>: client has to implement and run event loop to be + * able to use keepalive messages. Failure to do so may result in + * connections being closed unexpectedly. + * <p> + * <em>Note</em>: This API function controls only keepalive messages sent by + * the client. If the server is configured to use keepalive you still + * need to run the event loop to respond to them, even if you disable + * keepalives by this function. + * + * @param interval number of seconds of inactivity before a keepalive + * message is sent + * @param count number of messages that can be sent in a row + * @return {@code true} when successful, {@code false} otherwise. + */ + public boolean setKeepAlive(int interval, int count) throws LibvirtException { + return (0 == processError(libvirt.virConnectSetKeepAlive(VCP, interval, count))); + } } diff --git a/src/main/java/org/libvirt/jna/Libvirt.java b/src/main/java/org/libvirt/jna/Libvirt.java index 69dabe2..2bc5b6b 100644 --- a/src/main/java/org/libvirt/jna/Libvirt.java +++ b/src/main/java/org/libvirt/jna/Libvirt.java @@ -162,6 +162,7 @@ public interface Libvirt extends Library { ConnectionPointer virConnectOpen(String name); ConnectionPointer virConnectOpenAuth(String name, virConnectAuth auth, int flags); ConnectionPointer virConnectOpenReadOnly(String name); + int virConnectSetKeepAlive(ConnectionPointer virConnectPtr, int interval, int count); /** * @deprecated as of libvirt 0.6.0, all errors reported in the -- 1.7.9.5

Add initEventLoop(), processEvent(), runEventLoop() and stopEventLoop() static methods to the Library class. Signed-off-by: Claudio Bley <cbley@av-test.de> --- src/main/java/org/libvirt/Library.java | 91 ++++++++++++++++++++++++++++ src/main/java/org/libvirt/jna/Libvirt.java | 4 ++ 2 files changed, 95 insertions(+) diff --git a/src/main/java/org/libvirt/Library.java b/src/main/java/org/libvirt/Library.java index 95c13cb..3cfb8fd 100644 --- a/src/main/java/org/libvirt/Library.java +++ b/src/main/java/org/libvirt/Library.java @@ -7,6 +7,8 @@ import com.sun.jna.Native; import com.sun.jna.Pointer; import com.sun.jna.ptr.PointerByReference; +import java.util.concurrent.atomic.AtomicBoolean; + /** * This class represents an instance of the JNA mapped libvirt * library. @@ -17,6 +19,8 @@ import com.sun.jna.ptr.PointerByReference; * implementing the public API. */ final class Library { + private static AtomicBoolean runLoop = new AtomicBoolean(); + final static Libvirt libvirt; // an empty string array constant @@ -85,4 +89,91 @@ final class Library { } } } + + /** + * Initialize the event loop. + * + * Registers a default event loop implementation based on the + * poll() system call. + * <p> + * Once registered, the application has to invoke + * {@link #processEvent} in a loop or call {@link #runEventLoop} + * in another thread. + * <p> + * Note: You must call this function <em>before</em> connecting to + * the hypervisor. + * + * @throws LibvirtException on failure + * + * @see #processEvent + * @see #runLoop + */ + public static void initEventLoop() throws LibvirtException { + processError(libvirt.virEventRegisterDefaultImpl()); + } + + /** + * Run one iteration of the event loop. + * <p> + * Applications will generally want to have a thread which invokes + * this method in an infinite loop: + * <pre> + * {@code while (true) connection.processEvent(); } + * </pre> + * <p> + * Failure to do so may result in connections being closed + * unexpectedly as a result of keepalive timeout. + * + * @throws LibvirtException on failure + * + * @see #initEventLoop() + */ + public static void processEvent() throws LibvirtException { + processError(libvirt.virEventRunDefaultImpl()); + } + + /** + * Runs the event loop. + * + * This method blocks until {@link #stopEventLoop} is called or an + * exception is thrown. + * <p> + * Usually, this method is run in another thread. + * + * @throws LibvirtException if there was an error during the call of a + * native libvirt function + * @throws InterruptedException if this thread was interrupted by a call to + * {@link java.lang.Thread#interrupt() Thread.interrupt()} + */ + public static void runEventLoop() throws LibvirtException, InterruptedException { + runLoop.set(true); + do { + processEvent(); + if (Thread.interrupted()) + throw new InterruptedException(); + } while (runLoop.get()); + } + + /** + * Stops the event loop. + * + * This methods stops an event loop when an event loop is + * currently running, otherwise it does nothing. + * + * @see #runEventLoop + */ + public static void stopEventLoop() throws LibvirtException { + if (runLoop.getAndSet(false)) { + // add a timeout which fires immediately so that the processEvent + // method returns if it is waiting + libvirt.virEventAddTimeout(0, new org.libvirt.jna.Libvirt.VirEventTimeoutCallback() { + @Override + public void tick(int id, Pointer p) { + // remove itself right after it served its purpose + libvirt.virEventRemoveTimeout(id); + } + }, + null, null); + } + } } diff --git a/src/main/java/org/libvirt/jna/Libvirt.java b/src/main/java/org/libvirt/jna/Libvirt.java index 2bc5b6b..ed52bd3 100644 --- a/src/main/java/org/libvirt/jna/Libvirt.java +++ b/src/main/java/org/libvirt/jna/Libvirt.java @@ -187,6 +187,10 @@ public interface Libvirt extends Library { void virResetLastError(); void virSetErrorFunc(Pointer userData, VirErrorCallback callback); + // Event loop functions. + int virEventRegisterDefaultImpl(); + int virEventRunDefaultImpl(); + // Domain functions int virDomainAbortJob(DomainPointer virDomainPtr); int virDomainAttachDevice(DomainPointer virDomainPtr, String deviceXML); -- 1.7.9.5

Signed-off-by: Claudio Bley <cbley@av-test.de> --- src/test/java/org/libvirt/TestJavaBindings.java | 69 +++++++++++++++++++++++ 1 file changed, 69 insertions(+) diff --git a/src/test/java/org/libvirt/TestJavaBindings.java b/src/test/java/org/libvirt/TestJavaBindings.java index 5cc77e7..a73148f 100644 --- a/src/test/java/org/libvirt/TestJavaBindings.java +++ b/src/test/java/org/libvirt/TestJavaBindings.java @@ -1,5 +1,10 @@ package org.libvirt; +import org.libvirt.event.*; + +import java.util.Arrays; +import java.util.ArrayList; +import java.util.List; import java.util.UUID; import junit.framework.TestCase; @@ -12,6 +17,15 @@ public final class TestJavaBindings extends TestCase { private Connect conn; + static { + // do this once for each JVM instance, before connecting + try { + Library.initEventLoop(); + } catch (LibvirtException e) { + // XXX warn + } + } + protected void setUp() throws LibvirtException { conn = new Connect("test:///default", false); } @@ -237,4 +251,59 @@ public final class TestJavaBindings extends TestCase { assertTrue("pool1 should not be active", pool1.isActive() == 0); assertTrue("Domain2 should be active", defaultPool.isActive() == 1); } + + public void testDomainEvents() throws Exception { + final List<DomainEventType> events = new ArrayList<DomainEventType>(); + final Thread t = new Thread() { + @Override + public void run() { + try { + Library.runEventLoop(); + } catch (LibvirtException e) { + fail("LibvirtException was thrown: " + e); + } catch (InterruptedException e) { + } + } + }; + t.setDaemon(true); + t.start(); + + LifecycleListener listener = new LifecycleListener() { + @Override + public int onLifecycleChange(Domain d, DomainEvent e) + { + events.add(e.getType()); + + return 0; + } + }; + try { + conn.addLifecycleListener(listener); + + Domain dom = 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>" + + " <on_poweroff>destroy</on_poweroff>" + " <on_crash>restart</on_crash>" + "</domain>"); + + dom.create(); + dom.suspend(); + dom.resume(); + dom.destroy(); + dom.undefine(); + + // wait until (presumably) all events have been processed + Thread.sleep(300); + + assertEquals(Arrays.asList(DomainEventType.DEFINED, + DomainEventType.STARTED, + DomainEventType.SUSPENDED, + DomainEventType.RESUMED, + DomainEventType.STOPPED, + DomainEventType.UNDEFINED), + events); + } finally { + conn.removeLifecycleListener(listener); + Library.stopEventLoop(); + } + } } -- 1.7.9.5

Signed-off-by: Claudio Bley <cbley@av-test.de> --- src/main/java/org/libvirt/Connect.java | 57 ++++++++++++++++++++ src/main/java/org/libvirt/Domain.java | 20 +++++++ .../java/org/libvirt/event/PMWakeupListener.java | 17 ++++++ .../java/org/libvirt/event/PMWakeupReason.java | 5 ++ src/main/java/org/libvirt/jna/Libvirt.java | 6 +++ 5 files changed, 105 insertions(+) create mode 100644 src/main/java/org/libvirt/event/PMWakeupListener.java create mode 100644 src/main/java/org/libvirt/event/PMWakeupReason.java diff --git a/src/main/java/org/libvirt/Connect.java b/src/main/java/org/libvirt/Connect.java index d82dba2..d18a996 100644 --- a/src/main/java/org/libvirt/Connect.java +++ b/src/main/java/org/libvirt/Connect.java @@ -530,6 +530,63 @@ public class Connect { domainEventRegister(null, l); } + void domainEventRegister(Domain domain, final PMWakeupListener cb) throws LibvirtException { + if (cb == null) + throw new IllegalArgumentException("PMWakeupCallback cannot be null"); + + Libvirt.VirDomainEventCallback virCB = + new Libvirt.VirConnectDomainEventPMChangeCallback() { + @Override + public void eventCallback(ConnectionPointer virConnectPtr, DomainPointer virDomainPointer, + int reason, Pointer opaque) { + assert VCP.equals(virConnectPtr); + + try { + Domain d = Domain.constructIncRef(Connect.this, virDomainPointer); + cb.onPMWakeup(d, getConstant(PMWakeupReason.class, reason)); + } catch (LibvirtException e) { + throw new RuntimeException("libvirt error handling PMWakeup callback", e); + } + } + }; + + domainEventRegister(domain, DomainEventID.PMWAKEUP, virCB, cb); + } + + /** + * Adds the specified listener to receive PMWakeup events for + * domains of this connection. + * + * @param l the PMWakeup listener + * @throws LibvirtException on failure + * + * @see #removePMWakeupListener + * @see Domain#addPMWakeupListener + * @see <a + * href="http://www.libvirt.org/html/libvirt-libvirt.html#virConnectDomainEventRegist..." + * >virConnectDomainEventRegisterAny</a> + * + * @since 1.5.2 + */ + public void addPMWakeupListener(final PMWakeupListener l) throws LibvirtException { + domainEventRegister(null, l); + } + + /** + * Removes the specified PMWakeup listener so that it no longer + * receives PMWakeup events. + * + * @param l the PMWakeup listener + * @throws LibvirtException + * + * @see <a + * href="http://www.libvirt.org/html/libvirt-libvirt.html#virConnectDomainEventDeregi..." + * >virConnectDomainEventDeregisterAny</a> + */ + public void removePMWakeupListener(final PMWakeupListener l) throws LibvirtException { + domainEventDeregister(DomainEventID.PMWAKEUP, l); + } + /** * Removes the specified I/O error listener so that it no longer * receives I/O error events. diff --git a/src/main/java/org/libvirt/Domain.java b/src/main/java/org/libvirt/Domain.java index fb59781..6dda2a6 100644 --- a/src/main/java/org/libvirt/Domain.java +++ b/src/main/java/org/libvirt/Domain.java @@ -15,6 +15,7 @@ import org.libvirt.jna.virSchedParameter; import org.libvirt.jna.virVcpuInfo; import org.libvirt.event.RebootListener; import org.libvirt.event.LifecycleListener; +import org.libvirt.event.PMWakeupListener; import static org.libvirt.Library.libvirt; import static org.libvirt.ErrorHandler.processError; import static org.libvirt.ErrorHandler.processErrorIfZero; @@ -1082,6 +1083,25 @@ public class Domain { } /** + * Adds the specified listener to receive PMWakeup events for this domain. + * + * @param l the PMWakeup listener + * @throws LibvirtException on failure + * + * @see Connect#removePMWakeupListener + * @see Connect#addPMWakeupListener + * @see <a + * href="http://www.libvirt.org/html/libvirt-libvirt.html#virConnectDomainEventRegist..." + * >virConnectDomainEventRegisterAny</a> + * + * @since 1.5.2 + */ + public void addPMWakeupListener(final PMWakeupListener l) throws LibvirtException + { + virConnect.domainEventRegister(this, l); + } + + /** * Revert the domain to a given snapshot. * * @see <a href= diff --git a/src/main/java/org/libvirt/event/PMWakeupListener.java b/src/main/java/org/libvirt/event/PMWakeupListener.java new file mode 100644 index 0000000..50d69ef --- /dev/null +++ b/src/main/java/org/libvirt/event/PMWakeupListener.java @@ -0,0 +1,17 @@ +package org.libvirt.event; + +import org.libvirt.Domain; + +/** + * Interface for receiving PMWakeup events on a domain. + */ +public interface PMWakeupListener extends EventListener { + + /** + * This method gets called when a domain is woken up. + * + * @param domain the domain that was woken up + * @param reason the reason why that event happened + */ + void onPMWakeup(Domain domain, PMWakeupReason reason); +} diff --git a/src/main/java/org/libvirt/event/PMWakeupReason.java b/src/main/java/org/libvirt/event/PMWakeupReason.java new file mode 100644 index 0000000..12c37bf --- /dev/null +++ b/src/main/java/org/libvirt/event/PMWakeupReason.java @@ -0,0 +1,5 @@ +package org.libvirt.event; + +public enum PMWakeupReason { + UNKNOWN +} diff --git a/src/main/java/org/libvirt/jna/Libvirt.java b/src/main/java/org/libvirt/jna/Libvirt.java index 5bb9fa0..1eaeab8 100644 --- a/src/main/java/org/libvirt/jna/Libvirt.java +++ b/src/main/java/org/libvirt/jna/Libvirt.java @@ -96,6 +96,12 @@ public interface Libvirt extends Library { Pointer opaque); } + // PMWakeup and PMSuspend have the same callback interface. + interface VirConnectDomainEventPMChangeCallback extends VirDomainEventCallback { + void eventCallback(ConnectionPointer virConnectPtr, DomainPointer virDomainPointer, + int reason, Pointer opaque); + } + /** * Error callback */ -- 1.7.9.5

Signed-off-by: Claudio Bley <cbley@av-test.de> --- src/main/java/org/libvirt/Connect.java | 59 ++++++++++++++++++++ src/main/java/org/libvirt/Domain.java | 20 +++++++ .../java/org/libvirt/event/PMSuspendListener.java | 17 ++++++ .../java/org/libvirt/event/PMSuspendReason.java | 5 ++ 4 files changed, 101 insertions(+) create mode 100644 src/main/java/org/libvirt/event/PMSuspendListener.java create mode 100644 src/main/java/org/libvirt/event/PMSuspendReason.java diff --git a/src/main/java/org/libvirt/Connect.java b/src/main/java/org/libvirt/Connect.java index d18a996..10fc2e8 100644 --- a/src/main/java/org/libvirt/Connect.java +++ b/src/main/java/org/libvirt/Connect.java @@ -553,6 +553,65 @@ public class Connect { domainEventRegister(domain, DomainEventID.PMWAKEUP, virCB, cb); } + void domainEventRegister(Domain domain, final PMSuspendListener cb) throws LibvirtException { + if (cb == null) + throw new IllegalArgumentException("PMSuspendCallback cannot be null"); + + Libvirt.VirDomainEventCallback virCB = + new Libvirt.VirConnectDomainEventPMChangeCallback() { + @Override + public void eventCallback(ConnectionPointer virConnectPtr, DomainPointer virDomainPointer, + int reason, Pointer opaque) { + assert VCP.equals(virConnectPtr); + + try { + Domain d = Domain.constructIncRef(Connect.this, virDomainPointer); + cb.onPMSuspend(d, getConstant(PMSuspendReason.class, reason)); + } catch (LibvirtException e) { + throw new RuntimeException("libvirt error in PMSuspend callback", e); + } + } + }; + + domainEventRegister(domain, DomainEventID.PMSUSPEND, virCB, cb); + } + + /** + * Adds the specified listener to receive PMSuspend events for + * domains of this connection. + * + * @param l the PMSuspend listener + * @throws LibvirtException on failure + * + * @see #removePMSuspendListener + * @see Domain#addPMSuspendListener + * @see <a + * href="http://www.libvirt.org/html/libvirt-libvirt.html#virConnectDomainEventRegist..." + * >virConnectDomainEventRegisterAny</a> + * + * @since 1.5.2 + */ + public void addPMSuspendListener(final PMSuspendListener l) throws LibvirtException { + domainEventRegister(null, l); + } + + /** + * Removes the specified PMSuspend listener so that it no longer + * receives PMSuspend events. + * + * @param l the PMSuspend listener + * @throws LibvirtException + * + * @see <a + * href="http://www.libvirt.org/html/libvirt-libvirt.html#virConnectDomainEventDeregi..." + * >virConnectDomainEventDeregisterAny</a> + * + * @since 1.5.2 + */ + public void removePMSuspendListener(final PMSuspendListener l) throws LibvirtException { + domainEventDeregister(DomainEventID.PMWAKEUP, l); + } + /** * Adds the specified listener to receive PMWakeup events for * domains of this connection. diff --git a/src/main/java/org/libvirt/Domain.java b/src/main/java/org/libvirt/Domain.java index 6dda2a6..f3fffdd 100644 --- a/src/main/java/org/libvirt/Domain.java +++ b/src/main/java/org/libvirt/Domain.java @@ -16,6 +16,7 @@ import org.libvirt.jna.virVcpuInfo; import org.libvirt.event.RebootListener; import org.libvirt.event.LifecycleListener; import org.libvirt.event.PMWakeupListener; +import org.libvirt.event.PMSuspendListener; import static org.libvirt.Library.libvirt; import static org.libvirt.ErrorHandler.processError; import static org.libvirt.ErrorHandler.processErrorIfZero; @@ -1102,6 +1103,25 @@ public class Domain { } /** + * Adds the specified listener to receive PMSuspend events for this domain. + * + * @param l the PMSuspend listener + * @throws LibvirtException on failure + * + * @see Connect#removePMSuspendListener + * @see Connect#addPMSuspendListener + * @see <a + * href="http://www.libvirt.org/html/libvirt-libvirt.html#virConnectDomainEventRegist..." + * >virConnectDomainEventRegisterAny</a> + * + * @since 1.5.2 + */ + public void addPMSuspendListener(final PMSuspendListener l) throws LibvirtException + { + virConnect.domainEventRegister(this, l); + } + + /** * Revert the domain to a given snapshot. * * @see <a href= diff --git a/src/main/java/org/libvirt/event/PMSuspendListener.java b/src/main/java/org/libvirt/event/PMSuspendListener.java new file mode 100644 index 0000000..ec111e1 --- /dev/null +++ b/src/main/java/org/libvirt/event/PMSuspendListener.java @@ -0,0 +1,17 @@ +package org.libvirt.event; + +import org.libvirt.Domain; + +/** + * Interface for receiving PMSuspend events on a domain. + */ +public interface PMSuspendListener extends EventListener { + + /** + * This method gets called when a domain is suspended. + * + * @param domain the domain that was suspended + * @param reason the reason why that event happened + */ + void onPMSuspend(Domain domain, PMSuspendReason reason); +} diff --git a/src/main/java/org/libvirt/event/PMSuspendReason.java b/src/main/java/org/libvirt/event/PMSuspendReason.java new file mode 100644 index 0000000..58f06a1 --- /dev/null +++ b/src/main/java/org/libvirt/event/PMSuspendReason.java @@ -0,0 +1,5 @@ +package org.libvirt.event; + +public enum PMSuspendReason { + UNKNOWN +} -- 1.7.9.5

There can only be a single connection close listener registered per connection object. Signed-off-by: Claudio Bley <cbley@av-test.de> --- src/main/java/org/libvirt/Connect.java | 57 ++++++++++++++++++++++++++++ src/main/java/org/libvirt/jna/Libvirt.java | 11 ++++++ 2 files changed, 68 insertions(+) diff --git a/src/main/java/org/libvirt/Connect.java b/src/main/java/org/libvirt/Connect.java index 10fc2e8..f597826 100644 --- a/src/main/java/org/libvirt/Connect.java +++ b/src/main/java/org/libvirt/Connect.java @@ -46,6 +46,22 @@ public class Connect { return new HashMap[size]; } + private class CloseFunc implements Libvirt.VirConnectCloseFunc { + final ConnectionCloseListener listener; + + CloseFunc(ConnectionCloseListener l) { + this.listener = l; + } + + @Override + public void callback(ConnectionPointer VCP, int reason, Pointer opaque) { + this.listener.onClose(Connect.this, + getConstant(ConnectionCloseReason.class, reason)); + } + } + + private CloseFunc registeredCloseFunc = null; + /** * Event IDs. */ @@ -267,6 +283,11 @@ public class Connect { int success = 0; if (VCP != null) { success = libvirt.virConnectClose(VCP); + + // if the connection has been closed (i.e. the reference count is + // down to zero), forget about the registered close function + if (success == 0) registeredCloseFunc = null; + // If leave an invalid pointer dangling around JVM crashes and burns // if someone tries to call a method on us // We rely on the underlying libvirt error handling to detect that @@ -277,6 +298,42 @@ public class Connect { } /** + * Register the specified connection close listener to receive notifications + * when this connection is closed. + * <p> + * <strong>Note:</strong> There can only be at most one registered listener + * at a time. + * @param l the connection close listener + * @throws LibvirtException on failure + * @see #unregisterCloseListener + */ + public void registerCloseListener(final ConnectionCloseListener l) throws LibvirtException { + CloseFunc cf = new CloseFunc(l); + + processError(libvirt.virConnectRegisterCloseCallback(this.VCP, + cf, + null, + null)); + this.registeredCloseFunc = cf; + } + + /** + * Unregister the previously registered close listener. + * + * When there currently is no registered close listener, this method + * does nothing. + * + * @see #registerCloseListener + */ + public void unregisterCloseListener() throws LibvirtException { + if (this.registeredCloseFunc != null) { + processError(libvirt.virConnectUnregisterCloseCallback(this.VCP, + this.registeredCloseFunc)); + this.registeredCloseFunc = null; + } + } + + /** * Compares the given CPU description with the host CPU * * @see <a diff --git a/src/main/java/org/libvirt/jna/Libvirt.java b/src/main/java/org/libvirt/jna/Libvirt.java index 1eaeab8..e4b2cfb 100644 --- a/src/main/java/org/libvirt/jna/Libvirt.java +++ b/src/main/java/org/libvirt/jna/Libvirt.java @@ -65,6 +65,13 @@ public interface Libvirt extends Library { } /** + * Callback interface for connection closed events. + */ + interface VirConnectCloseFunc extends Callback { + void callback(ConnectionPointer VCP, int reason, Pointer opaque); + } + + /** * Domain Event Callbacks */ @@ -162,6 +169,10 @@ public interface Libvirt extends Library { // Register Domain Event Callbacks int virConnectDomainEventRegisterAny(ConnectionPointer virConnectPtr, DomainPointer virDomainPtr, int eventID, VirDomainEventCallback cb, Pointer opaque, Libvirt.VirFreeCallback freecb); + int virConnectRegisterCloseCallback(ConnectionPointer virConnectPtr, VirConnectCloseFunc cb, + Pointer opaque, Pointer freeOpaque); + int virConnectUnregisterCloseCallback(ConnectionPointer virConnectPtr, VirConnectCloseFunc cb); + int virConnectDomainEventDeregisterAny(ConnectionPointer virConnectPtr, int callbackID) ; void virConnSetErrorFunc(ConnectionPointer virConnectPtr, Pointer userData, VirErrorCallback callback); int virConnectIsAlive(ConnectionPointer virConnectPtr); -- 1.7.9.5

This wraps the virConnectGetSysinfo function available since libvirt version 0.8.8. Signed-off-by: Claudio Bley <cbley@av-test.de> --- src/main/java/org/libvirt/Connect.java | 21 +++++++++++++++++++++ src/main/java/org/libvirt/jna/Libvirt.java | 1 + 2 files changed, 22 insertions(+) diff --git a/src/main/java/org/libvirt/Connect.java b/src/main/java/org/libvirt/Connect.java index f597826..8659076 100644 --- a/src/main/java/org/libvirt/Connect.java +++ b/src/main/java/org/libvirt/Connect.java @@ -969,6 +969,27 @@ public class Connect { } /** + * Returns the XML description of the sysinfo details for the host + * on which the hypervisor is running. + * <p> + * This information is generally available only for hypervisors + * running with root privileges. + * + * @return sysinfo details in the same format as the {@code + * <sysinfo>} element of a domain XML. + * @since 1.5.2 + */ + public String getSysinfo() throws LibvirtException { + Pointer p = processError(libvirt.virConnectGetSysinfo(this.VCP, 0)); + + try { + return Library.getString(p); + } finally { + Library.free(p); + } + } + + /** * Gets the name of the Hypervisor software used. * * @return the name diff --git a/src/main/java/org/libvirt/jna/Libvirt.java b/src/main/java/org/libvirt/jna/Libvirt.java index e4b2cfb..3bd63e1 100644 --- a/src/main/java/org/libvirt/jna/Libvirt.java +++ b/src/main/java/org/libvirt/jna/Libvirt.java @@ -183,6 +183,7 @@ public interface Libvirt extends Library { Pointer virConnectGetHostname(ConnectionPointer virConnectPtr); int virConnectGetLibVersion(ConnectionPointer virConnectPtr, LongByReference libVer); int virConnectGetMaxVcpus(ConnectionPointer virConnectPtr, String type); + Pointer virConnectGetSysinfo(ConnectionPointer virConnectPtr, int flags); String virConnectGetType(ConnectionPointer virConnectPtr); String virConnectGetURI(ConnectionPointer virConnectPtr); int virConnectGetVersion(ConnectionPointer virConnectPtr, LongByReference hvVer); -- 1.7.9.5

This wraps the virDomainBlockPeek libvirt function, available since version 0.4.5. Signed-off-by: Claudio Bley <cbley@av-test.de> --- src/main/java/org/libvirt/Domain.java | 53 ++++++++++++++++++++++++++++ src/main/java/org/libvirt/jna/Libvirt.java | 4 +++ 2 files changed, 57 insertions(+) diff --git a/src/main/java/org/libvirt/Domain.java b/src/main/java/org/libvirt/Domain.java index f3fffdd..f57460f 100644 --- a/src/main/java/org/libvirt/Domain.java +++ b/src/main/java/org/libvirt/Domain.java @@ -1,5 +1,7 @@ package org.libvirt; +import java.nio.ByteBuffer; + import org.libvirt.event.IOErrorListener; import org.libvirt.jna.DomainPointer; import org.libvirt.jna.DomainSnapshotPointer; @@ -280,6 +282,57 @@ public class Domain { } /** + * Read the contents of a domain's disk device. + * <p> + * Typical uses for this are to determine if the domain has + * written a Master Boot Record (indicating that the domain has + * completed installation), or to try to work out the state of the + * domain's filesystems. + * <p> + * (Note that in the local case you might try to open the block + * device or file directly, but that won't work in the remote + * case, nor if you don't have sufficient permission. Hence the + * need for this call). + * <p> + * The disk parameter can either be an unambiguous source name of + * the block device (the {@code <source file='...'/>} sub-element, + * such as "/path/to/image"), or <em>(since 0.9.5)</em> the device + * target shorthand (the {@code <target dev='...'/>} sub-element, + * such as "xvda"). + * <p> + * Valid names can be found by calling {@link #getXMLDesc} and + * inspecting elements within {@code //domain/devices/disk}. + * <p> + * This method always reads the number of bytes remaining in the + * buffer, that is, {@code buffer.remaining()} at the moment this + * method is invoked. Upon return the buffer's position will be + * equal to the limit, the limit itself will not have changed. + * + * @param disk the path to the block device, or device shorthand + * @param offset the offset within block device + * @param buffer the buffer receiving the data + */ + public void blockPeek(String disk, long offset, ByteBuffer buffer) throws LibvirtException { + SizeT size = new SizeT(); + + // older libvirt has a limitation on the size of data + // transferred per request in the remote driver. So, split + // larger requests into 64K blocks. + + do { + final int req = Math.min(65536, buffer.remaining()); + + size.setValue(req); + + processError(libvirt.virDomainBlockPeek(this.VDP, disk, offset, size, buffer, 0)); + + buffer.position(buffer.position() + req); + } while (buffer.hasRemaining()); + + assert buffer.position() == buffer.limit(); + } + + /** * Returns block device (disk) stats for block devices attached to this * domain. The path parameter is the name of the block device. Get this by * calling virDomainGetXMLDesc and finding the <target dev='...'> attribute diff --git a/src/main/java/org/libvirt/jna/Libvirt.java b/src/main/java/org/libvirt/jna/Libvirt.java index 3bd63e1..0452246 100644 --- a/src/main/java/org/libvirt/jna/Libvirt.java +++ b/src/main/java/org/libvirt/jna/Libvirt.java @@ -1,5 +1,7 @@ package org.libvirt.jna; +import java.nio.ByteBuffer; + import com.sun.jna.Callback; import com.sun.jna.Library; import com.sun.jna.Native; @@ -243,6 +245,8 @@ public interface Libvirt extends Library { int virDomainAbortJob(DomainPointer virDomainPtr); int virDomainAttachDevice(DomainPointer virDomainPtr, String deviceXML); int virDomainAttachDeviceFlags(DomainPointer virDomainPtr, String deviceXML, int flags); + int virDomainBlockPeek(DomainPointer virDomainPtr, String disk, long offset, SizeT size, + ByteBuffer buffer, int flags); int virDomainBlockStats(DomainPointer virDomainPtr, String path, virDomainBlockStats stats, SizeT size); int virDomainBlockResize(DomainPointer virDomainPtr, String disk, long size, int flags); int virDomainCoreDump(DomainPointer virDomainPtr, String to, int flags); -- 1.7.9.5

This wraps the virDomainMemoryPeek libvirt function, available since version 0.4.5. Signed-off-by: Claudio Bley <cbley@av-test.de> --- src/main/java/org/libvirt/Domain.java | 40 ++++++++++++++++++++++ src/main/java/org/libvirt/MemoryAddressMode.java | 19 ++++++++++ src/main/java/org/libvirt/jna/Libvirt.java | 5 +-- 3 files changed, 60 insertions(+), 4 deletions(-) create mode 100644 src/main/java/org/libvirt/MemoryAddressMode.java diff --git a/src/main/java/org/libvirt/Domain.java b/src/main/java/org/libvirt/Domain.java index f57460f..5f0d1d0 100644 --- a/src/main/java/org/libvirt/Domain.java +++ b/src/main/java/org/libvirt/Domain.java @@ -826,6 +826,46 @@ public class Domain { } /** + * Read the contents of a domain's memory. + * <p> + * If mode is MemoryAddressMode.VIRTUAL the 'start' parameter is + * interpreted as virtual memory address for whichever task + * happens to be running on the domain at the moment. Although + * this sounds haphazard it is in fact what you want in order to + * read Linux kernel state, because it ensures that pointers in + * the kernel image can be interpreted coherently. + * <p> + * This method always reads the number of bytes remaining in the + * buffer, that is, {@code buffer.remaining()} at the moment this + * method is invoked. Upon return the buffer's position will be + * equal to the limit, the limit itself will not have changed. + * + * @param start the start address of the memory to peek + * @param mode the mode which determines whether the given addresses + * are interpreted as virtual or physical addresses + */ + public void memoryPeek(long start, ByteBuffer buffer, MemoryAddressMode mode) throws LibvirtException + { + SizeT size = new SizeT(); + + // older libvirt has a limitation on the size of data + // transferred per request in the remote driver. So, split + // larger requests into 64K blocks. + + do { + final int req = Math.min(65536, buffer.remaining()); + + size.setValue(req); + + processError(libvirt.virDomainMemoryPeek(this.VDP, start, size, buffer, mode.getValue())); + + buffer.position(buffer.position() + req); + } while (buffer.hasRemaining()); + + assert buffer.position() == buffer.limit(); + } + + /** * This function provides memory statistics for the domain. * * @param number diff --git a/src/main/java/org/libvirt/MemoryAddressMode.java b/src/main/java/org/libvirt/MemoryAddressMode.java new file mode 100644 index 0000000..c16edea --- /dev/null +++ b/src/main/java/org/libvirt/MemoryAddressMode.java @@ -0,0 +1,19 @@ +package org.libvirt; + +public enum MemoryAddressMode { + /** addresses are virtual addresses */ + VIRTUAL(1), + + /** addresses are physical addresses */ + PHYSICAL(2); + + private final int value; + + MemoryAddressMode(int v) { + this.value = v; + } + + int getValue() { + return value; + } +} diff --git a/src/main/java/org/libvirt/jna/Libvirt.java b/src/main/java/org/libvirt/jna/Libvirt.java index 0452246..28fbff1 100644 --- a/src/main/java/org/libvirt/jna/Libvirt.java +++ b/src/main/java/org/libvirt/jna/Libvirt.java @@ -22,10 +22,6 @@ import com.sun.jna.ptr.PointerByReference; * virConnCopyLastError * virFreeError * - * LIBVIRT_0.4.2 - * virDomainBlockPeek - * virDomainMemoryPeek - * * LIBVIRT_0_5.0 * virEventRegisterImpl * virConnectDomainEventRegister @@ -286,6 +282,7 @@ public interface Libvirt extends Library { DomainPointer virDomainLookupByUUIDString(ConnectionPointer virConnectPtr, String uuidstr); int virDomainManagedSave(DomainPointer virDomainPtr, int flags); int virDomainManagedSaveRemove(DomainPointer virDomainPtr, int flags); + int virDomainMemoryPeek(DomainPointer virDomainPtr, long start, SizeT size, ByteBuffer buffer, int flags); DomainPointer virDomainMigrate(DomainPointer virDomainPtr, ConnectionPointer virConnectPtr, NativeLong flags, String dname, String uri, NativeLong bandwidth); DomainPointer virDomainMigrate2(DomainPointer virDomainPtr, ConnectionPointer virConnectPtr, -- 1.7.9.5

This wraps the virSecretGetUsageType libvirt function available since version 0.7.1. Signed-off-by: Claudio Bley <cbley@av-test.de> --- src/main/java/org/libvirt/Secret.java | 5 +++++ src/main/java/org/libvirt/SecretUsageType.java | 23 +++++++++++++++++++++++ src/main/java/org/libvirt/jna/Libvirt.java | 1 + 3 files changed, 29 insertions(+) create mode 100644 src/main/java/org/libvirt/SecretUsageType.java diff --git a/src/main/java/org/libvirt/Secret.java b/src/main/java/org/libvirt/Secret.java index 868fcc8..e0ded73 100644 --- a/src/main/java/org/libvirt/Secret.java +++ b/src/main/java/org/libvirt/Secret.java @@ -64,6 +64,11 @@ public class Secret { return processError(libvirt.virSecretGetUsageID(VSP)); } + public SecretUsageType getUsageType() throws LibvirtException { + final int ret = processError(libvirt.virSecretGetUsageType(this.VSP)); + return Library.getConstant(SecretUsageType.class, ret); + } + /** * Get the UUID for this secret. * diff --git a/src/main/java/org/libvirt/SecretUsageType.java b/src/main/java/org/libvirt/SecretUsageType.java new file mode 100644 index 0000000..3907bdb --- /dev/null +++ b/src/main/java/org/libvirt/SecretUsageType.java @@ -0,0 +1,23 @@ +package org.libvirt; + +/** + * An enumeration of constants identifying the type of + * the owner of a secret. + * + * @see Secret#getUsageType + */ +public enum SecretUsageType { + /** No one uses the secret */ + NONE, + + /** A volume uses the secret */ + VOLUME, + + /** A CEPH object uses the secret */ + CEPH, + + /** A ISCSI object uses the secret */ + ISCSI, + + UNKNOWN +} diff --git a/src/main/java/org/libvirt/jna/Libvirt.java b/src/main/java/org/libvirt/jna/Libvirt.java index 28fbff1..21ee2c2 100644 --- a/src/main/java/org/libvirt/jna/Libvirt.java +++ b/src/main/java/org/libvirt/jna/Libvirt.java @@ -416,6 +416,7 @@ public interface Libvirt extends Library { int virSecretGetUUID(SecretPointer virSecretPtr, byte[] uuidString); int virSecretGetUUIDString(SecretPointer virSecretPtr, byte[] uuidString); String virSecretGetUsageID(SecretPointer virSecretPtr); + int virSecretGetUsageType(SecretPointer virSecretPtr); Pointer virSecretGetValue(SecretPointer virSecretPtr, SizeTByReference value_size, int flags); String virSecretGetXMLDesc(SecretPointer virSecretPtr, int flags); SecretPointer virSecretLookupByUsage(ConnectionPointer virConnectPtr, int usageType, String usageID); -- 1.7.9.5

This wraps the virDomainIsUpdated libvirt function available since version 0.8.6. Signed-off-by: Claudio Bley <cbley@av-test.de> --- src/main/java/org/libvirt/Domain.java | 8 ++++++++ src/main/java/org/libvirt/jna/Libvirt.java | 1 + 2 files changed, 9 insertions(+) diff --git a/src/main/java/org/libvirt/Domain.java b/src/main/java/org/libvirt/Domain.java index 5f0d1d0..fae95fe 100644 --- a/src/main/java/org/libvirt/Domain.java +++ b/src/main/java/org/libvirt/Domain.java @@ -799,6 +799,14 @@ public class Domain { return processError(libvirt.virDomainIsPersistent(VDP)); } + + /** + * Returns {@code true} if, and only if, this domain has been updated. + */ + public boolean isUpdated() throws LibvirtException { + return processError(libvirt.virDomainIsUpdated(this.VDP)) == 1; + } + /** * suspend a domain and save its memory contents to a file on disk. * diff --git a/src/main/java/org/libvirt/jna/Libvirt.java b/src/main/java/org/libvirt/jna/Libvirt.java index 21ee2c2..2c75018 100644 --- a/src/main/java/org/libvirt/jna/Libvirt.java +++ b/src/main/java/org/libvirt/jna/Libvirt.java @@ -276,6 +276,7 @@ public interface Libvirt extends Library { int virDomainInterfaceStats(DomainPointer virDomainPtr, String path, virDomainInterfaceStats stats, SizeT size); int virDomainIsActive(DomainPointer virDomainPtr); int virDomainIsPersistent(DomainPointer virDomainPtr); + int virDomainIsUpdated(DomainPointer virDomainPtr); DomainPointer virDomainLookupByID(ConnectionPointer virConnectPtr, int id); DomainPointer virDomainLookupByName(ConnectionPointer virConnectPtr, String name); DomainPointer virDomainLookupByUUID(ConnectionPointer virConnectPtr, byte[] uuidBytes); -- 1.7.9.5

This wraps the virDomainReset libvirt function available since version 0.9.7. Signed-off-by: Claudio Bley <cbley@av-test.de> --- src/main/java/org/libvirt/Domain.java | 7 +++++++ src/main/java/org/libvirt/jna/Libvirt.java | 1 + 2 files changed, 8 insertions(+) diff --git a/src/main/java/org/libvirt/Domain.java b/src/main/java/org/libvirt/Domain.java index fae95fe..89bc659 100644 --- a/src/main/java/org/libvirt/Domain.java +++ b/src/main/java/org/libvirt/Domain.java @@ -1223,6 +1223,13 @@ public class Domain { } /** + * Reset a domain immediately without any guest OS shutdown. + */ + public void reset() throws LibvirtException { + processError(libvirt.virDomainReset(this.VDP, 0)); + } + + /** * Revert the domain to a given snapshot. * * @see <a href= diff --git a/src/main/java/org/libvirt/jna/Libvirt.java b/src/main/java/org/libvirt/jna/Libvirt.java index 2c75018..7183d5b 100644 --- a/src/main/java/org/libvirt/jna/Libvirt.java +++ b/src/main/java/org/libvirt/jna/Libvirt.java @@ -297,6 +297,7 @@ public interface Libvirt extends Library { int virDomainPinVcpu(DomainPointer virDomainPtr, int vcpu, byte[] cpumap, int maplen); int virDomainReboot(DomainPointer virDomainPtr, int flags); int virDomainRef(DomainPointer virDomainPtr); + int virDomainReset(DomainPointer virDomainPtr, int flags); int virDomainRestore(ConnectionPointer virConnectPtr, String from); int virDomainRevertToSnapshot(DomainSnapshotPointer virDomainSnapshotPtr, int flags); int virDomainResume(DomainPointer virDomainPtr); -- 1.7.9.5

This wraps the virDomainPMWakeup libvirt function available since version 0.9.11. Signed-off-by: Claudio Bley <cbley@av-test.de> --- src/main/java/org/libvirt/Domain.java | 27 ++++++++++++++++++++++++++ src/main/java/org/libvirt/SuspendTarget.java | 15 ++++++++++++++ src/main/java/org/libvirt/jna/Libvirt.java | 2 ++ 3 files changed, 44 insertions(+) create mode 100644 src/main/java/org/libvirt/SuspendTarget.java diff --git a/src/main/java/org/libvirt/Domain.java b/src/main/java/org/libvirt/Domain.java index 89bc659..e0dba46 100644 --- a/src/main/java/org/libvirt/Domain.java +++ b/src/main/java/org/libvirt/Domain.java @@ -1,6 +1,7 @@ package org.libvirt; import java.nio.ByteBuffer; +import java.util.concurrent.TimeUnit; import org.libvirt.event.IOErrorListener; import org.libvirt.jna.DomainPointer; @@ -1091,6 +1092,32 @@ public class Domain { } /** + * Enter the given power management suspension target level. + */ + public void PMsuspend(SuspendTarget target) throws LibvirtException { + PMsuspendFor(target, 0, TimeUnit.SECONDS); + } + + /** + * Enter the given power management suspension target level for the given duration. + */ + public void PMsuspendFor(SuspendTarget target, long duration, TimeUnit unit) throws LibvirtException { + processError(libvirt.virDomainPMSuspendForDuration(this.VDP, target.ordinal(), unit.toSeconds(duration), 0)); + } + + /** + * Immediately wake up a guest using power management. + * <p> + * Injects a <em>wakeup<em> into the guest that previously used + * {@link #PMsuspend} or {@link #PMsuspendFor}, rather than + * waiting for the previously requested duration (if any) to + * elapse. + */ + public void PMwakeup() throws LibvirtException { + processError(libvirt.virDomainPMWakeup(this.VDP, 0)); + } + + /** * Dynamically changes the real CPUs which can be allocated to a virtual * CPU. This function requires priviledged access to the hypervisor. * diff --git a/src/main/java/org/libvirt/SuspendTarget.java b/src/main/java/org/libvirt/SuspendTarget.java new file mode 100644 index 0000000..456c980 --- /dev/null +++ b/src/main/java/org/libvirt/SuspendTarget.java @@ -0,0 +1,15 @@ +package org.libvirt; + +/** + * Power management suspension target levels + */ +public enum SuspendTarget { + /** Suspend-to-RAM */ + MEMORY, + + /** Suspend-to-Disk */ + DISK, + + /** Hybrid-Suspend */ + HYBRID; +} diff --git a/src/main/java/org/libvirt/jna/Libvirt.java b/src/main/java/org/libvirt/jna/Libvirt.java index 7183d5b..a6d3b1d 100644 --- a/src/main/java/org/libvirt/jna/Libvirt.java +++ b/src/main/java/org/libvirt/jna/Libvirt.java @@ -295,6 +295,8 @@ public interface Libvirt extends Library { String dxml, NativeLong flags, String dname, NativeLong bandwidth); int virDomainMemoryStats(DomainPointer virDomainPtr, virDomainMemoryStats[] stats, int nr_stats, int flags); int virDomainPinVcpu(DomainPointer virDomainPtr, int vcpu, byte[] cpumap, int maplen); + int virDomainPMSuspendForDuration(DomainPointer virDomainPtr, int target, long duration, int flags); + int virDomainPMWakeup(DomainPointer virDomainPtr, int flags); int virDomainReboot(DomainPointer virDomainPtr, int flags); int virDomainRef(DomainPointer virDomainPtr); int virDomainReset(DomainPointer virDomainPtr, int flags); -- 1.7.9.5

This wraps the virDomainSendKey libvirt function available since version 0.9.3. Signed-off-by: Claudio Bley <cbley@av-test.de> --- src/main/java/org/libvirt/Domain.java | 12 ++++++++ src/main/java/org/libvirt/KeycodeSet.java | 46 ++++++++++++++++++++++++++++ src/main/java/org/libvirt/jna/Libvirt.java | 1 + 3 files changed, 59 insertions(+) create mode 100644 src/main/java/org/libvirt/KeycodeSet.java diff --git a/src/main/java/org/libvirt/Domain.java b/src/main/java/org/libvirt/Domain.java index e0dba46..1c0af91 100644 --- a/src/main/java/org/libvirt/Domain.java +++ b/src/main/java/org/libvirt/Domain.java @@ -1352,6 +1352,18 @@ public class Domain { } /** + * Send key(s) to the guest. + * + * @param codeset the set of keycodes + * @param holdtime the duration that the keys will be held (in milliseconds) + * @param keys the key codes to be send + */ + public void sendKey(KeycodeSet codeset, int holdtime, int... keys) throws LibvirtException { + processError(libvirt.virDomainSendKey(this.VDP, codeset.ordinal(), + holdtime, keys, keys.length, 0)); + } + + /** * Shuts down this domain, the domain object is still usable there after but * the domain OS is being stopped. Note that the guest OS may ignore the * request. TODO: should we add an option for reboot, knowing it may not be diff --git a/src/main/java/org/libvirt/KeycodeSet.java b/src/main/java/org/libvirt/KeycodeSet.java new file mode 100644 index 0000000..132e508 --- /dev/null +++ b/src/main/java/org/libvirt/KeycodeSet.java @@ -0,0 +1,46 @@ +package org.libvirt; + +/** + */ +public enum KeycodeSet { + /** + * Linux key code set. + * <p> + * Defined in the linux/input.h header, this set of key codes is able + * to represent any scan code from any type of keyboard. + */ + LINUX, + + /** IBM XT keyboard code set */ + XT, + + /** AT set 1 key codes */ + ATSET1, + + /** AT set 2 key codes */ + ATSET2, + + /** AT set 3 key codes */ + ATSET3, + + /** Apple OS-X virtual key codes */ + OSX, + + /** */ + XT_KBD, + + /** Key code set as defined by the USB HID specification */ + USB, + + /** + * Microsoft Windows virtual key code set + * <p> + * Reference: <a target='blank' + * href='http://msdn.microsoft.com/en-us/library/windows/desktop/dd375731(v=vs.85).as...' + * >MSDN Virtual-Key Codes</a>. + */ + WIN32, + + /** Key code set as used by GTK-VNC and QEMU */ + RFB; +} diff --git a/src/main/java/org/libvirt/jna/Libvirt.java b/src/main/java/org/libvirt/jna/Libvirt.java index a6d3b1d..c8735d2 100644 --- a/src/main/java/org/libvirt/jna/Libvirt.java +++ b/src/main/java/org/libvirt/jna/Libvirt.java @@ -304,6 +304,7 @@ public interface Libvirt extends Library { int virDomainRevertToSnapshot(DomainSnapshotPointer virDomainSnapshotPtr, int flags); int virDomainResume(DomainPointer virDomainPtr); int virDomainSave(DomainPointer virDomainPtr, String to); + int virDomainSendKey(DomainPointer virDomainPtr, int codeset, int holdtime, int[] keycodes, int nkeycodes, int flags); int virDomainSetAutostart(DomainPointer virDomainPtr, int autoStart); int virDomainSetMaxMemory(DomainPointer virDomainPtr, NativeLong maxMemory); int virDomainSetMemory(DomainPointer virDomainPtr, NativeLong maxMemory); -- 1.7.9.5

This makes the Stream class a native citizen of the Java API. It can be used with the NIO Channel API, as well as (In,Out)putStream's using the java.nio.channels.Channels convenience wrappers. Signed-off-by: Claudio Bley <cbley@av-test.de> --- src/main/java/org/libvirt/Stream.java | 183 ++++++++++++++++++++++++++-- src/main/java/org/libvirt/jna/Libvirt.java | 4 +- 2 files changed, 178 insertions(+), 9 deletions(-) diff --git a/src/main/java/org/libvirt/Stream.java b/src/main/java/org/libvirt/Stream.java index c36ed70..71a2a6e 100644 --- a/src/main/java/org/libvirt/Stream.java +++ b/src/main/java/org/libvirt/Stream.java @@ -1,12 +1,46 @@ package org.libvirt; +import java.io.IOException; + +import java.nio.ByteBuffer; +import java.nio.channels.ByteChannel; +import java.nio.channels.ClosedChannelException; +import java.nio.channels.NonReadableChannelException; +import java.nio.channels.NonWritableChannelException; + import org.libvirt.jna.Libvirt; import org.libvirt.jna.SizeT; import org.libvirt.jna.StreamPointer; import static org.libvirt.Library.libvirt; import static org.libvirt.ErrorHandler.processError; -public class Stream { +/** + * The Stream class is used to transfer data between a libvirt daemon + * and a client. + * <p> + * It implements the ByteChannel interface. + * <p> + * Basic usage: + * + * <pre> + * {@code + * ByteBuffer buf = ByteBuffer.allocate(1024); + * Stream str = conn.streamNew(0); + * + * ... // open the stream e.g. calling Domain.screenshot + * + * while (str.read(buf) != -1) { + * buf.flip(); + * ... // do something with the data + * buf.compact(); + * }}</pre> + * <p> + * If you want to use this class as an InputStream or OutputStream, + * convert it using the {@link java.nio.channels.Channels#newInputStream + * Channels.newInputStream} and {@link java.nio.channels.Channels#newOutputStream + * Channels.newOutputStream} respectively. + */ +public class Stream implements ByteChannel { public static int VIR_STREAM_NONBLOCK = (1 << 0); @@ -20,6 +54,56 @@ public class Stream { */ private Connect virConnect; + private final static int CLOSED = 0; + private final static int READABLE = 1; + private final static int WRITABLE = 2; + private final static int OPEN = READABLE | WRITABLE; + private final static int EOF = 4; + + /* The status of the stream. A stream starts its live in the + * "CLOSED" state. + * + * It will be opened for input / output by another libvirt + * operation (e.g. virStorageVolDownload), which means it will + * be in state "READABLE" or "WRITABLE", exclusively. + * + * It will reach state "EOF", if {@link finish()} is called. + * + * It will be in the "CLOSED" state again, after calling abort() + * or close(). + */ + private int state = CLOSED; + + void markReadable() { + assert !isWritable() + : "A Stream cannot be readable and writable at the same time"; + + state |= READABLE; + } + + void markWritable() { + assert !isReadable() + : "A Stream cannot be readable and writable at the same time"; + + state |= WRITABLE; + } + + boolean isReadable() { + return (state & READABLE) != 0; + } + + boolean isWritable() { + return (state & WRITABLE) != 0; + } + + protected boolean isEOF() { + return (state & EOF) != 0; + } + + private void markEOF() { + state |= EOF; + } + Stream(Connect virConnect, StreamPointer VSP) { this.virConnect = virConnect; this.VSP = VSP; @@ -32,7 +116,9 @@ public class Stream { * @return <em>ignore</em> (always 0) */ public int abort() throws LibvirtException { - return processError(libvirt.virStreamAbort(VSP)); + int returnValue = processError(libvirt.virStreamAbort(VSP)); + this.state = CLOSED; + return returnValue; } /** @@ -66,7 +152,9 @@ public class Stream { * @throws LibvirtException */ public int finish() throws LibvirtException { - return processError(libvirt.virStreamFinish(VSP)); + int returnValue = processError(libvirt.virStreamFinish(VSP)); + markEOF(); + return returnValue; } /** @@ -79,7 +167,8 @@ public class Stream { public int free() throws LibvirtException { int success = 0; if (VSP != null) { - processError(libvirt.virStreamFree(VSP)); + closeStream(); + success = processError(libvirt.virStreamFree(VSP)); VSP = null; } @@ -95,7 +184,80 @@ public class Stream { * @throws LibvirtException */ public int receive(byte[] data) throws LibvirtException { - return processError(libvirt.virStreamRecv(VSP, data, new SizeT(data.length))); + return receive(ByteBuffer.wrap(data)); + } + + protected int receive(ByteBuffer buffer) throws LibvirtException { + int returnValue = processError(libvirt.virStreamRecv(VSP, buffer, new SizeT(buffer.remaining()))); + buffer.position(buffer.position() + returnValue); + return returnValue; + } + + @Override + public int read(ByteBuffer buffer) throws IOException { + if (!isOpen()) throw new ClosedChannelException(); + if (!isReadable()) throw new NonReadableChannelException(); + if (isEOF()) return -1; + + try { + int ret = receive(buffer); + + switch (ret) { + case 0: + finish(); + return -1; + + case -2: + throw new UnsupportedOperationException("non-blocking I/O stream not yet supported"); + + default: + return ret; + } + } catch (LibvirtException e) { + throw new IOException("could not read from stream", e); + } + } + + @Override + public int write(ByteBuffer buffer) throws IOException { + if (!isOpen()) throw new ClosedChannelException(); + if (!isWritable()) throw new NonWritableChannelException(); + + int pos = buffer.position(); + + try { + while (buffer.hasRemaining()) { + int ret = send(buffer); + + if (ret == -2) + throw new UnsupportedOperationException("non-blocking I/O stream not yet supported"); + } + return buffer.position() - pos; + } catch (LibvirtException e) { + throw new IOException("could not write to stream", e); + } + } + + protected void closeStream() throws LibvirtException { + if (isOpen() && !isEOF()) { + if (isWritable()) finish(); + else if (isReadable()) abort(); + } + this.state = CLOSED; + } + + @Override + public void close() throws IOException { + try { + closeStream(); + } catch (LibvirtException e) { + throw new IOException("error while closing Stream", e); + } + } + + @Override + public boolean isOpen() { + return (this.state & OPEN) != 0; } /** @@ -131,8 +293,15 @@ public class Stream { * full * @throws LibvirtException */ - public int send(String data) throws LibvirtException { - return processError(libvirt.virStreamSend(VSP, data, new SizeT(data.length()))); + public int send(byte[] data) throws LibvirtException { + return send(ByteBuffer.wrap(data)); + } + + protected int send(ByteBuffer buffer) throws LibvirtException { + SizeT size = new SizeT(buffer.remaining()); + int returnValue = processError(libvirt.virStreamSend(VSP, buffer, size)); + buffer.position(buffer.position() + returnValue); + return returnValue; } /** diff --git a/src/main/java/org/libvirt/jna/Libvirt.java b/src/main/java/org/libvirt/jna/Libvirt.java index c8735d2..c383ba6 100644 --- a/src/main/java/org/libvirt/jna/Libvirt.java +++ b/src/main/java/org/libvirt/jna/Libvirt.java @@ -440,9 +440,9 @@ public interface Libvirt extends Library { int virStreamFinish(StreamPointer virStreamPtr) ; int virStreamFree(StreamPointer virStreamPtr) ; StreamPointer virStreamNew(ConnectionPointer virConnectPtr, int flags) ; - int virStreamSend(StreamPointer virStreamPtr, String data, SizeT size); + int virStreamSend(StreamPointer virStreamPtr, ByteBuffer data, SizeT size); int virStreamSendAll(StreamPointer virStreamPtr, Libvirt.VirStreamSourceFunc handler, Pointer opaque); - int virStreamRecv(StreamPointer virStreamPtr, byte[] data, SizeT length); + int virStreamRecv(StreamPointer virStreamPtr, ByteBuffer data, SizeT length); int virStreamRecvAll(StreamPointer virStreamPtr, Libvirt.VirStreamSinkFunc handler, Pointer opaque); //DomainSnapshot Methods -- 1.7.9.5

This wraps the native virDomainScreenshot libvirt function available since version 0.9.2. Signed-off-by: Claudio Bley <cbley@av-test.de> --- src/main/java/org/libvirt/Domain.java | 10 ++++++++++ src/main/java/org/libvirt/Stream.java | 4 ++++ src/main/java/org/libvirt/jna/Libvirt.java | 1 + 3 files changed, 15 insertions(+) diff --git a/src/main/java/org/libvirt/Domain.java b/src/main/java/org/libvirt/Domain.java index 1c0af91..a9113cf 100644 --- a/src/main/java/org/libvirt/Domain.java +++ b/src/main/java/org/libvirt/Domain.java @@ -1285,6 +1285,16 @@ public class Domain { processError(libvirt.virDomainSave(VDP, to)); } + public String screenshot(Stream stream, int screen) throws LibvirtException { + Pointer ptr = processError(libvirt.virDomainScreenshot(this.VDP, stream.getVSP(), screen, 0)); + stream.markReadable(); + try { + return Library.getString(ptr); + } finally { + Library.free(ptr); + } + } + /** * Configures the network to be automatically started when the host machine * boots. diff --git a/src/main/java/org/libvirt/Stream.java b/src/main/java/org/libvirt/Stream.java index 71a2a6e..97bebdd 100644 --- a/src/main/java/org/libvirt/Stream.java +++ b/src/main/java/org/libvirt/Stream.java @@ -175,6 +175,10 @@ public class Stream implements ByteChannel { return success; } + StreamPointer getVSP() { + return VSP; + } + /** * Receives data from the stream into the buffer provided. * diff --git a/src/main/java/org/libvirt/jna/Libvirt.java b/src/main/java/org/libvirt/jna/Libvirt.java index c383ba6..80dacdb 100644 --- a/src/main/java/org/libvirt/jna/Libvirt.java +++ b/src/main/java/org/libvirt/jna/Libvirt.java @@ -305,6 +305,7 @@ public interface Libvirt extends Library { int virDomainResume(DomainPointer virDomainPtr); int virDomainSave(DomainPointer virDomainPtr, String to); int virDomainSendKey(DomainPointer virDomainPtr, int codeset, int holdtime, int[] keycodes, int nkeycodes, int flags); + Pointer virDomainScreenshot(DomainPointer virDomainPtr, StreamPointer virStreamPtr, int screen, int flags); int virDomainSetAutostart(DomainPointer virDomainPtr, int autoStart); int virDomainSetMaxMemory(DomainPointer virDomainPtr, NativeLong maxMemory); int virDomainSetMemory(DomainPointer virDomainPtr, NativeLong maxMemory); -- 1.7.9.5

Signed-off-by: Claudio Bley <cbley@av-test.de> --- src/test/java/org/libvirt/TestJavaBindings.java | 44 +++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/src/test/java/org/libvirt/TestJavaBindings.java b/src/test/java/org/libvirt/TestJavaBindings.java index a73148f..24d850a 100644 --- a/src/test/java/org/libvirt/TestJavaBindings.java +++ b/src/test/java/org/libvirt/TestJavaBindings.java @@ -2,6 +2,9 @@ package org.libvirt; import org.libvirt.event.*; +import java.io.IOException; +import java.nio.ByteBuffer; +import java.nio.channels.ClosedChannelException; import java.util.Arrays; import java.util.ArrayList; import java.util.List; @@ -306,4 +309,45 @@ public final class TestJavaBindings extends TestCase { Library.stopEventLoop(); } } + + public void testDomainScreenshot() throws Exception { + long version = conn.getLibVirVersion(); + + // virDomainScreenshot works since version 1.0.5 on test:// + // connections + if (version < 1000005) { + System.err.format("testDomainScreenshot skipped (libvirt version %d.%d.%d < 1.0.5)\n", + version / 1000000, version / 1000 % 1000, version % 1000); + return; + } + + Stream str = this.conn.streamNew(0); + Domain dom = this.conn.domainLookupByName("test"); + + assertFalse("Domain \"test\" not found", dom == null); + + String mimetype = dom.screenshot(str, 0); + + ByteBuffer bb = ByteBuffer.allocateDirect(8192); + + while (str.read(bb) != -1) // consume data + bb.clear(); + + // ensure that read() repeatedly returns -1 after EOF + + assertEquals("Stream is at EOF (1)", -1, str.read(bb)); + assertEquals("Stream is at EOF (2)", -1, str.read(bb)); + assertEquals("Stream is at EOF (3)", -1, str.read(bb)); + + // ensure that a ClosedChannelException gets thrown when + // trying to read() after closing the stream + + str.close(); + + try { + str.read(bb); + fail("ClosedChannelException expected calling read() on a closed stream"); + } catch (ClosedChannelException expected) { + } + } } -- 1.7.9.5

Signed-off-by: Claudio Bley <cbley@av-test.de> --- src/main/java/org/libvirt/BitFlags.java | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 src/main/java/org/libvirt/BitFlags.java diff --git a/src/main/java/org/libvirt/BitFlags.java b/src/main/java/org/libvirt/BitFlags.java new file mode 100644 index 0000000..f078c6c --- /dev/null +++ b/src/main/java/org/libvirt/BitFlags.java @@ -0,0 +1,18 @@ +package org.libvirt; + +public interface BitFlags { + int getBit(); +} + +final class BitFlagsHelper { + // bitwise-OR + static int OR(BitFlags[] flags) { + int ret = 0; + for (BitFlags f: flags) { + ret |= f.getBit(); + } + return ret; + } + + final static BitFlags[] NONE = {}; +} -- 1.7.9.5

Additionally, add an OpenFlags enum to the Connect classes which implements the BitFlags interface. This should be used when creating a read-only connection or to prevent using URI aliases. Signed-off-by: Claudio Bley <cbley@av-test.de> --- src/main/java/org/libvirt/Connect.java | 104 +++++++++++++++++++++++++------- 1 file changed, 82 insertions(+), 22 deletions(-) diff --git a/src/main/java/org/libvirt/Connect.java b/src/main/java/org/libvirt/Connect.java index 8659076..4ab61b3 100644 --- a/src/main/java/org/libvirt/Connect.java +++ b/src/main/java/org/libvirt/Connect.java @@ -1,5 +1,6 @@ package org.libvirt; +import java.net.URI; import java.util.HashMap; import java.util.Map; import java.util.UUID; @@ -24,6 +25,7 @@ import static org.libvirt.Library.libvirt; import static org.libvirt.Library.getConstant; import static org.libvirt.ErrorHandler.processError; import static org.libvirt.ErrorHandler.processErrorIfZero; +import static org.libvirt.BitFlagsHelper.OR; import com.sun.jna.Memory; import com.sun.jna.NativeLong; @@ -82,6 +84,24 @@ public class Connect { static final int LAST = 13; } + public enum OpenFlags implements BitFlags { + /** Open a connection in read-only mode */ + READONLY(1), + + /** Don't try to resolve URI aliases */ + NO_ALIASES(2); + + OpenFlags(int v) { + this.value = v; + } + + @Override + public int getBit() { + return value; + } + private final int value; + } + /** * Get the version of a connection. * @@ -202,9 +222,20 @@ public class Connect { * @see <a href="http://libvirt.org/uri.html">The URI documentation</a> */ public Connect(String uri) throws LibvirtException { - VCP = libvirt.virConnectOpen(uri); - // Check for an error - processError(VCP); + this(uri, null, 0); + } + + + /** + * Constructs a read-write Connect object from the supplied URI. + * + * @param uri + * The connection URI + * @throws LibvirtException + * @see <a href="http://libvirt.org/uri.html">The URI documentation</a> + */ + public Connect(URI uri, OpenFlags... flags) throws LibvirtException { + this(uri, null, flags); } /** @@ -218,13 +249,7 @@ public class Connect { * @see <a href="http://libvirt.org/uri.html">The URI documentation</a> */ public Connect(String uri, boolean readOnly) throws LibvirtException { - if (readOnly) { - VCP = libvirt.virConnectOpenReadOnly(uri); - } else { - VCP = libvirt.virConnectOpen(uri); - } - // Check for an error - processError(VCP); + this(uri, null, readOnly ? OpenFlags.READONLY.getBit() : 0); } /** @@ -240,26 +265,61 @@ public class Connect { * @see <a href="http://libvirt.org/uri.html">The URI documentation</a> */ public Connect(String uri, ConnectAuth auth, int flags) throws LibvirtException { - virConnectAuth vAuth = new virConnectAuth(); - vAuth.cb = auth; - vAuth.cbdata = null; - vAuth.ncredtype = auth.credType.length; - int[] authInts = new int[vAuth.ncredtype]; - - for (int x = 0; x < vAuth.ncredtype; x++) { - authInts[x] = auth.credType[x].mapToInt(); + virConnectAuth vAuth = null; + + if (auth != null) { + vAuth = new virConnectAuth(); + vAuth.cb = auth; + vAuth.cbdata = null; + vAuth.ncredtype = auth.credType.length; + int[] authInts = new int[vAuth.ncredtype]; + + for (int x = 0; x < vAuth.ncredtype; x++) { + authInts[x] = auth.credType[x].mapToInt(); + } + + Memory mem = new Memory(4 * vAuth.ncredtype); + mem.write(0, authInts, 0, vAuth.ncredtype); + vAuth.credtype = mem.share(0); } - Memory mem = new Memory(4 * vAuth.ncredtype); - mem.write(0, authInts, 0, vAuth.ncredtype); - vAuth.credtype = mem.share(0); - VCP = libvirt.virConnectOpenAuth(uri, vAuth, flags); // Check for an error processError(VCP); } /** + * Constructs a Connect object from the supplied URI, using the supplied + * authentication callback + * + * @param uri + * The connection URI + * @param auth + * a ConnectAuth object + * @param flags + * @throws LibvirtException + * @see <a href="http://libvirt.org/uri.html">The URI documentation</a> + */ + public Connect(URI uri, ConnectAuth auth, OpenFlags... flags) throws LibvirtException { + this(uri.toString(), auth, OR(flags)); + } + + /** + * Constructs a Connect object from the supplied URI, using the supplied + * authentication callback + * + * @param uri + * The connection URI + * @param auth + * a ConnectAuth object + * @throws LibvirtException + * @see <a href="http://libvirt.org/uri.html">The URI documentation</a> + */ + public Connect(URI uri, ConnectAuth auth) throws LibvirtException { + this(uri.toString(), auth, 0); + } + + /** * Computes the most feature-rich CPU which is compatible with all given * host CPUs. * -- 1.7.9.5

It should not be necessary to create a Connect object in order to determine the version of the libvirt library. Introduce Library.getVersion which returns this information. Deprecate Connect.getLibVirVersion but keep it for backwards compat. Signed-off-by: Claudio Bley <cbley@av-test.de> --- src/main/java/org/libvirt/Connect.java | 5 +++-- src/main/java/org/libvirt/Library.java | 15 ++++++++++++++- src/test/java/org/libvirt/TestJavaBindings.java | 3 +-- src/test/java/org/libvirt/TestLibvirtGlobals.java | 4 ++++ 4 files changed, 22 insertions(+), 5 deletions(-) diff --git a/src/main/java/org/libvirt/Connect.java b/src/main/java/org/libvirt/Connect.java index 4ab61b3..72f60f1 100644 --- a/src/main/java/org/libvirt/Connect.java +++ b/src/main/java/org/libvirt/Connect.java @@ -1007,11 +1007,12 @@ public class Connect { * * @return major * 1,000,000 + minor * 1,000 + release * @throws LibvirtException + * @deprecated use {@link Library#getVersion} instead */ + @Deprecated public long getLibVirVersion() throws LibvirtException { LongByReference libVer = new LongByReference(); - LongByReference typeVer = new LongByReference(); - processError(libvirt.virGetVersion(libVer, null, typeVer)); + processError(libvirt.virGetVersion(libVer, null, null)); return libVer.getValue(); } diff --git a/src/main/java/org/libvirt/Library.java b/src/main/java/org/libvirt/Library.java index 81df223..992e29d 100644 --- a/src/main/java/org/libvirt/Library.java +++ b/src/main/java/org/libvirt/Library.java @@ -5,6 +5,7 @@ import static org.libvirt.ErrorHandler.processError; import com.sun.jna.Native; import com.sun.jna.Pointer; +import com.sun.jna.ptr.LongByReference; import com.sun.jna.ptr.PointerByReference; import java.util.concurrent.atomic.AtomicBoolean; @@ -18,7 +19,7 @@ import java.util.concurrent.atomic.AtomicBoolean; * Additionally, this class contains internal methods to ease * implementing the public API. */ -final class Library { +public final class Library { private static AtomicBoolean runLoop = new AtomicBoolean(); final static Libvirt libvirt; @@ -40,6 +41,18 @@ final class Library { private Library() {} /** + * Returns the version of the native libvirt library. + * + * @return major * 1,000,000 + minor * 1,000 + release + * @throws LibvirtException + */ + public static long getVersion() throws LibvirtException { + LongByReference libVer = new LongByReference(); + processError(libvirt.virGetVersion(libVer, null, null)); + return libVer.getValue(); + } + + /** * Free memory pointed to by ptr. */ static void free(Pointer ptr) { diff --git a/src/test/java/org/libvirt/TestJavaBindings.java b/src/test/java/org/libvirt/TestJavaBindings.java index 24d850a..86a1f53 100644 --- a/src/test/java/org/libvirt/TestJavaBindings.java +++ b/src/test/java/org/libvirt/TestJavaBindings.java @@ -56,7 +56,6 @@ public final class TestJavaBindings extends TestCase { assertEquals("conn.getMaxVcpus(xen)", 32, conn.getMaxVcpus("xen")); assertNotNull("conn.getHostName()", conn.getHostName()); assertNotNull("conn.getCapabilities()", conn.getCapabilities()); - assertTrue("conn.getLibVirVersion()", conn.getLibVirVersion() > 6000); assertTrue("conn.connectionVersion()", Connect.connectionVersion(conn) > 6000); assertEquals("conn.getVersion()", 2, conn.getVersion()); assertTrue("conn.isAlive", conn.isAlive()); @@ -311,7 +310,7 @@ public final class TestJavaBindings extends TestCase { } public void testDomainScreenshot() throws Exception { - long version = conn.getLibVirVersion(); + long version = Library.getVersion(); // virDomainScreenshot works since version 1.0.5 on test:// // connections diff --git a/src/test/java/org/libvirt/TestLibvirtGlobals.java b/src/test/java/org/libvirt/TestLibvirtGlobals.java index b2b0d9f..ab36fb9 100644 --- a/src/test/java/org/libvirt/TestLibvirtGlobals.java +++ b/src/test/java/org/libvirt/TestLibvirtGlobals.java @@ -18,4 +18,8 @@ public class TestLibvirtGlobals extends TestCase { } assertTrue("We should have caught an error", cb.error); } + + public void testLibrary() throws Exception { + assertTrue("Library.getVersion() > 6000", Library.getVersion() > 6000); + } } -- 1.7.9.5