- Devel - libvirt List Archives

[libvirt] [PATCH] check for cfg->spiceTLS earlier in qemuProcessSPICEAllocatePorts
by Ján Tomko 09 Jul '14

09 Jul '14

This saves a few lines of code and catches the error when: <spice autoport ='yes' defaultMode='any' ..> <channel name='main' mode='secure'/> </spice> is specified with spice_tls = 0 in qemu.conf. Instead of this error in qemuBuildGraphicsSPICECommandLine: error: unsupported configuration: spice secure channels set in XML configuration, but TLS port is not provided an error is reported in qemuProcessSPICEAllocatePorts: error: unsupported configuration: Auto allocation of spice TLS port requested but spice TLS is disabled in qemu.conf Inspired by: https://www.redhat.com/archives/libvir-list/2014-June/msg01408.html --- src/qemu/qemu_process.c | 33 +++++++++++---------------------- 1 file changed, 11 insertions(+), 22 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 570960e..ccc571b 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -3534,7 +3534,8 @@ qemuProcessSPICEAllocatePorts(virQEMUDriverPtr driver, break; case VIR_DOMAIN_GRAPHICS_SPICE_CHANNEL_MODE_ANY: - needTLSPort = true; + if (cfg->spiceTLS) + needTLSPort = true; needPort = true; break; } @@ -3552,28 +3553,16 @@ qemuProcessSPICEAllocatePorts(virQEMUDriverPtr driver, if (needTLSPort || graphics->data.spice.tlsPort == -1) { if (!cfg->spiceTLS) { - /* log an error and fail if tls was specifically - * requested, or simply ignore (don't allocate a port) - * if we're here due to "defaultMode='any'" - * (aka unspecified). - */ - if ((graphics->data.spice.tlsPort == -1) || - (graphics->data.spice.defaultMode - == VIR_DOMAIN_GRAPHICS_SPICE_CHANNEL_MODE_SECURE)) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("Auto allocation of spice TLS port requested " - "but spice TLS is disabled in qemu.conf")); - goto error; - } - } else { - /* cfg->spiceTLS *is* in place, so it makes sense to - * allocate a port. - */ - if (virPortAllocatorAcquire(driver->remotePorts, &tlsPort) < 0) - goto error; - - graphics->data.spice.tlsPort = tlsPort; + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("Auto allocation of spice TLS port requested " + "but spice TLS is disabled in qemu.conf")); + goto error; } + + if (virPortAllocatorAcquire(driver->remotePorts, &tlsPort) < 0) + goto error; + + graphics->data.spice.tlsPort = tlsPort; } return 0; -- 1.8.5.5

2 1

[libvirt] [PATCH] util: storage: Fix build after 25924dec0f9329d429aadae14e273602307e2214
by Peter Krempa 09 Jul '14

09 Jul '14

The commit referenced above changed function arguments of virStorageFileGetMetadataFromBuf() but didn't tweak the ATTRIBUTE_NONNULL tied to them. This was caught by coverity as it actually obeys them. We disabled them for GCC and thus it didn't show up. Additionally in commit 3ea661deeabadc3c114dfb6f662b9fd17d714a01 I passed NULL to the backingFormat argument which was also marked as nonnull. Use a dummy int's address when the argument isn't supplied so that the code doesn't need to change much. --- src/util/virstoragefile.c | 4 ++++ src/util/virstoragefile.h | 3 +-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c index 505b652..de0e27a 100644 --- a/src/util/virstoragefile.c +++ b/src/util/virstoragefile.c @@ -955,6 +955,10 @@ virStorageFileGetMetadataFromBuf(const char *path, int *backingFormat) { virStorageSourcePtr ret = NULL; + int dummy; + + if (!backingFormat) + backingFormat = &dummy; if (!(ret = virStorageFileMetadataNew(path, format))) return NULL; diff --git a/src/util/virstoragefile.h b/src/util/virstoragefile.h index 744a6ba..528cfad 100644 --- a/src/util/virstoragefile.h +++ b/src/util/virstoragefile.h @@ -301,8 +301,7 @@ virStorageSourcePtr virStorageFileGetMetadataFromBuf(const char *path, size_t len, int format, int *backingFormat) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(4) - ATTRIBUTE_NONNULL(5); + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2); int virStorageFileChainGetBroken(virStorageSourcePtr chain, char **broken_file); -- 2.0.0

3 4

[libvirt] [PATCH 0/3] Couple of seclabels improvements
by Michal Privoznik 09 Jul '14

09 Jul '14

