- Devel - libvirt List Archives

[libvirt] [PATCH v2] tests: redo test argv file line wrapping
by Daniel P. Berrange 07 Nov '15

07 Nov '15

Back in commit bd6c46fa0cfe275c24debc1152cfc5206c04b59b Author: Juerg Haefliger <juerg.haefliger(a)hp.com> Date: Mon Jan 31 06:42:57 2011 -0500 tests: handle backspace-newline pairs in test input files all the test argv files were line wrapped so that the args were less than 80 characters. The way the line wrapping was done turns out to be quite undesirable, because it often leaves multiple parameters on the same line. If we later need to add or remove individual parameters, then it leaves us having to redo line wrapping. This commit changes the line wrapping so that every single "-param value" is one its own new line. If the "value" is still too long, then we break on ',' or ':' or ' ' as needed. This means that when we come to add / remove parameters from the test files line, the patch diffs will only ever show a single line added/removed which will greatly simplify review work. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- cfg.mk | 16 ++- .../bhyvexml2argvdata/bhyvexml2argv-acpiapic.args | 10 +- .../networkxml2firewalldata/nat-default-linux.args | 137 ++++++++++++++++----- .../qemuxml2argv-aarch64-aavmf-virtio-mmio.args | 33 +++-- tests/test-wrap-argv.pl | 106 ++++++++++++++++ 5 files changed, 262 insertions(+), 40 deletions(-) create mode 100644 tests/test-wrap-argv.pl Changed in v2: - Added hook in syntax-check to run test-wrap-argv to validate files diff --git a/cfg.mk b/cfg.mk index a9bba38..db513be 100644 --- a/cfg.mk +++ b/cfg.mk @@ -1068,7 +1068,7 @@ _autogen: # regenerate HACKING as part of the syntax-check ifneq ($(_gl-Makefile),) -syntax-check: $(top_srcdir)/HACKING bracket-spacing-check +syntax-check: $(top_srcdir)/HACKING bracket-spacing-check test-wrap-argv endif bracket-spacing-check: @@ -1077,6 +1077,20 @@ bracket-spacing-check: { echo '$(ME): incorrect formatting, see HACKING for rules' 1>&2; \ exit 1; } +test-wrap-argv: + $(AM_V_GEN)files=`$(VC_LIST) | grep -E '\.(ldargs|args)'`; \ + for file in $$files ; \ + do \ + $(PERL) $(top_srcdir)/tests/test-wrap-argv.pl $$file > $${file}-t ; \ + diff $$file $${file}-t; \ + res=$$? ; \ + rm $${file}-t ; \ + test $$res == 0 || { \ + echo "$(ME): Incorrect line wrapping in $$file." 1>&2; \ + echo "$(ME): Use test-wrap-argv.pl to wrap test data files" 1>&2; \ + exit 1; } \ + done + # sc_po_check can fail if generated files are not built first sc_po_check: \ $(srcdir)/daemon/remote_dispatch.h \ diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-acpiapic.args b/tests/bhyvexml2argvdata/bhyvexml2argv-acpiapic.args index 6b26964..e1afefd 100644 --- a/tests/bhyvexml2argvdata/bhyvexml2argv-acpiapic.args +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-acpiapic.args @@ -1,3 +1,11 @@ -/usr/sbin/bhyve -c 1 -m 214 -A -I -u -H -P -s 0:0,hostbridge \ +/usr/sbin/bhyve \ +-c 1 \ +-m 214 \ +-A \ +-I \ +-u \ +-H \ +-P \ +-s 0:0,hostbridge \ -s 3:0,virtio-net,faketapdev,mac=52:54:00:00:00:00 \ -s 2:0,ahci-hd,/tmp/freebsd.img bhyve diff --git a/tests/networkxml2firewalldata/nat-default-linux.args b/tests/networkxml2firewalldata/nat-default-linux.args index b92a845..ffdafdf 100644 --- a/tests/networkxml2firewalldata/nat-default-linux.args +++ b/tests/networkxml2firewalldata/nat-default-linux.args @@ -1,30 +1,107 @@ -iptables --table filter --insert INPUT --in-interface virbr0 --protocol tcp \ ---destination-port 67 --jump ACCEPT -iptables --table filter --insert INPUT --in-interface virbr0 --protocol udp \ ---destination-port 67 --jump ACCEPT -iptables --table filter --insert OUTPUT --out-interface virbr0 --protocol udp \ ---destination-port 68 --jump ACCEPT -iptables --table filter --insert INPUT --in-interface virbr0 --protocol tcp \ ---destination-port 53 --jump ACCEPT -iptables --table filter --insert INPUT --in-interface virbr0 --protocol udp \ ---destination-port 53 --jump ACCEPT -iptables --table filter --insert FORWARD --in-interface virbr0 --jump REJECT -iptables --table filter --insert FORWARD --out-interface virbr0 --jump REJECT -iptables --table filter --insert FORWARD --in-interface virbr0 \ ---out-interface virbr0 --jump ACCEPT -iptables --table filter --insert FORWARD --source 192.168.122.0/24 \ ---in-interface virbr0 --jump ACCEPT -iptables --table filter --insert FORWARD --destination 192.168.122.0/24 \ ---out-interface virbr0 --match conntrack --ctstate ESTABLISHED,RELATED --jump ACCEPT -iptables --table nat --insert POSTROUTING --source 192.168.122.0/24 '!' \ ---destination 192.168.122.0/24 --jump MASQUERADE -iptables --table nat --insert POSTROUTING --source 192.168.122.0/24 \ --p udp '!' --destination 192.168.122.0/24 --jump MASQUERADE --to-ports 1024-65535 -iptables --table nat --insert POSTROUTING --source 192.168.122.0/24 \ --p tcp '!' --destination 192.168.122.0/24 --jump MASQUERADE --to-ports 1024-65535 -iptables --table nat --insert POSTROUTING --source 192.168.122.0/24 \ ---destination 255.255.255.255/32 --jump RETURN -iptables --table nat --insert POSTROUTING --source 192.168.122.0/24 \ ---destination 224.0.0.0/24 --jump RETURN -iptables --table mangle --insert POSTROUTING --out-interface virbr0 \ ---protocol udp --destination-port 68 --jump CHECKSUM --checksum-fill +iptables \ +--table filter \ +--insert INPUT \ +--in-interface virbr0 \ +--protocol tcp \ +--destination-port 67 \ +--jump ACCEPT +iptables \ +--table filter \ +--insert INPUT \ +--in-interface virbr0 \ +--protocol udp \ +--destination-port 67 \ +--jump ACCEPT +iptables \ +--table filter \ +--insert OUTPUT \ +--out-interface virbr0 \ +--protocol udp \ +--destination-port 68 \ +--jump ACCEPT +iptables \ +--table filter \ +--insert INPUT \ +--in-interface virbr0 \ +--protocol tcp \ +--destination-port 53 \ +--jump ACCEPT +iptables \ +--table filter \ +--insert INPUT \ +--in-interface virbr0 \ +--protocol udp \ +--destination-port 53 \ +--jump ACCEPT +iptables \ +--table filter \ +--insert FORWARD \ +--in-interface virbr0 \ +--jump REJECT +iptables \ +--table filter \ +--insert FORWARD \ +--out-interface virbr0 \ +--jump REJECT +iptables \ +--table filter \ +--insert FORWARD \ +--in-interface virbr0 \ +--out-interface virbr0 \ +--jump ACCEPT +iptables \ +--table filter \ +--insert FORWARD \ +--source 192.168.122.0/24 \ +--in-interface virbr0 \ +--jump ACCEPT +iptables \ +--table filter \ +--insert FORWARD \ +--destination 192.168.122.0/24 \ +--out-interface virbr0 \ +--match conntrack \ +--ctstate ESTABLISHED,RELATED \ +--jump ACCEPT +iptables \ +--table nat \ +--insert POSTROUTING \ +--source 192.168.122.0/24 '!' \ +--destination 192.168.122.0/24 \ +--jump MASQUERADE +iptables \ +--table nat \ +--insert POSTROUTING \ +--source 192.168.122.0/24 \ +-p udp '!' \ +--destination 192.168.122.0/24 \ +--jump MASQUERADE \ +--to-ports 1024-65535 +iptables \ +--table nat \ +--insert POSTROUTING \ +--source 192.168.122.0/24 \ +-p tcp '!' \ +--destination 192.168.122.0/24 \ +--jump MASQUERADE \ +--to-ports 1024-65535 +iptables \ +--table nat \ +--insert POSTROUTING \ +--source 192.168.122.0/24 \ +--destination 255.255.255.255/32 \ +--jump RETURN +iptables \ +--table nat \ +--insert POSTROUTING \ +--source 192.168.122.0/24 \ +--destination 224.0.0.0/24 \ +--jump RETURN +iptables \ +--table mangle \ +--insert POSTROUTING \ +--out-interface virbr0 \ +--protocol udp \ +--destination-port 68 \ +--jump CHECKSUM \ +--checksum-fill diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-aavmf-virtio-mmio.args b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-aavmf-virtio-mmio.args index d6d8aed..4cc4cd2 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-aavmf-virtio-mmio.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-aavmf-virtio-mmio.args @@ -1,14 +1,31 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-aarch64 -S -M virt -cpu cortex-a53 \ --m 1024 -smp 1 -nographic \ --nodefconfig -nodefaults -monitor unix:/tmp/test-monitor,server,nowait \ --boot c -kernel /aarch64.kernel -initrd /aarch64.initrd -append \ -'earlyprintk console=ttyAMA0,115200n8 rw root=/dev/vda rootwait' \ --dtb /aarch64.dtb -device virtio-serial-device,id=virtio-serial0 -usb \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu-system-aarch64 \ +-S \ +-M virt \ +-cpu cortex-a53 \ +-m 1024 \ +-smp 1 \ +-nographic \ +-nodefconfig \ +-nodefaults \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-boot c \ +-kernel /aarch64.kernel \ +-initrd /aarch64.initrd \ +-append 'earlyprintk console=ttyAMA0,115200n8 rw root=/dev/vda rootwait' \ +-dtb /aarch64.dtb \ +-device virtio-serial-device,id=virtio-serial0 \ +-usb \ -drive file=/aarch64.raw,if=none,id=drive-virtio-disk0 \ -device virtio-blk-device,drive=drive-virtio-disk0,id=virtio-disk0 \ -device virtio-net-device,vlan=0,id=net0,mac=52:54:00:09:a4:37 \ --net user,vlan=0,name=hostnet0 -chardev pty,id=charconsole0 \ +-net user,vlan=0,name=hostnet0 \ +-chardev pty,id=charconsole0 \ -device virtconsole,chardev=charconsole0,id=console0 \ -device virtio-balloon-device,id=balloon0 \ -object rng-random,id=objrng0,filename=/dev/random \ diff --git a/tests/test-wrap-argv.pl b/tests/test-wrap-argv.pl new file mode 100644 index 0000000..dc70271 --- /dev/null +++ b/tests/test-wrap-argv.pl @@ -0,0 +1,106 @@ +#!/usr/bin/perl + + + +foreach my $file (@ARGV) { + &rewrap($file); +} + +sub rewrap { + my $file = shift; + + # Read the original file + open FILE, "<", $file or die "cannot read $file: $!"; + my @lines; + while (<FILE>) { + # If there is a trailing '\' then kill the new line + if (/\\$/) { + chomp; + $_ =~ s/\\$//; + } + + push @lines, $_; + } + + # Skip empty files + return unless @lines; + + # Kill the last new line in the file + chomp @lines[$#lines]; + close FILE; + + # Reconstruct the master data by joining all lines + # and then split again based on the real desired + # newlines + @lines = split /\n/, join('', @lines); + + # Now each @lines represents a single command, we + # can process them + foreach my $line (@lines) { + my @bits = split / /, join('', $line); + + # @bits contains env vars, then the command line + # and then the arguments + my @env; + my $cmd; + my @args; + + if ($bits[0] !~ /=/) { + $cmd = shift @bits; + } + + foreach my $bit (@bits) { + # If no command is defined yet, we must still + # have env vars + if (!defined $cmd) { + # Look for leading / to indicate command name + if ($bit =~ m,^/,) { + $cmd = $bit; + } else { + push @env, $bit; + } + } else { + # If there's a leading '-' then this is a new + # parameter, otherwise its a value for the prev + # parameter. + if ($bit =~ m,^-,) { + push @args, $bit; + } else { + $args[$#args] .= " " . $bit; + } + } + } + + # Print env + command first + print join(" \\\n", @env, $cmd), " \\\n"; + # We might have to split line argument values... + for (my $i = 0; $i <= $#args; $i++) { + my $arg = $args[$i]; + while (length($arg) > 80) { + my $split = rindex $arg, ",", 80; + if ($split == -1) { + $split = rindex $arg, ":", 80; + } + if ($split == -1) { + $split = rindex $arg, " ", 80; + } + if ($split == -1) { + warn "$file: cannot find nice place to split '$arg' below 80 chars\n"; + $split = 79; + } + $split++; + + my $head = substr $arg, 0, $split; + $arg = substr $arg, $split; + + print $head, "\\\n"; + } + print $arg; + if ($i != $#args) { + print " \\\n"; + } else { + print "\n"; + } + } + } +} -- 2.5.0

2 1

[libvirt] [PATCH 0/5] Revert virNetDevSendEthtoolIoctl logging errors and adjust code after
by John Ferlan 07 Nov '15

07 Nov '15

It's partially a reposting, partially some new stuff, and perhaps a v2 of something else. Patch 1 is Dan's revert patch - just because it's easier to have it done first. Patches 2 & 3 just adjust comments - no functional changes Patch 4 adds a check for root in virNetDevGetFeatures (rather than both of the callers). If not root, an empty bitmap would be returned (somewhat similar to what a platform without the features does). I'm not against moving the check to before the virBitmapNew; however, I was considering the case of xml parsing which does a virBitmapFree, then just calls virNetDevGetFeatures. Not filling in the *out with either NULL or an empty bitmap would result in that caller referencing a net.features which no longer exists. If the check should be done before the virBitmapNew, then an "*out = NULL" would need to be added before returning 0 just to be 'safe'... As an aside, it just felt better to add one check rather than two. Patch 5 restore the virNetDevSetupControl from the reverted patch back into virNetDevSendEthtoolIoctl. Since we cannot be called unless we're privileged and the ioctl shouldn't fail any with EPERM, that was also removed from the list of filtered failure errno values. Daniel P. Berrange (1): Revert "utils: Remove the logging of errors from virNetDevSendEthtoolIoctl" John Ferlan (4): virnetdev: Document reasons for ignoring some SIOCETHTOOL errno values virnetdev: Fix function comments for virNetDevGetFeatures virnetdev: Check for root in virNetDevGetFeatures virnetdev: Use virNetDevSetupControl in virNetDevSendEthtoolIoctl src/util/virnetdev.c | 52 ++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 38 insertions(+), 14 deletions(-) -- 2.1.0

2 6

[libvirt] [PATCH] tests: redo test argv file line wrapping
by Daniel P. Berrange 07 Nov '15

07 Nov '15

Back in commit bd6c46fa0cfe275c24debc1152cfc5206c04b59b Author: Juerg Haefliger <juerg.haefliger(a)hp.com> Date: Mon Jan 31 06:42:57 2011 -0500 tests: handle backspace-newline pairs in test input files all the test argv files were line wrapped so that the args were less than 80 characters. The way the line wrapping was done turns out to be quite undesirable, because it often leaves multiple parameters on the same line. If we later need to add or remove individual parameters, then it leaves us having to redo line wrapping. This commit changes the line wrapping so that every single "-param value" is one its own new line. If the "value" is still too long, then we break on ',' or ':' or ' ' as needed. This means that when we come to add / remove parameters from the test files line, the patch diffs will only ever show a single line added/removed which will greatly simplify review work. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- .../bhyvexml2argvdata/bhyvexml2argv-acpiapic.args | 10 +- .../networkxml2firewalldata/nat-default-linux.args | 137 ++++++++++++++++----- .../qemuxml2argv-aarch64-aavmf-virtio-mmio.args | 33 +++-- tests/test-wrap-argv.pl | 106 ++++++++++++++++ 4 files changed, 247 insertions(+), 39 deletions(-) create mode 100644 tests/test-wrap-argv.pl To avoid sending a 10 MB email, I'v only include these 3 example file changes. To view *all* the changes see my staging branch https://gitlab.com/berrange/libvirt/commit/4fe45c39dae176ae4dbc7e126d2a2ff2… 'make check' and 'make syntax-check' of course still pass after applying the big change. diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-acpiapic.args b/tests/bhyvexml2argvdata/bhyvexml2argv-acpiapic.args index 6b26964..e1afefd 100644 --- a/tests/bhyvexml2argvdata/bhyvexml2argv-acpiapic.args +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-acpiapic.args @@ -1,3 +1,11 @@ -/usr/sbin/bhyve -c 1 -m 214 -A -I -u -H -P -s 0:0,hostbridge \ +/usr/sbin/bhyve \ +-c 1 \ +-m 214 \ +-A \ +-I \ +-u \ +-H \ +-P \ +-s 0:0,hostbridge \ -s 3:0,virtio-net,faketapdev,mac=52:54:00:00:00:00 \ -s 2:0,ahci-hd,/tmp/freebsd.img bhyve diff --git a/tests/networkxml2firewalldata/nat-default-linux.args b/tests/networkxml2firewalldata/nat-default-linux.args index b92a845..ffdafdf 100644 --- a/tests/networkxml2firewalldata/nat-default-linux.args +++ b/tests/networkxml2firewalldata/nat-default-linux.args @@ -1,30 +1,107 @@ -iptables --table filter --insert INPUT --in-interface virbr0 --protocol tcp \ ---destination-port 67 --jump ACCEPT -iptables --table filter --insert INPUT --in-interface virbr0 --protocol udp \ ---destination-port 67 --jump ACCEPT -iptables --table filter --insert OUTPUT --out-interface virbr0 --protocol udp \ ---destination-port 68 --jump ACCEPT -iptables --table filter --insert INPUT --in-interface virbr0 --protocol tcp \ ---destination-port 53 --jump ACCEPT -iptables --table filter --insert INPUT --in-interface virbr0 --protocol udp \ ---destination-port 53 --jump ACCEPT -iptables --table filter --insert FORWARD --in-interface virbr0 --jump REJECT -iptables --table filter --insert FORWARD --out-interface virbr0 --jump REJECT -iptables --table filter --insert FORWARD --in-interface virbr0 \ ---out-interface virbr0 --jump ACCEPT -iptables --table filter --insert FORWARD --source 192.168.122.0/24 \ ---in-interface virbr0 --jump ACCEPT -iptables --table filter --insert FORWARD --destination 192.168.122.0/24 \ ---out-interface virbr0 --match conntrack --ctstate ESTABLISHED,RELATED --jump ACCEPT -iptables --table nat --insert POSTROUTING --source 192.168.122.0/24 '!' \ ---destination 192.168.122.0/24 --jump MASQUERADE -iptables --table nat --insert POSTROUTING --source 192.168.122.0/24 \ --p udp '!' --destination 192.168.122.0/24 --jump MASQUERADE --to-ports 1024-65535 -iptables --table nat --insert POSTROUTING --source 192.168.122.0/24 \ --p tcp '!' --destination 192.168.122.0/24 --jump MASQUERADE --to-ports 1024-65535 -iptables --table nat --insert POSTROUTING --source 192.168.122.0/24 \ ---destination 255.255.255.255/32 --jump RETURN -iptables --table nat --insert POSTROUTING --source 192.168.122.0/24 \ ---destination 224.0.0.0/24 --jump RETURN -iptables --table mangle --insert POSTROUTING --out-interface virbr0 \ ---protocol udp --destination-port 68 --jump CHECKSUM --checksum-fill +iptables \ +--table filter \ +--insert INPUT \ +--in-interface virbr0 \ +--protocol tcp \ +--destination-port 67 \ +--jump ACCEPT +iptables \ +--table filter \ +--insert INPUT \ +--in-interface virbr0 \ +--protocol udp \ +--destination-port 67 \ +--jump ACCEPT +iptables \ +--table filter \ +--insert OUTPUT \ +--out-interface virbr0 \ +--protocol udp \ +--destination-port 68 \ +--jump ACCEPT +iptables \ +--table filter \ +--insert INPUT \ +--in-interface virbr0 \ +--protocol tcp \ +--destination-port 53 \ +--jump ACCEPT +iptables \ +--table filter \ +--insert INPUT \ +--in-interface virbr0 \ +--protocol udp \ +--destination-port 53 \ +--jump ACCEPT +iptables \ +--table filter \ +--insert FORWARD \ +--in-interface virbr0 \ +--jump REJECT +iptables \ +--table filter \ +--insert FORWARD \ +--out-interface virbr0 \ +--jump REJECT +iptables \ +--table filter \ +--insert FORWARD \ +--in-interface virbr0 \ +--out-interface virbr0 \ +--jump ACCEPT +iptables \ +--table filter \ +--insert FORWARD \ +--source 192.168.122.0/24 \ +--in-interface virbr0 \ +--jump ACCEPT +iptables \ +--table filter \ +--insert FORWARD \ +--destination 192.168.122.0/24 \ +--out-interface virbr0 \ +--match conntrack \ +--ctstate ESTABLISHED,RELATED \ +--jump ACCEPT +iptables \ +--table nat \ +--insert POSTROUTING \ +--source 192.168.122.0/24 '!' \ +--destination 192.168.122.0/24 \ +--jump MASQUERADE +iptables \ +--table nat \ +--insert POSTROUTING \ +--source 192.168.122.0/24 \ +-p udp '!' \ +--destination 192.168.122.0/24 \ +--jump MASQUERADE \ +--to-ports 1024-65535 +iptables \ +--table nat \ +--insert POSTROUTING \ +--source 192.168.122.0/24 \ +-p tcp '!' \ +--destination 192.168.122.0/24 \ +--jump MASQUERADE \ +--to-ports 1024-65535 +iptables \ +--table nat \ +--insert POSTROUTING \ +--source 192.168.122.0/24 \ +--destination 255.255.255.255/32 \ +--jump RETURN +iptables \ +--table nat \ +--insert POSTROUTING \ +--source 192.168.122.0/24 \ +--destination 224.0.0.0/24 \ +--jump RETURN +iptables \ +--table mangle \ +--insert POSTROUTING \ +--out-interface virbr0 \ +--protocol udp \ +--destination-port 68 \ +--jump CHECKSUM \ +--checksum-fill diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-aavmf-virtio-mmio.args b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-aavmf-virtio-mmio.args index d6d8aed..4cc4cd2 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-aavmf-virtio-mmio.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-aavmf-virtio-mmio.args @@ -1,14 +1,31 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-aarch64 -S -M virt -cpu cortex-a53 \ --m 1024 -smp 1 -nographic \ --nodefconfig -nodefaults -monitor unix:/tmp/test-monitor,server,nowait \ --boot c -kernel /aarch64.kernel -initrd /aarch64.initrd -append \ -'earlyprintk console=ttyAMA0,115200n8 rw root=/dev/vda rootwait' \ --dtb /aarch64.dtb -device virtio-serial-device,id=virtio-serial0 -usb \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu-system-aarch64 \ +-S \ +-M virt \ +-cpu cortex-a53 \ +-m 1024 \ +-smp 1 \ +-nographic \ +-nodefconfig \ +-nodefaults \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-boot c \ +-kernel /aarch64.kernel \ +-initrd /aarch64.initrd \ +-append 'earlyprintk console=ttyAMA0,115200n8 rw root=/dev/vda rootwait' \ +-dtb /aarch64.dtb \ +-device virtio-serial-device,id=virtio-serial0 \ +-usb \ -drive file=/aarch64.raw,if=none,id=drive-virtio-disk0 \ -device virtio-blk-device,drive=drive-virtio-disk0,id=virtio-disk0 \ -device virtio-net-device,vlan=0,id=net0,mac=52:54:00:09:a4:37 \ --net user,vlan=0,name=hostnet0 -chardev pty,id=charconsole0 \ +-net user,vlan=0,name=hostnet0 \ +-chardev pty,id=charconsole0 \ -device virtconsole,chardev=charconsole0,id=console0 \ -device virtio-balloon-device,id=balloon0 \ -object rng-random,id=objrng0,filename=/dev/random \ diff --git a/tests/test-wrap-argv.pl b/tests/test-wrap-argv.pl new file mode 100644 index 0000000..e8c782b --- /dev/null +++ b/tests/test-wrap-argv.pl @@ -0,0 +1,106 @@ +#!/usr/bin/perl + + + +foreach my $file (@ARGV) { + &rewrap($file); +} + +sub rewrap { + my $file = shift; + + # Read the original file + open FILE, "<", $file or die "cannot read $file: $!"; + my @lines; + while (<FILE>) { + # If there is a trailing '\' then kill the new line + if (/\\$/) { + chomp; + $_ =~ s/\\$//; + } + + push @lines, $_; + } + + # Skip empty files + return unless @lines; + + # Kill the last new line in the file + chomp @lines[$#lines]; + close FILE; + + # Reconstruct the master data by joining all lines + # and then split again based on the real desired + # newlines + @lines = split /\n/, join('', @lines); + + open FILE, ">", $file or die "cannot create $file: $!"; + + print "Process $file\n"; + # Now each @lines represents a single command, we + # can process them + foreach my $line (@lines) { + my @bits = split / /, join('', $line); + + # @bits contains env vars, then the command line + # and then the arguments + my @env; + my $cmd; + my @args; + + foreach my $bit (@bits) { + # If no command is defined yet, we must still + # have env vars + if (!defined $cmd) { + # Look for leading / or = to indicate command name + if ($bit =~ m,^/,) { + $cmd = $bit; + } else { + push @env, $bit; + } + } else { + # If there's a leading '-' then this is a new + # parameter, otherwise its a value for the prev + # parameter. + if ($bit =~ m,^-,) { + push @args, $bit; + } else { + $args[$#args] .= " " . $bit; + } + } + } + + # Print env + command first + print FILE join(" \\\n", @env, $cmd), " \\\n"; + # We might have to split line argument values... + for (my $i = 0; $i <= $#args; $i++) { + my $arg = $args[$i]; + while (length($arg) > 80) { + my $split = rindex $arg, ",", 80; + if ($split == -1) { + $split = rindex $arg, ":", 80; + } + if ($split == -1) { + $split = rindex $arg, " ", 80; + } + if ($split == -1) { + warn "$file: cannot find nice place to split '$arg' below 80 chars\n"; + $split = 79; + } + $split++; + + my $head = substr $arg, 0, $split; + $arg = substr $arg, $split; + + print FILE $head, "\\\n"; + } + print FILE $arg; + if ($i != $#args) { + print FILE " \\\n"; + } else { + print FILE "\n"; + } + } + } + close FILE; +} -- 2.5.0

