- Devel - libvirt List Archives

[libvirt] [PATCH] document virCommandRunRegex function
by Christian Loehle 23 Nov '15

23 Nov '15

>From 01a3ed1e6bacba8cd9f398e5233960714b2c4f49 Mon Sep 17 00:00:00 2001 From: Christian Loehle <cloehle(a)linutronix.de> Date: Mon, 23 Nov 2015 15:06:37 +0100 Subject: [PATCH] =?UTF-8?q?document=20virCommandRunRegex=20function=C3=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/util/vircommand.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/src/util/vircommand.c b/src/util/vircommand.c index c7f1538..a88cc13 100644 --- a/src/util/vircommand.c +++ b/src/util/vircommand.c @@ -2889,12 +2889,24 @@ virCommandSetDryRun(virBufferPtr buf, } #ifndef WIN32 -/* +/** + * virCommandRunRegex: + * @cmd: command to run + * @nregex: number of regexes to apply + * @regex: array of regexes to apply + * @nvars: array of numbers of variables each regex will produce + * @func: callback function that is called for every line of output, + * needs to return 0 on success + * @data: additional data that will be passed to the callback function + * @prefix: prefix that will be skipped at the beginning of each line + * @exitstatus: 0 on success, -1 on memory allocation error, virCommandRun + * error or callback function error + * * Run an external program. * * Read its output and apply a series of regexes to each line * When the entire set of regexes has matched consecutively - * then run a callback passing in all the matches + * then run a callback passing in all the matches of the current line. */ int virCommandRunRegex(virCommandPtr cmd, -- 2.1.4

2 1

[libvirt] [PATCH 00/24] qemu: Add support for -incoming defer
by Jiri Denemark 23 Nov '15

23 Nov '15

Traditionally, we pass incoming migration URI on QEMU command line, which has some drawbacks. Depending on the URI QEMU may initialize its migration state immediately without giving us a chance to set any additional migration parameters (this applies mainly for fd: URIs). For some URIs the monitor may be completely blocked from the beginning until migration is finished, which means we may be stuck in qmp_capabilities command without being able to send any QMP commands. QEMU solved this by introducing "defer" parameter for -incoming command line option. This will tell QEMU to prepare for an incoming migration while the actual incoming URI is sent using migrate-incoming QMP command. Before calling this command we can normally talk to the monitor and even set any migration parameters which will be honored by the incoming migration. Jiri Denemark (24): qemu: Refactor waiting for completed migration on destination qemu: Refactor the code to build -incoming command line qemu: Don't generate migration URI in qemuBuildCommandLine qemu: Move incoming URI code to qemu_migration qemu: Introduce qemuProcessIncomingDef qemu: Always set async job when starting a domain qemu: Add APIs for migrate-incoming QMP command qemu: Use -incoming defer for migrations qemu: Rename stdin_{fd,path} in qemuProcessStart qemu: Separate hook handling code from qemuProcessStart qemu: Separate graphics handling code from qemuProcessStart qemu: Separate raw IO code from qemuProcessStart qemu: Enter monitor within qemuProcessSetLinkStates qemu: Separate balloon code from qemuProcessStart qemu: Introduce qemuProcessMakeDir qemu: Do not infer flags from other qemuProcessStart arguments qemu: Close logfd when closing monitor qemu: Introduce qemuProcessInit qemu: Introduce qemuProcessLaunch qemu: Introduce qemuProcessFinish qemu: Separate incoming URI generation from qemuMigrationPrepareAny qemu: Kill QEMU process if Prepare phase fails qemu: Skip starting NBD servers for offline migration qemu: Use qemuProcessLaunch in migration Prepare phase src/qemu/qemu_capabilities.c | 3 + src/qemu/qemu_capabilities.h | 3 + src/qemu/qemu_command.c | 42 +- src/qemu/qemu_command.h | 4 +- src/qemu/qemu_domain.c | 3 + src/qemu/qemu_domain.h | 1 + src/qemu/qemu_driver.c | 74 ++- src/qemu/qemu_migration.c | 357 +++++++---- src/qemu/qemu_migration.h | 11 + src/qemu/qemu_monitor.c | 14 + src/qemu/qemu_monitor.h | 3 + src/qemu/qemu_monitor_json.c | 25 + src/qemu/qemu_monitor_json.h | 5 + src/qemu/qemu_process.c | 881 +++++++++++++++++---------- src/qemu/qemu_process.h | 41 +- tests/qemucapabilitiesdata/caps_2.4.0-1.caps | 1 + tests/qemuxml2argvtest.c | 16 +- 17 files changed, 969 insertions(+), 515 deletions(-) -- 2.6.3

4 56

[libvirt] [PATCH 0/3] libxl: implement virDomainInterfaceStats
by Joao Martins 23 Nov '15

23 Nov '15

Hey, As discussed yesterday, this patch series implements virDomainInterfaceStats but based on "ConsoleCallback" as opposed of doing it in libxlDomainStart. The series is divided as following: Patch 1 adds up domain config to libxlDomainObjPrivate, Patch 2 renames console callback to something more generic and Patch 3 implements virDomainInterfaceStats also taking the previous review (v3 statistics) comments. Regards, Joao Joao Martins (3): libxl: add libxl_domain_config to libxlDomainObjPrivate libxl: Rename libxlConsoleCallback libxl: implement virDomainInterfaceStats src/libxl/libxl_domain.c | 65 +++++++++++++++++++++++++++++++++++++++--------- src/libxl/libxl_domain.h | 1 + src/libxl/libxl_driver.c | 46 ++++++++++++++++++++++++++++++++++ 3 files changed, 100 insertions(+), 12 deletions(-) -- 2.1.4

2 9

[libvirt] [libvirt-glib v2 1/3] gobject: Drop redundant glib compatibility code
by Zeeshan Ali (Khattak) 23 Nov '15

23 Nov '15

