- Devel - libvirt List Archives

[libvirt] libvirtd segfault
by Scott Sullivan 04 Jan '13

04 Jan '13

### Libvirt version: ### libvirt tagged v1.0.0 from git , with f0e72b2f5c675f927d04545dc5095f9e5998f171 applied ### Problem: ### Libvirtd segfaults ### Steps to reproduce: ### This is difficult to reproduce; but appears to happen only when doing 'virsh destroys', and when they are ran in concurrent intervals, over extended periods of time. Here are the steps I have taken to reproduce this problem (debian_6.0_amd64_kvm.img.gz is just a zipped up squeeze stock ISO install): First, copy this script to ease the steps (assumed to be at /root/libvirt_crash.pl later): #!/usr/bin/env perl use strict; use warnings; use Getopt::Long qw(:config no_ignore_case); use String::Random; use UUID::Random; my ($lvms,$sleep,$restarts_per_lvm); GetOptions( 'lvms=i' => \$lvms, 'restarts_per_lvm=i' => \$restarts_per_lvm, 'sleep=i' => \$sleep, ); die "USAGE:\n$0 [--lvms int | --restarts_per_lvm int | --sleep int (optional) ]\n" unless ( $lvms && $restarts_per_lvm ); sub _create_lvm { my $opts = shift; print "\tlvcreate -n $opts->{lvm} -L 5G /dev/LVM\n"; system("lvcreate -n $opts->{lvm} -L 5G /dev/LVM"); } sub _kpartx_lvm { my $opts = shift; die "_kpartx_lvm needs modifier!\n" unless ( $opts->{modifier} ); print "\tkpartx -p p -$opts->{modifier} -v /dev/LVM/$opts->{lvm}\n"; system("kpartx -p p -$opts->{modifier} -v /dev/LVM/$opts->{lvm}"); } sub _remove_lvm { my $opts = shift; print "\tlvremove -f /dev/LVM/$opts->{lvm}\n"; system("lvremove -f /dev/LVM/$opts->{lvm}"); unlink("/xen/configs/$opts->{lvm}.cfg"); } sub _display_lvm { my $opts = shift; print "\tparted -s /dev/LVM/$opts->{lvm} unit gb p\n"; system("parted -s /dev/LVM/$opts->{lvm} unit gb p"); } sub _dd_template { my $opts = shift; print "\tdd if=/root/ssullivan/debian_6.0_amd64_kvm.img.gz bs=1M | gunzip -c | dd of=/dev/LVM/$opts->{lvm} bs=1M\n"; system("dd if=/root/ssullivan/debian_6.0_amd64_kvm.img.gz bs=1M | gunzip -c | dd of=/dev/LVM/$opts->{lvm} bs=1M"); } sub _e2fsck_lvm { my $opts = shift; print "\te2fsck -y -f /dev/mapper/LVM-$opts->{lvm}p1\n"; system("e2fsck -y -f /dev/mapper/LVM-$opts->{lvm}p1"); print "\te2fsck -y -f /dev/mapper/LVM-$opts->{lvm}p3\n"; system("e2fsck -y -f /dev/mapper/LVM-$opts->{lvm}p3") } sub _place_virtconf { my $opts = shift; my $uuid = UUID::Random::generate; my $virt_conf = <<END; <domain type="kvm"> <name>$opts->{lvm}</name> <uuid>$uuid</uuid> <memory>450560</memory> <currentMemory>450560</currentMemory> <vcpu>2</vcpu> <cpu> <topology sockets="2" cores="4" threads="1"/> </cpu> <os> <type arch="x86_64" machine="pc-1.1">hvm</type> <boot dev="hd"/> </os> <features> <acpi/> <apic/> <pae/> </features> <clock offset="localtime"/> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> <on_crash>restart</on_crash> <devices> <emulator>/opt/libexec/qemu-kvm-wrapper</emulator> <disk type="block" device="disk"> <driver name="qemu" cache="none"/> <source dev="/dev/LVM/$opts->{lvm}"/> <target dev="vda" bus="virtio"/> </disk> <serial type="pty"> <target port="1"/> </serial> <console type="pty"> <target port="1"/> </console> <input type="tablet" bus="usb"/> <input type="mouse" bus="ps2"/> <graphics type="vnc" port="-1" autoport="yes" keymap="en-us"/> </devices> </domain> END open(my $fh, '>', "/xen/configs/$opts->{lvm}.cfg") || die "Error opening [/xen/configs/$opts->{lvm}.cfg] [$!]"; print $fh "$virt_conf\n"; close($fh) || die "Error closing [/xen/configs/$opts->{lvm}.cfg] [$!]"; } sub _shutdown_lvm { my $opts = shift; print "\tvirsh destroy $opts->{lvm}\n"; system("virsh destroy $opts->{lvm}"); _virsh_list(); } sub _virsh_list { print "\tvirsh list\n"; system('virsh list'); } sub _start_lvm { my $opts = shift; print "\tvirsh create /xen/configs/$opts->{lvm}.cfg\n"; system("virsh create /xen/configs/$opts->{lvm}.cfg"); _virsh_list(); } my $rnd = new String::Random; my $count = 0; while ( $count < $lvms ) { my $id = $rnd->randpattern("cccccccc"); print "####\nLVM PASS: $count\nLVM: $id\n####\n"; print "Creating LVM...\n"; _create_lvm({ lvm => $id }); print "DD'ing template...\n"; _dd_template({ lvm => $id }); print "kpartxA LVM...\n"; _kpartx_lvm({ lvm => $id, modifier => 'a' }); print "e2fsck LVM..\n"; _e2fsck_lvm({ lvm => $id }); print "kpartxD LVM...\n"; _kpartx_lvm({ lvm => $id, modifier => 'd' }); print "Placing libvirt conf...\n"; _place_virtconf({ lvm => $id }); print "Partition setup:\n"; _display_lvm({ lvm => $id }); print "Performing $restarts_per_lvm restarts on $id...\n"; my $restart_cnt = 0; while ( $restart_cnt < $restarts_per_lvm ) { print "####\nRESTART PASS: $restart_cnt\nLVM: $id\n####\n"; print "Shutting down LVM...\n"; _shutdown_lvm({ lvm => $id }); sleep $sleep if ( $sleep ); print "Starting LVM...\n"; _start_lvm({ lvm => $id }); $restart_cnt++; } print "Removing LVM...\n"; _shutdown_lvm({ lvm => $id }); _remove_lvm({ lvm => $id }); $count++; } I then started 21 of these scripts, with the below commands (preferably in a screen to reduce spamming): perl /root/libvirt_crash.pl --lvms 1000 --restarts_per_lvm 2000 & perl /root/libvirt_crash.pl --lvms 1000 --restarts_per_lvm 2000 & perl /root/libvirt_crash.pl --lvms 1000 --restarts_per_lvm 2000 & perl /root/libvirt_crash.pl --lvms 1000 --restarts_per_lvm 2000 & perl /root/libvirt_crash.pl --lvms 1000 --restarts_per_lvm 2000 --sleep 10 & perl /root/libvirt_crash.pl --lvms 1000 --restarts_per_lvm 2000 --sleep 10 & perl /root/libvirt_crash.pl --lvms 1000 --restarts_per_lvm 2000 & perl /root/libvirt_crash.pl --lvms 1000 --restarts_per_lvm 2000 & perl /root/libvirt_crash.pl --lvms 1000 --restarts_per_lvm 2000 & perl /root/libvirt_crash.pl --lvms 1000 --restarts_per_lvm 2000 & perl /root/libvirt_crash.pl --lvms 6000 --restarts_per_lvm 30 & perl /root/libvirt_crash.pl --lvms 6000 --restarts_per_lvm 30 & perl /root/libvirt_crash.pl --lvms 6000 --restarts_per_lvm 30 & perl /root/libvirt_crash.pl --lvms 6000 --restarts_per_lvm 30 & perl /root/libvirt_crash.pl --lvms 6000 --restarts_per_lvm 30 & perl /root/libvirt_crash.pl --lvms 6000 --restarts_per_lvm 30 & perl /root/libvirt_crash.pl --lvms 6000 --restarts_per_lvm 30 & perl /root/libvirt_crash.pl --lvms 6000 --restarts_per_lvm 30 & perl /root/libvirt_crash.pl --lvms 6000 --restarts_per_lvm 30 & perl /root/libvirt_crash.pl --lvms 6000 --restarts_per_lvm 30 & perl /root/libvirt_crash.pl --lvms 6000 --restarts_per_lvm 30 & I already had libvirtd started under GDB at this point. I waited about 3-6 hours, and I found this in my GDB session: 2012-12-27 17:23:35.922+0000: 7445: error : qemuMonitorIO:614 : internal error End of file from monitor 2012-12-27 17:23:36.558+0000: 7445: error : qemuMonitorIO:614 : internal error End of file from monitor Program received signal SIGSEGV, Segmentation fault. [Switching to Thread 0x7fff8e1fc700 (LWP 31142)] qemuDomainObjBeginJobInternal (driver=0x7fffe401d740, driver_locked=true, obj=0x7fff80001b00, job=QEMU_JOB_DESTROY, asyncJob=QEMU_ASYNC_JOB_NONE) at qemu/qemu_domain.c:768 768 priv->jobs_queued++; Missing separate debuginfos, use: debuginfo-install audit-libs-2.1.3-3.el6.x86_64 augeas-libs-0.9.0-1.el6.x86_64 avahi-libs-0.6.25-11.el6.x86_64 cyrus-sasl-gssapi-2.1.23-13.el6.x86_64 cyrus-sasl-lib-2.1.23-13.el6.x86_64 cyrus-sasl-md5-2.1.23-13.el6.x86_64 cyrus-sasl-plain-2.1.23-13.el6.x86_64 db4-4.7.25-16.el6.x86_64 dbus-libs-1.2.24-5.el6_1.x86_64 device-mapper-libs-1.02.66-6.el6.x86_64 glibc-2.12-1.47.el6.x86_64 gnutls-2.8.5-4.el6.x86_64 keyutils-libs-1.4-3.el6.x86_64 krb5-libs-1.9-22.el6_2.1.x86_64 libblkid-2.17.2-12.4.el6.x86_64 libcap-ng-0.6.4-3.el6_0.1.x86_64 libcom_err-1.41.12-11.el6.x86_64 libcurl-7.19.7-26.el6_1.2.x86_64 libgcrypt-1.4.5-9.el6.x86_64 libgpg-error-1.7-4.el6.x86_64 libidn-1.18-2.el6.x86_64 libnl-1.1-14.el6.x86_64 libpcap-1.0.0-6.20091201git117cb5.el6.x86_64 libpciaccess-0.12.1-1.el6.x86_64 libselinux-2.0.94-5.2.el6.x86_64 libsepol-2.0.41-4.el6.x86_64 libtasn1-2.3-3.el6.x86_64 libudev-147-2.40.el6.x86_64 libuuid-2.17.2-12.4.el6.x86_64 libxml2-2.7.6-4.el6.x86_64 libxslt-1.1.26-2.el6.x86_64 netcf-libs-0.1.9-2.el6.x86_64 nspr-4.8.8-3.el6.x86_64 nss-3.12.10-17.el6_2.x86_64 nss-softokn-freebl-3.12.9-11.el6.x86_64 nss-util-3.12.10-2.el6.x86_64 numactl-2.0.3-9.el6.x86_64 openldap-2.4.23-20.el6.x86_64 openssl-1.0.0-20.el6.x86_64 yajl-1.0.7-3.el6.x86_64 zlib-1.2.3-27.el6.x86_64 (gdb) Here is the output of 'thread apply all bt' from this session: Thread 30 (Thread 0x7fff8e1fc700 (LWP 31142)): #0 qemuDomainObjBeginJobInternal (driver=0x7fffe401d740, driver_locked=true, obj=0x7fff80001b00, job=QEMU_JOB_DESTROY, asyncJob=QEMU_ASYNC_JOB_NONE) at qemu/qemu_domain.c:768 #1 0x00007fffeac2b223 in qemuDomainDestroyFlags (dom=<value optimized out>, flags=<value optimized out>) at qemu/qemu_driver.c:2052 #2 0x00000039f10f97df in virDomainDestroy (domain=0x7fff741b8540) at libvirt.c:2201 #3 0x0000000000428e22 in remoteDispatchDomainDestroy (server=<value optimized out>, client=<value optimized out>, msg=<value optimized out>, rerr=0x7fff8e1fbbe0, args=<value optimized out>, ret=<value optimized out>) at remote_dispatch.h:1277 #4 remoteDispatchDomainDestroyHelper (server=<value optimized out>, client=<value optimized out>, msg=<value optimized out>, rerr=0x7fff8e1fbbe0, args=<value optimized out>, ret=<value optimized out>) at remote_dispatch.h:1255 #5 0x00000039f1146152 in virNetServerProgramDispatchCall (prog=0x6884a0, server=0x67fe60, client=0x68eb50, msg=0x6930b0) at rpc/virnetserverprogram.c:431 #6 virNetServerProgramDispatch (prog=0x6884a0, server=0x67fe60, client=0x68eb50, msg=0x6930b0) at rpc/virnetserverprogram.c:304 #7 0x00000039f1143fee in virNetServerProcessMsg (srv=<value optimized out>, client=0x68eb50, prog=<value optimized out>, msg=0x6930b0) at rpc/virnetserver.c:171 #8 0x00000039f1144a8b in virNetServerHandleJob (jobOpaque=<value optimized out>, opaque=<value optimized out>) at rpc/virnetserver.c:192 #9 0x00000039f10643ec in virThreadPoolWorker (opaque=<value optimized out>) at util/threadpool.c:144 #10 0x00000039f1063cd9 in virThreadHelper (data=<value optimized out>) at util/threads-pthread.c:161 #11 0x000000300a2077f1 in start_thread () from /lib64/libpthread.so.0 #12 0x0000003009ae570d in clone () from /lib64/libc.so.6 Thread 29 (Thread 0x7fff8ebfd700 (LWP 20241)): #0 0x000000300a20b3dc in pthread_cond_wait@@GLIBC_2.3.2 () from /lib64/libpthread.so.0 #1 0x00000039f1063eb6 in virCondWait (c=<value optimized out>, m=<value optimized out>) at util/threads-pthread.c:117 #2 0x00000039f1064483 in virThreadPoolWorker (opaque=<value optimized out>) at util/threadpool.c:103 #3 0x00000039f1063cd9 in virThreadHelper (data=<value optimized out>) at util/threads-pthread.c:161 #4 0x000000300a2077f1 in start_thread () from /lib64/libpthread.so.0 #5 0x0000003009ae570d in clone () from /lib64/libc.so.6 Thread 28 (Thread 0x7fff8f5fe700 (LWP 20235)): #0 0x000000300a20b3dc in pthread_cond_wait@@GLIBC_2.3.2 () from /lib64/libpthread.so.0 #1 0x00000039f1063eb6 in virCondWait (c=<value optimized out>, m=<value optimized out>) at util/threads-pthread.c:117 #2 0x00000039f1064483 in virThreadPoolWorker (opaque=<value optimized out>) at util/threadpool.c:103 #3 0x00000039f1063cd9 in virThreadHelper (data=<value optimized out>) at util/threads-pthread.c:161 #4 0x000000300a2077f1 in start_thread () from /lib64/libpthread.so.0 #5 0x0000003009ae570d in clone () from /lib64/libc.so.6 Thread 27 (Thread 0x7fff8ffff700 (LWP 29349)): #0 0x000000300a20b3dc in pthread_cond_wait@@GLIBC_2.3.2 () from /lib64/libpthread.so.0 #1 0x00000039f1063eb6 in virCondWait (c=<value optimized out>, m=<value optimized out>) at util/threads-pthread.c:117 #2 0x00000039f1064483 in virThreadPoolWorker (opaque=<value optimized out>) at util/threadpool.c:103 #3 0x00000039f1063cd9 in virThreadHelper (data=<value optimized out>) at util/threads-pthread.c:161 #4 0x000000300a2077f1 in start_thread () from /lib64/libpthread.so.0 #5 0x0000003009ae570d in clone () from /lib64/libc.so.6 Thread 26 (Thread 0x7fffb8dfa700 (LWP 29348)): #0 0x000000300a20b3dc in pthread_cond_wait@@GLIBC_2.3.2 () from /lib64/libpthread.so.0 #1 0x00000039f1063eb6 in virCondWait (c=<value optimized out>, m=<value optimized out>) at util/threads-pthread.c:117 #2 0x00000039f1064483 in virThreadPoolWorker (opaque=<value optimized out>) at util/threadpool.c:103 #3 0x00000039f1063cd9 in virThreadHelper (data=<value optimized out>) at util/threads-pthread.c:161 #4 0x000000300a2077f1 in start_thread () from /lib64/libpthread.so.0 #5 0x0000003009ae570d in clone () from /lib64/libc.so.6 Thread 25 (Thread 0x7fffb97fb700 (LWP 28577)): #0 0x000000300a20b3dc in pthread_cond_wait@@GLIBC_2.3.2 () from /lib64/libpthread.so.0 #1 0x00000039f1063eb6 in virCondWait (c=<value optimized out>, m=<value optimized out>) at util/threads-pthread.c:117 #2 0x00000039f1064483 in virThreadPoolWorker (opaque=<value optimized out>) at util/threadpool.c:103 #3 0x00000039f1063cd9 in virThreadHelper (data=<value optimized out>) at util/threads-pthread.c:161 #4 0x000000300a2077f1 in start_thread () from /lib64/libpthread.so.0 #5 0x0000003009ae570d in clone () from /lib64/libc.so.6 Thread 24 (Thread 0x7fffba1fc700 (LWP 28576)): #0 0x000000300a20b3dc in pthread_cond_wait@@GLIBC_2.3.2 () from /lib64/libpthread.so.0 #1 0x00000039f1063eb6 in virCondWait (c=<value optimized out>, m=<value optimized out>) at util/threads-pthread.c:117 #2 0x00000039f1064483 in virThreadPoolWorker (opaque=<value optimized out>) at util/threadpool.c:103 #3 0x00000039f1063cd9 in virThreadHelper (data=<value optimized out>) at util/threads-pthread.c:161 #4 0x000000300a2077f1 in start_thread () from /lib64/libpthread.so.0 #5 0x0000003009ae570d in clone () from /lib64/libc.so.6 Thread 23 (Thread 0x7fffbabfd700 (LWP 28180)): #0 0x000000300a20b3dc in pthread_cond_wait@@GLIBC_2.3.2 () from /lib64/libpthread.so.0 #1 0x00000039f1063eb6 in virCondWait (c=<value optimized out>, m=<value optimized out>) at util/threads-pthread.c:117 #2 0x00000039f1064483 in virThreadPoolWorker (opaque=<value optimized out>) at util/threadpool.c:103 #3 0x00000039f1063cd9 in virThreadHelper (data=<value optimized out>) at util/threads-pthread.c:161 #4 0x000000300a2077f1 in start_thread () from /lib64/libpthread.so.0 #5 0x0000003009ae570d in clone () from /lib64/libc.so.6 Thread 22 (Thread 0x7fffbb5fe700 (LWP 28178)): #0 0x000000300a20b3dc in pthread_cond_wait@@GLIBC_2.3.2 () from /lib64/libpthread.so.0 #1 0x00000039f1063eb6 in virCondWait (c=<value optimized out>, m=<value optimized out>) at util/threads-pthread.c:117 #2 0x00000039f1064483 in virThreadPoolWorker (opaque=<value optimized out>) at util/threadpool.c:103 #3 0x00000039f1063cd9 in virThreadHelper (data=<value optimized out>) at util/threads-pthread.c:161 #4 0x000000300a2077f1 in start_thread () from /lib64/libpthread.so.0 #5 0x0000003009ae570d in clone () from /lib64/libc.so.6 Thread 21 (Thread 0x7fffe0dfa700 (LWP 12076)): #0 0x000000300a20b3dc in pthread_cond_wait@@GLIBC_2.3.2 () from /lib64/libpthread.so.0 #1 0x00000039f1063eb6 in virCondWait (c=<value optimized out>, m=<value optimized out>) at util/threads-pthread.c:117 #2 0x00000039f1064483 in virThreadPoolWorker (opaque=<value optimized out>) at util/threadpool.c:103 #3 0x00000039f1063cd9 in virThreadHelper (data=<value optimized out>) at util/threads-pthread.c:161 #4 0x000000300a2077f1 in start_thread () from /lib64/libpthread.so.0 #5 0x0000003009ae570d in clone () from /lib64/libc.so.6 Thread 20 (Thread 0x7fffe17fb700 (LWP 5934)): #0 0x000000300a20b3dc in pthread_cond_wait@@GLIBC_2.3.2 () from /lib64/libpthread.so.0 #1 0x00000039f1063eb6 in virCondWait (c=<value optimized out>, m=<value optimized out>) at util/threads-pthread.c:117 #2 0x00000039f1064483 in virThreadPoolWorker (opaque=<value optimized out>) at util/threadpool.c:103 #3 0x00000039f1063cd9 in virThreadHelper (data=<value optimized out>) at util/threads-pthread.c:161 #4 0x000000300a2077f1 in start_thread () from /lib64/libpthread.so.0 #5 0x0000003009ae570d in clone () from /lib64/libc.so.6 Thread 19 (Thread 0x7fffe21fc700 (LWP 5904)): #0 0x000000300a20b3dc in pthread_cond_wait@@GLIBC_2.3.2 () from /lib64/libpthread.so.0 #1 0x00000039f1063eb6 in virCondWait (c=<value optimized out>, m=<value optimized out>) at util/threads-pthread.c:117 #2 0x00000039f1064483 in virThreadPoolWorker (opaque=<value optimized out>) at util/threadpool.c:103 #3 0x00000039f1063cd9 in virThreadHelper (data=<value optimized out>) at util/threads-pthread.c:161 #4 0x000000300a2077f1 in start_thread () from /lib64/libpthread.so.0 #5 0x0000003009ae570d in clone () from /lib64/libc.so.6 Thread 18 (Thread 0x7fffe2bfd700 (LWP 5860)): #0 0x000000300a20b3dc in pthread_cond_wait@@GLIBC_2.3.2 () from /lib64/libpthread.so.0 #1 0x00000039f1063eb6 in virCondWait (c=<value optimized out>, m=<value optimized out>) at util/threads-pthread.c:117 #2 0x00000039f1064483 in virThreadPoolWorker (opaque=<value optimized out>) at util/threadpool.c:103 #3 0x00000039f1063cd9 in virThreadHelper (data=<value optimized out>) at util/threads-pthread.c:161 #4 0x000000300a2077f1 in start_thread () from /lib64/libpthread.so.0 #5 0x0000003009ae570d in clone () from /lib64/libc.so.6 Thread 17 (Thread 0x7fffbbfff700 (LWP 855)): #0 0x000000300a20b3dc in pthread_cond_wait@@GLIBC_2.3.2 () from /lib64/libpthread.so.0 #1 0x00000039f1063eb6 in virCondWait (c=<value optimized out>, m=<value optimized out>) at util/threads-pthread.c:117 #2 0x00000039f1064483 in virThreadPoolWorker (opaque=<value optimized out>) at util/threadpool.c:103 #3 0x00000039f1063cd9 in virThreadHelper (data=<value optimized out>) at util/threads-pthread.c:161 #4 0x000000300a2077f1 in start_thread () from /lib64/libpthread.so.0 #5 0x0000003009ae570d in clone () from /lib64/libc.so.6 Thread 16 (Thread 0x7fffe97c4700 (LWP 835)): #0 0x000000300a20b3dc in pthread_cond_wait@@GLIBC_2.3.2 () from /lib64/libpthread.so.0 #1 0x00000039f1063eb6 in virCondWait (c=<value optimized out>, m=<value optimized out>) at util/threads-pthread.c:117 #2 0x00000039f1064483 in virThreadPoolWorker (opaque=<value optimized out>) at util/threadpool.c:103 #3 0x00000039f1063cd9 in virThreadHelper (data=<value optimized out>) at util/threads-pthread.c:161 #4 0x000000300a2077f1 in start_thread () from /lib64/libpthread.so.0 #5 0x0000003009ae570d in clone () from /lib64/libc.so.6 Thread 11 (Thread 0x7fffec73f700 (LWP 7457)): #0 0x000000300a20b3dc in pthread_cond_wait@@GLIBC_2.3.2 () from /lib64/libpthread.so.0 #1 0x00000039f1063eb6 in virCondWait (c=<value optimized out>, m=<value optimized out>) at util/threads-pthread.c:117 #2 0x00000039f1064483 in virThreadPoolWorker (opaque=<value optimized out>) at util/threadpool.c:103 #3 0x00000039f1063cd9 in virThreadHelper (data=<value optimized out>) at util/threads-pthread.c:161 #4 0x000000300a2077f1 in start_thread () from /lib64/libpthread.so.0 #5 0x0000003009ae570d in clone () from /lib64/libc.so.6 Thread 10 (Thread 0x7fffed140700 (LWP 7456)): #0 0x000000300a20b3dc in pthread_cond_wait@@GLIBC_2.3.2 () from /lib64/libpthread.so.0 #1 0x00000039f1063eb6 in virCondWait (c=<value optimized out>, m=<value optimized out>) at util/threads-pthread.c:117 #2 0x00000039f1064483 in virThreadPoolWorker (opaque=<value optimized out>) at util/threadpool.c:103 #3 0x00000039f1063cd9 in virThreadHelper (data=<value optimized out>) at util/threads-pthread.c:161 #4 0x000000300a2077f1 in start_thread () from /lib64/libpthread.so.0 #5 0x0000003009ae570d in clone () from /lib64/libc.so.6 Thread 9 (Thread 0x7fffedb41700 (LWP 7455)): #0 0x000000300a20b3dc in pthread_cond_wait@@GLIBC_2.3.2 () from /lib64/libpthread.so.0 #1 0x00000039f1063eb6 in virCondWait (c=<value optimized out>, m=<value optimized out>) at util/threads-pthread.c:117 #2 0x00000039f1064483 in virThreadPoolWorker (opaque=<value optimized out>) at util/threadpool.c:103 #3 0x00000039f1063cd9 in virThreadHelper (data=<value optimized out>) at util/threads-pthread.c:161 #4 0x000000300a2077f1 in start_thread () from /lib64/libpthread.so.0 #5 0x0000003009ae570d in clone () from /lib64/libc.so.6 Thread 8 (Thread 0x7fffee542700 (LWP 7454)): #0 0x000000300a20b3dc in pthread_cond_wait@@GLIBC_2.3.2 () from /lib64/libpthread.so.0 #1 0x00000039f1063eb6 in virCondWait (c=<value optimized out>, m=<value optimized out>) at util/threads-pthread.c:117 #2 0x00000039f1064483 in virThreadPoolWorker (opaque=<value optimized out>) at util/threadpool.c:103 #3 0x00000039f1063cd9 in virThreadHelper (data=<value optimized out>) at util/threads-pthread.c:161 #4 0x000000300a2077f1 in start_thread () from /lib64/libpthread.so.0 #5 0x0000003009ae570d in clone () from /lib64/libc.so.6 Thread 7 (Thread 0x7fffeef43700 (LWP 7453)): #0 0x000000300a20b3dc in pthread_cond_wait@@GLIBC_2.3.2 () from /lib64/libpthread.so.0 #1 0x00000039f1063eb6 in virCondWait (c=<value optimized out>, m=<value optimized out>) at util/threads-pthread.c:117 #2 0x00000039f1064483 in virThreadPoolWorker (opaque=<value optimized out>) at util/threadpool.c:103 #3 0x00000039f1063cd9 in virThreadHelper (data=<value optimized out>) at util/threads-pthread.c:161 #4 0x000000300a2077f1 in start_thread () from /lib64/libpthread.so.0 #5 0x0000003009ae570d in clone () from /lib64/libc.so.6 Thread 6 (Thread 0x7fffef944700 (LWP 7452)): #0 0x000000300a20b3dc in pthread_cond_wait@@GLIBC_2.3.2 () from /lib64/libpthread.so.0 #1 0x00000039f1063eb6 in virCondWait (c=<value optimized out>, m=<value optimized out>) at util/threads-pthread.c:117 #2 0x00000039f1064483 in virThreadPoolWorker (opaque=<value optimized out>) at util/threadpool.c:103 #3 0x00000039f1063cd9 in virThreadHelper (data=<value optimized out>) at util/threads-pthread.c:161 #4 0x000000300a2077f1 in start_thread () from /lib64/libpthread.so.0 #5 0x0000003009ae570d in clone () from /lib64/libc.so.6 Thread 5 (Thread 0x7ffff0345700 (LWP 7451)): #0 0x000000300a20b3dc in pthread_cond_wait@@GLIBC_2.3.2 () from /lib64/libpthread.so.0 #1 0x00000039f1063eb6 in virCondWait (c=<value optimized out>, m=<value optimized out>) at util/threads-pthread.c:117 #2 0x00000039f1064483 in virThreadPoolWorker (opaque=<value optimized out>) at util/threadpool.c:103 #3 0x00000039f1063cd9 in virThreadHelper (data=<value optimized out>) at util/threads-pthread.c:161 #4 0x000000300a2077f1 in start_thread () from /lib64/libpthread.so.0 #5 0x0000003009ae570d in clone () from /lib64/libc.so.6 Thread 4 (Thread 0x7ffff0d46700 (LWP 7450)): #0 0x000000300a20b3dc in pthread_cond_wait@@GLIBC_2.3.2 () from /lib64/libpthread.so.0 #1 0x00000039f1063eb6 in virCondWait (c=<value optimized out>, m=<value optimized out>) at util/threads-pthread.c:117 #2 0x00000039f1064483 in virThreadPoolWorker (opaque=<value optimized out>) at util/threadpool.c:103 #3 0x00000039f1063cd9 in virThreadHelper (data=<value optimized out>) at util/threads-pthread.c:161 #4 0x000000300a2077f1 in start_thread () from /lib64/libpthread.so.0 #5 0x0000003009ae570d in clone () from /lib64/libc.so.6 Thread 3 (Thread 0x7ffff1747700 (LWP 7449)): #0 0x000000300a20b3dc in pthread_cond_wait@@GLIBC_2.3.2 () from /lib64/libpthread.so.0 #1 0x00000039f1063eb6 in virCondWait (c=<value optimized out>, m=<value optimized out>) at util/threads-pthread.c:117 #2 0x00000039f1064483 in virThreadPoolWorker (opaque=<value optimized out>) at util/threadpool.c:103 #3 0x00000039f1063cd9 in virThreadHelper (data=<value optimized out>) at util/threads-pthread.c:161 #4 0x000000300a2077f1 in start_thread () from /lib64/libpthread.so.0 #5 0x0000003009ae570d in clone () from /lib64/libc.so.6 Thread 2 (Thread 0x7ffff2148700 (LWP 7448)): #0 0x000000300a20b3dc in pthread_cond_wait@@GLIBC_2.3.2 () from /lib64/libpthread.so.0 #1 0x00000039f1063eb6 in virCondWait (c=<value optimized out>, m=<value optimized out>) at util/threads-pthread.c:117 #2 0x00000039f1064483 in virThreadPoolWorker (opaque=<value optimized out>) at util/threadpool.c:103 #3 0x00000039f1063cd9 in virThreadHelper (data=<value optimized out>) at util/threads-pthread.c:161 #4 0x000000300a2077f1 in start_thread () from /lib64/libpthread.so.0 #5 0x0000003009ae570d in clone () from /lib64/libc.so.6 Thread 1 (Thread 0x7ffff7fda800 (LWP 7445)): #0 0x0000003009a46f60 in vfprintf () from /lib64/libc.so.6 #1 0x0000003009afc970 in __vsnprintf_chk () from /lib64/libc.so.6 #2 0x0000003009afc8aa in __snprintf_chk () from /lib64/libc.so.6 #3 0x00000039f108144a in snprintf (when=<value optimized out>, buf=0x7fffffffd470 "2012-12-27 17:23:36.561+0000") at /usr/include/bits/stdio2.h:65 #4 virTimeStringThenRaw (when=<value optimized out>, buf=0x7fffffffd470 "2012-12-27 17:23:36.561+0000") at util/virtime.c:219 #5 0x00000039f108167a in virTimeStringNowRaw (buf=0x7fffffffd470 "2012-12-27 17:23:36.561+0000") at util/virtime.c:195 #6 0x00000039f105834b in virLogVMessage (source=VIR_LOG_FROM_FILE, priority=<value optimized out>, filename=0x39f11ad70b "util/event_poll.c", linenr=378, funcname=0x39f11adcc0 "virEventPollMakePollFDs", fmt=<value optimized out>, vargs=0x7fffffffd4f0) at util/logging.c:822 #7 0x00000039f10586ec in virLogMessage (source=<value optimized out>, priority=<value optimized out>, filename=<value optimized out>, linenr=<value optimized out>, funcname=<value optimized out>, fmt=<value optimized out>) at util/logging.c:753 #8 0x00000039f1052241 in virEventPollMakePollFDs () at util/event_poll.c:374 #9 virEventPollRunOnce () at util/event_poll.c:605 #10 0x00000039f1051666 in virEventRunDefaultImpl () at util/event.c:247 #11 0x00000039f11437dd in virNetServerRun (srv=0x67fe60) at rpc/virnetserver.c:1004 #12 0x000000000040c5a3 in main (argc=<value optimized out>, argv=<value optimized out>) at libvirtd.c:1354 (gdb) Does anyone have any insights as to the cause of this, or any potential solutions? If there's anything I can add that would help let me know.