3 7

[libvirt] [PATCH libvirt-java] Add new WITH_SNAPSHOTS removal flag for Storage Volumes
by Wido den Hollander 06 Nov '15

06 Nov '15

This was recently added to libvirt and this is to match the API Signed-off-by: Wido den Hollander <wido(a)widodh.nl> --- src/main/java/org/libvirt/StorageVol.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/main/java/org/libvirt/StorageVol.java b/src/main/java/org/libvirt/StorageVol.java index 3b1533e..47a9013 100644 --- a/src/main/java/org/libvirt/StorageVol.java +++ b/src/main/java/org/libvirt/StorageVol.java @@ -22,6 +22,10 @@ public class StorageVol { * Clear all data to zeros (slow) */ static final int VIR_STORAGE_POOL_DELETE_ZEROED = 1; + /** + * Delete a volume even if it has snapshots + */ + static final int VIR_STORAGE_VOL_DELETE_WITH_SNAPSHOTS = 2; } public static final class ResizeFlags { -- 1.9.1

1 0

[libvirt] [PATCH 0/3] Alternative proposal to revert the removal of logging of errors from virNetDevSendEthtoolIoctl
by John Ferlan 06 Nov '15

06 Nov '15

Rather than revert as proposed here: http://www.redhat.com/archives/libvir-list/2015-November/msg00082.html Let's make some adjustments to the existing algorithm. The only question I don't have answered in my mind is whether an unprivileged daemon that has an interface with the feature bits defined should be allowed to start. Historically we haven't stopped it, so doing so now may not be right/good. Conversely, someone may "believe" their bits are set on their device when in fact they are not. Of course it's not documented on formatnode.html that setting the feature bits requires root. I did find through various searches that SIOCETHTOOL doesn't work unless it's run under root. John Ferlan (3): virnetdev: Check correct return value for virNetDevFeatureAvailable virnetdev: Message in virNetDevSendEthtoolIoctl rather than caller. virnetdev: Add check for unprivileged daemon src/util/virnetdev.c | 38 ++++++++++++++++++++++++-------------- 1 file changed, 24 insertions(+), 14 deletions(-) -- 2.1.0

3 8

[libvirt] [PATCH 0/2] Fix spurious error when migrating with memory hotplug
by Peter Krempa 06 Nov '15

06 Nov '15

Peter Krempa (2): qemu: migration: Properly parse memory hotplug migration flag qemu: migration: Actually error out on unsupported migration flag src/qemu/qemu_migration.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) -- 2.6.2

2 4

[libvirt] [PATCH 0/7] Drop support for QEMU < 0.12.0
by Daniel P. Berrange 06 Nov '15

06 Nov '15

The patches for introducing virtlogd will be significantly simplified if we don't need to worry about parsing stderr during startup. This is required prior to QEMU 0.11 so that we can get the dyanamically allocated /dev/pty/NNN paths. The QEMU 0.12.1 release was shipped in RHEL-6 vintage distros and is already quite old, so seems like a fair target version to aim for as the minimum required. By dropping support for anything older than QEMU 0.12.0 we can remove the code for parsing stderr. The QEMU 0.12.0 release was quite special because it was the release where QEMU switched what I call its "modern" approach to configuration via -device. A major part of the complexity of the QEMU command line generator is due to need to support non-device syntax, so by mandating QEMU 0.12.0 we'll be able to kill off alot of conditional code. This series makes a start by assuming existance of 5 features, -vnc, 'info chardev', -no-reboot, -drive and -name, but there are a tonne more we can assume. Looking at tests/qemuhelptest, we can drop about 30 capability flag tests QEMU_CAPS_UUID, QEMU_CAPS_MIGRATE_QEMU_TCP, QEMU_CAPS_MIGRATE_QEMU_EXEC, QEMU_CAPS_DRIVE_CACHE_V2, QEMU_CAPS_DRIVE_FORMAT, QEMU_CAPS_DRIVE_SERIAL, QEMU_CAPS_DRIVE_READONLY, QEMU_CAPS_VGA, QEMU_CAPS_0_10, QEMU_CAPS_ENABLE_KVM, QEMU_CAPS_SDL, QEMU_CAPS_XEN_DOMID, QEMU_CAPS_MIGRATE_QEMU_UNIX, QEMU_CAPS_CHARDEV, QEMU_CAPS_BALLOON, QEMU_CAPS_DEVICE, QEMU_CAPS_SMP_TOPOLOGY, QEMU_CAPS_RTC, QEMU_CAPS_NO_HPET, QEMU_CAPS_BOOT_MENU, QEMU_CAPS_NAME_PROCESS, QEMU_CAPS_SMBIOS_TYPE, QEMU_CAPS_VGA_NONE, QEMU_CAPS_MIGRATE_QEMU_FD, QEMU_CAPS_DRIVE_AIO, QEMU_CAPS_NO_SHUTDOWN, QEMU_CAPS_PCI_ROMBAR, QEMU_CAPS_NO_ACPI, QEMU_CAPS_VIRTIO_BLK_SG_IO, QEMU_CAPS_CPU_HOST, QEMU_CAPS_VNC The only slow complication is that some non-x86 architectures were slow in converting to -device syntax, so we cannot entirely assume -device is used everywhere. Daniel P. Berrange (7): qemu: mandate QEMU version 0.12.0 or newer qemu: remove all support for kQEMU qemu: assume -vnc arg always takes a ':' qemu: assume 'info chardev' is always available qemu: assume -no-reboot is always available qemu: assume -drive argument is always available qemu: assume -name is always available src/qemu/qemu_capabilities.c | 85 ++-- src/qemu/qemu_capabilities.h | 12 +- src/qemu/qemu_command.c | 559 ++++++++------------- src/qemu/qemu_hotplug.c | 3 +- src/qemu/qemu_process.c | 193 ------- tests/qemucapabilitiesdata/caps_1.2.2-1.caps | 4 - tests/qemucapabilitiesdata/caps_1.3.1-1.caps | 4 - tests/qemucapabilitiesdata/caps_1.4.2-1.caps | 4 - tests/qemucapabilitiesdata/caps_1.5.3-1.caps | 4 - tests/qemucapabilitiesdata/caps_1.6.0-1.caps | 4 - tests/qemucapabilitiesdata/caps_1.6.50-1.caps | 4 - tests/qemucapabilitiesdata/caps_2.1.1-1.caps | 4 - tests/qemucaps2xmldata/all_1.6.0-1.caps | 4 - tests/qemucaps2xmldata/nodisksnapshot_1.6.0-1.caps | 4 - tests/qemuhelpdata/kvm-74 | 111 ---- tests/qemuhelpdata/kvm-83-rhel56 | 141 ------ tests/qemuhelpdata/kvm-86 | 170 ------- tests/qemuhelpdata/qemu-0.10.5 | 141 ------ tests/qemuhelpdata/qemu-0.9.1 | 102 ---- tests/qemuhelpdata/qemu-kvm-0.10.5 | 155 ------ tests/qemuhelpdata/qemu-kvm-0.11.0-rc2 | 177 ------- tests/qemuhelptest.c | 195 ------- tests/qemuhotplugtest.c | 1 - .../qemuxml2argv-aarch64-aavmf-virtio-mmio.args | 2 +- .../qemuxml2argv-aarch64-cpu-passthrough.args | 2 +- .../qemuxml2argvdata/qemuxml2argv-aarch64-gic.args | 2 +- .../qemuxml2argv-aarch64-gicv3.args | 2 +- .../qemuxml2argv-aarch64-kvm-32-on-64.args | 2 +- .../qemuxml2argv-aarch64-mmio-default-pci.args | 2 +- .../qemuxml2argv-aarch64-virt-default-nic.args | 4 +- .../qemuxml2argv-aarch64-virt-virtio.args | 2 +- .../qemuxml2argv-aarch64-virtio-pci.args | 2 +- .../qemuxml2argv-arm-vexpressa9-basic.args | 2 +- .../qemuxml2argv-arm-vexpressa9-nodevs.args | 2 +- .../qemuxml2argv-arm-vexpressa9-virtio.args | 2 +- .../qemuxml2argv-arm-virt-virtio.args | 2 +- .../qemuxml2argv-balloon-device-auto.args | 9 +- .../qemuxml2argv-balloon-device-period.args | 9 +- .../qemuxml2argv-balloon-device.args | 9 +- .../qemuxml2argvdata/qemuxml2argv-bios-nvram.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-bios.args | 7 +- .../qemuxml2argv-blkiotune-device.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-blkiotune.args | 2 +- .../qemuxml2argvdata/qemuxml2argv-boot-cdrom.args | 5 +- .../qemuxml2argv-boot-complex-bootindex.args | 2 +- .../qemuxml2argv-boot-complex.args | 2 +- .../qemuxml2argv-boot-floppy-q35.args | 2 +- .../qemuxml2argvdata/qemuxml2argv-boot-floppy.args | 5 +- ...xml2argv-boot-menu-disable-drive-bootindex.args | 2 +- .../qemuxml2argv-boot-menu-disable-drive.args | 2 +- .../qemuxml2argv-boot-menu-disable.args | 6 +- ...qemuxml2argv-boot-menu-enable-with-timeout.args | 2 +- .../qemuxml2argv-boot-menu-enable.args | 2 +- .../qemuxml2argvdata/qemuxml2argv-boot-multi.args | 6 +- .../qemuxml2argv-boot-network.args | 4 +- .../qemuxml2argvdata/qemuxml2argv-boot-order.args | 2 +- .../qemuxml2argvdata/qemuxml2argv-boot-strict.args | 2 +- .../qemuxml2argv-bootindex-floppy-q35.args | 2 +- .../qemuxml2argv-channel-guestfwd.args | 6 +- .../qemuxml2argv-channel-spicevmc-old.args | 8 +- .../qemuxml2argv-channel-spicevmc.args | 8 +- .../qemuxml2argv-channel-virtio-auto.args | 8 +- .../qemuxml2argv-channel-virtio-autoadd.args | 5 +- .../qemuxml2argv-channel-virtio-autoassign.args | 5 +- .../qemuxml2argv-channel-virtio-default.args | 5 +- .../qemuxml2argv-channel-virtio-state.args | 5 +- .../qemuxml2argv-channel-virtio-unix.args | 5 +- .../qemuxml2argv-channel-virtio.args | 8 +- .../qemuxml2argv-clock-catchup.args | 4 +- .../qemuxml2argv-clock-france.args | 6 +- .../qemuxml2argv-clock-hpet-off.args | 4 +- ...muxml2argv-clock-localtime-basis-localtime.args | 4 +- .../qemuxml2argv-clock-localtime.args | 4 +- .../qemuxml2argv-clock-timer-hyperv-rtc.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-clock-utc.args | 9 +- tests/qemuxml2argvdata/qemuxml2argv-clock-utc.xml | 2 +- .../qemuxml2argv-clock-variable.args | 4 +- .../qemuxml2argv-console-compat-auto.args | 4 +- .../qemuxml2argv-console-compat-chardev.args | 6 +- .../qemuxml2argv-console-compat.args | 4 +- .../qemuxml2argv-console-sclp.args | 2 +- .../qemuxml2argv-console-virtio-ccw.args | 2 +- .../qemuxml2argv-console-virtio-many.args | 8 +- .../qemuxml2argv-console-virtio-s390.args | 2 +- .../qemuxml2argv-console-virtio.args | 8 +- .../qemuxml2argv-controller-order.args | 2 +- .../qemuxml2argv-cpu-Haswell-noTSX.args | 2 +- .../qemuxml2argvdata/qemuxml2argv-cpu-Haswell.args | 2 +- .../qemuxml2argv-cpu-Haswell2.args | 2 +- .../qemuxml2argv-cpu-Haswell3.args | 2 +- .../qemuxml2argv-cpu-eoi-disabled.args | 2 +- .../qemuxml2argv-cpu-eoi-enabled.args | 2 +- .../qemuxml2argvdata/qemuxml2argv-cpu-exact1.args | 2 +- .../qemuxml2argv-cpu-exact2-nofallback.args | 2 +- .../qemuxml2argvdata/qemuxml2argv-cpu-exact2.args | 2 +- .../qemuxml2argv-cpu-fallback.args | 2 +- .../qemuxml2argv-cpu-host-kvmclock.args | 2 +- .../qemuxml2argv-cpu-host-model-fallback.args | 2 +- .../qemuxml2argv-cpu-host-model-vendor.args | 2 +- .../qemuxml2argv-cpu-host-model.args | 2 +- ...qemuxml2argv-cpu-host-passthrough-features.args | 4 +- .../qemuxml2argv-cpu-host-passthrough.args | 2 +- .../qemuxml2argv-cpu-kvmclock.args | 2 +- .../qemuxml2argv-cpu-minimum1.args | 2 +- .../qemuxml2argv-cpu-minimum2.args | 2 +- .../qemuxml2argv-cpu-numa-disjoint.args | 2 +- .../qemuxml2argv-cpu-numa-no-memory-element.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-cpu-numa1.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-cpu-numa2.args | 2 +- .../qemuxml2argvdata/qemuxml2argv-cpu-strict1.args | 2 +- .../qemuxml2argv-cpu-topology1.args | 2 +- .../qemuxml2argv-cpu-topology2.args | 2 +- .../qemuxml2argv-cpu-topology3.args | 2 +- .../qemuxml2argv-cputune-numatune.args | 2 +- .../qemuxml2argv-cputune-zero-shares.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-cputune.args | 2 +- .../qemuxml2argv-default-kvm-host-arch.args | 2 +- .../qemuxml2argv-default-qemu-host-arch.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-disk-aio.args | 2 +- .../qemuxml2argv-disk-blockio.args | 2 +- .../qemuxml2argv-disk-cdrom-empty.args | 2 +- .../qemuxml2argv-disk-cdrom-network-ftp.args | 2 +- .../qemuxml2argv-disk-cdrom-network-ftps.args | 2 +- .../qemuxml2argv-disk-cdrom-network-http.args | 2 +- .../qemuxml2argv-disk-cdrom-network-https.args | 2 +- .../qemuxml2argv-disk-cdrom-network-tftp.args | 2 +- ...qemuxml2argv-disk-cdrom-tray-no-device-cap.args | 5 +- .../qemuxml2argv-disk-cdrom-tray.args | 2 +- .../qemuxml2argvdata/qemuxml2argv-disk-cdrom.args | 5 +- .../qemuxml2argv-disk-copy_on_read.args | 2 +- .../qemuxml2argv-disk-drive-boot-cdrom.args | 2 +- .../qemuxml2argv-disk-drive-boot-disk.args | 2 +- .../qemuxml2argv-disk-drive-cache-directsync.args | 2 +- .../qemuxml2argv-disk-drive-cache-unsafe.args | 2 +- .../qemuxml2argv-disk-drive-cache-v1-none.args | 2 +- .../qemuxml2argv-disk-drive-cache-v1-wb.args | 2 +- .../qemuxml2argv-disk-drive-cache-v1-wt.args | 2 +- .../qemuxml2argv-disk-drive-cache-v2-none.args | 2 +- .../qemuxml2argv-disk-drive-cache-v2-wb.args | 2 +- .../qemuxml2argv-disk-drive-cache-v2-wt.args | 2 +- .../qemuxml2argv-disk-drive-copy-on-read.args | 2 +- .../qemuxml2argv-disk-drive-discard.args | 2 +- ...uxml2argv-disk-drive-error-policy-enospace.args | 2 +- .../qemuxml2argv-disk-drive-error-policy-stop.args | 2 +- ...gv-disk-drive-error-policy-wreport-rignore.args | 2 +- .../qemuxml2argv-disk-drive-fat.args | 2 +- .../qemuxml2argv-disk-drive-fmt-qcow.args | 2 +- .../qemuxml2argv-disk-drive-network-gluster.args | 2 +- ...qemuxml2argv-disk-drive-network-iscsi-auth.args | 2 +- .../qemuxml2argv-disk-drive-network-iscsi-lun.args | 2 +- .../qemuxml2argv-disk-drive-network-iscsi.args | 2 +- ...qemuxml2argv-disk-drive-network-nbd-export.args | 2 +- ...ml2argv-disk-drive-network-nbd-ipv6-export.args | 2 +- .../qemuxml2argv-disk-drive-network-nbd-ipv6.args | 2 +- .../qemuxml2argv-disk-drive-network-nbd-unix.args | 2 +- .../qemuxml2argv-disk-drive-network-nbd.args | 2 +- .../qemuxml2argv-disk-drive-network-rbd-auth.args | 2 +- ...muxml2argv-disk-drive-network-rbd-ceph-env.args | 2 +- .../qemuxml2argv-disk-drive-network-rbd-ipv6.args | 2 +- .../qemuxml2argv-disk-drive-network-rbd.args | 2 +- .../qemuxml2argv-disk-drive-network-sheepdog.args | 2 +- .../qemuxml2argv-disk-drive-no-boot.args | 2 +- .../qemuxml2argv-disk-drive-readonly-disk.args | 2 +- ...qemuxml2argv-disk-drive-readonly-no-device.args | 2 +- .../qemuxml2argv-disk-drive-shared.args | 2 +- .../qemuxml2argv-disk-floppy-pseries.args | 2 +- ...emuxml2argv-disk-floppy-tray-no-device-cap.args | 5 +- .../qemuxml2argv-disk-floppy-tray.args | 2 +- .../qemuxml2argvdata/qemuxml2argv-disk-floppy.args | 7 +- .../qemuxml2argv-disk-geometry.args | 2 +- .../qemuxml2argv-disk-ide-drive-split.args | 2 +- .../qemuxml2argv-disk-ide-wwn.args | 2 +- .../qemuxml2argv-disk-ioeventfd.args | 2 +- .../qemuxml2argvdata/qemuxml2argv-disk-iscsi.args | 6 +- tests/qemuxml2argvdata/qemuxml2argv-disk-many.args | 8 +- .../qemuxml2argvdata/qemuxml2argv-disk-order.args | 2 +- .../qemuxml2argv-disk-sata-device.args | 2 +- .../qemuxml2argv-disk-scsi-device-auto.args | 2 +- .../qemuxml2argv-disk-scsi-device.args | 2 +- .../qemuxml2argv-disk-scsi-disk-split.args | 2 +- .../qemuxml2argv-disk-scsi-disk-vpd.args | 2 +- .../qemuxml2argv-disk-scsi-disk-wwn.args | 2 +- .../qemuxml2argv-disk-scsi-lun-passthrough.args | 2 +- .../qemuxml2argv-disk-scsi-megasas.args | 2 +- .../qemuxml2argv-disk-scsi-virtio-scsi.args | 2 +- .../qemuxml2argv-disk-scsi-vscsi.args | 2 +- .../qemuxml2argvdata/qemuxml2argv-disk-serial.args | 2 +- .../qemuxml2argv-disk-snapshot.args | 2 +- .../qemuxml2argv-disk-source-pool-mode.args | 2 +- .../qemuxml2argv-disk-source-pool.args | 2 +- .../qemuxml2argv-disk-usb-device-removable.args | 2 +- .../qemuxml2argv-disk-usb-device.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-disk-usb.args | 5 +- .../qemuxml2argv-disk-virtio-ccw-many.args | 2 +- .../qemuxml2argv-disk-virtio-ccw.args | 2 +- .../qemuxml2argv-disk-virtio-s390.args | 2 +- .../qemuxml2argv-disk-virtio-scsi-ccw.args | 2 +- .../qemuxml2argv-disk-virtio-scsi-cmd_per_lun.args | 2 +- .../qemuxml2argv-disk-virtio-scsi-ioeventfd.args | 2 +- .../qemuxml2argv-disk-virtio-scsi-max_sectors.args | 2 +- .../qemuxml2argv-disk-virtio-scsi-num_queues.args | 2 +- .../qemuxml2argvdata/qemuxml2argv-disk-virtio.args | 2 +- .../qemuxml2argvdata/qemuxml2argv-disk-xenvbd.args | 2 +- .../qemuxml2argv-eoi-disabled.args | 2 +- .../qemuxml2argvdata/qemuxml2argv-eoi-enabled.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-event_idx.args | 2 +- .../qemuxml2argv-fips-enabled.args | 4 +- .../qemuxml2argv-floppy-drive-fat.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-fs9p-ccw.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-fs9p.args | 8 +- .../qemuxml2argv-graphics-sdl-fullscreen.args | 6 +- .../qemuxml2argv-graphics-sdl.args | 6 +- ...emuxml2argv-graphics-spice-agent-file-xfer.args | 8 +- .../qemuxml2argv-graphics-spice-agentmouse.args | 6 +- .../qemuxml2argv-graphics-spice-compression.args | 9 +- .../qemuxml2argv-graphics-spice-qxl-vga.args | 8 +- .../qemuxml2argv-graphics-spice-sasl.args | 7 +- .../qemuxml2argv-graphics-spice-timeout.args | 2 +- .../qemuxml2argv-graphics-spice-usb-redir.args | 2 +- .../qemuxml2argv-graphics-spice.args | 8 +- .../qemuxml2argv-graphics-vnc-policy.args | 4 +- .../qemuxml2argv-graphics-vnc-sasl.args | 7 +- .../qemuxml2argv-graphics-vnc-socket.args | 4 +- .../qemuxml2argv-graphics-vnc-tls.args | 6 +- .../qemuxml2argv-graphics-vnc-websocket.args | 2 +- .../qemuxml2argv-graphics-vnc.args | 4 +- .../qemuxml2argv-hostdev-pci-address-device.args | 8 +- .../qemuxml2argv-hostdev-pci-address.args | 5 +- .../qemuxml2argv-hostdev-scsi-boot.args | 2 +- .../qemuxml2argv-hostdev-scsi-lsi-iscsi-auth.args | 2 +- .../qemuxml2argv-hostdev-scsi-lsi-iscsi.args | 2 +- .../qemuxml2argv-hostdev-scsi-lsi.args | 2 +- .../qemuxml2argv-hostdev-scsi-readonly.args | 2 +- ...emuxml2argv-hostdev-scsi-virtio-iscsi-auth.args | 2 +- .../qemuxml2argv-hostdev-scsi-virtio-iscsi.args | 2 +- .../qemuxml2argv-hostdev-scsi-virtio-scsi.args | 2 +- ...muxml2argv-hostdev-usb-address-device-boot.args | 7 +- .../qemuxml2argv-hostdev-usb-address-device.args | 8 +- .../qemuxml2argv-hostdev-usb-address.args | 4 +- .../qemuxml2argv-hostdev-vfio-multidomain.args | 8 +- .../qemuxml2argv-hostdev-vfio.args | 8 +- .../qemuxml2argv-hotplug-base.args | 2 +- .../qemuxml2argv-hugepages-numa.args | 2 +- .../qemuxml2argv-hugepages-pages.args | 4 +- .../qemuxml2argv-hugepages-pages2.args | 4 +- .../qemuxml2argv-hugepages-pages3.args | 4 +- .../qemuxml2argv-hugepages-pages5.args | 4 +- .../qemuxml2argv-hugepages-pages6.args | 4 +- .../qemuxml2argv-hugepages-shared.args | 4 +- tests/qemuxml2argvdata/qemuxml2argv-hugepages.args | 6 +- .../qemuxml2argvdata/qemuxml2argv-hyperv-off.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-hyperv.args | 2 +- .../qemuxml2argv-input-usbmouse-addr.args | 6 +- .../qemuxml2argv-input-usbmouse.args | 4 +- .../qemuxml2argv-input-usbtablet.args | 4 +- .../qemuxml2argv-iothreads-disk-virtio-ccw.args | 2 +- .../qemuxml2argv-iothreads-disk.args | 2 +- .../qemuxml2argv-iothreads-ids-partial.args | 6 +- .../qemuxml2argv-iothreads-ids.args | 6 +- tests/qemuxml2argvdata/qemuxml2argv-iothreads.args | 6 +- .../qemuxml2argv-kvm-features-off.args | 2 +- .../qemuxml2argv-kvm-features.args | 2 +- .../qemuxml2argv-kvm-pit-delay.args | 4 +- .../qemuxml2argv-kvm-pit-device.args | 4 +- tests/qemuxml2argvdata/qemuxml2argv-kvm.args | 2 +- .../qemuxml2argv-kvmclock+eoi-disabled.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-kvmclock.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-lease.args | 4 +- .../qemuxml2argv-machine-aeskeywrap-off-argv.args | 2 +- .../qemuxml2argv-machine-aeskeywrap-off-cap.args | 2 +- .../qemuxml2argv-machine-aeskeywrap-off-caps.args | 2 +- .../qemuxml2argv-machine-aeskeywrap-on-argv.args | 2 +- .../qemuxml2argv-machine-aeskeywrap-on-cap.args | 2 +- .../qemuxml2argv-machine-aeskeywrap-on-caps.args | 2 +- .../qemuxml2argv-machine-aliases1.args | 6 +- .../qemuxml2argv-machine-aliases2.args | 4 +- .../qemuxml2argv-machine-core-off.args | 4 +- .../qemuxml2argv-machine-core-on.args | 4 +- .../qemuxml2argv-machine-deakeywrap-off-argv.args | 2 +- .../qemuxml2argv-machine-deakeywrap-off-cap.args | 2 +- .../qemuxml2argv-machine-deakeywrap-off-caps.args | 2 +- .../qemuxml2argv-machine-deakeywrap-on-argv.args | 2 +- .../qemuxml2argv-machine-deakeywrap-on-cap.args | 2 +- .../qemuxml2argv-machine-deakeywrap-on-caps.args | 2 +- .../qemuxml2argv-machine-keywrap-none-argv.args | 2 +- .../qemuxml2argv-machine-keywrap-none-caps.args | 2 +- .../qemuxml2argv-machine-keywrap-none.args | 2 +- .../qemuxml2argv-machine-usb-opt.args | 4 +- .../qemuxml2argv-machine-vmport-opt.args | 4 +- .../qemuxml2argv-memory-hotplug-dimm-addr.args | 5 +- .../qemuxml2argv-memory-hotplug-dimm.args | 5 +- .../qemuxml2argv-memory-hotplug.args | 4 +- .../qemuxml2argv-memtune-unlimited.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-memtune.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-metadata.args | 2 +- .../qemuxml2argv-migrate-numa-unaligned.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-migrate.args | 4 +- .../qemuxml2argv-minimal-msg-timestamp.args | 2 +- .../qemuxml2argv-minimal-s390.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-minimal.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-misc-acpi.args | 4 +- .../qemuxml2argv-misc-disable-s3.args | 4 +- .../qemuxml2argv-misc-disable-suspends.args | 4 +- .../qemuxml2argv-misc-enable-s4.args | 4 +- .../qemuxml2argv-misc-no-reboot.args | 4 +- tests/qemuxml2argvdata/qemuxml2argv-misc-uuid.args | 4 +- tests/qemuxml2argvdata/qemuxml2argv-mlock-off.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-mlock-on.args | 2 +- .../qemuxml2argv-mlock-unsupported.args | 2 +- .../qemuxml2argv-monitor-json.args | 8 +- .../qemuxml2argv-multifunction-pci-device.args | 2 +- .../qemuxml2argvdata/qemuxml2argv-net-client.args | 4 +- .../qemuxml2argv-net-eth-ifname.args | 4 +- .../qemuxml2argv-net-eth-names.args | 4 +- tests/qemuxml2argvdata/qemuxml2argv-net-eth.args | 4 +- .../qemuxml2argv-net-hostdev-multidomain.args | 5 +- .../qemuxml2argv-net-hostdev-vfio-multidomain.args | 5 +- .../qemuxml2argv-net-hostdev-vfio.args | 5 +- .../qemuxml2argvdata/qemuxml2argv-net-hostdev.args | 5 +- tests/qemuxml2argvdata/qemuxml2argv-net-mcast.args | 4 +- .../qemuxml2argvdata/qemuxml2argv-net-server.args | 4 +- tests/qemuxml2argvdata/qemuxml2argv-net-udp.args | 4 +- tests/qemuxml2argvdata/qemuxml2argv-net-user.args | 4 +- .../qemuxml2argv-net-vhostuser-multiq.args | 5 +- .../qemuxml2argv-net-vhostuser.args | 5 +- .../qemuxml2argv-net-virtio-ccw.args | 2 +- .../qemuxml2argv-net-virtio-device.args | 8 +- .../qemuxml2argv-net-virtio-disable-offloads.args | 5 +- .../qemuxml2argv-net-virtio-netdev.args | 8 +- .../qemuxml2argv-net-virtio-s390.args | 2 +- .../qemuxml2argvdata/qemuxml2argv-net-virtio.args | 4 +- .../qemuxml2argvdata/qemuxml2argv-no-shutdown.args | 5 +- .../qemuxml2argv-nographics-vga.args | 4 +- .../qemuxml2argvdata/qemuxml2argv-nographics.args | 4 +- .../qemuxml2argv-nosharepages.args | 4 +- ...qemuxml2argv-numad-auto-memory-vcpu-cpuset.args | 6 +- ...d-auto-memory-vcpu-no-cpuset-and-placement.args | 6 +- ...muxml2argv-numad-auto-vcpu-static-numatune.args | 6 +- ...qemuxml2argv-numad-static-memory-auto-vcpu.args | 6 +- tests/qemuxml2argvdata/qemuxml2argv-numad.args | 6 +- ...qemuxml2argv-numatune-auto-nodeset-invalid.args | 4 +- .../qemuxml2argv-numatune-auto-prefer.args | 2 +- .../qemuxml2argv-numatune-memnode-no-memory.args | 2 +- .../qemuxml2argv-numatune-memnode.args | 2 +- .../qemuxml2argv-numatune-memory.args | 6 +- .../qemuxml2argv-panic-no-address.args | 5 +- tests/qemuxml2argvdata/qemuxml2argv-panic.args | 5 +- .../qemuxml2argv-parallel-parport-chardev.args | 6 +- .../qemuxml2argv-parallel-tcp-chardev.args | 6 +- .../qemuxml2argv-parallel-tcp.args | 4 +- .../qemuxml2argv-pci-autoadd-addr.args | 5 +- .../qemuxml2argv-pci-autoadd-idx.args | 5 +- .../qemuxml2argv-pci-bridge-many-disks.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-pci-many.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-pci-rom.args | 7 +- .../qemuxml2argv-pci-serial-dev-chardev.args | 6 +- .../qemuxml2argv-pcie-root-port.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-pcie-root.args | 2 +- .../qemuxml2argv-pcie-switch-downstream-port.args | 2 +- .../qemuxml2argv-pcie-switch-upstream-port.args | 2 +- .../qemuxml2argv-pcihole64-none.args | 2 +- .../qemuxml2argv-pcihole64-q35.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-pcihole64.args | 2 +- .../qemuxml2argv-pmu-feature-off.args | 2 +- .../qemuxml2argvdata/qemuxml2argv-pmu-feature.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-ppc-dtb.args | 2 +- .../qemuxml2argv-ppce500-serial.args | 3 +- .../qemuxml2argv-pseries-basic.args | 4 +- .../qemuxml2argv-pseries-cpu-compat.args | 4 +- .../qemuxml2argv-pseries-cpu-exact.args | 4 +- .../qemuxml2argv-pseries-cpu-le.args | 2 +- .../qemuxml2argv-pseries-disk.args | 2 +- .../qemuxml2argv-pseries-nvram.args | 2 +- .../qemuxml2argv-pseries-panic-missing.args | 2 +- .../qemuxml2argv-pseries-panic-no-address.args | 2 +- .../qemuxml2argv-pseries-usb-default.args | 2 +- .../qemuxml2argv-pseries-usb-kbd.args | 2 +- .../qemuxml2argv-pseries-usb-multi.args | 2 +- .../qemuxml2argv-pseries-vio-user-assigned.args | 2 +- .../qemuxml2argvdata/qemuxml2argv-pseries-vio.args | 2 +- .../qemuxml2argv-pv-spinlock-disabled.args | 2 +- .../qemuxml2argv-pv-spinlock-enabled.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-q35.args | 2 +- .../qemuxml2argv-qemu-ns-no-env.args | 4 +- tests/qemuxml2argvdata/qemuxml2argv-qemu-ns.args | 6 +- .../qemuxml2argv-reboot-timeout-disabled.args | 2 +- .../qemuxml2argv-reboot-timeout-enabled.args | 2 +- .../qemuxml2argvdata/qemuxml2argv-restore-v1.args | 4 +- .../qemuxml2argv-restore-v2-fd.args | 4 +- .../qemuxml2argvdata/qemuxml2argv-restore-v2.args | 4 +- ...muxml2argv-s390-allow-bogus-usb-controller.args | 2 +- .../qemuxml2argv-s390-allow-bogus-usb-none.args | 2 +- .../qemuxml2argv-seclabel-dac-none.args | 2 +- .../qemuxml2argv-seclabel-dynamic-baselabel.args | 2 +- .../qemuxml2argv-seclabel-dynamic-labelskip.args | 2 +- .../qemuxml2argv-seclabel-dynamic-override.args | 6 +- .../qemuxml2argv-seclabel-dynamic-relabel.args | 2 +- .../qemuxml2argv-seclabel-dynamic.args | 2 +- .../qemuxml2argv-seclabel-none.args | 2 +- .../qemuxml2argv-seclabel-static-labelskip.args | 2 +- .../qemuxml2argv-seclabel-static-relabel.args | 2 +- .../qemuxml2argv-seclabel-static.args | 2 +- .../qemuxml2argv-serial-dev-chardev-iobase.args | 6 +- .../qemuxml2argv-serial-dev-chardev.args | 6 +- .../qemuxml2argvdata/qemuxml2argv-serial-dev.args | 4 +- .../qemuxml2argv-serial-file-chardev.args | 6 +- .../qemuxml2argvdata/qemuxml2argv-serial-file.args | 4 +- .../qemuxml2argv-serial-many-chardev.args | 6 +- .../qemuxml2argvdata/qemuxml2argv-serial-many.args | 4 +- .../qemuxml2argv-serial-pty-chardev.args | 6 +- .../qemuxml2argvdata/qemuxml2argv-serial-pty.args | 4 +- .../qemuxml2argv-serial-spiceport-nospice.args | 2 +- .../qemuxml2argv-serial-spiceport.args | 5 +- .../qemuxml2argv-serial-tcp-chardev.args | 6 +- .../qemuxml2argv-serial-tcp-telnet-chardev.args | 6 +- .../qemuxml2argv-serial-tcp-telnet.args | 4 +- .../qemuxml2argvdata/qemuxml2argv-serial-tcp.args | 4 +- .../qemuxml2argv-serial-udp-chardev.args | 6 +- .../qemuxml2argvdata/qemuxml2argv-serial-udp.args | 4 +- .../qemuxml2argv-serial-unix-chardev.args | 6 +- .../qemuxml2argvdata/qemuxml2argv-serial-unix.args | 4 +- .../qemuxml2argv-serial-vc-chardev.args | 6 +- tests/qemuxml2argvdata/qemuxml2argv-serial-vc.args | 4 +- tests/qemuxml2argvdata/qemuxml2argv-shmem.args | 2 +- .../qemuxml2argv-smartcard-controller.args | 2 +- .../qemuxml2argv-smartcard-host-certificates.args | 2 +- .../qemuxml2argv-smartcard-host.args | 2 +- ...emuxml2argv-smartcard-passthrough-spicevmc.args | 2 +- .../qemuxml2argv-smartcard-passthrough-tcp.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-smbios.args | 6 +- tests/qemuxml2argvdata/qemuxml2argv-smp.args | 6 +- .../qemuxml2argv-sound-device.args | 8 +- tests/qemuxml2argvdata/qemuxml2argv-sound.args | 4 +- .../qemuxml2argv-tpm-passthrough.args | 2 +- .../qemuxml2argv-usb-controller.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-usb-hub.args | 2 +- .../qemuxml2argv-usb-ich9-companion.args | 2 +- .../qemuxml2argv-usb-ich9-ehci-addr.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-usb-none.args | 2 +- .../qemuxml2argv-usb-piix3-controller.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-usb-ports.args | 2 +- .../qemuxml2argv-usb-redir-boot.args | 2 +- .../qemuxml2argv-usb-redir-filter-version.args | 2 +- .../qemuxml2argv-usb-redir-filter.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-usb-redir.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-usb1-usb2.args | 2 +- .../qemuxml2argv-video-device-pciaddr-default.args | 6 +- .../qemuxml2argv-video-qxl-device-vgamem.args | 5 +- .../qemuxml2argv-video-qxl-device.args | 5 +- .../qemuxml2argv-video-qxl-nodevice.args | 5 +- .../qemuxml2argv-video-qxl-sec-device-vgamem.args | 5 +- .../qemuxml2argv-video-qxl-sec-device.args | 5 +- .../qemuxml2argv-video-vga-device-vgamem.args | 5 +- .../qemuxml2argv-video-vga-device.args | 5 +- .../qemuxml2argv-video-vga-nodevice.args | 5 +- .../qemuxml2argvdata/qemuxml2argv-virtio-lun.args | 2 +- .../qemuxml2argv-virtio-rng-ccw.args | 2 +- .../qemuxml2argv-virtio-rng-default.args | 2 +- .../qemuxml2argv-virtio-rng-egd.args | 2 +- .../qemuxml2argv-virtio-rng-multiple.args | 2 +- .../qemuxml2argv-virtio-rng-random.args | 2 +- .../qemuxml2argv-watchdog-device.args | 8 +- .../qemuxml2argv-watchdog-diag288.args | 2 +- .../qemuxml2argv-watchdog-dump.args | 4 +- .../qemuxml2argv-watchdog-injectnmi.args | 4 +- tests/qemuxml2argvdata/qemuxml2argv-watchdog.args | 4 +- tests/qemuxml2argvtest.c | 404 +++++++-------- tests/qemuxml2xmltest.c | 4 - .../qemuxmlns-qemu-ns-commandline-ns0.args | 6 +- .../qemuxmlns-qemu-ns-commandline-ns1.args | 6 +- .../qemuxmlns-qemu-ns-commandline.args | 6 +- .../qemuxmlns-qemu-ns-domain-commandline-ns0.args | 6 +- .../qemuxmlns-qemu-ns-domain-commandline.args | 6 +- .../qemuxmlns-qemu-ns-domain-ns0.args | 6 +- tests/qemuxmlnsdata/qemuxmlns-qemu-ns-domain.args | 6 +- tests/qemuxmlnstest.c | 2 - 476 files changed, 1262 insertions(+), 2754 deletions(-) delete mode 100644 tests/qemuhelpdata/kvm-74 delete mode 100644 tests/qemuhelpdata/kvm-83-rhel56 delete mode 100644 tests/qemuhelpdata/kvm-86 delete mode 100644 tests/qemuhelpdata/qemu-0.10.5 delete mode 100644 tests/qemuhelpdata/qemu-0.9.1 delete mode 100644 tests/qemuhelpdata/qemu-kvm-0.10.5 delete mode 100644 tests/qemuhelpdata/qemu-kvm-0.11.0-rc2 -- 2.5.0

