- Devel - libvirt List Archives

[libvirt] [PATCH 0/2] Fix a couple problems encountered during virInterface testing
by Laine Stump 28 Oct '09

28 Oct '09

When testing all the different possibilities of interfaces with the new netcf release + my latest libvirt patches (ACKed, but not yet committed), I came across some problems, addressed by the following two patches. The first patch is for a bug that crept in due to a last minute change suggested in danpb's review - I missed changing a couple places to account for changing the initial value of "ret". It could alternately be squashed into this patch, which hasn't yet been committed: https://www.redhat.com/archives/libvir-list/2009-October/msg00689.html The second patch loosens up the parsing of vlan, bond, and bridge interface XML because the live config XML doesn't know how to get those items yet. I believe the necessary items can be learned and included by the time for the *next* libvirt release, but think that the new functionality there already is too useful (and too needy of more hands to test) to delay the entire set for that long.

2 4

[libvirt] Trouble starting a QEMU guest with IPv6 VNC address
by Kaitlin Rupert 28 Oct '09

28 Oct '09

Hello, I am trying to start a QEMU guest with an IPv6 VNC address. I can specify the address and start the guest, but the VNC port shows up under the IPv4 list: # virsh dumpxml domU1 | grep graphics <graphics type='vnc' port='5900' autoport='no' listen='::1' keymap='en-us'/> # cat /proc/net/tcp | grep 170C 2: 00000000:170C 00000000:0000 0A 00000000:00000000 00:00000000 00000000 0 0 621103 1 ffff88007a043a80 299 0 0 2 -1 # cat /proc/net/tcp6 | grep 170C # # ps -ef | grep qemu root 16451 1 43 04:17 ? 00:00:18 /usr/bin/qemu-system-x86_64 -S -M pc -m 128 -smp 1 -name domU1 -uuid 2aebe290-d1ed-11dd-90eb-001a64bc024c -monitor pty -pidfile /var/run/libvirt/qemu//domU1.pid -no-acpi -boot c -drive file=/tmp/default-kvm-dimage,if=ide,index=0,boot=on -net nic,macaddr=11:22:33:aa:bb:cc,vlan=0 -net tap,fd=17,vlan=0 -serial none -parallel none -usb -vnc ::1:0 -k en-us I started the same guest manually, but I appended an ",ipv6' flag to the vnc option (see below). With this change, the port shows up in the IPv6 list. # /usr/bin/qemu-system-x86_64 -M pc -m 128 -smp 1 -name domU1 -uuid 2aebe290-d1ed-11dd-90eb-001a64bc024c -monitor pty -pidfile /var/run/libvirt/qemu//domU1.pid -no-acpi -boot c -drive file=/tmp/default-kvm-dimage,if=ide,index=0,boot=on -net nic,macaddr=11:22:33:aa:bb:cc,vlan=0 -net tap,fd=17,vlan=0 -serial none -parallel none -usb -vnc ::1:0,ipv6 -k en-us # cat /proc/net/tcp6 | grep 170C 2: 00000000000000000000000000000000:170C 00000000000000000000000000000000:0000 0A 00000000:00000000 00:00000000 00000000 0 0 621485 1 ffff88007a30ad00 299 0 0 2 -1 # cat /proc/net/tcp | grep 170C # I'd like to fix the qemu driver so that it specifies this flag, but I am unsure whether a guest XML change or some other change is appropriate here. Would it be better to have the qemu driver code do some detection on the address that is passed in? Thanks! -- Kaitlin Rupert IBM Linux Technology Center kaitlin(a)linux.vnet.ibm.com

3 3

[libvirt] virsh: error: failed to disconnect from the hypervisor in F12/rawhide with Xen
by Pasi Kärkkäinen 28 Oct '09

28 Oct '09

Hello, I have a testbox running current Fedora 12 (rawhide), with custom 2.6.31.4 Xen pv_ops dom0 kernel. [root@f12test ~]# xm list Name ID Mem VCPUs State Time(s) Domain-0 0 1020 4 r----- 33.8 c54test 1024 1 0.0 [root@f12test ~]# virsh list Id Name State ---------------------------------- 0 Domain-0 running virsh: error: failed to disconnect from the hypervisor [root@f12test ~]# virsh --connect xen:/// version Compiled against library: libvir 0.7.1 Using library: libvir 0.7.1 Using API: Xen 3.0.1 Running hypervisor: Xen 3.4.0 virsh: error: failed to disconnect from the hypervisor *** glibc detected *** virsh: double free or corruption (fasttop): 0x0000000000936250 *** ======= Backtrace: ========= /lib64/libc.so.6[0x3d9ec75dc6] virsh[0x406d91] virsh[0x406f29] virsh[0x406de3] virsh[0x414582] /lib64/libc.so.6(__libc_start_main+0xfd)[0x3d9ec1eb4d] virsh[0x405b59] ======= Memory map: ======== <snip, memory map removed> [root@f12test ~]# rpm -qa | grep -i libvirt libvirt-python-0.7.1-13.fc12.x86_64 libvirt-0.7.1-13.fc12.x86_64 libvirt-client-0.7.1-13.fc12.x86_64 [root@f12test ~]# rpm -qa | grep -i xen kernel-2.6.31.4-1.2.73.xendom0.fc12.x86_64 xen-3.4.1-5.fc12.x86_64 xen-runtime-3.4.1-5.fc12.x86_64 kernel-devel-2.6.31.4-1.2.73.xendom0.fc12.x86_64 xen-libs-3.4.1-5.fc12.x86_64 xen-hypervisor-3.4.1-5.fc12.x86_64 Any ideas? -- Pasi

