November 2010 - Devel - libvirt List Archives

[libvirt] pool and VM disk/image connection
by Zdenek Styblik 29 Nov '10

29 Nov '10

Dear list, I had a need to migrate pool resp. images in pool from /some/where/ to /some/where/else/. To my surprise, I just found out editing pool wasn't enough as each and every VM has full path to disk image not just "link" or "connection" to pool. I don't want to say this is bug or wrong doing; I don't want to say it isn't my fault, because it is and I should have study more carefully. What I'm asking for is an explanation of connection between images in pool, pool and VMs (or something like that). Just 1+1=? You see, my expectation was just to edit pool and it's all going to work-out. It didn't :) Thank you, Zdenek PS: I'm eventually to sorry for sending it at libvirt-users PPS: damn you and yours auto-suggestion, Thunderbird! :) -- Zdenek Styblik Net/Linux admin OS TurnovFree.net email: stybla(a)turnovfree.net jabber: stybla(a)jabber.turnovfree.net

1 0

[libvirt] vm start error due to libvirt
by 杨树林 29 Nov '10

29 Nov '10

Hi guys, I met a libvirt error Below is the information I got, Libvirt version: [root@kvm-yxnd-tjhy-8 qemu]# yum list installed |grep kvm etherboot-roms-kvm.x86_64 5.4.4-13.el5.centos installed etherboot-zroms-kvm.x86_64 5.4.4-13.el5.centos installed kmod-kvm.x86_64 83-164.el5_5.23 installed kvm.x86_64 83-164.el5_5.23 installed kvm-qemu-img.x86_64 83-164.el5_5.23 installed kvm-tools.x86_64 83-164.el5_5.23 installed [root@kvm-yxnd-tjhy-8 qemu]# yum list installed |grep libvirt libvirt.x86_64 0.8.3-1.el5 installed libvirt-client.x86_64 0.8.3-1.el5 installed libvirt-debuginfo.x86_64 0.8.3-1.el5 installed libvirt-devel.x86_64 0.8.3-1.el5 installed libvirt-python.x86_64 0.8.3-1.el5 installed [root@kvm-yxnd-tjhy-8 qemu]# yum list installed |grep qemu kvm-qemu-img.x86_64 83-164.el5_5.23 installed start vm error information , [root@kvm-yxnd-tjhy-8 ~]# virsh list --all Id Name State ---------------------------------- - iotest shut off - yxnd-gs-win32-qq shut off [root@kvm-yxnd-tjhy-8 ~]# virsh start iotest error: Failed to start domain iotest error: internal error Process exited while reading console log output: [root@kvm-yxnd-tjhy-8 ~]# cat /etc/libvirt/libvirtd.conf |grep log_level log_level = 1 tail /var/log/libvirt/qemu/iotest.log LC_ALL=C PATH=/sbin:/usr/sbin:/bin:/usr/bin HOME=/root USER=root LOGNAME=root QEMU_AUDIO_DRV=none /usr/libexec/qemu-kvm -S -M rhel5.4.0 -m 2048 -smp 4 -name iotest -uuid ec2bec5e-096b-6d41-238f-378b8cf39ad8 -monitor unix:/var/lib/libvirt/qemu/iotest.monitor,server,nowait -localtime -boot c -drive file=/datapool/iotest.qcow2,if=virtio,boot=on,format=qcow2,cache=none -net nic,macaddr=00:16:36:13:96:18,vlan=0,model=virtio -net tap,fd=17,vlan=0 -net nic,macaddr=00:16:36:7d:cb:c6,vlan=1,model=virtio -net tap,fd=18,vlan=1 -serial pty -parallel none -usb -usbdevice tablet -vnc 0.0.0.0:0 -k en-us -vga cirrus -balloon virtio [root@kvm-yxnd-tjhy-8 qemu]# cat /etc/libvirt/qemu/iotest.xml <domain type='kvm'> <name>iotest</name> <uuid>ec2bec5e-096b-6d41-238f-378b8cf39ad8</uuid> <memory>2097152</memory> <currentMemory>2097152</currentMemory> <vcpu>4</vcpu> <os> <type arch='x86_64' machine='rhel5.4.0'>hvm</type> <boot dev='hd'/> </os> <features> <acpi/> <apic/> <pae/> </features> <clock offset='localtime'/> <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'> <driver name='qemu' type='qcow2' cache='none'/> <source file='/datapool/iotest.qcow2'/> <target dev='vda' bus='virtio'/> </disk> <interface type='bridge'> <mac address='00:16:36:13:96:18'/> <source bridge='br1'/> <model type='virtio'/> </interface> <interface type='bridge'> <mac address='00:16:36:7d:cb:c6'/> <source bridge='br0'/> <model type='virtio'/> </interface> <serial type='pty'> <target port='0'/> </serial> <console type='pty'> <target type='serial' port='0'/> </console> <input type='tablet' bus='usb'/> <input type='mouse' bus='ps2'/> <graphics type='vnc' port='-1' autoport='yes' keymap='en-us'/> <video> <model type='cirrus' vram='9216' heads='1'/> </video> <memballoon model='virtio'/> </devices> </domain> The error log of /var/log/message: Nov 29 15:23:00 kvm-yxnd-tjhy-8 libvirtd: 15:23:00.775: info : qemuSecurityDACSetOwnership:40 : Setting DAC user and group on '/datapool/iotest.qcow2' to '0:0' Nov 29 15:23:00 kvm-yxnd-tjhy-8 libvirtd: 15:23:00.797: info : qemudDispatchSignalEvent:401 : Received unexpected signal 17 Nov 29 15:23:00 kvm-yxnd-tjhy-8 libvirtd: 15:23:00.798: info : brProbeVnetHdr:449 : Enabling IFF_VNET_HDR Nov 29 15:23:00 kvm-yxnd-tjhy-8 kernel: device vnet0 entered promiscuous mode Nov 29 15:23:00 kvm-yxnd-tjhy-8 kernel: device vnet0 entered promiscuous mode Nov 29 15:23:00 kvm-yxnd-tjhy-8 kernel: printk: 6 messages suppressed. Nov 29 15:23:00 kvm-yxnd-tjhy-8 kernel: printk: 6 messages suppressed. Nov 29 15:23:00 kvm-yxnd-tjhy-8 kernel: type=1700 audit(1291015380.812:157): dev=vnet0 prom=256 old_prom=0 auid=4294967295 ses=4294967295 Nov 29 15:23:00 kvm-yxnd-tjhy-8 kernel: type=1700 audit(1291015380.812:157): dev=vnet0 prom=256 old_prom=0 auid=4294967295 ses=4294967295 Nov 29 15:23:00 kvm-yxnd-tjhy-8 kernel: br1: port 2(vnet0) entering learning state Nov 29 15:23:00 kvm-yxnd-tjhy-8 kernel: br1: port 2(vnet0) entering learning state Nov 29 15:23:00 kvm-yxnd-tjhy-8 libvirtd: 15:23:00.814: info : brProbeVnetHdr:449 : Enabling IFF_VNET_HDR Nov 29 15:23:00 kvm-yxnd-tjhy-8 kernel: device vnet1 entered promiscuous mode Nov 29 15:23:00 kvm-yxnd-tjhy-8 kernel: device vnet1 entered promiscuous mode Nov 29 15:23:00 kvm-yxnd-tjhy-8 kernel: type=1700 audit(1291015380.828:158): dev=vnet1 prom=256 old_prom=0 auid=4294967295 ses=4294967295 Nov 29 15:23:00 kvm-yxnd-tjhy-8 kernel: type=1700 audit(1291015380.828:158): dev=vnet1 prom=256 old_prom=0 auid=4294967295 ses=4294967295 Nov 29 15:23:00 kvm-yxnd-tjhy-8 kernel: br0: port 2(vnet1) entering learning state Nov 29 15:23:00 kvm-yxnd-tjhy-8 kernel: br0: port 2(vnet1) entering learning state Nov 29 15:23:00 kvm-yxnd-tjhy-8 kernel: libvirtd[7487]: segfault at 00000000431e7000 rip 000000000043440c rsp 00000000431e4480 error 4 Nov 29 15:23:00 kvm-yxnd-tjhy-8 kernel: libvirtd[7487]: segfault at 00000000431e7000 rip 000000000043440c rsp 00000000431e4480 error 4 Nov 29 15:23:00 kvm-yxnd-tjhy-8 libvirtd: 15:23:00.837: error : virExecDaemonize:782 : internal error Intermediate daemon process exited with status 0. Nov 29 15:23:00 kvm-yxnd-tjhy-8 libvirtd: 15:23:00.837: info : qemudDispatchSignalEvent:401 : Received unexpected signal 17 Nov 29 15:23:00 kvm-yxnd-tjhy-8 kernel: br1: port 2(vnet0) entering disabled state Nov 29 15:23:00 kvm-yxnd-tjhy-8 kernel: br1: port 2(vnet0) entering disabled state Nov 29 15:23:00 kvm-yxnd-tjhy-8 kernel: device vnet0 left promiscuous mode Nov 29 15:23:00 kvm-yxnd-tjhy-8 kernel: device vnet0 left promiscuous mode Nov 29 15:23:00 kvm-yxnd-tjhy-8 kernel: type=1700 audit(1291015380.858:159): dev=vnet0 prom=0 old_prom=256 auid=4294967295 ses=4294967295 Nov 29 15:23:00 kvm-yxnd-tjhy-8 kernel: type=1700 audit(1291015380.858:159): dev=vnet0 prom=0 old_prom=256 auid=4294967295 ses=4294967295 Nov 29 15:23:00 kvm-yxnd-tjhy-8 kernel: br1: port 2(vnet0) entering disabled state Nov 29 15:23:00 kvm-yxnd-tjhy-8 kernel: br1: port 2(vnet0) entering disabled state Nov 29 15:23:00 kvm-yxnd-tjhy-8 kernel: br0: port 2(vnet1) entering disabled state Nov 29 15:23:00 kvm-yxnd-tjhy-8 kernel: br0: port 2(vnet1) entering disabled state Nov 29 15:23:00 kvm-yxnd-tjhy-8 kernel: device vnet1 left promiscuous mode Nov 29 15:23:00 kvm-yxnd-tjhy-8 kernel: device vnet1 left promiscuous mode Nov 29 15:23:00 kvm-yxnd-tjhy-8 kernel: type=1700 audit(1291015380.887:160): dev=vnet1 prom=0 old_prom=256 auid=4294967295 ses=4294967295 Nov 29 15:23:00 kvm-yxnd-tjhy-8 kernel: type=1700 audit(1291015380.887:160): dev=vnet1 prom=0 old_prom=256 auid=4294967295 ses=4294967295 Nov 29 15:23:00 kvm-yxnd-tjhy-8 kernel: br0: port 2(vnet1) entering disabled state Nov 29 15:23:00 kvm-yxnd-tjhy-8 kernel: br0: port 2(vnet1) entering disabled state Nov 29 15:23:00 kvm-yxnd-tjhy-8 libvirtd: 15:23:00.895: error : qemudReadLogOutput:2118 : internal error Process exited while reading console log output: Nov 29 15:23:00 kvm-yxnd-tjhy-8 libvirtd: 15:23:00.895: info : qemuSecurityDACRestoreSecurityFileLabel:80 : Restoring DAC user and group on '/datapool/iotest.qcow2' Nov 29 15:23:00 kvm-yxnd-tjhy-8 libvirtd: 15:23:00.895: info : qemuSecurityDACSetOwnership:40 : Setting DAC user and group on '/datapool/iotest.qcow2' to '0:0' I had disable the selinux before, I tried boot the vm via qemu-kvm, it works fine, so what was the problem ? thanks very much for any suggestion and help.

