- Devel - libvirt List Archives

[libvirt] Build failed in Jenkins: libvirt-syntax-check #2465
by Jenkins CI 09 Jul '14

09 Jul '14

See <http://honk.sigxcpu.org:8001/job/libvirt-syntax-check/2465/> ------------------------------------------ [...truncated 148 lines...] 0.43 prohibit_empty_lines_at_EOF prohibit_error_without_use grep: write error grep: write error /bin/sed: couldn't write 25 items to stdout: Broken pipe sed: couldn't write 1 item to stdout: Broken pipe 0.48 prohibit_error_without_use prohibit_exit_in_tests 0.53 prohibit_exit_in_tests prohibit_fork_wrappers 0.72 prohibit_fork_wrappers prohibit_getenv 0.63 prohibit_getenv prohibit_gethostby 0.61 prohibit_gethostby prohibit_gethostname 0.62 prohibit_gethostname prohibit_getopt_without_use grep: write error grep: write error /bin/sed: couldn't write 25 items to stdout: Broken pipe sed: couldn't write 1 item to stdout: Broken pipe 0.45 prohibit_getopt_without_use prohibit_gettext_markup 0.66 prohibit_gettext_markup prohibit_gettext_noop 0.62 prohibit_gettext_noop prohibit_hash_pjw_without_use grep: write error grep: write error /bin/sed: couldn't write 60 items to stdout: Broken pipe sed: couldn't write 1 item to stdout: Broken pipe 0.43 prohibit_hash_pjw_without_use prohibit_have_config_h 0.65 prohibit_have_config_h prohibit_ignore_value_without_use grep: write error grep: write error /bin/sed: couldn't write 25 items to stdout: Broken pipe sed: couldn't write 1 item to stdout: Broken pipe 0.50 prohibit_ignore_value_without_use prohibit_include_public_headers_brackets 0.60 prohibit_include_public_headers_brackets prohibit_include_public_headers_quote 0.44 prohibit_include_public_headers_quote prohibit_int_ijk 0.84 prohibit_int_ijk prohibit_internal_functions 0.78 prohibit_internal_functions prohibit_intprops_without_use grep: write error grep: write error /bin/sed: couldn't write 25 items to stdout: Broken pipe sed: couldn't write 1 item to stdout: Broken pipe 0.40 prohibit_intprops_without_use prohibit_inttostr_without_use grep: write error grep: write error /bin/sed: couldn't write 25 items to stdout: Broken pipe sed: couldn't write 1 item to stdout: Broken pipe 0.43 prohibit_inttostr_without_use prohibit_libgen 0.83 prohibit_libgen prohibit_long_lines 0.56 prohibit_long_lines prohibit_long_options_without_use grep: write error grep: write error /bin/sed: couldn't write 25 items to stdout: Broken pipe sed: couldn't write 1 item to stdout: Broken pipe 0.44 prohibit_long_options_without_use prohibit_loop_iijjkk 0.80 prohibit_loop_iijjkk prohibit_loop_var_decl 0.46 prohibit_loop_var_decl prohibit_magic_number_exit 0.98 prohibit_magic_number_exit prohibit_mixed_case_abbreviations 0.49 prohibit_mixed_case_abbreviations prohibit_mkstemp 0.58 prohibit_mkstemp prohibit_newline_at_end_of_diagnostic 0.61 prohibit_newline_at_end_of_diagnostic prohibit_nonreentrant 27.36 prohibit_nonreentrant prohibit_openat_without_use grep: write error grep: write error /bin/sed: couldn't write 25 items to stdout: Broken pipe sed: couldn't write 1 item to stdout: Broken pipe 0.43 prohibit_openat_without_use prohibit_path_max_allocation 0.62 prohibit_path_max_allocation prohibit_posixver_without_use grep: write error grep: write error /bin/sed: couldn't write 25 items to stdout: Broken pipe sed: couldn't write 1 item to stdout: Broken pipe 0.42 prohibit_posixver_without_use prohibit_raw_allocation 0.68 prohibit_raw_allocation prohibit_readdir 0.56 prohibit_readdir prohibit_readlink 0.63 prohibit_readlink prohibit_return_as_function 0.61 prohibit_return_as_function prohibit_reversed_compare_failure 0.49 prohibit_reversed_compare_failure prohibit_risky_id_promotion 0.65 prohibit_risky_id_promotion prohibit_root_dev_ino_without_use grep: write error grep: write error /bin/sed: couldn't write 25 items to stdout: Broken pipe sed: couldn't write 1 item to stdout: Broken pipe 0.40 prohibit_root_dev_ino_without_use prohibit_safe_read_without_use grep: write error grep: write error /bin/sed: couldn't write 43 items to stdout: Broken pipe sed: couldn't write 60 items to stdout: Broken pipe 0.38 prohibit_safe_read_without_use prohibit_same_without_use grep: write error grep: write error /bin/sed: couldn't write 1 item to stdout: Broken pipe sed: couldn't write 60 items to stdout: Broken pipe 0.39 prohibit_same_without_use prohibit_select 0.64 prohibit_select prohibit_semicolon_at_eol_in_python 0.30 prohibit_semicolon_at_eol_in_python prohibit_setuid 0.64 prohibit_setuid prohibit_signal_without_use grep: write error grep: write error /bin/sed: couldn't write 25 items to stdout: Broken pipe sed: couldn't write 60 items to stdout: Broken pipe 0.42 prohibit_signal_without_use prohibit_sprintf 0.65 prohibit_sprintf prohibit_stddef_without_use grep: write error grep: write error /bin/sed: couldn't write 25 items to stdout: Broken pipe sed: couldn't write 1 item to stdout: Broken pipe 0.40 prohibit_stddef_without_use prohibit_stdio--_without_use grep: write error grep: write error /bin/sed: couldn't write 25 items to stdout: Broken pipe sed: couldn't write 1 item to stdout: Broken pipe 0.40 prohibit_stdio--_without_use prohibit_stdio-safer_without_use grep: write error grep: write error /bin/sed: couldn't write 25 items to stdout: Broken pipe sed: couldn't write 1 item to stdout: Broken pipe 0.37 prohibit_stdio-safer_without_use prohibit_strcmp 0.59 prohibit_strcmp prohibit_strdup 0.61 prohibit_strdup prohibit_strings_without_use grep: write error grep: write error /bin/sed: couldn't write 25 items to stdout: Broken pipe sed: couldn't write 1 item to stdout: Broken pipe 0.36 prohibit_strings_without_use prohibit_strncmp 0.66 prohibit_strncmp prohibit_strncpy 0.59 prohibit_strncpy prohibit_strtol 1.19 prohibit_strtol prohibit_test_double_equal 0.44 prohibit_test_double_equal prohibit_test_minus_ao 0.67 prohibit_test_minus_ao prohibit_unbounded_arrays_in_rpc 0.24 prohibit_unbounded_arrays_in_rpc prohibit_undesirable_word_seq 31.97 prohibit_undesirable_word_seq prohibit_useless_translation 1.09 prohibit_useless_translation prohibit_verify_without_use grep: write error grep: write error /bin/sed: couldn't write 25 items to stdout: Broken pipe sed: couldn't write 1 item to stdout: Broken pipe 0.42 prohibit_verify_without_use prohibit_virBufferAdd_with_string_literal 0.57 prohibit_virBufferAdd_with_string_literal prohibit_virBufferAsprintf_with_string_literal 0.55 prohibit_virBufferAsprintf_with_string_literal prohibit_virConnectOpen_in_virsh 0.25 prohibit_virConnectOpen_in_virsh prohibit_windows_special_chars_in_filename 0.15 prohibit_windows_special_chars_in_filename prohibit_wrong_filename_in_comment 0.70 prohibit_wrong_filename_in_comment prohibit_xalloc_without_use grep: write error grep: write error /bin/sed: couldn't write 25 items to stdout: Broken pipe sed: couldn't write 1 item to stdout: Broken pipe 0.37 prohibit_xalloc_without_use prohibit_xfreopen_without_use grep: write error grep: write error /bin/sed: couldn't write 25 items to stdout: Broken pipe sed: couldn't write 1 item to stdout: Broken pipe 0.36 prohibit_xfreopen_without_use prohibit_xmlGetProp 0.54 prohibit_xmlGetProp prohibit_xmlURI 0.59 prohibit_xmlURI proper_name_utf8_requires_ICONV 0.38 proper_name_utf8_requires_ICONV redundant_const 0.61 redundant_const require_config_h 0.30 require_config_h require_config_h_first grep: write error grep: write error /bin/sed: couldn't write 43 items to stdout: Broken pipe sed: couldn't write 60 items to stdout: Broken pipe 7.92 require_config_h_first require_enum_last_marker 0.46 require_enum_last_marker require_locale_h 0.47 require_locale_h require_space_before_label 0.43 require_space_before_label require_whitespace_in_translation 1.00 require_whitespace_in_translation size_of_brackets 0.63 size_of_brackets spec_indentation cppi: libvirt.spec.in: line 771: not properly indented cppi: libvirt.spec.in: line 773: not properly indented cppi: libvirt.spec.in: line 788: not properly indented cppi: libvirt.spec.in: line 790: not properly indented maint.mk: incorrect preprocessor indentation make: *** [sc_spec_indentation] Error 1 Build step 'Execute shell' marked build as failure