Yes, the first two patches basically revert 693eac388f1759d. Only the last one fixes a real problem. Michal Privoznik (3): virSecurityLabelDef: substitute 'norelabel' with 'relabel' virSecurityDeviceLabelDef: substitute 'norelabel' with 'relabel' conf: Disallow <seclabel type='none' relabel='yes'/> src/conf/domain_conf.c | 40 +++++++++++++++++++++++----------------- src/security/security_apparmor.c | 10 +++++----- src/security/security_dac.c | 22 +++++++++++----------- src/security/security_manager.c | 2 +- src/security/security_selinux.c | 32 ++++++++++++++------------------ src/util/virseclabel.c | 2 +- src/util/virseclabel.h | 4 ++-- 7 files changed, 57 insertions(+), 55 deletions(-) -- 1.8.5.5

1 3

[libvirt] [PATCHv2] conf: Improve metadata type verification
by Peter Krempa 09 Jul '14

09 Jul '14

Split out checking of invalid metadata type from the switch statement so that we can use the typecasted enum value to allow tracking addition of new items by the compliler. Also avoids two dead-code break statements. --- Version 2: - move the check back to the original function so that we don't break forward compat src/conf/domain_conf.c | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index b80e7cf..fa76eb4 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -19575,6 +19575,12 @@ virDomainObjGetMetadata(virDomainObjPtr vm, virCheckFlags(VIR_DOMAIN_AFFECT_LIVE | VIR_DOMAIN_AFFECT_CONFIG, NULL); + if (type >= VIR_DOMAIN_METADATA_LAST) { + virReportError(VIR_ERR_INVALID_ARG, + _("unknown metadata type '%d'"), type); + goto cleanup; + } + if (virDomainLiveConfigHelperMethod(caps, xmlopt, vm, &flags, &def) < 0) goto cleanup; @@ -19601,10 +19607,7 @@ virDomainObjGetMetadata(virDomainObjPtr vm, goto cleanup; break; - default: - virReportError(VIR_ERR_INVALID_ARG, "%s", - _("unknown metadata type")); - goto cleanup; + case VIR_DOMAIN_METADATA_LAST: break; } @@ -19630,6 +19633,12 @@ virDomainDefSetMetadata(virDomainDefPtr def, char *tmp; int ret = -1; + if (type >= VIR_DOMAIN_METADATA_LAST) { + virReportError(VIR_ERR_INVALID_ARG, + _("unknown metadata type '%d'"), type); + goto cleanup; + } + switch ((virDomainMetadataType) type) { case VIR_DOMAIN_METADATA_DESCRIPTION: if (VIR_STRDUP(tmp, metadata) < 0) @@ -19683,10 +19692,7 @@ virDomainDefSetMetadata(virDomainDefPtr def, } break; - default: - virReportError(VIR_ERR_INVALID_ARG, "%s", - _("unknown metadata type")); - goto cleanup; + case VIR_DOMAIN_METADATA_LAST: break; } -- 2.0.0

2 2

[libvirt] [PATCH] virsh: document the possibility of accepting integers for numatune mode
by Martin Kletzander 09 Jul '14

09 Jul '14