2 7

Re: [libvirt] [libvirt-php][PATCH 00/20] compilation under OS X and various
by Michal Novotny 03 Jan '13

03 Jan '13

Hi Tugdual! Thanks for the patch series. I've applied and tested it and it's working great! Thanks again for the series. I've noted your major contribution in the AUTHORS file with big thanks going to you :-) Michal On 01/03/2013 10:34 AM, Tugdual Saunier wrote: > These patches are the result of my work to get libvirt-php compiled > under OS X. > As I suceeded to compiled it, I found some bugs/warnings > that are also fixed in the following commits. > The most important is probably the vnc_get_bitmap and vnc_refresh_screen now working. > > Tugdual Saunier (20): > Fixed compilation under OS X > fixed a malloc_error_break in doc generation > fixed wrong xpath in domain type retrieving > fixed PHP warnings in uuid generation > fixed warnings > fixed resource counter changes in libvirt_list_active_domains > init array only if needed in libvirt_list_inactive_domains > fixed wrong maxsize type in libvirt_logfile_set > fixed wrong types in libvirt_check_version > fixed wrong byte_order determination under other OS by improving it > fixed wrong test on virConnectClose return value > fixed vnc_get_bitmap > Fixed infinite loop in vnc_refresh_screen > fixed last warnings > fixed doc generation under OSX > Made tests more universal by using libvirt test driver > reorder tests by dependency > improved test-install.phpt, no more need of a random name > fixed some segfault in test-domain-snapshot.phpt > fixed wrong doc alignment for libvirt_domain_managedsave > > configure.ac | 10 + > docs/Makefile.am | 14 +- > src/Makefile.am | 5 +- > src/libvirt-php.c | 330 +++++++++++++-------------- > src/libvirt-php.h | 16 +- > src/vncfunc.c | 25 +- > tests/data/example-no-disk-and-media.xml | 3 +- > tests/functions.phpt | 8 + > tests/php.ini | 2 + > tests/runtests.sh | 11 +- > tests/test-conn-limit.phpt | 2 +- > tests/test-connect.phpt | 40 +--- > tests/test-domain-create-and-coredump.phpt | 2 +- > tests/test-domain-create-and-get-xpath.phpt | 4 +- > tests/test-domain-create.phpt | 2 +- > tests/test-domain-define-create-destroy.phpt | 2 +- > tests/test-domain-define-undefine.phpt | 2 +- > tests/test-domain-snapshot.phpt | 14 +- > tests/test-get-emulator.phpt | 10 +- > tests/test-install.phpt | 14 +- > tests/test-logging.phpt | 6 +- > tools/generate-api-docs.c | 1 + > 22 files changed, 260 insertions(+), 263 deletions(-) > create mode 100644 tests/data/test-libvirt-php.img > create mode 100644 tests/php.ini > > -- > 1.8.0.1 > -- Michal Novotny <minovotn(a)redhat.com>, RHCE, Red Hat Virtualization | libvirt-php bindings | php-virt-control.org

1 0

[libvirt] Greetings and next release
by Daniel Veillard 03 Jan '13

03 Jan '13

Hello everybody, Happy new year and best wishes for 2013 ! When we planned the 1.0.1 release we took the option of taking a bit of extra time to push mid-december and planning the following one for the end of January. Based on this I suggest to enter the freeze for libvirt-1.0.2 on the Thursday 24 so that we have a week to push for a final release on the end of the month. We are already over 110 commits since 1.0.1 so 3 weeks from now I would expect enough changes for a interesting release :-) Daniel -- Daniel Veillard | Open Source and Standards, Red Hat veillard(a)redhat.com | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | virtualization library http://libvirt.org/

1 0

[libvirt] Coverity scan
by John Ferlan 03 Jan '13

03 Jan '13

First allow me to introduce myself - I'm John Ferlan a new Red Hat employee (3 weeks). I came from the closed world at HP where for the last 7 years I worked in a group developing/supporting HP's Integrity Virtual Machine software prior to it being outsourced to India this past May. I primarily worked in the CLI/API and daemon space, although I also spent quite a bit of time in the lower virtualization layers which mimicked the Integrity instructions. I am very happy to be in the open world and look forward to contributing. Everyone has to start some where. My first task here at Red Hat was to triage a Coverity scan executed against libvirt-1.0.0-1.fc19.src.rpm done in late November. There were 285 issues documented. I quickly found that some of the defects found there were already fixed in later submits upstream, so I ran a new Coverity scan last Friday and it came back with 297 issues broken down as follows: 1 ARRAY_VS_SINGLETON 33 BAD_SIZEOF 17 CHECKED_RETURN 1 CONSTANT_EXPRESSION_RESULT 5 COPY_PASTE_ERROR 13 DEADCODE 46 FORWARD_NULL 2 MISSING_RETURN 2 NEGATIVE_RETURNS 7 NULL_RETURNS 1 OVERRUN 137 RESOURCE_LEAK 18 REVERSE_INULL 1 SIGN_EXTENSION 3 UNINIT 8 UNUSED_VALUE 2 USE_AFTER_FREE Of the defects found there are quite a few which can be considered as "false positives", some are trivial issues, a few complex issues, and the rest while resulting in a core usually occur in some error path. The bulk of the BAD_SIZEOF errors are the result of using a %p in the PROBE macro on structure pointers - it's a false positive, yet annoying. The bulk of FORWARD_NULL defects are from a false positive in vbox_templ.c. The bulk of RESOURCE_LEAK defects are from the use of macros to build code in esx_vi_types - which is where I'm triaging now. Of all the errors listed, "only" 62 files are affected. Over the next few weeks, I'll start sending patch requests starting with some of the trivial problems just so I can get my feet wet with the process as it's certainly different than my closed world experiences. Since part of that process is to communicate early so people know what you're doing and what's coming - that's what I'm doing! Also, now that I have a bit of experience with Coverity - I can run it again (more frequently) against the latest upstream bits. John Ferlan

4 4

[libvirt] [PATCH 0/3]add usb-audio support
by Guannan Ren 03 Jan '13

03 Jan '13

This set of patches is trying to add qemu usb-audio virtual device support. usb-audio XML example: <devices> <sound model='usb-audio'> <buffer>1536</buffer> <address type='usb' bus='0' port='1'/> </sound> </devices> qemu ${other_vm_args} \ -device usb-audio,id=sound0,buffer=1536,bus=usb.0,port=1 There is an optional sub-element <buffer> to customize the buffer size of usb audio device, if missing, the default size is 1536(defined in qemu code). Special size of value 0 means no buffer will be used, so we use bool 'customized_buffer'to differentiate user-defined 0 from being using default buffer value 1536. Guannan Ren(3) [PATCH 1/3] qemu: add usb-audio caps flag [PATCH 2/3] qemu: parse usb-audio audio device XML and docs [PATCH 3/3] test: add usb-audio testcase docs/formatdomain.html.in | 10 ++++++++-- docs/schemas/basictypes.rng | 11 +++++++++++ docs/schemas/domaincommon.rng | 9 +++++++++ docs/schemas/nwfilter.rng | 15 --------------- src/conf/domain_conf.c | 49 ++++++++++++++++++++++++++++++++++++++++++++++++- src/conf/domain_conf.h | 5 +++++ src/qemu/qemu_capabilities.c | 2 ++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 19 ++++++++++++++++++- tests/qemuhelptest.c | 9 ++++++--- tests/qemuxml2argvdata/qemuxml2argv-usb-audio.args | 7 +++++++ tests/qemuxml2argvdata/qemuxml2argv-usb-audio.xml | 31 +++++++++++++++++++++++++++++++ tests/qemuxml2argvtest.c | 3 +++ 13 files changed, 149 insertions(+), 22 deletions(-)

1 3

[libvirt] [RFC] Refactoring bridge driver for portability
by Roman Bogorodskiy 03 Jan '13

03 Jan '13

Hi, Few weeks ago when I have submitted my all-in-one huge FreeBSD, Eric made some comments on the networking part: http://www.redhat.com/archives/libvir-list/2012-December/msg00432.html Now when we're done with most of the other things, I'd like to discuss networking in more detail. Basically, the main question that bothers me is what would be the best way to refactor network/bridge_driver.c? Currently it contains a number of things: - dnsmasq routines, static, but cross-platform, doesn't need any changes (at least major ones) - the same for radvd - minor firewalld bits, that are linux specifc - iptables routines. There are quite a lot of that code and it's also gets called from many places in the file I'm thinking about an approach that Eric mentioned for virthread.c: - keep dnsmasq and radvd in bridge_driver.c - move out all linux specific code to bridge_driver_linux.c and #include it in a way similar to virthread.c - in a similar way create bridge_driver_freebsd.c Does it sound reasonable? Roman Bogorodskiy

3 3

[libvirt] [PATCH] build: use autobuild module to make build logs nicer
by Eric Blake 03 Jan '13

03 Jan '13

A recent build failure made me realize that we could usefully add a bit more information to configure output, for aid in analysis of failed builds. Pulling in the autobuild module merely adds these four lines to configure output: configure: autobuild project... libvirt configure: autobuild revision... 1.0.1 configure: autobuild hostname... myhost configure: autobuild timestamp... 20130102T181342Z which can be useful even if not using the Autobuild project to parse build logs. * bootstrap.conf (gnulib_modules): Add autobuild. --- I'll wait for a review on this one. Hmm, I also realized that there are other things that might be useful for autobuild to log, such as uname output; I'll ask upstream if it is worth enhancing the autobuild output, and if upstream agrees, then we would pick up that enhanced information next time we sync from gnulib. bootstrap.conf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bootstrap.conf b/bootstrap.conf index 37a0ae1..4b45a4f 100644 --- a/bootstrap.conf +++ b/bootstrap.conf @@ -1,6 +1,6 @@ # Bootstrap configuration. -# Copyright (C) 2010-2012 Red Hat, Inc. +# Copyright (C) 2010-2013 Red Hat, Inc. # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -20,6 +20,7 @@ gnulib_modules=' accept areadlink +autobuild base64 bind bitrotate -- 1.8.0.2

2 3

[libvirt] where is config.log when debugging a failure reported by Jenkins
by Eric Blake 03 Jan '13

03 Jan '13

Hello Jenkins folks, On the libvirt list, we came across a case where a broken commit was detected, but where the information available in the failure report was insufficient (for at least me) to reproduce the failure environment without asking more questions: http://honk.sigxcpu.org:8001/job/libvirt-build/472/ https://www.redhat.com/archives/libvir-list/2013-January/msg00037.html Is there any way that things can be tweaked to include the 'config.log' file in the web report of a failed build? Merely capturing the output of './configure' fails to provide some of the details that are intentionally redirected into the more verbose config.log file. -- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org

2 2

[libvirt] [PATCH] maint: update to latest gnulib
by Michal Privoznik 03 Jan '13

03 Jan '13

The update results in bootstrap being updated as well. --- .gnulib | 2 +- bootstrap | 15 ++++++++------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/.gnulib b/.gnulib index d245e6d..964bbc2 160000 --- a/.gnulib +++ b/.gnulib @@ -1 +1 @@ -Subproject commit d245e6ddd6ab2624d0d83acd8f111454f984f50f +Subproject commit 964bbc2d419584e93fe629ddbc40595612f62083 diff --git a/bootstrap b/bootstrap index e3e270b..c84d249 100755 --- a/bootstrap +++ b/bootstrap @@ -1,6 +1,6 @@ #! /bin/sh # Print a version string. -scriptversion=2012-07-19.14; # UTC +scriptversion=2012-12-28.10; # UTC # Bootstrap this package from checked-out sources. @@ -889,20 +889,21 @@ find "$m4_base" "$source_base" \ -depth $ -name '*.m4' -o -name '*.[ch]' $ \ -type l -xtype l -delete > /dev/null 2>&1 +# Invoke autoreconf with --force --install to ensure upgrades of tools +# such as ylwrap. +AUTORECONFFLAGS="--verbose --install --force -I $m4_base $ACLOCAL_FLAGS" + # Some systems (RHEL 5) are using ancient autotools, for which the # --no-recursive option had not been invented. Detect that lack and # omit the option when it's not supported. FIXME in 2017: remove this # hack when RHEL 5 autotools are updated, or when they become irrelevant. -no_recursive= case $($AUTORECONF --help) in - *--no-recursive*) no_recursive=--no-recursive;; + *--no-recursive*) AUTORECONFFLAGS="$AUTORECONFFLAGS --no-recursive";; esac # Tell autoreconf not to invoke autopoint or libtoolize; they were run above. -echo "running: AUTOPOINT=true LIBTOOLIZE=true " \ - "$AUTORECONF --verbose --install $no_recursive -I $m4_base $ACLOCAL_FLAGS" -AUTOPOINT=true LIBTOOLIZE=true \ - $AUTORECONF --verbose --install $no_recursive -I $m4_base $ACLOCAL_FLAGS \ +echo "running: AUTOPOINT=true LIBTOOLIZE=true $AUTORECONF $AUTORECONFFLAGS" +AUTOPOINT=true LIBTOOLIZE=true $AUTORECONF $AUTORECONFFLAGS \ || die "autoreconf failed" # Get some extra files from gnulib, overriding existing files. -- 1.8.0.2

2 2

[libvirt] [PATCH] Remove the inexistent function in comments
by Osier Yang 02 Jan '13

02 Jan '13

virNodeDeviceLookupByKey is inexistent. --- Pushed under trivial rule. --- include/libvirt/libvirt.h.in | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/include/libvirt/libvirt.h.in b/include/libvirt/libvirt.h.in index c6739d7..2de6835 100644 --- a/include/libvirt/libvirt.h.in +++ b/include/libvirt/libvirt.h.in @@ -3113,10 +3113,9 @@ typedef struct _virNodeDevice virNodeDevice; * virNodeDevicePtr: * * A virNodeDevicePtr is a pointer to a virNodeDevice structure. Get - * one via virNodeDeviceLookupByKey, virNodeDeviceLookupByName, or - * virNodeDeviceCreate. Be sure to Call virNodeDeviceFree when done - * using a virNodeDevicePtr obtained from any of the above functions to - * avoid leaking memory. + * one via, virNodeDeviceLookupByName, or virNodeDeviceCreate. Be sure + * to Call virNodeDeviceFree when done using a virNodeDevicePtr obtained + * from any of the above functions to avoid leaking memory. */ typedef virNodeDevice *virNodeDevicePtr; -- 1.7.7.6

2 2

[libvirt] [PATCH] qemu: Adapt to new log format
by Michal Privoznik 02 Jan '13

02 Jan '13