5 5

[libvirt] [PATCHv5 00/28] Refactor changing of domain disk source
by Peter Krempa 09 Jul '14

09 Jul '14

v4 wasn't reviewed, but recent patches caused pretty serious conflicts thus I'm posting a rebased version. Note that one of the patches was already pushed as a part of a different series. This series is also a preparation for fixing issue with libvirt not setting correct permissions on gluster volumes. Peter Krempa (28): storage: Implement virStorageFileCreate for local and gluster files qemu: Don't propagate whole disk definition into qemuDomainGetImageIds qemu: Add helper to initialize storage file backend with correct uid/gid storage: file: Tolerate NULL src when uninitializing the backend conf: Don't output seclabels for backingStore elements storage: Move readonly and shared flags to disk source from disk def util: storagefile: Add deep copy for struct virStorageSource util: storage: Add function to transfer config parts to new chain element util: storage: Copy parent's disk metadata to backing chain elements util: cgroup: Add helper to convert device mode to string qemu: cgroup: Add functions to set cgroup image stuff on individual imgs qemu: cgroup: Setup only the top level disk image for read-write access locking: Add APIs to lock individual image files security: Introduce APIs to label single images security: selinux: Implement per-image seclabel restore security: selinux: Implement per-image seclabel set security: DAC: Implement per-image seclabel restore security: DAC: Implement per-image seclabel set security: AppArmor: Implement per-image seclabel restore security: AppArmor: Implement per-image seclabel set util: storage: Make virStorageFileChainLookup more network storage aware util: storage: Return complete parent info from virStorageFileChainLookup qemu: blockcopy: Use the mirror disk source to label the files qemu: block: Properly track disk source while pivotting to new image qemu: snapshot: Improve approach to deal with snapshot metadata qemu: Refactor qemuDomainPrepareDiskChainElement qemu: snapshot: Refactor image labelling of new snapshot files qemu: snapshot: Use storage driver to pre-create snapshot file src/conf/domain_conf.c | 77 +++++--- src/conf/domain_conf.h | 2 - src/libvirt_private.syms | 7 + src/libxl/libxl_conf.c | 2 +- src/locking/domain_lock.c | 65 ++++--- src/locking/domain_lock.h | 8 + src/lxc/lxc_cgroup.c | 2 +- src/lxc/lxc_controller.c | 2 +- src/lxc/lxc_driver.c | 2 +- src/qemu/qemu_cgroup.c | 109 ++++++----- src/qemu/qemu_cgroup.h | 3 + src/qemu/qemu_command.c | 14 +- src/qemu/qemu_conf.c | 4 +- src/qemu/qemu_domain.c | 29 ++- src/qemu/qemu_domain.h | 4 + src/qemu/qemu_driver.c | 350 +++++++++++----------------------- src/qemu/qemu_migration.c | 16 +- src/security/security_apparmor.c | 55 ++++-- src/security/security_dac.c | 111 +++++------ src/security/security_driver.h | 10 + src/security/security_manager.c | 56 ++++++ src/security/security_manager.h | 7 + src/security/security_nop.c | 19 ++ src/security/security_selinux.c | 150 +++++++++------ src/security/security_stack.c | 38 ++++ src/security/virt-aa-helper.c | 2 +- src/storage/storage_backend_fs.c | 17 ++ src/storage/storage_backend_gluster.c | 28 +++ src/storage/storage_driver.c | 2 +- src/util/vircgroup.c | 62 ++++-- src/util/vircgroup.h | 2 + src/util/virstoragefile.c | 280 ++++++++++++++++++++++++--- src/util/virstoragefile.h | 14 +- src/vbox/vbox_tmpl.c | 30 +-- src/xenxs/xen_sxpr.c | 10 +- src/xenxs/xen_xm.c | 10 +- tests/virstoragetest.c | 86 ++++----- 37 files changed, 1075 insertions(+), 610 deletions(-) -- 1.9.3