2 1

[libvirt] OpenSource-Management of private Clouds and Virtualisation
by acue＠i4p.com 27 Nov '10

27 Nov '10

Hello, I want to announce the current version of the UnifiedSessionsManager. An OpenSource-Toolset providing a neatless interface for the vendor independent use and administration of virtual and physical systems. Private-Clouds - the "Intranet"! The license is GPL3+FDL-1.3+CCL-3.0. http://www.UnifiedSessionsManager.org The release is going to accomplish the foreseen feature set for the first step, scripting enabled commandline interface comprising tools for automation of creation, registration, inventory scanning and application of distributed virtual and physical mashines. Support for all major Linux host based hypervisors additionally including VMware-ESX/ESXi(TM)(under dev.) and XenServer(TM)(under dev.). The creation of grafical startmenus for Freedesktop.org/XDG - currently Gnome and KDE(still alpha - icons). Datasheet: ---------- http://www.UnifiedSessionsManager.org/en/downloads/datasheet-overview-en-03… Current supported Systems: ========================== Hypervisor(Linux based): KVM, QEMU(TM), VirtualBox(TM), VMware(Player/Server/Workstation)(TM), XEN(TM) Current version has consolen- dnd desktop access only for VMware-ESX(TM), XenServer(TM) Linux(TM - refer to Legal): CentOS, Debian, Fedora, Knoppix, Mandriva, RedHat Enterprise, Linux, ScientificLinux, SuSE, OpenSUSE, Oracle UnbreakableLinux, Ubuntu Linux-Smartphones/Netbooks(TM - refer to Legal): Android, MeeGo BSD(TM - refer to Legal): FreeBSD, OpenBSD Sun/Oracle(TM - refer to Legal): Solaris, OpenSolaris Graphical User Interfaces(TM - refer to Legal): X11, Gnome, KDE, fvwm, xfce Consoles(TM - refer to Legal): CLI, XTerm, gnome-terminal, Emacs, RDP, VNC, VMware, VMRC Legal: ====== Most listed system names are protected trademarks(TM) of their owners, in any case they are protected by their copyright(C). A listing of their legal owner is contained in the documentation, if one is forgotten, this will be corrected immediately. Imprint see datasheet. Yours sincerly Arno-Can Uestuensoez http://www.i4p.com For emails related to the UnifiedSessionsManager use acue_sf1(a)sourceforge.net ---------------------------------------------------------------------------- Arno-Can Uestuensoez www.i4p.com

