- Devel - libvirt List Archives

[libvirt] [PATCHv2] test driver: Add authentication to test driver.
by Richard W.M. Jones 09 Jan '14

09 Jan '14

There is no easy way to test authentication against libvirt. This commit modifies the test driver to allow simple username/password authentication. You modify the test XML by adding: <node> ... <auth> <user password="123456">rich</user> <user>jane</user> </auth> </node> If there are any /node/auth/user elements, then authentication is required by the test driver (if none are present, then the test driver will work as before and not require authentication). In the example above, two phony users are added: rich password: 123456 jane no password required The test driver will demand a username. If the password attribute is present (or if the username entered is wrong), then the password is also asked for and checked: $ virsh -c test://$(pwd)/testnode.xml list Enter username for localhost: rich Enter rich's password for localhost: *** Id Name State ---------------------------------------------------- 1 fv0 running 2 fc4 running Signed-off-by: Richard W.M. Jones <rjones(a)redhat.com> --- src/test/test_driver.c | 111 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 110 insertions(+), 1 deletion(-) diff --git a/src/test/test_driver.c b/src/test/test_driver.c index cde82a1..b724f82 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -58,6 +58,7 @@ #include "virrandom.h" #include "virstring.h" #include "cpu/cpu.h" +#include "virauth.h" #define VIR_FROM_THIS VIR_FROM_TEST @@ -82,6 +83,13 @@ typedef struct _testCell *testCellPtr; #define MAX_CELLS 128 +struct _testAuth { + char *username; + char *password; +}; +typedef struct _testAuth testAuth; +typedef struct _testAuth *testAuthPtr; + struct _testConn { virMutex lock; @@ -99,6 +107,8 @@ struct _testConn { virNodeDeviceObjList devs; int numCells; testCell cells[MAX_CELLS]; + size_t numAuths; + testAuthPtr auths; virObjectEventStatePtr eventState; }; @@ -1355,6 +1365,45 @@ error: return ret; } +static int +testParseAuthUsers(testConnPtr privconn, + xmlXPathContextPtr ctxt) +{ + int num, ret = -1; + size_t i; + xmlNodePtr *nodes = NULL; + + num = virXPathNodeSet("/node/auth/user", ctxt, &nodes); + if (num < 0) + goto error; + + privconn->numAuths = num; + if (num && VIR_ALLOC_N(privconn->auths, num) < 0) + goto error; + + for (i = 0; i < num; i++) { + char *username, *password; + + ctxt->node = nodes[i]; + username = virXPathString("string(.)", ctxt); + if (!username || STREQ(username, "")) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("missing username in /node/auth/user field")); + VIR_FREE(username); + goto error; + } + /* This field is optional. */ + password = virXMLPropString(nodes[i], "password"); + + privconn->auths[i].username = username; + privconn->auths[i].password = password; + } + + ret = 0; +error: + VIR_FREE(nodes); + return ret; +} /* No shared state between simultaneous test connections initialized * from a file. */ @@ -1417,6 +1466,8 @@ testOpenFromFile(virConnectPtr conn, const char *file) goto error; if (testParseNodedevs(privconn, file, ctxt) < 0) goto error; + if (testParseAuthUsers(privconn, ctxt) < 0) + goto error; xmlXPathFreeContext(ctxt); xmlFreeDoc(doc); @@ -1439,9 +1490,63 @@ testOpenFromFile(virConnectPtr conn, const char *file) return VIR_DRV_OPEN_ERROR; } +static int +testConnectAuthenticate(virConnectPtr conn, + virConnectAuthPtr auth) +{ + testConnPtr privconn = conn->privateData; + int ret = -1; + ssize_t i; + char *username = NULL, *password = NULL; + + if (privconn->numAuths == 0) + return 0; + + /* Authentication is required because the test XML contains a + * non-empty <auth/> section. First we must ask for a username. + */ + username = virAuthGetUsername(conn, auth, "test", NULL, "localhost"/*?*/); + if (!username) { + virReportError(VIR_ERR_AUTH_FAILED, "%s", + _("authentication failed when asking for username")); + goto cleanup; + } + + /* Does the username exist? */ + for (i = 0; i < privconn->numAuths; ++i) { + if (STREQ(privconn->auths[i].username, username)) + goto found_user; + } + i = -1; + +found_user: + /* Even if we didn't find the user, we still ask for a password. */ + if (i == -1 || privconn->auths[i].password != NULL) { + password = virAuthGetPassword(conn, auth, "test", + username, "localhost"); + if (password == NULL) { + virReportError(VIR_ERR_AUTH_FAILED, "%s", + _("authentication failed when asking for password")); + goto cleanup; + } + } + + if (i == -1 || + (password && STRNEQ(privconn->auths[i].password, password))) { + virReportError(VIR_ERR_AUTH_FAILED, "%s", + _("authentication failed, see test XML for the correct username/password")); + goto cleanup; + } + + ret = 0; +cleanup: + VIR_FREE(username); + VIR_FREE(password); + return ret; +} static virDrvOpenStatus testConnectOpen(virConnectPtr conn, - virConnectAuthPtr auth ATTRIBUTE_UNUSED, + virConnectAuthPtr auth, unsigned int flags) { int ret; @@ -1479,6 +1584,10 @@ static virDrvOpenStatus testConnectOpen(virConnectPtr conn, if (ret != VIR_DRV_OPEN_SUCCESS) return ret; + /* Fake authentication. */ + if (testConnectAuthenticate(conn, auth) < 0) + return VIR_DRV_OPEN_ERROR; + return VIR_DRV_OPEN_SUCCESS; } -- 1.8.4.2