We already require and use glib >= 2.36 so there is no reason to keep around code to ensure compatibility with glib older than that. --- libvirt-gobject/libvirt-gobject-compat.c | 87 -------------------------------- libvirt-gobject/libvirt-gobject-compat.h | 73 --------------------------- 2 files changed, 160 deletions(-) diff --git a/libvirt-gobject/libvirt-gobject-compat.c b/libvirt-gobject/libvirt-gobject-compat.c index 14b5eb3..e91b018 100644 --- a/libvirt-gobject/libvirt-gobject-compat.c +++ b/libvirt-gobject/libvirt-gobject-compat.c @@ -17,93 +17,6 @@ #include "libvirt-gobject-compat.h" -#if !GLIB_CHECK_VERSION(2,28,0) -/** - * g_simple_async_result_take_error: (skip) - * @simple: a #GSimpleAsyncResult - * @error: a #GError - * - * Sets the result from @error, and takes over the caller's ownership - * of @error, so the caller does not need to free it any more. - * - * Since: 2.28 - **/ -G_GNUC_INTERNAL void -g_simple_async_result_take_error (GSimpleAsyncResult *simple, - GError *error) -{ - /* this code is different from upstream */ - /* we can't avoid extra copy/free, since the simple struct is - opaque */ - g_simple_async_result_set_from_error (simple, error); - g_error_free (error); -} - -/** - * g_simple_async_result_new_take_error: (skip) - * @source_object: (allow-none): a #GObject, or %NULL - * @callback: (scope async): a #GAsyncReadyCallback - * @user_data: (closure): user data passed to @callback - * @error: a #GError - * - * Creates a #GSimpleAsyncResult from an error condition, and takes over the - * caller's ownership of @error, so the caller does not need to free it anymore. - * - * Returns: a #GSimpleAsyncResult - * - * Since: 2.28 - **/ -GSimpleAsyncResult * -g_simple_async_result_new_take_error(GObject *source_object, - GAsyncReadyCallback callback, - gpointer user_data, - GError *error) -{ - GSimpleAsyncResult *simple; - - g_return_val_if_fail(!source_object || G_IS_OBJECT(source_object), NULL); - - simple = g_simple_async_result_new(source_object, - callback, - user_data, NULL); - g_simple_async_result_take_error(simple, error); - - return simple; -} - -/** - * g_simple_async_report_take_gerror_in_idle: (skip) - * @object: (allow-none): a #GObject, or %NULL - * @callback: a #GAsyncReadyCallback. - * @user_data: user data passed to @callback. - * @error: the #GError to report - * - * Reports an error in an idle function. Similar to - * g_simple_async_report_gerror_in_idle(), but takes over the caller's - * ownership of @error, so the caller does not have to free it any more. - * - * Since: 2.28 - **/ -void -g_simple_async_report_take_gerror_in_idle(GObject *object, - GAsyncReadyCallback callback, - gpointer user_data, - GError *error) -{ - GSimpleAsyncResult *simple; - - g_return_if_fail(!object || G_IS_OBJECT(object)); - g_return_if_fail(error != NULL); - - simple = g_simple_async_result_new_take_error(object, - callback, - user_data, - error); - g_simple_async_result_complete_in_idle(simple); - g_object_unref(simple); -} -#endif - GMutex *gvir_mutex_new(void) { GMutex *mutex; diff --git a/libvirt-gobject/libvirt-gobject-compat.h b/libvirt-gobject/libvirt-gobject-compat.h index 2e87966..27fa305 100644 --- a/libvirt-gobject/libvirt-gobject-compat.h +++ b/libvirt-gobject/libvirt-gobject-compat.h @@ -35,77 +35,4 @@ GMutex *gvir_mutex_new(void); #endif -#if !GLIB_CHECK_VERSION(2,26,0) -#define G_DEFINE_BOXED_TYPE(TypeName, type_name, copy_func, free_func) G_DEFINE_BOXED_TYPE_WITH_CODE (TypeName, type_name, copy_func, free_func, {}) -#define G_DEFINE_BOXED_TYPE_WITH_CODE(TypeName, type_name, copy_func, free_func, _C_) _G_DEFINE_BOXED_TYPE_BEGIN (TypeName, type_name, copy_func, free_func) {_C_;} _G_DEFINE_TYPE_EXTENDED_END() -#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 7) -#define _G_DEFINE_BOXED_TYPE_BEGIN(TypeName, type_name, copy_func, free_func) \ -GType \ -type_name##_get_type (void) \ -{ \ - static volatile gsize g_define_type_id__volatile = 0; \ - if (g_once_init_enter (&g_define_type_id__volatile)) \ - { \ - GType (* _g_register_boxed) \ - (const gchar *, \ - union \ - { \ - TypeName * (*do_copy_type) (TypeName *); \ - TypeName * (*do_const_copy_type) (const TypeName *); \ - GBoxedCopyFunc do_copy_boxed; \ - } __attribute__((__transparent_union__)), \ - union \ - { \ - void (* do_free_type) (TypeName *); \ - GBoxedFreeFunc do_free_boxed; \ - } __attribute__((__transparent_union__)) \ - ) = g_boxed_type_register_static; \ - GType g_define_type_id = \ - _g_register_boxed (g_intern_static_string (#TypeName), copy_func, free_func); \ - { /* custom code follows */ -#else -#define _G_DEFINE_BOXED_TYPE_BEGIN(TypeName, type_name, copy_func, free_func) \ -GType \ -type_name##_get_type (void) \ -{ \ - static volatile gsize g_define_type_id__volatile = 0; \ - if (g_once_init_enter (&g_define_type_id__volatile)) \ - { \ - GType g_define_type_id = \ - g_boxed_type_register_static (g_intern_static_string (#TypeName), \ - (GBoxedCopyFunc) copy_func, \ - (GBoxedFreeFunc) free_func); \ - { /* custom code follows */ -#endif /* __GNUC__ */ -#endif /* glib 2.26 */ - -#if !GLIB_CHECK_VERSION(2,28,0) -#define g_clear_object(object_ptr) \ - G_STMT_START { \ - /* Only one access, please */ \ - gpointer *_p = (gpointer) (object_ptr); \ - gpointer _o; \ - \ - do \ - _o = g_atomic_pointer_get (_p); \ - while G_UNLIKELY (!g_atomic_pointer_compare_and_exchange (_p, _o, NULL));\ - \ - if (_o) \ - g_object_unref (_o); \ - } G_STMT_END - -void -g_simple_async_result_take_error(GSimpleAsyncResult *simple, - GError *error); -GSimpleAsyncResult *g_simple_async_result_new_take_error (GObject *source_object, - GAsyncReadyCallback callback, - gpointer user_data, - GError *error); -void g_simple_async_report_take_gerror_in_idle (GObject *object, - GAsyncReadyCallback callback, - gpointer user_data, - GError *error); -#endif /* glib 2.28 */ - - #endif /* __LIBVIRT_GOBJECT_COMPAT_H__ */ -- 2.5.0

2 5

[libvirt] Fw:[PATCH] fix configure for pcap
by 程宝传 23 Nov '15

23 Nov '15

when cross-compiling, pcap can not point to the correct toolchain. configure.ac | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index f481c50..d6d2cf4 100644 --- a/configure.ac +++ b/configure.ac @@ -1555,7 +1555,7 @@ if test "$with_numad" != "no" ; then with_numad="yes" fi else - test -z "$NUMAD" && + test -z "$NUMAD" &&/ AC_MSG_ERROR([You must install numad package to manage CPU and memory placement dynamically]) test "$with_numactl" = "yes" || fail=1 @@ -1588,8 +1588,13 @@ if test "$with_qemu" = "yes"; then if ! $LIBPCAP_CONFIG --libs > /dev/null 2>&1 ; then AC_MSG_RESULT(no) else - LIBPCAP_LIBS="`$LIBPCAP_CONFIG --libs`" - LIBPCAP_CFLAGS="`$LIBPCAP_CONFIG --cflags`" + if test -n $with_libtool_sysroot && test -n $lt_sysroot; then + LIBPCAP_LIBS="-lpcap" + LIBPCAP_CFLAGS="-I$lt_sysroot/usr/include" + else + LIBPCAP_LIBS="`$LIBPCAP_CONFIG --libs`" + LIBPCAP_CFLAGS="`$LIBPCAP_CONFIG --cflags`" + fi LIBPCAP_FOUND="yes" AC_MSG_RESULT(yes) fi -- 2.6.3.windows.1

