- Devel - libvirt List Archives

[libvirt] [TCK] [PATCH] networks: Fix some errors in test 100
by Stefan Berger 21 Nov '11

21 Nov '11

Network test 100 when run via sh ./networkApplyTest.sh --tap-test --verbose --wait currently exhibits some problems. This patch fixes them. I now only looking for dnsmasq to be running with some of the parameters from tck-testnet having gone into its command line arguments. --- scripts/networks/networkxml2hostout/tck-testnet-1.dat | 10 ++++++---- scripts/networks/networkxml2hostout/tck-testnet-1.post.dat | 6 ++++-- scripts/networks/networkxml2hostout/tck-testnet-2.dat | 10 ++++++---- scripts/networks/networkxml2hostout/tck-testnet-2.post.dat | 5 +++-- 4 files changed, 19 insertions(+), 12 deletions(-) Index: libvirt-tck/scripts/networks/networkxml2hostout/tck-testnet-1.dat =================================================================== --- libvirt-tck.orig/scripts/networks/networkxml2hostout/tck-testnet-1.dat +++ libvirt-tck/scripts/networks/networkxml2hostout/tck-testnet-1.dat @@ -5,12 +5,14 @@ MASQUERADE all -- 10.1.2.0/24 #iptables -n -L FORWARD | grep ' 10\.1\.2\.' ACCEPT all -- 0.0.0.0/0 10.1.2.0/24 state RELATED,ESTABLISHED ACCEPT all -- 10.1.2.0/24 0.0.0.0/0 -#ps aux | sed -n '/dnsmasq .*10\.1\.2\./ s|.*$dnsmasq[[:print:]*]$|\1|p' -dnsmasq --strict-order --bind-interfaces --pid-file=/var/run/libvirt/network/tck-testnet.pid --conf-file= --listen-address 10.1.2.1 --except-interface lo --dhcp-range 10.1.2.2,10.1.2.254 --dhcp-lease-max=253 --dhcp-no-override +#ps aux | sed -n '/dnsmasq .*tck-testnet/ s|.*$listen-address 10\.1\.2\.1*$.*|\1|p' +listen-address 10.1.2.1 +#ps aux | sed -n '/dnsmasq .*tck-testnet/ s|.*$dhcp-range 10\.1\.2\.2\,10\.1\.2\.254*$.*|\1|p' +dhcp-range 10.1.2.2,10.1.2.254 #route -n | grep '10\.1\.2\.' 10.1.2.0 0.0.0.0 255.255.255.0 U 0 0 0 tck-testbr -#brctl show | grep tck-testbr -tck-testbr 8000.000000000000 yes +#brctl show | grep tck-testbr | gawk '{print $1" "$3}' +tck-testbr yes #ifconfig tck-testbr | grep ':10\.1\.2\.' inet addr:10.1.2.1 Bcast:10.1.2.255 Mask:255.255.255.0 #virsh net-list | grep tck-testnet Index: libvirt-tck/scripts/networks/networkxml2hostout/tck-testnet-1.post.dat =================================================================== --- libvirt-tck.orig/scripts/networks/networkxml2hostout/tck-testnet-1.post.dat +++ libvirt-tck/scripts/networks/networkxml2hostout/tck-testnet-1.post.dat @@ -1,7 +1,9 @@ #iptables -t nat -L -n | grep ' 10\.1\.2\.' #iptables -n -L FORWARD | grep ' 10\.1\.2\.' -#ps aux | sed -n '/dnsmasq .*10\.1\.2\./ s|.*$dnsmasq[[:print:]*]$|\1|p' +#ps aux | sed -n '/dnsmasq .*tck-testnet/ s|.*$listen-address 10\.1\.2\.1*$.*|\1|p' +#ps aux | sed -n '/dnsmasq .*tck-testnet/ s|.*$dhcp-range 10\.1\.2\.2\,10\.1\.2\.254*$.*|\1|p' #route -n | grep '10\.1\.2\.' -#brctl show | grep tck-testbr +#route -n | grep '10\.1\.2\.' +#brctl show | grep tck-testbr | gawk '{print $1" "$3}' #ifconfig tck-testbr 2>/dev/null| grep ':10\.1\.2\.' #virsh net-list | grep tck-testnet Index: libvirt-tck/scripts/networks/networkxml2hostout/tck-testnet-2.dat =================================================================== --- libvirt-tck.orig/scripts/networks/networkxml2hostout/tck-testnet-2.dat +++ libvirt-tck/scripts/networks/networkxml2hostout/tck-testnet-2.dat @@ -2,12 +2,14 @@ ACCEPT all -- 0.0.0.0/0 10.1.2.0/24 ACCEPT all -- 10.1.2.0/24 0.0.0.0/0 #iptables -t nat -L -n | grep ' 10\.1\.2\.' -#ps aux | sed -n '/dnsmasq .*10\.1\.2\./ s|.*$dnsmasq[[:print:]*]$|\1|p' -dnsmasq --strict-order --bind-interfaces --pid-file=/var/run/libvirt/network/tck-testnet.pid --conf-file= --listen-address 10.1.2.1 --except-interface lo --dhcp-range 10.1.2.2,10.1.2.254 --dhcp-lease-max=253 --dhcp-no-override +#ps aux | sed -n '/dnsmasq .*tck-testnet/ s|.*$listen-address 10\.1\.2\.1$.*|\1|p' +listen-address 10.1.2.1 +#ps aux | sed -n '/dnsmasq .*tck-testnet/ s|.*$dhcp-range 10\.1\.2\.2,10\.1\.2\.254$.*|\1|p' +dhcp-range 10.1.2.2,10.1.2.254 #route -n | grep '10\.1\.2\.' 10.1.2.0 0.0.0.0 255.255.255.0 U 0 0 0 tck-testbr -#brctl show | grep tck-testbr -tck-testbr 8000.000000000000 yes +#brctl show | grep tck-testbr | gawk '{print $1" "$3}' +tck-testbr yes #ifconfig tck-testbr | grep ':10\.1\.2\.' inet addr:10.1.2.1 Bcast:10.1.2.255 Mask:255.255.255.0 #virsh net-list | grep tck-testnet Index: libvirt-tck/scripts/networks/networkxml2hostout/tck-testnet-2.post.dat =================================================================== --- libvirt-tck.orig/scripts/networks/networkxml2hostout/tck-testnet-2.post.dat +++ libvirt-tck/scripts/networks/networkxml2hostout/tck-testnet-2.post.dat @@ -1,7 +1,8 @@ #iptables -t nat -L -n | grep ' 10\.1\.2' #iptables -n -L FORWARD | grep ' 10\.1\.2' -#ps aux | sed -n '/dnsmasq .*10\.1\.2\./ s|.*$dnsmasq[[:print:]*]$|\1|p' +#ps aux | sed -n '/dnsmasq .*tck-testnet/ s|.*$listen-address 10\.1\.2\.1$.*|\1|p' +#ps aux | sed -n '/dnsmasq .*tck-testnet/ s|.*$dhcp-range 10\.1\.2\.2,10\.1\.2\.254$.*|\1|p' #route -n | grep '10\.1\.2\.' -#brctl show | grep tck-testbr +#brctl show | grep tck-testbr | gawk '{print $1" "$3}' #ifconfig tck-testbr 2>/dev/null | grep ':10\.1\.2\.' #virsh net-list | grep tck-testnet

