- Devel - libvirt List Archives

[libvirt] [RFC][PATCH 0/7] interface: Transaction API
by Michal Privoznik 20 May '11

20 May '11

This is a RFC implementation of what some may call network transaction API. The new interface driver functions now do not contain anything valuable, they are just stub. Later on, a real netcf calls will be added. This should only give us an image of whole thing. So any comments are more than welcome. The new API is accessible via new virsh command: iface-change with 3 options: start, commit, rollback. The test driver actually works, moreover it works as expected later within real deployment. Michal Privoznik (7): interface: add new public API interface: define internal driver API interface: implement the public APIs interface: implement the remote protocol interface: expose to virsh interface: Implement the driver methods interface: implement test driver configure.ac | 5 ++ include/libvirt/libvirt.h.in | 7 ++ src/driver.h | 12 ++++ src/esx/esx_interface_driver.c | 3 + src/interface/netcf_driver.c | 39 ++++++++++++ src/libvirt.c | 129 ++++++++++++++++++++++++++++++++++++++++ src/libvirt_public.syms | 7 ++ src/phyp/phyp_driver.c | 5 +- src/remote/remote_driver.c | 3 + src/remote/remote_protocol.x | 18 +++++- src/remote_protocol-structs | 9 +++ src/test/test_driver.c | 113 +++++++++++++++++++++++++++++++++++ tools/virsh.c | 59 ++++++++++++++++++ 13 files changed, 407 insertions(+), 2 deletions(-) -- 1.7.5.rc3

4 18

[libvirt] [PATCH] remote generator: Add special case for virConnectGetType
by Matthias Bolte 20 May '11

20 May '11

This patch depends on this unapplied series: https://www.redhat.com/archives/libvir-list/2011-May/msg00987.html Matthias

2 2

[libvirt] [PATCH] qemudDomainMemoryPeek: chown temporary file to qemu.qemu.
by Richard W.M. Jones 20 May '11

20 May '11

This attached patch resolves a fairly obvious problem which stops qemuDomainMemoryPeek from working at all. However, it's not the whole story. Read on ... (1) qemu still fails unless I manually set the mode of /var/cache/libvirt to 0755 (it is normally 0700). Owner Fails Works /var/cache/libvirt root.root 0700 0755 /var/cache/libvirt/qemu qemu.qemu 0750 0750 qemu is doing: open("/var/cache/libvirt/qemu/qemu.mem.fdVCod", O_WRONLY|O_CREAT|O_TRUNC, 0666) It's kinda annoying that /etc/libvirt and /var/{cache,lib}/libvirt are unreadable by other users. Is there some deep reason to do this? (2) After applying this patch, using virDomainMemoryPeek causes libvirtd to generate the following serious-looking warning. It doesn't appear to crash or fail in any way that I can tell: 15:17:09.982: 7784: error : virDomainFree:2122 : invalid domain pointer in virDomainFree I don't know where this is coming from. It only appears when my program actually does virDomainMemoryPeek, not when I have the same code with virDomainMemoryPeek commented out. Rich. -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones virt-top is 'top' for virtual machines. Tiny program with many powerful monitoring features, net stats, disk stats, logging, etc. http://et.redhat.com/~rjones/virt-top

2 5

[libvirt] phy driver
by Serge Hallyn 20 May '11

20 May '11

Hi, something like <disk type='block'> <driver name='phy'/> <source dev='%s'/> <target dev='sdb'/> </disk> used to be allowed. But now it appears (looking at git history) only <driver name='qemu'> is supported. Is that correct? Should tools which are spitting out libvirt xml be updated to use 'qemu', or is there something else going on? thanks, -serge

2 1

[libvirt] libvirt 0.8.2 issues
by Guangya Liu 20 May '11

20 May '11

Hi libvirt support, Found an interesting problem for Rhel, libvirt 0.8.2 is shipped with the distribution of Rhel5u6; libvirt 0.8.1 is shipped with the distributions of Rhel6, do you know why, why did we downgrade the version for libvirt when upgrading to Rhel6? We upgrade recently libvirt in our compute nodes. Now we are running the 0.8.2 version. We encounter a problem as following: In our production instance each compute node has 24GB of memory and each VM has 2GB of memory (8VMs x 2 GB). So enough space for them. [root@lxbst0501 ~]# free total used free shared buffers cached Mem: 24676304 8191072 16485232 0 305408 5255460 -/+ buffers/cache: 2630204 22046100 Swap: 4192956 0 4192956 If I try to start the VMs by hand, I get the following error: [root@lxbst0501 ~]# virsh start vmbst050107 error: Failed to start domain vmbst050107 error: internal error Process exited while reading console log output: Could not allocate physical memory virsh # version Compiled against library: libvir 0.8.2 Using library: libvir 0.8.2 Using API: QEMU 0.8.2 Running hypervisor: QEMU 0.10.5 [root@lxbst0501 ~]# /usr/sbin/libvirtd --version /usr/sbin/libvirtd (libvirt) 0.8.2 [root@lxbst0501 ~]# cat /etc/redhat-release Scientific Linux CERN SLC release 5.6 (Boron) More information about the kvm version that we are running: [root@lxbst0501 ~]# modinfo kvm_intel filename: /lib/modules/2.6.18-238.5.1.el5/weak-updates/kmod-kvm/kvm-intel.ko license: GPL author: Qumranet version: kvm-83-224.el5 srcversion: D94F9D8333D8C6AC615B53E depends: kvm vermagic: 2.6.18-238.el5 SMP mod_unload gcc-4.1 parm: bypass_guest_pf:bool parm: enable_vpid:bool parm: flexpriority_enabled:bool parm: enable_ept:bool parm: emulate_invalid_guest_state:bool [root@lxbst0501 ~]# kvm QEMU PC emulator version 0.9.1 (kvm-83-maint-snapshot-20090205), Copyright (c) 2003-2008 Fabrice Bellard [root@lxbst0501 ~]# LC_ALL=C PATH=/sbin:/usr/sbin:/bin:/usr/bin /usr/bin/kvm -S -M rhel5.4.0 -m 2048 -smp 1,sockets=1,cores=1,threads=1 -name vmbst050100 -uuid b7c85c96-511d-4a46-8de0-37b9edaf4ce9 -nographic -monitor unix:/var/lib/libvirt/qemu/vmbst050100.monitor,server,nowait -no-kvm-pit-reinjection -boot c -drive file=/dev/xen_vg/vmbst050100_1.img,if=virtio,boot=on,format=raw,cache=no ne -drive file=/afs/cern.ch/project/isf/contextualization/isoimages/glExecWN_slc5_ x86_64_kvm.iso,if=virtio,media=cdrom,readonly=on,format=raw -drive file=/dev/xen_vg/afscache-00-16-3e-00-49-ba,if=virtio,format=raw,cache=n one -drive file=/dev/xen_vg/pool-00-16-3e-00-49-ba,if=virtio,format=raw,cache=none -drive file=/dev/xen_vg/cvmfs-00-16-3e-00-49-ba,if=virtio,format=raw,cache=none -drive file=/VMOxen/storage/local/images/vmbst050100.iso,if=ide,media=cdrom,bus =1,unit=0,readonly=on,format=raw -net nic,macaddr=00:16:3e:00:49:ba,vlan=0,model=virtio -net tap,fd=17,vlan=0 -serial pty -parallel none -usb -balloon virtio TUNGETIFF ioctl() failed: Bad file descriptor TUNSETSNDBUF ioctl failed: Bad file descriptor Could not allocate physical memory Using strace to run the command. [root@lxbst0501 ~]# LC_ALL=C PATH=/sbin:/usr/sbin:/bin:/usr/bin strace /usr/bin/kvm -S -M rhel5.4.0 -m 2048 -smp 1,sockets=1,cores=1,threads=1 -name vmbst050100 -uuid b7c85c96-511d-4a46-8de0-37b9edaf4ce9 -nographic -monitor unix:/var/lib/libvirt/qemu/vmbst050100.monitor,server,nowait -no-kvm-pit-reinjection -boot c -drive file=/dev/xen_vg/vmbst050100_1.img,if=virtio,boot=on,format=raw,cache=no ne -drive file=/afs/cern.ch/project/isf/contextualization/isoimages/glExecWN_slc5_ x86_64_kvm.iso,if=virtio,media=cdrom,readonly=on,format=raw -drive file=/dev/xen_vg/afscache-00-16-3e-00-49-ba,if=virtio,format=raw,cache=n one -drive file=/dev/xen_vg/pool-00-16-3e-00-49-ba,if=virtio,format=raw,cache=none -drive file=/dev/xen_vg/cvmfs-00-16-3e-00-49-ba,if=virtio,format=raw,cache=none -drive file=/VMOxen/storage/local/images/vmbst050100.iso,if=ide,media=cdrom,bus =1,unit=0,readonly=on,format=raw -net nic,macaddr=00:16:3e:00:49:ba,vlan=0,model=virtio -net tap,fd=17,vlan=0 -serial pty -parallel none -usb -balloon virtio execve("/usr/bin/kvm", ["/usr/bin/kvm", "-S", "-M", "rhel5.4.0", "-m", "2048", "-smp", "1,sockets=1,cores=1,threads=1", "-name", "vmbst050100", "-uuid", "b7c85c96-511d-4a46-8de0-37b9edaf", "-nographic", "-monitor", "unix:/var/lib/libvirt/qemu/vmbst", "-no-kvm-pit-reinjection", ...], [/* 22 vars */]) = 0 brk(0) = 0x196b8000 mmap(NULL, 4096, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0) = 0x2b469709e000 mmap(NULL, 4096, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0) = 0x2b469709f000 access("/etc/ld.so.preload", R_OK) = -1 ENOENT (No such file or directory) open("/etc/ld.so.cache", O_RDONLY) = 3 fstat(3, {st_mode=S_IFREG|0644, st_size=29122, ...}) = 0 mmap(NULL, 29122, PROT_READ, MAP_PRIVATE, 3, 0) = 0x2b46970a0000 close(3) = 0 open("/lib64/libm.so.6", O_RDONLY) = 3 read(3, "\177ELF\2\1\1\0\0\0\0\0\0\0\0\0\3\0>\0\1\0\0\0`>@\0204\0\0\0"..., 832) = 832 fstat(3, {st_mode=S_IFREG|0755, st_size=615160, ...}) = 0 mmap(0x3410400000, 2629848, PROT_READ|PROT_EXEC, MAP_PRIVATE|MAP_DENYWRITE, 3, 0) = 0x3410400000 mprotect(0x3410482000, 2093056, PROT_NONE) = 0 mmap(0x3410681000, 8192, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_FIXED|MAP_DENYWRITE, 3, 0x81000) = 0x3410681000 close(3) = 0 open("/usr/lib64/libspice.so.0", O_RDONLY) = 3 read(3, "\177ELF\2\1\1\0\0\0\0\0\0\0\0\0\3\0>\0\1\0\0\0`d\200\0334\0\0\0"..., 832) = 832 fstat(3, {st_mode=S_IFREG|0755, st_size=636344, ...}) = 0 mmap(0x341b800000, 2744160, PROT_READ|PROT_EXEC, MAP_PRIVATE|MAP_DENYWRITE, 3, 0) = 0x341b800000 mprotect(0x341b899000, 2097152, PROT_NONE) = 0 mmap(0x341ba99000, 8192, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_FIXED|MAP_DENYWRITE, 3, 0x99000) = 0x341ba99000 mmap(0x341ba9b000, 12128, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_FIXED|MAP_ANONYMOUS, -1, 0) = 0x341ba9b000 close(3) = 0 open("/usr/lib64/liblog4cpp.so.4", O_RDONLY) = 3 read(3, "\177ELF\2\1\1\0\0\0\0\0\0\0\0\0\3\0>\0\1\0\0\0\200Q\1\0344\0\0\0"..., 832) = 832 fstat(3, {st_mode=S_IFREG|0755, st_size=265392, ...}) = 0 mmap(0x341c000000, 2358584, PROT_READ|PROT_EXEC, MAP_PRIVATE|MAP_DENYWRITE, 3, 0) = 0x341c000000 mprotect(0x341c03e000, 2093056, PROT_NONE) = 0 mmap(0x341c23d000, 12288, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_FIXED|MAP_DENYWRITE, 3, 0x3d000) = 0x341c23d000 close(3) = 0 open("/lib64/libnsl.so.1", O_RDONLY) = 3 read(3, "\177ELF\2\1\1\0\0\0\0\0\0\0\0\0\3\0>\0\1\0\0\0\240@@\0224\0\0\0"..., 832) = 832 fstat(3, {st_mode=S_IFREG|0755, st_size=114376, ...}) = 0 mmap(NULL, 4096, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0) = 0x2b46970a8000 mmap(0x3412400000, 2194096, PROT_READ|PROT_EXEC, MAP_PRIVATE|MAP_DENYWRITE, 3, 0) = 0x3412400000 mprotect(0x3412415000, 2093056, PROT_NONE) = 0 mmap(0x3412614000, 8192, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_FIXED|MAP_DENYWRITE, 3, 0x14000) = 0x3412614000 mmap(0x3412616000, 6832, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_FIXED|MAP_ANONYMOUS, -1, 0) = 0x3412616000 close(3) = 0 open("/usr/lib64/libpng12.so.0", O_RDONLY) = 3 read(3, "\177ELF\2\1\1\0\0\0\0\0\0\0\0\0\3\0>\0\1\0\0\0\220E@\0314\0\0\0"..., 832) = 832 fstat(3, {st_mode=S_IFREG|0755, st_size=145224, ...}) = 0 mmap(0x3419400000, 2238144, PROT_READ|PROT_EXEC, MAP_PRIVATE|MAP_DENYWRITE, 3, 0) = 0x3419400000 mprotect(0x3419422000, 2097152, PROT_NONE) = 0 mmap(0x3419622000, 4096, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_FIXED|MAP_DENYWRITE, 3, 0x22000) = 0x3419622000 close(3) = 0 open("/usr/lib64/libqcairo.so.2", O_RDONLY) = 3 read(3, "\177ELF\2\1\1\0\0\0\0\0\0\0\0\0\3\0>\0\1\0\0\0\340\232@\0324\0\0\0"..., 832) = 832 fstat(3, {st_mode=S_IFREG|0755, st_size=476712, ...}) = 0 mmap(0x341a400000, 2571096, PROT_READ|PROT_EXEC, MAP_PRIVATE|MAP_DENYWRITE, 3, 0) = 0x341a400000 mprotect(0x341a471000, 2097152, PROT_NONE) = 0 mmap(0x341a671000, 12288, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_FIXED|MAP_DENYWRITE, 3, 0x71000) = 0x341a671000 close(3) = 0 open("/usr/lib64/libcelt051.so.0", O_RDONLY) = 3 read(3, "\177ELF\2\1\1\0\0\0\0\0\0\0\0\0\3\0>\0\1\0\0\0\20\r\0\0324\0\0\0"..., 832) = 832 fstat(3, {st_mode=S_IFREG|0755, st_size=59184, ...}) = 0 mmap(NULL, 4096, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0) = 0x2b46970a9000 mmap(0x341a000000, 2152144, PROT_READ|PROT_EXEC, MAP_PRIVATE|MAP_DENYWRITE, 3, 0) = 0x341a000000 mprotect(0x341a00d000, 2097152, PROT_NONE) = 0 mmap(0x341a20d000, 4096, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_FIXED|MAP_DENYWRITE, 3, 0xd000) = 0x341a20d000 close(3) = 0 open("/usr/lib64/libqavcodec.so.51", O_RDONLY) = 3 read(3, "\177ELF\2\1\1\0\0\0\0\0\0\0\0\0\3\0>\0\1\0\0\0\340\262\200\0344\0\0\0". .., 832) = 832 fstat(3, {st_mode=S_IFREG|0755, st_size=514296, ...}) = 0 mmap(0x341c800000, 2658024, PROT_READ|PROT_EXEC, MAP_PRIVATE|MAP_DENYWRITE, 3, 0) = 0x341c800000 mprotect(0x341c873000, 2097152, PROT_NONE) = 0 mmap(0x341ca73000, 40960, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_FIXED|MAP_DENYWRITE, 3, 0x73000) = 0x341ca73000 mmap(0x341ca7d000, 48872, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_FIXED|MAP_ANONYMOUS, -1, 0) = 0x341ca7d000 close(3) = 0 open("/usr/lib64/libqavutil.so.49", O_RDONLY) = 3 read(3, "\177ELF\2\1\1\0\0\0\0\0\0\0\0\0\3\0>\0\1\0\0\0@\30\0\0334\0\0\0"..., 832) = 832 fstat(3, {st_mode=S_IFREG|0755, st_size=39384, ...}) = 0 mmap(0x341b000000, 2146168, PROT_READ|PROT_EXEC, MAP_PRIVATE|MAP_DENYWRITE, 3, 0) = 0x341b000000 mprotect(0x341b009000, 2093056, PROT_NONE) = 0 mmap(0x341b208000, 4096, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_FIXED|MAP_DENYWRITE, 3, 0x8000) = 0x341b208000 mmap(0x341b209000, 12152, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_FIXED|MAP_ANONYMOUS, -1, 0) = 0x341b209000 close(3) = 0 open("/lib64/libasound.so.2", O_RDONLY) = 3 read(3, "\177ELF\2\1\1\0\0\0\0\0\0\0\0\0\3\0>\0\1\0\0\0\260\327B\0274\0\0\0"..., 832) = 832 fstat(3, {st_mode=S_IFREG|0755, st_size=900960, ...}) = 0 mmap(NULL, 4096, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0) = 0x2b46970aa000 mmap(0x3417400000, 2994088, PROT_READ|PROT_EXEC, MAP_PRIVATE|MAP_DENYWRITE, 3, 0) = 0x3417400000 mprotect(0x34174d4000, 2093056, PROT_NONE) = 0 mmap(0x34176d3000, 32768, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_FIXED|MAP_DENYWRITE, 3, 0xd3000) = 0x34176d3000 close(3) = 0 open("/lib64/libssl.so.6", O_RDONLY) = 3 read(3, "\177ELF\2\1\1\0\0\0\0\0\0\0\0\0\3\0>\0\1\0\0\0\260,\301\0264\0\0\0"..., 832) = 832 fstat(3, {st_mode=S_IFREG|0755, st_size=311512, ...}) = 0 mmap(0x3416c00000, 2404272, PROT_READ|PROT_EXEC, MAP_PRIVATE|MAP_DENYWRITE, 3, 0) = 0x3416c00000 mprotect(0x3416c46000, 2093056, PROT_NONE) = 0 mmap(0x3416e45000, 24576, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_FIXED|MAP_DENYWRITE, 3, 0x45000) = 0x3416e45000 close(3) = 0 open("/lib64/libcrypto.so.6", O_RDONLY) = 3 read(3, "\177ELF\2\1\1\0\0\0\0\0\0\0\0\0\3\0>\0\1\0\0\0@\231E\0244\0\0\0"..., 832) = 832 fstat(3, {st_mode=S_IFREG|0755, st_size=1359680, ...}) = 0 mmap(0x3414400000, 3468656, PROT_READ|PROT_EXEC, MAP_PRIVATE|MAP_DENYWRITE, 3, 0) = 0x3414400000 mprotect(0x341452b000, 2093056, PROT_NONE) = 0 mmap(0x341472a000, 135168, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_FIXED|MAP_DENYWRITE, 3, 0x12a000) = 0x341472a000 mmap(0x341474b000, 15728, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_FIXED|MAP_ANONYMOUS, -1, 0) = 0x341474b000 close(3) = 0 open("/usr/lib64/libz.so.1", O_RDONLY) = 3 read(3, "\177ELF\2\1\1\0\0\0\0\0\0\0\0\0\3\0>\0\1\0\0\0\260\36\300\0204\0\0\0".. ., 832) = 832 fstat(3, {st_mode=S_IFREG|0755, st_size=85608, ...}) = 0 mmap(NULL, 4096, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0) = 0x2b46970ab000 mmap(0x3410c00000, 2178600, PROT_READ|PROT_EXEC, MAP_PRIVATE|MAP_DENYWRITE, 3, 0) = 0x3410c00000 mprotect(0x3410c14000, 2093056, PROT_NONE) = 0 mmap(0x3410e13000, 4096, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_FIXED|MAP_DENYWRITE, 3, 0x13000) = 0x3410e13000 close(3) = 0 open("/usr/lib64/libXrandr.so.2", O_RDONLY) = 3 read(3, "\177ELF\2\1\1\0\0\0\0\0\0\0\0\0\3\0>\0\1\0\0\0P\16\300\0304\0\0\0"..., 832) = 832 fstat(3, {st_mode=S_IFREG|0755, st_size=14984, ...}) = 0 mmap(0x3418c00000, 2107944, PROT_READ|PROT_EXEC, MAP_PRIVATE|MAP_DENYWRITE, 3, 0) = 0x3418c00000 mprotect(0x3418c03000, 2093056, PROT_NONE) = 0 mmap(0x3418e02000, 4096, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_FIXED|MAP_DENYWRITE, 3, 0x2000) = 0x3418e02000 close(3) = 0 open("/usr/lib64/libplds4.so", O_RDONLY) = 3 read(3, "\177ELF\2\1\1\0\0\0\0\0\0\0\0\0\3\0>\0\1\0\0\0@\16@\0234\0\0\0"..., 832) = 832 fstat(3, {st_mode=S_IFREG|0755, st_size=13960, ...}) = 0 mmap(0x3413400000, 2106896, PROT_READ|PROT_EXEC, MAP_PRIVATE|MAP_DENYWRITE, 3, 0) = 0x3413400000 mprotect(0x3413403000, 2093056, PROT_NONE) = 0 mmap(0x3413602000, 4096, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_FIXED|MAP_DENYWRITE, 3, 0x2000) = 0x3413602000 close(3) = 0 open("/usr/lib64/libplc4.so", O_RDONLY) = 3 read(3, "\177ELF\2\1\1\0\0\0\0\0\0\0\0\0\3\0>\0\1\0\0\0p\23\200\0224\0\0\0"..., 832) = 832 fstat(3, {st_mode=S_IFREG|0755, st_size=17992, ...}) = 0 mmap(0x3412800000, 2110904, PROT_READ|PROT_EXEC, MAP_PRIVATE|MAP_DENYWRITE, 3, 0) = 0x3412800000 mprotect(0x3412804000, 2093056, PROT_NONE) = 0 mmap(0x3412a03000, 4096, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_FIXED|MAP_DENYWRITE, 3, 0x3000) = 0x3412a03000 close(3) = 0 open("/usr/lib64/libnspr4.so", O_RDONLY) = 3 read(3, "\177ELF\2\1\1\0\0\0\0\0\0\0\0\0\3\0>\0\1\0\0\0\300\315\300\0234\0\0\0". .., 832) = 832 fstat(3, {st_mode=S_IFREG|0755, st_size=229720, ...}) = 0 mmap(NULL, 4096, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0) = 0x2b46970ac000 mmap(0x3413c00000, 2333184, PROT_READ|PROT_EXEC, MAP_PRIVATE|MAP_DENYWRITE, 3, 0) = 0x3413c00000 mprotect(0x3413c36000, 2093056, PROT_NONE) = 0 mmap(0x3413e35000, 12288, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_FIXED|MAP_DENYWRITE, 3, 0x35000) = 0x3413e35000 mmap(0x3413e38000, 6656, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_FIXED|MAP_ANONYMOUS, -1, 0) = 0x3413e38000 close(3) = 0 open("/lib64/libpthread.so.0", O_RDONLY) = 3 read(3, "\177ELF\2\1\1\0\0\0\0\0\0\0\0\0\3\0>\0\1\0\0\0\240W\200\0204\0\0\0"..., 832) = 832 fstat(3, {st_mode=S_IFREG|0755, st_size=145848, ...}) = 0 mmap(0x3410800000, 2204528, PROT_READ|PROT_EXEC, MAP_PRIVATE|MAP_DENYWRITE, 3, 0) = 0x3410800000 mprotect(0x3410816000, 2093056, PROT_NONE) = 0 mmap(0x3410a15000, 8192, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_FIXED|MAP_DENYWRITE, 3, 0x15000) = 0x3410a15000 mmap(0x3410a17000, 13168, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_FIXED|MAP_ANONYMOUS, -1, 0) = 0x3410a17000 close(3) = 0 open("/lib64/libdl.so.2", O_RDONLY) = 3 read(3, "\177ELF\2\1\1\0\0\0\0\0\0\0\0\0\3\0>\0\1\0\0\0\20\16\0\0204\0\0\0"..., 832) = 832 fstat(3, {st_mode=S_IFREG|0755, st_size=23376, ...}) = 0 mmap(0x3410000000, 2109696, PROT_READ|PROT_EXEC, MAP_PRIVATE|MAP_DENYWRITE, 3, 0) = 0x3410000000 mprotect(0x3410002000, 2097152, PROT_NONE) = 0 mmap(0x3410202000, 8192, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_FIXED|MAP_DENYWRITE, 3, 0x2000) = 0x3410202000 close(3) = 0 open("/usr/lib64/libgnutls.so.13", O_RDONLY) = 3 read(3, "\177ELF\2\1\1\0\0\0\0\0\0\0\0\0\3\0>\0\1\0\0\0P\332\201\0314\0\0\0"..., 832) = 832 fstat(3, {st_mode=S_IFREG|0755, st_size=542784, ...}) = 0 mmap(NULL, 4096, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0) = 0x2b46970ad000 mmap(0x3419800000, 2635816, PROT_READ|PROT_EXEC, MAP_PRIVATE|MAP_DENYWRITE, 3, 0) = 0x3419800000 mprotect(0x341987a000, 2093056, PROT_NONE) = 0 mmap(0x3419a79000, 45056, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_FIXED|MAP_DENYWRITE, 3, 0x79000) = 0x3419a79000 close(3) = 0 open("/usr/lib64/libgcrypt.so.11", O_RDONLY) = 3 read(3, "\177ELF\2\1\1\0\0\0\0\0\0\0\0\0\3\0>\0\1\0\0\0\0k\300\0224\0\0\0"..., 832) = 832 fstat(3, {st_mode=S_IFREG|0755, st_size=465480, ...}) = 0 mmap(0x3412c00000, 2559584, PROT_READ|PROT_EXEC, MAP_PRIVATE|MAP_DENYWRITE, 3, 0) = 0x3412c00000 mprotect(0x3412c6e000, 2093056, PROT_NONE) = 0 mmap(0x3412e6d000, 16384, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_FIXED|MAP_DENYWRITE, 3, 0x6d000) = 0x3412e6d000 close(3) = 0 open("/usr/lib64/libgpg-error.so.0", O_RDONLY) = 3 read(3, "\177ELF\2\1\1\0\0\0\0\0\0\0\0\0\3\0>\0\1\0\0\0\320\7\0\0234\0\0\0"..., 832) = 832 fstat(3, {st_mode=S_IFREG|0755, st_size=15208, ...}) = 0 mmap(0x3413000000, 2108192, PROT_READ|PROT_EXEC, MAP_PRIVATE|MAP_DENYWRITE, 3, 0) = 0x3413000000 mprotect(0x3413003000, 2093056, PROT_NONE) = 0 mmap(0x3413202000, 4096, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_FIXED|MAP_DENYWRITE, 3, 0x2000) = 0x3413202000 close(3) = 0 open("/lib64/librt.so.1", O_RDONLY) = 3 read(3, "\177ELF\2\1\1\0\0\0\0\0\0\0\0\0\3\0>\0\1\0\0\0 \"\200\0214\0\0\0"..., 832) = 832 fstat(3, {st_mode=S_IFREG|0755, st_size=53472, ...}) = 0 mmap(NULL, 4096, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0) = 0x2b46970ae000 mmap(0x3411800000, 2132936, PROT_READ|PROT_EXEC, MAP_PRIVATE|MAP_DENYWRITE, 3, 0) = 0x3411800000 mprotect(0x3411807000, 2097152, PROT_NONE) = 0 mmap(0x3411a07000, 8192, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_FIXED|MAP_DENYWRITE, 3, 0x7000) = 0x3411a07000 close(3) = 0 open("/lib64/libutil.so.1", O_RDONLY) = 3 read(3, "\177ELF\2\1\1\0\0\0\0\0\0\0\0\0\3\0>\0\1\0\0\0\200\16\0\0274\0\0\0"..., 832) = 832 fstat(3, {st_mode=S_IFREG|0755, st_size=18168, ...}) = 0 mmap(0x3417000000, 2105616, PROT_READ|PROT_EXEC, MAP_PRIVATE|MAP_DENYWRITE, 3, 0) = 0x3417000000 mprotect(0x3417002000, 2093056, PROT_NONE) = 0 mmap(0x3417201000, 8192, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_FIXED|MAP_DENYWRITE, 3, 0x1000) = 0x3417201000 close(3) = 0 open("/usr/lib64/libSDL-1.2.so.0", O_RDONLY) = 3 read(3, "\177ELF\2\1\1\0\0\0\0\0\0\0\0\0\3\0>\0\1\0\0\0\0\244\300\0314\0\0\0"... , 832) = 832 fstat(3, {st_mode=S_IFREG|0755, st_size=460376, ...}) = 0 mmap(0x3419c00000, 2739960, PROT_READ|PROT_EXEC, MAP_PRIVATE|MAP_DENYWRITE, 3, 0) = 0x3419c00000 mprotect(0x3419c6d000, 2097152, PROT_NONE) = 0 mmap(0x3419e6d000, 12288, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_FIXED|MAP_DENYWRITE, 3, 0x6d000) = 0x3419e6d000 mmap(0x3419e70000, 184056, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_FIXED|MAP_ANONYMOUS, -1, 0) = 0x3419e70000 close(3) = 0 open("/lib64/libc.so.6", O_RDONLY) = 3 read(3, "\177ELF\2\1\1\0\0\0\0\0\0\0\0\0\3\0>\0\1\0\0\0\220\332\301\0174\0\0\0". .., 832) = 832 fstat(3, {st_mode=S_IFREG|0755, st_size=1722304, ...}) = 0 mmap(0x340fc00000, 3502424, PROT_READ|PROT_EXEC, MAP_PRIVATE|MAP_DENYWRITE, 3, 0) = 0x340fc00000 mprotect(0x340fd4e000, 2097152, PROT_NONE) = 0 mmap(0x340ff4e000, 20480, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_FIXED|MAP_DENYWRITE, 3, 0x14e000) = 0x340ff4e000 mmap(0x340ff53000, 16728, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_FIXED|MAP_ANONYMOUS, -1, 0) = 0x340ff53000 close(3) = 0 open("/usr/lib64/libGL.so.1", O_RDONLY) = 3 read(3, "\177ELF\2\1\1\0\0\0\0\0\0\0\0\0\3\0>\0\1\0\0\0`\304\201\0324\0\0\0"..., 832) = 832 fstat(3, {st_mode=S_IFREG|0755, st_size=492720, ...}) = 0 mmap(NULL, 4096, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0) = 0x2b46970af000 mmap(0x341a800000, 2595592, PROT_READ|PROT_EXEC, MAP_PRIVATE|MAP_DENYWRITE, 3, 0) = 0x341a800000 mprotect(0x341a86e000, 2097152, PROT_NONE) = 0 mmap(0x341aa6e000, 40960, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_FIXED|MAP_DENYWRITE, 3, 0x6e000) = 0x341aa6e000 mmap(0x341aa78000, 6920, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_FIXED|MAP_ANONYMOUS, -1, 0) = 0x341aa78000 close(3) = 0 open("/usr/lib64/libGLU.so.1", O_RDONLY) = 3 read(3, "\177ELF\2\1\1\0\0\0\0\0\0\0\0\0\3\0>\0\1\0\0\0\240k\301\0324\0\0\0"..., 832) = 832 fstat(3, {st_mode=S_IFREG|0755, st_size=525752, ...}) = 0 mmap(0x341ac00000, 2618200, PROT_READ|PROT_EXEC, MAP_PRIVATE|MAP_DENYWRITE, 3, 0) = 0x341ac00000 mprotect(0x341ac7e000, 2097152, PROT_NONE) = 0 mmap(0x341ae7e000, 8192, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_FIXED|MAP_DENYWRITE, 3, 0x7e000) = 0x341ae7e000 close(3) = 0 open("/usr/lib64/libstdc++.so.6", O_RDONLY) = 3 read(3, "\177ELF\2\1\1\0\0\0\0\0\0\0\0\0\3\0>\0\1\0\0\0\320\363\204\0234\0\0\0". .., 832) = 832 fstat(3, {st_mode=S_IFREG|0755, st_size=972216, ...}) = 0 mmap(0x3413800000, 3141504, PROT_READ|PROT_EXEC, MAP_PRIVATE|MAP_DENYWRITE, 3, 0) = 0x3413800000 mprotect(0x34138e4000, 2097152, PROT_NONE) = 0 mmap(0x3413ae4000, 36864, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_FIXED|MAP_DENYWRITE, 3, 0xe4000) = 0x3413ae4000 mmap(0x3413aed000, 73600, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_FIXED|MAP_ANONYMOUS, -1, 0) = 0x3413aed000 close(3) = 0 open("/lib64/libgcc_s.so.1", O_RDONLY) = 3 read(3, "\177ELF\2\1\1\0\0\0\0\0\0\0\0\0\3\0>\0\1\0\0\0\340\35\0\0244\0\0\0"..., 832) = 832 fstat(3, {st_mode=S_IFREG|0755, st_size=56832, ...}) = 0 mmap(NULL, 4096, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0) = 0x2b46970b0000 mmap(0x3414000000, 2150216, PROT_READ|PROT_EXEC, MAP_PRIVATE|MAP_DENYWRITE, 3, 0) = 0x3414000000 mprotect(0x341400d000, 2093056, PROT_NONE) = 0 mmap(0x341420c000, 4096, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_FIXED|MAP_DENYWRITE, 3, 0xc000) = 0x341420c000 close(3) = 0 open("/usr/lib64/libqpixman-1.so.0", O_RDONLY) = 3 read(3, "\177ELF\2\1\1\0\0\0\0\0\0\0\0\0\3\0>\0\1\0\0\0\240J\300\0334\0\0\0"..., 832) = 832 fstat(3, {st_mode=S_IFREG|0755, st_size=278736, ...}) = 0 mmap(0x341bc00000, 2372000, PROT_READ|PROT_EXEC, MAP_PRIVATE|MAP_DENYWRITE, 3, 0) = 0x341bc00000 mprotect(0x341bc41000, 2097152, PROT_NONE) = 0 mmap(0x341be41000, 12288, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_FIXED|MAP_DENYWRITE, 3, 0x41000) = 0x341be41000 close(3) = 0 open("/usr/lib64/libfreetype.so.6", O_RDONLY) = 3 read(3, "\177ELF\2\1\1\0\0\0\0\0\0\0\0\0\3\0>\0\1\0\0\0\300\273\0\0264\0\0\0"... , 832) = 832 fstat(3, {st_mode=S_IFREG|0755, st_size=527504, ...}) = 0 mmap(0x3416000000, 2620464, PROT_READ|PROT_EXEC, MAP_PRIVATE|MAP_DENYWRITE, 3, 0) = 0x3416000000 mprotect(0x341607b000, 2097152, PROT_NONE) = 0 mmap(0x341627b000, 20480, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_FIXED|MAP_DENYWRITE, 3, 0x7b000) = 0x341627b000 close(3) = 0 open("/usr/lib64/libfontconfig.so.1", O_RDONLY) = 3 read(3, "\177ELF\2\1\1\0\0\0\0\0\0\0\0\0\3\0>\0\1\0\0\0P\226\0\0224\0\0\0"..., 832) = 832 fstat(3, {st_mode=S_IFREG|0755, st_size=212920, ...}) = 0 mmap(NULL, 4096, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0) = 0x2b46970b1000 mmap(0x3412000000, 2306792, PROT_READ|PROT_EXEC, MAP_PRIVATE|MAP_DENYWRITE, 3, 0) = 0x3412000000 mprotect(0x3412029000, 2097152, PROT_NONE) = 0 mmap(0x3412229000, 40960, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_FIXED|MAP_DENYWRITE, 3, 0x29000) = 0x3412229000 mmap(0x3412233000, 744, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_FIXED|MAP_ANONYMOUS, -1, 0) = 0x3412233000 close(3) = 0 open("/usr/lib64/libXrender.so.1", O_RDONLY) = 3 read(3, "\177ELF\2\1\1\0\0\0\0\0\0\0\0\0\3\0>\0\1\0\0\0\200\30\0\0304\0\0\0"..., 832) = 832 fstat(3, {st_mode=S_IFREG|0755, st_size=38528, ...}) = 0 mmap(0x3418000000, 2131416, PROT_READ|PROT_EXEC, MAP_PRIVATE|MAP_DENYWRITE, 3, 0) = 0x3418000000 mprotect(0x3418009000, 2093056, PROT_NONE) = 0 mmap(0x3418208000, 4096, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_FIXED|MAP_DENYWRITE, 3, 0x8000) = 0x3418208000 close(3) = 0 open("/usr/lib64/libX11.so.6", O_RDONLY) = 3 read(3, "\177ELF\2\1\1\0\0\0\0\0\0\0\0\0\3\0>\0\1\0\0\0\240\376\301\0274\0\0\0". .., 832) = 832 fstat(3, {st_mode=S_IFREG|0755, st_size=1095440, ...}) = 0 mmap(0x3417c00000, 3190504, PROT_READ|PROT_EXEC, MAP_PRIVATE|MAP_DENYWRITE, 3, 0) = 0x3417c00000 mprotect(0x3417d04000, 2097152, PROT_NONE) = 0 mmap(0x3417f04000, 28672, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_FIXED|MAP_DENYWRITE, 3, 0x104000) = 0x3417f04000 close(3) = 0 open("/usr/lib64/libgssapi_krb5.so.2", O_RDONLY) = 3 read(3, "\177ELF\2\1\1\0\0\0\0\0\0\0\0\0\3\0>\0\1\0\0\0p\221\200\0264\0\0\0"..., 832) = 832 fstat(3, {st_mode=S_IFREG|0755, st_size=188512, ...}) = 0 mmap(NULL, 4096, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0) = 0x2b46970b2000 mmap(0x3416800000, 2281424, PROT_READ|PROT_EXEC, MAP_PRIVATE|MAP_DENYWRITE, 3, 0) = 0x3416800000 mprotect(0x341682c000, 2093056, PROT_NONE) = 0 mmap(0x3416a2b000, 8192, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_FIXED|MAP_DENYWRITE, 3, 0x2b000) = 0x3416a2b000 close(3) = 0 open("/usr/lib64/libkrb5.so.3", O_RDONLY) = 3 read(3, "\177ELF\2\1\1\0\0\0\0\0\0\0\0\0\3\0>\0\1\0\0\0000\220\301\0254\0\0\0".. ., 832) = 832 fstat(3, {st_mode=S_IFREG|0755, st_size=613864, ...}) = 0 mmap(0x3415c00000, 2706592, PROT_READ|PROT_EXEC, MAP_PRIVATE|MAP_DENYWRITE, 3, 0) = 0x3415c00000 mprotect(0x3415c91000, 2097152, PROT_NONE) = 0 mmap(0x3415e91000, 16384, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_FIXED|MAP_DENYWRITE, 3, 0x91000) = 0x3415e91000 close(3) = 0 open("/lib64/libcom_err.so.2", O_RDONLY) = 3 read(3, "\177ELF\2\1\1\0\0\0\0\0\0\0\0\0\3\0>\0\1\0\0\0\360\n\200\0244\0\0\0"... , 832) = 832 fstat(3, {st_mode=S_IFREG|0755, st_size=10048, ...}) = 0 mmap(0x3414800000, 2103096, PROT_READ|PROT_EXEC, MAP_PRIVATE|MAP_DENYWRITE, 3, 0) = 0x3414800000 mprotect(0x3414802000, 2093056, PROT_NONE) = 0 mmap(0x3414a01000, 4096, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_FIXED|MAP_DENYWRITE, 3, 0x1000) = 0x3414a01000 close(3) = 0 open("/usr/lib64/libk5crypto.so.3", O_RDONLY) = 3 read(3, "\177ELF\2\1\1\0\0\0\0\0\0\0\0\0\3\0>\0\1\0\0\0\320U\0\0254\0\0\0"..., 832) = 832 fstat(3, {st_mode=S_IFREG|0755, st_size=153112, ...}) = 0 mmap(NULL, 4096, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0) = 0x2b46970b3000 mmap(0x3415000000, 2246920, PROT_READ|PROT_EXEC, MAP_PRIVATE|MAP_DENYWRITE, 3, 0) = 0x3415000000 mprotect(0x3415023000, 2097152, PROT_NONE) = 0 mmap(0x3415223000, 8192, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_FIXED|MAP_DENYWRITE, 3, 0x23000) = 0x3415223000 close(3) = 0 open("/lib64/libresolv.so.2", O_RDONLY) = 3 read(3, "\177ELF\2\1\1\0\0\0\0\0\0\0\0\0\3\0>\0\1\0\0\0\2402\300\0214\0\0\0"..., 832) = 832 fstat(3, {st_mode=S_IFREG|0755, st_size=92752, ...}) = 0 mmap(0x3411c00000, 2181864, PROT_READ|PROT_EXEC, MAP_PRIVATE|MAP_DENYWRITE, 3, 0) = 0x3411c00000 mprotect(0x3411c11000, 2097152, PROT_NONE) = 0 mmap(0x3411e11000, 8192, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_FIXED|MAP_DENYWRITE, 3, 0x11000) = 0x3411e11000 mmap(0x3411e13000, 6888, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_FIXED|MAP_ANONYMOUS, -1, 0) = 0x3411e13000 close(3) = 0 open("/usr/lib64/libXext.so.6", O_RDONLY) = 3 read(3, "\177ELF\2\1\1\0\0\0\0\0\0\0\0\0\3\0>\0\1\0\0\0\3003@\0304\0\0\0"..., 832) = 832 fstat(3, {st_mode=S_IFREG|0755, st_size=72424, ...}) = 0 mmap(0x3418400000, 2165888, PROT_READ|PROT_EXEC, MAP_PRIVATE|MAP_DENYWRITE, 3, 0) = 0x3418400000 mprotect(0x3418410000, 2097152, PROT_NONE) = 0 mmap(0x3418610000, 4096, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_FIXED|MAP_DENYWRITE, 3, 0x10000) = 0x3418610000 close(3) = 0 open("/usr/lib64/libesd.so.0", O_RDONLY) = 3 read(3, "\177ELF\2\1\1\0\0\0\0\0\0\0\0\0\3\0>\0\1\0\0\0 5\200\0274\0\0\0"..., 832) = 832 fstat(3, {st_mode=S_IFREG|0755, st_size=44992, ...}) = 0 mmap(NULL, 4096, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0) = 0x2b46970b4000 mmap(0x3417800000, 2137856, PROT_READ|PROT_EXEC, MAP_PRIVATE|MAP_DENYWRITE, 3, 0) = 0x3417800000 mprotect(0x3417809000, 2097152, PROT_NONE) = 0 mmap(0x3417a09000, 4096, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_FIXED|MAP_DENYWRITE, 3, 0x9000) = 0x3417a09000 close(3) = 0 open("/usr/lib64/libaudiofile.so.0", O_RDONLY) = 3 read(3, "\177ELF\2\1\1\0\0\0\0\0\0\0\0\0\3\0>\0\1\0\0\0@\230@\0264\0\0\0"..., 832) = 832 fstat(3, {st_mode=S_IFREG|0755, st_size=177136, ...}) = 0 mmap(0x3416400000, 2270088, PROT_READ|PROT_EXEC, MAP_PRIVATE|MAP_DENYWRITE, 3, 0) = 0x3416400000 mprotect(0x3416428000, 2093056, PROT_NONE) = 0 mmap(0x3416627000, 16384, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_FIXED|MAP_DENYWRITE, 3, 0x27000) = 0x3416627000 close(3) = 0 open("/usr/lib64/libXxf86vm.so.1", O_RDONLY) = 3 read(3, "\177ELF\2\1\1\0\0\0\0\0\0\0\0\0\3\0>\0\1\0\0\0\340\r@\0334\0\0\0"..., 832) = 832 fstat(3, {st_mode=S_IFREG|0755, st_size=21648, ...}) = 0 mmap(0x341b400000, 2114504, PROT_READ|PROT_EXEC, MAP_PRIVATE|MAP_DENYWRITE, 3, 0) = 0x341b400000 mprotect(0x341b405000, 2093056, PROT_NONE) = 0 mmap(0x341b604000, 4096, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_FIXED|MAP_DENYWRITE, 3, 0x4000) = 0x341b604000 close(3) = 0 open("/usr/lib64/libdrm.so.2", O_RDONLY) = 3 read(3, "\177ELF\2\1\1\0\0\0\0\0\0\0\0\0\3\0>\0\1\0\0\0p#@\0344\0\0\0"..., 832) = 832 fstat(3, {st_mode=S_IFREG|0755, st_size=33792, ...}) = 0 mmap(NULL, 4096, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0) = 0x2b46970b5000 mmap(0x341c400000, 2128880, PROT_READ|PROT_EXEC, MAP_PRIVATE|MAP_DENYWRITE, 3, 0) = 0x341c400000 mprotect(0x341c407000, 2097152, PROT_NONE) = 0 mmap(0x341c607000, 4096, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_FIXED|MAP_DENYWRITE, 3, 0x7000) = 0x341c607000 close(3) = 0 open("/lib64/libexpat.so.0", O_RDONLY) = 3 read(3, "\177ELF\2\1\1\0\0\0\0\0\0\0\0\0\3\0>\0\1\0\0\0@:@\0254\0\0\0"..., 832) = 832 fstat(3, {st_mode=S_IFREG|0755, st_size=143400, ...}) = 0 mmap(0x3415400000, 2236392, PROT_READ|PROT_EXEC, MAP_PRIVATE|MAP_DENYWRITE, 3, 0) = 0x3415400000 mprotect(0x3415420000, 2097152, PROT_NONE) = 0 mmap(0x3415620000, 8192, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_FIXED|MAP_DENYWRITE, 3, 0x20000) = 0x3415620000 close(3) = 0 open("/usr/lib64/libXau.so.6", O_RDONLY) = 3 read(3, "\177ELF\2\1\1\0\0\0\0\0\0\0\0\0\3\0>\0\1\0\0\0\360\f\0\0314\0\0\0"..., 832) = 832 fstat(3, {st_mode=S_IFREG|0755, st_size=12040, ...}) = 0 mmap(0x3419000000, 2105040, PROT_READ|PROT_EXEC, MAP_PRIVATE|MAP_DENYWRITE, 3, 0) = 0x3419000000 mprotect(0x3419002000, 2093056, PROT_NONE) = 0 mmap(0x3419201000, 4096, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_FIXED|MAP_DENYWRITE, 3, 0x1000) = 0x3419201000 close(3) = 0 open("/usr/lib64/libXdmcp.so.6", O_RDONLY) = 3 read(3, "\177ELF\2\1\1\0\0\0\0\0\0\0\0\0\3\0>\0\1\0\0\0\300\22\200\0304\0\0\0".. ., 832) = 832 fstat(3, {st_mode=S_IFREG|0755, st_size=22032, ...}) = 0 mmap(NULL, 4096, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0) = 0x2b46970b6000 mmap(0x3418800000, 2115016, PROT_READ|PROT_EXEC, MAP_PRIVATE|MAP_DENYWRITE, 3, 0) = 0x3418800000 mprotect(0x3418805000, 2093056, PROT_NONE) = 0 mmap(0x3418a04000, 4096, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_FIXED|MAP_DENYWRITE, 3, 0x4000) = 0x3418a04000 close(3) = 0 open("/usr/lib64/libkrb5support.so.0", O_RDONLY) = 3 read(3, "\177ELF\2\1\1\0\0\0\0\0\0\0\0\0\3\0>\0\1\0\0\0\0\"\300\0244\0\0\0"..., 832) = 832 fstat(3, {st_mode=S_IFREG|0755, st_size=35504, ...}) = 0 mmap(0x3414c00000, 2128368, PROT_READ|PROT_EXEC, MAP_PRIVATE|MAP_DENYWRITE, 3, 0) = 0x3414c00000 mprotect(0x3414c08000, 2093056, PROT_NONE) = 0 mmap(0x3414e07000, 4096, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_FIXED|MAP_DENYWRITE, 3, 0x7000) = 0x3414e07000 close(3) = 0 open("/lib64/libkeyutils.so.1", O_RDONLY) = 3 read(3, "\177ELF\2\1\1\0\0\0\0\0\0\0\0\0\3\0>\0\1\0\0\0`\n\200\0254\0\0\0"..., 832) = 832 fstat(3, {st_mode=S_IFREG|0755, st_size=9472, ...}) = 0 mmap(0x3415800000, 2102416, PROT_READ|PROT_EXEC, MAP_PRIVATE|MAP_DENYWRITE, 3, 0) = 0x3415800000 mprotect(0x3415802000, 2093056, PROT_NONE) = 0 mmap(0x3415a01000, 4096, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_FIXED|MAP_DENYWRITE, 3, 0x1000) = 0x3415a01000 close(3) = 0 mmap(NULL, 4096, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0) = 0x2b46970b7000 open("/lib64/libselinux.so.1", O_RDONLY) = 3 read(3, "\177ELF\2\1\1\0\0\0\0\0\0\0\0\0\3\0>\0\1\0\0\0\300D@\0214\0\0\0"..., 832) = 832 fstat(3, {st_mode=S_IFREG|0755, st_size=91352, ...}) = 0 mmap(0x3411400000, 2188704, PROT_READ|PROT_EXEC, MAP_PRIVATE|MAP_DENYWRITE, 3, 0) = 0x3411400000 mprotect(0x3411415000, 2093056, PROT_NONE) = 0 mmap(0x3411614000, 8192, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_FIXED|MAP_DENYWRITE, 3, 0x14000) = 0x3411614000 mmap(0x3411616000, 1440, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_FIXED|MAP_ANONYMOUS, -1, 0) = 0x3411616000 close(3) = 0 open("/lib64/libsepol.so.1", O_RDONLY) = 3 read(3, "\177ELF\2\1\1\0\0\0\0\0\0\0\0\0\3\0>\0\1\0\0\0@<\0\0214\0\0\0"..., 832) = 832 fstat(3, {st_mode=S_IFREG|0755, st_size=243400, ...}) = 0 mmap(0x3411000000, 2379072, PROT_READ|PROT_EXEC, MAP_PRIVATE|MAP_DENYWRITE, 3, 0) = 0x3411000000 mprotect(0x341103a000, 2097152, PROT_NONE) = 0 mmap(0x341123a000, 4096, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_FIXED|MAP_DENYWRITE, 3, 0x3a000) = 0x341123a000 mmap(0x341123b000, 40256, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_FIXED|MAP_ANONYMOUS, -1, 0) = 0x341123b000 close(3) = 0 mmap(NULL, 4096, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0) = 0x2b46970b8000 mmap(NULL, 4096, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0) = 0x2b46970b9000 mmap(NULL, 4096, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0) = 0x2b46970ba000 mmap(NULL, 4096, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0) = 0x2b46970bb000 arch_prctl(ARCH_SET_FS, 0x2b46970bad80) = 0 mprotect(0x3410681000, 4096, PROT_READ) = 0 mprotect(0x3412614000, 4096, PROT_READ) = 0 mprotect(0x3410a15000, 4096, PROT_READ) = 0 mprotect(0x3410202000, 4096, PROT_READ) = 0 mprotect(0x3411a07000, 4096, PROT_READ) = 0 mprotect(0x3417201000, 4096, PROT_READ) = 0 mprotect(0x340ff4e000, 16384, PROT_READ) = 0 mprotect(0x3413ae4000, 24576, PROT_READ) = 0 mprotect(0x3411e11000, 4096, PROT_READ) = 0 mprotect(0x340fa1b000, 4096, PROT_READ) = 0 munmap(0x2b46970a0000, 29122) = 0 set_tid_address(0x2b46970bae10) = 21034 set_robust_list(0x2b46970bae20, 0x18) = 0 futex(0x7fff6d5972dc, FUTEX_WAKE_PRIVATE, 1) = 0 rt_sigaction(SIGRTMIN, {0x3410805380, [], SA_RESTORER|SA_SIGINFO, 0x341080eb10}, NULL, 8) = 0 rt_sigaction(SIGRT_1, {0x34108052b0, [], SA_RESTORER|SA_RESTART|SA_SIGINFO, 0x341080eb10}, NULL, 8) = 0 rt_sigprocmask(SIG_UNBLOCK, [RTMIN RT_1], NULL, 8) = 0 getrlimit(RLIMIT_STACK, {rlim_cur=10240*1024, rlim_max=RLIM_INFINITY}) = 0 brk(0) = 0x196b8000 brk(0x196d9000) = 0x196d9000 access("/etc/selinux/", F_OK) = 0 open("/etc/selinux/config", O_RDONLY) = 3 fstat(3, {st_mode=S_IFREG|0644, st_size=513, ...}) = 0 mmap(NULL, 4096, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0) = 0x2b46970a0000 read(3, "# This file controls the state o"..., 4096) = 513 read(3, "", 4096) = 0 close(3) = 0 munmap(0x2b46970a0000, 4096) = 0 open("/proc/mounts", O_RDONLY) = 3 fstat(3, {st_mode=S_IFREG|0444, st_size=0, ...}) = 0 mmap(NULL, 4096, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0) = 0x2b46970a0000 read(3, "rootfs / rootfs rw 0 0\n/dev/root"..., 4096) = 731 close(3) = 0 munmap(0x2b46970a0000, 4096) = 0 open("/selinux/mls", O_RDONLY) = 3 read(3, "1", 19) = 1 close(3) = 0 socket(PF_FILE, SOCK_STREAM, 0) = 3 connect(3, {sa_family=AF_FILE, path="/var/run/setrans/.setrans-unix"...}, 110) = 0 sendmsg(3, {msg_name(0)=NULL, msg_iov(5)=[{"\1\0\0\0", 4}, {"\1\0\0\0", 4}, {"\1\0\0\0", 4}, {"\0", 1}, {"\0", 1}], msg_controllen=0, msg_flags=0}, MSG_NOSIGNAL) = 14 readv(3, [{"\1\0\0\0", 4}, {"\1\0\0\0", 4}, {"\0\0\0\0", 4}], 3) = 12 readv(3, [{"\0", 1}], 1) = 1 close(3) = 0 futex(0x3413aeeca8, FUTEX_WAKE_PRIVATE, 2147483647) = 0 rt_sigaction(SIGPIPE, {0x1, ~[RTMIN RT_1], SA_RESTORER, 0x341080eb10}, NULL, 8) = 0 rt_sigaction(SIGIO, {0x407440, ~[RTMIN RT_1], SA_RESTORER, 0x341080eb10}, NULL, 8) = 0 open("/dev/kvm", O_RDWR) = 3 ioctl(3, 0xae00, 0) = 12 clock_gettime(CLOCK_MONOTONIC, {985079, 528777824}) = 0 pipe([4, 5]) = 0 fcntl(4, F_GETFL) = 0 (flags O_RDONLY) fcntl(4, F_SETFL, O_RDONLY|O_NONBLOCK) = 0 fcntl(5, F_GETFL) = 0x1 (flags O_WRONLY) fcntl(5, F_SETFL, O_WRONLY|O_NONBLOCK) = 0 rt_sigaction(SIGALRM, {0x407460, ~[RTMIN RT_1], SA_RESTORER, 0x341080eb10}, NULL, 8) = 0 timer_create(CLOCK_REALTIME, {(nil), SIGALRM, SIGEV_SIGNAL, {...}}, {0x7ac26000000000}) = 0 fcntl(17, F_SETFL, O_RDONLY|O_NONBLOCK) = -1 EBADF (Bad file descriptor) ioctl(17, 0x800454d2, 0x7fff6d595b70) = -1 EBADF (Bad file descriptor) write(2, "TUNGETIFF ioctl() failed: Bad fi"..., 46TUNGETIFF ioctl() failed: Bad file descriptor ) = 46 ioctl(17, 0x400454d4, 0x7fff6d595c68) = -1 EBADF (Bad file descriptor) write(2, "TUNSETSNDBUF ioctl failed: Bad f"..., 47TUNSETSNDBUF ioctl failed: Bad file descriptor ) = 47 ioctl(3, 0xae01, 0) = 6 ioctl(3, 0xae03, 0x4) = 1 ioctl(3, 0xae03, 0x4) = 1 ioctl(6, 0xae47, 0xfffbd000) = 0 ioctl(3, 0xae03, 0xb) = 1 ioctl(6, 0xae64, 0xb) = 0 ioctl(3, 0xae03, 0xf) = 2 ioctl(3, 0xae03, 0x3) = 1 ioctl(3, 0xae03, 0) = 1 ioctl(6, 0xae60, 0) = 0 ioctl(3, 0xae03, 0x1a) = 1 uname({sys="Linux", node="lxbst0501.cern.ch", ...}) = 0 ioctl(3, 0xc004ae02, 0x7fff6d595b10) = -1 E2BIG (Argument list too long) ioctl(3, 0xc004ae02, 0x196ca0e0) = 0 ioctl(3, 0xae03, 0x27) = 1 ioctl(3, 0xae03, 0x18) = 1 ioctl(6, 0xae71, 0x7fff6d595ca0) = 0 ioctl(3, 0xae03, 0x15) = 1 ioctl(3, 0xae03, 0x19) = 1024 ioctl(6, 0x4008ae6a, 0x196ca120) = 0 mmap(NULL, 2168475648, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0) = -1 ENOMEM (Cannot allocate memory) brk(0x9aaef000) = 0x196d9000 mmap(NULL, 2168606720, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0) = -1 ENOMEM (Cannot allocate memory) mmap(NULL, 2168475648, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0) = -1 ENOMEM (Cannot allocate memory) brk(0x9aaef000) = 0x196d9000 mmap(NULL, 2168606720, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0) = -1 ENOMEM (Cannot allocate memory) ioctl(3, 0xae03, 0x10) = 1 write(2, "Could not allocate physical memo"..., 35Could not allocate physical memory ) = 35 exit_group(1) = ? Any comments? Thanks, Guangya Liu Software Developer@platform Computing

2 2

[libvirt] API Proposal: Block device streaming (V3)
by Adam Litke 20 May '11

20 May '11

Version 2 of the block device streaming API diverged significantly from the original API provided by Qemu. In an effort to provide an API that is designed to work well for the specific task of streaming data to a local device from its backing store I am proposing this: version 3 of the block device streaming API. Some noteworthy changes from earlier versions: The offset and length parameters to virDomainStream have been replaced by an iterator type. Manual specification of ranges is outside of the scope of the API and does not add utility. Instead, an iterator is used to perform a series of individual operations in an efficient manner without exposing device format particulars. I have added a new call virDomainBlockStreamAbort() that can be used to cancel an active stream operation. This is an improvement over the use of flags to override the meaning of virDomainBlockStream(). Block devices are specified by the fully-qualified path to the source file. This information is easier for API users to provide than the block device alias. All API functions return an int. Rather than returning an unsigned long long, virDomainBlockStream() updates the the iterator (which is passed in by reference) in place. ----- API V3 ----- /* * Disk Streaming */ typedef enum { /* * If set, virDomainBlockStream() will begin streaming the entire device * continuously. The status can be checked and the operation aborted by using * the functions virDomainGetBlockStreamInfo() and virDomainBlockStreamAbort(). */ VIR_DOMAIN_BLOCK_STREAM_CONTINUOUS = 1, } virDomainStreamDiskFlags; #define VIR_DOMAIN_BLOCK_STREAM_PATH_MAX 1024 /* An iterator for initiating and monitoring block streaming operations */ typedef unsigned long long virDomainBlockStreamCursor; typedef struct _virDomainBlockStreamInfo virDomainBlockStreamInfo; struct _virDomainBlockStreamInfo { char path[VIR_DOMAIN_BLOCK_STREAM_PATH_MAX]; /* * The following fields provide an indication of streaming progress. @cur * indicates the current position and will be between 0 and @end. @end is * the final cursor position for this operation and represents completion. To * approximate progress, divide @cur by @end. */ virDomainBlockStreamCursor cur; virDomainBlockStreamCursor end; }; typedef virDomainBlockStreamInfo *virDomainBlockStreamInfoPtr; /** * virDomainBlockStream: * @dom: pointer to domain object * @path: Fully-qualified filename of disk * @cursor: pointer to a virDomainBlockStreamCursor, or NULL * @flags: One of virDomainStreamDiskFlags, or zero * * Initate a streaming operation on the named block device associated with the * given domain. If VIR_DOMAIN_BLOCK_STREAM_CONTINUOUS is specified, the entire * device will be streamed in the background. Otherwise, the value stored in * cursor will be used to stream an increment. * * Returns -1 in case of failure, 0 when successful. On success and when @flags * does not contain VIR_DOMAIN_BLOCK_STREAM_CONTINUOUS, the iterator @cursor will * be updated to the proper value for use in a subsequent call. */ int virDomainBlockStream(virDomainPtr dom, const char *path, virDomainBlockStreamCursor *cursor, unsigned int flags); /** * virDomainBlockStreamAbort: * @dom: pointer to domain object * @path: fully-qualified filename of disk * @flags: currently unused, for future extension * * Cancel a disk streaming operation that has been previously started by a call to * virDomainBlockStream() with the VIR_DOMAIN_BLOCK_STREAM_CONTINUOUS flag. * * Returns -1 in case of failure, 0 when successful. */ int virDomainBlockStreamAbort(virDomainPtr dom, const char *path, unsigned int flags); /** * virDomainGetBlockStreamInfo: * @dom: pointer to domain object * @info: pointer to an array of virDomainBlockStreamInfo objects * @nr_results: Number of results requested * @flags: currently unused, for future extension * * Request information on active block streaming operations for the given domain. * The caller must supply an allocated array of virDomainBlockStreamInfo objects * Information about up to @nr_results active streams will be stored in @info. * * Returns -1 in case of failure, or the number of results that were stored. */ int virDomainGetBlockStreamInfo(virDomainPtr dom, virDomainBlockStreamInfoPtr info, unsigned int nr_results, unsigned int flags);

3 4

[libvirt] [numatune PATCH v2] Support NUMA tuning
by Osier Yang 20 May '11

20 May '11

Hi, All This series adopts Daniel's suggestion on v1, using libnuma but not invoking numactl to set the NUMA policy. Add support for "interleave" and "preferred" modes, except the "strict" mode supported in v1. The new XML is like: <numatune> <memory model="interleave" nodeset="+0-4,8-12"/> <numatune> I persist in using the numactl nodeset syntax to represent the "nodeset", as I think the purpose of adding NUMA tuning support is to provide the use for NUMA users, keeping the syntax same as numactl will make them feel better. Regards Osier [PATCH 1/4] numatune: Define XML schema and add docs [PATCH 2/4] numatune: Support persistent XML for numa tuning [PATCH 3/4] numatune: Set NUMA policy between fork and exec as a hook [PATCH 4/4] numatune: Add tests to validate the persistent XML

5 17

[libvirt] [PATCH 0/2] fix some migration's bug
by Wen Congyang 20 May '11

20 May '11

Wen Congyang (2): avoid vm is deleted in qemuDomainMigrateConfirm3() check whether the vm is paused before setting it offline src/qemu/qemu_migration.c | 16 +++++++++------- 1 files changed, 9 insertions(+), 7 deletions(-)

2 7

[libvirt] [PATCH v2] qemu: Add option to enable/disable IOEventFD feature
by Michal Privoznik 20 May '11

20 May '11

This feature allows QEMU to achieve higher throughput, but is available only in recent versions. It is accessible via ioeventfd attribute with accepting values 'on', 'off'. Only experienced users needs to set this, because QEMU defaults to 'on', meaning higher performance. Translates into virtio-{blk|net}-pci.ioeventfd option. --- diff to v1: - rebase to current HEAD docs/formatdomain.html.in | 15 ++++++++++++- docs/schemas/domain.rng | 14 +++++++++++++ src/conf/domain_conf.c | 44 +++++++++++++++++++++++++++++++++++++++++- src/conf/domain_conf.h | 12 +++++++++++ src/libvirt_private.syms | 2 + src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 23 +++++++++++++++++++++ tests/qemuhelptest.c | 3 +- 9 files changed, 112 insertions(+), 4 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 989dcf6..a4d7cbd 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -767,7 +767,7 @@ </disk> ... <disk type='network'> - <driver name="qemu" type="raw" io="threads"/> + <driver name="qemu" type="raw" io="threads" ioeventfd="on"/> <source protocol="sheepdog" name="image_name"> <host name="hostname" port="7000"/> </source> @@ -851,6 +851,11 @@ policies on I/O; qemu guests support "threads" and "native". <span class="since">Since 0.8.8</span> </li> + <li> + The optional <code>ioeventfd</code> attribute enables or disables + IOEventFD feature for virtqueue notify. The value can be either + 'on' or 'off'. + <span class="since">Since 0.9.2 (QEMU and KVM only)</span> </ul> </dd> <dt><code>boot</code></dt> @@ -1585,7 +1590,7 @@ qemu-kvm -net nic,model=? /dev/null <source network='default'/> <target dev='vnet1'/> <model type='virtio'/> - <b><driver name='vhost' txmode='iothread'/></b> + <b><driver name='vhost' txmode='iothread' ioeventfd='on'/></b> </interface> </devices> ...</pre> @@ -1636,6 +1641,12 @@ qemu-kvm -net nic,model=? /dev/null <b>In general you should leave this option alone, unless you are very certain you know what you are doing.</b> </dd> + <dt><code>ioeventfd</code><code></dt> + <dd> + This optional attribute allows users to enable or disable IOeventFD + feature for virtqueue notify. The value can be either 'on' or 'off'. + <span class="since">Since 0.9.2 (QEMU and KVM only)</span> + </dd> </dl> <h5><a name="elementsNICSTargetOverride">Overriding the target element</a></h5> diff --git a/docs/schemas/domain.rng b/docs/schemas/domain.rng index 7163c6e..c3e8e15 100644 --- a/docs/schemas/domain.rng +++ b/docs/schemas/domain.rng @@ -735,6 +735,9 @@ <optional> <ref name="driverIO"/> </optional> + <optional> + <ref name="ioeventfd"/> + </optional> <empty/> </element> </define> @@ -774,6 +777,14 @@ </choice> </attribute> </define> + <define name="ioeventfd"> + <attribute name="ioeventfd"> + <choice> + <value>on</value> + <value>off</value> + </choice> + </attribute> + </define> <define name="controller"> <element name="controller"> <choice> @@ -1074,6 +1085,9 @@ </choice> </attribute> </optional> + <optional> + <ref name="ioeventfd"/> + </optional> <empty/> </element> </optional> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 498438a..2cb8d66 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -162,6 +162,11 @@ VIR_ENUM_IMPL(virDomainDiskIo, VIR_DOMAIN_DISK_IO_LAST, "native", "threads") +VIR_ENUM_IMPL(virDomainVirtioEventFd, VIR_DOMAIN_VIRTIO_EVENT_FD_LAST, + "default", + "on", + "off") + VIR_ENUM_IMPL(virDomainController, VIR_DOMAIN_CONTROLLER_TYPE_LAST, "ide", "fdc", @@ -1901,6 +1906,7 @@ virDomainDiskDefParseXML(virCapsPtr caps, char *cachetag = NULL; char *error_policy = NULL; char *iotag = NULL; + char *ioeventfd = NULL; char *devaddr = NULL; virStorageEncryptionPtr encryption = NULL; char *serial = NULL; @@ -2016,6 +2022,7 @@ virDomainDiskDefParseXML(virCapsPtr caps, cachetag = virXMLPropString(cur, "cache"); error_policy = virXMLPropString(cur, "error_policy"); iotag = virXMLPropString(cur, "io"); + ioeventfd = virXMLPropString(cur, "ioeventfd"); } else if (xmlStrEqual(cur->name, BAD_CAST "readonly")) { def->readonly = 1; } else if (xmlStrEqual(cur->name, BAD_CAST "shareable")) { @@ -2152,6 +2159,18 @@ virDomainDiskDefParseXML(virCapsPtr caps, } } + if (ioeventfd) { + int i; + if ((i = virDomainVirtioEventFdTypeFromString(ioeventfd)) <= 0) { + virDomainReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("unknown disk ioeventfd mode '%s'"), + ioeventfd); + goto error; + } + def->ioeventfd = i; + } + + if (devaddr) { if (virDomainParseLegacyDeviceAddress(devaddr, &def->info.addr.pci) < 0) { @@ -2214,6 +2233,7 @@ cleanup: VIR_FREE(cachetag); VIR_FREE(error_policy); VIR_FREE(iotag); + VIR_FREE(ioeventfd); VIR_FREE(devaddr); VIR_FREE(serial); virStorageEncryptionFree(encryption); @@ -2601,6 +2621,7 @@ virDomainNetDefParseXML(virCapsPtr caps, char *model = NULL; char *backend = NULL; char *txmode = NULL; + char *ioeventfd = NULL; char *filter = NULL; char *internal = NULL; char *devaddr = NULL; @@ -2690,6 +2711,7 @@ virDomainNetDefParseXML(virCapsPtr caps, } else if (xmlStrEqual (cur->name, BAD_CAST "driver")) { backend = virXMLPropString(cur, "name"); txmode = virXMLPropString(cur, "txmode"); + ioeventfd = virXMLPropString(cur, "ioeventfd"); } else if (xmlStrEqual (cur->name, BAD_CAST "filterref")) { filter = virXMLPropString(cur, "filter"); VIR_FREE(filterparams); @@ -2906,6 +2928,17 @@ virDomainNetDefParseXML(virCapsPtr caps, } def->driver.virtio.txmode = m; } + if (ioeventfd != NULL) { + int i; + if ((i = virDomainVirtioEventFdTypeFromString(ioeventfd)) <= 0) { + virDomainReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("unknown interface <driver " + "ioeventfd='%s'> has been specified"), + ioeventfd); + goto error; + } + def->driver.virtio.ioeventfd = i; + } } if (filter != NULL) { @@ -2945,6 +2978,7 @@ cleanup: VIR_FREE(model); VIR_FREE(backend); VIR_FREE(txmode); + VIR_FREE(ioeventfd); VIR_FREE(filter); VIR_FREE(type); VIR_FREE(internal); @@ -7006,6 +7040,7 @@ virDomainDiskDefFormat(virBufferPtr buf, const char *cachemode = virDomainDiskCacheTypeToString(def->cachemode); const char *error_policy = virDomainDiskErrorPolicyTypeToString(def->error_policy); const char *iomode = virDomainDiskIoTypeToString(def->iomode); + const char *ioeventfd = virDomainVirtioEventFdTypeToString(def->ioeventfd); if (!type) { virDomainReportError(VIR_ERR_INTERNAL_ERROR, @@ -7037,7 +7072,8 @@ virDomainDiskDefFormat(virBufferPtr buf, " <disk type='%s' device='%s'>\n", type, device); - if (def->driverName || def->driverType || def->cachemode) { + if (def->driverName || def->driverType || def->cachemode || + def->ioeventfd) { virBufferAsprintf(buf, " <driver"); if (def->driverName) virBufferAsprintf(buf, " name='%s'", def->driverName); @@ -7049,6 +7085,8 @@ virDomainDiskDefFormat(virBufferPtr buf, virBufferAsprintf(buf, " error_policy='%s'", error_policy); if (def->iomode) virBufferAsprintf(buf, " io='%s'", iomode); + if (def->ioeventfd) + virBufferAsprintf(buf, " ioeventfd='%s'", ioeventfd); virBufferAsprintf(buf, "/>\n"); } @@ -7339,6 +7377,10 @@ virDomainNetDefFormat(virBufferPtr buf, virBufferAsprintf(buf, " txmode='%s'", virDomainNetVirtioTxModeTypeToString(def->driver.virtio.txmode)); } + if (def->driver.virtio.ioeventfd) { + virBufferAsprintf(buf, " ioeventfd='%s'", + virDomainVirtioEventFdTypeToString(def->driver.virtio.ioeventfd)); + } virBufferAddLit(buf, "/>\n"); } } diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index fe42f21..d6b4002 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -197,6 +197,15 @@ enum virDomainDiskIo { VIR_DOMAIN_DISK_IO_LAST }; +enum virDomainVirtioEventFd { + VIR_DOMAIN_VIRTIO_EVENT_FD_DEFAULT = 0, + VIR_DOMAIN_VIRTIO_EVENT_FD_ON, + VIR_DOMAIN_VIRTIO_EVENT_FD_OFF, + + VIR_DOMAIN_VIRTIO_EVENT_FD_LAST +}; + + /* Stores the virtual disk configuration */ typedef struct _virDomainDiskDef virDomainDiskDef; typedef virDomainDiskDef *virDomainDiskDefPtr; @@ -216,6 +225,7 @@ struct _virDomainDiskDef { int error_policy; int bootIndex; int iomode; + enum virDomainVirtioEventFd ioeventfd; unsigned int readonly : 1; unsigned int shared : 1; virDomainDeviceInfo info; @@ -351,6 +361,7 @@ struct _virDomainNetDef { struct { enum virDomainNetBackendType name; /* which driver backend to use */ enum virDomainNetVirtioTxModeType txmode; + enum virDomainVirtioEventFd ioeventfd; } virtio; } driver; union { @@ -1473,6 +1484,7 @@ VIR_ENUM_DECL(virDomainDiskCache) VIR_ENUM_DECL(virDomainDiskErrorPolicy) VIR_ENUM_DECL(virDomainDiskProtocol) VIR_ENUM_DECL(virDomainDiskIo) +VIR_ENUM_DECL(virDomainVirtioEventFd) VIR_ENUM_DECL(virDomainController) VIR_ENUM_DECL(virDomainControllerModel) VIR_ENUM_DECL(virDomainFS) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index acd5af3..cdf1ccb 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -351,6 +351,8 @@ virDomainVideoDefaultType; virDomainVideoTypeFromString; virDomainVideoTypeToString; virDomainVirtTypeToString; +virDomainVirtioEventFdTypeFromString; +virDomainVirtioEventFdTypeToString; virDomainWatchdogActionTypeFromString; virDomainWatchdogActionTypeToString; virDomainWatchdogModelTypeFromString; diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index ea55df5..1cd7aa7 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -1202,6 +1202,8 @@ qemuCapsParseDeviceStr(const char *str, virBitmapPtr flags) qemuCapsSet(flags, QEMU_CAPS_VIRTIO_TX_ALG); if (strstr(str, "name \"qxl-vga\"")) qemuCapsSet(flags, QEMU_CAPS_DEVICE_QXL_VGA); + if (strstr(str, "virtio-blk-pci.ioeventfd")) + qemuCapsSet(flags, QEMU_CAPS_VIRTIO_IOEVENTFD); return 0; } diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index ab47f22..56f3998 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -95,6 +95,7 @@ enum qemuCapsFlags { QEMU_CAPS_DEVICE_SPICEVMC = 57, /* older -device spicevmc*/ QEMU_CAPS_VIRTIO_TX_ALG = 58, /* -device virtio-net-pci,tx=string */ QEMU_CAPS_DEVICE_QXL_VGA = 59, /* Is the primary and vga campatible qxl device named qxl-vga? */ + QEMU_CAPS_VIRTIO_IOEVENTFD = 60, /* IOEventFD feature: virtio-{net|blk}-pci.ioeventfd=on/off */ QEMU_CAPS_LAST, /* this must always be the last item */ }; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 2828823..0729664 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -1169,6 +1169,26 @@ qemuBuildDeviceAddressStr(virBufferPtr buf, return 0; } +static int +qemuBuildIoEventFdStr(virBufferPtr buf, + enum virDomainVirtioEventFd use, + virBitmapPtr qemuCaps) +{ + if (qemuCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_IOEVENTFD)) { + switch (use) { + case VIR_DOMAIN_VIRTIO_EVENT_FD_ON: + case VIR_DOMAIN_VIRTIO_EVENT_FD_OFF: + virBufferAsprintf(buf, ",ioeventfd=%s", + virDomainVirtioEventFdTypeToString(use)); + break; + default: + /* In other cases (_DEFAULT, _LAST) we don't + * want to add anything */ + break; + } + } + return 0; +} #define QEMU_SERIAL_PARAM_ACCEPTED_CHARS \ "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-_" @@ -1434,6 +1454,7 @@ qemuBuildDriveDevStr(virDomainDiskDefPtr disk, break; case VIR_DOMAIN_DISK_BUS_VIRTIO: virBufferAddLit(&opt, "virtio-blk-pci"); + qemuBuildIoEventFdStr(&opt, disk->ioeventfd, qemuCaps); qemuBuildDeviceAddressStr(&opt, &disk->info, qemuCaps); break; case VIR_DOMAIN_DISK_BUS_USB: @@ -1656,6 +1677,8 @@ qemuBuildNicDevStr(virDomainNetDefPtr net, goto error; } } + if(usingVirtio) + qemuBuildIoEventFdStr(&buf, net->driver.virtio.ioeventfd, qemuCaps); if (vlan == -1) virBufferAsprintf(&buf, ",netdev=host%s", net->info.alias); else diff --git a/tests/qemuhelptest.c b/tests/qemuhelptest.c index 2522396..387f46c 100644 --- a/tests/qemuhelptest.c +++ b/tests/qemuhelptest.c @@ -474,7 +474,8 @@ mymain(void) QEMU_CAPS_CCID_PASSTHRU, QEMU_CAPS_CHARDEV_SPICEVMC, QEMU_CAPS_DEVICE_QXL_VGA, - QEMU_CAPS_VIRTIO_TX_ALG); + QEMU_CAPS_VIRTIO_TX_ALG, + QEMU_CAPS_VIRTIO_IOEVENTFD); return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; } -- 1.7.5.rc3

6 9

[libvirt] [PATCHv2 0/6] flush my patch queue
by Eric Blake 19 May '11

19 May '11

I've been building up a grab bag of un-acked patches (a couple have had reviews, but most have met list silence), so I figured a repost would help. Eric Blake (6): build: update to latest gnulib build: require newer gettext virsh: optimize creation of default connection build: make python optional at configure time build: silence clang false positive remote: remove special case for getting version .gnulib | 2 +- bootstrap | 12 +- bootstrap.conf | 2 +- configure.ac | 37 +++-- daemon/remote_generator.pl | 23 +-- src/libxl/libxl_driver.c | 2 + src/remote/remote_protocol.x | 4 +- src/remote_protocol-structs | 4 +- tools/virsh.c | 429 ++++++++++++++++++++++++------------------ 9 files changed, 299 insertions(+), 216 deletions(-) -- 1.7.4.4

4 19

[libvirt] [PATCH] Fix QEMU -vnc arg generation with raw IPv6 addresses
by Daniel P. Berrange 19 May '11

19 May '11

Since -vnc uses ':' to separate the address from the port, raw IPv6 addresses need to be escaped like [addr]:port * src/qemu/qemu_command.c: Escape raw IPv6 addresses with [] * tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc.args, tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc.xml: Tweak to test Ipv6 escaping --- src/qemu/qemu_command.c | 63 ++++++++++++------- .../qemuxml2argv-graphics-vnc.args | 2 +- .../qemuxml2argvdata/qemuxml2argv-graphics-vnc.xml | 2 +- 3 files changed, 42 insertions(+), 25 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 2828823..6fa401f 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -3893,11 +3893,14 @@ qemuBuildCommandLine(virConnectPtr conn, def->graphics[0]->data.vnc.socket); } else if (qemuCapsGet(qemuCaps, QEMU_CAPS_VNC_COLON)) { - if (def->graphics[0]->data.vnc.listenAddr) - virBufferAdd(&opt, def->graphics[0]->data.vnc.listenAddr, -1); - else if (driver->vncListen) - virBufferAdd(&opt, driver->vncListen, -1); - + const char *addr = def->graphics[0]->data.vnc.listenAddr ? + def->graphics[0]->data.vnc.listenAddr : + driver->vncListen; + bool escapeAddr = strchr(addr, ':'); + if (escapeAddr) + virBufferAsprintf(&opt, "[%s]", addr); + else + virBufferAdd(&opt, addr, -1); virBufferAsprintf(&opt, ":%d", def->graphics[0]->data.vnc.port - 5900); @@ -5734,32 +5737,46 @@ virDomainDefPtr qemuParseCommandLine(virCapsPtr caps, vnc->type = VIR_DOMAIN_GRAPHICS_TYPE_VNC; if (STRPREFIX(val, "unix:")) { + /* -vnc unix:/some/big/path */ vnc->data.vnc.socket = strdup(val + 5); if (!vnc->data.vnc.socket) { VIR_FREE(vnc); goto no_memory; } } else { - tmp = strchr(val, ':'); - if (tmp) { - char *opts; - if (virStrToLong_i(tmp+1, &opts, 10, - &vnc->data.vnc.port) < 0) { - VIR_FREE(vnc); - qemuReportError(VIR_ERR_INTERNAL_ERROR, - _("cannot parse VNC port '%s'"), tmp+1); - goto error; - } + /* + * -vnc 127.0.0.1:4 + * -vnc [2001:1:2:3:4:5:1234:1234]:4 + * -vnc some.host.name:4 + */ + char *opts; + const char *sep = ":"; + if (val[0] == '[') + sep = "]:"; + tmp = strstr(val, sep); + if (!tmp) { + VIR_FREE(vnc); + qemuReportError(VIR_ERR_INTERNAL_ERROR, + _("missing VNC port number in '%s'"), val); + goto error; + } + if (virStrToLong_i(tmp+strlen(sep), &opts, 10, + &vnc->data.vnc.port) < 0) { + VIR_FREE(vnc); + qemuReportError(VIR_ERR_INTERNAL_ERROR, + _("cannot parse VNC port '%s'"), tmp+1); + goto error; + } + if (val[0] == '[') + vnc->data.vnc.listenAddr = strndup(val+1, tmp-(val+1)); + else vnc->data.vnc.listenAddr = strndup(val, tmp-val); - if (!vnc->data.vnc.listenAddr) { - VIR_FREE(vnc); - goto no_memory; - } - vnc->data.vnc.port += 5900; - vnc->data.vnc.autoport = 0; - } else { - vnc->data.vnc.autoport = 1; + if (!vnc->data.vnc.listenAddr) { + VIR_FREE(vnc); + goto no_memory; } + vnc->data.vnc.port += 5900; + vnc->data.vnc.autoport = 0; } if (VIR_REALLOC_N(def->graphics, def->ngraphics+1) < 0) { diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc.args b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc.args index 13aa138..2af1540 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc.args @@ -1,4 +1,4 @@ LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ /usr/bin/qemu -S -M pc -m 214 -smp 1 -monitor unix:/tmp/test-monitor,server,\ nowait -no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -net none -serial none \ --parallel none -usb -vnc 127.0.0.1:3 +-parallel none -usb -vnc [2001:1:2:3:4:5:1234:1234]:3 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc.xml b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc.xml index eb6be7d..6304104 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc.xml @@ -21,7 +21,7 @@ </disk> <controller type='ide' index='0'/> <input type='mouse' bus='ps2'/> - <graphics type='vnc' port='5903' autoport='no' listen='127.0.0.1'/> + <graphics type='vnc' port='5903' autoport='no' listen='2001:1:2:3:4:5:1234:1234'/> <video> <model type='cirrus' vram='9216' heads='1'/> </video> -- 1.7.4.4

2 1

[libvirt] [PATCH 1/4] Fix error messages codes when TypeFromString fails
by Michal Privoznik 19 May '11

19 May '11

--- src/conf/cpu_conf.c | 4 +- src/conf/domain_conf.c | 100 ++++++++++++++++++----------------- src/conf/interface_conf.c | 2 +- src/conf/network_conf.c | 2 +- src/conf/node_device_conf.c | 4 +- src/conf/nwfilter_conf.c | 6 +- src/conf/secret_conf.c | 2 +- src/conf/storage_conf.c | 2 +- src/conf/storage_encryption_conf.c | 4 +- 9 files changed, 64 insertions(+), 62 deletions(-) diff --git a/src/conf/cpu_conf.c b/src/conf/cpu_conf.c index 98d598a..5b7b363 100644 --- a/src/conf/cpu_conf.c +++ b/src/conf/cpu_conf.c @@ -156,7 +156,7 @@ virCPUDefParseXML(const xmlNodePtr node, VIR_FREE(match); if (def->match < 0) { - virCPUReportError(VIR_ERR_INTERNAL_ERROR, + virCPUReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("Invalid match attribute for CPU specification")); goto error; } @@ -257,7 +257,7 @@ virCPUDefParseXML(const xmlNodePtr node, VIR_FREE(strpolicy); if (policy < 0) { - virCPUReportError(VIR_ERR_INTERNAL_ERROR, + virCPUReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("Invalid CPU feature policy")); goto error; } diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 3298c80..e7e265c 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -1707,7 +1707,7 @@ virDomainDeviceInfoParseXML(xmlNodePtr node, if (type) { if ((info->type = virDomainDeviceAddressTypeFromString(type)) < 0) { - virDomainReportError(VIR_ERR_INTERNAL_ERROR, + virDomainReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unknown address type '%s'"), type); goto cleanup; } @@ -1914,7 +1914,7 @@ virDomainDiskDefParseXML(virCapsPtr caps, type = virXMLPropString(node, "type"); if (type) { if ((def->type = virDomainDiskTypeFromString(type)) < 0) { - virDomainReportError(VIR_ERR_INTERNAL_ERROR, + virDomainReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unknown disk type '%s'"), type); goto error; } @@ -1947,7 +1947,7 @@ virDomainDiskDefParseXML(virCapsPtr caps, } def->protocol = virDomainDiskProtocolTypeFromString(protocol); if (def->protocol < 0) { - virDomainReportError(VIR_ERR_INTERNAL_ERROR, + virDomainReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unknown protocol type '%s'"), protocol); goto error; @@ -2046,7 +2046,7 @@ virDomainDiskDefParseXML(virCapsPtr caps, device = virXMLPropString(node, "device"); if (device) { if ((def->device = virDomainDiskDeviceTypeFromString(device)) < 0) { - virDomainReportError(VIR_ERR_INTERNAL_ERROR, + virDomainReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unknown disk device '%s'"), device); goto error; } @@ -2094,7 +2094,7 @@ virDomainDiskDefParseXML(virCapsPtr caps, if (bus) { if ((def->bus = virDomainDiskBusTypeFromString(bus)) < 0) { - virDomainReportError(VIR_ERR_INTERNAL_ERROR, + virDomainReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unknown disk bus type '%s'"), bus); goto error; } @@ -2132,14 +2132,14 @@ virDomainDiskDefParseXML(virCapsPtr caps, if (cachetag && (def->cachemode = virDomainDiskCacheTypeFromString(cachetag)) < 0) { - virDomainReportError(VIR_ERR_INTERNAL_ERROR, + virDomainReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unknown disk cache mode '%s'"), cachetag); goto error; } if (error_policy && (def->error_policy = virDomainDiskErrorPolicyTypeFromString(error_policy)) < 0) { - virDomainReportError(VIR_ERR_INTERNAL_ERROR, + virDomainReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unknown disk error policy '%s'"), error_policy); goto error; } @@ -2147,7 +2147,7 @@ virDomainDiskDefParseXML(virCapsPtr caps, if (iotag) { if ((def->iomode = virDomainDiskIoTypeFromString(iotag)) < 0 || def->iomode == VIR_DOMAIN_DISK_IO_DEFAULT) { - virDomainReportError(VIR_ERR_INTERNAL_ERROR, + virDomainReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unknown disk io mode '%s'"), iotag); goto error; } @@ -2251,7 +2251,7 @@ virDomainControllerDefParseXML(xmlNodePtr node, type = virXMLPropString(node, "type"); if (type) { if ((def->type = virDomainControllerTypeFromString(type)) < 0) { - virDomainReportError(VIR_ERR_INTERNAL_ERROR, + virDomainReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Unknown controller type '%s'"), type); goto error; } @@ -2269,7 +2269,7 @@ virDomainControllerDefParseXML(xmlNodePtr node, model = virXMLPropString(node, "model"); if (model) { if ((def->model = virDomainControllerModelTypeFromString(model)) < 0) { - virDomainReportError(VIR_ERR_INTERNAL_ERROR, + virDomainReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Unknown model type '%s'"), model); goto error; } @@ -2359,7 +2359,7 @@ virDomainFSDefParseXML(xmlNodePtr node, type = virXMLPropString(node, "type"); if (type) { if ((def->type = virDomainFSTypeFromString(type)) < 0) { - virDomainReportError(VIR_ERR_INTERNAL_ERROR, + virDomainReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unknown filesystem type '%s'"), type); goto error; } @@ -2370,7 +2370,7 @@ virDomainFSDefParseXML(xmlNodePtr node, accessmode = virXMLPropString(node, "accessmode"); if (accessmode) { if ((def->accessmode = virDomainFSAccessModeTypeFromString(accessmode)) < 0) { - virDomainReportError(VIR_ERR_INTERNAL_ERROR, + virDomainReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unknown accessmode '%s'"), accessmode); goto error; } @@ -2622,7 +2622,7 @@ virDomainNetDefParseXML(virCapsPtr caps, type = virXMLPropString(node, "type"); if (type != NULL) { if ((int)(def->type = virDomainNetTypeFromString(type)) < 0) { - virDomainReportError(VIR_ERR_INTERNAL_ERROR, + virDomainReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unknown interface type '%s'"), type); goto error; } @@ -2834,7 +2834,7 @@ virDomainNetDefParseXML(virCapsPtr caps, if (mode != NULL) { int m; if ((m = virDomainNetdevMacvtapTypeFromString(mode)) < 0) { - virDomainReportError(VIR_ERR_INTERNAL_ERROR, "%s", + virDomainReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("Unkown mode has been specified")); goto error; } @@ -2887,7 +2887,7 @@ virDomainNetDefParseXML(virCapsPtr caps, int name; if (((name = virDomainNetBackendTypeFromString(backend)) < 0) || (name == VIR_DOMAIN_NET_BACKEND_TYPE_DEFAULT)) { - virDomainReportError(VIR_ERR_INTERNAL_ERROR, + virDomainReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Unknown interface <driver name='%s'> " "has been specified"), backend); @@ -2899,7 +2899,7 @@ virDomainNetDefParseXML(virCapsPtr caps, int m; if (((m = virDomainNetVirtioTxModeTypeFromString(txmode)) < 0) || (m == VIR_DOMAIN_NET_VIRTIO_TX_MODE_DEFAULT)) { - virDomainReportError(VIR_ERR_INTERNAL_ERROR, + virDomainReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Unknown interface <driver txmode='%s'> " "has been specified"), txmode); @@ -3037,6 +3037,8 @@ virDomainChrDefParseTargetXML(virCapsPtr caps, if ((def->targetType = virDomainChrTargetTypeFromString(caps, def->deviceType, targetType)) < 0) { + virDomainReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("unknown type %s"), targetType); goto error; } @@ -3259,7 +3261,7 @@ virDomainChrSourceDefParseXML(virDomainChrSourceDefPtr def, def->data.tcp.protocol = VIR_DOMAIN_CHR_TCP_PROTOCOL_RAW; else if ((def->data.tcp.protocol = virDomainChrTcpProtocolTypeFromString(protocol)) < 0) { - virDomainReportError(VIR_ERR_INTERNAL_ERROR, + virDomainReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Unknown protocol '%s'"), protocol); goto error; } @@ -3386,7 +3388,7 @@ virDomainChrDefParseXML(virCapsPtr caps, if (type == NULL) { def->source.type = VIR_DOMAIN_CHR_TYPE_PTY; } else if ((def->source.type = virDomainChrTypeFromString(type)) < 0) { - virDomainReportError(VIR_ERR_XML_ERROR, + virDomainReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unknown type presented to host for character device: %s"), type); goto error; @@ -3394,7 +3396,7 @@ virDomainChrDefParseXML(virCapsPtr caps, nodeName = (const char *) node->name; if ((def->deviceType = virDomainChrDeviceTypeFromString(nodeName)) < 0) { - virDomainReportError(VIR_ERR_XML_ERROR, + virDomainReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unknown character device type: %s"), nodeName); } @@ -3464,7 +3466,7 @@ virDomainSmartcardDefParseXML(xmlNodePtr node, goto error; } if ((def->type = virDomainSmartcardTypeFromString(mode)) < 0) { - virDomainReportError(VIR_ERR_XML_ERROR, + virDomainReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unknown smartcard device mode: %s"), mode); goto error; @@ -3526,7 +3528,7 @@ virDomainSmartcardDefParseXML(xmlNodePtr node, goto error; } if ((def->data.passthru.type = virDomainChrTypeFromString(type)) < 0) { - virDomainReportError(VIR_ERR_XML_ERROR, + virDomainReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unknown type presented to host for " "character device: %s"), type); goto error; @@ -3594,14 +3596,14 @@ virDomainInputDefParseXML(const char *ostype, } if ((def->type = virDomainInputTypeFromString(type)) < 0) { - virDomainReportError(VIR_ERR_INTERNAL_ERROR, + virDomainReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unknown input device type '%s'"), type); goto error; } if (bus) { if ((def->bus = virDomainInputBusTypeFromString(bus)) < 0) { - virDomainReportError(VIR_ERR_INTERNAL_ERROR, + virDomainReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unknown input bus type '%s'"), bus); goto error; } @@ -3691,7 +3693,7 @@ virDomainTimerDefParseXML(const xmlNodePtr node, goto error; } if ((def->name = virDomainTimerNameTypeFromString(name)) < 0) { - virDomainReportError(VIR_ERR_INTERNAL_ERROR, + virDomainReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unknown timer name '%s'"), name); goto error; } @@ -3713,7 +3715,7 @@ virDomainTimerDefParseXML(const xmlNodePtr node, tickpolicy = virXMLPropString(node, "tickpolicy"); if (tickpolicy != NULL) { if ((def->tickpolicy = virDomainTimerTickpolicyTypeFromString(tickpolicy)) < 0) { - virDomainReportError(VIR_ERR_INTERNAL_ERROR, + virDomainReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unknown timer tickpolicy '%s'"), tickpolicy); goto error; } @@ -3723,7 +3725,7 @@ virDomainTimerDefParseXML(const xmlNodePtr node, track = virXMLPropString(node, "track"); if (track != NULL) { if ((def->track = virDomainTimerTrackTypeFromString(track)) < 0) { - virDomainReportError(VIR_ERR_INTERNAL_ERROR, + virDomainReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unknown timer track '%s'"), track); goto error; } @@ -3742,7 +3744,7 @@ virDomainTimerDefParseXML(const xmlNodePtr node, mode = virXMLPropString(node, "mode"); if (mode != NULL) { if ((def->mode = virDomainTimerModeTypeFromString(mode)) < 0) { - virDomainReportError(VIR_ERR_INTERNAL_ERROR, + virDomainReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unknown timer mode '%s'"), mode); goto error; } @@ -3863,7 +3865,7 @@ virDomainGraphicsDefParseXML(xmlNodePtr node, int flags) { } if ((def->type = virDomainGraphicsTypeFromString(type)) < 0) { - virDomainReportError(VIR_ERR_INTERNAL_ERROR, + virDomainReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unknown graphics device type '%s'"), type); goto error; } @@ -4052,7 +4054,7 @@ virDomainGraphicsDefParseXML(xmlNodePtr node, int flags) { } if ((nameval = virDomainGraphicsSpiceChannelNameTypeFromString(name)) < 0) { - virDomainReportError(VIR_ERR_INTERNAL_ERROR, + virDomainReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unknown spice channel name %s"), name); VIR_FREE(name); @@ -4060,7 +4062,7 @@ virDomainGraphicsDefParseXML(xmlNodePtr node, int flags) { goto error; } if ((modeval = virDomainGraphicsSpiceChannelModeTypeFromString(mode)) < 0) { - virDomainReportError(VIR_ERR_INTERNAL_ERROR, + virDomainReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unknown spice channel mode %s"), mode); VIR_FREE(name); @@ -4187,7 +4189,7 @@ virDomainSoundDefParseXML(const xmlNodePtr node, model = virXMLPropString(node, "model"); if ((def->model = virDomainSoundModelTypeFromString(model)) < 0) { - virDomainReportError(VIR_ERR_INTERNAL_ERROR, + virDomainReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unknown sound model '%s'"), model); goto error; } @@ -4229,7 +4231,7 @@ virDomainWatchdogDefParseXML(const xmlNodePtr node, } def->model = virDomainWatchdogModelTypeFromString (model); if (def->model < 0) { - virDomainReportError(VIR_ERR_INTERNAL_ERROR, + virDomainReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unknown watchdog model '%s'"), model); goto error; } @@ -4240,7 +4242,7 @@ virDomainWatchdogDefParseXML(const xmlNodePtr node, else { def->action = virDomainWatchdogActionTypeFromString (action); if (def->action < 0) { - virDomainReportError(VIR_ERR_INTERNAL_ERROR, + virDomainReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unknown watchdog action '%s'"), action); goto error; } @@ -4281,7 +4283,7 @@ virDomainMemballoonDefParseXML(const xmlNodePtr node, goto error; } if ((def->model = virDomainMemballoonModelTypeFromString(model)) < 0) { - virDomainReportError(VIR_ERR_INTERNAL_ERROR, + virDomainReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unknown memory balloon model '%s'"), model); goto error; } @@ -4325,7 +4327,7 @@ virSysinfoParseXML(const xmlNodePtr node, goto error; } if ((def->type = virDomainSysinfoTypeFromString(type)) < 0) { - virDomainReportError(VIR_ERR_INTERNAL_ERROR, + virDomainReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unknown sysinfo type '%s'"), type); goto error; } @@ -4502,13 +4504,13 @@ virDomainVideoDefParseXML(const xmlNodePtr node, if (type) { if ((def->type = virDomainVideoTypeFromString(type)) < 0) { - virDomainReportError(VIR_ERR_INTERNAL_ERROR, + virDomainReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unknown video model '%s'"), type); goto error; } } else { if ((def->type = virDomainVideoDefaultType(dom)) < 0) { - virDomainReportError(VIR_ERR_INTERNAL_ERROR, "%s", + virDomainReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("missing video model and cannot determine default")); goto error; } @@ -4516,7 +4518,7 @@ virDomainVideoDefParseXML(const xmlNodePtr node, if (vram) { if (virStrToLong_ui(vram, NULL, 10, &def->vram) < 0) { - virDomainReportError(VIR_ERR_INTERNAL_ERROR, + virDomainReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("cannot parse video ram '%s'"), vram); goto error; } @@ -4526,7 +4528,7 @@ virDomainVideoDefParseXML(const xmlNodePtr node, if (heads) { if (virStrToLong_ui(heads, NULL, 10, &def->heads) < 0) { - virDomainReportError(VIR_ERR_INTERNAL_ERROR, + virDomainReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("cannot parse video heads '%s'"), heads); goto error; } @@ -4739,7 +4741,7 @@ virDomainHostdevDefParseXML(const xmlNodePtr node, mode = virXMLPropString(node, "mode"); if (mode) { if ((def->mode=virDomainHostdevModeTypeFromString(mode)) < 0) { - virDomainReportError(VIR_ERR_INTERNAL_ERROR, + virDomainReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unknown hostdev mode '%s'"), mode); goto error; } @@ -4750,7 +4752,7 @@ virDomainHostdevDefParseXML(const xmlNodePtr node, type = virXMLPropString(node, "type"); if (type) { if ((def->source.subsys.type = virDomainHostdevSubsysTypeFromString(type)) < 0) { - virDomainReportError(VIR_ERR_INTERNAL_ERROR, + virDomainReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unknown host device type '%s'"), type); goto error; } @@ -4869,7 +4871,7 @@ virSecurityLabelDefParseXML(const virDomainDefPtr def, def->seclabel.type = virDomainSeclabelTypeFromString(p); VIR_FREE(p); if (def->seclabel.type < 0) { - virDomainReportError(VIR_ERR_XML_ERROR, + virDomainReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("invalid security type")); goto error; } @@ -5290,7 +5292,7 @@ virDomainDefParseBootXML(xmlXPathContextPtr ctxt, goto cleanup; } if ((val = virDomainBootTypeFromString(dev)) < 0) { - virDomainReportError(VIR_ERR_INTERNAL_ERROR, + virDomainReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unknown boot device '%s'"), dev); VIR_FREE(dev); @@ -5425,7 +5427,7 @@ static virDomainDefPtr virDomainDefParseXML(virCapsPtr caps, } if ((def->virtType = virDomainVirtTypeFromString(tmp)) < 0) { - virDomainReportError(VIR_ERR_INTERNAL_ERROR, + virDomainReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("invalid domain type %s"), tmp); goto error; } @@ -5597,7 +5599,7 @@ static virDomainDefPtr virDomainDefParseXML(virCapsPtr caps, for (i = 0 ; i < n ; i++) { int val = virDomainFeatureTypeFromString((const char *)nodes[i]->name); if (val < 0) { - virDomainReportError(VIR_ERR_INTERNAL_ERROR, + virDomainReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unexpected feature %s"), nodes[i]->name); goto error; @@ -6239,7 +6241,7 @@ static virDomainDefPtr virDomainDefParseXML(virCapsPtr caps, int mode; if ((mode = virDomainSmbiosModeTypeFromString(tmp)) < 0) { - virDomainReportError(VIR_ERR_INTERNAL_ERROR, + virDomainReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unknown smbios mode '%s'"), tmp); goto error; } @@ -6318,7 +6320,7 @@ static virDomainObjPtr virDomainObjParseXML(virCapsPtr caps, goto error; } if ((state = virDomainStateTypeFromString(tmp)) < 0) { - virDomainReportError(VIR_ERR_INTERNAL_ERROR, + virDomainReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("invalid domain state '%s'"), tmp); VIR_FREE(tmp); goto error; @@ -9170,7 +9172,7 @@ virDomainSnapshotDefPtr virDomainSnapshotDefParseString(const char *xmlStr, } def->state = virDomainStateTypeFromString(state); if (def->state < 0) { - virDomainReportError(VIR_ERR_INTERNAL_ERROR, + virDomainReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Invalid state '%s' in domain snapshot XML"), state); goto cleanup; @@ -9521,7 +9523,7 @@ int virDomainDiskDefForeachPath(virDomainDiskDefPtr disk, formatStr = "raw"; /* Xen compat */ if ((format = virStorageFileFormatTypeFromString(formatStr)) < 0) { - virDomainReportError(VIR_ERR_INTERNAL_ERROR, + virDomainReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unknown disk format '%s' for %s"), disk->driverType, disk->src); return -1; diff --git a/src/conf/interface_conf.c b/src/conf/interface_conf.c index f3848bd..7e9c78f 100644 --- a/src/conf/interface_conf.c +++ b/src/conf/interface_conf.c @@ -689,7 +689,7 @@ virInterfaceDefParseXML(xmlXPathContextPtr ctxt, int parentIfType) { } type = virInterfaceTypeFromString(tmp); if (type == -1) { - virInterfaceReportError(VIR_ERR_XML_ERROR, + virInterfaceReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unknown interface type %s"), tmp); VIR_FREE(tmp); return(NULL); diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index e4765ea..598d01f 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -674,7 +674,7 @@ virNetworkDefParseXML(xmlXPathContextPtr ctxt) tmp = virXPathString("string(./forward[1]/@mode)", ctxt); if (tmp) { if ((def->forwardType = virNetworkForwardTypeFromString(tmp)) < 0) { - virNetworkReportError(VIR_ERR_INTERNAL_ERROR, + virNetworkReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unknown forwarding type '%s'"), tmp); VIR_FREE(tmp); goto error; diff --git a/src/conf/node_device_conf.c b/src/conf/node_device_conf.c index dde2921..1675631 100644 --- a/src/conf/node_device_conf.c +++ b/src/conf/node_device_conf.c @@ -826,7 +826,7 @@ virNodeDevCapNetParseXML(xmlXPathContextPtr ctxt, int val = virNodeDevNetCapTypeFromString(tmp); VIR_FREE(tmp); if (val < 0) { - virNodeDeviceReportError(VIR_ERR_INTERNAL_ERROR, + virNodeDeviceReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("invalid network type supplied for '%s'"), def->name); goto out; @@ -1076,7 +1076,7 @@ virNodeDevCapsDefParseXML(xmlXPathContextPtr ctxt, } if ((val = virNodeDevCapTypeFromString(tmp)) < 0) { - virNodeDeviceReportError(VIR_ERR_INTERNAL_ERROR, + virNodeDeviceReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unknown capability type '%s'"), tmp); VIR_FREE(tmp); goto error; diff --git a/src/conf/nwfilter_conf.c b/src/conf/nwfilter_conf.c index a32bdb3..d493c77 100644 --- a/src/conf/nwfilter_conf.c +++ b/src/conf/nwfilter_conf.c @@ -1891,7 +1891,7 @@ virNWFilterRuleParse(xmlNodePtr node) } if ((ret->action = virNWFilterRuleActionTypeFromString(action)) < 0) { - virNWFilterReportError(VIR_ERR_INTERNAL_ERROR, + virNWFilterReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("unknown rule action attribute value")); goto err_exit; @@ -1905,7 +1905,7 @@ virNWFilterRuleParse(xmlNodePtr node) } if ((ret->tt = virNWFilterRuleDirectionTypeFromString(direction)) < 0) { - virNWFilterReportError(VIR_ERR_INTERNAL_ERROR, + virNWFilterReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("unknown rule direction attribute value")); goto err_exit; @@ -2004,7 +2004,7 @@ virNWFilterDefParseXML(xmlXPathContextPtr ctxt) { if (chain) { if ((ret->chainsuffix = virNWFilterChainSuffixTypeFromString(chain)) < 0) { - virNWFilterReportError(VIR_ERR_INTERNAL_ERROR, + virNWFilterReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unknown chain suffix '%s'"), chain); goto cleanup; } diff --git a/src/conf/secret_conf.c b/src/conf/secret_conf.c index 105afbe..c8a8b85 100644 --- a/src/conf/secret_conf.c +++ b/src/conf/secret_conf.c @@ -74,7 +74,7 @@ virSecretDefParseUsage(xmlXPathContextPtr ctxt, } type = virSecretUsageTypeTypeFromString(type_str); if (type < 0) { - virSecretReportError(VIR_ERR_XML_ERROR, + virSecretReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unknown secret usage type %s"), type_str); VIR_FREE(type_str); return -1; diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c index ca86f19..5f94c01 100644 --- a/src/conf/storage_conf.c +++ b/src/conf/storage_conf.c @@ -627,7 +627,7 @@ virStoragePoolDefParseXML(xmlXPathContextPtr ctxt) { type = virXPathString("string(./@type)", ctxt); if ((ret->type = virStoragePoolTypeFromString((const char *)type)) < 0) { - virStorageReportError(VIR_ERR_INTERNAL_ERROR, + virStorageReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unknown storage pool type %s"), (const char*)type); goto cleanup; } diff --git a/src/conf/storage_encryption_conf.c b/src/conf/storage_encryption_conf.c index 545efad..0a4d8ba 100644 --- a/src/conf/storage_encryption_conf.c +++ b/src/conf/storage_encryption_conf.c @@ -94,7 +94,7 @@ virStorageEncryptionSecretParse(xmlXPathContextPtr ctxt, } type = virStorageEncryptionSecretTypeTypeFromString(type_str); if (type < 0) { - virStorageReportError(VIR_ERR_XML_ERROR, + virStorageReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unknown volume encryption secret type %s"), type_str); VIR_FREE(type_str); @@ -148,7 +148,7 @@ virStorageEncryptionParseXML(xmlXPathContextPtr ctxt) } format = virStorageEncryptionFormatTypeFromString(format_str); if (format < 0) { - virStorageReportError(VIR_ERR_XML_ERROR, + virStorageReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unknown volume encryption format type %s"), format_str); VIR_FREE(format_str); -- 1.7.5.rc3

2 5

[libvirt] [PATCH] Use virDomainGetState in migration APIs
by Jiri Denemark 19 May '11

19 May '11

We are only interested in domain state so no need to call virDomainGetInfo for that. --- src/libvirt.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/libvirt.c b/src/libvirt.c index ff16c48..3d1b314 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -3513,10 +3513,10 @@ virDomainMigrateVersion1 (virDomainPtr domain, char *uri_out = NULL; char *cookie = NULL; int cookielen = 0, ret; - virDomainInfo info; + int state; - ret = virDomainGetInfo (domain, &info); - if (ret == 0 && info.state == VIR_DOMAIN_PAUSED) { + ret = virDomainGetState(domain, &state, NULL, 0); + if (ret == 0 && state == VIR_DOMAIN_PAUSED) { flags |= VIR_MIGRATE_PAUSED; } @@ -3601,7 +3601,7 @@ virDomainMigrateVersion2 (virDomainPtr domain, char *cookie = NULL; char *dom_xml = NULL; int cookielen = 0, ret; - virDomainInfo info; + int state; virErrorPtr orig_err = NULL; int cancelled; @@ -3632,8 +3632,8 @@ virDomainMigrateVersion2 (virDomainPtr domain, if (!dom_xml) return NULL; - ret = virDomainGetInfo (domain, &info); - if (ret == 0 && info.state == VIR_DOMAIN_PAUSED) { + ret = virDomainGetState(domain, &state, NULL, 0); + if (ret == 0 && state == VIR_DOMAIN_PAUSED) { flags |= VIR_MIGRATE_PAUSED; } @@ -3732,7 +3732,7 @@ virDomainMigrateVersion3(virDomainPtr domain, int cookieinlen = 0; int cookieoutlen = 0; int ret; - virDomainInfo info; + int state; virErrorPtr orig_err = NULL; int cancelled; @@ -3753,8 +3753,8 @@ virDomainMigrateVersion3(virDomainPtr domain, if (!dom_xml) goto done; - ret = virDomainGetInfo (domain, &info); - if (ret == 0 && info.state == VIR_DOMAIN_PAUSED) { + ret = virDomainGetState(domain, &state, NULL, 0); + if (ret == 0 && state == VIR_DOMAIN_PAUSED) { flags |= VIR_MIGRATE_PAUSED; } -- 1.7.5.rc3

2 2

[libvirt] [PATCH] Fix QEMU migration cookie crash for guests with no graphics
by Daniel P. Berrange 19 May '11

19 May '11

When generating a cookie for a guest with no data, the QEMU_MIGRATION_COOKIE_GRAPHICS flag was set even if no graphics data was added. Avoid setting the flag unless it was needed, also add a safety check for mig->graphics being non-NULL * src/qemu/qemu_migration.c: Avoid cookie crash for guest with no graphics --- src/qemu/qemu_migration.c | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index fcf8f9c..4d7bc38 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -252,11 +252,12 @@ qemuMigrationCookieAddGraphics(qemuMigrationCookiePtr mig, if (dom->def->ngraphics == 1 && (dom->def->graphics[0]->type == VIR_DOMAIN_GRAPHICS_TYPE_VNC || - dom->def->graphics[0]->type == VIR_DOMAIN_GRAPHICS_TYPE_SPICE) && - !(mig->graphics = qemuMigrationCookieGraphicsAlloc(driver, dom->def->graphics[0]))) - return -1; - - mig->flags |= QEMU_MIGRATION_COOKIE_GRAPHICS; + dom->def->graphics[0]->type == VIR_DOMAIN_GRAPHICS_TYPE_SPICE)) { + if (!(mig->graphics = + qemuMigrationCookieGraphicsAlloc(driver, dom->def->graphics[0]))) + return -1; + mig->flags |= QEMU_MIGRATION_COOKIE_GRAPHICS; + } return 0; } @@ -295,7 +296,8 @@ static void qemuMigrationCookieXMLFormat(virBufferPtr buf, virBufferEscapeString(buf, " <hostname>%s</hostname>\n", mig->hostname); virBufferAsprintf(buf, " <hostuuid>%s</hostuuid>\n", hostuuidstr); - if (mig->flags & QEMU_MIGRATION_COOKIE_GRAPHICS) + if ((mig->flags & QEMU_MIGRATION_COOKIE_GRAPHICS) && + mig->graphics) qemuMigrationCookieGraphicsXMLFormat(buf, mig->graphics); virBufferAddLit(buf, "</qemu-migration>\n"); -- 1.7.4.4

3 3

[libvirt] [PATCH] Blank out the 'listenAddr' parameter if empty string
by Daniel P. Berrange 19 May '11

19 May '11

Some bogus apps are generating a VNC/SPICE/RFB listen attribute with no content. This then causes a failure with the graphics migration cookie parsing. Blank out the 'listenAddr' parameter after parsing domain XML if it is the empty string, so the host default takes over * src/qemu/qemu_migration.c: Blank out listenAddr parameter if empty --- src/conf/domain_conf.c | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 03f4dc9..15fe9f0 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -3906,6 +3906,10 @@ virDomainGraphicsDefParseXML(xmlNodePtr node, int flags) { def->data.vnc.socket = virXMLPropString(node, "socket"); def->data.vnc.keymap = virXMLPropString(node, "keymap"); + if (def->data.vnc.listenAddr && + STREQ(def->data.vnc.listenAddr, "")) + VIR_FREE(def->data.vnc.listenAddr); + if (virDomainGraphicsAuthDefParseXML(node, &def->data.vnc.auth) < 0) goto error; } else if (def->type == VIR_DOMAIN_GRAPHICS_TYPE_SDL) { @@ -3970,6 +3974,10 @@ virDomainGraphicsDefParseXML(xmlNodePtr node, int flags) { } def->data.rdp.listenAddr = virXMLPropString(node, "listen"); + + if (def->data.rdp.listenAddr && + STREQ(def->data.rdp.listenAddr, "")) + VIR_FREE(def->data.rdp.listenAddr); } else if (def->type == VIR_DOMAIN_GRAPHICS_TYPE_DESKTOP) { char *fullscreen = virXMLPropString(node, "fullscreen"); @@ -4033,6 +4041,11 @@ virDomainGraphicsDefParseXML(xmlNodePtr node, int flags) { def->data.spice.listenAddr = virXMLPropString(node, "listen"); def->data.spice.keymap = virXMLPropString(node, "keymap"); + + if (def->data.spice.listenAddr && + STREQ(def->data.spice.listenAddr, "")) + VIR_FREE(def->data.spice.listenAddr); + if (virDomainGraphicsAuthDefParseXML(node, &def->data.spice.auth) < 0) goto error; -- 1.7.4.4

3 3

[libvirt] why is network i/o always zero?
by 黄亮 19 May '11

19 May '11

hi all I'm using Xen on CentOS.I wanna monitor the network activity of a domain. When I use Domain.InterfaceStats( ... ), which is the C# binding of virDomainInterfaceStats, it returns -1. I wonder if the function is not supported by Xen. So I using "domifstat", and I get vif1.0 rx_bytes 0 vif1.0 rx_packets 0 vif1.0 rx_errs 0 vif1.0 rx_drop 0 vif1.0 tx_bytes 0 vif1.0 tx_packets 0 vif1.0 tx_errs 0 vif1.0 tx_drop 0 but it never change even when I use that domain to ping another. virsh version: Compiled against library: libvir 0.8.4 Using library: libvir 0.8.4 Using API: Xen 3.0.1 Running hypervisor: Xen 3.3.0 My question is, is Xen not support virDomainInterfaceStats or is somewhere I've gone wrong, that I can't get the network i/o statistics? Thank you ! 2011-05-11 黄亮

2 2

[libvirt] [PATCH] Don't generate cookies with v2 migration protocol.
by Daniel P. Berrange 18 May '11

18 May '11

The v2 migration protocol had a limit on cookie length that was too small to be useful for QEMU. Avoid generating cookies with v2 protocol, so that old libvirtd can still reliably migrate a guest to new libvirtd uses v2 protocol. * src/qemu/qemu_driver.c: Avoid migration cookies with v2 migration --- src/qemu/qemu_driver.c | 27 ++++++++++++++++++++------- 1 files changed, 20 insertions(+), 7 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 2f9c8e7..44acc6a 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -5867,8 +5867,8 @@ cleanup: */ static int ATTRIBUTE_NONNULL (5) qemudDomainMigratePrepare2 (virConnectPtr dconn, - char **cookie, - int *cookielen, + char **cookie ATTRIBUTE_UNUSED, + int *cookielen ATTRIBUTE_UNUSED, const char *uri_in, char **uri_out, unsigned long flags, @@ -5906,9 +5906,12 @@ qemudDomainMigratePrepare2 (virConnectPtr dconn, goto cleanup; } + /* Do not use cookies in v2 protocol, since the cookie + * length was not sufficiently large, causing failures + * migrating between old & new libvirtd + */ ret = qemuMigrationPrepareDirect(driver, dconn, - NULL, 0, /* No input cookies in v2 */ - cookie, cookielen, + NULL, 0, NULL, NULL, /* No cookies */ uri_in, uri_out, dname, dom_xml); @@ -5921,8 +5924,8 @@ cleanup: /* Perform is the second step, and it runs on the source host. */ static int qemudDomainMigratePerform (virDomainPtr dom, - const char *cookie ATTRIBUTE_UNUSED, - int cookielen ATTRIBUTE_UNUSED, + const char *cookie, + int cookielen, const char *uri, unsigned long flags, const char *dname, @@ -5951,6 +5954,12 @@ qemudDomainMigratePerform (virDomainPtr dom, goto cleanup; } + /* Do not output cookies in v2 protocol, since the cookie + * length was not sufficiently large, causing failures + * migrating between old & new libvirtd. + * + * Consume any cookie we were able to decode though + */ ret = qemuMigrationPerform(driver, dom->conn, vm, uri, cookie, cookielen, NULL, NULL, /* No output cookies in v2 */ @@ -5997,8 +6006,12 @@ qemudDomainMigrateFinish2 (virConnectPtr dconn, goto cleanup; } + /* Do not use cookies in v2 protocol, since the cookie + * length was not sufficiently large, causing failures + * migrating between old & new libvirtd + */ dom = qemuMigrationFinish(driver, dconn, vm, - NULL, 0, NULL, NULL, /* No cookies in v2 */ + NULL, 0, NULL, NULL, /* No cookies */ flags, retcode); cleanup: -- 1.7.4.4

2 2

[libvirt] inquiry, get native capabilities of the host
by Dong-In David Kang 18 May '11

18 May '11

Hello, I'm interested in getting native capabilities of host CPU using libvirt. I've looked at .../src/cpu/cpu_map.xml. And it does describe native capabilities of host CPU very well. But, libvirt always returns a subset of the native capabilities which is far different from the feature lists in the xml file. (I'm testing with <model name='Westmere'>.) The sponsor of my project is interested is high-performance computing. And knowing native feature of the host CPU that can also be available to a virtual machine is very important for performance reason. I couldn't find how to get the native features of the host that is described in .../src/cpu/cpu_map.xml. Is there a way or libvirt API to get the native capabilities of host CPU that is well described in .../src/cpu/cpu_map.xml? Thanks, David.

3 5

[libvirt] [PATCH] Ensure p2p and direct migration use the new v3 protocol if available
by Daniel P. Berrange 18 May '11

18 May '11

The internal virDomainMigratePeer2Peer and virDomainMigrateDirect helper methods were not checking whether the target supports the v3 migration protocol. * src/libvirt.c: Use v3 migration protocol for p2p/direct migration if available. --- src/libvirt.c | 60 +++++++++++++++++++++++++++++++++++++++++++------------- 1 files changed, 46 insertions(+), 14 deletions(-) diff --git a/src/libvirt.c b/src/libvirt.c index 0542c35..ff16c48 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -3903,13 +3903,28 @@ virDomainMigratePeer2Peer (virDomainPtr domain, /* Perform the migration. The driver isn't supposed to return * until the migration is complete. */ - return domain->conn->driver->domainMigratePerform(domain, - NULL, /* cookie */ - 0, /* cookielen */ - uri, - flags, - dname, - bandwidth); + if (VIR_DRV_SUPPORTS_FEATURE(domain->conn->driver, domain->conn, + VIR_DRV_FEATURE_MIGRATION_V3)) { + VIR_DEBUG("Using migration protocol 3"); + return domain->conn->driver->domainMigratePerform3(domain, + NULL, /* cookiein */ + 0, /* cookieinlen */ + NULL, /* cookieoutlen */ + NULL, /* cookieoutlen */ + uri, + flags, + dname, + bandwidth); + } else { + VIR_DEBUG("Using migration protocol 2"); + return domain->conn->driver->domainMigratePerform(domain, + NULL, /* cookie */ + 0, /* cookielen */ + uri, + flags, + dname, + bandwidth); + } } @@ -3940,13 +3955,28 @@ virDomainMigrateDirect (virDomainPtr domain, /* Perform the migration. The driver isn't supposed to return * until the migration is complete. */ - return domain->conn->driver->domainMigratePerform(domain, - NULL, /* cookie */ - 0, /* cookielen */ - uri, - flags, - dname, - bandwidth); + if (VIR_DRV_SUPPORTS_FEATURE(domain->conn->driver, domain->conn, + VIR_DRV_FEATURE_MIGRATION_V3)) { + VIR_DEBUG("Using migration protocol 3"); + return domain->conn->driver->domainMigratePerform3(domain, + NULL, /* cookiein */ + 0, /* cookieinlen */ + NULL, /* cookieoutlen */ + NULL, /* cookieoutlen */ + uri, + flags, + dname, + bandwidth); + } else { + VIR_DEBUG("Using migration protocol 2"); + return domain->conn->driver->domainMigratePerform(domain, + NULL, /* cookie */ + 0, /* cookielen */ + uri, + flags, + dname, + bandwidth); + } } @@ -4207,6 +4237,7 @@ virDomainMigrateToURI (virDomainPtr domain, if (flags & VIR_MIGRATE_PEER2PEER) { if (VIR_DRV_SUPPORTS_FEATURE (domain->conn->driver, domain->conn, VIR_DRV_FEATURE_MIGRATION_P2P)) { + VIR_DEBUG("Using peer2peer migration"); if (virDomainMigratePeer2Peer (domain, flags, dname, duri, bandwidth) < 0) goto error; } else { @@ -4217,6 +4248,7 @@ virDomainMigrateToURI (virDomainPtr domain, } else { if (VIR_DRV_SUPPORTS_FEATURE (domain->conn->driver, domain->conn, VIR_DRV_FEATURE_MIGRATION_DIRECT)) { + VIR_DEBUG("Using direct migration"); if (virDomainMigrateDirect (domain, flags, dname, duri, bandwidth) < 0) goto error; } else { -- 1.7.4.4

2 1

[libvirt] [PATCH 0/7] round out persistent cpu.shares patches
by Eric Blake 18 May '11

18 May '11

When I pushed Hu's patch series this morning, I pointed out that it was incomplete. This should fill in the gaps. Eric Blake (7): libvirt.h: consolidate typed parameter handling remote: consolidate typed parameter handling sched: introduce virDomainGetSchedulerParametersFlags qemu: introduce qemuGetSchedulerParametersFlags remote: introduce remoteGetSchedulerParametersFlags virsh: improve schedinfo querying ability sched: provide new API shims for remaining drivers daemon/remote.c | 549 +++++++++++++++++------------------------- include/libvirt/libvirt.h.in | 152 +++++++----- python/generator.py | 13 + src/driver.h | 8 + src/esx/esx_driver.c | 28 ++- src/libvirt.c | 84 ++++++- src/libvirt_public.syms | 1 + src/libxl/libxl_driver.c | 32 +++- src/lxc/lxc_driver.c | 34 +++- src/qemu/qemu_driver.c | 77 +++++- src/remote/remote_driver.c | 513 ++++++++++++++++----------------------- src/remote/remote_protocol.x | 87 +++----- src/remote_protocol-structs | 63 ++--- src/test/test_driver.c | 37 +++- src/xen/xen_driver.c | 36 +++- tools/virsh.c | 32 ++- 16 files changed, 900 insertions(+), 846 deletions(-) -- 1.7.4.4

5 18

[libvirt] [PATCH 0/6] Clarify semantic of virDomain(G|S)et*Parameters functions
by Matthias Bolte 18 May '11

18 May '11

This series was inspired by the discusion about invalid argument checking in the public API and the unclear semantic of this functions. https://www.redhat.com/archives/libvir-list/2011-May/msg01105.html Clarify that the getter functions don't allow to obtain a subset of the parameters. You can only get all at once. Clarify that the setter functions can set a subset of the parameters. Matthias

3 12

[libvirt] [PATCH] Improve invalid argument checks for the public API
by Matthias Bolte 18 May '11

18 May '11

--- src/libvirt.c | 100 +++++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 94 insertions(+), 6 deletions(-) diff --git a/src/libvirt.c b/src/libvirt.c index 787908e..87391c6 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -1390,7 +1390,7 @@ int virConnectRef(virConnectPtr conn) { if ((!VIR_IS_CONNECT(conn))) { - virLibConnError(VIR_ERR_INVALID_ARG, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_CONN, __FUNCTION__); virDispatchError(NULL); return -1; } @@ -4487,7 +4487,6 @@ virDomainMigratePrepareTunnel(virConnectPtr conn, const char *dname, unsigned long bandwidth, const char *dom_xml) - { VIR_DEBUG("conn=%p, stream=%p, flags=%lu, dname=%s, " "bandwidth=%lu, dom_xml=%s", conn, st, flags, @@ -4994,6 +4993,12 @@ virDomainGetSchedulerType(virDomainPtr domain, int *nparams) virDispatchError(NULL); return NULL; } + + if (nparams == NULL) { + virLibDomainError(VIR_ERR_INVALID_ARG, __FUNCTION__); + goto error; + } + conn = domain->conn; if (conn->driver->domainGetSchedulerType){ @@ -5040,6 +5045,12 @@ virDomainGetSchedulerParameters(virDomainPtr domain, virDispatchError(NULL); return -1; } + + if (params == NULL || nparams == NULL) { + virLibDomainError(VIR_ERR_INVALID_ARG, __FUNCTION__); + goto error; + } + conn = domain->conn; if (conn->driver->domainGetSchedulerParameters) { @@ -5084,6 +5095,12 @@ virDomainSetSchedulerParameters(virDomainPtr domain, virDispatchError(NULL); return -1; } + + if (params == NULL) { + virLibDomainError(VIR_ERR_INVALID_ARG, __FUNCTION__); + goto error; + } + if (domain->conn->flags & VIR_CONNECT_RO) { virLibDomainError(VIR_ERR_OPERATION_DENIED, __FUNCTION__); goto error; @@ -5534,7 +5551,7 @@ virDomainGetBlockInfo(virDomainPtr domain, const char *path, virDomainBlockInfoP virDispatchError(NULL); return -1; } - if (info == NULL) { + if (path == NULL || info == NULL) { virLibDomainError(VIR_ERR_INVALID_ARG, __FUNCTION__); goto error; } @@ -6440,6 +6457,12 @@ virDomainAttachDevice(virDomainPtr domain, const char *xml) virDispatchError(NULL); return -1; } + + if (xml == NULL) { + virLibDomainError(VIR_ERR_INVALID_ARG, __FUNCTION__); + goto error; + } + if (domain->conn->flags & VIR_CONNECT_RO) { virLibDomainError(VIR_ERR_OPERATION_DENIED, __FUNCTION__); goto error; @@ -6500,6 +6523,12 @@ virDomainAttachDeviceFlags(virDomainPtr domain, virDispatchError(NULL); return -1; } + + if (xml == NULL) { + virLibDomainError(VIR_ERR_INVALID_ARG, __FUNCTION__); + goto error; + } + if (domain->conn->flags & VIR_CONNECT_RO) { virLibDomainError(VIR_ERR_OPERATION_DENIED, __FUNCTION__); goto error; @@ -6545,6 +6574,12 @@ virDomainDetachDevice(virDomainPtr domain, const char *xml) virDispatchError(NULL); return -1; } + + if (xml == NULL) { + virLibDomainError(VIR_ERR_INVALID_ARG, __FUNCTION__); + goto error; + } + if (domain->conn->flags & VIR_CONNECT_RO) { virLibDomainError(VIR_ERR_OPERATION_DENIED, __FUNCTION__); goto error; @@ -6601,6 +6636,12 @@ virDomainDetachDeviceFlags(virDomainPtr domain, virDispatchError(NULL); return -1; } + + if (xml == NULL) { + virLibDomainError(VIR_ERR_INVALID_ARG, __FUNCTION__); + goto error; + } + if (domain->conn->flags & VIR_CONNECT_RO) { virLibDomainError(VIR_ERR_OPERATION_DENIED, __FUNCTION__); goto error; @@ -6661,6 +6702,12 @@ virDomainUpdateDeviceFlags(virDomainPtr domain, virDispatchError(NULL); return -1; } + + if (xml == NULL) { + virLibDomainError(VIR_ERR_INVALID_ARG, __FUNCTION__); + goto error; + } + if (domain->conn->flags & VIR_CONNECT_RO) { virLibDomainError(VIR_ERR_OPERATION_DENIED, __FUNCTION__); goto error; @@ -7321,7 +7368,7 @@ int virNetworkRef(virNetworkPtr network) { if ((!VIR_IS_CONNECTED_NETWORK(network))) { - virLibConnError(VIR_ERR_INVALID_ARG, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_NETWORK, __FUNCTION__); virDispatchError(NULL); return -1; } @@ -8187,7 +8234,7 @@ int virInterfaceRef(virInterfacePtr iface) { if ((!VIR_IS_CONNECTED_INTERFACE(iface))) { - virLibConnError(VIR_ERR_INVALID_ARG, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_INTERFACE, __FUNCTION__); virDispatchError(NULL); return -1; } @@ -8630,7 +8677,7 @@ virStoragePoolLookupByVolume(virStorageVolPtr vol) virResetLastError(); if (!VIR_IS_CONNECTED_STORAGE_VOL(vol)) { - virLibConnError(VIR_ERR_INVALID_CONN, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_STORAGE_VOL, __FUNCTION__); virDispatchError(NULL); return NULL; } @@ -9702,6 +9749,11 @@ virStorageVolCreateXML(virStoragePoolPtr pool, return NULL; } + if (xmldesc == NULL) { + virLibConnError(VIR_ERR_INVALID_ARG, __FUNCTION__); + goto error; + } + if (pool->conn->flags & VIR_CONNECT_RO) { virLibConnError(VIR_ERR_OPERATION_DENIED, __FUNCTION__); goto error; @@ -9758,6 +9810,11 @@ virStorageVolCreateXMLFrom(virStoragePoolPtr pool, goto error; } + if (xmldesc == NULL) { + virLibConnError(VIR_ERR_INVALID_ARG, __FUNCTION__); + goto error; + } + if (pool->conn->flags & VIR_CONNECT_RO || clonevol->conn->flags & VIR_CONNECT_RO) { virLibConnError(VIR_ERR_OPERATION_DENIED, __FUNCTION__); @@ -10508,6 +10565,11 @@ int virNodeDeviceListCaps(virNodeDevicePtr dev, return -1; } + if (names == NULL || maxnames < 0) { + virLibNodeDeviceError(VIR_ERR_INVALID_ARG, __FUNCTION__); + goto error; + } + if (dev->conn->deviceMonitor && dev->conn->deviceMonitor->deviceListCaps) { int ret; ret = dev->conn->deviceMonitor->deviceListCaps (dev, names, maxnames); @@ -11764,6 +11826,11 @@ int virStreamSend(virStreamPtr stream, return -1; } + if (data == NULL) { + virLibConnError(VIR_ERR_INVALID_ARG, __FUNCTION__); + goto error; + } + if (stream->driver && stream->driver->streamSend) { int ret; @@ -11859,6 +11926,11 @@ int virStreamRecv(virStreamPtr stream, return -1; } + if (data == NULL) { + virLibConnError(VIR_ERR_INVALID_ARG, __FUNCTION__); + goto error; + } + if (stream->driver && stream->driver->streamRecv) { int ret; @@ -11935,6 +12007,11 @@ int virStreamSendAll(virStreamPtr stream, return -1; } + if (handler == NULL) { + virLibConnError(VIR_ERR_INVALID_ARG, __FUNCTION__); + goto cleanup; + } + if (stream->flags & VIR_STREAM_NONBLOCK) { virLibConnError(VIR_ERR_OPERATION_INVALID, _("data sources cannot be used for non-blocking streams")); @@ -12032,6 +12109,11 @@ int virStreamRecvAll(virStreamPtr stream, return -1; } + if (handler == NULL) { + virLibConnError(VIR_ERR_INVALID_ARG, __FUNCTION__); + goto cleanup; + } + if (stream->flags & VIR_STREAM_NONBLOCK) { virLibConnError(VIR_ERR_OPERATION_INVALID, _("data sinks cannot be used for non-blocking streams")); @@ -13746,6 +13828,12 @@ virDomainSnapshotCreateXML(virDomainPtr domain, } conn = domain->conn; + + if (xmlDesc == NULL) { + virLibDomainError(VIR_ERR_INVALID_ARG, __FUNCTION__); + goto error; + } + if (conn->flags & VIR_CONNECT_RO) { virLibConnError(VIR_ERR_OPERATION_DENIED, __FUNCTION__); goto error; -- 1.7.0.4

3 8

[libvirt] [PATCH] Fix messages using VIR_ERR_XML_ERROR
by Cole Robinson 18 May '11

18 May '11

This error code has existed since the dawn of time, yet the messages it generates are almost universally busted. Here's a small sampling: src/conf/domain_conf.c:4889 : XML description for missing root element is not well formed or invalid src/conf/domain_conf.c:4951 : XML description for unknown device type is not well formed or invalid src/conf/domain_conf.c:5460 : XML description for maximum vcpus must be an integer is not well formed or invalid src/conf/domain_conf.c:5468 : XML description for invalid maxvcpus %(count)lu is not well formed or invalid Fix up the error code to instead be XML error: <msg> Adjust the few locations that we using the original correctly (or shouldn't have been using the error code at all). Signed-off-by: Cole Robinson <crobinso(a)redhat.com> --- src/test/test_driver.c | 21 ++++++++++++++------- src/util/virterror.c | 4 ++-- src/xen/xm_internal.c | 5 +++-- 3 files changed, 19 insertions(+), 11 deletions(-) diff --git a/src/test/test_driver.c b/src/test/test_driver.c index 119b027..a9b306e 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -811,7 +811,8 @@ static int testOpenFromFile(virConnectPtr conn, if (ret == 0) { nodeInfo->nodes = l; } else if (ret == -2) { - testError(VIR_ERR_XML_ERROR, "%s", _("node cpu numa nodes")); + testError(VIR_ERR_XML_ERROR, "%s", + _("invalid node cpu nodes value")); goto error; } @@ -819,7 +820,8 @@ static int testOpenFromFile(virConnectPtr conn, if (ret == 0) { nodeInfo->sockets = l; } else if (ret == -2) { - testError(VIR_ERR_XML_ERROR, "%s", _("node cpu sockets")); + testError(VIR_ERR_XML_ERROR, "%s", + _("invalid node cpu sockets value")); goto error; } @@ -827,7 +829,8 @@ static int testOpenFromFile(virConnectPtr conn, if (ret == 0) { nodeInfo->cores = l; } else if (ret == -2) { - testError(VIR_ERR_XML_ERROR, "%s", _("node cpu cores")); + testError(VIR_ERR_XML_ERROR, "%s", + _("invalid node cpu cores value")); goto error; } @@ -835,7 +838,8 @@ static int testOpenFromFile(virConnectPtr conn, if (ret == 0) { nodeInfo->threads = l; } else if (ret == -2) { - testError(VIR_ERR_XML_ERROR, "%s", _("node cpu threads")); + testError(VIR_ERR_XML_ERROR, "%s", + _("invalid node cpu threads value")); goto error; } @@ -846,14 +850,16 @@ static int testOpenFromFile(virConnectPtr conn, nodeInfo->cpus = l; } } else if (ret == -2) { - testError(VIR_ERR_XML_ERROR, "%s", _("node active cpu")); + testError(VIR_ERR_XML_ERROR, "%s", + _("invalid node cpu active value")); goto error; } ret = virXPathLong("string(/node/cpu/mhz[1])", ctxt, &l); if (ret == 0) { nodeInfo->mhz = l; } else if (ret == -2) { - testError(VIR_ERR_XML_ERROR, "%s", _("node cpu mhz")); + testError(VIR_ERR_XML_ERROR, "%s", + _("invalid node cpu mhz value")); goto error; } @@ -872,7 +878,8 @@ static int testOpenFromFile(virConnectPtr conn, if (ret == 0) { nodeInfo->memory = l; } else if (ret == -2) { - testError(VIR_ERR_XML_ERROR, "%s", _("node memory")); + testError(VIR_ERR_XML_ERROR, "%s", + _("invalid node memory value")); goto error; } diff --git a/src/util/virterror.c b/src/util/virterror.c index fbb4a45..881a7dc 100644 --- a/src/util/virterror.c +++ b/src/util/virterror.c @@ -925,9 +925,9 @@ virErrorMsg(virErrorNumber error, const char *info) break; case VIR_ERR_XML_ERROR: if (info == NULL) - errmsg = _("XML description not well formed or invalid"); + errmsg = _("XML description is not well formed or invalid"); else - errmsg = _("XML description for %s is not well formed or invalid"); + errmsg = _("XML error: %s"); break; case VIR_ERR_DOM_EXIST: if (info == NULL) diff --git a/src/xen/xm_internal.c b/src/xen/xm_internal.c index 69e14c3..d0035c9 100644 --- a/src/xen/xm_internal.c +++ b/src/xen/xm_internal.c @@ -1515,8 +1515,9 @@ xenXMDomainDetachDeviceFlags(virDomainPtr domain, const char *xml, break; } default: - xenXMError(VIR_ERR_XML_ERROR, - "%s", _("unknown device")); + xenXMError(VIR_ERR_CONFIG_UNSUPPORTED, + _("device type '%s' cannot be detached"), + virDomainDeviceTypeToString(dev->type)); goto cleanup; } -- 1.7.4.4

3 5

[libvirt] Trying to re-compile libvirt package on Ubuntu Lucid
by Lars Nordin 18 May '11

18 May '11

I'm trying to rebuild Ubuntu's libvirt packages to turn on ESX support. I've downloaded the Ubuntu source package for Lucid (updated Lucid package) dget -u http://archive.ubuntu.com/ubuntu/pool/main/libv/libvirt/libvirt_0.7.5-5ubun… I try and re-compile dpkg-buildpackage -rfakeroot -b DEB_BUILD_OPTIONS="--with-esx" fakeroot debian/rules binary and I get this error, when the unit tests are run: ... testing with corrupted config: log_level Skipping test (due to Ubuntu buildd FTBFS): running libvirtd with a valid config file (2 seconds) FAIL: daemon-conf PASS: define-dev-segfault ... ==================== 1 of 37 tests failed ==================== make[4]: *** [check-TESTS] Error 1 make[4]: Leaving directory `/exp/h1/staff/lnordin/libvirt-pkg/libvirt-0.7.5/tests' make[3]: *** [check-am] Error 2 make[3]: Leaving directory `/exp/h1/staff/lnordin/libvirt-pkg/libvirt-0.7.5/tests' make[2]: *** [check-recursive] Error 1 make[2]: Leaving directory `/exp/h1/staff/lnordin/libvirt-pkg/libvirt-0.7.5/tests' make[1]: *** [check-recursive] Error 1 make[1]: Leaving directory `/exp/h1/staff/lnordin/libvirt-pkg/libvirt-0.7.5' make: *** [debian/stamp-makefile-check] Error 2 Anyone gone through this exercise before and would know how to get the packages re-built?

2 1

[libvirt] [PATCH] qemu: fix typo in spice migration code
by Michal Privoznik 18 May '11

18 May '11

This typo caused XPath returning improper value and thus not working spice after migration. --- src/qemu/qemu_migration.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index cb408ac..fcf8f9c 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -355,7 +355,7 @@ qemuMigrationCookieGraphicsXMLParse(xmlXPathContextPtr ctxt) goto error; } /* Optional */ - grap->tlsSubject = virXPathString("string(./graphics/cert[ info='subject']/@value)", ctxt); + grap->tlsSubject = virXPathString("string(./graphics/cert[@info='subject']/@value)", ctxt); return grap; -- 1.7.5.rc3

3 2

[libvirt] [PATCH 9/9] add DHCP snooping support to nwfilter
by David L Stevens 18 May '11

18 May '11

This patch removes remaining pieces of IP address learning. diff --git a/src/Makefile.am b/src/Makefile.am index 3da0797..53cdc00 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -389,9 +389,7 @@ NWFILTER_DRIVER_SOURCES = \ nwfilter/nwfilter_dhcpsnoop.c \ nwfilter/nwfilter_dhcpsnoop.h \ nwfilter/nwfilter_ebiptables_driver.c \ - nwfilter/nwfilter_ebiptables_driver.h \ - nwfilter/nwfilter_learnipaddr.c \ - nwfilter/nwfilter_learnipaddr.h + nwfilter/nwfilter_ebiptables_driver.h # Security framework and drivers for various models diff --git a/src/nwfilter/nwfilter_driver.c b/src/nwfilter/nwfilter_driver.c index 2e20e59..3a73fa4 100644 --- a/src/nwfilter/nwfilter_driver.c +++ b/src/nwfilter/nwfilter_driver.c @@ -40,7 +40,6 @@ #include "configmake.h" #include "nwfilter_dhcpsnoop.h" -#include "nwfilter_learnipaddr.h" #define VIR_FROM_THIS VIR_FROM_NWFILTER @@ -69,8 +68,6 @@ nwfilterDriverStartup(int privileged) { if (virNWFilterDHCPSnoopInit() < 0) return -1; - if (virNWFilterLearnInit() < 0) - return -1; virNWFilterTechDriversInit(privileged); @@ -131,7 +128,6 @@ alloc_err_exit: conf_init_err: virNWFilterTechDriversShutdown(); virNWFilterDHCPSnoopEnd(0); - virNWFilterLearnShutdown(); return -1; } @@ -154,7 +150,7 @@ nwfilterDriverReload(void) { if (conn) { /* shut down all threads -- they will be restarted if necessary */ - virNWFilterLearnThreadsTerminate(true); + virNWFilterDHCPSnoopEnd(0); nwfilterDriverLock(driverState); virNWFilterCallbackDriversLock(); @@ -206,7 +202,6 @@ nwfilterDriverShutdown(void) { virNWFilterConfLayerShutdown(); virNWFilterTechDriversShutdown(); virNWFilterDHCPSnoopEnd(0); - virNWFilterLearnShutdown(); nwfilterDriverLock(driverState); diff --git a/src/nwfilter/nwfilter_gentech_driver.c b/src/nwfilter/nwfilter_gentech_driver.c index c6e6600..42fd965 100644 --- a/src/nwfilter/nwfilter_gentech_driver.c +++ b/src/nwfilter/nwfilter_gentech_driver.c @@ -34,7 +34,6 @@ #include "nwfilter_gentech_driver.h" #include "nwfilter_ebiptables_driver.h" #include "nwfilter_dhcpsnoop.h" -#include "nwfilter_learnipaddr.h" #define VIR_FROM_THIS VIR_FROM_NWFILTER @@ -625,14 +624,10 @@ virNWFilterChangeVar(virConnectPtr conn, return 1; } - if (virNWFilterLockIface(ifname)) - goto err_exit; - if (delete) rc = techdriver->removeRules(conn, ifname, nptrs, ptrs); else rc = techdriver->addRules(conn, ifname, nptrs, ptrs); - virNWFilterUnlockIface(ifname); VIR_FREE(ptrs); err_exit: @@ -755,9 +750,6 @@ virNWFilterInstantiate(virConnectPtr conn, if (rc) goto err_exit; - if (virNWFilterLockIface(ifname)) - goto err_exit; - rc = techdriver->applyNewRules(conn, ifname, nptrs, ptrs); if (teardownOld && rc == 0) @@ -768,8 +760,6 @@ virNWFilterInstantiate(virConnectPtr conn, techdriver->allTeardown(ifname); rc = 1; } - - virNWFilterUnlockIface(ifname); } err_exit: @@ -811,7 +801,6 @@ __virNWFilterInstantiateFilter(virConnectPtr conn, virNWFilterDefPtr filter; char vmmacaddr[VIR_MAC_STRING_BUFLEN] = {0}; char *str_macaddr = NULL; - const char *ipaddr; char *str_ipaddr = NULL; techdriver = virNWFilterTechDriverForName(drvname); @@ -850,16 +839,6 @@ __virNWFilterInstantiateFilter(virConnectPtr conn, goto err_exit; } - ipaddr = virNWFilterGetIpAddrForIfname(ifname); - if (ipaddr) { - str_ipaddr = strdup(ipaddr); - if (!str_ipaddr) { - virReportOOMError(); - rc = 1; - goto err_exit; - } - } - vars1 = virNWFilterCreateVarHashmap(str_macaddr, str_ipaddr); if (!vars1) { rc = 1; @@ -1031,7 +1010,6 @@ int virNWFilterRollbackUpdateFilter(virConnectPtr conn, const virDomainNetDefPtr net) { const char *drvname = EBIPTABLES_DRIVER_ID; - int ifindex; virNWFilterTechDriverPtr techdriver; techdriver = virNWFilterTechDriverForName(drvname); @@ -1043,11 +1021,6 @@ int virNWFilterRollbackUpdateFilter(virConnectPtr conn, return 1; } - /* don't tear anything while the address is being learned */ - if (ifaceGetIndex(true, net->ifname, &ifindex) == 0 && - virNWFilterLookupLearnReq(ifindex) != NULL) - return 0; - return techdriver->tearNewRules(conn, net->ifname); } @@ -1057,7 +1030,6 @@ virNWFilterTearOldFilter(virConnectPtr conn, virDomainNetDefPtr net) { const char *drvname = EBIPTABLES_DRIVER_ID; - int ifindex; virNWFilterTechDriverPtr techdriver; techdriver = virNWFilterTechDriverForName(drvname); @@ -1069,11 +1041,6 @@ virNWFilterTearOldFilter(virConnectPtr conn, return 1; } - /* don't tear anything while the address is being learned */ - if (ifaceGetIndex(true, net->ifname, &ifindex) == 0 && - virNWFilterLookupLearnReq(ifindex) != NULL) - return 0; - return techdriver->tearOldRules(conn, net->ifname); } @@ -1095,17 +1062,8 @@ _virNWFilterTeardownFilter(const char *ifname) virNWFilterDHCPSnoopEnd(ifname); - virNWFilterTerminateLearnReq(ifname); - - if (virNWFilterLockIface(ifname)) - return 1; - techdriver->allTeardown(ifname); - virNWFilterDelIpAddrForIfname(ifname); - - virNWFilterUnlockIface(ifname); - return 0; } diff --git a/src/nwfilter/nwfilter_learnipaddr.c b/src/nwfilter/nwfilter_learnipaddr.c deleted file mode 100644 index 96d2a55..0000000 --- a/src/nwfilter/nwfilter_learnipaddr.c +++ /dev/null @@ -1,891 +0,0 @@ -/* - * nwfilter_learnipaddr.c: support for learning IP address used by a VM - * on an interface - * - * Copyright (C) 2011 Red Hat, Inc. - * Copyright (C) 2010 IBM Corp. - * Copyright (C) 2010 Stefan Berger - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * Author: Stefan Berger <stefanb(a)us.ibm.com> - */ - -#include <config.h> - -#ifdef HAVE_LIBPCAP -# include <pcap.h> -#endif - -#include <fcntl.h> -#include <sys/ioctl.h> - -#include <arpa/inet.h> -#include <net/ethernet.h> -#include <netinet/ip.h> -#include <netinet/udp.h> -#include <net/if_arp.h> -#include <intprops.h> - -#include "internal.h" - -#include "buf.h" -#include "memory.h" -#include "logging.h" -#include "datatypes.h" -#include "interface.h" -#include "virterror_internal.h" -#include "threads.h" -#include "conf/nwfilter_params.h" -#include "conf/domain_conf.h" -#include "nwfilter_gentech_driver.h" -#include "nwfilter_ebiptables_driver.h" -#include "nwfilter_learnipaddr.h" - -#define VIR_FROM_THIS VIR_FROM_NWFILTER - -#define IFINDEX2STR(VARNAME, ifindex) \ - char VARNAME[INT_BUFSIZE_BOUND(ifindex)]; \ - snprintf(VARNAME, sizeof(VARNAME), "%d", ifindex); - -#define PKT_TIMEOUT_MS 500 /* ms */ - -/* structure of an ARP request/reply message */ -struct f_arphdr { - struct arphdr arphdr; - uint8_t ar_sha[ETH_ALEN]; - uint32_t ar_sip; - uint8_t ar_tha[ETH_ALEN]; - uint32_t ar_tip; -} ATTRIBUTE_PACKED; - - -struct dhcp_option { - uint8_t code; - uint8_t len; - uint8_t value[0]; /* length varies */ -} ATTRIBUTE_PACKED; - - -/* structure representing DHCP message */ -struct dhcp { - uint8_t op; - uint8_t htype; - uint8_t hlen; - uint8_t hops; - uint32_t xid; - uint16_t secs; - uint16_t flags; - uint32_t ciaddr; - uint32_t yiaddr; - uint32_t siaddr; - uint32_t giaddr; - uint8_t chaddr[16]; - uint8_t zeroes[192]; - uint32_t magic; - struct dhcp_option options[0]; -} ATTRIBUTE_PACKED; - -#define DHCP_MSGT_DHCPOFFER 2 -#define DHCP_MSGT_DHCPACK 5 - - -#define DHCP_OPT_BCASTADDRESS 28 -#define DHCP_OPT_MESSAGETYPE 53 - -struct ether_vlan_header -{ - uint8_t dhost[ETH_ALEN]; - uint8_t shost[ETH_ALEN]; - uint16_t vlan_type; - uint16_t vlan_flags; - uint16_t ether_type; -} ATTRIBUTE_PACKED; - - -static virMutex pendingLearnReqLock; -static virHashTablePtr pendingLearnReq; - -static virMutex ipAddressMapLock; -static virNWFilterHashTablePtr ipAddressMap; - -static virMutex ifaceMapLock; -static virHashTablePtr ifaceLockMap; - -typedef struct _virNWFilterIfaceLock virNWFilterIfaceLock; -typedef virNWFilterIfaceLock *virNWFilterIfaceLockPtr; -struct _virNWFilterIfaceLock { - char ifname[IF_NAMESIZE]; - virMutex lock; - int refctr; -}; - - -static bool threadsTerminate = false; - - -int -virNWFilterLockIface(const char *ifname) { - virNWFilterIfaceLockPtr ifaceLock; - - virMutexLock(&ifaceMapLock); - - ifaceLock = virHashLookup(ifaceLockMap, ifname); - if (!ifaceLock) { - if (VIR_ALLOC(ifaceLock) < 0) { - virReportOOMError(); - goto err_exit; - } - - if (virMutexInitRecursive(&ifaceLock->lock)) { - virNWFilterReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("mutex initialization failed")); - VIR_FREE(ifaceLock); - goto err_exit; - } - - if (virStrcpyStatic(ifaceLock->ifname, ifname) == NULL) { - virNWFilterReportError(VIR_ERR_INTERNAL_ERROR, - _("interface name %s does not fit into " - "buffer "), - ifaceLock->ifname); - VIR_FREE(ifaceLock); - goto err_exit; - } - - while (virHashAddEntry(ifaceLockMap, ifname, ifaceLock)) { - VIR_FREE(ifaceLock); - goto err_exit; - } - - ifaceLock->refctr = 0; - } - - ifaceLock->refctr++; - - virMutexUnlock(&ifaceMapLock); - - virMutexLock(&ifaceLock->lock); - - return 0; - - err_exit: - virMutexUnlock(&ifaceMapLock); - - return 1; -} - - -static void -freeIfaceLock(void *payload, const void *name ATTRIBUTE_UNUSED) { - VIR_FREE(payload); -} - - -void -virNWFilterUnlockIface(const char *ifname) { - virNWFilterIfaceLockPtr ifaceLock; - - virMutexLock(&ifaceMapLock); - - ifaceLock = virHashLookup(ifaceLockMap, ifname); - - if (ifaceLock) { - virMutexUnlock(&ifaceLock->lock); - - ifaceLock->refctr--; - if (ifaceLock->refctr == 0) - virHashRemoveEntry(ifaceLockMap, ifname); - } - - virMutexUnlock(&ifaceMapLock); -} - - -static void -virNWFilterIPAddrLearnReqFree(virNWFilterIPAddrLearnReqPtr req) { - if (!req) - return; - - VIR_FREE(req->filtername); - virNWFilterHashTableFree(req->filterparams); - - VIR_FREE(req); -} - - -#if HAVE_LIBPCAP - -static int -virNWFilterRegisterLearnReq(virNWFilterIPAddrLearnReqPtr req) { - int res = -1; - IFINDEX2STR(ifindex_str, req->ifindex); - - virMutexLock(&pendingLearnReqLock); - - if (!virHashLookup(pendingLearnReq, ifindex_str)) - res = virHashAddEntry(pendingLearnReq, ifindex_str, req); - - virMutexUnlock(&pendingLearnReqLock); - - return res; -} - - -#endif - -int -virNWFilterTerminateLearnReq(const char *ifname) { - int rc = 1; - int ifindex; - virNWFilterIPAddrLearnReqPtr req; - - if (ifaceGetIndex(false, ifname, &ifindex) == 0) { - - IFINDEX2STR(ifindex_str, ifindex); - - virMutexLock(&pendingLearnReqLock); - - req = virHashLookup(pendingLearnReq, ifindex_str); - if (req) { - rc = 0; - req->terminate = true; - } - - virMutexUnlock(&pendingLearnReqLock); - } - - return rc; -} - - -virNWFilterIPAddrLearnReqPtr -virNWFilterLookupLearnReq(int ifindex) { - void *res; - IFINDEX2STR(ifindex_str, ifindex); - - virMutexLock(&pendingLearnReqLock); - - res = virHashLookup(pendingLearnReq, ifindex_str); - - virMutexUnlock(&pendingLearnReqLock); - - return res; -} - - -static void -freeLearnReqEntry(void *payload, const void *name ATTRIBUTE_UNUSED) { - virNWFilterIPAddrLearnReqFree(payload); -} - - -#ifdef HAVE_LIBPCAP - -static virNWFilterIPAddrLearnReqPtr -virNWFilterDeregisterLearnReq(int ifindex) { - virNWFilterIPAddrLearnReqPtr res; - IFINDEX2STR(ifindex_str, ifindex); - - virMutexLock(&pendingLearnReqLock); - - res = virHashSteal(pendingLearnReq, ifindex_str); - - virMutexUnlock(&pendingLearnReqLock); - - return res; -} - - - -static int -virNWFilterAddIpAddrForIfname(const char *ifname, char *addr) { - int ret; - - virMutexLock(&ipAddressMapLock); - - ret = virNWFilterHashTablePut(ipAddressMap, ifname, addr, 1); - - virMutexUnlock(&ipAddressMapLock); - - return ret; -} -#endif - - -void -virNWFilterDelIpAddrForIfname(const char *ifname) { - - virMutexLock(&ipAddressMapLock); - - if (virHashLookup(ipAddressMap->hashTable, ifname)) - virNWFilterHashTableRemoveEntry(ipAddressMap, ifname); - - virMutexUnlock(&ipAddressMapLock); -} - - -const char * -virNWFilterGetIpAddrForIfname(const char *ifname) { - const char *res; - - virMutexLock(&ipAddressMapLock); - - res = virHashLookup(ipAddressMap->hashTable, ifname); - - virMutexUnlock(&ipAddressMapLock); - - return res; -} - - -#ifdef HAVE_LIBPCAP - -static void -procDHCPOpts(struct dhcp *dhcp, int dhcp_opts_len, - uint32_t *vmaddr, uint32_t *bcastaddr, - enum howDetect *howDetected) { - struct dhcp_option *dhcpopt = &dhcp->options[0]; - - while (dhcp_opts_len >= 2) { - - switch (dhcpopt->code) { - - case DHCP_OPT_BCASTADDRESS: /* Broadcast address */ - if (dhcp_opts_len >= 6) { - uint32_t *tmp = (uint32_t *)&dhcpopt->value; - (*bcastaddr) = ntohl(*tmp); - } - break; - - case DHCP_OPT_MESSAGETYPE: /* Message type */ - if (dhcp_opts_len >= 3) { - uint8_t *val = (uint8_t *)&dhcpopt->value; - switch (*val) { - case DHCP_MSGT_DHCPACK: - case DHCP_MSGT_DHCPOFFER: - *vmaddr = dhcp->yiaddr; - *howDetected = DETECT_DHCP; - break; - } - } - } - dhcp_opts_len -= (2 + dhcpopt->len); - dhcpopt = (struct dhcp_option*)((char *)dhcpopt + 2 + dhcpopt->len); - } -} - - -/** - * learnIPAddressThread - * arg: pointer to virNWFilterIPAddrLearnReq structure - * - * Learn the IP address being used on an interface. Use ARP Request and - * Reply messages, DHCP offers and the first IP packet being sent from - * the VM to detect the IP address it is using. Detects only one IP address - * per interface (IP aliasing not supported). The method on how the - * IP address is detected can be chosen through flags. DETECT_DHCP will - * require that the IP address is detected from a DHCP OFFER, DETECT_STATIC - * will require that the IP address was taken from an ARP packet or an IPv4 - * packet. Both flags can be set at the same time. - */ -static void * -learnIPAddressThread(void *arg) -{ - char errbuf[PCAP_ERRBUF_SIZE] = {0}; - pcap_t *handle = NULL; - struct bpf_program fp; - struct pcap_pkthdr header; - const u_char *packet; - struct ether_header *ether_hdr; - struct ether_vlan_header *vlan_hdr; - virNWFilterIPAddrLearnReqPtr req = arg; - uint32_t vmaddr = 0, bcastaddr = 0; - unsigned int ethHdrSize; - char *listen_if = (strlen(req->linkdev) != 0) ? req->linkdev - : req->ifname; - int dhcp_opts_len; - char macaddr[VIR_MAC_STRING_BUFLEN]; - virBuffer buf = VIR_BUFFER_INITIALIZER; - char *filter = NULL; - uint16_t etherType; - bool showError = true; - enum howDetect howDetected = 0; - virNWFilterTechDriverPtr techdriver = req->techdriver; - - if (virNWFilterLockIface(req->ifname)) - goto err_no_lock; - - req->status = 0; - - /* anything change to the VM's interface -- check at least once */ - if (ifaceCheck(false, req->ifname, NULL, req->ifindex)) { - req->status = ENODEV; - goto done; - } - - handle = pcap_open_live(listen_if, BUFSIZ, 0, PKT_TIMEOUT_MS, errbuf); - - if (handle == NULL) { - VIR_DEBUG("Couldn't open device %s: %s\n", listen_if, errbuf); - req->status = ENODEV; - goto done; - } - - virFormatMacAddr(req->macaddr, macaddr); - - switch (req->howDetect) { - case DETECT_DHCP: - if (techdriver->applyDHCPOnlyRules(req->ifname, - req->macaddr, - NULL)) { - req->status = EINVAL; - goto done; - } - virBufferVSprintf(&buf, " ether dst %s" - " and src port 67 and dst port 68", - macaddr); - break; - default: - if (techdriver->applyBasicRules(req->ifname, - req->macaddr)) { - req->status = EINVAL; - goto done; - } - virBufferVSprintf(&buf, "ether host %s", macaddr); - } - - if (virBufferError(&buf)) { - req->status = ENOMEM; - goto done; - } - - filter = virBufferContentAndReset(&buf); - - if (pcap_compile(handle, &fp, filter, 1, 0) != 0) { - VIR_DEBUG("Couldn't compile filter '%s'.\n", filter); - req->status = EINVAL; - goto done; - } - - if (pcap_setfilter(handle, &fp) != 0) { - VIR_DEBUG("Couldn't set filter '%s'.\n", filter); - req->status = EINVAL; - pcap_freecode(&fp); - goto done; - } - - pcap_freecode(&fp); - - while (req->status == 0 && vmaddr == 0) { - packet = pcap_next(handle, &header); - - if (!packet) { - - if (threadsTerminate || req->terminate) { - req->status = ECANCELED; - showError = false; - break; - } - - /* check whether VM's dev is still there */ - if (ifaceCheck(false, req->ifname, NULL, req->ifindex)) { - req->status = ENODEV; - showError = false; - break; - } - continue; - } - - if (header.len >= sizeof(struct ether_header)) { - ether_hdr = (struct ether_header*)packet; - - switch (ntohs(ether_hdr->ether_type)) { - - case ETHERTYPE_IP: - ethHdrSize = sizeof(struct ether_header); - etherType = ntohs(ether_hdr->ether_type); - break; - - case ETHERTYPE_VLAN: - ethHdrSize = sizeof(struct ether_vlan_header); - vlan_hdr = (struct ether_vlan_header *)packet; - if (ntohs(vlan_hdr->ether_type) != ETHERTYPE_IP || - header.len < ethHdrSize) - continue; - etherType = ntohs(vlan_hdr->ether_type); - break; - - default: - continue; - } - - if (memcmp(ether_hdr->ether_shost, - req->macaddr, - VIR_MAC_BUFLEN) == 0) { - /* packets from the VM */ - - if (etherType == ETHERTYPE_IP && - (header.len >= ethHdrSize + - sizeof(struct iphdr))) { - struct iphdr *iphdr = (struct iphdr*)(packet + - ethHdrSize); - vmaddr = iphdr->saddr; - /* skip mcast addresses (224.0.0.0 - 239.255.255.255), - * class E (240.0.0.0 - 255.255.255.255, includes eth. - * bcast) and zero address in DHCP Requests */ - if ( (ntohl(vmaddr) & 0xe0000000) == 0xe0000000 || - vmaddr == 0) { - vmaddr = 0; - continue; - } - - howDetected = DETECT_STATIC; - } else if (etherType == ETHERTYPE_ARP && - (header.len >= ethHdrSize + - sizeof(struct f_arphdr))) { - struct f_arphdr *arphdr = (struct f_arphdr*)(packet + - ethHdrSize); - switch (ntohs(arphdr->arphdr.ar_op)) { - case ARPOP_REPLY: - vmaddr = arphdr->ar_sip; - howDetected = DETECT_STATIC; - break; - case ARPOP_REQUEST: - vmaddr = arphdr->ar_tip; - howDetected = DETECT_STATIC; - break; - } - } - } else if (memcmp(ether_hdr->ether_dhost, - req->macaddr, - VIR_MAC_BUFLEN) == 0) { - /* packets to the VM */ - if (etherType == ETHERTYPE_IP && - (header.len >= ethHdrSize + - sizeof(struct iphdr))) { - struct iphdr *iphdr = (struct iphdr*)(packet + - ethHdrSize); - if ((iphdr->protocol == IPPROTO_UDP) && - (header.len >= ethHdrSize + - iphdr->ihl * 4 + - sizeof(struct udphdr))) { - struct udphdr *udphdr= (struct udphdr *) - ((char *)iphdr + iphdr->ihl * 4); - if (ntohs(udphdr->source) == 67 && - ntohs(udphdr->dest) == 68 && - header.len >= ethHdrSize + - iphdr->ihl * 4 + - sizeof(struct udphdr) + - sizeof(struct dhcp)) { - struct dhcp *dhcp = (struct dhcp *) - ((char *)udphdr + sizeof(udphdr)); - if (dhcp->op == 2 /* BOOTREPLY */ && - !memcmp(&dhcp->chaddr[0], - req->macaddr, - 6)) { - dhcp_opts_len = header.len - - (ethHdrSize + iphdr->ihl * 4 + - sizeof(struct udphdr) + - sizeof(struct dhcp)); - procDHCPOpts(dhcp, dhcp_opts_len, - &vmaddr, - &bcastaddr, - &howDetected); - } - } - } - } - } - } - if (vmaddr && (req->howDetect & howDetected) == 0) { - vmaddr = 0; - howDetected = 0; - } - } /* while */ - - done: - VIR_FREE(filter); - - if (handle) - pcap_close(handle); - - if (req->status == 0) { - int ret; - virSocketAddr sa; - sa.len = sizeof(sa.data.inet4); - sa.data.inet4.sin_family = AF_INET; - sa.data.inet4.sin_addr.s_addr = vmaddr; - char *inetaddr; - - if ((inetaddr = virSocketFormatAddr(&sa))!= NULL) { - virNWFilterAddIpAddrForIfname(req->ifname, inetaddr); - - ret = virNWFilterInstantiateFilterLate(NULL, - req->ifname, - req->ifindex, - req->linkdev, - req->nettype, - req->macaddr, - req->filtername, - req->filterparams, - req->driver); - VIR_DEBUG("Result from applying firewall rules on " - "%s with IP addr %s : %d\n", req->ifname, inetaddr, ret); - } - } else { - if (showError) - virReportSystemError(req->status, - _("encountered an error on interface %s " - "index %d"), - req->ifname, req->ifindex); - - techdriver->applyDropAllRules(req->ifname); - } - - memset(&req->thread, 0x0, sizeof(req->thread)); - - VIR_DEBUG("pcap thread terminating for interface %s\n",req->ifname); - - virNWFilterUnlockIface(req->ifname); - - err_no_lock: - virNWFilterDeregisterLearnReq(req->ifindex); - - virNWFilterIPAddrLearnReqFree(req); - - return 0; -} - - -/** - * virNWFilterLearnIPAddress - * @techdriver : driver to build firewalls - * @ifname: the name of the interface - * @ifindex: the index of the interface - * @linkdev : the name of the link device; currently only used in case of a - * macvtap device - * @nettype : the type of interface - * @macaddr : the MAC address of the interface - * @filtername : the name of the top-level filter to apply to the interface - * once its IP address has been detected - * @driver : the network filter driver - * @howDetect : the method on how the thread is supposed to detect the - * IP address; must choose any of the available flags - * - * Instruct to learn the IP address being used on a given interface (ifname). - * Unless there already is a thread attempting to learn the IP address - * being used on the interface, a thread is started that will listen on - * the traffic being sent on the interface (or link device) with the - * MAC address that is provided. Will then launch the application of the - * firewall rules on the interface. - */ -int -virNWFilterLearnIPAddress(virNWFilterTechDriverPtr techdriver, - const char *ifname, - int ifindex, - const char *linkdev, - enum virDomainNetType nettype, - const unsigned char *macaddr, - const char *filtername, - virNWFilterHashTablePtr filterparams, - virNWFilterDriverStatePtr driver, - enum howDetect howDetect) { - int rc; - virNWFilterIPAddrLearnReqPtr req = NULL; - virNWFilterHashTablePtr ht = NULL; - - if (howDetect == 0) - return 1; - - if ( !techdriver->canApplyBasicRules()) { - virNWFilterReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("IP parameter must be provided since " - "snooping the IP address does not work " - "possibly due to missing tools")); - return 1; - } - - if (VIR_ALLOC(req) < 0) { - virReportOOMError(); - goto err_no_req; - } - - ht = virNWFilterHashTableCreate(0); - if (ht == NULL) { - virReportOOMError(); - goto err_free_req; - } - - if (virNWFilterHashTablePutAll(filterparams, ht)) - goto err_free_ht; - - req->filtername = strdup(filtername); - if (req->filtername == NULL) { - virReportOOMError(); - goto err_free_ht; - } - - if (virStrcpyStatic(req->ifname, ifname) == NULL) { - virNWFilterReportError(VIR_ERR_INTERNAL_ERROR, - _("Destination buffer for ifname ('%s') " - "not large enough"), ifname); - goto err_free_ht; - } - - if (linkdev) { - if (virStrcpyStatic(req->linkdev, linkdev) == NULL) { - virNWFilterReportError(VIR_ERR_INTERNAL_ERROR, - _("Destination buffer for linkdev ('%s') " - "not large enough"), linkdev); - goto err_free_ht; - } - } - - req->ifindex = ifindex; - req->nettype = nettype; - memcpy(req->macaddr, macaddr, sizeof(req->macaddr)); - req->driver = driver; - req->filterparams = ht; - ht = NULL; - req->howDetect = howDetect; - req->techdriver = techdriver; - - rc = virNWFilterRegisterLearnReq(req); - - if (rc) - goto err_free_req; - - if (pthread_create(&req->thread, - NULL, - learnIPAddressThread, - req) != 0) - goto err_dereg_req; - - return 0; - -err_dereg_req: - virNWFilterDeregisterLearnReq(ifindex); -err_free_ht: - virNWFilterHashTableFree(ht); -err_free_req: - virNWFilterIPAddrLearnReqFree(req); -err_no_req: - return 1; -} - -#else - -int -virNWFilterLearnIPAddress(virNWFilterTechDriverPtr techdriver ATTRIBUTE_UNUSED, - const char *ifname ATTRIBUTE_UNUSED, - int ifindex ATTRIBUTE_UNUSED, - const char *linkdev ATTRIBUTE_UNUSED, - enum virDomainNetType nettype ATTRIBUTE_UNUSED, - const unsigned char *macaddr ATTRIBUTE_UNUSED, - const char *filtername ATTRIBUTE_UNUSED, - virNWFilterHashTablePtr filterparams ATTRIBUTE_UNUSED, - virNWFilterDriverStatePtr driver ATTRIBUTE_UNUSED, - enum howDetect howDetect ATTRIBUTE_UNUSED) { - virNWFilterReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("IP parameter must be given since libvirt " - "was not compiled with IP address learning " - "support")); - return 1; -} -#endif /* HAVE_LIBPCAP */ - - -/** - * virNWFilterLearnInit - * Initialization of this layer - */ -int -virNWFilterLearnInit(void) { - - if (pendingLearnReq) - return 0; - - threadsTerminate = false; - - pendingLearnReq = virHashCreate(0, freeLearnReqEntry); - if (!pendingLearnReq) { - return 1; - } - - if (virMutexInit(&pendingLearnReqLock)) { - virNWFilterLearnShutdown(); - return 1; - } - - ipAddressMap = virNWFilterHashTableCreate(0); - if (!ipAddressMap) { - virReportOOMError(); - virNWFilterLearnShutdown(); - return 1; - } - - if (virMutexInit(&ipAddressMapLock)) { - virNWFilterLearnShutdown(); - return 1; - } - - ifaceLockMap = virHashCreate(0, freeIfaceLock); - if (!ifaceLockMap) { - virNWFilterLearnShutdown(); - return 1; - } - - if (virMutexInit(&ifaceMapLock)) { - virNWFilterLearnShutdown(); - return 1; - } - - return 0; -} - - -void -virNWFilterLearnThreadsTerminate(bool allowNewThreads) { - threadsTerminate = true; - - while (virHashSize(pendingLearnReq) != 0) - usleep((PKT_TIMEOUT_MS * 1000) / 3); - - if (allowNewThreads) - threadsTerminate = false; -} - -/** - * virNWFilterLearnShutdown - * Shutdown of this layer - */ -void -virNWFilterLearnShutdown(void) -{ - if (!pendingLearnReq) - return; - - virNWFilterLearnThreadsTerminate(false); - - virHashFree(pendingLearnReq); - pendingLearnReq = NULL; - - virNWFilterHashTableFree(ipAddressMap); - ipAddressMap = NULL; - - virHashFree(ifaceLockMap); - ifaceLockMap = NULL; -} diff --git a/src/nwfilter/nwfilter_learnipaddr.h b/src/nwfilter/nwfilter_learnipaddr.h deleted file mode 100644 index e4b9811..0000000 --- a/src/nwfilter/nwfilter_learnipaddr.h +++ /dev/null @@ -1,76 +0,0 @@ -/* - * nwfilter_learnipaddr.h: support for learning IP address used by a VM - * on an interface - * - * Copyright (C) 2010 IBM Corp. - * Copyright (C) 2010 Stefan Berger - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * Author: Stefan Berger <stefanb(a)us.ibm.com> - */ - -#ifndef __NWFILTER_LEARNIPADDR_H -# define __NWFILTER_LEARNIPADDR_H - -enum howDetect { - DETECT_DHCP = 1, - DETECT_STATIC = 2, -}; - -typedef struct _virNWFilterIPAddrLearnReq virNWFilterIPAddrLearnReq; -typedef virNWFilterIPAddrLearnReq *virNWFilterIPAddrLearnReqPtr; -struct _virNWFilterIPAddrLearnReq { - virNWFilterTechDriverPtr techdriver; - char ifname[IF_NAMESIZE]; - int ifindex; - char linkdev[IF_NAMESIZE]; - enum virDomainNetType nettype; - unsigned char macaddr[VIR_MAC_BUFLEN]; - char *filtername; - virNWFilterHashTablePtr filterparams; - virNWFilterDriverStatePtr driver; - enum howDetect howDetect; - - int status; - pthread_t thread; - volatile bool terminate; -}; - -int virNWFilterLearnIPAddress(virNWFilterTechDriverPtr techdriver, - const char *ifname, - int ifindex, - const char *linkdev, - enum virDomainNetType nettype, - const unsigned char *macaddr, - const char *filtername, - virNWFilterHashTablePtr filterparams, - virNWFilterDriverStatePtr driver, - enum howDetect howDetect); - -virNWFilterIPAddrLearnReqPtr virNWFilterLookupLearnReq(int ifindex); -int virNWFilterTerminateLearnReq(const char *ifname); - -void virNWFilterDelIpAddrForIfname(const char *ifname); -const char *virNWFilterGetIpAddrForIfname(const char *ifname); - -int virNWFilterLockIface(const char *ifname) ATTRIBUTE_RETURN_CHECK; -void virNWFilterUnlockIface(const char *ifname); - -int virNWFilterLearnInit(void); -void virNWFilterLearnShutdown(void); -void virNWFilterLearnThreadsTerminate(bool allowNewThreads); - -#endif /* __NWFILTER_LEARNIPADDR_H */

5 9

[libvirt] [PATCH 00/16 v5] Implement migration v3 protocol
by Daniel P. Berrange 18 May '11

18 May '11

An update of http://www.redhat.com/archives/libvir-list/2011-May/msg00605.html Changes in this series - Fix comments from previous review - Rebase to latest GIT Also pullable from http://gitorious.org/~berrange/libvirt/staging/commits/migrate-locking-3 NB, this branch includes the migration + lock manager series in one big set.

3 41

[libvirt] configure --prefix=$HOME --with-init-script buglet
by Eric Blake 17 May '11

17 May '11

Right now, on a Fedora system, if you configure libvirt to install into $HOME (because you don't have permissions to install into the default /usr/local or even into the system /usr), --with-init-script defaults to auto mode, detects that /etc/redhat-release exists, and tries to install the init script anyways. configure.ac needs to be patched to also check that $sysconfdir is /etc before changing with-init-script=auto over to with-init-script=redhat, so that the init scripts are only installed during a system install (where they make sense), and not during a /usr/local or $HOME install. I don't have time to patch this today, if someone wants to beat me to it. -- Eric Blake eblake(a)redhat.com +1-801-349-2682 Libvirt virtualization library http://libvirt.org

2 1

[libvirt] [PATCH] send 'container=libvirt' in env to container init
by Serge Hallyn 17 May '11

17 May '11

This allows upstart scripts to detect that they are in a container and modify their behavior accordingly. In this way, the same ubuntu maverick or natty image with the 'lxcguest' package installed can be booted on bare metal, in kvm, or as a libvirt or liblxc container. Signed-off-by: Chuck Short <zulcss(a)ubuntu.com> Signed-off-by: Serge Hallyn <serge.hallyn(a)ubuntu.com> --- src/lxc/lxc_container.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index 9ae93b5..a70aeeb 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -112,6 +112,7 @@ static virCommandPtr lxcContainerBuildInitCmd(virDomainDefPtr vmDef) virCommandAddEnvString(cmd, "PATH=/bin:/sbin"); virCommandAddEnvString(cmd, "TERM=linux"); + virCommandAddEnvString(cmd, "container=libvirt"); virCommandAddEnvPair(cmd, "LIBVIRT_LXC_UUID", uuidstr); virCommandAddEnvPair(cmd, "LIBVIRT_LXC_NAME", vmDef->name); -- 1.7.4.1

3 9

[libvirt] FreeBSD and sys/syslimits.h
by Matthias Bolte 17 May '11

17 May '11

libvirtd.h includes sys/syslimits.h if available. On FreeBSD the header contains this warning: In file included from libvirtd.h:42, from dispatch.h:28, from dispatch.c:30: /usr/include/sys/syslimits.h:41:2: warning: #warning "No user-serviceable parts inside." Here's the relevant part from that header: #if !defined(_KERNEL) && !defined(_LIMITS_H_) && !defined(_SYS_PARAM_H_) #ifndef _SYS_CDEFS_H_ #error this file needs sys/cdefs.h as a prerequisite #endif #ifdef __CC_SUPPORTS_WARNING #warning "No user-serviceable parts inside." #endif #endif This looks like this header is not meant to be included directly, at least on FreeBSD. Is this something gnulib or libvirt should care about? Matthias

3 4

[libvirt] [PATCH 0/9 v2] More virCommand conversions and cleanups
by Cole Robinson 17 May '11

17 May '11

The following series converts all users of several older command wrappers (virRunWithHook, virExecDaemonize, and virExec) to use virCommand. The remaining functionality is then moved out of util.c and into command.c v2: Committed some patches Dropped final patch, can be submitted seperately Addressed Eric's comments Cole Robinson (9): storage: iscsi: Convert virExec to virCommand openvz: Convert virExec usage to virCommand qemu: Convert virExec usage to virCommand storage: Covert regex helpers to virCommand storage_backend: Fix error reporting with regex helper storage_backend: Convert virRunWithHook usage to virCommand util: Remove unused virExec wrapper util: Implement virRun as a wrapper around virCommand Move virRun, virExec*, virFork to util/command cfg.mk | 2 +- src/libvirt_private.syms | 7 +- src/lxc/veth.c | 2 +- src/nwfilter/nwfilter_ebiptables_driver.c | 1 + src/openvz/openvz_conf.c | 37 +- src/openvz/openvz_driver.c | 55 ++-- src/qemu/qemu_driver.c | 35 +- src/qemu/qemu_process.c | 2 +- src/storage/storage_backend.c | 262 ++++-------- src/storage/storage_backend.h | 3 +- src/storage/storage_backend_fs.c | 7 +- src/storage/storage_backend_iscsi.c | 39 +-- src/storage/storage_backend_logical.c | 32 +-- src/util/command.c | 568 ++++++++++++++++++++++++ src/util/command.h | 14 + src/util/ebtables.c | 2 +- src/util/pci.c | 2 +- src/util/util.c | 674 +---------------------------- src/util/util.h | 35 -- src/vmware/vmware_driver.c | 1 + 20 files changed, 765 insertions(+), 1015 deletions(-) -- 1.7.4.4

3 23

[libvirt] [PATCH] build: tolerate unlimited group size
by Eric Blake 17 May '11

17 May '11

POSIX allows sysconf(_SC_GETPW_R_SIZE_MAX) to return -1 if there is no fixed limit, and requires ERANGE errors to track real size. http://pubs.opengroup.org/onlinepubs/9699919799/functions/getpwuid_r.html Also, on error for get*_r functions, errno is undefined, and the real error was the return value. * src/util/util.c (virGetUserEnt, virGetUserID, virGetGroupID) (virSetUIDGID): Cope with sysconf failure or too small buffer. Reported by Matthias Bolte. --- This pretty much copies the example implementation straight from POSIX for getting a hint for initial size, then iterating until ERANGE no longer occurs. src/util/util.c | 74 +++++++++++++++++++++++++++++++++++++----------------- 1 files changed, 51 insertions(+), 23 deletions(-) diff --git a/src/util/util.c b/src/util/util.c index f169e54..240f776 100644 --- a/src/util/util.c +++ b/src/util/util.c @@ -603,7 +603,7 @@ virExecWithHook(const char *const*argv, goto fork_error; } - openmax = sysconf (_SC_OPEN_MAX); + openmax = sysconf(_SC_OPEN_MAX); for (i = 3; i < openmax; i++) if (i != infd && i != null && @@ -2743,11 +2743,11 @@ static char *virGetUserEnt(uid_t uid, struct passwd *pw = NULL; long val = sysconf(_SC_GETPW_R_SIZE_MAX); size_t strbuflen = val; + int rc; - if (val < 0) { - virReportSystemError(errno, "%s", _("sysconf failed")); - return NULL; - } + /* sysconf is a hint; if it fails, fall back to a reasonable size */ + if (val < 0) + strbuflen = 1024; if (VIR_ALLOC_N(strbuf, strbuflen) < 0) { virReportOOMError(); @@ -2761,8 +2761,15 @@ static char *virGetUserEnt(uid_t uid, * 0 or ENOENT or ESRCH or EBADF or EPERM or ... * The given name or uid was not found. */ - if (getpwuid_r(uid, &pwbuf, strbuf, strbuflen, &pw) != 0 || pw == NULL) { - virReportSystemError(errno, + while ((rc = getpwuid_r(uid, &pwbuf, strbuf, strbuflen, &pw)) == ERANGE) { + if (VIR_RESIZE_N(strbuf, strbuflen, strbuflen, strbuflen) < 0) { + virReportOOMError(); + VIR_FREE(strbuf); + return NULL; + } + } + if (rc != 0 || pw == NULL) { + virReportSystemError(rc, _("Failed to find user record for uid '%u'"), (unsigned int) uid); VIR_FREE(strbuf); @@ -2800,11 +2807,11 @@ int virGetUserID(const char *name, struct passwd *pw = NULL; long val = sysconf(_SC_GETPW_R_SIZE_MAX); size_t strbuflen = val; + int rc; - if (val < 0) { - virReportSystemError(errno, "%s", _("sysconf failed")); - return -1; - } + /* sysconf is a hint; if it fails, fall back to a reasonable size */ + if (val < 0) + strbuflen = 1024; if (VIR_ALLOC_N(strbuf, strbuflen) < 0) { virReportOOMError(); @@ -2818,8 +2825,15 @@ int virGetUserID(const char *name, * 0 or ENOENT or ESRCH or EBADF or EPERM or ... * The given name or uid was not found. */ - if (getpwnam_r(name, &pwbuf, strbuf, strbuflen, &pw) != 0 || pw == NULL) { - virReportSystemError(errno, + while ((rc = getpwnam_r(name, &pwbuf, strbuf, strbuflen, &pw)) == ERANGE) { + if (VIR_RESIZE_N(strbuf, strbuflen, strbuflen, strbuflen) < 0) { + virReportOOMError(); + VIR_FREE(strbuf); + return -1; + } + } + if (rc != 0 || pw == NULL) { + virReportSystemError(rc, _("Failed to find user record for name '%s'"), name); VIR_FREE(strbuf); @@ -2842,11 +2856,11 @@ int virGetGroupID(const char *name, struct group *gr = NULL; long val = sysconf(_SC_GETGR_R_SIZE_MAX); size_t strbuflen = val; + int rc; - if (val < 0) { - virReportSystemError(errno, "%s", _("sysconf failed")); - return -1; - } + /* sysconf is a hint; if it fails, fall back to a reasonable size */ + if (val < 0) + strbuflen = 1024; if (VIR_ALLOC_N(strbuf, strbuflen) < 0) { virReportOOMError(); @@ -2860,8 +2874,15 @@ int virGetGroupID(const char *name, * 0 or ENOENT or ESRCH or EBADF or EPERM or ... * The given name or uid was not found. */ - if (getgrnam_r(name, &grbuf, strbuf, strbuflen, &gr) != 0 || gr == NULL) { - virReportSystemError(errno, + while ((rc = getgrnam_r(name, &grbuf, strbuf, strbuflen, &gr)) == ERANGE) { + if (VIR_RESIZE_N(strbuf, strbuflen, strbuflen, strbuflen) < 0) { + virReportOOMError(); + VIR_FREE(strbuf); + return -1; + } + } + if (rc != 0 || gr == NULL) { + virReportSystemError(rc, _("Failed to find group record for name '%s'"), name); VIR_FREE(strbuf); @@ -2897,6 +2918,7 @@ virSetUIDGID(uid_t uid, gid_t gid) struct passwd pwd, *pwd_result; char *buf = NULL; size_t bufsize; + int rc; bufsize = sysconf(_SC_GETPW_R_SIZE_MAX); if (bufsize == -1) @@ -2906,10 +2928,16 @@ virSetUIDGID(uid_t uid, gid_t gid) virReportOOMError(); return -1; } - getpwuid_r(uid, &pwd, buf, bufsize, &pwd_result); - if (!pwd_result) { - virReportSystemError(errno, - _("cannot getpwuid_r(%d)"), + while ((rc = getpwuid_r(uid, &pwd, buf, bufsize, + &pwd_result)) == ERANGE) { + if (VIR_RESIZE_N(buf, bufsize, bufsize, bufsize) < 0) { + virReportOOMError(); + VIR_FREE(buf); + return -1; + } + } + if (rc || !pwd_result) { + virReportSystemError(rc, _("cannot getpwuid_r(%d)"), (unsigned int) uid); VIR_FREE(buf); return -1; -- 1.7.4.4

2 2

[libvirt] 'attach-interface' failure and RHEL6 qemu-kvm
by Neil Wilson 17 May '11

17 May '11

I've run up against a small issue with the 'attach-interface' facility in later versions of libvirt. It doesn't appear to work with the vanilla qemu-kvm package in RHEL6 (which reports as version 0.12.1). For both attach-interface and attach-device I'm getting the same error. virsh attach-interface srv-vvh2o network vir0001 error: Failed to attach interface error: internal error unable to add host net: unknown command: 'host_net_add' virsh # attach-device srv-vvh2o fred.xml error: Failed to attach device from fred.xml error: internal error unable to add host net: unknown command: 'host_net_add' Looking at qemu monitor the 'qemu-kvm' is indeed short of the 'host_net_add' command and it all seems to be down to an entry in 'qemu_capabilities.c' which switches off 'netdev' for qemu versions less than 13. Is there a reason that the RHEL6 version - which seems to have functioning -netdev parameters and 'netdev_add' qemu commands - has been excluded? If its a RHEL6 special patched version is there a way to special case detect it in the code? Thanks Neil

1 0

[libvirt] [PATCH 00/12] esx: Generator improvments and general cleanups
by Matthias Bolte 17 May '11

17 May '11

As we're currently in feature freeze, this series is meant for 0.9.2. It includes mostly generator improvments and general cleanups. 10/12 is a race condition fix, but it's not critical because it's not that simple to trigger. Matthias

2 40

[libvirt] [PATCH v2] virsh: Correctly initialize libvirt
by Jiri Denemark 17 May '11

17 May '11

virsh didn't call virInitialize(), which (among other things) initializes virLastErr thread local variable. As a result of that, virsh could just segfault in virEventRegisterDefaultImpl() since that is the first call that touches (resets) virLastErr. I have no idea what lucky coincidence made this bug visible but I was able to reproduce it in 100% cases but only in one specific environment which included building in sandbox. --- src/libvirt.c | 3 +++ tools/virsh.c | 13 +++++++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/src/libvirt.c b/src/libvirt.c index 5a5439d..787908e 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -369,6 +369,9 @@ static struct gcry_thread_cbs virTLSThreadImpl = { * in multithreaded applications to avoid potential race when initializing * the library. * + * Calling virInitialize is mandatory, unless your first API call is one of + * virConnectOpen*. + * * Returns 0 in case of success, -1 in case of error */ int diff --git a/tools/virsh.c b/tools/virsh.c index e35637d..b469e7a 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -12983,6 +12983,10 @@ main(int argc, char **argv) char *defaultConn; bool ret = true; + memset(ctl, 0, sizeof(vshControl)); + ctl->imode = true; /* default is interactive mode */ + ctl->log_fd = -1; /* Initialize log file descriptor */ + if (!setlocale(LC_ALL, "")) { perror("setlocale"); /* failure to setup locale is not fatal */ @@ -12996,15 +13000,16 @@ main(int argc, char **argv) return EXIT_FAILURE; } + if (virInitialize() < 0) { + vshError(ctl, "%s", _("Failed to initialize libvirt")); + return EXIT_FAILURE; + } + if (!(progname = strrchr(argv[0], '/'))) progname = argv[0]; else progname++; - memset(ctl, 0, sizeof(vshControl)); - ctl->imode = true; /* default is interactive mode */ - ctl->log_fd = -1; /* Initialize log file descriptor */ - if ((defaultConn = getenv("VIRSH_DEFAULT_CONNECT_URI"))) { ctl->name = vshStrdup(ctl, defaultConn); } -- 1.7.5.rc3

2 2

[libvirt] [PATCH] mark mig->flags as QEMU_MIGRATION_COOKIE_GRAPHICS only when mig->graphics is not NULL
by Wen Congyang 17 May '11

17 May '11

Steps to reproduce this problem: 1. remove all <graphics ...> from xml. 2. start the domain 3. migrate the domain to another host, and libvirtd on the target host will crash. The reason of this bug is that we mark mig->flags as QEMU_MIGRATION_COOKIE_GRAPHICS even if we have no graphics. We will use mig->graphics when mig->flgas is QEMU_MIGRATION_COOKIE_GRAPHICS in the function qemuMigrationCookieXMLFormat() --- src/qemu/qemu_migration.c | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index cb408ac..3def14b 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -252,11 +252,13 @@ qemuMigrationCookieAddGraphics(qemuMigrationCookiePtr mig, if (dom->def->ngraphics == 1 && (dom->def->graphics[0]->type == VIR_DOMAIN_GRAPHICS_TYPE_VNC || - dom->def->graphics[0]->type == VIR_DOMAIN_GRAPHICS_TYPE_SPICE) && - !(mig->graphics = qemuMigrationCookieGraphicsAlloc(driver, dom->def->graphics[0]))) - return -1; - - mig->flags |= QEMU_MIGRATION_COOKIE_GRAPHICS; + dom->def->graphics[0]->type == VIR_DOMAIN_GRAPHICS_TYPE_SPICE)) { + mig->graphics = qemuMigrationCookieGraphicsAlloc(driver, + dom->def->graphics[0]); + if (mig->graphics == NULL) + return -1; + mig->flags |= QEMU_MIGRATION_COOKIE_GRAPHICS; + } return 0; } -- 1.7.1

1 0

[libvirt] [PATCHv4 0/6] Add virNodeGetCPUTimeParameters() API
by Minoru Usui 17 May '11

17 May '11

Hi, This is v4 of virNodeGetCpuTime() API. (This time, I rename it to virNodeGetCPUTimeParameters()) It returns cpu utilization or cumulative cpu time of the node from /proc/stat since node boots up. This patch only supports linux host. Changes v3->v4 - Rebase this patch like virDomainGetMemoryParameters() from v2 patches. (drop v3 patches except virsh subcommand) - Rename API name to virNodeGetCPUTimeParameters() v2->v3 - Change user I/F. It is able to request what the user want by the @flags. - Minor change of virsh nodecputime I/F. v1->v2 - Change user I/F like virDomainGetMemoryStats() - It can return either cpu utilization or cumulative cpu time of the node depends on each driver. Minoru Usui (6): [v4] virNodeGetCPUTimeParameters: Expose new API [v4] virNodeGetCPUTimeParameters: Define internal driver API [v4] virNodeGetCPUTimeParameters: Implement public API [v4] virNodeGetCPUTimeParameters: Implement remote protocol [v4] virNodeGetCPUTimeParameters: Implement virsh support [v4] virNodeGetCPUTimeParameters: Implement linux support daemon/remote.c | 81 +++++++++++++++++++++++++++ include/libvirt/libvirt.h.in | 65 +++++++++++++++++++++ src/driver.h | 8 +++ src/esx/esx_driver.c | 1 + src/libvirt.c | 87 ++++++++++++++++++++++++++++ src/libvirt_private.syms | 1 + src/libvirt_public.syms | 1 + src/libxl/libxl_driver.c | 1 + src/lxc/lxc_driver.c | 1 + src/nodeinfo.c | 127 ++++++++++++++++++++++++++++++++++++++++++ src/nodeinfo.h | 5 +- src/openvz/openvz_driver.c | 1 + src/phyp/phyp_driver.c | 1 + src/qemu/qemu_driver.c | 1 + src/remote/remote_driver.c | 65 +++++++++++++++++++++ src/remote/remote_protocol.x | 21 +++++++- src/test/test_driver.c | 1 + src/uml/uml_driver.c | 1 + src/vbox/vbox_tmpl.c | 1 + src/vmware/vmware_driver.c | 1 + src/xen/xen_driver.c | 1 + src/xenapi/xenapi_driver.c | 1 + tools/virsh.c | 107 +++++++++++++++++++++++++++++++++++ tools/virsh.pod | 4 + 24 files changed, 582 insertions(+), 2 deletions(-) -- Minoru Usui <usui(a)mxm.nes.nec.co.jp>

2 10

[libvirt] [PATCH] virsh: Improve editing
by Michal Privoznik 17 May '11

17 May '11

When users (pool-/net-)edit and they make a mistake, temporary file and thus all changes are gone. Better way is to let them decide if they want to get back to edit and correct what's wrong. However, this is suitable only in interactive mode. --- tools/virsh.c | 42 ++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 40 insertions(+), 2 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index fbeb7c8..0dccc17 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -338,6 +338,7 @@ static const char *vshDomainStateToString(int state); static const char *vshDomainVcpuStateToString(int state); static bool vshConnectionUsability(vshControl *ctl, virConnectPtr conn); +static char * vshReadline (vshControl *ctl, const char *prompt); static char *editWriteToTempFile (vshControl *ctl, const char *doc); static int editFile (vshControl *ctl, const char *filename); static char *editReadBackFile (vshControl *ctl, const char *filename); @@ -10099,6 +10100,7 @@ cmdEdit (vshControl *ctl, const vshCmd *cmd) char *doc_edited = NULL; char *doc_reread = NULL; int flags = VIR_DOMAIN_XML_SECURE | VIR_DOMAIN_XML_INACTIVE; + char *response; if (!vshConnectionUsability(ctl, ctl->conn)) goto cleanup; @@ -10116,6 +10118,7 @@ cmdEdit (vshControl *ctl, const vshCmd *cmd) tmp = editWriteToTempFile (ctl, doc); if (!tmp) goto cleanup; +again: /* Start the editor. */ if (editFile (ctl, tmp) == -1) goto cleanup; @@ -10148,8 +10151,43 @@ cmdEdit (vshControl *ctl, const vshCmd *cmd) /* Everything checks out, so redefine the domain. */ virDomainFree (dom); dom = virDomainDefineXML (ctl->conn, doc_edited); - if (!dom) - goto cleanup; + if (!dom) { + if (ctl->imode) { + virshReportError(ctl); + response = vshReadline(ctl, "Do you want to edit again [Y/n] "); + while (true) { + char *c = response; + while (c && *c) { + *c = tolower(*c); + c++; + } + + if (STREQ(response, "") || STREQ(response, "y") || + STREQ(response, "yes")) { + dom = vshCommandOptDomain (ctl, cmd, NULL); + if (!dom) + goto cleanup; + goto again; + } else if (!response || STREQ(response, "n") || + STREQ(response, "no")) { + /* Ok, this is a little hack. Command did not succeed, + * but the error was already reported. So we do not + * want it to get reported twice */ + ret = true; + goto cleanup; + } else { + char *prompt; + if (virAsprintf(&prompt, _("Sorry, response '%s' not " + "understood. [Y/n] "), response) < 0) + goto cleanup; + response = vshReadline(ctl, prompt); + VIR_FREE(prompt); + } + } + } else { + goto cleanup; + } + } vshPrint (ctl, _("Domain %s XML configuration edited.\n"), virDomainGetName(dom)); -- 1.7.5.rc3

7 8

[libvirt] FreeBSD and sysconf(_SC_GETPW_R_SIZE_MAX)
by Matthias Bolte 16 May '11

16 May '11

On FreeBSD virsh fails to enter interactive mode because vshReadlineInit fails, because virGetUserDirectory fails, because virGetUserEnt fails, because sysconf(_SC_GETPW_R_SIZE_MAX) returns -1 and sets errno to EINVAL. Is this something that gnulib should/could deal with, Eric? Or should we work around it in libvrt and fallback to PATH_MAX when sysconf(_SC_GETPW_R_SIZE_MAX) fails? Matthias

4 4

[libvirt] [PATCH] Fix leak of mime type string in screenshot dispatcher
by Daniel P. Berrange 16 May '11

16 May '11

* daemon/remote.c: Free mime string --- daemon/remote.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/daemon/remote.c b/daemon/remote.c index bb01c89..ea36bf5 100644 --- a/daemon/remote.c +++ b/daemon/remote.c @@ -1746,6 +1746,7 @@ remoteDispatchDomainScreenshot(struct qemud_server *server ATTRIBUTE_UNUSED, cleanup: if (rv < 0) remoteDispatchError(rerr); + VIR_FREE(mime); if (dom) virDomainFree(dom); if (stream && rv != 0) { -- 1.7.4.4

2 1

[libvirt] [PATCH] Remove obsolete remoteDispatchOOMError method
by Daniel P. Berrange 16 May '11

16 May '11

No new code should be using remoteDispatchOOMError() * daemon/dispatch.c, daemon/dispatch.h: Remove remoteDispatchOOMError --- daemon/dispatch.c | 8 -------- daemon/dispatch.h | 1 - 2 files changed, 0 insertions(+), 9 deletions(-) diff --git a/daemon/dispatch.c b/daemon/dispatch.c index 7453451..010be1e 100644 --- a/daemon/dispatch.c +++ b/daemon/dispatch.c @@ -104,14 +104,6 @@ void remoteDispatchGenericError (remote_error *rerr) } -void remoteDispatchOOMError (remote_error *rerr) -{ - remoteDispatchStringError(rerr, - VIR_ERR_NO_MEMORY, - "out of memory"); -} - - void remoteDispatchError(remote_error *rerr) { virErrorPtr verr = virGetLastError(); diff --git a/daemon/dispatch.h b/daemon/dispatch.h index 79d35ac..f24f494 100644 --- a/daemon/dispatch.h +++ b/daemon/dispatch.h @@ -45,7 +45,6 @@ void remoteDispatchFormatError (remote_error *rerr, void remoteDispatchAuthError (remote_error *rerr); void remoteDispatchGenericError (remote_error *rerr); -void remoteDispatchOOMError (remote_error *rerr); void remoteDispatchError(remote_error *rerr); -- 1.7.4.4

2 1

[libvirt] [PATCH] Fix remote dispatcher for screenshot command
by Daniel P. Berrange 16 May '11

16 May '11

* daemon/remote.c: Update screenshot dispatcher to follow standard practice --- daemon/remote.c | 53 +++++++++++++++++++++++++++++------------------------ 1 files changed, 29 insertions(+), 24 deletions(-) diff --git a/daemon/remote.c b/daemon/remote.c index 181f149..bb01c89 100644 --- a/daemon/remote.c +++ b/daemon/remote.c @@ -1694,59 +1694,64 @@ no_memory: } static int -remoteDispatchDomainScreenshot (struct qemud_server *server ATTRIBUTE_UNUSED, - struct qemud_client *client, - virConnectPtr conn, - remote_message_header *hdr, - remote_error *rerr, - remote_domain_screenshot_args *args, - remote_domain_screenshot_ret *ret) +remoteDispatchDomainScreenshot(struct qemud_server *server ATTRIBUTE_UNUSED, + struct qemud_client *client, + virConnectPtr conn, + remote_message_header *hdr, + remote_error *rerr, + remote_domain_screenshot_args *args, + remote_domain_screenshot_ret *ret) { int rv = -1; struct qemud_client_stream *stream = NULL; - virDomainPtr dom; + virDomainPtr dom = NULL; char *mime, **mime_p; + if (!conn) { + virNetError(VIR_ERR_INTERNAL_ERROR, "%s", _("connection not open")); + goto cleanup; + } + ret->mime = NULL; - dom = get_nonnull_domain (conn, args->dom); - if (dom == NULL) - goto err; + if (!(dom = get_nonnull_domain (conn, args->dom))) + goto cleanup; - stream = remoteCreateClientStream(conn, hdr); - if (!stream) - goto err; + if (!(stream = remoteCreateClientStream(conn, hdr))) + goto cleanup; - mime = virDomainScreenshot(dom, stream->st, args->screen, args->flags); - if (!mime) - goto err; + if (!(mime = virDomainScreenshot(dom, stream->st, args->screen, args->flags))) + goto cleanup; if (remoteAddClientStream(client, stream, 1) < 0) { virStreamAbort(stream->st); - goto err; + goto cleanup; } if (VIR_ALLOC(mime_p) < 0) { - remoteDispatchOOMError(rerr); + virReportOOMError(); goto cleanup; } *mime_p = strdup(mime); if (*mime_p == NULL) { - remoteDispatchOOMError(rerr); + virReportOOMError(); goto cleanup; } ret->mime = mime_p; + rv = 0; -err: +cleanup: if (rv < 0) remoteDispatchError(rerr); -cleanup: - virDomainFree(dom); - if (stream && rv != 0) + if (dom) + virDomainFree(dom); + if (stream && rv != 0) { + virStreamAbort(stream->st); remoteFreeClientStream(client, stream); + } return rv; } -- 1.7.4.4

2 1

[libvirt] [PATCH] cleanup: use c99 initializations
by Lai Jiangshan 16 May '11

16 May '11

It help us avoid to touch many files when we define the internal APIs of a public API like commit b19bd85e15332405623ed46a3ee8b99812aa6007. --- src/esx/esx_device_monitor.c | 15 +-- src/esx/esx_driver.c | 175 +++++++++++------------------- src/esx/esx_interface_driver.c | 18 +--- src/esx/esx_network_driver.c | 23 +---- src/esx/esx_nwfilter_driver.c | 13 +-- src/esx/esx_secret_driver.c | 15 +-- src/esx/esx_storage_driver.c | 68 +++++------- src/interface/netcf_driver.c | 30 +++--- src/libxl/libxl_driver.c | 165 +++++++++------------------- src/lxc/lxc_driver.c | 161 ++++++++------------------- src/network/bridge_driver.c | 40 ++++---- src/openvz/openvz_driver.c | 152 +++++++------------------- src/phyp/phyp_driver.c | 136 +++++------------------ src/qemu/qemu_driver.c | 220 ++++++++++++++++++------------------- src/remote/remote_driver.c | 224 +++++++++++++++++++------------------- src/test/test_driver.c | 240 ++++++++++++++++------------------------ src/uml/uml_driver.c | 156 ++++++++------------------- src/vbox/vbox_tmpl.c | 208 +++++++++++------------------------ src/vmware/vmware_driver.c | 140 +++++------------------- src/xen/xen_driver.c | 188 +++++++++++++------------------- src/xen/xen_hypervisor.c | 56 +++------- src/xen/xen_inotify.c | 40 +------- src/xen/xend_internal.c | 73 ++++++------- src/xen/xm_internal.c | 52 +++------- src/xen/xs_internal.c | 47 ++------- src/xenapi/xenapi_driver.c | 157 ++++++++------------------- 26 files changed, 958 insertions(+), 1854 deletions(-) diff --git a/src/esx/esx_device_monitor.c b/src/esx/esx_device_monitor.c index 3fa63d5..957edbe 100644 --- a/src/esx/esx_device_monitor.c +++ b/src/esx/esx_device_monitor.c @@ -66,18 +66,9 @@ esxDeviceClose(virConnectPtr conn) static virDeviceMonitor esxDeviceMonitor = { - "ESX", /* name */ - esxDeviceOpen, /* open */ - esxDeviceClose, /* close */ - NULL, /* numOfDevices */ - NULL, /* listDevices */ - NULL, /* deviceLookupByName */ - NULL, /* deviceGetXMLDesc */ - NULL, /* deviceGetParent */ - NULL, /* deviceNumOfCaps */ - NULL, /* deviceListCaps */ - NULL, /* deviceCreateXML */ - NULL, /* deviceDestroy */ + .name = "ESX", + .open = esxDeviceOpen, + .close = esxDeviceClose, }; diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c index ef7838a..a45f9d0 100644 --- a/src/esx/esx_driver.c +++ b/src/esx/esx_driver.c @@ -4589,118 +4589,69 @@ esxDomainGetMemoryParameters(virDomainPtr domain, virMemoryParameterPtr params, static virDriver esxDriver = { - VIR_DRV_ESX, - "ESX", - esxOpen, /* open */ - esxClose, /* close */ - esxSupportsFeature, /* supports_feature */ - esxGetType, /* type */ - esxGetVersion, /* version */ - NULL, /* libvirtVersion (impl. in libvirt.c) */ - esxGetHostname, /* hostname */ - NULL, /* getSysinfo */ - NULL, /* getMaxVcpus */ - esxNodeGetInfo, /* nodeGetInfo */ - esxGetCapabilities, /* getCapabilities */ - esxListDomains, /* listDomains */ - esxNumberOfDomains, /* numOfDomains */ - NULL, /* domainCreateXML */ - esxDomainLookupByID, /* domainLookupByID */ - esxDomainLookupByUUID, /* domainLookupByUUID */ - esxDomainLookupByName, /* domainLookupByName */ - esxDomainSuspend, /* domainSuspend */ - esxDomainResume, /* domainResume */ - esxDomainShutdown, /* domainShutdown */ - esxDomainReboot, /* domainReboot */ - esxDomainDestroy, /* domainDestroy */ - esxDomainGetOSType, /* domainGetOSType */ - esxDomainGetMaxMemory, /* domainGetMaxMemory */ - esxDomainSetMaxMemory, /* domainSetMaxMemory */ - esxDomainSetMemory, /* domainSetMemory */ - NULL, /* domainSetMemoryFlags */ - esxDomainSetMemoryParameters, /* domainSetMemoryParameters */ - esxDomainGetMemoryParameters, /* domainGetMemoryParameters */ - NULL, /* domainSetBlkioParameters */ - NULL, /* domainGetBlkioParameters */ - esxDomainGetInfo, /* domainGetInfo */ - NULL, /* domainSave */ - NULL, /* domainRestore */ - NULL, /* domainCoreDump */ - NULL, /* domainScreenshot */ - esxDomainSetVcpus, /* domainSetVcpus */ - esxDomainSetVcpusFlags, /* domainSetVcpusFlags */ - esxDomainGetVcpusFlags, /* domainGetVcpusFlags */ - NULL, /* domainPinVcpu */ - NULL, /* domainGetVcpus */ - esxDomainGetMaxVcpus, /* domainGetMaxVcpus */ - NULL, /* domainGetSecurityLabel */ - NULL, /* nodeGetSecurityModel */ - esxDomainGetXMLDesc, /* domainGetXMLDesc */ - esxDomainXMLFromNative, /* domainXMLFromNative */ - esxDomainXMLToNative, /* domainXMLToNative */ - esxListDefinedDomains, /* listDefinedDomains */ - esxNumberOfDefinedDomains, /* numOfDefinedDomains */ - esxDomainCreate, /* domainCreate */ - esxDomainCreateWithFlags, /* domainCreateWithFlags */ - esxDomainDefineXML, /* domainDefineXML */ - esxDomainUndefine, /* domainUndefine */ - NULL, /* domainAttachDevice */ - NULL, /* domainAttachDeviceFlags */ - NULL, /* domainDetachDevice */ - NULL, /* domainDetachDeviceFlags */ - NULL, /* domainUpdateDeviceFlags */ - esxDomainGetAutostart, /* domainGetAutostart */ - esxDomainSetAutostart, /* domainSetAutostart */ - esxDomainGetSchedulerType, /* domainGetSchedulerType */ - esxDomainGetSchedulerParameters, /* domainGetSchedulerParameters */ - esxDomainSetSchedulerParameters, /* domainSetSchedulerParameters */ - esxDomainMigratePrepare, /* domainMigratePrepare */ - esxDomainMigratePerform, /* domainMigratePerform */ - esxDomainMigrateFinish, /* domainMigrateFinish */ - NULL, /* domainBlockStats */ - NULL, /* domainInterfaceStats */ - NULL, /* domainMemoryStats */ - NULL, /* domainBlockPeek */ - NULL, /* domainMemoryPeek */ - NULL, /* domainGetBlockInfo */ - NULL, /* nodeGetCellsFreeMemory */ - esxNodeGetFreeMemory, /* nodeGetFreeMemory */ - NULL, /* domainEventRegister */ - NULL, /* domainEventDeregister */ - NULL, /* domainMigratePrepare2 */ - NULL, /* domainMigrateFinish2 */ - NULL, /* nodeDeviceDettach */ - NULL, /* nodeDeviceReAttach */ - NULL, /* nodeDeviceReset */ - NULL, /* domainMigratePrepareTunnel */ - esxIsEncrypted, /* isEncrypted */ - esxIsSecure, /* isSecure */ - esxDomainIsActive, /* domainIsActive */ - esxDomainIsPersistent, /* domainIsPersistent */ - esxDomainIsUpdated, /* domainIsUpdated */ - NULL, /* cpuCompare */ - NULL, /* cpuBaseline */ - NULL, /* domainGetJobInfo */ - NULL, /* domainAbortJob */ - NULL, /* domainMigrateSetMaxDowntime */ - NULL, /* domainMigrateSetMaxSpeed */ - NULL, /* domainEventRegisterAny */ - NULL, /* domainEventDeregisterAny */ - NULL, /* domainManagedSave */ - NULL, /* domainHasManagedSaveImage */ - NULL, /* domainManagedSaveRemove */ - esxDomainSnapshotCreateXML, /* domainSnapshotCreateXML */ - esxDomainSnapshotGetXMLDesc, /* domainSnapshotGetXMLDesc */ - esxDomainSnapshotNum, /* domainSnapshotNum */ - esxDomainSnapshotListNames, /* domainSnapshotListNames */ - esxDomainSnapshotLookupByName, /* domainSnapshotLookupByName */ - esxDomainHasCurrentSnapshot, /* domainHasCurrentSnapshot */ - esxDomainSnapshotCurrent, /* domainSnapshotCurrent */ - esxDomainRevertToSnapshot, /* domainRevertToSnapshot */ - esxDomainSnapshotDelete, /* domainSnapshotDelete */ - NULL, /* qemuDomainMonitorCommand */ - NULL, /* domainOpenConsole */ - NULL, /* domainInjectNMI */ + .no = VIR_DRV_ESX, + .name = "ESX", + .open = esxOpen, + .close = esxClose, + .supports_feature = esxSupportsFeature, + .type = esxGetType, + .version = esxGetVersion, + .getHostname = esxGetHostname, + .nodeGetInfo = esxNodeGetInfo, + .getCapabilities = esxGetCapabilities, + .listDomains = esxListDomains, + .numOfDomains = esxNumberOfDomains, + .domainLookupByID = esxDomainLookupByID, + .domainLookupByUUID = esxDomainLookupByUUID, + .domainLookupByName = esxDomainLookupByName, + .domainSuspend = esxDomainSuspend, + .domainResume = esxDomainResume, + .domainShutdown = esxDomainShutdown, + .domainReboot = esxDomainReboot, + .domainDestroy = esxDomainDestroy, + .domainGetOSType = esxDomainGetOSType, + .domainGetMaxMemory = esxDomainGetMaxMemory, + .domainSetMaxMemory = esxDomainSetMaxMemory, + .domainSetMemory = esxDomainSetMemory, + .domainSetMemoryParameters = esxDomainSetMemoryParameters, + .domainGetMemoryParameters = esxDomainGetMemoryParameters, + .domainGetInfo = esxDomainGetInfo, + .domainSetVcpus = esxDomainSetVcpus, + .domainSetVcpusFlags = esxDomainSetVcpusFlags, + .domainGetVcpusFlags = esxDomainGetVcpusFlags, + .domainGetMaxVcpus = esxDomainGetMaxVcpus, + .domainGetXMLDesc = esxDomainGetXMLDesc, + .domainXMLFromNative = esxDomainXMLFromNative, + .domainXMLToNative = esxDomainXMLToNative, + .listDefinedDomains = esxListDefinedDomains, + .numOfDefinedDomains = esxNumberOfDefinedDomains, + .domainCreate = esxDomainCreate, + .domainCreateWithFlags = esxDomainCreateWithFlags, + .domainDefineXML = esxDomainDefineXML, + .domainUndefine = esxDomainUndefine, + .domainGetAutostart = esxDomainGetAutostart, + .domainSetAutostart = esxDomainSetAutostart, + .domainGetSchedulerType = esxDomainGetSchedulerType, + .domainGetSchedulerParameters = esxDomainGetSchedulerParameters, + .domainSetSchedulerParameters = esxDomainSetSchedulerParameters, + .domainMigratePrepare = esxDomainMigratePrepare, + .domainMigratePerform = esxDomainMigratePerform, + .domainMigrateFinish = esxDomainMigrateFinish, + .getFreeMemory = esxNodeGetFreeMemory, + .isEncrypted = esxIsEncrypted, + .isSecure = esxIsSecure, + .domainIsActive = esxDomainIsActive, + .domainIsPersistent = esxDomainIsPersistent, + .domainIsUpdated = esxDomainIsUpdated, + .domainSnapshotCreateXML = esxDomainSnapshotCreateXML, + .domainSnapshotGetXMLDesc = esxDomainSnapshotGetXMLDesc, + .domainSnapshotNum = esxDomainSnapshotNum, + .domainSnapshotListNames = esxDomainSnapshotListNames, + .domainSnapshotLookupByName = esxDomainSnapshotLookupByName, + .domainHasCurrentSnapshot = esxDomainHasCurrentSnapshot, + .domainSnapshotCurrent = esxDomainSnapshotCurrent, + .domainRevertToSnapshot = esxDomainRevertToSnapshot, + .domainSnapshotDelete = esxDomainSnapshotDelete, }; diff --git a/src/esx/esx_interface_driver.c b/src/esx/esx_interface_driver.c index 4bac3d5..15e93bb 100644 --- a/src/esx/esx_interface_driver.c +++ b/src/esx/esx_interface_driver.c @@ -66,21 +66,9 @@ esxInterfaceClose(virConnectPtr conn) static virInterfaceDriver esxInterfaceDriver = { - "ESX", /* name */ - esxInterfaceOpen, /* open */ - esxInterfaceClose, /* close */ - NULL, /* numOfInterfaces */ - NULL, /* listInterfaces */ - NULL, /* numOfDefinedInterfaces */ - NULL, /* listDefinedInterfaces */ - NULL, /* interfaceLookupByName */ - NULL, /* interfaceLookupByMACString */ - NULL, /* interfaceGetXMLDesc */ - NULL, /* interfaceDefineXML */ - NULL, /* interfaceUndefine */ - NULL, /* interfaceCreate */ - NULL, /* interfaceDestroy */ - NULL, /* interfaceIsActive */ + .name = "ESX", + .open = esxInterfaceOpen, + .close = esxInterfaceClose, }; diff --git a/src/esx/esx_network_driver.c b/src/esx/esx_network_driver.c index bbc2541..4571fec 100644 --- a/src/esx/esx_network_driver.c +++ b/src/esx/esx_network_driver.c @@ -66,26 +66,9 @@ esxNetworkClose(virConnectPtr conn) static virNetworkDriver esxNetworkDriver = { - "ESX", /* name */ - esxNetworkOpen, /* open */ - esxNetworkClose, /* close */ - NULL, /* numOfNetworks */ - NULL, /* listNetworks */ - NULL, /* numOfDefinedNetworks */ - NULL, /* listDefinedNetworks */ - NULL, /* networkLookupByUUID */ - NULL, /* networkLookupByName */ - NULL, /* networkCreateXML */ - NULL, /* networkDefineXML */ - NULL, /* networkUndefine */ - NULL, /* networkCreate */ - NULL, /* networkDestroy */ - NULL, /* networkGetXMLDesc */ - NULL, /* networkGetBridgeName */ - NULL, /* networkGetAutostart */ - NULL, /* networkSetAutostart */ - NULL, /* networkIsActive */ - NULL, /* networkIsPersistent */ + .name = "ESX", + .open = esxNetworkOpen, + .close = esxNetworkClose, }; diff --git a/src/esx/esx_nwfilter_driver.c b/src/esx/esx_nwfilter_driver.c index a9d046d..9dce603 100644 --- a/src/esx/esx_nwfilter_driver.c +++ b/src/esx/esx_nwfilter_driver.c @@ -65,16 +65,9 @@ esxNWFilterClose(virConnectPtr conn) static virNWFilterDriver esxNWFilterDriver = { - "ESX", /* name */ - esxNWFilterOpen, /* open */ - esxNWFilterClose, /* close */ - NULL, /* numOfNWFilters */ - NULL, /* listNWFilters */ - NULL, /* nwfilterLookupByName */ - NULL, /* nwfilterLookupByUUID */ - NULL, /* defineXML */ - NULL, /* undefine */ - NULL, /* getXMLDesc */ + .name = "ESX", + .open = esxNWFilterOpen, + .close = esxNWFilterClose, }; diff --git a/src/esx/esx_secret_driver.c b/src/esx/esx_secret_driver.c index 1ae7ddc..e10a5ab 100644 --- a/src/esx/esx_secret_driver.c +++ b/src/esx/esx_secret_driver.c @@ -64,18 +64,9 @@ esxSecretClose(virConnectPtr conn) static virSecretDriver esxSecretDriver = { - "ESX", /* name */ - esxSecretOpen, /* open */ - esxSecretClose, /* close */ - NULL, /* numOfSecrets */ - NULL, /* listSecrets */ - NULL, /* lookupByUUID */ - NULL, /* lookupByUsage */ - NULL, /* defineXML */ - NULL, /* getXMLDesc */ - NULL, /* setValue */ - NULL, /* getValue */ - NULL, /* undefine */ + .name = "ESX", + .open = esxSecretOpen, + .close = esxSecretClose, }; diff --git a/src/esx/esx_storage_driver.c b/src/esx/esx_storage_driver.c index f37d064..6b7c2d9 100644 --- a/src/esx/esx_storage_driver.c +++ b/src/esx/esx_storage_driver.c @@ -1641,45 +1641,35 @@ esxStoragePoolIsPersistent(virStoragePoolPtr pool ATTRIBUTE_UNUSED) static virStorageDriver esxStorageDriver = { - "ESX", /* name */ - esxStorageOpen, /* open */ - esxStorageClose, /* close */ - esxNumberOfStoragePools, /* numOfPools */ - esxListStoragePools, /* listPools */ - esxNumberOfDefinedStoragePools, /* numOfDefinedPools */ - esxListDefinedStoragePools, /* listDefinedPools */ - NULL, /* findPoolSources */ - esxStoragePoolLookupByName, /* poolLookupByName */ - esxStoragePoolLookupByUUID, /* poolLookupByUUID */ - esxStoragePoolLookupByVolume, /* poolLookupByVolume */ - NULL, /* poolCreateXML */ - NULL, /* poolDefineXML */ - NULL, /* poolBuild */ - NULL, /* poolUndefine */ - NULL, /* poolCreate */ - NULL, /* poolDestroy */ - NULL, /* poolDelete */ - esxStoragePoolRefresh, /* poolRefresh */ - esxStoragePoolGetInfo, /* poolGetInfo */ - esxStoragePoolGetXMLDesc, /* poolGetXMLDesc */ - esxStoragePoolGetAutostart, /* poolGetAutostart */ - esxStoragePoolSetAutostart, /* poolSetAutostart */ - esxStoragePoolNumberOfStorageVolumes, /* poolNumOfVolumes */ - esxStoragePoolListStorageVolumes, /* poolListVolumes */ - esxStorageVolumeLookupByName, /* volLookupByName */ - esxStorageVolumeLookupByKey, /* volLookupByKey */ - esxStorageVolumeLookupByPath, /* volLookupByPath */ - esxStorageVolumeCreateXML, /* volCreateXML */ - esxStorageVolumeCreateXMLFrom, /* volCreateXMLFrom */ - NULL, /* volDownload */ - NULL, /* volUpload */ - esxStorageVolumeDelete, /* volDelete */ - esxStorageVolumeWipe, /* volWipe */ - esxStorageVolumeGetInfo, /* volGetInfo */ - esxStorageVolumeGetXMLDesc, /* volGetXMLDesc */ - esxStorageVolumeGetPath, /* volGetPath */ - esxStoragePoolIsActive, /* poolIsActive */ - esxStoragePoolIsPersistent, /* poolIsPersistent */ + .name = "ESX", + .open = esxStorageOpen, + .close = esxStorageClose, + .numOfPools = esxNumberOfStoragePools, + .listPools = esxListStoragePools, + .numOfDefinedPools = esxNumberOfDefinedStoragePools, + .listDefinedPools = esxListDefinedStoragePools, + .poolLookupByName = esxStoragePoolLookupByName, + .poolLookupByUUID = esxStoragePoolLookupByUUID, + .poolLookupByVolume = esxStoragePoolLookupByVolume, + .poolRefresh = esxStoragePoolRefresh, + .poolGetInfo = esxStoragePoolGetInfo, + .poolGetXMLDesc = esxStoragePoolGetXMLDesc, + .poolGetAutostart = esxStoragePoolGetAutostart, + .poolSetAutostart = esxStoragePoolSetAutostart, + .poolNumOfVolumes = esxStoragePoolNumberOfStorageVolumes, + .poolListVolumes = esxStoragePoolListStorageVolumes, + .volLookupByName = esxStorageVolumeLookupByName, + .volLookupByKey = esxStorageVolumeLookupByKey, + .volLookupByPath = esxStorageVolumeLookupByPath, + .volCreateXML = esxStorageVolumeCreateXML, + .volCreateXMLFrom = esxStorageVolumeCreateXMLFrom, + .volDelete = esxStorageVolumeDelete, + .volWipe = esxStorageVolumeWipe, + .volGetInfo = esxStorageVolumeGetInfo, + .volGetXMLDesc = esxStorageVolumeGetXMLDesc, + .volGetPath = esxStorageVolumeGetPath, + .poolIsActive = esxStoragePoolIsActive, + .poolIsPersistent = esxStoragePoolIsPersistent, }; diff --git a/src/interface/netcf_driver.c b/src/interface/netcf_driver.c index 709f09b..aa6f7bf 100644 --- a/src/interface/netcf_driver.c +++ b/src/interface/netcf_driver.c @@ -541,21 +541,21 @@ cleanup: } static virInterfaceDriver interfaceDriver = { - "Interface", - interfaceOpenInterface, /* open */ - interfaceCloseInterface, /* close */ - interfaceNumOfInterfaces, /* numOfInterfaces */ - interfaceListInterfaces, /* listInterfaces */ - interfaceNumOfDefinedInterfaces, /* numOfInterfaces */ - interfaceListDefinedInterfaces, /* listInterfaces */ - interfaceLookupByName, /* interfaceLookupByName */ - interfaceLookupByMACString, /* interfaceLookupByMACSTring */ - interfaceGetXMLDesc, /* interfaceGetXMLDesc */ - interfaceDefineXML, /* interfaceDefineXML */ - interfaceUndefine, /* interfaceUndefine */ - interfaceCreate, /* interfaceCreate */ - interfaceDestroy, /* interfaceDestroy */ - interfaceIsActive, /* interfaceIsActive */ + .name = "Interface", + .open = interfaceOpenInterface, + .close = interfaceCloseInterface, + .numOfInterfaces = interfaceNumOfInterfaces, + .listInterfaces = interfaceListInterfaces, + .numOfInterfaces = interfaceNumOfDefinedInterfaces, + .listInterfaces = interfaceListDefinedInterfaces, + .interfaceLookupByName = interfaceLookupByName, + .interfaceLookupByMACSTring = interfaceLookupByMACString, + .interfaceGetXMLDesc = interfaceGetXMLDesc, + .interfaceDefineXML = interfaceDefineXML, + .interfaceUndefine = interfaceUndefine, + .interfaceCreate = interfaceCreate, + .interfaceDestroy = interfaceDestroy, + .interfaceIsActive = interfaceIsActive, }; int interfaceRegister(void) { diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index 60557fc..5ec7157 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -2645,118 +2645,59 @@ libxlDomainEventDeregisterAny(virConnectPtr conn, int callbackID) static virDriver libxlDriver = { - VIR_DRV_LIBXL, - "xenlight", - libxlOpen, /* open */ - libxlClose, /* close */ - NULL, /* supports_feature */ - libxlGetType, /* type */ - libxlGetVersion, /* version */ - NULL, /* libvirtVersion (impl. in libvirt.c) */ - virGetHostname, /* getHostname */ - NULL, /* getSysinfo */ - libxlGetMaxVcpus, /* getMaxVcpus */ - libxlNodeGetInfo, /* nodeGetInfo */ - libxlGetCapabilities, /* getCapabilities */ - libxlListDomains, /* listDomains */ - libxlNumDomains, /* numOfDomains */ - libxlDomainCreateXML, /* domainCreateXML */ - libxlDomainLookupByID, /* domainLookupByID */ - libxlDomainLookupByUUID, /* domainLookupByUUID */ - libxlDomainLookupByName, /* domainLookupByName */ - libxlDomainSuspend, /* domainSuspend */ - libxlDomainResume, /* domainResume */ - libxlDomainShutdown, /* domainShutdown */ - libxlDomainReboot, /* domainReboot */ - libxlDomainDestroy, /* domainDestroy */ - libxlDomainGetOSType, /* domainGetOSType */ - libxlDomainGetMaxMemory, /* domainGetMaxMemory */ - NULL, /* domainSetMaxMemory */ - libxlDomainSetMemory, /* domainSetMemory */ - libxlDomainSetMemoryFlags, /* domainSetMemoryFlags */ - NULL, /* domainSetMemoryParameters */ - NULL, /* domainGetMemoryParameters */ - NULL, /* domainSetBlkioParameters */ - NULL, /* domainGetBlkioParameters */ - libxlDomainGetInfo, /* domainGetInfo */ - NULL, /* domainSave */ - NULL, /* domainRestore */ - NULL, /* domainCoreDump */ - NULL, /* domainScreenshot */ - libxlDomainSetVcpus, /* domainSetVcpus */ - libxlDomainSetVcpusFlags, /* domainSetVcpusFlags */ - libxlDomainGetVcpusFlags, /* domainGetVcpusFlags */ - libxlDomainPinVcpu, /* domainPinVcpu */ - libxlDomainGetVcpus, /* domainGetVcpus */ - NULL, /* domainGetMaxVcpus */ - NULL, /* domainGetSecurityLabel */ - NULL, /* nodeGetSecurityModel */ - libxlDomainGetXMLDesc, /* domainGetXMLDesc */ - libxlDomainXMLFromNative, /* domainXmlFromNative */ - libxlDomainXMLToNative, /* domainXmlToNative */ - libxlListDefinedDomains, /* listDefinedDomains */ - libxlNumDefinedDomains, /* numOfDefinedDomains */ - libxlDomainCreate, /* domainCreate */ - libxlDomainCreateWithFlags, /* domainCreateWithFlags */ - libxlDomainDefineXML, /* domainDefineXML */ - libxlDomainUndefine, /* domainUndefine */ - NULL, /* domainAttachDevice */ - NULL, /* domainAttachDeviceFlags */ - NULL, /* domainDetachDevice */ - NULL, /* domainDetachDeviceFlags */ - NULL, /* domainUpdateDeviceFlags */ - libxlDomainGetAutostart, /* domainGetAutostart */ - libxlDomainSetAutostart, /* domainSetAutostart */ - libxlDomainGetSchedulerType,/* domainGetSchedulerType */ - libxlDomainGetSchedulerParameters,/* domainGetSchedulerParameters */ - libxlDomainSetSchedulerParameters,/* domainSetSchedulerParameters */ - NULL, /* domainMigratePrepare */ - NULL, /* domainMigratePerform */ - NULL, /* domainMigrateFinish */ - NULL, /* domainBlockStats */ - NULL, /* domainInterfaceStats */ - NULL, /* domainMemoryStats */ - NULL, /* domainBlockPeek */ - NULL, /* domainMemoryPeek */ - NULL, /* domainGetBlockInfo */ - NULL, /* nodeGetCellsFreeMemory */ - libxlNodeGetFreeMemory, /* getFreeMemory */ - libxlDomainEventRegister, /* domainEventRegister */ - libxlDomainEventDeregister, /* domainEventDeregister */ - NULL, /* domainMigratePrepare2 */ - NULL, /* domainMigrateFinish2 */ - NULL, /* nodeDeviceDettach */ - NULL, /* nodeDeviceReAttach */ - NULL, /* nodeDeviceReset */ - NULL, /* domainMigratePrepareTunnel */ - NULL, /* IsEncrypted */ - NULL, /* IsSecure */ - libxlDomainIsActive, /* DomainIsActive */ - libxlDomainIsPersistent, /* DomainIsPersistent */ - libxlDomainIsUpdated, /* domainIsUpdated */ - NULL, /* cpuCompare */ - NULL, /* cpuBaseline */ - NULL, /* domainGetJobInfo */ - NULL, /* domainAbortJob */ - NULL, /* domainMigrateSetMaxDowntime */ - NULL, /* domainMigrateSetMaxSpeed */ - libxlDomainEventRegisterAny,/* domainEventRegisterAny */ - libxlDomainEventDeregisterAny,/* domainEventDeregisterAny */ - NULL, /* domainManagedSave */ - NULL, /* domainHasManagedSaveImage */ - NULL, /* domainManagedSaveRemove */ - NULL, /* domainSnapshotCreateXML */ - NULL, /* domainSnapshotGetXMLDesc */ - NULL, /* domainSnapshotNum */ - NULL, /* domainSnapshotListNames */ - NULL, /* domainSnapshotLookupByName */ - NULL, /* domainHasCurrentSnapshot */ - NULL, /* domainSnapshotCurrent */ - NULL, /* domainRevertToSnapshot */ - NULL, /* domainSnapshotDelete */ - NULL, /* qemuDomainMonitorCommand */ - NULL, /* domainOpenConsole */ - NULL, /* domainInjectNMI */ + .no = VIR_DRV_LIBXL, + .name = "xenlight", + .open = libxlOpen, + .close = libxlClose, + .type = libxlGetType, + .version = libxlGetVersion, + .getHostname = virGetHostname, + .getMaxVcpus = libxlGetMaxVcpus, + .nodeGetInfo = libxlNodeGetInfo, + .getCapabilities = libxlGetCapabilities, + .listDomains = libxlListDomains, + .numOfDomains = libxlNumDomains, + .domainCreateXML = libxlDomainCreateXML, + .domainLookupByID = libxlDomainLookupByID, + .domainLookupByUUID = libxlDomainLookupByUUID, + .domainLookupByName = libxlDomainLookupByName, + .domainSuspend = libxlDomainSuspend, + .domainResume = libxlDomainResume, + .domainShutdown = libxlDomainShutdown, + .domainReboot = libxlDomainReboot, + .domainDestroy = libxlDomainDestroy, + .domainGetOSType = libxlDomainGetOSType, + .domainGetMaxMemory = libxlDomainGetMaxMemory, + .domainSetMemory = libxlDomainSetMemory, + .domainSetMemoryFlags = libxlDomainSetMemoryFlags, + .domainGetInfo = libxlDomainGetInfo, + .domainSetVcpus = libxlDomainSetVcpus, + .domainSetVcpusFlags = libxlDomainSetVcpusFlags, + .domainGetVcpusFlags = libxlDomainGetVcpusFlags, + .domainPinVcpu = libxlDomainPinVcpu, + .domainGetVcpus = libxlDomainGetVcpus, + .domainGetXMLDesc = libxlDomainGetXMLDesc, + .domainXmlFromNative = libxlDomainXMLFromNative, + .domainXmlToNative = libxlDomainXMLToNative, + .listDefinedDomains = libxlListDefinedDomains, + .numOfDefinedDomains = libxlNumDefinedDomains, + .domainCreate = libxlDomainCreate, + .domainCreateWithFlags = libxlDomainCreateWithFlags, + .domainDefineXML = libxlDomainDefineXML, + .domainUndefine = libxlDomainUndefine, + .domainGetAutostart = libxlDomainGetAutostart, + .domainSetAutostart = libxlDomainSetAutostart, + .domainGetSchedulerType = libxlDomainGetSchedulerType, + .domainGetSchedulerParameters = libxlDomainGetSchedulerParameters, + .domainSetSchedulerParameters = libxlDomainSetSchedulerParameters, + .getFreeMemory = libxlNodeGetFreeMemory, + .domainEventRegister = libxlDomainEventRegister, + .domainEventDeregister = libxlDomainEventDeregister, + .domainIsActive = libxlDomainIsActive, + .domainIsPersistent = libxlDomainIsPersistent, + .domainIsUpdated = libxlDomainIsUpdated, + .domainEventRegisterAny = libxlDomainEventRegisterAny, + .domainEventDeregisterAny = libxlDomainEventDeregisterAny, }; static virStateDriver libxlStateDriver = { diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index 68824e4..d2eb3fe 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -2674,118 +2674,55 @@ cleanup: /* Function Tables */ static virDriver lxcDriver = { - VIR_DRV_LXC, /* the number virDrvNo */ - "LXC", /* the name of the driver */ - lxcOpen, /* open */ - lxcClose, /* close */ - NULL, /* supports_feature */ - NULL, /* type */ - lxcVersion, /* version */ - NULL, /* libvirtVersion (impl. in libvirt.c) */ - virGetHostname, /* getHostname */ - NULL, /* getSysinfo */ - NULL, /* getMaxVcpus */ - nodeGetInfo, /* nodeGetInfo */ - lxcGetCapabilities, /* getCapabilities */ - lxcListDomains, /* listDomains */ - lxcNumDomains, /* numOfDomains */ - lxcDomainCreateAndStart, /* domainCreateXML */ - lxcDomainLookupByID, /* domainLookupByID */ - lxcDomainLookupByUUID, /* domainLookupByUUID */ - lxcDomainLookupByName, /* domainLookupByName */ - lxcDomainSuspend, /* domainSuspend */ - lxcDomainResume, /* domainResume */ - NULL, /* domainShutdown */ - NULL, /* domainReboot */ - lxcDomainDestroy, /* domainDestroy */ - lxcGetOSType, /* domainGetOSType */ - lxcDomainGetMaxMemory, /* domainGetMaxMemory */ - lxcDomainSetMaxMemory, /* domainSetMaxMemory */ - lxcDomainSetMemory, /* domainSetMemory */ - NULL, /* domainSetMemoryFlags */ - lxcDomainSetMemoryParameters, /* domainSetMemoryParameters */ - lxcDomainGetMemoryParameters, /* domainGetMemoryParameters */ - NULL, /* domainSetBlkioParameters */ - NULL, /* domainGetBlkioParameters */ - lxcDomainGetInfo, /* domainGetInfo */ - NULL, /* domainSave */ - NULL, /* domainRestore */ - NULL, /* domainCoreDump */ - NULL, /* domainScreenshot */ - NULL, /* domainSetVcpus */ - NULL, /* domainSetVcpusFlags */ - NULL, /* domainGetVcpusFlags */ - NULL, /* domainPinVcpu */ - NULL, /* domainGetVcpus */ - NULL, /* domainGetMaxVcpus */ - NULL, /* domainGetSecurityLabel */ - NULL, /* nodeGetSecurityModel */ - lxcDomainGetXMLDesc, /* domainGetXMLDesc */ - NULL, /* domainXMLFromNative */ - NULL, /* domainXMLToNative */ - lxcListDefinedDomains, /* listDefinedDomains */ - lxcNumDefinedDomains, /* numOfDefinedDomains */ - lxcDomainStart, /* domainCreate */ - lxcDomainStartWithFlags, /* domainCreateWithFlags */ - lxcDomainDefine, /* domainDefineXML */ - lxcDomainUndefine, /* domainUndefine */ - NULL, /* domainAttachDevice */ - NULL, /* domainAttachDeviceFlags */ - NULL, /* domainDetachDevice */ - NULL, /* domainDetachDeviceFlags */ - NULL, /* domainUpdateDeviceFlags */ - lxcDomainGetAutostart, /* domainGetAutostart */ - lxcDomainSetAutostart, /* domainSetAutostart */ - lxcGetSchedulerType, /* domainGetSchedulerType */ - lxcGetSchedulerParameters, /* domainGetSchedulerParameters */ - lxcSetSchedulerParameters, /* domainSetSchedulerParameters */ - NULL, /* domainMigratePrepare */ - NULL, /* domainMigratePerform */ - NULL, /* domainMigrateFinish */ - NULL, /* domainBlockStats */ - lxcDomainInterfaceStats, /* domainInterfaceStats */ - NULL, /* domainMemoryStats */ - NULL, /* domainBlockPeek */ - NULL, /* domainMemoryPeek */ - NULL, /* domainGetBlockInfo */ - nodeGetCellsFreeMemory, /* nodeGetCellsFreeMemory */ - nodeGetFreeMemory, /* getFreeMemory */ - lxcDomainEventRegister, /* domainEventRegister */ - lxcDomainEventDeregister, /* domainEventDeregister */ - NULL, /* domainMigratePrepare2 */ - NULL, /* domainMigrateFinish2 */ - NULL, /* nodeDeviceDettach */ - NULL, /* nodeDeviceReAttach */ - NULL, /* nodeDeviceReset */ - NULL, /* domainMigratePrepareTunnel */ - lxcIsEncrypted, /* isEncrypted */ - lxcIsSecure, /* isSecure */ - lxcDomainIsActive, /* domainIsActive */ - lxcDomainIsPersistent, /* domainIsPersistent */ - lxcDomainIsUpdated, /* domainIsUpdated */ - NULL, /* cpuCompare */ - NULL, /* cpuBaseline */ - NULL, /* domainGetJobInfo */ - NULL, /* domainAbortJob */ - NULL, /* domainMigrateSetMaxDowntime */ - NULL, /* domainMigrateSetMaxSpeed */ - lxcDomainEventRegisterAny, /* domainEventRegisterAny */ - lxcDomainEventDeregisterAny, /* domainEventDeregisterAny */ - NULL, /* domainManagedSave */ - NULL, /* domainHasManagedSaveImage */ - NULL, /* domainManagedSaveRemove */ - NULL, /* domainSnapshotCreateXML */ - NULL, /* domainSnapshotGetXMLDesc */ - NULL, /* domainSnapshotNum */ - NULL, /* domainSnapshotListNames */ - NULL, /* domainSnapshotLookupByName */ - NULL, /* domainHasCurrentSnapshot */ - NULL, /* domainSnapshotCurrent */ - NULL, /* domainRevertToSnapshot */ - NULL, /* domainSnapshotDelete */ - NULL, /* qemuDomainMonitorCommand */ - lxcDomainOpenConsole, /* domainOpenConsole */ - NULL, /* domainInjectNMI */ + .no = VIR_DRV_LXC, + .name = "LXC", + .open = lxcOpen, + .close = lxcClose, + .version = lxcVersion, + .getHostname = virGetHostname, + .nodeGetInfo = nodeGetInfo, + .getCapabilities = lxcGetCapabilities, + .listDomains = lxcListDomains, + .numOfDomains = lxcNumDomains, + .domainCreateXML = lxcDomainCreateAndStart, + .domainLookupByID = lxcDomainLookupByID, + .domainLookupByUUID = lxcDomainLookupByUUID, + .domainLookupByName = lxcDomainLookupByName, + .domainSuspend = lxcDomainSuspend, + .domainResume = lxcDomainResume, + .domainDestroy = lxcDomainDestroy, + .domainGetOSType = lxcGetOSType, + .domainGetMaxMemory = lxcDomainGetMaxMemory, + .domainSetMaxMemory = lxcDomainSetMaxMemory, + .domainSetMemory = lxcDomainSetMemory, + .domainSetMemoryParameters = lxcDomainSetMemoryParameters, + .domainGetMemoryParameters = lxcDomainGetMemoryParameters, + .domainGetInfo = lxcDomainGetInfo, + .domainGetXMLDesc = lxcDomainGetXMLDesc, + .listDefinedDomains = lxcListDefinedDomains, + .numOfDefinedDomains = lxcNumDefinedDomains, + .domainCreate = lxcDomainStart, + .domainCreateWithFlags = lxcDomainStartWithFlags, + .domainDefineXML = lxcDomainDefine, + .domainUndefine = lxcDomainUndefine, + .domainGetAutostart = lxcDomainGetAutostart, + .domainSetAutostart = lxcDomainSetAutostart, + .domainGetSchedulerType = lxcGetSchedulerType, + .domainGetSchedulerParameters = lxcGetSchedulerParameters, + .domainSetSchedulerParameters = lxcSetSchedulerParameters, + .domainInterfaceStats = lxcDomainInterfaceStats, + .nodeGetCellsFreeMemory = nodeGetCellsFreeMemory, + .getFreeMemory = nodeGetFreeMemory, + .domainEventRegister = lxcDomainEventRegister, + .domainEventDeregister = lxcDomainEventDeregister, + .isEncrypted = lxcIsEncrypted, + .isSecure = lxcIsSecure, + .domainIsActive = lxcDomainIsActive, + .domainIsPersistent = lxcDomainIsPersistent, + .domainIsUpdated = lxcDomainIsUpdated, + .domainEventRegisterAny = lxcDomainEventRegisterAny, + .domainEventDeregisterAny = lxcDomainEventDeregisterAny, + .domainOpenConsole = lxcDomainOpenConsole, }; static virStateDriver lxcStateDriver = { diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index d6030a4..0373fca 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -2503,26 +2503,26 @@ cleanup: static virNetworkDriver networkDriver = { - "Network", - networkOpenNetwork, /* open */ - networkCloseNetwork, /* close */ - networkNumNetworks, /* numOfNetworks */ - networkListNetworks, /* listNetworks */ - networkNumDefinedNetworks, /* numOfDefinedNetworks */ - networkListDefinedNetworks, /* listDefinedNetworks */ - networkLookupByUUID, /* networkLookupByUUID */ - networkLookupByName, /* networkLookupByName */ - networkCreate, /* networkCreateXML */ - networkDefine, /* networkDefineXML */ - networkUndefine, /* networkUndefine */ - networkStart, /* networkCreate */ - networkDestroy, /* networkDestroy */ - networkGetXMLDesc, /* networkGetXMLDesc */ - networkGetBridgeName, /* networkGetBridgeName */ - networkGetAutostart, /* networkGetAutostart */ - networkSetAutostart, /* networkSetAutostart */ - networkIsActive, - networkIsPersistent, + .name = "Network", + .open = networkOpenNetwork, + .close = networkCloseNetwork, + .numOfNetworks = networkNumNetworks, + .listNetworks = networkListNetworks, + .numOfDefinedNetworks = networkNumDefinedNetworks, + .listDefinedNetworks = networkListDefinedNetworks, + .networkLookupByUUID = networkLookupByUUID, + .networkLookupByName = networkLookupByName, + .networkCreateXML = networkCreate, + .networkDefineXML = networkDefine, + .networkUndefine = networkUndefine, + .networkCreate = networkStart, + .networkDestroy = networkDestroy, + .networkGetXMLDesc = networkGetXMLDesc, + .networkGetBridgeName = networkGetBridgeName, + .networkGetAutostart = networkGetAutostart, + .networkSetAutostart = networkSetAutostart, + .networkIsActive = networkIsActive, + .networkIsPersistent = networkIsPersistent, }; static virStateDriver networkStateDriver = { diff --git a/src/openvz/openvz_driver.c b/src/openvz/openvz_driver.c index 3e1952f..157f73f 100644 --- a/src/openvz/openvz_driver.c +++ b/src/openvz/openvz_driver.c @@ -1543,118 +1543,46 @@ cleanup: } static virDriver openvzDriver = { - VIR_DRV_OPENVZ, - "OPENVZ", - openvzOpen, /* open */ - openvzClose, /* close */ - NULL, /* supports_feature */ - openvzGetType, /* type */ - openvzGetVersion, /* version */ - NULL, /* libvirtVersion (impl. in libvirt.c) */ - NULL, /* getHostname */ - NULL, /* getSysinfo */ - openvzGetMaxVCPUs, /* getMaxVcpus */ - nodeGetInfo, /* nodeGetInfo */ - openvzGetCapabilities, /* getCapabilities */ - openvzListDomains, /* listDomains */ - openvzNumDomains, /* numOfDomains */ - openvzDomainCreateXML, /* domainCreateXML */ - openvzDomainLookupByID, /* domainLookupByID */ - openvzDomainLookupByUUID, /* domainLookupByUUID */ - openvzDomainLookupByName, /* domainLookupByName */ - openvzDomainSuspend, /* domainSuspend */ - openvzDomainResume, /* domainResume */ - openvzDomainShutdown, /* domainShutdown */ - openvzDomainReboot, /* domainReboot */ - openvzDomainShutdown, /* domainDestroy */ - openvzGetOSType, /* domainGetOSType */ - NULL, /* domainGetMaxMemory */ - NULL, /* domainSetMaxMemory */ - NULL, /* domainSetMemory */ - NULL, /* domainSetMemoryFlags */ - NULL, /* domainSetMemoryParameters */ - NULL, /* domainGetMemoryParameters */ - NULL, /* domainSetBlkioParameters */ - NULL, /* domainGetBlkioParameters */ - openvzDomainGetInfo, /* domainGetInfo */ - NULL, /* domainSave */ - NULL, /* domainRestore */ - NULL, /* domainCoreDump */ - NULL, /* domainScreenshot */ - openvzDomainSetVcpus, /* domainSetVcpus */ - openvzDomainSetVcpusFlags, /* domainSetVcpusFlags */ - openvzDomainGetVcpusFlags, /* domainGetVcpusFlags */ - NULL, /* domainPinVcpu */ - NULL, /* domainGetVcpus */ - openvzDomainGetMaxVcpus, /* domainGetMaxVcpus */ - NULL, /* domainGetSecurityLabel */ - NULL, /* nodeGetSecurityModel */ - openvzDomainGetXMLDesc, /* domainGetXMLDesc */ - NULL, /* domainXmlFromNative */ - NULL, /* domainXmlToNative */ - openvzListDefinedDomains, /* listDefinedDomains */ - openvzNumDefinedDomains, /* numOfDefinedDomains */ - openvzDomainCreate, /* domainCreate */ - openvzDomainCreateWithFlags, /* domainCreateWithFlags */ - openvzDomainDefineXML, /* domainDefineXML */ - openvzDomainUndefine, /* domainUndefine */ - NULL, /* domainAttachDevice */ - NULL, /* domainAttachDeviceFlags */ - NULL, /* domainDetachDevice */ - NULL, /* domainDetachDeviceFlags */ - NULL, /* domainUpdateDeviceFlags */ - openvzDomainGetAutostart, /* domainGetAutostart */ - openvzDomainSetAutostart, /* domainSetAutostart */ - NULL, /* domainGetSchedulerType */ - NULL, /* domainGetSchedulerParameters */ - NULL, /* domainSetSchedulerParameters */ - NULL, /* domainMigratePrepare */ - NULL, /* domainMigratePerform */ - NULL, /* domainMigrateFinish */ - NULL, /* domainBlockStats */ - NULL, /* domainInterfaceStats */ - NULL, /* domainMemoryStats */ - NULL, /* domainBlockPeek */ - NULL, /* domainMemoryPeek */ - NULL, /* domainGetBlockInfo */ - NULL, /* nodeGetCellsFreeMemory */ - NULL, /* getFreeMemory */ - NULL, /* domainEventRegister */ - NULL, /* domainEventDeregister */ - NULL, /* domainMigratePrepare2 */ - NULL, /* domainMigrateFinish2 */ - NULL, /* nodeDeviceDettach */ - NULL, /* nodeDeviceReAttach */ - NULL, /* nodeDeviceReset */ - NULL, /* domainMigratePrepareTunnel */ - openvzIsEncrypted, - openvzIsSecure, - openvzDomainIsActive, - openvzDomainIsPersistent, - openvzDomainIsUpdated, /* domainIsUpdated */ - NULL, /* cpuCompare */ - NULL, /* cpuBaseline */ - NULL, /* domainGetJobInfo */ - NULL, /* domainAbortJob */ - NULL, /* domainMigrateSetMaxDowntime */ - NULL, /* domainMigrateSetMaxSpeed */ - NULL, /* domainEventRegisterAny */ - NULL, /* domainEventDeregisterAny */ - NULL, /* domainManagedSave */ - NULL, /* domainHasManagedSaveImage */ - NULL, /* domainManagedSaveRemove */ - NULL, /* domainSnapshotCreateXML */ - NULL, /* domainSnapshotGetXMLDesc */ - NULL, /* domainSnapshotNum */ - NULL, /* domainSnapshotListNames */ - NULL, /* domainSnapshotLookupByName */ - NULL, /* domainHasCurrentSnapshot */ - NULL, /* domainSnapshotCurrent */ - NULL, /* domainRevertToSnapshot */ - NULL, /* domainSnapshotDelete */ - NULL, /* qemuDomainMonitorCommand */ - NULL, /* domainOpenConsole */ - NULL, /* domainInjectNMI */ + .no = VIR_DRV_OPENVZ, + .name = "OPENVZ", + .open = openvzOpen, + .close = openvzClose, + .type = openvzGetType, + .version = openvzGetVersion, + .getMaxVcpus = openvzGetMaxVCPUs, + .nodeGetInfo = nodeGetInfo, + .getCapabilities = openvzGetCapabilities, + .listDomains = openvzListDomains, + .numOfDomains = openvzNumDomains, + .domainCreateXML = openvzDomainCreateXML, + .domainLookupByID = openvzDomainLookupByID, + .domainLookupByUUID = openvzDomainLookupByUUID, + .domainLookupByName = openvzDomainLookupByName, + .domainSuspend = openvzDomainSuspend, + .domainResume = openvzDomainResume, + .domainShutdown = openvzDomainShutdown, + .domainReboot = openvzDomainReboot, + .domainDestroy = openvzDomainShutdown, + .domainGetOSType = openvzGetOSType, + .domainGetInfo = openvzDomainGetInfo, + .domainSetVcpus = openvzDomainSetVcpus, + .domainSetVcpusFlags = openvzDomainSetVcpusFlags, + .domainGetVcpusFlags = openvzDomainGetVcpusFlags, + .domainGetMaxVcpus = openvzDomainGetMaxVcpus, + .domainGetXMLDesc = openvzDomainGetXMLDesc, + .listDefinedDomains = openvzListDefinedDomains, + .numOfDefinedDomains = openvzNumDefinedDomains, + .domainCreate = openvzDomainCreate, + .domainCreateWithFlags = openvzDomainCreateWithFlags, + .domainDefineXML = openvzDomainDefineXML, + .domainUndefine = openvzDomainUndefine, + .domainGetAutostart = openvzDomainGetAutostart, + .domainSetAutostart = openvzDomainSetAutostart, + .isEncrypted = openvzIsEncrypted, + .isSecure = openvzIsSecure, + .domainIsActive = openvzDomainIsActive, + .domainIsPersistent = openvzDomainIsPersistent, + .domainIsUpdated = openvzDomainIsUpdated, }; int openvzRegister(void) { diff --git a/src/phyp/phyp_driver.c b/src/phyp/phyp_driver.c index 8b6fa69..1f05f60 100644 --- a/src/phyp/phyp_driver.c +++ b/src/phyp/phyp_driver.c @@ -3725,116 +3725,32 @@ phypVIOSDriverClose(virConnectPtr conn ATTRIBUTE_UNUSED) } static virDriver phypDriver = { - VIR_DRV_PHYP, "PHYP", phypOpen, /* open */ - phypClose, /* close */ - NULL, /* supports_feature */ - NULL, /* type */ - NULL, /* version */ - NULL, /* libvirtVersion (impl. in libvirt.c) */ - NULL, /* getHostname */ - NULL, /* getSysinfo */ - NULL, /* getMaxVcpus */ - NULL, /* nodeGetInfo */ - phypConnectGetCapabilities, /* getCapabilities */ - phypListDomains, /* listDomains */ - phypNumDomains, /* numOfDomains */ - phypDomainCreateAndStart, /* domainCreateXML */ - phypDomainLookupByID, /* domainLookupByID */ - NULL, /* domainLookupByUUID */ - phypDomainLookupByName, /* domainLookupByName */ - NULL, /* domainSuspend */ - phypDomainResume, /* domainResume */ - phypDomainShutdown, /* domainShutdown */ - phypDomainReboot, /* domainReboot */ - phypDomainDestroy, /* domainDestroy */ - NULL, /* domainGetOSType */ - NULL, /* domainGetMaxMemory */ - NULL, /* domainSetMaxMemory */ - NULL, /* domainSetMemory */ - NULL, /* domainSetMemoryFlags */ - NULL, /* domainSetMemoryParameters */ - NULL, /* domainGetMemoryParameters */ - NULL, /* domainSetBlkioParameters */ - NULL, /* domainGetBlkioParameters */ - phypDomainGetInfo, /* domainGetInfo */ - NULL, /* domainSave */ - NULL, /* domainRestore */ - NULL, /* domainCoreDump */ - NULL, /* domainScreenshot */ - phypDomainSetCPU, /* domainSetVcpus */ - phypDomainSetVcpusFlags, /* domainSetVcpusFlags */ - phypDomainGetVcpusFlags, /* domainGetVcpusFlags */ - NULL, /* domainPinVcpu */ - NULL, /* domainGetVcpus */ - phypGetLparCPUMAX, /* domainGetMaxVcpus */ - NULL, /* domainGetSecurityLabel */ - NULL, /* nodeGetSecurityModel */ - phypDomainGetXMLDesc, /* domainGetXMLDesc */ - NULL, /* domainXMLFromNative */ - NULL, /* domainXMLToNative */ - phypListDefinedDomains, /* listDefinedDomains */ - phypNumDefinedDomains, /* numOfDefinedDomains */ - NULL, /* domainCreate */ - NULL, /* domainCreateWithFlags */ - NULL, /* domainDefineXML */ - NULL, /* domainUndefine */ - phypAttachDevice, /* domainAttachDevice */ - NULL, /* domainAttachDeviceFlags */ - NULL, /* domainDetachDevice */ - NULL, /* domainDetachDeviceFlags */ - NULL, /* domainUpdateDeviceFlags */ - NULL, /* domainGetAutostart */ - NULL, /* domainSetAutostart */ - NULL, /* domainGetSchedulerType */ - NULL, /* domainGetSchedulerParameters */ - NULL, /* domainSetSchedulerParameters */ - NULL, /* domainMigratePrepare */ - NULL, /* domainMigratePerform */ - NULL, /* domainMigrateFinish */ - NULL, /* domainBlockStats */ - NULL, /* domainInterfaceStats */ - NULL, /* domainMemoryStats */ - NULL, /* domainBlockPeek */ - NULL, /* domainMemoryPeek */ - NULL, /* domainGetBlockInfo */ - NULL, /* nodeGetCellsFreeMemory */ - NULL, /* getFreeMemory */ - NULL, /* domainEventRegister */ - NULL, /* domainEventDeregister */ - NULL, /* domainMigratePrepare2 */ - NULL, /* domainMigrateFinish2 */ - NULL, /* nodeDeviceDettach */ - NULL, /* nodeDeviceReAttach */ - NULL, /* nodeDeviceReset */ - NULL, /* domainMigratePrepareTunnel */ - phypIsEncrypted, /* isEncrypted */ - phypIsSecure, /* isSecure */ - NULL, /* domainIsActive */ - NULL, /* domainIsPersistent */ - phypIsUpdated, /* domainIsUpdated */ - NULL, /* cpuCompare */ - NULL, /* cpuBaseline */ - NULL, /* domainGetJobInfo */ - NULL, /* domainAbortJob */ - NULL, /* domainMigrateSetMaxDowntime */ - NULL, /* domainMigrateSetMaxSpeed */ - NULL, /* domainEventRegisterAny */ - NULL, /* domainEventDeregisterAny */ - NULL, /* domainManagedSave */ - NULL, /* domainHasManagedSaveImage */ - NULL, /* domainManagedSaveRemove */ - NULL, /* domainSnapshotCreateXML */ - NULL, /* domainSnapshotGetXMLDesc */ - NULL, /* domainSnapshotNum */ - NULL, /* domainSnapshotListNames */ - NULL, /* domainSnapshotLookupByName */ - NULL, /* domainHasCurrentSnapshot */ - NULL, /* domainSnapshotCurrent */ - NULL, /* domainRevertToSnapshot */ - NULL, /* domainSnapshotDelete */ - NULL, /* qemuMonitorCommand */ - NULL, /* domainOpenConsole */ - NULL, /* domainInjectNMI */ + .no = VIR_DRV_PHYP, + .name = "PHYP", + .open = phypOpen, + .close = phypClose, + .getCapabilities = phypConnectGetCapabilities, + .listDomains = phypListDomains, + .numOfDomains = phypNumDomains, + .domainCreateXML = phypDomainCreateAndStart, + .domainLookupByID = phypDomainLookupByID, + .domainLookupByName = phypDomainLookupByName, + .domainResume = phypDomainResume, + .domainShutdown = phypDomainShutdown, + .domainReboot = phypDomainReboot, + .domainDestroy = phypDomainDestroy, + .domainGetInfo = phypDomainGetInfo, + .domainSetVcpus = phypDomainSetCPU, + .domainSetVcpusFlags = phypDomainSetVcpusFlags, + .domainGetVcpusFlags = phypDomainGetVcpusFlags, + .domainGetMaxVcpus = phypGetLparCPUMAX, + .domainGetXMLDesc = phypDomainGetXMLDesc, + .listDefinedDomains = phypListDefinedDomains, + .numOfDefinedDomains = phypNumDefinedDomains, + .domainAttachDevice = phypAttachDevice, + .isEncrypted = phypIsEncrypted, + .isSecure = phypIsSecure, + .domainIsUpdated = phypIsUpdated, }; static virStorageDriver phypStorageDriver = { diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index fff41e0..c9eb279 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -7212,118 +7212,114 @@ cleanup: static virDriver qemuDriver = { - VIR_DRV_QEMU, - "QEMU", - qemudOpen, /* open */ - qemudClose, /* close */ - qemudSupportsFeature, /* supports_feature */ - qemudGetType, /* type */ - qemudGetVersion, /* version */ - NULL, /* libvirtVersion (impl. in libvirt.c) */ - virGetHostname, /* getHostname */ - qemuGetSysinfo, /* getSysinfo */ - qemudGetMaxVCPUs, /* getMaxVcpus */ - nodeGetInfo, /* nodeGetInfo */ - qemudGetCapabilities, /* getCapabilities */ - qemudListDomains, /* listDomains */ - qemudNumDomains, /* numOfDomains */ - qemudDomainCreate, /* domainCreateXML */ - qemudDomainLookupByID, /* domainLookupByID */ - qemudDomainLookupByUUID, /* domainLookupByUUID */ - qemudDomainLookupByName, /* domainLookupByName */ - qemudDomainSuspend, /* domainSuspend */ - qemudDomainResume, /* domainResume */ - qemudDomainShutdown, /* domainShutdown */ - NULL, /* domainReboot */ - qemudDomainDestroy, /* domainDestroy */ - qemudDomainGetOSType, /* domainGetOSType */ - qemudDomainGetMaxMemory, /* domainGetMaxMemory */ - qemudDomainSetMaxMemory, /* domainSetMaxMemory */ - qemudDomainSetMemory, /* domainSetMemory */ - qemudDomainSetMemoryFlags, /* domainSetMemoryFlags */ - qemuDomainSetMemoryParameters, /* domainSetMemoryParameters */ - qemuDomainGetMemoryParameters, /* domainGetMemoryParameters */ - qemuDomainSetBlkioParameters, /* domainSetBlkioParameters */ - qemuDomainGetBlkioParameters, /* domainGetBlkioParameters */ - qemudDomainGetInfo, /* domainGetInfo */ - qemudDomainSave, /* domainSave */ - qemuDomainRestore, /* domainRestore */ - qemudDomainCoreDump, /* domainCoreDump */ - qemuDomainScreenshot, /* domainScreenshot */ - qemudDomainSetVcpus, /* domainSetVcpus */ - qemudDomainSetVcpusFlags, /* domainSetVcpusFlags */ - qemudDomainGetVcpusFlags, /* domainGetVcpusFlags */ - qemudDomainPinVcpu, /* domainPinVcpu */ - qemudDomainGetVcpus, /* domainGetVcpus */ - qemudDomainGetMaxVcpus, /* domainGetMaxVcpus */ - qemudDomainGetSecurityLabel, /* domainGetSecurityLabel */ - qemudNodeGetSecurityModel, /* nodeGetSecurityModel */ - qemuDomainGetXMLDesc, /* domainGetXMLDesc */ - qemuDomainXMLFromNative, /* domainXmlFromNative */ - qemuDomainXMLToNative, /* domainXMLToNative */ - qemudListDefinedDomains, /* listDefinedDomains */ - qemudNumDefinedDomains, /* numOfDefinedDomains */ - qemudDomainStart, /* domainCreate */ - qemudDomainStartWithFlags, /* domainCreateWithFlags */ - qemudDomainDefine, /* domainDefineXML */ - qemudDomainUndefine, /* domainUndefine */ - qemuDomainAttachDevice, /* domainAttachDevice */ - qemuDomainAttachDeviceFlags, /* domainAttachDeviceFlags */ - qemuDomainDetachDevice, /* domainDetachDevice */ - qemuDomainDetachDeviceFlags, /* domainDetachDeviceFlags */ - qemuDomainUpdateDeviceFlags, /* domainUpdateDeviceFlags */ - qemudDomainGetAutostart, /* domainGetAutostart */ - qemudDomainSetAutostart, /* domainSetAutostart */ - qemuGetSchedulerType, /* domainGetSchedulerType */ - qemuGetSchedulerParameters, /* domainGetSchedulerParameters */ - qemuSetSchedulerParameters, /* domainSetSchedulerParameters */ - NULL, /* domainMigratePrepare (v1) */ - qemudDomainMigratePerform, /* domainMigratePerform */ - NULL, /* domainMigrateFinish */ - qemudDomainBlockStats, /* domainBlockStats */ - qemudDomainInterfaceStats, /* domainInterfaceStats */ - qemudDomainMemoryStats, /* domainMemoryStats */ - qemudDomainBlockPeek, /* domainBlockPeek */ - qemudDomainMemoryPeek, /* domainMemoryPeek */ - qemuDomainGetBlockInfo, /* domainGetBlockInfo */ - nodeGetCellsFreeMemory, /* nodeGetCellsFreeMemory */ - nodeGetFreeMemory, /* getFreeMemory */ - qemuDomainEventRegister, /* domainEventRegister */ - qemuDomainEventDeregister, /* domainEventDeregister */ - qemudDomainMigratePrepare2, /* domainMigratePrepare2 */ - qemudDomainMigrateFinish2, /* domainMigrateFinish2 */ - qemudNodeDeviceDettach, /* nodeDeviceDettach */ - qemudNodeDeviceReAttach, /* nodeDeviceReAttach */ - qemudNodeDeviceReset, /* nodeDeviceReset */ - qemudDomainMigratePrepareTunnel, /* domainMigratePrepareTunnel */ - qemuIsEncrypted, /* isEncrypted */ - qemuIsSecure, /* isSecure */ - qemuDomainIsActive, /* domainIsActive */ - qemuDomainIsPersistent, /* domainIsPersistent */ - qemuDomainIsUpdated, /* domainIsUpdated */ - qemuCPUCompare, /* cpuCompare */ - qemuCPUBaseline, /* cpuBaseline */ - qemuDomainGetJobInfo, /* domainGetJobInfo */ - qemuDomainAbortJob, /* domainAbortJob */ - qemuDomainMigrateSetMaxDowntime, /* domainMigrateSetMaxDowntime */ - qemuDomainMigrateSetMaxSpeed, /* domainMigrateSetMaxSpeed */ - qemuDomainEventRegisterAny, /* domainEventRegisterAny */ - qemuDomainEventDeregisterAny, /* domainEventDeregisterAny */ - qemuDomainManagedSave, /* domainManagedSave */ - qemuDomainHasManagedSaveImage, /* domainHasManagedSaveImage */ - qemuDomainManagedSaveRemove, /* domainManagedSaveRemove */ - qemuDomainSnapshotCreateXML, /* domainSnapshotCreateXML */ - qemuDomainSnapshotGetXMLDesc, /* domainSnapshotGetXMLDesc */ - qemuDomainSnapshotNum, /* domainSnapshotNum */ - qemuDomainSnapshotListNames, /* domainSnapshotListNames */ - qemuDomainSnapshotLookupByName, /* domainSnapshotLookupByName */ - qemuDomainHasCurrentSnapshot, /* domainHasCurrentSnapshot */ - qemuDomainSnapshotCurrent, /* domainSnapshotCurrent */ - qemuDomainRevertToSnapshot, /* domainRevertToSnapshot */ - qemuDomainSnapshotDelete, /* domainSnapshotDelete */ - qemuDomainMonitorCommand, /* qemuDomainMonitorCommand */ - qemuDomainOpenConsole, /* domainOpenConsole */ - qemuDomainInjectNMI, /* domainInjectNMI */ + .no = VIR_DRV_QEMU, + .name = "QEMU", + .open = qemudOpen, + .close = qemudClose, + .supports_feature = qemudSupportsFeature, + .type = qemudGetType, + .version = qemudGetVersion, + .getHostname = virGetHostname, + .getSysinfo = qemuGetSysinfo, + .getMaxVcpus = qemudGetMaxVCPUs, + .nodeGetInfo = nodeGetInfo, + .getCapabilities = qemudGetCapabilities, + .listDomains = qemudListDomains, + .numOfDomains = qemudNumDomains, + .domainCreateXML = qemudDomainCreate, + .domainLookupByID = qemudDomainLookupByID, + .domainLookupByUUID = qemudDomainLookupByUUID, + .domainLookupByName = qemudDomainLookupByName, + .domainSuspend = qemudDomainSuspend, + .domainResume = qemudDomainResume, + .domainShutdown = qemudDomainShutdown, + .domainDestroy = qemudDomainDestroy, + .domainGetOSType = qemudDomainGetOSType, + .domainGetMaxMemory = qemudDomainGetMaxMemory, + .domainSetMaxMemory = qemudDomainSetMaxMemory, + .domainSetMemory = qemudDomainSetMemory, + .domainSetMemoryFlags = qemudDomainSetMemoryFlags, + .domainSetMemoryParameters = qemuDomainSetMemoryParameters, + .domainGetMemoryParameters = qemuDomainGetMemoryParameters, + .domainSetBlkioParameters = qemuDomainSetBlkioParameters, + .domainGetBlkioParameters = qemuDomainGetBlkioParameters, + .domainGetInfo = qemudDomainGetInfo, + .domainSave = qemudDomainSave, + .domainRestore = qemuDomainRestore, + .domainCoreDump = qemudDomainCoreDump, + .domainScreenshot = qemuDomainScreenshot, + .domainSetVcpus = qemudDomainSetVcpus, + .domainSetVcpusFlags = qemudDomainSetVcpusFlags, + .domainGetVcpusFlags = qemudDomainGetVcpusFlags, + .domainPinVcpu = qemudDomainPinVcpu, + .domainGetVcpus = qemudDomainGetVcpus, + .domainGetMaxVcpus = qemudDomainGetMaxVcpus, + .domainGetSecurityLabel = qemudDomainGetSecurityLabel, + .nodeGetSecurityModel = qemudNodeGetSecurityModel, + .domainGetXMLDesc = qemuDomainGetXMLDesc, + .domainXMLFromNative = qemuDomainXMLFromNative, + .domainXMLToNative = qemuDomainXMLToNative, + .listDefinedDomains = qemudListDefinedDomains, + .numOfDefinedDomains = qemudNumDefinedDomains, + .domainCreate = qemudDomainStart, + .domainCreateWithFlags = qemudDomainStartWithFlags, + .domainDefineXML = qemudDomainDefine, + .domainUndefine = qemudDomainUndefine, + .domainAttachDevice = qemuDomainAttachDevice, + .domainAttachDeviceFlags = qemuDomainAttachDeviceFlags, + .domainDetachDevice = qemuDomainDetachDevice, + .domainDetachDeviceFlags = qemuDomainDetachDeviceFlags, + .domainUpdateDeviceFlags = qemuDomainUpdateDeviceFlags, + .domainGetAutostart = qemudDomainGetAutostart, + .domainSetAutostart = qemudDomainSetAutostart, + .domainGetSchedulerType = qemuGetSchedulerType, + .domainGetSchedulerParameters = qemuGetSchedulerParameters, + .domainSetSchedulerParameters = qemuSetSchedulerParameters, + .domainMigratePerform = qemudDomainMigratePerform, + .domainBlockStats = qemudDomainBlockStats, + .domainInterfaceStats = qemudDomainInterfaceStats, + .domainMemoryStats = qemudDomainMemoryStats, + .domainBlockPeek = qemudDomainBlockPeek, + .domainMemoryPeek = qemudDomainMemoryPeek, + .domainGetBlockInfo = qemuDomainGetBlockInfo, + .nodeGetCellsFreeMemory = nodeGetCellsFreeMemory, + .getFreeMemory = nodeGetFreeMemory, + .domainEventRegister = qemuDomainEventRegister, + .domainEventDeregister = qemuDomainEventDeregister, + .domainMigratePrepare2 = qemudDomainMigratePrepare2, + .domainMigrateFinish2 = qemudDomainMigrateFinish2, + .nodeDeviceDettach = qemudNodeDeviceDettach, + .nodeDeviceReAttach = qemudNodeDeviceReAttach, + .nodeDeviceReset = qemudNodeDeviceReset, + .domainMigratePrepareTunnel = qemudDomainMigratePrepareTunnel, + .isEncrypted = qemuIsEncrypted, + .isSecure = qemuIsSecure, + .domainIsActive = qemuDomainIsActive, + .domainIsPersistent = qemuDomainIsPersistent, + .domainIsUpdated = qemuDomainIsUpdated, + .cpuCompare = qemuCPUCompare, + .cpuBaseline = qemuCPUBaseline, + .domainGetJobInfo = qemuDomainGetJobInfo, + .domainAbortJob = qemuDomainAbortJob, + .domainMigrateSetMaxDowntime = qemuDomainMigrateSetMaxDowntime, + .domainMigrateSetMaxSpeed = qemuDomainMigrateSetMaxSpeed, + .domainEventRegisterAny = qemuDomainEventRegisterAny, + .domainEventDeregisterAny = qemuDomainEventDeregisterAny, + .domainManagedSave = qemuDomainManagedSave, + .domainHasManagedSaveImage = qemuDomainHasManagedSaveImage, + .domainManagedSaveRemove = qemuDomainManagedSaveRemove, + .domainSnapshotCreateXML = qemuDomainSnapshotCreateXML, + .domainSnapshotGetXMLDesc = qemuDomainSnapshotGetXMLDesc, + .domainSnapshotNum = qemuDomainSnapshotNum, + .domainSnapshotListNames = qemuDomainSnapshotListNames, + .domainSnapshotLookupByName = qemuDomainSnapshotLookupByName, + .domainHasCurrentSnapshot = qemuDomainHasCurrentSnapshot, + .domainSnapshotCurrent = qemuDomainSnapshotCurrent, + .domainRevertToSnapshot = qemuDomainRevertToSnapshot, + .domainSnapshotDelete = qemuDomainSnapshotDelete, + .qemuDomainMonitorCommand = qemuDomainMonitorCommand, + .domainOpenConsole = qemuDomainOpenConsole, + .domainInjectNMI = qemuDomainInjectNMI, }; diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index 1847577..bd5db15 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -6364,118 +6364,118 @@ unsigned long remoteVersion(void) } static virDriver remote_driver = { - VIR_DRV_REMOTE, - "remote", - remoteOpen, /* open */ - remoteClose, /* close */ - remoteSupportsFeature, /* supports_feature */ - remoteType, /* type */ - remoteGetVersion, /* version */ - remoteGetLibVersion, /* libvirtVersion */ - remoteGetHostname, /* getHostname */ - remoteGetSysinfo, /* getSysinfo */ - remoteGetMaxVcpus, /* getMaxVcpus */ - remoteNodeGetInfo, /* nodeGetInfo */ - remoteGetCapabilities, /* getCapabilities */ - remoteListDomains, /* listDomains */ - remoteNumOfDomains, /* numOfDomains */ - remoteDomainCreateXML, /* domainCreateXML */ - remoteDomainLookupByID, /* domainLookupByID */ - remoteDomainLookupByUUID, /* domainLookupByUUID */ - remoteDomainLookupByName, /* domainLookupByName */ - remoteDomainSuspend, /* domainSuspend */ - remoteDomainResume, /* domainResume */ - remoteDomainShutdown, /* domainShutdown */ - remoteDomainReboot, /* domainReboot */ - remoteDomainDestroy, /* domainDestroy */ - remoteDomainGetOSType, /* domainGetOSType */ - remoteDomainGetMaxMemory, /* domainGetMaxMemory */ - remoteDomainSetMaxMemory, /* domainSetMaxMemory */ - remoteDomainSetMemory, /* domainSetMemory */ - remoteDomainSetMemoryFlags, /* domainSetMemoryFlags */ - remoteDomainSetMemoryParameters, /* domainSetMemoryParameters */ - remoteDomainGetMemoryParameters, /* domainGetMemoryParameters */ - remoteDomainSetBlkioParameters, /* domainSetBlkioParameters */ - remoteDomainGetBlkioParameters, /* domainGetBlkioParameters */ - remoteDomainGetInfo, /* domainGetInfo */ - remoteDomainSave, /* domainSave */ - remoteDomainRestore, /* domainRestore */ - remoteDomainCoreDump, /* domainCoreDump */ - remoteDomainScreenshot, /* domainScreenshot */ - remoteDomainSetVcpus, /* domainSetVcpus */ - remoteDomainSetVcpusFlags, /* domainSetVcpusFlags */ - remoteDomainGetVcpusFlags, /* domainGetVcpusFlags */ - remoteDomainPinVcpu, /* domainPinVcpu */ - remoteDomainGetVcpus, /* domainGetVcpus */ - remoteDomainGetMaxVcpus, /* domainGetMaxVcpus */ - remoteDomainGetSecurityLabel, /* domainGetSecurityLabel */ - remoteNodeGetSecurityModel, /* nodeGetSecurityModel */ - remoteDomainGetXMLDesc, /* domainGetXMLDesc */ - remoteDomainXMLFromNative, /* domainXMLFromNative */ - remoteDomainXMLToNative, /* domainXMLToNative */ - remoteListDefinedDomains, /* listDefinedDomains */ - remoteNumOfDefinedDomains, /* numOfDefinedDomains */ - remoteDomainCreate, /* domainCreate */ - remoteDomainCreateWithFlags, /* domainCreateWithFlags */ - remoteDomainDefineXML, /* domainDefineXML */ - remoteDomainUndefine, /* domainUndefine */ - remoteDomainAttachDevice, /* domainAttachDevice */ - remoteDomainAttachDeviceFlags, /* domainAttachDeviceFlags */ - remoteDomainDetachDevice, /* domainDetachDevice */ - remoteDomainDetachDeviceFlags, /* domainDetachDeviceFlags */ - remoteDomainUpdateDeviceFlags, /* domainUpdateDeviceFlags */ - remoteDomainGetAutostart, /* domainGetAutostart */ - remoteDomainSetAutostart, /* domainSetAutostart */ - remoteDomainGetSchedulerType, /* domainGetSchedulerType */ - remoteDomainGetSchedulerParameters, /* domainGetSchedulerParameters */ - remoteDomainSetSchedulerParameters, /* domainSetSchedulerParameters */ - remoteDomainMigratePrepare, /* domainMigratePrepare */ - remoteDomainMigratePerform, /* domainMigratePerform */ - remoteDomainMigrateFinish, /* domainMigrateFinish */ - remoteDomainBlockStats, /* domainBlockStats */ - remoteDomainInterfaceStats, /* domainInterfaceStats */ - remoteDomainMemoryStats, /* domainMemoryStats */ - remoteDomainBlockPeek, /* domainBlockPeek */ - remoteDomainMemoryPeek, /* domainMemoryPeek */ - remoteDomainGetBlockInfo, /* domainGetBlockInfo */ - remoteNodeGetCellsFreeMemory, /* nodeGetCellsFreeMemory */ - remoteNodeGetFreeMemory, /* getFreeMemory */ - remoteDomainEventRegister, /* domainEventRegister */ - remoteDomainEventDeregister, /* domainEventDeregister */ - remoteDomainMigratePrepare2, /* domainMigratePrepare2 */ - remoteDomainMigrateFinish2, /* domainMigrateFinish2 */ - remoteNodeDeviceDettach, /* nodeDeviceDettach */ - remoteNodeDeviceReAttach, /* nodeDeviceReAttach */ - remoteNodeDeviceReset, /* nodeDeviceReset */ - remoteDomainMigratePrepareTunnel, /* domainMigratePrepareTunnel */ - remoteIsEncrypted, /* isEncrypted */ - remoteIsSecure, /* isSecure */ - remoteDomainIsActive, /* domainIsActive */ - remoteDomainIsPersistent, /* domainIsPersistent */ - remoteDomainIsUpdated, /* domainIsUpdated */ - remoteCPUCompare, /* cpuCompare */ - remoteCPUBaseline, /* cpuBaseline */ - remoteDomainGetJobInfo, /* domainGetJobInfo */ - remoteDomainAbortJob, /* domainFinishJob */ - remoteDomainMigrateSetMaxDowntime, /* domainMigrateSetMaxDowntime */ - remoteDomainMigrateSetMaxSpeed, /* domainMigrateSetMaxSpeed */ - remoteDomainEventRegisterAny, /* domainEventRegisterAny */ - remoteDomainEventDeregisterAny, /* domainEventDeregisterAny */ - remoteDomainManagedSave, /* domainManagedSave */ - remoteDomainHasManagedSaveImage, /* domainHasManagedSaveImage */ - remoteDomainManagedSaveRemove, /* domainManagedSaveRemove */ - remoteDomainSnapshotCreateXML, /* domainSnapshotCreateXML */ - remoteDomainSnapshotGetXMLDesc, /* domainSnapshotGetXMLDesc */ - remoteDomainSnapshotNum, /* domainSnapshotNum */ - remoteDomainSnapshotListNames, /* domainSnapshotListNames */ - remoteDomainSnapshotLookupByName, /* domainSnapshotLookupByName */ - remoteDomainHasCurrentSnapshot, /* domainHasCurrentSnapshot */ - remoteDomainSnapshotCurrent, /* domainSnapshotCurrent */ - remoteDomainRevertToSnapshot, /* domainRevertToSnapshot */ - remoteDomainSnapshotDelete, /* domainSnapshotDelete */ - remoteQemuDomainMonitorCommand, /* qemuDomainMonitorCommand */ - remoteDomainOpenConsole, /* domainOpenConsole */ - remoteDomainInjectNMI, /* domainInjectNMI */ + .no = VIR_DRV_REMOTE, + .name = "remote", + .open = remoteOpen, + .close = remoteClose, + .supports_feature = remoteSupportsFeature, + .type = remoteType, + .version = remoteGetVersion, + .libvirtVersion = remoteGetLibVersion, + .getHostname = remoteGetHostname, + .getSysinfo = remoteGetSysinfo, + .getMaxVcpus = remoteGetMaxVcpus, + .nodeGetInfo = remoteNodeGetInfo, + .getCapabilities = remoteGetCapabilities, + .listDomains = remoteListDomains, + .numOfDomains = remoteNumOfDomains, + .domainCreateXML = remoteDomainCreateXML, + .domainLookupByID = remoteDomainLookupByID, + .domainLookupByUUID = remoteDomainLookupByUUID, + .domainLookupByName = remoteDomainLookupByName, + .domainSuspend = remoteDomainSuspend, + .domainResume = remoteDomainResume, + .domainShutdown = remoteDomainShutdown, + .domainReboot = remoteDomainReboot, + .domainDestroy = remoteDomainDestroy, + .domainGetOSType = remoteDomainGetOSType, + .domainGetMaxMemory = remoteDomainGetMaxMemory, + .domainSetMaxMemory = remoteDomainSetMaxMemory, + .domainSetMemory = remoteDomainSetMemory, + .domainSetMemoryFlags = remoteDomainSetMemoryFlags, + .domainSetMemoryParameters = remoteDomainSetMemoryParameters, + .domainGetMemoryParameters = remoteDomainGetMemoryParameters, + .domainSetBlkioParameters = remoteDomainSetBlkioParameters, + .domainGetBlkioParameters = remoteDomainGetBlkioParameters, + .domainGetInfo = remoteDomainGetInfo, + .domainSave = remoteDomainSave, + .domainRestore = remoteDomainRestore, + .domainCoreDump = remoteDomainCoreDump, + .domainScreenshot = remoteDomainScreenshot, + .domainSetVcpus = remoteDomainSetVcpus, + .domainSetVcpusFlags = remoteDomainSetVcpusFlags, + .domainGetVcpusFlags = remoteDomainGetVcpusFlags, + .domainPinVcpu = remoteDomainPinVcpu, + .domainGetVcpus = remoteDomainGetVcpus, + .domainGetMaxVcpus = remoteDomainGetMaxVcpus, + .domainGetSecurityLabel = remoteDomainGetSecurityLabel, + .nodeGetSecurityModel = remoteNodeGetSecurityModel, + .domainGetXMLDesc = remoteDomainGetXMLDesc, + .domainXMLFromNative = remoteDomainXMLFromNative, + .domainXMLToNative = remoteDomainXMLToNative, + .listDefinedDomains = remoteListDefinedDomains, + .numOfDefinedDomains = remoteNumOfDefinedDomains, + .domainCreate = remoteDomainCreate, + .domainCreateWithFlags = remoteDomainCreateWithFlags, + .domainDefineXML = remoteDomainDefineXML, + .domainUndefine = remoteDomainUndefine, + .domainAttachDevice = remoteDomainAttachDevice, + .domainAttachDeviceFlags = remoteDomainAttachDeviceFlags, + .domainDetachDevice = remoteDomainDetachDevice, + .domainDetachDeviceFlags = remoteDomainDetachDeviceFlags, + .domainUpdateDeviceFlags = remoteDomainUpdateDeviceFlags, + .domainGetAutostart = remoteDomainGetAutostart, + .domainSetAutostart = remoteDomainSetAutostart, + .domainGetSchedulerType = remoteDomainGetSchedulerType, + .domainGetSchedulerParameters = remoteDomainGetSchedulerParameters, + .domainSetSchedulerParameters = remoteDomainSetSchedulerParameters, + .domainMigratePrepare = remoteDomainMigratePrepare, + .domainMigratePerform = remoteDomainMigratePerform, + .domainMigrateFinish = remoteDomainMigrateFinish, + .domainBlockStats = remoteDomainBlockStats, + .domainInterfaceStats = remoteDomainInterfaceStats, + .domainMemoryStats = remoteDomainMemoryStats, + .domainBlockPeek = remoteDomainBlockPeek, + .domainMemoryPeek = remoteDomainMemoryPeek, + .domainGetBlockInfo = remoteDomainGetBlockInfo, + .nodeGetCellsFreeMemory = remoteNodeGetCellsFreeMemory, + .getFreeMemory = remoteNodeGetFreeMemory, + .domainEventRegister = remoteDomainEventRegister, + .domainEventDeregister = remoteDomainEventDeregister, + .domainMigratePrepare2 = remoteDomainMigratePrepare2, + .domainMigrateFinish2 = remoteDomainMigrateFinish2, + .nodeDeviceDettach = remoteNodeDeviceDettach, + .nodeDeviceReAttach = remoteNodeDeviceReAttach, + .nodeDeviceReset = remoteNodeDeviceReset, + .domainMigratePrepareTunnel = remoteDomainMigratePrepareTunnel, + .isEncrypted = remoteIsEncrypted, + .isSecure = remoteIsSecure, + .domainIsActive = remoteDomainIsActive, + .domainIsPersistent = remoteDomainIsPersistent, + .domainIsUpdated = remoteDomainIsUpdated, + .cpuCompare = remoteCPUCompare, + .cpuBaseline = remoteCPUBaseline, + .domainGetJobInfo = remoteDomainGetJobInfo, + .domainAbortJob = remoteDomainAbortJob, + .domainMigrateSetMaxDowntime = remoteDomainMigrateSetMaxDowntime, + .domainMigrateSetMaxSpeed = remoteDomainMigrateSetMaxSpeed, + .domainEventRegisterAny = remoteDomainEventRegisterAny, + .domainEventDeregisterAny = remoteDomainEventDeregisterAny, + .domainManagedSave = remoteDomainManagedSave, + .domainHasManagedSaveImage = remoteDomainHasManagedSaveImage, + .domainManagedSaveRemove = remoteDomainManagedSaveRemove, + .domainSnapshotCreateXML = remoteDomainSnapshotCreateXML, + .domainSnapshotGetXMLDesc = remoteDomainSnapshotGetXMLDesc, + .domainSnapshotNum = remoteDomainSnapshotNum, + .domainSnapshotListNames = remoteDomainSnapshotListNames, + .domainSnapshotLookupByName = remoteDomainSnapshotLookupByName, + .domainHasCurrentSnapshot = remoteDomainHasCurrentSnapshot, + .domainSnapshotCurrent = remoteDomainSnapshotCurrent, + .domainRevertToSnapshot = remoteDomainRevertToSnapshot, + .domainSnapshotDelete = remoteDomainSnapshotDelete, + .qemuDomainMonitorCommand = remoteQemuDomainMonitorCommand, + .domainOpenConsole = remoteDomainOpenConsole, + .domainInjectNMI = remoteDomainInjectNMI, }; static virNetworkDriver network_driver = { diff --git a/src/test/test_driver.c b/src/test/test_driver.c index 36d8c12..34278fe 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -5276,159 +5276,105 @@ static int testNWFilterClose(virConnectPtr conn) { } static virDriver testDriver = { - VIR_DRV_TEST, - "Test", - testOpen, /* open */ - testClose, /* close */ - NULL, /* supports_feature */ - NULL, /* type */ - testGetVersion, /* version */ - NULL, /* libvirtVersion (impl. in libvirt.c) */ - virGetHostname, /* getHostname */ - NULL, /* getSysinfo */ - testGetMaxVCPUs, /* getMaxVcpus */ - testNodeGetInfo, /* nodeGetInfo */ - testGetCapabilities, /* getCapabilities */ - testListDomains, /* listDomains */ - testNumOfDomains, /* numOfDomains */ - testDomainCreateXML, /* domainCreateXML */ - testLookupDomainByID, /* domainLookupByID */ - testLookupDomainByUUID, /* domainLookupByUUID */ - testLookupDomainByName, /* domainLookupByName */ - testPauseDomain, /* domainSuspend */ - testResumeDomain, /* domainResume */ - testShutdownDomain, /* domainShutdown */ - testRebootDomain, /* domainReboot */ - testDestroyDomain, /* domainDestroy */ - testGetOSType, /* domainGetOSType */ - testGetMaxMemory, /* domainGetMaxMemory */ - testSetMaxMemory, /* domainSetMaxMemory */ - testSetMemory, /* domainSetMemory */ - NULL, /* domainSetMemoryFlags */ - NULL, /* domainSetMemoryParameters */ - NULL, /* domainGetMemoryParameters */ - NULL, /* domainSetBlkioParameters */ - NULL, /* domainGetBlkioParameters */ - testGetDomainInfo, /* domainGetInfo */ - testDomainSave, /* domainSave */ - testDomainRestore, /* domainRestore */ - testDomainCoreDump, /* domainCoreDump */ - NULL, /* domainScreenshot */ - testSetVcpus, /* domainSetVcpus */ - testDomainSetVcpusFlags, /* domainSetVcpusFlags */ - testDomainGetVcpusFlags, /* domainGetVcpusFlags */ - testDomainPinVcpu, /* domainPinVcpu */ - testDomainGetVcpus, /* domainGetVcpus */ - testDomainGetMaxVcpus, /* domainGetMaxVcpus */ - NULL, /* domainGetSecurityLabel */ - NULL, /* nodeGetSecurityModel */ - testDomainGetXMLDesc, /* domainGetXMLDesc */ - NULL, /* domainXMLFromNative */ - NULL, /* domainXMLToNative */ - testListDefinedDomains, /* listDefinedDomains */ - testNumOfDefinedDomains, /* numOfDefinedDomains */ - testDomainCreate, /* domainCreate */ - testDomainCreateWithFlags, /* domainCreateWithFlags */ - testDomainDefineXML, /* domainDefineXML */ - testDomainUndefine, /* domainUndefine */ - NULL, /* domainAttachDevice */ - NULL, /* domainAttachDeviceFlags */ - NULL, /* domainDetachDevice */ - NULL, /* domainDetachDeviceFlags */ - NULL, /* domainUpdateDeviceFlags */ - testDomainGetAutostart, /* domainGetAutostart */ - testDomainSetAutostart, /* domainSetAutostart */ - testDomainGetSchedulerType, /* domainGetSchedulerType */ - testDomainGetSchedulerParams, /* domainGetSchedulerParameters */ - testDomainSetSchedulerParams, /* domainSetSchedulerParameters */ - NULL, /* domainMigratePrepare */ - NULL, /* domainMigratePerform */ - NULL, /* domainMigrateFinish */ - testDomainBlockStats, /* domainBlockStats */ - testDomainInterfaceStats, /* domainInterfaceStats */ - NULL, /* domainMemoryStats */ - NULL, /* domainBlockPeek */ - NULL, /* domainMemoryPeek */ - NULL, /* domainGetBlockInfo */ - testNodeGetCellsFreeMemory, /* nodeGetCellsFreeMemory */ - NULL, /* getFreeMemory */ - testDomainEventRegister, /* domainEventRegister */ - testDomainEventDeregister, /* domainEventDeregister */ - NULL, /* domainMigratePrepare2 */ - NULL, /* domainMigrateFinish2 */ - NULL, /* nodeDeviceDettach */ - NULL, /* nodeDeviceReAttach */ - NULL, /* nodeDeviceReset */ - NULL, /* domainMigratePrepareTunnel */ - testIsEncrypted, /* isEncrypted */ - testIsSecure, /* isEncrypted */ - testDomainIsActive, /* domainIsActive */ - testDomainIsPersistent, /* domainIsPersistent */ - testDomainIsUpdated, /* domainIsUpdated */ - NULL, /* cpuCompare */ - NULL, /* cpuBaseline */ - NULL, /* domainGetJobInfo */ - NULL, /* domainAbortJob */ - NULL, /* domainMigrateSetMaxDowntime */ - NULL, /* domainMigrateSetMaxSpeed */ - testDomainEventRegisterAny, /* domainEventRegisterAny */ - testDomainEventDeregisterAny, /* domainEventDeregisterAny */ - NULL, /* domainManagedSave */ - NULL, /* domainHasManagedSaveImage */ - NULL, /* domainManagedSaveRemove */ - NULL, /* domainSnapshotCreateXML */ - NULL, /* domainSnapshotGetXMLDesc */ - NULL, /* domainSnapshotNum */ - NULL, /* domainSnapshotListNames */ - NULL, /* domainSnapshotLookupByName */ - NULL, /* domainHasCurrentSnapshot */ - NULL, /* domainSnapshotCurrent */ - NULL, /* domainRevertToSnapshot */ - NULL, /* domainSnapshotDelete */ - NULL, /* qemuDomainMonitorCommand */ - NULL, /* domainOpenConsole */ - NULL, /* domainInjectNMI */ + .no = VIR_DRV_TEST, + .name = "Test", + .open = testOpen, + .close = testClose, + .version = testGetVersion, + .getHostname = virGetHostname, + .getMaxVcpus = testGetMaxVCPUs, + .nodeGetInfo = testNodeGetInfo, + .getCapabilities = testGetCapabilities, + .listDomains = testListDomains, + .numOfDomains = testNumOfDomains, + .domainCreateXML = testDomainCreateXML, + .domainLookupByID = testLookupDomainByID, + .domainLookupByUUID = testLookupDomainByUUID, + .domainLookupByName = testLookupDomainByName, + .domainSuspend = testPauseDomain, + .domainResume = testResumeDomain, + .domainShutdown = testShutdownDomain, + .domainReboot = testRebootDomain, + .domainDestroy = testDestroyDomain, + .domainGetOSType = testGetOSType, + .domainGetMaxMemory = testGetMaxMemory, + .domainSetMaxMemory = testSetMaxMemory, + .domainSetMemory = testSetMemory, + .domainGetInfo = testGetDomainInfo, + .domainSave = testDomainSave, + .domainRestore = testDomainRestore, + .domainCoreDump = testDomainCoreDump, + .domainSetVcpus = testSetVcpus, + .domainSetVcpusFlags = testDomainSetVcpusFlags, + .domainGetVcpusFlags = testDomainGetVcpusFlags, + .domainPinVcpu = testDomainPinVcpu, + .domainGetVcpus = testDomainGetVcpus, + .domainGetMaxVcpus = testDomainGetMaxVcpus, + .domainGetXMLDesc = testDomainGetXMLDesc, + .listDefinedDomains = testListDefinedDomains, + .numOfDefinedDomains = testNumOfDefinedDomains, + .domainCreate = testDomainCreate, + .domainCreateWithFlags = testDomainCreateWithFlags, + .domainDefineXML = testDomainDefineXML, + .domainUndefine = testDomainUndefine, + .domainGetAutostart = testDomainGetAutostart, + .domainSetAutostart = testDomainSetAutostart, + .domainGetSchedulerType = testDomainGetSchedulerType, + .domainGetSchedulerParameters = testDomainGetSchedulerParams, + .domainSetSchedulerParameters = testDomainSetSchedulerParams, + .domainBlockStats = testDomainBlockStats, + .domainInterfaceStats = testDomainInterfaceStats, + .nodeGetCellsFreeMemory = testNodeGetCellsFreeMemory, + .domainEventRegister = testDomainEventRegister, + .domainEventDeregister = testDomainEventDeregister, + .isEncrypted = testIsEncrypted, + .isSecure = testIsSecure, + .domainIsActive = testDomainIsActive, + .domainIsPersistent = testDomainIsPersistent, + .domainIsUpdated = testDomainIsUpdated, + .domainEventRegisterAny = testDomainEventRegisterAny, + .domainEventDeregisterAny = testDomainEventDeregisterAny, }; static virNetworkDriver testNetworkDriver = { - "Test", - testOpenNetwork, /* open */ - testCloseNetwork, /* close */ - testNumNetworks, /* numOfNetworks */ - testListNetworks, /* listNetworks */ - testNumDefinedNetworks, /* numOfDefinedNetworks */ - testListDefinedNetworks, /* listDefinedNetworks */ - testLookupNetworkByUUID, /* networkLookupByUUID */ - testLookupNetworkByName, /* networkLookupByName */ - testNetworkCreate, /* networkCreateXML */ - testNetworkDefine, /* networkDefineXML */ - testNetworkUndefine, /* networkUndefine */ - testNetworkStart, /* networkCreate */ - testNetworkDestroy, /* networkDestroy */ - testNetworkGetXMLDesc, /* networkGetXMLDesc */ - testNetworkGetBridgeName, /* networkGetBridgeName */ - testNetworkGetAutostart, /* networkGetAutostart */ - testNetworkSetAutostart, /* networkSetAutostart */ - testNetworkIsActive, /* networkIsActive */ - testNetworkIsPersistent, /* networkIsPersistent */ + .name = "Test", + .open = testOpenNetwork, + .close = testCloseNetwork, + .numOfNetworks = testNumNetworks, + .listNetworks = testListNetworks, + .numOfDefinedNetworks = testNumDefinedNetworks, + .listDefinedNetworks = testListDefinedNetworks, + .networkLookupByUUID = testLookupNetworkByUUID, + .networkLookupByName = testLookupNetworkByName, + .networkCreateXML = testNetworkCreate, + .networkDefineXML = testNetworkDefine, + .networkUndefine = testNetworkUndefine, + .networkCreate = testNetworkStart, + .networkDestroy = testNetworkDestroy, + .networkGetXMLDesc = testNetworkGetXMLDesc, + .networkGetBridgeName = testNetworkGetBridgeName, + .networkGetAutostart = testNetworkGetAutostart, + .networkSetAutostart = testNetworkSetAutostart, + .networkIsActive = testNetworkIsActive, + .networkIsPersistent = testNetworkIsPersistent, }; static virInterfaceDriver testInterfaceDriver = { - "Test", /* name */ - testOpenInterface, /* open */ - testCloseInterface, /* close */ - testNumOfInterfaces, /* numOfInterfaces */ - testListInterfaces, /* listInterfaces */ - testNumOfDefinedInterfaces, /* numOfDefinedInterfaces */ - testListDefinedInterfaces, /* listDefinedInterfaces */ - testLookupInterfaceByName, /* interfaceLookupByName */ - testLookupInterfaceByMACString, /* interfaceLookupByMACString */ - testInterfaceGetXMLDesc, /* interfaceGetXMLDesc */ - testInterfaceDefineXML, /* interfaceDefineXML */ - testInterfaceUndefine, /* interfaceUndefine */ - testInterfaceCreate, /* interfaceCreate */ - testInterfaceDestroy, /* interfaceDestroy */ - testInterfaceIsActive, /* interfaceIsActive */ + .name = "Test", + .open = testOpenInterface, + .close = testCloseInterface, + .numOfInterfaces = testNumOfInterfaces, + .listInterfaces = testListInterfaces, + .numOfDefinedInterfaces = testNumOfDefinedInterfaces, + .listDefinedInterfaces = testListDefinedInterfaces, + .interfaceLookupByName = testLookupInterfaceByName, + .interfaceLookupByMACString = testLookupInterfaceByMACString, + .interfaceGetXMLDesc = testInterfaceGetXMLDesc, + .interfaceDefineXML = testInterfaceDefineXML, + .interfaceUndefine = testInterfaceUndefine, + .interfaceCreate = testInterfaceCreate, + .interfaceDestroy = testInterfaceDestroy, + .interfaceIsActive = testInterfaceIsActive, }; diff --git a/src/uml/uml_driver.c b/src/uml/uml_driver.c index e7cd77a..2f6c553 100644 --- a/src/uml/uml_driver.c +++ b/src/uml/uml_driver.c @@ -2144,118 +2144,50 @@ cleanup: static virDriver umlDriver = { - VIR_DRV_UML, - "UML", - umlOpen, /* open */ - umlClose, /* close */ - NULL, /* supports_feature */ - umlGetType, /* type */ - umlGetVersion, /* version */ - NULL, /* libvirtVersion (impl. in libvirt.c) */ - virGetHostname, /* getHostname */ - NULL, /* getSysinfo */ - NULL, /* getMaxVcpus */ - nodeGetInfo, /* nodeGetInfo */ - umlGetCapabilities, /* getCapabilities */ - umlListDomains, /* listDomains */ - umlNumDomains, /* numOfDomains */ - umlDomainCreate, /* domainCreateXML */ - umlDomainLookupByID, /* domainLookupByID */ - umlDomainLookupByUUID, /* domainLookupByUUID */ - umlDomainLookupByName, /* domainLookupByName */ - NULL, /* domainSuspend */ - NULL, /* domainResume */ - umlDomainShutdown, /* domainShutdown */ - NULL, /* domainReboot */ - umlDomainDestroy, /* domainDestroy */ - umlDomainGetOSType, /* domainGetOSType */ - umlDomainGetMaxMemory, /* domainGetMaxMemory */ - umlDomainSetMaxMemory, /* domainSetMaxMemory */ - umlDomainSetMemory, /* domainSetMemory */ - NULL, /* domainSetMemoryFlags */ - NULL, /* domainSetMemoryParameters */ - NULL, /* domainGetMemoryParameters */ - NULL, /* domainSetBlkioParameters */ - NULL, /* domainGetBlkioParameters */ - umlDomainGetInfo, /* domainGetInfo */ - NULL, /* domainSave */ - NULL, /* domainRestore */ - NULL, /* domainCoreDump */ - NULL, /* domainScreenshot */ - NULL, /* domainSetVcpus */ - NULL, /* domainSetVcpusFlags */ - NULL, /* domainGetVcpusFlags */ - NULL, /* domainPinVcpu */ - NULL, /* domainGetVcpus */ - NULL, /* domainGetMaxVcpus */ - NULL, /* domainGetSecurityLabel */ - NULL, /* nodeGetSecurityModel */ - umlDomainGetXMLDesc, /* domainGetXMLDesc */ - NULL, /* domainXMLFromNative */ - NULL, /* domainXMLToNative */ - umlListDefinedDomains, /* listDefinedDomains */ - umlNumDefinedDomains, /* numOfDefinedDomains */ - umlDomainStart, /* domainCreate */ - umlDomainStartWithFlags, /* domainCreateWithFlags */ - umlDomainDefine, /* domainDefineXML */ - umlDomainUndefine, /* domainUndefine */ - umlDomainAttachDevice, /* domainAttachDevice */ - umlDomainAttachDeviceFlags, /* domainAttachDeviceFlags */ - umlDomainDetachDevice, /* domainDetachDevice */ - umlDomainDetachDeviceFlags, /* domainDetachDeviceFlags */ - NULL, /* domainUpdateDeviceFlags */ - umlDomainGetAutostart, /* domainGetAutostart */ - umlDomainSetAutostart, /* domainSetAutostart */ - NULL, /* domainGetSchedulerType */ - NULL, /* domainGetSchedulerParameters */ - NULL, /* domainSetSchedulerParameters */ - NULL, /* domainMigratePrepare */ - NULL, /* domainMigratePerform */ - NULL, /* domainMigrateFinish */ - NULL, /* domainBlockStats */ - NULL, /* domainInterfaceStats */ - NULL, /* domainMemoryStats */ - umlDomainBlockPeek, /* domainBlockPeek */ - NULL, /* domainMemoryPeek */ - NULL, /* domainGetBlockInfo */ - nodeGetCellsFreeMemory, /* nodeGetCellsFreeMemory */ - nodeGetFreeMemory, /* getFreeMemory */ - NULL, /* domainEventRegister */ - NULL, /* domainEventDeregister */ - NULL, /* domainMigratePrepare2 */ - NULL, /* domainMigrateFinish2 */ - NULL, /* nodeDeviceDettach */ - NULL, /* nodeDeviceReAttach */ - NULL, /* nodeDeviceReset */ - NULL, /* domainMigratePrepareTunnel */ - umlIsEncrypted, /* isEncrypted */ - umlIsSecure, /* isSecure */ - umlDomainIsActive, /* domainIsActive */ - umlDomainIsPersistent, /* domainIsPersistent */ - umlDomainIsUpdated, /* domainIsUpdated */ - NULL, /* cpuCompare */ - NULL, /* cpuBaseline */ - NULL, /* domainGetJobInfo */ - NULL, /* domainAbortJob */ - NULL, /* domainMigrateSetMaxDowntime */ - NULL, /* domainMigrateSetMaxSpeed */ - NULL, /* domainEventRegisterAny */ - NULL, /* domainEventDeregisterAny */ - NULL, /* domainManagedSave */ - NULL, /* domainHasManagedSaveImage */ - NULL, /* domainManagedSaveRemove */ - NULL, /* domainSnapshotCreateXML */ - NULL, /* domainSnapshotGetXMLDesc */ - NULL, /* domainSnapshotNum */ - NULL, /* domainSnapshotListNames */ - NULL, /* domainSnapshotLookupByName */ - NULL, /* domainHasCurrentSnapshot */ - NULL, /* domainSnapshotCurrent */ - NULL, /* domainRevertToSnapshot */ - NULL, /* domainSnapshotDelete */ - NULL, /* qemuDomainMonitorCommand */ - umlDomainOpenConsole, /* domainOpenConsole */ - NULL, /* domainInjectNMI */ + .no = VIR_DRV_UML, + .name = "UML", + .open = umlOpen, + .close = umlClose, + .type = umlGetType, + .version = umlGetVersion, + .getHostname = virGetHostname, + .nodeGetInfo = nodeGetInfo, + .getCapabilities = umlGetCapabilities, + .listDomains = umlListDomains, + .numOfDomains = umlNumDomains, + .domainCreateXML = umlDomainCreate, + .domainLookupByID = umlDomainLookupByID, + .domainLookupByUUID = umlDomainLookupByUUID, + .domainLookupByName = umlDomainLookupByName, + .domainShutdown = umlDomainShutdown, + .domainDestroy = umlDomainDestroy, + .domainGetOSType = umlDomainGetOSType, + .domainGetMaxMemory = umlDomainGetMaxMemory, + .domainSetMaxMemory = umlDomainSetMaxMemory, + .domainSetMemory = umlDomainSetMemory, + .domainGetInfo = umlDomainGetInfo, + .domainGetXMLDesc = umlDomainGetXMLDesc, + .listDefinedDomains = umlListDefinedDomains, + .numOfDefinedDomains = umlNumDefinedDomains, + .domainCreate = umlDomainStart, + .domainCreateWithFlags = umlDomainStartWithFlags, + .domainDefineXML = umlDomainDefine, + .domainUndefine = umlDomainUndefine, + .domainAttachDevice = umlDomainAttachDevice, + .domainAttachDeviceFlags = umlDomainAttachDeviceFlags, + .domainDetachDevice = umlDomainDetachDevice, + .domainDetachDeviceFlags = umlDomainDetachDeviceFlags, + .domainGetAutostart = umlDomainGetAutostart, + .domainSetAutostart = umlDomainSetAutostart, + .domainBlockPeek = umlDomainBlockPeek, + .nodeGetCellsFreeMemory = nodeGetCellsFreeMemory, + .getFreeMemory = nodeGetFreeMemory, + .isEncrypted = umlIsEncrypted, + .isSecure = umlIsSecure, + .domainIsActive = umlDomainIsActive, + .domainIsPersistent = umlDomainIsPersistent, + .domainIsUpdated = umlDomainIsUpdated, + .domainOpenConsole = umlDomainOpenConsole, }; static int diff --git a/src/vbox/vbox_tmpl.c b/src/vbox/vbox_tmpl.c index 41b6795..7198995 100644 --- a/src/vbox/vbox_tmpl.c +++ b/src/vbox/vbox_tmpl.c @@ -8661,136 +8661,77 @@ endjob: */ virDriver NAME(Driver) = { - VIR_DRV_VBOX, - "VBOX", - vboxOpen, /* open */ - vboxClose, /* close */ - NULL, /* supports_feature */ - NULL, /* type */ - vboxGetVersion, /* version */ - NULL, /* libvirtVersion (impl. in libvirt.c) */ - virGetHostname, /* getHostname */ - NULL, /* getSysinfo */ - vboxGetMaxVcpus, /* getMaxVcpus */ - nodeGetInfo, /* nodeGetInfo */ - vboxGetCapabilities, /* getCapabilities */ - vboxListDomains, /* listDomains */ - vboxNumOfDomains, /* numOfDomains */ - vboxDomainCreateXML, /* domainCreateXML */ - vboxDomainLookupByID, /* domainLookupByID */ - vboxDomainLookupByUUID, /* domainLookupByUUID */ - vboxDomainLookupByName, /* domainLookupByName */ - vboxDomainSuspend, /* domainSuspend */ - vboxDomainResume, /* domainResume */ - vboxDomainShutdown, /* domainShutdown */ - vboxDomainReboot, /* domainReboot */ - vboxDomainDestroy, /* domainDestroy */ - vboxDomainGetOSType, /* domainGetOSType */ - NULL, /* domainGetMaxMemory */ - NULL, /* domainSetMaxMemory */ - vboxDomainSetMemory, /* domainSetMemory */ - NULL, /* domainSetMemoryFlags */ - NULL, /* domainSetMemoryParameters */ - NULL, /* domainGetMemoryParameters */ - NULL, /* domainSetBlkioParameters */ - NULL, /* domainGetBlkioParameters */ - vboxDomainGetInfo, /* domainGetInfo */ - vboxDomainSave, /* domainSave */ - NULL, /* domainRestore */ - NULL, /* domainCoreDump */ + .no = VIR_DRV_VBOX, + .name = "VBOX", + .open = vboxOpen, + .close = vboxClose, + .version = vboxGetVersion, + .getHostname = virGetHostname, + .getMaxVcpus = vboxGetMaxVcpus, + .nodeGetInfo = nodeGetInfo, + .getCapabilities = vboxGetCapabilities, + .listDomains = vboxListDomains, + .numOfDomains = vboxNumOfDomains, + .domainCreateXML = vboxDomainCreateXML, + .domainLookupByID = vboxDomainLookupByID, + .domainLookupByUUID = vboxDomainLookupByUUID, + .domainLookupByName = vboxDomainLookupByName, + .domainSuspend = vboxDomainSuspend, + .domainResume = vboxDomainResume, + .domainShutdown = vboxDomainShutdown, + .domainReboot = vboxDomainReboot, + .domainDestroy = vboxDomainDestroy, + .domainGetOSType = vboxDomainGetOSType, + .domainSetMemory = vboxDomainSetMemory, + .domainGetInfo = vboxDomainGetInfo, + .domainSave = vboxDomainSave, #if VBOX_API_VERSION == 4000 - vboxDomainScreenshot, /* domainScreenshot */ -#else - NULL, /* domainScreenshot */ + .domainScreenshot = vboxDomainScreenshot, #endif - vboxDomainSetVcpus, /* domainSetVcpus */ - vboxDomainSetVcpusFlags, /* domainSetVcpusFlags */ - vboxDomainGetVcpusFlags, /* domainGetVcpusFlags */ - NULL, /* domainPinVcpu */ - NULL, /* domainGetVcpus */ - vboxDomainGetMaxVcpus, /* domainGetMaxVcpus */ - NULL, /* domainGetSecurityLabel */ - NULL, /* nodeGetSecurityModel */ - vboxDomainGetXMLDesc, /* domainGetXMLDesc */ - NULL, /* domainXMLFromNative */ - NULL, /* domainXMLToNative */ - vboxListDefinedDomains, /* listDefinedDomains */ - vboxNumOfDefinedDomains, /* numOfDefinedDomains */ - vboxDomainCreate, /* domainCreate */ - vboxDomainCreateWithFlags, /* domainCreateWithFlags */ - vboxDomainDefineXML, /* domainDefineXML */ - vboxDomainUndefine, /* domainUndefine */ - vboxDomainAttachDevice, /* domainAttachDevice */ - vboxDomainAttachDeviceFlags, /* domainAttachDeviceFlags */ - vboxDomainDetachDevice, /* domainDetachDevice */ - vboxDomainDetachDeviceFlags, /* domainDetachDeviceFlags */ - vboxDomainUpdateDeviceFlags, /* domainUpdateDeviceFlags */ - NULL, /* domainGetAutostart */ - NULL, /* domainSetAutostart */ - NULL, /* domainGetSchedulerType */ - NULL, /* domainGetSchedulerParameters */ - NULL, /* domainSetSchedulerParameters */ - NULL, /* domainMigratePrepare */ - NULL, /* domainMigratePerform */ - NULL, /* domainMigrateFinish */ - NULL, /* domainBlockStats */ - NULL, /* domainInterfaceStats */ - NULL, /* domainMemoryStats */ - NULL, /* domainBlockPeek */ - NULL, /* domainMemoryPeek */ - NULL, /* domainGetBlockInfo */ - nodeGetCellsFreeMemory, /* nodeGetCellsFreeMemory */ - nodeGetFreeMemory, /* getFreeMemory */ -#if VBOX_API_VERSION == 2002 || VBOX_API_VERSION == 4000 - NULL, /* domainEventRegister */ - NULL, /* domainEventDeregister */ -#else - vboxDomainEventRegister, /* domainEventRegister */ - vboxDomainEventDeregister, /* domainEventDeregister */ + .domainSetVcpus = vboxDomainSetVcpus, + .domainSetVcpusFlags = vboxDomainSetVcpusFlags, + .domainGetVcpusFlags = vboxDomainGetVcpusFlags, + .domainGetMaxVcpus = vboxDomainGetMaxVcpus, + .domainGetXMLDesc = vboxDomainGetXMLDesc, + .listDefinedDomains = vboxListDefinedDomains, + .numOfDefinedDomains = vboxNumOfDefinedDomains, + .domainCreate = vboxDomainCreate, + .domainCreateWithFlags = vboxDomainCreateWithFlags, + .domainDefineXML = vboxDomainDefineXML, + .domainUndefine = vboxDomainUndefine, + .domainAttachDevice = vboxDomainAttachDevice, + .domainAttachDeviceFlags = vboxDomainAttachDeviceFlags, + .domainDetachDevice = vboxDomainDetachDevice, + .domainDetachDeviceFlags = vboxDomainDetachDeviceFlags, + .domainUpdateDeviceFlags = vboxDomainUpdateDeviceFlags, + .nodeGetCellsFreeMemory = nodeGetCellsFreeMemory, + .getFreeMemory = nodeGetFreeMemory, +#if !(VBOX_API_VERSION == 2002 || VBOX_API_VERSION == 4000) + .domainEventRegister = vboxDomainEventRegister, + .domainEventDeregister = vboxDomainEventDeregister, #endif - NULL, /* domainMigratePrepare2 */ - NULL, /* domainMigrateFinish2 */ - NULL, /* nodeDeviceDettach */ - NULL, /* nodeDeviceReAttach */ - NULL, /* nodeDeviceReset */ - NULL, /* domainMigratePrepareTunnel */ - vboxIsEncrypted, /* isEncrypted */ - vboxIsSecure, /* isSecure */ - vboxDomainIsActive, /* domainIsActive */ - vboxDomainIsPersistent, /* domainIsPersistent */ - vboxDomainIsUpdated, /* domainIsUpdated */ - NULL, /* cpuCompare */ - NULL, /* cpuBaseline */ - NULL, /* domainGetJobInfo */ - NULL, /* domainAbortJob */ - NULL, /* domainMigrateSetMaxDowntime */ - NULL, /* domainMigrateSetMaxSpeed */ -#if VBOX_API_VERSION == 2002 || VBOX_API_VERSION == 4000 - NULL, /* domainEventRegisterAny */ - NULL, /* domainEventDeregisterAny */ -#else - vboxDomainEventRegisterAny, /* domainEventRegisterAny */ - vboxDomainEventDeregisterAny, /* domainEventDeregisterAny */ + .isEncrypted = vboxIsEncrypted, + .isSecure = vboxIsSecure, + .domainIsActive = vboxDomainIsActive, + .domainIsPersistent = vboxDomainIsPersistent, + .domainIsUpdated = vboxDomainIsUpdated, +#if !(VBOX_API_VERSION == 2002 || VBOX_API_VERSION == 4000) + .domainEventRegisterAny = vboxDomainEventRegisterAny, + .domainEventDeregisterAny = vboxDomainEventDeregisterAny, #endif - NULL, /* domainManagedSave */ - NULL, /* domainHasManagedSaveImage */ - NULL, /* domainManagedSaveRemove */ - vboxDomainSnapshotCreateXML, /* domainSnapshotCreateXML */ - vboxDomainSnapshotGetXMLDesc, /* domainSnapshotGetXMLDesc */ - vboxDomainSnapshotNum, /* domainSnapshotNum */ - vboxDomainSnapshotListNames, /* domainSnapshotListNames */ - vboxDomainSnapshotLookupByName, /* domainSnapshotLookupByName */ - vboxDomainHasCurrentSnapshot, /* domainHasCurrentSnapshot */ - vboxDomainSnapshotCurrent, /* domainSnapshotCurrent */ - vboxDomainRevertToSnapshot, /* domainRevertToSnapshot */ - vboxDomainSnapshotDelete, /* domainSnapshotDelete */ - NULL, /* qemuDomainMonitorCommand */ - NULL, /* domainOpenConsole */ - NULL, /* domainInjectNMI */ + .domainSnapshotCreateXML = vboxDomainSnapshotCreateXML, + .domainSnapshotGetXMLDesc = vboxDomainSnapshotGetXMLDesc, + .domainSnapshotNum = vboxDomainSnapshotNum, + .domainSnapshotListNames = vboxDomainSnapshotListNames, + .domainSnapshotLookupByName = vboxDomainSnapshotLookupByName, + .domainHasCurrentSnapshot = vboxDomainHasCurrentSnapshot, + .domainSnapshotCurrent = vboxDomainSnapshotCurrent, + .domainRevertToSnapshot = vboxDomainRevertToSnapshot, + .domainSnapshotDelete = vboxDomainSnapshotDelete, }; virNetworkDriver NAME(NetworkDriver) = { - "VBOX", + .name = "VBOX", .open = vboxNetworkOpen, .close = vboxNetworkClose, .numOfNetworks = vboxNumOfNetworks, @@ -8805,9 +8746,6 @@ virNetworkDriver NAME(NetworkDriver) = { .networkCreate = vboxNetworkCreate, .networkDestroy = vboxNetworkDestroy, .networkGetXMLDesc = vboxNetworkGetXMLDesc, - .networkGetBridgeName = NULL, - .networkGetAutostart = NULL, - .networkSetAutostart = NULL }; virStorageDriver NAME(StorageDriver) = { @@ -8816,24 +8754,7 @@ virStorageDriver NAME(StorageDriver) = { .close = vboxStorageClose, .numOfPools = vboxStorageNumOfPools, .listPools = vboxStorageListPools, - .numOfDefinedPools = NULL, - .listDefinedPools = NULL, - .findPoolSources = NULL, .poolLookupByName = vboxStoragePoolLookupByName, - .poolLookupByUUID = NULL, - .poolLookupByVolume = NULL, - .poolCreateXML = NULL, - .poolDefineXML = NULL, - .poolBuild = NULL, - .poolUndefine = NULL, - .poolCreate = NULL, - .poolDestroy = NULL, - .poolDelete = NULL, - .poolRefresh = NULL, - .poolGetInfo = NULL, - .poolGetXMLDesc = NULL, - .poolGetAutostart = NULL, - .poolSetAutostart = NULL, .poolNumOfVolumes = vboxStoragePoolNumOfVolumes, .poolListVolumes = vboxStoragePoolListVolumes, @@ -8841,7 +8762,6 @@ virStorageDriver NAME(StorageDriver) = { .volLookupByKey = vboxStorageVolLookupByKey, .volLookupByPath = vboxStorageVolLookupByPath, .volCreateXML = vboxStorageVolCreateXML, - .volCreateXMLFrom = NULL, .volDelete = vboxStorageVolDelete, .volGetInfo = vboxStorageVolGetInfo, .volGetXMLDesc = vboxStorageVolGetXMLDesc, diff --git a/src/vmware/vmware_driver.c b/src/vmware/vmware_driver.c index b920f79..529efa6 100644 --- a/src/vmware/vmware_driver.c +++ b/src/vmware/vmware_driver.c @@ -897,118 +897,34 @@ vmwareDomainGetInfo(virDomainPtr dom, virDomainInfoPtr info) } static virDriver vmwareDriver = { - VIR_DRV_VMWARE, - "VMWARE", - vmwareOpen, /* open */ - vmwareClose, /* close */ - NULL, /* supports_feature */ - vmwareGetType, /* type */ - vmwareGetVersion, /* version */ - NULL, /* libvirtVersion (impl. in libvirt.c) */ - NULL, /* getHostname */ - NULL, /* getSysinfo */ - NULL, /* getMaxVcpus */ - NULL, /* nodeGetInfo */ - NULL, /* getCapabilities */ - vmwareListDomains, /* listDomains */ - vmwareNumDomains, /* numOfDomains */ - vmwareDomainCreateXML, /* domainCreateXML */ - vmwareDomainLookupByID, /* domainLookupByID */ - vmwareDomainLookupByUUID, /* domainLookupByUUID */ - vmwareDomainLookupByName, /* domainLookupByName */ - vmwareDomainSuspend, /* domainSuspend */ - vmwareDomainResume, /* domainResume */ - vmwareDomainShutdown, /* domainShutdown */ - vmwareDomainReboot, /* domainReboot */ - vmwareDomainShutdown, /* domainDestroy */ - vmwareGetOSType, /* domainGetOSType */ - NULL, /* domainGetMaxMemory */ - NULL, /* domainSetMaxMemory */ - NULL, /* domainSetMemory */ - NULL, /* domainSetMemoryFlags */ - NULL, /* domainSetMemoryParameters */ - NULL, /* domainGetMemoryParameters */ - NULL, /* domainSetBlkioParameters */ - NULL, /* domainGetBlkioParameters */ - vmwareDomainGetInfo, /* domainGetInfo */ - NULL, /* domainSave */ - NULL, /* domainRestore */ - NULL, /* domainCoreDump */ - NULL, /* domainScreenshot */ - NULL, /* domainSetVcpus */ - NULL, /* domainSetVcpusFlags */ - NULL, /* domainGetVcpusFlags */ - NULL, /* domainPinVcpu */ - NULL, /* domainGetVcpus */ - NULL, /* domainGetMaxVcpus */ - NULL, /* domainGetSecurityLabel */ - NULL, /* nodeGetSecurityModel */ - vmwareDomainGetXMLDesc, /* domainGetXMLDesc */ - NULL, /* domainXmlFromNative */ - NULL, /* domainXmlToNative */ - vmwareListDefinedDomains, /* listDefinedDomains */ - vmwareNumDefinedDomains, /* numOfDefinedDomains */ - vmwareDomainCreate, /* domainCreate */ - vmwareDomainCreateWithFlags,/* domainCreateWithFlags */ - vmwareDomainDefineXML, /* domainDefineXML */ - vmwareDomainUndefine, /* domainUndefine */ - NULL, /* domainAttachDevice */ - NULL, /* domainAttachDeviceFlags */ - NULL, /* domainDetachDevice */ - NULL, /* domainDetachDeviceFlags */ - NULL, /* domainUpdateDeviceFlags */ - NULL, /* domainGetAutostart */ - NULL, /* domainSetAutostart */ - NULL, /* domainGetSchedulerType */ - NULL, /* domainGetSchedulerParameters */ - NULL, /* domainSetSchedulerParameters */ - NULL, /* domainMigratePrepare */ - NULL, /* domainMigratePerform */ - NULL, /* domainMigrateFinish */ - NULL, /* domainBlockStats */ - NULL, /* domainInterfaceStats */ - NULL, /* domainMemoryStats */ - NULL, /* domainBlockPeek */ - NULL, /* domainMemoryPeek */ - NULL, /* domainGetBlockInfo */ - NULL, /* nodeGetCellsFreeMemory */ - NULL, /* getFreeMemory */ - NULL, /* domainEventRegister */ - NULL, /* domainEventDeregister */ - NULL, /* domainMigratePrepare2 */ - NULL, /* domainMigrateFinish2 */ - NULL, /* nodeDeviceDettach */ - NULL, /* nodeDeviceReAttach */ - NULL, /* nodeDeviceReset */ - NULL, /* domainMigratePrepareTunnel */ - NULL, /* IsEncrypted */ - NULL, /* IsSecure */ - vmwareDomainIsActive, /* DomainIsActive */ - vmwareDomainIsPersistent, /* DomainIsPersistent */ - NULL, /* domainIsUpdated */ - NULL, /* cpuCompare */ - NULL, /* cpuBaseline */ - NULL, /* domainGetJobInfo */ - NULL, /* domainAbortJob */ - NULL, /* domainMigrateSetMaxDowntime */ - NULL, /* domainMigrateSetMaxSpeed */ - NULL, /* domainEventRegisterAny */ - NULL, /* domainEventDeregisterAny */ - NULL, /* domainManagedSave */ - NULL, /* domainHasManagedSaveImage */ - NULL, /* domainManagedSaveRemove */ - NULL, /* domainSnapshotCreateXML */ - NULL, /* domainSnapshotGetXMLDesc */ - NULL, /* domainSnapshotNum */ - NULL, /* domainSnapshotListNames */ - NULL, /* domainSnapshotLookupByName */ - NULL, /* domainHasCurrentSnapshot */ - NULL, /* domainSnapshotCurrent */ - NULL, /* domainRevertToSnapshot */ - NULL, /* domainSnapshotDelete */ - NULL, /* qemuDomainMonitorCommand */ - NULL, /* domainOpenConsole */ - NULL, /* domainInjectNMI */ + .no = VIR_DRV_VMWARE, + .name = "VMWARE", + .open = vmwareOpen, + .close = vmwareClose, + .type = vmwareGetType, + .version = vmwareGetVersion, + .listDomains = vmwareListDomains, + .numOfDomains = vmwareNumDomains, + .domainCreateXML = vmwareDomainCreateXML, + .domainLookupByID = vmwareDomainLookupByID, + .domainLookupByUUID = vmwareDomainLookupByUUID, + .domainLookupByName = vmwareDomainLookupByName, + .domainSuspend = vmwareDomainSuspend, + .domainResume = vmwareDomainResume, + .domainShutdown = vmwareDomainShutdown, + .domainReboot = vmwareDomainReboot, + .domainDestroy = vmwareDomainShutdown, + .domainGetOSType = vmwareGetOSType, + .domainGetInfo = vmwareDomainGetInfo, + .domainGetXMLDesc = vmwareDomainGetXMLDesc, + .listDefinedDomains = vmwareListDefinedDomains, + .numOfDefinedDomains = vmwareNumDefinedDomains, + .domainCreate = vmwareDomainCreate, + .domainCreateWithFlags = vmwareDomainCreateWithFlags, + .domainDefineXML = vmwareDomainDefineXML, + .domainUndefine = vmwareDomainUndefine, + .domainIsActive = vmwareDomainIsActive, + .domainIsPersistent = vmwareDomainIsPersistent, }; int diff --git a/src/xen/xen_driver.c b/src/xen/xen_driver.c index 5bafb73..aaebfda 100644 --- a/src/xen/xen_driver.c +++ b/src/xen/xen_driver.c @@ -2099,118 +2099,82 @@ cleanup: /* The interface which we export upwards to libvirt.c. */ static virDriver xenUnifiedDriver = { - VIR_DRV_XEN_UNIFIED, - "Xen", - xenUnifiedOpen, /* open */ - xenUnifiedClose, /* close */ - xenUnifiedSupportsFeature, /* supports_feature */ - xenUnifiedType, /* type */ - xenUnifiedGetVersion, /* version */ - NULL, /* libvirtVersion (impl. in libvirt.c) */ - virGetHostname, /* getHostname */ - NULL, /* getSysinfo */ - xenUnifiedGetMaxVcpus, /* getMaxVcpus */ - xenUnifiedNodeGetInfo, /* nodeGetInfo */ - xenUnifiedGetCapabilities, /* getCapabilities */ - xenUnifiedListDomains, /* listDomains */ - xenUnifiedNumOfDomains, /* numOfDomains */ - xenUnifiedDomainCreateXML, /* domainCreateXML */ - xenUnifiedDomainLookupByID, /* domainLookupByID */ - xenUnifiedDomainLookupByUUID, /* domainLookupByUUID */ - xenUnifiedDomainLookupByName, /* domainLookupByName */ - xenUnifiedDomainSuspend, /* domainSuspend */ - xenUnifiedDomainResume, /* domainResume */ - xenUnifiedDomainShutdown, /* domainShutdown */ - xenUnifiedDomainReboot, /* domainReboot */ - xenUnifiedDomainDestroy, /* domainDestroy */ - xenUnifiedDomainGetOSType, /* domainGetOSType */ - xenUnifiedDomainGetMaxMemory, /* domainGetMaxMemory */ - xenUnifiedDomainSetMaxMemory, /* domainSetMaxMemory */ - xenUnifiedDomainSetMemory, /* domainSetMemory */ - NULL, /*domainSetMemoryFlags */ - NULL, /* domainSetMemoryParameters */ - NULL, /* domainGetMemoryParameters */ - NULL, /* domainSetBlkioParameters */ - NULL, /* domainGetBlkioParameters */ - xenUnifiedDomainGetInfo, /* domainGetInfo */ - xenUnifiedDomainSave, /* domainSave */ - xenUnifiedDomainRestore, /* domainRestore */ - xenUnifiedDomainCoreDump, /* domainCoreDump */ - NULL, /* domainScreenshot */ - xenUnifiedDomainSetVcpus, /* domainSetVcpus */ - xenUnifiedDomainSetVcpusFlags, /* domainSetVcpusFlags */ - xenUnifiedDomainGetVcpusFlags, /* domainGetVcpusFlags */ - xenUnifiedDomainPinVcpu, /* domainPinVcpu */ - xenUnifiedDomainGetVcpus, /* domainGetVcpus */ - xenUnifiedDomainGetMaxVcpus, /* domainGetMaxVcpus */ - NULL, /* domainGetSecurityLabel */ - NULL, /* nodeGetSecurityModel */ - xenUnifiedDomainGetXMLDesc, /* domainGetXMLDesc */ - xenUnifiedDomainXMLFromNative, /* domainXMLFromNative */ - xenUnifiedDomainXMLToNative, /* domainXMLToNative */ - xenUnifiedListDefinedDomains, /* listDefinedDomains */ - xenUnifiedNumOfDefinedDomains, /* numOfDefinedDomains */ - xenUnifiedDomainCreate, /* domainCreate */ - xenUnifiedDomainCreateWithFlags, /* domainCreateWithFlags */ - xenUnifiedDomainDefineXML, /* domainDefineXML */ - xenUnifiedDomainUndefine, /* domainUndefine */ - xenUnifiedDomainAttachDevice, /* domainAttachDevice */ - xenUnifiedDomainAttachDeviceFlags, /* domainAttachDeviceFlags */ - xenUnifiedDomainDetachDevice, /* domainDetachDevice */ - xenUnifiedDomainDetachDeviceFlags, /* domainDetachDeviceFlags */ - xenUnifiedDomainUpdateDeviceFlags, /* domainUpdateDeviceFlags */ - xenUnifiedDomainGetAutostart, /* domainGetAutostart */ - xenUnifiedDomainSetAutostart, /* domainSetAutostart */ - xenUnifiedDomainGetSchedulerType, /* domainGetSchedulerType */ - xenUnifiedDomainGetSchedulerParameters, /* domainGetSchedulerParameters */ - xenUnifiedDomainSetSchedulerParameters, /* domainSetSchedulerParameters */ - xenUnifiedDomainMigratePrepare, /* domainMigratePrepare */ - xenUnifiedDomainMigratePerform, /* domainMigratePerform */ - xenUnifiedDomainMigrateFinish, /* domainMigrateFinish */ - xenUnifiedDomainBlockStats, /* domainBlockStats */ - xenUnifiedDomainInterfaceStats, /* domainInterfaceStats */ - NULL, /* domainMemoryStats */ - xenUnifiedDomainBlockPeek, /* domainBlockPeek */ - NULL, /* domainMemoryPeek */ - NULL, /* domainGetBlockInfo */ - xenUnifiedNodeGetCellsFreeMemory, /* nodeGetCellsFreeMemory */ - xenUnifiedNodeGetFreeMemory, /* getFreeMemory */ - xenUnifiedDomainEventRegister, /* domainEventRegister */ - xenUnifiedDomainEventDeregister, /* domainEventDeregister */ - NULL, /* domainMigratePrepare2 */ - NULL, /* domainMigrateFinish2 */ - xenUnifiedNodeDeviceDettach, /* nodeDeviceDettach */ - xenUnifiedNodeDeviceReAttach, /* nodeDeviceReAttach */ - xenUnifiedNodeDeviceReset, /* nodeDeviceReset */ - NULL, /* domainMigratePrepareTunnel */ - xenUnifiedIsEncrypted, /* isEncrypted */ - xenUnifiedIsSecure, /* isSecure */ - xenUnifiedDomainIsActive, /* domainIsActive */ - xenUnifiedDomainIsPersistent, /* domainIsPersistent */ - xenUnifiedDomainIsUpdated, /* domainIsUpdated */ - NULL, /* cpuCompare */ - NULL, /* cpuBaseline */ - NULL, /* domainGetJobInfo */ - NULL, /* domainAbortJob */ - NULL, /* domainMigrateSetMaxDowntime */ - NULL, /* domainMigrateSetMaxSpeed */ - xenUnifiedDomainEventRegisterAny, /* domainEventRegisterAny */ - xenUnifiedDomainEventDeregisterAny, /* domainEventDeregisterAny */ - NULL, /* domainManagedSave */ - NULL, /* domainHasManagedSaveImage */ - NULL, /* domainManagedSaveRemove */ - NULL, /* domainSnapshotCreateXML */ - NULL, /* domainSnapshotGetXMLDesc */ - NULL, /* domainSnapshotNum */ - NULL, /* domainSnapshotListNames */ - NULL, /* domainSnapshotLookupByName */ - NULL, /* domainHasCurrentSnapshot */ - NULL, /* domainSnapshotCurrent */ - NULL, /* domainRevertToSnapshot */ - NULL, /* domainSnapshotDelete */ - NULL, /* qemuDomainMonitorCommand */ - xenUnifiedDomainOpenConsole, /* domainOpenConsole */ - NULL, /* domainInjectNMI */ + .no = VIR_DRV_XEN_UNIFIED, + .name = "Xen", + .open = xenUnifiedOpen, + .close = xenUnifiedClose, + .supports_feature = xenUnifiedSupportsFeature, + .type = xenUnifiedType, + .version = xenUnifiedGetVersion, + .getHostname = virGetHostname, + .getMaxVcpus = xenUnifiedGetMaxVcpus, + .nodeGetInfo = xenUnifiedNodeGetInfo, + .getCapabilities = xenUnifiedGetCapabilities, + .listDomains = xenUnifiedListDomains, + .numOfDomains = xenUnifiedNumOfDomains, + .domainCreateXML = xenUnifiedDomainCreateXML, + .domainLookupByID = xenUnifiedDomainLookupByID, + .domainLookupByUUID = xenUnifiedDomainLookupByUUID, + .domainLookupByName = xenUnifiedDomainLookupByName, + .domainSuspend = xenUnifiedDomainSuspend, + .domainResume = xenUnifiedDomainResume, + .domainShutdown = xenUnifiedDomainShutdown, + .domainReboot = xenUnifiedDomainReboot, + .domainDestroy = xenUnifiedDomainDestroy, + .domainGetOSType = xenUnifiedDomainGetOSType, + .domainGetMaxMemory = xenUnifiedDomainGetMaxMemory, + .domainSetMaxMemory = xenUnifiedDomainSetMaxMemory, + .domainSetMemory = xenUnifiedDomainSetMemory, + .domainGetInfo = xenUnifiedDomainGetInfo, + .domainSave = xenUnifiedDomainSave, + .domainRestore = xenUnifiedDomainRestore, + .domainCoreDump = xenUnifiedDomainCoreDump, + .domainSetVcpus = xenUnifiedDomainSetVcpus, + .domainSetVcpusFlags = xenUnifiedDomainSetVcpusFlags, + .domainGetVcpusFlags = xenUnifiedDomainGetVcpusFlags, + .domainPinVcpu = xenUnifiedDomainPinVcpu, + .domainGetVcpus = xenUnifiedDomainGetVcpus, + .domainGetMaxVcpus = xenUnifiedDomainGetMaxVcpus, + .domainGetXMLDesc = xenUnifiedDomainGetXMLDesc, + .domainXMLFromNative = xenUnifiedDomainXMLFromNative, + .domainXMLToNative = xenUnifiedDomainXMLToNative, + .listDefinedDomains = xenUnifiedListDefinedDomains, + .numOfDefinedDomains = xenUnifiedNumOfDefinedDomains, + .domainCreate = xenUnifiedDomainCreate, + .domainCreateWithFlags = xenUnifiedDomainCreateWithFlags, + .domainDefineXML = xenUnifiedDomainDefineXML, + .domainUndefine = xenUnifiedDomainUndefine, + .domainAttachDevice = xenUnifiedDomainAttachDevice, + .domainAttachDeviceFlags = xenUnifiedDomainAttachDeviceFlags, + .domainDetachDevice = xenUnifiedDomainDetachDevice, + .domainDetachDeviceFlags = xenUnifiedDomainDetachDeviceFlags, + .domainUpdateDeviceFlags = xenUnifiedDomainUpdateDeviceFlags, + .domainGetAutostart = xenUnifiedDomainGetAutostart, + .domainSetAutostart = xenUnifiedDomainSetAutostart, + .domainGetSchedulerType = xenUnifiedDomainGetSchedulerType, + .domainGetSchedulerParameters = xenUnifiedDomainGetSchedulerParameters, + .domainSetSchedulerParameters = xenUnifiedDomainSetSchedulerParameters, + .domainMigratePrepare = xenUnifiedDomainMigratePrepare, + .domainMigratePerform = xenUnifiedDomainMigratePerform, + .domainMigrateFinish = xenUnifiedDomainMigrateFinish, + .domainBlockStats = xenUnifiedDomainBlockStats, + .domainInterfaceStats = xenUnifiedDomainInterfaceStats, + .domainBlockPeek = xenUnifiedDomainBlockPeek, + .nodeGetCellsFreeMemory = xenUnifiedNodeGetCellsFreeMemory, + .getFreeMemory = xenUnifiedNodeGetFreeMemory, + .domainEventRegister = xenUnifiedDomainEventRegister, + .domainEventDeregister = xenUnifiedDomainEventDeregister, + .nodeDeviceDettach = xenUnifiedNodeDeviceDettach, + .nodeDeviceReAttach = xenUnifiedNodeDeviceReAttach, + .nodeDeviceReset = xenUnifiedNodeDeviceReset, + .isEncrypted = xenUnifiedIsEncrypted, + .isSecure = xenUnifiedIsSecure, + .domainIsActive = xenUnifiedDomainIsActive, + .domainIsPersistent = xenUnifiedDomainIsPersistent, + .domainIsUpdated = xenUnifiedDomainIsUpdated, + .domainEventRegisterAny = xenUnifiedDomainEventRegisterAny, + .domainEventDeregisterAny = xenUnifiedDomainEventDeregisterAny, + .domainOpenConsole = xenUnifiedDomainOpenConsole, }; /** diff --git a/src/xen/xen_hypervisor.c b/src/xen/xen_hypervisor.c index f442cfd..52bd26d 100644 --- a/src/xen/xen_hypervisor.c +++ b/src/xen/xen_hypervisor.c @@ -802,44 +802,24 @@ typedef struct xen_op_v2_dom xen_op_v2_dom; static unsigned long xenHypervisorGetMaxMemory(virDomainPtr domain); struct xenUnifiedDriver xenHypervisorDriver = { - xenHypervisorOpen, /* open */ - xenHypervisorClose, /* close */ - xenHypervisorGetVersion, /* version */ - NULL, /* hostname */ - NULL, /* nodeGetInfo */ - xenHypervisorGetCapabilities, /* getCapabilities */ - xenHypervisorListDomains, /* listDomains */ - xenHypervisorNumOfDomains, /* numOfDomains */ - NULL, /* domainCreateXML */ - xenHypervisorPauseDomain, /* domainSuspend */ - xenHypervisorResumeDomain, /* domainResume */ - NULL, /* domainShutdown */ - NULL, /* domainReboot */ - xenHypervisorDestroyDomain, /* domainDestroy */ - xenHypervisorDomainGetOSType, /* domainGetOSType */ - xenHypervisorGetMaxMemory, /* domainGetMaxMemory */ - xenHypervisorSetMaxMemory, /* domainSetMaxMemory */ - NULL, /* domainSetMemory */ - xenHypervisorGetDomainInfo, /* domainGetInfo */ - NULL, /* domainSave */ - NULL, /* domainRestore */ - NULL, /* domainCoreDump */ - NULL, /* domainScreenshot */ - xenHypervisorPinVcpu, /* domainPinVcpu */ - xenHypervisorGetVcpus, /* domainGetVcpus */ - NULL, /* listDefinedDomains */ - NULL, /* numOfDefinedDomains */ - NULL, /* domainCreate */ - NULL, /* domainDefineXML */ - NULL, /* domainUndefine */ - NULL, /* domainAttachDeviceFlags */ - NULL, /* domainDetachDeviceFlags */ - NULL, /* domainUpdateDeviceFlags */ - NULL, /* domainGetAutostart */ - NULL, /* domainSetAutostart */ - xenHypervisorGetSchedulerType, /* domainGetSchedulerType */ - xenHypervisorGetSchedulerParameters, /* domainGetSchedulerParameters */ - xenHypervisorSetSchedulerParameters, /* domainSetSchedulerParameters */ + .open = xenHypervisorOpen, + .close = xenHypervisorClose, + .version = xenHypervisorGetVersion, + .getCapabilities = xenHypervisorGetCapabilities, + .listDomains = xenHypervisorListDomains, + .numOfDomains = xenHypervisorNumOfDomains, + .domainSuspend = xenHypervisorPauseDomain, + .domainResume = xenHypervisorResumeDomain, + .domainDestroy = xenHypervisorDestroyDomain, + .domainGetOSType = xenHypervisorDomainGetOSType, + .domainGetMaxMemory = xenHypervisorGetMaxMemory, + .domainSetMaxMemory = xenHypervisorSetMaxMemory, + .domainGetInfo = xenHypervisorGetDomainInfo, + .domainPinVcpu = xenHypervisorPinVcpu, + .domainGetVcpus = xenHypervisorGetVcpus, + .domainGetSchedulerType = xenHypervisorGetSchedulerType, + .domainGetSchedulerParameters = xenHypervisorGetSchedulerParameters, + .domainSetSchedulerParameters = xenHypervisorSetSchedulerParameters, }; #define virXenError(code, ...) \ diff --git a/src/xen/xen_inotify.c b/src/xen/xen_inotify.c index 71bb6be..69ff48c 100644 --- a/src/xen/xen_inotify.c +++ b/src/xen/xen_inotify.c @@ -50,44 +50,8 @@ __FUNCTION__, __LINE__, __VA_ARGS__) struct xenUnifiedDriver xenInotifyDriver = { - xenInotifyOpen, /* open */ - xenInotifyClose, /* close */ - NULL, /* version */ - NULL, /* hostname */ - NULL, /* nodeGetInfo */ - NULL, /* getCapabilities */ - NULL, /* listDomains */ - NULL, /* numOfDomains */ - NULL, /* domainCreateLinux */ - NULL, /* domainSuspend */ - NULL, /* domainResume */ - NULL, /* domainShutdown */ - NULL, /* domainReboot */ - NULL, /* domainDestroy */ - NULL, /* domainGetOSType */ - NULL, /* domainGetMaxMemory */ - NULL, /* domainSetMaxMemory */ - NULL, /* domainSetMemory */ - NULL, /* domainGetInfo */ - NULL, /* domainSave */ - NULL, /* domainRestore */ - NULL, /* domainCoreDump */ - NULL, /* domainScreenshot */ - NULL, /* domainPinVcpu */ - NULL, /* domainGetVcpus */ - NULL, /* listDefinedDomains */ - NULL, /* numOfDefinedDomains */ - NULL, /* domainCreate */ - NULL, /* domainDefineXML */ - NULL, /* domainUndefine */ - NULL, /* domainAttachDeviceFlags */ - NULL, /* domainDetachDeviceFlags */ - NULL, /* domainUpdateDeviceFlags */ - NULL, /* domainGetAutostart */ - NULL, /* domainSetAutostart */ - NULL, /* domainGetSchedulerType */ - NULL, /* domainGetSchedulerParameters */ - NULL, /* domainSetSchedulerParameters */ + .open = xenInotifyOpen, + .close = xenInotifyClose, }; static int diff --git a/src/xen/xend_internal.c b/src/xen/xend_internal.c index 8bd5ddf..5d7799a 100644 --- a/src/xen/xend_internal.c +++ b/src/xen/xend_internal.c @@ -3842,44 +3842,41 @@ xenDaemonDomainBlockPeek (virDomainPtr domain, const char *path, } struct xenUnifiedDriver xenDaemonDriver = { - xenDaemonOpen, /* open */ - xenDaemonClose, /* close */ - xenDaemonGetVersion, /* version */ - NULL, /* hostname */ - xenDaemonNodeGetInfo, /* nodeGetInfo */ - NULL, /* getCapabilities */ - xenDaemonListDomains, /* listDomains */ - xenDaemonNumOfDomains, /* numOfDomains */ - xenDaemonCreateXML, /* domainCreateXML */ - xenDaemonDomainSuspend, /* domainSuspend */ - xenDaemonDomainResume, /* domainResume */ - xenDaemonDomainShutdown, /* domainShutdown */ - xenDaemonDomainReboot, /* domainReboot */ - xenDaemonDomainDestroy, /* domainDestroy */ - xenDaemonDomainGetOSType, /* domainGetOSType */ - xenDaemonDomainGetMaxMemory, /* domainGetMaxMemory */ - xenDaemonDomainSetMaxMemory, /* domainSetMaxMemory */ - xenDaemonDomainSetMemory, /* domainMaxMemory */ - xenDaemonDomainGetInfo, /* domainGetInfo */ - xenDaemonDomainSave, /* domainSave */ - xenDaemonDomainRestore, /* domainRestore */ - xenDaemonDomainCoreDump, /* domainCoreDump */ - NULL, /* domainScreenshot */ - xenDaemonDomainPinVcpu, /* domainPinVcpu */ - xenDaemonDomainGetVcpus, /* domainGetVcpus */ - xenDaemonListDefinedDomains, /* listDefinedDomains */ - xenDaemonNumOfDefinedDomains,/* numOfDefinedDomains */ - xenDaemonDomainCreate, /* domainCreate */ - xenDaemonDomainDefineXML, /* domainDefineXML */ - xenDaemonDomainUndefine, /* domainUndefine */ - xenDaemonAttachDeviceFlags, /* domainAttachDeviceFlags */ - xenDaemonDetachDeviceFlags, /* domainDetachDeviceFlags */ - xenDaemonUpdateDeviceFlags, /* domainUpdateDeviceFlags */ - xenDaemonDomainGetAutostart, /* domainGetAutostart */ - xenDaemonDomainSetAutostart, /* domainSetAutostart */ - xenDaemonGetSchedulerType, /* domainGetSchedulerType */ - xenDaemonGetSchedulerParameters, /* domainGetSchedulerParameters */ - xenDaemonSetSchedulerParameters, /* domainSetSchedulerParameters */ + .open = xenDaemonOpen, + .close = xenDaemonClose, + .version = xenDaemonGetVersion, + .nodeGetInfo = xenDaemonNodeGetInfo, + .listDomains = xenDaemonListDomains, + .numOfDomains = xenDaemonNumOfDomains, + .domainCreateXML = xenDaemonCreateXML, + .domainSuspend = xenDaemonDomainSuspend, + .domainResume = xenDaemonDomainResume, + .domainShutdown = xenDaemonDomainShutdown, + .domainReboot = xenDaemonDomainReboot, + .domainDestroy = xenDaemonDomainDestroy, + .domainGetOSType = xenDaemonDomainGetOSType, + .domainGetMaxMemory = xenDaemonDomainGetMaxMemory, + .domainSetMaxMemory = xenDaemonDomainSetMaxMemory, + .domainMaxMemory = xenDaemonDomainSetMemory, + .domainGetInfo = xenDaemonDomainGetInfo, + .domainSave = xenDaemonDomainSave, + .domainRestore = xenDaemonDomainRestore, + .domainCoreDump = xenDaemonDomainCoreDump, + .domainPinVcpu = xenDaemonDomainPinVcpu, + .domainGetVcpus = xenDaemonDomainGetVcpus, + .listDefinedDomains = xenDaemonListDefinedDomains, + .numOfDefinedDomains = xenDaemonNumOfDefinedDomains, + .domainCreate = xenDaemonDomainCreate, + .domainDefineXML = xenDaemonDomainDefineXML, + .domainUndefine = xenDaemonDomainUndefine, + .domainAttachDeviceFlags = xenDaemonAttachDeviceFlags, + .domainDetachDeviceFlags = xenDaemonDetachDeviceFlags, + .domainUpdateDeviceFlags = xenDaemonUpdateDeviceFlags, + .domainGetAutostart = xenDaemonDomainGetAutostart, + .domainSetAutostart = xenDaemonDomainSetAutostart, + .domainGetSchedulerType = xenDaemonGetSchedulerType, + .domainGetSchedulerParameters = xenDaemonGetSchedulerParameters, + .domainSetSchedulerParameters = xenDaemonSetSchedulerParameters, }; diff --git a/src/xen/xm_internal.c b/src/xen/xm_internal.c index 642a5ee..f207314 100644 --- a/src/xen/xm_internal.c +++ b/src/xen/xm_internal.c @@ -81,44 +81,20 @@ static int xenXMDomainDetachDeviceFlags(virDomainPtr domain, const char *xml, #define XM_XML_ERROR "Invalid xml" struct xenUnifiedDriver xenXMDriver = { - xenXMOpen, /* open */ - xenXMClose, /* close */ - NULL, /* version */ - NULL, /* hostname */ - NULL, /* nodeGetInfo */ - NULL, /* getCapabilities */ - NULL, /* listDomains */ - NULL, /* numOfDomains */ - NULL, /* domainCreateXML */ - NULL, /* domainSuspend */ - NULL, /* domainResume */ - NULL, /* domainShutdown */ - NULL, /* domainReboot */ - NULL, /* domainDestroy */ - NULL, /* domainGetOSType */ - xenXMDomainGetMaxMemory, /* domainGetMaxMemory */ - xenXMDomainSetMaxMemory, /* domainSetMaxMemory */ - xenXMDomainSetMemory, /* domainMaxMemory */ - xenXMDomainGetInfo, /* domainGetInfo */ - NULL, /* domainSave */ - NULL, /* domainRestore */ - NULL, /* domainCoreDump */ - NULL, /* domainScreenshot */ - xenXMDomainPinVcpu, /* domainPinVcpu */ - NULL, /* domainGetVcpus */ - xenXMListDefinedDomains, /* listDefinedDomains */ - xenXMNumOfDefinedDomains, /* numOfDefinedDomains */ - xenXMDomainCreate, /* domainCreate */ - xenXMDomainDefineXML, /* domainDefineXML */ - xenXMDomainUndefine, /* domainUndefine */ - xenXMDomainAttachDeviceFlags, /* domainAttachDeviceFlags */ - xenXMDomainDetachDeviceFlags, /* domainDetachDeviceFlags */ - NULL, /* domainUpdateDeviceFlags */ - NULL, /* domainGetAutostart */ - NULL, /* domainSetAutostart */ - NULL, /* domainGetSchedulerType */ - NULL, /* domainGetSchedulerParameters */ - NULL, /* domainSetSchedulerParameters */ + .open = xenXMOpen, + .close = xenXMClose, + .domainGetMaxMemory = xenXMDomainGetMaxMemory, + .domainSetMaxMemory = xenXMDomainSetMaxMemory, + .domainMaxMemory = xenXMDomainSetMemory, + .domainGetInfo = xenXMDomainGetInfo, + .domainPinVcpu = xenXMDomainPinVcpu, + .listDefinedDomains = xenXMListDefinedDomains, + .numOfDefinedDomains = xenXMNumOfDefinedDomains, + .domainCreate = xenXMDomainCreate, + .domainDefineXML = xenXMDomainDefineXML, + .domainUndefine = xenXMDomainUndefine, + .domainAttachDeviceFlags = xenXMDomainAttachDeviceFlags, + .domainDetachDeviceFlags = xenXMDomainDetachDeviceFlags, }; #define xenXMError(code, ...) \ diff --git a/src/xen/xs_internal.c b/src/xen/xs_internal.c index 4529ef4..10dbe36 100644 --- a/src/xen/xs_internal.c +++ b/src/xen/xs_internal.c @@ -43,44 +43,15 @@ static void xenStoreWatchEvent(int watch, int fd, int events, void *data); static void xenStoreWatchListFree(xenStoreWatchListPtr list); struct xenUnifiedDriver xenStoreDriver = { - xenStoreOpen, /* open */ - xenStoreClose, /* close */ - NULL, /* version */ - NULL, /* hostname */ - NULL, /* nodeGetInfo */ - NULL, /* getCapabilities */ - xenStoreListDomains, /* listDomains */ - NULL, /* numOfDomains */ - NULL, /* domainCreateXML */ - NULL, /* domainSuspend */ - NULL, /* domainResume */ - xenStoreDomainShutdown, /* domainShutdown */ - xenStoreDomainReboot, /* domainReboot */ - NULL, /* domainDestroy */ - xenStoreDomainGetOSType, /* domainGetOSType */ - xenStoreDomainGetMaxMemory, /* domainGetMaxMemory */ - NULL, /* domainSetMaxMemory */ - xenStoreDomainSetMemory, /* domainSetMemory */ - xenStoreGetDomainInfo, /* domainGetInfo */ - NULL, /* domainSave */ - NULL, /* domainRestore */ - NULL, /* domainCoreDump */ - NULL, /* domainScreenshot */ - NULL, /* domainPinVcpu */ - NULL, /* domainGetVcpus */ - NULL, /* listDefinedDomains */ - NULL, /* numOfDefinedDomains */ - NULL, /* domainCreate */ - NULL, /* domainDefineXML */ - NULL, /* domainUndefine */ - NULL, /* domainAttachDeviceFlags */ - NULL, /* domainDetachDeviceFlags */ - NULL, /* domainUpdateDeviceFlags */ - NULL, /* domainGetAutostart */ - NULL, /* domainSetAutostart */ - NULL, /* domainGetSchedulerType */ - NULL, /* domainGetSchedulerParameters */ - NULL, /* domainSetSchedulerParameters */ + .open = xenStoreOpen, + .close = xenStoreClose, + .listDomains = xenStoreListDomains, + .domainShutdown = xenStoreDomainShutdown, + .domainReboot = xenStoreDomainReboot, + .domainGetOSType = xenStoreDomainGetOSType, + .domainGetMaxMemory = xenStoreDomainGetMaxMemory, + .domainSetMemory = xenStoreDomainSetMemory, + .domainGetInfo = xenStoreGetDomainInfo, }; #define virXenStoreError(code, ...) \ diff --git a/src/xenapi/xenapi_driver.c b/src/xenapi/xenapi_driver.c index 136356d..239a6d2 100644 --- a/src/xenapi/xenapi_driver.c +++ b/src/xenapi/xenapi_driver.c @@ -1779,118 +1779,51 @@ xenapiNodeGetCellsFreeMemory (virConnectPtr conn, unsigned long long *freeMems, /* The interface which we export upwards to libvirt.c. */ static virDriver xenapiDriver = { - VIR_DRV_XENAPI, - "XenAPI", - xenapiOpen, /* open */ - xenapiClose, /* close */ - xenapiSupportsFeature, /* supports_feature */ - xenapiType, /* type */ - xenapiGetVersion, /* version */ - NULL, /*getlibvirtVersion */ - xenapiGetHostname, /* getHostname */ - NULL, /* getSysinfo */ - xenapiGetMaxVcpus, /* getMaxVcpus */ - xenapiNodeGetInfo, /* nodeGetInfo */ - xenapiGetCapabilities, /* getCapabilities */ - xenapiListDomains, /* listDomains */ - xenapiNumOfDomains, /* numOfDomains */ - xenapiDomainCreateXML, /* domainCreateXML */ - xenapiDomainLookupByID, /* domainLookupByID */ - xenapiDomainLookupByUUID, /* domainLookupByUUID */ - xenapiDomainLookupByName, /* domainLookupByName */ - xenapiDomainSuspend, /* domainSuspend */ - xenapiDomainResume, /* domainResume */ - xenapiDomainShutdown, /* domainShutdown */ - xenapiDomainReboot, /* domainReboot */ - xenapiDomainDestroy, /* domainDestroy */ - xenapiDomainGetOSType, /* domainGetOSType */ - xenapiDomainGetMaxMemory, /* domainGetMaxMemory */ - xenapiDomainSetMaxMemory, /* domainSetMaxMemory */ - NULL, /* domainSetMemory */ - NULL, /* domainSetMemoryFlags */ - NULL, /* domainSetMemoryParameters */ - NULL, /* domainGetMemoryParameters */ - NULL, /* domainSetBlkioParameters */ - NULL, /* domainGetBlkioParameters */ - xenapiDomainGetInfo, /* domainGetInfo */ - NULL, /* domainSave */ - NULL, /* domainRestore */ - NULL, /* domainCoreDump */ - NULL, /* domainScreenshot */ - xenapiDomainSetVcpus, /* domainSetVcpus */ - xenapiDomainSetVcpusFlags, /* domainSetVcpusFlags */ - xenapiDomainGetVcpusFlags, /* domainGetVcpusFlags */ - xenapiDomainPinVcpu, /* domainPinVcpu */ - xenapiDomainGetVcpus, /* domainGetVcpus */ - xenapiDomainGetMaxVcpus, /* domainGetMaxVcpus */ - NULL, /* domainGetSecurityLabel */ - NULL, /* nodeGetSecurityModel */ - xenapiDomainGetXMLDesc, /* domainGetXMLDesc */ - NULL, /* domainXmlFromNative */ - NULL, /* domainXmlToNative */ - xenapiListDefinedDomains, /* listDefinedDomains */ - xenapiNumOfDefinedDomains, /* numOfDefinedDomains */ - xenapiDomainCreate, /* domainCreate */ - xenapiDomainCreateWithFlags, /* domainCreateWithFlags */ - xenapiDomainDefineXML, /* domainDefineXML */ - xenapiDomainUndefine, /* domainUndefine */ - NULL, /* domainAttachDevice */ - NULL, /* domainAttachDeviceFlags */ - NULL, /* domainDetachDevice */ - NULL, /* domainDetachDeviceFlags */ - NULL, /* domainUpdateDeviceFlags */ - xenapiDomainGetAutostart, /* domainGetAutostart */ - xenapiDomainSetAutostart, /* domainSetAutostart */ - xenapiDomainGetSchedulerType, /* domainGetSchedulerType */ - NULL, /* domainGetSchedulerParameters */ - NULL, /* domainSetSchedulerParameters */ - NULL, /* domainMigratePrepare */ - NULL, /* domainMigratePerform */ - NULL, /* domainMigrateFinish */ - NULL, /* domainBlockStats */ - NULL, /* domainInterfaceStats */ - NULL, /* domainMemoryStats */ - NULL, /* domainBlockPeek */ - NULL, /* domainMemoryPeek */ - NULL, /* domainGetBlockInfo */ - xenapiNodeGetCellsFreeMemory, /* nodeGetCellsFreeMemory */ - xenapiNodeGetFreeMemory, /* getFreeMemory */ - NULL, /* domainEventRegister */ - NULL, /* domainEventDeregister */ - NULL, /* domainMigratePrepare2 */ - NULL, /* domainMigrateFinish2 */ - NULL, /* nodeDeviceDettach */ - NULL, /* nodeDeviceReAttach */ - NULL, /* nodeDeviceReset */ - NULL, /* domainMigratePrepareTunnel */ - NULL, /* isEncrypted */ - NULL, /* isSecure */ - NULL, /* domainIsActive */ - NULL, /* domainIsPersistent */ - xenapiDomainIsUpdated, /* domainIsUpdated */ - NULL, /* cpuCompare */ - NULL, /* cpuBaseline */ - NULL, /* domainGetJobInfo */ - NULL, /* domainAbortJob */ - NULL, /* domainMigrateSetMaxDowntime */ - NULL, /* domainMigrateSetMaxSpeed */ - NULL, /* domainEventRegisterAny */ - NULL, /* domainEventDeregisterAny */ - NULL, /* domainManagedSave */ - NULL, /* domainHasManagedSaveImage */ - NULL, /* domainManagedSaveRemove */ - NULL, /* domainSnapshotCreateXML */ - NULL, /* domainSnapshotGetXMLDesc */ - NULL, /* domainSnapshotNum */ - NULL, /* domainSnapshotListNames */ - NULL, /* domainSnapshotLookupByName */ - NULL, /* domainHasCurrentSnapshot */ - NULL, /* domainSnapshotCurrent */ - NULL, /* domainRevertToSnapshot */ - NULL, /* domainSnapshotDelete */ - NULL, /* qemuDomainMonitorCommand */ - NULL, /* domainOpenConsole */ - NULL, /* domainInjectNMI */ + .no = VIR_DRV_XENAPI, + .name = "XenAPI", + .open = xenapiOpen, + .close = xenapiClose, + .supports_feature = xenapiSupportsFeature, + .type = xenapiType, + .version = xenapiGetVersion, + .getHostname = xenapiGetHostname, + .getMaxVcpus = xenapiGetMaxVcpus, + .nodeGetInfo = xenapiNodeGetInfo, + .getCapabilities = xenapiGetCapabilities, + .listDomains = xenapiListDomains, + .numOfDomains = xenapiNumOfDomains, + .domainCreateXML = xenapiDomainCreateXML, + .domainLookupByID = xenapiDomainLookupByID, + .domainLookupByUUID = xenapiDomainLookupByUUID, + .domainLookupByName = xenapiDomainLookupByName, + .domainSuspend = xenapiDomainSuspend, + .domainResume = xenapiDomainResume, + .domainShutdown = xenapiDomainShutdown, + .domainReboot = xenapiDomainReboot, + .domainDestroy = xenapiDomainDestroy, + .domainGetOSType = xenapiDomainGetOSType, + .domainGetMaxMemory = xenapiDomainGetMaxMemory, + .domainSetMaxMemory = xenapiDomainSetMaxMemory, + .domainGetInfo = xenapiDomainGetInfo, + .domainSetVcpus = xenapiDomainSetVcpus, + .domainSetVcpusFlags = xenapiDomainSetVcpusFlags, + .domainGetVcpusFlags = xenapiDomainGetVcpusFlags, + .domainPinVcpu = xenapiDomainPinVcpu, + .domainGetVcpus = xenapiDomainGetVcpus, + .domainGetMaxVcpus = xenapiDomainGetMaxVcpus, + .domainGetXMLDesc = xenapiDomainGetXMLDesc, + .listDefinedDomains = xenapiListDefinedDomains, + .numOfDefinedDomains = xenapiNumOfDefinedDomains, + .domainCreate = xenapiDomainCreate, + .domainCreateWithFlags = xenapiDomainCreateWithFlags, + .domainDefineXML = xenapiDomainDefineXML, + .domainUndefine = xenapiDomainUndefine, + .domainGetAutostart = xenapiDomainGetAutostart, + .domainSetAutostart = xenapiDomainSetAutostart, + .domainGetSchedulerType = xenapiDomainGetSchedulerType, + .nodeGetCellsFreeMemory = xenapiNodeGetCellsFreeMemory, + .getFreeMemory = xenapiNodeGetFreeMemory, + .domainIsUpdated = xenapiDomainIsUpdated, }; /**

2 1

[libvirt] [PATCH] virsh: Report an error when virGetUserDirectory fails
by Matthias Bolte 16 May '11

16 May '11

Otherwise virsh shows the interactive greeting and the silently exists instead of enterting interactive mode. --- tools/virsh.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 3baa015..356e0ae 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -12495,8 +12495,10 @@ vshReadlineInit(vshControl *ctl) /* Prepare to read/write history from/to the ~/.virsh/history file */ userdir = virGetUserDirectory(getuid()); - if (userdir == NULL) + if (userdir == NULL) { + vshError(ctl, "%s", _("Could not determine home directory")); return -1; + } if (virAsprintf(&ctl->historydir, "%s/.virsh", userdir) < 0) { vshError(ctl, "%s", _("Out of memory")); -- 1.7.0.4

2 2

[libvirt] libvirt, FreeBSD portability inquiry
by Jason Helfman 16 May '11

16 May '11

Hi, I am interested in porting libvirt to FreeBSD, and am curious if there may be anything that may not be possible at this point in respect to the libvirt source code to be aware of. Here is the log of the build of the software: I know it has been ported to MacOSX, and thought it could then be possible with FreeBSD. Thanks, Jason -- Jason Helfman System Administrator experts-exchange.com http://www.experts-exchange.com/M_4830110.html E4AD 7CF1 1396 27F6 79DD 4342 5E92 AD66 8C8C FBA5

3 15

[libvirt] Allow hvsupport.html.in to be auto-generated
by Daniel P. Berrange 16 May '11

16 May '11

The hvsupport.html.in file is constantly out of date, because when updating the drivers to add new APIs, people often (always) forget to update the hvsupport.html.in file. To solve this we can instead store version number annotations in the drivers themselves, so it is not easily missed. Then the hvsupport.html.in file can be auto-generated

4 17

[libvirt] Cache and memory bandwidth graphs: native versus guest
by Bill Gray 16 May '11

16 May '11

See attachment with two graphs: (1) cache bandwidth, (2) blowup of sustained memory bandwidth region... - X axis has a log scale - Light blue line is an older system with 32K L1 and 6M L2 caches - All other measurements on perf34: 32K L1, 256K L2, 30M L3 caches - Majority of variation in L1 cache region is from the two guest measurements done with no taskset to a VCPU: yellow and maroon lines. Perhaps this reflects the test bouncing between VCPUs in the guest. - The sustained memory bandwidth for the guest with no pinning is only 80% of native (maroon line), which motivates more convenient and comprehensive numactl for guests. - Virtualized bandwidth is otherwise nearly in line with native, which confirms the importance of the virtual CPUID communicating actual native cache sizes to cache-size-aware guest applications, since guest apps could benefit from the full size of the native cache. (Guest was started with "-cpu host", but lscpu in guest showed 4M cache despite actual 30M cache.)

2 1

[libvirt] KVM Forum 2011: Call For Participation
by KVM-Forum-2011-PC＠redhat.com 16 May '11

16 May '11

================================================================= KVM Forum 2011: Call For Participation August 15-16, 2011 - Hyatt Regency Vancouver - Vancouver, Canada ================================================================= KVM is an industry leading open source hypervisor that provides an ideal platform for datacenter virtualization, virtual desktop infrastructure, and cloud computing. Once again, it's time to bring together the community of developers and users that define the KVM ecosystem for our annual technical conference. We will discuss the current state of affairs and plan for the future of KVM, its surrounding infrastructure, and management tools. So mark your calendar and join us in advancing KVM. http://events.linuxfoundation.org/events/kvm-forum/ We are colocated with The Linux Foundation's LinuxCon again this year. KVM Forum attendees will be eligible to attend LinuxCon for a discounted rate. http://events.linuxfoundation.org/events/kvm-forum/register We invite you to lead part of the discussion by submitting a speaking proposal for KVM Forum 2011. http://events.linuxfoundation.org/cfp Suggested topics: KVM - Scaling and performance - Nested virtualization - I/O improvements - PCI device assignment - Driver domains - Time keeping - Resource management (cpu, memory, i/o) - Memory management (page sharing, swapping, huge pages, etc) - Fault tolerance - VEPA, VN-Link, vswitch - Security QEMU - Device model improvements - New devices - Scaling and performance - Desktop virtualization - Spice - Increasing robustness and hardening - Security model - Management interfaces - QMP protocol and implementation - Image formats - Live migration - Live snapshots and merging Virtio - Speeding up existing devices - Alternatives - Virtio on non-Linux Management infrastructure - Libvirt - KVM autotest - OpenStack - Network virtualization management - Enterprise storage management Cloud computing - Scalable storage - Virtual networking - Security - Provisioning - Hybrid SUBMISSION REQUIREMENTS Abstracts due: May 16th, 2011 Notification: May 31th, 2011 Please submit a short abstract (~150 words) describing your presentation proposal. In your submission please note how long your talk will take. Slots vary in length up to 45 minutes. Also include in your proposal the proposal type -- one of: - technical talk - end-user talk - BOF (birds of a feather) session Sumbit your proposal here: http://events.linuxfoundation.org/cfp You will receive a notification whether or not your presentation proposal was accepted by May 31st. END-USER COLLABORATION One of the big challenges as developers is to know what, where and how people actually use our software. We will reserve a few slots for end users talking about their deployment challenges and achievements. If you are using KVM in production you are encouraged submit a speaking proposal. Simply mark it as an end-user collaboration proposal. As and end user, this is a unique opportunity to get your input to developers. BOF SESSION We will reserve some slots in the evening after the main conference tracks, for birds of a feather sessions. These sessions will be less formal than presentation tracks and targetted for people who would like to discuss specific issues with other developers and/or users. If you are interested in getting developers and/or uses together to discuss a specific problem, please submit a BOF proposal. LIGHTNING TALKS In addition to submitted talks we will also have some room for lightning talks. These are short (5 minute) discussions to highlight new work or ideas that aren't complete enough to warrant a full presentation slot. Lightning talk submissions and scheduling will be handled on-site at KVM Forum. HOTEL / TRAVEL The KVM Forum 2011 will be held in Vancouver BC at the Hyatt Regency Vancouver. http://events.linuxfoundation.org/events/kvm-forum/travel Thank you for your interest in KVM. We're looking forward to your submissions and seeing you at the KVM Forum 2011 in August! Thanks, your KVM Forum 2011 Program Commitee Please contact us with any questions or comments. KVM-Forum-2011-PC(a)redhat.com

2 1

[libvirt] [PATCH] Disable virCommandExec on Win32
by Daniel P. Berrange 16 May '11

16 May '11

Mingw execve() has a broken signature. Disable this function until gnulib fixes the signature, since we don't really need this on Win32 anyway. * src/util/command.c: Disable virCommandExec on Win32 --- src/util/command.c | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/src/util/command.c b/src/util/command.c index 7ac411b..ebb90cb 100644 --- a/src/util/command.c +++ b/src/util/command.c @@ -989,6 +989,7 @@ cleanup: * Returns -1 on any error executing the command. * Will not return on success. */ +#ifndef WIN32 int virCommandExec(virCommandPtr cmd) { if (!cmd ||cmd->has_error == ENOMEM) { @@ -1003,6 +1004,18 @@ int virCommandExec(virCommandPtr cmd) return execve(cmd->args[0], cmd->args, cmd->env); } +#else +int virCommandExec(virCommandPtr cmd ATTRIBUTE_UNUSED) +{ + /* Mingw execve() has a broken signature. Disable this + * function until gnulib fixes the signature, since we + * don't really need this on Win32 anyway. + */ + virReportSystemError(ENOSYS, "%s", + _("Executing new processes is not supported on Win32 platform")); + return -1; +} +#endif /* * Run the command and wait for completion. -- 1.7.4.4

2 1

[libvirt] [PATCH] Cast args/env for execve in virCommand
by Daniel P. Berrange 16 May '11

16 May '11

'char **' is not compatible with 'const char* const*' so needs an explicit cast. Fixes the build on MinGW * src/util/command.c: Cast args/env for execve --- src/util/command.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/src/util/command.c b/src/util/command.c index 78586e8..d63b984 100644 --- a/src/util/command.c +++ b/src/util/command.c @@ -1000,7 +1000,9 @@ int virCommandExec(virCommandPtr cmd) return -1; } - return execve(cmd->args[0], cmd->args, cmd->env); + return execve(cmd->args[0], + (const char *const *)cmd->args, + (const char *const *)cmd->env); } /* -- 1.7.4.4

3 3