2 59

[libvirt] [PATCH] qemu: fix domxml-to-native failing when spice_tls is not enabled
by Jincheng Miao 09 Jul '14

09 Jul '14

The default graphics channel mode is 'any', so as to defaultMode attribute. If defaultMode and channel mode are all the default value 'any', qemuConnectDomainXMLToNative will set TLSPort. But in qemuBuildGraphicsSPICECommandLine, if spice_tls is not enabled, libvirtd will report an error to tell the user that spice TLS is disabled in qemu.conf. So qemuConnectDomainXMLToNative should check spice_tls is enabled, then decide to allocate an tlsPort number to this graphics. If user specified defaultMode is 'secure', qemuConnectDomainXMLToNative could allocate tlsPort, and then let qemuBuildGraphicsSPICECommandLine reports the spice_tls disabled error. The related bug is: https://bugzilla.redhat.com/show_bug.cgi?id=1113868 Signed-off-by: Jincheng Miao <jmiao(a)redhat.com> --- src/qemu/qemu_driver.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index d34da6f..d1e3b2f 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -6013,7 +6013,8 @@ static char *qemuConnectDomainXMLToNative(virConnectPtr conn, break; case VIR_DOMAIN_GRAPHICS_SPICE_CHANNEL_MODE_ANY: - needTLSPort = true; + if (cfg->spiceTLS) + needTLSPort = true; needPort = true; break; } -- 1.7.1