2 2

[libvirt] [TCK][PATCH] add more test cases
by Stefan Berger 21 Nov '11

21 Nov '11

This patch adds a couple more test cases (especially for IPv6 configurations) to the network test 100. Again make sure that some of the parameters from tck-testnet's XML have made it into command line parameters of dnsmasq. --- scripts/networks/networkxml2hostout/tck-testnet-3.dat | 49 +++++++++++++ scripts/networks/networkxml2hostout/tck-testnet-3.post.dat | 19 +++++ scripts/networks/networkxml2xmlin/tck-testnet-3.xml | 22 +++++ 3 files changed, 90 insertions(+) Index: libvirt-tck/scripts/networks/networkxml2xmlin/tck-testnet-3.xml =================================================================== --- /dev/null +++ libvirt-tck/scripts/networks/networkxml2xmlin/tck-testnet-3.xml @@ -0,0 +1,22 @@ +<network> + <name>tck-testnet</name> + <uuid>aadc8920-502a-4774-ac2b-cd382a204d06</uuid> + <bridge name="tck-testbr" /> + <forward mode="nat" /> + <ip address="10.1.2.1" netmask="255.255.255.0"> + <dhcp> + <range start="10.1.2.2" end="10.1.2.254" /> + <host mac="00:16:3e:77:e2:ed" name="a.example.com" ip="10.1.2.10" /> + <host mac="00:16:3e:3e:a9:1a" name="b.example.com" ip="10.1.2.11" /> + </dhcp> + </ip> + <ip family="ipv4" address="192.168.123.1" netmask="255.255.255.0"> + </ip> + <ip family="ipv6" address="2001:db8:ac10:fe01::1" prefix="64"> + </ip> + <ip family="ipv6" address="2001:db8:ac10:fd01::1" prefix="64"> + </ip> + <ip family="ipv4" address="172.28.255.241" netmask="255.255.255.240"> + </ip> +</network> + Index: libvirt-tck/scripts/networks/networkxml2hostout/tck-testnet-3.dat =================================================================== --- /dev/null +++ libvirt-tck/scripts/networks/networkxml2hostout/tck-testnet-3.dat @@ -0,0 +1,49 @@ +#iptables -t nat -L -n | grep ' 10\.1\.2\.' +MASQUERADE tcp -- 10.1.2.0/24 !10.1.2.0/24 masq ports: 1024-65535 +MASQUERADE udp -- 10.1.2.0/24 !10.1.2.0/24 masq ports: 1024-65535 +MASQUERADE all -- 10.1.2.0/24 !10.1.2.0/24 +#iptables -n -L FORWARD | grep ' 10\.1\.2\.' +ACCEPT all -- 0.0.0.0/0 10.1.2.0/24 state RELATED,ESTABLISHED +ACCEPT all -- 10.1.2.0/24 0.0.0.0/0 +#ip6tables -n -L FORWARD | grep ' 2001:db8:ac10' +ACCEPT all ::/0 2001:db8:ac10:fd01::/64 +ACCEPT all 2001:db8:ac10:fd01::/64 ::/0 +ACCEPT all ::/0 2001:db8:ac10:fe01::/64 +ACCEPT all 2001:db8:ac10:fe01::/64 ::/0 +#ps aux | sed -n '/dnsmasq .*tck-testnet/ s|.*$listen-address 10\.1\.2\.1$.*|\1|p' +listen-address 10.1.2.1 +#ps aux | sed -n '/dnsmasq .*tck-testnet/ s|.*$listen-address 192\.168\.123\.1$.*|\1|p' +listen-address 192.168.123.1 +#ps aux | sed -n '/dnsmasq .*tck-testnet/ s|.*$listen-address 172\.28\.255\.241$.*|\1|p' +listen-address 172.28.255.241 +#ps aux | sed -n '/dnsmasq .*tck-testnet/ s|.*$dhcp-range 10\.1\.2\.2,10\.1\.2\.254$.*|\1|p' +dhcp-range 10.1.2.2,10.1.2.254 +#ps aux | sed -n '/dnsmasq .*tck-testnet/ s|.*$listen-address 2001\:db8\:ac10\:fe01\:\:1$.*|\1|p' +listen-address 2001:db8:ac10:fe01::1 +#ps aux | sed -n '/dnsmasq .*tck-testnet/ s|.*$listen-address 2001\:db8\:ac10\:fd01\:\:1$.*|\1|p' +listen-address 2001:db8:ac10:fd01::1 +#ps aux | sed -n '/radvd --.*tck-testnet-/ s|.*$\/radvd\/tck-testnet-radvd.conf$.*|\1|p' +/radvd/tck-testnet-radvd.conf +#route -n | grep '10\.1\.2\.' +10.1.2.0 0.0.0.0 255.255.255.0 U 0 0 0 tck-testbr +#route -n | grep '192\.168\.123\.' +192.168.123.0 0.0.0.0 255.255.255.0 U 0 0 0 tck-testbr +#route -n | grep '172\.28\.255\.240' +172.28.255.240 0.0.0.0 255.255.255.240 U 0 0 0 tck-testbr +#brctl show | grep tck-testbr | gawk '{print $1" "$3}' +tck-testbr yes +#ifconfig tck-testbr | grep ':10\.1\.2\.' + inet addr:10.1.2.1 Bcast:10.1.2.255 Mask:255.255.255.0 +#ifconfig tck-testbr | grep 'inet6 addr: 2001' + inet6 addr: 2001:db8:ac10:fd01::1/64 Scope:Global + inet6 addr: 2001:db8:ac10:fe01::1/64 Scope:Global +#ip addr show tck-testbr | grep "inet " + inet 10.1.2.1/24 brd 10.1.2.255 scope global tck-testbr + inet 192.168.123.1/24 brd 192.168.123.255 scope global tck-testbr + inet 172.28.255.241/28 brd 172.28.255.255 scope global tck-testbr +#ip route show dev tck-testbr +172.28.255.240/28 proto kernel scope link src 172.28.255.241 +10.1.2.0/24 proto kernel scope link src 10.1.2.1 +192.168.123.0/24 proto kernel scope link src 192.168.123.1 +#virsh net-list | grep tck-testnet +tck-testnet active no Index: libvirt-tck/scripts/networks/networkxml2hostout/tck-testnet-3.post.dat =================================================================== --- /dev/null +++ libvirt-tck/scripts/networks/networkxml2hostout/tck-testnet-3.post.dat @@ -0,0 +1,19 @@ +#iptables -t nat -L -n | grep ' 10\.1\.2\.' +#iptables -n -L FORWARD | grep ' 10\.1\.2\.' +#ip6tables -n -L FORWARD | grep ' 2001:db8:ac10' +#ps aux | sed -n '/dnsmasq .*tck-testnet/ s|.*$listen-address 10\.1\.2\.1$.*|\1|p' +#ps aux | sed -n '/dnsmasq .*tck-testnet/ s|.*$listen-address 192\.168\.123\.1$.*|\1|p' +#ps aux | sed -n '/dnsmasq .*tck-testnet/ s|.*$listen-address 172\.28\.255\.241$.*|\1|p' +#ps aux | sed -n '/dnsmasq .*tck-testnet/ s|.*$dhcp-range 10\.1\.2\.2,10\.1\.2\.254$.*|\1|p' +#ps aux | sed -n '/dnsmasq .*tck-testnet/ s|.*$listen-address 2001\:db8\:ac10\:fe01\:\:1$.*|\1|p' +#ps aux | sed -n '/dnsmasq .*tck-testnet/ s|.*$listen-address 2001\:db8\:ac10\:fd01\:\:1$.*|\1|p' +#ps aux | sed -n '/radvd --.*tck-testnet-/ s|.*$\/radvd\/tck-testnet-radvd.conf$.*|\1|p' +#route -n | grep '10\.1\.2\.' +#route -n | grep '192\.168\.123\.' +#route -n | grep '172\.28\.255\.240' +#brctl show | grep tck-testbr +#ifconfig tck-testbr 2>/dev/null | grep ':10\.1\.2\.' +#ifconfig tck-testbr 2>/dev/null | grep 'inet6 addr: 2001' +#ip addr show tck-testbr 2>/dev/null | grep "inet " +#ip route show dev tck-testbr 2>/dev/null +#virsh net-list | grep tck-testnet