Since 586502189edf9fd0f89a83de96717a2ea826fdb0 qemu commit, the log lines reporting chardev's path has changed from: $ ./x86_64-softmmu/qemu-system-x86_64 -serial pty -serial pty -monitor pty char device redirected to /dev/pts/5 char device redirected to /dev/pts/6 char device redirected to /dev/pts/7 to: $ ./x86_64-softmmu/qemu-system-x86_64 -serial pty -serial pty -monitor pty char device compat_monitor0 redirected to /dev/pts/5 char device serial0 redirected to /dev/pts/6 char device serial1 redirected to /dev/pts/7 However, with current code we are not prepared for such change, which results in us being unable to start any domain. --- src/qemu/qemu_process.c | 33 +++++++++++++++++++++++++++++---- 1 file changed, 29 insertions(+), 4 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index eac6553..29bd082 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -1431,22 +1431,43 @@ cleanup: * * char device redirected to /dev/pts/3 * + * However, since 1.4 the line we are looking for has changed to: + * + * char device <alias> redirected to /some/path + * * Returns -1 for error, 0 success, 1 continue reading */ static int qemuProcessExtractTTYPath(const char *haystack, size_t *offset, + const char *alias, char **path) { - static const char needle[] = "char device redirected to"; - char *tmp, *dev; + static const char *needle[] = {"char device", "redirected to"}; + const char *tmp, *dev; VIR_FREE(*path); /* First look for our magic string */ - if (!(tmp = strstr(haystack + *offset, needle))) { + if (!(tmp = strstr(haystack + *offset, needle[0]))) return 1; + + tmp += strlen(needle[0]); + virSkipSpaces(&tmp); + + if (STRPREFIX(tmp, "char")) { + /* we are dealing with new style */ + tmp += strlen("char"); + if (!STRPREFIX(tmp, alias)) + return 1; + + tmp += strlen(alias); + virSkipSpaces(&tmp); } - tmp += sizeof(needle); + + if (!STRPREFIX(tmp, needle[1])) + return 1; + + tmp += strlen(needle[1]); dev = tmp; /* @@ -1569,6 +1590,7 @@ qemuProcessFindCharDevicePTYs(virDomainObjPtr vm, virDomainChrDefPtr chr = vm->def->serials[i]; if (chr->source.type == VIR_DOMAIN_CHR_TYPE_PTY) { if ((ret = qemuProcessExtractTTYPath(output, &offset, + chr->info.alias, &chr->source.data.file.path)) != 0) return ret; } @@ -1579,6 +1601,7 @@ qemuProcessFindCharDevicePTYs(virDomainObjPtr vm, virDomainChrDefPtr chr = vm->def->parallels[i]; if (chr->source.type == VIR_DOMAIN_CHR_TYPE_PTY) { if ((ret = qemuProcessExtractTTYPath(output, &offset, + chr->info.alias, &chr->source.data.file.path)) != 0) return ret; } @@ -1589,6 +1612,7 @@ qemuProcessFindCharDevicePTYs(virDomainObjPtr vm, virDomainChrDefPtr chr = vm->def->channels[i]; if (chr->source.type == VIR_DOMAIN_CHR_TYPE_PTY) { if ((ret = qemuProcessExtractTTYPath(output, &offset, + chr->info.alias, &chr->source.data.file.path)) != 0) return ret; } @@ -1608,6 +1632,7 @@ qemuProcessFindCharDevicePTYs(virDomainObjPtr vm, if (chr->source.type == VIR_DOMAIN_CHR_TYPE_PTY && chr->targetType == VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_VIRTIO) { if ((ret = qemuProcessExtractTTYPath(output, &offset, + chr->info.alias, &chr->source.data.file.path)) != 0) return ret; } -- 1.8.0.2

4 7

[libvirt] ESX error while freeing inherited objects
by Ata Bohra 02 Jan '13

02 Jan '13

Hi All, Freeing of an object having inheritance depth >=2 throws an error such as:" internal error Call to esxVI_<grand_parent>_Free for unexpected type 'Child'. " For instance: Below code snippet is from esx_vi_generator.input (modified) object VirtualDevice Int key r Description deviceInfo o VirtualDeviceBackingInfo backing o VirtualDeviceConnectInfo connectable o Int controllerKey o Int unitNumber o end object VirtualController extends VirtualDevice Int busNumber r Int device ol end object VirtualIDEController extends VirtualController end object VirtualDeviceConfigSpec VirtualDeviceConfigSpecOperation operation o VirtualDeviceConfigSpecFileOperation fileOperation o VirtualDevice device r end object VirtualMachineConfigSpec... VirtualDeviceConfigSpec deviceChange ol..end On free of "VirtualMachineConfigSpec", I hit below error:"libvir: ESX Driver error : internal error Call to esxVI_VirtualDevice_Free for unexpected type 'VirtualIDEController'" But if I remove VirtualController and include its fields directly to VirtualIDEController, error is resolved. Please let me know if I'm missing anything, else, it seems like a bug with generated code. While debugging the error seems to come from: esx_vi_types.c: /* * Macros to implement dynamic dispatched functions */#define ESX_VI__TEMPLATE__DISPATCH(_actual_type, _actual_type_name, __type, \ _dispatch, _error_return) \ switch (_actual_type) { \ _dispatch \ \ case esxVI_Type_##__type: \ break; \ \ default: \ virReportError(VIR_ERR_INTERNAL_ERROR, \ _("Call to %s for unexpected type '%s'"), \ __FUNCTION__, _actual_type_name); \ return _error_return; \ } Thanks!Ata

1 1

[libvirt] [PATCH] ESX: append CURL headers to fix serviceContent entities
by Ata E Husain Bohra 02 Jan '13

02 Jan '13

Append curl headers with "SOAPAction" header to populate serviceContent object entities which are otherwise missing. --- src/esx/esx_vi.c | 2 ++ src/esx/esx_vi_generator.input | 3 +++ 2 files changed, 5 insertions(+) diff --git a/src/esx/esx_vi.c b/src/esx/esx_vi.c index 99c1eb1..a379183 100644 --- a/src/esx/esx_vi.c +++ b/src/esx/esx_vi.c @@ -322,6 +322,8 @@ esxVI_CURL_Connect(esxVI_CURL *curl, esxUtil_ParsedUri *parsedUri) * approx. 2 sec per POST operation. */ curl->headers = curl_slist_append(curl->headers, "Expect:"); + curl->headers = curl_slist_append(curl->headers, + _("SOAPAction: \"urn:vim25\"")); if (curl->headers == NULL) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", diff --git a/src/esx/esx_vi_generator.input b/src/esx/esx_vi_generator.input index 22c114e..236dcb3 100644 --- a/src/esx/esx_vi_generator.input +++ b/src/esx/esx_vi_generator.input @@ -1008,6 +1008,8 @@ object ServiceContent ManagedObjectReference clusterProfileManager o ManagedObjectReference complianceManager o ManagedObjectReference localizationManager o + ManagedObjectReference storageResourceManager o + ManagedObjectReference guestOperationsManager o end @@ -1073,6 +1075,7 @@ object UserSession DateTime lastActiveTime r String locale r String messageLocale r + Boolean extensionSession o end -- 1.7.9.5

3 3

[libvirt] [PATCH] sanlock: Chown lease files as well
by Michal Privoznik 01 Jan '13

01 Jan '13

Since sanlock doesn't run under root:root, we have chown()'ed the __LIBVIRT__DISKS__ lease file to the user:group defined in the sanlock config. However, when writing the patch I've forgot about lease files for each disk (this is the /var/lib/libvirt/sanlock/<md5>) file. --- src/locking/lock_driver_sanlock.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/locking/lock_driver_sanlock.c b/src/locking/lock_driver_sanlock.c index 75ced84..c955003 100644 --- a/src/locking/lock_driver_sanlock.c +++ b/src/locking/lock_driver_sanlock.c @@ -679,6 +679,17 @@ static int virLockManagerSanlockCreateLease(struct sanlk_resource *res) } VIR_DEBUG("Someone else just created lockspace %s", res->disks[0].path); } else { + /* chown() the path to make sure sanlock can access it */ + if ((driver->user != -1 || driver->group != -1) && + (fchown(fd, driver->user, driver->group) < 0)) { + virReportSystemError(errno, + _("cannot chown '%s' to (%u, %u)"), + res->disks[0].path, + (unsigned int) driver->user, + (unsigned int) driver->group); + goto error_unlink; + } + if ((rv = sanlock_align(&res->disks[0])) < 0) { if (rv <= -200) virReportError(VIR_ERR_INTERNAL_ERROR, -- 1.8.0.2

3 3

[libvirt] [test-API][PATCH V2] managedsave: change the checking method about bypass cache
by hongming 30 Dec '12

30 Dec '12

Check whether the O_DIRECT flag is in use on the managed save file during the duration of the managed save, since that is the real effect of the current implementation of the --bypass-cache flag. Add break condition into the while loop of get_fileflags() method in the PATCH V2 --- repos/managedsave/managedsave.py | 61 ++++++++++++++++++++------------------ 1 files changed, 32 insertions(+), 29 deletions(-) diff --git a/repos/managedsave/managedsave.py b/repos/managedsave/managedsave.py index 4a92151..70d4ebc 100644 --- a/repos/managedsave/managedsave.py +++ b/repos/managedsave/managedsave.py @@ -2,6 +2,8 @@ import os import math +import thread +import time import libvirt from libvirt import libvirtError @@ -39,39 +41,43 @@ def check_savefile_create(*args): logger.info("managed save file exists") return True -def compare_cachedfile(cachebefore, cacheafter): - """Compare cached value before managed save and its value after - managed save """ +def get_fileflags(): + """Get the file flags of managed save file""" + cmds = "cat /proc/$(lsof -w /var/lib/libvirt/qemu/save/"+guestname+".save"\ + "|awk '/libvirt_i/{print $2}')/fdinfo/1|grep flags|awk '{print $NF}'" + global fileflags + while True: + (status, output) = utils.exec_cmd(cmds, shell=True) + if status == 0: + if len(output) == 1: + logger.info("The flags of saved file %s " % output[0]) + fileflags = output[0][-5] + break + else: + logger.error("Fail to get the flags of saved file") + return 1 + + thread.exit_thread() - diff = cacheafter - cachebefore - logger.info("diff is %s " % diff) - percent = math.fabs(diff)/cachebefore - logger.info("diff percent is %s " % percent) - if percent < 0.05: +def check_fileflag(fileflags): + """Check the file flags of managed save file if include O_DIRECT""" + if int(fileflags) == 4: + logger.info("file flags include O_DIRECT") return True else: + logger.error("file flags doesn't include O_DIRECT") return False -def get_cachevalue(): - """Get the file system cached value """ - - cmds = "head -n4 /proc/meminfo|grep Cached|awk '{print $2}'" - (status, output) = utils.exec_cmd(cmds, shell=True) - if status != 0: - logger.error("Fail to run cmd line to get cache") - return 1 - else: - logger.debug(output[0]) - cachevalue= int(output[0]) - return cachevalue - def managedsave(params): """Managed save a running domain""" global logger logger = params['logger'] + global guestname guestname = params['guestname'] flags = params ['flags'] + global fileflags + fileflags = '' #Save given flags to sharedmod.data sharedmod.data['flagsave'] = flags @@ -122,17 +128,14 @@ def managedsave(params): #If given flags include bypass-cache,check if bypass file system cache if flagn % 2 == 1: - logger.info("Given flags include --bypass-cache") - os.system('echo 3 > /proc/sys/vm/drop_caches') - cache_before = get_cachevalue() - logger.info("Cached value before managedsave is %s" % cache_before) + logger.info("Given flags include --bypass-cache") + thread.start_new_thread(get_fileflags,()) + # Guarantee get_fileflags shell has run before managed save + time.sleep(5) domobj.managedSave(flagn) - cache_after = get_cachevalue() - logger.info("Cached value after managedsave is %s" % cache_after) - - if compare_cachedfile(cache_before, cache_after): + if check_fileflag(fileflags): logger.info("Bypass file system cache successfully") else: logger.error("Bypass file system cache failed") -- 1.7.7.6

2 1

[libvirt] virsh "net-create" explanation
by Bilal Ahmad 29 Dec '12

29 Dec '12