2 2

[libvirt] [PATCH 0/3] Few cleanups pointed out in reviews
by Peter Krempa 09 Jul '14

09 Jul '14

Peter Krempa (3): conf: Verify metadata type right away util: XML: Avoid forward function declaration lib: Check conditions for VIR_DOMAIN_BLOCK_REBASE_RELATIVE right away src/conf/domain_conf.c | 10 ++-------- src/libvirt.c | 17 +++++++++++++---- src/qemu/qemu_driver.c | 7 ------- src/util/virxml.c | 5 ----- 4 files changed, 15 insertions(+), 24 deletions(-) -- 2.0.0

3 9

[libvirt] [PATCH] virEventPollDispatchHandles: Honour array boundaries
by Michal Privoznik 09 Jul '14

09 Jul '14

When dispatching events from the event loop, the array of registered handles is searched to see what handles happened an event on. However, the array is searched in weird way: the check for the array boundaries is at the end, so we may touch the elements after the end of the array: ==10434== Invalid read of size 4 ==10434== at 0x52D06B6: virEventPollDispatchHandles (vireventpoll.c:486) ==10434== by 0x52D10E4: virEventPollRunOnce (vireventpoll.c:660) ==10434== by 0x52CF207: virEventRunDefaultImpl (virevent.c:308) ==10434== by 0x1639D1: virNetServerRun (virnetserver.c:1139) ==10434== by 0x1220DC: main (libvirtd.c:1507) ==10434== Address 0xc11ff04 is 4 bytes after a block of size 960 alloc'd ==10434== at 0x4C2CA5E: realloc (in /usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so) ==10434== by 0x52AD378: virReallocN (viralloc.c:245) ==10434== by 0x52AD46E: virExpandN (viralloc.c:294) ==10434== by 0x52AD5B1: virResizeN (viralloc.c:352) ==10434== by 0x52CF2EC: virEventPollAddHandle (vireventpoll.c:116) ==10434== by 0x52CEF5B: virEventAddHandle (virevent.c:78) ==10434== by 0x11F69A90: nodeStateInitialize (node_device_udev.c:1797) ==10434== by 0x53C3C89: virStateInitialize (libvirt.c:743) ==10434== by 0x120563: daemonRunStateInit (libvirtd.c:919) ==10434== by 0x5317719: virThreadHelper (virthread.c:197) ==10434== by 0x8376F39: start_thread (in /lib64/libpthread-2.17.so) ==10434== by 0x8A7F9FC: clone (in /lib64/libc-2.17.so) Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/util/vireventpoll.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/util/vireventpoll.c b/src/util/vireventpoll.c index 528b24c..13f40dc 100644 --- a/src/util/vireventpoll.c +++ b/src/util/vireventpoll.c @@ -477,46 +477,46 @@ static int virEventPollDispatchTimeouts(void) static int virEventPollDispatchHandles(int nfds, struct pollfd *fds) { size_t i, n; VIR_DEBUG("Dispatch %d", nfds); /* NB, use nfds not eventLoop.handlesCount, because new * fds might be added on end of list, and they're not * in the fds array we've got */ for (i = 0, n = 0; n < nfds && i < eventLoop.handlesCount; n++) { - while ((eventLoop.handles[i].fd != fds[n].fd || - eventLoop.handles[i].events == 0) && - i < eventLoop.handlesCount) { + while (i < eventLoop.handlesCount && + (eventLoop.handles[i].fd != fds[n].fd || + eventLoop.handles[i].events == 0)) { i++; } if (i == eventLoop.handlesCount) break; VIR_DEBUG("i=%zu w=%d", i, eventLoop.handles[i].watch); if (eventLoop.handles[i].deleted) { EVENT_DEBUG("Skip deleted n=%zu w=%d f=%d", i, eventLoop.handles[i].watch, eventLoop.handles[i].fd); continue; } if (fds[n].revents) { virEventHandleCallback cb = eventLoop.handles[i].cb; int watch = eventLoop.handles[i].watch; void *opaque = eventLoop.handles[i].opaque; int hEvents = virEventPollFromNativeEvents(fds[n].revents); PROBE(EVENT_POLL_DISPATCH_HANDLE, "watch=%d events=%d", watch, hEvents); virMutexUnlock(&eventLoop.lock); (cb)(watch, fds[n].fd, hEvents, opaque); virMutexLock(&eventLoop.lock); } } return 0; } /* Used post dispatch to actually remove any timers that * were previously marked as deleted. This asynchronous * cleanup is needed to make dispatch re-entrant safe. */ -- 1.8.5.5