According to the code, 'virsh numatune' supports integers for specifying --mode as well as the string definitions "strict", "interleave", and "preferred". However, this possibility was not documented anywhere, so this patch adds it to both the man page and command help. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1085706 Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- tools/virsh-domain.c | 3 ++- tools/virsh.pod | 8 +++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index b5b9f91..5a17aff 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -7823,7 +7823,8 @@ static const vshCmdOptDef opts_numatune[] = { }, {.name = "mode", .type = VSH_OT_DATA, - .help = N_("NUMA mode, one of strict, preferred and interleave") + .help = N_("NUMA mode, one of strict, preferred and interleave \n" + "or a number from the virDomainNumatuneMemMode enum") }, {.name = "nodeset", .type = VSH_OT_DATA, diff --git a/tools/virsh.pod b/tools/virsh.pod index 99d0b74..a5e8406 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -1402,9 +1402,11 @@ Set or get a domain's numa parameters, corresponding to the <numatune> element of domain XML. Without flags, the current settings are displayed. -I<mode> can be one of `strict', `interleave' and `preferred'. For a -running domain, the mode can't be changed, and the nodeset can be -changed only if the domain was started with a mode of `strict'. +I<mode> can be one of `strict', `interleave' and `preferred' or any +valid number from the virDomainNumatuneMemMode enum in case the daemon +supports it. For a running domain, the mode can't be changed, and the +nodeset can be changed only if the domain was started with a mode of +`strict'. I<nodeset> is a list of numa nodes used by the host for running the domain. Its syntax is a comma separated list, with '-' for ranges and '^' for -- 2.0.0

2 1

[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

[libvirt] [PATCH] maint: update to latest gnulib
by Eric Blake 08 Jul '14

08 Jul '14

When run under an environment that inherits an ignored SIGPIPE (hello, annoying buildbots), a syntax-check was producing quite a bit of noise, such as: > prohibit_argmatch_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.46 prohibit_argmatch_without_use This has been fixed upstream in gnulib. There are several other portability improvements in our regular submodule update. * .gnulib: Update to latest, in part for quieter syntax-check. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Pushing under the gnulib maintenance rule. * .gnulib d55899f...9d5efe7 (19): > maint.mk: less syntax-check noise when SIGPIPE is ignored > nl_langinfo: CODESET on MS-Windows and more items from localeconv > Bruno Haible has stepped down as maintainer. > mktime: merge #if/#ifdef usage from glibc > git-version-gen: improve option descriptions > regex: fix memory leak in compiler > regex: merge patch from libc > acl: port to gcc -Wredundant-decls > parse-duration: eliminate 68-year duration limit > pthread: don't assume AC_CANONICAL_HOST, port better to Solaris, etc. > pthread: define thread-safe macros on some platforms > regex: don't be multithreaded if USE_UNLOCKED_IO. > gettext: update macros to version 0.19 > select,poll: fix console handle check on windows 8 > select: fix waiting on anonymous pipes on MS-Windows > times: fix to return non constant value on MS-Windows > isatty: fix to work on windows 8 > maint: fix typo in fdl.texi > mountlist: avoid hasmntopt const type warning on solaris .gnulib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gnulib b/.gnulib index d55899f..9d5efe7 160000 --- a/.gnulib +++ b/.gnulib @@ -1 +1 @@ -Subproject commit d55899fd2c5794ac85ecb14d5e2f646a89e4b4dd +Subproject commit 9d5efe7d61e1d96a6d7c97ffa4d21c5e33e9bd30 -- 1.9.3

1 0

[libvirt] [PATCH] Document the need to free vir*Ptr objects per-function
by Ján Tomko 08 Jul '14

08 Jul '14

Another patch for https://bugzilla.redhat.com/show_bug.cgi?id=994731 --- src/libvirt.c | 139 +++++++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 134 insertions(+), 5 deletions(-) diff --git a/src/libvirt.c b/src/libvirt.c index 316fdf0..8684298 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -1299,6 +1299,9 @@ do_open(const char *name, * * URIs are documented at http://libvirt.org/uri.html * + * virConnectClose should be used to release the resources after the connection + * is no longer needed. + * * Returns a pointer to the hypervisor connection or NULL in case of error */ virConnectPtr @@ -1331,7 +1334,7 @@ virConnectOpen(const char *name) * on the available methods to control the domains. * * See virConnectOpen for notes about environment variables which can - * have an effect on opening drivers + * have an effect on opening drivers and freeing the connection resources * * URIs are documented at http://libvirt.org/uri.html * @@ -1369,7 +1372,7 @@ virConnectOpenReadOnly(const char *name) * credentials via the callback * * See virConnectOpen for notes about environment variables which can - * have an effect on opening drivers + * have an effect on opening drivers and freeing the connection resources * * URIs are documented at http://libvirt.org/uri.html * @@ -1875,6 +1878,9 @@ virDomainGetConnect(virDomainPtr dom) * libvirtd daemon. Any domains marked for auto destroy will * block attempts at migration, save-to-file, or snapshots. * + * virDomainFree should be used to free the resources after the + * domain object is no longer needed. + * * Returns a new domain object or NULL in case of failure */ virDomainPtr @@ -1937,6 +1943,9 @@ virDomainCreateXML(virConnectPtr conn, const char *xmlDesc, * libvirtd daemon. Any domains marked for auto destroy will * block attempts at migration, save-to-file, or snapshots. * + * virDomainFree should be used to free the resources after the + * domain object is no longer needed. + * * Returns a new domain object or NULL in case of failure */ virDomainPtr @@ -2000,6 +2009,9 @@ virDomainCreateLinux(virConnectPtr conn, const char *xmlDesc, * Note that this won't work for inactive domains which have an ID of -1, * in that case a lookup based on the Name or UUId need to be done instead. * + * virDomainFree should be used to free the resources after the + * domain object is no longer needed. + * * Returns a new domain object or NULL in case of failure. If the * domain cannot be found, then VIR_ERR_NO_DOMAIN error is raised. */ @@ -2036,6 +2048,9 @@ virDomainLookupByID(virConnectPtr conn, int id) * * Try to lookup a domain on the given hypervisor based on its UUID. * + * virDomainFree should be used to free the resources after the + * domain object is no longer needed. + * * Returns a new domain object or NULL in case of failure. If the * domain cannot be found, then VIR_ERR_NO_DOMAIN error is raised. */ @@ -2072,6 +2087,9 @@ virDomainLookupByUUID(virConnectPtr conn, const unsigned char *uuid) * * Try to lookup a domain on the given hypervisor based on its UUID. * + * virDomainFree should be used to free the resources after the + * domain object is no longer needed. + * * Returns a new domain object or NULL in case of failure. If the * domain cannot be found, then VIR_ERR_NO_DOMAIN error is raised. */ @@ -2108,6 +2126,9 @@ virDomainLookupByUUIDString(virConnectPtr conn, const char *uuidstr) * * Try to lookup a domain on the given hypervisor based on its name. * + * virDomainFree should be used to free the resources after the + * domain object is no longer needed. + * * Returns a new domain object or NULL in case of failure. If the * domain cannot be found, then VIR_ERR_NO_DOMAIN error is raised. */ @@ -5284,6 +5305,9 @@ virDomainMigrateDirect(virDomainPtr domain, * different processors even with the same architecture, or between * different types of hypervisor. * + * virDomainFree should be used to free the resources after the + * returned domain object is no longer needed. + * * Returns 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). @@ -5509,6 +5533,9 @@ virDomainMigrate(virDomainPtr domain, * @dname for that purpose). Domain name in @dxml must match the * original domain name. * + * virDomainFree should be used to free the resources after the + * returned domain object is no longer needed. + * * Returns 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). @@ -5680,6 +5707,9 @@ virDomainMigrate2(virDomainPtr domain, * different processors even with the same architecture, or between * different types of hypervisor. * + * virDomainFree should be used to free the resources after the + * returned domain object is no longer needed. + * * Returns 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). @@ -7916,7 +7946,7 @@ virDomainBlockStats(virDomainPtr dom, const char *disk, * @dom: pointer to domain object * @disk: path to the block device, or device shorthand * @params: pointer to block stats parameter object - * (return value) + * (return value, allocated by the caller) * @nparams: pointer to number of block stats; input and output * @flags: bitwise-OR of virTypedParameterFlags * @@ -8631,6 +8661,9 @@ virDomainGetBlockInfo(virDomainPtr domain, const char *disk, * domain being defined; in that case, use virDomainBlockJobAbort() to * stop the block copy first. * + * virDomainFree should be used to free the resources after the + * domain object is no longer needed. + * * Returns NULL in case of error, a pointer to the domain otherwise */ virDomainPtr @@ -10899,6 +10932,9 @@ virConnectListDefinedNetworks(virConnectPtr conn, char **const names, * * Try to lookup a network on the given hypervisor based on its name. * + * virNetworkFree should be used to free the resources after the + * network object is no longer needed. + * * Returns a new network object or NULL in case of failure. If the * network cannot be found, then VIR_ERR_NO_NETWORK error is raised. */ @@ -10935,6 +10971,9 @@ virNetworkLookupByName(virConnectPtr conn, const char *name) * * Try to lookup a network on the given hypervisor based on its UUID. * + * virNetworkFree should be used to free the resources after the + * network object is no longer needed. + * * Returns a new network object or NULL in case of failure. If the * network cannot be found, then VIR_ERR_NO_NETWORK error is raised. */ @@ -11008,6 +11047,9 @@ virNetworkLookupByUUIDString(virConnectPtr conn, const char *uuidstr) * Create and start a new virtual network, based on an XML description * similar to the one returned by virNetworkGetXMLDesc() * + * virNetworkFree should be used to free the resources after the + * network object is no longer needed. + * * Returns a new network object or NULL in case of failure */ virNetworkPtr @@ -11044,6 +11086,9 @@ virNetworkCreateXML(virConnectPtr conn, const char *xmlDesc) * * Define a network, but does not create it * + * virNetworkFree should be used to free the resources after the + * network object is no longer needed. + * * Returns NULL in case of error, a pointer to the network otherwise */ virNetworkPtr @@ -11788,6 +11833,9 @@ virConnectListDefinedInterfaces(virConnectPtr conn, * * Try to lookup an interface on the given hypervisor based on its name. * + * virInterfaceFree should be used to free the resources after the + * interface object is no longer needed. + * * Returns a new interface object or NULL in case of failure. If the * interface cannot be found, then VIR_ERR_NO_INTERFACE error is raised. */ @@ -11824,6 +11872,9 @@ virInterfaceLookupByName(virConnectPtr conn, const char *name) * * Try to lookup an interface on the given hypervisor based on its MAC. * + * virInterfaceFree should be used to free the resources after the + * interface object is no longer needed. + * * Returns a new interface object or NULL in case of failure. If the * interface cannot be found, then VIR_ERR_NO_INTERFACE error is raised. */ @@ -11962,6 +12013,9 @@ virInterfaceGetXMLDesc(virInterfacePtr iface, unsigned int flags) * automatically removed during the next reboot of the system running * libvirtd. * + * virInterfaceFree should be used to free the resources after the + * interface object is no longer needed. + * * Returns NULL in case of error, a pointer to the interface otherwise */ virInterfacePtr @@ -12634,6 +12688,9 @@ virConnectFindStoragePoolSources(virConnectPtr conn, * * Fetch a storage pool based on its unique name * + * virStoragePoolFree should be used to free the resources after the + * storage pool object is no longer needed. + * * Returns a virStoragePoolPtr object, or NULL if no matching pool is found */ virStoragePoolPtr @@ -12670,6 +12727,9 @@ virStoragePoolLookupByName(virConnectPtr conn, * * Fetch a storage pool based on its globally unique id * + * virStoragePoolFree should be used to free the resources after the + * storage pool object is no longer needed. + * * Returns a virStoragePoolPtr object, or NULL if no matching pool is found */ virStoragePoolPtr @@ -12706,6 +12766,9 @@ virStoragePoolLookupByUUID(virConnectPtr conn, * * Fetch a storage pool based on its globally unique id * + * virStoragePoolFree should be used to free the resources after the + * storage pool object is no longer needed. + * * Returns a virStoragePoolPtr object, or NULL if no matching pool is found */ virStoragePoolPtr @@ -12741,6 +12804,9 @@ virStoragePoolLookupByUUIDString(virConnectPtr conn, * * Fetch a storage pool which contains a particular volume * + * virStoragePoolFree should be used to free the resources after the + * storage pool object is no longer needed. + * * Returns a virStoragePoolPtr object, or NULL if no matching pool is found */ virStoragePoolPtr @@ -12778,6 +12844,9 @@ virStoragePoolLookupByVolume(virStorageVolPtr vol) * pool is not persistent, so its definition will disappear * when it is destroyed, or if the host is restarted * + * virStoragePoolFree should be used to free the resources after the + * storage pool object is no longer needed. + * * Returns a virStoragePoolPtr object, or NULL if creation failed */ virStoragePoolPtr @@ -12818,6 +12887,9 @@ virStoragePoolCreateXML(virConnectPtr conn, * Define a new inactive storage pool based on its XML description. The * pool is persistent, until explicitly undefined. * + * virStoragePoolFree should be used to free the resources after the + * storage pool object is no longer needed. + * * Returns a virStoragePoolPtr object, or NULL if creation failed */ virStoragePoolPtr @@ -13277,7 +13349,7 @@ virStoragePoolGetInfo(virStoragePoolPtr pool, * storage pool. This is suitable for later feeding back * into the virStoragePoolCreateXML method. * - * Returns a XML document, or NULL on error + * Returns a XML document (caller frees), or NULL on error */ char * virStoragePoolGetXMLDesc(virStoragePoolPtr pool, @@ -13542,6 +13614,9 @@ virStorageVolGetConnect(virStorageVolPtr vol) * Fetch a pointer to a storage volume based on its name * within a pool * + * virStorageVolFree should be used to free the resources after the + * storage volume object is no longer needed. + * * Returns a storage volume, or NULL if not found / error */ virStorageVolPtr @@ -13579,6 +13654,9 @@ virStorageVolLookupByName(virStoragePoolPtr pool, * Fetch a pointer to a storage volume based on its * globally unique key * + * virStorageVolFree should be used to free the resources after the + * storage volume object is no longer needed. + * * Returns a storage volume, or NULL if not found / error */ virStorageVolPtr @@ -13616,6 +13694,9 @@ virStorageVolLookupByKey(virConnectPtr conn, * Fetch a pointer to a storage volume based on its * locally (host) unique path * + * virStorageVolFree should be used to free the resources after the + * storage volume object is no longer needed. + * * Returns a storage volume, or NULL if not found / error */ virStorageVolPtr @@ -13705,6 +13786,9 @@ virStorageVolGetKey(virStorageVolPtr vol) * qcow2 image files which don't support full preallocation, * by creating a sparse image file with metadata. * + * virStorageVolFree should be used to free the resources after the + * storage volume object is no longer needed. + * * Returns the storage volume, or NULL on error */ virStorageVolPtr @@ -13753,6 +13837,9 @@ virStorageVolCreateXML(virStoragePoolPtr pool, * qcow2 image files which don't support full preallocation, * by creating a sparse image file with metadata. * + * virStorageVolFree should be used to free the resources after the + * storage volume object is no longer needed. + * * Returns the storage volume, or NULL on error */ virStorageVolPtr @@ -14454,6 +14541,9 @@ virNodeListDevices(virConnectPtr conn, * * Lookup a node device by its name. * + * virNodeDeviceFree should be used to free the resources after the + * node device object is no longer needed. + * * Returns a virNodeDevicePtr if found, NULL otherwise. */ virNodeDevicePtr @@ -14491,6 +14581,9 @@ virNodeDeviceLookupByName(virConnectPtr conn, const char *name) * * Lookup SCSI Host which is capable with 'fc_host' by its WWNN and WWPN. * + * virNodeDeviceFree should be used to free the resources after the + * node device object is no longer needed. + * * Returns a virNodeDevicePtr if found, NULL otherwise. */ virNodeDevicePtr @@ -14941,6 +15034,9 @@ virNodeDeviceReset(virNodeDevicePtr dev) * Create a new device on the VM host machine, for example, virtual * HBAs created using vport_create. * + * virNodeDeviceFree should be used to free the resources after the + * node device object is no longer needed. + * * Returns a node device object if successful, NULL in case of failure */ virNodeDevicePtr @@ -15280,6 +15376,9 @@ virConnectListSecrets(virConnectPtr conn, char **uuids, int maxuuids) * Try to lookup a secret on the given hypervisor based on its UUID. * Uses the 16 bytes of raw data to describe the UUID * + * virSecretFree should be used to free the resources after the + * secret object is no longer needed. + * * Returns a new secret object or NULL in case of failure. If the * secret cannot be found, then VIR_ERR_NO_SECRET error is raised. */ @@ -15318,6 +15417,9 @@ virSecretLookupByUUID(virConnectPtr conn, const unsigned char *uuid) * Try to lookup a secret on the given hypervisor based on its UUID. * Uses the printable string value to describe the UUID * + * virSecretFree should be used to free the resources after the + * secret object is no longer needed. + * * Returns a new secret object or NULL in case of failure. If the * secret cannot be found, then VIR_ERR_NO_SECRET error is raised. */ @@ -15357,6 +15459,9 @@ virSecretLookupByUUIDString(virConnectPtr conn, const char *uuidstr) * The usageID is unique within the set of secrets sharing the * same usageType value. * + * virSecretFree should be used to free the resources after the + * secret object is no longer needed. + * * Returns a new secret object or NULL in case of failure. If the * secret cannot be found, then VIR_ERR_NO_SECRET error is raised. */ @@ -15402,6 +15507,9 @@ virSecretLookupByUsage(virConnectPtr conn, * Otherwise, creates a new secret with an automatically chosen UUID, and * initializes its attributes from xml. * + * virSecretFree should be used to free the resources after the + * secret object is no longer needed. + * * Returns a secret on success, NULL on failure. */ virSecretPtr @@ -16793,6 +16901,9 @@ virConnectListNWFilters(virConnectPtr conn, char **const names, int maxnames) * * Try to lookup a network filter on the given hypervisor based on its name. * + * virNWFilterFree should be used to free the resources after the + * nwfilter object is no longer needed. + * * Returns a new nwfilter object or NULL in case of failure. If the * network filter cannot be found, then VIR_ERR_NO_NWFILTER error is raised. */ @@ -16829,6 +16940,9 @@ virNWFilterLookupByName(virConnectPtr conn, const char *name) * * Try to lookup a network filter on the given hypervisor based on its UUID. * + * virNWFilterFree should be used to free the resources after the + * nwfilter object is no longer needed. + * * Returns a new nwfilter object or NULL in case of failure. If the * nwfdilter cannot be found, then VIR_ERR_NO_NWFILTER error is raised. */ @@ -16865,6 +16979,9 @@ virNWFilterLookupByUUID(virConnectPtr conn, const unsigned char *uuid) * * Try to lookup an nwfilter on the given hypervisor based on its UUID. * + * virNWFilterFree should be used to free the resources after the + * nwfilter object is no longer needed. + * * Returns a new nwfilter object or NULL in case of failure. If the * nwfilter cannot be found, then VIR_ERR_NO_NWFILTER error is raised. */ @@ -17005,6 +17122,9 @@ virNWFilterGetUUIDString(virNWFilterPtr nwfilter, char *buf) * Define a new network filter, based on an XML description * similar to the one returned by virNWFilterGetXMLDesc() * + * virNWFilterFree should be used to free the resources after the + * nwfilter object is no longer needed. + * * Returns a new nwfilter object or NULL in case of failure */ virNWFilterPtr @@ -17348,7 +17468,7 @@ virConnectGetCPUModelNames(virConnectPtr conn, const char *arch, char ***models, * without this flag features that are part of the CPU model will not be * listed. * - * Returns XML description of the computed CPU or NULL on error. + * Returns XML description of the computed CPU (caller frees) or NULL on error. */ char * virConnectBaselineCPU(virConnectPtr conn, @@ -18297,6 +18417,9 @@ virDomainSnapshotGetConnect(virDomainSnapshotPtr snapshot) * block copy operation; in that case, use virDomainBlockJobAbort() * to stop the block copy first. * + * virDomainSnapshotFree should be used to free the resources after the + * snapshot object is no longer needed. + * * Returns an (opaque) virDomainSnapshotPtr on success, NULL on failure. */ virDomainSnapshotPtr @@ -18966,6 +19089,9 @@ virDomainHasCurrentSnapshot(virDomainPtr domain, unsigned int flags) * * Get the current snapshot for a domain, if any. * + * virDomainSnapshotFree should be used to free the resources after the + * snapshot object is no longer needed. + * * Returns a domain snapshot object or NULL in case of failure. If the * current domain snapshot cannot be found, then the VIR_ERR_NO_DOMAIN_SNAPSHOT * error is raised. @@ -19005,6 +19131,9 @@ virDomainSnapshotCurrent(virDomainPtr domain, * * Get the parent snapshot for @snapshot, if any. * + * virDomainSnapshotFree should be used to free the resources after the + * snapshot object is no longer needed. + * * Returns a domain snapshot object or NULL in case of failure. If the * given snapshot is a root (no parent), then the VIR_ERR_NO_DOMAIN_SNAPSHOT * error is raised. -- 1.8.5.5

2 1

[libvirt] [PATCH] Actually fix the spec file
by Ján Tomko 08 Jul '14

08 Jul '14

There was a '%' missing before the last {rhel}. Tested on RHEL-7 this time. --- Trivial, but not pushed yet due to my bad commit history today. libvirt.spec.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index e5f9fb8..8d1acfa 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -522,7 +522,7 @@ BuildRequires: libapparmor-devel %if %{with_network} BuildRequires: dnsmasq >= 2.41 BuildRequires: iptables - %if (0%{?fedora} && 0%{?fedora} < 17) || (0%{?rhel} && 0{?rhel} < 7) + %if (0%{?fedora} && 0%{?fedora} < 17) || (0%{?rhel} && 0%{?rhel} < 7) BuildRequires: iptables-ipv6 %endif BuildRequires: radvd @@ -768,7 +768,7 @@ Requires: libvirt-daemon = %{version}-%{release} Requires: dnsmasq >= 2.41 Requires: radvd Requires: iptables - %if (0%{?fedora} && 0%{?fedora} < 17) || (0%{?rhel} && 0{?rhel} < 7) + %if (0%{?fedora} && 0%{?fedora} < 17) || (0%{?rhel} && 0%{?rhel} < 7) Requires: iptables-ipv6 %endif @@ -785,7 +785,7 @@ Summary: Nwfilter driver plugin for the libvirtd daemon Group: Development/Libraries Requires: libvirt-daemon = %{version}-%{release} Requires: iptables - %if (0%{?fedora} && 0%{?fedora} < 17) || (0%{?rhel} && 0{?rhel} < 7) + %if (0%{?fedora} && 0%{?fedora} < 17) || (0%{?rhel} && 0%{?rhel} < 7) Requires: iptables-ipv6 %endif Requires: ebtables -- 1.8.5.5

2 1

[libvirt] [PATCH] properly indent virSecurityLabelDefsParseXML() parameters
by Martin Kletzander 08 Jul '14

08 Jul '14

Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- Notes: Pushed as trivial src/conf/domain_conf.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 70f1103..b80e7cf 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -4664,9 +4664,9 @@ virSecurityLabelDefParseXML(xmlXPathContextPtr ctxt, static int virSecurityLabelDefsParseXML(virDomainDefPtr def, - xmlXPathContextPtr ctxt, - virCapsPtr caps, - unsigned int flags) + xmlXPathContextPtr ctxt, + virCapsPtr caps, + unsigned int flags) { size_t i = 0; int n; -- 2.0.0

1 0

[libvirt] [PATCH] Don't require iptables-ipv6 on >= F17 and RHEL >= 7
by Ján Tomko 08 Jul '14

08 Jul '14

We only need ip6tables, which is now a part of the iptables package: http://pkgs.fedoraproject.org/cgit/iptables.git/commit/?h=1392835 This needlessly pulls in iptables-services: https://bugzilla.redhat.com/show_bug.cgi?id=1101510 which can conflict with firewalld: https://bugzilla.redhat.com/show_bug.cgi?id=1101484 --- libvirt.spec.in | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libvirt.spec.in b/libvirt.spec.in index 8802746..ba6054c 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -522,7 +522,9 @@ BuildRequires: libapparmor-devel %if %{with_network} BuildRequires: dnsmasq >= 2.41 BuildRequires: iptables + %if 0%{?fedora} < 17 && 0%{?rhel} < 7 BuildRequires: iptables-ipv6 + %endif BuildRequires: radvd %endif %if %{with_nwfilter} @@ -766,7 +768,9 @@ Requires: libvirt-daemon = %{version}-%{release} Requires: dnsmasq >= 2.41 Requires: radvd Requires: iptables + %if 0%{?fedora} < 17 && 0%{?rhel} < 7 Requires: iptables-ipv6 + %endif %description daemon-driver-network The network driver plugin for the libvirtd daemon, providing @@ -781,7 +785,9 @@ Summary: Nwfilter driver plugin for the libvirtd daemon Group: Development/Libraries Requires: libvirt-daemon = %{version}-%{release} Requires: iptables + %if 0%{?fedora} < 17 && 0%{?rhel} < 7 Requires: iptables-ipv6 + %endif Requires: ebtables %description daemon-driver-nwfilter -- 1.8.5.5

2 2

[libvirt] [PATCH] properly set video ram size for qemu VGA video device
by Pavel Hrdina 08 Jul '14

08 Jul '14

https://bugzilla.redhat.com/show_bug.cgi?id=1076098 We support vram option for video devices in domain xml, but so far only for QXL it had some effect. VGA video device in QEMU can also accept the size of video ram and we should pass it. Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- src/qemu/qemu_command.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index fb64cda..09e29c9 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -4800,6 +4800,9 @@ qemuBuildDeviceVideoStr(virDomainDefPtr def, /* QEMU accepts bytes for vram_size. */ virBufferAsprintf(&buf, ",vram_size=%u", video->vram * 1024); + } else if (video->type == VIR_DOMAIN_VIDEO_TYPE_VGA) { + /* QEMU accepts megabytes for vgamem_mb. */ + virBufferAsprintf(&buf, ",vgamem_mb=%u", video->vram / 1024); } if (qemuBuildDeviceAddressStr(&buf, def, &video->info, qemuCaps) < 0) -- 1.8.5.5

4 3

[libvirt] [PATCH] Document the need to free vir*Ptr objects
by Ján Tomko 08 Jul '14

08 Jul '14

https://bugzilla.redhat.com/show_bug.cgi?id=994731 --- docs/api.html.in | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/docs/api.html.in b/docs/api.html.in index eae7657..68ffa0b 100644 --- a/docs/api.html.in +++ b/docs/api.html.in @@ -159,6 +159,10 @@ </ul> </li> </ul> + <p>Note: functions returning vir*Ptr (like the virDomainLookup functions) + allocate memory which needs to be freed by the caller by the corresponding + vir*Free function (e.g. virDomainFree for a virDomainPtr object). + </p> <p> For more in-depth details of the storage related APIs see <a href="storage.html">the storage management page</a>. </p> -- 1.8.5.5

2 1

[libvirt] guest-fsfreeze-freeze: Does it allow for any guest-fsfreeze_hook in Windows guest machine.
by Puneet Bakshi 08 Jul '14

08 Jul '14

Hi, When guest agent command "guest-fsfreeze-freeze" is invoked on a linux VM, a hook is provided to do execute any pre-script before actually doing a freeze. int64_t qmp_guest_fsfreeze_freeze(Error **errp) { ::: execute_fsfreeze_hook(FSFREEZE_HOOK_FREEZE, &local_err); ::: } Can the same thing be done in case of Windows guest machine? I could not find similar thing in case of Windows ("qga_vss_fsfreeze()->requester_freeze()") where I can put a script (a hook) to do some preprocessing. Regards, ~Puneet

1 0

[libvirt] [PATCHv7 0/4] Rest of the relative backing and network commit series
by Peter Krempa 08 Jul '14

08 Jul '14

Rebased to current master. Peter Krempa (4): lib: Introduce flag VIR_DOMAIN_BLOCK_COMMIT_RELATIVE lib: Introduce flag VIR_DOMAIN_BLOCK_REBASE_RELATIVE qemu: Add support for networked disks for block commit qemu: Add support for networked disks for block pull/block rebase include/libvirt/libvirt.h.in | 6 ++++ src/libvirt.c | 8 +++++ src/qemu/qemu_driver.c | 83 +++++++++++++++++++++++++++++++++++++++----- tools/virsh-domain.c | 18 ++++++++-- tools/virsh.pod | 9 +++-- 5 files changed, 112 insertions(+), 12 deletions(-) -- 1.9.3

2 9

[libvirt] [PATCH 0/4] qemu: Support qemuDomainGetBlockInfo on remote storage
by Peter Krempa 08 Jul '14

08 Jul '14

And a few refactors. Peter Krempa (4): util: storage: Inline use of virStorageFileGetMetadataFromFDInternal util: storage: Allow specifying format for virStorageFileGetMetadataFromBuf storage: gluster: Optimize header reader functions qemu: refactor qemuDomainGetBlockInfo to work with remote storage src/libvirt_private.syms | 1 + src/qemu/qemu_driver.c | 84 ++++++++++++++--------- src/storage/storage_backend_gluster.c | 48 ++----------- src/util/virstoragefile.c | 124 +++++++++++++++------------------- src/util/virstoragefile.h | 5 +- 5 files changed, 118 insertions(+), 144 deletions(-) -- 2.0.0

2 9