2 2

[libvirt] [TCK][PATCH] nwfilter: Add test cases for vlan and stp filtering
by Stefan Berger 21 Nov '11

21 Nov '11

Add test cases for VLAN and (upcoming) STP. --- scripts/nwfilter/nwfilterxml2fwallout/stp-test.fwall | 14 +++++ scripts/nwfilter/nwfilterxml2fwallout/vlan-test.fwall | 15 ++++++ scripts/nwfilter/nwfilterxml2xmlin/stp-test.xml | 26 ++++++++++ scripts/nwfilter/nwfilterxml2xmlin/vlan-test.xml | 45 ++++++++++++++++++ 4 files changed, 100 insertions(+) Index: libvirt-tck/scripts/nwfilter/nwfilterxml2fwallout/vlan-test.fwall =================================================================== --- /dev/null +++ libvirt-tck/scripts/nwfilter/nwfilterxml2fwallout/vlan-test.fwall @@ -0,0 +1,15 @@ +#ebtables -t nat -L libvirt-I-vnet0 | grep -v "^Bridge" | grep -v "^$" +-p 802_1Q -s aa:bb:cc:dd:ee:ff -d 1:2:3:4:5:6 --vlan-id 291 -j CONTINUE +-p 802_1Q -s aa:bb:cc:dd:ee:ff -d 1:2:3:4:5:6 --vlan-id 1234 -j RETURN +-p 802_1Q -s 1:2:3:4:5:6 -d aa:bb:cc:dd:ee:ff --vlan-encap 2054 -j DROP +-p 802_1Q -s 1:2:3:4:5:6 -d aa:bb:cc:dd:ee:ff --vlan-encap 4660 -j ACCEPT +#ebtables -t nat -L libvirt-O-vnet0 | grep -v "^Bridge" | grep -v "^$" +-p 802_1Q -s 1:2:3:4:5:6 -d aa:bb:cc:dd:ee:ff --vlan-id 291 -j CONTINUE +-p 802_1Q -s 1:2:3:4:5:6 -d aa:bb:cc:dd:ee:ff --vlan-id 1234 -j RETURN +-p 802_1Q -s 1:2:3:4:5:6 -d aa:bb:cc:dd:ee:ff --vlan-id 291 -j DROP +-p 802_1Q -s 1:2:3:4:5:6 -d aa:bb:cc:dd:ee:ff -j ACCEPT +#ebtables -t nat -L PREROUTING | grep vnet0 +-i vnet0 -j libvirt-I-vnet0 +#ebtables -t nat -L POSTROUTING | grep vnet0 +-o vnet0 -j libvirt-O-vnet0 + Index: libvirt-tck/scripts/nwfilter/nwfilterxml2xmlin/vlan-test.xml =================================================================== --- /dev/null +++ libvirt-tck/scripts/nwfilter/nwfilterxml2xmlin/vlan-test.xml @@ -0,0 +1,45 @@ +<filter name='tck-testcase' chain='root'> + <uuid>5c6d49af-b071-6127-b4ec-6f8ed4b55335</uuid> + <rule action='continue' direction='inout'> + <vlan srcmacaddr='1:2:3:4:5:6' srcmacmask='ff:ff:ff:ff:ff:ff' + dstmacaddr='aa:bb:cc:dd:ee:ff' dstmacmask='ff:ff:ff:ff:ff:ff' + vlanid='0x123' + /> + </rule> + + <rule action='return' direction='inout'> + <vlan srcmacaddr='1:2:3:4:5:6' srcmacmask='ff:ff:ff:ff:ff:ff' + dstmacaddr='aa:bb:cc:dd:ee:ff' dstmacmask='ff:ff:ff:ff:ff:ff' + vlanid='1234' + /> + </rule> + + <rule action='reject' direction='in'> + <vlan srcmacaddr='1:2:3:4:5:6' srcmacmask='ff:ff:ff:ff:ff:ff' + dstmacaddr='aa:bb:cc:dd:ee:ff' dstmacmask='ff:ff:ff:ff:ff:ff' + vlanid='0x123' + /> + </rule> + + <rule action='accept' direction='in'> + <vlan srcmacaddr='1:2:3:4:5:6' srcmacmask='ff:ff:ff:ff:ff:ff' + dstmacaddr='aa:bb:cc:dd:ee:ff' dstmacmask='ff:ff:ff:ff:ff:ff' + vlanid='0xffff' + /> + </rule> + + <rule action='drop' direction='out'> + <vlan srcmacaddr='1:2:3:4:5:6' srcmacmask='ff:ff:ff:ff:ff:ff' + dstmacaddr='aa:bb:cc:dd:ee:ff' dstmacmask='ff:ff:ff:ff:ff:ff' + encap-protocol='arp' + /> + </rule> + + <rule action='accept' direction='out'> + <vlan srcmacaddr='1:2:3:4:5:6' srcmacmask='ff:ff:ff:ff:ff:ff' + dstmacaddr='aa:bb:cc:dd:ee:ff' dstmacmask='ff:ff:ff:ff:ff:ff' + encap-protocol='0x1234' + /> + </rule> + +</filter> Index: libvirt-tck/scripts/nwfilter/nwfilterxml2fwallout/stp-test.fwall =================================================================== --- /dev/null +++ libvirt-tck/scripts/nwfilter/nwfilterxml2fwallout/stp-test.fwall @@ -0,0 +1,14 @@ +#ebtables -t nat -L libvirt-I-vnet0 | grep -v "^Bridge" | grep -v "^$" +-d BGA -j I-vnet0-stp-xyz +#ebtables -t nat -L libvirt-O-vnet0 | grep -v "^Bridge" | grep -v "^$" +-d BGA -j O-vnet0-stp-xyz +#ebtables -t nat -L PREROUTING | grep vnet0 +-i vnet0 -j libvirt-I-vnet0 +#ebtables -t nat -L POSTROUTING | grep vnet0 +-o vnet0 -j libvirt-O-vnet0 +#ebtables -t nat -L I-vnet0-stp-xyz | grep -v "^Bridge" | grep -v "^$" +-s 1:2:3:4:5:6 -d BGA --stp-root-prio 4660:9029 --stp-root-addr 6:5:4:3:2:1 --stp-root-cost 287454020:573785173 -j RETURN +#ebtables -t nat -L O-vnet0-stp-xyz | grep -v "^Bridge" | grep -v "^$" +-s 1:2:3:4:5:6 -d BGA --stp-type 18 --stp-flags 68 -j CONTINUE +-s 1:2:3:4:5:6 -d BGA --stp-sender-prio 4660 --stp-sender-addr 6:5:4:3:2:1 --stp-port 123:234 --stp-msg-age 5544:5555 --stp-max-age 7777:8888 --stp-hello-time 12345:12346 --stp-forward-delay 54321:65432 -j DROP + Index: libvirt-tck/scripts/nwfilter/nwfilterxml2xmlin/stp-test.xml =================================================================== --- /dev/null +++ libvirt-tck/scripts/nwfilter/nwfilterxml2xmlin/stp-test.xml @@ -0,0 +1,26 @@ +<filter name='tck-testcase' chain='stp-xyz'> + <uuid>5c6d49af-b071-6127-b4ec-6f8ed4b55335</uuid> + <rule action='continue' direction='in'> + <stp srcmacaddr='1:2:3:4:5:6' srcmacmask='ff:ff:ff:ff:ff:ff' + type='0x12' flags='0x44'/> + </rule> + + <rule action='return' direction='out'> + <stp srcmacaddr='1:2:3:4:5:6' srcmacmask='ff:ff:ff:ff:ff:ff' + root-priority='0x1234' root-priority-hi='0x2345' + root-address="6:5:4:3:2:1" root-address-mask='ff:ff:ff:ff:ff:ff' + root-cost='0x11223344' root-cost-hi='0x22334455' /> + </rule> + + <rule action='reject' direction='in'> + <stp srcmacaddr='1:2:3:4:5:6' srcmacmask='ff:ff:ff:ff:ff:ff' + sender-priority='0x1234' + sender-address="6:5:4:3:2:1" + port='123' port-hi='234' + age='5544' age-hi='5555' + max-age='7777' max-age-hi='8888' + hello-time='12345' hello-time-hi='12346' + forward-delay='54321' forward-delay-hi='65432'/> + </rule> + +</filter>