2 3

[libvirt] [PATCH] Avoid segv if ncf_init fails
by Laine Stump 27 Oct '09

27 Oct '09

If ncf_init() fails, it takes responsibility to call ncf_close() when appropriate. Having libvirt call it results in a double close, which ends up segv'ing. --- src/interface/netcf_driver.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/src/interface/netcf_driver.c b/src/interface/netcf_driver.c index b5c3664..c44ba62 100644 --- a/src/interface/netcf_driver.c +++ b/src/interface/netcf_driver.c @@ -142,10 +142,6 @@ static virDrvOpenStatus interfaceOpenInterface(virConnectPtr conn, return 0; netcf_error: - if (driverState->netcf) - { - ncf_close(driverState->netcf); - } virMutexDestroy (&driverState->lock); mutex_error: VIR_FREE(driverState); -- 1.6.5.15.gc274d

3 4

[libvirt] [PATCH 0/3] test: Support NodeDeviceCreate/Destroy
by Cole Robinson 27 Oct '09

27 Oct '09

The following small series provides the refactoring and implementation needed to support NodeDeviceCreate/Destroy in the test driver, particularly with respect to NPIV emulation. Cole Robinson (3): node device: Fix locking issue in virNodeDeviceDestroy node device: Break out get_wwns and get_parent_node helpers test: Support virNodeDeviceCreate and virNodeDeviceDestroy src/conf/node_device_conf.c | 89 +++++++++++++++++++++++ src/conf/node_device_conf.h | 11 +++ src/libvirt_private.syms | 2 + src/node_device/node_device_driver.c | 114 ++++-------------------------- src/test/test_driver.c | 129 +++++++++++++++++++++++++++++++++- 5 files changed, 244 insertions(+), 101 deletions(-)

3 13

[libvirt] [PATCH] Fix --with-init-script configure option
by Matthew Booth 27 Oct '09

27 Oct '09