5 29

Re: [libvirt] Libvirt management daemon issue
by Eric Blake 05 Nov '15

05 Nov '15

[re-adding the list with permission - conversations like this should be held in public, because others may benefit from the archives] [please don't top-post on technical lists] On 11/04/2015 09:42 PM, Bilal Arif wrote: > One thing I found about binaries when i apply my patch on Qemu the results > was: > > robo@robo:~/Downloads/qemu-2.4.0.1$ patch -p1 < > /home/robo/Downloads/kvm-qemu-2.4.0.1-libvmi.patch > (Stripping trailing CRs from patch; use --binary to disable.) > patching file hmp.c > (Stripping trailing CRs from patch; use --binary to disable.) > patching file hmp-commands.hx > (Stripping trailing CRs from patch; use --binary to disable.) > patching file hmp.h > (Stripping trailing CRs from patch; use --binary to disable.) > patching file Makefile.target > (Stripping trailing CRs from patch; use --binary to disable.) > patching file memory-access.c > (Stripping trailing CRs from patch; use --binary to disable.) > patching file memory-access.h > (Stripping trailing CRs from patch; use --binary to disable.) > patching file qapi-schema.json > (Stripping trailing CRs from patch; use --binary to disable.) > patching file qmp-commands.hx Patching qemu is unrelated to building libvirt, and the fact that patch merely warned you about stripping CRs shouldn't affect the qemu you build, nor cause problem you were seeing with libvirt. You know, it would be nice if the libvmi folks could upstream their patch instead of making users have to apply a downstream patch and self-build. There have been some conversations on the qemu list lately about what it would take. But it is unrelated to the topic at hand. > > > On Thu, Nov 5, 2015 at 9:38 AM, Bilal Arif <billal.ariif(a)gmail.com> wrote: > >> Thanks Eric Blacke, Well Your answer is may be deficult to understand for >> newbies like me. so I listing my actions performed of fresh ubuntu box >> please consider and make me understand how self-built binaries get >> installed and where they exist and how I could check their configure for >> Ubuntu 14.04. >> Actions: >> Dependencies are installed with apt-get for Introspection >> Qemu-KVM from source and put a patch on that after i just download libvirt >> from and compile. You still didn't show what arguments to pass to ./configure. The problem you are hitting is because your configure arguments differ from those of the pre-built distro libvirt, and when both are installed, attempts to locate subsidiary files (whether .so or other subsidiary files) are finding the files from the other installation. But I don't use Ubuntu enough to know what to recommend. Which is why posting this on the list, where other users might be able to chime in, is always a better idea than posting to just me. -- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org

1 0

[libvirt] [PATCH v2 0/9] Introduce virt-admin client
by Erik Skultety 05 Nov '15

05 Nov '15

v1: 1/9 - ACKed if adjusted 6/9 - ACKed 8/9 - ACKed if squashed into 4/9 --> resolves 7/9 v2: - double empty line in private.syms is preserved (1/9) - adjusted authors of virt-admin modules (2/9) - removed unnecessary includes from virt-admin module (2/9) - replaced "int" disconnected type for type "bool" (2/9) - dropped unused command groups (2/9) - removed unnecessary flags and adminControl struct element (2/9) - introduction of virAdmConnectIsAlive split separately (3/9) - remote version of admin API moved into a separate module (4/9) - updated admin_protocol-structs (8/9) - removed debugging leftovers from gendispatch.pl (8/9) - properly indented if-else conditions in gendispatch.pl (8/9) - removed unrelated paragraph, domain references, unsupported options from virt-admin.pod and command 'connect' is now (hopefully correctly) documented (9/9) - introduction of vshAdmCatchDisconnect and introduction of close callbacks had to be squashed together due to dependencies both ways <-- review 4/9 pointed out dummy NULL close callback which should be replaced by something relevant - creation of the admin socket is prohibited (until 1.3.0) => testing requires the socket to be permitted and created! Erik Skultety (9): libvirt: Export libvirt config getters by moving them to util virt-admin: Introduce first working skeleton admin: Introduce virAdmConnectIsAlive admin: Move remote admin API version to a separate module admin: Do not generate remoteAdminConnect{Open,Close} admin: Add URI support and introduce virAdmGetDefaultURI admin: Add support for connection close callbacks admin: Introduce virAdmConnectGetLibVersion virt-admin: Provide a man page for virt-admin .gitignore | 1 + daemon/admin_server.c | 9 + daemon/libvirtd.c | 1 - include/libvirt/libvirt-admin.h | 25 ++ po/POTFILES.in | 2 + src/admin/admin_protocol.x | 15 +- src/admin/admin_remote.c | 217 ++++++++++++ src/admin_protocol-structs | 4 + src/datatypes.c | 22 ++ src/datatypes.h | 15 +- src/libvirt-admin.c | 421 +++++++++++++++-------- src/libvirt.c | 55 +-- src/libvirt_admin_private.syms | 1 + src/libvirt_admin_public.syms | 5 + src/libvirt_private.syms | 1 + src/rpc/gendispatch.pl | 11 +- src/util/virconf.c | 52 +++ src/util/virconf.h | 2 +- tools/Makefile.am | 36 +- tools/virt-admin.c | 737 ++++++++++++++++++++++++++++++++++++++++ tools/virt-admin.h | 47 +++ tools/virt-admin.pod | 278 +++++++++++++++ 22 files changed, 1747 insertions(+), 210 deletions(-) create mode 100644 src/admin/admin_remote.c create mode 100644 tools/virt-admin.c create mode 100644 tools/virt-admin.h create mode 100644 tools/virt-admin.pod -- 2.4.3

3 25

[libvirt] [PATCH] network: Remove extraneous ATTRIBUTE_NONNULL for virNetDevWaitDadFinish
by John Ferlan 05 Nov '15

05 Nov '15

Commit id '0f7436ca' added virNetDevWaitDadFinish using ATTRIBUTE_NONNULL for both arguments, although one is a non-null argument. A Coverity build balks at that. Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- Pushing under the build-breaker rule src/util/virnetdev.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/virnetdev.h b/src/util/virnetdev.h index 9108be6..772ae75 100644 --- a/src/util/virnetdev.h +++ b/src/util/virnetdev.h @@ -106,7 +106,7 @@ int virNetDevClearIPAddress(const char *ifname, int virNetDevGetIPAddress(const char *ifname, virSocketAddrPtr addr) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK; int virNetDevWaitDadFinish(virSocketAddrPtr *addrs, size_t count) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2); + ATTRIBUTE_NONNULL(1); int virNetDevSetMAC(const char *ifname, -- 2.1.0

1 0

[libvirt] Libvirt management daemon issue
by Bilal Arif 05 Nov '15

05 Nov '15

robo@robo:~$ sudo /etc/init.d/libvirt-bin start [sudo] password for robo: * Starting libvirt management daemon libvirtd/usr/sbin/libvirtd: /usr/local/lib/libvirt.so.0: version `LIBVIRT_PRIVATE_1.2.2' not found (required by /usr/sbin/libvirtd) Giving up waiting for /var/run/libvirt/libvirt-sock. After installing libvirt from source a lot of Ubuntu user face this issue, as i searched on internet about this, no solution works. this is mostly in case of ubuntu users as mentioned in many posted threads. so please help us as soon as possible. (this is only in case of installation libvirt from source)

2 1

[libvirt] [PATCH] qemu: add /usr/lib to AC_PATH_PROG for qemu-bridge-helper
by Michel Normand 05 Nov '15

05 Nov '15

For openSUSE the qemu-bridge-helper is installed in /usr/lib So libvirt has to search it in this directory. Signed-off-by: Michel Normand <normand(a)linux.vnet.ibm.com> --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 75e95b7..77106ac 100644 --- a/configure.ac +++ b/configure.ac @@ -2520,7 +2520,7 @@ AC_DEFINE_UNQUOTED([QEMU_USER], ["$QEMU_USER"], [QEMU user account]) AC_DEFINE_UNQUOTED([QEMU_GROUP], ["$QEMU_GROUP"], [QEMU group account]) AC_PATH_PROG([QEMU_BRIDGE_HELPER], [qemu-bridge-helper], [/usr/libexec/qemu-bridge-helper], - [/usr/libexec:/usr/lib/qemu]) + [/usr/libexec:/usr/lib/qemu:/usr/lib]) AC_DEFINE_UNQUOTED([QEMU_BRIDGE_HELPER], ["$QEMU_BRIDGE_HELPER"], [QEMU bridge helper]) AC_ARG_WITH([macvtap], -- 1.7.9.5

2 1

[libvirt] Release of libvirt-1.2.21
by Daniel Veillard 04 Nov '15

04 Nov '15

So as planned I tagged libvirt-1.2.21 in git, we are out of freeze ! The signed tarballs and rpms for 1.2.21 are in the usual places for libvirt ftp://libvirt.org/libvirt/ and for python bindings ftp://libvirt.org/libvirt/python/ This is a moderately sized release with around 150 commits, a lot of refactoring and cleanups on the migration code, the python bindings and updates to the vz driver: Documentation: - event impl. registration before hypervisor connection (Dominik Perpeet) - libvirt-secret: Fix typo (Wei Jiangang) - NEWS: Fix XSLT stylesheet (Andrea Bolognani) - NEWS: Split releases by year (Andrea Bolognani) - NEWS: Unify date format (Andrea Bolognani) - NEWS: Unify section titles (Andrea Bolognani) - NEWS: Add empty lines (Andrea Bolognani) - NEWS: Fix indentation (Andrea Bolognani) - NEWS: Fix newlines (Andrea Bolognani) - NEWS: Fix whitespace (Andrea Bolognani) - NEWS: Organize old entries (Andrea Bolognani) - NEWS: Split old entries (2009) (Andrea Bolognani) - NEWS: Split old entries (2008) (Andrea Bolognani) - NEWS: Split old entries (2006-2007) (Andrea Bolognani) - NEWS: Properly escape > in HTML (Andrea Bolognani) - NEWS: Split off merged sections (Andrea Bolognani) - NEWS: Remove empty sections (Andrea Bolognani) - NEWS: Include description for release 0.7.3 (Andrea Bolognani) - domain: Show canonical pvspinlock XML (Cole Robinson) - Add Cuckoo Sandbox into apps.html (Martin Kletzander) Portability: - Fix virNetDevWaitDadFinish stub (Roman Bogorodskiy) - util: implement virProcessGetStartTime on GNU/kFreeBSD (Pino Toscano) - build: include xdr cflags for libvirt-admin (Eric Blake) - virt-host-validate: disable mntent code on Win32 (Daniel P. Berrange) - src: Remove $(builddir) usage (Andrea Bolognani) Bug Fixes: - wireshark: Install to generic plugin directory (Michal Privoznik) - network: wait for DAD to finish for bridge IPv6 addresses (Maxim Perevedentsev) - qemu: Use live autoNodeset when numatune placement is auto (Luyao Huang) - virsh-domain: use correct base for virStrToLong_ui (Pavel Hrdina) - libvirt-domain: fix the error reporting when use the localhost as target uri (Luyao Huang) - qemu: fix migration flags undefinesource cannot work (Luyao Huang) - virsh: Display an error when passing count <= 0 to setvcpus (Luyao Huang) - virtlockd: Don't SIGSEGV on SIGUSR1 (Michal Privoznik) - Close the source fd if the destination qemu exits during tunnelled migration (Shivaprasad G Bhat) - qemu: Fix qemu startup check for QEMU_CAPS_OBJECT_IOTHREAD (John Ferlan) - virsh: Use 'format' argument only when specified (Peter Krempa) - storage: Track successful creation of LV for removal (John Ferlan) - storage: Fix a resource leak in storageVolCreateXML (John Ferlan) - storage: Fix incorrect format for <disk> <auth> XML (John Ferlan) - migration: check dconnuri in p2p mode (Nikolay Shirokovskiy) - qemu: Resolve Coverity FORWARD_NULL (John Ferlan) - libxl: Resolve Coverity FORWARD_NULL (John Ferlan) - tests: eventtest: Fix coverity warning (Cole Robinson) - qemu: migration: Skip few checks while doing offline migration (Peter Krempa) - qemu: Wait until destination QEMU consumes all migration data (Jiri Denemark) - conf: Remove <metadata> elements with no namespace (Peter Krempa) - storage: Adjust calculation of alloc/capacity for disk (John Ferlan) - storage: Prior to creating a volume, refresh the pool (John Ferlan) - virfile: Fix error path for forked virFileRemove (John Ferlan) - rpc: libssh2: Fix regression in ssh host key verification (Peter Krempa) - interface: fail on OOM from virGetInterface() (Laine Stump) - libvirt.spec: fix accidental conditional inclusion of polkit docs (Daniel P. Berrange) - qemu: Use memory-backing-file only when needed (Martin Kletzander) Improvements: - util: set max wait for IPv6 DAD to 20 seconds (Laine Stump) - util: set error if DAD is not finished (Luyao Huang) - netlink: add support for multi-part netlink messages. (Maxim Perevedentsev) - rbd: Remove snapshots if the DELETE_WITH_SNAPSHOTS flag has been provided (Wido den Hollander) - bhyve: implement domainGetOSType (Roman Bogorodskiy) - libvirt-domain: fix no error report when p2p migrate fail (Luyao Huang) - conf: Add serial target type to ABI stability check (Luyao Huang) - lock_daemon: Switch to wrapper locking functions (Michal Privoznik) - qemu: hostdev: Introduce qemuHostdevUpdateActiveDomainDevices() (Andrea Bolognani) - qemu: hostdev: Unify naming for qemuHostdevUpdateActive*Devices() (Andrea Bolognani) - qemu: hostdev: Unify naming for qemuHostdevReAttach*Devices() (Andrea Bolognani) - qemu: hostdev: Unify naming for qemuHostdevPrepare*Devices() (Andrea Bolognani) - hostdev: Rename virHostdevUpdateDomainActiveDevices() (Andrea Bolognani) - conf: Fix error message to use correct parameter (John Ferlan) - util: Produce friendlier error message to user (Luyao Huang) - util: Adjust error paths for virNumaSetPagePoolSize (Luyao Huang) - util: split the virNumaGetHugePageInfoPath into separate function (Luyao Huang) - Avoid using !STREQ and !STRNEQ (Ishmanpreet Kaur Khera) - vz: implement some domain API calls (Maxim Nestratov) - vz: implement API calls of nodeGetxxx family (Maxim Nestratov) - vz: implement connectGetMaxVcpus API calls (Maxim Nestratov) - security_dac: Introduce remember/recall APIs (Michal Privoznik) - security_dac: Limit usage of virSecurityDACSetOwnershipInternal (Michal Privoznik) - virSecurityDACRestoreSecurityFileLabel: Pass virSecurityDACDataPtr (Michal Privoznik) - virSecurityDACSetOwnership: Pass virSecurityDACDataPtr (Michal Privoznik) - virSecurityDACSetOwnershipInternal: Don't chown so often (Michal Privoznik) - security_dac: Fix TODO marks (Michal Privoznik) - conf: Optimize the iothreadid initialization (John Ferlan) - qemu: Check for niothreads == 0 in qemuSetupCgroupForIOThreads (John Ferlan) - qemu: Use 'niothreadids' instead of 'iothreads' (John Ferlan) - Fix conficts with HACKING doc (Wei Jiangang) - conf: Refactor the iothreadid initialization (John Ferlan) - tests: make redirects happen in correct order (Wei Jiangang) - storage: Rework error paths for virStorageBackendCreateExecCommand (John Ferlan) - storage: On error rmdir created directory in virDirCreate[NoFork] (John Ferlan) - storage: On error unlink created file in virFileOpen{As|Forked} (John Ferlan) - storage: Remove duplicitous refreshVol in Sheepdog buildVol (John Ferlan) - storage: Remove duplicitous refreshVol in RBD buildVol (John Ferlan) - virt-host-validate: check for IOMMU support (Daniel P. Berrange) - libvirt-domain: Drop virDomainMigrateCheckNotLocal attribute (Michal Privoznik) - virt-host-validate: check for required cgroups (Daniel P. Berrange) - virt-host-validate: distinguish exists vs accessible for devices (Daniel P. Berrange) - virt-host-validate.c: check for kernel namespaces (Daniel P. Berrange) - migration: refactor: introduce parameter checking function (Nikolay Shirokovskiy) - migration: merge all proto branches into single function (Nikolay Shirokovskiy) - migration: refactor: refactor parameter compatibility checks (Nikolay Shirokovskiy) - migration: refactor: extract parameter adaption functions (Nikolay Shirokovskiy) - migration: refactor: introduce params version of unmanaged (Nikolay Shirokovskiy) - migration: refactor: merge direct and p2p into unmanaged (Nikolay Shirokovskiy) - migration: refactor: rename uri parameter to miguri (Nikolay Shirokovskiy) - migration: remove direct migration dependency on version1 of driver (Michal Privoznik) - migration: move implementation check to branches in p2p (Nikolay Shirokovskiy) - migration: refactor: reuse p2p url check (Nikolay Shirokovskiy) - migration: refactor: get rid of use_params p2p_full (Nikolay Shirokovskiy) - virJSONValueArraySize: return ssize_t (Michal Privoznik) - src: Include $(builddir)/util in the header search path (Andrea Bolognani) - storage: Perform some cleanup of calls (John Ferlan) - AUTHORS: Add myself to the list of committers (Andrea Bolognani) - virSecurityManagerNew: Turn array of booleans into flags (Michal Privoznik) - qemu: Fix indentation issue (Andrea Bolognani) - qemu: Remove explicit values from virQEMUCapsFlags (Andrea Bolognani) - qemu: migration: Use migration flags in qemuMigrationIsAllowed (Peter Krempa) - qemu: migration: Drop @def from qemuMigrationIsAllowed (Peter Krempa) - qemu: migration: Split source and destination migration checks (Peter Krempa) - spec: Delete .git after applying patches (Cole Robinson) - tests: qemu: Add aarch64 virtio pci tests (Cole Robinson) - qemu: Make updating stats in qemuMigrationCheckJobStatus optional (Jiri Denemark) - qemu: Introduce flags in qemuMigrationCompleted (Jiri Denemark) - qemu: Copy completed migration stats only on success (Jiri Denemark) - qemu: Always update migration times on destination (Jiri Denemark) - tests: Check GIC-related XMLs in qemuxml2xmltest (Martin Kletzander) - Do not distribute generated virkeymaps.h (Martin Kletzander) - apparmor: differentiate between error and unconfined profiles (Cédric Bosdonnat) - testutils: Drop virtTestResult (Cole Robinson) - tests: eventtest: Open code virtTestResult (Cole Robinson) - tests: sheepdog: Drop use of virtTestResult (Cole Robinson) - testutils: Add coloring to verbose PASS/FAILED output (Cole Robinson) - storage: Introduce virStorageBackendDiskStartPool (John Ferlan) - storage: Add additional errors/checks for disk label (John Ferlan) - storage: Add param to check whether we can write a disk label (John Ferlan) - storage: Refactor disk label checking (John Ferlan) - virfile: Add extra check for direct delete in virFileRemove (John Ferlan) - qemu: Add conditions for qemu-kvm use on ppc64 (Andrea Bolognani) - rpc: libssh2: Add more debugging info (Peter Krempa) - conf: Reuse virDomainDefCheckDuplicateDiskWWN to check disk serial too (Peter Krempa) - qemu: Perform the disk WWN check only on fresh starts (Peter Krempa) - interface: let netcf pre-filter for active vs. inactive (Laine Stump) - interface: re-use name and mac address rather than re-retrieving (Laine Stump) - interface: report correct interface count when not returning list (Laine Stump) - qemu: Add -mem-path even with numa (Martin Kletzander) - qemu: Extract -mem-path building into its own function (Martin Kletzander) - qemu: Move memory size detection to the top of the function (Martin Kletzander) - qemu: Move simplification variable to begining of the function (Martin Kletzander) - qemu: Add test cases for gic-version option (Pavel Fedin) - qemu: Add support for gic-version machine option (Pavel Fedin) - qemu: Introduce QEMU_CAPS_MACH_VIRT_GIC_VERSION capability (Pavel Fedin) - Post-release version bump to 1.2.21 (Martin Kletzander) Cleanups: - tests: Remove unused nodeinfo test data (Andrea Bolognani) - vz: cleanup (Maxim Nestratov) - vz: remove storage driver as never used (Maxim Nestratov) - vz: remove network driver as never used (Maxim Nestratov) Thanks everybody for your contributions to this 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/

3 5

[libvirt] [PATCH 0/5] Some qemuProcessStart cleanups
by Jiri Denemark 04 Nov '15

04 Nov '15

Jiri Denemark (5): qemu: Use correct type when calling qemuPrepareNVRAM qemu: Rename cleanup label in qemuProcessStart qemu: Rename ret variable in qemuProcessStart qemu: Introduce cleanup label in qemuProcessStart qemu: Fix memory leak in qemuProcessStart src/qemu/qemu_process.c | 215 ++++++++++++++++++++++++------------------------ 1 file changed, 106 insertions(+), 109 deletions(-) -- 2.6.2

2 7

[libvirt] [PATCH v2] Remove new lines from debug messages
by Jiri Denemark 04 Nov '15

04 Nov '15

VIR_DEBUG will automatically add a new line to the message, having "\n" at the end or at the beginning of the message results in empty lines. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/nwfilter/nwfilter_dhcpsnoop.c | 2 +- src/nwfilter/nwfilter_gentech_driver.c | 2 +- src/nwfilter/nwfilter_learnipaddr.c | 10 +++++----- src/rpc/virnetsocket.c | 2 +- src/util/virfile.c | 2 +- src/util/virhash.c | 2 +- src/util/virnetdevmacvlan.c | 26 ++++++++++++------------ src/util/virprocess.c | 2 +- src/xen/xend_internal.c | 2 +- tests/virhostdevtest.c | 36 +++++++++++++++++----------------- tests/virnetsockettest.c | 2 +- tests/virtimetest.c | 2 +- 12 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/nwfilter/nwfilter_dhcpsnoop.c b/src/nwfilter/nwfilter_dhcpsnoop.c index f05d4a8..bd6d25f 100644 --- a/src/nwfilter/nwfilter_dhcpsnoop.c +++ b/src/nwfilter/nwfilter_dhcpsnoop.c @@ -2017,7 +2017,7 @@ static void virNWFilterSnoopJoinThreads(void) { while (virAtomicIntGet(&virNWFilterSnoopState.nThreads) != 0) { - VIR_WARN("Waiting for snooping threads to terminate: %u\n", + VIR_WARN("Waiting for snooping threads to terminate: %u", virAtomicIntGet(&virNWFilterSnoopState.nThreads)); usleep(1000 * 1000); } diff --git a/src/nwfilter/nwfilter_gentech_driver.c b/src/nwfilter/nwfilter_gentech_driver.c index 701f8d8..5a4cff1 100644 --- a/src/nwfilter/nwfilter_gentech_driver.c +++ b/src/nwfilter/nwfilter_gentech_driver.c @@ -540,7 +540,7 @@ virNWFilterDetermineMissingVarsRec(virNWFilterDefPtr filter, if (rc) break; } else if (inc) { - VIR_DEBUG("Following filter %s\n", inc->filterref); + VIR_DEBUG("Following filter %s", inc->filterref); obj = virNWFilterObjFindByName(&driver->nwfilters, inc->filterref); if (obj) { diff --git a/src/nwfilter/nwfilter_learnipaddr.c b/src/nwfilter/nwfilter_learnipaddr.c index 5b55055..1adbadb 100644 --- a/src/nwfilter/nwfilter_learnipaddr.c +++ b/src/nwfilter/nwfilter_learnipaddr.c @@ -413,7 +413,7 @@ learnIPAddressThread(void *arg) handle = pcap_open_live(listen_if, BUFSIZ, 0, PKT_TIMEOUT_MS, errbuf); if (handle == NULL) { - VIR_DEBUG("Couldn't open device %s: %s\n", listen_if, errbuf); + VIR_DEBUG("Couldn't open device %s: %s", listen_if, errbuf); req->status = ENODEV; goto done; } @@ -448,13 +448,13 @@ learnIPAddressThread(void *arg) filter = virBufferContentAndReset(&buf); if (pcap_compile(handle, &fp, filter, 1, 0) != 0) { - VIR_DEBUG("Couldn't compile filter '%s'.\n", filter); + VIR_DEBUG("Couldn't compile filter '%s'", filter); req->status = EINVAL; goto done; } if (pcap_setfilter(handle, &fp) != 0) { - VIR_DEBUG("Couldn't set filter '%s'.\n", filter); + VIR_DEBUG("Couldn't set filter '%s'", filter); req->status = EINVAL; pcap_freecode(&fp); goto done; @@ -626,7 +626,7 @@ learnIPAddressThread(void *arg) req->filtername, req->filterparams); VIR_DEBUG("Result from applying firewall rules on " - "%s with IP addr %s : %d\n", req->ifname, inetaddr, ret); + "%s with IP addr %s : %d", req->ifname, inetaddr, ret); } } else { if (showError) @@ -638,7 +638,7 @@ learnIPAddressThread(void *arg) techdriver->applyDropAllRules(req->ifname); } - VIR_DEBUG("pcap thread terminating for interface %s\n", req->ifname); + VIR_DEBUG("pcap thread terminating for interface %s", req->ifname); virNWFilterUnlockIface(req->ifname); diff --git a/src/rpc/virnetsocket.c b/src/rpc/virnetsocket.c index 5e5f1ab..526d291 100644 --- a/src/rpc/virnetsocket.c +++ b/src/rpc/virnetsocket.c @@ -196,7 +196,7 @@ int virNetSocketCheckProtocols(bool *hasIPv4, freeaddrinfo(ai); - VIR_DEBUG("Protocols: v4 %d v6 %d\n", *hasIPv4, *hasIPv6); + VIR_DEBUG("Protocols: v4 %d v6 %d", *hasIPv4, *hasIPv6); ret = 0; cleanup: diff --git a/src/util/virfile.c b/src/util/virfile.c index e5cf2c5..f45e18f 100644 --- a/src/util/virfile.c +++ b/src/util/virfile.c @@ -681,7 +681,7 @@ static int virFileLoopDeviceOpen(char **dev_name) if (virFileLoopDeviceOpenLoopCtl(dev_name, &loop_fd) < 0) return -1; - VIR_DEBUG("Return from loop-control got fd %d\n", loop_fd); + VIR_DEBUG("Return from loop-control got fd %d", loop_fd); if (loop_fd >= 0) return loop_fd; diff --git a/src/util/virhash.c b/src/util/virhash.c index bc90c44..fab621b 100644 --- a/src/util/virhash.c +++ b/src/util/virhash.c @@ -287,7 +287,7 @@ virHashGrow(virHashTablePtr table, size_t size) VIR_FREE(oldtable); #ifdef DEBUG_GROW - VIR_DEBUG("virHashGrow : from %d to %d, %ld elems\n", oldsize, + VIR_DEBUG("virHashGrow : from %d to %d, %ld elems", oldsize, size, nbElem); #endif diff --git a/src/util/virnetdevmacvlan.c b/src/util/virnetdevmacvlan.c index 89985b8..de345e6 100644 --- a/src/util/virnetdevmacvlan.c +++ b/src/util/virnetdevmacvlan.c @@ -473,16 +473,16 @@ virNetDevMacVLanVPortProfileCallback(struct nlmsghdr *hdr, case RTM_DELLINK: case RTM_SETLINK: case RTM_GETLINK: - VIR_DEBUG(" IFINFOMSG\n"); - VIR_DEBUG(" ifi_family = 0x%02x\n", + VIR_DEBUG(" IFINFOMSG"); + VIR_DEBUG(" ifi_family = 0x%02x", ((struct ifinfomsg *)data)->ifi_family); - VIR_DEBUG(" ifi_type = 0x%x\n", + VIR_DEBUG(" ifi_type = 0x%x", ((struct ifinfomsg *)data)->ifi_type); - VIR_DEBUG(" ifi_index = %i\n", + VIR_DEBUG(" ifi_index = %i", ((struct ifinfomsg *)data)->ifi_index); - VIR_DEBUG(" ifi_flags = 0x%04x\n", + VIR_DEBUG(" ifi_flags = 0x%04x", ((struct ifinfomsg *)data)->ifi_flags); - VIR_DEBUG(" ifi_change = 0x%04x\n", + VIR_DEBUG(" ifi_change = 0x%04x", ((struct ifinfomsg *)data)->ifi_change); } /* DEBUG end */ @@ -544,23 +544,23 @@ virNetDevMacVLanVPortProfileCallback(struct nlmsghdr *hdr, if (tb[IFLA_IFNAME]) { ifname = (char *)RTA_DATA(tb[IFLA_IFNAME]); - VIR_DEBUG("IFLA_IFNAME = %s\n", ifname); + VIR_DEBUG("IFLA_IFNAME = %s", ifname); } if (tb[IFLA_OPERSTATE]) { rem = *(unsigned short *)RTA_DATA(tb[IFLA_OPERSTATE]); - VIR_DEBUG("IFLA_OPERSTATE = %d\n", rem); + VIR_DEBUG("IFLA_OPERSTATE = %d", rem); } if (tb[IFLA_VF_PORTS]) { struct nlattr *tb_vf_ports; - VIR_DEBUG("found IFLA_VF_PORTS\n"); + VIR_DEBUG("found IFLA_VF_PORTS"); nla_for_each_nested(tb_vf_ports, tb[IFLA_VF_PORTS], rem) { - VIR_DEBUG("iterating\n"); + VIR_DEBUG("iterating"); if (nla_type(tb_vf_ports) != IFLA_VF_PORT) { - VIR_DEBUG("not a IFLA_VF_PORT. skipping\n"); + VIR_DEBUG("not a IFLA_VF_PORT. skipping"); continue; } if (nla_parse_nested(tb3, IFLA_PORT_MAX, tb_vf_ports, @@ -600,7 +600,7 @@ virNetDevMacVLanVPortProfileCallback(struct nlmsghdr *hdr, uuid = (unsigned char *) RTA_DATA(tb3[IFLA_PORT_INSTANCE_UUID]); instance2str(uuid, instance, sizeof(instance)); - VIR_DEBUG("IFLA_PORT_INSTANCE_UUID = %s\n", + VIR_DEBUG("IFLA_PORT_INSTANCE_UUID = %s", instance); } @@ -615,7 +615,7 @@ virNetDevMacVLanVPortProfileCallback(struct nlmsghdr *hdr, } if (tb3[IFLA_PORT_RESPONSE]) { - VIR_DEBUG("IFLA_PORT_RESPONSE = %d\n", *(uint16_t *) + VIR_DEBUG("IFLA_PORT_RESPONSE = %d", *(uint16_t *) RTA_DATA(tb3[IFLA_PORT_RESPONSE])); } } diff --git a/src/util/virprocess.c b/src/util/virprocess.c index 43118f8..103c114 100644 --- a/src/util/virprocess.c +++ b/src/util/virprocess.c @@ -407,7 +407,7 @@ virProcessKillPainfully(pid_t pid, bool force) int virProcessSetAffinity(pid_t pid, virBitmapPtr map) { size_t i; - VIR_DEBUG("Set process affinity on %lld\n", (long long)pid); + VIR_DEBUG("Set process affinity on %lld", (long long)pid); # ifdef CPU_ALLOC /* New method dynamically allocates cpu mask, allowing unlimted cpus */ int numcpus = 1024; diff --git a/src/xen/xend_internal.c b/src/xen/xend_internal.c index 62ce930..21d99e3 100644 --- a/src/xen/xend_internal.c +++ b/src/xen/xend_internal.c @@ -507,7 +507,7 @@ xend_op_ext(virConnectPtr xend, const char *path, const char *key, va_list ap) return -1; content = virBufferContentAndReset(&buf); - VIR_DEBUG("xend op: %s\n", content); + VIR_DEBUG("xend op: %s", content); ret = http2unix(xend_post(xend, path, content)); VIR_FREE(content); diff --git a/tests/virhostdevtest.c b/tests/virhostdevtest.c index 065b825..faebdd4 100644 --- a/tests/virhostdevtest.c +++ b/tests/virhostdevtest.c @@ -169,14 +169,14 @@ testVirHostdevPreparePCIHostdevs_unmanaged(const void *oaque ATTRIBUTE_UNUSED) count2 = virPCIDeviceListCount(mgr->inactivePCIHostdevs); /* Test normal functionality */ - VIR_DEBUG("Test 0 hostdevs\n"); + VIR_DEBUG("Test 0 hostdevs"); if (virHostdevPreparePCIDevices(mgr, drv_name, dom_name, uuid, NULL, 0, 0) < 0) goto cleanup; CHECK_LIST_COUNT(mgr->activePCIHostdevs, count1); /* Test unmanaged hostdevs */ - VIR_DEBUG("Test >=1 unmanaged hostdevs\n"); + VIR_DEBUG("Test >=1 unmanaged hostdevs"); if (virHostdevPreparePCIDevices(mgr, drv_name, dom_name, uuid, hostdevs, nhostdevs, 0) < 0) goto cleanup; @@ -186,21 +186,21 @@ testVirHostdevPreparePCIHostdevs_unmanaged(const void *oaque ATTRIBUTE_UNUSED) /* Test conflict */ count1 = virPCIDeviceListCount(mgr->activePCIHostdevs); count2 = virPCIDeviceListCount(mgr->inactivePCIHostdevs); - VIR_DEBUG("Test: prepare same hostdevs for same driver/domain again\n"); + VIR_DEBUG("Test: prepare same hostdevs for same driver/domain again"); if (!virHostdevPreparePCIDevices(mgr, drv_name, dom_name, uuid, &hostdevs[0], 1, 0)) goto cleanup; CHECK_LIST_COUNT(mgr->activePCIHostdevs, count1); CHECK_LIST_COUNT(mgr->inactivePCIHostdevs, count2); - VIR_DEBUG("Test: prepare same hostdevs for same driver, diff domain again\n"); + VIR_DEBUG("Test: prepare same hostdevs for same driver, diff domain again"); if (!virHostdevPreparePCIDevices(mgr, drv_name, "test_domain1", uuid, &hostdevs[1], 1, 0)) goto cleanup; CHECK_LIST_COUNT(mgr->activePCIHostdevs, count1); CHECK_LIST_COUNT(mgr->inactivePCIHostdevs, count2); - VIR_DEBUG("Test: prepare same hostdevs for diff driver/domain again\n"); + VIR_DEBUG("Test: prepare same hostdevs for diff driver/domain again"); if (!virHostdevPreparePCIDevices(mgr, "test_driver1", dom_name, uuid, &hostdevs[2], 1, 0)) goto cleanup; @@ -223,7 +223,7 @@ testVirHostdevReAttachPCIHostdevs_unmanaged(const void *oaque ATTRIBUTE_UNUSED) for (i = 0; i < nhostdevs; i++) { if (hostdevs[i]->managed != false) { - VIR_DEBUG("invalid test\n"); + VIR_DEBUG("invalid test"); return -1; } } @@ -231,11 +231,11 @@ testVirHostdevReAttachPCIHostdevs_unmanaged(const void *oaque ATTRIBUTE_UNUSED) count1 = virPCIDeviceListCount(mgr->activePCIHostdevs); count2 = virPCIDeviceListCount(mgr->inactivePCIHostdevs); - VIR_DEBUG("Test 0 hostdevs\n"); + VIR_DEBUG("Test 0 hostdevs"); virHostdevReAttachPCIDevices(mgr, drv_name, dom_name, NULL, 0, NULL); CHECK_LIST_COUNT(mgr->activePCIHostdevs, count1); - VIR_DEBUG("Test >=1 unmanaged hostdevs\n"); + VIR_DEBUG("Test >=1 unmanaged hostdevs"); virHostdevReAttachPCIDevices(mgr, drv_name, dom_name, hostdevs, nhostdevs, NULL); CHECK_LIST_COUNT(mgr->activePCIHostdevs, count1 - 3); @@ -261,7 +261,7 @@ testVirHostdevPreparePCIHostdevs_managed(const void *oaque ATTRIBUTE_UNUSED) count1 = virPCIDeviceListCount(mgr->activePCIHostdevs); /* Test normal functionality */ - VIR_DEBUG("Test >=1 hostdevs\n"); + VIR_DEBUG("Test >=1 hostdevs"); if (virHostdevPreparePCIDevices(mgr, drv_name, dom_name, uuid, hostdevs, nhostdevs, 0) < 0) goto cleanup; @@ -269,19 +269,19 @@ testVirHostdevPreparePCIHostdevs_managed(const void *oaque ATTRIBUTE_UNUSED) /* Test conflict */ count1 = virPCIDeviceListCount(mgr->activePCIHostdevs); - VIR_DEBUG("Test: prepare same hostdevs for same driver/domain again\n"); + VIR_DEBUG("Test: prepare same hostdevs for same driver/domain again"); if (!virHostdevPreparePCIDevices(mgr, drv_name, dom_name, uuid, &hostdevs[0], 1, 0)) goto cleanup; CHECK_LIST_COUNT(mgr->activePCIHostdevs, count1); - VIR_DEBUG("Test: prepare same hostdevs for same driver, diff domain again\n"); + VIR_DEBUG("Test: prepare same hostdevs for same driver, diff domain again"); if (!virHostdevPreparePCIDevices(mgr, drv_name, "test_domain1", uuid, &hostdevs[1], 1, 0)) goto cleanup; CHECK_LIST_COUNT(mgr->activePCIHostdevs, count1); - VIR_DEBUG("Test: prepare same hostdevs for diff driver/domain again\n"); + VIR_DEBUG("Test: prepare same hostdevs for diff driver/domain again"); if (!virHostdevPreparePCIDevices(mgr, "test_driver1", dom_name, uuid, &hostdevs[2], 1, 0)) goto cleanup; @@ -303,18 +303,18 @@ testVirHostdevReAttachPCIHostdevs_managed(const void *oaque ATTRIBUTE_UNUSED) for (i = 0; i < nhostdevs; i++) { if (hostdevs[i]->managed != true) { - VIR_DEBUG("invalid test\n"); + VIR_DEBUG("invalid test"); return -1; } } count1 = virPCIDeviceListCount(mgr->activePCIHostdevs); - VIR_DEBUG("Test 0 hostdevs\n"); + VIR_DEBUG("Test 0 hostdevs"); virHostdevReAttachPCIDevices(mgr, drv_name, dom_name, NULL, 0, NULL); CHECK_LIST_COUNT(mgr->activePCIHostdevs, count1); - VIR_DEBUG("Test >=1 hostdevs\n"); + VIR_DEBUG("Test >=1 hostdevs"); virHostdevReAttachPCIDevices(mgr, drv_name, dom_name, hostdevs, nhostdevs, NULL); CHECK_LIST_COUNT(mgr->activePCIHostdevs, count1 - 3); @@ -392,13 +392,13 @@ testVirHostdevUpdateActivePCIHostdevs(const void *oaque ATTRIBUTE_UNUSED) count1 = virPCIDeviceListCount(mgr->activePCIHostdevs); - VIR_DEBUG("Test 0 hostdevs\n"); + VIR_DEBUG("Test 0 hostdevs"); if (virHostdevUpdateActivePCIDevices(mgr, NULL, 0, drv_name, dom_name) < 0) goto cleanup; CHECK_LIST_COUNT(mgr->activePCIHostdevs, count1); - VIR_DEBUG("Test >=1 hostdevs\n"); + VIR_DEBUG("Test >=1 hostdevs"); if (virHostdevUpdateActivePCIDevices(mgr, hostdevs, nhostdevs, drv_name, dom_name) < 0) goto cleanup; @@ -432,7 +432,7 @@ mymain(void) # define DO_TEST(fnc) \ do { \ - VIR_DEBUG("\nTesting: %s", #fnc); \ + VIR_DEBUG("Testing: %s", #fnc); \ if (virtTestRun(#fnc, fnc, NULL) < 0) \ ret = -1; \ } while (0) diff --git a/tests/virnetsockettest.c b/tests/virnetsockettest.c index ce9eeab..5786870 100644 --- a/tests/virnetsockettest.c +++ b/tests/virnetsockettest.c @@ -105,7 +105,7 @@ checkProtocols(bool *hasIPv4, bool *hasIPv6, break; } - VIR_DEBUG("Choose port %d\n", *freePort); + VIR_DEBUG("Choose port %d", *freePort); ret = 0; diff --git a/tests/virtimetest.c b/tests/virtimetest.c index 9ab38ae..49040d3 100644 --- a/tests/virtimetest.c +++ b/tests/virtimetest.c @@ -92,7 +92,7 @@ testTimeLocalOffset(const void *args) return -1; if (data->offset != actual) { - VIR_DEBUG("Expect Offset %ld got %ld\n", + VIR_DEBUG("Expect Offset %ld got %ld", data->offset, actual); return -1; } -- 2.6.2

2 2

[libvirt] [REPOST PATCH 0/6] Have 'buildVol' callers to clean up after themselves
by John Ferlan 04 Nov '15

04 Nov '15

Since some time and changes have occurred since the original posting, I figured it would be just easier to updated and repost the remainder of the series: http://www.redhat.com/archives/libvir-list/2015-October/msg00312.html Where the patches 1-3 are v2's of the original patches 8 & 9: http://www.redhat.com/archives/libvir-list/2015-October/msg00515.html http://www.redhat.com/archives/libvir-list/2015-October/msg00516.html http://www.redhat.com/archives/libvir-list/2015-October/msg00518.html Note that patches 4-6 have been ACK'd already as patches 10-12, it's just that without the previous patches it doesn't make much sense to push them alone. John Ferlan (6): storage: Refactor and fix virStorageBackendCreateExecCommand storage: Cleanup failures virStorageBackendCreateExecCommand storage: Cleanup failures in virStorageBackendCreateRaw storage: Pull volume removal from pool in storageVolDeleteInternal Revert "storage: Prior to creating a volume, refresh the pool" storage: On 'buildVol' failure don't delete the volume src/storage/storage_backend.c | 40 ++++++++++++++++++++++++++------------- src/storage/storage_backend.h | 10 ++++++++++ src/storage/storage_driver.c | 44 +++++++++++++++++++++---------------------- 3 files changed, 59 insertions(+), 35 deletions(-) -- 2.1.0

2 17

[libvirt] [PATCH] Revert "utils: Remove the logging of errors from virNetDevSendEthtoolIoctl"
by Daniel P. Berrange 04 Nov '15

04 Nov '15

This reverts commit 6f2a0198e913c91a2ef8b99db79b7d3cc5396957. This commit removed error reporting from virNetDevSendEthtoolIoctl pushing responsibility onto the callers. This is wrong, however, since virNetDevSendEthtoolIoctl calls virNetDevSetupControl which can still report errors. So as a result virNetDevSendEthtoolIoctl may or may not report errors depending on which bit of it fails, and as a result callers now overwrite some errors. It also introduced a regression causing unprivileged libvirtd to spew error messages to the console due to inability to query the NIC features, an error which was previously ignored. virNetDevSetupControlFull:148 : Cannot open network interface control socket: Operation not permitted virNetDevFeatureAvailable:3062 : Cannot get device wlp3s0 flags: Operation not permitted virNetDevSetupControlFull:148 : Cannot open network interface control socket: Operation not permitted virNetDevFeatureAvailable:3062 : Cannot get device wlp3s0 flags: Operation not permitted virNetDevSetupControlFull:148 : Cannot open network interface control socket: Operation not permitted virNetDevFeatureAvailable:3062 : Cannot get device wlp3s0 flags: Operation not permitted virNetDevSetupControlFull:148 : Cannot open network interface control socket: Operation not permitted virNetDevFeatureAvailable:3062 : Cannot get device wlp3s0 flags: Operation not permitted Looking back at the original posting I see no explanation of why thsi refactoring was needed, so reverting the clearly broken error reporting logic looks like the best option. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/util/virnetdev.c | 56 +++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 40 insertions(+), 16 deletions(-) diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c index 9789e93..657df3a 100644 --- a/src/util/virnetdev.c +++ b/src/util/virnetdev.c @@ -3145,15 +3145,39 @@ static int virNetDevSendEthtoolIoctl(const char *ifname, void *cmd) { int ret = -1; - int fd; - struct ifreq ifr; + int sock = -1; + virIfreq ifr; - if ((fd = virNetDevSetupControl(ifname, &ifr)) < 0) - return ret; + sock = socket(AF_LOCAL, SOCK_DGRAM, 0); + if (sock < 0) { + virReportSystemError(errno, "%s", _("Cannot open control socket")); + goto cleanup; + } + + memset(&ifr, 0, sizeof(ifr)); + strcpy(ifr.ifr_name, ifname); ifr.ifr_data = cmd; - ret = ioctl(fd, SIOCETHTOOL, &ifr); + ret = ioctl(sock, SIOCETHTOOL, &ifr); + if (ret != 0) { + switch (errno) { + case EPERM: + VIR_DEBUG("ethtool ioctl: permission denied"); + break; + case EINVAL: + VIR_DEBUG("ethtool ioctl: invalid request"); + break; + case EOPNOTSUPP: + VIR_DEBUG("ethtool ioctl: request not supported"); + break; + default: + virReportSystemError(errno, "%s", _("ethtool ioctl error")); + goto cleanup; + } + } - VIR_FORCE_CLOSE(fd); + cleanup: + if (sock) + VIR_FORCE_CLOSE(sock); return ret; } @@ -3170,12 +3194,12 @@ virNetDevSendEthtoolIoctl(const char *ifname, void *cmd) static int virNetDevFeatureAvailable(const char *ifname, struct ethtool_value *cmd) { + int ret = -1; + cmd = (void*)cmd; - if (virNetDevSendEthtoolIoctl(ifname, cmd) < 0) { - virReportSystemError(errno, _("Cannot get device %s flags"), ifname); - return -1; - } - return cmd->data > 0 ? 1 : 0; + if (!virNetDevSendEthtoolIoctl(ifname, cmd)) + ret = cmd->data > 0 ? 1 : 0; + return ret; } @@ -3192,12 +3216,12 @@ virNetDevFeatureAvailable(const char *ifname, struct ethtool_value *cmd) static int virNetDevGFeatureAvailable(const char *ifname, struct ethtool_gfeatures *cmd) { + int ret = -1; + cmd = (void*)cmd; - if (virNetDevSendEthtoolIoctl(ifname, cmd) < 0) { - virReportSystemError(errno, _("Cannot get device %s generic features"), ifname); - return -1; - } - return FEATURE_BIT_IS_SET(cmd->features, TX_UDP_TNL, active); + if (!virNetDevSendEthtoolIoctl(ifname, cmd)) + ret = FEATURE_BIT_IS_SET(cmd->features, TX_UDP_TNL, active); + return ret; } # endif -- 2.5.0

2 4

[libvirt] [PATCH] virkeymaps.h: Fix VPATH build with --disable-dependency-tracking
by Michal Privoznik 03 Nov '15

03 Nov '15

Funny things happen when you try to do a VPATH build and pass --disable-dependency-tracking argument to the configure script. Not only the directory structure is not created at the end of configure phase, but also contradictory to others, virkeymaps.h does not depend on src/utils dirstamp. I don't know how to force automake to generate that rule, but this is the diff that makes things work for me again. Yes, as you can see it more or less reverts a9fe620372144db3e432bd7506cb909cc3179ef8. More than less. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- Steps to reproduce: 1) mkdir /tmp/test_libvirt && cd $_ 2) $OLDPWD/configure --disable-dependency-tracking 3) make src/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Makefile.am b/src/Makefile.am index 99b4993..f98912f 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -181,7 +181,7 @@ MAINTAINERCLEANFILES += util/virkeymaps.h util/virkeymaps.h: $(srcdir)/util/keymaps.csv \ $(srcdir)/util/virkeycode-mapgen.py $(AM_V_GEN)$(PYTHON) $(srcdir)/util/virkeycode-mapgen.py \ - <$(srcdir)/util/keymaps.csv >util/virkeymaps.h + <$(srcdir)/util/keymaps.csv >$(srcdir)/util/virkeymaps.h # Internal generic driver infrastructure NODE_INFO_SOURCES = nodeinfo.h nodeinfo.c nodeinfopriv.h -- 2.4.10

3 5

[libvirt] [PATCH] bhyve: add bootrom support
by Roman Bogorodskiy 03 Nov '15

03 Nov '15

Recently, bhyve got UEFI support that eliminates necessity of having two-step process of starting a VM, i.e. loading OS using loader like bhyveloader or grub and then calling bhyve itself. >From user perspective usage looks the following: if a domain XML contains the '<bootloader>' element and it's value is a path to non-executable file, then it's treated as a path to bootrom file and external loader is not execute. All the existing behavior remains the same, e.g. if bootloader is not specified, bhyveloader is used. If loader is specified and it points to an executable file, it's executed before running bhyve. Implementation consists of two major parts: * Add probing for capability by checking if the current bhyve binary accepts '-l bootrom' argument meaning that UEFI is supported * virBhyveProcessBuildBhyveCmd is extended with 'external_loader' argument. If it decides (based on the schema described above) that external loader is not needed, it sets it to false. All the related code changed accordingly to act based on value of external_loader. --- src/bhyve/bhyve_capabilities.c | 11 ++++ src/bhyve/bhyve_capabilities.h | 1 + src/bhyve/bhyve_command.c | 20 +++++++- src/bhyve/bhyve_command.h | 1 + src/bhyve/bhyve_driver.c | 15 +++--- src/bhyve/bhyve_process.c | 58 ++++++++++++---------- .../bhyvexml2argvdata/bhyvexml2argv-bhyveload.args | 3 ++ .../bhyvexml2argv-bhyveload.ldargs | 1 + .../bhyvexml2argvdata/bhyvexml2argv-bhyveload.xml | 24 +++++++++ tests/bhyvexml2argvdata/bhyvexml2argv-bootrom.args | 4 ++ tests/bhyvexml2argvdata/bhyvexml2argv-bootrom.xml | 23 +++++++++ tests/bhyvexml2argvmock.c | 13 +++++ tests/bhyvexml2argvtest.c | 39 ++++++++------- 13 files changed, 162 insertions(+), 51 deletions(-) create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload.args create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload.ldargs create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload.xml create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-bootrom.args create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-bootrom.xml diff --git a/src/bhyve/bhyve_capabilities.c b/src/bhyve/bhyve_capabilities.c index d2970a2..fbdd63c 100644 --- a/src/bhyve/bhyve_capabilities.c +++ b/src/bhyve/bhyve_capabilities.c @@ -166,6 +166,17 @@ virBhyveProbeCaps(unsigned int *caps) if (strstr(help, "-u:") != NULL) *caps |= BHYVE_CAP_RTC_UTC; + virCommandFree(cmd); + + cmd = virCommandNew(binary); + virCommandAddArgList(cmd, "-l", "bootrom", NULL); + if (virCommandRun(cmd, &exit) < 0) { + ret = -1; + goto out; + } + if (exit == 1) + *caps |= BHYVE_CAP_BOOTROM; + out: VIR_FREE(help); virCommandFree(cmd); diff --git a/src/bhyve/bhyve_capabilities.h b/src/bhyve/bhyve_capabilities.h index 0eb22a4..25dfb2c 100644 --- a/src/bhyve/bhyve_capabilities.h +++ b/src/bhyve/bhyve_capabilities.h @@ -33,6 +33,7 @@ typedef enum { typedef enum { BHYVE_CAP_RTC_UTC = 1, + BHYVE_CAP_BOOTROM = 2, } virBhyveCapsFlags; int virBhyveProbeGrubCaps(virBhyveGrubCapsFlags *caps); diff --git a/src/bhyve/bhyve_command.c b/src/bhyve/bhyve_command.c index 6576029..10d504e 100644 --- a/src/bhyve/bhyve_command.c +++ b/src/bhyve/bhyve_command.c @@ -216,7 +216,9 @@ bhyveBuildDiskArgStr(const virDomainDef *def ATTRIBUTE_UNUSED, virCommandPtr virBhyveProcessBuildBhyveCmd(virConnectPtr conn, - virDomainDefPtr def, bool dryRun) + virDomainDefPtr def, + bool *external_loader, + bool dryRun) { /* * /usr/sbin/bhyve -c 2 -m 256 -AI -H -P \ @@ -230,6 +232,22 @@ virBhyveProcessBuildBhyveCmd(virConnectPtr conn, virCommandPtr cmd = virCommandNew(BHYVE); + /* Check what loader to use */ + if ((def->os.bootloader != NULL) && + (!virFileIsExecutable(def->os.bootloader))) { + *external_loader = false; + if ((bhyveDriverGetCaps(conn) & BHYVE_CAP_BOOTROM) == 0) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("Installed bhyve binary does not support " + "bootrom")); + goto error; + } + virCommandAddArg(cmd, "-l"); + virCommandAddArgFormat(cmd, "bootrom,%s", def->os.bootloader); + } else { + *external_loader = true; + } + /* CPUs */ virCommandAddArg(cmd, "-c"); virCommandAddArgFormat(cmd, "%d", def->vcpus); diff --git a/src/bhyve/bhyve_command.h b/src/bhyve/bhyve_command.h index 22a959d..20a3bf0 100644 --- a/src/bhyve/bhyve_command.h +++ b/src/bhyve/bhyve_command.h @@ -32,6 +32,7 @@ virCommandPtr virBhyveProcessBuildBhyveCmd(virConnectPtr conn, virDomainDefPtr def, + bool *external_loader, bool dryRun); virCommandPtr diff --git a/src/bhyve/bhyve_driver.c b/src/bhyve/bhyve_driver.c index 4840a0e..7290251 100644 --- a/src/bhyve/bhyve_driver.c +++ b/src/bhyve/bhyve_driver.c @@ -698,6 +698,7 @@ bhyveConnectDomainXMLToNative(virConnectPtr conn, virDomainDefPtr def = NULL; virCommandPtr cmd = NULL, loadcmd = NULL; virCapsPtr caps = NULL; + bool external_loader = NULL; char *ret = NULL; virCheckFlags(0, NULL); @@ -721,15 +722,17 @@ bhyveConnectDomainXMLToNative(virConnectPtr conn, if (bhyveDomainAssignAddresses(def, NULL) < 0) goto cleanup; - if (!(loadcmd = virBhyveProcessBuildLoadCmd(conn, def, "<device.map>", - NULL))) + if (!(cmd = virBhyveProcessBuildBhyveCmd(conn, def, &external_loader, true))) goto cleanup; - if (!(cmd = virBhyveProcessBuildBhyveCmd(conn, def, true))) - goto cleanup; + if (external_loader) { + if (!(loadcmd = virBhyveProcessBuildLoadCmd(conn, def, "<device.map>", + NULL))) + goto cleanup; - virBufferAdd(&buf, virCommandToString(loadcmd), -1); - virBufferAddChar(&buf, '\n'); + virBufferAdd(&buf, virCommandToString(loadcmd), -1); + virBufferAddChar(&buf, '\n'); + } virBufferAdd(&buf, virCommandToString(cmd), -1); if (virBufferCheckError(&buf) < 0) diff --git a/src/bhyve/bhyve_process.c b/src/bhyve/bhyve_process.c index 284641a..d62cccd 100644 --- a/src/bhyve/bhyve_process.c +++ b/src/bhyve/bhyve_process.c @@ -114,6 +114,7 @@ virBhyveProcessStart(virConnectPtr conn, virCommandPtr load_cmd = NULL; bhyveConnPtr privconn = conn->privateData; int ret = -1, rc; + bool external_loader = NULL; if (virAsprintf(&logfile, "%s/%s.log", BHYVE_LOG_DIR, vm->def->name) < 0) @@ -150,6 +151,7 @@ virBhyveProcessStart(virConnectPtr conn, /* Call bhyve to start the VM */ if (!(cmd = virBhyveProcessBuildBhyveCmd(conn, vm->def, + &external_loader, false))) goto cleanup; @@ -159,38 +161,40 @@ virBhyveProcessStart(virConnectPtr conn, virCommandSetPidFile(cmd, privconn->pidfile); virCommandDaemonize(cmd); - /* Now bhyve command is constructed, meaning the - * domain is ready to be started, so we can build - * and execute bhyveload command */ - rc = virBhyveFormatDevMapFile(vm->def->name, &devmap_file); - if (rc < 0) - goto cleanup; - - if (!(load_cmd = virBhyveProcessBuildLoadCmd(conn, vm->def, devmap_file, - &devicemap))) - goto cleanup; - virCommandSetOutputFD(load_cmd, &logfd); - virCommandSetErrorFD(load_cmd, &logfd); + if (external_loader) { + /* Now bhyve command is constructed, meaning the + * domain is ready to be started, so we can build + * and execute bhyveload command */ + rc = virBhyveFormatDevMapFile(vm->def->name, &devmap_file); + if (rc < 0) + goto cleanup; - if (devicemap != NULL) { - rc = virFileWriteStr(devmap_file, devicemap, 0644); - if (rc) { - virReportSystemError(errno, - _("Cannot write device.map '%s'"), - devmap_file); + if (!(load_cmd = virBhyveProcessBuildLoadCmd(conn, vm->def, devmap_file, + &devicemap))) goto cleanup; + virCommandSetOutputFD(load_cmd, &logfd); + virCommandSetErrorFD(load_cmd, &logfd); + + if (devicemap != NULL) { + rc = virFileWriteStr(devmap_file, devicemap, 0644); + if (rc) { + virReportSystemError(errno, + _("Cannot write device.map '%s'"), + devmap_file); + goto cleanup; + } } - } - /* Log generated command line */ - virCommandWriteArgLog(load_cmd, logfd); - if ((pos = lseek(logfd, 0, SEEK_END)) < 0) - VIR_WARN("Unable to seek to end of logfile: %s", - virStrerror(errno, ebuf, sizeof(ebuf))); + /* Log generated command line */ + virCommandWriteArgLog(load_cmd, logfd); + if ((pos = lseek(logfd, 0, SEEK_END)) < 0) + VIR_WARN("Unable to seek to end of logfile: %s", + virStrerror(errno, ebuf, sizeof(ebuf))); - VIR_DEBUG("Loading domain '%s'", vm->def->name); - if (virCommandRun(load_cmd, NULL) < 0) - goto cleanup; + VIR_DEBUG("Loading domain '%s'", vm->def->name); + if (virCommandRun(load_cmd, NULL) < 0) + goto cleanup; + } /* Now we can start the domain */ VIR_DEBUG("Starting domain '%s'", vm->def->name); diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload.args b/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload.args new file mode 100644 index 0000000..118735e --- /dev/null +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload.args @@ -0,0 +1,3 @@ +/usr/sbin/bhyve -c 1 -m 214 -u -H -P -s 0:0,hostbridge \ +-s 3:0,virtio-net,faketapdev,mac=52:54:00:00:00:00 \ +-s 2:0,ahci-hd,/tmp/freebsd.img bhyve diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload.ldargs b/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload.ldargs new file mode 100644 index 0000000..56f7fb3 --- /dev/null +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload.ldargs @@ -0,0 +1 @@ +/usr/sbin/bhyveload -foo diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload.xml b/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload.xml new file mode 100644 index 0000000..9dac10c --- /dev/null +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload.xml @@ -0,0 +1,24 @@ +<domain type='bhyve'> + <name>bhyve</name> + <uuid>df3be7e7-a104-11e3-aeb0-50e5492bd3dc</uuid> + <memory>219136</memory> + <vcpu>1</vcpu> + <bootloader>/usr/sbin/bhyveload</bootloader> + <bootloader_args>-foo</bootloader_args> + <os> + <type>hvm</type> + </os> + <devices> + <disk type='file'> + <driver name='file' type='raw'/> + <source file='/tmp/freebsd.img'/> + <target dev='hda' bus='sata'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/> + </disk> + <interface type='bridge'> + <model type='virtio'/> + <source bridge="virbr0"/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> + </interface> + </devices> +</domain> diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-bootrom.args b/tests/bhyvexml2argvdata/bhyvexml2argv-bootrom.args new file mode 100644 index 0000000..d46ffab --- /dev/null +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-bootrom.args @@ -0,0 +1,4 @@ +/usr/sbin/bhyve -l bootrom,/path/to/rom.fd \ +-c 1 -m 214 -u -H -P -s 0:0,hostbridge \ +-s 3:0,virtio-net,faketapdev,mac=52:54:00:00:00:00 \ +-s 2:0,ahci-hd,/tmp/freebsd.img bhyve diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-bootrom.xml b/tests/bhyvexml2argvdata/bhyvexml2argv-bootrom.xml new file mode 100644 index 0000000..2da80c5 --- /dev/null +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-bootrom.xml @@ -0,0 +1,23 @@ +<domain type='bhyve'> + <name>bhyve</name> + <uuid>df3be7e7-a104-11e3-aeb0-50e5492bd3dc</uuid> + <memory>219136</memory> + <vcpu>1</vcpu> + <bootloader>/path/to/rom.fd</bootloader> + <os> + <type>hvm</type> + </os> + <devices> + <disk type='file'> + <driver name='file' type='raw'/> + <source file='/tmp/freebsd.img'/> + <target dev='hda' bus='sata'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/> + </disk> + <interface type='bridge'> + <model type='virtio'/> + <source bridge="virbr0"/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> + </interface> + </devices> +</domain> diff --git a/tests/bhyvexml2argvmock.c b/tests/bhyvexml2argvmock.c index 41058ca..797dc20 100644 --- a/tests/bhyvexml2argvmock.c +++ b/tests/bhyvexml2argvmock.c @@ -1,5 +1,6 @@ #include <config.h> +#include "virfile.h" #include "virstring.h" #include "virnetdev.h" #include "virnetdevtap.h" @@ -48,3 +49,15 @@ int virNetDevSetOnline(const char *ifname ATTRIBUTE_UNUSED, { return 0; } + +bool virFileIsExecutable(const char *file) +{ + if (STREQ(file, "/fizz_buzz_bazz")) + return true; + else if (STREQ(file, "/usr/local/sbin/grub-bhyve")) + return true; + else if (STREQ(file, "/usr/sbin/bhyveload")) + return true; + + return false; +} diff --git a/tests/bhyvexml2argvtest.c b/tests/bhyvexml2argvtest.c index 3e57a78..2ff1ae3 100644 --- a/tests/bhyvexml2argvtest.c +++ b/tests/bhyvexml2argvtest.c @@ -23,6 +23,7 @@ static int testCompareXMLToArgvFiles(const char *xml, virDomainDefPtr vmdef = NULL; virCommandPtr cmd = NULL, ldcmd = NULL; virConnectPtr conn; + bool external_loader = NULL; int ret = -1; if (!(conn = virGetConnect())) @@ -34,33 +35,35 @@ static int testCompareXMLToArgvFiles(const char *xml, conn->privateData = &driver; - if (!(cmd = virBhyveProcessBuildBhyveCmd(conn, vmdef, false))) + if (!(cmd = virBhyveProcessBuildBhyveCmd(conn, vmdef, &external_loader, false))) goto out; if (!(actualargv = virCommandToString(cmd))) goto out; - if (!(ldcmd = virBhyveProcessBuildLoadCmd(conn, vmdef, "<device.map>", - &actualdm))) - goto out; - - if (actualdm != NULL) - virTrimSpaces(actualdm, NULL); - - if (!(actualld = virCommandToString(ldcmd))) - goto out; + if (external_loader) { + if (!(ldcmd = virBhyveProcessBuildLoadCmd(conn, vmdef, "<device.map>", + &actualdm))) + goto out; - if (virtTestCompareToFile(actualargv, cmdline) < 0) - goto out; + if (actualdm != NULL) + virTrimSpaces(actualdm, NULL); - if (virtTestCompareToFile(actualld, ldcmdline) < 0) - goto out; + if (!(actualld = virCommandToString(ldcmd))) + goto out; - if (virFileExists(dmcmdline) || actualdm) { - if (virtTestCompareToFile(actualdm, dmcmdline) < 0) + if (virtTestCompareToFile(actualld, ldcmdline) < 0) goto out; + + if (virFileExists(dmcmdline) || actualdm) { + if (virtTestCompareToFile(actualdm, dmcmdline) < 0) + goto out; + } } + if (virtTestCompareToFile(actualargv, cmdline) < 0) + goto out; + ret = 0; out: @@ -118,7 +121,7 @@ mymain(void) } while (0) driver.grubcaps = BHYVE_GRUB_CAP_CONSDEV; - driver.bhyvecaps = BHYVE_CAP_RTC_UTC; + driver.bhyvecaps = BHYVE_CAP_RTC_UTC | BHYVE_CAP_BOOTROM; DO_TEST("base"); DO_TEST("acpiapic"); @@ -130,8 +133,10 @@ mymain(void) DO_TEST("grub-defaults"); DO_TEST("grub-bootorder"); DO_TEST("grub-bootorder2"); + DO_TEST("bhyveload"); DO_TEST("bhyveload-explicitargs"); DO_TEST("custom-loader"); + DO_TEST("bootrom"); DO_TEST("disk-cdrom-grub"); DO_TEST("serial-grub"); DO_TEST("localtime"); -- 2.6.1

2 3

[libvirt] Ten years of libvirt
by Michal Privoznik 03 Nov '15

03 Nov '15

Dear list, join me on this big day in congratulations to libvirt that has just turned 10 and is starting new decade of its life. At the same time big thanks to all who contributed in any way. Cheers! Michal

6 6

Re: [libvirt] [PATCH 7/8] Postpone reprobing till all the devices in iommu group are unbound from vfio
by Andrea Bolognani 02 Nov '15

02 Nov '15

On Mon, 2015-11-02 at 10:06 +0530, Shivaprasad bhat wrote: > > > +{ > > > + int ret = 0; > > > + virPCIDevicePtr pci = NULL; > > > + > > > + if (!(pci = virPCIDeviceNew(devAddr->domain, devAddr->bus, > > > + devAddr->slot, devAddr->function))) > > > + goto cleanup; > > > + > > > + if (STREQ_NULLABLE(pci->stubDriver, "vfio-pci")) > > > + ret = -1; > > > > As mentioned in the comment for Patch 1, I think this is > > fairly obscure: if I had not read throught the whole > > series, I'd assume this checks whether the device is > > configured to use vfio-pci as stub driver, not whether > > it is currently bound to it, and it would not be > > immediately clear to me how this check fits in a function > > called virPCIDeviceBoundToVFIODriver(). > > > > I think it would be much cleaner to query the driver > > explicitly using virPCIDeviceGetDriverPathAndName() and > > remove that call from virPCIDeviceNew(). > > > > The PCIDeviceNew does exactly the same of going through > the sysfs and populating it. Its only code which is as though > the stubDriver scan is happening inside than explicitly outside. > > The Iterator today takes virPCIDeviceAddressPtr and > virPCIDeviceGetDriverPathAndName for which we anyway need to > call virPCIDevNew. I am just avoiding one extra function call by > moving it inside virPCIDevNew The problem I have with this approach is that, as far as I understand, before your patch dev->stubDriver is a configuration item: you set it to whatever's appropriate, and the value is later inspected in virPCIDeviceBindToStub()[1] to decide what stub driver the device should be bound to. After your patch, depending on the context, it could be either a configuration item, as before, or state, eg. the current stub driver the device is bound to, with no clear way to tell one situation from the other. I think using a single attribute to store related but different information should be avoided, as it has the potential to make the code much harder to understand, especially later on for someone who's not been involved in the implementation. Moreover you only need that value for comparison purposes in a couple of places, and by moving the code to virPCIDeviceNew() you make it so the value is loaded (by performing filesystem operations) every single time a virDevice is created, whether the value is actually used or not. Cheers. [1] Rather virPCIDeviceDetach() in reality - I have a pending patch that moves it to virPCIDeviceBindToStub() where it IMHO belongs -- Andrea Bolognani Software Engineer - Virtualization Team

1 0

[libvirt] [PATCH v6 00/13] qemu: Add quorum support to libvirt
by Matthias Gatto 02 Nov '15

02 Nov '15

The purpose of these patches is to introduce quorum for libvirt I've try to follow this proposal: http://www.redhat.com/archives/libvir-list/2014-May/msg00533.html This feature ask for 6 task: 1) Allow a _virStorageSource to contain more than one backing store. Because all the actual libvirt code use the backingStore field as a pointer and we needs want to change that, I've decide to encapsulate the backingStore field to simplifie the array manipulation. 2) Add the missing field a quorum need in _virStorageSource and the VIR_STORAGE_TYPE_QUORUM and VIR_STORAGE_FILE_QUORUM in their respectives enums. 3) Parse and format the xml Because a quorum allows to have more than one backing store at the same level we need to change virDomainDiskDefFormat and virDomainDiskDefParseXML to call virDomainDiskBackingStoreFormat and virDomainDiskBackingStoreParse in a loop. virDomainDiskBackingStoreFormat and virDomainDiskBackingStoreParse can call themself recursively in a loop because a quorum can contain another quorum 4) Build qemu string As for the xml, we have to call the function which create quorum recursively. But this task have the problem explained here: http://www.redhat.com/archives/libvir-list/2014-October/msg00529.html The _virStorageSource missing some informations that can be passed to a child, and therefore this version of quorum is incomplet. 5) Allow to hotplug/change a disk in a quorum This part is not present in these patches because for this task we have to use blockdev-add, and currently libvirt use device_add for hotpluging that doesn't allow to hotplug quorum childs. There is 3 way to handle this problem: 1) create a virDomainBlockDevAdd function in libvirt witch call blockdev-add. 2) use blockdev-add instead of device_add in qemuMonitorJSONAddDevice 3) write a hack which uses blockdev-add only when attaching a quorum child V2: -Rebase on master -Add Documentation V3: -Transforme the backingStore field in virStorageSource into an array of pointer instead of a pointer -Modify virStorageSourceSetBackingStore to allow it to expand the backingStore size. V4: -Rebase on master V5: -Rebase on master -patch 1-4/9: use patchs from John Ferlan -patch 4/9: check return of virStorageSourceSetBackingStore -patch 5/9: report type of error on virStorageSourceSetBackingStore v6 note: First at all, I'm sorry for the time between v5 and v6, I had other projects to work on and was unable to work at full time on libvirt, moreover I've try at first to support all snapshot and block jobs operations for quorum, but encounter a lot a problems. At the end I had a versions which was only handling some few operations, so I've block all unsupported operations for quorum, I plan to continue working on the quorum unsupported operations, and send it when it will be ready, but in the meantime I hope to upstream this serie of patch which should provide a very basic(but stable) quorum suport. v6 modifications: -Rebase on master -Remove node-name patch -patch 06/13: Add virStorageSourceIsRAID -patch 10/13: Add virDomainDefHasRAID -patch 11-13/13: Block all unsupported operations Matthias Gatto (13): virstoragefile: Add virStorageSourceGetBackingStore virstoragefile: Always use virStorageSourceGetBackingStore to get backing store virstoragefile: Add virStorageSourceSetBackingStore virstoragefile: Always use virStorageSourceSetBackingStore to set backing store virstoragefile: change backingStore to backingStores. virstoragefile: Add virStorageSourceIsRAID virstoragefile: Add quorum in virstoragefile domain_conf: Read and Write quorum config qemu: Add quorum support in qemuBuildDriveDevStr domain: add virDomainDefHasRAID qemu: Block snapshot operation with RAID qemu: qemuDomainGetBlockInfo quorum support qemu: qemuDiskPathToAlias quorum support docs/formatdomain.html.in | 23 +++- docs/schemas/domaincommon.rng | 21 +++- docs/schemas/storagecommon.rng | 1 + docs/schemas/storagevol.rng | 1 + src/conf/domain_conf.c | 196 +++++++++++++++++++++++++--------- src/conf/domain_conf.h | 1 + src/conf/storage_conf.c | 23 ++-- src/libvirt_private.syms | 4 + src/qemu/qemu_cgroup.c | 4 +- src/qemu/qemu_command.c | 94 ++++++++++++++++ src/qemu/qemu_domain.c | 2 +- src/qemu/qemu_driver.c | 50 ++++++--- src/qemu/qemu_migration.c | 1 + src/qemu/qemu_monitor_json.c | 4 +- src/security/security_dac.c | 2 +- src/security/security_selinux.c | 4 +- src/security/virt-aa-helper.c | 2 +- src/storage/storage_backend.c | 22 ++-- src/storage/storage_backend_fs.c | 38 ++++--- src/storage/storage_backend_gluster.c | 11 +- src/storage/storage_backend_logical.c | 15 ++- src/storage/storage_driver.c | 3 +- src/util/virstoragefile.c | 118 +++++++++++++++++--- src/util/virstoragefile.h | 15 ++- tests/virstoragetest.c | 18 ++-- 25 files changed, 523 insertions(+), 150 deletions(-) -- 2.6.1

2 23

[libvirt] [PATCH v3 0/9] Few VFIO related fixes
by Shivaprasad G Bhat 02 Nov '15

02 Nov '15

The following series implements... --- Addressed comments on V2 and V1 Fixed the while loop exit in P8 virPCIDeviceUnbindFromStub() Shivaprasad G Bhat (9): Implement virPCIIsKnownStub function Initialize the stubDriver of pci devices if bound to a valid one Add iommu group number info to virPCIDevice Refuse to reattach from vfio if the iommu group is in use by any domain Wait for vfio-pci device cleanups before reassinging the device to host driver Split reprobe action from the virPCIUnbindFromStub into a new function Pass activeDevs and inactiveDevs to virPCIDeviceUnbindFromStub and virPCIDeviceBindToStub Postpone reprobing till all the devices in iommu group are unbound from vfio Wait for iommmu device to go away before reprobing the host driver src/libvirt_private.syms | 1 src/util/virhostdev.c | 18 +++ src/util/virpci.c | 300 +++++++++++++++++++++++++++++++++++++++------- src/util/virpci.h | 2 tests/virpcimock.c | 187 ++++++++++++++++++++++++++--- tests/virpcitest.c | 152 +++++++++++++++++++---- 6 files changed, 566 insertions(+), 94 deletions(-) -- Signature

1 9

[libvirt] [PATCH 0/4] *** Don't include .c file for editing support ***
by rodinasophie＠gmail.com 02 Nov '15

02 Nov '15

From: sonya <rodinasophie(a)gmail.com> *** BLURB HERE *** sonya (4): General structures and interfaces were added Virsh-edit interface was added Comment in virsh-edit.h was changed Style-errors are fixed tools/Makefile.am | 1 + tools/virsh-domain.c | 187 ++++++++++++++++++++++++++++++++++++------------ tools/virsh-edit.c | 100 ++++++-------------------- tools/virsh-edit.h | 42 +++++++++++ tools/virsh-interface.c | 64 +++++++++++++---- tools/virsh-network.c | 62 ++++++++++++---- tools/virsh-nwfilter.c | 64 +++++++++++++---- tools/virsh-pool.c | 64 +++++++++++++---- tools/virsh-snapshot.c | 76 ++++++++++++++------ 9 files changed, 464 insertions(+), 196 deletions(-) create mode 100644 tools/virsh-edit.h -- 2.1.4

2 6

[libvirt] [PATCH] syntax-check: Add sc_prohibit_space_in_label rule
by Andrea Bolognani 02 Nov '15

02 Nov '15

This guards against code such as cleanup : which is happily accepted by the compiler but does not conform to our style guidelines. --- cfg.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/cfg.mk b/cfg.mk index a9bba38..8462051 100644 --- a/cfg.mk +++ b/cfg.mk @@ -919,6 +919,12 @@ sc_require_space_before_label: halt="Top-level labels should be indented by one space" \ $(_sc_search_regexp) +sc_prohibit_space_in_label: + @prohibit='^[_a-zA-Z0-9]+ +:$$' \ + in_vc_files='\.[ch]$$' \ + halt="There should be no space between label name and colon" \ + $(_sc_search_regexp) + # Doesn't catch all cases of mismatched braces across if-else, but it helps sc_require_if_else_matching_braces: @prohibit='( else( if .*\))? {|} else( if .*\))?$$)' \ -- 2.4.3

2 2

[libvirt] [PATCH v2 0/9] Few VFIO related fixes
by Shivaprasad G Bhat 02 Nov '15

02 Nov '15

The following series fixes few VFIO related host crashes during hotplug/unplug or bind/unbind. --- Shivaprasad G Bhat (9): Implement virPCIIsAKnownStub function Initialize the stubDriver of pci devices if bound to a valid one Add iommu group number info to virPCIDevice Refuse to reattach from vfio if the iommu group is in use by any domain Wait for vfio-pci device cleanups before reassinging the device to host driver Split reprobe action from the virPCIUnbindFromStub into a new function Pass activeDevs and inactiveDevs to virPCIDeviceUnbindFromStub and virPCIDeviceBindToStub Postpone reprobing till all the devices in iommu group are unbound from vfio Wait for iommmu device to go away before reprobing the host driver src/libvirt_private.syms | 1 src/util/virhostdev.c | 18 +++ src/util/virpci.c | 289 ++++++++++++++++++++++++++++++++++++++-------- src/util/virpci.h | 2 tests/virpcimock.c | 187 +++++++++++++++++++++++++++--- tests/virpcitest.c | 152 ++++++++++++++++++++---- 6 files changed, 555 insertions(+), 94 deletions(-) -- Signature

3 14

[libvirt] Happy Birthday Libvirt
by Daniel Veillard 02 Nov '15

02 Nov '15

Hello everybody, as the first commits were done on Nov 2 2005, libvirt is more or less ten years old. This has been quite a bit of a journey, but a very successful one in my opinion, the initial goal was to provide a long term stable API for virtualization in the Red Hat ecosystem, and I'm very happy to see the goal has been reached, and we went way beyond that. In the end I think libvirt helped avoid the "balkanization" which is classic in highly competitive domains where you end up with one vertical set of tools per vendor. I also think that libvirt played a key role to keep free and open source software in the main virtualization offerings and even more so for cloud management systems. So it's time to celebrate, there is obviously lot to be done still on libvirt (as the steady stream of patches show !), but I would like to thank everybody who has contributed to the project so far, with a special mention to Dan Berrange who has been leading the effort technically for most of that time. I would also say that I have been very pelased with how the project has been working in that decade, the community is technical but friendly, and it's my hope libvirt, the project as well as the code, will remain as successful for the next decade ! So Thank You everybody, for making this project and community successful ! Enjoy that very special day :-) 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] [PATCH 0/8] Few vfio related fixes
by Shivaprasad G Bhat 02 Nov '15

02 Nov '15

The series fixes 3 issues which lead to host crash. The actual fixes are in p3, p4, p7 and p8. I'll fill in more details / descriptions in v2. The make check fails on virpcitest now, which I am still debugging. I anticipate some rework from review on p7 which I continue to refine. Sending now, to get any feedback that might change things drastically. --- Shivaprasad G Bhat (8): Initialize the stubDriver of pci devices if bound to a valid one Add iommu group number info to virPCIDevice Refuse to reattach from vfio if the iommu group is in use by any domain Wait for vfio-pci device cleanups before reassinging the device to host driver Split reprobe action from the virPCIUnbindFromStub into a new function Pass activeDevs and inactiveDevs to virPCIDeviceUnbindFromStub and virPCIDeviceBindToStub Postpone reprobing till all the devices in iommu group are unbound from vfio Wait for iommmu device to go away before reprobing the host driver src/util/virhostdev.c | 18 ++++ src/util/virpci.c | 206 ++++++++++++++++++++++++++++++++++++++----------- 2 files changed, 177 insertions(+), 47 deletions(-) -- Signature

4 19

[libvirt] Entering freeze for libvirt-1.2.21
by Daniel Veillard 02 Nov '15

02 Nov '15

As pointed our on Tuesday it's time for a new release. I have tagged the release candidate 1 in git and pushed signed tarball and rpms to the usual place at: ftp://libvirt.org/libvirt/ Based on my limited testing this works just fine, but that's very limited and doesn't test portability at all, so please give it a try ! I will likely push rc2 on the week-end and the final version on Tuesday or Wednesday, please raise issues if you fine any, thanks, 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/

2 5

[libvirt] Outreachy 2015 DecemberMarch- Enhancing libvirt-designer
by Riyafa Abdul Hameed 01 Nov '15

01 Nov '15

Dear sir, I am Computer Science and Engineering undergraduate at University of Moratuwa, Sri Lanka. I am a keen learner and am much interested in open source. I have worked with WSO2 <http://wso2.com/> on open source projects and am quite familiar with FOSS development. I have a good knowledge in C and in using XML. I would like to participate in "Outreachy 2015 DecemberMarch" with QEMU, but it was already quite late when I came to know of this program as its application deadline closes by tomorrow. I would like to apply for the project "Enhancing libvirt-designer" this time for Outreachy. I sent a mail to the mentor, Michal Privoznik and I couldn't get in touch with him. Because it is already too late can anyone please suggest what I can do before I apply for the program by tomorrow? Thank you. Yours sincerely, Riyafa -- Riyafa Abdul Hameed Undergraduate, University of Moratuwa Email: riyafa3(a)gmail.com Website: https://riyafa.wordpress.com/ <http://riyafa.wordpress.com/> <http://facebook.com/riyafa.ahf> <http://lk.linkedin.com/in/riyafa> <http://twitter.com/Riyafa1>

1 0

[libvirt] [PATCH 1/3] cpu_map.xml: add cmt feature to x86
by Qiaowei Ren 31 Oct '15

31 Oct '15

Some Intel processor families (e.g. the Intel Xeon processor E5 v3 family) introduced CMT (Cache Monitoring Technology) to measure the usage of cache by applications running on the platform. This patch add it into x86 part of cpu_map.xml. Signed-off-by: Qiaowei Ren <qiaowei.ren(a)intel.com> --- .gnulib | 2 +- src/cpu/cpu_map.xml | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.gnulib b/.gnulib index f39477d..106a386 160000 --- a/.gnulib +++ b/.gnulib @@ -1 +1 @@ -Subproject commit f39477dba778e99392948dd3dd19ec0d46aee932 +Subproject commit 106a3866d01f9dd57ab4f10dbeb0d5a8db73a9f7 diff --git a/src/cpu/cpu_map.xml b/src/cpu/cpu_map.xml index b9e95cf..14ccbd8 100644 --- a/src/cpu/cpu_map.xml +++ b/src/cpu/cpu_map.xml @@ -317,6 +317,9 @@ <feature name='rtm'> <cpuid function='0x00000007' ebx='0x00000800'/> </feature> + <feature name='cmt'> + <cpuid function='0x00000007' ebx='0x00001000'/> + </feature> <feature name='rdseed'> <cpuid function='0x00000007' ebx='0x00040000'/> </feature> -- 1.9.1

5 10

[libvirt] [python PATCH] fix crash introduced by commit 1d39dbaf
by Pavel Hrdina 31 Oct '15

31 Oct '15

Some of the libvirt_*Wrap functions steals the reference and we need to set the item in array to NULL no not free it on success. Those three places was accidentally removed by commit 1d39dbaf. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1270977 Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- Pushed as fix for critical crasher. libvirt-override.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/libvirt-override.c b/libvirt-override.c index c6c1da8..5f1c98f 100644 --- a/libvirt-override.c +++ b/libvirt-override.c @@ -2448,6 +2448,7 @@ libvirt_virDomainListAllSnapshots(PyObject *self ATTRIBUTE_UNUSED, for (i = 0; i < c_retval; i++) { VIR_PY_LIST_SET_GOTO(py_retval, i, libvirt_virDomainSnapshotPtrWrap(snaps[i]), error); + snaps[i] = NULL; } cleanup: @@ -2544,9 +2545,11 @@ libvirt_virDomainSnapshotListAllChildren(PyObject *self ATTRIBUTE_UNUSED, if (!(py_retval = PyList_New(c_retval))) goto cleanup; - for (i = 0; i < c_retval; i++) + for (i = 0; i < c_retval; i++) { VIR_PY_LIST_SET_GOTO(py_retval, i, libvirt_virDomainSnapshotPtrWrap(snaps[i]), error); + snaps[i] = NULL; + } cleanup: for (i = 0; i < c_retval; i++) @@ -3117,9 +3120,11 @@ libvirt_virConnectListAllNetworks(PyObject *self ATTRIBUTE_UNUSED, if (!(py_retval = PyList_New(c_retval))) goto cleanup; - for (i = 0; i < c_retval; i++) + for (i = 0; i < c_retval; i++) { VIR_PY_LIST_SET_GOTO(py_retval, i, libvirt_virNetworkPtrWrap(nets[i]), error); + nets[i] = NULL; + } cleanup: for (i = 0; i < c_retval; i++) -- 2.6.2

1 0

[libvirt] RFC: Improve performance of macvtap device creation
by Tony Krowiak 31 Oct '15

31 Oct '15

For a guest domain defined with a large number of macvtap devices, it takes an exceedingly long time to boot the guest. In a test of a guest domain configured with 82 macvtap devices, it took over two minutes for the guest to boot. An strace of the ioctl calls during guest start up showed the SIOCGIFFLAGS ioctl literally being invoked 3,403 times. I was able to isolate the source of the ioctl calls to the*virNetDevMacVLanCreateWithVPortProfile* function in*virnetdevmacvlan.c*. The macvtap interface name is created by looping over a counter variable, starting with zero, and appending the counter value to 'macvtap'. With each iteration, a call is made to*virNetDevExists* (SIOCGIFFLAGS ioctl) to determine if a device with that name already exists, until a unique name is created. In the test case cited above, to create an interface name for the 82nd macvtap device, the*virNetDevExists* function will be called for interface names 'macvtap0' to 'macvtap80' before it is determined that 'mavtap81' can be used. So if N is the number of macvtap interfaces defined for a guest, the SIOCGIFFLAGS ioctl will be invoked (N x N + N)/2 times to find an unused macvtap device names. That's assuming only one guest is being started, who knows how many times the ioctl may have to be called in an installation running a large number of guests defined with macvtap devices. I was able to reduce the amount of time for starting a guest domain defined with 82 macvtap devices from over 2 minutes to about 14 seconds by keeping track of the interface name suffixes previously used. I defined two static bit maps (virBitmap), one each for macvtap and macvlan device name suffixes. When a macvtap/macvlan device is created, the index of the next clear bit (virBitmapNextClearBit) is retrieved to create the name. If an interface with that name does not exist, the device is created and the bit at the index used to create the interface name is set (virBitmapSetBit). When a macvtap/macvlan device is deleted, if the interface name has the pattern 'macvtap%d' or 'macvlan%d', the suffix is parsed into a bit index and used to clear the (virBitMapClearBit) bit in the respective bitmap. I am not sure that is the best design because there is no way to track interface names used to create macvtap devices outside of libvirt, for example using the ip command. There may also be other issues I've not contemplated. I included a couple of additional ideas below and am looking for comments or other suggestions that I have not considered. * Define a global counter variable initialized to 0, that gets incremented each time an interface name is created, to keep track of the last used interface name suffix. At some maximum value, the counter will be set back to 0. * Append a random number to 'macvlan' or 'macvtap' when creating the interface name. Of course, the number of digits would have to be limited so the interface name would not exceed the maximum allowed. * Create the interface name in code that has more knowledge of the environment and pass the name into the *virNetDevMacVLanCreateWithVPortProfile* function via the *tgifname* parameter. For example, the *qemuBuildCommandLine* function in *qemu_command.c* contains the loop that iterates over the network devices defined for the guest domain that ultimately get created via the *virNetDevMacVLanCreateWithVPortProfile* function. That function has access to the network device configuration and at the very least could ensure none of the names previously defined for the guest aren't used. I believe it would be matter of creating a macvtap interface name - e.g., maybe a call to some function in *virnetdevmacvlan.c* - and setting the name in the virDomainNetDef structure prior to invoking *qemuBuildInterfaceCommandLine*? There are shortcomings in all of these ideas, so if you have a better one, feel free to present it.

4 7

[libvirt] RAM backend and guest ABI (was Re: [Qemu-devel] [PATCH v2] pc: memhp: enforce minimal 128Mb) alignment for pc-dimm
by Eduardo Habkost 30 Oct '15

30 Oct '15

(CCing Michal and libvir-list, so libvirt team is aware of this restriction) On Thu, Oct 29, 2015 at 02:36:37PM +0100, Igor Mammedov wrote: > On Tue, 27 Oct 2015 14:36:35 -0200 > Eduardo Habkost <ehabkost(a)redhat.com> wrote: > > > On Tue, Oct 27, 2015 at 10:14:56AM +0100, Igor Mammedov wrote: > > > On Tue, 27 Oct 2015 10:53:08 +0200 > > > "Michael S. Tsirkin" <mst(a)redhat.com> wrote: > > > > > > > On Tue, Oct 27, 2015 at 09:48:37AM +0100, Igor Mammedov wrote: > > > > > On Tue, 27 Oct 2015 10:31:21 +0200 > > > > > "Michael S. Tsirkin" <mst(a)redhat.com> wrote: > > > > > > > > > > > On Mon, Oct 26, 2015 at 02:24:32PM +0100, Igor Mammedov wrote: > > > > > > > Yep it's workaround but it works around QEMU's broken virtio > > > > > > > implementation in a simple way without need for guest side changes. > > > > > > > > > > > > > > Without foreseeable virtio fix it makes memory hotplug unusable and even > > > > > > > more so if there were a virtio fix it won't fix old guests since you've > > > > > > > said that virtio fix would require changes of both QEMU and guest sides. > > > > > > > > > > > > What makes it not foreseeable? > > > > > > Apparently only the fact that we have a work-around in place so no one > > > > > > works on it. I can code it up pretty quickly, but I'm flat out of time > > > > > > for testing as I'm going on vacation soon, and hard freeze is pretty > > > > > > close. > > > > > I can lend a hand for testing part. > > > > > > > > > > > > > > > > > GPA space is kind of cheap, but wasting it in chunks of 512M > > > > > > seems way too aggressive. > > > > > hotplug region is sized with 1Gb alignment reserve per DIMM so we aren't > > > > > actually wasting anything here. > > > > > > > > > > > > > If I allocate two 1G DIMMs, what will be the gap size? 512M? 1G? > > > > It's too much either way. > > > minimum would be 512, and if backend is 1Gb-hugepage gap will be > > > backend's natural alignment (i.e. 1Gb). > > > > Is backend configuration even allowed to affect the machine ABI? We need > > to be able to change backend configuration when migrating the VM to > > another host. > for now, one has to use the same type of backend on both sides > i.e. if source uses 1Gb huge pages backend then target also > need to use it. > The page size of the backend don't even depend on QEMU arguments, but on the kernel command-line or hugetlbfs mount options. So it's possible to have exactly the same QEMU command-line on source and destination (with an explicit versioned machine-type), and get a VM that can't be migrated? That means we are breaking our guarantees about migration and guest ABI. > We could change this for the next machine type to always force > max alignment (1Gb), then it would be possible to change > between backends with different alignments. I'm not sure what's the best solution here. If always using 1GB is too aggressive, we could require management to ask for an explicit alignment as a -machine option if they know they will need a specific backend page size. BTW, are you talking about the behavior introduced by aa8580cddf011e8cedcf87f7a0fdea7549fc4704 ("pc: memhp: force gaps between DIMM's GPA") only, or the backend page size was already affecting GPA allocation before that commit? -- Eduardo

2 1

[libvirt] [PATCH v2 0/3] improve virsh attach-interface
by Pavel Hrdina 30 Oct '15

30 Oct '15

new in v2: - removed netdev name as an option for --source parameter - removed --driver parameter, the default is vfio for new qemu and that's good enough Pavel Hrdina (3): virsh-nodedev: makes struct and functions for NodeDevice list available virsh-domain: update attach-interface to support type=hostdev virsh.pod: update and improve a attach-interface section tools/virsh-domain.c | 34 +++++++++++++++++++-- tools/virsh-nodedev.c | 16 ++++------ tools/virsh-nodedev.h | 11 +++++++ tools/virsh.pod | 82 +++++++++++++++++++++++++++++++-------------------- 4 files changed, 98 insertions(+), 45 deletions(-) -- 2.6.2

2 13

[libvirt] qemu-agent-command via isa-serial for freebsd
by Vasiliy Tolstov 30 Oct '15

30 Oct '15

Hi! I'm need to control freebsd guest via qemu-ga, as i see qemu-ga already supports isa-serial connection. How i need to configure domain via libvirt to able virsh qemu-agent-command to this guest vm? -- Vasiliy Tolstov, e-mail: v.tolstov(a)selfip.ru

3 10

[libvirt] [PATCH] util: set error if DAD is not finished
by Luyao Huang 30 Oct '15

30 Oct '15

If DAD not finished in 5 seconds, user will get an unknown error like this: # virsh net-start ipv6 error: Failed to start network ipv6 error: An error occurred, but the cause is unknown Call virReportError to set an error. Signed-off-by: Luyao Huang <lhuang(a)redhat.com> --- I found the DAD will take 7 seconds on my machine, and i cannot create a network which use ipv6 now :( . Can we offer a way allow user to change this timeout ? maybe add a configuration file option in libvirtd.conf. src/util/virnetdev.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c index 9789e93..c8861e9 100644 --- a/src/util/virnetdev.c +++ b/src/util/virnetdev.c @@ -1398,7 +1398,13 @@ virNetDevWaitDadFinish(virSocketAddrPtr *addrs, size_t count) VIR_FREE(resp); } /* Check timeout. */ - ret = dad ? -1 : 0; + if (dad) { + virReportError(VIR_ERR_SYSTEM_ERROR, + _("Duplicate Address Detection " + "not finished in %d seconds"), VIR_DAD_WAIT_TIMEOUT); + } else { + ret = 0; + } cleanup: VIR_FREE(resp); -- 1.8.3.1

5 5

[libvirt] Again cgroups and isolcpus
by Henning Schild 30 Oct '15

30 Oct '15

Hi folks, i already started a discussion on the interaction of cgroups and isolcpus a while ago. But now i believe i have got a better understanding of how the two interact and i can describe problems that arise from that. The scenario: A machine that runs realtime tasks on pcpus reserved with isolcpus. It also runs VMs with the help of libvirt. It might also run realtime VMs with the help of libvirt. Moving a task into a new cgroup/cpuset and some modifications of the cpus in that set imply a setaffinity by the kernel. That affinity setting will ignore isolcpus. The result is possible "interference by" or "starvation of" these tasks. Now let me describe one scenario where that implicit setaffinity becomes a problem for our realtime system. libvirt creates a superset called the machine.slice and subsets called emulator and vpuX. By default the machine.slice inherits from the root which contains all pcpus, also the isolated ones. Now moving a task into that superset will place that task on isolcpus where it might interfere or simply starve. Turns out that a fresh qemu actually is put into that superset. That is a bug that should be fixed but let me address that one in another mail. My current point of view is that we need a strong mechanism to isolate cpus. isolcpus just is not good enough. The measure of choice probably is cpusets as well, and this time with the exclusive flag turned on. That will stop every other cpuset user from messing around with those cpus by accident. I am thinking of one or more cpusets where isolated cpus are parked and not used within this cgroup. Anyone wanting to use one of them will have to take it out there and explictily put it into their a new set. Now if libvirt makes the mistake to have tasks running in supersets these tasks will spread to the newly added rt-cpu. Or new tasks that run in supersets will end up on rt-cpus already in use. But at least we have containment in libvirt and the VMs it spawned. For alloc and free of rt-cpus i am planning to use libvirt hooks to begin with, from what i read they should enable me to do what i need. What do you guys think about the general idea to address the described problem? I will implement a prototype of the alloc-free of rt-cpus. My current hope is that libvirt hooks can be abused for that. I am thinking that at some point libvirt should be able to do that without hooks. It should get a notion of reserved ressources that are currently parked in other cgroups. My current suspicion is that the cpusets might just be the tip of the iceberg. -- for now i am running libvirt without cgroups to keep my isolcpus free cgroups/cpusets offer a switch to make a cpu exclusive to a set. That switch is great because it will act as an assert, a second line of defense. Having seen how cpusets and migration mess around with affinities i guess for realtime people have to insist on that second line of defense. Especially in times where cgroups are all over the place. In openstack one would actually say that a pcpu should be "dedicated". That will result in a vcpupin on exactly one pcpu. Unfortunately one meaning of "dedicated" gets lost in translation. It could otherwise be used by libvirtd to set cpuset.cpu_exclusive in the vcpu-cgroup. And i am bringing that up here because i do not think libvirt allows me to influence the cpu_exclusive flag for my vcpu cgroups. Henning

1 0

[libvirt] libvirt guest-agent-command error
by Vasiliy Tolstov 29 Oct '15

29 Oct '15

Hi. I'm debug some issues with guest-agent inside vm and find this bug, that affected me https://bugzilla.redhat.com/show_bug.cgi?id=1090551 Does anybody knows how to properly fix this ? -- Vasiliy Tolstov, e-mail: v.tolstov(a)selfip.ru

2 1

[libvirt] [PATCH] wireshark: Install to generic plugin directory
by Michal Privoznik 29 Oct '15

29 Oct '15

There has been a report on the list [1] that we are not installing the wireshark dissector into the correct plugin directory. And in fact we are not. The problem is, the plugin directory path is constructed at compile time. However, it's dependent on the wireshark version, e.g. /usr/lib/wireshark/1.12.6/plugins/ This is rather unfortunate, because if libvirt RPMs were built with one version, but installed on a system with newer one, the plugins are not really loaded. This problem lead fedora packagers to unify plugin path to: /usr/lib/wireshark/plugins/ Cool! But this was enabled just in wireshark-1.12.6-4. Therefore, we must require at least that version. And while at it, on some distributions, the wireshark.pc file already has a variable that defines where plugin dir is. Use that if possible. 1: https://www.redhat.com/archives/libvirt-users/2015-October/msg00063.html Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- libvirt.spec.in | 6 ++++-- m4/virt-wireshark.m4 | 7 ++++++- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 9dff994..469bfca 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1170,7 +1170,7 @@ virtualization capabilities of recent versions of Linux (and other OSes). %package wireshark Summary: Wireshark dissector plugin for libvirt RPC transactions Group: Development/Libraries -Requires: wireshark +Requires: wireshark >= 1.12.6-4 Requires: %{name}-client = %{version}-%{release} %description wireshark @@ -1561,6 +1561,8 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libvirt/connection-driver/*.a %endif %if %{with_wireshark} rm -f $RPM_BUILD_ROOT%{_libdir}/wireshark/plugins/*/libvirt.la +mv $RPM_BUILD_ROOT%{_libdir}/wireshark/plugins/*/libvirt.so \ + $RPM_BUILD_ROOT%{_libdir}/wireshark/plugins/libvirt.so %endif # Temporarily get rid of not-installed libvirt-admin.so @@ -2279,7 +2281,7 @@ exit 0 %if %{with_wireshark} %files wireshark -%{_libdir}/wireshark/plugins/*/libvirt.so +%{_libdir}/wireshark/plugins/libvirt.so %endif %if %{with_lxc} diff --git a/m4/virt-wireshark.m4 b/m4/virt-wireshark.m4 index 47204ed..199317e 100644 --- a/m4/virt-wireshark.m4 +++ b/m4/virt-wireshark.m4 @@ -28,7 +28,12 @@ AC_DEFUN([LIBVIRT_CHECK_WIRESHARK],[ dnl Check for system location of wireshark plugins if test "x$with_wireshark_dissector" != "xno" ; then if test "x$with_ws_plugindir" = "xcheck" ; then - ws_plugindir="$libdir/wireshark/plugins/$($PKG_CONFIG --modversion wireshark)" + ws_plugindir="$($PKG_CONFIG --variable plugindir wireshark)" + if test "x$ws_plugindir" = "x" ; then + dnl On some systems the plugindir variable may not be stored within pkg config. + dnl Fall back to older style of constructing the plugin dir path. + ws_plugindir="$libdir/wireshark/plugins/$($PKG_CONFIG --modversion wireshark)" + fi elif test "x$with_ws_plugindir" = "xno" || test "x$with_ws_plugindir" = "xyes"; then AC_MSG_ERROR([ws-plugindir must be used only with valid path]) else -- 2.4.10

2 1

[libvirt] virsh can't support VM offline blockcommit
by justlibvirt＠gmail.com 29 Oct '15

29 Oct '15

Hi everyone! I use the libvirt(version: 1.2.2) and QEMU(version: 2.2.1) to test qemu snapshot features: I tried virsh blockcommit when VM offline, the virsh blockcommit failed: the error messase as below: error: Requested operation is not valid: domain is not running when I start the VM, the virsh blockcommit work fine! my question is：we need virsh support blockcommit when VM offline。how do？ we test qemu snapshot as follows： we need create snapshot of the cycle，and by virsh blockcommit merge snapshot chain，but when VM offline， the virsh blockcommit will fail， someone suggest me：when VM offline，may use qemu-img commit to submit snapshot turn，but qemu-img can't modify snapshot chain backing relation，it need we use qemu-img rebase amend snapshot‘s backingfile， the main question is when we use qemu-img rebase modify snapshot's backingfile, if someone start the VM, it will may lead to VM filesystem readonly。 we should how to solve the question? thanks! justlibvirt(a)gmail.com

2 3

[libvirt] [PATCH] Remove new lines from debug messages
by Jiri Denemark 29 Oct '15

29 Oct '15

Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/nwfilter/nwfilter_gentech_driver.c | 2 +- src/nwfilter/nwfilter_learnipaddr.c | 10 +++++----- src/rpc/virnetsocket.c | 2 +- src/util/virfile.c | 2 +- src/util/virhash.c | 2 +- src/util/virnetdevmacvlan.c | 28 +++++++++++++------------- src/util/virprocess.c | 2 +- src/xen/xend_internal.c | 2 +- tests/virhostdevtest.c | 36 +++++++++++++++++----------------- tests/virnetsockettest.c | 2 +- tests/virtimetest.c | 2 +- 11 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/nwfilter/nwfilter_gentech_driver.c b/src/nwfilter/nwfilter_gentech_driver.c index 701f8d8..5a4cff1 100644 --- a/src/nwfilter/nwfilter_gentech_driver.c +++ b/src/nwfilter/nwfilter_gentech_driver.c @@ -540,7 +540,7 @@ virNWFilterDetermineMissingVarsRec(virNWFilterDefPtr filter, if (rc) break; } else if (inc) { - VIR_DEBUG("Following filter %s\n", inc->filterref); + VIR_DEBUG("Following filter %s", inc->filterref); obj = virNWFilterObjFindByName(&driver->nwfilters, inc->filterref); if (obj) { diff --git a/src/nwfilter/nwfilter_learnipaddr.c b/src/nwfilter/nwfilter_learnipaddr.c index 5b55055..1adbadb 100644 --- a/src/nwfilter/nwfilter_learnipaddr.c +++ b/src/nwfilter/nwfilter_learnipaddr.c @@ -413,7 +413,7 @@ learnIPAddressThread(void *arg) handle = pcap_open_live(listen_if, BUFSIZ, 0, PKT_TIMEOUT_MS, errbuf); if (handle == NULL) { - VIR_DEBUG("Couldn't open device %s: %s\n", listen_if, errbuf); + VIR_DEBUG("Couldn't open device %s: %s", listen_if, errbuf); req->status = ENODEV; goto done; } @@ -448,13 +448,13 @@ learnIPAddressThread(void *arg) filter = virBufferContentAndReset(&buf); if (pcap_compile(handle, &fp, filter, 1, 0) != 0) { - VIR_DEBUG("Couldn't compile filter '%s'.\n", filter); + VIR_DEBUG("Couldn't compile filter '%s'", filter); req->status = EINVAL; goto done; } if (pcap_setfilter(handle, &fp) != 0) { - VIR_DEBUG("Couldn't set filter '%s'.\n", filter); + VIR_DEBUG("Couldn't set filter '%s'", filter); req->status = EINVAL; pcap_freecode(&fp); goto done; @@ -626,7 +626,7 @@ learnIPAddressThread(void *arg) req->filtername, req->filterparams); VIR_DEBUG("Result from applying firewall rules on " - "%s with IP addr %s : %d\n", req->ifname, inetaddr, ret); + "%s with IP addr %s : %d", req->ifname, inetaddr, ret); } } else { if (showError) @@ -638,7 +638,7 @@ learnIPAddressThread(void *arg) techdriver->applyDropAllRules(req->ifname); } - VIR_DEBUG("pcap thread terminating for interface %s\n", req->ifname); + VIR_DEBUG("pcap thread terminating for interface %s", req->ifname); virNWFilterUnlockIface(req->ifname); diff --git a/src/rpc/virnetsocket.c b/src/rpc/virnetsocket.c index 5e5f1ab..526d291 100644 --- a/src/rpc/virnetsocket.c +++ b/src/rpc/virnetsocket.c @@ -196,7 +196,7 @@ int virNetSocketCheckProtocols(bool *hasIPv4, freeaddrinfo(ai); - VIR_DEBUG("Protocols: v4 %d v6 %d\n", *hasIPv4, *hasIPv6); + VIR_DEBUG("Protocols: v4 %d v6 %d", *hasIPv4, *hasIPv6); ret = 0; cleanup: diff --git a/src/util/virfile.c b/src/util/virfile.c index e5cf2c5..f45e18f 100644 --- a/src/util/virfile.c +++ b/src/util/virfile.c @@ -681,7 +681,7 @@ static int virFileLoopDeviceOpen(char **dev_name) if (virFileLoopDeviceOpenLoopCtl(dev_name, &loop_fd) < 0) return -1; - VIR_DEBUG("Return from loop-control got fd %d\n", loop_fd); + VIR_DEBUG("Return from loop-control got fd %d", loop_fd); if (loop_fd >= 0) return loop_fd; diff --git a/src/util/virhash.c b/src/util/virhash.c index bc90c44..fab621b 100644 --- a/src/util/virhash.c +++ b/src/util/virhash.c @@ -287,7 +287,7 @@ virHashGrow(virHashTablePtr table, size_t size) VIR_FREE(oldtable); #ifdef DEBUG_GROW - VIR_DEBUG("virHashGrow : from %d to %d, %ld elems\n", oldsize, + VIR_DEBUG("virHashGrow : from %d to %d, %ld elems", oldsize, size, nbElem); #endif diff --git a/src/util/virnetdevmacvlan.c b/src/util/virnetdevmacvlan.c index 89985b8..f85bd3e 100644 --- a/src/util/virnetdevmacvlan.c +++ b/src/util/virnetdevmacvlan.c @@ -473,16 +473,16 @@ virNetDevMacVLanVPortProfileCallback(struct nlmsghdr *hdr, case RTM_DELLINK: case RTM_SETLINK: case RTM_GETLINK: - VIR_DEBUG(" IFINFOMSG\n"); - VIR_DEBUG(" ifi_family = 0x%02x\n", + VIR_DEBUG(" IFINFOMSG"); + VIR_DEBUG(" ifi_family = 0x%02x", ((struct ifinfomsg *)data)->ifi_family); - VIR_DEBUG(" ifi_type = 0x%x\n", + VIR_DEBUG(" ifi_type = 0x%x", ((struct ifinfomsg *)data)->ifi_type); - VIR_DEBUG(" ifi_index = %i\n", + VIR_DEBUG(" ifi_index = %i", ((struct ifinfomsg *)data)->ifi_index); - VIR_DEBUG(" ifi_flags = 0x%04x\n", + VIR_DEBUG(" ifi_flags = 0x%04x", ((struct ifinfomsg *)data)->ifi_flags); - VIR_DEBUG(" ifi_change = 0x%04x\n", + VIR_DEBUG(" ifi_change = 0x%04x", ((struct ifinfomsg *)data)->ifi_change); } /* DEBUG end */ @@ -544,29 +544,29 @@ virNetDevMacVLanVPortProfileCallback(struct nlmsghdr *hdr, if (tb[IFLA_IFNAME]) { ifname = (char *)RTA_DATA(tb[IFLA_IFNAME]); - VIR_DEBUG("IFLA_IFNAME = %s\n", ifname); + VIR_DEBUG("IFLA_IFNAME = %s", ifname); } if (tb[IFLA_OPERSTATE]) { rem = *(unsigned short *)RTA_DATA(tb[IFLA_OPERSTATE]); - VIR_DEBUG("IFLA_OPERSTATE = %d\n", rem); + VIR_DEBUG("IFLA_OPERSTATE = %d", rem); } if (tb[IFLA_VF_PORTS]) { struct nlattr *tb_vf_ports; - VIR_DEBUG("found IFLA_VF_PORTS\n"); + VIR_DEBUG("found IFLA_VF_PORTS"); nla_for_each_nested(tb_vf_ports, tb[IFLA_VF_PORTS], rem) { - VIR_DEBUG("iterating\n"); + VIR_DEBUG("iterating"); if (nla_type(tb_vf_ports) != IFLA_VF_PORT) { - VIR_DEBUG("not a IFLA_VF_PORT. skipping\n"); + VIR_DEBUG("not a IFLA_VF_PORT. skipping"); continue; } if (nla_parse_nested(tb3, IFLA_PORT_MAX, tb_vf_ports, ifla_port_policy)) { VIR_DEBUG("nested parsing on level 2" - " failed."); + " failed"); } if (tb3[IFLA_PORT_VF]) { VIR_DEBUG("IFLA_PORT_VF = %d", @@ -600,7 +600,7 @@ virNetDevMacVLanVPortProfileCallback(struct nlmsghdr *hdr, uuid = (unsigned char *) RTA_DATA(tb3[IFLA_PORT_INSTANCE_UUID]); instance2str(uuid, instance, sizeof(instance)); - VIR_DEBUG("IFLA_PORT_INSTANCE_UUID = %s\n", + VIR_DEBUG("IFLA_PORT_INSTANCE_UUID = %s", instance); } @@ -615,7 +615,7 @@ virNetDevMacVLanVPortProfileCallback(struct nlmsghdr *hdr, } if (tb3[IFLA_PORT_RESPONSE]) { - VIR_DEBUG("IFLA_PORT_RESPONSE = %d\n", *(uint16_t *) + VIR_DEBUG("IFLA_PORT_RESPONSE = %d", *(uint16_t *) RTA_DATA(tb3[IFLA_PORT_RESPONSE])); } } diff --git a/src/util/virprocess.c b/src/util/virprocess.c index e6b78ef..d2bf360 100644 --- a/src/util/virprocess.c +++ b/src/util/virprocess.c @@ -407,7 +407,7 @@ virProcessKillPainfully(pid_t pid, bool force) int virProcessSetAffinity(pid_t pid, virBitmapPtr map) { size_t i; - VIR_DEBUG("Set process affinity on %lld\n", (long long)pid); + VIR_DEBUG("Set process affinity on %lld", (long long)pid); # ifdef CPU_ALLOC /* New method dynamically allocates cpu mask, allowing unlimted cpus */ int numcpus = 1024; diff --git a/src/xen/xend_internal.c b/src/xen/xend_internal.c index 62ce930..21d99e3 100644 --- a/src/xen/xend_internal.c +++ b/src/xen/xend_internal.c @@ -507,7 +507,7 @@ xend_op_ext(virConnectPtr xend, const char *path, const char *key, va_list ap) return -1; content = virBufferContentAndReset(&buf); - VIR_DEBUG("xend op: %s\n", content); + VIR_DEBUG("xend op: %s", content); ret = http2unix(xend_post(xend, path, content)); VIR_FREE(content); diff --git a/tests/virhostdevtest.c b/tests/virhostdevtest.c index 065b825..faebdd4 100644 --- a/tests/virhostdevtest.c +++ b/tests/virhostdevtest.c @@ -169,14 +169,14 @@ testVirHostdevPreparePCIHostdevs_unmanaged(const void *oaque ATTRIBUTE_UNUSED) count2 = virPCIDeviceListCount(mgr->inactivePCIHostdevs); /* Test normal functionality */ - VIR_DEBUG("Test 0 hostdevs\n"); + VIR_DEBUG("Test 0 hostdevs"); if (virHostdevPreparePCIDevices(mgr, drv_name, dom_name, uuid, NULL, 0, 0) < 0) goto cleanup; CHECK_LIST_COUNT(mgr->activePCIHostdevs, count1); /* Test unmanaged hostdevs */ - VIR_DEBUG("Test >=1 unmanaged hostdevs\n"); + VIR_DEBUG("Test >=1 unmanaged hostdevs"); if (virHostdevPreparePCIDevices(mgr, drv_name, dom_name, uuid, hostdevs, nhostdevs, 0) < 0) goto cleanup; @@ -186,21 +186,21 @@ testVirHostdevPreparePCIHostdevs_unmanaged(const void *oaque ATTRIBUTE_UNUSED) /* Test conflict */ count1 = virPCIDeviceListCount(mgr->activePCIHostdevs); count2 = virPCIDeviceListCount(mgr->inactivePCIHostdevs); - VIR_DEBUG("Test: prepare same hostdevs for same driver/domain again\n"); + VIR_DEBUG("Test: prepare same hostdevs for same driver/domain again"); if (!virHostdevPreparePCIDevices(mgr, drv_name, dom_name, uuid, &hostdevs[0], 1, 0)) goto cleanup; CHECK_LIST_COUNT(mgr->activePCIHostdevs, count1); CHECK_LIST_COUNT(mgr->inactivePCIHostdevs, count2); - VIR_DEBUG("Test: prepare same hostdevs for same driver, diff domain again\n"); + VIR_DEBUG("Test: prepare same hostdevs for same driver, diff domain again"); if (!virHostdevPreparePCIDevices(mgr, drv_name, "test_domain1", uuid, &hostdevs[1], 1, 0)) goto cleanup; CHECK_LIST_COUNT(mgr->activePCIHostdevs, count1); CHECK_LIST_COUNT(mgr->inactivePCIHostdevs, count2); - VIR_DEBUG("Test: prepare same hostdevs for diff driver/domain again\n"); + VIR_DEBUG("Test: prepare same hostdevs for diff driver/domain again"); if (!virHostdevPreparePCIDevices(mgr, "test_driver1", dom_name, uuid, &hostdevs[2], 1, 0)) goto cleanup; @@ -223,7 +223,7 @@ testVirHostdevReAttachPCIHostdevs_unmanaged(const void *oaque ATTRIBUTE_UNUSED) for (i = 0; i < nhostdevs; i++) { if (hostdevs[i]->managed != false) { - VIR_DEBUG("invalid test\n"); + VIR_DEBUG("invalid test"); return -1; } } @@ -231,11 +231,11 @@ testVirHostdevReAttachPCIHostdevs_unmanaged(const void *oaque ATTRIBUTE_UNUSED) count1 = virPCIDeviceListCount(mgr->activePCIHostdevs); count2 = virPCIDeviceListCount(mgr->inactivePCIHostdevs); - VIR_DEBUG("Test 0 hostdevs\n"); + VIR_DEBUG("Test 0 hostdevs"); virHostdevReAttachPCIDevices(mgr, drv_name, dom_name, NULL, 0, NULL); CHECK_LIST_COUNT(mgr->activePCIHostdevs, count1); - VIR_DEBUG("Test >=1 unmanaged hostdevs\n"); + VIR_DEBUG("Test >=1 unmanaged hostdevs"); virHostdevReAttachPCIDevices(mgr, drv_name, dom_name, hostdevs, nhostdevs, NULL); CHECK_LIST_COUNT(mgr->activePCIHostdevs, count1 - 3); @@ -261,7 +261,7 @@ testVirHostdevPreparePCIHostdevs_managed(const void *oaque ATTRIBUTE_UNUSED) count1 = virPCIDeviceListCount(mgr->activePCIHostdevs); /* Test normal functionality */ - VIR_DEBUG("Test >=1 hostdevs\n"); + VIR_DEBUG("Test >=1 hostdevs"); if (virHostdevPreparePCIDevices(mgr, drv_name, dom_name, uuid, hostdevs, nhostdevs, 0) < 0) goto cleanup; @@ -269,19 +269,19 @@ testVirHostdevPreparePCIHostdevs_managed(const void *oaque ATTRIBUTE_UNUSED) /* Test conflict */ count1 = virPCIDeviceListCount(mgr->activePCIHostdevs); - VIR_DEBUG("Test: prepare same hostdevs for same driver/domain again\n"); + VIR_DEBUG("Test: prepare same hostdevs for same driver/domain again"); if (!virHostdevPreparePCIDevices(mgr, drv_name, dom_name, uuid, &hostdevs[0], 1, 0)) goto cleanup; CHECK_LIST_COUNT(mgr->activePCIHostdevs, count1); - VIR_DEBUG("Test: prepare same hostdevs for same driver, diff domain again\n"); + VIR_DEBUG("Test: prepare same hostdevs for same driver, diff domain again"); if (!virHostdevPreparePCIDevices(mgr, drv_name, "test_domain1", uuid, &hostdevs[1], 1, 0)) goto cleanup; CHECK_LIST_COUNT(mgr->activePCIHostdevs, count1); - VIR_DEBUG("Test: prepare same hostdevs for diff driver/domain again\n"); + VIR_DEBUG("Test: prepare same hostdevs for diff driver/domain again"); if (!virHostdevPreparePCIDevices(mgr, "test_driver1", dom_name, uuid, &hostdevs[2], 1, 0)) goto cleanup; @@ -303,18 +303,18 @@ testVirHostdevReAttachPCIHostdevs_managed(const void *oaque ATTRIBUTE_UNUSED) for (i = 0; i < nhostdevs; i++) { if (hostdevs[i]->managed != true) { - VIR_DEBUG("invalid test\n"); + VIR_DEBUG("invalid test"); return -1; } } count1 = virPCIDeviceListCount(mgr->activePCIHostdevs); - VIR_DEBUG("Test 0 hostdevs\n"); + VIR_DEBUG("Test 0 hostdevs"); virHostdevReAttachPCIDevices(mgr, drv_name, dom_name, NULL, 0, NULL); CHECK_LIST_COUNT(mgr->activePCIHostdevs, count1); - VIR_DEBUG("Test >=1 hostdevs\n"); + VIR_DEBUG("Test >=1 hostdevs"); virHostdevReAttachPCIDevices(mgr, drv_name, dom_name, hostdevs, nhostdevs, NULL); CHECK_LIST_COUNT(mgr->activePCIHostdevs, count1 - 3); @@ -392,13 +392,13 @@ testVirHostdevUpdateActivePCIHostdevs(const void *oaque ATTRIBUTE_UNUSED) count1 = virPCIDeviceListCount(mgr->activePCIHostdevs); - VIR_DEBUG("Test 0 hostdevs\n"); + VIR_DEBUG("Test 0 hostdevs"); if (virHostdevUpdateActivePCIDevices(mgr, NULL, 0, drv_name, dom_name) < 0) goto cleanup; CHECK_LIST_COUNT(mgr->activePCIHostdevs, count1); - VIR_DEBUG("Test >=1 hostdevs\n"); + VIR_DEBUG("Test >=1 hostdevs"); if (virHostdevUpdateActivePCIDevices(mgr, hostdevs, nhostdevs, drv_name, dom_name) < 0) goto cleanup; @@ -432,7 +432,7 @@ mymain(void) # define DO_TEST(fnc) \ do { \ - VIR_DEBUG("\nTesting: %s", #fnc); \ + VIR_DEBUG("Testing: %s", #fnc); \ if (virtTestRun(#fnc, fnc, NULL) < 0) \ ret = -1; \ } while (0) diff --git a/tests/virnetsockettest.c b/tests/virnetsockettest.c index ce9eeab..5786870 100644 --- a/tests/virnetsockettest.c +++ b/tests/virnetsockettest.c @@ -105,7 +105,7 @@ checkProtocols(bool *hasIPv4, bool *hasIPv6, break; } - VIR_DEBUG("Choose port %d\n", *freePort); + VIR_DEBUG("Choose port %d", *freePort); ret = 0; diff --git a/tests/virtimetest.c b/tests/virtimetest.c index 9ab38ae..49040d3 100644 --- a/tests/virtimetest.c +++ b/tests/virtimetest.c @@ -92,7 +92,7 @@ testTimeLocalOffset(const void *args) return -1; if (data->offset != actual) { - VIR_DEBUG("Expect Offset %ld got %ld\n", + VIR_DEBUG("Expect Offset %ld got %ld", data->offset, actual); return -1; } -- 2.6.2

2 3

[libvirt] [libvirt-test-api][PATCH] Add config flag when calling setVcpusFlags with maximum flag
by Hongming Zhang 29 Oct '15

29 Oct '15

Flag 'VIR_DOMAIN_AFFECT_CONFIG' is required by flag 'VIR_DOMAIN_VCPU_MAXIMUM' modified: set_vcpus_config.py --- repos/setVcpus/set_vcpus_config.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/repos/setVcpus/set_vcpus_config.py b/repos/setVcpus/set_vcpus_config.py index 3bb3984..3ef0992 100644 --- a/repos/setVcpus/set_vcpus_config.py +++ b/repos/setVcpus/set_vcpus_config.py @@ -80,7 +80,7 @@ def set_vcpus_config(params): return 1 if maxvcpu: - flags = libvirt.VIR_DOMAIN_VCPU_MAXIMUM + flags = libvirt.VIR_DOMAIN_VCPU_MAXIMUM|libvirt.VIR_DOMAIN_AFFECT_CONFIG logger.info("the given max vcpu number is %s" % maxvcpu) logger.info("set domain maximum vcpu as %s with flag: %s" % (maxvcpu, flags)) -- 1.9.3

2 1

[libvirt] [libvirt-test-api][PATCH 0/2]Fix issues in the method of getting vcpu thread id of vcpupin_live and cpu_affinity
by Hongming Zhang 29 Oct '15

29 Oct '15

Hongming Zhang (2): Fix the issues in checking method of vcpupin_live Modify the checking method via passing the vcpu thread id repos/domain/cpu_affinity.py | 16 +++++++++------- repos/setVcpus/vcpupin_live.py | 36 ++++++++++++++++++++---------------- 2 files changed, 29 insertions(+), 23 deletions(-) -- 1.9.3

2 3

[libvirt] [PATCH] Fix virNetDevWaitDadFinish stub
by Roman Bogorodskiy 29 Oct '15

29 Oct '15

Build on non-Linux fails because the virNetDevWaitDadFinish() stub has unused parameters. Fix by adding appropriate ATTRIBUTE_UNUSED for these parameters. Pushing under build-breaker rule. --- src/util/virnetdev.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c index b84437e..9789e93 100644 --- a/src/util/virnetdev.c +++ b/src/util/virnetdev.c @@ -1527,7 +1527,8 @@ int virNetDevClearIPAddress(const char *ifname, /* return after DAD finishes for all known IPv6 addresses or an error */ int -virNetDevWaitDadFinish(virSocketAddrPtr *addrs, size_t count) +virNetDevWaitDadFinish(virSocketAddrPtr *addrs ATTRIBUTE_UNUSED, + size_t count ATTRIBUTE_UNUSED) { virReportSystemError(ENOSYS, "%s", _("Unable to wait for IPv6 DAD on this platform")); -- 2.4.6

1 0

[libvirt] [PATCH] util: remove unnecessary code to avoid error overwrite
by Luyao Huang 29 Oct '15

29 Oct '15

virCgroupRemove use VIR_ERROR to log the error and won't change the virLastErr in the thread, so no need do this. Signed-off-by: Luyao Huang <lhuang(a)redhat.com> --- src/util/vircgroup.c | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c index 0379c2e..a120a15 100644 --- a/src/util/vircgroup.c +++ b/src/util/vircgroup.c @@ -1670,13 +1670,8 @@ virCgroupNewMachineSystemd(const char *name, } if (virCgroupAddTask(*group, pidleader) < 0) { - virErrorPtr saved = virSaveLastError(); virCgroupRemove(*group); virCgroupFree(group); - if (saved) { - virSetError(saved); - virFreeError(saved); - } } ret = 0; @@ -1728,13 +1723,8 @@ virCgroupNewMachineManual(const char *name, goto cleanup; if (virCgroupAddTask(*group, pidleader) < 0) { - virErrorPtr saved = virSaveLastError(); virCgroupRemove(*group); virCgroupFree(group); - if (saved) { - virSetError(saved); - virFreeError(saved); - } } done: -- 1.8.3.1

3 2

[libvirt] [PATCH] qemu: fix wrong nodeset info when numatune placement is auto
by Luyao Huang 29 Oct '15

29 Oct '15

https://bugzilla.redhat.com/show_bug.cgi?id=1270715 Since commit 9deb96f remove check the nodeset from cgroup for a running vm, the numatune nodeset reporting for those guest numatune placement is auto is not right. Pass the autonodeset to virDomainNumatuneFormatNodeset() to fix this. Signed-off-by: Luyao Huang <lhuang(a)redhat.com> --- src/qemu/qemu_driver.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 8cd5ee3..8ca55dd 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -10177,6 +10177,7 @@ qemuDomainGetNumaParameters(virDomainPtr dom, size_t i; virDomainObjPtr vm = NULL; virDomainNumatuneMemMode tmpmode = VIR_DOMAIN_NUMATUNE_MEM_STRICT; + qemuDomainObjPrivatePtr priv; char *nodeset = NULL; int ret = -1; virDomainDefPtr def = NULL; @@ -10187,6 +10188,7 @@ qemuDomainGetNumaParameters(virDomainPtr dom, if (!(vm = qemuDomObjFromDomain(dom))) return -1; + priv = vm->privateData; if (virDomainGetNumaParametersEnsureACL(dom->conn, vm->def) < 0) goto cleanup; @@ -10214,7 +10216,8 @@ qemuDomainGetNumaParameters(virDomainPtr dom, break; case 1: /* fill numa nodeset here */ - nodeset = virDomainNumatuneFormatNodeset(def->numa, NULL, -1); + nodeset = virDomainNumatuneFormatNodeset(def->numa, + priv->autoNodeset, -1); if (!nodeset || virTypedParameterAssign(param, VIR_DOMAIN_NUMA_NODESET, VIR_TYPED_PARAM_STRING, nodeset) < 0) -- 1.8.3.1

3 2

[libvirt] [PATCHv4 0/2] Added waiting for DAD to finish for bridge address.
by Maxim Perevedentsev 29 Oct '15

29 Oct '15

This is a fix for commit db488c79173b240459c7754f38c3c6af9b432970 dnsmasq main process which is relied on when waiting for DAD to complete exits without actually waiting for DAD. This is dnsmasq daemon's task. It seems to be a race that DAD finished before dnsmasq main process exited. The above commit needs the execution to block until DAD finishes for bridge IPv6 address because then it closes dummy tap device. Thus we need to ensure this ourselves. So we periodically poll the kernel using netlink and check whether there are any IPv6 addresses assigned to bridge which have 'tentative' state. After DAD is finished, execution continues. I guess that is what dnsmasq was assumed to do. We use netlink to dump information about existing IPv6 addresses. Netlink's response is a multi-part message. Unfortunately, the current implementation of virNetlink treats such messages as faulty and throws an error. So the patch 2/2 adds multi-part nelink response support. Update v2: fixed syntax. Update v3: moved to virnetdev. Update v4: added DAD timeout, minor fixes. Maxim Perevedentsev (2): network: added waiting for DAD to finish for bridge address. netlink: add support for multi-part netlink messages. src/libvirt_private.syms | 1 + src/network/bridge_driver.c | 34 +++++++++++++- src/util/virnetdev.c | 110 ++++++++++++++++++++++++++++++++++++++++++++ src/util/virnetdev.h | 2 + src/util/virnetlink.c | 4 +- 5 files changed, 149 insertions(+), 2 deletions(-) -- 1.8.3.1

2 4

[libvirt] [libvirt-glib] gobject: Add wrapper virDomainSetTime()
by Zeeshan Ali (Khattak) 29 Oct '15

29 Oct '15

--- libvirt-gobject/libvirt-gobject-domain.c | 126 +++++++++++++++++++++++++++++++ libvirt-gobject/libvirt-gobject-domain.h | 25 ++++++ libvirt-gobject/libvirt-gobject.sym | 9 +++ 3 files changed, 160 insertions(+) diff --git a/libvirt-gobject/libvirt-gobject-domain.c b/libvirt-gobject/libvirt-gobject-domain.c index 34eb7ca..26d0cba 100644 --- a/libvirt-gobject/libvirt-gobject-domain.c +++ b/libvirt-gobject/libvirt-gobject-domain.c @@ -1886,3 +1886,129 @@ gboolean gvir_domain_get_has_current_snapshot(GVirDomain *dom, return TRUE; } + +/** + * gvir_domain_set_time: + * @dom: the domain + * @seconds: The seconds since Epoch in UTC. + * @nseconds: The microseconds. + * @flags: bitwise-OR of #GVirDomainSetTimeFlags. + * + * This function tries to set guest time to the given value. The time to set + * (@seconds and @nseconds) should be in seconds relative to the Epoch of + * 1970-01-01 00:00:00 in UTC. + * + * If you pass #GVIR_DOMAIN_TIME_SYNC as @flags, the time is reset using + * domain's RTC and @seconds and @nseconds arguments are ignored. + * + * Please note that some hypervisors may require guest agent to be configured + * and running in order for this function to work. + */ +gboolean gvir_domain_set_time(GVirDomain *dom, + gint64 seconds, + guint nseconds, + guint flags, + GError **err) +{ + GVirDomainPrivate *priv; + int ret; + + g_return_val_if_fail(GVIR_IS_DOMAIN(dom), FALSE); + g_return_val_if_fail(err == NULL || *err == NULL, FALSE); + g_return_val_if_fail(flags == 0 || flags & GVIR_DOMAIN_TIME_SYNC, FALSE); + + priv = dom->priv; + ret = virDomainSetTime(priv->handle, seconds, nseconds, flags); + if (ret < 0) { + gvir_set_error_literal(err, GVIR_DOMAIN_ERROR, + 0, + "Unable to set domain time"); + return FALSE; + } + + return TRUE; +} + +typedef struct { + gint64 seconds; + guint nseconds; + guint flags; +} DomainSetTimeData; + +static void domain_set_time_data_free(DomainSetTimeData *data) +{ + g_slice_free(DomainSetTimeData, data); +} + +static void +gvir_domain_set_time_helper(GTask *task, + gpointer object, + gpointer task_data, + GCancellable *cancellable G_GNUC_UNUSED) +{ + GVirDomain *dom = GVIR_DOMAIN(object); + DomainSetTimeData *data = (DomainSetTimeData *) task_data; + GError *err = NULL; + + if (!gvir_domain_set_time(dom, + data->seconds, + data->nseconds, + data->flags, + &err)) + g_task_return_error(task, err); + else + g_task_return_boolean(task, TRUE); +} + +/** + * gvir_domain_set_time_async: + * @dom: the domain + * @dom: the domain + * @seconds: The seconds since Epoch in UTC. + * @nseconds: The microseconds. + * @flags: bitwise-OR of #GVirDomainSetTimeFlags. + * @cancellable: (allow-none)(transfer none): cancellation object + * @callback: (scope async): completion callback + * @user_data: (closure): opaque data for callback + * + * Asynchronous variant of #gvir_domain_set_time. + */ +void gvir_domain_set_time_async(GVirDomain *dom, + gint64 seconds, + guint nseconds, + guint flags, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data) +{ + GTask *task; + DomainSetTimeData *data; + + g_return_if_fail(GVIR_IS_DOMAIN(dom)); + g_return_if_fail((cancellable == NULL) || G_IS_CANCELLABLE(cancellable)); + + data = g_slice_new0(DomainSetTimeData); + data->seconds = seconds; + data->nseconds = nseconds; + data->flags = flags; + + task = g_task_new (G_OBJECT(dom), + cancellable, + callback, + user_data); + g_task_set_task_data (task, data, (GDestroyNotify)domain_set_time_data_free); + g_task_run_in_thread(task, gvir_domain_set_time_helper); + + g_object_unref(task); +} + +gboolean gvir_domain_set_time_finish(GVirDomain *dom, + GAsyncResult *result, + GError **err) +{ + g_return_val_if_fail(GVIR_IS_DOMAIN(dom), FALSE); + g_return_val_if_fail(g_task_is_valid(result, G_OBJECT(dom)), FALSE); + g_return_val_if_fail(err == NULL || *err == NULL, FALSE); + + return g_task_propagate_boolean(G_TASK(result), err); +} diff --git a/libvirt-gobject/libvirt-gobject-domain.h b/libvirt-gobject/libvirt-gobject-domain.h index 4fe381e..fbf7173 100644 --- a/libvirt-gobject/libvirt-gobject-domain.h +++ b/libvirt-gobject/libvirt-gobject-domain.h @@ -215,6 +215,15 @@ typedef enum { GVIR_DOMAIN_SNAPSHOT_LIST_EXTERNAL = VIR_DOMAIN_SNAPSHOT_LIST_EXTERNAL } GVirDomainSnapshotListFlags; +/** + * GVirDomainSetTimeFlags: + * @GVIR_DOMAIN_TIME_NONE: Re-sync domain time to given values. + * @GVIR_DOMAIN_TIME_SYNC: Re-sync domain time from domain's RTC. + */ +typedef enum { + GVIR_DOMAIN_TIME_NONE = 0, + GVIR_DOMAIN_TIME_SYNC = VIR_DOMAIN_TIME_SYNC, +} GVirDomainSetTimeFlags; typedef struct _GVirDomainInfo GVirDomainInfo; struct _GVirDomainInfo @@ -401,6 +410,22 @@ gboolean gvir_domain_get_has_current_snapshot(GVirDomain *dom, gboolean *has_current_snapshot, GError **error); +gboolean gvir_domain_set_time(GVirDomain *dom, + gint64 seconds, + guint nseconds, + guint flags, + GError **err); +void gvir_domain_set_time_async(GVirDomain *dom, + gint64 seconds, + guint nseconds, + guint flags, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data); +gboolean gvir_domain_set_time_finish(GVirDomain *dom, + GAsyncResult *result, + GError **err); + G_END_DECLS #endif /* __LIBVIRT_GOBJECT_DOMAIN_H__ */ diff --git a/libvirt-gobject/libvirt-gobject.sym b/libvirt-gobject/libvirt-gobject.sym index ca89a45..cbfaa71 100644 --- a/libvirt-gobject/libvirt-gobject.sym +++ b/libvirt-gobject/libvirt-gobject.sym @@ -304,4 +304,13 @@ LIBVIRT_GOBJECT_0.2.2 { gvir_network_get_dhcp_leases; } LIBVIRT_GOBJECT_0.2.1; +LIBVIRT_GOBJECT_0.2.3 { + global: + gvir_domain_set_time_flags_get_type; + + gvir_domain_set_time; + gvir_domain_set_time_async; + gvir_domain_set_time_finish; +} LIBVIRT_GOBJECT_0.2.2; + # .... define new API here using predicted next version number .... -- 2.5.0

2 3

[libvirt] [PATCH] Use correct pci addresses during device-detach
by Nitesh_Konkar 28 Oct '15

28 Oct '15

From: Nitesh_Konkar <niteshkonkar(a)in.ibm.com> The attach-device on live and persistent copies can be done independently. Thus devices can end up having different pci addresses in live and persistent copies. The detach device should try to detach the device from their respective addresses instead of using the same from live/persistent. Signed-off-by:nitkon12@linux.vnet.ibm.com --- src/driver-nodedev.h | 1 + src/qemu/qemu_driver.c | 25 ++++++++++--------------- 2 files changed, 11 insertions(+), 15 deletions(-) diff --git a/src/driver-nodedev.h b/src/driver-nodedev.h index e846612..dea79bd 100644 --- a/src/driver-nodedev.h +++ b/src/driver-nodedev.h @@ -59,6 +59,7 @@ typedef char * typedef char * (*virDrvNodeDeviceGetParent)(virNodeDevicePtr dev); + typedef int (*virDrvNodeDeviceNumOfCaps)(virNodeDevicePtr dev); diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index f133b45..6fd58c2 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -8708,23 +8708,12 @@ static int qemuDomainDetachDeviceFlags(virDomainPtr dom, const char *xml, !(flags & VIR_DOMAIN_AFFECT_LIVE)) parse_flags |= VIR_DOMAIN_DEF_PARSE_INACTIVE; - dev = dev_copy = virDomainDeviceDefParse(xml, vm->def, + dev_copy = virDomainDeviceDefParse(xml, vm->def, caps, driver->xmlopt, parse_flags); - if (dev == NULL) + if (dev_copy == NULL) goto endjob; - if (flags & VIR_DOMAIN_AFFECT_CONFIG && - flags & VIR_DOMAIN_AFFECT_LIVE) { - /* If we are affecting both CONFIG and LIVE - * create a deep copy of device as adding - * to CONFIG takes one instance. - */ - dev_copy = virDomainDeviceDefCopy(dev, vm->def, caps, driver->xmlopt); - if (!dev_copy) - goto endjob; - } - if (priv->qemuCaps) qemuCaps = virObjectRef(priv->qemuCaps); else if (!(qemuCaps = virQEMUCapsCacheLookup(driver->qemuCapsCache, vm->def->emulator))) @@ -8736,6 +8725,13 @@ static int qemuDomainDetachDeviceFlags(virDomainPtr dom, const char *xml, if (!vmdef) goto endjob; + dev = virDomainDeviceDefParse(xml, vmdef, + caps, driver->xmlopt, + parse_flags); + if (!dev) + goto endjob; + + if (virDomainDefCompatibleDevice(vmdef, dev, VIR_DOMAIN_DEVICE_ACTION_DETACH) < 0) goto endjob; @@ -8777,8 +8773,7 @@ static int qemuDomainDetachDeviceFlags(virDomainPtr dom, const char *xml, cleanup: virObjectUnref(qemuCaps); virDomainDefFree(vmdef); - if (dev != dev_copy) - virDomainDeviceDefFree(dev_copy); + virDomainDeviceDefFree(dev_copy); virDomainDeviceDefFree(dev); virDomainObjEndAPI(&vm); virObjectUnref(caps); -- 2.4.0

2 1