2 1

[libvirt] [osinfo PATCH 1/8] Add #include <string.h> for strcmp
by Christophe Fergeau 21 Nov '11

21 Nov '11

--- tools/osinfo-detect.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/osinfo-detect.c b/tools/osinfo-detect.c index 6afa30a..be36afb 100644 --- a/tools/osinfo-detect.c +++ b/tools/osinfo-detect.c @@ -23,6 +23,7 @@ */ #include <osinfo/osinfo.h> +#include <string.h> #define FORMAT_STR_PLAIN "plain" #define FORMAT_STR_ENV "env" -- 1.7.7.1

3 10

[libvirt] virt-viewer, requirement question
by Jason Helfman 21 Nov '11

21 Nov '11

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 Hi, I am the port maintainer for libvirt, and associated tools, in the FreeBSD Project. I was wondering if "Require SPICE-GTK >= 0.6.0" for virt-viewer, is accurate, or is this optional. Thanks, Jason - -- Jason Helfman System Administrator experts-exchange.com http://www.experts-exchange.com/M_4830110.html E4AD 7CF1 1396 27F6 79DD 4342 5E92 AD66 8C8C FBA5 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (FreeBSD) iF4EAREIAAYFAk7Fs78ACgkQXpKtZoyM+6UjQQD/a325xAeqwky8gEecZ5prlhrt hrW1J0aNohkdZNUR0xgA/24bMLgC3t9DQOVnlZ66YFvJZe5FmIyps4jjsjLH207f =6oa6 -----END PGP SIGNATURE-----

