- Devel - libvirt List Archives

[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