2 1

[libvirt] [PATCH] util: cgroup: Fix build on non-cgroup platforms
by Peter Krempa 09 Jul '14

09 Jul '14

Commit 48f44510098cead629ede9a49ea4e840a28ccca introduced a helper fucntion to convert cgroup device mode to string. The function was only conditionally compliled on platforms that support cgroup. This broke the build when attempting to export the symbol: CCLD libvirt.la Cannot export virCgroupGetDevicePermsString: symbol not defined Move the function out of the ifdef, as it doesn't really depend on the cgroup code being present. --- src/util/vircgroup.c | 76 ++++++++++++++++++++++++++-------------------------- 1 file changed, 38 insertions(+), 38 deletions(-) diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c index 2eaf265..1ec12ac 100644 --- a/src/util/vircgroup.c +++ b/src/util/vircgroup.c @@ -83,6 +83,44 @@ typedef enum { } virCgroupFlags; +/** + * virCgroupGetDevicePermsString: + * + * @perms: Bitwise or of VIR_CGROUP_DEVICE permission bits + * + * Returns string corresponding to the appropriate bits set. + */ +const char * +virCgroupGetDevicePermsString(int perms) +{ + if (perms & VIR_CGROUP_DEVICE_READ) { + if (perms & VIR_CGROUP_DEVICE_WRITE) { + if (perms & VIR_CGROUP_DEVICE_MKNOD) + return "rwm"; + else + return "rw"; + } else { + if (perms & VIR_CGROUP_DEVICE_MKNOD) + return "rm"; + else + return "r"; + } + } else { + if (perms & VIR_CGROUP_DEVICE_WRITE) { + if (perms & VIR_CGROUP_DEVICE_MKNOD) + return "wm"; + else + return "w"; + } else { + if (perms & VIR_CGROUP_DEVICE_MKNOD) + return "m"; + else + return ""; + } + } +} + + #ifdef VIR_CGROUP_SUPPORTED bool virCgroupAvailable(void) @@ -2624,44 +2662,6 @@ virCgroupDenyAllDevices(virCgroupPtr group) /** - * virCgroupGetDevicePermsString: - * - * @perms: Bitwise or of VIR_CGROUP_DEVICE permission bits - * - * Returns string corresponding to the appropriate bits set. - */ -const char * -virCgroupGetDevicePermsString(int perms) -{ - if (perms & VIR_CGROUP_DEVICE_READ) { - if (perms & VIR_CGROUP_DEVICE_WRITE) { - if (perms & VIR_CGROUP_DEVICE_MKNOD) - return "rwm"; - else - return "rw"; - } else { - if (perms & VIR_CGROUP_DEVICE_MKNOD) - return "rm"; - else - return "r"; - } - } else { - if (perms & VIR_CGROUP_DEVICE_WRITE) { - if (perms & VIR_CGROUP_DEVICE_MKNOD) - return "wm"; - else - return "w"; - } else { - if (perms & VIR_CGROUP_DEVICE_MKNOD) - return "m"; - else - return ""; - } - } -} - - -/** * virCgroupAllowDevice: * * @group: The cgroup to allow a device for -- 2.0.0