2 2

[libvirt] [PATCH] event: clean up client side RPC code
by Eric Blake 09 Jan '14

09 Jan '14

Commit cfd62c1 was incomplete; I found more cases where error messages were being overwritten, and where the code between the three registration/deregistration APIs was not consistent. Since it is fairly easy to trigger an attempt to register an unregistered object, I also changed the error message from VIR_ERR_INTERNAL_ERROR to VIR_ERR_INVALID_ARG. * src/conf/object_event.c (virObjectEventCallbackListEventID): Inline... (virObjectEventStateEventID): ...into lone caller, and report error on failure. (virObjectEventCallbackListAddID, virObjectEventStateCallbackID) (virObjectEventCallbackListRemoveID) (virObjectEventCallbackListMarkDeleteID): Tweak error category. * src/remote/remote_driver.c (remoteConnectDomainEventRegister): Don't leak registration on failure. (remoteConnectDomainEventDeregisterAny) (remoteConnectNetworkEventDeregisterAny): Don't overwrite error. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- src/conf/object_event.c | 57 ++++++++++++++++++++++------------------------ src/remote/remote_driver.c | 56 ++++++++++++++++++++++----------------------- 2 files changed, 55 insertions(+), 58 deletions(-) diff --git a/src/conf/object_event.c b/src/conf/object_event.c index b01ffe5..b69387a 100644 --- a/src/conf/object_event.c +++ b/src/conf/object_event.c @@ -210,8 +210,9 @@ virObjectEventCallbackListRemoveID(virConnectPtr conn, } } - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("could not find event callback for removal")); + virReportError(VIR_ERR_INVALID_ARG, + _("could not find event callback %d for deletion"), + callbackID); return -1; } @@ -233,8 +234,9 @@ virObjectEventCallbackListMarkDeleteID(virConnectPtr conn, } } - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("could not find event callback for deletion")); + virReportError(VIR_ERR_INVALID_ARG, + _("could not find event callback %d for deletion"), + callbackID); return -1; } @@ -357,7 +359,7 @@ virObjectEventCallbackListAddID(virConnectPtr conn, if (virObjectEventCallbackLookup(conn, cbList, uuid, klass, eventID, callback, !callbackID) != -1) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + virReportError(VIR_ERR_INVALID_ARG, "%s", _("event callback already tracked")); return -1; } @@ -398,27 +400,6 @@ cleanup: } -static int -virObjectEventCallbackListEventID(virConnectPtr conn, - virObjectEventCallbackListPtr cbList, - int callbackID) -{ - size_t i; - - for (i = 0; i < cbList->count; i++) { - virObjectEventCallbackPtr cb = cbList->callbacks[i]; - - if (cb->deleted) - continue; - - if (cb->callbackID == callbackID && cb->conn == conn) - return cb->eventID; - } - - return -1; -} - - /** * virObjectEventQueueClear: * @queue: pointer to the queue @@ -897,7 +878,7 @@ virObjectEventStateCallbackID(virConnectPtr conn, virObjectEventStateUnlock(state); if (ret < 0) - virReportError(VIR_ERR_INTERNAL_ERROR, + virReportError(VIR_ERR_INVALID_ARG, _("event callback function %p not registered"), callback); return ret; @@ -920,11 +901,27 @@ virObjectEventStateEventID(virConnectPtr conn, virObjectEventStatePtr state, int callbackID) { - int ret; + int ret = -1; + size_t i; + virObjectEventCallbackListPtr cbList = state->callbacks; virObjectEventStateLock(state); - ret = virObjectEventCallbackListEventID(conn, - state->callbacks, callbackID); + for (i = 0; i < cbList->count; i++) { + virObjectEventCallbackPtr cb = cbList->callbacks[i]; + + if (cb->deleted) + continue; + + if (cb->callbackID == callbackID && cb->conn == conn) { + ret = cb->eventID; + break; + } + } virObjectEventStateUnlock(state); + + if (ret < 0) + virReportError(VIR_ERR_INVALID_ARG, + _("event callback id %d not registered"), + callbackID); return ret; } diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index fecb9b2..64d9d92 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -2911,6 +2911,7 @@ done: return rv; } + static int remoteConnectNetworkEventRegisterAny(virConnectPtr conn, virNetworkPtr net, @@ -2968,16 +2969,12 @@ remoteConnectNetworkEventDeregisterAny(virConnectPtr conn, remoteDriverLock(priv); if ((eventID = virObjectEventStateEventID(conn, priv->eventState, - callbackID)) < 0) { - virReportError(VIR_ERR_RPC, _("unable to find callback ID %d"), callbackID); + callbackID)) < 0) goto done; - } if ((count = virObjectEventStateDeregisterID(conn, priv->eventState, - callbackID)) < 0) { - virReportError(VIR_ERR_RPC, _("unable to find callback ID %d"), callbackID); + callbackID)) < 0) goto done; - } /* If that was the last callback for this eventID, we need to disable * events on the server */ @@ -2997,6 +2994,7 @@ done: return rv; } + static int remoteConnectListAllInterfaces(virConnectPtr conn, virInterfacePtr **ifaces, @@ -4405,10 +4403,11 @@ out: #endif /* WITH_POLKIT */ /*----------------------------------------------------------------------*/ -static int remoteConnectDomainEventRegister(virConnectPtr conn, - virConnectDomainEventCallback callback, - void *opaque, - virFreeCallback freecb) +static int +remoteConnectDomainEventRegister(virConnectPtr conn, + virConnectDomainEventCallback callback, + void *opaque, + virFreeCallback freecb) { int rv = -1; struct private_data *priv = conn->privateData; @@ -4421,11 +4420,13 @@ static int remoteConnectDomainEventRegister(virConnectPtr conn, goto done; if (count == 1) { - /* Tell the server when we are the first callback deregistering */ + /* Tell the server when we are the first callback registering */ if (call(conn, priv, 0, REMOTE_PROC_CONNECT_DOMAIN_EVENT_REGISTER, (xdrproc_t) xdr_void, (char *) NULL, - (xdrproc_t) xdr_void, (char *) NULL) == -1) + (xdrproc_t) xdr_void, (char *) NULL) == -1) { + virDomainEventStateDeregister(conn, priv->eventState, callback); goto done; + } } rv = 0; @@ -4435,8 +4436,9 @@ done: return rv; } -static int remoteConnectDomainEventDeregister(virConnectPtr conn, - virConnectDomainEventCallback callback) +static int +remoteConnectDomainEventDeregister(virConnectPtr conn, + virConnectDomainEventCallback callback) { struct private_data *priv = conn->privateData; int rv = -1; @@ -5205,12 +5207,13 @@ static virStreamDriver remoteStreamDrv = { }; -static int remoteConnectDomainEventRegisterAny(virConnectPtr conn, - virDomainPtr dom, - int eventID, - virConnectDomainEventGenericCallback callback, - void *opaque, - virFreeCallback freecb) +static int +remoteConnectDomainEventRegisterAny(virConnectPtr conn, + virDomainPtr dom, + int eventID, + virConnectDomainEventGenericCallback callback, + void *opaque, + virFreeCallback freecb) { int rv = -1; struct private_data *priv = conn->privateData; @@ -5248,8 +5251,9 @@ done: } -static int remoteConnectDomainEventDeregisterAny(virConnectPtr conn, - int callbackID) +static int +remoteConnectDomainEventDeregisterAny(virConnectPtr conn, + int callbackID) { struct private_data *priv = conn->privateData; int rv = -1; @@ -5260,16 +5264,12 @@ static int remoteConnectDomainEventDeregisterAny(virConnectPtr conn, remoteDriverLock(priv); if ((eventID = virObjectEventStateEventID(conn, priv->eventState, - callbackID)) < 0) { - virReportError(VIR_ERR_RPC, _("unable to find callback ID %d"), callbackID); + callbackID)) < 0) goto done; - } if ((count = virObjectEventStateDeregisterID(conn, priv->eventState, - callbackID)) < 0) { - virReportError(VIR_ERR_RPC, _("unable to find callback ID %d"), callbackID); + callbackID)) < 0) goto done; - } /* If that was the last callback for this eventID, we need to disable * events on the server */ -- 1.8.4.2

2 2

[libvirt] [PATCH] Make sure AC_ARG_WITH is always executed
by Guido Günther 09 Jan '14

09 Jan '14

--- I'm not sure whether it's good autoconf style to have AC_ARG_WITH in a conditional so this patch moves it out. Cheers, -- Guido configure.ac | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 97752f4..d02b9d2 100644 --- a/configure.ac +++ b/configure.ac @@ -1418,13 +1418,12 @@ elif test "with_secdriver_apparmor" != "no" ; then fi AM_CONDITIONAL([WITH_SECDRIVER_APPARMOR], [test "$with_secdriver_apparmor" != "no"]) -if test "$with_apparmor" != "no"; then AC_ARG_WITH([apparmor-profiles], [AS_HELP_STRING([--with-apparmor-profiles], [install apparmor profiles @<:@default=no@:>@])], [with_apparmor_profiles=yes], [with_apparmor_profiles=no]) -else +if test "$with_apparmor" = "no"; then with_apparmor_profiles="no" fi AM_CONDITIONAL([WITH_APPARMOR_PROFILES], [test "$with_apparmor_profiles" != "no"]) -- 1.8.5.2

2 2

[libvirt] [libvirt-java] [PATCH 0/3] Make the Java wrapper more fun to use
by Claudio Bley 09 Jan '14

09 Jan '14

This patchset first implements the ByteChannel interface for the Stream class which makes it readily usable with any standard Java library. Note, that this changes the wrapping of the virStreamRecv and virStreamSend function of the jna.Libvirt interface (which also makes this more efficient because a ByteBuffer is used instead of an Array). However, this interface should not be considered part of the public interface of the library, as with all classes part of the org.libvirt.jna package. In order to put this new functionality to use, the virDomainScreenshot function is wrapped and a unit test added to exercise it a bit. Claudio Bley (3): Implement interface ByteChannel for Stream class Domain: add screenshot method test: add testDomainScreenshot JUnit test src/main/java/org/libvirt/Domain.java | 11 ++ src/main/java/org/libvirt/Stream.java | 175 +++++++++++++++++++++++- src/main/java/org/libvirt/jna/Libvirt.java | 7 +- src/test/java/org/libvirt/TestJavaBindings.java | 38 +++++ 4 files changed, 226 insertions(+), 5 deletions(-) -- 1.8.5.2.msysgit.0

1 3

[libvirt] [PATCH] qemu: Add support for changing timeout value to open unix monitor socket
by Pavel Fux 09 Jan '14

09 Jan '14

I have fixed all comments except: "We prefer passing the driver as an argument instead". I thought of it at first but I looked at the function call graph and it's not that easy. and you did the same in src/qemu/qemu_process.c:115

4 6

[libvirt] [libvirt-java] [PATCH] Avoid calling processError for functions that cannot fail
by Claudio Bley 09 Jan '14

09 Jan '14

The libvirt functions virNodeDeviceNumOfCaps, virNodeDeviceGetParent and virNodeDeviceListCaps never indicate an error because they do not fail. --- src/main/java/org/libvirt/Device.java | 19 ++++++------------- src/main/java/org/libvirt/jna/Libvirt.java | 2 +- 2 files changed, 7 insertions(+), 14 deletions(-) diff --git a/src/main/java/org/libvirt/Device.java b/src/main/java/org/libvirt/Device.java index fe49ce9..5492b69 100644 --- a/src/main/java/org/libvirt/Device.java +++ b/src/main/java/org/libvirt/Device.java @@ -98,23 +98,19 @@ public class Device { /** * Returns the number of capabilities which the instance has. * - * @throws LibvirtException + * @throws LibvirtException never */ public int getNumberOfCapabilities() throws LibvirtException { - int num = libvirt.virNodeDeviceNumOfCaps(VDP); - processError(); - return num; + return libvirt.virNodeDeviceNumOfCaps(VDP); } /** * Returns the parent of the device * - * @throws LibvirtException + * @throws LibvirtException never */ public String getParent() throws LibvirtException { - String parent = libvirt.virNodeDeviceGetParent(VDP); - processError(); - return parent; + return libvirt.virNodeDeviceGetParent(VDP); } /** @@ -123,15 +119,13 @@ public class Device { * @throws LibvirtException */ public String getXMLDescription() throws LibvirtException { - String desc = libvirt.virNodeDeviceGetXMLDesc(VDP); - processError(); - return desc; + return processError(libvirt.virNodeDeviceGetXMLDesc(VDP)); } /** * List the capabilities of the device * - * @throws LibvirtException + * @throws LibvirtException never */ public String[] listCapabilities() throws LibvirtException { int maxCaps = getNumberOfCapabilities(); @@ -139,7 +133,6 @@ public class Device { if (maxCaps > 0) { libvirt.virNodeDeviceListCaps(VDP, names, maxCaps); - processError(); } return names; } diff --git a/src/main/java/org/libvirt/jna/Libvirt.java b/src/main/java/org/libvirt/jna/Libvirt.java index b026b04..a2bf42e 100644 --- a/src/main/java/org/libvirt/jna/Libvirt.java +++ b/src/main/java/org/libvirt/jna/Libvirt.java @@ -281,7 +281,7 @@ public interface Libvirt extends Library { String virNodeDeviceGetName(DevicePointer virDevicePointer); String virNodeDeviceGetParent(DevicePointer virDevicePointer); int virNodeDeviceNumOfCaps(DevicePointer virDevicePointer); - int virNodeDeviceListCaps(DevicePointer virDevicePointer, String[] names, int maxNames); + int virNodeDeviceListCaps(DevicePointer virDevicePointer, Pointer[] names, int maxNames); String virNodeDeviceGetXMLDesc(DevicePointer virDevicePointer); int virNodeDeviceFree(DevicePointer virDevicePointer); int virNodeDeviceDettach(DevicePointer virDevicePointer); -- 1.8.5.2.msysgit.0

1 2

[libvirt] [libvirt-java] [PATCH] Use virFree in order to release memory acquired from libvirt
by Claudio Bley 09 Jan '14

09 Jan '14

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(a)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 813f09b..b026b04 100644 --- a/src/main/java/org/libvirt/jna/Libvirt.java +++ b/src/main/java/org/libvirt/jna/Libvirt.java @@ -7,6 +7,7 @@ import com.sun.jna.NativeLong; 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 @@ -171,6 +172,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.8.5.2.msysgit.0

1 0

[libvirt] [PATCH] util: Use new array management macros
by Osier Yang 08 Jan '14

08 Jan '14

Like commit 94a26c7e from Eric Blake, the old fuzzy code should be replaced by the new array management macros now. And the type of scsi->count should be changed into "size_t", and thus virSCSIDeviceListCount should return size_t instead, similar for vir{PCI,USB}DeviceListCount. --- src/util/virpci.c | 2 +- src/util/virpci.h | 2 +- src/util/virscsi.c | 35 ++++++++++------------------------- src/util/virscsi.h | 2 +- src/util/virusb.c | 2 +- src/util/virusb.h | 2 +- 6 files changed, 15 insertions(+), 30 deletions(-) diff --git a/src/util/virpci.c b/src/util/virpci.c index 8ec642f..ea93771 100644 --- a/src/util/virpci.c +++ b/src/util/virpci.c @@ -1721,7 +1721,7 @@ virPCIDeviceListGet(virPCIDeviceListPtr list, return list->devs[idx]; } -int +size_t virPCIDeviceListCount(virPCIDeviceListPtr list) { return list->count; diff --git a/src/util/virpci.h b/src/util/virpci.h index 0479f0b..08bf4c3 100644 --- a/src/util/virpci.h +++ b/src/util/virpci.h @@ -86,7 +86,7 @@ int virPCIDeviceListAdd(virPCIDeviceListPtr list, int virPCIDeviceListAddCopy(virPCIDeviceListPtr list, virPCIDevicePtr dev); virPCIDevicePtr virPCIDeviceListGet(virPCIDeviceListPtr list, int idx); -int virPCIDeviceListCount(virPCIDeviceListPtr list); +size_t virPCIDeviceListCount(virPCIDeviceListPtr list); virPCIDevicePtr virPCIDeviceListSteal(virPCIDeviceListPtr list, virPCIDevicePtr dev); virPCIDevicePtr virPCIDeviceListStealIndex(virPCIDeviceListPtr list, diff --git a/src/util/virscsi.c b/src/util/virscsi.c index 7aca9e6..f12a2a5 100644 --- a/src/util/virscsi.c +++ b/src/util/virscsi.c @@ -62,7 +62,7 @@ struct _virSCSIDevice { struct _virSCSIDeviceList { virObjectLockable parent; - unsigned int count; + size_t count; virSCSIDevicePtr *devs; }; @@ -356,12 +356,7 @@ virSCSIDeviceListAdd(virSCSIDeviceListPtr list, return -1; } - if (VIR_REALLOC_N(list->devs, list->count + 1) < 0) - return -1; - - list->devs[list->count++] = dev; - - return 0; + return VIR_APPEND_ELEMENT(list->devs, list->count, dev); } virSCSIDevicePtr @@ -373,7 +368,7 @@ virSCSIDeviceListGet(virSCSIDeviceListPtr list, int idx) return list->devs[idx]; } -int +size_t virSCSIDeviceListCount(virSCSIDeviceListPtr list) { return list->count; @@ -387,24 +382,14 @@ virSCSIDeviceListSteal(virSCSIDeviceListPtr list, size_t i; for (i = 0; i < list->count; i++) { - if (list->devs[i]->adapter != dev->adapter || - list->devs[i]->bus != dev->bus || - list->devs[i]->target != dev->target || - list->devs[i]->unit != dev->unit) - continue; - - ret = list->devs[i]; - - if (i != list->count--) - memmove(&list->devs[i], - &list->devs[i+1], - sizeof(*list->devs) * (list->count - i)); - - if (VIR_REALLOC_N(list->devs, list->count) < 0) { - ; /* not fatal */ + if (list->devs[i]->adapter == dev->adapter || + list->devs[i]->bus == dev->bus || + list->devs[i]->target == dev->target || + list->devs[i]->unit == dev->unit) { + ret = list->devs[i]; + VIR_DELETE_ELEMENT(list->devs, i, list->count); + break; } - - break; } return ret; diff --git a/src/util/virscsi.h b/src/util/virscsi.h index cce5df4..4c461f8 100644 --- a/src/util/virscsi.h +++ b/src/util/virscsi.h @@ -77,7 +77,7 @@ int virSCSIDeviceListAdd(virSCSIDeviceListPtr list, virSCSIDevicePtr dev); virSCSIDevicePtr virSCSIDeviceListGet(virSCSIDeviceListPtr list, int idx); -int virSCSIDeviceListCount(virSCSIDeviceListPtr list); +size_t virSCSIDeviceListCount(virSCSIDeviceListPtr list); virSCSIDevicePtr virSCSIDeviceListSteal(virSCSIDeviceListPtr list, virSCSIDevicePtr dev); void virSCSIDeviceListDel(virSCSIDeviceListPtr list, diff --git a/src/util/virusb.c b/src/util/virusb.c index 3c82200..bb5980d 100644 --- a/src/util/virusb.c +++ b/src/util/virusb.c @@ -464,7 +464,7 @@ virUSBDeviceListGet(virUSBDeviceListPtr list, return list->devs[idx]; } -int +size_t virUSBDeviceListCount(virUSBDeviceListPtr list) { return list->count; diff --git a/src/util/virusb.h b/src/util/virusb.h index aa59d12..e0a7c4c 100644 --- a/src/util/virusb.h +++ b/src/util/virusb.h @@ -86,7 +86,7 @@ int virUSBDeviceListAdd(virUSBDeviceListPtr list, virUSBDevicePtr dev); virUSBDevicePtr virUSBDeviceListGet(virUSBDeviceListPtr list, int idx); -int virUSBDeviceListCount(virUSBDeviceListPtr list); +size_t virUSBDeviceListCount(virUSBDeviceListPtr list); virUSBDevicePtr virUSBDeviceListSteal(virUSBDeviceListPtr list, virUSBDevicePtr dev); void virUSBDeviceListDel(virUSBDeviceListPtr list, -- 1.8.1.4

2 2

[libvirt] [libvirt-java] [PATCH] Fix wrapping of virStreamSend
by Claudio Bley 08 Jan '14

08 Jan '14

The native virStreamSend function is meant to be used to transfer byte data. Wrapping the function to use a Java String as the data depends on the default charset of the JVM and might impose further problems transferring \0 characters. Use a byte Array as the parameter type instead, as for virStreamRecv. Add the Stream.receive(byte[]) method which should be used instead of the legacy Stream.receive(String) method. The old method is kept for backward compatibility, but marked as deprecated. --- src/main/java/org/libvirt/Stream.java | 27 +++++++++++++++++++++++++-- src/main/java/org/libvirt/jna/Libvirt.java | 2 +- 2 files changed, 26 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/libvirt/Stream.java b/src/main/java/org/libvirt/Stream.java index bd8e87f..404c9a0 100644 --- a/src/main/java/org/libvirt/Stream.java +++ b/src/main/java/org/libvirt/Stream.java @@ -142,6 +142,27 @@ public class Stream { } /** + * Write the data of the given string to a stream. + * + * @param data + * the string data to write + * @return the number of bytes written, -1 on error, -2 if the buffer is + * full + * @throws LibvirtException + * + * @deprecated This libvirt API was previously wrapped incorrectly, since + * the native function is meant to transfer bytes, not string + * data. + * Its effect depends on the default Charset on your platform + * which is determined on JVM startup. + * Use the {@link #send(byte[])} method instead. + */ + @Deprecated + public int send(String data) throws LibvirtException { + return send(data.getBytes(java.nio.charset.Charset.defaultCharset())); + } + + /** * Write a series of bytes to the stream. * * @param data @@ -149,9 +170,11 @@ public class Stream { * @return the number of bytes written, -1 on error, -2 if the buffer is * full * @throws LibvirtException + * + * @since 1.5.2 */ - public int send(String data) throws LibvirtException { - int returnValue = libvirt.virStreamSend(VSP, data, new NativeLong(data.length())); + public int send(byte[] data) throws LibvirtException { + int returnValue = libvirt.virStreamSend(VSP, data, new NativeLong(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 813f09b..98f2125 100644 --- a/src/main/java/org/libvirt/jna/Libvirt.java +++ b/src/main/java/org/libvirt/jna/Libvirt.java @@ -368,7 +368,7 @@ 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, byte[] data, NativeLong size); int virStreamSendAll(StreamPointer virStreamPtr, Libvirt.VirStreamSourceFunc handler, Pointer opaque); int virStreamRecv(StreamPointer virStreamPtr, byte[] data, NativeLong length); int virStreamRecvAll(StreamPointer virStreamPtr, Libvirt.VirStreamSinkFunc handler, Pointer opaque); -- 1.8.5.2.msysgit.0

1 0

[libvirt] [libvirt-java] [PATCH] Fix javadoc comments
by Claudio Bley 08 Jan '14

08 Jan '14

Correct some typos and paste the right documentation from virInterfaceCreate, virInterfaceDestroy to the Interface.create and Interface.destroy doc comments. --- Pushing under the trivial rule. src/main/java/org/libvirt/Domain.java | 2 +- .../java/org/libvirt/DomainInterfaceStats.java | 2 +- src/main/java/org/libvirt/DomainSnapshot.java | 2 +- src/main/java/org/libvirt/Interface.java | 22 ++++++++++++++++++---- src/main/java/org/libvirt/Stream.java | 4 ++-- 5 files changed, 23 insertions(+), 9 deletions(-) diff --git a/src/main/java/org/libvirt/Domain.java b/src/main/java/org/libvirt/Domain.java index e4c45f6..2f70bf2 100644 --- a/src/main/java/org/libvirt/Domain.java +++ b/src/main/java/org/libvirt/Domain.java @@ -370,7 +370,7 @@ public class Domain { } /** - * Provides a boolean value indicating whether the network is configured to + * Provides a boolean value indicating whether the domain is configured to * be automatically started when the host machine boots. * * @return the result diff --git a/src/main/java/org/libvirt/DomainInterfaceStats.java b/src/main/java/org/libvirt/DomainInterfaceStats.java index 0e948d5..eab5c44 100644 --- a/src/main/java/org/libvirt/DomainInterfaceStats.java +++ b/src/main/java/org/libvirt/DomainInterfaceStats.java @@ -3,7 +3,7 @@ package org.libvirt; import org.libvirt.jna.virDomainInterfaceStats; /** - * The Domain.interfaceStats method returns th network counters in this object + * The Domain.interfaceStats method returns the network counters in this object. * * @author stoty * diff --git a/src/main/java/org/libvirt/DomainSnapshot.java b/src/main/java/org/libvirt/DomainSnapshot.java index b58fd20..9409fef 100644 --- a/src/main/java/org/libvirt/DomainSnapshot.java +++ b/src/main/java/org/libvirt/DomainSnapshot.java @@ -27,7 +27,7 @@ public class DomainSnapshot { * href="http://www.libvirt.org/html/libvirt-libvirt.html#virDomainSnapshotDelete">Libvirt * Documentation</a> * @param flags - * controls teh deletion + * controls the deletion * @return 0 if the selected snapshot(s) were successfully deleted, -1 on error. * @throws LibvirtException */ diff --git a/src/main/java/org/libvirt/Interface.java b/src/main/java/org/libvirt/Interface.java index 7782fb9..6ea21b6 100644 --- a/src/main/java/org/libvirt/Interface.java +++ b/src/main/java/org/libvirt/Interface.java @@ -40,8 +40,13 @@ public class Interface { } /** - * Create and start a defined network. If the call succeed the network moves - * from the defined to the running networks pools. + * Activate an interface (i.e. call "ifup"). + * + * If there was an open network config transaction at the time + * this interface was defined (that is, if + * virInterfaceChangeBegin() had been called), the interface will + * be brought back down (and then undefined) if + * virInterfaceChangeRollback() is called. * * @throws LibvirtException */ @@ -52,8 +57,17 @@ public class Interface { } /** - * Destroy the network object. The running instance is shutdown if not down - * already and all resources used by it are given back to the hypervisor. + * Deactivate an interface (i.e. call "ifdown"). + * + * This does not remove the interface from the config, and does + * not free the associated virInterfacePtr object. + * + * If there is an open network config transaction at the time this + * interface is destroyed (that is, if virInterfaceChangeBegin() + * had been called), and if the interface is later undefined and + * then virInterfaceChangeRollback() is called, the restoral of + * the interface definition will also bring the interface back + * up. * * @throws LibvirtException */ diff --git a/src/main/java/org/libvirt/Stream.java b/src/main/java/org/libvirt/Stream.java index 84e300c..bd8e87f 100644 --- a/src/main/java/org/libvirt/Stream.java +++ b/src/main/java/org/libvirt/Stream.java @@ -100,10 +100,10 @@ public class Stream { } /** - * Receieves data from teh stream into the buffer provided. + * Receives data from the stream into the buffer provided. * * @param data - * the put the sata into + * buffer to put the data into * @return the number of bytes read, -1 on error, -2 if the buffer is empty * @throws LibvirtException */ -- 1.8.5.2.msysgit.0

1 0