Hi all, I am new to libvirt and started looking at the source code. While tracing back the virsh command "net-create", I got stuck into a loop and I would really like someone to explain how this works. In the virsh-network.c, from: network = virNetworkCreateXML(ctl->conn, buffer); I traced back to: if (conn->networkDriver && conn->networkDriver->networkCreateXML) { virNetworkPtr ret; ret = conn->networkDriver->networkCreateXML(conn, xmlDesc); Then I traced back to the following struct to find how networkCreateXML is working: struct _virNetworkDriver { const char * name; /* the name of the driver */ virDrvOpen open; virDrvClose close; virDrvNumOfNetworks numOfNetworks; virDrvListNetworks listNetworks; virDrvNumOfDefinedNetworks numOfDefinedNetworks; virDrvListDefinedNetworks listDefinedNetworks; virDrvListAllNetworks listAllNetworks; virDrvNetworkLookupByUUID networkLookupByUUID; virDrvNetworkLookupByName networkLookupByName; virDrvNetworkCreateXML networkCreateXML; >From the above code, I located the definition of virDrvNetworkCreateXML and found the following: typedef virNetworkPtr (*virDrvNetworkCreateXML) (virConnectPtr conn, const char *xmlDesc); This is where I am unable to trace back to any other code. Can someone please explain the code with typedef above and where is the definition of the function this function pointer is pointing to? I want to get to the root of the networkCreateXML function and how it exactly works. Can someone please explain? Thanks a lot, Bilal

3 2

[libvirt] [PATCH] python: Adapt to virevent rename
by Michal Privoznik 28 Dec '12

28 Dec '12

With our recent renames under src/util/* we forgot to adapt python wrapper code generator. This results in some methods being not exposed: $ python examples/domain-events/events-python/event-test.py Using uri:qemu:///system Traceback (most recent call last): File "examples/domain-events/events-python/event-test.py", line 585, in <module> main() File "examples/domain-events/events-python/event-test.py", line 543, in main virEventLoopPureStart() File "examples/domain-events/events-python/event-test.py", line 416, in virEventLoopPureStart virEventLoopPureRegister() File "examples/domain-events/events-python/event-test.py", line 397, in virEventLoopPureRegister libvirt.virEventRegisterImpl(virEventAddHandleImpl, AttributeError: 'module' object has no attribute 'virEventRegisterImpl' --- Pushed under trivial rule. python/generator.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python/generator.py b/python/generator.py index e9b9270..bae4edc 100755 --- a/python/generator.py +++ b/python/generator.py @@ -132,7 +132,7 @@ class docParser(xml.sax.handler.ContentHandler): if tag == 'function': if self.function != None: if (self.function_module == "libvirt" or - self.function_module == "event" or + self.function_module == "virevent" or self.function_module == "virterror"): function(self.function, self.function_descr, self.function_return, self.function_args, -- 1.8.0.2

1 0

[libvirt] [test-API][PATCH] Add volume upload and download cases
by Wayne Sun 28 Dec '12

28 Dec '12

* test download storage volumes using storage download API. * test upload storage volumes using storage upload API. For upload case, only raw volume format is supported, other format will fail. The offset and length value should be chosen from 0 and 1048576, because upload size is set as 1M. * both case use blocking stream. * sample conf is added. Signed-off-by: Wayne Sun <gsun(a)redhat.com> --- cases/storage_vol_upload_download.conf | 127 ++++++++++++++++++++++ repos/storage/vol_download.py | 157 +++++++++++++++++++++++++++ repos/storage/vol_upload.py | 183 ++++++++++++++++++++++++++++++++ 3 files changed, 467 insertions(+), 0 deletions(-) create mode 100644 cases/storage_vol_upload_download.conf create mode 100644 repos/storage/vol_download.py create mode 100644 repos/storage/vol_upload.py diff --git a/cases/storage_vol_upload_download.conf b/cases/storage_vol_upload_download.conf new file mode 100644 index 0000000..b393814 --- /dev/null +++ b/cases/storage_vol_upload_download.conf @@ -0,0 +1,127 @@ +storage:create_dir_pool + poolname + $defaultpoolname + +storage:vol_upload + poolname + $defaultpoolname + volname + $defaultvolumename + capacity + 10M + volformat + raw + offset + 0 + length + 0 +clean + +storage:vol_upload + poolname + $defaultpoolname + volname + $defaultvolumename + capacity + 10M + volformat + raw + offset + 1048576 + length + 0 +clean + +storage:vol_upload + poolname + $defaultpoolname + volname + $defaultvolumename + capacity + 10M + volformat + raw + offset + 0 + length + 1048576 +clean + +storage:vol_upload + poolname + $defaultpoolname + volname + $defaultvolumename + capacity + 10M + volformat + raw + offset + 1048576 + length + 1048576 +clean + +storage:vol_download + poolname + $defaultpoolname + volname + $defaultvolumename + capacity + 50M + volformat + raw + offset + 0 + length + 0 +clean + +storage:vol_download + poolname + $defaultpoolname + volname + $defaultvolumename + capacity + 50M + volformat + qcow2 + offset + 1048576 + length + 0 +clean + +storage:vol_download + poolname + $defaultpoolname + volname + $defaultvolumename + capacity + 50M + volformat + qed + offset + 0 + length + 1048576 +clean + +storage:vol_download + poolname + $defaultpoolname + volname + $defaultvolumename + capacity + 50M + volformat + raw + offset + 1048576 + length + 1048576 +clean + +storage:destroy_pool + poolname + $defaultpoolname diff --git a/repos/storage/vol_download.py b/repos/storage/vol_download.py new file mode 100644 index 0000000..839bc8a --- /dev/null +++ b/repos/storage/vol_download.py @@ -0,0 +1,157 @@ +#!/usr/bin/env python +# storage volume download testing + +import os +import string +import hashlib +from xml.dom import minidom + +import libvirt +from libvirt import libvirtError + +from src import sharedmod +from utils import utils + +required_params = ('poolname', 'volname', 'volformat', 'capacity', 'offset', + 'length',) +optional_params = {'xml' : 'xmls/dir_volume.xml', + } + +def get_pool_path(poolobj): + """ get pool xml description + """ + poolxml = poolobj.XMLDesc(0) + + logger.debug("the xml description of pool is %s" % poolxml) + + doc = minidom.parseString(poolxml) + path_element = doc.getElementsByTagName('path')[0] + textnode = path_element.childNodes[0] + path_value = textnode.data + + return path_value + +def write_file(path, capacity): + """write test data to file + """ + logger.info("write %s data into file %s" % (capacity, path)) + out = utils.get_capacity_suffix_size(capacity) + f = open(path, 'w') + datastr = ''.join(string.lowercase + string.uppercase + + string.digits + '.' + '\n') + repeat = out['capacity_byte'] / 64 + data = ''.join(repeat * datastr) + f.write(data) + f.close() + +def digest(path, offset, length): + """read data from file with length bytes, begin at offset + and return md5 hexdigest + """ + f = open(path, 'r') + f.seek(offset) + m = hashlib.md5() + done = 0 + + while True: + want = 1024 + if length and length - done < want: + want = length - done + outstr = f.read(want) + got = len(outstr) + if got == 0: + break + done += got + m.update(outstr) + + logger.debug("total %s bytes data is readed" % done) + + f.close() + return m.hexdigest() + +def handler(stream, data, file_): + return file_.write(data) + +def vol_download(params): + """test volume download and check""" + + global logger + logger = params['logger'] + poolname = params['poolname'] + volname = params['volname'] + volformat = params['volformat'] + offset = int(params['offset']) + length = int(params['length']) + capacity = params['capacity'] + xmlstr = params['xml'] + + logger.info("the poolname is %s, volname is %s, volformat is %s" % + (poolname, volname, volformat)) + logger.info("download offset is: %s" % offset) + logger.info("the data length to download is: %s" % length) + + conn = sharedmod.libvirtobj['conn'] + try: + poolobj = conn.storagePoolLookupByName(poolname) + path_value = get_pool_path(poolobj) + volume_path = path_value + "/" + volname + + xmlstr = xmlstr.replace('VOLPATH', volume_path) + xmlstr = xmlstr.replace('SUFFIX', capacity[-1]) + xmlstr = xmlstr.replace('CAP', capacity[:-1]) + logger.debug("volume xml:\n%s" % xmlstr) + + logger.info("create %s raw volume" % volname) + vol = poolobj.createXML(xmlstr, 0) + + write_file(volume_path, capacity) + origdigest = digest(volume_path, offset, length) + logger.debug("the md5 hex digest of data read from %s is: %s" % + (volume_path, origdigest)) + + st = conn.newStream(0) + + test_path = path_value + "/" + "vol_test" + + f = open(test_path, 'w') + logger.info("start download") + vol.download(st, offset, length, 0) + logger.info("downloaded all data") + st.recvAll(handler, f) + logger.info("finished stream") + st.finish() + f.close() + + newdigest = digest(test_path, 0, 0) + logger.debug("the md5 hex digest of data read from %s is: %s" % + (test_path, newdigest)) + + if origdigest == newdigest: + logger.info("file digests match, download succeed") + else: + logger.error("file digests not match, download failed") + return 1 + + except libvirtError, e: + logger.error("libvirt call failed: " + str(e)) + return 1 + + return 0 + +def vol_download_clean(params): + """clean testing environment""" + poolname = params['poolname'] + volname = params['volname'] + + conn = sharedmod.libvirtobj['conn'] + poolobj = conn.storagePoolLookupByName(poolname) + path_value = get_pool_path(poolobj) + test_path = path_value + "/" + "vol_test" + + vol = poolobj.storageVolLookupByName(volname) + vol.delete(0) + + if os.path.exists(test_path): + os.unlink(test_path) + + return 0 diff --git a/repos/storage/vol_upload.py b/repos/storage/vol_upload.py new file mode 100644 index 0000000..42af06f --- /dev/null +++ b/repos/storage/vol_upload.py @@ -0,0 +1,183 @@ +#!/usr/bin/env python +# storage volume upload testing, only raw format volume is +# supported, other format might fail. offset and length can +# only be chosen in 0 and 1048576. + +import os +import string +import hashlib +from xml.dom import minidom + +import libvirt +from libvirt import libvirtError + +from src import sharedmod + +required_params = ('poolname', 'volname', 'volformat', 'capacity', + 'offset', 'length',) +optional_params = {'xml' : 'xmls/dir_volume.xml', + } + +def get_pool_path(poolobj): + """ get pool xml description + """ + poolxml = poolobj.XMLDesc(0) + + logger.debug("the xml description of pool is %s" % poolxml) + + doc = minidom.parseString(poolxml) + path_element = doc.getElementsByTagName('path')[0] + textnode = path_element.childNodes[0] + path_value = textnode.data + + return path_value + +def write_file(path): + """write 1M test data to file + """ + logger.info("write data into file %s" % path) + f = open(path, 'w') + datastr = ''.join(string.lowercase + string.uppercase + + string.digits + '.' + '\n') + data = ''.join(16384 * datastr) + f.write(data) + f.close() + +def digest(path, offset, length): + """read data from file with length bytes, begin at offset + and return md5 hexdigest + """ + f = open(path, 'r') + f.seek(offset) + m = hashlib.md5() + done = 0 + + while True: + want = 1024 + if length and length - done < want: + want = length - done + outstr = f.read(want) + got = len(outstr) + if got == 0: + break + done += got + m.update(outstr) + + logger.debug("total %s bytes data is readed" % done) + + f.close() + return m.hexdigest() + +def handler(stream, data, file_): + return file_.read(data) + +def vol_upload(params): + """test volume download and check""" + + global logger + logger = params['logger'] + poolname = params['poolname'] + volname = params['volname'] + volformat = params['volformat'] + offset = int(params['offset']) + length = int(params['length']) + capacity = params['capacity'] + xmlstr = params['xml'] + + logger.info("the poolname is %s, volname is %s, volformat is %s" % + (poolname, volname, volformat)) + logger.info("upload offset is: %s" % offset) + logger.info("the data length to upload is: %s" % length) + + conn = sharedmod.libvirtobj['conn'] + try: + poolobj = conn.storagePoolLookupByName(poolname) + path_value = get_pool_path(poolobj) + volume_path = path_value + "/" + volname + + xmlstr = xmlstr.replace('VOLPATH', volume_path) + xmlstr = xmlstr.replace('SUFFIX', capacity[-1]) + xmlstr = xmlstr.replace('CAP', capacity[:-1]) + logger.debug("volume xml:\n%s" % xmlstr) + + logger.info("create %s raw volume" % volname) + vol = poolobj.createXML(xmlstr, 0) + + test_path = path_value + "/" + "vol_test" + write_file(test_path) + olddigest = digest(test_path, 0, 0) + logger.debug("the old file digest is: %s" % olddigest) + + if offset: + origdigestpre = digest(volume_path, 0, offset) + else: + origdigestpre = '' + logger.debug("the original pre region digest is: %s" % origdigestpre) + + origdigestpost = digest(volume_path, offset + 1024 * 1024, 0) + logger.debug("the original post region digest is: %s" % origdigestpost) + + st = conn.newStream(0) + + f = open(test_path, 'r') + logger.info("start upload") + vol.upload(st, offset, length, 0) + logger.info("sent all data") + st.sendAll(handler, f) + logger.info("finished stream") + st.finish() + f.close() + + newdigest = digest(volume_path, offset, 1024 * 1024) + logger.debug("the new file digest is: %s" % olddigest) + + if offset: + newdigestpre = digest(volume_path, 0, offset) + else: + newdigestpre = '' + logger.debug("the new pre region digest is: %s" % origdigestpre) + + newdigestpost = digest(volume_path, offset + 1024 * 1024, 0) + logger.debug("the new post region digest is: %s" % origdigestpost) + + if newdigestpre == origdigestpre: + logger.info("file pre region digests match") + else: + logger.error("file pre region digests not match") + return 1 + + if olddigest == newdigest: + logger.info("file digests match") + else: + logger.error("file digests not match") + return 1 + + if newdigestpost == origdigestpost: + logger.info("file post region digests match") + else: + logger.error("file post region digests not match") + return 1 + + except libvirtError, e: + logger.error("libvirt call failed: " + str(e)) + return 1 + + return 0 + +def vol_upload_clean(params): + """clean testing environment""" + poolname = params['poolname'] + volname = params['volname'] + + conn = sharedmod.libvirtobj['conn'] + poolobj = conn.storagePoolLookupByName(poolname) + path_value = get_pool_path(poolobj) + test_path = path_value + "/" + "vol_test" + + vol = poolobj.storageVolLookupByName(volname) + vol.delete(0) + + if os.path.exists(test_path): + os.unlink(test_path) + + return 0 -- 1.7.1

1 0

[libvirt] [PATCH 0/6] Fix multiple problems while dealing with transient networks
by Peter Krempa 28 Dec '12

28 Dec '12

This series fixes a few issues when dealing with transient networks: 1) Check for multiple DHCP sections is added also to transient networks 2) Create and clean up dnsmasq config files when dealing with transient networks 3) Add support for making network transient with undefine 4) a few cleanups Peter Krempa (6): conf: net: Fix helper for applying new network definition net: Change argument type of virNetworkObjIsDuplicate() net: Move creation of dnsmasq hosts file to function starting dnsmasq net: Remove dnsmasq and radvd files also when destroying transient nets net: Re-use checks when creating transient networks net: Add support for changing persistent networks to transient src/conf/network_conf.c | 4 +- src/conf/network_conf.h | 2 +- src/network/bridge_driver.c | 261 +++++++++++++++++++++++--------------------- 3 files changed, 138 insertions(+), 129 deletions(-) -- 1.7.12.4

4 30

Re: [libvirt] [Users] Vdsm/libvir error during deploy
by Dan Kenigsberg 28 Dec '12

28 Dec '12

On Mon, Dec 24, 2012 at 02:18:48PM +0100, Joop wrote: > Dan Kenigsberg wrote: > >Which version of libvirt is installed on your host? > > > libvirt-1.0.1-2.fc17.x86_64 > libvirt-client-1.0.1-2.fc17.x86_64 > libvirt-daemon-1.0.1-2.fc17.x86_64 > libvirt-daemon-config-network-1.0.1-2.fc17.x86_64 > libvirt-daemon-config-nwfilter-1.0.1-2.fc17.x86_64 > libvirt-daemon-driver-interface-1.0.1-2.fc17.x86_64 > libvirt-daemon-driver-lxc-1.0.1-2.fc17.x86_64 > libvirt-daemon-driver-network-1.0.1-2.fc17.x86_64 > libvirt-daemon-driver-nodedev-1.0.1-2.fc17.x86_64 > libvirt-daemon-driver-nwfilter-1.0.1-2.fc17.x86_64 > libvirt-daemon-driver-qemu-1.0.1-2.fc17.x86_64 > libvirt-daemon-driver-secret-1.0.1-2.fc17.x86_64 > libvirt-daemon-driver-storage-1.0.1-2.fc17.x86_64 > libvirt-daemon-driver-uml-1.0.1-2.fc17.x86_64 > libvirt-daemon-driver-xen-1.0.1-2.fc17.x86_64 > libvirt-lock-sanlock-1.0.1-2.fc17.x86_64 > libvirt-python-1.0.1-2.fc17.x86_64 > > From virt-preview repo > [fedora-virt-preview] > name=Virtualization packages from Rawhide built for latest Fedora > baseurl=http://fedorapeople.org/groups/virt/virt-preview/fedora-$releasever… > enabled=1 > skip_if_unavailable=1 > gpgcheck=0 > > >What is the output of the following python script on your machine? Mine > >says "1". Could it be that your libvirt says "0"? > > > >============= > > > >from vdsm import libvirtconnection > > > >conn = libvirtconnection.get() > >netXml = """<network> > > <name>test</name> > > <forward mode='passthrough'> > > <interface dev='em1'/> > > </forward> > ></network> > >""" > > > >net = conn.networkDefineXML(netXml) > >net.create() > >print net.isPersistent() > >net.destroy() > >net.undefine() > > > > > 0 > libvir: Network Driver error : Network not found: no network with > matching uuid > Traceback (most recent call last): > File "test.py", line 16, in <module> > net.undefine() > File "/usr/lib64/python2.7/site-packages/libvirt.py", line 2154, in > undefine > if ret == -1: raise libvirtError ('virNetworkUndefine() failed', > net=self) > libvirt.libvirtError: Network not found: no network with matching uuid > > So '0' :-(( > Suppose that error isn't good either. > Should I downgrade to an earlier version of libvirt? Please try. My guess is that this is a libvirt bug added by http://libvirt.org/git/?p=libvirt.git;a=commitdiff;h=0211fd6e04cdc402da2081… in libvirt 1.0.1. More authoritative answer is expected by those added to the CC line.

3 4

[libvirt] [PATCH] ESX: append CURL headers to fix serviceContent entities
by Ata E Husain Bohra 26 Dec '12

26 Dec '12

It seems with current SOAP header the call to retrieve "serviceContent" object does not populate all available references (for instance: ovfManager). The host exposes details of these Managed Object References (MoBs) if header is appended with "SOAPACtion" field. Ata E Husain Bohra (1): ESX: append CURL headers to fix serviceContent entities src/esx/esx_vi.c | 2 ++ src/esx/esx_vi_generator.input | 3 +++ 2 files changed, 5 insertions(+) -- 1.7.9.5

1 0

[libvirt] [jenkins@libvirt.sigxcpu.org: Build failed in Jenkins: libvirt-check #419]
by Guido Günther 26 Dec '12

26 Dec '12

Hi, it seems one of these commits 5411e7e176dcbb65591cb97ec128b5fd0f365805 473011334ccd93e8efbb67f2561f1d4e54d212ae 392c192240566d9e167d2b5a1022092d8f7e045c broke "make check" as seen on http://honk.sigxcpu.org:8001/job/libvirt-check/417/console output attached. I can't look into this in more right now though. Cheers, -- Guido P.S.: the libvirt-tck check is also currently broken but that's probably a fallout of the above.

3 7

[libvirt] [PATCH 0/2] Use more of qemuDomObjFromDomain
by Michal Privoznik 25 Dec '12

25 Dec '12

I know we are in the freeze so I will push this after upstream is thaw. Michal Privoznik (2): qemu: Relax locking in DomainHasManagedSaveImage and DomainMonitorCommand qemu: Convert some APIs to use qemuDomObjFromDomain src/qemu/qemu_driver.c | 478 +++++------------------------------------------ 1 files changed, 51 insertions(+), 427 deletions(-) -- 1.7.8.6

2 7

[libvirt] libvirt will wait 20 minutes or hang when the network interface down
by Benjamin Wang (gendwang) 24 Dec '12

24 Dec '12

Hi, I find that when the network interface is down. In most scenarios, the libvirt will wait 20 minutes and report the exception. In seldom scenarios, the polling thread will hang even if the network is recovered. The following is the formal description from libcurl website: http://curl.haxx.se/docs/faq.html (Section "4.19 Why doesn't cURL return an error when the network cable is unplugged?") The following is the similar case about thread hand: http://curl.haxx.se/mail/lib-2010-07/0108.html For "wait 20 minutes", although this is the TCP normal mechanism, but if a server manages tons of thousands of devices by libvirt. When 1000 devices are down, This could cause thread leak for a long period. For thread hang, this could cause thread leak forever. I tried to add the following codes in esx_vi.c. It seems that these code can avoid the above issues. Would you give your comments? if (curl->headers == NULL) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Could not build CURL header list")); return -1; } + curl_easy_setopt(curl->handle, CURLOPT_LOW_SPEED_LIMIT, 10); + curl_easy_setopt(curl->handle, CURLOPT_LOW_SPEED_TIME, 120); curl_easy_setopt(curl->handle, CURLOPT_USERAGENT, "libvirt-esx"); curl_easy_setopt(curl->handle, CURLOPT_HEADER, 0); curl_easy_setopt(curl->handle, CURLOPT_FOLLOWLOCATION, 0); curl_easy_setopt(curl->handle, CURLOPT_SSL_VERIFYPEER, B.R. Benjamin Wang

2 2

[libvirt] [PATCH 0/8] Fix PowerPC CPU driver
by Jiri Denemark 22 Dec '12

22 Dec '12

Current PowerPC driver is too complicated and mostly wrong as it was apparently created from x86 driver and not properly addapted for PowerPC architecture. More details about the issues are described in individual patches. Jiri Denemark (8): cpu: Introduce cpuModelIsAllowed internal API cpu: Make comparing PowerPC CPUs easier to read cpu: Fix PowerPCNodeData cpu: Fix loading PowerPC vendor from cpu_map.xml cpu: Reimplement PowerPCBaseline cpu: Reimplement PowerPCDecode cpu: Remove hardcoded list of PowerPC models cpu: Rename PowerPCUpdate and PowerPCDataFree functions src/cpu/cpu.c | 17 ++ src/cpu/cpu.h | 5 + src/cpu/cpu_generic.c | 19 +-- src/cpu/cpu_map.xml | 12 +- src/cpu/cpu_powerpc.c | 462 +++++++++++++++++--------------------------------- src/cpu/cpu_x86.c | 11 +- 6 files changed, 193 insertions(+), 333 deletions(-) -- 1.8.0.2

3 17

[libvirt] Release of libvirt-1.0.1
by Daniel Veillard 22 Dec '12

22 Dec '12

So as scheduled, and since we got only a few fixes on top of rc2 I made the release this morning, it is tagged in the git tree and tarball and rpms are available as usual at: ftp://libvirt.org/libvirt/ This is a balanced release with both new features, a lot of improvements and a reasonable amount of bug fixes too, overall a bit more than 350 commit, accumulated since 1.0.0. Features: - Introduce virtlockd daemon (Daniel P. Berrange) - parallels: add disk and network device support (Dmitry Guryanov) - Add virDomainSendProcessSignal API (Daniel P. Berrange) - Introduce virDomainFSTrim() public API (Michal Privoznik) - add fuse support for libvirt lxc (Gao feng) - Add Gluster protocol as supported network disk backend (Harsh Prateek Bora) - various snapshot improvements (Peter Krempa, Eric Blake) Documentation: - fix some typos in examples (Eric Blake) - Fix location of libvirt.conf and auth.conf (Michał Łomnicki) - Document offline migration (Jiri Denemark) - libvirt.c: Fix wording and grammar in virDomainFSTrim (Michal Privoznik) - Fix a few spaces (Ján Tomko) - boot order for host and redirected USB devices (Ján Tomko) - AbortJob: Fix documentation (Michal Privoznik) - Fix "virsh create" example (Guido Günther) Portability: - build: minor build fixes for BSD (Eric Blake) - Socket identity support for FreeBSD. (Roman Bogorodskiy) - Require SANLK_INQ_WAIT for inq_lockspace support (Guido Günther) - locking: Fix VPATH build and distribute generated files (Jiri Denemark) - build: Fix VPATH build (Jiri Denemark) - Change virCgroupGetAppRoot stub on non-Linux to avoid unused param warning (Daniel P. Berrange) - Qemu FreeBSD: fix compilation (Roman Bogorodskiy) - Drop mntent.h include. (Roman Bogorodskiy) - virsh: Fix usage of header termios.h (Peter Krempa) - pci: Fix building of 32bit PCI command array (Peter Krempa) - spec: require dbus-daemon when using libvirtd in Fedora (Eric Blake) - systemd: require dbus service (Eric Blake) - rpc: fix build failure with older dbus (Eric Blake) - build: fix build --without-network (Ján Tomko) - build: trivial fix error: implicit declaration of function 'malloc' (Natanael Copa) - run bootstrap if .gnulib is not present (Hu Tao) - add ppc64 and s390x to arches where qemu-kvm exists (Dan Horák) - nodeinfo: port nodecpumap to RHEL5 (Eric Blake) - spec: don't enable cgconfig under systemd (Eric Blake) Bug Fixes: - network: fix (non)update of dnsmasq config during virDomainUpdateDeviceFlags (Laine Stump) - sanlock: Re-add lockspace unconditionally (Michal Privoznik) - install: fix virtlockd installation (Eric Blake) - qemu: don't fail update netdev on bridge detach failure (Laine Stump) - selinux: fix NULL dereference in GetSecurityMountOptions (Ján Tomko) - network: prevent dnsmasq from listening on localhost (Laine Stump) - Fix error reporting when fetching SCSI/LVM keys (Daniel P. Berrange) - Fix probing of QED file format (Daniel P. Berrange) - Fix memory leak in QEMU QMP capabilities initialization (Daniel P. Berrange) - qemu: snapshot: Remove memory image if external checkpoint fails (Peter Krempa) - qemu: snapshot: Don't leak XML definition if restarting of CPUs fails (Peter Krempa) - qemu: fix uninitialized variable warning in doPeer2PeerMigrate (Ján Tomko) - conf: Remove duplicate declaration of virNetworkDNSDefPtr (Jiri Denemark) - qemu: Restart CPUs with valid async job type when doing external snapshots (Peter Krempa) - qemu: eliminate bogus error log when changing netdev's bridge (Laine Stump) - qemu: capabilities: fix machine name/canonical swappage (Cole Robinson) - Inhibit daemon shutdown during driver initialization (Guido Günther) - util: Don't fail virGetGroupIDByName when group not found (Christophe Fergeau) - util: Don't fail virGetUserIDByName when user not found (Christophe Fergeau) - storage: Error out earlier if the volume target path already exists (Osier Yang) - remote: Avoid the thread race condition (Daniel P. Berrange) - qemu: Fix memory (and FD) leak on PCI device detach (Jiri Denemark) - qemu: Don't free PCI device if adding it to activePciHostdevs fails (Jiri Denemark) - qemu: Fix error code when attaching existing device (Jiri Denemark) - Fix memory leak introduced by commit 501bfad1 (Jim Fehlig) - Shut down session libvirtd cleanly on host shutdown/user logout (Alexander Larsson) - Inhibit desktop shutdown while any virtual machines are running (Daniel P. Berrange) - conf: prevent crash with no uuid in cephx auth secret (Ján Tomko) - virsh: don't crash if shutdown --mode not provided (Eric Blake) - qemu: Fix up the default machine type for QMP probing (Viktor Mihajlovski) - Fix uninitialized variables (Guido Günther) - qemu: don't attempt undefined QMP commands (Eric Blake) - storage: fix scsi detach regression with cgroup ACLs (Eric Blake) - nwfilter: report an error on OOM (Ján Tomko) - virsh: check the return value of virStoragePoolGetAutostart (Ján Tomko) - conf: fix uninitialized variable in virDomainListSnapshots (Ján Tomko) - rpc: don't destroy xdr before creating it in virNetMessageEncodeHeader (Ján Tomko) - virsh: use correct sizeof when allocating cpumap (Ján Tomko) - util: fix virBitmap allocation in virProcessInfoGetAffinity (Ján Tomko) - conf: fix NULL check in virNetDevBandwidthParse (Ján Tomko) - Don't fail hard when we can't connect to the monitor (Guido Günther) - node_memory: Fix bug of node_memory_tune (Osier Yang) - node_memory: Do not fail if there is parameter unsupported (Osier Yang) - network: fix crash when portgroup has no name (Laine Stump) - maint: Fix use of invalid reboot flags (Michal Privoznik) - util: check for NULL parameter in virFileWrapperFdCatchError (Ján Tomko) - conf: snapshot: check return value of virDomainSnapshotObjListNum (Ján Tomko) - conf: check the return value of virXPathNodeSet (Ján Tomko) - cgroup: fix impossible overrun in virCgroupAddTaskController (Ján Tomko) - nwfilter: fix NULL pointer check in virNWFilterSnoopReqNew (Ján Tomko) - qemu: Fix error messages when dispatching guest agent commands (Peter Krempa) - qemu: Fix QMP Capabability Probing Failure (Viktor Mihajlovski) - qemu: Wait for monitor socket even without pid (Viktor Mihajlovski) - bitmap: fix typo to use UL type of integer constant in virBitmapIsAllSet (Guannan Ren) - qemu: fix a crash when save file can't be opened (Ján Tomko) - Fix leak of virNetworkPtr in LXC startup failure path (Daniel P. Berrange) - Fix error reporting in virNetDevVethDelete (Daniel P. Berrange) - Ensure transient def is removed if LXC start fails (Daniel P. Berrange) - Ensure failure to create macvtap device aborts LXC start (Daniel P. Berrange) - Avoid crash when LXC start fails with no interface target (Daniel P. Berrange) - Treat missing driver cgroup as fatal in LXC driver (Daniel P. Berrange) - Ensure LXC container exits if cgroups setup fails (Daniel P. Berrange) - Fix error handling in virSecurityManagerGetMountOptions (Daniel P. Berrange) - storage: fix device detach regression with cgroup ACLs (Eric Blake) - lxc: Don't crash if no security driver is specified in libvirt_lxc (Peter Krempa) - lxc: Avoid segfault of libvirt_lxc helper on early cleanup paths (Peter Krempa) - storage: fix logical volume cloning (Ján Tomko) - Fix exiting of libvirt_lxc program on container quit (Daniel P. Berrange) - Skip deleted timers when calculting next timeout (Daniel P. Berrange) - Fix virDiskNameToIndex to actually ignore partition numbers (Daniel P. Berrange) - qemu: Stop recursive detection of image chains when an image is missing (Peter Krempa) - storage: Fix bug of fs pool destroying (Osier Yang) - qemu: fix RBD attach regression (Scott Sullivan) - qemu: allow larger discrepency between memory & currentMemory in domain xml (Laine Stump) - sanlock: Retry after EINPROGRESS (Michal Privoznik) - virsh: fix uninitialized variable in cmdSnapshotEdit (Ján Tomko) - util: fix index when building lock owners array (Laine Stump) - Fix uninitialized variable in virLXCControllerSetupDevPTS (Daniel P. Berrange) - tests: Remove temporary directories in qemumonitorjsontest (Peter Krempa) - tests: Fix qemumonitorjsontest deadlock when the machine is under load (Peter Krempa) - qemu: Fix domain ID numbering race condition (Peter Krempa) - storage: fix broken backing chain (Philipp Hahn) - qemu: Don't corrupt pointer in qemuDomainSaveMemory() (Peter Krempa) - esx: Yet another connection fix for 5.1 (Martin Kletzander) - iohelper: Don't report errors on special FDs (Michal Privoznik) - qemu: Fix possible race when pausing guest (Peter Krempa) - conf: net: Fix deadlock if assignment of network def fails (Peter Krempa) - conf: net: Fix helper for applying new network definition (Peter Krempa) Improvements: - spec: Include lockd files in libvirt-daemon package (Jiri Denemark) - build: Install both qemu-lockd.conf and qemu-sanlock.conf (Jiri Denemark) - build: use fewer cat processes (Eric Blake) - build: Distribute more files (Jiri Denemark) - virsh: use vshReconnect for non-default connections too (Ján Tomko) - virsh: don't lie about reconnection in vshReconnect (Ján Tomko) - Add support for locking based on SCSI volume ID (Daniel P. Berrange) - Add support for locking based on LVM volume uuid (Daniel P. Berrange) - Add ability to maintain disk leases indirectly (Daniel P. Berrange) - Add a virtlockd client as a lock driver impl (Daniel P. Berrange) - Add support for re-exec() of virtlockd upon SIGUSR1 (Daniel P. Berrange) - Enable systemd socket activation with virtlockd (Daniel P. Berrange) - Implement dispatch functions for lock protocol in virtlockd (Daniel P. Berrange) - Define a wire protocol for talking to the virtlockd daemon (Daniel P. Berrange) - Introduce basic infrastructure for virtlockd daemon (Daniel P. Berrange) - Refactor creation of lock manager plugins (Daniel P. Berrange) - Support network boot for HVM guests in libxl (Jim Fehlig) - Add lots of debugging to storage file probing code (Daniel P. Berrange) - Log warning if storage magic matches, but version does not (Daniel P. Berrange) - network: match xml warning message (Eric Blake) - Fix make check with different object directory (Viktor Mihajlovski) - qemu: Improve error reporting from qemuDomainManagedSaveRemove (Peter Krempa) - qemu: Small code cleanups in the managedsave functions (Peter Krempa) - qemu: Refactor managed save functions to use domain lookup helpers (Peter Krempa) - qemu: Add a new domain lookup helper and improve the docs (Peter Krempa) - util: Fix warning message in previous patch (Peter Krempa) - util: rework error reporting in virGet(User|Group)IDByName (Peter Krempa) - Refactor virDomainHostdevFind method (Daniel P. Berrange) - Slightly refactor hostdev parsing / formating (Daniel P. Berrange) - Remove bogus const return values in storage file APIs (Daniel P. Berrange) - Add missing export of virStorageFileGetLVMKey & virStorageFileGetSCSIKey (Daniel P. Berrange) - Fix sorting of libvirt_private.syms and add syntax check rule (Daniel P. Berrange) - uml: Report error if inotify fails on driver startup (Cole Robinson) - tools: Only install guests init script if --with-init=script=redhat (Cole Robinson) - add vnc unix sockets to apparmor policy (Serge Hallyn) - add security hook for permitting hugetlbfs access (Serge Hallyn) - maint: mention when HACKING is rebuilt during make (Eric Blake) - qemu: reuse qemuMigrationIsAllowed when doing save and managedsave (Peter Krempa) - qemu: snapshot: Report better error message if migration isn't allowed (Peter Krempa) - qemu: Make qemuMigrationIsAllowed more reusable (Peter Krempa) - qemu: assume seccomp sandbox is supported since qemu 1.2 (Ján Tomko) - domain: Keep assigned class_id in domstatus XML (Michal Privoznik) - network: Create real network status files (Michal Privoznik) - bandwidth: Create network bandwidth (un)plug functions (Michal Privoznik) - bandwidth: Create rate update function (Michal Privoznik) - bandwidth: Create (un)plug functions (Michal Privoznik) - bandwidth: Create hierarchical shaping classes (Michal Privoznik) - bandwidth: add new 'floor' attribute (Michal Privoznik) - bandwidth: Attach sfq to leaf node (Michal Privoznik) - parallels: handle network adapters of type 'routed' (Dmitry Guryanov) - parallels: add routed pseudo network (Dmitry Guryanov) - parallels: parse virtual network properties (Dmitry Guryanov) - parallels: add network driver (Dmitry Guryanov) - parallels: move parallelsParseError to parallels_utils.h (Dmitry Guryanov) - parallels: add support of network interfaces to parallelsDomainDefineXML (Dmitry Guryanov) - parallels: parse information about network interfaces (Dmitry Guryanov) - examples: Fix balloon event callback (Jiri Denemark) - network: put dnsmasq parameters in conf-file instead of command line (Gene Czarcinski) - network: add support for DHCPv6 (Gene Czarcinski) - conf: split <forward> parser/clear into separate functions (Laine Stump) - conf: put data for network <forward> element into its own struct (Laine Stump) - conf: make virNetworkIpDefClear consistent with other functions (Laine Stump) - conf: rename some labels and functions in network_conf (Laine Stump) - network: backend functions for updating network dns host/srv/txt (Laine Stump) - conf: clear and parse functions for dns host/srv/txt records (Laine Stump) - conf: rename network dns host/srv/txt arrays (Laine Stump) - conf: use VIR_(INSERT|DELETE)_ELEMENT in virNetworkUpdate backend (Laine Stump) - util: add VIR_(APPEND|INSERT|DELETE)_ELEMENT (Laine Stump) - parallels: add support of removing disks (Dmitry Guryanov) - parallels: apply config after VM creation (Dmitry Guryanov) - parallels: add support of disks creation (Dmitry Guryanov) - parallels: add function parallelsGetDiskBusName (Dmitry Guryanov) - parallels: split parallelsStorageVolumeDelete function (Dmitry Guryanov) - parallels: fill volumes capacity parameter (Dmitry Guryanov) - parallels: add info about volumes (Dmitry Guryanov) - parallels: fix leaks in parallelsFindVolumes (Dmitry Guryanov) - parallels: create storage pools by VM list (Dmitry Guryanov) - parallels: remove unused code from storage driver (Dmitry Guryanov) - parallels: split parallelsStorageOpen function (Dmitry Guryanov) - parallels: handle disk devices in parallelsDomainDefineXML (Dmitry Guryanov) - parallels: add info about hard disk devices (Dmitry Guryanov) - Add support for offline migration (liguang) - S390: Assign default model "virtio" for network interfaces (Viktor Mihajlovski) - virsh: allow metadata preallocation when creating volumes (Ján Tomko) - storage: allow metadata preallocation when creating qcow2 images (Ján Tomko) - qemu: Allow the user to specify vendor and product for disk (Osier Yang) - Convert libxl driver to Xen 4.2 (Jim Fehlig) - network: prevent a few invalid configuration combinations (Laine Stump) - network: allow guest to guest IPv6 without gateway definition (Gene Czarcinski) - util: Do not keep PCI device config file open (Jiri Denemark) - util: Slightly refactor PCI list functions (Jiri Denemark) - qemu: Simplify the code (Osier Yang) - qemu: improve error for failed JSON commands (Eric Blake) - qemu: nicer error message if live disk snapshot unsupported (Eric Blake) - implement managedsave in libvirt xen legacy driver (Bamvor Jian Zhang) - Bind connection close callback APIs to python binding (Daniel P. Berrange) - Replace polling for active VMs with signalling by drivers (Daniel P. Berrange) - Only let VM drivers block libvirtd timed shutdown (Daniel P. Berrange) - Make QEMU perform managed save of all VMs on stop of libvirtd (Daniel P. Berrange) - build: fix incremental autogen.sh when no AUTHORS is present (Eric Blake) - Add iSCSI backend storage driver for ESX (Ata E Husain Bohra) - qemu: support live update of an interface's filter (Laine Stump) - nwfilter: utility function virNWFilterVarValueEqual (Stefan Berger) - conf: fix virDomainNetGetActualDirect*() and BridgeName() (Laine Stump) - virsh: Report errors if arguments of the schedinfo command are incorrect (Peter Krempa) - logging: more API needing to log flags (Eric Blake) - s/flags=%u/flags=%x/ in earlier commit (Daniel P. Berrange) - Allow duration=0 for virsh nodesuspend (Daniel P. Berrange) - Allow comma separated list of shutdown/reboot modes with virsh (Daniel P. Berrange) - Introduce APIs for splitting/joining strings (Daniel P. Berrange) - Add support for shutdown / reboot APIs in LXC driver (Daniel P. Berrange) - Introduce two new methods for triggering controlled shutdown/reboot (Daniel P. Berrange) - Move reboot/shutdown flags combination check into QEMU driver (Daniel P. Berrange) - Add APIs for talking to init via /dev/initctl (Daniel P. Berrange) - Ensure virDomainShutdownFlags logs flags parameter (Daniel P. Berrange) - Quote client identity in SASL whitelist log message (Daniel P. Berrange) - qemu: Refactor error reporting in qemu driver configuration parser (Peter Krempa) - qemu: Refactor config parameter retrieval (Peter Krempa) - network: use dnsmasq --bind-dynamic when available (Laine Stump) - util: new virSocketAddrIsPrivate function (Laine Stump) - util: capabilities detection for dnsmasq (Laine Stump) - virsh: do timing even for unusable connections (Ján Tomko) - Turn some dual-state int parameters into booleans (Daniel P. Berrange) - Introduce a 'stop' method to virDriverState (Daniel P. Berrange) - Implement virDomainSendProcessSignal for LXC driver (Daniel P. Berrange) - Add a 'send-process-signal' command to virsh (Daniel P. Berrange) - Specify remote protocol for virDomainSendProcessSignal (Daniel P. Berrange) - Rename misc QEMU structs/enums to use normal naming style (Daniel P. Berrange) - Replace 'struct qemud_driver *' with virQEMUDriverPtr (Daniel P. Berrange) - virsh: fix error messages in iface-bridge (Ján Tomko) - libssh2_session: support DSS keys as well (Ján Tomko) - virsh: Rewrite cmdDomDisplay (Martin Kletzander) - virsh: Expose new virDomainFSTrim API (Michal Privoznik) - qemu: Implement virDomainFSTrim (Michal Privoznik) - remote: Implement virDomainFSTrim (Michal Privoznik) - qemu: Add QEMU version computation to QMP probing (Viktor Mihajlovski) - mount fuse's meminfo file to container's /proc/meminfo (Gao feng) - make /proc/meminfo isolate with host through fuse (Gao feng) - add interface virCgroupGetAppRoot (Gao feng) - add interface virCgroupGetMemSwapUsage (Gao feng) - Add a configure option for fuse support in LXC driver (Gao feng) - Alphabetically sort libvirt_daemon.syms (Daniel P. Berrange) - Change bridge driver to use named initializers with virDriverState (Daniel P. Berrange) - virdbus: Add virDBusGetSessionBus helper (Alexander Larsson) - Specify name of target interface with macvlan error (Daniel P. Berrange) - Store initpid in the domain status XML for LXC (Daniel P. Berrange) - Pass virSecurityManagerPtr object further down into LXC setup code (Daniel P. Berrange) - tests: Add tests for gluster protocol based network disks support (Harsh Prateek Bora) - qemu: Add support for gluster protocol based network storage backend. (Harsh Prateek Bora) - Refactor ESX storage driver to implement facade pattern (Ata E Husain Bohra) - Add private data pointer to virStoragePool and virStorageVol (Ata E Husain Bohra) - cpu: Add Intel Haswell cpu model (Peter Krempa) - util: Use virReportSystemError for system error in pci.c (Osier Yang) - virsh: Report error when taking a snapshot with empty --memspec argument (Peter Krempa) - Warn if requesting update to non-existent timer/handle watch (Daniel P. Berrange) - qemuhelpdata: Revert my 'fix' (Michal Privoznik) - conf: Report sensible error for invalid disk name (Martin Kletzander) - Log an audit message with the LXC init pid (Daniel P. Berrange) - Use virNetServerRun instead of custom main loop (Daniel P. Berrange) - storage: Improve virStorageBackendFileSystemStop (Osier Yang) - tests: update qemuhelptest data (Ján Tomko) - tests: add boot order for host and redirected USB to qemu argv test (Ján Tomko) - conf: add support for booting from redirected USB devices (Ján Tomko) - qemu: graphics support for simultaneous one of each sdl, vnc, spice (Alon Levy) - qemu: refactor graphics code to not hardcode a single display (Alon Levy) - snapshot: make cloning of domain definition easier (Eric Blake) - snapshot: expose location through virsh snapshot-info (Eric Blake) - snapshot: implement new filter sets (Eric Blake) - snapshot: add virsh back-compat support for new filters (Eric Blake) - snapshot: add two more filter sets to API (Eric Blake) - nodeinfo: support kernels that lack socket information (Eric Blake) - snapshot: require user to supply external memory file name (Eric Blake) - virsh: save: report an error if XML file can't be read (Ján Tomko) - virsh: Use virNodeGetCPUMap if possible (Viktor Mihajlovski) - python: Use virNodeGetCPUMap where possible (Viktor Mihajlovski) - qemu, lxc: Change host CPU number detection logic. (Viktor Mihajlovski) - nodeinfo: enable nodeGetCPUCount for older kernels (Viktor Mihajlovski) - Use helper functions to format the journal iov array (Miloslav Trmač) - Add metadata to virLogOutputFunc (Miloslav Trmač) - Add a metadata parameter to virLog{, V}Message (Miloslav Trmač) - qemu: add bootindex for usb-host and usb-redir devices (Ján Tomko) - build: rerun bootstrap if AUTHORS is missing (Eric Blake) - qemu: Don't force port=0 for SPICE (Michal Privoznik) - snapshot: qemu: Fix detection of external snapshots when deleting (Peter Krempa) - nodeinfotest: Add test data from a AMD bulldozer machine. (Peter Krempa) - nodeinfotest: Add test data for 2 processor host with broken NUMA (Peter Krempa) - nodeinfo: Add check and workaround to guarantee valid cpu topologies (Peter Krempa) - qemu: Allow migration to be cancelled at prepare phase (Michal Privoznik) - capabilities: defaultConsoleTargetType can depend on architecture (Viktor Mihajlovski) - snapshot: qemu: Add support for external inactive snapshots (Peter Krempa) - virsh: add snapshot-create-as memspec support (Eric Blake) - virsh: make ,, escape parsing common (Eric Blake) - qemu: Emit event if 'cont' fails (Michal Privoznik) - Introduce new VIR_DOMAIN_EVENT_SUSPENDED_API_ERROR event (Michal Privoznik) - virsh: document which term is older (Eric Blake) - tests: Add test for controller order (Michal Privoznik) - qemu: Add controllers in specified order (Michal Privoznik) - qemu: Wrap controllers code into dummy loop (Michal Privoznik) - spec: replace scriptlets with new systemd macros (Václav Pavlín) - gitignore: ignore more files (liguang) - snapshot: qemu: Remove restrictions preventing external checkpoints (Peter Krempa) - snapshot: qemu: Add support for external checkpoints (Peter Krempa) - snapshot: qemu: Rename qemuDomainSnapshotCreateActive (Peter Krempa) - snapshot: qemu: Add async job type for snapshots (Peter Krempa) - snapshot: Add flag to enable creating checkpoints in live state (Peter Krempa) - qemu: Split out domain memory saving code to allow reuse (Peter Krempa) - qemu: Clean up snapshot retrieval to use the new helper (Peter Krempa) - cpu: Add AMD Opteron G5 cpu model (Peter Krempa) - cpu: Add newly added cpu flags (Peter Krempa) - snapshot: merge pre-snapshot checks (Eric Blake) - snapshot: populate new XML info for qemu snapshots (Eric Blake) - snapshot: improve disk align checking (Eric Blake) - snapshot: new XML for external system checkpoint (Eric Blake) - snapshot: simplify OOM checking during parse (Eric Blake) - Document bracket whitespace rules & add syntax-check rule (Daniel P. Berrange) - net: Mark network persistent when assigning persistent definition (Peter Krempa) - net: Add support for changing persistent networks to transient (Peter Krempa) - net: Re-use checks when creating transient networks (Peter Krempa) - net: Remove dnsmasq and radvd files also when destroying transient nets (Peter Krempa) - net: Move creation of dnsmasq hosts file to function starting dnsmasq (Peter Krempa) - net: Change argument type of virNetworkObjIsDuplicate() (Peter Krempa) - build: Do not ignore logging.c in sc_prohibit_mkstemp (Jiri Denemark) - qemu: use default machine type if missing it in qemu command line (Guannan Ren) Cleanups - storage: Remove the redundant white lines (Osier Yang) - Fix the indention (Osier Yang) - Do not export symbol virStateActive anymore (Osier Yang) - maint: Misc whitespace cleanups (Peter Krempa) - Fix the coding style (Osier Yang) - Fix indentions (Osier Yang) - qemu: Remove full stop from error messages (Jiri Denemark) - build: more fix to avoid C99 for loop (Hu Tao) - nwfilter: drop dead code (Eric Blake) - qemu: Drop word "either" from comments for agent monitor functions (Peter Krempa) - s/qemud/qemu/ in QEMU driver sources (Daniel P. Berrange) - Remove bogus newline at end of debug log message (Daniel P. Berrange) - build: avoid C99 for loop (Eric Blake) - util: Fix the indention (Osier Yang) - qemu/qemu_command.c: fix indent of label (Alon Levy) - qemu: Beautify code indent in migration codes (liguang) - qemu: Fix function header formating of 2 functions (Peter Krempa) - Remove spurious whitespace between function name & open brackets (Daniel P. Berrange) - Remove a chunk which should not have been pushed as part of 1.0.0 (Daniel Veillard) - logging.c: Properly indent and ignore one syntax-check rule (Michal Privoznik) Thanks everybody for your contributions, be it reports, code, reviews, ideas or documentation ! Daniel -- Daniel Veillard | Open Source and Standards, Red Hat veillard(a)redhat.com | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | virtualization library http://libvirt.org/

4 4

[libvirt] [PATCH] S390: Re-enable capability probing for virtio devices.
by Viktor Mihajlovski 22 Dec '12

22 Dec '12

Since we switched to QMP probing, the object types are spelled out explicitly, i.e. virtio-net-pci. This has effectively disabled the capability detection of s390 virtio devices. The trivial fix is to add the s390 virtio types explicitly to qemuCapsObjectProps. Signed-off-by: Viktor Mihajlovski <mihajlov(a)linux.vnet.ibm.com> --- src/qemu/qemu_capabilities.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index a6ac169..a705a53 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -1400,6 +1400,10 @@ static struct qemuCapsObjectTypeProps qemuCapsObjectProps[] = { ARRAY_CARDINALITY(qemuCapsObjectPropsVirtioBlk) }, { "virtio-net-pci", qemuCapsObjectPropsVirtioNet, ARRAY_CARDINALITY(qemuCapsObjectPropsVirtioNet) }, + { "virtio-blk-s390", qemuCapsObjectPropsVirtioBlk, + ARRAY_CARDINALITY(qemuCapsObjectPropsVirtioBlk) }, + { "virtio-net-s390", qemuCapsObjectPropsVirtioNet, + ARRAY_CARDINALITY(qemuCapsObjectPropsVirtioNet) }, { "pci-assign", qemuCapsObjectPropsPciAssign, ARRAY_CARDINALITY(qemuCapsObjectPropsPciAssign) }, { "kvm-pci-assign", qemuCapsObjectPropsPciAssign, -- 1.7.9.5

3 3

[libvirt] [PATCH] util: fix botched check for new netlink request filters
by Laine Stump 22 Dec '12

22 Dec '12

This is an adjustment to the fix for https://bugzilla.redhat.com/show_bug.cgi?id=889319 to account for two bonehead mistakes I made. commit ac2797cf2af2fd0e64c58a48409a8175d24d6f86 attempted to fix a problem with netlink in newer kernels requiring an extra attribute with a filter flag set in order to receive an IFLA_VFINFO_LIST from netlink. Unfortunately, the #ifdef that protected against compiling it in on systems without the new flag went a bit too far, assuring that the new code would *never* be compiled. The first problem was that, while some IFLA_* enum values are also not, so checking to see if it's #defined is not a valid method of determining whether or not to add the attribute. Fortunately, the flag that is being set (RTEXT_FILTER_VF) *is* #defined, and it is never present if IFLA_EXT_MASK isn't, so it's sufficient to just check for that flag. And to top it off, due to the code not actually compiling when I thought it did, I didn't realize that I'd been given the wrong arglist to nla_put() - you can't just send a const value to nla_put, you have to send it a pointer to memory containing what you want to add to the message, along with the length of that memory. This time I've actually sent the patch over to the other machine that's expriencing the problem, applied it to the branch being used (0.10.2) and verified that it works properly, i.e. it does fix the problem it's supposed to fix. :-/ --- src/util/virnetdev.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c index e5a0d6d..898e77a 100644 --- a/src/util/virnetdev.c +++ b/src/util/virnetdev.c @@ -1275,13 +1275,17 @@ virNetDevLinkDump(const char *ifname, int ifindex, goto buffer_too_small; } -# if defined(IFLA_EXT_MASK) && defined(RTEXT_FILTER_VF) +# if defined(RTEXT_FILTER_VF) /* if this filter exists in the kernel's netlink implementation, * we need to set it, otherwise the response message will not * contain the IFLA_VFINFO_LIST that we're looking for. */ - if (nla_put(nl_msg, IFLA_EXT_MASK, RTEXT_FILTER_VF) < 0) + { + uint32_t ifla_ext_mask = RTEXT_FILTER_VF; + + if (nla_put(nl_msg, IFLA_EXT_MASK, sizeof(ifla_ext_mask), &ifla_ext_mask) < 0) goto buffer_too_small; + } # endif if (virNetlinkCommand(nl_msg, recvbuf, &recvbuflen, -- 1.7.11.7

2 2

[libvirt] qemumonitorjsontest still hangs
by Eric Blake 22 Dec '12

22 Dec '12

I ran 'make check' under a heavily loaded system, and it hung in qemumonitorjsontest as follows: (gdb) t a a bt Thread 2 (Thread 0x2b0f8000e700 (LWP 423)): #0 0x00000032f96e998d in poll () from /lib64/libc.so.6 #1 0x00002b0f7f3a1951 in virEventPollRunOnce () at util/event_poll.c:615 #2 0x00002b0f7f39fb26 in virEventRunDefaultImpl () at util/event.c:247 #3 0x00000000004c25fa in qemuMonitorTestWorker (opaque=0x1ad8bc0) at qemumonitortestutils.c:308 #4 0x00002b0f7f3bbc39 in virThreadHelper (data=0x1ada580) at util/threads-pthread.c:161 #5 0x00000032f9a07d15 in start_thread () from /lib64/libpthread.so.0 #6 0x00000032f96f246d in clone () from /lib64/libc.so.6 Thread 1 (Thread 0x2b0f7fe0bbc0 (LWP 402)): #0 0x00000032f9a08e60 in pthread_join () from /lib64/libpthread.so.0 #1 0x00002b0f7f3bbeae in virThreadJoin (thread=0x1ad8be8) at util/threads-pthread.c:236 #2 0x00000000004c27b0 in qemuMonitorTestFree (test=0x1ad8bc0) at qemumonitortestutils.c:362 #3 0x00000000004144ba in testQemuMonitorJSONGetMachines (data=0x1ac7650) at qemumonitorjsontest.c:298 #4 0x0000000000414ef2 in virtTestRun (title=0x4c3434 "GetMachines", nloops=1, body=0x413f3e <testQemuMonitorJSONGetMachines>, data=0x1ac7650) at testutils.c:160 ---Type <return> to continue, or q <return> to quit--- #5 0x00000000004149f4 in mymain () at qemumonitorjsontest.c:446 #6 0x0000000000416092 in virtTestMain (argc=1, argv=0x7fffc02dcac8, func=0x41493d <mymain>) at testutils.c:719 #7 0x0000000000414aab in main (argc=1, argv=0x7fffc02dcac8) at qemumonitorjsontest.c:455 This was with latest libvirt.git, so I'm worried we still have a nasty race somewhere in there. -- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org

1 0

[libvirt] [PATCH] blockjob: fix memleak that prevented block pivot
by Eric Blake 22 Dec '12

22 Dec '12

https://bugzilla.redhat.com/show_bug.cgi?id=888426 The code for doing a block-copy was supposed to track the destination file in drive->mirror, but was set up to do all mallocs prior to starting the copy so that OOM wouldn't leave things partially started. However, the wrong variable was being written; later in the code we silently did 'disk->mirror = mirror' which was still NULL, and thus leaking memory and leaving libvirt to think that the mirror job was never started, which prevented a pivot operation after a copy. * src/qemu/qemu_driver.c (qemuDomainBlockCopy): Initialize correct variable. --- src/qemu/qemu_driver.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 7d8dd21..184f852 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -13429,7 +13429,7 @@ qemuDomainBlockCopy(virDomainPtr dom, const char *path, } if (!format && disk->mirrorFormat > 0) format = virStorageFileFormatTypeToString(disk->mirrorFormat); - if (!(disk->mirror = strdup(dest))) { + if (!(mirror = strdup(dest))) { virReportOOMError(); goto endjob; } -- 1.7.1

2 2

[libvirt] vhost-net on ethernet interface type
by Raja Sivaramakrishnan 22 Dec '12

22 Dec '12

Hello, I would like to enable vhost-net on an interface of ethernet type. However, this doesn't work, probably due to the following code in libvirt. if (actualType == VIR_DOMAIN_NET_TYPE_NETWORK || actualType == VIR_DOMAIN_NET_TYPE_BRIDGE || actualType == VIR_DOMAIN_NET_TYPE_DIRECT) { /* Attempt to use vhost-net mode for these types of network device */ Can VIR_DOMAIN_NET_TYPE_ETHERNET also be included in the check above? Or is there some reason to disable vhost-net for this type? Thanks, Raja

2 2

[libvirt] [PATCH 0/8] Dump domain's IP addresses
by Michal Privoznik 22 Dec '12

22 Dec '12

It's been a while since I tried get this in. I've reworked the patches, the exposed API, and start new round of reviews. Moreover, during work I've come to point, where extending qemu guest agent seemed wise: http://lists.nongnu.org/archive/html/qemu-devel/2012-12/msg03264.html Therefore I am introducing 'flags' field, which can contain some boolean values we don't have yet, e.g. IFF_UP, IFF_PROMISC, etc. Re: 'dstaddr' field in struct _virDomainInterfaceIPAddress; It's basically a join of: union { char *dstaddr; /* for IFF_POINTOPOINT interface */ char *broadaddr; /* for IFF_BROADCAST interface */ } Since an interface cannot has both flags set (see man 3 getifaddrs) I've joined both into one 'char *dstaddr'. I know it is not mnemonic as the union, so I left it for discussion. I can change it if you want to. Michal Privoznik (8): Introduce virDomainInterfacesAddresses API Introduce virDomainInterfaceFree API qemu_agent: Implement 'guest-network-get-interfaces' command handling qemu: Implement qemuDomainInterfacesAddresses virsh: Expose virDomainInterfacesAddresses remote: Implement virDomainInterfacesAddresses python: Expose virDomainInterfacesAddresses python: create example for dumping domain IP addresses daemon/remote.c | 138 +++++++++++++++++++++++++++++++++ examples/python/Makefile.am | 2 +- examples/python/README | 1 + examples/python/domipaddrs.py | 50 ++++++++++++ include/libvirt/libvirt.h.in | 52 +++++++++++++ python/generator.py | 3 + python/libvirt-override-api.xml | 7 ++ python/libvirt-override.c | 120 +++++++++++++++++++++++++++++ src/driver.h | 6 ++ src/libvirt.c | 102 +++++++++++++++++++++++++ src/libvirt_public.syms | 7 ++ src/qemu/qemu_agent.c | 164 ++++++++++++++++++++++++++++++++++++++++ src/qemu/qemu_agent.h | 2 + src/qemu/qemu_driver.c | 68 +++++++++++++++++ src/remote/remote_driver.c | 86 +++++++++++++++++++++ src/remote/remote_protocol.x | 27 ++++++- src/remote_protocol-structs | 27 +++++++ tools/virsh-domain.c | 102 +++++++++++++++++++++++++ 18 files changed, 962 insertions(+), 2 deletions(-) create mode 100755 examples/python/domipaddrs.py -- 1.8.0.2

2 12

[libvirt] [PATCH 0/6] BUG fix for PowerPC.
by Li Zhang 21 Dec '12

21 Dec '12

From: Li Zhang <zhlcindy(a)linux.vnet.ibm.com> This patch series is to fix bugs on PowerPC we found when testing libvirt. Li Zhang (6): Set std VGA model as default model for ppc64. Use -machine option for PPC64 Remove QEMU_CAPS_NO_ACPI capability for non-x86 platform Support all backend serial devices for pSeries guest Set the default machine as pseries for PPC64 Use help string "-device driver," when getting additional caps. src/conf/capabilities.c | 6 ++++ src/conf/domain_conf.c | 2 ++ src/qemu/qemu_capabilities.c | 12 ++++++-- src/qemu/qemu_command.c | 31 +++++++++++--------- .../qemuxml2argv-machine-core-off.args | 2 +- .../qemuxml2argv-machine-core-on.args | 2 +- .../qemuxml2argv-pseries-basic.args | 2 +- .../qemuxml2argv-pseries-vio-user-assigned.args | 2 +- .../qemuxml2argvdata/qemuxml2argv-pseries-vio.args | 2 +- 9 files changed, 39 insertions(+), 22 deletions(-) -- 1.7.10.1

3 19

[libvirt] [PATCH v2 0/28] Rename files in src/util to have a 'vir' prefix
by Daniel P. Berrange 21 Dec '12

21 Dec '12

Currently the files in src/util are 50/50 split between those having a 'vir' prefix and those which don't. Finish the job by remaining all remaining files to have a 'vir' prefix too, guaranteeing that they can't clash with system headers[1]. The only case which was not a plain rename, was merging processinfo.{c,h} into the virprocess.{c,h} since the functionality logically belongs together. At the end src/Makefile.am is updated to sort util files alphabetically. Left as further work - make sure all functions in these files also have a 'vir' prefix. eg dnsmasq, ebtables, iptables, usb and pci files are violators in this regard. Also left, much of virutil.c should move into virfile.c Changes in v2: - Rebased to latest GIT - Turned on rename detection to make review easier Daniel [1] Not a theoretical problem - we already hit a clsah on 'usb.h' before forcing us to use 'hostusb.h' and 'memory.h' clashes with a system header but we never noticed so far. In-Reply-To:

3 32

[libvirt] [test-API][PATCH] managedsave: change the checking method about bypass cache
by hongming 21 Dec '12

21 Dec '12

Check whether the O_DIRECT flag is in use on the managed save file during the duration of the managed save, since that is the real effect of the current implementation of the --bypass-cache flag. --- repos/managedsave/managedsave.py | 66 +++++++++++++++++++------------------ 1 files changed, 34 insertions(+), 32 deletions(-) diff --git a/repos/managedsave/managedsave.py b/repos/managedsave/managedsave.py index 4a92151..b898876 100644 --- a/repos/managedsave/managedsave.py +++ b/repos/managedsave/managedsave.py @@ -2,6 +2,8 @@ import os import math +import thread +import time import libvirt from libvirt import libvirtError @@ -39,39 +41,42 @@ def check_savefile_create(*args): logger.info("managed save file exists") return True -def compare_cachedfile(cachebefore, cacheafter): - """Compare cached value before managed save and its value after - managed save """ - - diff = cacheafter - cachebefore - logger.info("diff is %s " % diff) - percent = math.fabs(diff)/cachebefore - logger.info("diff percent is %s " % percent) - if percent < 0.05: - return True - else: - return False - -def get_cachevalue(): - """Get the file system cached value """ - - cmds = "head -n4 /proc/meminfo|grep Cached|awk '{print $2}'" - (status, output) = utils.exec_cmd(cmds, shell=True) - if status != 0: - logger.error("Fail to run cmd line to get cache") - return 1 +def get_fileflags(): + """Get the file flags of managed save file""" + cmds = "cat /proc/$(lsof -w /var/lib/libvirt/qemu/save/"+guestname+".save"\ + "|awk '/libvirt_i/{print $2}')/fdinfo/1|grep flags|awk '{print $NF}'" + global fileflags + while True: + (status, output) = utils.exec_cmd(cmds, shell=True) + if status == 0: + for i in range(len(output)): + logger.info("The flags of saved file %s" % output[i]) + fileflags = output[i][-5] + else: + logger.error("Fail to get the flags of saved file") + return 1 + + thread.exit_thread() + +def check_fileflag(fileflags): + """Check the file flags of managed save file if include O_DIRECT""" + if int(fileflags) == 4: + logger.info("file flags include O_DIRECT") + return True else: - logger.debug(output[0]) - cachevalue= int(output[0]) - return cachevalue + logger.error("file flags doesn't include O_DIRECT") + return False def managedsave(params): """Managed save a running domain""" global logger logger = params['logger'] + global guestname guestname = params['guestname'] flags = params ['flags'] + global fileflags + fileflags = '' #Save given flags to sharedmod.data sharedmod.data['flagsave'] = flags @@ -122,17 +127,14 @@ def managedsave(params): #If given flags include bypass-cache,check if bypass file system cache if flagn % 2 == 1: - logger.info("Given flags include --bypass-cache") - os.system('echo 3 > /proc/sys/vm/drop_caches') - cache_before = get_cachevalue() - logger.info("Cached value before managedsave is %s" % cache_before) + logger.info("Given flags include --bypass-cache") + thread.start_new_thread(get_fileflags,()) + # Guarantee get_fileflags shell has run before managed save + time.sleep(5) domobj.managedSave(flagn) - cache_after = get_cachevalue() - logger.info("Cached value after managedsave is %s" % cache_after) - - if compare_cachedfile(cache_before, cache_after): + if check_fileflag(fileflags): logger.info("Bypass file system cache successfully") else: logger.error("Bypass file system cache failed") -- 1.7.7.6

1 0

[libvirt] [PATCH 0/2] account for change in netlink kernel ABI
by Laine Stump 21 Dec '12

21 Dec '12

The first of these two patches changes libvirt to account for a change in netlink's kernel ABI that happened upstream several months ago. The second patch adds in error logs to the functions that failed after the kernel change. Laine Stump (2): util: fix functions that retrieve SRIOV VF info util: add missing error log messages when failing to get netlink VFINFO src/util/virnetdev.c | 87 +++++++++++++++++++++++++++++----------------------- 1 file changed, 49 insertions(+), 38 deletions(-) -- 1.7.11.7

2 4

[libvirt] [PATCH 1/1] Add sysinfo data and enable virSysinfoRead test case for POWER
by Li Zhang 21 Dec '12

21 Dec '12

From: Li Zhang <zhlcindy(a)linux.vnet.ibm.com> This patch is to enable virSysinfoRead test case for POWER, and provide sysinfo data on POWER. Signed-off-by: Li Zhang <zhlcindy(a)linux.vnet.ibm.com> Reviewed-by: Viktor Mihajlovski <mihajlov(a)linux.vnet.ibm.com> --- tests/sysinfodata/ppccpuinfo.data | 85 ++++++++++++++++++++++++++++++++++ tests/sysinfodata/ppcsysinfo.expect | 87 +++++++++++++++++++++++++++++++++++ tests/sysinfotest.c | 25 ---------- 3 files changed, 172 insertions(+), 25 deletions(-) create mode 100644 tests/sysinfodata/ppccpuinfo.data create mode 100644 tests/sysinfodata/ppcsysinfo.expect diff --git a/tests/sysinfodata/ppccpuinfo.data b/tests/sysinfodata/ppccpuinfo.data new file mode 100644 index 0000000..bf4433c --- /dev/null +++ b/tests/sysinfodata/ppccpuinfo.data @@ -0,0 +1,85 @@ +processor : 0 +cpu : POWER7 (raw), altivec supported +clock : 8.388608MHz +revision : 2.3 (pvr 003f 0203) + +processor : 4 +cpu : POWER7 (raw), altivec supported +clock : 8.388608MHz +revision : 2.3 (pvr 003f 0203) + +processor : 8 +cpu : POWER7 (raw), altivec supported +clock : 8.388608MHz +revision : 2.3 (pvr 003f 0203) + +processor : 12 +cpu : POWER7 (raw), altivec supported +clock : 8.388608MHz +revision : 2.3 (pvr 003f 0203) + +processor : 16 +cpu : POWER7 (raw), altivec supported +clock : 8.388608MHz +revision : 2.3 (pvr 003f 0203) + +processor : 20 +cpu : POWER7 (raw), altivec supported +clock : 8.388608MHz +revision : 2.3 (pvr 003f 0203) + +processor : 24 +cpu : POWER7 (raw), altivec supported +clock : 8.388608MHz +revision : 2.3 (pvr 003f 0203) + +processor : 28 +cpu : POWER7 (raw), altivec supported +clock : 8.388608MHz +revision : 2.3 (pvr 003f 0203) + +processor : 32 +cpu : POWER7 (raw), altivec supported +clock : 8.388608MHz +revision : 2.3 (pvr 003f 0203) + +processor : 36 +cpu : POWER7 (raw), altivec supported +clock : 8.388608MHz +revision : 2.3 (pvr 003f 0203) + +processor : 40 +cpu : POWER7 (raw), altivec supported +clock : 8.388608MHz +revision : 2.3 (pvr 003f 0203) + +processor : 44 +cpu : POWER7 (raw), altivec supported +clock : 8.388608MHz +revision : 2.3 (pvr 003f 0203) + +processor : 48 +cpu : POWER7 (raw), altivec supported +clock : 8.388608MHz +revision : 2.3 (pvr 003f 0203) + +processor : 52 +cpu : POWER7 (raw), altivec supported +clock : 8.388608MHz +revision : 2.3 (pvr 003f 0203) + +processor : 56 +cpu : POWER7 (raw), altivec supported +clock : 8.388608MHz +revision : 2.3 (pvr 003f 0203) + +processor : 60 +cpu : POWER7 (raw), altivec supported +clock : 8.388608MHz +revision : 2.3 (pvr 003f 0203) + +timebase : 512000000 +platform : PowerNV +model : 8246-L2C +machine : PowerNV 8246-L2C +firmware : OPAL v2 diff --git a/tests/sysinfodata/ppcsysinfo.expect b/tests/sysinfodata/ppcsysinfo.expect new file mode 100644 index 0000000..32407e0 --- /dev/null +++ b/tests/sysinfodata/ppcsysinfo.expect @@ -0,0 +1,87 @@ +<sysinfo type='smbios'> + <system> + <entry name='version'>PowerNV 8246-L2C</entry> + <entry name='serial'>8246-L2C</entry> + <entry name='family'>PowerNV</entry> + </system> + <processor> + <entry name='socket_destination'>0</entry> + <entry name='type'>POWER7 (raw), altivec supported</entry> + <entry name='version'>2.3 (pvr 003f 0203)</entry> + </processor> + <processor> + <entry name='socket_destination'>4</entry> + <entry name='type'>POWER7 (raw), altivec supported</entry> + <entry name='version'>2.3 (pvr 003f 0203)</entry> + </processor> + <processor> + <entry name='socket_destination'>8</entry> + <entry name='type'>POWER7 (raw), altivec supported</entry> + <entry name='version'>2.3 (pvr 003f 0203)</entry> + </processor> + <processor> + <entry name='socket_destination'>12</entry> + <entry name='type'>POWER7 (raw), altivec supported</entry> + <entry name='version'>2.3 (pvr 003f 0203)</entry> + </processor> + <processor> + <entry name='socket_destination'>16</entry> + <entry name='type'>POWER7 (raw), altivec supported</entry> + <entry name='version'>2.3 (pvr 003f 0203)</entry> + </processor> + <processor> + <entry name='socket_destination'>20</entry> + <entry name='type'>POWER7 (raw), altivec supported</entry> + <entry name='version'>2.3 (pvr 003f 0203)</entry> + </processor> + <processor> + <entry name='socket_destination'>24</entry> + <entry name='type'>POWER7 (raw), altivec supported</entry> + <entry name='version'>2.3 (pvr 003f 0203)</entry> + </processor> + <processor> + <entry name='socket_destination'>28</entry> + <entry name='type'>POWER7 (raw), altivec supported</entry> + <entry name='version'>2.3 (pvr 003f 0203)</entry> + </processor> + <processor> + <entry name='socket_destination'>32</entry> + <entry name='type'>POWER7 (raw), altivec supported</entry> + <entry name='version'>2.3 (pvr 003f 0203)</entry> + </processor> + <processor> + <entry name='socket_destination'>36</entry> + <entry name='type'>POWER7 (raw), altivec supported</entry> + <entry name='version'>2.3 (pvr 003f 0203)</entry> + </processor> + <processor> + <entry name='socket_destination'>40</entry> + <entry name='type'>POWER7 (raw), altivec supported</entry> + <entry name='version'>2.3 (pvr 003f 0203)</entry> + </processor> + <processor> + <entry name='socket_destination'>44</entry> + <entry name='type'>POWER7 (raw), altivec supported</entry> + <entry name='version'>2.3 (pvr 003f 0203)</entry> + </processor> + <processor> + <entry name='socket_destination'>48</entry> + <entry name='type'>POWER7 (raw), altivec supported</entry> + <entry name='version'>2.3 (pvr 003f 0203)</entry> + </processor> + <processor> + <entry name='socket_destination'>52</entry> + <entry name='type'>POWER7 (raw), altivec supported</entry> + <entry name='version'>2.3 (pvr 003f 0203)</entry> + </processor> + <processor> + <entry name='socket_destination'>56</entry> + <entry name='type'>POWER7 (raw), altivec supported</entry> + <entry name='version'>2.3 (pvr 003f 0203)</entry> + </processor> + <processor> + <entry name='socket_destination'>60</entry> + <entry name='type'>POWER7 (raw), altivec supported</entry> + <entry name='version'>2.3 (pvr 003f 0203)</entry> + </processor> +</sysinfo> diff --git a/tests/sysinfotest.c b/tests/sysinfotest.c index 79ee128..353bc76 100644 --- a/tests/sysinfotest.c +++ b/tests/sysinfotest.c @@ -50,27 +50,6 @@ struct testSysinfoData { char *expected; /* (required) file containing output of virSysinfoFormat */ }; -# if defined(__powerpc__) || defined(__powerpc64__) -/* TODO ppc: remove the if defined() branch - to enable the real test run after providing test data, see below. - */ -static int -testSysinfo(const void *data ATTRIBUTE_UNUSED) -{ - return EXIT_AM_SKIP; -} - -static int -sysinfotest_run(const char *test ATTRIBUTE_UNUSED, - const char *decoder ATTRIBUTE_UNUSED, - const char *sysinfo ATTRIBUTE_UNUSED, - const char *cpuinfo ATTRIBUTE_UNUSED, - const char *expected ATTRIBUTE_UNUSED) -{ - return testSysinfo(NULL); -} -# else - static int testSysinfo(const void *data) { @@ -143,7 +122,6 @@ error: VIR_FREE(testdata.expected); return ret; } -# endif /* defined(__powerpc__) ... */ # if defined(__s390__) || defined(__s390x__) static int @@ -158,9 +136,6 @@ test_s390(void) VIRT_TEST_MAIN(test_s390) # elif defined(__powerpc__) || defined(__powerpc64__) -/* TODO for PPC owner: provide test data - and enable the real sysinfotest_run above -*/ static int test_ppc(void) { -- 1.7.10.1

3 2

[libvirt] [PATCH] security: fix #endif comment in security_stack.h
by Ján Tomko 21 Dec '12

21 Dec '12

--- Pushed under the trivial rule. --- src/security/security_stack.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/security/security_stack.h b/src/security/security_stack.h index 4ba55f7..b38f9a9 100644 --- a/src/security/security_stack.h +++ b/src/security/security_stack.h @@ -35,4 +35,4 @@ virSecurityStackGetPrimary(virSecurityManagerPtr mgr); virSecurityManagerPtr* virSecurityStackGetNested(virSecurityManagerPtr mgr); -#endif /* __VIR_SECURITY_DAC */ +#endif /* __VIR_SECURITY_STACK */ -- 1.7.8.6

1 0

[libvirt] [PATCH 0/5] Miscellaneous cleanups
by Martin Kletzander 21 Dec '12

21 Dec '12

My cleanup branch got up to 5 commits so in order to get rid of it, I'm sending it. Some of them could be most probably pushed as trivial, but since some are older (even though the commit date is new), I'm sending it in the pack together. Martin Kletzander (5): fix typo in the word affinities conf: minor indentation cleanups conf: Don't format cputune element when not needed conf: eliminate redundant use of VIR_ALLOC docs: aesthetical cleanups docs/hacking.html.in | 12 ++++---- src/conf/domain_conf.c | 80 ++++++++++++++++++++++-------------------------- src/libxl/libxl_driver.c | 4 +-- src/qemu/qemu_process.c | 8 ++--- 4 files changed, 48 insertions(+), 56 deletions(-) -- 1.8.0.2

2 14

[libvirt] [PATCH] conf: cpu: Fix to escape cpu model, vendor_id and vendor
by Ken ICHIKAWA 20 Dec '12

20 Dec '12

This patch fixes a problem that encoded xml special charas of cpu model, vendor_id and vendor are saved as decoded xml special charas. If I define model name including encoded xml special charas in domain XML like below: <domain> <cpu mode='custom' match='exact'> <model fallback='allow'>><</model> </cpu> </domain> domain xml definition file is saved as <domain> <cpu mode='custom' match='exact'> <model fallback='allow'>><</model> </cpu> </domain> After that, if libvirtd is restarted, dumpxml command, edit command and etc. are disabled with below error until I stop libvirtd and fix the xml file manually. 2012-12-20 04:56:54.371+0000: 11893: error : catchXMLError:691 : /etc/libvirt/qemu/f17.xml:25: StartTag: invalid element name <model fallback='allow'>><</model> ------------------------------^ Also vendor_id and vendor have same problem. Signed-off-by: Ken ICHIKAWA <ichikawa.ken(a)jp.fujitsu.com> --- src/conf/cpu_conf.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/conf/cpu_conf.c b/src/conf/cpu_conf.c index 3973c83..e9f9431 100644 --- a/src/conf/cpu_conf.c +++ b/src/conf/cpu_conf.c @@ -609,17 +609,17 @@ virCPUDefFormatBuf(virBufferPtr buf, } virBufferAsprintf(buf, " fallback='%s'", fallback); if (def->vendor_id) - virBufferAsprintf(buf, " vendor_id='%s'", def->vendor_id); + virBufferEscapeString(buf, " vendor_id='%s'", def->vendor_id); } if (formatModel && def->model) { - virBufferAsprintf(buf, ">%s</model>\n", def->model); + virBufferEscapeString(buf, ">%s</model>\n", def->model); } else { virBufferAddLit(buf, "/>\n"); } } if (formatModel && def->vendor) - virBufferAsprintf(buf, "<vendor>%s</vendor>\n", def->vendor); + virBufferEscapeString(buf, "<vendor>%s</vendor>\n", def->vendor); if (def->sockets && def->cores && def->threads) { virBufferAddLit(buf, "<topology"); -- 1.7.11.7

2 1

[libvirt] [PATCH v2.1 00/11] Rework storage migration
by Michal Privoznik 20 Dec '12

20 Dec '12

This patch set re-implements migration with storage for enough new qemu. Currently, you can migrate a domain to a host without need for shared storage. This is done by setting 'blk' or 'inc' attribute (representing VIR_MIGRATE_NON_SHARED_DISK and VIR_MIGRATE_NON_SHARED_INC flags respectively) of 'migrate' monitor command. However, the qemu implementation is buggy and applications are advised to switch to new impementation which, moreover, offers some nice features, like migrating only explicitly specified disks. The new functionality is controlled via 'nbd-server-*' and 'drive-mirror' commands. The flow is meant to look like this: 1) User invokes libvirt's migrate functionality. 2) libvirt checks that no block jobs are active on the source. 3) libvirt starts the destination QEMU and sets up the NBD server using the nbd-server-start and nbd-server-add commands. 4) libvirt starts drive-mirror with a destination pointing to the remote NBD server, for example nbd:host:port:exportname=diskname (where diskname is the -drive id specified on the destination). 5) once all mirroring jobs reach steady state, libvirt invokes the migrate command. 6) once migration completed, libvirt invokes the nbd-server-stop command on the destination QEMU. If we just skip the 2nd step and there is an active block-job, qemu will fail in step 4. No big deal. Since we try to NOT break migration and keep things compatible, this feature is enabled iff both sides support it. Since there's obvious need for some data transfer between src and dst, I've put it into qemuCookieMigration: 1) src -> dest: (QEMU_MIGRATION_PHASE_BEGIN3 -> QEMU_MIGRATION_PHASE_PREPARE) <nbd> <disk size='17179869184'/> </nbd> Hey destination, I know how to use this cool new feature. Moreover, these are the disks I'll send you. Each one of them is X bytes big. It's one of the prerequisite - the file (disk->src) on dst exists and has at least the same size as on dst. 2) dst -> src: (QEMU_MIGRATION_PHASE_PREPARE -> QEMU_MIGRATION_PHASE_PERFORM3) <nbd port='X'/> Okay, I (destination) support this feature as well. I've created all files as you (src) told me to and you can start rolling data. I am listening on port X. 3) src -> dst: (QEMU_MIGRATION_PHASE_PERFORM3 -> QEMU_MIGRATION_PHASE_FINISH3) <nbd port='-1'/> Migration completed, destination, you may shut the NBD server down. If either src or dst doesn't support NBD, it is not used and whole process fall backs to old implementation. diff to v1: -Eric's and Daniel's suggestions worked in. To point out the bigger ones: don't do NBD style when TUNNELLED requested, added 'b:writable' to 'nbd-server-add' -drop '/qemu-migration/nbd/disk/@src' attribute from migration cookie. As pointed out by Jirka, disk->src can be changed during migration (e.g. by migration hook or by passed xml). So I've tried (as suggested on the list) passing disk alias. However, since qemu hasn't been started on destination yet, the aliases hasn't been generated yet. So we have to rely on ordering completely. diff to v2: -rebase to reflect changes made by offline migration patch -send initial nbd cookie only if needed The patches 1,3 and 5 has been ACKed already. Michal Privoznik (11): qemu: Introduce NBD_SERVER capability Introduce NBD migration cookie qemu: Introduce nbd-server-start command qemu: Introduce nbd-server-add command qemu: Introduce nbd-server-stop command qemu_migration: Introduce qemuMigrationStartNBDServer qemu_migration: Move port allocation to a separate func qemu_migration: Implement qemuMigrationStartNBDServer() qemu_migration: Implement qemuMigrationDriveMirror qemu_migration: Check size prerequisites qemu_migration: Stop NBD server at Finish phase src/qemu/qemu_capabilities.c | 3 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_migration.c | 624 ++++++++++++++++++++++++++++++++++++++++--- src/qemu/qemu_monitor.c | 63 +++++ src/qemu/qemu_monitor.h | 7 + src/qemu/qemu_monitor_json.c | 95 +++++++ src/qemu/qemu_monitor_json.h | 7 + 7 files changed, 768 insertions(+), 32 deletions(-) -- 1.8.0.2