5 9

[libvirt] [PATCH] doc: Fix spelling of virBufferVSprintf
by Jiri Denemark 25 Nov '10

25 Nov '10

--- Pushed under the trivial rule. HACKING | 2 +- docs/hacking.html.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/HACKING b/HACKING index cd7559d..d646709 100644 --- a/HACKING +++ b/HACKING @@ -508,7 +508,7 @@ Typical usage is as follows: ... virBufferAddLit(&buf, "<domain>\n"); - virBufferVSprint(&buf, " <memory>%d</memory>\n", memory); + virBufferVSprintf(&buf, " <memory>%d</memory>\n", memory); ... virBufferAddLit(&buf, "</domain>\n"); diff --git a/docs/hacking.html.in b/docs/hacking.html.in index ac16f41..900e242 100644 --- a/docs/hacking.html.in +++ b/docs/hacking.html.in @@ -606,7 +606,7 @@ ... virBufferAddLit(&buf, "<domain>\n"); - virBufferVSprint(&buf, " <memory>%d</memory>\n", memory); + virBufferVSprintf(&buf, " <memory>%d</memory>\n", memory); ... virBufferAddLit(&buf, "</domain>\n"); -- 1.7.3.2

1 0

[libvirt] Valid characters in domain names?
by Richard W.M. Jones 25 Nov '10