2 1

[libvirt] [PATCH 0/3] qemu_cgroup cleanups
by Ján Tomko 23 Nov '15

23 Nov '15

*** BLARGGH HERE *** Ján Tomko (3): rename qemuSetupHostdevCGroup to qemuSetupHostdevCgroup Simplify qemuSetupChrSourceCgroup and its callers qemuSetupChrSourceCgroup: rename dev to source src/qemu/qemu_cgroup.c | 37 ++++++++++++++++--------------------- src/qemu/qemu_cgroup.h | 2 +- src/qemu/qemu_hotplug.c | 6 +++--- 3 files changed, 20 insertions(+), 25 deletions(-) -- 2.4.6

2 7

[libvirt] [libvirt-glib 2/3] gconfig: Drop redundant glib compatibility code
by Zeeshan Ali (Khattak) 23 Nov '15

23 Nov '15

We already require and use glib >= 2.36 so there is no reason to keep around code to ensure compatibility with glib older than that. --- libvirt-gconfig/libvirt-gconfig-compat.h | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/libvirt-gconfig/libvirt-gconfig-compat.h b/libvirt-gconfig/libvirt-gconfig-compat.h index fbf552c..c9ac645 100644 --- a/libvirt-gconfig/libvirt-gconfig-compat.h +++ b/libvirt-gconfig/libvirt-gconfig-compat.h @@ -25,26 +25,6 @@ #include <glib-object.h> -#if !GLIB_CHECK_VERSION(2,32,0) - -#if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1) -#define G_DEPRECATED __attribute__((__deprecated__)) -#elif defined(_MSC_VER) && (_MSC_VER >= 1300) -#define G_DEPRECATED __declspec(deprecated) -#else -#define G_DEPRECATED -#endif - -#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 5) -#define G_DEPRECATED_FOR(f) __attribute__((__deprecated__("Use '" #f "' instead"))) -#elif defined(_MSC_FULL_VER) && (_MSC_FULL_VER > 140050320) -#define G_DEPRECATED_FOR(f) __declspec(deprecated("is deprecated. Use '" #f "' instead")) -#else -#define G_DEPRECATED_FOR(f) G_DEPRECATED -#endif - -#endif - #if GLIB_CHECK_VERSION(2, 35, 0) #define g_type_init() #endif -- 2.5.0

2 1

[libvirt] [v3] gobject: Add wrapper virDomainSetTime()
by Zeeshan Ali (Khattak) 23 Nov '15

23 Nov '15