2 14

[libvirt] [PATCH] maint: formatting cleanups in buf.c
by Eric Blake 20 Dec '12

20 Dec '12

* src/util/buf.c: Use consistent formatting. --- Pushing under the trivial rule. src/util/buf.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/util/buf.c b/src/util/buf.c index e5a6ab7..e5406da 100644 --- a/src/util/buf.c +++ b/src/util/buf.c @@ -106,8 +106,8 @@ virBufferGetIndent(const virBufferPtr buf, bool dynamic) /** * virBufferGrow: - * @buf: the buffer - * @len: the minimum free size to allocate on top of existing used space + * @buf: the buffer + * @len: the minimum free size to allocate on top of existing used space * * Grow the available space of a buffer to at least @len bytes. * @@ -282,8 +282,8 @@ virBufferUse(const virBufferPtr buf) /** * virBufferAsprintf: * @buf: the buffer to append to - * @format: the format - * @...: the variable list of arguments + * @format: the format + * @...: the variable list of arguments * * Do a formatted print to an XML buffer. Auto indentation may be applied. */ @@ -299,8 +299,8 @@ virBufferAsprintf(virBufferPtr buf, const char *format, ...) /** * virBufferVasprintf: * @buf: the buffer to append to - * @format: the format - * @argptr: the variable list of arguments + * @format: the format + * @argptr: the variable list of arguments * * Do a formatted print to an XML buffer. Auto indentation may be applied. */ @@ -458,7 +458,7 @@ virBufferEscapeSexpr(virBufferPtr buf, virBufferEscape(buf, '\\', "\\'", format, str); } -/* Work around spurious strchr() diagnostics given by -Wlogical-op * +/* Work around spurious strchr() diagnostics given by -Wlogical-op * for gcc < 4.6. Doing it via a local pragma keeps the damage * smaller than disabling it on the package level. Unfortunately, the * affected GCCs don't allow diagnostic push/pop which would have @@ -522,7 +522,7 @@ virBufferEscape(virBufferPtr buf, char escape, const char *toescape, /** * virBufferURIEncodeString: * @buf: the buffer to append to - * @str: the string argument which will be URI-encoded + * @str: the string argument which will be URI-encoded * * Append the string to the buffer. The string will be URI-encoded * during the append (ie any non alpha-numeric characters are replaced @@ -630,7 +630,7 @@ virBufferEscapeShell(virBufferPtr buf, const char *str) /** * virBufferStrcat: * @buf: the buffer to append to - * @...: the variable list of strings, the last argument must be NULL + * @...: the variable list of strings, the last argument must be NULL * * Concatenate strings to an XML buffer. Auto indentation may be applied * after each string argument. -- 1.8.0.2

1 0

[libvirt] [PATCH] build: make broken -Wlogical-op test be gcc-only
by Eric Blake 20 Dec '12

20 Dec '12

Commit 8b8fcdea introduced a check for broken gcc -Wlogical-op, but did not guard the check against non-gcc compilers, which might lead to spurious failures when another compiler encounters an unknown pragma. Additionally, all of our compiler warning logic should belong in a single file, and use cache variables to allow overriding the decision at configure time if necessary. * configure.ac (BROKEN_GCC_WLOGICALOP): Move... * m4/virt-compile-warnings.m4 (LIBVIRT_COMPILE_WARNINGS): ...here, and update to modern autoconf idioms. --- Fixes the issues mentioned here: https://www.redhat.com/archives/libvir-list/2012-December/msg01197.html https://www.redhat.com/archives/libvir-list/2012-December/msg01211.html configure.ac | 23 ----------------------- m4/virt-compile-warnings.m4 | 22 ++++++++++++++++++++++ 2 files changed, 22 insertions(+), 23 deletions(-) diff --git a/configure.ac b/configure.ac index 20caa92..3c97e4f 100644 --- a/configure.ac +++ b/configure.ac @@ -255,29 +255,6 @@ AC_CHECK_TYPE([struct ifreq], #include <net/if.h> ]]) -dnl Check whether strchr(s, char variable) causes a bogus compile warning -dnl which is the case with a certain range of GCC versions -AC_MSG_CHECKING([whether GCC -Wlogical-op is broken]) - -save_CFLAGS="$CFLAGS" -CFLAGS="-O2 -Wlogical-op -Werror" - -AC_TRY_COMPILE([#include <string.h>], - [const char *haystack; - char needle; - return strchr(haystack, needle) == haystack;], - [gcc_false_strchr_warning=no], - [gcc_false_strchr_warning=yes]) - -CFLAGS="$save_CFLAGS" - -if test "x$gcc_false_strchr_warning" = xyes; then - AC_DEFINE_UNQUOTED([BROKEN_GCC_WLOGICALOP], 1, - [GCC -Wlogical-op is reporting false positive on strchr]) -fi - -AC_MSG_RESULT([$gcc_false_strchr_warning]) - dnl Our only use of libtasn1.h is in the testsuite, and can be skipped dnl if the header is not present. Assume -ltasn1 is present if the dnl header could be found. diff --git a/m4/virt-compile-warnings.m4 b/m4/virt-compile-warnings.m4 index 4a0f289..a08fcac 100644 --- a/m4/virt-compile-warnings.m4 +++ b/m4/virt-compile-warnings.m4 @@ -95,6 +95,22 @@ AC_DEFUN([LIBVIRT_COMPILE_WARNINGS],[ dontwarn="$dontwarn -Wmissing-declarations" fi + dnl Check whether strchr(s, char variable) causes a bogus compile + dnl warning, which is the case with GCC < 4.6 on some glibc + AC_CACHE_CHECK([whether GCC -Wlogical-op gives bogus warnings], + [lv_cv_gcc_wlogical_op_broken], [ + save_CFLAGS="$CFLAGS" + CFLAGS="-O2 -Wlogical-op -Werror" + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ + #include <string.h> + ]], [[ + const char *haystack; + char needle; + return strchr(haystack, needle) == haystack;]])], + [lv_cv_gcc_wlogical_op_broken=no], + [lv_cv_gcc_wlogical_op_broken=yes]) + CFLAGS="$save_CFLAGS"]) + # We might fundamentally need some of these disabled forever, but # ideally we'd turn many of them on dontwarn="$dontwarn -Wfloat-equal" @@ -196,4 +212,10 @@ AC_DEFUN([LIBVIRT_COMPILE_WARNINGS],[ WARN_PYTHON_CFLAGS=$WARN_CFLAGS AC_SUBST(WARN_PYTHON_CFLAGS) WARN_CFLAGS=$save_WARN_CFLAGS + + if test "$gl_cv_warn_c__Wlogical_op" = yes && + test "$lv_cv_gcc_wlogical_op_broken" = yes; then + AC_DEFINE_UNQUOTED([BROKEN_GCC_WLOGICALOP], 1, + [Define to 1 if gcc -Wlogical-op reports false positives on strchr]) + fi ]) -- 1.8.0.2

2 2

[libvirt] [PATCH] build: use strchr now that we can work around broken gcc
by Eric Blake 20 Dec '12

20 Dec '12

Revert the complex workaround of commit 39d91e9, now that we have a nicer framework for shutting up broken gcc. * src/util/buf.c (virBufferEscape): Simplify. --- src/util/buf.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/src/util/buf.c b/src/util/buf.c index 030dc97..e5a6ab7 100644 --- a/src/util/buf.c +++ b/src/util/buf.c @@ -458,2 +458,2 @@ virBufferEscapeSexpr(virBufferPtr buf, virBufferEscape(buf, '\\', "\\'", format, str); } +/* Work around spurious strchr() diagnostics given by -Wlogical-op + * for gcc < 4.6. Doing it via a local pragma keeps the damage + * smaller than disabling it on the package level. Unfortunately, the + * affected GCCs don't allow diagnostic push/pop which would have + * further reduced the impact. */ +#if BROKEN_GCC_WLOGICALOP +# pragma GCC diagnostic ignored "-Wlogical-op" +#endif + /** * virBufferEscape: * @buf: the buffer to append to @@ -499,11 +508,7 @@ virBufferEscape(virBufferPtr buf, char escape, const char *toescape, cur = str; out = escaped; while (*cur != 0) { - /* strchr work-around for gcc 4.3 & 4.4 bug with -Wlogical-op - * http://gcc.gnu.org/bugzilla/show_bug.cgi?id=36513 - */ - char needle[2] = { *cur, 0 }; - if (strstr(toescape, needle)) + if (strchr(toescape, *cur)) *out++ = escape; *out++ = *cur; cur++; -- 1.8.0.2