25 Nov '10

Does libvirt enforce any sort of validity of characters in guest names? Someone tried to create a domain called '#' (the single hash character) and noted that this caused failures in virt-tools: https://bugzilla.redhat.com/show_bug.cgi?id=639601 https://bugzilla.redhat.com/show_bug.cgi?id=639602 Had a look at the code but couldn't see anything obvious: It seems like libvirt delegates this entirely to the drivers, the drivers (probably) all call virDomainDefParseXML, and this function does no checking that I could see. If my analysis is correct, this could be dangerous. What if the name contains a character that is special to the qemu command line (','), to XML ('>'), or to C ()? As an example, the code already does: char *virDomainDefFormat(virDomainDefPtr def, int flags) { ... virBufferEscapeString(&buf, " <name>%s</name>\n", def->name); ... } Rich. -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones virt-df lists disk usage of guests without needing to install any software inside the virtual machine. Supports Linux and Windows. http://et.redhat.com/~rjones/virt-df/

8 24

[libvirt] [PATCH] Fix host CPU counting on unusual NUMA topologies
by Jiri Denemark 25 Nov '10

25 Nov '10

The nodeinfo structure includes nodes : the number of NUMA cell, 1 for uniform mem access sockets : number of CPU socket per node cores : number of core per socket threads : number of threads per core which does not work well for NUMA topologies where each node does not consist of integral number of CPU sockets. We also have VIR_NODEINFO_MAXCPUS macro in public libvirt.h which computes maximum number of CPUs as (nodes * sockets * cores * threads). As a result, we can't just change sockets to report total number of sockets instead of sockets per node. This would probably be the easiest since I doubt anyone is using the field directly. But because of the macro, some apps might be using sockets indirectly. This patch leaves sockets to be the number of CPU sockets per node (and fixes qemu driver to comply with this) on machines where sockets can be divided by nodes. If we can't divide sockets by nodes, we behave as if there was just one NUMA node containing all sockets. Apps interested in NUMA should consult capabilities XML, which is what they probably do anyway. This way, the only case in which apps that care about NUMA may break is on machines with funky NUMA topology. And there is a chance libvirt wasn't able to start any guests on those machines anyway (although it depends on the topology, total number of CPUs and kernel version). Nothing changes at all for apps that don't care about NUMA. Notes: * Testing on 4 sockets, 12 cores each, 8 NUMA nodes Xen (RHEL-5) hypervisor with numa=on: - xm info nr_cpus : 48 nr_nodes : 8 sockets_per_node : 0 cores_per_socket : 12 threads_per_core : 1 - virsh nodeinfo CPU(s): 48 CPU socket(s): 4 Core(s) per socket: 12 Thread(s) per core: 1 NUMA cell(s): 1 - virsh capabilities /capabilities/host/topology/cells@num = 8 QEMU driver: - virsh nodeinfo CPU(s): 48 CPU socket(s): 4 Core(s) per socket: 12 Thread(s) per core: 1 NUMA cell(s): 1 - virsh capabilities /capabilities/host/topology/cells@num = 8 * 2 sockets, 4 cores each, 2 NUMA nodes Xen (RHEL-5) hypervisor with numa=on: - xm info nr_cpus : 8 nr_nodes : 2 sockets_per_node : 1 cores_per_socket : 4 threads_per_core : 1 - virsh nodeinfo CPU(s): 8 CPU socket(s): 1 Core(s) per socket: 4 Thread(s) per core: 1 NUMA cell(s): 2 - virsh capabilities /capabilities/host/topology/cells@num = 2 QEMU driver: - virsh nodeinfo CPU(s): 8 CPU socket(s): 1 Core(s) per socket: 4 Thread(s) per core: 1 NUMA cell(s): 2 - virsh capabilities /capabilities/host/topology/cells@num = 2 * uniform memory architecture, 2 sockets, 4 cores each Xen (RHEL-5) hypervisor: - xm info nr_cpus : 8 nr_nodes : 1 sockets_per_node : 2 cores_per_socket : 4 threads_per_core : 1 - virsh nodeinfo CPU(s): 8 CPU socket(s): 2 Core(s) per socket: 4 Thread(s) per core: 1 NUMA cell(s): 1 - virsh capabilities /capabilities/host/topology/cells@num = 1 Xen (upstream) hypervisor: - xm info nr_cpus : 8 nr_nodes : 1 cores_per_socket : 4 threads_per_core : 1 - virsh nodeinfo CPU(s): 8 CPU socket(s): 2 Core(s) per socket: 4 Thread(s) per core: 1 NUMA cell(s): 1 - virsh capabilities /capabilities/host/topology/cells@num = 1 QEMU driver: - virsh nodeinfo CPU(s): 8 CPU socket(s): 2 Core(s) per socket: 4 Thread(s) per core: 1 NUMA cell(s): 1 - virsh capabilities /capabilities/host/topology/cells@num = 1 --- include/libvirt/libvirt.h.in | 9 ++++++--- src/nodeinfo.c | 10 ++++++++++ src/xen/xend_internal.c | 19 ++++++++++++++----- 3 files changed, 30 insertions(+), 8 deletions(-) diff --git a/include/libvirt/libvirt.h.in b/include/libvirt/libvirt.h.in index 716f7af..395a9f8 100644 --- a/include/libvirt/libvirt.h.in +++ b/include/libvirt/libvirt.h.in @@ -219,9 +219,12 @@ struct _virNodeInfo { unsigned long memory;/* memory size in kilobytes */ unsigned int cpus; /* the number of active CPUs */ unsigned int mhz; /* expected CPU frequency */ - unsigned int nodes; /* the number of NUMA cell, 1 for uniform mem access */ - unsigned int sockets;/* number of CPU socket per node */ - unsigned int cores; /* number of core per socket */ + unsigned int nodes; /* the number of NUMA cell, 1 for unusual NUMA + topologies or uniform memory access; check + capabilities XML for the actual NUMA topology */ + unsigned int sockets;/* number of CPU sockets per node if nodes == 1, + total number of CPU sockets otherwise */ + unsigned int cores; /* number of cores per socket */ unsigned int threads;/* number of threads per core */ }; diff --git a/src/nodeinfo.c b/src/nodeinfo.c index 9be2a02..acd3188 100644 --- a/src/nodeinfo.c +++ b/src/nodeinfo.c @@ -305,6 +305,16 @@ int linuxNodeInfoCPUPopulate(FILE *cpuinfo, return -1; } + /* nodeinfo->sockets is supposed to be a number of sockets per NUMA node, + * however if NUMA nodes are not composed of whole sockets, we just lie + * about the number of NUMA nodes and force apps to check capabilities XML + * for the actual NUMA topology. + */ + if (nodeinfo->sockets % nodeinfo->nodes == 0) + nodeinfo->sockets /= nodeinfo->nodes; + else + nodeinfo->nodes = 1; + return 0; } diff --git a/src/xen/xend_internal.c b/src/xen/xend_internal.c index 4450195..6ce0c3f 100644 --- a/src/xen/xend_internal.c +++ b/src/xen/xend_internal.c @@ -2497,12 +2497,21 @@ sexpr_to_xend_node_info(const struct sexpr *root, virNodeInfoPtr info) if (procs == 0) /* Sanity check in case of Xen bugs in futures..*/ return (-1); info->sockets = nr_cpus / procs; - /* Should already be fine, but for further sanity make - * sure we have at least one socket - */ - if (info->sockets == 0) - info->sockets = 1; } + + /* On systems where NUMA nodes are not composed of whole sockets either Xen + * provided us wrong number of sockets per node or we computed the wrong + * number in the compatibility code above. In such case, we compute the + * correct number of sockets on the host, lie about the number of NUMA + * nodes, and force apps to check capabilities XML for the actual NUMA + * topology. + */ + if (info->nodes * info->sockets * info->cores * info->threads + != info->cpus) { + info->nodes = 1; + info->sockets = info->cpus / (info->cores * info->threads); + } + return (0); } -- 1.7.3.2