The --with-init-script configure option was broken, and always defaulted based on the existence of /etc/redhat-release. This was a systematic typo based on mixed use of init-script and init-scripts. --- configure.in | 14 +++++++------- daemon/Makefile.am | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/configure.in b/configure.in index 2f9db72..42ed29b 100644 --- a/configure.in +++ b/configure.in @@ -243,17 +243,17 @@ dnl init script flavor dnl AC_MSG_CHECKING([for init script flavor]) AC_ARG_WITH([init-script], - [AC_HELP_STRING([--with-init-scripts=[redhat|auto|none]], - [Style of init scripts to install (defaults to auto)])]) -if test "x$with_init_scripts" = "x" -o "x$with_init_scripts" = "xauto"; then + [AC_HELP_STRING([--with-init-script=[redhat|auto|none]], + [Style of init script to install (defaults to auto)])]) +if test "x$with_init_script" = "x" -o "x$with_init_script" = "xauto"; then if test -f /etc/redhat-release ; then - with_init_scripts=redhat + with_init_script=redhat else - with_init_scripts=none + with_init_script=none fi fi -AM_CONDITIONAL([LIBVIRT_INIT_SCRIPTS_RED_HAT], test x$with_init_scripts = xredhat) -AC_MSG_RESULT($with_init_scripts) +AM_CONDITIONAL([LIBVIRT_INIT_SCRIPT_RED_HAT], test x$with_init_script = xredhat) +AC_MSG_RESULT($with_init_script) dnl RHEL-5 has a peculiar version of Xen, which requires some special casing AC_ARG_WITH([rhel5-api], diff --git a/daemon/Makefile.am b/daemon/Makefile.am index 84aab04..ab3f238 100644 --- a/daemon/Makefile.am +++ b/daemon/Makefile.am @@ -188,7 +188,7 @@ install-logrotate: libvirtd.logrotate mkdir -p $(DESTDIR)$(sysconfdir)/logrotate.d/ $(INSTALL_DATA) $< $(DESTDIR)$(sysconfdir)/logrotate.d/libvirtd -if LIBVIRT_INIT_SCRIPTS_RED_HAT +if LIBVIRT_INIT_SCRIPT_RED_HAT install-init: libvirtd.init mkdir -p $(DESTDIR)$(sysconfdir)/rc.d/init.d $(INSTALL_SCRIPT) libvirtd.init \ @@ -222,7 +222,7 @@ install-init: uninstall-init: libvirtd.init: -endif # DBUS_INIT_SCRIPTS_RED_HAT +endif # LIBVIRT_INIT_SCRIPT_RED_HAT # This must be added last, since functions it provides/replaces # are used by nearly every other library. -- 1.6.2.5

1 0

[libvirt] [PATCH] doc nits
by Dan Kenigsberg 27 Oct '09

27 Oct '09

(sorry, these ones annoy me when they are online) --- src/datatypes.c | 4 ++-- src/libvirt.c | 22 +++++++++++----------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/datatypes.c b/src/datatypes.c index 89ad309..0601a79 100644 --- a/src/datatypes.c +++ b/src/datatypes.c @@ -71,7 +71,7 @@ virNetworkFreeName(virNetworkPtr network, const char *name ATTRIBUTE_UNUSED) /** * virInterfaceFreeName: - * @interface: a interface object + * @interface: an interface object * * Destroy the interface object, this is just used by the interface hash callback. * @@ -674,7 +674,7 @@ _("Failed to change interface mac address from %s to %s due to differing lengths * virReleaseInterface: * @interface: the interface to release * - * Unconditionally release all memory associated with a interface. + * Unconditionally release all memory associated with an interface. * The conn.lock mutex must be held prior to calling this, and will * be released prior to this returning. The interface obj must not * be used once this method returns. diff --git a/src/libvirt.c b/src/libvirt.c index 9e87900..f7a0761 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -291,7 +291,7 @@ virInitialize(void) #ifdef WITH_DRIVER_MODULES /* We don't care if any of these fail, because the whole point * is to allow users to only install modules they want to use. - * If they try to use a open a connection for a module that + * If they try to use an open a connection for a module that * is not loaded they'll get a suitable error at that point */ virDriverLoadModule("test"); @@ -2050,7 +2050,7 @@ error: * virDomainResume: * @domain: a domain object * - * Resume an suspended domain, the process is restarted from the state where + * Resume a suspended domain, the process is restarted from the state where * it was frozen by calling virSuspendDomain(). * This function may requires privileged access * @@ -3999,7 +3999,7 @@ error: * * The path parameter is the name of the network interface. * - * Domains may have more than network interface. To get stats for + * Domains may have more than one network interface. To get stats for * each you should make multiple calls to this function. * * Individual fields within the stats structure may be returned @@ -4680,7 +4680,7 @@ error: * @domain: pointer to domain object, or NULL for Domain0 * @info: pointer to an array of virVcpuInfo structures (OUT) * @maxinfo: number of structures in info array - * @cpumaps: pointer to an bit map of real CPUs for all vcpus of this + * @cpumaps: pointer to a bit map of real CPUs for all vcpus of this * domain (in 8-bit bytes) (OUT) * If cpumaps is NULL, then no cpumap information is returned by the API. * It's assumed there is <maxinfo> cpumap in cpumaps array. @@ -9202,7 +9202,7 @@ error: * @xml: XML describing the secret. * @flags: flags, use 0 for now * - * If XML specifies an UUID, locates the specified secret and replaces all + * If XML specifies a UUID, locates the specified secret and replaces all * attributes of the secret specified by UUID by attributes specified in xml * (any attributes not specified in xml are discarded). * @@ -9713,7 +9713,7 @@ virStreamRef(virStreamPtr stream) * with the call, but may instead be delayed until a * subsequent call. * - * A example using this with a hypothetical file upload + * An example using this with a hypothetical file upload * API looks like * * virStreamPtr st = virStreamNew(conn, 0); @@ -9805,7 +9805,7 @@ error: * with the call, but may instead be delayed until a * subsequent call. * - * A example using this with a hypothetical file download + * An example using this with a hypothetical file download * API looks like * * virStreamPtr st = virStreamNew(conn, 0); @@ -9896,7 +9896,7 @@ error: * requested data source. This is simply a convenient alternative * to virStreamSend, for apps that do blocking-I/o. * - * A example using this with a hypothetical file upload + * An example using this with a hypothetical file upload * API looks like * * int mysource(virStreamPtr st, char *buf, int nbytes, void *opaque) { @@ -9993,7 +9993,7 @@ cleanup: * requested data sink. This is simply a convenient alternative * to virStreamRecv, for apps that do blocking-I/o. * - * A example using this with a hypothetical file download + * An example using this with a hypothetical file download * API looks like * * int mysink(virStreamPtr st, const char *buf, int nbytes, void *opaque) { @@ -10174,7 +10174,7 @@ error: * virStreamEventRemoveCallback: * @stream: pointer to the stream object * - * Remove a event callback from the stream + * Remove an event callback from the stream * * Returns 0 on success, -1 on error */ @@ -10297,7 +10297,7 @@ error: * Decrement the reference count on a stream, releasing * the stream object if the reference count has hit zero. * - * There must not be a active data transfer in progress + * There must not be an active data transfer in progress * when releasing the stream. If a stream needs to be * disposed of prior to end of stream being reached, then * the virStreamAbort function should be called first. -- 1.6.2.5

2 2

[libvirt] RestrictedVersion Error trying to shutdown an ESX VM
by Shahar Klein 26 Oct '09

26 Oct '09

I could swear it worked before: virsh # list Id Name State ---------------------------------- 352 ubuntu904 running 368 rh53 running virsh # shutdown 352 error: Failed to shutdown domain 352 error: internal error HTTP response code 500. VI Fault: ServerFaultCode - fault.RestrictedVersion.summary with LIBVIRT_DEBUG=1: virsh # shutdown 352 10:34:50.665: debug : virDomainLookupByID:1746 : conn=0x626440, id=352 10:34:50.687: debug : virGetDomain:344 : New hash entry 0x7104d0 10:34:50.687: debug : virDomainShutdown:2331 : domain=0x7104d0 error: Failed to shutdown domain 352 10:34:50.722: debug : virDomainFree:1958 : domain=0x7104d0 10:34:50.722: debug : virUnrefDomain:421 : unref domain 0x7104d0 ubuntu904 1 10:34:50.722: debug : virReleaseDomain:375 : release domain 0x7104d0 ubuntu904 10:34:50.722: debug : virReleaseDomain:391 : unref connection 0x626440 2 error: internal error HTTP response code 500. VI Fault: ServerFaultCode - fault.RestrictedVersion.summary

2 1

[libvirt] [PATCH] Fix problems in the Xen inotify driver.
by Matthias Bolte 26 Oct '09

26 Oct '09

In xenInotifyXendDomainsDirLookup() the wrong UUID variable is used to search in the config info list. In xenInotifyEvent() the event is dispatched if it's NULL. Both were introduced in bc898df2c74fe3c8efedfbbd430737bac950e65e. --- src/xen/xen_inotify.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/xen/xen_inotify.c b/src/xen/xen_inotify.c index 9e0407f..aa3893a 100644 --- a/src/xen/xen_inotify.c +++ b/src/xen/xen_inotify.c @@ -142,7 +142,7 @@ xenInotifyXendDomainsDirLookup(virConnectPtr conn, const char *filename, search for, and create a domain from the stored list info */ for (i = 0 ; i < priv->configInfoList->count ; i++) { - if (!memcmp(uuid, priv->configInfoList->doms[i]->uuid, VIR_UUID_BUFLEN)) { + if (!memcmp(rawuuid, priv->configInfoList->doms[i]->uuid, VIR_UUID_BUFLEN)) { *name = strdup(priv->configInfoList->doms[i]->name); if (!*name) { virXenInotifyError(NULL, VIR_ERR_INTERNAL_ERROR, @@ -332,7 +332,7 @@ reread: xenInotifyDomainEventFromFile(conn, fname, VIR_DOMAIN_EVENT_UNDEFINED, VIR_DOMAIN_EVENT_UNDEFINED_REMOVED); - if (!event) + if (event) xenUnifiedDomainEventDispatch(conn->privateData, event); else virXenInotifyError(NULL, VIR_ERR_INTERNAL_ERROR, -- 1.6.0.4

3 2

[libvirt] [PATCH] Fix error message in qemudLoadDriverConfig()
by Matthias Bolte 26 Oct '09

26 Oct '09

* src/qemu/qemu_conf.c: change the error message to refer to 'cgroup_controllers' instead of 'cgroup_device_acl' --- src/qemu/qemu_conf.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index 158e9a3..a095cb7 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -243,7 +243,7 @@ int qemudLoadDriverConfig(struct qemud_driver *driver, for (i = 0, pp = p->list; pp; ++i, pp = pp->next) { int ctl; if (pp->type != VIR_CONF_STRING) { - VIR_ERROR("%s", _("cgroup_device_acl must be a list of strings")); + VIR_ERROR("%s", _("cgroup_controllers must be a list of strings")); virConfFree(conf); return -1; } -- 1.6.0.4

2 1

[libvirt] [PATCH] Various syntax-check fixes.
by Chris Lalancette 26 Oct '09

26 Oct '09

Make a pass over the syntax-check files, tightening up regex's, un-ignoring certain files, and cleaning things up. Signed-off-by: Chris Lalancette <clalance(a)redhat.com> --- .x-sc_prohibit_VIR_ERR_NO_MEMORY | 13 +++++-------- .x-sc_prohibit_gethostby | 5 ++--- .x-sc_prohibit_strcmp_and_strncmp | 7 +++++++ .x-sc_prohibit_strncpy | 2 +- .x-sc_require_config_h | 1 - Makefile.am | 14 ++++++++++++-- cfg.mk | 8 +++----- 7 files changed, 30 insertions(+), 20 deletions(-) diff --git a/.x-sc_prohibit_VIR_ERR_NO_MEMORY b/.x-sc_prohibit_VIR_ERR_NO_MEMORY index fbefbeb..5c96e83 100644 --- a/.x-sc_prohibit_VIR_ERR_NO_MEMORY +++ b/.x-sc_prohibit_VIR_ERR_NO_MEMORY @@ -1,8 +1,5 @@ -ChangeLog -docs/devhelp/libvirt-virterror.html -docs/html/libvirt-virterror.html -docs/libvirt-api.xml -docs/libvirt-refs.xml -include/libvirt/virterror.h -daemon/dispatch.c -src/util/virterror.c +^ChangeLog$ +^ChangeLog-old$ +^include/libvirt/virterror\.h$ +^daemon/dispatch\.c$ +^src/util/virterror\.c$ diff --git a/.x-sc_prohibit_gethostby b/.x-sc_prohibit_gethostby index c771142..7c052f4 100644 --- a/.x-sc_prohibit_gethostby +++ b/.x-sc_prohibit_gethostby @@ -1,3 +1,2 @@ -gnulib/lib/getaddrinfo.c -gnulib/m4/ -src/xend_internal.c +^gnulib/lib/getaddrinfo\.c$ +^gnulib/m4/ diff --git a/.x-sc_prohibit_strcmp_and_strncmp b/.x-sc_prohibit_strcmp_and_strncmp index b7c456e..c0d8793 100644 --- a/.x-sc_prohibit_strcmp_and_strncmp +++ b/.x-sc_prohibit_strcmp_and_strncmp @@ -1 +1,8 @@ ^gnulib/ +^ChangeLog-old$ +^examples/domain-events/events-c/event-test\.c$ +^src/internal\.h$ +^src/lxc/lxc_container\.c$ +^src/node_device/node_device_devkit\.c$ +^src/node_device/node_device_hal\.c$ +^src/storage/parthelper\.c$ diff --git a/.x-sc_prohibit_strncpy b/.x-sc_prohibit_strncpy index 10bc29c..70e2300 100644 --- a/.x-sc_prohibit_strncpy +++ b/.x-sc_prohibit_strncpy @@ -1 +1 @@ -src/util/util.c +^src/util/util\.c$ diff --git a/.x-sc_require_config_h b/.x-sc_require_config_h index e1f6e10..a530ae0 100644 --- a/.x-sc_require_config_h +++ b/.x-sc_require_config_h @@ -1,5 +1,4 @@ ^examples/ ^gnulib/lib/dummy\.c$ ^gnulib/tests/dummy\.c$ -^daemon/remote_protocol\.c$ ^ChangeLog$ diff --git a/Makefile.am b/Makefile.am index 977ad0c..14fc593 100644 --- a/Makefile.am +++ b/Makefile.am @@ -17,12 +17,22 @@ EXTRA_DIST = \ mingw32-libvirt.spec.in \ libvirt.pc libvirt.pc.in \ autobuild.sh \ + .x-sc_avoid_ctype_macros \ .x-sc_avoid_if_before_free \ - .x-sc_require_config_h_first \ + .x-sc_avoid_write \ + .x-sc_m4_quote_check \ + .x-sc_prohibit_asprintf \ + .x-sc_prohibit_gethostby \ + .x-sc_prohibit_have_config_h \ + .x-sc_prohibit_HAVE_MBRTOWC \ + .x-sc_prohibit_nonreentrant \ .x-sc_prohibit_strcmp \ .x-sc_prohibit_strcmp_and_strncmp \ + .x-sc_prohibit_strncpy \ + .x-sc_prohibit_VIR_ERR_NO_MEMORY \ .x-sc_require_config_h \ - .x-sc_prohibit_nonreentrant \ + .x-sc_require_config_h_first \ + .x-sc_trailing_blank \ Makefile.nonreentrant \ autogen.sh \ examples/domain-events/events-python \ diff --git a/cfg.mk b/cfg.mk index 44cfd17..c1d3864 100644 --- a/cfg.mk +++ b/cfg.mk @@ -79,11 +79,9 @@ sc_avoid_write: # Use STREQ rather than comparing strcmp == 0, or != 0. # Similarly, use STREQLEN or STRPREFIX rather than strncmp. sc_prohibit_strcmp_and_strncmp: - @grep -nE '! *strn?cmp *$|\<strn?cmp *\([^)]+$ *==' \ - $$($(VC_LIST_EXCEPT)) \ - | grep -vE ':# *define STREQ(LEN)?\(' && \ - { echo '$(ME): use STREQ(LEN) in place of the above uses of strcmp(strncmp)' \ - 1>&2; exit 1; } || : + @re='strn?cmp *\(' \ + msg='use STREQ() in place of the above uses of str[n]cmp' \ + $(_prohibit_regexp) # Use virAsprintf rather than a'sprintf since *strp is undefined on error. sc_prohibit_asprintf: -- 1.6.0.6

2 2

[libvirt] [PATCH] Tighten up nonreentrant syntax-check.
by Chris Lalancette 26 Oct '09

26 Oct '09

We can slightly tighten up the regex's used to detect the use of nonreentrant functions. We can also check src/util/virterror.c by modifying a comment; I think it's worth it to get the additional coverage. Signed-off-by: Chris Lalancette <clalance(a)redhat.com> --- .x-sc_prohibit_nonreentrant | 8 ++++---- src/util/virterror.c | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.x-sc_prohibit_nonreentrant b/.x-sc_prohibit_nonreentrant index ac783c0..0ab2f5d 100644 --- a/.x-sc_prohibit_nonreentrant +++ b/.x-sc_prohibit_nonreentrant @@ -1,10 +1,10 @@ ^gnulib/ ^po/ -ChangeLog +^ChangeLog$ +^ChangeLog-old$ ^Makefile* ^docs/ ^tests/ -^tools/virsh\.c -^tools/console\.c -^src/util/virterror\.c +^tools/virsh\.c$ +^tools/console\.c$ ^build-aux/ diff --git a/src/util/virterror.c b/src/util/virterror.c index e421ab7..657cb3f 100644 --- a/src/util/virterror.c +++ b/src/util/virterror.c @@ -1157,7 +1157,7 @@ const char *virStrerror(int theerrno, char *errBuf, size_t errBufLen) return errBuf; # endif #else - /* Mingw lacks strerror_r() and its strerror() is definitely not + /* Mingw lacks strerror_r and its strerror is definitely not * threadsafe, so safest option is to just print the raw errno * value - we can at least reliably & safely look it up in the * header files for debug purposes -- 1.6.0.6

2 2

[libvirt] [PATCH] Replace two strcmp() by STREQ() in qemu_driver.c
by Chris Lalancette 26 Oct '09

26 Oct '09

Signed-off-by: Chris Lalancette <clalance(a)redhat.com> --- src/qemu/qemu_driver.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 4cd235d..da7dda7 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -4142,7 +4142,7 @@ qemudCanonicalizeMachineFromInfo(virDomainDefPtr def, if (!machine->canonical) continue; - if (strcmp(def->os.machine, machine->name) != 0) + if (STRNEQ(def->os.machine, machine->name)) continue; if (!(*canonical = strdup(machine->canonical))) { @@ -4171,7 +4171,7 @@ qemudCanonicalizeMachineDirect(virDomainDefPtr def, char **canonical) if (!machines[i]->canonical) continue; - if (strcmp(def->os.machine, machines[i]->name) != 0) + if (STRNEQ(def->os.machine, machines[i]->name)) continue; *canonical = machines[i]->canonical; -- 1.6.0.6

2 4

[libvirt] [PATCH] Replace gethostname by virGetHostname in xend_internal.c
by Chris Lalancette 26 Oct '09

26 Oct '09

--- src/xen/xend_internal.c | 11 +---------- 1 files changed, 1 insertions(+), 10 deletions(-) diff --git a/src/xen/xend_internal.c b/src/xen/xend_internal.c index 27d215e..d3ab019 100644 --- a/src/xen/xend_internal.c +++ b/src/xen/xend_internal.c @@ -4342,21 +4342,12 @@ xenDaemonDomainMigratePrepare (virConnectPtr dconn, const char *dname ATTRIBUTE_UNUSED, unsigned long resource ATTRIBUTE_UNUSED) { - int r; - char hostname [HOST_NAME_MAX+1]; - /* If uri_in is NULL, get the current hostname as a best guess * of how the source host should connect to us. Note that caller * deallocates this string. */ if (uri_in == NULL) { - r = gethostname (hostname, HOST_NAME_MAX+1); - if (r == -1) { - virReportSystemError(dconn, errno, - _("unable to resolve name %s"), hostname); - return -1; - } - *uri_out = strdup (hostname); + *uri_out = virGetHostname(); if (*uri_out == NULL) { virReportOOMError(dconn); return -1; -- 1.6.0.6

2 2

[libvirt] [PATCH] Replace a gethostname by virGetHostname in libvirtd.c
by Chris Lalancette 26 Oct '09

26 Oct '09

Signed-off-by: Chris Lalancette <clalance(a)redhat.com> --- daemon/libvirtd.c | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c index 4eb33bc..02bd287 100644 --- a/daemon/libvirtd.c +++ b/daemon/libvirtd.c @@ -937,15 +937,19 @@ static struct qemud_server *qemudNetworkInit(struct qemud_server *server) { server->mdns = libvirtd_mdns_new(); if (!mdns_name) { - char groupname[64], localhost[HOST_NAME_MAX+1], *tmp; + char groupname[64], *localhost, *tmp; /* Extract the host part of the potentially FQDN */ - gethostname(localhost, HOST_NAME_MAX); - localhost[HOST_NAME_MAX] = '\0'; + localhost = virGetHostname(); + if (localhost == NULL) { + virReportOOMError(NULL); + goto cleanup; + } if ((tmp = strchr(localhost, '.'))) *tmp = '\0'; snprintf(groupname, sizeof(groupname)-1, "Virtualization Host %s", localhost); groupname[sizeof(groupname)-1] = '\0'; group = libvirtd_mdns_add_group(server->mdns, groupname); + VIR_FREE(localhost); } else { group = libvirtd_mdns_add_group(server->mdns, mdns_name); } -- 1.6.0.6

2 2

[libvirt] [PATCH] Remove a completely bogus reference increment in the Xen driver.
by Chris Lalancette 26 Oct '09

26 Oct '09

xenUnifiedDomainEventRegister() calls out to virDomainEventCallbackListAdd(), which increments the reference count on the connection. That is fine, but then xenUnifiedDomainEventRegister() increments the usage count again, leading to a usage count leak. Remove the increment in the xen register, and the UnrefConnect in the xen unregister. Signed-off-by: Chris Lalancette <clalance(a)redhat.com> --- src/xen/xen_driver.c | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) diff --git a/src/xen/xen_driver.c b/src/xen/xen_driver.c index 5273a11..f2744b0 100644 --- a/src/xen/xen_driver.c +++ b/src/xen/xen_driver.c @@ -1502,9 +1502,6 @@ xenUnifiedDomainEventRegister (virConnectPtr conn, ret = virDomainEventCallbackListAdd(conn, priv->domainEventCallbacks, callback, opaque, freefunc); - if (ret == 0) - conn->refs++; - xenUnifiedUnlock(priv); return (ret); } @@ -1530,9 +1527,6 @@ xenUnifiedDomainEventDeregister (virConnectPtr conn, ret = virDomainEventCallbackListRemove(conn, priv->domainEventCallbacks, callback); - if (ret == 0) - virUnrefConnect(conn); - xenUnifiedUnlock(priv); return ret; } -- 1.6.0.6

2 2

[libvirt] [PATCH] Add a new syntax-check rule for gethostname.
by Chris Lalancette 26 Oct '09

26 Oct '09

We should always be using virGetHostname in place of gethostname; thus add in a new syntax-check rule to make sure no new uses creep in. Signed-off-by: Chris Lalancette <clalance(a)redhat.com> --- .x-sc_prohibit_gethostname | 2 ++ Makefile.am | 1 + cfg.mk | 5 +++++ src/libvirt.c | 2 +- 4 files changed, 9 insertions(+), 1 deletions(-) create mode 100644 .x-sc_prohibit_gethostname diff --git a/.x-sc_prohibit_gethostname b/.x-sc_prohibit_gethostname new file mode 100644 index 0000000..e7acb03 --- /dev/null +++ b/.x-sc_prohibit_gethostname @@ -0,0 +1,2 @@ +^src/util/util\.c$ +^ChangeLog-old$ diff --git a/Makefile.am b/Makefile.am index 14fc593..32cd96a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -23,6 +23,7 @@ EXTRA_DIST = \ .x-sc_m4_quote_check \ .x-sc_prohibit_asprintf \ .x-sc_prohibit_gethostby \ + .x-sc_prohibit_gethostname \ .x-sc_prohibit_have_config_h \ .x-sc_prohibit_HAVE_MBRTOWC \ .x-sc_prohibit_nonreentrant \ diff --git a/cfg.mk b/cfg.mk index c1d3864..45d6531 100644 --- a/cfg.mk +++ b/cfg.mk @@ -94,6 +94,11 @@ sc_prohibit_strncpy: msg='use virStrncpy, not strncpy' \ $(_prohibit_regexp) +sc_prohibit_gethostname: + @re='gethostname *\(' \ + msg='use virGetHostname, not gethostname' \ + $(_prohibit_regexp) + sc_prohibit_VIR_ERR_NO_MEMORY: @re='\<V''IR_ERR_NO_MEMORY\>' \ msg='use virReportOOMError, not V'IR_ERR_NO_MEMORY \ diff --git a/src/libvirt.c b/src/libvirt.c index 5787f22..4e244bb 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -1441,7 +1441,7 @@ error: * @conn: pointer to a hypervisor connection * * This returns the system hostname on which the hypervisor is - * running (the result of the gethostname(2) system call). If + * running (the result of the gethostname system call). If * we are connected to a remote system, then this returns the * hostname of the remote system. * -- 1.6.0.6

2 2

[libvirt] [PATCH] Add a default log_level to qemudSetLogging to remove a build warning.
by Chris Lalancette 26 Oct '09

26 Oct '09

(original patch from Charles Duffy) Signed-off-by: Chris Lalancette <clalance(a)redhat.com> --- daemon/libvirtd.c | 11 +++-------- 1 files changed, 3 insertions(+), 8 deletions(-) diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c index 03bc1b4..4eb33bc 100644 --- a/daemon/libvirtd.c +++ b/daemon/libvirtd.c @@ -2509,8 +2509,9 @@ remoteReadSaslAllowedUsernameList (virConfPtr conf ATTRIBUTE_UNUSED, * debugging is asked for then output informations or debug. */ static int -qemudSetLogging(virConfPtr conf, const char *filename) { - int log_level; +qemudSetLogging(virConfPtr conf, const char *filename) +{ + int log_level = 0; char *log_filters = NULL; char *log_outputs = NULL; int ret = -1; @@ -2531,12 +2532,6 @@ qemudSetLogging(virConfPtr conf, const char *filename) { * level has been set, we must process variables in the opposite * order, each one overriding the previous. */ - /* - * GET_CONF_INT returns 0 when there is no log_level setting in - * the config file. The conditional below eliminates a false - * warning in that case, but also has the side effect of missing - * a warning if the user actually does say log_level=0. - */ GET_CONF_INT (conf, filename, log_level); if (log_level != 0) virLogSetDefaultPriority(log_level); -- 1.6.0.6

2 2

[libvirt] virsh edit not saving interface target specification
by Neil Aggarwal 26 Oct '09

26 Oct '09

Hello: I am trying to set a target dev specification for one of my guests so I stopped the guest and the did virst edit, added the target specification, and saved the file. If I go back into virsh edit, the target specification is not being saved. I am using libvirt 0.6.3-20.el5 installed by yum on CentOS 5.4. Here is the XML file after I edited it: <domain type='kvm'> <name>jamm12a</name> <uuid>6452dcff-c20f-908b-d1ee-7dcf1406a3e0</uuid> <memory>1048576</memory> <currentMemory>1048576</currentMemory> <vcpu>1</vcpu> <os> <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <features> <acpi/> <apic/> <pae/> </features> <clock offset='utc'/> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> <on_crash>restart</on_crash> <devices> <emulator>/usr/libexec/qemu-kvm</emulator> <disk type='file' device='disk'> <source file='/var/lib/libvirt/images/jamm12a.img'/> <target dev='hda' bus='ide'/> </disk> <disk type='file' device='cdrom'> <target dev='hdc' bus='ide'/> <readonly/> </disk> <interface type='bridge'> <mac address='54:52:00:4f:83:67'/> <source bridge='br0'/> <target dev='vnet1'/> </interface> <serial type='pty'> <target port='0'/> </serial> <console type='pty'> <target port='0'/> </console> <input type='mouse' bus='ps2'/> <graphics type='vnc' port='-1' autoport='yes' keymap='en-us'/> </devices> </domain> When I save the file and do virsh edit again, the <target dev='vnet1'/> line is not saved. Is this a bug in libvirt? Thanks, Neil -- Neil Aggarwal, (281)846-8957, www.JAMMConsulting.com Will your e-commerce site go offline if you have a DB server failure, fiber cut, flood, fire, or other disaster? If so, ask about our geographically redundant database system.

4 5

[libvirt] Get Virtual Machine Information
by Gandhiraj Natarajan 25 Oct '09

25 Oct '09

Hi 1. We need to know how to get the IP addresses of virtual machines running in Novel Xen Server? 2. We need to know how to get the proper operating system like Windows XP or 2000 or 2003? Thanks in advance Regards, Gandhiraj Natarajan Connect more, do more and share more with Yahoo! India Mail. Learn more. http://in.overview.mail.yahoo.com/

2 3

[libvirt] invalid domain pointer
by Stefan 23 Oct '09

23 Oct '09

Hello, my log files are filled with (5 times per second): error : invalid domain pointer in no domain with matching id -1 My system: libvirt 0.6.1, Ubuntu 9.04, 2.6.28-15-server #52-Ubuntu x86_64 Any ideas ? Thanks Stefan

2 3

[libvirt] [PATCH] Remove redundant virFileDeletePID() call
by Chris Lalancette 23 Oct '09

23 Oct '09

virFileDeletePID() is unnecessarily called in qemudRemoveDomainStatus(). The only caller of qemudRemoveDomainStatus() is qemudShutdownVMDaemon(), and that already calls virFileDeletePID (with a better error message). Remove the redundant call here. Signed-off-by: Chris Lalancette <clalance(a)redhat.com> --- src/qemu/qemu_driver.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 02bb5cb..4cd235d 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -273,9 +273,6 @@ qemudRemoveDomainStatus(virConnectPtr conn, goto cleanup; } - if(virFileDeletePid(driver->stateDir, vm->def->name)) - goto cleanup; - rc = 0; cleanup: VIR_FREE(file); -- 1.6.0.6

2 2

[libvirt] Re: [virt-tools-list] [BUG] mounting of NFSv4 pools fails in virt-manager
by Cole Robinson 23 Oct '09

23 Oct '09

On 10/23/2009 07:22 AM, Jon Nordby wrote: > The problem is due to libvirt using mount.nfs instead of mount.nfs4 for > NFSv4 shares. > > virt-manager tries the following command (see attached file): > [jon@jon-laptop ~]$ sudo /bin/mount 10.0.0.2:/libvirt_install > /var/lib/libvirt/images/server-install > mount.nfs: access denied by server while mounting 10.0.0.2:/libvirt_install > > When it should be something like this instead: > [jon@jon-laptop ~]$ sudo /bin/mount -t nfs4 10.0.0.2:/libvirt_install > /var/lib/libvirt/images/server-install > > Because mount apparently considers NFSv4 to be a different type than > previous NFS versions: > [jon@jon-laptop ~]$ mount.nfs > mount.nfs mount.nfs4 > > OS: Arch Linux Current on both server and client. nfs-utils 1.2.0-4 and > kernel 2.6.31 > > I don't believe there is a good way to programatically check which version a > share is, but one can catch the error and try again with "-t nfs4". > Or perhaps trying nfs4 first is better... > > libvirtError: internal error '/bin/mount 10.0.0.2:/libvirt_install /var/lib/libvirt/images/server-install' exited with non-zero status 32 and signal 0: mount.nfs: access denied by server while mounting 10.0.0.2:/libvirt_insta FYI, libvirt issues should go to libvirt-list(a)redhat.com (cc'ing) - Cole

1 0

[libvirt] libvirt: use existing network bridge
by Sascha Frey 23 Oct '09

23 Oct '09

Hi, I met a problem setting up virt-manager and libvirt: I want to use an existing customized network bridge with libvirt (I need special iptables rules and a custom DHCP setup). So I created a network definition file like this: <network> <name>NAT</name> <bridge name='br-nat' /> </network> Unfortunately, I'm unable to activate this network, because libvirt tries to create the bridge `br-nat' and fails, because it already exists: # virsh net-start NAT error: Failed to start network NAT error: cannot create bridge 'br-nat': File exists I just want libvirt to attach the guest's tap devices to this existing bridge. I don't want libvirt to manage the network. Is there any chance to realize this set-up? It should work with virt-manager using the graphical wizard. Thanks! Regards Sascha

4 4

[libvirt] libvirt update problem
by Gerry Reno 23 Oct '09

23 Oct '09

# yum list 'libvirt' Loaded plugins: dellsysidplugin2, fastestmirror, installonlyn, refresh-packagekit, versionlock Loading mirror speeds from cached hostfile Excluding mirror: mirror.newnanutilities.org * fedora: mirror.hiwaay.net * updates: mirror.hiwaay.net Reading version lock configuration Installed Packages libvirt.i586 0.6.2-8.fc11 installed libvirt.x86_64 0.6.2-8.fc11 installed Available Packages libvirt.i586 0.6.2-18.fc11 updates libvirt.x86_64 0.6.2-18.fc11 updates and when I update libvirt: Transaction Check Error: file /usr/share/libvirt/schemas/domain.rng from install of libvirt-0.6.2-18.fc11.x86_64 conflicts with file from package libvirt-0.6.2-8.fc11.i586 What is wrong here?

1 1