2 1

[libvirt] [PATCH] build: Check for broken GCC -Wlogical-op was too optimistic
by Viktor Mihajlovski 20 Dec '12

20 Dec '12

The check for a broken GCC -Wlogical-op implemententation was written under the wrong assumption that unknown warning options would be gracefully ignored. Thanks to Eric Blake and Daniel Berrange for pointing that out. Signed-off-by: Viktor Mihajlovski <mihajlov(a)linux.vnet.ibm.com> --- configure.ac | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 20caa92..828ae01 100644 --- a/configure.ac +++ b/configure.ac @@ -260,7 +260,13 @@ dnl which is the case with a certain range of GCC versions AC_MSG_CHECKING([whether GCC -Wlogical-op is broken]) save_CFLAGS="$CFLAGS" -CFLAGS="-O2 -Wlogical-op -Werror" +for w_opt in $WARN_CFLAGS; do + case $w_opt in + "-Wlogical-op" | "-Werror" ) + CFLAGS="$CFLAGS $w_opt" + ;; + esac +done AC_TRY_COMPILE([#include <string.h>], [const char *haystack; -- 1.7.9.5

2 1

[libvirt] virtulazation error
by Gangadahr Jena 20 Dec '12

20 Dec '12

hi every one when i am start windows os using virtual macine manager on redhat 6 os it showing this type of error-Error starting domain: unsupported configuration: Only PCI device addresses with function=0 are supported with this QEMU binary

2 1

[libvirt] [PATCH 0/2] FreeBSD: nodeinfo support and CPU affinity stubs
by Roman Bogorodskiy 19 Dec '12

19 Dec '12

With this set of changes it's now possible to connect to libvirtd using virsh and start/shutdown domains with the obvious limitation that networking is not supported at this point. CPU affinity most likely could be implemented using cpu_setaffinity(2) and cpu_getaffinity(2) on FreeBSD, but networking support looks more important now. Roman Bogorodskiy (2): FreeBSD: add nodeinfo support. FreeBSD: stub out CPU affinity functions. src/nodeinfo.c | 75 +++++++++++++++++++++++++++++++++++++++++++++++++- src/util/processinfo.c | 22 +++++++++++++++ 2 files changed, 96 insertions(+), 1 deletion(-) -- 1.8.0

3 16

[libvirt] [PATCHv3 0/3] sysinfo: s390 bug fix and tests
by Viktor Mihajlovski 19 Dec '12

19 Dec '12

Primarily this fixes a memory issue in virSysinfoRead on s390. As a side effect it became necessary to work around a GCC bug. Finally I have followed Daniel Berrange's suggestion to provide tests for sysinfo. V2: Turned single patch into series V3: Fixed -Werror induced build break with current GCC Viktor Mihajlovski (3): build: Check for broken GCC -Wlogical-op in configure S390: Fix virSysinfoRead memory corruption tests: Add tests for sysinfo cfg.mk | 2 +- configure.ac | 23 ++++ src/libvirt_private.syms | 1 + src/util/sysinfo.c | 195 +++++++++++++++++---------------- tests/Makefile.am | 6 + tests/sysinfodata/dmidecode.sh | 3 + tests/sysinfodata/s390cpuinfo.data | 12 ++ tests/sysinfodata/s390sysinfo.data | 114 +++++++++++++++++++ tests/sysinfodata/s390sysinfo.expect | 25 +++++ tests/sysinfodata/x86sysinfo.data | 83 ++++++++++++++ tests/sysinfodata/x86sysinfo.expect | 53 +++++++++ tests/sysinfotest.c | 200 ++++++++++++++++++++++++++++++++++ 12 files changed, 622 insertions(+), 95 deletions(-) create mode 100755 tests/sysinfodata/dmidecode.sh create mode 100644 tests/sysinfodata/s390cpuinfo.data create mode 100644 tests/sysinfodata/s390sysinfo.data create mode 100644 tests/sysinfodata/s390sysinfo.expect create mode 100644 tests/sysinfodata/x86sysinfo.data create mode 100644 tests/sysinfodata/x86sysinfo.expect create mode 100644 tests/sysinfotest.c -- 1.7.9.5

3 13

[libvirt] [RFC] Support for qemu's virtio-rng
by Peter Krempa 19 Dec '12

19 Dec '12

Commit 16c915ba42b45df7a64a6908287f03bfa3764bed in the qemu.git tree introduced support for emulating a virtio-rng device used to pass-through entropy to the guests. Qemu provides two backends to gather entropy from: 1) Default chardev backend This backend supports reading non-blocking character devices that provide entropy such as /dev/random (by default) or others according to configuration. This backend also supports basic rate limiting of the entropy read from the source. Unfortunately as the rate limiting is done just on a per-guest basis this cannot protect the host from being starved of entropy by multiple guests although their individual rates are limited. 2) EGD backend This backend uses the EGD protocol to communicate with a daemon that servers entropy. The EGD protocol is a simple protocol that was introduced by the entropy gathering daemon (a substitute for /dev/random on machines that don't support it). This protocol can be used for centralized management of entropy allocation to the hosts. This by itself isn't really useful as implementations of EGD daemons are trying to create the entropy instead of using available sources and multiplexing/rate-limiting them. For this functionality we will (probably) need a separate server to serve the entropy to the guests but more on this topic later. To represent the configuration of the virtio-rng device to the guest I propose the following domain XML snipped to be used: For the first use case I propose: <domain> [...] <devices> [...] <rng model='virtio'> <rate bytes='1024' period='1000'/> <source type='char'>/dev/urandom</source> -- or -- <source type='char'/> -- for the default source -- </rng> </devices> </domain> For the EGD backend used manually (without any managed server) I propose: <rng model='virtio'> <rate bytes='1024' period='1000'/> <source type='egd'> <remote type='unix'>/path/to/socket</remote> -- or -- <remote type='tcp' port='12345'>host.addr</remote> -- optionally or even more options, but they don't seem useful </source> </rng> Now these solutions are mere envelopes on top of the qemu functionality and don't really let us do any advanced configuration or management and they don't protect the host or guests by themselves from starving others from entropy. The solution for the problem described above is to have a central point where guests can request entropy and this central point will do all the rate limiting. To do this we will need to add a daemon that will talk the EGD protocol. This daemon will need to read entropy on request from the kernel software entropy device (/dev/random) or possibly a hardware RNG and distribute it to the hosts. To enable concurrent access and avoid starvation the daemon will implement a "shaping protocol" based on the hierarchical token bucket approach used to rate-limit network flows. For implementation details on this one I'll send a separate RFC. To allow configuration of the groups and sources I propose to create a separate driver with infrastructure similar to the network driver. This will allow to start multiple entropy distribution daemons with different sources and define the hierarchical classes to allow guest grouping. With this infrastructure you will be able to specify the rng device as follows: <rng model='virtio'> <source type='pool' pool='default'>classname</source> </rng> This will auto-configure all parameters according to the configuration of the pool and ensure that te guest gets classified correctly. As the start I'll implement the two basic options and then I'll propose another RFC how I will approach the second part more closely. Peter

2 1

[libvirt] [PATCH] Add smartcard support to libvirt-gconfig
by alexl＠redhat.com 19 Dec '12

19 Dec '12

From: Alexander Larsson <alexl(a)redhat.com> This handles <smartcard> devices. --- libvirt-gconfig/Makefile.am | 8 ++ .../libvirt-gconfig-domain-device-private.h | 3 + libvirt-gconfig/libvirt-gconfig-domain-device.c | 2 +- ...rt-gconfig-domain-smartcard-host-certificates.c | 124 +++++++++++++++++++++ ...rt-gconfig-domain-smartcard-host-certificates.h | 74 ++++++++++++ .../libvirt-gconfig-domain-smartcard-host.c | 75 +++++++++++++ .../libvirt-gconfig-domain-smartcard-host.h | 67 +++++++++++ .../libvirt-gconfig-domain-smartcard-passthrough.c | 116 +++++++++++++++++++ .../libvirt-gconfig-domain-smartcard-passthrough.h | 70 ++++++++++++ libvirt-gconfig/libvirt-gconfig-domain-smartcard.c | 90 +++++++++++++++ libvirt-gconfig/libvirt-gconfig-domain-smartcard.h | 67 +++++++++++ libvirt-gconfig/libvirt-gconfig.h | 4 + libvirt-gconfig/libvirt-gconfig.sym | 21 ++++ 13 files changed, 720 insertions(+), 1 deletion(-) create mode 100644 libvirt-gconfig/libvirt-gconfig-domain-smartcard-host-certificates.c create mode 100644 libvirt-gconfig/libvirt-gconfig-domain-smartcard-host-certificates.h create mode 100644 libvirt-gconfig/libvirt-gconfig-domain-smartcard-host.c create mode 100644 libvirt-gconfig/libvirt-gconfig-domain-smartcard-host.h create mode 100644 libvirt-gconfig/libvirt-gconfig-domain-smartcard-passthrough.c create mode 100644 libvirt-gconfig/libvirt-gconfig-domain-smartcard-passthrough.h create mode 100644 libvirt-gconfig/libvirt-gconfig-domain-smartcard.c create mode 100644 libvirt-gconfig/libvirt-gconfig-domain-smartcard.h diff --git a/libvirt-gconfig/Makefile.am b/libvirt-gconfig/Makefile.am index 507e733..6b3b2cb 100644 --- a/libvirt-gconfig/Makefile.am +++ b/libvirt-gconfig/Makefile.am @@ -54,6 +54,10 @@ GCONFIG_HEADER_FILES = \ libvirt-gconfig-domain-redirdev.h \ libvirt-gconfig-domain-seclabel.h \ libvirt-gconfig-domain-serial.h \ + libvirt-gconfig-domain-smartcard.h \ + libvirt-gconfig-domain-smartcard-host.h \ + libvirt-gconfig-domain-smartcard-host-certificates.h \ + libvirt-gconfig-domain-smartcard-passthrough.h \ libvirt-gconfig-domain-snapshot.h \ libvirt-gconfig-domain-sound.h \ libvirt-gconfig-domain-timer.h \ @@ -127,6 +131,10 @@ GCONFIG_SOURCE_FILES = \ libvirt-gconfig-domain-redirdev.c \ libvirt-gconfig-domain-seclabel.c \ libvirt-gconfig-domain-serial.c \ + libvirt-gconfig-domain-smartcard.c \ + libvirt-gconfig-domain-smartcard-host.c \ + libvirt-gconfig-domain-smartcard-host-certificates.c \ + libvirt-gconfig-domain-smartcard-passthrough.c \ libvirt-gconfig-domain-snapshot.c \ libvirt-gconfig-domain-sound.c \ libvirt-gconfig-domain-timer.c \ diff --git a/libvirt-gconfig/libvirt-gconfig-domain-device-private.h b/libvirt-gconfig/libvirt-gconfig-domain-device-private.h index 3ec83c3..d8ac47f 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-device-private.h +++ b/libvirt-gconfig/libvirt-gconfig-domain-device-private.h @@ -45,6 +45,9 @@ gvir_config_domain_graphics_new_from_tree(GVirConfigXmlDoc *doc, GVirConfigDomainDevice * gvir_config_domain_interface_new_from_tree(GVirConfigXmlDoc *doc, xmlNodePtr tree); +GVirConfigDomainDevice * +gvir_config_domain_smartcard_new_from_tree(GVirConfigXmlDoc *doc, + xmlNodePtr tree); G_END_DECLS diff --git a/libvirt-gconfig/libvirt-gconfig-domain-device.c b/libvirt-gconfig/libvirt-gconfig-domain-device.c index 60d6bcc..e3dbe8d 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-device.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-device.c @@ -72,7 +72,7 @@ gvir_config_domain_device_new_from_tree(GVirConfigXmlDoc *doc, } else if (xmlStrEqual(tree->name, (xmlChar*)"redirdev")) { type = GVIR_CONFIG_TYPE_DOMAIN_REDIRDEV; } else if (xmlStrEqual(tree->name, (xmlChar*)"smartcard")) { - goto unimplemented; + return gvir_config_domain_smartcard_new_from_tree(doc, tree); } else if (xmlStrEqual(tree->name, (xmlChar*)"interface")) { return gvir_config_domain_interface_new_from_tree(doc, tree); } else if (xmlStrEqual(tree->name, (xmlChar*)"input")) { diff --git a/libvirt-gconfig/libvirt-gconfig-domain-smartcard-host-certificates.c b/libvirt-gconfig/libvirt-gconfig-domain-smartcard-host-certificates.c new file mode 100644 index 0000000..c013be7 --- /dev/null +++ b/libvirt-gconfig/libvirt-gconfig-domain-smartcard-host-certificates.c @@ -0,0 +1,124 @@ +/* + * libvirt-gconfig-domain-smartcard-host-certificates.c: libvirt domain smartcard host-certificates configuration + * + * Copyright (C) 2012 Red Hat, Inc. + * + * 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: Alexander Larsson <alexl(a)redhat.com> + */ + +#include <config.h> + +#include "libvirt-gconfig/libvirt-gconfig.h" +#include "libvirt-gconfig/libvirt-gconfig-private.h" + +#define GVIR_CONFIG_DOMAIN_SMARTCARD_HOST_CERTIFICATES_GET_PRIVATE(obj) \ + (G_TYPE_INSTANCE_GET_PRIVATE((obj), GVIR_CONFIG_TYPE_DOMAIN_SMARTCARD_HOST_CERTIFICATES, GVirConfigDomainSmartcardHostCertificatesPrivate)) + +struct _GVirConfigDomainSmartcardHostCertificatesPrivate +{ + gboolean unused; +}; + +G_DEFINE_TYPE(GVirConfigDomainSmartcardHostCertificates, gvir_config_domain_smartcard_host_certificates, GVIR_CONFIG_TYPE_DOMAIN_SMARTCARD); + + +static void gvir_config_domain_smartcard_host_certificates_class_init(GVirConfigDomainSmartcardHostCertificatesClass *klass) +{ + g_type_class_add_private(klass, sizeof(GVirConfigDomainSmartcardHostCertificatesPrivate)); +} + + +static void gvir_config_domain_smartcard_host_certificates_init(GVirConfigDomainSmartcardHostCertificates *smartcard) +{ + g_debug("Init GVirConfigDomainSmartcardHostCertificates=%p", smartcard); + + smartcard->priv = GVIR_CONFIG_DOMAIN_SMARTCARD_HOST_CERTIFICATES_GET_PRIVATE(smartcard); +} + + +GVirConfigDomainSmartcardHostCertificates *gvir_config_domain_smartcard_host_certificates_new(void) +{ + GVirConfigObject *object; + + object = gvir_config_object_new(GVIR_CONFIG_TYPE_DOMAIN_SMARTCARD_HOST_CERTIFICATES, + "smartcard", NULL); + gvir_config_object_set_attribute(object, "mode", "host-certificates", NULL); + return GVIR_CONFIG_DOMAIN_SMARTCARD_HOST_CERTIFICATES(object); +} + +GVirConfigDomainSmartcardHostCertificates *gvir_config_domain_smartcard_host_certificates_new_from_xml(const gchar *xml, + GError **error) +{ + GVirConfigObject *object; + + object = gvir_config_object_new_from_xml(GVIR_CONFIG_TYPE_DOMAIN_SMARTCARD_HOST_CERTIFICATES, + "smartcard", NULL, xml, error); + if (g_strcmp0(gvir_config_object_get_attribute(object, NULL, "mode"), "host-certificates") != 0) { + g_object_unref(G_OBJECT(object)); + return NULL; + } + return GVIR_CONFIG_DOMAIN_SMARTCARD_HOST_CERTIFICATES(object); +} + +/** + * gvir_config_domain_smartcard_host_certificates_set_database: + * @path: (allow-none): + */ +void +gvir_config_domain_smartcard_host_certificates_set_database (GVirConfigDomainSmartcardHostCertificates *smartcard, + const char *path) +{ + g_return_if_fail(GVIR_CONFIG_IS_DOMAIN_SMARTCARD_HOST_CERTIFICATES(smartcard)); + + gvir_config_object_set_node_content(GVIR_CONFIG_OBJECT(smartcard), + "database", path); +} + +/** + * gvir_config_domain_smartcard_host_certificates_set_certificates: + * @cert1: (allow-none): + * @cert2: (allow-none): + * @cert3: (allow-none): + */ +void +gvir_config_domain_smartcard_host_certificates_set_certificates (GVirConfigDomainSmartcardHostCertificates *smartcard, + const char *cert1, + const char *cert2, + const char *cert3) +{ + GVirConfigObject *child; + + g_return_if_fail(GVIR_CONFIG_IS_DOMAIN_SMARTCARD_HOST_CERTIFICATES(smartcard)); + + gvir_config_object_delete_children(GVIR_CONFIG_OBJECT(smartcard), + "certificate", NULL); + + if (cert1 == NULL) + return; + + child = gvir_config_object_add_child(GVIR_CONFIG_OBJECT(smartcard), "certificate"); + gvir_config_object_set_node_content(GVIR_CONFIG_OBJECT(smartcard), NULL, cert1); + g_object_unref(G_OBJECT(child)); + + child = gvir_config_object_add_child(GVIR_CONFIG_OBJECT(smartcard), "certificate"); + gvir_config_object_set_node_content(GVIR_CONFIG_OBJECT(smartcard), NULL, cert2); + g_object_unref(G_OBJECT(child)); + + child = gvir_config_object_add_child(GVIR_CONFIG_OBJECT(smartcard), "certificate"); + gvir_config_object_set_node_content(GVIR_CONFIG_OBJECT(smartcard), NULL, cert3); + g_object_unref(G_OBJECT(child)); +} diff --git a/libvirt-gconfig/libvirt-gconfig-domain-smartcard-host-certificates.h b/libvirt-gconfig/libvirt-gconfig-domain-smartcard-host-certificates.h new file mode 100644 index 0000000..3d370e3 --- /dev/null +++ b/libvirt-gconfig/libvirt-gconfig-domain-smartcard-host-certificates.h @@ -0,0 +1,74 @@ +/* + * libvirt-gconfig-domain-smartcard-host-certificates.h: libvirt domain smartcard host-certificates configuration + * + * Copyright (C) 2012 Red Hat, Inc. + * + * 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: Alexander Larsson <alexl(a)redhat.com> + */ + +#if !defined(__LIBVIRT_GCONFIG_H__) && !defined(LIBVIRT_GCONFIG_BUILD) +#error "Only <libvirt-gconfig/libvirt-gconfig.h> can be included directly." +#endif + +#ifndef __LIBVIRT_GCONFIG_DOMAIN_SMARTCARD_HOST_CERTIFICATES_H__ +#define __LIBVIRT_GCONFIG_DOMAIN_SMARTCARD_HOST_CERTIFICATES_H__ + +G_BEGIN_DECLS + +#define GVIR_CONFIG_TYPE_DOMAIN_SMARTCARD_HOST_CERTIFICATES (gvir_config_domain_smartcard_host_certificates_get_type ()) +#define GVIR_CONFIG_DOMAIN_SMARTCARD_HOST_CERTIFICATES(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GVIR_CONFIG_TYPE_DOMAIN_SMARTCARD_HOST_CERTIFICATES, GVirConfigDomainSmartcardHostCertificates)) +#define GVIR_CONFIG_DOMAIN_SMARTCARD_HOST_CERTIFICATES_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GVIR_CONFIG_TYPE_DOMAIN_SMARTCARD_HOST_CERTIFICATES, GVirConfigDomainSmartcardHostCertificatesClass)) +#define GVIR_CONFIG_IS_DOMAIN_SMARTCARD_HOST_CERTIFICATES(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GVIR_CONFIG_TYPE_DOMAIN_SMARTCARD_HOST_CERTIFICATES)) +#define GVIR_CONFIG_IS_DOMAIN_SMARTCARD_HOST_CERTIFICATES_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GVIR_CONFIG_TYPE_DOMAIN_SMARTCARD_HOST_CERTIFICATES)) +#define GVIR_CONFIG_DOMAIN_SMARTCARD_HOST_CERTIFICATES_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GVIR_CONFIG_TYPE_DOMAIN_SMARTCARD_HOST_CERTIFICATES, GVirConfigDomainSmartcardHostCertificatesClass)) + +typedef struct _GVirConfigDomainSmartcardHostCertificates GVirConfigDomainSmartcardHostCertificates; +typedef struct _GVirConfigDomainSmartcardHostCertificatesPrivate GVirConfigDomainSmartcardHostCertificatesPrivate; +typedef struct _GVirConfigDomainSmartcardHostCertificatesClass GVirConfigDomainSmartcardHostCertificatesClass; + +struct _GVirConfigDomainSmartcardHostCertificates +{ + GVirConfigDomainSmartcard parent; + + GVirConfigDomainSmartcardHostCertificatesPrivate *priv; + + /* Do not add fields to this struct */ +}; + +struct _GVirConfigDomainSmartcardHostCertificatesClass +{ + GVirConfigDomainSmartcardClass parent_class; + + gpointer padding[20]; +}; + +GType gvir_config_domain_smartcard_host_certificates_get_type(void); + +GVirConfigDomainSmartcardHostCertificates *gvir_config_domain_smartcard_host_certificates_new(void); +GVirConfigDomainSmartcardHostCertificates *gvir_config_domain_smartcard_host_certificates_new_from_xml(const gchar *xml, + GError **error); + +void gvir_config_domain_smartcard_host_certificates_set_database (GVirConfigDomainSmartcardHostCertificates *smartcard, + const char *path); +void gvir_config_domain_smartcard_host_certificates_set_certificates (GVirConfigDomainSmartcardHostCertificates *smartcard, + const char *cert1, + const char *cert2, + const char *cert3); + +G_END_DECLS + +#endif /* __LIBVIRT_GCONFIG_DOMAIN_SMARTCARD_HOST_CERTIFICATES_H__ */ diff --git a/libvirt-gconfig/libvirt-gconfig-domain-smartcard-host.c b/libvirt-gconfig/libvirt-gconfig-domain-smartcard-host.c new file mode 100644 index 0000000..035c291 --- /dev/null +++ b/libvirt-gconfig/libvirt-gconfig-domain-smartcard-host.c @@ -0,0 +1,75 @@ +/* + * libvirt-gconfig-domain-smartcard-host.c: libvirt domain smartcard host configuration + * + * Copyright (C) 2012 Red Hat, Inc. + * + * 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: Alexander Larsson <alexl(a)redhat.com> + */ + +#include <config.h> + +#include "libvirt-gconfig/libvirt-gconfig.h" +#include "libvirt-gconfig/libvirt-gconfig-private.h" + +#define GVIR_CONFIG_DOMAIN_SMARTCARD_HOST_GET_PRIVATE(obj) \ + (G_TYPE_INSTANCE_GET_PRIVATE((obj), GVIR_CONFIG_TYPE_DOMAIN_SMARTCARD_HOST, GVirConfigDomainSmartcardHostPrivate)) + +struct _GVirConfigDomainSmartcardHostPrivate +{ + gboolean unused; +}; + +G_DEFINE_TYPE(GVirConfigDomainSmartcardHost, gvir_config_domain_smartcard_host, GVIR_CONFIG_TYPE_DOMAIN_SMARTCARD); + + +static void gvir_config_domain_smartcard_host_class_init(GVirConfigDomainSmartcardHostClass *klass) +{ + g_type_class_add_private(klass, sizeof(GVirConfigDomainSmartcardHostPrivate)); +} + + +static void gvir_config_domain_smartcard_host_init(GVirConfigDomainSmartcardHost *smartcard) +{ + g_debug("Init GVirConfigDomainSmartcardHost=%p", smartcard); + + smartcard->priv = GVIR_CONFIG_DOMAIN_SMARTCARD_HOST_GET_PRIVATE(smartcard); +} + + +GVirConfigDomainSmartcardHost *gvir_config_domain_smartcard_host_new(void) +{ + GVirConfigObject *object; + + object = gvir_config_object_new(GVIR_CONFIG_TYPE_DOMAIN_SMARTCARD_HOST, + "smartcard", NULL); + gvir_config_object_set_attribute(object, "mode", "host", NULL); + return GVIR_CONFIG_DOMAIN_SMARTCARD_HOST(object); +} + +GVirConfigDomainSmartcardHost *gvir_config_domain_smartcard_host_new_from_xml(const gchar *xml, + GError **error) +{ + GVirConfigObject *object; + + object = gvir_config_object_new_from_xml(GVIR_CONFIG_TYPE_DOMAIN_SMARTCARD_HOST, + "smartcard", NULL, xml, error); + if (g_strcmp0(gvir_config_object_get_attribute(object, NULL, "mode"), "host") != 0) { + g_object_unref(G_OBJECT(object)); + return NULL; + } + return GVIR_CONFIG_DOMAIN_SMARTCARD_HOST(object); +} diff --git a/libvirt-gconfig/libvirt-gconfig-domain-smartcard-host.h b/libvirt-gconfig/libvirt-gconfig-domain-smartcard-host.h new file mode 100644 index 0000000..f1dcba2 --- /dev/null +++ b/libvirt-gconfig/libvirt-gconfig-domain-smartcard-host.h @@ -0,0 +1,67 @@ +/* + * libvirt-gconfig-domain-smartcard-host.h: libvirt domain smartcard host configuration + * + * Copyright (C) 2012 Red Hat, Inc. + * + * 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: Alexander Larsson <alexl(a)redhat.com> + */ + +#if !defined(__LIBVIRT_GCONFIG_H__) && !defined(LIBVIRT_GCONFIG_BUILD) +#error "Only <libvirt-gconfig/libvirt-gconfig.h> can be included directly." +#endif + +#ifndef __LIBVIRT_GCONFIG_DOMAIN_SMARTCARD_HOST_H__ +#define __LIBVIRT_GCONFIG_DOMAIN_SMARTCARD_HOST_H__ + +G_BEGIN_DECLS + +#define GVIR_CONFIG_TYPE_DOMAIN_SMARTCARD_HOST (gvir_config_domain_smartcard_host_get_type ()) +#define GVIR_CONFIG_DOMAIN_SMARTCARD_HOST(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GVIR_CONFIG_TYPE_DOMAIN_SMARTCARD_HOST, GVirConfigDomainSmartcardHost)) +#define GVIR_CONFIG_DOMAIN_SMARTCARD_HOST_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GVIR_CONFIG_TYPE_DOMAIN_SMARTCARD_HOST, GVirConfigDomainSmartcardHostClass)) +#define GVIR_CONFIG_IS_DOMAIN_SMARTCARD_HOST(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GVIR_CONFIG_TYPE_DOMAIN_SMARTCARD_HOST)) +#define GVIR_CONFIG_IS_DOMAIN_SMARTCARD_HOST_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GVIR_CONFIG_TYPE_DOMAIN_SMARTCARD_HOST)) +#define GVIR_CONFIG_DOMAIN_SMARTCARD_HOST_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GVIR_CONFIG_TYPE_DOMAIN_SMARTCARD_HOST, GVirConfigDomainSmartcardHostClass)) + +typedef struct _GVirConfigDomainSmartcardHost GVirConfigDomainSmartcardHost; +typedef struct _GVirConfigDomainSmartcardHostPrivate GVirConfigDomainSmartcardHostPrivate; +typedef struct _GVirConfigDomainSmartcardHostClass GVirConfigDomainSmartcardHostClass; + +struct _GVirConfigDomainSmartcardHost +{ + GVirConfigDomainSmartcard parent; + + GVirConfigDomainSmartcardHostPrivate *priv; + + /* Do not add fields to this struct */ +}; + +struct _GVirConfigDomainSmartcardHostClass +{ + GVirConfigDomainSmartcardClass parent_class; + + gpointer padding[20]; +}; + +GType gvir_config_domain_smartcard_host_get_type(void); + +GVirConfigDomainSmartcardHost *gvir_config_domain_smartcard_host_new(void); +GVirConfigDomainSmartcardHost *gvir_config_domain_smartcard_host_new_from_xml(const gchar *xml, + GError **error); + +G_END_DECLS + +#endif /* __LIBVIRT_GCONFIG_DOMAIN_SMARTCARD_HOST_H__ */ diff --git a/libvirt-gconfig/libvirt-gconfig-domain-smartcard-passthrough.c b/libvirt-gconfig/libvirt-gconfig-domain-smartcard-passthrough.c new file mode 100644 index 0000000..10fd460 --- /dev/null +++ b/libvirt-gconfig/libvirt-gconfig-domain-smartcard-passthrough.c @@ -0,0 +1,116 @@ +/* + * libvirt-gconfig-domain-smartcard-passthrough.c: libvirt domain smartcard passthrough configuration + * + * Copyright (C) 2012 Red Hat, Inc. + * + * 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: Alexander Larsson <alexl(a)redhat.com> + */ + +#include <config.h> + +#include "libvirt-gconfig/libvirt-gconfig.h" +#include "libvirt-gconfig/libvirt-gconfig-private.h" + +#define GVIR_CONFIG_DOMAIN_SMARTCARD_PASSTHROUGH_GET_PRIVATE(obj) \ + (G_TYPE_INSTANCE_GET_PRIVATE((obj), GVIR_CONFIG_TYPE_DOMAIN_SMARTCARD_PASSTHROUGH, GVirConfigDomainSmartcardPassthroughPrivate)) + +struct _GVirConfigDomainSmartcardPassthroughPrivate +{ + gboolean unused; +}; + +G_DEFINE_TYPE(GVirConfigDomainSmartcardPassthrough, gvir_config_domain_smartcard_passthrough, GVIR_CONFIG_TYPE_DOMAIN_SMARTCARD); + + +static void gvir_config_domain_smartcard_passthrough_class_init(GVirConfigDomainSmartcardPassthroughClass *klass) +{ + g_type_class_add_private(klass, sizeof(GVirConfigDomainSmartcardPassthroughPrivate)); +} + + +static void gvir_config_domain_smartcard_passthrough_init(GVirConfigDomainSmartcardPassthrough *smartcard) +{ + g_debug("Init GVirConfigDomainSmartcardPassthrough=%p", smartcard); + + smartcard->priv = GVIR_CONFIG_DOMAIN_SMARTCARD_PASSTHROUGH_GET_PRIVATE(smartcard); +} + + +GVirConfigDomainSmartcardPassthrough *gvir_config_domain_smartcard_passthrough_new(void) +{ + GVirConfigObject *object; + + object = gvir_config_object_new(GVIR_CONFIG_TYPE_DOMAIN_SMARTCARD_PASSTHROUGH, + "smartcard", NULL); + gvir_config_object_set_attribute(object, "mode", "passthrough", NULL); + return GVIR_CONFIG_DOMAIN_SMARTCARD_PASSTHROUGH(object); +} + +GVirConfigDomainSmartcardPassthrough *gvir_config_domain_smartcard_passthrough_new_from_xml(const gchar *xml, + GError **error) +{ + GVirConfigObject *object; + + object = gvir_config_object_new_from_xml(GVIR_CONFIG_TYPE_DOMAIN_SMARTCARD_PASSTHROUGH, + "smartcard", NULL, xml, error); + if (g_strcmp0(gvir_config_object_get_attribute(object, NULL, "mode"), "passthrough") != 0) { + g_object_unref(G_OBJECT(object)); + return NULL; + } + return GVIR_CONFIG_DOMAIN_SMARTCARD_PASSTHROUGH(object); +} + + +static void prepend_prop(xmlNodePtr node, xmlAttrPtr prop) +{ + if (node->properties == NULL) { + node->properties = prop; + } else { + prop->next = node->properties; + node->properties->prev = prop; + node->properties = prop; + } +} + +void +gvir_config_domain_smartcard_passthrough_set_source(GVirConfigDomainSmartcardPassthrough *smartcard, + GVirConfigDomainChardevSource *source) +{ + xmlNodePtr smartcard_node; + xmlNodePtr source_node; + xmlNodePtr child; + xmlAttrPtr attr; + + g_return_if_fail(GVIR_CONFIG_IS_DOMAIN_SMARTCARD_PASSTHROUGH(smartcard)); + g_return_if_fail(GVIR_CONFIG_IS_DOMAIN_CHARDEV_SOURCE(source)); + + smartcard_node = gvir_config_object_get_xml_node(GVIR_CONFIG_OBJECT(smartcard)); + source_node = gvir_config_object_get_xml_node(GVIR_CONFIG_OBJECT(source)); + + g_return_if_fail((smartcard_node != NULL) && (source_node != NULL)); + + for (child = source_node->children; child != NULL; child = child->next) { + xmlUnlinkNode(child); + xmlAddChild(smartcard_node, child); + } + + for (attr = source_node->properties; attr != NULL; attr = attr->next) { + xmlAttrPtr new_attr; + new_attr = xmlCopyProp(smartcard_node, attr); + prepend_prop(smartcard_node, new_attr); + } +} diff --git a/libvirt-gconfig/libvirt-gconfig-domain-smartcard-passthrough.h b/libvirt-gconfig/libvirt-gconfig-domain-smartcard-passthrough.h new file mode 100644 index 0000000..c2bd50c --- /dev/null +++ b/libvirt-gconfig/libvirt-gconfig-domain-smartcard-passthrough.h @@ -0,0 +1,70 @@ +/* + * libvirt-gconfig-domain-smartcard-passthrough.h: libvirt domain smartcard passthrough configuration + * + * Copyright (C) 2012 Red Hat, Inc. + * + * 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: Alexander Larsson <alexl(a)redhat.com> + */ + +#if !defined(__LIBVIRT_GCONFIG_H__) && !defined(LIBVIRT_GCONFIG_BUILD) +#error "Only <libvirt-gconfig/libvirt-gconfig.h> can be included directly." +#endif + +#ifndef __LIBVIRT_GCONFIG_DOMAIN_SMARTCARD_PASSTHROUGH_H__ +#define __LIBVIRT_GCONFIG_DOMAIN_SMARTCARD_PASSTHROUGH_H__ + +G_BEGIN_DECLS + +#define GVIR_CONFIG_TYPE_DOMAIN_SMARTCARD_PASSTHROUGH (gvir_config_domain_smartcard_passthrough_get_type ()) +#define GVIR_CONFIG_DOMAIN_SMARTCARD_PASSTHROUGH(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GVIR_CONFIG_TYPE_DOMAIN_SMARTCARD_PASSTHROUGH, GVirConfigDomainSmartcardPassthrough)) +#define GVIR_CONFIG_DOMAIN_SMARTCARD_PASSTHROUGH_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GVIR_CONFIG_TYPE_DOMAIN_SMARTCARD_PASSTHROUGH, GVirConfigDomainSmartcardPassthroughClass)) +#define GVIR_CONFIG_IS_DOMAIN_SMARTCARD_PASSTHROUGH(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GVIR_CONFIG_TYPE_DOMAIN_SMARTCARD_PASSTHROUGH)) +#define GVIR_CONFIG_IS_DOMAIN_SMARTCARD_PASSTHROUGH_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GVIR_CONFIG_TYPE_DOMAIN_SMARTCARD_PASSTHROUGH)) +#define GVIR_CONFIG_DOMAIN_SMARTCARD_PASSTHROUGH_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GVIR_CONFIG_TYPE_DOMAIN_SMARTCARD_PASSTHROUGH, GVirConfigDomainSmartcardPassthroughClass)) + +typedef struct _GVirConfigDomainSmartcardPassthrough GVirConfigDomainSmartcardPassthrough; +typedef struct _GVirConfigDomainSmartcardPassthroughPrivate GVirConfigDomainSmartcardPassthroughPrivate; +typedef struct _GVirConfigDomainSmartcardPassthroughClass GVirConfigDomainSmartcardPassthroughClass; + +struct _GVirConfigDomainSmartcardPassthrough +{ + GVirConfigDomainSmartcard parent; + + GVirConfigDomainSmartcardPassthroughPrivate *priv; + + /* Do not add fields to this struct */ +}; + +struct _GVirConfigDomainSmartcardPassthroughClass +{ + GVirConfigDomainSmartcardClass parent_class; + + gpointer padding[20]; +}; + +GType gvir_config_domain_smartcard_passthrough_get_type(void); + +GVirConfigDomainSmartcardPassthrough *gvir_config_domain_smartcard_passthrough_new(void); +GVirConfigDomainSmartcardPassthrough *gvir_config_domain_smartcard_passthrough_new_from_xml(const gchar *xml, + GError **error); +void gvir_config_domain_smartcard_passthrough_set_source(GVirConfigDomainSmartcardPassthrough *smartcard, + GVirConfigDomainChardevSource *source); + + +G_END_DECLS + +#endif /* __LIBVIRT_GCONFIG_DOMAIN_SMARTCARD_PASSTHROUGH_H__ */ diff --git a/libvirt-gconfig/libvirt-gconfig-domain-smartcard.c b/libvirt-gconfig/libvirt-gconfig-domain-smartcard.c new file mode 100644 index 0000000..73ea867 --- /dev/null +++ b/libvirt-gconfig/libvirt-gconfig-domain-smartcard.c @@ -0,0 +1,90 @@ +/* + * libvirt-gconfig-domain-smartcard.c: libvirt domain smartcard configuration + * + * Copyright (C) 2012 Red Hat, Inc. + * + * 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: Alexander Larsson <alexl(a)redhat.com> + */ + +#include <config.h> + +#include "libvirt-gconfig/libvirt-gconfig.h" +#include "libvirt-gconfig/libvirt-gconfig-private.h" + +#define GVIR_CONFIG_DOMAIN_SMARTCARD_GET_PRIVATE(obj) \ + (G_TYPE_INSTANCE_GET_PRIVATE((obj), GVIR_CONFIG_TYPE_DOMAIN_SMARTCARD, GVirConfigDomainSmartcardPrivate)) + +struct _GVirConfigDomainSmartcardPrivate +{ + gboolean unused; +}; + +G_DEFINE_ABSTRACT_TYPE(GVirConfigDomainSmartcard, gvir_config_domain_smartcard, GVIR_CONFIG_TYPE_DOMAIN_DEVICE); + + +static void gvir_config_domain_smartcard_class_init(GVirConfigDomainSmartcardClass *klass) +{ + g_type_class_add_private(klass, sizeof(GVirConfigDomainSmartcardPrivate)); +} + + +static void gvir_config_domain_smartcard_init(GVirConfigDomainSmartcard *smartcard) +{ + g_debug("Init GVirConfigDomainSmartcard=%p", smartcard); + + smartcard->priv = GVIR_CONFIG_DOMAIN_SMARTCARD_GET_PRIVATE(smartcard); +} + +/** + * gvir_config_domain_smartcard_set_address: + * @address: (allow-none): + */ +void gvir_config_domain_smartcard_set_address(GVirConfigDomainRedirdev *redirdev, + GVirConfigDomainAddress *address) +{ + g_return_if_fail(GVIR_CONFIG_IS_DOMAIN_REDIRDEV(redirdev)); + g_return_if_fail(address == NULL || GVIR_CONFIG_IS_DOMAIN_ADDRESS(address)); + + gvir_config_object_attach_replace(GVIR_CONFIG_OBJECT(redirdev), + "address", + GVIR_CONFIG_OBJECT(address)); +} + +G_GNUC_INTERNAL GVirConfigDomainDevice * +gvir_config_domain_smartcard_new_from_tree(GVirConfigXmlDoc *doc, + xmlNodePtr tree) +{ + const char *mode; + GType gtype; + + mode = gvir_config_xml_get_attribute_content(tree, "mode"); + if (mode == NULL) + return NULL; + + if (g_str_equal(mode, "host")) { + gtype = GVIR_CONFIG_TYPE_DOMAIN_SMARTCARD_HOST; + } else if (g_str_equal(mode, "host-certificates")) { + gtype = GVIR_CONFIG_TYPE_DOMAIN_SMARTCARD_HOST_CERTIFICATES; + } else if (g_str_equal(mode, "passthrough")) { + gtype = GVIR_CONFIG_TYPE_DOMAIN_SMARTCARD_PASSTHROUGH; + } else { + g_debug("Unknown domain smartcard node: %s", mode); + return NULL; + } + + return GVIR_CONFIG_DOMAIN_DEVICE(gvir_config_object_new_from_tree(gtype, doc, NULL, tree)); +} diff --git a/libvirt-gconfig/libvirt-gconfig-domain-smartcard.h b/libvirt-gconfig/libvirt-gconfig-domain-smartcard.h new file mode 100644 index 0000000..5136b02 --- /dev/null +++ b/libvirt-gconfig/libvirt-gconfig-domain-smartcard.h @@ -0,0 +1,67 @@ +/* + * libvirt-gconfig-domain-smartcard.h: libvirt domain smartcard configuration + * + * Copyright (C) 2012 Red Hat, Inc. + * + * 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: Alexander Larsson <alexl(a)redhat.com> + */ + +#if !defined(__LIBVIRT_GCONFIG_H__) && !defined(LIBVIRT_GCONFIG_BUILD) +#error "Only <libvirt-gconfig/libvirt-gconfig.h> can be included directly." +#endif + +#ifndef __LIBVIRT_GCONFIG_DOMAIN_SMARTCARD_H__ +#define __LIBVIRT_GCONFIG_DOMAIN_SMARTCARD_H__ + +G_BEGIN_DECLS + +#define GVIR_CONFIG_TYPE_DOMAIN_SMARTCARD (gvir_config_domain_smartcard_get_type ()) +#define GVIR_CONFIG_DOMAIN_SMARTCARD(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GVIR_CONFIG_TYPE_DOMAIN_SMARTCARD, GVirConfigDomainSmartcard)) +#define GVIR_CONFIG_DOMAIN_SMARTCARD_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GVIR_CONFIG_TYPE_DOMAIN_SMARTCARD, GVirConfigDomainSmartcardClass)) +#define GVIR_CONFIG_IS_DOMAIN_SMARTCARD(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GVIR_CONFIG_TYPE_DOMAIN_SMARTCARD)) +#define GVIR_CONFIG_IS_DOMAIN_SMARTCARD_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GVIR_CONFIG_TYPE_DOMAIN_SMARTCARD)) +#define GVIR_CONFIG_DOMAIN_SMARTCARD_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GVIR_CONFIG_TYPE_DOMAIN_SMARTCARD, GVirConfigDomainSmartcardClass)) + +typedef struct _GVirConfigDomainSmartcard GVirConfigDomainSmartcard; +typedef struct _GVirConfigDomainSmartcardPrivate GVirConfigDomainSmartcardPrivate; +typedef struct _GVirConfigDomainSmartcardClass GVirConfigDomainSmartcardClass; + +struct _GVirConfigDomainSmartcard +{ + GVirConfigDomainDevice parent; + + GVirConfigDomainSmartcardPrivate *priv; + + /* Do not add fields to this struct */ +}; + +struct _GVirConfigDomainSmartcardClass +{ + GVirConfigDomainDeviceClass parent_class; + + gpointer padding[20]; +}; + + +GType gvir_config_domain_smartcard_get_type(void); + +void gvir_config_domain_smartcard_set_address(GVirConfigDomainRedirdev *redirdev, + GVirConfigDomainAddress *address); + +G_END_DECLS + +#endif /* __LIBVIRT_GCONFIG_DOMAIN_SMARTCARD_H__ */ diff --git a/libvirt-gconfig/libvirt-gconfig.h b/libvirt-gconfig/libvirt-gconfig.h index 0428259..9feaba2 100644 --- a/libvirt-gconfig/libvirt-gconfig.h +++ b/libvirt-gconfig/libvirt-gconfig.h @@ -71,6 +71,10 @@ #include <libvirt-gconfig/libvirt-gconfig-domain-redirdev.h> #include <libvirt-gconfig/libvirt-gconfig-domain-seclabel.h> #include <libvirt-gconfig/libvirt-gconfig-domain-serial.h> +#include <libvirt-gconfig/libvirt-gconfig-domain-smartcard.h> +#include <libvirt-gconfig/libvirt-gconfig-domain-smartcard-host.h> +#include <libvirt-gconfig/libvirt-gconfig-domain-smartcard-host-certificates.h> +#include <libvirt-gconfig/libvirt-gconfig-domain-smartcard-passthrough.h> #include <libvirt-gconfig/libvirt-gconfig-domain-snapshot.h> #include <libvirt-gconfig/libvirt-gconfig-domain-sound.h> #include <libvirt-gconfig/libvirt-gconfig-domain-timer.h> diff --git a/libvirt-gconfig/libvirt-gconfig.sym b/libvirt-gconfig/libvirt-gconfig.sym index 622e0f2..d9cff90 100644 --- a/libvirt-gconfig/libvirt-gconfig.sym +++ b/libvirt-gconfig/libvirt-gconfig.sym @@ -483,4 +483,25 @@ LIBVIRT_GCONFIG_0.1.4 { gvir_config_domain_set_power_management; } LIBVIRT_GCONFIG_0.1.3; +LIBVIRT_GCONFIG_0.1.5 { + global: + gvir_config_domain_smartcard_get_type; + gvir_config_domain_smartcard_set_address; + + gvir_config_domain_smartcard_host_get_type; + gvir_config_domain_smartcard_host_new; + gvir_config_domain_smartcard_host_new_from_xml; + + gvir_config_domain_smartcard_host_certificates_get_type; + gvir_config_domain_smartcard_host_certificates_new; + gvir_config_domain_smartcard_host_certificates_new_from_xml; + gvir_config_domain_smartcard_host_certificates_set_database; + gvir_config_domain_smartcard_host_certificates_set_certificates; + + gvir_config_domain_smartcard_passthrough_get_type; + gvir_config_domain_smartcard_passthrough_new; + gvir_config_domain_smartcard_passthrough_new_from_xml; + gvir_config_domain_smartcard_passthrough_set_source; +} LIBVIRT_GCONFIG_0.1.4; + # .... define new API here using predicted next version number .... -- 1.8.0.1

2 2