--- libvirt-gobject/libvirt-gobject-domain.c | 134 +++++++++++++++++++++++++++++++ libvirt-gobject/libvirt-gobject-domain.h | 15 +++- libvirt-gobject/libvirt-gobject.sym | 9 +++ 3 files changed, 157 insertions(+), 1 deletion(-) diff --git a/libvirt-gobject/libvirt-gobject-domain.c b/libvirt-gobject/libvirt-gobject-domain.c index 34eb7ca..cb8096b 100644 --- a/libvirt-gobject/libvirt-gobject-domain.c +++ b/libvirt-gobject/libvirt-gobject-domain.c @@ -1886,3 +1886,137 @@ gboolean gvir_domain_get_has_current_snapshot(GVirDomain *dom, return TRUE; } + +/** + * gvir_domain_set_time: + * @dom: the domain + * @date_time: (allow-none)(transfer none): the time to set as #GDateTime. + * @flags: Unused, pass 0. + * @error: (allow-none): Place-holder for error or %NULL + * + * This function tries to set guest time to the given value. The passed + * time must in UTC. + * + * If @date_time is %NULL, the time is reset using the domain's RTC. + * + * Please note that some hypervisors may require guest agent to be configured + * and running in order for this function to work. + * + * Returns: %TRUE on success, %FALSE otherwise. + */ +gboolean gvir_domain_set_time(GVirDomain *dom, + GDateTime *date_time, + guint flags G_GNUC_UNUSED, + GError **err) +{ + int ret; + GTimeVal tv; + glong seconds; + glong nseconds; + guint settime_flags; + + g_return_val_if_fail(GVIR_IS_DOMAIN(dom), FALSE); + g_return_val_if_fail(err == NULL || *err == NULL, FALSE); + g_return_val_if_fail(flags == 0, FALSE); + + if (date_time != NULL) { + if (!g_date_time_to_timeval(date_time, &tv)) { + g_set_error_literal(err, GVIR_DOMAIN_ERROR, + 0, + "Failed to parse given time argument"); + return FALSE; + } + + seconds = tv.tv_sec; + nseconds = tv.tv_usec * 1000; + settime_flags = 0; + } else { + seconds = 0; + nseconds = 0; + settime_flags = VIR_DOMAIN_TIME_SYNC; + } + + ret = virDomainSetTime(dom->priv->handle, seconds, nseconds, settime_flags); + if (ret < 0) { + gvir_set_error_literal(err, GVIR_DOMAIN_ERROR, + 0, + "Unable to set domain time"); + return FALSE; + } + + return TRUE; +} + +static void +gvir_domain_set_time_helper(GTask *task, + gpointer object, + gpointer task_data, + GCancellable *cancellable G_GNUC_UNUSED) +{ + GVirDomain *dom = GVIR_DOMAIN(object); + GDateTime *date_time = (GDateTime *) task_data; + GError *err = NULL; + + if (!gvir_domain_set_time(dom, date_time, 0, &err)) + g_task_return_error(task, err); + else + g_task_return_boolean(task, TRUE); +} + +/** + * gvir_domain_set_time_async: + * @dom: the domain + * @date_time: (allow-none)(transfer none): the time to set as #GDateTime. + * @flags: bitwise-OR of #GVirDomainSetTimeFlags. + * @cancellable: (allow-none)(transfer none): cancellation object + * @callback: (scope async): completion callback + * @user_data: (closure): opaque data for callback + * + * Asynchronous variant of #gvir_domain_set_time. + */ +void gvir_domain_set_time_async(GVirDomain *dom, + GDateTime *date_time, + guint flags G_GNUC_UNUSED, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data) +{ + GTask *task; + + g_return_if_fail(GVIR_IS_DOMAIN(dom)); + g_return_if_fail((cancellable == NULL) || G_IS_CANCELLABLE(cancellable)); + g_return_if_fail(flags == 0); + + task = g_task_new(G_OBJECT(dom), + cancellable, + callback, + user_data); + if (date_time != NULL) + g_task_set_task_data(task, + g_date_time_ref(date_time), + (GDestroyNotify)g_date_time_unref); + g_task_run_in_thread(task, gvir_domain_set_time_helper); + + g_object_unref(task); +} + +/** + * gvir_domain_set_time_finish: + * @dom: the domain + * @result: (transfer none): async method result + * @err: Place-holder for possible errors + * + * Finishes the operation started by #gvir_domain_set_time_async. + * + * Returns: %TRUE on success, %FALSE otherwise. + */ +gboolean gvir_domain_set_time_finish(GVirDomain *dom, + GAsyncResult *result, + GError **err) +{ + g_return_val_if_fail(GVIR_IS_DOMAIN(dom), FALSE); + g_return_val_if_fail(g_task_is_valid(result, G_OBJECT(dom)), FALSE); + g_return_val_if_fail(err == NULL || *err == NULL, FALSE); + + return g_task_propagate_boolean(G_TASK(result), err); +} diff --git a/libvirt-gobject/libvirt-gobject-domain.h b/libvirt-gobject/libvirt-gobject-domain.h index 4fe381e..099cde3 100644 --- a/libvirt-gobject/libvirt-gobject-domain.h +++ b/libvirt-gobject/libvirt-gobject-domain.h @@ -215,7 +215,6 @@ typedef enum { GVIR_DOMAIN_SNAPSHOT_LIST_EXTERNAL = VIR_DOMAIN_SNAPSHOT_LIST_EXTERNAL } GVirDomainSnapshotListFlags; - typedef struct _GVirDomainInfo GVirDomainInfo; struct _GVirDomainInfo { @@ -401,6 +400,20 @@ gboolean gvir_domain_get_has_current_snapshot(GVirDomain *dom, gboolean *has_current_snapshot, GError **error); +gboolean gvir_domain_set_time(GVirDomain *dom, + GDateTime *date_time, + guint flags, + GError **err); +void gvir_domain_set_time_async(GVirDomain *dom, + GDateTime *date_time, + guint flags, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data); +gboolean gvir_domain_set_time_finish(GVirDomain *dom, + GAsyncResult *result, + GError **err); + G_END_DECLS #endif /* __LIBVIRT_GOBJECT_DOMAIN_H__ */ diff --git a/libvirt-gobject/libvirt-gobject.sym b/libvirt-gobject/libvirt-gobject.sym index ca89a45..cbfaa71 100644 --- a/libvirt-gobject/libvirt-gobject.sym +++ b/libvirt-gobject/libvirt-gobject.sym @@ -304,4 +304,13 @@ LIBVIRT_GOBJECT_0.2.2 { gvir_network_get_dhcp_leases; } LIBVIRT_GOBJECT_0.2.1; +LIBVIRT_GOBJECT_0.2.3 { + global: + gvir_domain_set_time_flags_get_type; + + gvir_domain_set_time; + gvir_domain_set_time_async; + gvir_domain_set_time_finish; +} LIBVIRT_GOBJECT_0.2.2; + # .... define new API here using predicted next version number .... -- 2.5.0

2 1

[libvirt] [PATCH] vz: implementation of boot device order
by Mikhail Feoktistov 23 Nov '15

23 Nov '15

This patch implements functionality of boot device order based on boot element from os section in XML. Now we support boot from CDROM and HDD. If we have several devices of the same type (for example hdd0 and hdd1), than we mark the first one as bootable. --- src/vz/vz_sdk.c | 111 +++++++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 81 insertions(+), 30 deletions(-) diff --git a/src/vz/vz_sdk.c b/src/vz/vz_sdk.c index 750133d..bebd3b8 100644 --- a/src/vz/vz_sdk.c +++ b/src/vz/vz_sdk.c @@ -2198,6 +2198,78 @@ prlsdkAddDeviceToBootList(PRL_HANDLE sdkdom, return -1; } +static int +prlsdkSetBootDevices(PRL_HANDLE sdkdom, + virDomainDefPtr def) +{ + size_t i; + PRL_RESULT pret; + PRL_HANDLE devList = PRL_INVALID_HANDLE; + PRL_HANDLE dev = PRL_INVALID_HANDLE; + PRL_DEVICE_TYPE currentDevType, bootDevType; + PRL_UINT32 devIndex, devCount, j; + PRL_UINT32 bootSequence = 0; + bool rootMount = false; + + pret = PrlVmCfg_GetAllDevices(sdkdom, &devList); + prlsdkCheckRetGoto(pret, error); + + pret = PrlHndlList_GetItemsCount(devList, &devCount); + prlsdkCheckRetGoto(pret, error); + + for (i = 0; i < def->os.nBootDevs; i++) { + switch (def->os.bootDevs[i]) { + case VIR_DOMAIN_BOOT_CDROM: + bootDevType = PDE_OPTICAL_DISK; + break; + case VIR_DOMAIN_BOOT_DISK: + bootDevType = PDE_HARD_DISK; + break; + default: + continue; + } + + for (j = 0; j < devCount; j++) { + pret = PrlHndlList_GetItem(devList, j, &dev); + prlsdkCheckRetGoto(pret, error); + + pret = PrlVmDev_GetType(dev, &currentDevType); + prlsdkCheckRetGoto(pret, error); + + if (currentDevType == bootDevType) { + pret = PrlVmDev_GetIndex(dev, &devIndex); + prlsdkCheckRetGoto(pret, error); + + if (prlsdkAddDeviceToBootList(sdkdom, devIndex, currentDevType, bootSequence) < 0) + goto error; + bootSequence++; + + if (IS_CT(def) && !rootMount) { + /* If we add physical device as a boot disk to container + we have to specify mount point for it */ + pret = PrlVmDevHd_SetMountPoint(dev, "/"); + prlsdkCheckRetGoto(pret, error); + rootMount = true; + } + } + PrlHandle_Free(dev); + dev = PRL_INVALID_HANDLE; + } + } + + PrlHandle_Free(devList); + return 0; + + error: + if (dev != PRL_INVALID_HANDLE) + PrlHandle_Free(dev); + + if (devList != PRL_INVALID_HANDLE) + PrlHandle_Free(devList); + + return -1; +} + static int prlsdkCheckGraphicsUnsupportedParams(virDomainDefPtr def) { virDomainGraphicsDefPtr gr; @@ -3145,9 +3217,7 @@ static int prlsdkDelDisk(PRL_HANDLE sdkdom, int idx) } static int prlsdkAddDisk(PRL_HANDLE sdkdom, - virDomainDiskDefPtr disk, - bool bootDisk, - bool isCt) + virDomainDiskDefPtr disk) { PRL_RESULT pret; PRL_HANDLE sdkdisk = PRL_INVALID_HANDLE; @@ -3156,7 +3226,6 @@ static int prlsdkAddDisk(PRL_HANDLE sdkdom, PRL_MASS_STORAGE_INTERFACE_TYPE sdkbus; int idx; virDomainDeviceDriveAddressPtr drive; - PRL_UINT32 devIndex; PRL_DEVICE_TYPE devType; char *dst = NULL; @@ -3302,21 +3371,6 @@ static int prlsdkAddDisk(PRL_HANDLE sdkdom, goto cleanup; } - if (bootDisk) { - pret = PrlVmDev_GetIndex(sdkdisk, &devIndex); - prlsdkCheckRetGoto(pret, cleanup); - - if (prlsdkAddDeviceToBootList(sdkdom, devIndex, devType, 0) < 0) - goto cleanup; - - /* If we add physical device as a boot disk to container - * we have to specify mount point for it */ - if (isCt) { - pret = PrlVmDevHd_SetMountPoint(sdkdisk, "/"); - prlsdkCheckRetGoto(pret, cleanup); - } - } - return 0; cleanup: PrlHandle_Free(sdkdisk); @@ -3335,7 +3389,7 @@ prlsdkAttachVolume(virDomainObjPtr dom, virDomainDiskDefPtr disk) if (PRL_FAILED(waitJob(job))) goto cleanup; - ret = prlsdkAddDisk(privdom->sdkdom, disk, false, IS_CT(dom->def)); + ret = prlsdkAddDisk(privdom->sdkdom, disk); if (ret == 0) { job = PrlVm_CommitEx(privdom->sdkdom, PVCF_DETACH_HDD_BUNDLE); if (PRL_FAILED(waitJob(job))) { @@ -3472,7 +3526,7 @@ prlsdkDoApplyConfig(virConnectPtr conn, PRL_RESULT pret; size_t i; char uuidstr[VIR_UUID_STRING_BUFLEN + 2]; - bool needBoot = true; + bool rootfsFound = false; char *mask = NULL; if (prlsdkCheckUnsupportedParams(sdkdom, def) < 0) @@ -3552,21 +3606,18 @@ prlsdkDoApplyConfig(virConnectPtr conn, for (i = 0; i < def->nfss; i++) { if (STREQ(def->fss[i]->dst, "/")) - needBoot = false; + rootfsFound = true; if (prlsdkAddFS(sdkdom, def->fss[i]) < 0) goto error; } for (i = 0; i < def->ndisks; i++) { - bool bootDisk = false; - - if (needBoot && - def->disks[i]->device == VIR_DOMAIN_DISK_DEVICE_DISK) { + if (prlsdkAddDisk(sdkdom, def->disks[i]) < 0) + goto error; + } - needBoot = false; - bootDisk = true; - } - if (prlsdkAddDisk(sdkdom, def->disks[i], bootDisk, IS_CT(def)) < 0) + if (!rootfsFound) { + if (prlsdkSetBootDevices(sdkdom, def) < 0) goto error; } -- 1.8.3.1

1 0

[libvirt] Drop deprecated API use + redundant compat. code
by Zeeshan Ali (Khattak) 23 Nov '15

23 Nov '15

Couldn't come up with a better summary here, sorry but these patches simply * Drop usage of deprecated GSimpleAsyncResult API. * Drop redundant compatibility API.

2 8

[libvirt] [PATCH] qemu: handle more machines with a single builtin IDE controller
by Guido Günther 23 Nov '15

23 Nov '15

like I440FX by moving the condition into qemuDomainMachineHasBuiltinIDE and adding more machines. Reference: http://bugs.debian.org/805189 --- src/qemu/qemu_command.c | 26 ++++++++++++++------------ src/qemu/qemu_domain.c | 10 ++++++++++ src/qemu/qemu_domain.h | 1 + 3 files changed, 25 insertions(+), 12 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index ef5ef93..4d00fd9 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -1054,11 +1054,12 @@ qemuAssignDeviceControllerAlias(virDomainDefPtr domainDef, */ return virAsprintf(&controller->info.alias, "pci.%d", controller->idx); } else if (controller->type == VIR_DOMAIN_CONTROLLER_TYPE_IDE) { - /* for any machine based on I440FX, the first (and currently - * only) IDE controller is an integrated controller hardcoded - * with id "ide" + /* for any machine based on e.g. I440FX or G3Beige, the + * first (and currently only) IDE controller is an integrated + * controller hardcoded with id "ide" */ - if (qemuDomainMachineIsI440FX(domainDef) && controller->idx == 0) + if (qemuDomainMachineHasBuiltinIDE(domainDef) && + controller->idx == 0) return VIR_STRDUP(controller->info.alias, "ide"); } else if (controller->type == VIR_DOMAIN_CONTROLLER_TYPE_SATA) { /* for any Q35 machine, the first SATA controller is the @@ -4914,14 +4915,15 @@ qemuBuildControllerDevStr(virDomainDefPtr domainDef, break; case VIR_DOMAIN_CONTROLLER_TYPE_IDE: - /* Since we currently only support the integrated IDE controller - * on 440fx, if we ever get to here, it's because some other - * machinetype had an IDE controller specified, or a 440fx had - * multiple ide controllers. + /* Since we currently only support the integrated IDE + * controller on various boards, if we ever get to here, it's + * because some other machinetype had an IDE controller + * specified, or one with a single IDE contraller had multiple + * ide controllers specified. */ - if (qemuDomainMachineIsI440FX(domainDef)) + if (qemuDomainMachineHasBuiltinIDE(domainDef)) virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("Only a single IDE controller is unsupported " + _("Only a single IDE controller is supported " "for this machine type")); else virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", @@ -9900,9 +9902,9 @@ qemuBuildCommandLine(virConnectPtr conn, cont->idx == 0 && qemuDomainMachineIsQ35(def)) continue; - /* first IDE controller on i440fx machines is implicit */ + /* first IDE controller is implicit on various machines */ if (cont->type == VIR_DOMAIN_CONTROLLER_TYPE_IDE && - cont->idx == 0 && qemuDomainMachineIsI440FX(def)) + cont->idx == 0 && qemuDomainMachineHasBuiltinIDE(def)) continue; if (cont->type == VIR_DOMAIN_CONTROLLER_TYPE_USB && diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 0861bfd..18513f9 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -3724,6 +3724,16 @@ qemuDomainDefValidateMemoryHotplug(const virDomainDef *def, } +bool +qemuDomainMachineHasBuiltinIDE(const virDomainDef *def) +{ + return qemuDomainMachineIsI440FX(def) || + STREQ(def->os.machine, "malta") || + STREQ(def->os.machine, "sun4u") || + STREQ(def->os.machine, "g3beige"); +} + + /** * qemuDomainUpdateCurrentMemorySize: * diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h index 8b6b1a3..271dce9 100644 --- a/src/qemu/qemu_domain.h +++ b/src/qemu/qemu_domain.h @@ -479,6 +479,7 @@ bool qemuDomainMachineIsQ35(const virDomainDef *def); bool qemuDomainMachineIsI440FX(const virDomainDef *def); bool qemuDomainMachineNeedsFDC(const virDomainDef *def); bool qemuDomainMachineIsS390CCW(const virDomainDef *def); +bool qemuDomainMachineHasBuiltinIDE(const virDomainDef *def); int qemuDomainUpdateCurrentMemorySize(virQEMUDriverPtr driver, virDomainObjPtr vm); -- 2.6.2

2 2

[libvirt] [PATCH 0/3] qemu: Fix machines with built in IDE
by Guido Günther 21 Nov '15

21 Nov '15

Hi, eadd757ccee0e72156a5345e6c25477aa057a9f1 introduced an error for machines with an unsupported IDE controller but missed some machine types. The attached three pathes fix this. Reference: http://bugs.debian.org/805189 Guido Günther (3): qemu: PPCs G3Beige has a default IDE controller qemu: sparc64s sun4u has a default IDE controller qemu: MIPS{,64} malta has a default IDE controller src/qemu/qemu_command.c | 34 ++++++++++++++++++++++++---------- src/qemu/qemu_domain.c | 21 +++++++++++++++++++++ src/qemu/qemu_domain.h | 3 +++ 3 files changed, 48 insertions(+), 10 deletions(-) -- 2.6.2

2 7

[libvirt] adding tests to qemu_driver
by noxdafox 20 Nov '15

20 Nov '15

Greetings, I was investigating on an issue in which QEMU's dynamic ownership was not properly working when calling qemuDomainCoreDumpWithFormat(). The core of the issue seems to be the qemuOpenFileAs() function which does not handle the dynamic ownership. This might affect other libvirt's features within as well. The function is quite complicated and I was thinking about refactoring it a bit in order to simplify the logic allowing to fix the dynamic ownership handling as well. In order to refactor it, I was planning to write tests in order to cover all its use cases before actually changing the code. The issue is that all the functions within the qemu_driver.c module are static. I could indeed include the module itself in my tests but I'm not sure whether this is acceptable. Furthermore I'd like to have some clarification about the NFS related code. It seems that some effort has been put in order to tackle something I'm not aware of. Could someone briefly explain how to reproduce NFS failing scenarios? Thank you.

3 6

[libvirt] ANNOUNCE: ruby-libvirt 0.6.0
by Chris Lalancette 20 Nov '15

20 Nov '15

All, I'm pleased to release ruby-libvirt 0.6.0. ruby-libvirt is a ruby wrapper around the libvirt API. The changelog between 0.5.2 and 0.6.0 is: * Fix possible buffer overflow * Fix storage volume creation error messages * Add additional storage pool defines * Implement Network dhcp_leases method * Implement Connect node_alloc_pages method * Implement Domain time method * Implement Connect domain_capabilities method * Implement Domain core_dump_with_format method * Implement Domain fs_freeze method * Implement Domain fs_info method * Implement Connect node_free_pages method Version 0.6.0 is available from http://libvirt.org/ruby: Tarball: http://libvirt.org/ruby/download/ruby-libvirt-0.5.2.tgz Gem: http://libvirt.org/ruby/download/ruby-libvirt-0.5.2.gem It is also available from rubygems.org; to get the latest version, run: $ gem install ruby-libvirt Packages for it are also built for Fedora, and will be released shortly. As usual, if you run into questions, problems, or bugs, please feel free to mail me (clalancette gmail com) and the libvirt mailing list. Thanks to those who contributed to this release.

1 0

[libvirt] [PATCH] Allow building lxc without virt-login-shell
by Cédric Bosdonnat 20 Nov '15

20 Nov '15

Add a configure option to disable virt-login-shell build even if lxc is enabled. --- configure.ac | 14 ++++++++++++++ tools/Makefile.am | 12 ++++++------ 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/configure.ac b/configure.ac index f481c50..c766351 100644 --- a/configure.ac +++ b/configure.ac @@ -1074,6 +1074,19 @@ if test "$with_lxc" = "yes" ; then fi AM_CONDITIONAL([WITH_LXC], [test "$with_lxc" = "yes"]) +AC_ARG_WITH([login_shell], + [AS_HELP_STRING([--with-login-shell], + [build virt-login-shell @<:@default=yes@:>@])]) +m4_divert_text([DEFAULTS], [with_login_shell=yes]) + +if test "$with_lxc" != "yes" ; then + with_login_shell="no" +fi +if test "$with_login_shell" ; then + AC_DEFINE_UNQUOTED([WITH_LOGIN_SHELL], 1, [whether virt-login-shell is built]) +fi +AM_CONDITIONAL([WITH_LOGIN_SHELL], [test "$with_login_shell" = "yes"]) + dnl dnl Checks for the Parallels driver dnl @@ -2974,6 +2987,7 @@ AC_MSG_NOTICE([ Init script: $with_init_script]) AC_MSG_NOTICE([Char device locks: $with_chrdev_lock_files]) AC_MSG_NOTICE([ Default Editor: $DEFAULT_EDITOR]) AC_MSG_NOTICE([ Loader/NVRAM: $with_loader_nvram]) +AC_MSG_NOTICE([ virt-login-shell: $with_login_shell]) AC_MSG_NOTICE([]) AC_MSG_NOTICE([Developer Tools]) AC_MSG_NOTICE([]) diff --git a/tools/Makefile.am b/tools/Makefile.am index d5638d9..d005035 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -71,12 +71,12 @@ sbin_SCRIPTS = virt-sanlock-cleanup DISTCLEANFILES += virt-sanlock-cleanup endif WITH_SANLOCK -if WITH_LXC +if WITH_LOGIN_SHELL conf_DATA += virt-login-shell.conf bin_PROGRAMS += virt-login-shell -else ! WITH_LXC +else ! WITH_LOGIN_SHELL EXTRA_DIST += virt-login-shell.conf -endif ! WITH_LXC +endif ! WITH_LOGIN_SHELL dist_man1_MANS = \ @@ -84,11 +84,11 @@ dist_man1_MANS = \ virt-pki-validate.1 \ virt-xml-validate.1 \ virsh.1 -if WITH_LXC +if WITH_LOGIN_SHELL dist_man1_MANS += virt-login-shell.1 -else ! WITH_LXC +else ! WITH_LOGIN_SHELL EXTRA_DIST += virt-login-shell.1 -endif ! WITH_LXC +endif ! WITH_LOGIN_SHELL if WITH_SANLOCK dist_man8_MANS = virt-sanlock-cleanup.8 endif WITH_SANLOCK -- 2.1.4

4 5

[libvirt] [PATCH 0/2] Address more nfs root-squash issues
by John Ferlan 20 Nov '15

20 Nov '15

Fix a couple of more issues with an NFS root-squash environment. The details are in the commit messages and bugzilla comments. NB: While using virFileOpenAs in the virStorageBackendVolOpen path and checking for EACESS/EPERM afterwards may seem a bit counter intuitive, but those will be returned if the virFileOpenAs code doesn't attempt to open in the forked environment. John Ferlan (2): storage: Really fix setting mode for backend exec in NFS root-squash env storage: Change virStorageBackendVolOpen to use virFileOpenAs src/storage/storage_backend.c | 37 +++++++++++++++++++++++++++++++++---- 1 file changed, 33 insertions(+), 4 deletions(-) -- 2.5.0

2 3

[libvirt] [PATCH] Use correct pci addresses during device-detach
by Nitesh_Konkar 20 Nov '15

20 Nov '15

From: Nitesh_Konkar <niteshkonkar(a)in.ibm.com> The attach-device on live and persistent copies can be done independently. Thus devices can end up having different pci addresses in live and persistent copies. The detach device should try to detach the device from their respective addresses instead of using the same from live/persistent. Signed-off-by:nitkon12@linux.vnet.ibm.com --- src/driver-nodedev.h | 1 + src/qemu/qemu_driver.c | 25 ++++++++++--------------- 2 files changed, 11 insertions(+), 15 deletions(-) diff --git a/src/driver-nodedev.h b/src/driver-nodedev.h index e846612..dea79bd 100644 --- a/src/driver-nodedev.h +++ b/src/driver-nodedev.h @@ -59,6 +59,7 @@ typedef char * typedef char * (*virDrvNodeDeviceGetParent)(virNodeDevicePtr dev); + typedef int (*virDrvNodeDeviceNumOfCaps)(virNodeDevicePtr dev); diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index f133b45..6fd58c2 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -8708,23 +8708,12 @@ static int qemuDomainDetachDeviceFlags(virDomainPtr dom, const char *xml, !(flags & VIR_DOMAIN_AFFECT_LIVE)) parse_flags |= VIR_DOMAIN_DEF_PARSE_INACTIVE; - dev = dev_copy = virDomainDeviceDefParse(xml, vm->def, + dev_copy = virDomainDeviceDefParse(xml, vm->def, caps, driver->xmlopt, parse_flags); - if (dev == NULL) + if (dev_copy == NULL) goto endjob; - if (flags & VIR_DOMAIN_AFFECT_CONFIG && - flags & VIR_DOMAIN_AFFECT_LIVE) { - /* If we are affecting both CONFIG and LIVE - * create a deep copy of device as adding - * to CONFIG takes one instance. - */ - dev_copy = virDomainDeviceDefCopy(dev, vm->def, caps, driver->xmlopt); - if (!dev_copy) - goto endjob; - } - if (priv->qemuCaps) qemuCaps = virObjectRef(priv->qemuCaps); else if (!(qemuCaps = virQEMUCapsCacheLookup(driver->qemuCapsCache, vm->def->emulator))) @@ -8736,6 +8725,13 @@ static int qemuDomainDetachDeviceFlags(virDomainPtr dom, const char *xml, if (!vmdef) goto endjob; + dev = virDomainDeviceDefParse(xml, vmdef, + caps, driver->xmlopt, + parse_flags); + if (!dev) + goto endjob; + + if (virDomainDefCompatibleDevice(vmdef, dev, VIR_DOMAIN_DEVICE_ACTION_DETACH) < 0) goto endjob; @@ -8777,8 +8773,7 @@ static int qemuDomainDetachDeviceFlags(virDomainPtr dom, const char *xml, cleanup: virObjectUnref(qemuCaps); virDomainDefFree(vmdef); - if (dev != dev_copy) - virDomainDeviceDefFree(dev_copy); + virDomainDeviceDefFree(dev_copy); virDomainDeviceDefFree(dev); virDomainObjEndAPI(&vm); virObjectUnref(caps); -- 2.4.0

2 1

[libvirt] [PATCH 0/3] security: misc cleanups
by Ján Tomko 20 Nov '15

20 Nov '15

Ján Tomko (3): security_dac: check if virSecurityDACGetIds returns negative security: remove extra security from function names security_selinux: fix indentation src/security/security_dac.c | 242 ++++++++++++++++++++-------------------- src/security/security_selinux.c | 205 +++++++++++++++++----------------- 2 files changed, 223 insertions(+), 224 deletions(-) -- 2.4.6

2 6

[libvirt] [PATCH 0/2] Fix coverity build and resolve new issue
by John Ferlan 20 Nov '15

20 Nov '15

The first patch is a Coverity build breaker... The second one popped up recently and while some may consider it noise or a false positive, it is the only call that didn't check status. Not sure why it "popped up" after the recent changes, but that does happen. John Ferlan (2): qemu: Fix build error in Coverity environment vbox: Resolve Coverity CHECKED_RETURN src/qemu/qemu_command.h | 2 +- src/vbox/vbox_common.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) -- 2.5.0

3 8

[libvirt] [PATCH 0/6] Fixes for memory locking limit
by Andrea Bolognani 20 Nov '15

20 Nov '15

The code dealing with RLIMIT_MEMLOCK contained a few assumptions that hold for x86 but don't necessarily work as well for other platforms, eg. that qemu will need to lock memory only when VFIO passthrough is involved. This series removes such assumptions by removing ad-hoc code and making sure that the function containing the correct logic is called instead; it also implements the platform-specific calculations needed to calculate the correct RLIMIT_MEMLOCK value for ppc64 guests. Patches 1-4 are architecture-agnostic, patches 5-6 are specific to ppc64. Cheers. Andrea Bolognani (6): process: Log when limiting the amount of locked memory qemu: Use qemuDomainRequiresMlock() in qemuBuildCommandLine() qemu: Use qemuDomainRequiresMlock() when attaching PCI hostdev qemu: Reduce memlock limit after detaching hostdev qemu: Always set locked memory limit for ppc64 domains qemu: Add ppc64-specific math to qemuDomainGetMlockLimitBytes() src/qemu/qemu_command.c | 9 ++--- src/qemu/qemu_domain.c | 89 +++++++++++++++++++++++++++++++++++++++++++++++-- src/qemu/qemu_hotplug.c | 29 ++++++++++++---- src/util/virprocess.c | 4 +++ 4 files changed, 116 insertions(+), 15 deletions(-) -- 2.5.0

3 18

[libvirt] [PATCHv4 0/6] Hyper-v crash feature support
by Dmitry Andreev 19 Nov '15

19 Nov '15

A new Hyper-V cpu feature 'hv_crash' was added to QEMU. The feature will become available in v2.5.0. What is changed in v4: * panic model attribute is added even if it wasn't specified by the user [5/6], tests updated. * configuration with multiple panic defices of same model is rejected [6/6] 1-4 commits have no changes. The previous version: https://www.redhat.com/archives/libvir-list/2015-November/msg00457.html Dmitry Andreev (6): conf: add 'model' attribute for panic device with values isa, pseries, hyperv qemu: add support for hv_crash feature as a panic device schema: allow multiple panic devices tests: add tests for panic models and multiple panic devices qemu: set panic device model if not specified by the user conf: reject multiple panic devices of same model docs/formatdomain.html.in | 19 ++- docs/schemas/domaincommon.rng | 13 ++- src/conf/domain_conf.c | 128 +++++++++++++-------- src/conf/domain_conf.h | 15 ++- src/qemu/qemu_command.c | 74 ++++++++++-- src/qemu/qemu_domain.c | 30 ++++- tests/qemuargv2xmltest.c | 1 + .../qemuxml2argv-hyperv-panic.args | 21 ++++ .../qemuxml2argvdata/qemuxml2argv-hyperv-panic.xml | 25 ++++ .../qemuxml2argv-panic-double.args | 21 ++++ .../qemuxml2argvdata/qemuxml2argv-panic-double.xml | 28 +++++ tests/qemuxml2argvdata/qemuxml2argv-panic-isa.xml | 31 +++++ .../qemuxml2argv-panic-no-address.xml | 2 +- .../qemuxml2argv-panic-pseries.xml | 30 +++++ .../qemuxml2argvdata/qemuxml2argv-pseries-disk.xml | 2 +- .../qemuxml2argv-pseries-nvram.xml | 2 +- tests/qemuxml2argvtest.c | 3 + tests/qemuxml2xmloutdata/qemuxml2xmlout-panic.xml | 31 +++++ .../qemuxml2xmlout-pseries-panic-missing.xml | 2 +- .../qemuxml2xmlout-pseries-panic-no-address.xml | 30 +++++ tests/qemuxml2xmltest.c | 8 +- 21 files changed, 446 insertions(+), 70 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-hyperv-panic.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-hyperv-panic.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-panic-double.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-panic-double.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-panic-isa.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-panic-pseries.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-panic.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-panic-no-address.xml -- 1.8.3.1

2 12

[libvirt] [PATCH 0/2] libxl: a few minor fixes
by Jim Fehlig 19 Nov '15

19 Nov '15

A few minor fixes for patches 1 and 2 of Joao's series adding stats support to the libxl driver https://www.redhat.com/archives/libvir-list/2015-November/msg00489.html I only noticed the minor flaws while reviewing patches later in the series, after already committing patches 1 and 2. Jim Fehlig (2): libxl: unref libxlDriverConfig object libxl: don't unlock virDomainObj if refcnt is 0 src/libxl/libxl_driver.c | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) -- 2.1.4

3 7

[libvirt] qemuParseCommandLine and virDomainDefPostParse (and virDomaniDefAddImplicitControllers)
by Laine Stump 19 Nov '15

19 Nov '15

While playing with the idea of forcing explicit USB controller models, I ended up with the qemuargv2xml test failing; it ended up that this was because changes I had made to qemuDomainDefPostParse() were affecting the XML produced by qemuParseCommandline(). The reason - after constructing a virDomainDef object by parsing a qemu commandline, qemuParseCommandline() calls two functions that are supposed to be called after parsing domain XML - virDomainDefPostParse() (which calls qemuDomainDefPostParse()). In my opinion, qemuParseCommandLine() shouldn't be calling virDomainDefPostParse() (or virDomainefAddImplicitControllers(), which it calls in the wrong order relative to virDomainDefPostParse() BTW). The reasons are: 1) this is causing the argv-to-xml conversion to include things in the XML that were not on the original commandline, in particular "default" devices like PCI and USB controllers (added in qemuDomainDefPostParse() based on machinetype) as well as disk, smartcard, virtio-serial, and hostdev-scsi controllers in virDomainDefAddImplicitControllers() (why the duality there, anyway?) 2) If the output of argv-to-xml is used for a virDomainDefine, those post-parse functions will be called then, and the implicit/auto devices will be added at that time anyway, so in practice nothing is gained by adding them during argv-to-xml. Does anyone else have an opinion about this?

3 5

[libvirt] [PATCH v2] vz: implementation of domainReboot callback
by Mikhail Feoktistov 19 Nov '15

19 Nov '15

Diff from v1. 1. Add virCheckFlags() call in vzDomainReboot --- src/vz/vz_driver.c | 8 ++++++++ src/vz/vz_sdk.c | 8 ++++++++ src/vz/vz_sdk.h | 1 + 3 files changed, 17 insertions(+) diff --git a/src/vz/vz_driver.c b/src/vz/vz_driver.c index 0a968b9..39f58a4 100644 --- a/src/vz/vz_driver.c +++ b/src/vz/vz_driver.c @@ -923,6 +923,13 @@ static int vzDomainShutdown(virDomainPtr domain) return prlsdkDomainChangeState(domain, prlsdkStop); } +static int vzDomainReboot(virDomainPtr domain, + unsigned int flags) +{ + virCheckFlags(0, -1); + return prlsdkDomainChangeState(domain, prlsdkRestart); +} + static int vzDomainIsActive(virDomainPtr domain) { virDomainObjPtr dom = NULL; @@ -1486,6 +1493,7 @@ static virHypervisorDriver vzDriver = { .domainShutdown = vzDomainShutdown, /* 0.10.0 */ .domainCreate = vzDomainCreate, /* 0.10.0 */ .domainCreateWithFlags = vzDomainCreateWithFlags, /* 1.2.10 */ + .domainReboot = vzDomainReboot, /* 1.2.22 */ .domainDefineXML = vzDomainDefineXML, /* 0.10.0 */ .domainDefineXMLFlags = vzDomainDefineXMLFlags, /* 1.2.12 */ .domainUndefine = vzDomainUndefine, /* 1.2.10 */ diff --git a/src/vz/vz_sdk.c b/src/vz/vz_sdk.c index 89c9e89..bf71e96 100644 --- a/src/vz/vz_sdk.c +++ b/src/vz/vz_sdk.c @@ -1831,6 +1831,14 @@ PRL_RESULT prlsdkSuspend(PRL_HANDLE sdkdom) return waitJob(job); } +PRL_RESULT prlsdkRestart(PRL_HANDLE sdkdom) +{ + PRL_HANDLE job = PRL_INVALID_HANDLE; + + job = PrlVm_Restart(sdkdom); + return waitJob(job); +} + int prlsdkDomainChangeStateLocked(vzConnPtr privconn, virDomainObjPtr dom, diff --git a/src/vz/vz_sdk.h b/src/vz/vz_sdk.h index ebe4591..88ee7d9 100644 --- a/src/vz/vz_sdk.h +++ b/src/vz/vz_sdk.h @@ -41,6 +41,7 @@ PRL_RESULT prlsdkStop(PRL_HANDLE sdkdom); PRL_RESULT prlsdkPause(PRL_HANDLE sdkdom); PRL_RESULT prlsdkResume(PRL_HANDLE sdkdom); PRL_RESULT prlsdkSuspend(PRL_HANDLE sdkdom); +PRL_RESULT prlsdkRestart(PRL_HANDLE sdkdom); typedef PRL_RESULT (*prlsdkChangeStateFunc)(PRL_HANDLE sdkdom); int -- 1.8.3.1

3 2

[libvirt] [PATCH] vz: allow only en-us keymap for VNC
by Mikhail Feoktistov 19 Nov '15

19 Nov '15

In virtuozzo we support only en-us keymap for VMs and containers. If keymap is specified than check that it's en-us, otherwise show error message. --- src/vz/vz_sdk.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/vz/vz_sdk.c b/src/vz/vz_sdk.c index 89c9e89..526c0f2 100644 --- a/src/vz/vz_sdk.c +++ b/src/vz/vz_sdk.c @@ -2220,10 +2220,11 @@ static int prlsdkCheckGraphicsUnsupportedParams(virDomainDefPtr def) return -1; } - if (gr->data.vnc.keymap != 0) { + if (gr->data.vnc.keymap != 0 && + STRNEQ(gr->data.vnc.keymap, "en-us")) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("vz driver doesn't support " - "keymap setting for VNC graphics.")); + _("vz driver supports only " + "\"en-us\" keymap for VNC graphics.")); return -1; } -- 1.8.3.1

2 1