3 6

[libvirt] [PATCH] storage: Skips backingStore of virtual snapshot lv
by Osier Yang 20 Nov '11

20 Nov '11

lvs outputs "[$lvname_vorigin]" for the virtual snapshot lv (created with "--virtualsize"), and the original device pointed by "$lvname_vorigin" is just for lvm internal use, one should never use it. Per lvm's nameing rules, "[" is not valid as part of the vg/lv name. (man 8 lvm). <quote> VALID NAMES The following characters are valid for VG and LV names: a-z A-Z 0-9 + _ . - VG and LV names cannot begin with a hyphen. There are also various reserved names that are used internally by lvm that can not be used as LV or VG names. A VG cannot be called anything that exists in /dev/ at the time of creation, nor can it be called '.' or '..'. A LV cannot be called '.' '..' 'snapshot' or 'pvmove'. The LV name may also not con‐ tain the strings '_mlog' or '_mimage' </quote> So we can skip the set the lv's backingStore by checking if the name begins with a "[". --- src/storage/storage_backend_logical.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/src/storage/storage_backend_logical.c b/src/storage/storage_backend_logical.c index 3c3e736..8118d08 100644 --- a/src/storage/storage_backend_logical.c +++ b/src/storage/storage_backend_logical.c @@ -121,7 +121,14 @@ virStorageBackendLogicalMakeVol(virStoragePoolObjPtr pool, } } - if (groups[1] && !STREQ(groups[1], "")) { + /* Skips the backingStore of lv created with "--virtualsize", + * its original device "/dev/$vgname/$lvname_vorigin" is + * just for lvm internal use, one should never use it. + * + * (lvs outputs "[$lvname_vorigin] for field "origin" if the + * lv is created with "--virtualsize"). + */ + if (groups[1] && !STREQ(groups[1], "") && (groups[1][0] != '[')) { if (virAsprintf(&vol->backingStore.path, "%s/%s", pool->def->target.path, groups[1]) < 0) { virReportOOMError(); -- 1.7.1

2 4

[libvirt] [PATCH] build: require more tools from maintainers
by Eric Blake 18 Nov '11

18 Nov '11

We want our tarballs to be complete - this means that any generated file that gets shipped as part of the tarball so that ordinary users don't have to rebuild it must be something that the maintainer can generate. There have been various reports of random build failures when using libvirt.git instead of a tarball, and often it is due to missing a maintainer-specific tool to produce one of these generated files. This patch raises the bar for what you must have installed to build libvirt.git, but does not impact what you can get away with for building tarballs. Note: It still remains possible to do a successful 'make dist' without these tools, when starting from a release tarball. * bootstrap.conf (buildreq): Add tools that maintainers need for a successful 'make dist' from a fresh git checkout. --- In reply to this thread: https://www.redhat.com/archives/libvir-list/2011-November/msg00344.html bootstrap.conf | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/bootstrap.conf b/bootstrap.conf index 6498aba..a291590 100644 --- a/bootstrap.conf +++ b/bootstrap.conf @@ -181,6 +181,12 @@ ACLOCAL="$ACLOCAL -I m4" export ACLOCAL # Build prerequisites +# Note that some of these programs are only required for 'make dist' to +# succeed from a fresh git checkout; not all of these programs are +# required to run 'make dist' on a tarball. As a special case, we want +# to require the equivalent of the Fedora python-devel package, but +# RHEL 5 lacks the witness python-config package; we hack around that +# old environment below. buildreq="\ autoconf 2.59 automake 1.9.6 @@ -191,9 +197,18 @@ gzip - libtool - perl 5.5 pkg-config - +python-config - rpcgen - tar - +xmllint - +xsltproc - " +# You don't have to be on a system with rpm; rather, if you happen to +# be on RHEL 5, then this bypasses the bootstrap logic that probes for +# a working 'python-config --version'. +if `(rpm -q python-devel) >/dev/null 2>&1`; then + PYTHON_CONFIG=true +fi # Automake requires that ChangeLog exist. touch ChangeLog || exit 1 -- 1.7.7.1

1 1

[libvirt] [PATCH] Don't copy sexpr node value that is an empty string
by Jim Fehlig 18 Nov '11

18 Nov '11

Xen4.1 initializes some unspecified sexpr config items to an empty string, unlike previous Xen versions that would leave the item unset. E.g. the kernel item for an HVM guest (non-direct kernel boot): Xen4.0 and earlier ... (image (hvm (kernel ) ... Xen4.1 ... (image (hvm (kernel '') ... The empty string for kernel causes some grief in subsequent parsing where existence of specified kernel is checked, e.g. if (!def->os.kernel) ... This patch solves the problem in sexpr_node_copy() by not copying a node containing an empty string. --- src/util/sexpr.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/util/sexpr.c b/src/util/sexpr.c index 0e30087..3523d76 100644 --- a/src/util/sexpr.c +++ b/src/util/sexpr.c @@ -519,7 +519,7 @@ int sexpr_node_copy(const struct sexpr *sexpr, const char *node, char **dst) { const char *val = sexpr_node(sexpr, node); - if (val) { + if (val && *val) { *dst = strdup(val); if (!(*dst)) return -1; -- 1.7.7

2 2

[libvirt] "make rpm" failing with git head on RHEL6
by Justin Clift 18 Nov '11

18 Nov '11

Hi guys, Just tried "make rpm" with git head, on RHEL 6.x. It gave the following failure: make[1]: Leaving directory `/home/jc/git_repos/libvirt' make[1]: Entering directory `/home/jc/git_repos/libvirt' { test ! -d "libvirt-0.9.6" || { find "libvirt-0.9.6" -type d ! -perm -200 -exec chmod u+w {} ';' && rm -fr "libvirt-0.9.6"; }; } test -d "libvirt-0.9.6" || mkdir "libvirt-0.9.6" cp: cannot stat `./NEWS': No such file or directory make[1]: *** [distdir] Error 1 make[1]: Leaving directory `/home/jc/git_repos/libvirt' make: *** [rpm] Error 2 Anyone want to fix it prior to 0.9.7? :) Regards and best wishes, Justin Clift -- Aeolus Community Manager http://www.aeolusproject.org

5 15

[libvirt] [PATCH] tests: avoid xend ABRT crash report
by Eric Blake 18 Nov '11

18 Nov '11

I installed the xen development packages on my non-Xen F16 machine in order to compile-test xen code and ensure we don't break things on that front, but being a non-xen machine, /usr/sbin/xend is obviously not running. Unfortunately, xen-4.1.2-1.fc16 has a bug where merely trying to probe xend status on a non-xen kernel causes xend to issue an ABRT crash report: https://bugzilla.redhat.com/show_bug.cgi?id=728696 Even though libvirt (correctly) skips the test, the xend crash report is unnecessary noise. Fix this by first filtering out non-xen kernels even before attempting to probe xend. The test still runs and passes (if run as root) on a RHEL 5 xen kernel after this patch. * tests/reconnect.c (mymain): Skip xend probe on non-xen kernel. * tests/statstest.c (mymain): Likewise. --- Pushing under the trivial rule (can't quite call it the build-breaker, since the libvirt testsuite itself still passed). tests/reconnect.c | 9 ++++++++- tests/statstest.c | 9 ++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/tests/reconnect.c b/tests/reconnect.c index d4aa9f3..90af830 100644 --- a/tests/reconnect.c +++ b/tests/reconnect.c @@ -2,6 +2,7 @@ #include <stdio.h> #include <stdlib.h> +#include <sys/utsname.h> #include "internal.h" #include "testutils.h" @@ -20,8 +21,14 @@ mymain(void) virDomainPtr dom; int status; virCommandPtr cmd; + struct utsname ut; - /* skip test if xend is not running */ + /* Skip test if xend is not running. Calling xend on a non-xen + kernel causes some versions of xend to issue a crash report, so + we first probe uname results. */ + uname(&ut); + if (strstr(ut.release, "xen") == NULL) + return EXIT_AM_SKIP; cmd = virCommandNewArgList("/usr/sbin/xend", "status", NULL); if (virCommandRun(cmd, &status) != 0 || status != 0) { virCommandFree(cmd); diff --git a/tests/statstest.c b/tests/statstest.c index 18cdc5c..fff69a3 100644 --- a/tests/statstest.c +++ b/tests/statstest.c @@ -3,6 +3,7 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> +#include <sys/utsname.h> #include "stats_linux.h" #include "internal.h" @@ -47,8 +48,14 @@ mymain(void) int ret = 0; int status; virCommandPtr cmd; + struct utsname ut; - /* skip test if xend is not running */ + /* Skip test if xend is not running. Calling xend on a non-xen + kernel causes some versions of xend to issue a crash report, so + we first probe uname results. */ + uname(&ut); + if (strstr(ut.release, "xen") == NULL) + return EXIT_AM_SKIP; cmd = virCommandNewArgList("/usr/sbin/xend", "status", NULL); if (virCommandRun(cmd, &status) != 0 || status != 0) { virCommandFree(cmd); -- 1.7.7.1

1 0