3 3

[libvirt] [PATCH 0/4] libxl: a few migration improvements
by Jim Fehlig 09 Jul '14

09 Jul '14

See individual patches for details. Jim Fehlig (4): libxl: rename goto label libxl: remove domain when migration prepare fails libxl: acquire job though begin phase only libxl: fix crash in migrate confirm for transient domains src/libxl/libxl_driver.c | 7 ++---- src/libxl/libxl_migration.c | 60 ++++++++++++++++++++++----------------------- src/libxl/libxl_migration.h | 2 +- 3 files changed, 33 insertions(+), 36 deletions(-) -- 1.8.4.5

2 9

[libvirt] [PATCH] LXC: fix an improper comments for lxcDomainDestroyFlags
by Chen Hanxiao 08 Jul '14

08 Jul '14

Currently @flag is not used yet. Signed-off-by: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> --- src/lxc/lxc_driver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index 79c3b4a..5c4ab58 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -1420,7 +1420,7 @@ lxcConnectDomainEventDeregisterAny(virConnectPtr conn, /** * lxcDomainDestroyFlags: * @dom: pointer to domain to destroy - * @flags: an OR'ed set of virDomainDestroyFlags + * @flags: extra flags; not used yet. * * Sends SIGKILL to container root process to terminate the container * -- 1.9.0

3 2

[libvirt] [PATCH libvirt] qemu: show a warning when using aio=native without cache=none
by Giuseppe Scrivano 08 Jul '14

08 Jul '14

Qemu will fallback to aio=threads when the cache mode doesn't use O_DIRECT, even if aio=native was explictly set. Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1086704 Signed-off-by: Giuseppe Scrivano <gscrivan(a)redhat.com> --- src/qemu/qemu_command.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index fb64cda..92a6c9a 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -3477,6 +3477,13 @@ qemuBuildDriveStr(virConnectPtr conn, mode = qemuDiskCacheV1TypeToString(disk->cachemode); } + if (disk->iomode == VIR_DOMAIN_DISK_IO_NATIVE && + disk->cachemode != VIR_DOMAIN_DISK_CACHE_DIRECTSYNC) { + VIR_WARN("native I/O needs either no disk cache " + "or directsync cache mode, QEMU will fallback " + "to aio=threads"); + } + virBufferAsprintf(&opt, ",cache=%s", mode); } else if (disk->shared && !disk->readonly) { virBufferAddLit(&opt, ",cache=off"); -- 1.9.3

3 4

[libvirt] [PATCH] Allow updating names in DHCP hosts by matching IPs.
by Ján Tomko 08 Jul '14

08 Jul '14

Also fix the error message if an IPv6 host with no MAC is not found. https://bugzilla.redhat.com/show_bug.cgi?id=991290 --- src/conf/network_conf.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index 909631b..ce4d4d8 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -3480,11 +3480,13 @@ virNetworkDefUpdateIPDHCPHost(virNetworkDefPtr def, if (command == VIR_NETWORK_UPDATE_COMMAND_MODIFY) { - /* search for the entry with this (mac|name), + /* search for the entry with this (ip|mac|name), * and update the IP+(mac|name) */ for (i = 0; i < ipdef->nhosts; i++) { if ((host.mac && !virMacAddrCompare(host.mac, ipdef->hosts[i].mac)) || + (VIR_SOCKET_ADDR_VALID(&host.ip) && + virSocketAddrEqual(&host.ip, &ipdef->hosts[i].ip)) || (host.name && STREQ_NULLABLE(host.name, ipdef->hosts[i].name))) { break; @@ -3492,10 +3494,14 @@ virNetworkDefUpdateIPDHCPHost(virNetworkDefPtr def, } if (i == ipdef->nhosts) { + char *ip = virSocketAddrFormat(&host.ip); virReportError(VIR_ERR_OPERATION_INVALID, _("couldn't locate an existing dhcp host entry with " - "\"mac='%s'\" in network '%s'"), - host.mac, def->name); + "\"mac='%s'\" \"name='%s'\" \"ip='%s'\" in" + " network '%s'"), + host.mac ? host.mac : _("unknown"), host.name, + ip ? ip : _("unknown"), def->name); + VIR_FREE(ip); goto cleanup; } @@ -3524,8 +3530,8 @@ virNetworkDefUpdateIPDHCPHost(virNetworkDefPtr def, _("there is an existing dhcp host entry in " "network '%s' that matches " "\"<host mac='%s' name='%s' ip='%s'/>\""), - def->name, host.mac, host.name, - ip ? ip : "unknown"); + def->name, host.mac ? host.mac : _("unknown"), + host.name, ip ? ip : _("unknown")); VIR_FREE(ip); goto cleanup; } -- 1.8.5.5

2 1