2 3

[libvirt] [PATCH] Fix broken XML entity for '>'
by Philipp Hahn 25 Nov '10

25 Nov '10

Add missing 'g' to '>' of '<product />' source-element. Signed-off-by: Philipp Hahn <hahn(a)univention.de> --- docs/formatstorage.html.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)

2 1

[libvirt] [PATCH] qemu: mark domain as updated after config updating happened
by Osier Yang 24 Nov '10

24 Nov '10

* src/qemu/qemu_driver.c (qemudDomainDetachDevice, qemudDomainAttachDevice, qemuDomainUpdateDeviceFlags) --- src/qemu/qemu_driver.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index f00d8a3..b55e189 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -8864,6 +8864,9 @@ static int qemudDomainAttachDevice(virDomainPtr dom, goto endjob; } + if (ret == 0 && !vm->updated) + vm->updated = 1; + if (!ret && virDomainSaveStatus(driver->caps, driver->stateDir, vm) < 0) ret = -1; @@ -9074,6 +9077,9 @@ static int qemuDomainUpdateDeviceFlags(virDomainPtr dom, break; } + if (ret == 0 && !vm->updated) + vm->updated = 1; + if (!ret && virDomainSaveStatus(driver->caps, driver->stateDir, vm) < 0) ret = -1; @@ -9748,6 +9754,9 @@ static int qemudDomainDetachDevice(virDomainPtr dom, "%s", _("This type of device cannot be hot unplugged")); } + if (ret == 0 && !vm->updated) + vm->updated = 1; + if (!ret && virDomainSaveStatus(driver->caps, driver->stateDir, vm) < 0) ret = -1; -- 1.7.3.2

2 2

[libvirt] [PATCH] Implementations of virDomainIsUpdated for drivers except qemu
by Osier Yang 24 Nov '10

