- Devel - libvirt List Archives

[libvirt] [PATCH 0/2] bhyve: implement connectDomainXMLToNative
by Roman Bogorodskiy 14 Apr '14

14 Apr '14

One thing I'm wondering about. Bhyve has two step domain startup: 1. bhyveload 2. bhyve This implementation prints out only 'bhyve' command. Should it also print bhyveload command and if yes, how should it look for a user, something like 'bhyveload ... ; bhyve ...' ? Roman Bogorodskiy (2): bhyve: improve bhyve_command.c testability bhyve: implement connectDomainXMLToNative src/bhyve/bhyve_command.c | 85 +++++++++++++++++++++++++---------------------- src/bhyve/bhyve_command.h | 8 +++-- src/bhyve/bhyve_driver.c | 45 +++++++++++++++++++++++++ src/bhyve/bhyve_process.c | 10 +++--- tests/bhyvexml2argvtest.c | 2 +- 5 files changed, 103 insertions(+), 47 deletions(-) -- 1.9.0

2 4

[libvirt] [PATCH] virsh: Make secret's usage can be modified if the usage isn't used
by liyang 14 Apr '14

14 Apr '14

From: Li Yang <liyang.fnst(a)cn.fujitsu.com> When a secret's usage is specified, for example: <secret ephemeral='no' private='no'> <uuid>540c56d1-f4b3-5031-b76d-33e99e9b5c64</uuid> <usage type='volume'> <volume>/tmp/test</volume> </usage> </secret> If another volume '/tmp/test1' isn't used, the current secret's usage can bo modified to '/tmp/test1'. If '/tmp/test1' has been used for another secret, error message will be outputed. Signed-off-by: Li Yang <liyang.fnst(a)cn.fujitsu.com> --- src/secret/secret_driver.c | 18 +++++++++++------- 1 files changed, 11 insertions(+), 7 deletions(-) diff --git a/src/secret/secret_driver.c b/src/secret/secret_driver.c index 4123e6e..78fd054 100644 --- a/src/secret/secret_driver.c +++ b/src/secret/secret_driver.c @@ -781,6 +781,7 @@ secretDefineXML(virConnectPtr conn, const char *xml, virSecretDriverStatePtr driver = conn->secretPrivateData; virSecretPtr ret = NULL; virSecretEntryPtr secret; + virSecretEntryPtr new_secret; virSecretDefPtr backup = NULL; virSecretDefPtr new_attrs; @@ -804,7 +805,7 @@ secretDefineXML(virConnectPtr conn, const char *xml, char uuidstr[VIR_UUID_STRING_BUFLEN]; virUUIDFormat(secret->def->uuid, uuidstr); virReportError(VIR_ERR_INTERNAL_ERROR, - _("a secret with UUID %s already defined for use with %s"), + _("a secret with UUID %s is already defined for use with %s"), uuidstr, usageID); goto cleanup; } @@ -819,12 +820,15 @@ secretDefineXML(virConnectPtr conn, const char *xml, const char *newUsageID = secretUsageIDForDef(new_attrs); const char *oldUsageID = secretUsageIDForDef(secret->def); if (STRNEQ(oldUsageID, newUsageID)) { - char uuidstr[VIR_UUID_STRING_BUFLEN]; - virUUIDFormat(secret->def->uuid, uuidstr); - virReportError(VIR_ERR_INTERNAL_ERROR, - _("a secret with UUID %s is already defined for use with %s"), - uuidstr, oldUsageID); - goto cleanup; + new_secret = secretFindByUsage(driver, new_attrs->usage_type, newUsageID); + if (new_secret){ + char uuidstr[VIR_UUID_STRING_BUFLEN]; + virUUIDFormat(new_secret->def->uuid, uuidstr); + virReportError(VIR_ERR_INTERNAL_ERROR, + _("a secret with UUID %s is already defined for use with %s"), + uuidstr, newUsageID); + goto cleanup; + } } if (secret->def->private && !new_attrs->private) { -- 1.7.1

1 0

[libvirt] [PATCH 0/6] another virstoragefile cleanup
by Eric Blake 12 Apr '14

12 Apr '14

Today's cleanup: add tests for backing chain lookups, and remove another redundant field. Eric Blake (6): conf: test backing chain lookup util: new virFileRelLinkPointsTo function conf: report error on chain lookup failure conf: drop redundant parameter to chain lookup conf: tweak chain lookup internals conf: delete internal directory field src/libvirt_private.syms | 1 + src/qemu/qemu_driver.c | 13 +-- src/util/virfile.c | 26 +++++- src/util/virfile.h | 3 + src/util/virstoragefile.c | 96 +++++++++++------------ src/util/virstoragefile.h | 2 - src/xen/xm_internal.c | 11 ++- tests/virstoragetest.c | 196 +++++++++++++++++++++++++++++++++++++++------- 8 files changed, 251 insertions(+), 97 deletions(-) -- 1.9.0

2 19

[libvirt] [PATCH v5] Introduce --without-pm-utils to get rid of pm-is-supported dependency
by Cédric Bosdonnat 11 Apr '14

11 Apr '14

This uses the dbus api of systemd to check the power management capabilities of the node. --- Difference with v4: * Removed left-over debug bits * Rebased * Cleaned up the spurious white space change configure.ac | 22 +++++++++ libvirt.spec.in | 9 ++++ src/libvirt_private.syms | 3 ++ src/util/virnodesuspend.c | 75 ++++++++++++++++++++++------ src/util/virsystemd.c | 59 ++++++++++++++++++++++ src/util/virsystemd.h | 6 +++ tests/virsystemdtest.c | 121 ++++++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 279 insertions(+), 16 deletions(-) diff --git a/configure.ac b/configure.ac index 52c50df..ea85851 100644 --- a/configure.ac +++ b/configure.ac @@ -563,6 +563,10 @@ AC_ARG_WITH([chrdev-lock-files], [location for UUCP style lock files for character devices (use auto for default paths on some platforms) @<:@default=auto@:>@])]) m4_divert_text([DEFAULTS], [with_chrdev_lock_files=auto]) +AC_ARG_WITH([pm-utils], + [AS_HELP_STRING([--with-pm-utils], + [use pm-utils for power management @<:@default=yes@:>@])]) +m4_divert_text([DEFAULTS], [with_pm_utils=check]) dnl dnl in case someone want to build static binaries @@ -1621,6 +1625,23 @@ fi AM_CONDITIONAL([WITH_PHYP],[test "$with_phyp" = "yes"]) +dnl +dnl Should we build with pm-utils support? +dnl +if test "$with_pm_utils" = "check"; then + with_pm_utils=yes + if test "$with_dbus" = "yes"; then + if test "$init_systemd" = "yes"; then + with_pm_utils=no + fi + fi +fi + +if test "$with_pm_utils" = "yes"; then + AC_DEFINE_UNQUOTED([WITH_PM_UTILS], 1, [whether to use pm-utils]) +fi +AM_CONDITIONAL([WITH_PM_UTILS], [test "$with_pm_utils" = "yes"]) + dnl virsh libraries VIRSH_LIBS="$VIRSH_LIBS $READLINE_LIBS" AC_SUBST([VIRSH_LIBS]) @@ -2853,6 +2874,7 @@ AC_MSG_NOTICE([ rbd: $LIBRBD_LIBS]) else AC_MSG_NOTICE([ rbd: no]) fi +AC_MSG_NOTICE([pm-utils: $with_pm_utils]) AC_MSG_NOTICE([]) AC_MSG_NOTICE([Test suite]) diff --git a/libvirt.spec.in b/libvirt.spec.in index 8e83fb3..b61ef8d 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -132,6 +132,7 @@ %define with_libssh2 0%{!?_without_libssh2:0} %define with_wireshark 0%{!?_without_wireshark:0} %define with_systemd_daemon 0%{!?_without_systemd_daemon:0} +%define with_pm_utils 1 # Non-server/HV driver defaults which are always enabled %define with_sasl 0%{!?_without_sasl:1} @@ -182,6 +183,7 @@ %if 0%{?fedora} >= 17 || 0%{?rhel} >= 7 %define with_systemd 1 %define with_systemd_daemon 1 + %define with_pm_utils 0 %endif # Fedora 18 / RHEL-7 are first where firewalld support is enabled @@ -1138,8 +1140,10 @@ Requires: nc Requires: gettext # Needed by virt-pki-validate script. Requires: gnutls-utils +%if %{with_pm_utils} # Needed for probing the power management features of the host. Requires: pm-utils +%{endif} %if %{with_sasl} Requires: cyrus-sasl # Not technically required, but makes 'out-of-box' config @@ -1395,6 +1399,10 @@ driver %define _without_systemd_daemon --without-systemd-daemon %endif +%if ! %{with_pm_utils} + %define _without_pm_utils --without-pm-utils +%endif + %define when %(date +"%%F-%%T") %define where %(hostname) %define who %{?packager}%{!?packager:Unknown} @@ -1471,6 +1479,7 @@ rm -f po/stamp-po %{?_with_firewalld} \ %{?_without_wireshark} \ %{?_without_systemd_daemon} \ + %{?_without_pm_utils} \ %{with_packager} \ %{with_packager_version} \ --with-qemu-user=%{qemu_user} \ diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index cd43335..6e807c4 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1888,6 +1888,9 @@ virSysinfoSetup; # util/virsystemd.h +virSystemdCanHibernate; +virSystemdCanHybridSleep; +virSystemdCanSuspend; virSystemdCreateMachine; virSystemdMakeMachineName; virSystemdMakeScopeName; diff --git a/src/util/virnodesuspend.c b/src/util/virnodesuspend.c index 08c47aa..70ede2a 100644 --- a/src/util/virnodesuspend.c +++ b/src/util/virnodesuspend.c @@ -22,6 +22,7 @@ #include <config.h> #include "virnodesuspend.h" +# include "virsystemd.h" #include "vircommand.h" #include "virthread.h" #include "datatypes.h" @@ -228,23 +229,9 @@ int nodeSuspendForDuration(unsigned int target, return ret; } - -/** - * virNodeSuspendSupportsTarget: - * @target: The power management target to check whether it is supported - * by the host. Values could be: - * VIR_NODE_SUSPEND_TARGET_MEM - * VIR_NODE_SUSPEND_TARGET_DISK - * VIR_NODE_SUSPEND_TARGET_HYBRID - * @supported: set to true if supported, false otherwise - * - * Run the script 'pm-is-supported' (from the pm-utils package) - * to find out if @target is supported by the host. - * - * Returns 0 if the query was successful, -1 on failure. - */ +#ifdef WITH_PM_UTILS static int -virNodeSuspendSupportsTarget(unsigned int target, bool *supported) +virNodeSuspendSupportsTargetPMUtils(unsigned int target, bool *supported) { virCommandPtr cmd; int status; @@ -280,6 +267,62 @@ virNodeSuspendSupportsTarget(unsigned int target, bool *supported) virCommandFree(cmd); return ret; } +#endif + +static int +virNodeSuspendSupportsTargetSystemd(unsigned int target, bool *supported) +{ + int ret = -1; + + if (virNodeSuspendInitialize() < 0) + return -1; + + *supported = false; + + switch (target) { + case VIR_NODE_SUSPEND_TARGET_MEM: + ret = virSystemdCanSuspend(supported); + break; + case VIR_NODE_SUSPEND_TARGET_DISK: + ret = virSystemdCanHibernate(supported); + break; + case VIR_NODE_SUSPEND_TARGET_HYBRID: + ret = virSystemdCanHybridSleep(supported); + break; + default: + return ret; + } + + return ret; +} + +/** + * virNodeSuspendSupportsTarget: + * @target: The power management target to check whether it is supported + * by the host. Values could be: + * VIR_NODE_SUSPEND_TARGET_MEM + * VIR_NODE_SUSPEND_TARGET_DISK + * VIR_NODE_SUSPEND_TARGET_HYBRID + * @supported: set to true if supported, false otherwise + * + * Run the script 'pm-is-supported' (from the pm-utils package) + * to find out if @target is supported by the host. + * + * Returns 0 if the query was successful, -1 on failure. + */ +static int +virNodeSuspendSupportsTarget(unsigned int target, bool *supported) +{ + int ret; + + ret = virNodeSuspendSupportsTargetSystemd(target, supported); +#ifdef WITH_PM_UTILS + if (ret < 0) + ret = virNodeSuspendSupportsTargetPMUtils(target, supported); +#endif + + return ret; +} /** * virNodeSuspendGetTargetMask: diff --git a/src/util/virsystemd.c b/src/util/virsystemd.c index 93b3f9c..e9ca564 100644 --- a/src/util/virsystemd.c +++ b/src/util/virsystemd.c @@ -325,3 +325,62 @@ virSystemdNotifyStartup(void) sd_notify(0, "READY=1"); #endif } + +static int +virSystemdPMSupportTarget(const char *methodName, bool *result) +{ + int ret; + DBusConnection *conn; + DBusMessage *message = NULL; + char *response; + + ret = virDBusIsServiceEnabled("org.freedesktop.login1"); + if (ret < 0) + return ret; + + if ((ret = virDBusIsServiceRegistered("org.freedesktop.login1")) < 0) + return ret; + + if (!(conn = virDBusGetSystemBus())) + return -1; + + ret = -1; + + if (virDBusCallMethod(conn, + &message, + NULL, + "org.freedesktop.login1", + "/org/freedesktop/login1", + "org.freedesktop.login1.Manager", + methodName, + NULL) < 0) + return ret; + + if ((ret = virDBusMessageRead(message, "s", &response)) < 0) + goto cleanup; + + *result = STREQ("yes", response) || STREQ("challenge", response); + + ret = 0; + + cleanup: + dbus_message_unref(message); + VIR_FREE(response); + + return ret; +} + +int virSystemdCanSuspend(bool *result) +{ + return virSystemdPMSupportTarget("CanSuspend", result); +} + +int virSystemdCanHibernate(bool *result) +{ + return virSystemdPMSupportTarget("CanHibernate", result); +} + +int virSystemdCanHybridSleep(bool *result) +{ + return virSystemdPMSupportTarget("CanHybridSleep", result); +} diff --git a/src/util/virsystemd.h b/src/util/virsystemd.h index 7fed456..491c9b7 100644 --- a/src/util/virsystemd.h +++ b/src/util/virsystemd.h @@ -48,4 +48,10 @@ int virSystemdTerminateMachine(const char *name, void virSystemdNotifyStartup(void); +int virSystemdCanSuspend(bool *result); + +int virSystemdCanHibernate(bool *result); + +int virSystemdCanHybridSleep(bool *result); + #endif /* __VIR_SYSTEMD_H__ */ diff --git a/tests/virsystemdtest.c b/tests/virsystemdtest.c index 2b014cc..86d717f 100644 --- a/tests/virsystemdtest.c +++ b/tests/virsystemdtest.c @@ -55,10 +55,21 @@ VIR_MOCK_IMPL_RET_ARGS(dbus_connection_send_with_reply_and_block, } else { reply = dbus_message_new(DBUS_MESSAGE_TYPE_METHOD_RETURN); } + } else if (STREQ(service, "org.freedesktop.login1")) { + char *supported = getenv("RESULT_SUPPORT"); + DBusMessageIter iter; + reply = dbus_message_new(DBUS_MESSAGE_TYPE_METHOD_RETURN); + dbus_message_iter_init_append(reply, &iter); + + if (!dbus_message_iter_append_basic(&iter, + DBUS_TYPE_STRING, + &supported)) + goto error; } else if (STREQ(service, "org.freedesktop.DBus") && STREQ(member, "ListActivatableNames")) { const char *svc1 = "org.foo.bar.wizz"; const char *svc2 = "org.freedesktop.machine1"; + const char *svc3 = "org.freedesktop.login1"; DBusMessageIter iter; DBusMessageIter sub; reply = dbus_message_new(DBUS_MESSAGE_TYPE_METHOD_RETURN); @@ -75,11 +86,17 @@ VIR_MOCK_IMPL_RET_ARGS(dbus_connection_send_with_reply_and_block, DBUS_TYPE_STRING, &svc2)) goto error; + if (!getenv("FAIL_NO_SERVICE") && + !dbus_message_iter_append_basic(&sub, + DBUS_TYPE_STRING, + &svc3)) + goto error; dbus_message_iter_close_container(&iter, &sub); } else if (STREQ(service, "org.freedesktop.DBus") && STREQ(member, "ListNames")) { const char *svc1 = "org.foo.bar.wizz"; const char *svc2 = "org.freedesktop.systemd1"; + const char *svc3 = "org.freedesktop.login1"; DBusMessageIter iter; DBusMessageIter sub; reply = dbus_message_new(DBUS_MESSAGE_TYPE_METHOD_RETURN); @@ -96,6 +113,11 @@ VIR_MOCK_IMPL_RET_ARGS(dbus_connection_send_with_reply_and_block, DBUS_TYPE_STRING, &svc2)) goto error; + if ((!getenv("FAIL_NO_SERVICE") && !getenv("FAIL_NOT_REGISTERED")) && + !dbus_message_iter_append_basic(&sub, + DBUS_TYPE_STRING, + &svc3)) + goto error; dbus_message_iter_close_container(&iter, &sub); } else { reply = dbus_message_new(DBUS_MESSAGE_TYPE_METHOD_RETURN); @@ -313,6 +335,86 @@ testScopeName(const void *opaque) return ret; } +typedef int (*virSystemdCanHelper)(bool * result); +struct testPMSupportData { + virSystemdCanHelper tested; +}; + +static int testPMSupportHelper(const void *opaque) +{ + int rv; + bool result; + size_t i; + const char *results[4] = {"yes", "no", "na", "challenge"}; + int expected[4] = {1, 0, 0, 1}; + const struct testPMSupportData *data = opaque; + + for (i = 0; i < 4; i++) { + setenv("RESULT_SUPPORT", results[i], 1); + if ((rv = data->tested(&result)) < 0) { + fprintf(stderr, "%s", "Unexpected canSuspend error\n"); + return -1; + } + + if (result != expected[i]) { + fprintf(stderr, "Unexpected result for answer '%s'\n", results[i]); + goto error; + } + unsetenv("RESULT_SUPPORT"); + } + + return 0; +error: + unsetenv("RESULT_SUPPORT"); + return -1; +} + +static int testPMSupportHelperNoSystemd(const void *opaque) +{ + int rv; + bool result; + const struct testPMSupportData *data = opaque; + + setenv("FAIL_NO_SERVICE", "1", 1); + + if ((rv = data->tested(&result)) == 0) { + unsetenv("FAIL_NO_SERVICE"); + fprintf(stderr, "%s", "Unexpected canSuspend success\n"); + return -1; + } + unsetenv("FAIL_NO_SERVICE"); + + if (rv != -2) { + fprintf(stderr, "%s", "Unexpected canSuspend error\n"); + return -1; + } + + return 0; +} + +static int testPMSupportSystemdNotRunning(const void *opaque) +{ + int rv; + bool result; + const struct testPMSupportData *data = opaque; + + setenv("FAIL_NOT_REGISTERED", "1", 1); + + if ((rv = data->tested(&result)) == 0) { + unsetenv("FAIL_NOT_REGISTERED"); + fprintf(stderr, "%s", "Unexpected canSuspend success\n"); + return -1; + } + unsetenv("FAIL_NOT_REGISTERED"); + + if (rv != -2) { + fprintf(stderr, "%s", "Unexpected canSuspend error\n"); + return -1; + } + + return 0; +} + static int mymain(void) { @@ -351,6 +453,25 @@ mymain(void) TEST_SCOPE("demo", "/machine/eng-dept/testing!stuff", "machine-eng\\x2ddept-testing\\x21stuff-lxc\\x2ddemo.scope"); +# define TESTS_PM_SUPPORT_HELPER(name, function) \ + do { \ + struct testPMSupportData data = { \ + function \ + }; \ + if (virtTestRun("Test " name " ", testPMSupportHelper, &data) < 0) \ + ret = -1; \ + if (virtTestRun("Test " name " no systemd ", \ + testPMSupportHelperNoSystemd, &data) < 0) \ + ret = -1; \ + if (virtTestRun("Test systemd " name " not running ", \ + testPMSupportSystemdNotRunning, &data) < 0) \ + ret = -1; \ + } while (0) + + TESTS_PM_SUPPORT_HELPER("canSuspend", &virSystemdCanSuspend); + TESTS_PM_SUPPORT_HELPER("canHibernate", &virSystemdCanHibernate); + TESTS_PM_SUPPORT_HELPER("canHybridSleep", &virSystemdCanHybridSleep); + return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; } -- 1.8.4.5

2 1

[libvirt] [PATCH] tests: drop dead code from argv2xml and xml2xml
by Eric Blake 11 Apr '14

11 Apr '14

Noticed while tweaking the RelaxNG grammar for <disk> elements. * tests/qemuxml2xmloutdata/qemuxml2xmlout-numad-static-vcpu-no-numatune.xml: * tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-cdrom-empty.xml: Drop unused files. * tests/qemuargv2xmltest.c (testInfo, DO_TEST_FULL): Drop unused field. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Pushing under the trivial rule. tests/qemuargv2xmltest.c | 16 +++++------ .../qemuxml2xmlout-disk-cdrom-empty.xml | 32 ---------------------- ...emuxml2xmlout-numad-static-vcpu-no-numatune.xml | 29 -------------------- 3 files changed, 7 insertions(+), 70 deletions(-) delete mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-cdrom-empty.xml delete mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-numad-static-vcpu-no-numatune.xml diff --git a/tests/qemuargv2xmltest.c b/tests/qemuargv2xmltest.c index 4cc3749..0fc9fcb 100644 --- a/tests/qemuargv2xmltest.c +++ b/tests/qemuargv2xmltest.c @@ -95,7 +95,6 @@ static int testCompareXMLToArgvFiles(const char *xml, struct testInfo { const char *name; unsigned long long extraFlags; - const char *migrateFrom; }; static int @@ -137,16 +136,16 @@ mymain(void) if (!(driver.xmlopt = virQEMUDriverCreateXMLConf(&driver))) return EXIT_FAILURE; -# define DO_TEST_FULL(name, extraFlags, migrateFrom) \ +# define DO_TEST_FULL(name, extraFlags) \ do { \ - const struct testInfo info = { name, extraFlags, migrateFrom }; \ + const struct testInfo info = { name, extraFlags }; \ if (virtTestRun("QEMU ARGV-2-XML " name, \ testCompareXMLToArgvHelper, &info) < 0) \ ret = -1; \ } while (0) # define DO_TEST(name) \ - DO_TEST_FULL(name, 0, NULL) + DO_TEST_FULL(name, 0) setenv("PATH", "/bin", 1); setenv("USER", "test", 1); @@ -264,12 +263,11 @@ mymain(void) DO_TEST("nosharepages"); - DO_TEST_FULL("restore-v1", 0, "stdio"); - DO_TEST_FULL("restore-v2", 0, "stdio"); - DO_TEST_FULL("restore-v2", 0, "exec:cat"); - DO_TEST_FULL("migrate", 0, "tcp:10.0.0.1:5000"); + DO_TEST("restore-v1"); + DO_TEST("restore-v2"); + DO_TEST("migrate"); - DO_TEST_FULL("qemu-ns-no-env", 1, NULL); + DO_TEST_FULL("qemu-ns-no-env", 1); virObjectUnref(driver.config); virObjectUnref(driver.caps); diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-cdrom-empty.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-cdrom-empty.xml deleted file mode 100644 index 2c5a81a..0000000 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-cdrom-empty.xml +++ /dev/null @@ -1,32 +0,0 @@ -<domain type='qemu'> - <name>QEMUGuest1</name> - <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory unit='KiB'>219100</memory> - <currentMemory unit='KiB'>219100</currentMemory> - <vcpu placement='static'>1</vcpu> - <os> - <type arch='i686' machine='pc'>hvm</type> - <boot dev='hd'/> - </os> - <clock offset='utc'/> - <on_poweroff>destroy</on_poweroff> - <on_reboot>restart</on_reboot> - <on_crash>destroy</on_crash> - <devices> - <emulator>/usr/bin/qemu</emulator> - <disk type='block' device='disk'> - <source dev='/dev/HostVG/QEMUGuest1'/> - <target dev='hda' bus='ide'/> - <address type='drive' controller='0' bus='0' target='0' unit='0'/> - </disk> - <disk type='file' device='cdrom'> - <target dev='hdc' bus='ide'/> - <source startupPolicy='optional'/> - <readonly/> - <address type='drive' controller='0' bus='1' target='0' unit='0'/> - </disk> - <controller type='usb' index='0'/> - <controller type='ide' index='0'/> - <memballoon model='virtio'/> - </devices> -</domain> diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-numad-static-vcpu-no-numatune.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-numad-static-vcpu-no-numatune.xml deleted file mode 100644 index 71c1497..0000000 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-numad-static-vcpu-no-numatune.xml +++ /dev/null @@ -1,29 +0,0 @@ -<domain type='qemu'> - <name>QEMUGuest1</name> - <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory unit='KiB'>219136</memory> - <currentMemory unit='KiB'>219136</currentMemory> - <vcpu placement='static'>2</vcpu> - <os> - <type arch='i686' machine='pc'>hvm</type> - <boot dev='hd'/> - </os> - <cpu> - <topology sockets='2' cores='1' threads='1'/> - </cpu> - <clock offset='utc'/> - <on_poweroff>destroy</on_poweroff> - <on_reboot>restart</on_reboot> - <on_crash>destroy</on_crash> - <devices> - <emulator>/usr/bin/qemu</emulator> - <disk type='block' device='disk'> - <source dev='/dev/HostVG/QEMUGuest1'/> - <target dev='hda' bus='ide'/> - <address type='drive' controller='0' bus='0' target='0' unit='0'/> - </disk> - <controller type='ide' index='0'/> - <controller type='usb' index='0'/> - <memballoon model='virtio'/> - </devices> -</domain> -- 1.9.0

1 0

[libvirt] [PATCH 0/2] bhyve: enhance domain management
by Wojciech Macek 11 Apr '14

11 Apr '14

Two small changes: 1. Inside domainDestroy, forget about domain if it is not persistent. 2. Add domainCreateXML call Wojciech Macek (2): bhyve: fix domain management bhyve: domainCreateXML src/bhyve/bhyve_driver.c | 80 ++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 78 insertions(+), 2 deletions(-) -- 1.9.0

3 7

[libvirt] API calls to get interfaces and block devices
by Ruben Kerkhof 11 Apr '14

11 Apr '14

Hi all, I have a few python scripts which use the libvirt api to get interface and block device statistics. What has been bugging me for a while now that is that there’s no high level api to get a list of all interfaces or block devices for a vm. The list can be retrieved from the xml with a bit of Xpath magic, but this seems to me to break the nice abstraction layer libvirt provides. Ideally, I don’t have to do anything with xml, and add dependencies on xml parsers to my code. I’ve seen examples of code doing this, for example the collectd libvirt plugin, but there must be many others. Can I kindly ask for such an API? Unfortunately I don’t have the skills to code this up myself. Kind regards, Ruben Kerkhof

3 6

[libvirt] [PATCH] virsh: Add one blank line after output of dompmsuspend/dompmwakeup
by Shanzhi Yu 11 Apr '14

11 Apr '14

There should be include one blank line after result of dompmsuspend and dompmwakeup --- tools/virsh-domain.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 73414f8..3aca1e7 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -2830,7 +2830,7 @@ cmdDomPMSuspend(vshControl *ctl, const vshCmd *cmd) goto cleanup; } - vshPrint(ctl, _("Domain %s successfully suspended"), + vshPrint(ctl, _("Domain %s successfully suspended\n"), virDomainGetName(dom)); ret = true; @@ -2881,7 +2881,7 @@ cmdDomPMWakeup(vshControl *ctl, const vshCmd *cmd) goto cleanup; } - vshPrint(ctl, _("Domain %s successfully woken up"), + vshPrint(ctl, _("Domain %s successfully woken up\n"), virDomainGetName(dom)); ret = true; -- 1.8.3.1

2 1

[libvirt] maint: backport of 736e017e and friends
by Martin Kletzander 11 Apr '14

11 Apr '14

I wanted to back-port 736e017e as requested in Bug 1058149 [1], because it fixes a crash. However, it requires 5b3492fa and e9d09fe1 to be back-ported as well, so I wanted to confirm it's still OK when it's not a simple two-liner or similar (and combined with the low probability of the crash to happen). What's the stand on this? Martin [1] https://bugzilla.redhat.com/show_bug.cgi?id=1058149

4 4

[libvirt] [PATCH] cpu: Properly check input parameters
by Jiri Denemark 11 Apr '14

11 Apr '14

Most of the APIs in CPU driver do not expect to get NULL for input parameters. Let's mark them with ATTRIBUTE_NONNULL and also check for some members of virCPUDef when the APIs expect them have some specific values. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/cpu/cpu.c | 48 +++++++++++++++++++++++++++++++++++++----------- src/cpu/cpu.h | 36 ++++++++++++++++++++++++------------ 2 files changed, 61 insertions(+), 23 deletions(-) diff --git a/src/cpu/cpu.c b/src/cpu/cpu.c index 9cd2300..528e1a7 100644 --- a/src/cpu/cpu.c +++ b/src/cpu/cpu.c @@ -108,12 +108,6 @@ cpuCompareXML(virCPUDefPtr host, if (cpu == NULL) goto cleanup; - if (!cpu->model) { - virReportError(VIR_ERR_OPERATION_INVALID, - "%s", _("no CPU model specified")); - goto cleanup; - } - ret = cpuCompare(host, cpu); cleanup: @@ -146,6 +140,12 @@ cpuCompare(virCPUDefPtr host, VIR_DEBUG("host=%p, cpu=%p", host, cpu); + if (!cpu->model) { + virReportError(VIR_ERR_INVALID_ARG, "%s", + _("no guest CPU model specified")); + return VIR_CPU_COMPARE_ERROR; + } + if ((driver = cpuGetSubDriver(host->arch)) == NULL) return VIR_CPU_COMPARE_ERROR; @@ -203,14 +203,15 @@ cpuDecode(virCPUDefPtr cpu, } if (models == NULL && nmodels != 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - "%s", _("nonzero nmodels doesn't match with NULL models")); + virReportError(VIR_ERR_INVALID_ARG, "%s", + _("nonzero nmodels doesn't match with NULL models")); return -1; } - if (cpu == NULL) { - virReportError(VIR_ERR_INTERNAL_ERROR, - "%s", _("invalid CPU definition")); + if (cpu->type > VIR_CPU_TYPE_GUEST || + cpu->mode != VIR_CPU_MODE_CUSTOM) { + virReportError(VIR_ERR_INVALID_ARG, "%s", + _("invalid CPU definition stub")); return -1; } @@ -264,6 +265,12 @@ cpuEncode(virArch arch, virArchToString(arch), cpu, forced, required, optional, disabled, forbidden, vendor); + if (!cpu->model) { + virReportError(VIR_ERR_INVALID_ARG, "%s", + _("no guest CPU model specified")); + return -1; + } + if ((driver = cpuGetSubDriver(arch)) == NULL) return -1; @@ -367,6 +374,12 @@ cpuGuestData(virCPUDefPtr host, VIR_DEBUG("host=%p, guest=%p, data=%p, msg=%p", host, guest, data, msg); + if (!guest->model) { + virReportError(VIR_ERR_INVALID_ARG, "%s", + _("no guest CPU model specified")); + return VIR_CPU_COMPARE_ERROR; + } + if ((driver = cpuGetSubDriver(host->arch)) == NULL) return VIR_CPU_COMPARE_ERROR; @@ -529,6 +542,19 @@ cpuBaseline(virCPUDefPtr *cpus, return NULL; } + for (i = 0; i < ncpus; i++) { + if (!cpus[i]) { + virReportError(VIR_ERR_INVALID_ARG, + _("invalid CPU definition at index %zu"), i); + return NULL; + } + if (!cpus[i]->model) { + virReportError(VIR_ERR_INVALID_ARG, + _("no CPU model specified at index %zu"), i); + return NULL; + } + } + if (models == NULL && nmodels != 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("nonzero nmodels doesn't match with NULL models")); diff --git a/src/cpu/cpu.h b/src/cpu/cpu.h index 27169fe..e9f2713 100644 --- a/src/cpu/cpu.h +++ b/src/cpu/cpu.h @@ -119,18 +119,21 @@ struct cpuArchDriver { extern virCPUCompareResult cpuCompareXML(virCPUDefPtr host, - const char *xml); + const char *xml) + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2); extern virCPUCompareResult cpuCompare (virCPUDefPtr host, - virCPUDefPtr cpu); + virCPUDefPtr cpu) + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2); extern int cpuDecode (virCPUDefPtr cpu, const virCPUData *data, const char **models, unsigned int nmodels, - const char *preferred); + const char *preferred) + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2); extern int cpuEncode (virArch arch, @@ -140,7 +143,8 @@ cpuEncode (virArch arch, virCPUDataPtr *optional, virCPUDataPtr *disabled, virCPUDataPtr *forbidden, - virCPUDataPtr *vendor); + virCPUDataPtr *vendor) + ATTRIBUTE_NONNULL(2); extern void cpuDataFree (virCPUDataPtr data); @@ -152,7 +156,8 @@ extern virCPUCompareResult cpuGuestData(virCPUDefPtr host, virCPUDefPtr guest, virCPUDataPtr *data, - char **msg); + char **msg) + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2); extern char * cpuBaselineXML(const char **xmlCPUs, @@ -166,30 +171,37 @@ cpuBaseline (virCPUDefPtr *cpus, unsigned int ncpus, const char **models, unsigned int nmodels, - unsigned int flags); + unsigned int flags) + ATTRIBUTE_NONNULL(1); extern int cpuUpdate (virCPUDefPtr guest, - const virCPUDef *host); + const virCPUDef *host) + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2); extern int cpuHasFeature(const virCPUData *data, - const char *feature); + const char *feature) + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2); bool cpuModelIsAllowed(const char *model, const char **models, - unsigned int nmodels); + unsigned int nmodels) + ATTRIBUTE_NONNULL(1); extern int -cpuGetModels(const char *arch, char ***models); +cpuGetModels(const char *arch, char ***models) + ATTRIBUTE_NONNULL(1); /* cpuDataFormat and cpuDataParse are implemented for unit tests only and * have no real-life usage */ -char *cpuDataFormat(const virCPUData *data); +char *cpuDataFormat(const virCPUData *data) + ATTRIBUTE_NONNULL(1); virCPUDataPtr cpuDataParse(virArch arch, - const char *xmlStr); + const char *xmlStr) + ATTRIBUTE_NONNULL(2); #endif /* __VIR_CPU_H__ */ -- 1.9.1

2 2

[libvirt] [PATCH] cpu: Add documentation for CPU driver APIs
by Jiri Denemark 11 Apr '14

11 Apr '14

Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/cpu/cpu.c | 202 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 202 insertions(+) diff --git a/src/cpu/cpu.c b/src/cpu/cpu.c index e91f5bb..9cd2300 100644 --- a/src/cpu/cpu.c +++ b/src/cpu/cpu.c @@ -77,6 +77,19 @@ cpuGetSubDriver(virArch arch) } +/** + * cpuCompareXML: + * + * @host: host CPU definition + * @xml: XML description of either guest or host CPU to be compared with @host + * + * Compares the CPU described by @xml with @host CPU. + * + * Returns VIR_CPU_COMPARE_ERROR on error, VIR_CPU_COMPARE_INCOMPATIBLE when + * the two CPUs are incompatible, VIR_CPU_COMPARE_IDENTICAL when the two CPUs + * are identical, VIR_CPU_COMPARE_SUPERSET when the @xml CPU is a superset of + * the @host CPU. + */ virCPUCompareResult cpuCompareXML(virCPUDefPtr host, const char *xml) @@ -112,6 +125,19 @@ cpuCompareXML(virCPUDefPtr host, } +/** + * cpuCompare: + * + * @host: host CPU definition + * @cpu: either guest or host CPU to be compared with @host + * + * Compares the CPU described by @cpu with @host CPU. + * + * Returns VIR_CPU_COMPARE_ERROR on error, VIR_CPU_COMPARE_INCOMPATIBLE when + * the two CPUs are incompatible, VIR_CPU_COMPARE_IDENTICAL when the two CPUs + * are identical, VIR_CPU_COMPARE_SUPERSET when the @cpu CPU is a superset of + * the @host CPU. + */ virCPUCompareResult cpuCompare(virCPUDefPtr host, virCPUDefPtr cpu) @@ -134,6 +160,31 @@ cpuCompare(virCPUDefPtr host, } +/** + * cpuDecode: + * + * @cpu: CPU definition stub to be filled in + * @data: internal CPU data to be decoded into @cpu definition + * @models: list of CPU models that can be considered when decoding @data + * @nmodels: number of CPU models in @models + * @preferred: CPU models that should be used if possible + * + * Decodes internal CPU data into a CPU definition consisting of a CPU model + * and a list of CPU features. The @cpu model stub is supposed to have arch, + * type, match and fallback members set, this function will add the rest. If + * @models list is NULL, all models supported by libvirt will be considered + * when decoding the data. In general, this function will select the model + * closest to the CPU specified by @data unless @preferred is non-NULL, in + * which case the @preferred model will be used as long as it is compatible + * with @data. + * + * For VIR_ARCH_I686 and VIR_ARCH_X86_64 architectures this means the computed + * CPU definition will have the shortest possible list of additional features. + * When @preferred is non-NULL, the @preferred model will be used even if + * other models would result in a shorter list of additional features. + * + * Returns 0 on success, -1 on error. + */ int cpuDecode(virCPUDefPtr cpu, const virCPUData *data, @@ -177,6 +228,25 @@ cpuDecode(virCPUDefPtr cpu, } +/** + * cpuEncode: + * + * @arch: CPU architecture + * @cpu: CPU definition to be encoded into internal CPU driver representation + * @forced: where to store CPU data corresponding to forced features + * @required: where to store CPU data corresponding to required features + * @optional: where to store CPU data corresponding to optional features + * @disabled: where to store CPU data corresponding to disabled features + * @forbidden: where to store CPU data corresponding to forbidden features + * @vendor: where to store CPU data corresponding to CPU vendor + * + * Encode CPU definition from @cpu into internal CPU driver representation. + * Any of @forced, @required, @optional, @disabled, @forbidden and @vendor + * arguments can be NULL in case the caller is not interested in the + * corresponding data. + * + * Returns 0 on success, -1 on error. + */ int cpuEncode(virArch arch, const virCPUDef *cpu, @@ -209,6 +279,15 @@ cpuEncode(virArch arch, } +/** + * cpuDataFree: + * + * @data: CPU data structure to be freed + * + * Free internal CPU data. + * + * Returns nothing. + */ void cpuDataFree(virCPUDataPtr data) { @@ -233,6 +312,13 @@ cpuDataFree(virCPUDataPtr data) } +/** + * cpuNodeData: + * + * @arch: CPU architecture + * + * Returns CPU data for host CPU or NULL on error. + */ virCPUDataPtr cpuNodeData(virArch arch) { @@ -254,6 +340,23 @@ cpuNodeData(virArch arch) } +/** + * cpuGuestData: + * + * @host: host CPU definition + * @guest: guest CPU definition + * @data: computed guest CPU data + * @msg: error message describing why the @guest and @host CPUs are considered + * incompatible + * + * Computes guest CPU data for the @guest CPU definition when run on the @host + * CPU. + * + * Returns VIR_CPU_COMPARE_ERROR on error, VIR_CPU_COMPARE_INCOMPATIBLE when + * the two CPUs are incompatible (@msg will describe the incompatibility), + * VIR_CPU_COMPARE_IDENTICAL when the two CPUs are identical, + * VIR_CPU_COMPARE_SUPERSET when the @guest CPU is a superset of the @host CPU. + */ virCPUCompareResult cpuGuestData(virCPUDefPtr host, virCPUDefPtr guest, @@ -278,6 +381,27 @@ cpuGuestData(virCPUDefPtr host, } +/** + * cpuBaselineXML: + * + * @xmlCPUs: list of host CPU XML descriptions + * @ncpus: number of CPUs in @xmlCPUs + * @models: list of CPU models that can be considered for the baseline CPU + * @nmodels: number of CPU models in @models + * @flags: bitwise-OR of virConnectBaselineCPUFlags + * + * Computes the most feature-rich CPU which is compatible with all given + * host CPUs. If @models array is NULL, all models supported by libvirt will + * be considered when computing the baseline CPU model, otherwise the baseline + * CPU model will be one of the provided CPU @models. + * + * If @flags includes VIR_CONNECT_BASELINE_CPU_EXPAND_FEATURES then libvirt + * will explicitly list all CPU features that are part of the host CPU, + * without this flag features that are part of the CPU model will not be + * listed. + * + * Returns XML description of the baseline CPU or NULL on error. + */ char * cpuBaselineXML(const char **xmlCPUs, unsigned int ncpus, @@ -353,6 +477,27 @@ cpuBaselineXML(const char **xmlCPUs, } +/** + * cpuBaseline: + * + * @cpus: list of host CPU definitions + * @ncpus: number of CPUs in @cpus + * @models: list of CPU models that can be considered for the baseline CPU + * @nmodels: number of CPU models in @models + * @flags: bitwise-OR of virConnectBaselineCPUFlags + * + * Computes the most feature-rich CPU which is compatible with all given + * host CPUs. If @models array is NULL, all models supported by libvirt will + * be considered when computing the baseline CPU model, otherwise the baseline + * CPU model will be one of the provided CPU @models. + * + * If @flags includes VIR_CONNECT_BASELINE_CPU_EXPAND_FEATURES then libvirt + * will explicitly list all CPU features that are part of the host CPU, + * without this flag features that are part of the CPU model will not be + * listed. + * + * Returns baseline CPU definition or NULL on error. + */ virCPUDefPtr cpuBaseline(virCPUDefPtr *cpus, unsigned int ncpus, @@ -404,6 +549,20 @@ cpuBaseline(virCPUDefPtr *cpus, } +/** + * cpuUpdate: + * + * @guest: guest CPU definition + * @host: host CPU definition + * + * Updates @guest CPU definition according to @host CPU. This is required to + * support guest CPU definition which are relative to host CPU, such as CPUs + * with VIR_CPU_MODE_CUSTOM and optional features or VIR_CPU_MATCH_MINIMUM, or + * CPUs with non-custom mode (VIR_CPU_MODE_HOST_MODEL, + * VIR_CPU_MODE_HOST_PASSTHROUGH). + * + * Returns 0 on success, -1 on error. + */ int cpuUpdate(virCPUDefPtr guest, const virCPUDef *host) @@ -425,6 +584,18 @@ cpuUpdate(virCPUDefPtr guest, return driver->update(guest, host); } + +/** + * cpuHasFeature: + * + * @data: internal CPU representation + * @feature: feature to be checked for + * + * Checks whether @feature is supported by the CPU described by @data. + * + * Returns 1 if the feature is supported, 0 if it's not supported, or + * -1 on error. + */ int cpuHasFeature(const virCPUData *data, const char *feature) @@ -446,6 +617,16 @@ cpuHasFeature(const virCPUData *data, return driver->hasFeature(data, feature); } + +/** + * cpuDataFormat: + * + * @data: internal CPU representation + * + * Formats @data into XML for test purposes. + * + * Returns string representation of the XML describing @data or NULL on error. + */ char * cpuDataFormat(const virCPUData *data) { @@ -466,6 +647,17 @@ cpuDataFormat(const virCPUData *data) return driver->dataFormat(data); } + +/** + * cpuDataParse: + * + * @arch: CPU architecture + * @xmlStr: XML string produced by cpuDataFormat + * + * Parses XML representation of virCPUData structure for test purposes. + * + * Returns internal CPU data structure parsed from the XML or NULL on error. + */ virCPUDataPtr cpuDataParse(virArch arch, const char *xmlStr) @@ -541,6 +733,16 @@ cpuGetArchModels(const char *arch, struct cpuGetModelsData *data) } +/** + * cpuGetModels: + * + * @archName: CPU architecture string + * @models: where to store the list of supported models + * + * Fetches all CPU models supported by libvirt on @archName. + * + * Returns number of supported CPU models or -1 on error. + */ int cpuGetModels(const char *archName, char ***models) { -- 1.9.1

2 2

[libvirt] [PATCH] tests: Fix systemd test with --without-driver-modules
by Jiri Denemark 11 Apr '14

11 Apr '14

Every test that makes use of virmock.h (only virsystemdtest as of now) needs to be linked with -export-dynamic to make sure the LD_PRELOADed mock library can access it's wrap_* symbols. Normally, DRIVER_MODULE_LDFLAGS variable contains -export-dynamic but when --without-driver-modules configure option is used, DRIVER_MODULE_LDFLAGS is empty. This patch turns on -export-dynamic for all tests unconditionally regardless on --without-driver-modules. This fixes virsystemdtest and all future users of virmock.h. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- tests/Makefile.am | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index c5346d1..1e63b86 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -43,6 +43,9 @@ AM_CFLAGS = \ $(COVERAGE_CFLAGS) \ $(WARN_CFLAGS) +AM_LDFLAGS = \ + -export-dynamic + if WITH_DRIVER_MODULES INCLUDES += \ -DTEST_DRIVER_DIR=\"$(top_builddir)/src/.libs\" @@ -921,7 +924,6 @@ virsystemdtest_SOURCES = \ virsystemdtest.c testutils.h testutils.c virsystemdtest_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS) virsystemdtest_LDADD = $(LDADDS) -virsystemdtest_LDFLAGS = $(DRIVER_MODULE_LDFLAGS) else ! WITH_DBUS EXTRA_DIST += virdbustest.c virmockdbus.c virsystemdtest.c -- 1.9.2

2 2

[libvirt] [PATCH] virsh: Add a white line into secret-get-value output
by liyang 11 Apr '14

11 Apr '14

From: Li Yang <liyang.fnst(a)cn.fujitsu.com> Commonly there is a whilt line at the end of the virsh command output, for example: [root@localhost /]# virsh list --name --all virt-tests-vm1 [root@localhost /]# For now the output of secret-get-value like this: [root@localhost /]# virsh secret-get-value b7811f0f-7fcb-d6b0-c12c-2d8807814b33 00111111001111110011111100111111 [root@localhost /] So modify the codes, make output like this: [root@localhost /]# virsh secret-get-value b7811f0f-7fcb-d6b0-c12c-2d8807814b33 00111111001111110011111100111111 [root@localhost /] Signed-off-by: Li Yang <liyang.fnst(a)cn.fujitsu.com> --- tools/virsh-secret.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/virsh-secret.c b/tools/virsh-secret.c index b5acfda..784fd3f 100644 --- a/tools/virsh-secret.c +++ b/tools/virsh-secret.c @@ -284,7 +284,7 @@ cmdSecretGetValue(vshControl *ctl, const vshCmd *cmd) vshError(ctl, "%s", _("Failed to allocate memory")); goto cleanup; } - vshPrint(ctl, "%s", base64); + vshPrint(ctl, "%s\n", base64); memset(base64, 0, strlen(base64)); VIR_FREE(base64); ret = true; -- 1.7.1

1 0

[libvirt] [PATCH] storage: add check for invalid volume name
by Jincheng Miao 11 Apr '14

11 Apr '14

If volume name is a path, storageVolCreateXML appends that name to the specified pool path, that will taint other pools. Adding the volume check is better for sanity. Signed-off-by: Jincheng Miao <jmiao(a)redhat.com> --- src/storage/storage_driver.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c index 2cb8347..c3b807f 100644 --- a/src/storage/storage_driver.c +++ b/src/storage/storage_driver.c @@ -49,6 +49,7 @@ #include "configmake.h" #include "virstring.h" #include "viraccessapicheck.h" +#include "dirname.h" #define VIR_FROM_THIS VIR_FROM_STORAGE @@ -1864,6 +1865,14 @@ storageVolCreateXMLFrom(virStoragePoolPtr obj, goto cleanup; } + /* Make sure the volume name is not a path */ + if (last_component(newvol->name) != newvol->name) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("storage volume name '%s' is a path"), + newvol->name); + goto cleanup; + } + /* Is there ever a valid case for this? */ if (newvol->target.capacity < origvol->target.capacity) newvol->target.capacity = origvol->target.capacity; -- 1.8.3.1

2 2

[libvirt] [PATCH v4] Introduce --without-pm-utils to get rid of pm-is-supported dependency
by Cédric Bosdonnat 11 Apr '14

11 Apr '14

This uses the dbus api of systemd to check the power management capabilities of the node. --- Diff with v3: * Added unit tests vir virSystemdCan* helpers * Make the default for with-pm-utils depending on dbus and systemd detection * Changed the implementation of the helpers to return true for 'yes' and 'challenge' responses, we shouldn't get a 'no' given libvirtd runs as privileged user... but who knows. configure.ac | 24 +++++++++++ libvirt.spec.in | 9 +++++ src/libvirt_private.syms | 3 ++ src/util/virnodesuspend.c | 75 ++++++++++++++++++++++++++-------- src/util/virsystemd.c | 59 +++++++++++++++++++++++++++ src/util/virsystemd.h | 6 +++ tests/virsystemdmock.c | 22 ++++++++++ tests/virsystemdtest.c | 100 +++++++++++++++++++++++++++++++++++++++++++++- 8 files changed, 281 insertions(+), 17 deletions(-) diff --git a/configure.ac b/configure.ac index 73efffa..34e5ec2 100644 --- a/configure.ac +++ b/configure.ac @@ -563,6 +563,10 @@ AC_ARG_WITH([chrdev-lock-files], [location for UUCP style lock files for character devices (use auto for default paths on some platforms) @<:@default=auto@:>@])]) m4_divert_text([DEFAULTS], [with_chrdev_lock_files=auto]) +AC_ARG_WITH([pm-utils], + [AS_HELP_STRING([--with-pm-utils], + [use pm-utils for power management @<:@default=yes@:>@])]) +m4_divert_text([DEFAULTS], [with_pm_utils=check]) dnl dnl in case someone want to build static binaries @@ -1621,6 +1625,25 @@ fi AM_CONDITIONAL([WITH_PHYP],[test "$with_phyp" = "yes"]) +dnl +dnl Should we build with pm-utils support? +dnl +set -x +if test "$with_pm_utils" = "check"; then + with_pm_utils=yes + if test "$with_dbus" = "yes"; then + if test "$init_systemd" = "yes"; then + with_pm_utils=no + fi + fi +fi + +if test "$with_pm_utils" = "yes"; then + AC_DEFINE_UNQUOTED([WITH_PM_UTILS], 1, [whether to use pm-utils]) +fi +AM_CONDITIONAL([WITH_PM_UTILS], [test "$with_pm_utils" = "yes"]) +set +x + dnl virsh libraries VIRSH_LIBS="$VIRSH_LIBS $READLINE_LIBS" AC_SUBST([VIRSH_LIBS]) @@ -2845,6 +2868,7 @@ AC_MSG_NOTICE([ rbd: $LIBRBD_LIBS]) else AC_MSG_NOTICE([ rbd: no]) fi +AC_MSG_NOTICE([pm-utils: $with_pm_utils]) AC_MSG_NOTICE([]) AC_MSG_NOTICE([Test suite]) diff --git a/libvirt.spec.in b/libvirt.spec.in index eab9b23..5c20955 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -132,6 +132,7 @@ %define with_libssh2 0%{!?_without_libssh2:0} %define with_wireshark 0%{!?_without_wireshark:0} %define with_systemd_daemon 0%{!?_without_systemd_daemon:0} +%define with_pm_utils 1 # Non-server/HV driver defaults which are always enabled %define with_sasl 0%{!?_without_sasl:1} @@ -182,6 +183,7 @@ %if 0%{?fedora} >= 17 || 0%{?rhel} >= 7 %define with_systemd 1 %define with_systemd_daemon 1 + %define with_pm_utils 0 %endif # Fedora 18 / RHEL-7 are first where firewalld support is enabled @@ -1138,8 +1140,10 @@ Requires: nc Requires: gettext # Needed by virt-pki-validate script. Requires: gnutls-utils +%if %{with_pm_utils} # Needed for probing the power management features of the host. Requires: pm-utils +%{endif} %if %{with_sasl} Requires: cyrus-sasl # Not technically required, but makes 'out-of-box' config @@ -1395,6 +1399,10 @@ driver %define _without_systemd_daemon --without-systemd-daemon %endif +%if ! %{with_pm_utils} + %define _without_pm_utils --without-pm-utils +%endif + %define when %(date +"%%F-%%T") %define where %(hostname) %define who %{?packager}%{!?packager:Unknown} @@ -1471,6 +1479,7 @@ rm -f po/stamp-po %{?_with_firewalld} \ %{?_without_wireshark} \ %{?_without_systemd_daemon} \ + %{?_without_pm_utils} \ %{with_packager} \ %{with_packager_version} \ --with-qemu-user=%{qemu_user} \ diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 38fbf63..ce51bdf 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1879,6 +1879,9 @@ virSysinfoSetup; # util/virsystemd.h +virSystemdCanHibernate; +virSystemdCanHybridSleep; +virSystemdCanSuspend; virSystemdCreateMachine; virSystemdMakeMachineName; virSystemdMakeScopeName; diff --git a/src/util/virnodesuspend.c b/src/util/virnodesuspend.c index 8088931..b1eddff 100644 --- a/src/util/virnodesuspend.c +++ b/src/util/virnodesuspend.c @@ -22,6 +22,7 @@ #include <config.h> #include "virnodesuspend.h" +# include "virsystemd.h" #include "vircommand.h" #include "virthread.h" #include "datatypes.h" @@ -245,23 +246,9 @@ int nodeSuspendForDuration(unsigned int target, return ret; } - -/** - * virNodeSuspendSupportsTarget: - * @target: The power management target to check whether it is supported - * by the host. Values could be: - * VIR_NODE_SUSPEND_TARGET_MEM - * VIR_NODE_SUSPEND_TARGET_DISK - * VIR_NODE_SUSPEND_TARGET_HYBRID - * @supported: set to true if supported, false otherwise - * - * Run the script 'pm-is-supported' (from the pm-utils package) - * to find out if @target is supported by the host. - * - * Returns 0 if the query was successful, -1 on failure. - */ +#ifdef WITH_PM_UTILS static int -virNodeSuspendSupportsTarget(unsigned int target, bool *supported) +virNodeSuspendSupportsTargetPMUtils(unsigned int target, bool *supported) { virCommandPtr cmd; int status; @@ -300,6 +287,62 @@ virNodeSuspendSupportsTarget(unsigned int target, bool *supported) virCommandFree(cmd); return ret; } +#endif + +static int +virNodeSuspendSupportsTargetSystemd(unsigned int target, bool *supported) +{ + int ret = -1; + + if (virNodeSuspendInitialize() < 0) + return -1; + + *supported = false; + + switch (target) { + case VIR_NODE_SUSPEND_TARGET_MEM: + ret = virSystemdCanSuspend(supported); + break; + case VIR_NODE_SUSPEND_TARGET_DISK: + ret = virSystemdCanHibernate(supported); + break; + case VIR_NODE_SUSPEND_TARGET_HYBRID: + ret = virSystemdCanHybridSleep(supported); + break; + default: + return ret; + } + + return ret; +} + +/** + * virNodeSuspendSupportsTarget: + * @target: The power management target to check whether it is supported + * by the host. Values could be: + * VIR_NODE_SUSPEND_TARGET_MEM + * VIR_NODE_SUSPEND_TARGET_DISK + * VIR_NODE_SUSPEND_TARGET_HYBRID + * @supported: set to true if supported, false otherwise + * + * Run the script 'pm-is-supported' (from the pm-utils package) + * to find out if @target is supported by the host. + * + * Returns 0 if the query was successful, -1 on failure. + */ +static int +virNodeSuspendSupportsTarget(unsigned int target, bool *supported) +{ + int ret; + + ret = virNodeSuspendSupportsTargetSystemd(target, supported); +#ifdef WITH_PM_UTILS + if (ret < 0) + ret = virNodeSuspendSupportsTargetPMUtils(target, supported); +#endif + + return ret; +} /** * virNodeSuspendGetTargetMask: diff --git a/src/util/virsystemd.c b/src/util/virsystemd.c index 93b3f9c..e9ca564 100644 --- a/src/util/virsystemd.c +++ b/src/util/virsystemd.c @@ -325,3 +325,62 @@ virSystemdNotifyStartup(void) sd_notify(0, "READY=1"); #endif } + +static int +virSystemdPMSupportTarget(const char *methodName, bool *result) +{ + int ret; + DBusConnection *conn; + DBusMessage *message = NULL; + char *response; + + ret = virDBusIsServiceEnabled("org.freedesktop.login1"); + if (ret < 0) + return ret; + + if ((ret = virDBusIsServiceRegistered("org.freedesktop.login1")) < 0) + return ret; + + if (!(conn = virDBusGetSystemBus())) + return -1; + + ret = -1; + + if (virDBusCallMethod(conn, + &message, + NULL, + "org.freedesktop.login1", + "/org/freedesktop/login1", + "org.freedesktop.login1.Manager", + methodName, + NULL) < 0) + return ret; + + if ((ret = virDBusMessageRead(message, "s", &response)) < 0) + goto cleanup; + + *result = STREQ("yes", response) || STREQ("challenge", response); + + ret = 0; + + cleanup: + dbus_message_unref(message); + VIR_FREE(response); + + return ret; +} + +int virSystemdCanSuspend(bool *result) +{ + return virSystemdPMSupportTarget("CanSuspend", result); +} + +int virSystemdCanHibernate(bool *result) +{ + return virSystemdPMSupportTarget("CanHibernate", result); +} + +int virSystemdCanHybridSleep(bool *result) +{ + return virSystemdPMSupportTarget("CanHybridSleep", result); +} diff --git a/src/util/virsystemd.h b/src/util/virsystemd.h index 7fed456..491c9b7 100644 --- a/src/util/virsystemd.h +++ b/src/util/virsystemd.h @@ -48,4 +48,10 @@ int virSystemdTerminateMachine(const char *name, void virSystemdNotifyStartup(void); +int virSystemdCanSuspend(bool *result); + +int virSystemdCanHibernate(bool *result); + +int virSystemdCanHybridSleep(bool *result); + #endif /* __VIR_SYSTEMD_H__ */ diff --git a/tests/virsystemdmock.c b/tests/virsystemdmock.c index 23167db..cc385ec 100644 --- a/tests/virsystemdmock.c +++ b/tests/virsystemdmock.c @@ -76,10 +76,21 @@ DBusMessage *dbus_connection_send_with_reply_and_block(DBusConnection *connectio } else { reply = dbus_message_new(DBUS_MESSAGE_TYPE_METHOD_RETURN); } + } else if (STREQ(service, "org.freedesktop.login1")) { + char *supported = getenv("RESULT_SUPPORT"); + DBusMessageIter iter; + reply = dbus_message_new(DBUS_MESSAGE_TYPE_METHOD_RETURN); + dbus_message_iter_init_append(reply, &iter); + + if (!dbus_message_iter_append_basic(&iter, + DBUS_TYPE_STRING, + &supported)) + goto error; } else if (STREQ(service, "org.freedesktop.DBus") && STREQ(member, "ListActivatableNames")) { const char *svc1 = "org.foo.bar.wizz"; const char *svc2 = "org.freedesktop.machine1"; + const char *svc3 = "org.freedesktop.login1"; DBusMessageIter iter, sub; reply = dbus_message_new(DBUS_MESSAGE_TYPE_METHOD_RETURN); dbus_message_iter_init_append(reply, &iter); @@ -95,11 +106,17 @@ DBusMessage *dbus_connection_send_with_reply_and_block(DBusConnection *connectio DBUS_TYPE_STRING, &svc2)) goto error; + if (!getenv("FAIL_NO_SERVICE") && + !dbus_message_iter_append_basic(&sub, + DBUS_TYPE_STRING, + &svc3)) + goto error; dbus_message_iter_close_container(&iter, &sub); } else if (STREQ(service, "org.freedesktop.DBus") && STREQ(member, "ListNames")) { const char *svc1 = "org.foo.bar.wizz"; const char *svc2 = "org.freedesktop.systemd1"; + const char *svc3 = "org.freedesktop.login1"; DBusMessageIter iter, sub; reply = dbus_message_new(DBUS_MESSAGE_TYPE_METHOD_RETURN); dbus_message_iter_init_append(reply, &iter); @@ -115,6 +132,11 @@ DBusMessage *dbus_connection_send_with_reply_and_block(DBusConnection *connectio DBUS_TYPE_STRING, &svc2)) goto error; + if ((!getenv("FAIL_NO_SERVICE") && !getenv("FAIL_NOT_REGISTERED")) && + !dbus_message_iter_append_basic(&sub, + DBUS_TYPE_STRING, + &svc3)) + goto error; dbus_message_iter_close_container(&iter, &sub); } else { reply = dbus_message_new(DBUS_MESSAGE_TYPE_METHOD_RETURN); diff --git a/tests/virsystemdtest.c b/tests/virsystemdtest.c index 4fc5137..a9583e7 100644 --- a/tests/virsystemdtest.c +++ b/tests/virsystemdtest.c @@ -205,7 +205,6 @@ static int testCreateBadSystemd(const void *opaque ATTRIBUTE_UNUSED) return 0; } - struct testScopeData { const char *name; const char *partition; @@ -237,6 +236,86 @@ testScopeName(const void *opaque) return ret; } +typedef int (*virSystemdCanHelper)(bool * result); +struct testPMSupportData { + virSystemdCanHelper tested; +}; + +static int testPMSupportHelper(const void *opaque) +{ + int rv; + bool result; + size_t i; + const char *results[4] = {"yes", "no", "na", "challenge"}; + int expected[4] = {1, 0, 0, 1}; + const struct testPMSupportData *data = opaque; + + for (i = 0; i < 4; i++) { + setenv("RESULT_SUPPORT", results[i], 1); + if ((rv = data->tested(&result)) < 0) { + fprintf(stderr, "%s", "Unexpected canSuspend error\n"); + return -1; + } + + if (result != expected[i]) { + fprintf(stderr, "Unexpected result for answer '%s'\n", results[i]); + goto error; + } + unsetenv("RESULT_SUPPORT"); + } + + return 0; +error: + unsetenv("RESULT_SUPPORT"); + return -1; +} + +static int testPMSupportHelperNoSystemd(const void *opaque) +{ + int rv; + bool result; + const struct testPMSupportData *data = opaque; + + setenv("FAIL_NO_SERVICE", "1", 1); + + if ((rv = data->tested(&result)) == 0) { + unsetenv("FAIL_NO_SERVICE"); + fprintf(stderr, "%s", "Unexpected canSuspend success\n"); + return -1; + } + unsetenv("FAIL_NO_SERVICE"); + + if (rv != -2) { + fprintf(stderr, "%s", "Unexpected canSuspend error\n"); + return -1; + } + + return 0; +} + +static int testPMSupportSystemdNotRunning(const void *opaque) +{ + int rv; + bool result; + const struct testPMSupportData *data = opaque; + + setenv("FAIL_NOT_REGISTERED", "1", 1); + + if ((rv = data->tested(&result)) == 0) { + unsetenv("FAIL_NOT_REGISTERED"); + fprintf(stderr, "%s", "Unexpected canSuspend success\n"); + return -1; + } + unsetenv("FAIL_NOT_REGISTERED"); + + if (rv != -2) { + fprintf(stderr, "%s", "Unexpected canSuspend error\n"); + return -1; + } + + return 0; +} + static int mymain(void) { @@ -275,6 +354,25 @@ mymain(void) TEST_SCOPE("demo", "/machine/eng-dept/testing!stuff", "machine-eng\\x2ddept-testing\\x21stuff-lxc\\x2ddemo.scope"); +# define TESTS_PM_SUPPORT_HELPER(name, function) \ + do { \ + struct testPMSupportData data = { \ + function \ + }; \ + if (virtTestRun("Test " name " ", testPMSupportHelper, &data) < 0) \ + ret = -1; \ + if (virtTestRun("Test " name " no systemd ", \ + testPMSupportHelperNoSystemd, &data) < 0) \ + ret = -1; \ + if (virtTestRun("Test systemd " name " not running ", \ + testPMSupportSystemdNotRunning, &data) < 0) \ + ret = -1; \ + } while (0) + + TESTS_PM_SUPPORT_HELPER("canSuspend", &virSystemdCanSuspend); + TESTS_PM_SUPPORT_HELPER("canHibernate", &virSystemdCanHibernate); + TESTS_PM_SUPPORT_HELPER("canHybridSleep", &virSystemdCanHybridSleep); + return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; } -- 1.8.4.5

3 2

[libvirt] [PATCH v2 1/1] Enable QEMU_CAPS_PCI_MULTIBUS capability for QEMU2.0 forward on PPC64.
by Li Zhang 11 Apr '14

11 Apr '14

From: Li Zhang <zhlcindy(a)linux.vnet.ibm.com> For QEMU2.0 forward version on PPC64, it supports PCI multibus. Currently, libvirt still disables it which causes an error "Bus 'pci' not found". Signed-off-by: Li Zhang <zhlcindy(a)linux.vnet.ibm.com> --- src/qemu/qemu_capabilities.c | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 381b3ec..812bbe0 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -2813,13 +2813,16 @@ virQEMUCapsInitHelp(virQEMUCapsPtr qemuCaps, uid_t runUid, gid_t runGid) false) < 0) goto cleanup; - /* Currently only x86_64 and i686 support PCI-multibus. */ - if (qemuCaps->arch == VIR_ARCH_X86_64 || - qemuCaps->arch == VIR_ARCH_I686) { + /* Currently only x86_64, i686 and PPC64 support PCI-multibus. */ + if ((qemuCaps->arch == VIR_ARCH_PPC64 && + qemuCaps->version >= 2000000) || + ARCH_IS_X86(qemuCaps->arch)) { virQEMUCapsSet(qemuCaps, QEMU_CAPS_PCI_MULTIBUS); - } else { - /* -no-acpi is not supported on other archs - * even if qemu reports it in -help */ + } + + /* -no-acpi is not supported on non-X86 archs + * even if qemu reports it in -help */ + if (!ARCH_IS_X86(qemuCaps->arch)) { virQEMUCapsClear(qemuCaps, QEMU_CAPS_NO_ACPI); } @@ -2940,11 +2943,14 @@ virQEMUCapsInitArchQMPBasic(virQEMUCapsPtr qemuCaps, } /* - * Currently only x86_64 and i686 support PCI-multibus, - * -no-acpi and -no-kvm-pit-reinjection. + * Currently only x86_64, i686 and PPC64 support PCI-multibus, + * Moreover, the first two arches support -no-acpi and + * -no-kvm-pit-reinjection. */ - if (qemuCaps->arch == VIR_ARCH_X86_64 || - qemuCaps->arch == VIR_ARCH_I686) { + if (qemuCaps->arch == VIR_ARCH_PPC64 && + qemuCaps->version >= 2000000) { + virQEMUCapsSet(qemuCaps, QEMU_CAPS_PCI_MULTIBUS); + } else if (ARCH_IS_X86(qemuCaps->arch)) { virQEMUCapsSet(qemuCaps, QEMU_CAPS_PCI_MULTIBUS); virQEMUCapsSet(qemuCaps, QEMU_CAPS_NO_ACPI); virQEMUCapsSet(qemuCaps, QEMU_CAPS_NO_KVM_PIT); -- 1.8.2.1

3 4

[libvirt] [PATCH 0/5] progress towards removing virStorageFileMetadata
by Eric Blake 11 Apr '14

11 Apr '14

I'm almost to the point where virStorageSource can track everything that virStorageFileMetadata was used for, so that we can use one struct instead of two. But while working on this today, I noticed that virStorageFileChainLookup() does not have any unit tests, so I'll be writing those before removing the two remaining redundant fields. Eric Blake (5): conf: provide details on network backing store conf: expose probe for non-local storage conf: delete useless backingStoreIsFile field conf: return backing information separately from metadata conf: delete useless backingStoreFormat field src/conf/domain_conf.c | 2 +- src/libvirt_private.syms | 1 + src/storage/storage_backend_fs.c | 34 ++++---- src/storage/storage_backend_gluster.c | 14 ++-- src/util/virstoragefile.c | 146 +++++++++++++++++++++------------- src/util/virstoragefile.h | 9 ++- tests/virstoragetest.c | 49 ++++-------- 7 files changed, 135 insertions(+), 120 deletions(-) -- 1.9.0

2 12

[libvirt] [PATCH] conf: make virstoragetest debug easier
by Eric Blake 10 Apr '14

10 Apr '14

I'm tired of alternating between test failures due to bugs in my refactoring work, vs. test failures due to leftovers in the file system from the previous test. This patch has no impact when the testsuite is successful, but doeesn't hurt either. * tests/virstoragetest.c (testPrepImages): Clean up from prior failed test. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Pushing under the trivial rule. tests/virstoragetest.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/virstoragetest.c b/tests/virstoragetest.c index 13b5032..029561c 100644 --- a/tests/virstoragetest.c +++ b/tests/virstoragetest.c @@ -102,6 +102,9 @@ testPrepImages(void) if (!qemuimg) goto skip; + /* Clean up from any earlier failed tests */ + virFileDeleteTree(datadir); + /* See if qemu-img supports '-o compat=xxx'. If so, we force the * use of both v2 and v3 files; if not, it is v2 only but the test * still works. */ -- 1.9.0

1 0

[libvirt] [PATCH 00/13] Add multiple trace backend function and add new ftrace backend for libvirt
by yangzy.fnst＠cn.fujitsu.com 09 Apr '14

09 Apr '14

From: Xinghai Yu <yuxinghai(a)cn.fujitsu.com> This patch set will let libvirt to support multiple trace backend function and add a new 'ftrace' backend at the same time. Then, libvirt would have 2 trace backend: dtrace, ftrace.They can be used alone or together. Patchs 1,2,3,4,5 are used for supporting multiple trace backend function. Patch 6 are used for adding ftrace as a new trace backend for libvirt. Patchs 7,8,9,10,11,12,13 add ftrace initial code in programs who use it. Thanks very much for Stefan Hajnoczi for I have used his scripts in patch 4 which commited in qemu. Thanks very much for Eiichi Tsukata for I have used his ftrace codes in patch 6 which commited in qemu. Backgroud: The existing trace mechanism in libvirt is dtrace. Although the dtrace can work, it's not work well enough. Every time we want get information from the trace point we must write a systemtap script and run it together with libvirt. That's really unpractical on some occasion, especially on production server since the systemtap script can't be executed automatically. And some problems may be not easy to reproduce, then it will cost a lot of time to get the trace information again. So I think it is essential to add supporting for record the trace information automatically in libvirt to satisfy the user's requirement. That's why I implemented multiple trace backend function and ftrace support in libvirt. Xinghai Yu (13): configure.ac: Define new macro 'WITH_TRACE_PROBES' to indicate trace function are available Makefile.am: Add new multiple trace backend supporting framework src: Use new tracepoint declaration files to replace the old dtrace declaration files to support multiple trace function src: Add scripts 'tracetool' to supporting the translation from tracepoint files to multiple trace backend supporting files daemon,src: Use new tracepoint function calls to replace old PROBE macro calls to support multiple trace function configure.ac, Makefile.am, src: Add new ftrace backend src/libvirt.c: Init ftrace backend in libvirt library so that programs containing it can use ftrace src/qemu/qemu_driver.c: Init ftrace backend in qemu driver so that qemu driver can support ftrace src/locking/lock_daemon.c: Init ftrace backend in program 'virtlockd' src/util/iohelper.c: Init ftrace backend in program 'libvirt_iohelper' src/storage/parthelper.c: Init ftrace backend in program 'libvirt_parthelper' src/lxc/lxc_controller.c: Init ftrace backend in program 'libvirt_lxc' src/security/virt-aa-helper.c: Init ftrace backend in program 'virt-aa-helper' config-post.h | 2 +- configure.ac | 24 ++++ daemon/Makefile.am | 13 +- daemon/remote.c | 77 +++++------ src/Makefile.am | 179 +++++++++++++++++++------ src/ftrace.c | 91 +++++++++++++ src/ftrace.h | 14 ++ src/internal.h | 69 +---------- src/libvirt.c | 9 ++ src/libvirt_probes.d | 82 ------------ src/libvirt_qemu_probes.d | 22 ---- src/libvirt_qemu_trace_events | 15 +++ src/libvirt_trace_events | 70 ++++++++++ src/locking/lock_daemon.c | 9 ++ src/lxc/lxc_controller.c | 9 ++ src/qemu/qemu_driver.c | 10 ++ src/qemu/qemu_monitor.c | 42 +++--- src/qemu/qemu_monitor_json.c | 12 +- src/qemu/qemu_monitor_text.c | 8 +- src/rpc/virkeepalive.c | 42 +++--- src/rpc/virnetclient.c | 43 +++--- src/rpc/virnetserverclient.c | 31 ++--- src/rpc/virnetsocket.c | 22 ++-- src/rpc/virnettlscontext.c | 42 +++--- src/security/virt-aa-helper.c | 9 ++ src/storage/parthelper.c | 9 ++ src/tracetool.py | 103 +++++++++++++++ src/tracetool/__init__.py | 268 ++++++++++++++++++++++++++++++++++++++ src/tracetool/backend/__init__.py | 120 +++++++++++++++++ src/tracetool/backend/trace.py | 112 ++++++++++++++++ src/tracetool/format/__init__.py | 103 +++++++++++++++ src/tracetool/format/c.py | 22 ++++ src/tracetool/format/d.py | 20 +++ src/tracetool/format/h.py | 22 ++++ src/util/iohelper.c | 9 ++ src/util/vireventpoll.c | 66 +++++----- src/util/virobject.c | 16 ++- tests/Makefile.am | 13 +- tools/virsh.c | 3 + 39 files changed, 1429 insertions(+), 401 deletions(-) create mode 100644 src/ftrace.c create mode 100644 src/ftrace.h delete mode 100644 src/libvirt_probes.d delete mode 100644 src/libvirt_qemu_probes.d create mode 100644 src/libvirt_qemu_trace_events create mode 100644 src/libvirt_trace_events create mode 100644 src/tracetool.py create mode 100644 src/tracetool/__init__.py create mode 100644 src/tracetool/backend/__init__.py create mode 100644 src/tracetool/backend/trace.py create mode 100644 src/tracetool/format/__init__.py create mode 100644 src/tracetool/format/c.py create mode 100644 src/tracetool/format/d.py create mode 100644 src/tracetool/format/h.py -- 1.8.3.1

4 20

[libvirt] [PATCH] Add support for timestamping QEMU logs
by Ján Tomko 09 Apr '14

09 Apr '14

QEMU commit 5e2ac51 added a boolean '-msg timestamp=[on|off]' option, which can enable timestamps on errors: $ qemu-system-x86_64 -msg timestamp=on zghhdorf 2014-04-09T13:25:46.779484Z qemu-system-x86_64: -msg timestamp=on: could not open disk image zghhdorf: Could not open 'zghhdorf': No such file or directory Enable this timestamp if the QEMU binary supports it. Add a 'log_timestamp' option to qemu.conf for disabling this behavior. --- src/qemu/libvirtd_qemu.aug | 3 +++ src/qemu/qemu.conf | 8 ++++++++ src/qemu/qemu_capabilities.c | 5 +++++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 4 ++++ src/qemu/qemu_conf.c | 4 ++++ src/qemu/qemu_conf.h | 2 ++ src/qemu/test_libvirtd_qemu.aug.in | 1 + tests/qemucapabilitiesdata/caps_1.6.0-1.caps | 1 + tests/qemucapabilitiesdata/caps_1.6.50-1.caps | 1 + tests/qemuxml2argvtest.c | 1 + 11 files changed, 31 insertions(+) diff --git a/src/qemu/libvirtd_qemu.aug b/src/qemu/libvirtd_qemu.aug index a9ff421..e985d22 100644 --- a/src/qemu/libvirtd_qemu.aug +++ b/src/qemu/libvirtd_qemu.aug @@ -85,6 +85,8 @@ module Libvirtd_qemu = | int_entry "migration_port_min" | int_entry "migration_port_max" + let log_entry = bool_entry "log_timestamp" + (* Each entry in the config is one of the following ... *) let entry = vnc_entry | spice_entry @@ -96,6 +98,7 @@ module Libvirtd_qemu = | device_entry | rpc_entry | network_entry + | log_entry let comment = [ label "#comment" . del /#[ \t]*/ "# " . store /([^ \t\n][^\n]*)?/ . del /\n/ "\n" ] let empty = [ label "#empty" . eol ] diff --git a/src/qemu/qemu.conf b/src/qemu/qemu.conf index f0e802f..42f812d 100644 --- a/src/qemu/qemu.conf +++ b/src/qemu/qemu.conf @@ -465,3 +465,11 @@ # #migration_port_min = 49152 #migration_port_max = 49215 + + + +# Timestamp QEMU's log messages (if QEMU supports it) +# +# Defaults to 1. +# +#log_timestamp = 0 diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 381b3ec..71bf5f2 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -254,6 +254,7 @@ VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST, "spiceport", "usb-kbd", /* 165 */ + "msg-timestamp", ); @@ -1143,6 +1144,9 @@ virQEMUCapsComputeCmdFlags(const char *help, if (strstr(help, "-machine")) virQEMUCapsSet(qemuCaps, QEMU_CAPS_MACHINE_OPT); + if (strstr(help, "-msg timestamp")) + virQEMUCapsSet(qemuCaps, QEMU_CAPS_MSG_TIMESTAMP); + /* USB option is supported v1.3.0 onwards */ if (qemuCaps->version >= 1003000) virQEMUCapsSet(qemuCaps, QEMU_CAPS_MACHINE_USB_OPT); @@ -2329,6 +2333,7 @@ static struct virQEMUCapsCommandLineProps virQEMUCapsCommandLine[] = { { "boot-opts", "strict", QEMU_CAPS_BOOT_STRICT }, { "boot-opts", "reboot-timeout", QEMU_CAPS_REBOOT_TIMEOUT }, { "spice", "disable-agent-file-xfer", QEMU_CAPS_SPICE_FILE_XFER_DISABLE }, + { "msg", "timestamp", QEMU_CAPS_MSG_TIMESTAMP }, }; static int diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index df8c978..f1ea05b 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -204,6 +204,7 @@ enum virQEMUCapsFlags { QEMU_CAPS_SPICE_FILE_XFER_DISABLE = 163, /* -spice disable-agent-file-xfer */ QEMU_CAPS_CHARDEV_SPICEPORT = 164, /* -chardev spiceport */ QEMU_CAPS_DEVICE_USB_KBD = 165, /* -device usb-kbd */ + QEMU_CAPS_MSG_TIMESTAMP = 166, /* -msg timestamp */ QEMU_CAPS_LAST, /* this must always be the last item */ }; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 379c094..286070a 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -9735,6 +9735,10 @@ qemuBuildCommandLine(virConnectPtr conn, virCommandSetMaxMemLock(cmd, memKB * 1024); } + if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_MSG_TIMESTAMP) && + cfg->logTimestamp) + virCommandAddArgList(cmd, "-msg", "timestamp=on", NULL); + virObjectUnref(cfg); return cmd; diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index 198ee2f..e487f5e 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -255,6 +255,8 @@ virQEMUDriverConfigPtr virQEMUDriverConfigNew(bool privileged) cfg->keepAliveCount = 5; cfg->seccompSandbox = -1; + cfg->logTimestamp = true; + return cfg; error: @@ -576,6 +578,8 @@ int virQEMUDriverConfigLoadFile(virQEMUDriverConfigPtr cfg, GET_VALUE_STR("migration_address", cfg->migrationAddress); + GET_VALUE_BOOL("log_timestamp", cfg->logTimestamp); + ret = 0; cleanup: diff --git a/src/qemu/qemu_conf.h b/src/qemu/qemu_conf.h index a36ea63..5d2983a 100644 --- a/src/qemu/qemu_conf.h +++ b/src/qemu/qemu_conf.h @@ -167,6 +167,8 @@ struct _virQEMUDriverConfig { char *migrationAddress; int migrationPortMin; int migrationPortMax; + + bool logTimestamp; }; /* Main driver state */ diff --git a/src/qemu/test_libvirtd_qemu.aug.in b/src/qemu/test_libvirtd_qemu.aug.in index b2328d3..30a4257 100644 --- a/src/qemu/test_libvirtd_qemu.aug.in +++ b/src/qemu/test_libvirtd_qemu.aug.in @@ -72,3 +72,4 @@ module Test_libvirtd_qemu = { "migration_address" = "127.0.0.1" } { "migration_port_min" = "49152" } { "migration_port_max" = "49215" } +{ "log_timestamp" = "0" } diff --git a/tests/qemucapabilitiesdata/caps_1.6.0-1.caps b/tests/qemucapabilitiesdata/caps_1.6.0-1.caps index 597f873..55ad973 100644 --- a/tests/qemucapabilitiesdata/caps_1.6.0-1.caps +++ b/tests/qemucapabilitiesdata/caps_1.6.0-1.caps @@ -142,4 +142,5 @@ <flag name='spice-file-xfer-disable'/> <flag name='spiceport'/> <flag name='usb-kbd'/> + <flag name='msg-timestamp'/> </qemuCaps> diff --git a/tests/qemucapabilitiesdata/caps_1.6.50-1.caps b/tests/qemucapabilitiesdata/caps_1.6.50-1.caps index 0c1dd87..37b1a9a 100644 --- a/tests/qemucapabilitiesdata/caps_1.6.50-1.caps +++ b/tests/qemucapabilitiesdata/caps_1.6.50-1.caps @@ -140,4 +140,5 @@ <flag name='spice-file-xfer-disable'/> <flag name='spiceport'/> <flag name='usb-kbd'/> + <flag name='msg-timestamp'/> </qemuCaps> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 13ed4f6..3e81998 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -582,6 +582,7 @@ mymain(void) unsetenv("SDL_AUDIODRIVER"); DO_TEST("minimal", QEMU_CAPS_NAME); + DO_TEST("minimal-msg-timestamp", QEMU_CAPS_NAME, QEMU_CAPS_MSG_TIMESTAMP); DO_TEST("minimal-s390", QEMU_CAPS_NAME); DO_TEST("machine-aliases1", NONE); DO_TEST("machine-aliases2", QEMU_CAPS_KVM); -- 1.8.3.2

1 1

[libvirt] [PATCH] Fix build on mingw32
by Ján Tomko 09 Apr '14

09 Apr '14

My commit 897808e added a parameter to virCgroupGetPercpuStats, but didn't change the stub for systems where cgroups are not supported. --- Pushed as a build-breaker fix. src/util/vircgroup.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c index 74e0907..c7ebf8d 100644 --- a/src/util/vircgroup.c +++ b/src/util/vircgroup.c @@ -4469,7 +4469,8 @@ virCgroupGetPercpuStats(virCgroupPtr group ATTRIBUTE_UNUSED, virTypedParameterPtr params ATTRIBUTE_UNUSED, unsigned int nparams ATTRIBUTE_UNUSED, int start_cpu ATTRIBUTE_UNUSED, - unsigned int ncpus ATTRIBUTE_UNUSED) + unsigned int ncpus ATTRIBUTE_UNUSED, + unsigned int nvcpupids ATTRIBUTE_UNUSED) { virReportSystemError(ENOSYS, "%s", _("Control groups not supported on this platform")); -- 1.8.3.2

1 0

[libvirt] [PATCH 0/6] qemuDomainGetPercpuStats cleanups
by Ján Tomko 09 Apr '14

09 Apr '14

This series removes qemuDomainGetPercpuStats in favor of virCgroupGetPercpuStats, fixes incorrect startcpu boundaries check and cleans the code up. Ján Tomko (6): Don't require domain obj in qemuDomainGetPercpuStats Fix return value of virCgroupGetPercpuStats Extend virCgroupGetPercpuStats to fill in vcputime too Rename id, max_id to need_cpus, total_cpus Check maximum startcpu value correctly Clean up virCgroupGetPercpuStats src/lxc/lxc_driver.c | 2 +- src/qemu/qemu_driver.c | 163 +------------------------------------------------ src/util/vircgroup.c | 115 ++++++++++++++++++++++++++++------ src/util/vircgroup.h | 3 +- tests/vircgrouptest.c | 2 +- 5 files changed, 103 insertions(+), 182 deletions(-) -- 1.8.3.2

2 8

[libvirt] [PATCH] virsh: Fix comment of vshCmdInfo
by liyang 09 Apr '14

09 Apr '14

From: Li Yang <liyang.fnst(a)cn.fujitsu.com> The original comment of vshCmdInfo: "name" - command name Actually it's 'help' and the short description of command, not the command name. Signed-off-by: Li Yang <liyang.fnst(a)cn.fujitsu.com> --- tools/virsh.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/virsh.h b/tools/virsh.h index 3e0251b..1ffc003 100644 --- a/tools/virsh.h +++ b/tools/virsh.h @@ -154,7 +154,7 @@ typedef char **(*vshCompleter)(unsigned int flags); * vshCmdInfo -- name/value pair for information about command * * Commands should have at least the following names: - * "name" - command name + * "help" - short description of command * "desc" - description of command, or empty string */ struct _vshCmdInfo { -- 1.7.1

2 1

[libvirt] [PATCH 0/6] add fields to virStorageFileMetadata
by Eric Blake 09 Apr '14

09 Apr '14

I'm finally happy enough that I'm populating new fields correctly; I still need to visit uses of the old fields to swap them over to using the new fields before I can finally merge the virStorageFileMetadata and virStorageSource structs into one. I posted an RFC version of patch 4 earlier: https://www.redhat.com/archives/libvir-list/2014-April/msg00047.html since then, I've cleaned things up so that it passes the testsuite the first time through. Eric Blake (6): conf: track user vs. canonical name through full chain lookup conf: earlier allocation during backing chain crawl conf: rename some test fields conf: track more fields in backing chain metadata conf: start testing contents of the new backing chain fields conf: test for more fields src/util/virstoragefile.c | 221 ++++++++++++++++++++++++++++--------------- src/util/virstoragefile.h | 36 ++++++- tests/virstoragetest.c | 234 +++++++++++++++++++++++++++++++++++----------- 3 files changed, 358 insertions(+), 133 deletions(-) -- 1.9.0

2 13

[libvirt] [PATCH] qemu: Unexport qemuBuildNetworkDriveURI()
by Peter Krempa 09 Apr '14

09 Apr '14

The function isn't used in any other file. Convert it to static. --- Notes: Pushed as trivial. src/qemu/qemu_command.c | 2 +- src/qemu/qemu_command.h | 7 ------- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 3942a23..8b4a57a 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -3605,7 +3605,7 @@ qemuNetworkDriveGetPort(int protocol, #define QEMU_DEFAULT_NBD_PORT "10809" -char * +static char * qemuBuildNetworkDriveURI(int protocol, const char *src, size_t nhosts, diff --git a/src/qemu/qemu_command.h b/src/qemu/qemu_command.h index d5e8a4d..bad6ac0 100644 --- a/src/qemu/qemu_command.h +++ b/src/qemu/qemu_command.h @@ -182,13 +182,6 @@ char * qemuBuildHubDevStr(virDomainDefPtr def, char * qemuBuildRedirdevDevStr(virDomainDefPtr def, virDomainRedirdevDefPtr dev, virQEMUCapsPtr qemuCaps); -char *qemuBuildNetworkDriveURI(int proto, - const char *src, - size_t nhosts, - virStorageNetHostDefPtr hosts, - const char *username, - const char *secret); - int qemuNetworkIfaceConnect(virDomainDefPtr def, virConnectPtr conn, virQEMUDriverPtr driver, -- 1.9.1

1 0

[libvirt] [PATCH 0/3] storage: refactor storage file helpers in storage driver after virStorageSource introduction
by Peter Krempa 09 Apr '14

09 Apr '14

Peter Krempa (3): conf: Refactor helpers to retrieve actual storage type storage: Refactor storage file initialization to use virStorageSourcePtr storage: Refactor location of metadata for storage drive access to files src/conf/domain_conf.c | 10 --- src/conf/domain_conf.h | 1 - src/conf/snapshot_conf.c | 7 --- src/conf/snapshot_conf.h | 2 - src/libvirt_private.syms | 3 +- src/qemu/qemu_command.c | 6 +- src/qemu/qemu_driver.c | 37 ++++++------ src/storage/storage_backend.c | 1 + src/storage/storage_backend.h | 20 ++++-- src/storage/storage_backend_fs.c | 12 ++-- src/storage/storage_backend_gluster.c | 33 +++++----- src/storage/storage_driver.c | 111 ++++++++++++---------------------- src/storage/storage_driver.h | 35 +++-------- src/util/virstoragefile.c | 10 +++ src/util/virstoragefile.h | 6 ++ 15 files changed, 122 insertions(+), 172 deletions(-) -- 1.9.1

2 9

[libvirt] [PATCH] storage: Don't update pool available/allocation pool if vol-create-as fails
by John Ferlan 09 Apr '14

09 Apr '14

https://bugzilla.redhat.com/show_bug.cgi?id=1024159 If adding a volume to a storage pool fails during the CreateXML or CreateXMLFrom API's, we don't want to adjust the available and allocation values for the storage pool during storageVolDelete since we haven't adjusted the values for the create. Refactor storageVolDelete() a bit to create a storageVolDeleteInternal() which will handle the primary deletion activities. Add a parameter updateMeta which will signify whether to update the values or not. Adjust the calls from CreateXML and CreateXMLFrom to directly call the DeleteInternal with the pool lock held. This does bypass the call to virStorageVolDeleteEnsureACL(). Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- I did try to make storageVolDelete() just be a shim to storageVolDeleteInternal(), but ran afoul of check-aclrules.pl since the EnsureAcl wasn't in storageVolDelete(). src/storage/storage_driver.c | 83 +++++++++++++++++++++++++++----------------- 1 file changed, 52 insertions(+), 31 deletions(-) diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c index 2f98f78..6b14b1b 100644 --- a/src/storage/storage_driver.c +++ b/src/storage/storage_driver.c @@ -1553,6 +1553,51 @@ storageVolLookupByPath(virConnectPtr conn, static int +storageVolDeleteInternal(virStorageVolPtr obj, + virStorageBackendPtr backend, + virStoragePoolObjPtr pool, + virStorageVolDefPtr vol, + unsigned int flags, + bool updateMeta) +{ + size_t i; + int ret = -1; + + if (!backend->deleteVol) { + virReportError(VIR_ERR_NO_SUPPORT, + "%s", _("storage pool does not support vol deletion")); + + goto cleanup; + } + + if (backend->deleteVol(obj->conn, pool, vol, flags) < 0) + goto cleanup; + + /* Update pool metadata - don't update meta data from error paths + * in this module since the allocation/available weren't adjusted yet + */ + if (updateMeta) { + pool->def->allocation -= vol->target.allocation; + pool->def->available += vol->target.allocation; + } + + for (i = 0; i < pool->volumes.count; i++) { + if (pool->volumes.objs[i] == vol) { + VIR_INFO("Deleting volume '%s' from storage pool '%s'", + vol->name, pool->def->name); + virStorageVolDefFree(vol); + + VIR_DELETE_ELEMENT(pool->volumes.objs, i, pool->volumes.count); + break; + } + } + ret = 0; + + cleanup: + return ret; +} + +static int storageVolDelete(virStorageVolPtr obj, unsigned int flags) { @@ -1560,7 +1605,6 @@ storageVolDelete(virStorageVolPtr obj, virStoragePoolObjPtr pool; virStorageBackendPtr backend; virStorageVolDefPtr vol = NULL; - size_t i; int ret = -1; storageDriverLock(driver); @@ -1602,30 +1646,9 @@ storageVolDelete(virStorageVolPtr obj, goto cleanup; } - if (!backend->deleteVol) { - virReportError(VIR_ERR_NO_SUPPORT, - "%s", _("storage pool does not support vol deletion")); - - goto cleanup; - } - - if (backend->deleteVol(obj->conn, pool, vol, flags) < 0) + if (storageVolDeleteInternal(obj, backend, pool, vol, flags, true) < 0) goto cleanup; - /* Update pool metadata */ - pool->def->allocation -= vol->target.allocation; - pool->def->available += vol->target.allocation; - - for (i = 0; i < pool->volumes.count; i++) { - if (pool->volumes.objs[i] == vol) { - VIR_INFO("Deleting volume '%s' from storage pool '%s'", - vol->name, pool->def->name); - virStorageVolDefFree(vol); - - VIR_DELETE_ELEMENT(pool->volumes.objs, i, pool->volumes.count); - break; - } - } ret = 0; cleanup: @@ -1634,7 +1657,6 @@ storageVolDelete(virStorageVolPtr obj, return ret; } - static virStorageVolPtr storageVolCreateXML(virStoragePoolPtr obj, const char *xmldesc, @@ -1738,9 +1760,9 @@ storageVolCreateXML(virStoragePoolPtr obj, voldef = NULL; if (buildret < 0) { - virStoragePoolObjUnlock(pool); - storageVolDelete(volobj, 0); - pool = NULL; + storageVolDeleteInternal(volobj, backend, pool, buildvoldef, + 0, false); + buildvoldef = NULL; goto cleanup; } @@ -1908,7 +1930,6 @@ storageVolCreateXMLFrom(virStoragePoolPtr obj, origvol->building = 0; newvol->building = 0; allocation = newvol->target.allocation; - newvol = NULL; pool->asyncjobs--; if (origpool) { @@ -1918,11 +1939,11 @@ storageVolCreateXMLFrom(virStoragePoolPtr obj, } if (buildret < 0) { - virStoragePoolObjUnlock(pool); - storageVolDelete(volobj, 0); - pool = NULL; + storageVolDeleteInternal(volobj, backend, pool, newvol, 0, false); + newvol = NULL; goto cleanup; } + newvol = NULL; /* Updating pool metadata */ pool->def->allocation += allocation; -- 1.9.0

2 2

[libvirt] [PATCH 1/1] Set pci-ohci as the USB default controller for PPC64.
by Li Zhang 09 Apr '14

09 Apr '14

From: Li Zhang <zhlcindy(a)linux.vnet.ibm.com> PPC64 prefers to set pci-ohci controller as default USB controller. Currently, libvirt is using legacy USB controller as default. There are problems with VGA which can't work correctly with USB Keyboard and USB Mouse. This patch is to set pci-ohci as USB default controller. Signed-off-by: Li Zhang <zhlcindy(a)linux.vnet.ibm.com> --- src/qemu/qemu_command.c | 5 +++-- tests/qemuxml2argvdata/qemuxml2argv-pseries-usb-default.args | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 379c094..46e851a 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -8466,8 +8466,9 @@ qemuBuildCommandLine(virConnectPtr conn, } else if (cont->type == VIR_DOMAIN_CONTROLLER_TYPE_USB && cont->model == -1 && !qemuDomainMachineIsQ35(def) && - (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_PIIX3_USB_UHCI) || - def->os.arch == VIR_ARCH_PPC64)) { + (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_PIIX3_USB_UHCI) || + (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_PCI_OHCI) && + def->os.arch == VIR_ARCH_PPC64))) { if (usblegacy) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("Multiple legacy USB controllers are " diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-usb-default.args b/tests/qemuxml2argvdata/qemuxml2argv-pseries-usb-default.args index 3a21b76..eac7c56 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-pseries-usb-default.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-pseries-usb-default.args @@ -3,5 +3,5 @@ LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -nographic -nodefconfig -nodefaults \ -chardev socket,id=charmonitor,path=/tmp/test-monitor,server,nowait \ -mon chardev=charmonitor,id=monitor,mode=readline -no-acpi -boot c \ --usb -chardev pty,id=charserial0 \ +-device pci-ohci,id=usb,bus=pci,addr=0x1 -chardev pty,id=charserial0 \ -device spapr-vty,chardev=charserial0,reg=0x30000000 -- 1.8.2.1

2 2

[libvirt] [PATCH] build: avoid compiler warning on shadowed name
by Jean-Baptiste Rouault 09 Apr '14

09 Apr '14

Introduced in commit d1e55de3. virstoragetest.c: In function ‘testStorageChain’: virstoragetest.c:249:10: warning: declaration of ‘abs’ shadows a global declaration [-Wshadow] --- tests/virstoragetest.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/virstoragetest.c b/tests/virstoragetest.c index 74ad15c..bfdee8c 100644 --- a/tests/virstoragetest.c +++ b/tests/virstoragetest.c @@ -246,7 +246,7 @@ testStorageChain(const void *args) virStorageFileMetadataPtr elt; size_t i = 0; char *broken = NULL; - bool abs = !!(data->flags & ABS_START); + bool isAbs = !!(data->flags & ABS_START); meta = virStorageFileGetMetadata(data->start, data->format, -1, -1, (data->flags & ALLOW_PROBE) != 0); @@ -292,7 +292,7 @@ testStorageChain(const void *args) goto cleanup; } - expDirectory = abs ? data->files[i]->expDirectoryAbs + expDirectory = isAbs ? data->files[i]->expDirectoryAbs : data->files[i]->expDirectoryRel; if (virAsprintf(&expect, "store:%s\nraw:%s\ndirectory:%s\nother:%d %d %lld %d", -- 1.8.5.3

2 1

[libvirt] [PATCH] tests: use virBhyveCapsBuild in bhyvexml2argv test
by Roman Bogorodskiy 09 Apr '14

09 Apr '14

As we can use virBhyveCapsBuild() now, replace testBhyveBuildCapabilities() with it. --- tests/bhyvexml2argvtest.c | 30 ++---------------------------- 1 file changed, 2 insertions(+), 28 deletions(-) diff --git a/tests/bhyvexml2argvtest.c b/tests/bhyvexml2argvtest.c index b37fbb0..aedfb01 100644 --- a/tests/bhyvexml2argvtest.c +++ b/tests/bhyvexml2argvtest.c @@ -6,6 +6,7 @@ # include "datatypes.h" +# include "bhyve/bhyve_capabilities.h" # include "bhyve/bhyve_utils.h" # include "bhyve/bhyve_command.h" @@ -13,33 +14,6 @@ static bhyveConn driver; -static virCapsPtr -testBhyveBuildCapabilities(void) -{ - virCapsPtr caps; - virCapsGuestPtr guest; - - if ((caps = virCapabilitiesNew(virArchFromHost(), - 0, 0)) == NULL) - return NULL; - - if ((guest = virCapabilitiesAddGuest(caps, "hvm", - VIR_ARCH_X86_64, - "bhyve", - NULL, 0, NULL)) == NULL) - goto error; - - if (virCapabilitiesAddGuestDomain(guest, - "bhyve", NULL, NULL, 0, NULL) == NULL) - goto error; - - return caps; - - error: - virObjectUnref(caps); - return NULL; -} - static int testCompareXMLToArgvFiles(const char *xml, const char *cmdline) { @@ -114,7 +88,7 @@ mymain(void) { int ret = 0; - if ((driver.caps = testBhyveBuildCapabilities()) == NULL) + if ((driver.caps = virBhyveCapsBuild()) == NULL) return EXIT_FAILURE; if ((driver.xmlopt = virDomainXMLOptionNew(NULL, NULL, NULL)) == NULL) -- 1.9.0

2 2

[libvirt] [PATCH 0/2] byve: domain management
by Wojciech Macek 09 Apr '14

09 Apr '14

Some enhancements and fixes with domain management. 1. Create stub for domainResume. Since bhyve does not support suspending, this one works a little different. If domain is already running, it reports success, but fails in all other cases. 2. add domainCreateXML routine 3. Fix persistency: when domain is not persistent, it should be forgotten upon domainDestroy. Wojciech Macek (2): bhyve: stub for domainResume bhyve: domainCreateXML src/bhyve/bhyve_driver.c | 115 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 114 insertions(+), 1 deletion(-) -- 1.9.0

3 7

[libvirt] How to pass -no-kvm-irqchip to KVM/QEMU guests
by Brody Wong 09 Apr '14

09 Apr '14

Hi, experts, I am using libvirt 0.10.2, and doing some tests against guest IO performance. Can I have a way to pass -no-kvm-irqchip in libvirt xml files to qemu-kvm? I did some search in google, it hits: http://www.redhat.com/archives/libvir-list/2009-September/msg00495.html But it seems it does not work on CentOS, after I used this wrapper script, qemu-kvm will crash.. and I did not find libvirt upstream solved this problem, is there anther way to solve this? Thanks a lot.

1 0

[libvirt] [PATCH 0/5] more work on virstoragefile
by Eric Blake 08 Apr '14

08 Apr '14

More patches along my way towards exposing backing chains in domain XML. Eric Blake (5): conf: avoid memleak on NULL path conf: fix detection of infinite backing loop conf: test for more scenarios conf: interleave virstoragetest structs conf: another refactor of virstoragetest src/security/virt-aa-helper.c | 5 +- src/util/virstoragefile.c | 28 +++- src/util/virstoragefile.h | 3 +- tests/virstoragetest.c | 360 ++++++++++++++++++++++++------------------ 4 files changed, 230 insertions(+), 166 deletions(-) -- 1.9.0

2 16

[libvirt] [PATCH 1/3] bhyve: add domain metadata support
by Roman Bogorodskiy 08 Apr '14

08 Apr '14

Implement domainSetMetadata and domainGetMetadata driver calls. --- src/bhyve/bhyve_driver.c | 55 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/src/bhyve/bhyve_driver.c b/src/bhyve/bhyve_driver.c index 461a070..f268de4 100644 --- a/src/bhyve/bhyve_driver.c +++ b/src/bhyve/bhyve_driver.c @@ -793,6 +793,59 @@ bhyveDomainOpenConsole(virDomainPtr dom, } static int +bhyveDomainSetMetadata(virDomainPtr dom, + int type, + const char *metadata, + const char *key, + const char *uri, + unsigned int flags) +{ + bhyveConnPtr privconn = dom->conn->privateData; + virDomainObjPtr vm; + int ret = -1; + + virCheckFlags(VIR_DOMAIN_AFFECT_LIVE | + VIR_DOMAIN_AFFECT_CONFIG, -1); + + if (!(vm = bhyveDomObjFromDomain(dom))) + return -1; + + if (virDomainSetMetadataEnsureACL(dom->conn, vm->def, flags) < 0) + goto cleanup; + + ret = virDomainObjSetMetadata(vm, type, metadata, key, uri, privconn->caps, + privconn->xmlopt, BHYVE_CONFIG_DIR, flags); + + cleanup: + virObjectUnlock(vm); + return ret; +} + +static char * +bhyveDomainGetMetadata(virDomainPtr dom, + int type, + const char *uri, + unsigned int flags) +{ + bhyveConnPtr privconn = dom->conn->privateData; + virDomainObjPtr vm; + char *ret = NULL; + + if (!(vm = bhyveDomObjFromDomain(dom))) + return NULL; + + if (virDomainGetMetadataEnsureACL(dom->conn, vm->def) < 0) + goto cleanup; + + ret = virDomainObjGetMetadata(vm, type, uri, privconn->caps, + privconn->xmlopt, flags); + + cleanup: + virObjectUnlock(vm); + return ret; +} + +static int bhyveNodeGetCPUStats(virConnectPtr conn, int cpuNum, virNodeCPUStatsPtr params, @@ -1009,6 +1062,8 @@ static virDriver bhyveDriver = { .domainGetAutostart = bhyveDomainGetAutostart, /* 1.2.4 */ .domainSetAutostart = bhyveDomainSetAutostart, /* 1.2.4 */ .domainOpenConsole = bhyveDomainOpenConsole, /* 1.2.4 */ + .domainSetMetadata = bhyveDomainSetMetadata, /* 1.2.4 */ + .domainGetMetadata = bhyveDomainGetMetadata, /* 1.2.4 */ .nodeGetCPUStats = bhyveNodeGetCPUStats, /* 1.2.2 */ .nodeGetMemoryStats = bhyveNodeGetMemoryStats, /* 1.2.2 */ .nodeGetInfo = bhyveNodeGetInfo, /* 1.2.3 */ -- 1.9.0

2 6

[libvirt] [PATCH] bhyve: fix ATTRIBUTE_NONNULL usage
by Roman Bogorodskiy 08 Apr '14

08 Apr '14

Fix incorrect ATTRIBUTE_NONNULL usage introduced in 17b17565 which caused build failure: bhyve/bhyve_driver.c:127:48: error: expected ')' bhyveDriverGetCapabilities(bhyveConnPtr driver ATTRIBUTE_NONNULL) ^ bhyve/bhyve_driver.c:127:27: note: to match this '(' bhyveDriverGetCapabilities(bhyveConnPtr driver ATTRIBUTE_NONNULL) Pushed under the build breaker rule. --- src/bhyve/bhyve_driver.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/bhyve/bhyve_driver.c b/src/bhyve/bhyve_driver.c index a5b349a..e48528f 100644 --- a/src/bhyve/bhyve_driver.c +++ b/src/bhyve/bhyve_driver.c @@ -123,8 +123,8 @@ bhyveAutostartDomains(bhyveConnPtr driver) * * Returns: a reference to a virCapsPtr instance or NULL */ -static virCapsPtr -bhyveDriverGetCapabilities(bhyveConnPtr driver ATTRIBUTE_NONNULL) +static virCapsPtr ATTRIBUTE_NONNULL(1) +bhyveDriverGetCapabilities(bhyveConnPtr driver) { return virObjectRef(driver->caps); -- 1.9.0

1 0

[libvirt] [PATCH] vmware: set the driver version
by Jean-Baptiste Rouault 08 Apr '14

08 Apr '14

Since commit 7457cbe8 the vmware driver version isn't set anymore. --- src/vmware/vmware_conf.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/vmware/vmware_conf.c b/src/vmware/vmware_conf.c index 6aba4f8..5e894a4 100644 --- a/src/vmware/vmware_conf.c +++ b/src/vmware/vmware_conf.c @@ -301,6 +301,7 @@ vmwareExtractVersion(struct vmware_driver *driver) if (vmwareParseVersionStr(driver->type, outbuf, &version) < 0) goto cleanup; + driver->version = version; ret = 0; cleanup: -- 1.8.5.3

2 1

[libvirt] [PATCH] Fix leak on OOM in virNWFilterVarValueCreateSimpleCopyValue
by Daniel P. Berrange 08 Apr '14

08 Apr '14

If virNWFilterVarValueCreateSimple fails with OOM, then 'val' will be leaked by virNWFilterVarValueCreateSimpleCopyValue Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/conf/nwfilter_params.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/conf/nwfilter_params.c b/src/conf/nwfilter_params.c index 40eccc4..3e85bc1 100644 --- a/src/conf/nwfilter_params.c +++ b/src/conf/nwfilter_params.c @@ -126,10 +126,14 @@ virNWFilterVarValuePtr virNWFilterVarValueCreateSimpleCopyValue(const char *value) { char *val; + virNWFilterVarValuePtr ret; if (VIR_STRDUP(val, value) < 0) return NULL; - return virNWFilterVarValueCreateSimple(val); + ret = virNWFilterVarValueCreateSimple(val); + if (!ret) + VIR_FREE(val); + return ret; } const char * -- 1.9.0

2 1

[libvirt] [PATCH] Fix incorrect values in redirdev ABI check error
by Ján Tomko 08 Apr '14

08 Apr '14

My commit c9123fb introduced this copy-and-paste error. --- Pushed as trivial. src/conf/domain_conf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 52bbf87..1be942d 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -14231,7 +14231,7 @@ virDomainDefCheckABIStability(virDomainDefPtr src, virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Target domain redirected devices count %zu " "does not match source %zu"), - dst->nconsoles, src->nconsoles); + dst->nredirdevs, src->nredirdevs); goto error; } -- 1.8.3.2

1 0

Re: [libvirt] [PATCH] -Added autocloseable to connect class (set close() return type to void so to adapt it to the autocloseable interface)
by Claudio Bley 08 Apr '14

08 Apr '14

[forwarding my answer back to the list] Pasquale, please keep the discussion on the list, you should probably use the "Reply To All" (or whatever GMail calls it) button when answering. At Tue, 08 Apr 2014 16:09:31 +0200, Claudio Bley wrote: > > [Remember /not/ to top-post on technical lists.] > > At Mon, 7 Apr 2014 20:28:28 +0200, > Pasquale Dir wrote: > > > > Hello, > > is it ok if I'll send multiple patches for each added function? I'd start > > with the getCPUStats which is the most complex as it introduces new jna > > types too. > > Yes, that would be a good start. (although I'd probably do it in > reverse, starting out with the small changes, then tackling the > complex ones). > > > As for Thread.sleep() is it ok to substitute it with a wait(long) ? Or you > > have any alternative? That wait is needed for the alghoritm to work. > > I'm not convinced that this functionality belongs into the library at > all. Maybe we could add a convenience method doing the computation > for two given stats and a time period, but I don't feel strongly in > support of adding this method. > > Regards, > Claudio

1 0

[libvirt] [PATCH] LXC: Fix return code evaulation in lxcCheckNetNsSupport()
by Richard Weinberger 08 Apr '14

08 Apr '14

Commit b9dd878f (util: make it easier to grab only regular command exit) changed the call semantics of virCommandRun() and therefore of virRun() too. But lxcCheckNetNsSupport() was not updated. As consequence of this lxcCheckNetNsSupport always failed and broke LXC. Signed-off-by: Richard Weinberger <richard(a)nod.at> diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index b900bc6..de67004 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -1475,8 +1475,7 @@ static int lxcCheckNetNsSupport(void) const char *argv[] = {"ip", "link", "set", "lo", "netns", "-1", NULL}; int ip_rc; - if (virRun(argv, &ip_rc) < 0 || - !(WIFEXITED(ip_rc) && (WEXITSTATUS(ip_rc) != 255))) + if (virRun(argv, &ip_rc) < 0 || ip_rc == 255) return 0; if (lxcContainerAvailable(LXC_CONTAINER_FEATURE_NET) < 0) -- 1.8.4.2

2 1

[libvirt] [PATCH] Use a static initializer for static mutexes
by Daniel P. Berrange 08 Apr '14

08 Apr '14

Now that we ditched our custom pthread impl for Win32, we can use PTHREAD_MUTEX_INITIALIZER for static mutexes. This avoids the need to use a virOnce one-time global initializer in a number of places. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/conf/nwfilter_ipaddrmap.c | 7 +------ src/lxc/lxc_controller.c | 8 +------- src/nwfilter/nwfilter_ebiptables_driver.c | 5 +---- src/nwfilter/nwfilter_learnipaddr.c | 14 ++------------ src/test/test_driver.c | 17 +---------------- src/util/virnetdevmacvlan.c | 15 +-------------- src/util/virnetdevveth.c | 16 +--------------- src/util/virnodesuspend.c | 22 +--------------------- src/util/virrandom.c | 5 +---- src/util/virthread.h | 5 +++++ 10 files changed, 15 insertions(+), 99 deletions(-) diff --git a/src/conf/nwfilter_ipaddrmap.c b/src/conf/nwfilter_ipaddrmap.c index 9cbad49c..4bb6775 100644 --- a/src/conf/nwfilter_ipaddrmap.c +++ b/src/conf/nwfilter_ipaddrmap.c @@ -33,7 +33,7 @@ #define VIR_FROM_THIS VIR_FROM_NWFILTER -static virMutex ipAddressMapLock; +static virMutex ipAddressMapLock = VIR_MUTEX_INITIALIZER; static virNWFilterHashTablePtr ipAddressMap; @@ -147,11 +147,6 @@ virNWFilterIPAddrMapInit(void) if (!ipAddressMap) return -1; - if (virMutexInit(&ipAddressMapLock) < 0) { - virNWFilterIPAddrMapShutdown(); - return -1; - } - return 0; } diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c index 1d3a74b..c05dfec 100644 --- a/src/lxc/lxc_controller.c +++ b/src/lxc/lxc_controller.c @@ -823,7 +823,7 @@ static int lxcControllerClearCapabilities(void) } static bool wantReboot = false; -static virMutex lock; +static virMutex lock = VIR_MUTEX_INITIALIZER; static void virLXCControllerSignalChildIO(virNetServerPtr server, @@ -1108,9 +1108,6 @@ static int virLXCControllerMain(virLXCControllerPtr ctrl) int rc = -1; size_t i; - if (virMutexInit(&lock) < 0) - goto cleanup2; - if (virNetServerAddSignalHandler(ctrl->server, SIGCHLD, virLXCControllerSignalChildIO, @@ -1164,9 +1161,6 @@ static int virLXCControllerMain(virLXCControllerPtr ctrl) rc = wantReboot ? 1 : 0; cleanup: - virMutexDestroy(&lock); - cleanup2: - for (i = 0; i < ctrl->nconsoles; i++) virLXCControllerConsoleClose(&(ctrl->consoles[i])); diff --git a/src/nwfilter/nwfilter_ebiptables_driver.c b/src/nwfilter/nwfilter_ebiptables_driver.c index 8dbab18..ce0b7e3 100644 --- a/src/nwfilter/nwfilter_ebiptables_driver.c +++ b/src/nwfilter/nwfilter_ebiptables_driver.c @@ -211,7 +211,7 @@ static void ebiptablesDriverShutdown(void); static void ebtablesCleanAll(const char *ifname); static int ebiptablesAllTeardown(const char *ifname); -static virMutex execCLIMutex; +static virMutex execCLIMutex = VIR_MUTEX_INITIALIZER; struct ushort_map { unsigned short attr; @@ -4376,9 +4376,6 @@ ebiptablesDriverInit(bool privileged) if (!privileged) return 0; - if (virMutexInit(&execCLIMutex) < 0) - return -EINVAL; - grep_cmd_path = virFindFileInPath("grep"); /* diff --git a/src/nwfilter/nwfilter_learnipaddr.c b/src/nwfilter/nwfilter_learnipaddr.c index 1ffed78..a6cdc87 100644 --- a/src/nwfilter/nwfilter_learnipaddr.c +++ b/src/nwfilter/nwfilter_learnipaddr.c @@ -119,10 +119,10 @@ struct ether_vlan_header } ATTRIBUTE_PACKED; -static virMutex pendingLearnReqLock; +static virMutex pendingLearnReqLock = VIR_MUTEX_INITIALIZER; static virHashTablePtr pendingLearnReq; -static virMutex ifaceMapLock; +static virMutex ifaceMapLock = VIR_MUTEX_INITIALIZER; static virHashTablePtr ifaceLockMap; typedef struct _virNWFilterIfaceLock virNWFilterIfaceLock; @@ -806,22 +806,12 @@ virNWFilterLearnInit(void) return -1; } - if (virMutexInit(&pendingLearnReqLock) < 0) { - virNWFilterLearnShutdown(); - return -1; - } - ifaceLockMap = virHashCreate(0, virHashValueFree); if (!ifaceLockMap) { virNWFilterLearnShutdown(); return -1; } - if (virMutexInit(&ifaceMapLock) < 0) { - virNWFilterLearnShutdown(); - return -1; - } - return 0; } diff --git a/src/test/test_driver.c b/src/test/test_driver.c index 77e30b2..64f3daa 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -119,7 +119,7 @@ typedef struct _testConn *testConnPtr; static testConn defaultConn; static int defaultConnections; -static virMutex defaultLock; +static virMutex defaultLock = VIR_MUTEX_INITIALIZER; #define TEST_MODEL "i686" #define TEST_MODEL_WORDSIZE 32 @@ -141,15 +141,6 @@ static int testConnectClose(virConnectPtr conn); static void testObjectEventQueue(testConnPtr driver, virObjectEventPtr event); -static int -testOnceInit(void) -{ - return virMutexInit(&defaultLock); -} - -VIR_ONCE_GLOBAL_INIT(test) - - static void testDriverLock(testConnPtr driver) { virMutexLock(&driver->lock); @@ -1554,9 +1545,6 @@ static virDrvOpenStatus testConnectOpen(virConnectPtr conn, virCheckFlags(VIR_CONNECT_RO, VIR_DRV_OPEN_ERROR); - if (testInitialize() < 0) - return VIR_DRV_OPEN_ERROR; - if (!conn->uri) return VIR_DRV_OPEN_DECLINED; @@ -1596,9 +1584,6 @@ static int testConnectClose(virConnectPtr conn) { testConnPtr privconn = conn->privateData; - if (testInitialize() < 0) - return -1; - if (privconn == &defaultConn) { virMutexLock(&defaultLock); if (--defaultConnections) { diff --git a/src/util/virnetdevmacvlan.c b/src/util/virnetdevmacvlan.c index 42313b7..7bbf540 100644 --- a/src/util/virnetdevmacvlan.c +++ b/src/util/virnetdevmacvlan.c @@ -73,18 +73,7 @@ VIR_LOG_INIT("util.netdevmacvlan"); # define MACVLAN_NAME_PREFIX "macvlan" # define MACVLAN_NAME_PATTERN "macvlan%d" -virMutex virNetDevMacVLanCreateMutex; - -static int virNetDevMacVLanCreateMutexOnceInit(void) -{ - if (virMutexInit(&virNetDevMacVLanCreateMutex) < 0) { - virReportSystemError(errno, "%s", _("unable to init mutex")); - return -1; - } - return 0; -} - -VIR_ONCE_GLOBAL_INIT(virNetDevMacVLanCreateMutex); +virMutex virNetDevMacVLanCreateMutex = VIR_MUTEX_INITIALIZER; /** * virNetDevMacVLanCreate: @@ -873,8 +862,6 @@ int virNetDevMacVLanCreateWithVPortProfile(const char *tgifname, } else { create_name: retries = 5; - if (virNetDevMacVLanCreateMutexInitialize() < 0) - return -1; virMutexLock(&virNetDevMacVLanCreateMutex); for (c = 0; c < 8192; c++) { snprintf(ifname, sizeof(ifname), pattern, c); diff --git a/src/util/virnetdevveth.c b/src/util/virnetdevveth.c index 14febb7..e9d6f9c 100644 --- a/src/util/virnetdevveth.c +++ b/src/util/virnetdevveth.c @@ -41,18 +41,7 @@ VIR_LOG_INIT("util.netdevveth"); /* Functions */ -virMutex virNetDevVethCreateMutex; - -static int virNetDevVethCreateMutexOnceInit(void) -{ - if (virMutexInit(&virNetDevVethCreateMutex) < 0) { - virReportSystemError(errno, "%s", _("unable to init mutex")); - return -1; - } - return 0; -} - -VIR_ONCE_GLOBAL_INIT(virNetDevVethCreateMutex); +virMutex virNetDevVethCreateMutex = VIR_MUTEX_INITIALIZER; static int virNetDevVethExists(int devNum) { @@ -132,9 +121,6 @@ int virNetDevVethCreate(char** veth1, char** veth2) * We might race with other containers, but this is reasonably * unlikely, so don't do too many retries for device creation */ - if (virNetDevVethCreateMutexInitialize() < 0) - return -1; - virMutexLock(&virNetDevVethCreateMutex); #define MAX_VETH_RETRIES 10 diff --git a/src/util/virnodesuspend.c b/src/util/virnodesuspend.c index 8088931..08c47aa 100644 --- a/src/util/virnodesuspend.c +++ b/src/util/virnodesuspend.c @@ -46,7 +46,7 @@ VIR_LOG_INIT("util.nodesuspend"); static unsigned int nodeSuspendTargetMask; static bool nodeSuspendTargetMaskInit; -static virMutex virNodeSuspendMutex; +static virMutex virNodeSuspendMutex = VIR_MUTEX_INITIALIZER; static bool aboutToSuspend; @@ -61,20 +61,6 @@ static void virNodeSuspendUnlock(void) } -static int virNodeSuspendOnceInit(void) -{ - if (virMutexInit(&virNodeSuspendMutex) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Unable to initialize mutex")); - return -1; - } - - return 0; -} - -VIR_ONCE_GLOBAL_INIT(virNodeSuspend) - - /** * virNodeSuspendSetNodeWakeup: * @alarmTime: time in seconds from now, at which the RTC alarm has to be set. @@ -178,9 +164,6 @@ int nodeSuspendForDuration(unsigned int target, virCheckFlags(0, -1); - if (virNodeSuspendInitialize() < 0) - return -1; - if (virNodeSuspendGetTargetMask(&supported) < 0) return -1; @@ -267,9 +250,6 @@ virNodeSuspendSupportsTarget(unsigned int target, bool *supported) int status; int ret = -1; - if (virNodeSuspendInitialize() < 0) - return -1; - *supported = false; switch (target) { diff --git a/src/util/virrandom.c b/src/util/virrandom.c index 3f17f5e..4301f3f 100644 --- a/src/util/virrandom.c +++ b/src/util/virrandom.c @@ -56,7 +56,7 @@ enum { static char randomState[RANDOM_STATE_SIZE]; static struct random_data randomData; -static virMutex randomLock; +static virMutex randomLock = VIR_MUTEX_INITIALIZER; static int @@ -74,9 +74,6 @@ virRandomOnceInit(void) return -1; #endif - if (virMutexInit(&randomLock) < 0) - return -1; - if (initstate_r(seed, randomState, sizeof(randomState), diff --git a/src/util/virthread.h b/src/util/virthread.h index eba8dc3..4b92a43 100644 --- a/src/util/virthread.h +++ b/src/util/virthread.h @@ -71,6 +71,11 @@ struct virOnceControl { }; +# define VIR_MUTEX_INITIALIZER \ + { \ + .lock = PTHREAD_MUTEX_INITIALIZER \ + } + # define VIR_ONCE_CONTROL_INITIALIZER \ { \ .once = PTHREAD_ONCE_INIT \ -- 1.9.0

2 1

[libvirt] [PATCH] virnetdev: Fix Memory Leak in virNetDevReplaceMacAddress() and virNetDevRestoreMacAddress()
by Wangrui (K) 08 Apr '14

08 Apr '14

2 1

[libvirt] [PATCH v1 0/2] Keep original file label
by Michal Privoznik 08 Apr '14

08 Apr '14

This creates a new file to store the original file labels. Or do we want the whole functionality to reside in virtlockd? Michal Privoznik (2): security_dac: Keep original file label security_dac: Lock label store file src/Makefile.am | 3 +- src/locking/lock_driver.h | 2 + src/locking/lock_driver_lockd.c | 25 +++ src/lxc/lxc_controller.c | 2 +- src/lxc/lxc_driver.c | 3 +- src/qemu/qemu_driver.c | 9 +- src/security/security_dac.c | 412 +++++++++++++++++++++++++++++++++++---- src/security/security_manager.c | 24 ++- src/security/security_manager.h | 7 +- tests/qemuhotplugtest.c | 2 +- tests/seclabeltest.c | 2 +- tests/securityselinuxlabeltest.c | 3 +- tests/securityselinuxtest.c | 2 +- 13 files changed, 438 insertions(+), 58 deletions(-) -- 1.9.0

1 4

[libvirt] [PATCHv2 0/3] bhyve: capabilities and CPU-capabilities support
by Wojciech Macek 08 Apr '14

08 Apr '14

Rebased onto master Add following changes: - support for connectBaselineCPU (required by OpenStack) - move capabilites functions to separate file + API change - implement connectCompareCPU Wojciech Macek (3): bhyve: support for connectBaselineCPU bhyve: create capabilities submodule bhyve: connectCompareCPU support src/Makefile.am | 2 + src/bhyve/bhyve_capabilities.c | 105 ++++++++++++++++++++++++++++++++++++++++ src/bhyve/bhyve_capabilities.h | 30 ++++++++++++ src/bhyve/bhyve_driver.c | 107 ++++++++++++++++++++++++++++++++--------- 4 files changed, 222 insertions(+), 22 deletions(-) create mode 100644 src/bhyve/bhyve_capabilities.c create mode 100644 src/bhyve/bhyve_capabilities.h -- 1.9.0

3 7

[libvirt] [PATCH] lxc conf2xml: don't let current vcpus at 0: define won't like it
by Cédric Bosdonnat 07 Apr '14

07 Apr '14

--- src/lxc/lxc_native.c | 1 + tests/lxcconf2xmldata/lxcconf2xml-blkiotune.xml | 2 +- tests/lxcconf2xmldata/lxcconf2xml-cpusettune.xml | 2 +- tests/lxcconf2xmldata/lxcconf2xml-cputune.xml | 2 +- tests/lxcconf2xmldata/lxcconf2xml-idmap.xml | 2 +- tests/lxcconf2xmldata/lxcconf2xml-macvlannetwork.xml | 2 +- tests/lxcconf2xmldata/lxcconf2xml-memtune.xml | 2 +- tests/lxcconf2xmldata/lxcconf2xml-nonenetwork.xml | 2 +- tests/lxcconf2xmldata/lxcconf2xml-nonetwork.xml | 2 +- tests/lxcconf2xmldata/lxcconf2xml-physnetwork.xml | 2 +- tests/lxcconf2xmldata/lxcconf2xml-simple.xml | 2 +- tests/lxcconf2xmldata/lxcconf2xml-vlannetwork.xml | 2 +- 12 files changed, 12 insertions(+), 11 deletions(-) diff --git a/src/lxc/lxc_native.c b/src/lxc/lxc_native.c index 2b09fae..f4c4556 100644 --- a/src/lxc/lxc_native.c +++ b/src/lxc/lxc_native.c @@ -868,6 +868,7 @@ lxcParseConfigString(const char *config) /* Value not handled by the LXC driver, setting to * minimum required to make XML parsing pass */ vmdef->maxvcpus = 1; + vmdef->vcpus = 1; vmdef->nfss = 0; diff --git a/tests/lxcconf2xmldata/lxcconf2xml-blkiotune.xml b/tests/lxcconf2xmldata/lxcconf2xml-blkiotune.xml index 628798d..36b8e52 100644 --- a/tests/lxcconf2xmldata/lxcconf2xml-blkiotune.xml +++ b/tests/lxcconf2xmldata/lxcconf2xml-blkiotune.xml @@ -18,7 +18,7 @@ <weight>300</weight> </device> </blkiotune> - <vcpu placement='static' current='0'>1</vcpu> + <vcpu placement='static'>1</vcpu> <os> <type>exe</type> <init>/sbin/init</init> diff --git a/tests/lxcconf2xmldata/lxcconf2xml-cpusettune.xml b/tests/lxcconf2xmldata/lxcconf2xml-cpusettune.xml index 1b8fb0c..932ab61 100644 --- a/tests/lxcconf2xmldata/lxcconf2xml-cpusettune.xml +++ b/tests/lxcconf2xmldata/lxcconf2xml-cpusettune.xml @@ -3,7 +3,7 @@ <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> <memory unit='KiB'>65536</memory> <currentMemory unit='KiB'>0</currentMemory> - <vcpu placement='static' cpuset='1-2,5-7' current='0'>1</vcpu> + <vcpu placement='static' cpuset='1-2,5-7'>1</vcpu> <numatune> <memory mode='strict' nodeset='1-4'/> </numatune> diff --git a/tests/lxcconf2xmldata/lxcconf2xml-cputune.xml b/tests/lxcconf2xmldata/lxcconf2xml-cputune.xml index a511dcf..1bab1c6 100644 --- a/tests/lxcconf2xmldata/lxcconf2xml-cputune.xml +++ b/tests/lxcconf2xmldata/lxcconf2xml-cputune.xml @@ -3,7 +3,7 @@ <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> <memory unit='KiB'>65536</memory> <currentMemory unit='KiB'>0</currentMemory> - <vcpu placement='static' current='0'>1</vcpu> + <vcpu placement='static'>1</vcpu> <cputune> <shares>1024</shares> <period>500000</period> diff --git a/tests/lxcconf2xmldata/lxcconf2xml-idmap.xml b/tests/lxcconf2xmldata/lxcconf2xml-idmap.xml index 576c903..050ccd6 100644 --- a/tests/lxcconf2xmldata/lxcconf2xml-idmap.xml +++ b/tests/lxcconf2xmldata/lxcconf2xml-idmap.xml @@ -3,7 +3,7 @@ <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> <memory unit='KiB'>65536</memory> <currentMemory unit='KiB'>0</currentMemory> - <vcpu placement='static' current='0'>1</vcpu> + <vcpu placement='static'>1</vcpu> <os> <type>exe</type> <init>/sbin/init</init> diff --git a/tests/lxcconf2xmldata/lxcconf2xml-macvlannetwork.xml b/tests/lxcconf2xmldata/lxcconf2xml-macvlannetwork.xml index aa0683a..996c0f7 100644 --- a/tests/lxcconf2xmldata/lxcconf2xml-macvlannetwork.xml +++ b/tests/lxcconf2xmldata/lxcconf2xml-macvlannetwork.xml @@ -3,7 +3,7 @@ <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> <memory unit='KiB'>65536</memory> <currentMemory unit='KiB'>0</currentMemory> - <vcpu placement='static' current='0'>1</vcpu> + <vcpu placement='static'>1</vcpu> <os> <type>exe</type> <init>/sbin/init</init> diff --git a/tests/lxcconf2xmldata/lxcconf2xml-memtune.xml b/tests/lxcconf2xmldata/lxcconf2xml-memtune.xml index 0264356..b7c919e 100644 --- a/tests/lxcconf2xmldata/lxcconf2xml-memtune.xml +++ b/tests/lxcconf2xmldata/lxcconf2xml-memtune.xml @@ -8,7 +8,7 @@ <soft_limit unit='KiB'>131072</soft_limit> <swap_hard_limit unit='KiB'>2097152</swap_hard_limit> </memtune> - <vcpu placement='static' current='0'>1</vcpu> + <vcpu placement='static'>1</vcpu> <os> <type>exe</type> <init>/sbin/init</init> diff --git a/tests/lxcconf2xmldata/lxcconf2xml-nonenetwork.xml b/tests/lxcconf2xmldata/lxcconf2xml-nonenetwork.xml index eebcb4e..6d9e16d 100644 --- a/tests/lxcconf2xmldata/lxcconf2xml-nonenetwork.xml +++ b/tests/lxcconf2xmldata/lxcconf2xml-nonenetwork.xml @@ -3,7 +3,7 @@ <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> <memory unit='KiB'>65536</memory> <currentMemory unit='KiB'>0</currentMemory> - <vcpu placement='static' current='0'>1</vcpu> + <vcpu placement='static'>1</vcpu> <os> <type>exe</type> <init>/sbin/init</init> diff --git a/tests/lxcconf2xmldata/lxcconf2xml-nonetwork.xml b/tests/lxcconf2xmldata/lxcconf2xml-nonetwork.xml index 511e3dd..101324a 100644 --- a/tests/lxcconf2xmldata/lxcconf2xml-nonetwork.xml +++ b/tests/lxcconf2xmldata/lxcconf2xml-nonetwork.xml @@ -3,7 +3,7 @@ <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> <memory unit='KiB'>65536</memory> <currentMemory unit='KiB'>0</currentMemory> - <vcpu placement='static' current='0'>1</vcpu> + <vcpu placement='static'>1</vcpu> <os> <type>exe</type> <init>/sbin/init</init> diff --git a/tests/lxcconf2xmldata/lxcconf2xml-physnetwork.xml b/tests/lxcconf2xmldata/lxcconf2xml-physnetwork.xml index 35a2a96..5fe1b03 100644 --- a/tests/lxcconf2xmldata/lxcconf2xml-physnetwork.xml +++ b/tests/lxcconf2xmldata/lxcconf2xml-physnetwork.xml @@ -3,7 +3,7 @@ <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> <memory unit='KiB'>65536</memory> <currentMemory unit='KiB'>0</currentMemory> - <vcpu placement='static' current='0'>1</vcpu> + <vcpu placement='static'>1</vcpu> <os> <type>exe</type> <init>/sbin/init</init> diff --git a/tests/lxcconf2xmldata/lxcconf2xml-simple.xml b/tests/lxcconf2xmldata/lxcconf2xml-simple.xml index 6ec0f17..b3c3659 100644 --- a/tests/lxcconf2xmldata/lxcconf2xml-simple.xml +++ b/tests/lxcconf2xmldata/lxcconf2xml-simple.xml @@ -3,7 +3,7 @@ <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> <memory unit='KiB'>65536</memory> <currentMemory unit='KiB'>0</currentMemory> - <vcpu placement='static' current='0'>1</vcpu> + <vcpu placement='static'>1</vcpu> <os> <type arch='i686'>exe</type> <init>/sbin/init</init> diff --git a/tests/lxcconf2xmldata/lxcconf2xml-vlannetwork.xml b/tests/lxcconf2xmldata/lxcconf2xml-vlannetwork.xml index 7d6d51b..45348ed 100644 --- a/tests/lxcconf2xmldata/lxcconf2xml-vlannetwork.xml +++ b/tests/lxcconf2xmldata/lxcconf2xml-vlannetwork.xml @@ -3,7 +3,7 @@ <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> <memory unit='KiB'>65536</memory> <currentMemory unit='KiB'>0</currentMemory> - <vcpu placement='static' current='0'>1</vcpu> + <vcpu placement='static'>1</vcpu> <os> <type>exe</type> <init>/sbin/init</init> -- 1.8.4.5

3 2

[libvirt] [PATCH 0/3] Couple of bhyve driver cleanups
by Michal Privoznik 07 Apr '14

07 Apr '14

*** BLURB HERE *** Michal Privoznik (3): bhyve_capabilities: Add Semihalf to Copyright Simplify bhyveDriverGetCapabilities() bhyveConnectGetCapabilities: Fix double caps unref src/bhyve/bhyve_capabilities.c | 1 + src/bhyve/bhyve_driver.c | 25 +++++++++++-------------- 2 files changed, 12 insertions(+), 14 deletions(-) -- 1.9.0

2 4

[libvirt] ANNOUNCE: Perl binding Sys-Virt release 1.2.3
by Daniel P. Berrange 07 Apr '14

07 Apr '14

I am pleased to announce that release 1.2.3 of Sys-Virt, the libvirt Perl API binding, is now available for download: http://search.cpan.org/CPAN/authors/id/D/DA/DANBERR/Sys-Virt-1.2.3.tar.gz Changed in the 1.2.3 release: - Add VIR_FROM_CRYPTO error constant - Add VIR_MIGRATE_AUTO_CONVERGE migration constant - Add virDomainCoreDumpWithFormat and its constants Further information, including online API documentation & previous release archives, is available from the CPAN home page http://search.cpan.org/dist/Sys-Virt/ Regards, Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|

1 0

[libvirt] [PATCH] hash: add common utility functions
by Eric Blake 07 Apr '14

07 Apr '14

I almost wrote a hash value free function that just called VIR_FREE, then realized I couldn't be the first person to do that. Sure enough, it was worth factoring into a common helper routine. Furthermore, in a few places we were passing raw free() as the cleanup function; whereas going through VIR_FREE() ensures that any (temporary) tracing or other memory stress testing that we add to viralloc.c will not be bypassed. * src/util/virhash.h (virHashValueFree): New function. * src/util/virhash.c (virHashValueFree): Implement it. * src/util/virobject.h (virObjectFreeHashData): New function. * src/libvirt_private.syms (virhash.h, virobject.h): Export them. * src/nwfilter/nwfilter_learnipaddr.c (virNWFilterLearnInit): Use common function. * src/qemu/qemu_capabilities.c (virQEMUCapsCacheNew): Likewise. * src/qemu/qemu_command.c (qemuDomainCCWAddressSetCreate): Likewise. * src/qemu/qemu_monitor.c (qemuMonitorGetBlockInfo): Likewise. * src/qemu/qemu_process.c (qemuProcessWaitForMonitor): Likewise. * src/util/virclosecallbacks.c (virCloseCallbacksNew): Likewise. * src/util/virkeyfile.c (virKeyFileParseGroup): Likewise. * tests/qemumonitorjsontest.c (testQemuMonitorJSONqemuMonitorJSONGetBlockInfo): Likewise. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- It turns out I may end up not using the common helper in my code after all, but the cleanup is still worth posting. src/libvirt_private.syms | 2 ++ src/nwfilter/nwfilter_learnipaddr.c | 9 +-------- src/qemu/qemu_capabilities.c | 9 +-------- src/qemu/qemu_command.c | 8 +------- src/qemu/qemu_monitor.c | 2 +- src/qemu/qemu_process.c | 6 +----- src/util/virclosecallbacks.c | 11 ++--------- src/util/virhash.c | 9 ++++++++- src/util/virhash.h | 5 ++++- src/util/virkeyfile.c | 9 ++------- src/util/virobject.c | 17 ++++++++++++++++- src/util/virobject.h | 3 ++- tests/qemumonitorjsontest.c | 6 +++--- 13 files changed, 44 insertions(+), 52 deletions(-) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 2d12105..6b68a43 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1290,6 +1290,7 @@ virHashSize; virHashSteal; virHashTableSize; virHashUpdateEntry; +virHashValueFree; # util/virhook.h @@ -1628,6 +1629,7 @@ virClassIsDerivedFrom; virClassName; virClassNew; virObjectFreeCallback; +virObjectFreeHashData; virObjectIsClass; virObjectLock; virObjectLockableNew; diff --git a/src/nwfilter/nwfilter_learnipaddr.c b/src/nwfilter/nwfilter_learnipaddr.c index 0eb5e7e..1ffed78 100644 --- a/src/nwfilter/nwfilter_learnipaddr.c +++ b/src/nwfilter/nwfilter_learnipaddr.c @@ -188,13 +188,6 @@ virNWFilterLockIface(const char *ifname) } -static void -freeIfaceLock(void *payload, const void *name ATTRIBUTE_UNUSED) -{ - VIR_FREE(payload); -} - - void virNWFilterUnlockIface(const char *ifname) { @@ -818,7 +811,7 @@ virNWFilterLearnInit(void) return -1; } - ifaceLockMap = virHashCreate(0, freeIfaceLock); + ifaceLockMap = virHashCreate(0, virHashValueFree); if (!ifaceLockMap) { virNWFilterLearnShutdown(); return -1; diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index e1d04ff..2c8ec10 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -3288,13 +3288,6 @@ bool virQEMUCapsIsValid(virQEMUCapsPtr qemuCaps) } -static void -virQEMUCapsHashDataFree(void *payload, const void *key ATTRIBUTE_UNUSED) -{ - virObjectUnref(payload); -} - - virQEMUCapsCachePtr virQEMUCapsCacheNew(const char *libDir, const char *cacheDir, @@ -3313,7 +3306,7 @@ virQEMUCapsCacheNew(const char *libDir, return NULL; } - if (!(cache->binaries = virHashCreate(10, virQEMUCapsHashDataFree))) + if (!(cache->binaries = virHashCreate(10, virObjectFreeHashData))) goto error; if (VIR_STRDUP(cache->libDir, libDir) < 0) goto error; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 37841d1..cc45828 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -1102,12 +1102,6 @@ qemuCCWAdressIncrement(virDomainDeviceCCWAddressPtr addr) return 0; } -static void -qemuDomainCCWAddressSetFreeEntry(void *payload, - const void *name ATTRIBUTE_UNUSED) -{ - VIR_FREE(payload); -} int qemuDomainCCWAddressAssign(virDomainDeviceInfoPtr dev, qemuDomainCCWAddressSetPtr addrs, @@ -1264,7 +1258,7 @@ qemuDomainCCWAddressSetCreate(void) if (VIR_ALLOC(addrs) < 0) goto error; - if (!(addrs->defined = virHashCreate(10, qemuDomainCCWAddressSetFreeEntry))) + if (!(addrs->defined = virHashCreate(10, virHashValueFree))) goto error; /* must use cssid = 0xfe (254) for virtio-ccw devices */ diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index 205002b..5a5a59b 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -1678,7 +1678,7 @@ qemuMonitorGetBlockInfo(qemuMonitorPtr mon) return NULL; } - if (!(table = virHashCreate(32, (virHashDataFree) free))) + if (!(table = virHashCreate(32, virHashValueFree))) return NULL; if (mon->json) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index ca9e15c..0afad9d 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -1871,10 +1871,6 @@ qemuProcessFindCharDevicePTYs(virDomainObjPtr vm, return 0; } -static void qemuProcessFreePtyPath(void *payload, const void *name ATTRIBUTE_UNUSED) -{ - VIR_FREE(payload); -} static int qemuProcessWaitForMonitor(virQEMUDriverPtr driver, @@ -1911,7 +1907,7 @@ qemuProcessWaitForMonitor(virQEMUDriverPtr driver, * reliable if it's available. * Note that the monitor itself can be on a pty, so we still need to try the * log output method. */ - paths = virHashCreate(0, qemuProcessFreePtyPath); + paths = virHashCreate(0, virHashValueFree); if (paths == NULL) goto cleanup; diff --git a/src/util/virclosecallbacks.c b/src/util/virclosecallbacks.c index d62fd89..4f26172 100644 --- a/src/util/virclosecallbacks.c +++ b/src/util/virclosecallbacks.c @@ -1,7 +1,7 @@ /* * virclosecallbacks.c: Connection close callbacks routines * - * Copyright (C) 2013 Red Hat, Inc. + * Copyright (C) 2013-2014 Red Hat, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -67,13 +67,6 @@ static int virCloseCallbacksOnceInit(void) VIR_ONCE_GLOBAL_INIT(virCloseCallbacks) -static void -virCloseCallbacksFreeData(void *payload, - const void *name ATTRIBUTE_UNUSED) -{ - VIR_FREE(payload); -} - virCloseCallbacksPtr virCloseCallbacksNew(void) { @@ -85,7 +78,7 @@ virCloseCallbacksNew(void) if (!(closeCallbacks = virObjectLockableNew(virCloseCallbacksClass))) return NULL; - closeCallbacks->list = virHashCreate(5, virCloseCallbacksFreeData); + closeCallbacks->list = virHashCreate(5, virHashValueFree); if (!closeCallbacks->list) { virObjectUnref(closeCallbacks); return NULL; diff --git a/src/util/virhash.c b/src/util/virhash.c index 9ef3554..e3c1880 100644 --- a/src/util/virhash.c +++ b/src/util/virhash.c @@ -3,7 +3,7 @@ * * Reference: Your favorite introductory book on algorithms * - * Copyright (C) 2005-2013 Red Hat, Inc. + * Copyright (C) 2005-2014 Red Hat, Inc. * Copyright (C) 2000 Bjorn Reese and Daniel Veillard. * * Permission to use, copy, modify, and distribute this software for any @@ -99,6 +99,13 @@ static void virHashStrFree(void *name) } +void +virHashValueFree(void *value, const void *name ATTRIBUTE_UNUSED) +{ + VIR_FREE(value); +} + + static size_t virHashComputeKey(const virHashTable *table, const void *name) { diff --git a/src/util/virhash.h b/src/util/virhash.h index 4de9a14..a137137 100644 --- a/src/util/virhash.h +++ b/src/util/virhash.h @@ -3,7 +3,7 @@ * Description: This module implements the hash table and allocation and * deallocation of domains and connections * - * Copyright (C) 2005-2013 Red Hat, Inc. + * Copyright (C) 2005-2014 Red Hat, Inc. * Copyright (C) 2000 Bjorn Reese and Daniel Veillard. * * Author: Bjorn Reese <bjorn.reese(a)systematic.dk> @@ -184,4 +184,7 @@ ssize_t virHashRemoveSet(virHashTablePtr table, virHashSearcher iter, const void void *virHashSearch(const virHashTable *table, virHashSearcher iter, const void *data); +/* Convenience for when VIR_FREE(value) is sufficient as a data freer. */ +void virHashValueFree(void *value, const void *name); + #endif /* ! __VIR_HASH_H__ */ diff --git a/src/util/virkeyfile.c b/src/util/virkeyfile.c index 742fb37..da06425 100644 --- a/src/util/virkeyfile.c +++ b/src/util/virkeyfile.c @@ -1,7 +1,7 @@ /* * virkeyfile.c: "ini"-style configuration file handling * - * Copyright (C) 2012-2013 Red Hat, Inc. + * Copyright (C) 2012-2014 Red Hat, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -103,11 +103,6 @@ virKeyFileErrorHelper(const char *file, const char *func, size_t line, } -static void virKeyFileValueFree(void *value, const void *name ATTRIBUTE_UNUSED) -{ - VIR_FREE(value); -} - static int virKeyFileParseGroup(virKeyFileParserCtxtPtr ctxt) { int ret = -1; @@ -130,7 +125,7 @@ static int virKeyFileParseGroup(virKeyFileParserCtxtPtr ctxt) NEXT; - if (!(ctxt->group = virHashCreate(10, virKeyFileValueFree))) + if (!(ctxt->group = virHashCreate(10, virHashValueFree))) goto cleanup; if (virHashAddEntry(ctxt->conf->groups, ctxt->groupname, ctxt->group) < 0) diff --git a/src/util/virobject.c b/src/util/virobject.c index c8bc193..6cb84b4 100644 --- a/src/util/virobject.c +++ b/src/util/virobject.c @@ -1,7 +1,7 @@ /* * virobject.c: libvirt reference counted object * - * Copyright (C) 2012-2013 Red Hat, Inc. + * Copyright (C) 2012-2014 Red Hat, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -390,3 +390,18 @@ void virObjectFreeCallback(void *opaque) { virObjectUnref(opaque); } + + +/** + * virObjectFreeHashData: + * @opaque: a pointer to a virObject instance + * @name: ignored, name of the hash key being deleted + * + * Provides identical functionality to virObjectUnref, + * but with the signature matching the virHashDataFree + * typedef. + */ +void virObjectFreeHashData(void *opaque, const void *name ATTRIBUTE_UNUSED) +{ + virObjectUnref(opaque); +} diff --git a/src/util/virobject.h b/src/util/virobject.h index d571b5c..ad1f0c1 100644 --- a/src/util/virobject.h +++ b/src/util/virobject.h @@ -1,7 +1,7 @@ /* * virobject.h: libvirt reference counted object * - * Copyright (C) 2012-2013 Red Hat, Inc. + * Copyright (C) 2012-2014 Red Hat, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -89,6 +89,7 @@ bool virObjectIsClass(void *obj, ATTRIBUTE_NONNULL(2); void virObjectFreeCallback(void *opaque); +void virObjectFreeHashData(void *opaque, const void *name); void *virObjectLockableNew(virClassPtr klass) ATTRIBUTE_NONNULL(1); diff --git a/tests/qemumonitorjsontest.c b/tests/qemumonitorjsontest.c index f80d03e..47d7481 100644 --- a/tests/qemumonitorjsontest.c +++ b/tests/qemumonitorjsontest.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2011-2013 Red Hat, Inc. + * Copyright (C) 2011-2014 Red Hat, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -1356,8 +1356,8 @@ testQemuMonitorJSONqemuMonitorJSONGetBlockInfo(const void *data) if (!test) return -1; - if (!(blockDevices = virHashCreate(32, (virHashDataFree) free)) || - !(expectedBlockDevices = virHashCreate(32, (virHashDataFree) (free)))) + if (!(blockDevices = virHashCreate(32, virHashValueFree)) || + !(expectedBlockDevices = virHashCreate(32, virHashValueFree))) goto cleanup; if (VIR_ALLOC(info) < 0) -- 1.9.0

2 2

[libvirt] [PATCH] interface: dumpx inactive xml when interface isn't active
by Laine Stump 07 Apr '14

07 Apr '14

Other drivers in libvirt (e.g. network, qemu) will automatically return the "inactive" (persistent configuration) XML of an object when that object is inactive. The netcf backend of the interface driver would always try to return the live status XML of the interface, even when it was down. Although netcf does return valid XML in that case, for bond interfaces it is missing almost all of its content, including the <bond> subelement itself, leading to this error message from "virsh iface-dumpxml" of a bond interface that is inactive: error: XML error: bond interface misses the bond element (this is because libvirt's validation of the XML returned by netcf always requires a <bond> element be present). This patch modifies the interface driver netcf backend to check if the interface is inactive, and in that case always return the inactive XML (which will always have a <bond> element, thus eliminating the error message, as well as making operation more in line with other drivers. This fixes the following bug: https://bugzilla.redhat.com/show_bug.cgi?id=878394 --- src/interface/interface_backend_netcf.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/interface/interface_backend_netcf.c b/src/interface/interface_backend_netcf.c index 4d55653..36a50bd 100644 --- a/src/interface/interface_backend_netcf.c +++ b/src/interface/interface_backend_netcf.c @@ -801,6 +801,7 @@ static char *netcfInterfaceGetXMLDesc(virInterfacePtr ifinfo, char *xmlstr = NULL; virInterfaceDefPtr ifacedef = NULL; char *ret = NULL; + bool active; virCheckFlags(VIR_INTERFACE_XML_INACTIVE, NULL); @@ -812,7 +813,10 @@ static char *netcfInterfaceGetXMLDesc(virInterfacePtr ifinfo, goto cleanup; } - if ((flags & VIR_INTERFACE_XML_INACTIVE)) { + if (netcfInterfaceObjIsActive(iface, &active) < 0) + goto cleanup; + + if ((flags & VIR_INTERFACE_XML_INACTIVE) || !active) { xmlstr = ncf_if_xml_desc(iface); } else { xmlstr = ncf_if_xml_state(iface); -- 1.9.0

2 1

[libvirt] [PATCH] tests: build viridentitytest only WITH_ATTR.
by Jincheng Miao 07 Apr '14

07 Apr '14

Commit d7c4e0036 assumed all SELinux tests depended upon securityselinuxhelper need xattr support, but forgot to move viridentitytest under WITH_ATTR. Reported-by: Nehal J Wani <nehaljw.kkd1(a)gmail.com> Signed-off-by: Jincheng Miao <jmiao(a)redhat.com> --- tests/Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index 6e15af8..7a15295 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -146,7 +146,6 @@ test_programs = virshtest sockettest \ virpcitest \ virendiantest \ virfiletest \ - viridentitytest \ viriscsitest \ virkeycodetest \ virlockspacetest \ @@ -188,7 +187,8 @@ endif WITH_DBUS if WITH_SECDRIVER_SELINUX if WITH_ATTR -test_programs += securityselinuxtest +test_programs += securityselinuxtest \ + viridentitytest if WITH_QEMU test_programs += securityselinuxlabeltest endif WITH_QEMU -- 1.8.3.1

3 2

[libvirt] [PATCH libvirt-python 0/2] fix build dependency & increment version
by Laine Stump 07 Apr '14

07 Apr '14

Although they're trivial and one is a build breaker, I haven't pushed either in case I've made incorrect assumptions about something. Laine Stump (2): build: add BuildRequires for python-lxml and python3-lxml increment version post-release libvirt-python.spec.in | 2 ++ setup.py | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) -- 1.9.0

2 4

[libvirt] [PATCHv2] maint: Correctly detect wether "gluster" cli tool is accessible
by Peter Krempa 07 Apr '14

07 Apr '14

The configure definition previously always defined the GLUSTER_CLI macro and thus the code needing it wasn't compiled out if the tool wasn't accessible. --- Notes: Version 2: Simplify check. configure.ac | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index e68f5f6..52c50df 100644 --- a/configure.ac +++ b/configure.ac @@ -1939,8 +1939,10 @@ AM_CONDITIONAL([WITH_STORAGE_GLUSTER], [test "$with_storage_gluster" = "yes"]) if test "$with_storage_fs" = "yes" || test "$with_storage_gluster" = "yes"; then AC_PATH_PROG([GLUSTER_CLI], [gluster], [], [$PATH:/sbin:/usr/sbin]) - AC_DEFINE_UNQUOTED([GLUSTER_CLI], ["$GLUSTER_CLI"], - [Location or name of the gluster command line tool]) + if test "x$GLUSTER_CLI" != "x"; then + AC_DEFINE_UNQUOTED([GLUSTER_CLI], ["$GLUSTER_CLI"], + [Location or name of the gluster command line tool]) + fi fi LIBPARTED_CFLAGS= -- 1.9.1

2 2

[libvirt] [PATCH] libvirt-guests: avoid bashism
by Guido Günther 07 Apr '14

07 Apr '14

At least Debian uses dash to run the init scripts --- tools/libvirt-guests.sh.in | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tools/libvirt-guests.sh.in b/tools/libvirt-guests.sh.in index 4bbd4e4..a158b62 100644 --- a/tools/libvirt-guests.sh.in +++ b/tools/libvirt-guests.sh.in @@ -89,13 +89,15 @@ test_connect() { uri=$1 - for ((i = 0; i < ${CONNECT_RETRIES}; i++)); do + i=${CONNECT_RETRIES} + while [ $i -gt 0 ]; do run_virsh "$uri" connect 2>/dev/null if [ $? -eq 0 ]; then return 0; fi sleep ${RETRIES_SLEEP} eval_gettext "Unable to connect to libvirt currently. Retrying .. \$i" + i=$(($i-1)) done eval_gettext "Can't connect to \$uri. Skipping." echo -- 1.9.1

2 2

[libvirt] [PATCH] QoS: make tc filters match all traffic
by Antoni S. Puimedon 07 Apr '14

07 Apr '14

Up until now the traffic control filters for the vNIC QoS were matching only ip traffic. For egress traffic that was unnoticed because the unmatched traffic would just go to the default htb class and be shaped anyway. For ingress, though, since the policing of the rate is done by the filter itself. The problem is solved by changing protocol to all and making anything match the filter. Bug-Url: https://bugzilla.redhat.com/1084444 Signed-off-by: Antoni S. Puimedon <asegurap(a)redhat.com> --- src/util/virnetdevbandwidth.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/util/virnetdevbandwidth.c b/src/util/virnetdevbandwidth.c index b06ed4c..1e00116 100644 --- a/src/util/virnetdevbandwidth.c +++ b/src/util/virnetdevbandwidth.c @@ -193,7 +193,7 @@ virNetDevBandwidthSet(const char *ifname, virCommandFree(cmd); cmd = virCommandNew(TC); virCommandAddArgList(cmd, "filter", "add", "dev", ifname, "parent", - "1:0", "protocol", "ip", "handle", "1", "fw", + "1:0", "protocol", "all", "handle", "1", "fw", "flowid", "1", NULL); if (virCommandRun(cmd, NULL) < 0) @@ -221,9 +221,10 @@ virNetDevBandwidthSet(const char *ifname, virCommandFree(cmd); cmd = virCommandNew(TC); + /* Set filter to match all ingress traffic */ virCommandAddArgList(cmd, "filter", "add", "dev", ifname, "parent", - "ffff:", "protocol", "ip", "u32", "match", "ip", - "src", "0.0.0.0/0", "police", "rate", average, + "ffff:", "protocol", "all", "u32", "match", "u32", + "0", "0", "police", "rate", average, "burst", burst, "mtu", "64kb", "drop", "flowid", ":1", NULL); -- 1.9.0

2 1

[libvirt] [PATCH] maint: Correctly detect wether "gluster" cli tool is accessible
by Peter Krempa 07 Apr '14

07 Apr '14

The configure definition previously always defined the GLUSTER_CLI macro and thus the code needing it wasn't compiled out if the tool wasn't accessible. --- configure.ac | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index e68f5f6..fa07cfd 100644 --- a/configure.ac +++ b/configure.ac @@ -1938,9 +1938,11 @@ AM_CONDITIONAL([WITH_STORAGE_GLUSTER], [test "$with_storage_gluster" = "yes"]) if test "$with_storage_fs" = "yes" || test "$with_storage_gluster" = "yes"; then - AC_PATH_PROG([GLUSTER_CLI], [gluster], [], [$PATH:/sbin:/usr/sbin]) - AC_DEFINE_UNQUOTED([GLUSTER_CLI], ["$GLUSTER_CLI"], - [Location or name of the gluster command line tool]) + AC_PATH_PROG([GLUSTER_CLI], [gluster], [no], [$PATH:/sbin:/usr/sbin]) + if test "x$GLUSTER_CLI" != "xno"; then + AC_DEFINE_UNQUOTED([GLUSTER_CLI], ["$GLUSTER_CLI"], + [Location or name of the gluster command line tool]) + fi fi LIBPARTED_CFLAGS= -- 1.9.1

2 1

[libvirt] [PATCH] -Added autocloseable to connect class (set close() return type to void so to adapt it to the autocloseable interface)
by phate867＠gmail.com 07 Apr '14

07 Apr '14

From: pasquale <pasquale@pasquale-VPCEB1A4E> -Added the following bindings: --virDomainGetCpuStats --virNodeGetCpuStats --virDomainShutdownFlags --virDomainDestroyFlags -Added following classes --org/libvirt/CPUStatistic giving cpu stats in user friendly form --org/libvirt/jna/VirUnion binding --org/libvirt/jna/virDomainCPUStats type --org/libvirt/jna/virNodeCPUStats type --org/libvirt/jna/virTypedParameter biding --- src/main/java/org/libvirt/CPUStatistic.java | 61 +++ src/main/java/org/libvirt/Connect.java | 137 +++++- src/main/java/org/libvirt/Device.java | 57 ++- src/main/java/org/libvirt/Domain.java | 501 +++++++++++++++------ .../java/org/libvirt/DomainInterfaceStats.java | 2 +- src/main/java/org/libvirt/DomainSnapshot.java | 31 +- src/main/java/org/libvirt/Error.java | 409 ++++++----------- src/main/java/org/libvirt/ErrorHandler.java | 54 +-- src/main/java/org/libvirt/Interface.java | 65 +-- src/main/java/org/libvirt/Library.java | 4 +- src/main/java/org/libvirt/Network.java | 61 ++- src/main/java/org/libvirt/NetworkFilter.java | 43 +- src/main/java/org/libvirt/Secret.java | 67 ++- src/main/java/org/libvirt/StoragePool.java | 106 +++-- src/main/java/org/libvirt/StorageVol.java | 68 +-- src/main/java/org/libvirt/Stream.java | 71 ++- src/main/java/org/libvirt/jna/Libvirt.java | 42 +- src/main/java/org/libvirt/jna/VirUnion.java | 14 + 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 +- .../java/org/libvirt/jna/virDomainCPUStats.java | 21 + 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/virNodeCPUStats.java | 19 + 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 +- .../java/org/libvirt/jna/virTypedParameter.java | 22 + src/main/java/org/libvirt/jna/virVcpuInfo.java | 4 +- 35 files changed, 1194 insertions(+), 717 deletions(-) create mode 100644 src/main/java/org/libvirt/CPUStatistic.java create mode 100644 src/main/java/org/libvirt/jna/VirUnion.java create mode 100644 src/main/java/org/libvirt/jna/virDomainCPUStats.java create mode 100644 src/main/java/org/libvirt/jna/virNodeCPUStats.java create mode 100644 src/main/java/org/libvirt/jna/virTypedParameter.java diff --git a/src/main/java/org/libvirt/CPUStatistic.java b/src/main/java/org/libvirt/CPUStatistic.java new file mode 100644 index 0000000..4cd6f09 --- /dev/null +++ b/src/main/java/org/libvirt/CPUStatistic.java @@ -0,0 +1,61 @@ +package org.libvirt; + +import java.nio.charset.Charset; +import org.libvirt.jna.virNodeCPUStats; +import org.libvirt.jna.virTypedParameter; + +public class CPUStatistic { + public String tag; + public long val; + + //valid for host cpu stats + public static final int KERNEL_H = 0; + public static final int USER_H = 1; + public static final int IDLE_H = 2; + public static final int IOWAIT_H = 3; + + //valid for guest cpu stats + public static final int CPU_D = 0; + public static final int USER_D = 1; + public static final int SYSTEM_D = 2; + + private String createStringFromBytes(byte[] b){ + Charset ch = Charset.forName("UTF-8"); + int i = 0; + while ((i<b.length) && (b[i]!=0)) + i++; + + return new String(b,0,i,ch); + } + + public CPUStatistic(virNodeCPUStats stat){ + tag = createStringFromBytes(stat.tag); + val = stat.val; + } + + public CPUStatistic(virTypedParameter stat){ + tag = createStringFromBytes(stat.field); + val = stat.value.l; + } + + public String getTag() { + return tag; + } + + public long getValue() { + return val; + } + + public void setTag(String tag) { + this.tag = tag; + } + + public void setValue(long val) { + this.val = val; + } + + @Override + public String toString() { + return String.format("tag:%s%nval:%d%n", tag, val); + } +} diff --git a/src/main/java/org/libvirt/Connect.java b/src/main/java/org/libvirt/Connect.java index fedc60e..07285f9 100644 --- a/src/main/java/org/libvirt/Connect.java +++ b/src/main/java/org/libvirt/Connect.java @@ -14,15 +14,15 @@ import org.libvirt.jna.StoragePoolPointer; import org.libvirt.jna.StorageVolPointer; import org.libvirt.jna.StreamPointer; import org.libvirt.jna.virConnectAuth; +import org.libvirt.jna.virNodeCPUStats; 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; import com.sun.jna.Pointer; +import com.sun.jna.ptr.IntByReference; import com.sun.jna.ptr.LongByReference; /** @@ -31,7 +31,7 @@ import com.sun.jna.ptr.LongByReference; * * @author stoty */ -public class Connect { +public class Connect implements AutoCloseable{ /** * Get the version of a connection. @@ -82,6 +82,7 @@ public class Connect { */ public static void setErrorCallback(Libvirt.VirErrorCallback callback) throws LibvirtException { Libvirt.INSTANCE.virSetErrorFunc(null, callback); + ErrorHandler.processError(Libvirt.INSTANCE); } /** @@ -121,6 +122,7 @@ public class Connect { VCP = libvirt.virConnectOpen(uri); // Check for an error processError(VCP); + ErrorHandler.processError(Libvirt.INSTANCE); } /** @@ -141,6 +143,7 @@ public class Connect { } // Check for an error processError(VCP); + ErrorHandler.processError(Libvirt.INSTANCE); } /** @@ -173,6 +176,7 @@ public class Connect { VCP = libvirt.virConnectOpenAuth(uri, vAuth, flags); // Check for an error processError(VCP); + ErrorHandler.processError(Libvirt.INSTANCE); } /** @@ -195,7 +199,7 @@ public class Connect { * @throws LibvirtException * @return number of remaining references (>= 0) */ - public int close() throws LibvirtException { + public void close() throws LibvirtException { int success = 0; if (VCP != null) { success = libvirt.virConnectClose(VCP); @@ -205,7 +209,8 @@ public class Connect { // it's called with a null virConnectPointer VCP = null; } - return processError(success); + + processError(success); } /** @@ -219,7 +224,8 @@ public class Connect { * @throws LibvirtException */ public CPUCompareResult compareCPU(String xmlDesc) throws LibvirtException { - int rawResult = processError(libvirt.virConnectCompareCPU(VCP, xmlDesc, 0)); + int rawResult = libvirt.virConnectCompareCPU(VCP, xmlDesc, 0); + processError(); return CPUCompareResult.get(rawResult); } @@ -306,11 +312,13 @@ public class Connect { * Documentation</a> * @param callbackID * the callback to deregister - * @return ignore (always 0) + * @return 0 on success, -1 on failure * @throws LibvirtException */ public int domainEventDeregisterAny(int callbackID) throws LibvirtException { - return processError(libvirt.virConnectDomainEventDeregisterAny(VCP, callbackID)); + int returnValue = libvirt.virConnectDomainEventDeregisterAny(VCP, callbackID); + processError(); + return returnValue; } /** @@ -475,6 +483,41 @@ public class Connect { Library.free(ptr); } } + + /** + * This functions gives a % of the load on the host cpu system. + * In the case of a multicore processor it gives a load average. + * In order to do so it makes two sequential measurements, according + * to the interval parameter. + * + * + * @param interval the interval,in ms, between the two measurations. + * @return + * @throws LibvirtException + */ + public float getCPUOverallUsage(long interval) throws LibvirtException{ + float result = 0; + CPUStatistic[] st1 = getCPUStats(-1, 0); + try { + Thread.sleep(interval); + CPUStatistic[] st2 = getCPUStats(-1, 0); + + for(int i=0;i<st2.length;i++) + st2[i].val -= st1[i].val; + + long sum = 0; + for(int i=0;i<st2.length;i++) + sum +=st2[i].val; + + result = 100.0f - (st2[CPUStatistic.IDLE_H].val*100.0f/sum); + + } catch (InterruptedException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + + return result; + } /** * NUMA Support @@ -492,7 +535,10 @@ public class Connect { * Returns the free memory for the connection */ public long getFreeMemory() throws LibvirtException { - return processErrorIfZero(libvirt.virNodeGetFreeMemory(VCP)); + long returnValue = 0; + returnValue = libvirt.virNodeGetFreeMemory(VCP); + if (returnValue == 0) processError(); + return returnValue; } /** @@ -632,11 +678,13 @@ 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 + * @return 1 if encrypted, 0 if not encrypted, -1 on error * @throws LibvirtException */ public int isEncrypted() throws LibvirtException { - return processError(libvirt.virConnectIsEncrypted(VCP)); + int returnValue = libvirt.virConnectIsEncrypted(VCP); + processError(); + return returnValue; } /** @@ -645,11 +693,13 @@ 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 + * @return 1 if secure, 0 if not secure, -1 on error * @throws LibvirtException */ public int isSecure() throws LibvirtException { - return processError(libvirt.virConnectIsSecure(VCP)); + int returnValue = libvirt.virConnectIsSecure(VCP); + processError(); + return returnValue; } /** @@ -1019,6 +1069,7 @@ public class Connect { processError(libvirt.virNodeGetInfo(VCP, vInfo)); return new NodeInfo(vInfo); } + /** * Provides the number of inactive domains. @@ -1130,6 +1181,65 @@ 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); + } + + public CPUStatistic[] getCPUStats(int number,long flags) throws LibvirtException{ + CPUStatistic[] stats = null; + + IntByReference nParams = new IntByReference(); + + int result = libvirt.virNodeGetCPUStats( + VCP, number, null, nParams, flags); + processError(); + + if(result == 0){ + virNodeCPUStats[] params = new virNodeCPUStats[nParams.getValue()]; + result = libvirt.virNodeGetCPUStats(VCP, number , params, nParams, flags); + processError(); + + if(result >= 0){ + stats = new CPUStatistic[params.length]; + for(int i=0;i<params.length;i++) + stats[i] = new CPUStatistic(params[i]); + } + } + + return stats; + } + + /** + * 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 @@ -1200,6 +1310,7 @@ public class Connect { public void setConnectionErrorCallback(Libvirt.VirErrorCallback callback) throws LibvirtException { libvirt.virConnSetErrorFunc(VCP, null, callback); + processError(); } /** diff --git a/src/main/java/org/libvirt/Device.java b/src/main/java/org/libvirt/Device.java index a3b20b8..fe49ce9 100644 --- a/src/main/java/org/libvirt/Device.java +++ b/src/main/java/org/libvirt/Device.java @@ -2,11 +2,6 @@ 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; /** * A device which is attached to a node @@ -46,7 +41,8 @@ public class Device { public int destroy() throws LibvirtException { int success = 0; if (VDP != null) { - success = processError(libvirt.virNodeDeviceDestroy(VDP)); + success = libvirt.virNodeDeviceDestroy(VDP); + processError(); VDP = null; } @@ -60,7 +56,9 @@ public class Device { * @throws LibvirtException */ public int detach() throws LibvirtException { - return processError(libvirt.virNodeDeviceDettach(VDP)); + int num = libvirt.virNodeDeviceDettach(VDP); + processError(); + return num; } @Override @@ -78,7 +76,8 @@ public class Device { public int free() throws LibvirtException { int success = 0; if (VDP != null) { - success = processError(libvirt.virNodeDeviceFree(VDP)); + success = libvirt.virNodeDeviceFree(VDP); + processError(); VDP = null; } @@ -91,7 +90,9 @@ public class Device { * @throws LibvirtException */ public String getName() throws LibvirtException { - return processError(libvirt.virNodeDeviceGetName(VDP)); + String name = libvirt.virNodeDeviceGetName(VDP); + processError(); + return name; } /** @@ -100,7 +101,9 @@ public class Device { * @throws LibvirtException */ public int getNumberOfCapabilities() throws LibvirtException { - return processError(libvirt.virNodeDeviceNumOfCaps(VDP)); + int num = libvirt.virNodeDeviceNumOfCaps(VDP); + processError(); + return num; } /** @@ -109,7 +112,9 @@ public class Device { * @throws LibvirtException */ public String getParent() throws LibvirtException { - return processError(libvirt.virNodeDeviceGetParent(VDP)); + String parent = libvirt.virNodeDeviceGetParent(VDP); + processError(); + return parent; } /** @@ -118,7 +123,9 @@ public class Device { * @throws LibvirtException */ public String getXMLDescription() throws LibvirtException { - return processError(libvirt.virNodeDeviceGetXMLDesc(VDP)); + String desc = libvirt.virNodeDeviceGetXMLDesc(VDP); + processError(); + return desc; } /** @@ -128,15 +135,21 @@ public class Device { */ public String[] listCapabilities() throws LibvirtException { int maxCaps = getNumberOfCapabilities(); + String[] names = new String[maxCaps]; if (maxCaps > 0) { - Pointer[] ptrs = new Pointer[maxCaps]; - int got = processError(libvirt.virNodeDeviceListCaps(VDP, ptrs, maxCaps)); - - return Library.toStringArray(ptrs, got); - } else { - return Library.NO_STRINGS; + libvirt.virNodeDeviceListCaps(VDP, names, maxCaps); + processError(); } + return names; + } + + /** + * Error handling logic to throw errors. Must be called after every libvirt + * call. + */ + protected void processError() throws LibvirtException { + virConnect.processError(); } /** @@ -145,7 +158,9 @@ public class Device { * @throws LibvirtException */ public int reAttach() throws LibvirtException { - return processError(libvirt.virNodeDeviceReAttach(VDP)); + int num = libvirt.virNodeDeviceReAttach(VDP); + processError(); + return num; } /** @@ -155,6 +170,8 @@ public class Device { * @throws LibvirtException */ public int reset() throws LibvirtException { - return processError(libvirt.virNodeDeviceReset(VDP)); + int num = libvirt.virNodeDeviceReset(VDP); + processError(); + return num; } } diff --git a/src/main/java/org/libvirt/Domain.java b/src/main/java/org/libvirt/Domain.java index a217733..b515b4b 100644 --- a/src/main/java/org/libvirt/Domain.java +++ b/src/main/java/org/libvirt/Domain.java @@ -3,7 +3,6 @@ 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; @@ -11,10 +10,10 @@ import org.libvirt.jna.virDomainInterfaceStats; import org.libvirt.jna.virDomainJobInfo; import org.libvirt.jna.virDomainMemoryStats; import org.libvirt.jna.virSchedParameter; +import org.libvirt.jna.virTypedParameter; import org.libvirt.jna.virVcpuInfo; + import static org.libvirt.Library.libvirt; -import static org.libvirt.ErrorHandler.processError; -import static org.libvirt.ErrorHandler.processErrorIfZero; import com.sun.jna.Native; import com.sun.jna.NativeLong; @@ -33,25 +32,25 @@ public class Domain { public static final int BYTES = 1; } - static final class CreateFlags { - static final int VIR_DOMAIN_NONE = 0; - static final int VIR_DOMAIN_SNAPSHOT_CREATE_REDEFINE = (1 << 0); /* Restore or alter + public static final class CreateFlags { + public static final int VIR_DOMAIN_NONE = 0; + public static final int VIR_DOMAIN_SNAPSHOT_CREATE_REDEFINE = (1 << 0); /* Restore or alter metadata */ - static final int VIR_DOMAIN_SNAPSHOT_CREATE_CURRENT = (1 << 1); /* With redefine, make + public static final int VIR_DOMAIN_SNAPSHOT_CREATE_CURRENT = (1 << 1); /* With redefine, make snapshot current */ - static final int VIR_DOMAIN_SNAPSHOT_CREATE_NO_METADATA = (1 << 2); /* Make snapshot without + public static final int VIR_DOMAIN_SNAPSHOT_CREATE_NO_METADATA = (1 << 2); /* Make snapshot without remembering it */ - static final int VIR_DOMAIN_SNAPSHOT_CREATE_HALT = (1 << 3); /* Stop running guest + public static final int VIR_DOMAIN_SNAPSHOT_CREATE_HALT = (1 << 3); /* Stop running guest after snapshot */ - static final int VIR_DOMAIN_SNAPSHOT_CREATE_DISK_ONLY = (1 << 4); /* disk snapshot, not + public static final int VIR_DOMAIN_SNAPSHOT_CREATE_DISK_ONLY = (1 << 4); /* disk snapshot, not system checkpoint */ - static final int VIR_DOMAIN_SNAPSHOT_CREATE_REUSE_EXT = (1 << 5); /* reuse any existing + public static final int VIR_DOMAIN_SNAPSHOT_CREATE_REUSE_EXT = (1 << 5); /* reuse any existing external files */ - static final int VIR_DOMAIN_SNAPSHOT_CREATE_QUIESCE = (1 << 6); /* use guest agent to + public static final int VIR_DOMAIN_SNAPSHOT_CREATE_QUIESCE = (1 << 6); /* use guest agent to quiesce all mounted file systems within the domain */ - static final int VIR_DOMAIN_SNAPSHOT_CREATE_ATOMIC = (1 << 7); /* atomically avoid + public static final int VIR_DOMAIN_SNAPSHOT_CREATE_ATOMIC = (1 << 7); /* atomically avoid partial changes */ } @@ -72,6 +71,19 @@ public class Domain { * when supported */ static final int VIR_MIGRATE_UNSAFE = (1 << 9); /* force migration even if it is considered unsafe */ } + + public static final class ShutdownFlags{ + static final long SHUTDOWN_DEFAULT = 0; //hypervisor choice + static final long SHUTDOWN_ACPI_POWER_BTN = 1; //send acpi api event + static final long SHUTDOWN_GUEST_AGENT = 2; //use guest agent + static final long SHUTDOWN_INITCTL = 4; //use init ctl + static final long DOMAIN_SHUTDOWN_SIGNAL = 8; //send a signal + } + + public static final class DestroyFlags{ + public static final long DESTROY_DEFAULT = 0; //Default behavior - could lead to data loss!! + public static final long DESTROY_GRACEFUL = 1; //only SIGTERM, no SIGKILL + } static final class XMLFlags { /** @@ -162,11 +174,13 @@ public class Domain { * @see <a * href="http://www.libvirt.org/html/libvirt-libvirt.html#virDomainAbortJob">Libvirt * Documentation</a> - * @return ignore (always 0) + * @return 0 in case of success and -1 in case of failure. * @throws LibvirtException */ public int abortJob() throws LibvirtException { - return processError(libvirt.virDomainAbortJob(VDP)); + int returnValue = libvirt.virDomainAbortJob(VDP); + processError(); + return returnValue; } /** @@ -180,7 +194,8 @@ public class Domain { * @throws LibvirtException */ public void attachDevice(String xmlDesc) throws LibvirtException { - processError(libvirt.virDomainAttachDevice(VDP, xmlDesc)); + libvirt.virDomainAttachDevice(VDP, xmlDesc); + processError(); } /** @@ -196,7 +211,8 @@ public class Domain { * @throws LibvirtException */ public void attachDeviceFlags(String xmlDesc, int flags) throws LibvirtException { - processError(libvirt.virDomainAttachDeviceFlags(VDP, xmlDesc, flags)); + libvirt.virDomainAttachDeviceFlags(VDP, xmlDesc, flags); + processError(); } /** @@ -205,13 +221,14 @@ public class Domain { * * @param path * the path to the block device - * @return the info + * @return the info, or null if an error * @throws LibvirtException */ public DomainBlockInfo blockInfo(String path) throws LibvirtException { virDomainBlockInfo info = new virDomainBlockInfo(); - processError(libvirt.virDomainGetBlockInfo(VDP, path, info, 0)); - return new DomainBlockInfo(info); + int success = libvirt.virDomainGetBlockInfo(VDP, path, info, 0); + processError(); + return success == 0 ? new DomainBlockInfo(info) : null; } /** @@ -231,8 +248,9 @@ public class Domain { */ public DomainBlockStats blockStats(String path) throws LibvirtException { virDomainBlockStats stats = new virDomainBlockStats(); - processError(libvirt.virDomainBlockStats(VDP, path, stats, new SizeT(stats.size()))); - return new DomainBlockStats(stats); + int success = libvirt.virDomainBlockStats(VDP, path, stats, stats.size()); + processError(); + return success == 0 ? new DomainBlockStats(stats) : null; } /** @@ -247,7 +265,8 @@ public class Domain { * @throws LibvirtException */ public void blockResize(String disk, long size, int flags) throws LibvirtException { - processError(libvirt.virDomainBlockResize(VDP, disk, size, flags)); + int returnValue = libvirt.virDomainBlockResize(VDP, disk, size, flags); + processError(); } @@ -262,7 +281,8 @@ public class Domain { * @throws LibvirtException */ public void coreDump(String to, int flags) throws LibvirtException { - processError(libvirt.virDomainCoreDump(VDP, to, flags)); + libvirt.virDomainCoreDump(VDP, to, flags); + processError(); } /** @@ -277,11 +297,12 @@ public class Domain { * Launches this defined domain. If the call succeed the domain moves from * the defined to the running domains pools. * - * @return ignore (always 0) * @throws LibvirtException */ public int create() throws LibvirtException { - return processError(libvirt.virDomainCreate(VDP)); + int returnValue = libvirt.virDomainCreate(VDP); + processError(); + return returnValue; } /** @@ -289,11 +310,12 @@ public class Domain { * If the call succeed the domain moves from * the defined to the running domains pools. * - * @return ignore (always 0) * @throws LibvirtException */ public int create(int flags) throws LibvirtException { - return processError(libvirt.virDomainCreateWithFlags(VDP, flags)); + int returnValue = libvirt.virDomainCreateWithFlags(VDP, flags); + processError(); + return returnValue; } /** @@ -305,7 +327,13 @@ public class Domain { * @throws LibvirtException */ public void destroy() throws LibvirtException { - processError(libvirt.virDomainDestroy(VDP)); + libvirt.virDomainDestroy(VDP); + processError(); + } + + public void destroyWithFlags(long flags) throws LibvirtException{ + libvirt.virDomainDestroyFlags(VDP, flags); + processError(); } /** @@ -319,7 +347,8 @@ public class Domain { * @throws LibvirtException */ public void detachDevice(String xmlDesc) throws LibvirtException { - processError(libvirt.virDomainDetachDevice(VDP, xmlDesc)); + libvirt.virDomainDetachDevice(VDP, xmlDesc); + processError(); } /** @@ -333,12 +362,13 @@ public class Domain { * @throws LibvirtException */ public void detachDeviceFlags(String xmlDesc, int flags) throws LibvirtException { - processError(libvirt.virDomainDetachDeviceFlags(VDP, xmlDesc, flags)); + libvirt.virDomainDetachDeviceFlags(VDP, xmlDesc, flags); + processError(); } @Override protected void finalize() throws LibvirtException { - free(); + close(); } /** @@ -346,12 +376,13 @@ public class Domain { * structure is freed and should not be used thereafter. * * @throws LibvirtException - * @return number of references left (>= 0) + * @return number of references left (>= 0) for success, -1 for failure. */ - public int free() throws LibvirtException { + public int close() throws LibvirtException { int success = 0; if (VDP != null) { - success = processError(libvirt.virDomainFree(VDP)); + success = libvirt.virDomainFree(VDP); + processError(); VDP = null; } @@ -359,7 +390,7 @@ public class Domain { } /** - * Provides a boolean value indicating whether the domain is configured to + * Provides a boolean value indicating whether the network is configured to * be automatically started when the host machine boots. * * @return the result @@ -367,7 +398,8 @@ public class Domain { */ public boolean getAutostart() throws LibvirtException { IntByReference autoStart = new IntByReference(); - processError(libvirt.virDomainGetAutostart(VDP, autoStart)); + libvirt.virDomainGetAutostart(VDP, autoStart); + processError(); return autoStart.getValue() != 0 ? true : false; } @@ -379,6 +411,47 @@ public class Domain { public Connect getConnect() { return virConnect; } + + /** + * This functions gives a % of the load on the host cpu system. + * In the case of a multicore processor it gives a load average. + * In order to do so it makes two sequential measurements, according + * to the interval parameter. + * + * + * @param interval the interval,in ms, between the two measurations. + * @return + * @throws LibvirtException + */ + public float getCPUOverallUsage(long interval) throws LibvirtException{ + float result = 0; + CPUStatistic[] h1 = getConnect().getCPUStats(-1, 0); + CPUStatistic[] d1 = getCPUStats(-1, 0); + try { + Thread.sleep(interval); + CPUStatistic[] h2 = getConnect().getCPUStats(-1, 0); + CPUStatistic[] d2 = getCPUStats(-1, 0); + + for(int i=0;i<h2.length;i++) + h2[i].val -= h1[i].val; + + for(int i=0;i<d2.length;i++) + d2[i].val -= d1[i].val; + + long sum = 0; + for(int i=0;i<h2.length;i++) + sum +=h2[i].val; + + + result = d2[CPUStatistic.CPU_D].val*100.0f/sum; + + } catch (InterruptedException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + + return result; + } /** * Gets the hypervisor ID number for the domain @@ -387,7 +460,9 @@ public class Domain { * @throws LibvirtException */ public int getID() throws LibvirtException { - return processError(libvirt.virDomainGetID(VDP)); + int returnValue = libvirt.virDomainGetID(VDP); + processError(); + return returnValue; } /** @@ -403,9 +478,14 @@ public class Domain { * @throws LibvirtException */ public DomainInfo getInfo() throws LibvirtException { + DomainInfo returnValue = null; virDomainInfo vInfo = new virDomainInfo(); - processError(libvirt.virDomainGetInfo(VDP, vInfo)); - return new DomainInfo(vInfo); + int success = libvirt.virDomainGetInfo(VDP, vInfo); + processError(); + if (success == 0) { + returnValue = new DomainInfo(vInfo); + } + return returnValue; } /** @@ -419,9 +499,14 @@ public class Domain { * @throws LibvirtException */ public DomainJobInfo getJobInfo() throws LibvirtException { + DomainJobInfo returnValue = null; virDomainJobInfo vInfo = new virDomainJobInfo(); - processError(libvirt.virDomainGetJobInfo(VDP, vInfo)); - return new DomainJobInfo(vInfo); + int success = libvirt.virDomainGetJobInfo(VDP, vInfo); + processError(); + if (success == 0) { + returnValue = new DomainJobInfo(vInfo); + } + return returnValue; } /** @@ -431,9 +516,9 @@ public class Domain { * @throws LibvirtException */ public long getMaxMemory() throws LibvirtException { - // the memory size in kibibytes (blocks of 1024 bytes), or 0 in case of error. NativeLong returnValue = libvirt.virDomainGetMaxMemory(VDP); - return processErrorIfZero(returnValue.longValue()); + processError(); + return returnValue.longValue(); } /** @@ -446,17 +531,21 @@ public class Domain { * @throws LibvirtException */ public int getMaxVcpus() throws LibvirtException { - return processError(libvirt.virDomainGetMaxVcpus(VDP)); + int returnValue = libvirt.virDomainGetMaxVcpus(VDP); + processError(); + return returnValue; } /** * Gets the public name for this domain * - * @return the name, null if there is no name - * @throws LibvirtException never + * @return the name + * @throws LibvirtException */ public String getName() throws LibvirtException { - return libvirt.virDomainGetName(VDP); + String returnValue = libvirt.virDomainGetName(VDP); + processError(); + return returnValue; } /** @@ -466,7 +555,8 @@ public class Domain { * @throws LibvirtException */ public String getOSType() throws LibvirtException { - Pointer ptr = processError(libvirt.virDomainGetOSType(VDP)); + Pointer ptr = libvirt.virDomainGetOSType(VDP); + processError(); try { return Library.getString(ptr); } finally { @@ -482,25 +572,22 @@ public class Domain { */ public SchedParameter[] getSchedulerParameters() throws LibvirtException { IntByReference nParams = new IntByReference(); - Library.free(processError(libvirt.virDomainGetSchedulerType(VDP, nParams))); - - 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++) { + SchedParameter[] returnValue = new SchedParameter[0]; + Pointer pScheduler = libvirt.virDomainGetSchedulerType(VDP, nParams); + processError(); + if (pScheduler != null) { + String scheduler = Library.getString(pScheduler); + Library.free(pScheduler); + virSchedParameter[] nativeParams = new virSchedParameter[nParams.getValue()]; + returnValue = new SchedParameter[nParams.getValue()]; + libvirt.virDomainGetSchedulerParameters(VDP, nativeParams, nParams); + processError(); + for (int x = 0; x < nParams.getValue(); x++) { returnValue[x] = SchedParameter.create(nativeParams[x]); } - return returnValue; - } else { - return new SchedParameter[] {}; } + + return returnValue; } // getSchedulerType @@ -513,13 +600,14 @@ public class Domain { * @return the type of the scheduler * @throws LibvirtException */ - public String getSchedulerType() throws LibvirtException { - Pointer pScheduler = processError(libvirt.virDomainGetSchedulerType(VDP, null)); - try { - return Library.getString(pScheduler); - } finally { - Library.free(pScheduler); - } + public String[] getSchedulerType() throws LibvirtException { + IntByReference nParams = new IntByReference(); + Pointer pScheduler = libvirt.virDomainGetSchedulerType(VDP, nParams); + processError(); + String[] array = new String[1]; + array[0] = Library.getString(pScheduler); + Library.free(pScheduler); + return array; } /** @@ -531,8 +619,13 @@ public class Domain { */ public int[] getUUID() throws LibvirtException { byte[] bytes = new byte[Libvirt.VIR_UUID_BUFLEN]; - processError(libvirt.virDomainGetUUID(VDP, bytes)); - return Connect.convertUUIDBytes(bytes); + int success = libvirt.virDomainGetUUID(VDP, bytes); + processError(); + int[] returnValue = new int[0]; + if (success == 0) { + returnValue = Connect.convertUUIDBytes(bytes); + } + return returnValue; } /** @@ -544,8 +637,13 @@ public class Domain { */ public String getUUIDString() throws LibvirtException { byte[] bytes = new byte[Libvirt.VIR_UUID_STRING_BUFLEN]; - processError(libvirt.virDomainGetUUIDString(VDP, bytes)); - return Native.toString(bytes); + int success = libvirt.virDomainGetUUIDString(VDP, bytes); + processError(); + String returnValue = null; + if (success == 0) { + returnValue = Native.toString(bytes); + } + return returnValue; } /** @@ -565,7 +663,8 @@ public class Domain { virVcpuInfo[] infos = new virVcpuInfo[cpuCount]; returnValue = new int[cpuCount * maplength]; byte[] cpumaps = new byte[cpuCount * maplength]; - processError(libvirt.virDomainGetVcpus(VDP, infos, cpuCount, cpumaps, maplength)); + libvirt.virDomainGetVcpus(VDP, infos, cpuCount, cpumaps, maplength); + processError(); for (int x = 0; x < cpuCount * maplength; x++) { returnValue[x] = cpumaps[x]; } @@ -583,12 +682,37 @@ public class Domain { int cpuCount = getMaxVcpus(); VcpuInfo[] returnValue = new VcpuInfo[cpuCount]; virVcpuInfo[] infos = new virVcpuInfo[cpuCount]; - processError(libvirt.virDomainGetVcpus(VDP, infos, cpuCount, null, 0)); + libvirt.virDomainGetVcpus(VDP, infos, cpuCount, null, 0); + processError(); for (int x = 0; x < cpuCount; x++) { returnValue[x] = new VcpuInfo(infos[x]); } return returnValue; } + + public CPUStatistic[] getCPUStats(int number, long flags) throws LibvirtException{ + + CPUStatistic[] stats = null; + + int result = libvirt.virDomainGetCPUStats(VDP, + null, 0, -1, 1, 0); + processError(); + + if(result >0){ + + virTypedParameter[] params = new virTypedParameter[result]; + result = libvirt.virDomainGetCPUStats(VDP, params, result, + number, 1, flags); + processError(); + if(result > 0){ + stats = new CPUStatistic[params.length]; + for(int i=0;i<params.length;i++) + stats[i] = new CPUStatistic(params[i]); + } + } + + return stats; + } /** * Provides an XML description of the domain. The description may be reused @@ -602,7 +726,8 @@ public class Domain { * Description format </a> */ public String getXMLDesc(int flags) throws LibvirtException { - Pointer ptr = processError(libvirt.virDomainGetXMLDesc(VDP, flags)); + Pointer ptr = libvirt.virDomainGetXMLDesc(VDP, flags); + processError(); try { return Library.getString(ptr); } finally { @@ -615,11 +740,13 @@ public class Domain { * * @see <a href="http://www.libvirt.org/html/libvirt-libvirt.html#virDomainHasCurrentSnapshot>Libvi * r t Documentation</a> - * @return 1 if running, 0 if inactive + * @return 1 if running, 0 if inactive, -1 on error * @throws LibvirtException */ public int hasCurrentSnapshot() throws LibvirtException { - return processError(libvirt.virDomainHasCurrentSnapshot(VDP, 0)); + int returnValue = libvirt.virDomainHasCurrentSnapshot(VDP, 0); + processError(); + return returnValue; } /** @@ -632,7 +759,9 @@ public class Domain { * @throws LibvirtException */ public int hasManagedSaveImage() throws LibvirtException { - return processError(libvirt.virDomainHasManagedSaveImage(VDP, 0)); + int returnValue = libvirt.virDomainHasManagedSaveImage(VDP, 0); + processError(); + return returnValue; } /** @@ -650,7 +779,8 @@ public class Domain { */ public DomainInterfaceStats interfaceStats(String path) throws LibvirtException { virDomainInterfaceStats stats = new virDomainInterfaceStats(); - processError(libvirt.virDomainInterfaceStats(VDP, path, stats, new SizeT(stats.size()))); + libvirt.virDomainInterfaceStats(VDP, path, stats, stats.size()); + processError(); return new DomainInterfaceStats(stats); } @@ -660,11 +790,13 @@ public class Domain { * @see <a * href="http://www.libvirt.org/html/libvirt-libvirt.html#virDomainIsActive">Libvirt * Documentation</a> - * @return 1 if running, 0 if inactive + * @return 1 if running, 0 if inactive, -1 on error * @throws LibvirtException */ public int isActive() throws LibvirtException { - return processError(libvirt.virDomainIsActive(VDP)); + int returnValue = libvirt.virDomainIsActive(VDP); + processError(); + return returnValue; } /** @@ -674,11 +806,13 @@ public class Domain { * @see <a * href="http://www.libvirt.org/html/libvirt-libvirt.html#virDomainIsPersistent">Libvirt * Documentation</a> - * @return 1 if persistent, 0 if transient + * @return 1 if persistent, 0 if transient, -1 on error * @throws LibvirtException */ public int isPersistent() throws LibvirtException { - return processError(libvirt.virDomainIsPersistent(VDP)); + int returnValue = libvirt.virDomainIsPersistent(VDP); + processError(); + return returnValue; } /** @@ -687,11 +821,13 @@ public class Domain { * @see <a * href="http://www.libvirt.org/html/libvirt-libvirt.html#virDomainManagedSave">Libvirt * Documentation</a> - * @return always 0 + * @return 0 in case of success or -1 in case of failure * @throws LibvirtException */ public int managedSave() throws LibvirtException { - return processError(libvirt.virDomainManagedSave(VDP, 0)); + int returnValue = libvirt.virDomainManagedSave(VDP, 0); + processError(); + return returnValue; } /** @@ -700,11 +836,13 @@ public class Domain { * @see <a * href="http://www.libvirt.org/html/libvirt-libvirt.html#virDomainManagedSaveRemove">Libvirt * Documentation</a> - * @return always 0 + * @return 0 in case of success, and -1 in case of error * @throws LibvirtException */ public int managedSaveRemove() throws LibvirtException { - return processError(libvirt.virDomainManagedSaveRemove(VDP, 0)); + int returnValue = libvirt.virDomainManagedSaveRemove(VDP, 0); + processError(); + return returnValue; } /** @@ -712,19 +850,37 @@ public class Domain { * * @param number * the number of stats to retrieve - * @return the collection of stats + * @return the collection of stats, or null if an error occurs. * @throws LibvirtException */ public MemoryStatistic[] memoryStats(int number) throws LibvirtException { virDomainMemoryStats[] stats = new virDomainMemoryStats[number]; MemoryStatistic[] returnStats = null; - int result = processError(libvirt.virDomainMemoryStats(VDP, stats, number, 0)); - returnStats = new MemoryStatistic[result]; - for (int x = 0; x < result; x++) { - returnStats[x] = new MemoryStatistic(stats[x]); + int result = libvirt.virDomainMemoryStats(VDP, stats, number, 0); + processError(); + if (result >= 0) { + returnStats = new MemoryStatistic[result]; + for (int x = 0; x < result; x++) { + returnStats[x] = new MemoryStatistic(stats[x]); + } } return returnStats; } + + //TODO + /*public CPUStatistic[] cpuStats(int number) throws LibvirtException{ + virDomainCPUStats[] stats = new virDomainCPUStats[number]; + CPUStatistic[] returnStats = null; + int result = libvirt.virDomainGetVcpus(VDP, stats, number,null, 0); + processError(); + if (result >= 0) { + returnStats = new CPUStatistic[result]; + for (int x = 0; x < result; x++) { + returnStats[x] = new CPUStatistic(stats[x]); + } + } + return returnStats; + }*/ /** * Migrate this domain object from its current host to the destination host @@ -795,8 +951,8 @@ public class Domain { * @throws LibvirtException if the migration fails */ public Domain migrate(Connect dconn, long flags, String dxml, String dname, String uri, long bandwidth) throws LibvirtException { - DomainPointer newPtr = - processError(libvirt.virDomainMigrate2(VDP, dconn.VCP, dxml, new NativeLong(flags), dname, uri, new NativeLong(bandwidth))); + DomainPointer newPtr = libvirt.virDomainMigrate2(VDP, dconn.VCP, dxml, new NativeLong(flags), dname, uri, new NativeLong(bandwidth)); + processError(); return new Domain(dconn, newPtr); } @@ -839,13 +995,14 @@ public class Domain { * (optional) dest hostname/URI as seen from the source host * @param bandwidth * optional) specify migration bandwidth limit in Mbps - * @return the new domain object if the migration was successful. Note that - * the new domain object exists in the scope of the destination - * connection (dconn). + * @return the new domain object if the migration was successful, or NULL in + * case of error. Note that the new domain object exists in the + * scope of the destination connection (dconn). * @throws LibvirtException */ public Domain migrate(Connect dconn, long flags, String dname, String uri, long bandwidth) throws LibvirtException { - DomainPointer newPtr = processError(libvirt.virDomainMigrate(VDP, dconn.VCP, new NativeLong(flags), dname, uri, new NativeLong(bandwidth))); + DomainPointer newPtr = libvirt.virDomainMigrate(VDP, dconn.VCP, new NativeLong(flags), dname, uri, new NativeLong(bandwidth)); + processError(); return new Domain(dconn, newPtr); } @@ -858,11 +1015,13 @@ public class Domain { * Documentation</a> * @param downtime * the time to be down - * @return always 0 + * @return 0 in case of success, -1 otherwise. * @throws LibvirtException */ public int migrateSetMaxDowntime(long downtime) throws LibvirtException { - return processError(libvirt.virDomainMigrateSetMaxDowntime(VDP, downtime, 0)); + int returnValue = libvirt.virDomainMigrateSetMaxDowntime(VDP, downtime, 0); + processError(); + return returnValue; } /** @@ -896,9 +1055,9 @@ public class Domain { * @throws LibvirtException */ public int migrateToURI(String dconnuri, String miguri, String dxml, long flags, String dname, long bandwidth) throws LibvirtException { - return processError(libvirt.virDomainMigrateToURI2(VDP, dconnuri, miguri, - dxml, new NativeLong(flags), - dname, new NativeLong(bandwidth))); + int returnValue = libvirt.virDomainMigrateToURI2(VDP, dconnuri, miguri, dxml, new NativeLong(flags), dname, new NativeLong(bandwidth)); + processError(); + return returnValue; } /** @@ -921,7 +1080,9 @@ public class Domain { * @throws LibvirtException */ public int migrateToURI(String uri, long flags, String dname, long bandwidth) throws LibvirtException { - return processError(libvirt.virDomainMigrateToURI(VDP, uri, new NativeLong(flags), dname, new NativeLong(bandwidth))); + int returnValue = libvirt.virDomainMigrateToURI(VDP, uri, new NativeLong(flags), dname, new NativeLong(bandwidth)); + processError(); + return returnValue; } /** @@ -943,7 +1104,16 @@ public class Domain { for (int x = 0; x < cpumap.length; x++) { packedMap[x] = (byte) cpumap[x]; } - processError(libvirt.virDomainPinVcpu(VDP, vcpu, packedMap, cpumap.length)); + libvirt.virDomainPinVcpu(VDP, vcpu, packedMap, cpumap.length); + processError(); + } + + /** + * Error handling logic to throw errors. Must be called after every libvirt + * call. + */ + protected void processError() throws LibvirtException { + virConnect.processError(); } /** @@ -956,7 +1126,8 @@ public class Domain { * @throws LibvirtException */ public void reboot(int flags) throws LibvirtException { - processError(libvirt.virDomainReboot(VDP, flags)); + libvirt.virDomainReboot(VDP, flags); + processError(); } /** @@ -967,7 +1138,8 @@ public class Domain { * @throws LibvirtException */ public void resume() throws LibvirtException { - processError(libvirt.virDomainResume(VDP)); + libvirt.virDomainResume(VDP); + processError(); } /** @@ -978,11 +1150,13 @@ public class Domain { * >Libvirt Documentation</> * @param snapshot * the snapshot to revert to - * @return 0 if the creation is successful + * @return 0 if the creation is successful, -1 on error. * @throws LibvirtException */ public int revertToSnapshot(DomainSnapshot snapshot) throws LibvirtException { - return processError(libvirt.virDomainRevertToSnapshot(snapshot.VDSP, 0)); + int returnCode = libvirt.virDomainRevertToSnapshot(snapshot.VDSP, 0); + processError(); + return returnCode; } /** @@ -996,7 +1170,8 @@ public class Domain { * @throws LibvirtException */ public void save(String to) throws LibvirtException { - processError(libvirt.virDomainSave(VDP, to)); + libvirt.virDomainSave(VDP, to); + processError(); } /** @@ -1008,7 +1183,8 @@ public class Domain { */ public void setAutostart(boolean autostart) throws LibvirtException { int autoValue = autostart ? 1 : 0; - processError(libvirt.virDomainSetAutostart(VDP, autoValue)); + libvirt.virDomainSetAutostart(VDP, autoValue); + processError(); } /** @@ -1020,7 +1196,8 @@ public class Domain { * @throws LibvirtException */ public void setMaxMemory(long memory) throws LibvirtException { - processError(libvirt.virDomainSetMaxMemory(VDP, new NativeLong(memory))); + libvirt.virDomainSetMaxMemory(VDP, new NativeLong(memory)); + processError(); } /** @@ -1033,7 +1210,8 @@ public class Domain { * @throws LibvirtException */ public void setMemory(long memory) throws LibvirtException { - processError(libvirt.virDomainSetMemory(VDP, new NativeLong(memory))); + libvirt.virDomainSetMemory(VDP, new NativeLong(memory)); + processError(); } /** @@ -1048,7 +1226,8 @@ public class Domain { for (int x = 0; x < params.length; x++) { input[x] = SchedParameter.toNative(params[x]); } - processError(libvirt.virDomainSetSchedulerParameters(VDP, input, params.length)); + libvirt.virDomainSetSchedulerParameters(VDP, input, params.length); + processError(); } /** @@ -1062,7 +1241,8 @@ public class Domain { * @throws LibvirtException */ public void setVcpus(int nvcpus) throws LibvirtException { - processError(libvirt.virDomainSetVcpus(VDP, nvcpus)); + libvirt.virDomainSetVcpus(VDP, nvcpus); + processError(); } /** @@ -1074,7 +1254,19 @@ public class Domain { * @throws LibvirtException */ public void shutdown() throws LibvirtException { - processError(libvirt.virDomainShutdown(VDP)); + libvirt.virDomainShutdown(VDP); + processError(); + } + + /** + * Shuts down this domain with selected shutdown flag. + * Please use Domain static flags under the inner class SHUTDOWNFlags + * @param flag + * @throws LibvirtException + */ + public void shutdown(long flag) throws LibvirtException{ + libvirt.virDomainShutdownFlags(VDP, flag); + processError(); } /** @@ -1088,12 +1280,17 @@ public class Domain { * string containing an XML description of the domain * @param flags * flags for creating the snapshot, see the virDomainSnapshotCreateFlags for the flag options - * @return the snapshot + * @return the snapshot, or null on Error * @throws LibvirtException */ public DomainSnapshot snapshotCreateXML(String xmlDesc, int flags) throws LibvirtException { - DomainSnapshotPointer ptr = processError(libvirt.virDomainSnapshotCreateXML(VDP, xmlDesc, flags)); - return new DomainSnapshot(virConnect, ptr); + DomainSnapshotPointer ptr = libvirt.virDomainSnapshotCreateXML(VDP, xmlDesc, flags); + processError(); + DomainSnapshot returnValue = null; + if (ptr != null) { + returnValue = new DomainSnapshot(virConnect, ptr); + } + return returnValue; } /** @@ -1103,7 +1300,7 @@ public class Domain { * This is just a convenience method, it has the same effect * as calling {@code snapshotCreateXML(xmlDesc, 0);}. * - * @see #snapshotCreateXML(String, int) + * @see #snapshotCreateXML(int) * @see <a * href="http://www.libvirt.org/html/libvirt-libvirt.html#virDomainSnapshotCreateXML">Libvirt * Documentation</a> @@ -1122,12 +1319,17 @@ public class Domain { * @see <a * href="http://www.libvirt.org/html/libvirt-libvirt.html#virDomainSnapshotCurrent">Libvirt * Documentation</a> - * @return the snapshot + * @return the snapshot, or null on Error * @throws LibvirtException */ public DomainSnapshot snapshotCurrent() throws LibvirtException { - DomainSnapshotPointer ptr = processError(libvirt.virDomainSnapshotCurrent(VDP, 0)); - return new DomainSnapshot(virConnect, ptr); + DomainSnapshotPointer ptr = libvirt.virDomainSnapshotCurrent(VDP, 0); + processError(); + DomainSnapshot returnValue = null; + if (ptr != null) { + returnValue = new DomainSnapshot(virConnect, ptr); + } + return returnValue; } /** @@ -1140,15 +1342,16 @@ public class Domain { * @throws LibvirtException */ public String[] snapshotListNames(int flags) throws LibvirtException { + String[] returnValue = null; int num = snapshotNum(); - if (num > 0) { - Pointer[] ptrs = new Pointer[num]; - int got = processError(libvirt.virDomainSnapshotListNames(VDP, ptrs, num, flags)); - - return Library.toStringArray(ptrs, got); - } else { - return Library.NO_STRINGS; + if (num >= 0) { + returnValue = new String[num]; + if (num > 0) { + libvirt.virDomainSnapshotListNames(VDP, returnValue, num, flags); + processError(); + } } + return returnValue; } /** @@ -1176,12 +1379,17 @@ public class Domain { * Documentation</a> * @param name * the name - * @return The located snapshot + * @return The located snapshot, or null if an error * @throws LibvirtException */ public DomainSnapshot snapshotLookupByName(String name) throws LibvirtException { - DomainSnapshotPointer ptr = processError(libvirt.virDomainSnapshotLookupByName(VDP, name, 0)); - return new DomainSnapshot(virConnect, ptr); + DomainSnapshotPointer ptr = libvirt.virDomainSnapshotLookupByName(VDP, name, 0); + processError(); + DomainSnapshot returnValue = null; + if (ptr != null) { + returnValue = new DomainSnapshot(virConnect, ptr); + } + return returnValue; } /** @@ -1192,7 +1400,9 @@ public class Domain { * Documentation</a> */ public int snapshotNum() throws LibvirtException { - return processError(libvirt.virDomainSnapshotNum(VDP, 0)); + int returnValue = libvirt.virDomainSnapshotNum(VDP, 0); + processError(); + return returnValue; } /** @@ -1204,7 +1414,8 @@ public class Domain { * @throws LibvirtException */ public void suspend() throws LibvirtException { - processError(libvirt.virDomainSuspend(VDP)); + libvirt.virDomainSuspend(VDP); + processError(); } /** @@ -1213,7 +1424,8 @@ public class Domain { * @throws LibvirtException */ public void undefine() throws LibvirtException { - processError(libvirt.virDomainUndefine(VDP)); + libvirt.virDomainUndefine(VDP); + processError(); } /** @@ -1225,7 +1437,8 @@ public class Domain { * @throws LibvirtException */ public void undefine(int flags) throws LibvirtException { - processError(libvirt.virDomainUndefineFlags(VDP, flags)); + libvirt.virDomainUndefineFlags(VDP, flags); + processError(); } /** @@ -1236,11 +1449,13 @@ public class Domain { * the xml to update with * @param flags * controls the update - * @return always 0 + * @return 0 in case of success, -1 in case of failure. * @throws LibvirtException */ public int updateDeviceFlags(String xml, int flags) throws LibvirtException { - return processError(libvirt.virDomainUpdateDeviceFlags(VDP, xml, flags)); + int returnValue = libvirt.virDomainUpdateDeviceFlags(VDP, xml, flags); + processError(); + return returnValue; } } diff --git a/src/main/java/org/libvirt/DomainInterfaceStats.java b/src/main/java/org/libvirt/DomainInterfaceStats.java index eab5c44..0e948d5 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 the network counters in this object. + * The Domain.interfaceStats method returns th 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 3013117..b58fd20 100644 --- a/src/main/java/org/libvirt/DomainSnapshot.java +++ b/src/main/java/org/libvirt/DomainSnapshot.java @@ -2,9 +2,6 @@ package org.libvirt; import org.libvirt.jna.DomainSnapshotPointer; import static org.libvirt.Library.libvirt; -import static org.libvirt.ErrorHandler.processError; - -import com.sun.jna.Pointer; public class DomainSnapshot { @@ -30,14 +27,15 @@ public class DomainSnapshot { * href="http://www.libvirt.org/html/libvirt-libvirt.html#virDomainSnapshotDelete">Libvirt * Documentation</a> * @param flags - * controls the deletion - * @return ignore (always 0) + * controls teh deletion + * @return 0 if the selected snapshot(s) were successfully deleted, -1 on error. * @throws LibvirtException */ public int delete(int flags) throws LibvirtException { int success = 0; if (VDSP != null) { - success = processError(libvirt.virDomainSnapshotDelete(VDSP, flags)); + success = libvirt.virDomainSnapshotDelete(VDSP, flags); + processError(); VDSP = null; } @@ -54,12 +52,13 @@ public class DomainSnapshot { * exist. * * @throws LibvirtException - * @return 0 on success + * @return 0 on success, or -1 on error. */ public int free() throws LibvirtException { int success = 0; if (VDSP != null) { - success = processError(libvirt.virDomainSnapshotFree(VDSP)); + success = libvirt.virDomainSnapshotFree(VDSP); + processError(); VDSP = null; } @@ -73,12 +72,16 @@ public class DomainSnapshot { * @return the XML document */ public String getXMLDesc() throws LibvirtException { - Pointer p = processError(libvirt.virDomainSnapshotGetXMLDesc(VDSP, 0)); + String returnValue = libvirt.virDomainSnapshotGetXMLDesc(VDSP, 0); + processError(); + return returnValue; + } - try { - return Library.getString(p); - } finally { - Library.free(p); - } + /** + * Error handling logic to throw errors. Must be called after every libvirt + * call. + */ + protected void processError() throws LibvirtException { + virConnect.processError(); } } diff --git a/src/main/java/org/libvirt/Error.java b/src/main/java/org/libvirt/Error.java index 15dd870..114e758 100644 --- a/src/main/java/org/libvirt/Error.java +++ b/src/main/java/org/libvirt/Error.java @@ -28,104 +28,54 @@ public class Error implements Serializable { } public static enum ErrorDomain { - VIR_FROM_NONE, - /** Error at Xen hypervisor layer */ - VIR_FROM_XEN, - /** Error at connection with xend daemon */ - VIR_FROM_XEND, - /** Error at connection with xen store */ - VIR_FROM_XENSTORE, - /** Error in the S-Expression code */ - VIR_FROM_SEXPR, - /** Error in the XML code */ - VIR_FROM_XML, - /** Error when operating on a domain */ - VIR_FROM_DOM, - /** Error in the XML-RPC code */ - VIR_FROM_RPC, - /** Error in the proxy code */ - VIR_FROM_PROXY, - /** Error in the configuration file handling */ - VIR_FROM_CONF, - /** Error at the QEMU daemon */ - VIR_FROM_QEMU, - /** Error when operating on a network */ - VIR_FROM_NET, - /** Error from test driver */ - VIR_FROM_TEST, - /** Error from remote driver */ - VIR_FROM_REMOTE, - /** Error from OpenVZ driver */ - VIR_FROM_OPENVZ, - /** Error at Xen XM layer */ - VIR_FROM_XENXM, - /** Error in the Linux Stats code */ - VIR_FROM_STATS_LINUX, - /** Error from Linux Container driver */ - VIR_FROM_LXC, - /** Error from storage driver */ - VIR_FROM_STORAGE, - /** Error from network config */ - VIR_FROM_NETWORK, - /** Error from domain config */ - VIR_FROM_DOMAIN, - /** Error at the UML driver */ - VIR_FROM_UML, - /** Error from node device monitor */ - VIR_FROM_NODEDEV, - /** Error from xen inotify layer */ - VIR_FROM_XEN_INOTIFY, - /** Error from security framework */ - VIR_FROM_SECURITY, - /** Error from VirtualBox driver */ - VIR_FROM_VBOX, - /** Error when operating on an interface */ - VIR_FROM_INTERFACE, - /** Error from OpenNebula driver */ - VIR_FROM_ONE, - /** Error from ESX driver */ - VIR_FROM_ESX, - /** Error from IBM power hypervisor */ - VIR_FROM_PHYP, - /** Error from secret storage */ - VIR_FROM_SECRET, - /** Error from CPU driver */ - VIR_FROM_CPU, - /** Error from XenAPI */ - VIR_FROM_XENAPI, - /** Error from network filter driver */ - VIR_FROM_NWFILTER, - /** Error from Synchronous hooks */ - VIR_FROM_HOOK, - /** Error from domain snapshot */ - VIR_FROM_DOMAIN_SNAPSHOT, - /** Error from auditing subsystem */ - VIR_FROM_AUDIT, - /** Error from sysinfo/SMBIOS */ - VIR_FROM_SYSINFO, - /** Error from I/O streams */ - VIR_FROM_STREAMS, - /** Error from VMware driver */ - VIR_FROM_VMWARE, - /** Error from event loop impl */ - VIR_FROM_EVENT, - /** Error from libxenlight driver */ - VIR_FROM_LIBXL, - /** Error from lock manager */ - VIR_FROM_LOCKING, - /** Error from Hyper-V driver */ - VIR_FROM_HYPERV, - /** Error from capabilities */ - VIR_FROM_CAPABILITIES, - /** Error from URI handling */ - VIR_FROM_URI, - /** Error from auth handling */ - VIR_FROM_AUTH, - /** Error from DBus */ - VIR_FROM_DBUS, - - /** unknown error domain */ - VIR_FROM_UNKNOWN; // must be the last entry! + VIR_FROM_NONE, VIR_FROM_XEN, /* Error at Xen hypervisor layer */ + VIR_FROM_XEND, /* Error at connection with xend daemon */ + VIR_FROM_XENSTORE, /* Error at connection with xen store */ + VIR_FROM_SEXPR, /* Error in the S-Expression code */ + VIR_FROM_XML, /* Error in the XML code */ + VIR_FROM_DOM, /* Error when operating on a domain */ + VIR_FROM_RPC, /* Error in the XML-RPC code */ + VIR_FROM_PROXY, /* Error in the proxy code */ + VIR_FROM_CONF, /* Error in the configuration file handling */ + VIR_FROM_QEMU, /* Error at the QEMU daemon */ + VIR_FROM_NET, /* Error when operating on a network */ + VIR_FROM_TEST, /* Error from test driver */ + VIR_FROM_REMOTE, /* Error from remote driver */ + VIR_FROM_OPENVZ, /* Error from OpenVZ driver */ + VIR_FROM_XENXM, /* Error at Xen XM layer */ + VIR_FROM_STATS_LINUX, /* Error in the Linux Stats code */ + VIR_FROM_LXC, /* Error from Linux Container driver */ + VIR_FROM_STORAGE, /* Error from storage driver */ + VIR_FROM_NETWORK, /* Error from network config */ + VIR_FROM_DOMAIN, /* Error from domain config */ + VIR_FROM_UML, /* Error at the UML driver */ + VIR_FROM_NODEDEV, /* Error from node device monitor */ + VIR_FROM_XEN_INOTIFY, /* Error from xen inotify layer */ + VIR_FROM_SECURITY, /* Error from security framework */ + VIR_FROM_VBOX, /* Error from VirtualBox driver */ + VIR_FROM_INTERFACE, /* Error when operating on an interface */ + VIR_FROM_ONE, /* Error from OpenNebula driver */ + VIR_FROM_ESX, /* Error from ESX driver */ + VIR_FROM_PHYP, /* Error from IBM power hypervisor */ + VIR_FROM_SECRET, /* Error from secret storage */ + VIR_FROM_CPU, /* Error from CPU driver */ + VIR_FROM_XENAPI, /* Error from XenAPI */ + VIR_FROM_NWFILTER, /* Error from network filter driver */ + VIR_FROM_HOOK, /* Error from Synchronous hooks */ + VIR_FROM_DOMAIN_SNAPSHOT, /* Error from domain snapshot */ + VIR_FROM_AUDIT, /* Error from auditing subsystem */ + VIR_FROM_SYSINFO, /* Error from sysinfo/SMBIOS */ + VIR_FROM_STREAMS, /* Error from I/O streams */ + VIR_FROM_VMWARE, /* Error from VMware driver */ + VIR_FROM_EVENT, /* Error from event loop impl */ + VIR_FROM_LIBXL, /* Error from libxenlight driver */ + VIR_FROM_LOCKING, /* Error from lock manager */ + VIR_FROM_HYPERV, /* Error from Hyper-V driver */ + VIR_FROM_CAPABILITIES, /* Error from capabilities */ + VIR_FROM_URI, /* Error from URI handling */ + VIR_FROM_AUTH, /* Error from auth handling */ + VIR_FROM_DBUS, /* Error from DBus */ + VIR_FROM_UNKNOWN; /* unknown error domain (must be the last entry!) */ protected static final ErrorDomain wrap(int value) { return safeElementAt(value, values()); @@ -151,170 +101,93 @@ public class Error implements Serializable { } public static enum ErrorNumber { - VIR_ERR_OK, - /** internal error */ - VIR_ERR_INTERNAL_ERROR, - /** memory allocation failure */ - VIR_ERR_NO_MEMORY, - /** no support for this function */ - VIR_ERR_NO_SUPPORT, - /** could not resolve hostname */ - VIR_ERR_UNKNOWN_HOST, - /** can't connect to hypervisor */ - VIR_ERR_NO_CONNECT, - /** invalid connection object */ - VIR_ERR_INVALID_CONN, - /** invalid domain object */ - VIR_ERR_INVALID_DOMAIN, - /** invalid function argument */ - VIR_ERR_INVALID_ARG, - /** a command to hypervisor failed */ - VIR_ERR_OPERATION_FAILED, - /** a HTTP GET command to failed */ - VIR_ERR_GET_FAILED, - /** a HTTP POST command to failed */ - VIR_ERR_POST_FAILED, - /** unexpected HTTP error code */ - VIR_ERR_HTTP_ERROR, - /** failure to serialize an S-Expr */ - VIR_ERR_SEXPR_SERIAL, - /** could not open Xen hypervisor control */ - VIR_ERR_NO_XEN, - /** failure doing an hypervisor call */ - VIR_ERR_XEN_CALL, - /** unknown OS type */ - VIR_ERR_OS_TYPE, - /** missing kernel information */ - VIR_ERR_NO_KERNEL, - /** missing root device information */ - VIR_ERR_NO_ROOT, - /** missing source device information */ - VIR_ERR_NO_SOURCE, - /** missing target device information */ - VIR_ERR_NO_TARGET, - /** missing domain name information */ - VIR_ERR_NO_NAME, - /** missing domain OS information */ - VIR_ERR_NO_OS, - /** missing domain devices information */ - VIR_ERR_NO_DEVICE, - /** could not open Xen Store control */ - VIR_ERR_NO_XENSTORE, - /** too many drivers registered */ - VIR_ERR_DRIVER_FULL, - /** not supported by the drivers (DEPRECATED) */ - VIR_ERR_CALL_FAILED, - /** an XML description is not well formed or broken */ - VIR_ERR_XML_ERROR, - /** the domain already exist */ - VIR_ERR_DOM_EXIST, - /** operation forbidden on read-only connections */ - VIR_ERR_OPERATION_DENIED, - /** failed to open a conf file */ - VIR_ERR_OPEN_FAILED, - /** failed to read a conf file */ - VIR_ERR_READ_FAILED, - /** failed to parse a conf file */ - VIR_ERR_PARSE_FAILED, - /** failed to parse the syntax of a conf file */ - VIR_ERR_CONF_SYNTAX, - /** failed to write a conf file */ - VIR_ERR_WRITE_FAILED, - /** detail of an XML error */ - VIR_ERR_XML_DETAIL, - /** invalid network object */ - VIR_ERR_INVALID_NETWORK, - /** the network already exist */ - VIR_ERR_NETWORK_EXIST, - /** general system call failure */ - VIR_ERR_SYSTEM_ERROR, - /** some sort of RPC error */ - VIR_ERR_RPC, - /** error from a GNUTLS call */ - VIR_ERR_GNUTLS_ERROR, - /** failed to start network */ - VIR_WAR_NO_NETWORK, - /** domain not found or unexpectedly disappeared */ - VIR_ERR_NO_DOMAIN, - /** network not found */ - VIR_ERR_NO_NETWORK, - /** invalid MAC address */ - VIR_ERR_INVALID_MAC, - /** authentication failed */ - VIR_ERR_AUTH_FAILED, - /** invalid storage pool object */ - VIR_ERR_INVALID_STORAGE_POOL, - /** invalid storage vol object */ - VIR_ERR_INVALID_STORAGE_VOL, - /** failed to start storage */ - VIR_WAR_NO_STORAGE, - /** storage pool not found */ - VIR_ERR_NO_STORAGE_POOL, - /** storage pool not found */ - VIR_ERR_NO_STORAGE_VOL, - /** failed to start node driver */ - VIR_WAR_NO_NODE, - /** invalid node device object */ - VIR_ERR_INVALID_NODE_DEVICE, - /** node device not found */ - VIR_ERR_NO_NODE_DEVICE, - /** security model not found */ - VIR_ERR_NO_SECURITY_MODEL, - /** operation is not applicable at this time */ - VIR_ERR_OPERATION_INVALID, - /** failed to start interface driver */ - VIR_WAR_NO_INTERFACE, - /** interface driver not running */ - VIR_ERR_NO_INTERFACE, - /** invalid interface object */ - VIR_ERR_INVALID_INTERFACE, - /** more than one matching interface found */ - VIR_ERR_MULTIPLE_INTERFACES, - /** failed to start secret storage */ - VIR_WAR_NO_SECRET, - /** invalid secret */ - VIR_ERR_INVALID_SECRET, - /** secret not found */ - VIR_ERR_NO_SECRET, - /** unsupported configuration construct */ - VIR_ERR_CONFIG_UNSUPPORTED, - /** timeout occurred during operation */ - VIR_ERR_OPERATION_TIMEOUT, - /** a migration worked, but making the VM persist on the dest - * host failed */ - VIR_ERR_MIGRATE_PERSIST_FAILED, - /** a synchronous hook script failed */ - VIR_ERR_HOOK_SCRIPT_FAILED, - /** invalid domain snapshot */ - VIR_ERR_INVALID_DOMAIN_SNAPSHOT, - /** domain snapshot not found */ - VIR_ERR_NO_DOMAIN_SNAPSHOT, - /** stream pointer not valid */ - VIR_ERR_INVALID_STREAM, - /** valid API use but unsupported by the given driver */ - VIR_ERR_ARGUMENT_UNSUPPORTED, - /** storage pool probe failed */ - VIR_ERR_STORAGE_PROBE_FAILED, - /** storage pool already built */ - VIR_ERR_STORAGE_POOL_BUILT, - /** force was not requested for a risky domain snapshot - revert */ - VIR_ERR_SNAPSHOT_REVERT_RISKY, - /** operation on a domain was canceled/aborted by user */ - VIR_ERR_OPERATION_ABORTED, - /** authentication cancelled */ - VIR_ERR_AUTH_CANCELLED, - /** The metadata is not present */ - VIR_ERR_NO_DOMAIN_METADATA, - /** Migration is not safe */ - VIR_ERR_MIGRATE_UNSAFE, - /** integer overflow */ - VIR_ERR_OVERFLOW, - /** action prevented by block copy job */ - VIR_ERR_BLOCK_COPY_ACTIVE, - - /** unknown error */ - VIR_ERR_UNKNOWN; // must be the last entry! + VIR_ERR_OK, VIR_ERR_INTERNAL_ERROR, /* internal error */ + VIR_ERR_NO_MEMORY, /* memory allocation failure */ + VIR_ERR_NO_SUPPORT, /* no support for this function */ + VIR_ERR_UNKNOWN_HOST, /* could not resolve hostname */ + VIR_ERR_NO_CONNECT, /* can't connect to hypervisor */ + VIR_ERR_INVALID_CONN, /* invalid connection object */ + VIR_ERR_INVALID_DOMAIN, /* invalid domain object */ + VIR_ERR_INVALID_ARG, /* invalid function argument */ + VIR_ERR_OPERATION_FAILED, /* a command to hypervisor failed */ + VIR_ERR_GET_FAILED, /* a HTTP GET command to failed */ + VIR_ERR_POST_FAILED, /* a HTTP POST command to failed */ + VIR_ERR_HTTP_ERROR, /* unexpected HTTP error code */ + VIR_ERR_SEXPR_SERIAL, /* failure to serialize an S-Expr */ + VIR_ERR_NO_XEN, /* could not open Xen hypervisor control */ + VIR_ERR_XEN_CALL, /* failure doing an hypervisor call */ + VIR_ERR_OS_TYPE, /* unknown OS type */ + VIR_ERR_NO_KERNEL, /* missing kernel information */ + VIR_ERR_NO_ROOT, /* missing root device information */ + VIR_ERR_NO_SOURCE, /* missing source device information */ + VIR_ERR_NO_TARGET, /* missing target device information */ + VIR_ERR_NO_NAME, /* missing domain name information */ + VIR_ERR_NO_OS, /* missing domain OS information */ + VIR_ERR_NO_DEVICE, /* missing domain devices information */ + VIR_ERR_NO_XENSTORE, /* could not open Xen Store control */ + VIR_ERR_DRIVER_FULL, /* too many drivers registered */ + VIR_ERR_CALL_FAILED, /* not supported by the drivers (DEPRECATED) */ + VIR_ERR_XML_ERROR, /* an XML description is not well formed or broken */ + VIR_ERR_DOM_EXIST, /* the domain already exist */ + VIR_ERR_OPERATION_DENIED, /* + * operation forbidden on read-only + * connections + */ + VIR_ERR_OPEN_FAILED, /* failed to open a conf file */ + VIR_ERR_READ_FAILED, /* failed to read a conf file */ + VIR_ERR_PARSE_FAILED, /* failed to parse a conf file */ + VIR_ERR_CONF_SYNTAX, /* failed to parse the syntax of a conf file */ + VIR_ERR_WRITE_FAILED, /* failed to write a conf file */ + VIR_ERR_XML_DETAIL, /* detail of an XML error */ + VIR_ERR_INVALID_NETWORK, /* invalid network object */ + VIR_ERR_NETWORK_EXIST, /* the network already exist */ + VIR_ERR_SYSTEM_ERROR, /* general system call failure */ + VIR_ERR_RPC, /* some sort of RPC error */ + VIR_ERR_GNUTLS_ERROR, /* error from a GNUTLS call */ + VIR_WAR_NO_NETWORK, /* failed to start network */ + VIR_ERR_NO_DOMAIN, /* domain not found or unexpectedly disappeared */ + VIR_ERR_NO_NETWORK, /* network not found */ + VIR_ERR_INVALID_MAC, /* invalid MAC address */ + VIR_ERR_AUTH_FAILED, /* authentication failed */ + VIR_ERR_INVALID_STORAGE_POOL, /* invalid storage pool object */ + VIR_ERR_INVALID_STORAGE_VOL, /* invalid storage vol object */ + VIR_WAR_NO_STORAGE, /* failed to start storage */ + VIR_ERR_NO_STORAGE_POOL, /* storage pool not found */ + VIR_ERR_NO_STORAGE_VOL, /* storage pool not found */ + VIR_WAR_NO_NODE, /* failed to start node driver */ + VIR_ERR_INVALID_NODE_DEVICE, /* invalid node device object */ + VIR_ERR_NO_NODE_DEVICE, /* node device not found */ + VIR_ERR_NO_SECURITY_MODEL, /* security model not found */ + VIR_ERR_OPERATION_INVALID, /* operation is not applicable at this time */ + VIR_WAR_NO_INTERFACE, /* failed to start interface driver */ + VIR_ERR_NO_INTERFACE, /* interface driver not running */ + VIR_ERR_INVALID_INTERFACE, /* invalid interface object */ + VIR_ERR_MULTIPLE_INTERFACES, /* more than one matching interface found */ + VIR_WAR_NO_SECRET, /* failed to start secret storage */ + VIR_ERR_INVALID_SECRET, /* invalid secret */ + VIR_ERR_NO_SECRET, /* secret not found */ + VIR_ERR_CONFIG_UNSUPPORTED, /* unsupported configuration construct */ + VIR_ERR_OPERATION_TIMEOUT, /* timeout occurred during operation */ + VIR_ERR_MIGRATE_PERSIST_FAILED, /* a migration worked, but making the + VM persist on the dest host failed */ + VIR_ERR_HOOK_SCRIPT_FAILED, /* a synchronous hook script failed */ + VIR_ERR_INVALID_DOMAIN_SNAPSHOT, /* invalid domain snapshot */ + VIR_ERR_NO_DOMAIN_SNAPSHOT, /* domain snapshot not found */ + VIR_ERR_INVALID_STREAM, /* stream pointer not valid */ + VIR_ERR_ARGUMENT_UNSUPPORTED, /* valid API use but unsupported by + the given driver */ + VIR_ERR_STORAGE_PROBE_FAILED, /* storage pool probe failed */ + VIR_ERR_STORAGE_POOL_BUILT, /* storage pool already built */ + VIR_ERR_SNAPSHOT_REVERT_RISKY, /* force was not requested for a + risky domain snapshot revert */ + VIR_ERR_OPERATION_ABORTED, /* operation on a domain was + canceled/aborted by user */ + VIR_ERR_AUTH_CANCELLED, /* authentication cancelled */ + VIR_ERR_NO_DOMAIN_METADATA, /* The metadata is not present */ + VIR_ERR_MIGRATE_UNSAFE, /* Migration is not safe */ + VIR_ERR_OVERFLOW, /* integer overflow */ + VIR_ERR_BLOCK_COPY_ACTIVE, /* action prevented by block copy job */ + VIR_ERR_UNKNOWN; /* unknown error (must be the last entry!) */ protected static final ErrorNumber wrap(int value) { return safeElementAt(value, values()); @@ -340,9 +213,9 @@ public class Error implements Serializable { private NetworkPointer VNP; /* Deprecated */ public Error(virError vError) { - code = ErrorNumber.wrap(vError.code); - domain = ErrorDomain.wrap(vError.domain); - level = ErrorLevel.wrap(vError.level); + code = code.wrap(vError.code); + domain = domain.wrap(vError.domain); + level = level.wrap(vError.level); message = vError.message; str1 = vError.str1; str2 = vError.str2; @@ -355,9 +228,9 @@ public class Error implements Serializable { } /** - * Gets the error code + * Gets he error code * - * @return a VirErrorNumber + * @return a VirErroNumber */ public ErrorNumber getCode() { return code; @@ -421,7 +294,7 @@ public class Error implements Serializable { } /** - * Returns a human-readable informative error message + * Returns human-readable informative error messag * * @return error message */ diff --git a/src/main/java/org/libvirt/ErrorHandler.java b/src/main/java/org/libvirt/ErrorHandler.java index c2e7337..434c85d 100644 --- a/src/main/java/org/libvirt/ErrorHandler.java +++ b/src/main/java/org/libvirt/ErrorHandler.java @@ -3,11 +3,6 @@ package org.libvirt; import org.libvirt.jna.Libvirt; import org.libvirt.jna.virError; -import static org.libvirt.Library.libvirt; - -import com.sun.jna.Pointer; -import com.sun.jna.PointerType; - /** * Utility class which processes the last error from the libvirt library. It * turns errors into Libvirt Exceptions. @@ -16,7 +11,14 @@ import com.sun.jna.PointerType; */ public class ErrorHandler { - private static final void processError() throws LibvirtException { + /** + * Look for the latest error from libvirt not tied to a connection + * + * @param libvirt + * the active connection + * @throws LibvirtException + */ + public static void processError(Libvirt libvirt) throws LibvirtException { virError vError = libvirt.virGetLastError(); if (vError != null) { Error error = new Error(vError); @@ -28,44 +30,4 @@ public class ErrorHandler { } } } - - /** - * Calls {@link #processError()} when the given libvirt return code - * indicates an error. - * - * @param ret libvirt return code, indicating error if -1. - * @return {@code ret} - * @throws LibvirtException - */ - static final int processError(int ret) throws LibvirtException { - if (ret == -1) processError(); - return ret; - } - - /** - * Calls {@link #processError()} if {@code arg} is null. - * - * @param arg An arbitrary object returned by libvirt. - * @return {@code arg} - * @throws LibvirtException - */ - static final <T extends PointerType> T processError(T arg) throws LibvirtException { - if (arg == null) processError(); - return arg; - } - - static final Pointer processError(Pointer arg) throws LibvirtException { - if (arg == null) processError(); - return arg; - } - - static final String processError(String str) throws LibvirtException { - if (str == null) processError(); - return str; - } - - static final long processErrorIfZero(long ret) throws LibvirtException { - if (ret == 0) processError(); - return ret; - } } diff --git a/src/main/java/org/libvirt/Interface.java b/src/main/java/org/libvirt/Interface.java index e0ddc3f..7782fb9 100644 --- a/src/main/java/org/libvirt/Interface.java +++ b/src/main/java/org/libvirt/Interface.java @@ -2,7 +2,6 @@ package org.libvirt; import org.libvirt.jna.InterfacePointer; import static org.libvirt.Library.libvirt; -import static org.libvirt.ErrorHandler.processError; import com.sun.jna.Pointer; @@ -41,37 +40,27 @@ public class Interface { } /** - * 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. + * Create and start a defined network. If the call succeed the network moves + * from the defined to the running networks pools. * * @throws LibvirtException */ public int create() throws LibvirtException { - return processError(libvirt.virInterfaceCreate(VIP)); + int returnValue = libvirt.virInterfaceCreate(VIP); + processError(); + return returnValue; } /** - * 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. + * 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. * * @throws LibvirtException */ public int destroy() throws LibvirtException { - return processError(libvirt.virInterfaceDestroy(VIP)); + int returnValue = libvirt.virInterfaceDestroy(VIP); + processError(); + return returnValue; } @Override @@ -84,12 +73,13 @@ public class Interface { * structure is freed and should not be used thereafter. * * @throws LibvirtException - * @return number of references left (>= 0) + * @return number of references left (>= 0) for success, -1 for failure. */ public int free() throws LibvirtException { int success = 0; if (VIP != null) { - success = processError(libvirt.virInterfaceFree(VIP)); + success = libvirt.virInterfaceFree(VIP); + processError(); VIP = null; } @@ -102,7 +92,9 @@ public class Interface { * @throws LibvirtException */ public String getMACString() throws LibvirtException { - return processError(libvirt.virInterfaceGetMACString(VIP)); + String name = libvirt.virInterfaceGetMACString(VIP); + processError(); + return name; } /** @@ -111,7 +103,9 @@ public class Interface { * @throws LibvirtException */ public String getName() throws LibvirtException { - return processError(libvirt.virInterfaceGetName(VIP)); + String name = libvirt.virInterfaceGetName(VIP); + processError(); + return name; } /** @@ -120,7 +114,8 @@ public class Interface { * @throws LibvirtException */ public String getXMLDescription(int flags) throws LibvirtException { - Pointer xml = processError(libvirt.virInterfaceGetXMLDesc(VIP, flags)); + Pointer xml = libvirt.virInterfaceGetXMLDesc(VIP, flags); + processError(); try { return Library.getString(xml); } finally { @@ -134,11 +129,21 @@ public class Interface { * @see <a * href="http://www.libvirt.org/html/libvirt-libvirt.html#virInterfaceIsActive">Libvirt * Documentation</a> - * @return 1 if running, 0 if inactive + * @return 1 if running, 0 if inactive, -1 on error * @throws LibvirtException */ public int isActive() throws LibvirtException { - return processError(libvirt.virInterfaceIsActive(VIP)); + int returnValue = libvirt.virInterfaceIsActive(VIP); + processError(); + return returnValue; + } + + /** + * Error handling logic to throw errors. Must be called after every libvirt + * call. + */ + protected void processError() throws LibvirtException { + virConnect.processError(); } /** @@ -148,6 +153,8 @@ public class Interface { * @throws LibvirtException */ public int undefine() throws LibvirtException { - return processError(libvirt.virInterfaceUndefine(VIP)); + int returnValue = libvirt.virInterfaceUndefine(VIP); + processError(); + return returnValue; } } diff --git a/src/main/java/org/libvirt/Library.java b/src/main/java/org/libvirt/Library.java index 6f12c37..0136095 100644 --- a/src/main/java/org/libvirt/Library.java +++ b/src/main/java/org/libvirt/Library.java @@ -1,7 +1,6 @@ package org.libvirt; import org.libvirt.jna.Libvirt; -import static org.libvirt.ErrorHandler.processError; import com.sun.jna.Native; import com.sun.jna.Pointer; @@ -24,9 +23,10 @@ final class Library { // Load the native part static { + Libvirt.INSTANCE.virInitialize(); libvirt = Libvirt.INSTANCE; try { - processError(libvirt.virInitialize()); + ErrorHandler.processError(Libvirt.INSTANCE); } catch (Exception e) { e.printStackTrace(); } diff --git a/src/main/java/org/libvirt/Network.java b/src/main/java/org/libvirt/Network.java index 2a77028..2244c5d 100644 --- a/src/main/java/org/libvirt/Network.java +++ b/src/main/java/org/libvirt/Network.java @@ -3,7 +3,6 @@ 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; @@ -44,7 +43,8 @@ public class Network { * @throws LibvirtException */ public void create() throws LibvirtException { - processError(libvirt.virNetworkCreate(VNP)); + libvirt.virNetworkCreate(VNP); + processError(); } /** @@ -56,7 +56,8 @@ public class Network { * @throws LibvirtException */ public void destroy() throws LibvirtException { - processError(libvirt.virNetworkDestroy(VNP)); + libvirt.virNetworkDestroy(VNP); + processError(); } @Override @@ -70,12 +71,13 @@ public class Network { * return an error. * * @throws LibvirtException - * @return number of references left (>= 0) + * @return number of references left (>= 0) for success, -1 for failure. */ public int free() throws LibvirtException { int success = 0; if (VNP != null) { - success = processError(libvirt.virNetworkFree(VNP)); + success = libvirt.virNetworkFree(VNP); + processError(); VNP = null; } @@ -91,7 +93,8 @@ public class Network { */ public boolean getAutostart() throws LibvirtException { IntByReference autoStart = new IntByReference(); - processError(libvirt.virNetworkGetAutostart(VNP, autoStart)); + libvirt.virNetworkGetAutostart(VNP, autoStart); + processError(); return (autoStart.getValue() != 0) ? true : false; } @@ -103,7 +106,8 @@ public class Network { * @throws LibvirtException */ public String getBridgeName() throws LibvirtException { - final Pointer ptr = processError(libvirt.virNetworkGetBridgeName(VNP)); + final Pointer ptr = libvirt.virNetworkGetBridgeName(VNP); + processError(); try { return Library.getString(ptr); } finally { @@ -127,7 +131,9 @@ public class Network { * @throws LibvirtException */ public String getName() throws LibvirtException { - return processError(libvirt.virNetworkGetName(VNP)); + String returnValue = libvirt.virNetworkGetName(VNP); + processError(); + return returnValue; } /** @@ -139,8 +145,13 @@ public class Network { */ public int[] getUUID() throws LibvirtException { byte[] bytes = new byte[Libvirt.VIR_UUID_BUFLEN]; - processError(libvirt.virNetworkGetUUID(VNP, bytes)); - return Connect.convertUUIDBytes(bytes); + int success = libvirt.virNetworkGetUUID(VNP, bytes); + processError(); + int[] returnValue = new int[0]; + if (success == 0) { + returnValue = Connect.convertUUIDBytes(bytes); + } + return returnValue; } /** @@ -152,8 +163,13 @@ public class Network { */ public String getUUIDString() throws LibvirtException { byte[] bytes = new byte[Libvirt.VIR_UUID_STRING_BUFLEN]; - processError(libvirt.virNetworkGetUUIDString(VNP, bytes)); - return Native.toString(bytes); + int success = libvirt.virNetworkGetUUIDString(VNP, bytes); + processError(); + String returnValue = null; + if (success == 0) { + returnValue = Native.toString(bytes); + } + return returnValue; } /** @@ -167,7 +183,8 @@ public class Network { * @throws LibvirtException */ public String getXMLDesc(int flags) throws LibvirtException { - Pointer ptr = processError(libvirt.virNetworkGetXMLDesc(VNP, flags)); + Pointer ptr = libvirt.virNetworkGetXMLDesc(VNP, flags); + processError(); try { return Library.getString(ptr); } finally { @@ -185,7 +202,9 @@ public class Network { * @throws LibvirtException */ public int isActive() throws LibvirtException { - return processError(libvirt.virNetworkIsActive(VNP)); + int returnValue = libvirt.virNetworkIsActive(VNP); + processError(); + return returnValue; } /** @@ -199,7 +218,13 @@ public class Network { * @throws LibvirtException */ public int isPersistent() throws LibvirtException { - return processError(libvirt.virNetworkIsPersistent(VNP)); + int returnValue = libvirt.virNetworkIsPersistent(VNP); + processError(); + return returnValue; + } + + protected void processError() throws LibvirtException { + virConnect.processError(); } /** @@ -212,7 +237,8 @@ public class Network { */ public void setAutostart(boolean autostart) throws LibvirtException { int autoValue = autostart ? 1 : 0; - processError(libvirt.virNetworkSetAutostart(VNP, autoValue)); + libvirt.virNetworkSetAutostart(VNP, autoValue); + processError(); } /** @@ -221,7 +247,8 @@ public class Network { * @throws LibvirtException */ public void undefine() throws LibvirtException { - processError(libvirt.virNetworkUndefine(VNP)); + libvirt.virNetworkUndefine(VNP); + processError(); } } diff --git a/src/main/java/org/libvirt/NetworkFilter.java b/src/main/java/org/libvirt/NetworkFilter.java index 4f4bc6c..ba4d2ea 100644 --- a/src/main/java/org/libvirt/NetworkFilter.java +++ b/src/main/java/org/libvirt/NetworkFilter.java @@ -3,7 +3,6 @@ package org.libvirt; import org.libvirt.jna.Libvirt; import org.libvirt.jna.NetworkFilterPointer; import static org.libvirt.Library.libvirt; -import static org.libvirt.ErrorHandler.processError; import com.sun.jna.Native; @@ -33,12 +32,13 @@ public class NetworkFilter { * exist. * * @throws LibvirtException - * @return ignore (always 0) + * @return 0 on success, or -1 on error. */ public int free() throws LibvirtException { int success = 0; if (NFP != null) { - success = processError(libvirt.virNWFilterFree(NFP)); + success = libvirt.virNWFilterFree(NFP); + processError(); NFP = null; } @@ -52,7 +52,9 @@ public class NetworkFilter { * @throws LibvirtException */ public String getName() throws LibvirtException { - return processError(libvirt.virNWFilterGetName(NFP)); + String returnValue = libvirt.virNWFilterGetName(NFP); + processError(); + return returnValue; } /** @@ -64,8 +66,13 @@ public class NetworkFilter { */ public int[] getUUID() throws LibvirtException { byte[] bytes = new byte[Libvirt.VIR_UUID_BUFLEN]; - processError(libvirt.virNWFilterGetUUID(NFP, bytes)); - return Connect.convertUUIDBytes(bytes); + int success = libvirt.virNWFilterGetUUID(NFP, bytes); + processError(); + int[] returnValue = new int[0]; + if (success == 0) { + returnValue = Connect.convertUUIDBytes(bytes); + } + return returnValue; } /** @@ -77,8 +84,13 @@ public class NetworkFilter { */ public String getUUIDString() throws LibvirtException { byte[] bytes = new byte[Libvirt.VIR_UUID_STRING_BUFLEN]; - processError(libvirt.virNWFilterGetUUIDString(NFP, bytes)); - return Native.toString(bytes); + int success = libvirt.virNWFilterGetUUIDString(NFP, bytes); + processError(); + String returnValue = null; + if (success == 0) { + returnValue = Native.toString(bytes); + } + return returnValue; } /** @@ -90,7 +102,17 @@ public class NetworkFilter { * @return the XML document */ public String getXMLDesc() throws LibvirtException { - return processError(libvirt.virNWFilterGetXMLDesc(NFP, 0)); + String returnValue = libvirt.virNWFilterGetXMLDesc(NFP, 0); + processError(); + return returnValue; + } + + /** + * Error handling logic to throw errors. Must be called after every libvirt + * call. + */ + protected void processError() throws LibvirtException { + virConnect.processError(); } /** @@ -99,6 +121,7 @@ public class NetworkFilter { * @throws LibvirtException */ public void undefine() throws LibvirtException { - processError(libvirt.virNWFilterUndefine(NFP)); + libvirt.virNWFilterUndefine(NFP); + processError(); } } diff --git a/src/main/java/org/libvirt/Secret.java b/src/main/java/org/libvirt/Secret.java index 868fcc8..5332e02 100644 --- a/src/main/java/org/libvirt/Secret.java +++ b/src/main/java/org/libvirt/Secret.java @@ -2,12 +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 static org.libvirt.ErrorHandler.processError; 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; @@ -40,12 +39,13 @@ public class Secret { * Release the secret handle. The underlying secret continues to exist. * * @throws LibvirtException - * @return ignore (always 0) + * @return 0 on success, or -1 on error. */ public int free() throws LibvirtException { int success = 0; if (VSP != null) { - success = processError(libvirt.virSecretFree(VSP)); + success = libvirt.virSecretFree(VSP); + processError(); VSP = null; } @@ -61,7 +61,9 @@ public class Secret { * @throws LibvirtException */ public String getUsageID() throws LibvirtException { - return processError(libvirt.virSecretGetUsageID(VSP)); + String returnValue = libvirt.virSecretGetUsageID(VSP); + processError(); + return returnValue; } /** @@ -73,8 +75,13 @@ public class Secret { */ public int[] getUUID() throws LibvirtException { byte[] bytes = new byte[Libvirt.VIR_UUID_BUFLEN]; - processError(libvirt.virSecretGetUUID(VSP, bytes)); - return Connect.convertUUIDBytes(bytes); + int success = libvirt.virSecretGetUUID(VSP, bytes); + processError(); + int[] returnValue = new int[0]; + if (success == 0) { + returnValue = Connect.convertUUIDBytes(bytes); + } + return returnValue; } /** @@ -86,8 +93,13 @@ public class Secret { */ public String getUUIDString() throws LibvirtException { byte[] bytes = new byte[Libvirt.VIR_UUID_STRING_BUFLEN]; - processError(libvirt.virSecretGetUUIDString(VSP, bytes)); - return Native.toString(bytes); + int success = libvirt.virSecretGetUUIDString(VSP, bytes); + processError(); + String returnValue = null; + if (success == 0) { + returnValue = Native.toString(bytes); + } + return returnValue; } /** @@ -108,8 +120,9 @@ public class Secret { * @return the value of the secret, or null on failure. */ public byte[] getByteValue() throws LibvirtException { - SizeTByReference value_size = new SizeTByReference(); - Pointer value = processError(libvirt.virSecretGetValue(VSP, value_size, 0)); + LongByReference value_size = new LongByReference(); + Pointer value = libvirt.virSecretGetValue(VSP, value_size, 0); + processError(); ByteBuffer bb = value.getByteBuffer(0, value_size.getValue()); byte[] returnValue = new byte[bb.remaining()]; bb.get(returnValue); @@ -122,33 +135,49 @@ public class Secret { * @return the XML document */ public String getXMLDesc() throws LibvirtException { - return processError(libvirt.virSecretGetXMLDesc(VSP, 0)); + 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(); } /** * Sets the value of the secret * - * @return ignore (always 0) + * @return 0 on success, -1 on failure. */ public int setValue(String value) throws LibvirtException { - return processError(libvirt.virSecretSetValue(VSP, value, new SizeT(value.length()), 0)); + int returnValue = libvirt.virSecretSetValue(VSP, value, new NativeLong(value.length()), 0); + processError(); + return returnValue; } /** * Sets the value of the secret * - * @return ignore (always 0) + * @return 0 on success, -1 on failure. */ public int setValue(byte[] value) throws LibvirtException { - return processError(libvirt.virSecretSetValue(VSP, value, new SizeT(value.length), 0)); + int returnValue = libvirt.virSecretSetValue(VSP, value, new NativeLong(value.length), 0); + processError(); + return returnValue; } /** * Undefines, but does not free, the Secret. * - * @return ignore (always 0) + * @return 0 on success, -1 on failure. */ public int undefine() throws LibvirtException { - return processError(libvirt.virSecretUndefine(VSP)); + int returnValue = libvirt.virSecretUndefine(VSP); + processError(); + return returnValue; } } diff --git a/src/main/java/org/libvirt/StoragePool.java b/src/main/java/org/libvirt/StoragePool.java index 14ecab8..2d59f68 100644 --- a/src/main/java/org/libvirt/StoragePool.java +++ b/src/main/java/org/libvirt/StoragePool.java @@ -5,10 +5,8 @@ import org.libvirt.jna.StoragePoolPointer; import org.libvirt.jna.StorageVolPointer; import org.libvirt.jna.virStoragePoolInfo; 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; /** @@ -74,7 +72,8 @@ public class StoragePool { * future flags, use 0 for now */ public void build(int flags) throws LibvirtException { - processError(libvirt.virStoragePoolBuild(VSPP, flags)); + libvirt.virStoragePoolBuild(VSPP, flags); + processError(); } /** @@ -84,7 +83,8 @@ public class StoragePool { * future flags, use 0 for now */ public void create(int flags) throws LibvirtException { - processError(libvirt.virStoragePoolCreate(VSPP, flags)); + libvirt.virStoragePoolCreate(VSPP, flags); + processError(); } /** @@ -95,7 +95,8 @@ public class StoragePool { * flags for obliteration process */ public void delete(int flags) throws LibvirtException { - processError(libvirt.virStoragePoolDelete(VSPP, flags)); + libvirt.virStoragePoolDelete(VSPP, flags); + processError(); } /** @@ -105,7 +106,8 @@ public class StoragePool { * This does not free the associated virStoragePoolPtr object. */ public void destroy() throws LibvirtException { - processError(libvirt.virStoragePoolDestroy(VSPP)); + libvirt.virStoragePoolDestroy(VSPP); + processError(); } @Override @@ -118,12 +120,13 @@ public class StoragePool { * not change the state of the pool on the host. * * @throws LibvirtException - * @return number of references left (>= 0) + * @return number of references left (>= 0) for success, -1 for failure. */ public int free() throws LibvirtException { int success = 0; if (VSPP != null) { - success = processError(libvirt.virStoragePoolFree(VSPP)); + success = libvirt.virStoragePoolFree(VSPP); + processError(); VSPP = null; } return success; @@ -138,7 +141,8 @@ public class StoragePool { */ public boolean getAutostart() throws LibvirtException { IntByReference autoStart = new IntByReference(); - processError(libvirt.virStoragePoolGetAutostart(VSPP, autoStart)); + libvirt.virStoragePoolGetAutostart(VSPP, autoStart); + processError(); return autoStart.getValue() != 0 ? true : false; } @@ -160,7 +164,8 @@ public class StoragePool { */ public StoragePoolInfo getInfo() throws LibvirtException { virStoragePoolInfo vInfo = new virStoragePoolInfo(); - processError(libvirt.virStoragePoolGetInfo(VSPP, vInfo)); + libvirt.virStoragePoolGetInfo(VSPP, vInfo); + processError(); return new StoragePoolInfo(vInfo); } @@ -171,7 +176,9 @@ public class StoragePool { * @throws LibvirtException */ public String getName() throws LibvirtException { - return processError(libvirt.virStoragePoolGetName(VSPP)); + String returnValue = libvirt.virStoragePoolGetName(VSPP); + processError(); + return returnValue; } /** @@ -182,8 +189,13 @@ public class StoragePool { */ public int[] getUUID() throws LibvirtException { byte[] bytes = new byte[Libvirt.VIR_UUID_BUFLEN]; - processError(libvirt.virStoragePoolGetUUID(VSPP, bytes)); - return Connect.convertUUIDBytes(bytes); + int success = libvirt.virStoragePoolGetUUID(VSPP, bytes); + processError(); + int[] returnValue = new int[0]; + if (success == 0) { + returnValue = Connect.convertUUIDBytes(bytes); + } + return returnValue; } /** @@ -194,8 +206,13 @@ public class StoragePool { */ public String getUUIDString() throws LibvirtException { byte[] bytes = new byte[Libvirt.VIR_UUID_STRING_BUFLEN]; - processError(libvirt.virStoragePoolGetUUIDString(VSPP, bytes)); - return Native.toString(bytes); + int success = libvirt.virStoragePoolGetUUIDString(VSPP, bytes); + processError(); + String returnValue = null; + if (success == 0) { + returnValue = Native.toString(bytes); + } + return returnValue; } /** @@ -207,7 +224,9 @@ public class StoragePool { * @return a XML document -java @throws LibvirtException */ public String getXMLDesc(int flags) throws LibvirtException { - return processError(libvirt.virStoragePoolGetXMLDesc(VSPP, flags)); + String returnValue = libvirt.virStoragePoolGetXMLDesc(VSPP, flags); + processError(); + return returnValue; } /** @@ -216,11 +235,13 @@ public class StoragePool { * @see <a * href="http://www.libvirt.org/html/libvirt-libvirt.html#virStoragePoolIsActive">Libvirt * Documentation</a> - * @return 1 if running, 0 if inactive + * @return 1 if running, 0 if inactive, -1 on error * @throws LibvirtException */ public int isActive() throws LibvirtException { - return processError(libvirt.virStoragePoolIsActive(VSPP)); + int returnValue = libvirt.virStoragePoolIsActive(VSPP); + processError(); + return returnValue; } /** @@ -230,11 +251,13 @@ public class StoragePool { * @see <a * href="http://www.libvirt.org/html/libvirt-libvirt.html#virStoragePoolIsPersistent">Libvirt * Documentation</a> - * @return 1 if persistent, 0 if transient + * @return 1 if persistent, 0 if transient, -1 on error * @throws LibvirtException */ public int isPersistent() throws LibvirtException { - return processError(libvirt.virStoragePoolIsPersistent(VSPP)); + int returnValue = libvirt.virStoragePoolIsPersistent(VSPP); + processError(); + return returnValue; } /** @@ -246,15 +269,10 @@ public class StoragePool { */ public String[] listVolumes() throws LibvirtException { int num = numOfVolumes(); - 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; - } + String[] returnValue = new String[num]; + libvirt.virStoragePoolListVolumes(VSPP, returnValue, num); + processError(); + return returnValue; } /** @@ -264,7 +282,13 @@ public class StoragePool { * @throws LibvirtException */ public int numOfVolumes() throws LibvirtException { - return processError(libvirt.virStoragePoolNumOfVolumes(VSPP)); + int returnValue = libvirt.virStoragePoolNumOfVolumes(VSPP); + processError(); + return returnValue; + } + + protected void processError() throws LibvirtException { + virConnect.processError(); } /** @@ -277,7 +301,8 @@ public class StoragePool { * @throws LibvirtException */ public void refresh(int flags) throws LibvirtException { - processError(libvirt.virStoragePoolRefresh(VSPP, flags)); + libvirt.virStoragePoolRefresh(VSPP, flags); + processError(); } /** @@ -303,7 +328,8 @@ public class StoragePool { * @throws LibvirtException */ public StorageVol storageVolCreateXML(String xmlDesc, int flags) throws LibvirtException { - StorageVolPointer sPtr = processError(libvirt.virStorageVolCreateXML(VSPP, xmlDesc, flags)); + StorageVolPointer sPtr = libvirt.virStorageVolCreateXML(VSPP, xmlDesc, flags); + processError(); return new StorageVol(virConnect, sPtr); } @@ -312,12 +338,13 @@ public class StoragePool { * as input. Information for the new volume (name, perms) are passed via a * typical volume XML description. * - * @return The storage volume + * @return The storage volume, or {@code null} on error. * @throws LibvirtException */ public StorageVol storageVolCreateXMLFrom(String xmlDesc, StorageVol cloneVolume, int flags) throws LibvirtException { - StorageVolPointer sPtr = processError(libvirt.virStorageVolCreateXMLFrom(VSPP, xmlDesc, cloneVolume.VSVP, flags)); + StorageVolPointer sPtr = libvirt.virStorageVolCreateXMLFrom(VSPP, xmlDesc, cloneVolume.VSVP, flags); + processError(); return new StorageVol(virConnect, sPtr); } @@ -327,13 +354,13 @@ public class StoragePool { * * @param name * name of storage volume - * @return a StorageVol object, or {@code null} if not found. + * @return The StorageVol object found * @throws LibvirtException */ public StorageVol storageVolLookupByName(String name) throws LibvirtException { - StorageVolPointer sPtr = processError(libvirt.virStorageVolLookupByName(VSPP, name)); - - return (sPtr == null) ? null : new StorageVol(virConnect, sPtr); + StorageVolPointer sPtr = libvirt.virStorageVolLookupByName(VSPP, name); + processError(); + return new StorageVol(virConnect, sPtr); } /** @@ -342,7 +369,8 @@ public class StoragePool { * @throws LibvirtException */ public void undefine() throws LibvirtException { - processError(libvirt.virStoragePoolUndefine(VSPP)); + libvirt.virStoragePoolUndefine(VSPP); + processError(); } } diff --git a/src/main/java/org/libvirt/StorageVol.java b/src/main/java/org/libvirt/StorageVol.java index 47b79f6..561cb4d 100644 --- a/src/main/java/org/libvirt/StorageVol.java +++ b/src/main/java/org/libvirt/StorageVol.java @@ -4,9 +4,6 @@ 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; - -import com.sun.jna.Pointer; /** * An acutal storage bucket. @@ -85,7 +82,8 @@ public class StorageVol { * @throws LibvirtException */ public void delete(int flags) throws LibvirtException { - processError(libvirt.virStorageVolDelete(VSVP, flags)); + libvirt.virStorageVolDelete(VSVP, flags); + processError(); } @Override @@ -98,12 +96,13 @@ public class StorageVol { * to exist * * @throws LibvirtException - * @return number of references left (>= 0) + * @return number of references left (>= 0) for success, -1 for failure. */ public int free() throws LibvirtException { int success = 0; if (VSVP != null) { - success = processError(libvirt.virStorageVolFree(VSVP)); + libvirt.virStorageVolFree(VSVP); + processError(); VSVP = null; } return success; @@ -128,7 +127,8 @@ public class StorageVol { */ public StorageVolInfo getInfo() throws LibvirtException { virStorageVolInfo vInfo = new virStorageVolInfo(); - processError(libvirt.virStorageVolGetInfo(VSVP, vInfo)); + libvirt.virStorageVolGetInfo(VSVP, vInfo); + processError(); return new StorageVolInfo(vInfo); } @@ -140,7 +140,9 @@ public class StorageVol { * @throws LibvirtException */ public String getKey() throws LibvirtException { - return processError(libvirt.virStorageVolGetKey(VSVP)); + String returnValue = libvirt.virStorageVolGetKey(VSVP); + processError(); + return returnValue; } /** @@ -150,7 +152,9 @@ public class StorageVol { * @throws LibvirtException */ public String getName() throws LibvirtException { - return processError(libvirt.virStorageVolGetName(VSVP)); + String returnValue = libvirt.virStorageVolGetName(VSVP); + processError(); + return returnValue; } /** @@ -163,13 +167,9 @@ public class StorageVol { * @throws LibvirtException */ public String getPath() throws LibvirtException { - Pointer p = processError(libvirt.virStorageVolGetPath(VSVP)); - - try { - return Library.getString(p); - } finally { - Library.free(p); - } + String returnValue = libvirt.virStorageVolGetPath(VSVP); + processError(); + return returnValue; } /** @@ -181,35 +181,43 @@ public class StorageVol { * @throws LibvirtException */ public String getXMLDesc(int flags) throws LibvirtException { - Pointer p = processError(libvirt.virStorageVolGetXMLDesc(VSVP, flags)); + String returnValue = libvirt.virStorageVolGetXMLDesc(VSVP, flags); + processError(); + return returnValue; + } - try { - return Library.getString(p); - } finally { - Library.free(p); - } + /** + * Error handling logic which should be called after every libvirt call + * + * @throws LibvirtException + */ + protected void processError() throws LibvirtException { + virConnect.processError(); } /** * Fetch a storage pool which contains this volume * - * @return StoragePool object, or {@code null} if not found. + * @return StoragePool object, * @throws LibvirtException */ public StoragePool storagePoolLookupByVolume() throws LibvirtException { - StoragePoolPointer ptr = processError(libvirt.virStoragePoolLookupByVolume(VSVP)); - return (ptr == null) ? null : new StoragePool(virConnect, ptr); + StoragePoolPointer ptr = libvirt.virStoragePoolLookupByVolume(VSVP); + processError(); + return 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 ignore (always 0) + * @return 0 on success, or -1 on error * @throws LibvirtException */ public int wipe() throws LibvirtException { - return processError(libvirt.virStorageVolWipe(VSVP, 0)); + int returnValue = libvirt.virStorageVolWipe(VSVP, 0); + processError(); + return returnValue; } /** @@ -220,10 +228,12 @@ public class StorageVol { * new capacity for volume * @param flags * flags for resizing, see libvirt API for exact flags - * @return ignore (always 0) + * @return 0 on success, or -1 on error * @throws LibvirtException */ public int resize(long capacity, int flags) throws LibvirtException { - return processError(libvirt.virStorageVolResize(VSVP, capacity, flags)); + int returnValue = libvirt.virStorageVolResize(VSVP, capacity, flags); + processError(); + return returnValue; } } diff --git a/src/main/java/org/libvirt/Stream.java b/src/main/java/org/libvirt/Stream.java index c36ed70..84e300c 100644 --- a/src/main/java/org/libvirt/Stream.java +++ b/src/main/java/org/libvirt/Stream.java @@ -1,10 +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 static org.libvirt.ErrorHandler.processError; + +import com.sun.jna.NativeLong; public class Stream { @@ -28,11 +28,11 @@ public class Stream { /** * Request that the in progress data transfer be cancelled abnormally before * the end of the stream has been reached - * - * @return ignore (always 0) */ public int abort() throws LibvirtException { - return processError(libvirt.virStreamAbort(VSP)); + int returnValue = libvirt.virStreamAbort(VSP); + processError(); + return returnValue; } /** @@ -46,11 +46,13 @@ public class Stream { * the events to monitor * @param cb * the callback method - * @return ignore (always 0) + * @return 0 for success, -1 for failure * @throws LibvirtException */ public int addCallback(int events, Libvirt.VirStreamEventCallback cb) throws LibvirtException { - return processError(libvirt.virStreamEventAddCallback(VSP, events, cb, null, null)); + int returnValue = libvirt.virStreamEventAddCallback(VSP, events, cb, null, null); + processError(); + return returnValue; } @Override @@ -62,24 +64,27 @@ public class Stream { * Indicate that there is no further data is to be transmitted on the * stream. * - * @return ignore (always 0) + * @return 0 if success, -1 if failure * @throws LibvirtException */ public int finish() throws LibvirtException { - return processError(libvirt.virStreamFinish(VSP)); + int returnValue = libvirt.virStreamFinish(VSP); + processError(); + return returnValue; } /** * Decrement the reference count on a stream, releasing the stream object if * the reference count has hit zero. * - * @return ignore (always 0) * @throws LibvirtException + * @return 0 on success, or -1 on error. */ public int free() throws LibvirtException { int success = 0; if (VSP != null) { - processError(libvirt.virStreamFree(VSP)); + success = libvirt.virStreamFree(VSP); + processError(); VSP = null; } @@ -87,15 +92,25 @@ public class Stream { } /** - * Receives data from the stream into the buffer provided. + * Error handling logic to throw errors. Must be called after every libvirt + * call. + */ + protected void processError() throws LibvirtException { + virConnect.processError(); + } + + /** + * Receieves data from teh stream into the buffer provided. * * @param data - * buffer to put the data into + * the put the sata into * @return the number of bytes read, -1 on error, -2 if the buffer is empty * @throws LibvirtException */ public int receive(byte[] data) throws LibvirtException { - return processError(libvirt.virStreamRecv(VSP, data, new SizeT(data.length))); + int returnValue = libvirt.virStreamRecv(VSP, data, new NativeLong(data.length)); + processError(); + return returnValue; } /** @@ -104,22 +119,26 @@ public class Stream { * @see <a href="http://www.libvirt.org/html/libvirt-libvirt.html#virStreamRecvAll">virStreamRecvAll</a> * @param handler * the callback handler - * @return ignore (always 0) + * @return 0 if successfule, -1 otherwise * @throws LibvirtException */ public int receiveAll(Libvirt.VirStreamSinkFunc handler) throws LibvirtException { - return processError(libvirt.virStreamRecvAll(VSP, handler, null)); + int returnValue = libvirt.virStreamRecvAll(VSP, handler, null); + processError(); + return returnValue; } /** * Remove an event callback from the stream * * @see <a href="http://www.libvirt.org/html/libvirt-libvirt.html#virStreamEventRemoveCallba…">Libvirt Docs</a> - * @return ignore (always 0) + * @return 0 for success, -1 for failure * @throws LibvirtException */ public int removeCallback() throws LibvirtException { - return processError(libvirt.virStreamEventRemoveCallback(VSP)); + int returnValue = libvirt.virStreamEventRemoveCallback(VSP); + processError(); + return returnValue; } /** @@ -132,7 +151,9 @@ public class Stream { * @throws LibvirtException */ public int send(String data) throws LibvirtException { - return processError(libvirt.virStreamSend(VSP, data, new SizeT(data.length()))); + int returnValue = libvirt.virStreamSend(VSP, data, new NativeLong(data.length())); + processError(); + return returnValue; } /** @@ -143,11 +164,13 @@ public class Stream { * Documentation</a> * @param handler * the callback handler - * @return ignore (always 0) + * @return 0 if successfule, -1 otherwise * @throws LibvirtException */ public int sendAll(Libvirt.VirStreamSourceFunc handler) throws LibvirtException { - return processError(libvirt.virStreamSendAll(VSP, handler, null)); + int returnValue = libvirt.virStreamSendAll(VSP, handler, null); + processError(); + return returnValue; } /** @@ -156,10 +179,12 @@ public class Stream { * @see <a href="http://www.libvirt.org/html/libvirt-libvirt.html#virStreamEventUpdateCallba…">Libvirt Docs</a> * @param events * the events to monitor - * @return ignore (always 0) + * @return 0 for success, -1 for failure * @throws LibvirtException */ public int updateCallback(int events) throws LibvirtException { - return processError(libvirt.virStreamEventUpdateCallback(VSP, events)); + int returnValue = libvirt.virStreamEventUpdateCallback(VSP, events); + processError(); + return returnValue; } } diff --git a/src/main/java/org/libvirt/jna/Libvirt.java b/src/main/java/org/libvirt/jna/Libvirt.java index 0e4c9fc..230d63c 100644 --- a/src/main/java/org/libvirt/jna/Libvirt.java +++ b/src/main/java/org/libvirt/jna/Libvirt.java @@ -4,7 +4,6 @@ import com.sun.jna.Callback; import com.sun.jna.Library; import com.sun.jna.Native; import com.sun.jna.NativeLong; -import com.sun.jna.Platform; import com.sun.jna.Pointer; import com.sun.jna.ptr.IntByReference; import com.sun.jna.ptr.LongByReference; @@ -97,13 +96,14 @@ public interface Libvirt extends Library { void eventCallback(ConnectionPointer virConnectPtr, DomainPointer virDomainPointer, Pointer opaque) ; } - Libvirt INSTANCE = (Libvirt) Native.loadLibrary(Platform.isWindows() ? "virt-0" : "virt", Libvirt.class); + Libvirt INSTANCE = (Libvirt) Native.loadLibrary("virt", Libvirt.class); // Constants we need public static int VIR_UUID_BUFLEN = 16; public static int VIR_UUID_STRING_BUFLEN = (36 + 1); public static int VIR_DOMAIN_SCHED_FIELD_LENGTH = 80; + public static int VIR_NODE_CPU_STATS_FIELD_LENGTH = 256; // Connection Functions String virConnectBaselineCPU(ConnectionPointer virConnectPtr, String[] xmlCPUs, int ncpus, int flags); @@ -180,20 +180,26 @@ 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, SizeT size); + int virDomainBlockStats(DomainPointer virDomainPtr, String path, virDomainBlockStats stats, int size); int virDomainBlockResize(DomainPointer virDomainPtr, String disk, long size, int flags); int virDomainCoreDump(DomainPointer virDomainPtr, String to, int flags); + int virDomainGetVcpus(DomainPointer virDomainPtr, virDomainCPUStats[] stats, int nr_stats,char[] map, int flags); int virDomainCreate(DomainPointer virDomainPtr); int virDomainCreateWithFlags(DomainPointer virDomainPtr, int flags); DomainPointer virDomainCreateLinux(ConnectionPointer virConnectPtr, String xmlDesc, int flags); DomainPointer virDomainCreateXML(ConnectionPointer virConnectPtr, String xmlDesc, int flags); DomainPointer virDomainDefineXML(ConnectionPointer virConnectPtr, String xmlDesc); int virDomainDestroy(DomainPointer virDomainPtr); + int virDomainDestroyFlags(DomainPointer virDomainPtr,long flags); int virDomainDetachDevice(DomainPointer virDomainPtr, String deviceXML); int virDomainDetachDeviceFlags(DomainPointer virDomainPtr, String deviceXML, int flags); int virDomainFree(DomainPointer virDomainPtr); int virDomainGetAutostart(DomainPointer virDomainPtr, IntByReference value); int virDomainGetBlockInfo(DomainPointer virDomainPtr, String path, virDomainBlockInfo info, int flags); + + int virDomainGetCPUStats(DomainPointer virDomainPtr,virTypedParameter[] params, + long nparams,int start_cpu,long ncpus,long flags); + int virDomainGetID(DomainPointer virDomainPtr); int virDomainGetInfo(DomainPointer virDomainPtr, virDomainInfo vInfo); int virDomainGetJobInfo(DomainPointer virDomainPtr, virDomainJobInfo vInfo); @@ -210,7 +216,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, SizeT size); + int virDomainInterfaceStats(DomainPointer virDomainPtr, String path, virDomainInterfaceStats stats, int size); int virDomainIsActive(DomainPointer virDomainPtr); int virDomainIsPersistent(DomainPointer virDomainPtr); DomainPointer virDomainLookupByID(ConnectionPointer virConnectPtr, int id); @@ -241,6 +247,7 @@ public interface Libvirt extends Library { int virDomainSetSchedulerParameters(DomainPointer virDomainPtr, virSchedParameter[] params, int nparams); int virDomainSetVcpus(DomainPointer virDomainPtr, int nvcpus); int virDomainShutdown(DomainPointer virDomainPtr); + int virDomainShutdownFlags(DomainPointer virDomainPtr,long flags); int virDomainSuspend(DomainPointer virDomainPtr); int virDomainUpdateDeviceFlags(DomainPointer virDomainPtr, String xml, int flags); int virDomainUndefine(DomainPointer virDomainPtr); @@ -271,7 +278,10 @@ public interface Libvirt extends Library { int virNodeGetCellsFreeMemory(ConnectionPointer virConnectPtr, LongByReference freeMems, int startCell, int maxCells); long virNodeGetFreeMemory(ConnectionPointer virConnectPtr); - + + int virNodeGetCPUStats(ConnectionPointer virConnectPtr, int cpuNum, + virNodeCPUStats[] stats,IntByReference nparams, long flags); + // Node/Device functions int virNodeNumOfDevices(ConnectionPointer virConnectPtr, String capabilityName, int flags); int virNodeListDevices(ConnectionPointer virConnectPtr, String capabilityName, Pointer[] names, int maxnames, @@ -280,7 +290,7 @@ public interface Libvirt extends Library { String virNodeDeviceGetName(DevicePointer virDevicePointer); String virNodeDeviceGetParent(DevicePointer virDevicePointer); int virNodeDeviceNumOfCaps(DevicePointer virDevicePointer); - int virNodeDeviceListCaps(DevicePointer virDevicePointer, Pointer[] names, int maxNames); + int virNodeDeviceListCaps(DevicePointer virDevicePointer, String[] names, int maxNames); String virNodeDeviceGetXMLDesc(DevicePointer virDevicePointer); int virNodeDeviceFree(DevicePointer virDevicePointer); int virNodeDeviceDettach(DevicePointer virDevicePointer); @@ -303,7 +313,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, Pointer[] names, int maxnames); + int virStoragePoolListVolumes(StoragePoolPointer storagePoolPtr, String[] names, int maxnames); int virStoragePoolIsActive(StoragePoolPointer storagePoolPtr); int virStoragePoolIsPersistent(StoragePoolPointer storagePoolPtr); StoragePoolPointer virStoragePoolLookupByName(ConnectionPointer virConnectPtr, String name); @@ -324,8 +334,8 @@ public interface Libvirt extends Library { int virStorageVolGetInfo(StorageVolPointer storageVolPtr, virStorageVolInfo info); String virStorageVolGetKey(StorageVolPointer storageVolPtr); String virStorageVolGetName(StorageVolPointer storageVolPtr); - Pointer virStorageVolGetPath(StorageVolPointer storageVolPtr); - Pointer virStorageVolGetXMLDesc(StorageVolPointer storageVolPtr, int flags); + String virStorageVolGetPath(StorageVolPointer storageVolPtr); + String virStorageVolGetXMLDesc(StorageVolPointer storageVolPtr, int flags); StorageVolPointer virStorageVolLookupByKey(ConnectionPointer virConnectPtr, String name); StorageVolPointer virStorageVolLookupByName(StoragePoolPointer storagePoolPtr, String name); StorageVolPointer virStorageVolLookupByPath(ConnectionPointer virConnectPtr, String path); @@ -351,13 +361,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, SizeTByReference value_size, int flags); + Pointer virSecretGetValue(SecretPointer virSecretPtr, LongByReference 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, SizeT value_size, int flags); - int virSecretSetValue(SecretPointer virSecretPtr, byte[] value, SizeT value_size, int flags); + int virSecretSetValue(SecretPointer virSecretPtr, String value, NativeLong value_size, int flags); + int virSecretSetValue(SecretPointer virSecretPtr, byte[] value, NativeLong value_size, int flags); int virSecretUndefine(SecretPointer virSecretPtr); //Stream Methods @@ -369,18 +379,18 @@ 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, String data, NativeLong size); int virStreamSendAll(StreamPointer virStreamPtr, Libvirt.VirStreamSourceFunc handler, Pointer opaque); - int virStreamRecv(StreamPointer virStreamPtr, byte[] data, SizeT length); + int virStreamRecv(StreamPointer virStreamPtr, byte[] data, NativeLong length); int virStreamRecvAll(StreamPointer virStreamPtr, Libvirt.VirStreamSinkFunc handler, Pointer opaque); //DomainSnapshot Methods DomainSnapshotPointer virDomainSnapshotCreateXML(DomainPointer virDomainPtr, String xmlDesc, int flags); DomainSnapshotPointer virDomainSnapshotCurrent(DomainPointer virDomainPtr, int flags); int virDomainSnapshotDelete(DomainSnapshotPointer virDomainSnapshotPtr, int flags); - Pointer virDomainSnapshotGetXMLDesc(DomainSnapshotPointer virDomainSnapshotPtr, int flags); + String virDomainSnapshotGetXMLDesc(DomainSnapshotPointer virDomainSnapshotPtr, int flags); int virDomainSnapshotFree(DomainSnapshotPointer virDomainSnapshotPtr); - int virDomainSnapshotListNames(DomainPointer virDomainPtr, Pointer[] names, int nameslen, int flags); + int virDomainSnapshotListNames(DomainPointer virDomainPtr, String[] names, int nameslen, int flags); DomainSnapshotPointer virDomainSnapshotLookupByName(DomainPointer virDomainPtr, String name, int flags); int virDomainSnapshotNum(DomainPointer virDomainPtr, int flags); diff --git a/src/main/java/org/libvirt/jna/VirUnion.java b/src/main/java/org/libvirt/jna/VirUnion.java new file mode 100644 index 0000000..ba089e0 --- /dev/null +++ b/src/main/java/org/libvirt/jna/VirUnion.java @@ -0,0 +1,14 @@ +package org.libvirt.jna; + +import com.sun.jna.Union; +import com.sun.jna.ptr.ByteByReference; + +public class VirUnion extends Union{ + public int i; + public long ui; + public long l; + public long ul; + public double d; + public char b; + public ByteByReference s = new ByteByReference(); +} diff --git a/src/main/java/org/libvirt/jna/virConnectAuth.java b/src/main/java/org/libvirt/jna/virConnectAuth.java index 0451348..ece61f6 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<String> fields = Arrays.asList( + private static final List fields = Arrays.asList( "credtype", "ncredtype", "cb", "cbdata"); @Override - protected List<String> getFieldOrder() { + protected List getFieldOrder() { return fields; } } diff --git a/src/main/java/org/libvirt/jna/virConnectCredential.java b/src/main/java/org/libvirt/jna/virConnectCredential.java index 316b1f4..6dd4a75 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<String> fields = Arrays.asList( + private static final List fields = Arrays.asList( "type", "prompt", "challenge", "defresult", "result", "resultlen"); @Override - protected List<String> getFieldOrder() { + protected List getFieldOrder() { return fields; } } diff --git a/src/main/java/org/libvirt/jna/virDomainBlockInfo.java b/src/main/java/org/libvirt/jna/virDomainBlockInfo.java index 5a88ba3..fb1b845 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<String> fields = Arrays.asList( + private static final List fields = Arrays.asList( "capacity", "allocation", "physical"); @Override - protected List<String> getFieldOrder() { + protected List getFieldOrder() { return fields; } } diff --git a/src/main/java/org/libvirt/jna/virDomainBlockStats.java b/src/main/java/org/libvirt/jna/virDomainBlockStats.java index e48629a..a7331f6 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<String> fields = Arrays.asList( + private static final List fields = Arrays.asList( "rd_req", "rd_bytes", "wr_req", "wr_bytes", "errs"); @Override - protected List<String> getFieldOrder() { + protected List getFieldOrder() { return fields; } } diff --git a/src/main/java/org/libvirt/jna/virDomainCPUStats.java b/src/main/java/org/libvirt/jna/virDomainCPUStats.java new file mode 100644 index 0000000..04d5377 --- /dev/null +++ b/src/main/java/org/libvirt/jna/virDomainCPUStats.java @@ -0,0 +1,21 @@ +package org.libvirt.jna; + +import java.util.Arrays; +import java.util.List; + +import com.sun.jna.Structure; + +public class virDomainCPUStats extends Structure{ + public long number ; + public long state ; + public long cpuTime; + public long cpu; + + private static final List fields = Arrays.asList( "number", "state", + "cpuTime","cpu"); + + @Override + protected List getFieldOrder() { + return fields; + } +} diff --git a/src/main/java/org/libvirt/jna/virDomainInfo.java b/src/main/java/org/libvirt/jna/virDomainInfo.java index ff20d16..0b667f6 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<String> fields = Arrays.asList( + private static final List fields = Arrays.asList( "state", "maxMem", "memory", "nrVirtCpu", "cpuTime"); @Override - protected List<String> getFieldOrder() { + protected List getFieldOrder() { return fields; } } diff --git a/src/main/java/org/libvirt/jna/virDomainInterfaceStats.java b/src/main/java/org/libvirt/jna/virDomainInterfaceStats.java index 9b98aa8..eea6a49 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<String> fields = Arrays.asList( + private static final List fields = Arrays.asList( "rx_bytes", "rx_packets", "rx_errs", "rx_drop", "tx_bytes", "tx_packets", "tx_errs", "tx_drop"); @Override - protected List<String> getFieldOrder() { + protected List getFieldOrder() { return fields; } } diff --git a/src/main/java/org/libvirt/jna/virDomainJobInfo.java b/src/main/java/org/libvirt/jna/virDomainJobInfo.java index 1bab587..0398901 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<String> fields = Arrays.asList( + private static final List fields = Arrays.asList( "type", "timeElapsed", "timeRemaining", "dataTotal", "dataProcessed", "dataRemaining", "memTotal", "memProcessed", "memRemaining", "fileTotal", "fileProcessed", "fileRemaining"); @Override - protected List<String> getFieldOrder() { + protected List getFieldOrder() { return fields; } } diff --git a/src/main/java/org/libvirt/jna/virDomainMemoryStats.java b/src/main/java/org/libvirt/jna/virDomainMemoryStats.java index dfbd3f9..b14fb95 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<String> fields = Arrays.asList( "tag", "val"); + private static final List fields = Arrays.asList( "tag", "val"); @Override - protected List<String> getFieldOrder() { + protected List getFieldOrder() { return fields; } } diff --git a/src/main/java/org/libvirt/jna/virError.java b/src/main/java/org/libvirt/jna/virError.java index e58f5f3..36b9f69 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<String> fields = Arrays.asList( + private static final List fields = Arrays.asList( "code", "domain", "message", "level", "conn", "dom", "str1", "str2", "str3", "int1", "int2", "net"); @Override - protected List<String> getFieldOrder() { + protected List getFieldOrder() { return fields; } } diff --git a/src/main/java/org/libvirt/jna/virNodeCPUStats.java b/src/main/java/org/libvirt/jna/virNodeCPUStats.java new file mode 100644 index 0000000..89c1a24 --- /dev/null +++ b/src/main/java/org/libvirt/jna/virNodeCPUStats.java @@ -0,0 +1,19 @@ +package org.libvirt.jna; + +import java.util.Arrays; +import java.util.List; + +import com.sun.jna.NativeLong; +import com.sun.jna.Structure; + +public class virNodeCPUStats extends Structure{ + public byte[] tag = new byte[80]; + public long val ; + + private static final List fields = Arrays.asList( "tag", "val"); + + @Override + protected List getFieldOrder() { + return fields; + } +} diff --git a/src/main/java/org/libvirt/jna/virNodeInfo.java b/src/main/java/org/libvirt/jna/virNodeInfo.java index 7a7716e..9ff1251 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<String> fields = Arrays.asList( + private static final List fields = Arrays.asList( "model", "memory", "cpus", "mhz", "nodes", "sockets", "cores", "threads"); @Override - protected List<String> getFieldOrder() { + protected List getFieldOrder() { return fields; } } diff --git a/src/main/java/org/libvirt/jna/virSchedParameter.java b/src/main/java/org/libvirt/jna/virSchedParameter.java index f3787a9..f579ef0 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<String> fields = Arrays.asList( + private static final List fields = Arrays.asList( "field", "type", "value"); @Override - protected List<String> getFieldOrder() { + protected List getFieldOrder() { return fields; } } diff --git a/src/main/java/org/libvirt/jna/virStoragePoolInfo.java b/src/main/java/org/libvirt/jna/virStoragePoolInfo.java index 7077175..fe20f0f 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<String> fields = Arrays.asList( + private static final List fields = Arrays.asList( "state", "capacity", "allocation", "available"); @Override - protected List<String> getFieldOrder() { + protected List getFieldOrder() { return fields; } } diff --git a/src/main/java/org/libvirt/jna/virStorageVolInfo.java b/src/main/java/org/libvirt/jna/virStorageVolInfo.java index 8bf2d5c..93132ea 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<String> fields = Arrays.asList( + private static final List fields = Arrays.asList( "type", "capacity", "allocation"); @Override - protected List<String> getFieldOrder() { + protected List getFieldOrder() { return fields; } } diff --git a/src/main/java/org/libvirt/jna/virTypedParameter.java b/src/main/java/org/libvirt/jna/virTypedParameter.java new file mode 100644 index 0000000..4fe48f6 --- /dev/null +++ b/src/main/java/org/libvirt/jna/virTypedParameter.java @@ -0,0 +1,22 @@ +package org.libvirt.jna; + +import java.util.Arrays; +import java.util.List; + +import com.sun.jna.Structure; + +public class virTypedParameter extends Structure{ + + public byte[] field = new byte[80]; + public int type; + public VirUnion value; + + private static final List fields = Arrays.asList( "field", "type", + "value"); + @Override + protected List getFieldOrder() { + // TODO Auto-generated method stub + return fields; + } + +} diff --git a/src/main/java/org/libvirt/jna/virVcpuInfo.java b/src/main/java/org/libvirt/jna/virVcpuInfo.java index bc1a539..96eca2f 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<String> fields = Arrays.asList( + private static final List fields = Arrays.asList( "number", "state", "cpuTime", "cpu"); @Override - protected List<String> getFieldOrder() { + protected List getFieldOrder() { return fields; } } -- 1.8.3.2

2 1

[libvirt] [PATCH 2/2] added my name to authors :)
by phate867＠gmail.com 05 Apr '14

05 Apr '14

From: Pasquale Di Rienzo <phate867(a)gmail.com> --- AUTHORS | 1 + 1 file changed, 1 insertion(+) diff --git a/AUTHORS b/AUTHORS index 07809bf..e8bcb2b 100644 --- a/AUTHORS +++ b/AUTHORS @@ -16,3 +16,4 @@ Andrea Sansottera <andrea.sansottera(a)gmail.com> Stefan Majer <stefan.majer(a)gmail.com> Wido den Hollander <wido(a)widodh.nl> Eric Blake <eblake(a)redhat.com> +Pasquale Di Rienzo <phate867(a)gmail.com> \ No newline at end of file -- 1.8.3.2

1 0

[libvirt] [PATCH 0/3] bhyve: capabilities and CPU-capabilities support
by Wojciech Macek 05 Apr '14

05 Apr '14

Add following changes: - support for connectBaselineCPU (required by OpenStack) - move capabilites functions to separate file + API change - implement connectCompareCPU Wojciech Macek (3): bhyve: support for connectBaselineCPU bhyve: create capabilities submodule bhyve: connectCompareCPU support src/Makefile.am | 2 + src/bhyve/bhyve_capabilities.c | 105 ++++++++++++++++++++++++++++++++++++++++ src/bhyve/bhyve_capabilities.h | 30 ++++++++++++ src/bhyve/bhyve_driver.c | 107 ++++++++++++++++++++++++++++++++--------- 4 files changed, 222 insertions(+), 22 deletions(-) create mode 100644 src/bhyve/bhyve_capabilities.c create mode 100644 src/bhyve/bhyve_capabilities.h -- 1.9.0

3 7

[libvirt] [PATCH v3 0/2] bhyve: add console support through nmdm device
by Roman Bogorodskiy 05 Apr '14

05 Apr '14

Changes from v2: - Add unittest - Minor: new labels style and target for 1.2.4 Changes from v1: Switch over from implicit slave device path, i.e. guessing from <source path='/dev/nmdm0A'/> that the slave is '/dev/nmdm0B', to explicit master and slave device specification using <source master='/dev/nmdm0A' slave='/dev/nmdm0B'/>. Roman Bogorodskiy (2): bhyve: add console support through nmdm device bhyve: add xml2argv tests for console src/bhyve/bhyve_command.c | 34 +++++++++++++ src/bhyve/bhyve_driver.c | 45 +++++++++++++++++ src/conf/domain_audit.c | 1 + src/conf/domain_conf.c | 59 +++++++++++++++++++++- src/conf/domain_conf.h | 5 ++ src/qemu/qemu_command.c | 1 + src/qemu/qemu_monitor_json.c | 1 + tests/bhyvexml2argvdata/bhyvexml2argv-console.args | 4 ++ tests/bhyvexml2argvdata/bhyvexml2argv-console.xml | 23 +++++++++ tests/bhyvexml2argvdata/bhyvexml2argv-serial.args | 4 ++ tests/bhyvexml2argvdata/bhyvexml2argv-serial.xml | 23 +++++++++ tests/bhyvexml2argvtest.c | 2 + 12 files changed, 201 insertions(+), 1 deletion(-) create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-console.args create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-console.xml create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-serial.args create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-serial.xml -- 1.8.4.2

2 4

[libvirt] [PATCH] bhyve: domain autostart support
by Roman Bogorodskiy 05 Apr '14

05 Apr '14

Re-submit patch provided by David back in February when bhyve driver was not in the tree. I did some changes to the patch on the way: - rebase to the current master - add ACL checks - use bhyveDomObjFromDomain() instead of custom virDomainObjListFindByUUID() - fix problems reported by 'syntax-check' David Shane Holden (1): bhyve: domain autostart support src/bhyve/bhyve_driver.c | 135 ++++++++++++++++++++++++++++++++++++++++++++++- src/bhyve/bhyve_utils.h | 5 ++ 2 files changed, 139 insertions(+), 1 deletion(-) -- 1.8.4.2

2 4

[libvirt] [PATCH] NFS storage pool: Fix libvirtd crash due to refactor edit
by John Ferlan 04 Apr '14

04 Apr '14

Commit id '18642d10' refactored the call to virCommandRunRegex() inside a new function virStorageBackendFileSystemNetFindNFSPoolSources(), but the cut-n-paste didn't remove the "&state". Now that state is passed by reference, it results in a libvirtd core with a messages entry: "...internal error: unknown storage pool type Unknow" Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- src/storage/storage_backend_fs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/storage/storage_backend_fs.c b/src/storage/storage_backend_fs.c index 1d85871..4e4a7ae 100644 --- a/src/storage/storage_backend_fs.c +++ b/src/storage/storage_backend_fs.c @@ -266,7 +266,7 @@ virStorageBackendFileSystemNetFindNFSPoolSources(virNetfsDiscoverState *state) if (virCommandRunRegex(cmd, 1, regexes, vars, virStorageBackendFileSystemNetFindPoolSourcesFunc, - &state, NULL) < 0) + state, NULL) < 0) virResetLastError(); virCommandFree(cmd); -- 1.8.5.3

2 1

Re: [libvirt] [Qemu-devel] [PATCH] spapr: skip adding usb keyboard/mouse in case of -nodefaults
by Eric Blake 04 Apr '14

04 Apr '14

[adding libvir-list] On 04/04/2014 05:23 AM, Markus Armbruster wrote: > Paolo Bonzini <pbonzini(a)redhat.com> writes: > >> Il 04/04/2014 12:58, Markus Armbruster ha scritto: >>>>>>> >>>>>>> Have you considered extending QEMUMachineInitArgs instead of adding this >>>>>>> function? >>>>> >>>>> Did not think of this option earlier. You mean doing something like >>>>> this? >>> Yes. Looks nicer, doesn't it? >> >> I still think it's a libvirt bug. Mixing -nodefaults and -usb and >> -device is looking for trouble I think. "-usb" is a do-what-I-mean >> kind of option and it makes sense for it to add a keyboard and mouse, >> even with -nodefaults. > > I agree that management tools should not use -usb, except when they want > to manage ancient versions of QEMU for some reason. We've tried to make libvirt avoid -usb when it knows it is targetting a new enough qemu. But I'm not the one most familiar with that code. At this point, I'm just trying to facilitate discussions, and make sure the right people are looking at this - what versions of qemu vs. libvirt have you tested, and what does libvirt still need to patch to avoid -usb, and/or qemu patch so that libvirt can correctly probe that -usb is not needed? -- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org

1 0

[libvirt] [PATCH 0/5] virstoragefile refactoring, part 3
by Eric Blake 04 Apr '14

04 Apr '14

Part 2 gave us a common virStorageSource struct, now it's time to start using that struct when crawling backing file chains. I posted some RFCs about my full conversion plan, here's the patches I have working so far. Still plenty more to come, but today's batch of patches took me a lot longer than I had planned due to having to refactor the testsuite to avoid a compiler error about over-large stack allocation. Eric Blake (5): tests: use C99 initialization for storage test tests: refactor virstoragetest for less stack space conf: track when storage type is still undetermined conf: track more fields in backing chain metadata conf: start testing contents of the new backing chain fields src/conf/domain_conf.c | 10 +- src/conf/snapshot_conf.c | 2 +- src/qemu/qemu_command.c | 1 + src/qemu/qemu_driver.c | 11 +- src/util/virstoragefile.c | 33 +++- src/util/virstoragefile.h | 43 ++++- tests/virstoragetest.c | 405 ++++++++++++++++++++++++++++++++-------------- 7 files changed, 366 insertions(+), 139 deletions(-) -- 1.9.0

2 13

[libvirt] [PATCH] Add V6LOCAL parameter to nwfilter rules.
by Brian Rak 04 Apr '14

04 Apr '14

Currently, adding any sort of IPv6 nwfilter rules is rather difficult. There are no standard rules, and you end up doing a lot of things by hand. This patch makes the $V6LOCAL variable available within rules. This is the generated from the interface's mac address using the modified EUI-64 format, which matches what the guest should be using. This is part of what information is needed to correctly filter guest IPv6 traffic. Since this changes with the MAC address, it is significantly easier if libvirt populates it (rather then requring the user to enter it) --- docs/formatnwfilter.html.in | 9 ++++++--- src/conf/nwfilter_params.h | 1 + src/nwfilter/nwfilter_gentech_driver.c | 23 +++++++++++++++++++++++ 3 files changed, 30 insertions(+), 3 deletions(-) mode change 100644 => 100755 src/nwfilter/nwfilter_gentech_driver.c diff --git a/docs/formatnwfilter.html.in b/docs/formatnwfilter.html.in index 45b97f7..aa1ff9f 100644 --- a/docs/formatnwfilter.html.in +++ b/docs/formatnwfilter.html.in @@ -239,9 +239,9 @@ <h3><a name="nwfconceptsvars">Usage of variables in filters</a></h3> - Two variables names have so far been reserved for usage by the - network traffic filtering subsystem: <code>MAC</code> and - <code>IP</code>. + Three variables names have so far been reserved for usage by the + network traffic filtering subsystem: <code>MAC</code>, + <code>IP</code>, and <code>V6LOCAL</code> <code>MAC</code> is the MAC address of the network interface. A filtering rule that references this variable @@ -251,6 +251,9 @@ parameter similar to the IP parameter above, it is discouraged since libvirt knows what MAC address an interface will be using. + <code>V6LOCAL</code> is the computed IPv6 link-local address. + This is based on the MAC variable + The parameter <code>IP</code> represents the IP address that the operating system inside the virtual machine is expected to use on the given interface. The <code>IP</code> parameter diff --git a/src/conf/nwfilter_params.h b/src/conf/nwfilter_params.h index 5e9777b..f61250f 100644 --- a/src/conf/nwfilter_params.h +++ b/src/conf/nwfilter_params.h @@ -98,6 +98,7 @@ bool virNWFilterHashTableEqual(virNWFilterHashTablePtr a, # define NWFILTER_VARNAME_IP "IP" # define NWFILTER_VARNAME_MAC "MAC" +# define NWFILTER_VARNAME_V6LOCAL "V6LOCAL" # define NWFILTER_VARNAME_CTRL_IP_LEARNING "CTRL_IP_LEARNING" # define NWFILTER_VARNAME_DHCPSERVER "DHCPSERVER" diff --git a/src/nwfilter/nwfilter_gentech_driver.c b/src/nwfilter/nwfilter_gentech_driver.c old mode 100644 new mode 100755 index 1ce5e70..a86dae8 --- a/src/nwfilter/nwfilter_gentech_driver.c +++ b/src/nwfilter/nwfilter_gentech_driver.c @@ -45,6 +45,7 @@ VIR_LOG_INIT("nwfilter.nwfilter_gentech_driver"); #define NWFILTER_STD_VAR_MAC NWFILTER_VARNAME_MAC #define NWFILTER_STD_VAR_IP NWFILTER_VARNAME_IP +#define NWFILTER_STD_VAR_V6LOCAL NWFILTER_VARNAME_V6LOCAL #define NWFILTER_DFLT_LEARN "any" @@ -163,6 +164,28 @@ virNWFilterVarHashmapAddStdValues(virNWFilterHashTablePtr table, "%s", _("Could not add variable 'MAC' to hashmap")); return -1; } + + virMacAddr parsedMac; + if (virMacAddrParse(macaddr, &parsedMac) == 0) + { + parsedMac.addr[0] ^= 2; + + char euiMacAddr[26]; + snprintf(euiMacAddr, sizeof(euiMacAddr), "fe80::%x%x:%xff:fe%x:%x%x", parsedMac.addr[0], parsedMac.addr[1], parsedMac.addr[2], + parsedMac.addr[3], parsedMac.addr[4], parsedMac.addr[5]); + + val = virNWFilterVarValueCreateSimpleCopyValue(euiMacAddr); + if (!val) + return -1; + + if (virHashAddEntry(table->hashTable, + NWFILTER_STD_VAR_V6LOCAL, + val) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + "%s", _("Could not add variable 'V6LOCAL' to hashmap")); + return -1; + } + } } if (ipaddr) { -- 1.7.1

3 7

[libvirt] Enhancing clean-traffic to work with IPv6
by Brian Rak 04 Apr '14

04 Apr '14

I'm looking into adding IPv6 support to the nwfilter clean-traffic rules, but I'm unsure of the best approach to this. I'm planning on sending patches once I get this correct, so I'm trying to figure out what way fits in best. There's a couple different ways I can think of: 1) Explicitly add v6 rules to the existing clean-traffic rules. This would enable IPv6 for guests whenever libvirt was upgraded, which may be a problem. 2) Add another filter chain (clean-ipv6-traffic) that would do the same thing as clean-traffic, just for IPv6 3) Add another filter chain (clean-ipv6-ipv4-traffic), that would clean IPv6 traffic, and include the clean-traffic filter set The limitation here is that IP learning will not work for IPv6, so actually using IPv6 is going to require passing in parameters to filter specifying what ranges the guest should be allowed to use. I think this rules out #1. Any suggestions?

2 3

[libvirt] libxl fixes/improvements for libvirt
by Stefan Bader 04 Apr '14

04 Apr '14

Here several changes which improve the handling of Xen for me: * 0001-libxl-Use-id-from-virDomainObj-inside-the-driver.patch This is a re-send as I initially submitted that as a reply to some discussion. Starting from the visibly broken libxlDomainGetInfo when creating or rebooting a guest with virt-manager, I replaced all usage of dom->id with the more stable vm->def->id. * 0002-libxl-Set-disk-format-for-empty-cdrom-device.patch Fixes start of a guest after ejecting the iso image from a virtual CDROM drive (again using virt-manager). * 0003-libxl-Implement-basic-video-device-selection.patch Should fix the occasional disagreement about the used VNC port and adds the ability to select the standard VGA graphics from Xen. VRAM size seemed to work with that. Only for Cirrus, while the qemu command-line looks good, ones seems to end up with 32M. Note to people on the Xen list: I wonder whether libxenlight internally should somehow should fix up the situation where a caller sets up the video devices in the vfbs list but does not sync that with the information in the build info. Question probably is what the semantics should be. -Stefan

5 22

[libvirt] [PATCH 0/7] Some vshCommandOpt rework
by Michal Privoznik 04 Apr '14

04 Apr '14

*** BLURB HERE *** Michal Privoznik (7): virsh: Make vshCommandOpt* report error virsh-domain: Adapt to new error reporting virsh-domain-monitor: Adapt to new error reporting virsh-host: Adapt to new error reporting virsh-interface: Adapt to new error reporting virsh-network: Adapt to new error reporting virsh-volume: Adapt to new error reporting tests/vcpupin | 2 +- tools/virsh-domain-monitor.c | 5 +-- tools/virsh-domain.c | 75 ++++++++++++++------------------------------ tools/virsh-host.c | 19 +++-------- tools/virsh-interface.c | 4 +-- tools/virsh-network.c | 4 +-- tools/virsh-volume.c | 16 +++------- tools/virsh.c | 72 +++++++++++++++++++++++++++++++++++++----- tools/virsh.h | 2 +- 9 files changed, 102 insertions(+), 97 deletions(-) -- 1.9.0

2 10

[libvirt] [PATCH v2] Add V6LOCAL nwfilter parameter.
by Brian Rak 04 Apr '14

04 Apr '14

Currently, adding any sort of IPv6 nwfilter rules is rather difficult. There are no standard rules, and you end up doing a lot of things by hand. This patch makes the $V6LOCAL variable available within nwfilter nules. This is the generated from the interface's mac address using the modified EUI-64 format, which matches what the guest should be using. This is part of what information is needed to correctly filter guest IPv6 traffic. Since this changes with the MAC address, it is significantly easier if libvirt populates it (rather then requiring the user to enter it). As an example, an interface with a MAC address of "12:34:45:46:23:41" would have a V6LOCAL value of "fe80::1034:45ff:fe46:2341" --- docs/formatnwfilter.html.in | 11 ++++++++--- src/conf/nwfilter_params.h | 1 + src/nwfilter/nwfilter_gentech_driver.c | 25 +++++++++++++++++++++++++ 3 files changed, 34 insertions(+), 3 deletions(-) diff --git a/docs/formatnwfilter.html.in b/docs/formatnwfilter.html.in index 45b97f7..4f10884 100644 --- a/docs/formatnwfilter.html.in +++ b/docs/formatnwfilter.html.in @@ -239,9 +239,9 @@ <h3><a name="nwfconceptsvars">Usage of variables in filters</a></h3> - Two variables names have so far been reserved for usage by the - network traffic filtering subsystem: <code>MAC</code> and - <code>IP</code>. + Three variables names have so far been reserved for usage by the + network traffic filtering subsystem: <code>MAC</code>, + <code>IP</code>, and <code>V6LOCAL</code> (since 1.2.4). <code>MAC</code> is the MAC address of the network interface. A filtering rule that references this variable @@ -251,6 +251,11 @@ parameter similar to the IP parameter above, it is discouraged since libvirt knows what MAC address an interface will be using. + <code>V6LOCAL</code> is the computed IPv6 link-local address. + This is based on the MAC address of the interface. As an example, + a MAC address of <code>12:34:45:46:23:41</code> would result in a + link local address of <code>fe80::1034:45ff:fe46:2341</code>. + The parameter <code>IP</code> represents the IP address that the operating system inside the virtual machine is expected to use on the given interface. The <code>IP</code> parameter diff --git a/src/conf/nwfilter_params.h b/src/conf/nwfilter_params.h index 5e9777b..f61250f 100644 --- a/src/conf/nwfilter_params.h +++ b/src/conf/nwfilter_params.h @@ -98,6 +98,7 @@ bool virNWFilterHashTableEqual(virNWFilterHashTablePtr a, # define NWFILTER_VARNAME_IP "IP" # define NWFILTER_VARNAME_MAC "MAC" +# define NWFILTER_VARNAME_V6LOCAL "V6LOCAL" # define NWFILTER_VARNAME_CTRL_IP_LEARNING "CTRL_IP_LEARNING" # define NWFILTER_VARNAME_DHCPSERVER "DHCPSERVER" diff --git a/src/nwfilter/nwfilter_gentech_driver.c b/src/nwfilter/nwfilter_gentech_driver.c index 1ce5e70..c58df1c 100644 --- a/src/nwfilter/nwfilter_gentech_driver.c +++ b/src/nwfilter/nwfilter_gentech_driver.c @@ -45,6 +45,7 @@ VIR_LOG_INIT("nwfilter.nwfilter_gentech_driver"); #define NWFILTER_STD_VAR_MAC NWFILTER_VARNAME_MAC #define NWFILTER_STD_VAR_IP NWFILTER_VARNAME_IP +#define NWFILTER_STD_VAR_V6LOCAL NWFILTER_VARNAME_V6LOCAL #define NWFILTER_DFLT_LEARN "any" @@ -163,6 +164,30 @@ virNWFilterVarHashmapAddStdValues(virNWFilterHashTablePtr table, "%s", _("Could not add variable 'MAC' to hashmap")); return -1; } + + virMacAddr parsedMac; + if (virMacAddrParse(macaddr, &parsedMac) == 0) { + parsedMac.addr[0] ^= 2; + + char euiMacAddr[26]; + snprintf(euiMacAddr, sizeof(euiMacAddr), + "fe80::%02x%02x:%02xff:fe%02x:%02x%02x", parsedMac.addr[0], + parsedMac.addr[1], parsedMac.addr[2], parsedMac.addr[3], + parsedMac.addr[4], parsedMac.addr[5]); + + val = virNWFilterVarValueCreateSimpleCopyValue(euiMacAddr); + if (!val) + return -1; + + if (virHashAddEntry(table->hashTable, + NWFILTER_STD_VAR_V6LOCAL, + val) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + "%s", _("Could not add variable 'V6LOCAL' " + "to hashmap")); + return -1; + } + } } if (ipaddr) { -- 1.7.1

2 1

[libvirt] [PATCH] Define CPUINFO_FILE_LEN and fix maxlen of cpuinfo file for powerpc
by Olivia Yin 04 Apr '14

04 Apr '14

This patch define CPUINFO_FILE_LEN as 2KB which is enough for most architectures. For the 24 cores PowerPC machines, the file of /proc/cpuinfo will be larger than 2KB. It will fail to start libvirtd with the error message as below: virFileReadAll: Failed to read file '/proc/cpuinfo': Value too large for defined data type virSysinfoRead: internal error Failed to open /proc/cpuinfo So this patch increases the maxlen of cpuinfo for PowerPC architecture. Signed-off-by: Olivia Yin <Hong-Hua.Yin(a)freescale.com> --- src/util/virsysinfo.c | 6 +++--- src/util/virsysinfo.h | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/util/virsysinfo.c b/src/util/virsysinfo.c index 7b16157..33c4bc6 100644 --- a/src/util/virsysinfo.c +++ b/src/util/virsysinfo.c @@ -223,7 +223,7 @@ virSysinfoRead(void) if (VIR_ALLOC(ret) < 0) goto no_memory; - if (virFileReadAll(CPUINFO, 2048, &outbuf) < 0) { + if (virFileReadAll(CPUINFO, 2 * CPUINFO_FILE_LEN, &outbuf) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Failed to open %s"), CPUINFO); return NULL; @@ -341,7 +341,7 @@ virSysinfoRead(void) if (VIR_ALLOC(ret) < 0) goto no_memory; - if (virFileReadAll(CPUINFO, 2048, &outbuf) < 0) { + if (virFileReadAll(CPUINFO, CPUINFO_FILE_LEN, &outbuf) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Failed to open %s"), CPUINFO); return NULL; @@ -470,7 +470,7 @@ virSysinfoRead(void) goto no_memory; /* Gather info from /proc/cpuinfo */ - if (virFileReadAll(CPUINFO, 8192, &outbuf) < 0) { + if (virFileReadAll(CPUINFO, 4 * CPUINFO_FILE_LEN, &outbuf) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Failed to open %s"), CPUINFO); return NULL; diff --git a/src/util/virsysinfo.h b/src/util/virsysinfo.h index fbb505b..630b9ce 100644 --- a/src/util/virsysinfo.h +++ b/src/util/virsysinfo.h @@ -102,4 +102,6 @@ bool virSysinfoIsEqual(virSysinfoDefPtr src, VIR_ENUM_DECL(virSysinfo) +#define CPUINFO_FILE_LEN 2048 /*2KB limit for normal cpuinfo file*/ + #endif /* __VIR_SYSINFOS_H__ */ -- 1.8.5

4 5

[libvirt] [PATCH] virsh: Fix help info of net-event and event command
by liyang 04 Apr '14

04 Apr '14

From: Li Yang <liyang.fnst(a)cn.fujitsu.com> For now the help informatin of net-event and event like this: [root@localhost qemu]# virsh help net-event NAME net-event - (null) ... [root@localhost qemu]# virsh help event NAME event - (null) ... Now fixed them, make them show correct information instead of 'null'. Signed-off-by: Li Yang <liyang.fnst(a)cn.fujitsu.com> --- tools/virsh-domain.c | 2 +- tools/virsh-network.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index f2856a5..310b5dc 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -11030,7 +11030,7 @@ static vshEventCallback vshEventCallbacks[] = { verify(VIR_DOMAIN_EVENT_ID_LAST == ARRAY_CARDINALITY(vshEventCallbacks)); static const vshCmdInfo info_event[] = { - {.name = "event", + {.name = "help", .data = N_("Domain Events") }, {.name = "desc", diff --git a/tools/virsh-network.c b/tools/virsh-network.c index 22d21e7..338db28 100644 --- a/tools/virsh-network.c +++ b/tools/virsh-network.c @@ -1180,7 +1180,7 @@ vshEventLifecyclePrint(virConnectPtr conn ATTRIBUTE_UNUSED, } static const vshCmdInfo info_network_event[] = { - {.name = "net-event", + {.name = "help", .data = N_("Network Events") }, {.name = "desc", -- 1.7.1

2 1

[libvirt] [PATCH] Fix Memory Leak in daemon/libvirtd.c
by Nehal J Wani 04 Apr '14

04 Apr '14

Fixes leak introduced by e562e82f ==4937== 64 bytes in 1 blocks are definitely lost in loss record 270 of 405 ==4937== at 0x4A06BE0: realloc (vg_replace_malloc.c:662) ==4937== by 0x6FA41C4: __vasprintf_chk (vasprintf_chk.c:90) ==4937== by 0x50C8D29: virVasprintfInternal (stdio2.h:199) ==4937== by 0x50C8E3A: virAsprintfInternal (virstring.c:362) ==4937== by 0x11D01A: main (libvirtd.c:1170) --- daemon/libvirtd.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c index e247259..bb84c90 100644 --- a/daemon/libvirtd.c +++ b/daemon/libvirtd.c @@ -1132,6 +1132,7 @@ int main(int argc, char **argv) { bool privileged = geteuid() == 0 ? true : false; bool implicit_conf = false; char *run_dir = NULL; + char *cpumap = NULL; mode_t old_umask; struct option opts[] = { @@ -1159,7 +1160,6 @@ int main(int argc, char **argv) { if (strstr(argv[0], "lt-libvirtd") || strstr(argv[0], "/daemon/.libs/libvirtd")) { char *tmp = strrchr(argv[0], '/'); - char *cpumap; if (!tmp) { fprintf(stderr, _("%s: cannot identify driver directory\n"), argv[0]); exit(EXIT_FAILURE); @@ -1182,6 +1182,7 @@ int main(int argc, char **argv) { virDriverModuleInitialize(driverdir); #endif cpuMapOverride(cpumap); + VIR_FREE(cpumap); *tmp = '/'; /* Must not free 'driverdir' - it is still used */ } -- 1.7.1

2 1

[libvirt] [PATCH v2] Define CPUINFO_FILE_LEN and fix maxlen of cpuinfo file for all uses
by Olivia Yin 04 Apr '14

04 Apr '14

For example, the file /proc/cpuinfo for 24 cores PowerPC platform is larger than the previous maximum size 2KB. It will fail to start libvirtd with the error message as below: virFileReadAll: Failed to read file '/proc/cpuinfo': Value too large for defined data type virSysinfoRead: internal error Failed to open /proc/cpuinfo This patch defines CPUINFO_FILE_LEN as 10KB which is enough for most architectures. Signed-off-by: Olivia Yin <Hong-Hua.Yin(a)freescale.com> --- src/util/virsysinfo.c | 6 +++--- src/util/virsysinfo.h | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/util/virsysinfo.c b/src/util/virsysinfo.c index 7b16157..873872c 100644 --- a/src/util/virsysinfo.c +++ b/src/util/virsysinfo.c @@ -223,7 +223,7 @@ virSysinfoRead(void) if (VIR_ALLOC(ret) < 0) goto no_memory; - if (virFileReadAll(CPUINFO, 2048, &outbuf) < 0) { + if (virFileReadAll(CPUINFO, CPUINFO_FILE_LEN, &outbuf) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Failed to open %s"), CPUINFO); return NULL; @@ -341,7 +341,7 @@ virSysinfoRead(void) if (VIR_ALLOC(ret) < 0) goto no_memory; - if (virFileReadAll(CPUINFO, 2048, &outbuf) < 0) { + if (virFileReadAll(CPUINFO, CPUINFO_FILE_LEN, &outbuf) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Failed to open %s"), CPUINFO); return NULL; @@ -470,7 +470,7 @@ virSysinfoRead(void) goto no_memory; /* Gather info from /proc/cpuinfo */ - if (virFileReadAll(CPUINFO, 8192, &outbuf) < 0) { + if (virFileReadAll(CPUINFO, CPUINFO_FILE_LEN, &outbuf) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Failed to open %s"), CPUINFO); return NULL; diff --git a/src/util/virsysinfo.h b/src/util/virsysinfo.h index fbb505b..b5336e2 100644 --- a/src/util/virsysinfo.h +++ b/src/util/virsysinfo.h @@ -102,4 +102,6 @@ bool virSysinfoIsEqual(virSysinfoDefPtr src, VIR_ENUM_DECL(virSysinfo) +#define CPUINFO_FILE_LEN (10*1024) /*10KB limit for /proc/cpuinfo file*/ + #endif /* __VIR_SYSINFOS_H__ */ -- 1.8.5

2 1

[libvirt] libxl: Issues with virt-manager when used to manager Xen domains
by Stefan Bader 03 Apr '14

03 Apr '14

This started off with some regression testing after going forward to Xen-4.4. We currently would pair that with a libvirt version 1.2.2 and right now operations through virsh seem to be working (mostly) well. But when using virt-manager (not the most up-to-date versions but some combinations that quite likely will occur (0.9.1 and 0.9.5)) there are some issues. Two symptoms seem to be caused by the same underlying problem which is caused by the way virt-manager interacts with libvirt. That seems to be that virt-manager acquires a reference to virDomainPtr only once and then uses that for subsequent call. This is a problem because both virDomainPtr object and virDomainObjPtr objects contains a domid but only the latter gets updated. So both, creating a new guest (which must be a define step and then use the handle to start the guest) as well as rebooting a guest cause problems for virt-manager. Mainly because of libxlDomainGetInfo() which retrieves the virDomainObjPtr for a given virDommainPtr. Then checks the domain object to be active or not but uses the domid from the domain to call into libxl: if (!(vm = libxlDomObjFromDomain(dom))) goto cleanup; ... if (!virDomainObjIsActive(vm)) { info->cpuTime = 0; info->memory = vm->def->mem.cur_balloon; info->maxMem = vm->def->mem.max_balloon; } else { if (libxl_domain_info(priv->ctx, &d_info, dom->id) != 0) { This fails either with dom->id being -1 (still) or using the old id from before the reboot. A dirty hack seems to avoid this: static virDomainObjPtr libxlDomObjFromDomain(virDomainPtr dom) { virDomainObjPtr vm; libxlDriverPrivatePtr driver = dom->conn->privateData; char uuidstr[VIR_UUID_STRING_BUFLEN]; vm = virDomainObjListFindByUUID(driver->domains, dom->uuid); if (!vm) { virUUIDFormat(dom->uuid, uuidstr); virReportError(VIR_ERR_NO_DOMAIN, _("no domain with matching uuid '%s' (%s)"), uuidstr, dom->name); return NULL; - } + } else { + if (dom->id != vm->def->id) { + VIR_WARN("libxlDomObjFromDomain: domid changed (%d->%d)", + dom->id, vm->def->id); + dom->id = vm->def->id; + } + } return vm; } Not really sure this is the right way to go. Also because that warning above happens a lot more (repeatedly) than I would have expected. This may or may not be related to the next question. Not a problem but more a confusion on my side: virGetDomain() has commentary that says it will return either a pointer to an existing object or one to a new one. Its just, I cannot see that done in the code. Is that a future plan or was that way but was removed? I must admit I have not looked deeper into that but one explanation of the repeated domid mismatch would be if the virDomainPtr that virt-manager uses to communicate with libvirt would be cloned before doing things inside libvirt. And holding that handle for so long and not obtaining a fresh one through the various lookup interfaces each time could be a mistake of virt-manager. Unfortunately one that needs to be handled in some way. -Stefan

3 6

[libvirt] [PATCH] phyp: fix logic error on volume creation
by Eric Blake 03 Apr '14

03 Apr '14

The phyp code claims that it wants a non-zero value, but actually enforces a capacity of zero. It has been this way since commit ebc46fe in June 2010. Bummer that it has my name as the committer - I guess I should have been much more stubborn about not blindly taking someone else's 1600-line patch. * src/phyp/phyp_driver.c (phypStorageVolCreateXML): Use correct logic. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- The fact that this bug has gone unnoticed for years makes me wonder if we are better off just removing the phyp driver from our code base, since it is obvious it is not getting much testing. I'm also waiting for a review on this, because although I _think_ the code wanted a non-zero capacity, I don't know enough about phyp and the "viosvrcmd -c 'mklv -lv'" command line; maybe the comments are wrong and it always wanted 0 capacity instead (which is the only thing that would get past the pre-patch code check). src/phyp/phyp_driver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/phyp/phyp_driver.c b/src/phyp/phyp_driver.c index fc3e7db..3a5eefd 100644 --- a/src/phyp/phyp_driver.c +++ b/src/phyp/phyp_driver.c @@ -2003,15 +2003,15 @@ phypStorageVolCreateXML(virStoragePoolPtr pool, * in the moment you create the volume. * */ if (voldef->key) { VIR_ERROR(_("Key must be empty, Power Hypervisor will create one for you.")); goto err; } - if (voldef->capacity) { + if (!voldef->capacity) { VIR_ERROR(_("Capacity cannot be empty.")); goto err; } key = phypBuildVolume(pool->conn, voldef->name, spdef->name, voldef->capacity); -- 1.9.0

3 3

[libvirt] [PATCH] Add redirdevs to ABI stability check
by Ján Tomko 03 Apr '14

03 Apr '14

Check the bus, type of the source device (tcp vs. spicevmc) and the device address visible in the guest. https://bugzilla.redhat.com/show_bug.cgi?id=1035128 --- src/conf/domain_conf.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 0af5be7..9f1c020 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -13693,6 +13693,42 @@ virDomainHubDefCheckABIStability(virDomainHubDefPtr src, return true; } + +static bool +virDomainRedirdevDefCheckABIStability(virDomainRedirdevDefPtr src, + virDomainRedirdevDefPtr dst) +{ + if (src->bus != dst->bus) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("Target redirected device bus %s does not match " + "source %s"), + virDomainRedirdevBusTypeToString(dst->bus), + virDomainRedirdevBusTypeToString(src->bus)); + return false; + } + + switch ((enum virDomainRedirdevBus) src->bus) { + case VIR_DOMAIN_REDIRDEV_BUS_USB: + if (src->source.chr.type != dst->source.chr.type) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("Target redirected device source type %s does " + "not match source device source type %s"), + virDomainChrTypeToString(dst->source.chr.type), + virDomainChrTypeToString(src->source.chr.type)); + return false; + } + break; + case VIR_DOMAIN_REDIRDEV_BUS_LAST: + break; + } + + if (!virDomainDeviceInfoCheckABIStability(&src->info, &dst->info)) + return false; + + return true; +} + + static bool virDomainRedirFilterDefCheckABIStability(virDomainRedirFilterDefPtr src, virDomainRedirFilterDefPtr dst) @@ -14133,6 +14169,20 @@ virDomainDefCheckABIStability(virDomainDefPtr src, if (!virDomainHubDefCheckABIStability(src->hubs[i], dst->hubs[i])) goto error; + if (src->nredirdevs != dst->nredirdevs) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("Target domain redirected devices count %zu " + "does not match source %zu"), + dst->nconsoles, src->nconsoles); + goto error; + } + + for (i = 0; i < src->nredirdevs; i++) { + if (!virDomainRedirdevDefCheckABIStability(src->redirdevs[i], + dst->redirdevs[i])) + goto error; + } + if ((!src->redirfilter && dst->redirfilter) || (src->redirfilter && !dst->redirfilter)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, -- 1.8.3.2

2 1

[libvirt] [PATCH] Use the force flag for mkfs -t xfs
by Ján Tomko 03 Apr '14

03 Apr '14

Without this, building an XFS pool on a formatted partition fails with --overwrite. https://bugzilla.redhat.com/show_bug.cgi?id=927172 --- src/storage/storage_backend_fs.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/storage/storage_backend_fs.c b/src/storage/storage_backend_fs.c index e0244ba..1d85871 100644 --- a/src/storage/storage_backend_fs.c +++ b/src/storage/storage_backend_fs.c @@ -665,11 +665,13 @@ virStorageBackendExecuteMKFS(const char *device, int ret = 0; virCommandPtr cmd = NULL; - cmd = virCommandNewArgList(MKFS, - "-t", - format, - device, - NULL); + cmd = virCommandNewArgList(MKFS, "-t", format, NULL); + + /* use the force, otherwise mkfs.xfs won't overwrite existing fs */ + if (STREQ(format, "xfs")) + virCommandAddArg(cmd, "-f"); + + virCommandAddArg(cmd, device); if (virCommandRun(cmd, NULL) < 0) { virReportSystemError(errno, -- 1.8.3.2

2 1

[libvirt] [PATCH] virsh: Make 'exit' action same as 'quit'
by liyang 03 Apr '14

03 Apr '14

From: Li Yang <liyang.fnst(a)cn.fujitsu.com> For now 'virsh quit' action like this: -------------------------------- [root@localhost /]# virsh quit [root@localhost /]# -------------------------------- And 'virsh exit' action: -------------------------------- [root@localhost /]# virsh exit [root@localhost /]# -------------------------------- There is a small difference('/n') between them. According to manual said: quit, exit quit this interactive terminal And in the code they all called cmdQuit func, They should get same actions. Signed-off-by: Li Yang <liyang.fnst(a)cn.fujitsu.com> --- tools/virsh.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 02835d9..da7fedd 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -1852,7 +1852,8 @@ vshCommandRun(vshControl *ctl, const vshCmd *cmd) if (!ret && disconnected != 0) vshReconnect(ctl); - if (STREQ(cmd->def->name, "quit")) /* hack ... */ + if (STREQ(cmd->def->name, "quit") || + STREQ(cmd->def->name, "exit")) /* hack ... */ return ret; if (enable_timing) { -- 1.7.1

2 1

[libvirt] [PATCH] qemu: make sure agent returns error when required data are missing
by Martin Kletzander 03 Apr '14

03 Apr '14

Commit 5b3492fa aimed to fix this and caught one error but exposed another one. When agent command is being executed and the thread waiting for the reply is woken up by an event (e.g. EOF in case of shutdown), the command finishes with no data (rxObject == NULL), but no error is reported, since this might be desired by the caller (e.g. suspend through agent). However, in other situations, when the data are required (e.g. getting vCPUs), we proceed to getting desired data out of the reply, but none of the virJSON*() functions works well with NULLs. I chose the way of a new parameter for qemuAgentCommand() function that specifies whether reply is required and behaves according to that. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1058149 Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- Notes: This issue probably exists since qemu-ga is supported in libvirt, so this (along with 5b3492fa and e9d09fe1) might be worth back-porting to some maintenance branches, I just haven't gone through them to see which ones are applicable. src/qemu/qemu_agent.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/src/qemu/qemu_agent.c b/src/qemu/qemu_agent.c index 92573bd..4082331 100644 --- a/src/qemu/qemu_agent.c +++ b/src/qemu/qemu_agent.c @@ -1080,6 +1080,7 @@ static int qemuAgentCommand(qemuAgentPtr mon, virJSONValuePtr cmd, virJSONValuePtr *reply, + bool needReply, int seconds) { int ret = -1; @@ -1111,7 +1112,7 @@ qemuAgentCommand(qemuAgentPtr mon, /* If we haven't obtained any reply but we wait for an * event, then don't report this as error */ if (!msg.rxObject) { - if (await_event) { + if (await_event && !needReply) { VIR_DEBUG("Woken up by event %d", await_event); } else { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", @@ -1275,7 +1276,7 @@ int qemuAgentShutdown(qemuAgentPtr mon, mon->await_event = QEMU_AGENT_EVENT_RESET; else mon->await_event = QEMU_AGENT_EVENT_SHUTDOWN; - ret = qemuAgentCommand(mon, cmd, &reply, + ret = qemuAgentCommand(mon, cmd, &reply, false, VIR_DOMAIN_QEMU_AGENT_COMMAND_BLOCK); virJSONValueFree(cmd); @@ -1305,7 +1306,7 @@ int qemuAgentFSFreeze(qemuAgentPtr mon) if (!cmd) return -1; - if (qemuAgentCommand(mon, cmd, &reply, + if (qemuAgentCommand(mon, cmd, &reply, true, VIR_DOMAIN_QEMU_AGENT_COMMAND_BLOCK) < 0) goto cleanup; @@ -1342,7 +1343,7 @@ int qemuAgentFSThaw(qemuAgentPtr mon) if (!cmd) return -1; - if (qemuAgentCommand(mon, cmd, &reply, + if (qemuAgentCommand(mon, cmd, &reply, true, VIR_DOMAIN_QEMU_AGENT_COMMAND_BLOCK) < 0) goto cleanup; @@ -1379,7 +1380,7 @@ qemuAgentSuspend(qemuAgentPtr mon, return -1; mon->await_event = QEMU_AGENT_EVENT_SUSPEND; - ret = qemuAgentCommand(mon, cmd, &reply, + ret = qemuAgentCommand(mon, cmd, &reply, false, VIR_DOMAIN_QEMU_AGENT_COMMAND_BLOCK); virJSONValueFree(cmd); @@ -1409,7 +1410,7 @@ qemuAgentArbitraryCommand(qemuAgentPtr mon, if (!(cmd = virJSONValueFromString(cmd_str))) goto cleanup; - if ((ret = qemuAgentCommand(mon, cmd, &reply, timeout)) < 0) + if ((ret = qemuAgentCommand(mon, cmd, &reply, true, timeout)) < 0) goto cleanup; if (!(*result = virJSONValueToString(reply, false))) @@ -1436,7 +1437,7 @@ qemuAgentFSTrim(qemuAgentPtr mon, if (!cmd) return ret; - ret = qemuAgentCommand(mon, cmd, &reply, + ret = qemuAgentCommand(mon, cmd, &reply, false, VIR_DOMAIN_QEMU_AGENT_COMMAND_BLOCK); virJSONValueFree(cmd); @@ -1458,7 +1459,7 @@ qemuAgentGetVCPUs(qemuAgentPtr mon, if (!(cmd = qemuAgentMakeCommand("guest-get-vcpus", NULL))) return -1; - if (qemuAgentCommand(mon, cmd, &reply, + if (qemuAgentCommand(mon, cmd, &reply, true, VIR_DOMAIN_QEMU_AGENT_COMMAND_BLOCK) < 0) goto cleanup; @@ -1566,7 +1567,7 @@ qemuAgentSetVCPUs(qemuAgentPtr mon, cpus = NULL; - if (qemuAgentCommand(mon, cmd, &reply, + if (qemuAgentCommand(mon, cmd, &reply, true, VIR_DOMAIN_QEMU_AGENT_COMMAND_BLOCK) < 0) goto cleanup; -- 1.9.1

3 3

[libvirt] [PATCHv3 0/3] Time setting and getting in qemu guests
by Michal Privoznik 03 Apr '14

03 Apr '14

Hopefully the last round. Michal Privoznik (3): Introduce virDomain{Get,Set}Time APIs virsh: Expose virDomain{Get,Set}Time qemu: Implement virDomain{Get,Set}Time daemon/remote.c | 37 ++++++++++++ include/libvirt/libvirt.h.in | 14 +++++ src/access/viraccessperm.c | 2 +- src/access/viraccessperm.h | 7 ++- src/driver.h | 14 +++++ src/libvirt.c | 94 ++++++++++++++++++++++++++++++ src/libvirt_public.syms | 5 ++ src/qemu/qemu_agent.c | 99 ++++++++++++++++++++++++++++++++ src/qemu/qemu_agent.h | 8 +++ src/qemu/qemu_driver.c | 109 +++++++++++++++++++++++++++++++++++ src/remote/remote_driver.c | 35 ++++++++++++ src/remote/remote_protocol.x | 31 +++++++++- src/remote_protocol-structs | 16 ++++++ tools/virsh-domain-monitor.c | 132 +++++++++++++++++++++++++++++++++++++++++++ tools/virsh.pod | 16 ++++++ 15 files changed, 616 insertions(+), 3 deletions(-) -- 1.9.0

1 3

[libvirt] [PATCH 0/2] Clean up errors when net device could not be found on detach
by Ján Tomko 03 Apr '14

03 Apr '14

Partially fixes https://bugzilla.redhat.com/show_bug.cgi?id=872028 Does nothing to adress the fact that interface type and other attributes are ignored on device detach Ján Tomko (2): Move error reporting into virDomainNetFindIdx Include PCI address in the error in virDomainNetFindIdx src/conf/domain_conf.c | 26 ++++++++++++++++++++++---- src/lxc/lxc_driver.c | 39 +++++---------------------------------- src/qemu/qemu_driver.c | 28 +++------------------------- src/qemu/qemu_hotplug.c | 15 ++------------- 4 files changed, 32 insertions(+), 76 deletions(-) -- 1.8.3.2

2 5

[libvirt] Release of python bindings for libvirt 1.2.3
by Daniel Veillard 03 Apr '14

03 Apr '14

With a bit of delay due to a dependancy needing fixing, the python bindings update for 1.2.3 are available, tagged in the libvirt-python git module and for download at the usual place: ftp://libvirt.org/libvirt/python/ It carries a mix of improvements, bugs and portability fixes: Portability: - Fix nosetests usage with python3 (Daniel P. Berrange) - setup.py: Allow running --help or clean without pkg-config (Cole Robinson) Bug Fixes: - Fix potential crash when setting partial cpu/memory/numa/interface limits on domains (Brian Rak) - event: fix domain reference bugs (Eric Blake) - override: Return NULL on python failure in getCPUModelNames (Cole Robinson) - override: GetCPUModelNames should return None on failure (Cole Robinson) - setPyVirTypedParameter: free whole return variable on error (Michal Privoznik) Improvements: - setup.py: Make have_libvirt_lxc a function (Cole Robinson) - setup.py: Move module list building to its own function (Cole Robinson) - setup.py: Remove unused import (Cole Robinson) - qemu: support arbitrary monitor events (Eric Blake) - generator: Add virConnectDomainQemuMonitorEventCallback to skipped_types (Martin Kletzander) - maint: balance {} usage (Eric Blake) - maint: Add ctags configuration file and ignore the output (Peter Krempa) - maint: set up preferred emacs settings (Eric Blake) - maint: ignore .pyc files (Eric Blake) - Add test for setting scheduler parameters (Daniel P. Berrange) - Add support for running unit tests with nose (Daniel P. Berrange) - setPyVirTypedParameter: Copy full field name (Michal Privoznik) Thaks everybody for your contributions to this release ! Daniel -- Daniel Veillard | Open Source and Standards, Red Hat veillard(a)redhat.com | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | virtualization library http://libvirt.org/

1 0

[libvirt] [PATCH] tests: simplify storage test cleanup
by Eric Blake 02 Apr '14

02 Apr '14

No need to spawn a child 'rm' process when we can do it ourselves. * tests/virstoragetest.c (testCleanupImages): Use dedicated helper. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Pushing under the trivial rule. tests/virstoragetest.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/tests/virstoragetest.c b/tests/virstoragetest.c index 3089d70..9ec39c7 100644 --- a/tests/virstoragetest.c +++ b/tests/virstoragetest.c @@ -62,8 +62,6 @@ static char *abslink2; static void testCleanupImages(void) { - virCommandPtr cmd; - VIR_FREE(qemuimg); VIR_FREE(absraw); VIR_FREE(canonraw); @@ -79,9 +77,7 @@ testCleanupImages(void) return; } - cmd = virCommandNewArgList("rm", "-rf", datadir, NULL); - ignore_value(virCommandRun(cmd, NULL)); - virCommandFree(cmd); + virFileDeleteTree(datadir); } static int -- 1.9.0

1 0

[libvirt] [PATCH v4 0/5] Expose FSFreeze/FSThaw within the guest as API
by Tomoki Sekiyama 02 Apr '14

02 Apr '14

Hello, This is patchset v4 to add FSFreeze/FSThaw API for custom disk snapshotting. Changes to v3: * fix typp and label spacing * rebased to recent tree (v3: http://www.redhat.com/archives/libvir-list/2014-March/msg01358.html ) === Description === Currently FSFreeze and FSThaw are supported by qemu guest agent and they are used internally in snapshot-create command with --quiesce option. However, when users want to utilize the native snapshot feature of storage devices (such as LVM over iSCSI, enterprise storage appliances, etc.), they need to issue fsfreeze command separately from libvirt-driven snapshots. (OpenStack cinder provides these storages' snapshot feature, but it cannot quiesce the guest filesystems automatically for now.) Although virDomainQemuGuestAgent() API could be used for this purpose, it is only for debugging and is not supported officially. This patchset adds virDomainFSFreeze()/virDomainFSThaw() APIs and virsh domfsfreeze/domfsthaw commands to enable the users to freeze and thaw domain's filesystems cleanly. The APIs have flags option currently unsupported for future extension. --- Tomoki Sekiyama (5): Introduce virDomainFSFreeze() and virDomainFSThaw() public API remote: Implement virDomainFSFreeze and virDomainFSThaw qemu: Track domain quiesced status qemu: Implement virDomainFSFreeze and virDomainFSThaw virsh: Expose new virDomainFSFreeze and virDomainFSThaw API include/libvirt/libvirt.h.in | 6 ++ src/access/viraccessperm.c | 2 - src/access/viraccessperm.h | 6 ++ src/driver.h | 10 +++ src/libvirt.c | 70 ++++++++++++++++++++ src/libvirt_public.syms | 2 + src/qemu/qemu_domain.c | 5 + src/qemu/qemu_domain.h | 2 + src/qemu/qemu_driver.c | 144 ++++++++++++++++++++++++++++++++++++++---- src/remote/remote_driver.c | 2 + src/remote/remote_protocol.x | 25 +++++++ src/remote_protocol-structs | 9 +++ src/rpc/gendispatch.pl | 2 + tools/virsh-domain.c | 92 +++++++++++++++++++++++++++ tools/virsh.pod | 15 ++++ 15 files changed, 376 insertions(+), 16 deletions(-)

3 13

[libvirt] [PATCH v3] storage: Report error from VolOpen by default
by Cole Robinson 02 Apr '14

02 Apr '14

Currently VolOpen notifies the user of a potentially non-fatal failure by returning -2 and logging a VIR_WARN or VIR_INFO. Unfortunately most callers treat -2 as fatal but don't actually report any message with the error APIs. Rename the VOL_OPEN_ERROR flag to VOL_OPEN_NOERROR. If NOERROR is specified, we preserve the current behavior of returning -2 (there's only one caller that wants this). However in the default case, only return -1, and actually use the error APIs. Fix up a couple callers as a result. --- src/storage/storage_backend.c | 77 ++++++++++++++++++++++++-------------- src/storage/storage_backend.h | 7 ++-- src/storage/storage_backend_fs.c | 28 +++++--------- src/storage/storage_backend_scsi.c | 3 -- 4 files changed, 62 insertions(+), 53 deletions(-) diff --git a/src/storage/storage_backend.c b/src/storage/storage_backend.c index 8fe3687..f44e323 100644 --- a/src/storage/storage_backend.c +++ b/src/storage/storage_backend.c @@ -1279,8 +1279,9 @@ virStorageBackendDetectBlockVolFormatFD(virStorageSourcePtr target, /* * Allows caller to silently ignore files with improper mode * - * Returns -1 on error, -2 if file mode is unexpected or the - * volume is a dangling symbolic link. + * Returns -1 on error. If VIR_STORAGE_VOL_OPEN_NOERROR is passed, we + * return -2 if file mode is unexpected or the volume is a dangling + * symbolic link. */ int virStorageBackendVolOpen(const char *path, struct stat *sb, @@ -1288,9 +1289,10 @@ virStorageBackendVolOpen(const char *path, struct stat *sb, { int fd, mode = 0; char *base = last_component(path); + bool noerror = (flags * VIR_STORAGE_VOL_OPEN_NOERROR); if (lstat(path, sb) < 0) { - if (errno == ENOENT && !(flags & VIR_STORAGE_VOL_OPEN_ERROR)) { + if (errno == ENOENT && noerror) { VIR_WARN("ignoring missing file '%s'", path); return -2; } @@ -1301,11 +1303,21 @@ virStorageBackendVolOpen(const char *path, struct stat *sb, } if (S_ISFIFO(sb->st_mode)) { - VIR_WARN("ignoring FIFO '%s'", path); - return -2; + if (noerror) { + VIR_WARN("ignoring FIFO '%s'", path); + return -2; + } + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Volume path '%s' is a FIFO"), path); + return -1; } else if (S_ISSOCK(sb->st_mode)) { - VIR_WARN("ignoring socket '%s'", path); - return -2; + if (noerror) { + VIR_WARN("ignoring socket '%s'", path); + return -2; + } + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Volume path '%s' is a socket"), path); + return -1; } /* O_NONBLOCK should only matter during open() for fifos and @@ -1316,25 +1328,21 @@ virStorageBackendVolOpen(const char *path, struct stat *sb, * race. */ if ((fd = open(path, O_RDONLY|O_NONBLOCK|O_NOCTTY)) < 0) { if ((errno == ENOENT || errno == ELOOP) && - S_ISLNK(sb->st_mode)) { + S_ISLNK(sb->st_mode) && noerror) { VIR_WARN("ignoring dangling symlink '%s'", path); return -2; } - if (errno == ENOENT && !(flags & VIR_STORAGE_VOL_OPEN_ERROR)) { + if (errno == ENOENT && noerror) { VIR_WARN("ignoring missing file '%s'", path); return -2; } - virReportSystemError(errno, - _("cannot open volume '%s'"), - path); + virReportSystemError(errno, _("cannot open volume '%s'"), path); return -1; } if (fstat(fd, sb) < 0) { - virReportSystemError(errno, - _("cannot stat file '%s'"), - path); + virReportSystemError(errno, _("cannot stat file '%s'"), path); VIR_FORCE_CLOSE(fd); return -1; } @@ -1351,33 +1359,46 @@ virStorageBackendVolOpen(const char *path, struct stat *sb, if (STREQ(base, ".") || STREQ(base, "..")) { VIR_FORCE_CLOSE(fd); - VIR_INFO("Skipping special dir '%s'", base); - return -2; + if (noerror) { + VIR_INFO("Skipping special dir '%s'", base); + return -2; + } + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Cannot use volume path '%s'"), path); + return -1; } } else { - VIR_WARN("ignoring unexpected type for file '%s'", path); VIR_FORCE_CLOSE(fd); - return -2; + if (noerror) { + VIR_WARN("ignoring unexpected type for file '%s'", path); + return -2; + } + virReportError(VIR_ERR_INTERNAL_ERROR, + _("unexpected type for file '%s'"), path); + return -1; } if (virSetBlocking(fd, true) < 0) { + VIR_FORCE_CLOSE(fd); + if (noerror) { + VIR_WARN("unable to set blocking mode for '%s'", path); + return -2; + } virReportSystemError(errno, _("unable to set blocking mode for '%s'"), path); - VIR_FORCE_CLOSE(fd); - return -2; + return -1; } if (!(mode & flags)) { VIR_FORCE_CLOSE(fd); - VIR_INFO("Skipping volume '%s'", path); - - if (mode & VIR_STORAGE_VOL_OPEN_ERROR) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("unexpected storage mode for '%s'"), path); - return -1; + if (noerror) { + VIR_INFO("Skipping volume '%s'", path); + return -2; } - return -2; + virReportError(VIR_ERR_INTERNAL_ERROR, + _("unexpected storage mode for '%s'"), path); + return -1; } return fd; diff --git a/src/storage/storage_backend.h b/src/storage/storage_backend.h index 89511f8..c695ef7 100644 --- a/src/storage/storage_backend.h +++ b/src/storage/storage_backend.h @@ -120,16 +120,15 @@ virStorageBackendPtr virStorageBackendForType(int type); /* VolOpenCheckMode flags */ enum { - VIR_STORAGE_VOL_OPEN_ERROR = 1 << 0, /* warn if unexpected type - * encountered */ + VIR_STORAGE_VOL_OPEN_NOERROR = 1 << 0, /* don't error if unexpected type + * encountered, just warn */ VIR_STORAGE_VOL_OPEN_REG = 1 << 1, /* regular files okay */ VIR_STORAGE_VOL_OPEN_BLOCK = 1 << 2, /* block files okay */ VIR_STORAGE_VOL_OPEN_CHAR = 1 << 3, /* char files okay */ VIR_STORAGE_VOL_OPEN_DIR = 1 << 4, /* directories okay */ }; -# define VIR_STORAGE_VOL_OPEN_DEFAULT (VIR_STORAGE_VOL_OPEN_ERROR |\ - VIR_STORAGE_VOL_OPEN_REG |\ +# define VIR_STORAGE_VOL_OPEN_DEFAULT (VIR_STORAGE_VOL_OPEN_REG |\ VIR_STORAGE_VOL_OPEN_BLOCK) int virStorageBackendVolOpen(const char *path, struct stat *sb, diff --git a/src/storage/storage_backend_fs.c b/src/storage/storage_backend_fs.c index de6521c..9b958f0 100644 --- a/src/storage/storage_backend_fs.c +++ b/src/storage/storage_backend_fs.c @@ -56,10 +56,10 @@ VIR_LOG_INIT("storage.storage_backend_fs"); -#define VIR_STORAGE_VOL_FS_OPEN_FLAGS (VIR_STORAGE_VOL_OPEN_DEFAULT |\ - VIR_STORAGE_VOL_OPEN_DIR) -#define VIR_STORAGE_VOL_FS_REFRESH_FLAGS (VIR_STORAGE_VOL_FS_OPEN_FLAGS &\ - ~VIR_STORAGE_VOL_OPEN_ERROR) +#define VIR_STORAGE_VOL_FS_OPEN_FLAGS (VIR_STORAGE_VOL_OPEN_DEFAULT &\ + VIR_STORAGE_VOL_OPEN_DIR) +#define VIR_STORAGE_VOL_FS_PROBE_FLAGS (VIR_STORAGE_VOL_FS_OPEN_FLAGS &\ + VIR_STORAGE_VOL_OPEN_NOERROR) static int ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3) virStorageBackendProbeTarget(virStorageSourcePtr target, @@ -80,7 +80,7 @@ virStorageBackendProbeTarget(virStorageSourcePtr target, *encryption = NULL; if ((ret = virStorageBackendVolOpen(target->path, &sb, - VIR_STORAGE_VOL_FS_REFRESH_FLAGS)) < 0) + VIR_STORAGE_VOL_FS_PROBE_FLAGS)) < 0) goto error; /* Take care to propagate ret, it is not always -1 */ fd = ret; @@ -902,19 +902,11 @@ virStorageBackendFileSystemRefresh(virConnectPtr conn ATTRIBUTE_UNUSED, vol->backingStore.path = backingStore; vol->backingStore.format = backingStoreFormat; - if (virStorageBackendUpdateVolTargetInfo(&vol->backingStore, - false, - VIR_STORAGE_VOL_OPEN_DEFAULT) < 0) { - /* The backing file is currently unavailable, the capacity, - * allocation, owner, group and mode are unknown. Just log the - * error and continue. - * Unfortunately virStorageBackendProbeTarget() might already - * have logged a similar message for the same problem, but only - * if AUTO format detection was used. */ - virReportError(VIR_ERR_INTERNAL_ERROR, - _("cannot probe backing volume info: %s"), - vol->backingStore.path); - } + virStorageBackendUpdateVolTargetInfo(&vol->backingStore, false, + VIR_STORAGE_VOL_OPEN_DEFAULT); + /* If this failed, the backing file is currently unavailable, + * the capacity, allocation, owner, group and mode are unknown. + * An error message was raised, but we just continue. */ } diff --git a/src/storage/storage_backend_scsi.c b/src/storage/storage_backend_scsi.c index cf546fb..c448d7f 100644 --- a/src/storage/storage_backend_scsi.c +++ b/src/storage/storage_backend_scsi.c @@ -201,9 +201,6 @@ virStorageBackendSCSINewLun(virStoragePoolObjPtr pool, if (virStorageBackendUpdateVolInfo(vol, true, VIR_STORAGE_VOL_OPEN_DEFAULT) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Failed to update volume for '%s'"), - devpath); retval = -1; goto free_vol; } -- 1.9.0

2 2

[libvirt] Clock problems on live migration
by Paul Boven 02 Apr '14

02 Apr '14

Hi everyone, When doing a live migration, Linux guests will frequently get stuck and become unresponsive, while the CPU utilization on the host for that guest goes to 100%. If you wait long enough, the guest seems to always recover, with a dmesg entry such as: Clocksource tsc unstable (delta = 35882846234 ns) So the TSC did a jump of nearly 36 seconds. I've actually had a (test-vm) stay stuck for over 11 minutes before becoming responsive again (delta = 662463064082 ns). Migrations often fail when going from server A to B, but will then work fine in the other direction. Both servers and guests are locked to the same NTP servers, and are well within 1ms from one another. Both hosts are running Ubuntu 13.04 with these versions (from Ubuntu packages): Kernel: 3.8.0-35-generic x86_64 Libvirt: 1.0.2 Qemu: 1.4.0 Gluster-fs: 3.4.2 (libvirt access the images via the filesystem, not using libgfapi yet). The interconnect between both machines (both for migration and gluster) is 10GbE. We have different guests (all Ubuntu releases, 13.04 and 13.10), and they all seem to be affected. Clocksource: kvm-clock on all guests. Clock entry from the guest XML: <clock offset='utc'/> Now as far as I've udnerstood the documentation of kvm-clock, it specifically supports live migrations, so I'm a bit surprised by these problems. There isn't all that much information to find on this issue, although I have found postings by others that seem to have run into the same issues, but without a solution. Any help would be much appreciated. Regards, Paul Boven. -- Paul Boven <boven(a)jive.nl> +31 (0)521-596547 Unix/Linux/Networking specialist Joint Institute for VLBI in Europe - www.jive.nl VLBI - It's a fringe science

1 0

[libvirt] [PATCHv2] Fix coverity-reported leak in virSecurityManagerGenLabel
by Ján Tomko 02 Apr '14

02 Apr '14

Coverity complains about a possible leak of seclabel if !sec_managers[i]->drv->domainGenSecurityLabel is true and the seclabel might be overwritten by the next iteration of the loop. This leak should never happen, because every security driver has domainGenSecurityLabel defined. --- v1: 'Remove useless NULL check in virSecurityManagerGenLabel' https://www.redhat.com/archives/libvir-list/2014-April/msg00087.html src/security/security_manager.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/security/security_manager.c b/src/security/security_manager.c index d68c7e9..79edb07 100644 --- a/src/security/security_manager.c +++ b/src/security/security_manager.c @@ -514,6 +514,8 @@ int virSecurityManagerGenLabel(virSecurityManagerPtr mgr, if (!sec_managers[i]->drv->domainGenSecurityLabel) { virReportUnsupportedError(); + virSecurityLabelDefFree(seclabel); + seclabel = NULL; } else { /* The seclabel must be added to @vm prior calling domainGenSecurityLabel * which may require seclabel to be presented already */ -- 1.8.3.2

2 2

[libvirt] [PATCH v3] Introduce --without-pm-utils to get rid of pm-is-supported dependency
by Cédric Bosdonnat 02 Apr '14

02 Apr '14

This uses the dbus api of systemd to check the power management capabilities of the node. --- Diff with v2: * Fixed a few dbus call problems configure.ac | 11 +++++++++ libvirt.spec.in | 9 ++++++++ src/libvirt_private.syms | 3 +++ src/util/virnodesuspend.c | 32 +++++++++++++++++++++++++ src/util/virsystemd.c | 59 +++++++++++++++++++++++++++++++++++++++++++++++ src/util/virsystemd.h | 6 +++++ 6 files changed, 120 insertions(+) diff --git a/configure.ac b/configure.ac index 73efffa..807cf0f 100644 --- a/configure.ac +++ b/configure.ac @@ -563,6 +563,10 @@ AC_ARG_WITH([chrdev-lock-files], [location for UUCP style lock files for character devices (use auto for default paths on some platforms) @<:@default=auto@:>@])]) m4_divert_text([DEFAULTS], [with_chrdev_lock_files=auto]) +AC_ARG_WITH([pm-utils], + [AS_HELP_STRING([--with-pm-utils], + [use pm-utils for power management @<:@default=yes@:>@])]) +m4_divert_text([DEFAULTS], [with_pm_utils=yes]) dnl dnl in case someone want to build static binaries @@ -1621,6 +1625,12 @@ fi AM_CONDITIONAL([WITH_PHYP],[test "$with_phyp" = "yes"]) +dnl Should we build with pm-utils support? +if test "$with_pm_utils" = "yes"; then + AC_DEFINE_UNQUOTED([WITH_PM_UTILS], 1, [whether to use pm-utils]) +fi +AM_CONDITIONAL([WITH_PM_UTILS], [test "$with_pm_utils" = "yes"]) + dnl virsh libraries VIRSH_LIBS="$VIRSH_LIBS $READLINE_LIBS" AC_SUBST([VIRSH_LIBS]) @@ -2845,6 +2855,7 @@ AC_MSG_NOTICE([ rbd: $LIBRBD_LIBS]) else AC_MSG_NOTICE([ rbd: no]) fi +AC_MSG_NOTICE([pm-utils: $with_pm_utils]) AC_MSG_NOTICE([]) AC_MSG_NOTICE([Test suite]) diff --git a/libvirt.spec.in b/libvirt.spec.in index eab9b23..5c20955 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -132,6 +132,7 @@ %define with_libssh2 0%{!?_without_libssh2:0} %define with_wireshark 0%{!?_without_wireshark:0} %define with_systemd_daemon 0%{!?_without_systemd_daemon:0} +%define with_pm_utils 1 # Non-server/HV driver defaults which are always enabled %define with_sasl 0%{!?_without_sasl:1} @@ -182,6 +183,7 @@ %if 0%{?fedora} >= 17 || 0%{?rhel} >= 7 %define with_systemd 1 %define with_systemd_daemon 1 + %define with_pm_utils 0 %endif # Fedora 18 / RHEL-7 are first where firewalld support is enabled @@ -1138,8 +1140,10 @@ Requires: nc Requires: gettext # Needed by virt-pki-validate script. Requires: gnutls-utils +%if %{with_pm_utils} # Needed for probing the power management features of the host. Requires: pm-utils +%{endif} %if %{with_sasl} Requires: cyrus-sasl # Not technically required, but makes 'out-of-box' config @@ -1395,6 +1399,10 @@ driver %define _without_systemd_daemon --without-systemd-daemon %endif +%if ! %{with_pm_utils} + %define _without_pm_utils --without-pm-utils +%endif + %define when %(date +"%%F-%%T") %define where %(hostname) %define who %{?packager}%{!?packager:Unknown} @@ -1471,6 +1479,7 @@ rm -f po/stamp-po %{?_with_firewalld} \ %{?_without_wireshark} \ %{?_without_systemd_daemon} \ + %{?_without_pm_utils} \ %{with_packager} \ %{with_packager_version} \ --with-qemu-user=%{qemu_user} \ diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 38fbf63..ce51bdf 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1879,6 +1879,9 @@ virSysinfoSetup; # util/virsystemd.h +virSystemdCanHibernate; +virSystemdCanHybridSleep; +virSystemdCanSuspend; virSystemdCreateMachine; virSystemdMakeMachineName; virSystemdMakeScopeName; diff --git a/src/util/virnodesuspend.c b/src/util/virnodesuspend.c index 8088931..ba4a338 100644 --- a/src/util/virnodesuspend.c +++ b/src/util/virnodesuspend.c @@ -22,6 +22,9 @@ #include <config.h> #include "virnodesuspend.h" +#ifndef WITH_PM_UTILS +# include "virsystemd.h" +#endif #include "vircommand.h" #include "virthread.h" #include "datatypes.h" @@ -260,6 +263,7 @@ int nodeSuspendForDuration(unsigned int target, * * Returns 0 if the query was successful, -1 on failure. */ +#ifdef WITH_PM_UTILS static int virNodeSuspendSupportsTarget(unsigned int target, bool *supported) { @@ -300,6 +304,34 @@ virNodeSuspendSupportsTarget(unsigned int target, bool *supported) virCommandFree(cmd); return ret; } +#else /* ! WITH_PM_UTILS */ +static int +virNodeSuspendSupportsTarget(unsigned int target, bool *supported) +{ + int ret = -1; + + if (virNodeSuspendInitialize() < 0) + return -1; + + *supported = false; + + switch (target) { + case VIR_NODE_SUSPEND_TARGET_MEM: + ret = virSystemdCanSuspend(supported); + break; + case VIR_NODE_SUSPEND_TARGET_DISK: + ret = virSystemdCanHibernate(supported); + break; + case VIR_NODE_SUSPEND_TARGET_HYBRID: + ret = virSystemdCanHybridSleep(supported); + break; + default: + return ret; + } + + return ret; +} +#endif /* WITH_PM_UTILS */ /** * virNodeSuspendGetTargetMask: diff --git a/src/util/virsystemd.c b/src/util/virsystemd.c index 93b3f9c..d144d12 100644 --- a/src/util/virsystemd.c +++ b/src/util/virsystemd.c @@ -325,3 +325,62 @@ virSystemdNotifyStartup(void) sd_notify(0, "READY=1"); #endif } + +static int +virSystemdPMSupportTarget(const char *methodName, bool *result) +{ + int ret; + DBusConnection *conn; + DBusMessage *message = NULL; + char *response; + + ret = virDBusIsServiceEnabled("org.freedesktop.login1"); + if (ret < 0) + return ret; + + if ((ret = virDBusIsServiceRegistered("org.freedesktop.login1")) < 0) + return ret; + + if (!(conn = virDBusGetSystemBus())) + return -1; + + ret = -1; + + if (virDBusCallMethod(conn, + &message, + NULL, + "org.freedesktop.login1", + "/org/freedesktop/login1", + "org.freedesktop.login1.Manager", + methodName, + NULL) < 0) + return ret; + + if ((ret = virDBusMessageRead(message, "s", &response)) < 0) + goto cleanup; + + *result = STRNEQ("no", response); + + ret = 0; + + cleanup: + dbus_message_unref(message); + VIR_FREE(response); + + return ret; +} + +int virSystemdCanSuspend(bool *result) +{ + return virSystemdPMSupportTarget("CanSuspend", result); +} + +int virSystemdCanHibernate(bool *result) +{ + return virSystemdPMSupportTarget("CanHibernate", result); +} + +int virSystemdCanHybridSleep(bool *result) +{ + return virSystemdPMSupportTarget("CanHybridSleep", result); +} diff --git a/src/util/virsystemd.h b/src/util/virsystemd.h index 7fed456..491c9b7 100644 --- a/src/util/virsystemd.h +++ b/src/util/virsystemd.h @@ -48,4 +48,10 @@ int virSystemdTerminateMachine(const char *name, void virSystemdNotifyStartup(void); +int virSystemdCanSuspend(bool *result); + +int virSystemdCanHibernate(bool *result); + +int virSystemdCanHybridSleep(bool *result); + #endif /* __VIR_SYSTEMD_H__ */ -- 1.8.4.5

4 5

[libvirt] [PATCH] Remove useless NULL check in virSecurityManagerGenLabel
by Ján Tomko 02 Apr '14

02 Apr '14

Every security driver has domainGenSecurityLabel defined. Coverity complains about a possible leak of seclabel if !sec_managers[i]->drv->domainGenSecurityLabel is true and the seclabel might be overwritten by the next iteration of the loop. --- src/security/security_manager.c | 28 ++++++++++++---------------- 1 file changed, 12 insertions(+), 16 deletions(-) diff --git a/src/security/security_manager.c b/src/security/security_manager.c index d68c7e9..24855db 100644 --- a/src/security/security_manager.c +++ b/src/security/security_manager.c @@ -512,24 +512,20 @@ int virSecurityManagerGenLabel(virSecurityManagerPtr mgr, } } - if (!sec_managers[i]->drv->domainGenSecurityLabel) { - virReportUnsupportedError(); - } else { - /* The seclabel must be added to @vm prior calling domainGenSecurityLabel - * which may require seclabel to be presented already */ - if (generated && - VIR_APPEND_ELEMENT(vm->seclabels, vm->nseclabels, seclabel) < 0) - goto cleanup; - - if (sec_managers[i]->drv->domainGenSecurityLabel(sec_managers[i], vm) < 0) { - if (VIR_DELETE_ELEMENT(vm->seclabels, - vm->nseclabels -1, vm->nseclabels) < 0) - vm->nseclabels--; - goto cleanup; - } + /* The seclabel must be added to @vm prior calling domainGenSecurityLabel + * which may require seclabel to be presented already */ + if (generated && + VIR_APPEND_ELEMENT(vm->seclabels, vm->nseclabels, seclabel) < 0) + goto cleanup; - seclabel = NULL; + if (sec_managers[i]->drv->domainGenSecurityLabel(sec_managers[i], vm) < 0) { + if (VIR_DELETE_ELEMENT(vm->seclabels, + vm->nseclabels -1, vm->nseclabels) < 0) + vm->nseclabels--; + goto cleanup; } + + seclabel = NULL; } ret = 0; -- 1.8.3.2

3 3

[libvirt] [PATCHv2 0/4] Time setting and getting in qemu guests
by Michal Privoznik 02 Apr '14

02 Apr '14

If we'd come up with a struct to interpret the time, it's written in stone and there's nothing we can do about it. Even if we break up the struct into function arguments. However, we can use typed parameters and have the API extensible. For example, I'm implementing seconds granularity only for now. If later somebody feels like he/she wants to use even finer granularity, we can do that by inventing a new typed param. Same goes for timezone, etc. Michal Privoznik (4): Introduce virDomain{Get,Set}Time APIs remote: Implement remote{Get,Set}Time virsh: Expose virDomain{Get,Set}Time qemu: Implement virDomain{Get,Set}Time daemon/remote.c | 50 +++++++++++++++ include/libvirt/libvirt.h.in | 24 ++++++++ src/access/viraccessperm.c | 2 +- src/access/viraccessperm.h | 7 ++- src/driver.h | 14 +++++ src/libvirt.c | 96 +++++++++++++++++++++++++++++ src/libvirt_public.syms | 6 ++ src/qemu/qemu_agent.c | 95 ++++++++++++++++++++++++++++ src/qemu/qemu_agent.h | 6 ++ src/qemu/qemu_driver.c | 139 +++++++++++++++++++++++++++++++++++++++++ src/remote/remote_driver.c | 47 ++++++++++++++ src/remote/remote_protocol.x | 32 +++++++++- src/remote_protocol-structs | 20 ++++++ tools/virsh-domain-monitor.c | 143 +++++++++++++++++++++++++++++++++++++++++++ tools/virsh.pod | 16 +++++ 15 files changed, 694 insertions(+), 3 deletions(-) -- 1.9.0

3 6

Re: [libvirt] RFC: viridentitytest Failure on CentOS 6.5?
by Nehal J Wani 02 Apr '14

02 Apr '14

On Sun, Mar 16, 2014 at 1:28 PM, Nehal J Wani <nehaljw.kkd1(a)gmail.com> wrote: > I followed the following steps to build a clean development version of > libvirt from source. Can't seem to understand what is wrong. (Entire > buildLog has been attached): > > ➜ /tmp cat /etc/issue > CentOS release 6.5 (Final) > Kernel \r on an \m > ➜ /tmp sestatus > SELinux status: enabled > SELinuxfs mount: /selinux > Current mode: enforcing > Mode from config file: enforcing > Policy version: 24 > Policy from config file: targeted > ➜ /tmp git clone git://libvirt.org/libvirt.git > Initialized empty Git repository in /tmp/libvirt/.git/ > remote: Counting objects: 138935, done. > remote: Compressing objects: 100% (21143/21143), done. > remote: Total 138935 (delta 117282), reused 138935 (delta 117282) > Receiving objects: 100% (138935/138935), 137.72 MiB | 559 KiB/s, done. > Resolving deltas: 100% (117282/117282), done. > ➜ /tmp cd libvirt > ➜ libvirt git:(master) ./autogen.sh --system > Running ./configure with --prefix=/usr --sysconfdir=/etc > --localstatedir=/var --libdir=/usr/lib64 > .. > .. > Now type 'make' to compile libvirt. > ➜ libvirt git:(master) make > .. > .. > make[1]: Leaving directory `/tmp/libvirt' > ➜ libvirt git:(master) ✗ cd tests > ➜ tests git:(master) ✗ ./viridentitytest > /tmp/libvirt/tests/.libs/libsecurityselinuxhelper.so: No such file or directory > ➜ tests git:(master) ✗ > > > -- > Nehal J Wani Ping! -- Nehal J Wani

3 4

[libvirt] [PATCH] qemu: cleanup error checking on agent replies
by Martin Kletzander 02 Apr '14

02 Apr '14

On all the places where qemuAgentComand() was called, we did a check for errors in the reply. Unfortunately, some of the places called qemuAgentCheckError() without checking for non-null reply which might have resulted in a crash. So this patch makes the error-checking part of qemuAgentCommand() itself, which: a) makes it look better, b) makes the check mandatory and, most importantly, c) checks for the errors if and only if it is appropriate. This actually fixes a potential crashers when qemuAgentComand() returned 0, but reply was NULL. Having said that, it *should* fix the following bug: https://bugzilla.redhat.com/show_bug.cgi?id=1058149 Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- src/qemu/qemu_agent.c | 27 +++++++-------------------- 1 file changed, 7 insertions(+), 20 deletions(-) diff --git a/src/qemu/qemu_agent.c b/src/qemu/qemu_agent.c index 27af1be..4c83d7d 100644 --- a/src/qemu/qemu_agent.c +++ b/src/qemu/qemu_agent.c @@ -117,6 +117,8 @@ struct _qemuAgent { qemuAgentEvent await_event; }; +static int qemuAgentCheckError(virJSONValuePtr cmd, virJSONValuePtr reply); + static virClassPtr qemuAgentClass; static void qemuAgentDispose(void *obj); @@ -1009,6 +1011,7 @@ qemuAgentCommand(qemuAgentPtr mon, } } else { *reply = msg.rxObject; + ret = qemuAgentCheckError(cmd, *reply); } } @@ -1277,9 +1280,6 @@ int qemuAgentShutdown(qemuAgentPtr mon, ret = qemuAgentCommand(mon, cmd, &reply, VIR_DOMAIN_QEMU_AGENT_COMMAND_BLOCK); - if (reply && ret == 0) - ret = qemuAgentCheckError(cmd, reply); - virJSONValueFree(cmd); virJSONValueFree(reply); return ret; @@ -1308,8 +1308,7 @@ int qemuAgentFSFreeze(qemuAgentPtr mon) return -1; if (qemuAgentCommand(mon, cmd, &reply, - VIR_DOMAIN_QEMU_AGENT_COMMAND_BLOCK) < 0 || - qemuAgentCheckError(cmd, reply) < 0) + VIR_DOMAIN_QEMU_AGENT_COMMAND_BLOCK) < 0) goto cleanup; if (virJSONValueObjectGetNumberInt(reply, "return", &ret) < 0) { @@ -1346,8 +1345,7 @@ int qemuAgentFSThaw(qemuAgentPtr mon) return -1; if (qemuAgentCommand(mon, cmd, &reply, - VIR_DOMAIN_QEMU_AGENT_COMMAND_BLOCK) < 0 || - qemuAgentCheckError(cmd, reply) < 0) + VIR_DOMAIN_QEMU_AGENT_COMMAND_BLOCK) < 0) goto cleanup; if (virJSONValueObjectGetNumberInt(reply, "return", &ret) < 0) { @@ -1386,9 +1384,6 @@ qemuAgentSuspend(qemuAgentPtr mon, ret = qemuAgentCommand(mon, cmd, &reply, VIR_DOMAIN_QEMU_AGENT_COMMAND_BLOCK); - if (reply && ret == 0) - ret = qemuAgentCheckError(cmd, reply); - virJSONValueFree(cmd); virJSONValueFree(reply); return ret; @@ -1419,9 +1414,6 @@ qemuAgentArbitraryCommand(qemuAgentPtr mon, if ((ret = qemuAgentCommand(mon, cmd, &reply, timeout)) < 0) goto cleanup; - if ((ret = qemuAgentCheckError(cmd, reply)) < 0) - goto cleanup; - if (!(*result = virJSONValueToString(reply, false))) ret = -1; @@ -1449,9 +1441,6 @@ qemuAgentFSTrim(qemuAgentPtr mon, ret = qemuAgentCommand(mon, cmd, &reply, VIR_DOMAIN_QEMU_AGENT_COMMAND_BLOCK); - if (reply && ret == 0) - ret = qemuAgentCheckError(cmd, reply); - virJSONValueFree(cmd); virJSONValueFree(reply); return ret; @@ -1472,8 +1461,7 @@ qemuAgentGetVCPUs(qemuAgentPtr mon, return -1; if (qemuAgentCommand(mon, cmd, &reply, - VIR_DOMAIN_QEMU_AGENT_COMMAND_BLOCK) < 0 || - qemuAgentCheckError(cmd, reply) < 0) + VIR_DOMAIN_QEMU_AGENT_COMMAND_BLOCK) < 0) goto cleanup; if (!(data = virJSONValueObjectGet(reply, "return"))) { @@ -1581,8 +1569,7 @@ qemuAgentSetVCPUs(qemuAgentPtr mon, cpus = NULL; if (qemuAgentCommand(mon, cmd, &reply, - VIR_DOMAIN_QEMU_AGENT_COMMAND_BLOCK) < 0 || - qemuAgentCheckError(cmd, reply) < 0) + VIR_DOMAIN_QEMU_AGENT_COMMAND_BLOCK) < 0) goto cleanup; if (virJSONValueObjectGetNumberInt(reply, "return", &ret) < 0) { -- 1.9.1

2 3

[libvirt] [PATCH] virsh: man: delete the unexpected character in snapshot-list
by Shanzhi Yu 02 Apr '14

02 Apr '14

--- tools/virsh.pod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/virsh.pod b/tools/virsh.pod index ba2da20..98d891a 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -3162,7 +3162,7 @@ with I<--current>. =item B<snapshot-list> I<domain> [I<--metadata>] [I<--no-metadata>] [{I<--parent> | I<--roots> | [{I<--tree> | I<--name>}]}] [{[I<--from>] B<snapshot> | I<--current>} [I<--descendants>]] -[I<--leaves>] [I<--no-leaves>] p[I<--inactive>] [I<--active>] +[I<--leaves>] [I<--no-leaves>] [I<--inactive>] [I<--active>] [I<--disk-only>] [I<--internal>] [I<--external>] List all of the available snapshots for the given domain, defaulting -- 1.9.0

3 2

[libvirt] [BUG] xenInotify/keep-alive double-free
by Philipp Hahn 02 Apr '14

02 Apr '14

Hello, There seems to be a double-free bug in libvirt; I've checked libvirt 0.9.12 and 1.2.3: With 0.9.12 xenUnifiedOpen() passes a pointer of "conn" to xenInotifyOpen(), which passes it to virEventAddHandle(...opaque=conn...). After successfully defining a new domain inotify picks up the newly created directory and generates an event, which is processes when virsh already dropped its last public reference to the domain and subsequently already freed the connection. Since *conn is not zero-filled, the data is still valid and usable, but virsh the terminates on double-freeing some internal data. I can reproduce by it doing: virsh undefine $DOM virsh -c xen:// define $DOM.xml For 1.2.3 something similar seems to happen with the keep-alive: $ grep unref ~/BUG/31032_virsh-define-segv.log virUnrefDomain:276 : unref domain 0x7f4ec4003fe0 ucs32-64-segv 1 virReleaseDomain:246 : unref connection 0x917650 2 virUnrefDomain:276 : unref domain 0x934460 ucs32-64-segv 1 virReleaseDomain:246 : unref connection 0x917650 2 virUnrefConnect:145 : unref connection 0x917650 1 virUnrefDomain:276 : unref domain 0x7f4ec4004060 ucs32-64-segv 1 virReleaseDomain:246 : unref connection 0x917650 1 Notice that there are two lines for "unref connection ... 1"! My gut feeling is that libvirt should also increment the reference counter for internal references to delay freeing still used data and add a second counter to track external references, which is used to start closing down things. Comments and ideas welcomed. We're tracking this as <https://forge.univention.org/bugzilla/show_bug.cgi?id=31032> Sincerely Philipp -- Philipp Hahn Open Source Software Engineer Univention GmbH be open. Mary-Somerville-Str. 1 D-28359 Bremen Tel.: +49 421 22232-0 Fax : +49 421 22232-99 hahn(a)univention.de http://www.univention.de/ Geschäftsführer: Peter H. Ganten HRB 20755 Amtsgericht Bremen Steuer-Nr.: 71-597-02876

1 0

[libvirt] [bug?] unix sockets opened via chardev devices not being closed on shutdown
by Chris Friesen 02 Apr '14

02 Apr '14

I have a case where I'm creating a virtio channel between the host and guest using something like this: <channel type="unix"> <source mode="bind" path="/path/in/host/instance_name"/> <target type="virtio" name="name_in_guest"/> </channel> When qemu is started up this gets created as expected, but when qemu is shut down the unix socket is left in the filesystem. It seems to me that libvirt should be deleting this unix socket the same way that it deletes the monitor socket in qemuProcessStop(). Anyone else trying to delete it is going to be subject to race conditions since they can't know whether or not a virtual machine has been (re)created that wants to use the same socket path. Chris

1 0

[libvirt] [PATCH] maint: fix spelling errors in disk pools
by Eric Blake 02 Apr '14

02 Apr '14

Noticed during my work on storage struct cleanups. * src/storage/storage_backend_disk.c (virStorageBackendDiskPartBoundaries): Fix spelling errors. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Pushing under the trivial rule. Particularly odd that we managed too different ways of mis-spelling partition in the same file! src/storage/storage_backend_disk.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/storage/storage_backend_disk.c b/src/storage/storage_backend_disk.c index 8d09500..fb7a2a4 100644 --- a/src/storage/storage_backend_disk.c +++ b/src/storage/storage_backend_disk.c @@ -1,7 +1,7 @@ /* * storage_backend_disk.c: storage backend for disk handling * - * Copyright (C) 2007-2008, 2010-2013 Red Hat, Inc. + * Copyright (C) 2007-2014 Red Hat, Inc. * Copyright (C) 2007-2008 Daniel P. Berrange * * This library is free software; you can redistribute it and/or @@ -440,7 +440,7 @@ static int virStorageBackendDiskPartTypeToCreate(virStoragePoolObjPtr pool) { if (pool->def->source.format == VIR_STORAGE_POOL_DISK_DOS) { - /* count primary and extended paritions, + /* count primary and extended partitions, can't be more than 3 to create a new primary partition */ size_t i; int count = 0; @@ -532,10 +532,10 @@ virStorageBackendDiskPartFormat(virStoragePoolObjPtr pool, * partitions */ static int -virStorageBackendDiskPartBoundries(virStoragePoolObjPtr pool, - unsigned long long *start, - unsigned long long *end, - unsigned long long allocation) +virStorageBackendDiskPartBoundaries(virStoragePoolObjPtr pool, + unsigned long long *start, + unsigned long long *end, + unsigned long long allocation) { size_t i; int smallestExtent = -1; @@ -568,7 +568,7 @@ virStorageBackendDiskPartBoundries(virStoragePoolObjPtr pool, the extra bytes we have */ neededSize += cylinderSize; } - /* if we are creating a logical patition, we need one extra + /* if we are creating a logical partition, we need one extra block between partitions (or actually move start one block) */ if (partType == VIR_STORAGE_VOL_DISK_TYPE_LOGICAL) { size -= SECTOR_SIZE; @@ -647,9 +647,9 @@ virStorageBackendDiskCreateVol(virConnectPtr conn ATTRIBUTE_UNUSED, } virCommandAddArg(cmd, partFormat); - if (virStorageBackendDiskPartBoundries(pool, &startOffset, - &endOffset, - vol->capacity) != 0) { + if (virStorageBackendDiskPartBoundaries(pool, &startOffset, + &endOffset, + vol->capacity) != 0) { goto cleanup; } -- 1.9.0

1 0

[libvirt] [PATCH] maint: ensure src/ directory includes are clean
by Eric Blake 01 Apr '14

01 Apr '14

In 'make syntax-check', we have a rule that prevents layering violations between the various files in src. However, we forgot to treat conf/ and the more recently-added access/ as lower-level directories, and were not detecting cases where they might have used a driver file. Also, it's not nice that qemu can use storage/ but none of the other drivers could do so. * cfg.mk (sc_prohibit_cross_inclusion): Tighten rules for conf/ and access/, let all other drivers use storage/. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- I noticed this because of my work on domain_conf.h: I want to share a struct between util/virstoragefile and conf/domain_conf, and ran into a syntax check when I tried to make util/ depend on conf/. I fixed things to obey layering with conf/ depending on util/, but in the process noticed that some layering violations went undetected. cfg.mk | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/cfg.mk b/cfg.mk index a4ae978..19537cf 100644 --- a/cfg.mk +++ b/cfg.mk @@ -760,17 +760,17 @@ sc_prohibit_gettext_markup: # lower-level code must not include higher-level headers. cross_dirs=$(patsubst $(srcdir)/src/%.,%,$(wildcard $(srcdir)/src/*/.)) cross_dirs_re=($(subst / ,/|,$(cross_dirs))) +mid_dirs=access|conf|cpu|locking|network|node_device|rpc|security|storage sc_prohibit_cross_inclusion: @for dir in $(cross_dirs); do \ case $$dir in \ util/) safe="util";; \ - locking/) \ - safe="($$dir|util|conf|rpc)";; \ - cpu/ | locking/ | network/ | rpc/ | security/) \ + access/ | conf/) safe="($$dir|conf|util)";; \ + locking/) safe="($$dir|util|conf|rpc)";; \ + cpu/| network/| node_device/| rpc/| security/| storage/) \ safe="($$dir|util|conf)";; \ xenapi/ | xenxs/ ) safe="($$dir|util|conf|xen)";; \ - qemu/ ) safe="($$dir|util|conf|cpu|network|locking|rpc|security|storage)";; \ - *) safe="($$dir|util|conf|cpu|network|locking|rpc|security)";; \ + *) safe="($$dir|$(mid_dirs)|util)";; \ esac; \ in_vc_files="^src/$$dir" \ prohibit='^# *include .$(cross_dirs_re)' \ -- 1.8.5.3

1 1

[libvirt] [PATCH 0/n] round 2 of storage chain refactoring
by Eric Blake 01 Apr '14

01 Apr '14

In round 1, I split out a new struct in domain_conf.h. This starts round 2: moving the struct into util/virstoragefile.h, so it can be shared by domain, snapshot, and existing virstoragefile backing chain operations. It's turned out to be a bigger process than I first thought, so I've tried splitting it into smaller patches to ease review. I also want to get review started on the parts I have compiling, while still working on the rest of the series, since I know that at least Peter will be heavily impacted by some of the changes in this series. Eric Blake (2): conf: split security label structs to util/ conf: split network host structs to util/ src/Makefile.am | 1 + src/conf/domain_conf.c | 139 +++------------------------------- src/conf/domain_conf.h | 71 +---------------- src/conf/snapshot_conf.c | 5 +- src/conf/snapshot_conf.h | 4 +- src/libvirt_private.syms | 21 ++--- src/qemu/qemu_command.c | 38 +++++----- src/qemu/qemu_command.h | 6 +- src/qemu/qemu_conf.c | 4 +- src/qemu/qemu_driver.c | 24 +++--- src/qemu/qemu_process.c | 2 +- src/security/security_manager.c | 2 +- src/security/security_selinux.c | 2 +- src/storage/storage_backend_gluster.c | 8 +- src/storage/storage_driver.c | 8 +- src/storage/storage_driver.h | 2 +- src/util/virseclabel.c | 82 ++++++++++++++++++++ src/util/virseclabel.h | 67 ++++++++++++++++ src/util/virstoragefile.c | 71 ++++++++++++++++- src/util/virstoragefile.h | 30 +++++++- 20 files changed, 328 insertions(+), 259 deletions(-) create mode 100644 src/util/virseclabel.c create mode 100644 src/util/virseclabel.h -- 1.8.5.3

2 37

[libvirt] [PATCH v2] Introduce --without-pm-utils to get rid of pm-is-supported dependency
by Cédric Bosdonnat 01 Apr '14

01 Apr '14

This uses the dbus api of systemd to check the power management capabilities of the node. --- This replaces the previous pm-utils dropping patch attempt to implement Cole's idea. configure.ac | 11 ++++++++ libvirt.spec.in | 9 +++++++ src/libvirt_private.syms | 3 +++ src/util/virnodesuspend.c | 32 ++++++++++++++++++++++ src/util/virsystemd.c | 68 +++++++++++++++++++++++++++++++++++++++++++++++ src/util/virsystemd.h | 6 +++++ 6 files changed, 129 insertions(+) diff --git a/configure.ac b/configure.ac index 73efffa..807cf0f 100644 --- a/configure.ac +++ b/configure.ac @@ -563,6 +563,10 @@ AC_ARG_WITH([chrdev-lock-files], [location for UUCP style lock files for character devices (use auto for default paths on some platforms) @<:@default=auto@:>@])]) m4_divert_text([DEFAULTS], [with_chrdev_lock_files=auto]) +AC_ARG_WITH([pm-utils], + [AS_HELP_STRING([--with-pm-utils], + [use pm-utils for power management @<:@default=yes@:>@])]) +m4_divert_text([DEFAULTS], [with_pm_utils=yes]) dnl dnl in case someone want to build static binaries @@ -1621,6 +1625,12 @@ fi AM_CONDITIONAL([WITH_PHYP],[test "$with_phyp" = "yes"]) +dnl Should we build with pm-utils support? +if test "$with_pm_utils" = "yes"; then + AC_DEFINE_UNQUOTED([WITH_PM_UTILS], 1, [whether to use pm-utils]) +fi +AM_CONDITIONAL([WITH_PM_UTILS], [test "$with_pm_utils" = "yes"]) + dnl virsh libraries VIRSH_LIBS="$VIRSH_LIBS $READLINE_LIBS" AC_SUBST([VIRSH_LIBS]) @@ -2845,6 +2855,7 @@ AC_MSG_NOTICE([ rbd: $LIBRBD_LIBS]) else AC_MSG_NOTICE([ rbd: no]) fi +AC_MSG_NOTICE([pm-utils: $with_pm_utils]) AC_MSG_NOTICE([]) AC_MSG_NOTICE([Test suite]) diff --git a/libvirt.spec.in b/libvirt.spec.in index eab9b23..5c20955 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -132,6 +132,7 @@ %define with_libssh2 0%{!?_without_libssh2:0} %define with_wireshark 0%{!?_without_wireshark:0} %define with_systemd_daemon 0%{!?_without_systemd_daemon:0} +%define with_pm_utils 1 # Non-server/HV driver defaults which are always enabled %define with_sasl 0%{!?_without_sasl:1} @@ -182,6 +183,7 @@ %if 0%{?fedora} >= 17 || 0%{?rhel} >= 7 %define with_systemd 1 %define with_systemd_daemon 1 + %define with_pm_utils 0 %endif # Fedora 18 / RHEL-7 are first where firewalld support is enabled @@ -1138,8 +1140,10 @@ Requires: nc Requires: gettext # Needed by virt-pki-validate script. Requires: gnutls-utils +%if %{with_pm_utils} # Needed for probing the power management features of the host. Requires: pm-utils +%{endif} %if %{with_sasl} Requires: cyrus-sasl # Not technically required, but makes 'out-of-box' config @@ -1395,6 +1399,10 @@ driver %define _without_systemd_daemon --without-systemd-daemon %endif +%if ! %{with_pm_utils} + %define _without_pm_utils --without-pm-utils +%endif + %define when %(date +"%%F-%%T") %define where %(hostname) %define who %{?packager}%{!?packager:Unknown} @@ -1471,6 +1479,7 @@ rm -f po/stamp-po %{?_with_firewalld} \ %{?_without_wireshark} \ %{?_without_systemd_daemon} \ + %{?_without_pm_utils} \ %{with_packager} \ %{with_packager_version} \ --with-qemu-user=%{qemu_user} \ diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 38fbf63..ce51bdf 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1879,6 +1879,9 @@ virSysinfoSetup; # util/virsystemd.h +virSystemdCanHibernate; +virSystemdCanHybridSleep; +virSystemdCanSuspend; virSystemdCreateMachine; virSystemdMakeMachineName; virSystemdMakeScopeName; diff --git a/src/util/virnodesuspend.c b/src/util/virnodesuspend.c index 8088931..ba4a338 100644 --- a/src/util/virnodesuspend.c +++ b/src/util/virnodesuspend.c @@ -22,6 +22,9 @@ #include <config.h> #include "virnodesuspend.h" +#ifndef WITH_PM_UTILS +# include "virsystemd.h" +#endif #include "vircommand.h" #include "virthread.h" #include "datatypes.h" @@ -260,6 +263,7 @@ int nodeSuspendForDuration(unsigned int target, * * Returns 0 if the query was successful, -1 on failure. */ +#ifdef WITH_PM_UTILS static int virNodeSuspendSupportsTarget(unsigned int target, bool *supported) { @@ -300,6 +304,34 @@ virNodeSuspendSupportsTarget(unsigned int target, bool *supported) virCommandFree(cmd); return ret; } +#else /* ! WITH_PM_UTILS */ +static int +virNodeSuspendSupportsTarget(unsigned int target, bool *supported) +{ + int ret = -1; + + if (virNodeSuspendInitialize() < 0) + return -1; + + *supported = false; + + switch (target) { + case VIR_NODE_SUSPEND_TARGET_MEM: + ret = virSystemdCanSuspend(supported); + break; + case VIR_NODE_SUSPEND_TARGET_DISK: + ret = virSystemdCanHibernate(supported); + break; + case VIR_NODE_SUSPEND_TARGET_HYBRID: + ret = virSystemdCanHybridSleep(supported); + break; + default: + return ret; + } + + return ret; +} +#endif /* WITH_PM_UTILS */ /** * virNodeSuspendGetTargetMask: diff --git a/src/util/virsystemd.c b/src/util/virsystemd.c index 93b3f9c..d4c1dd3 100644 --- a/src/util/virsystemd.c +++ b/src/util/virsystemd.c @@ -325,3 +325,71 @@ virSystemdNotifyStartup(void) sd_notify(0, "READY=1"); #endif } + +static int +virSystemdPMSupportTarget(const char *methodName, bool *result) +{ + int ret; + DBusConnection *conn; + DBusMessage *message; + char *response; + + ret = virDBusIsServiceEnabled("org.freedesktop.login1"); + if (ret < 0) + return ret; + + if ((ret = virDBusIsServiceRegistered("org.freedesktop.login1")) < 0) + return ret; + + if (!(conn = virDBusGetSystemBus())) + return -1; + + ret = -1; + + /* + * The systemd DBus API we're invoking has the + * following signature + * + * CanSuspend(out s value); + * + * @value one of 'na', 'yes', 'no' or 'challenge' + */ + + if (virDBusCallMethod(conn, + &message, + NULL, + "org.freedesktop.login1", + "/org/freedesktop/login1", + "org.freedesktop.login1.Manager", + methodName, + "") < 0) + goto cleanup; + + if ((ret = virDBusMessageRead(message, "s", &response)) < 0) + goto cleanup; + + *result = STRNEQ("no", response); + + ret = 0; + + cleanup: + dbus_message_unref(message); + VIR_FREE(response); + + return ret; +} + +int virSystemdCanSuspend(bool *result) +{ + return virSystemdPMSupportTarget("CanSuspend", result); +} + +int virSystemdCanHibernate(bool *result) +{ + return virSystemdPMSupportTarget("CanHibernate", result); +} + +int virSystemdCanHybridSleep(bool *result) +{ + return virSystemdPMSupportTarget("CanHybridSleep", result); +} diff --git a/src/util/virsystemd.h b/src/util/virsystemd.h index 7fed456..491c9b7 100644 --- a/src/util/virsystemd.h +++ b/src/util/virsystemd.h @@ -48,4 +48,10 @@ int virSystemdTerminateMachine(const char *name, void virSystemdNotifyStartup(void); +int virSystemdCanSuspend(bool *result); + +int virSystemdCanHibernate(bool *result); + +int virSystemdCanHybridSleep(bool *result); + #endif /* __VIR_SYSTEMD_H__ */ -- 1.8.4.5

2 1

[libvirt] [PATCH v2 0/4] Fix VolOpen error reporting
by Cole Robinson 01 Apr '14

01 Apr '14

In https://bugzilla.redhat.com/show_bug.cgi?id=1080613 , something is causing StorageVolGetXML to fail, but it's not raising any error message. Code inspection found that most users of VolOpen are susceptible to error reporting issues. The first 3 patches are some code reorganization and cleanups that make it easier to identify the VolOpen callers. Patch 4 fixes up the reporting issue. v2: Jan's suggestion to only report an error if caller passed in VOL_OPEN_ERROR Cole Robinson (4): storage: Rename UpdateVolInfoFlags to UpdateVolInfo storage: move block format lookup to shared UpdateVolInfo storage: Rename VolOpenCheckMode to VolOpen storage: Report error from VolOpen if proper flag is passed src/storage/storage_backend.c | 260 ++++++++++++++++++---------------- src/storage/storage_backend.h | 18 +-- src/storage/storage_backend_disk.c | 3 +- src/storage/storage_backend_fs.c | 25 ++-- src/storage/storage_backend_logical.c | 11 +- src/storage/storage_backend_mpath.c | 36 +---- src/storage/storage_backend_scsi.c | 43 +----- 7 files changed, 175 insertions(+), 221 deletions(-) -- 1.8.5.3

4 13

[libvirt] [PATCH 0/6] Gluster pool lookup and few gluster related fixes
by Peter Krempa 01 Apr '14

01 Apr '14

Peter Krempa (6): storage: pool: Fix XML indentation in pool source lookup storage: netfs: Split up and tidy up NFS storage pool source function storage: netfs: Support lookup of glusterfs pool sources storage: gluster: Implement storage pool lookup storage: gluster: Fix crash when initialization of storage backend fails util: storagefile: Don't pursue backing chain of NULL image configure.ac | 6 +++ src/conf/storage_conf.c | 2 + src/storage/storage_backend.c | 86 +++++++++++++++++++++++++++++++++++ src/storage/storage_backend.h | 4 ++ src/storage/storage_backend_fs.c | 54 ++++++++++++++-------- src/storage/storage_backend_gluster.c | 56 ++++++++++++++++++++++- src/util/virstoragefile.c | 2 +- 7 files changed, 187 insertions(+), 23 deletions(-) -- 1.9.1

3 19