24 Nov '10

Except LXC and UML driver, implementations of all other drivers return 0 simpley, because these drivers doesn't have config both in memory and on disk, no need to track if the domain of these drivers updated or not. Rename "xenUnifiedDomainisPersistent" to "xenUnifiedDomainIsPersistent" * esx/esx_driver.c * lxc/lxc_driver.c * opennebula/one_driver.c * openvz/openvz_driver.c * phyp/phyp_driver.c * test/test_driver.c * uml/uml_driver.c * vbox/vbox_tmpl.c * xen/xen_driver.c * xenapi/xenapi_driver.c --- src/esx/esx_driver.c | 8 ++++++-- src/lxc/lxc_driver.c | 25 ++++++++++++++++++++++++- src/opennebula/one_driver.c | 6 +++++- src/openvz/openvz_driver.c | 6 +++++- src/phyp/phyp_driver.c | 7 ++++++- src/test/test_driver.c | 7 ++++++- src/uml/uml_driver.c | 24 +++++++++++++++++++++--- src/vbox/vbox_tmpl.c | 6 +++++- src/xen/xen_driver.c | 12 +++++++++--- src/xenapi/xenapi_driver.c | 8 +++++++- 10 files changed, 94 insertions(+), 15 deletions(-) diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c index 5c04596..8ea6219 100644 --- a/src/esx/esx_driver.c +++ b/src/esx/esx_driver.c @@ -3765,7 +3765,11 @@ esxDomainIsPersistent(virDomainPtr domain ATTRIBUTE_UNUSED) return 1; } - +static int +esxDomainIsUpdated(virDomainPtr domain ATTRIBUTE_UNUSED) +{ + return 0; +} static virDomainSnapshotPtr esxDomainSnapshotCreateXML(virDomainPtr domain, const char *xmlDesc, @@ -4360,7 +4364,7 @@ static virDriver esxDriver = { esxIsSecure, /* isSecure */ esxDomainIsActive, /* domainIsActive */ esxDomainIsPersistent, /* domainIsPersistent */ - NULL, /* domainIsUpdated */ + esxDomainIsUpdated, /* domainIsUpdated */ NULL, /* cpuCompare */ NULL, /* cpuBaseline */ NULL, /* domainGetJobInfo */ diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index 886286b..eb58086 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -325,6 +325,29 @@ cleanup: return ret; } +static int lxcDomainIsUpdated(virDomainPtr dom) +{ + lxc_driver_t *driver = dom->conn->privateData; + virDomainObjPtr obj; + int ret = -1; + + lxcDriverLock(driver); + obj = virDomainFindByUUID(&driver->domains, dom->uuid); + lxcDriverUnlock(driver); + if (!obj) { + char uuidstr[VIR_UUID_STRING_BUFLEN]; + virUUIDFormat(dom->uuid, uuidstr); + lxcError(VIR_ERR_NO_DOMAIN, + _("No domain with matching uuid '%s'"), uuidstr); + goto cleanup; + } + ret = obj->updated; + +cleanup: + if (obj) + virDomainObjUnlock(obj); + return ret; +} static int lxcListDomains(virConnectPtr conn, int *ids, int nids) { lxc_driver_t *driver = conn->privateData; @@ -2882,7 +2905,7 @@ static virDriver lxcDriver = { lxcIsSecure, /* isSecure */ lxcDomainIsActive, /* domainIsActive */ lxcDomainIsPersistent, /* domainIsPersistent */ - NULL, /* domainIsUpdated */ + lxcDomainIsUpdated, /* domainIsUpdated */ NULL, /* cpuCompare */ NULL, /* cpuBaseline */ NULL, /* domainGetJobInfo */ diff --git a/src/opennebula/one_driver.c b/src/opennebula/one_driver.c index 4fe7f9b..c31f132 100644 --- a/src/opennebula/one_driver.c +++ b/src/opennebula/one_driver.c @@ -106,6 +106,10 @@ static int oneIsSecure(virConnectPtr conn ATTRIBUTE_UNUSED) return 0; } +static int oneIsUpdated(virConnectPtr conn ATTRIBUTE_UNUSED) +{ + return 0; +} static virDomainPtr oneDomainLookupByID(virConnectPtr conn, int id) @@ -800,7 +804,7 @@ static virDriver oneDriver = { oneIsSecure, /* isSecure */ NULL, /* domainIsActive */ NULL, /* domainIsPersistent */ - NULL, /* domainIsUpdated */ + oneIsUpdated, /* domainIsUpdated */ NULL, /* cpuCompare */ NULL, /* cpuBaseline */ NULL, /* domainGetJobInfo */ diff --git a/src/openvz/openvz_driver.c b/src/openvz/openvz_driver.c index 5089e37..807bb7c 100644 --- a/src/openvz/openvz_driver.c +++ b/src/openvz/openvz_driver.c @@ -459,6 +459,10 @@ cleanup: return ret; } +static int openvzDomainIsUpdated(virDomainPtr dom ATTRIBUTE_UNUSED) +{ + return 0; +} static char *openvzDomainDumpXML(virDomainPtr dom, int flags) { struct openvz_driver *driver = dom->conn->privateData; @@ -1670,7 +1674,7 @@ static virDriver openvzDriver = { openvzIsSecure, openvzDomainIsActive, openvzDomainIsPersistent, - NULL, /* domainIsUpdated */ + openvzDomainIsUpdated, /* domainIsUpdated */ NULL, /* cpuCompare */ NULL, /* cpuBaseline */ NULL, /* domainGetJobInfo */ diff --git a/src/phyp/phyp_driver.c b/src/phyp/phyp_driver.c index 24b426e..08faa9b 100644 --- a/src/phyp/phyp_driver.c +++ b/src/phyp/phyp_driver.c @@ -1277,6 +1277,11 @@ phypIsSecure(virConnectPtr conn ATTRIBUTE_UNUSED) return 1; } +static int +phypIsSecure(virConnectPtr conn ATTRIBUTE_UNUSED) +{ + return 0; +} /* return the lpar_id given a name and a managed system name */ static int @@ -4021,7 +4026,7 @@ static virDriver phypDriver = { phypIsSecure, /* isSecure */ NULL, /* domainIsActive */ NULL, /* domainIsPersistent */ - NULL, /* domainIsUpdated */ + phypIsUpdated, /* domainIsUpdated */ NULL, /* cpuCompare */ NULL, /* cpuBaseline */ NULL, /* domainGetJobInfo */ diff --git a/src/test/test_driver.c b/src/test/test_driver.c index b6838c2..ddff160 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -1295,6 +1295,11 @@ cleanup: return ret; } +static int testDomainIsUpdated(virDomainPtr dom ATTRIBUTE_UNUSED) +{ + return 0; +} + static virDomainPtr testDomainCreateXML(virConnectPtr conn, const char *xml, unsigned int flags) @@ -5413,7 +5418,7 @@ static virDriver testDriver = { testIsSecure, /* isEncrypted */ testDomainIsActive, /* domainIsActive */ testDomainIsPersistent, /* domainIsPersistent */ - NULL, /* domainIsUpdated */ + testDomainIsUpdated, /* domainIsUpdated */ NULL, /* cpuCompare */ NULL, /* cpuBaseline */ NULL, /* domainGetJobInfo */ diff --git a/src/uml/uml_driver.c b/src/uml/uml_driver.c index 6c28c76..26b6b50 100644 --- a/src/uml/uml_driver.c +++ b/src/uml/uml_driver.c @@ -1213,8 +1213,6 @@ cleanup: virDomainObjUnlock(obj); return ret; } - - static int umlDomainIsPersistent(virDomainPtr dom) { struct uml_driver *driver = dom->conn->privateData; @@ -1236,6 +1234,26 @@ cleanup: return ret; } +static int umlDomainIsUpdated(virDomainPtr dom) +{ + struct uml_driver *driver = dom->conn->privateData; + virDomainObjPtr obj; + int ret = -1; + + umlDriverLock(driver); + obj = virDomainFindByUUID(&driver->domains, dom->uuid); + umlDriverUnlock(driver); + if (!obj) { + umlReportError(VIR_ERR_NO_DOMAIN, NULL); + goto cleanup; + } + ret = obj->updated; + +cleanup: + if (obj) + virDomainObjUnlock(obj); + return ret; +} static int umlGetVersion(virConnectPtr conn, unsigned long *version) { struct uml_driver *driver = conn->privateData; @@ -2248,7 +2266,7 @@ static virDriver umlDriver = { umlIsSecure, /* isSecure */ umlDomainIsActive, /* domainIsActive */ umlDomainIsPersistent, /* domainIsPersistent */ - NULL, /* domainIsUpdated */ + umlDomainIsUpdated, /* domainIsUpdated */ NULL, /* cpuCompare */ NULL, /* cpuBaseline */ NULL, /* domainGetJobInfo */ diff --git a/src/vbox/vbox_tmpl.c b/src/vbox/vbox_tmpl.c index 0a7a247..ada71b4 100644 --- a/src/vbox/vbox_tmpl.c +++ b/src/vbox/vbox_tmpl.c @@ -1347,6 +1347,10 @@ static int vboxDomainIsPersistent(virDomainPtr dom ATTRIBUTE_UNUSED) { } +static int vboxDomainIsUpdated(virDomainPtr dom ATTRIBUTE_UNUSED) { + return 0; +} + static int vboxDomainSuspend(virDomainPtr dom) { VBOX_OBJECT_CHECK(dom->conn, int, -1); IMachine *machine = NULL; @@ -8451,7 +8455,7 @@ virDriver NAME(Driver) = { vboxIsSecure, /* isSecure */ vboxDomainIsActive, /* domainIsActive */ vboxDomainIsPersistent, /* domainIsPersistent */ - NULL, /* domainIsUpdated */ + vboxDomainIsUpdated, /* domainIsUpdated */ NULL, /* cpuCompare */ NULL, /* cpuBaseline */ NULL, /* domainGetJobInfo */ diff --git a/src/xen/xen_driver.c b/src/xen/xen_driver.c index 959cc7d..4c11b11 100644 --- a/src/xen/xen_driver.c +++ b/src/xen/xen_driver.c @@ -740,7 +740,7 @@ xenUnifiedDomainIsActive(virDomainPtr dom) } static int -xenUnifiedDomainisPersistent(virDomainPtr dom) +xenUnifiedDomainIsPersistent(virDomainPtr dom) { GET_PRIVATE(dom->conn); virDomainPtr currdom = NULL; @@ -791,6 +791,12 @@ done: } static int +xenUnifiedDomainIsUpdated(virDomainPtr dom ATTRIBUTE_UNUSED) +{ + return 0; +} + +static int xenUnifiedDomainSuspend (virDomainPtr dom) { GET_PRIVATE(dom->conn); @@ -2069,8 +2075,8 @@ static virDriver xenUnifiedDriver = { xenUnifiedIsEncrypted, /* isEncrypted */ xenUnifiedIsSecure, /* isSecure */ xenUnifiedDomainIsActive, /* domainIsActive */ - xenUnifiedDomainisPersistent, /* domainIsPersistent */ - NULL, /* domainIsUpdated */ + xenUnifiedDomainIsPersistent, /* domainIsPersistent */ + xenUnifiedDomainIsUpdated, /* domainIsUpdated */ NULL, /* cpuCompare */ NULL, /* cpuBaseline */ NULL, /* domainGetJobInfo */ diff --git a/src/xenapi/xenapi_driver.c b/src/xenapi/xenapi_driver.c index dec2d25..6fff276 100644 --- a/src/xenapi/xenapi_driver.c +++ b/src/xenapi/xenapi_driver.c @@ -1745,6 +1745,12 @@ xenapiNodeGetFreeMemory (virConnectPtr conn) return freeMem; } +static int +xenapiDomainIsUpdated(virDomainPtr dom ATTRIBUTE_UNUSED) +{ + return 0; +} + /* * xenapiNodeGetCellsFreeMemory * @@ -1847,7 +1853,7 @@ static virDriver xenapiDriver = { NULL, /* isSecure */ NULL, /* domainIsActive */ NULL, /* domainIsPersistent */ - NULL, /* domainIsUpdated */ + xenapiDomainIsUpdated, /* domainIsUpdated */ NULL, /* cpuCompare */ NULL, /* cpuBaseline */ NULL, /* domainGetJobInfo */ -- 1.7.3.2

2 2

[libvirt] [PATCH] build: enforce files.h usage
by Eric Blake 24 Nov '10

24 Nov '10

* cfg.mk (sc_prohibit_close): New syntax-check rule. * src/util/pci.c (pciWaitForDeviceCleanup): Fix violation. * .x-sc_prohibit_close: New exceptions. * Makefile.am (EXTRA_DIST): Distribute new file. --- As promised, here's my followup to Stefan's recent close() cleanups, which will help us avoid further regressions. .x-sc_prohibit_close | 3 +++ Makefile.am | 1 + cfg.mk | 9 +++++++++ src/util/pci.c | 2 +- 4 files changed, 14 insertions(+), 1 deletions(-) create mode 100644 .x-sc_prohibit_close diff --git a/.x-sc_prohibit_close b/.x-sc_prohibit_close new file mode 100644 index 0000000..348200c --- /dev/null +++ b/.x-sc_prohibit_close @@ -0,0 +1,3 @@ +^docs/.* +^HACKING$ +^src/util/files.c$ diff --git a/Makefile.am b/Makefile.am index d3f8876..bf1b49b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -26,6 +26,7 @@ EXTRA_DIST = \ .x-sc_bindtextdomain \ .x-sc_m4_quote_check \ .x-sc_prohibit_asprintf \ + .x-sc_prohibit_close \ .x-sc_prohibit_empty_lines_at_EOF \ .x-sc_prohibit_gethostby \ .x-sc_prohibit_gethostname \ diff --git a/cfg.mk b/cfg.mk index 0851f44..963c7db 100644 --- a/cfg.mk +++ b/cfg.mk @@ -231,6 +231,15 @@ sc_avoid_write: halt='consider using safewrite instead of write' \ $(_sc_search_regexp) +# Avoid functions that can lead to double-close bugs. +sc_prohibit_close: + @prohibit='\<[f]close *\(' \ + halt='use VIR_{FORCE_}[F]CLOSE instead of [f]close' \ + $(_sc_search_regexp) + @prohibit='\<fdopen *\(' \ + halt='use VIR_FDOPEN instead of fdopen' \ + $(_sc_search_regexp) + # Similar to the gnulib maint.mk rule for sc_prohibit_strcmp # Use STREQLEN or STRPREFIX rather than comparing strncmp == 0, or != 0. sc_prohibit_strncmp: diff --git a/src/util/pci.c b/src/util/pci.c index bd8c6c5..d38cefa 100644 --- a/src/util/pci.c +++ b/src/util/pci.c @@ -1095,7 +1095,7 @@ pciWaitForDeviceCleanup(pciDevice *dev, const char *matcher) } } - fclose(fp); + VIR_FORCE_FCLOSE(fp); return ret; } -- 1.7.3.2

2 2