- Devel - libvirt List Archives

[libvirt] [PATCH] maint: enforce whitespace on shell scripts
by Eric Blake 22 Apr '10

22 Apr '10

Noticed because virt-pki-validate was very inconsistent on using tabs vs. 8 spaces, sometimes mixing both paradigms on a single line. 'git diff -b' shows significant changes only in cfg.mk. * cfg.mk (sc_TAB_in_indentation): Add a few files. * daemon/libvirtd.init.in: Avoid tabs. * tools/virt-pki-validate.in: Likewise. --- cfg.mk | 4 +- daemon/libvirtd.init.in | 6 +- tools/virt-pki-validate.in | 138 ++++++++++++++++++++++---------------------- 3 files changed, 74 insertions(+), 74 deletions(-) diff --git a/cfg.mk b/cfg.mk index 790d357..105b625 100644 --- a/cfg.mk +++ b/cfg.mk @@ -139,8 +139,8 @@ sc_prohibit_ctype_h: # files in gnulib, since they're imported. sc_TAB_in_indentation: @prohibit='^ * ' \ - in_vc_files='\.(rng|[ch](\.in)?)$$' \ - halt='use spaces, not TAB, for indentation in C sources and RNG schemas' \ + in_vc_files='(\.(rng|[ch](\.in)?)|(daemon|tools)/.*\.in)$$' \ + halt='use spaces, not TAB, for indentation in C, sh, and RNG schemas' \ $(_sc_search_regexp) ctype_re = isalnum|isalpha|isascii|isblank|iscntrl|isdigit|isgraph|islower\ diff --git a/daemon/libvirtd.init.in b/daemon/libvirtd.init.in index 4c8821b..d4dc98b 100644 --- a/daemon/libvirtd.init.in +++ b/daemon/libvirtd.init.in @@ -72,7 +72,7 @@ stop() { if [ $RETVAL -eq 0 ]; then rm -f @localstatedir@/lock/subsys/$SERVICE rm -f $PIDFILE - rm -rf @localstatedir@/cache/libvirt/* + rm -rf @localstatedir@/cache/libvirt/* fi } @@ -101,13 +101,13 @@ case "$1" in ;; force-reload) reload - ;; + ;; condrestart|try-restart) [ -f @localstatedir@/lock/subsys/$SERVICE ] && restart || : ;; *) echo $"Usage: $0 {start|stop|status|restart|condrestart|reload|force-reload|try-restart}" - exit 2 + exit 2 ;; esac exit $RETVAL diff --git a/tools/virt-pki-validate.in b/tools/virt-pki-validate.in index ee7b79d..9a1c6fa 100755 --- a/tools/virt-pki-validate.in +++ b/tools/virt-pki-validate.in @@ -147,35 +147,35 @@ then if [ ! -r $LIBVIRT/clientcert.pem ] then echo Client certificate $LIBVIRT/clientcert.pem should be world readable - echo "as root do: chown root:root $LIBVIRT/clientcert.pem ; chmod 644 $LIBVIRT/clientcert.pem" + echo "as root do: chown root:root $LIBVIRT/clientcert.pem ; chmod 644 $LIBVIRT/clientcert.pem" else S_ORG=`$CERTOOL -i --infile $LIBVIRT/clientcert.pem | grep Subject: | sed 's+.*O=$[a-zA-Z \._-]*$.*+\1+'` - if [ "$ORG" != "$S_ORG" ] - then - echo The CA certificate and the client certificate do not match - echo CA organization: $ORG - echo Client organization: $S_ORG - fi - CLIENT=`$CERTOOL -i --infile $LIBVIRT/clientcert.pem | grep Subject: | sed 's+.*CN=$.[a-zA-Z \._-]*$.*+\1+'` - echo Found client certificate $LIBVIRT/clientcert.pem for $CLIENT - if [ ! -e $LIBVIRTP/clientkey.pem ] - then - echo Missing client private key $LIBVIRTP/clientkey.pem - else - echo Found client private key $LIBVIRTP/clientkey.pem - OWN=`ls -l $LIBVIRTP/clientkey.pem | awk '{ print $3 }'` - MOD=`ls -l $LIBVIRTP/clientkey.pem | awk '{ print $1 }'` - if [ "$OWN" != "root" ] - then - echo The client private key should be owned by root - echo "as root do: chown root $LIBVIRTP/clientkey.pem" - fi - if [ "$MOD" != "-rw-r--r--" ] - then - echo The client private key need to be read by client tools - echo "as root do: chmod 644 $LIBVIRTP/clientkey.pem" - fi - fi + if [ "$ORG" != "$S_ORG" ] + then + echo The CA certificate and the client certificate do not match + echo CA organization: $ORG + echo Client organization: $S_ORG + fi + CLIENT=`$CERTOOL -i --infile $LIBVIRT/clientcert.pem | grep Subject: | sed 's+.*CN=$.[a-zA-Z \._-]*$.*+\1+'` + echo Found client certificate $LIBVIRT/clientcert.pem for $CLIENT + if [ ! -e $LIBVIRTP/clientkey.pem ] + then + echo Missing client private key $LIBVIRTP/clientkey.pem + else + echo Found client private key $LIBVIRTP/clientkey.pem + OWN=`ls -l $LIBVIRTP/clientkey.pem | awk '{ print $3 }'` + MOD=`ls -l $LIBVIRTP/clientkey.pem | awk '{ print $1 }'` + if [ "$OWN" != "root" ] + then + echo The client private key should be owned by root + echo "as root do: chown root $LIBVIRTP/clientkey.pem" + fi + if [ "$MOD" != "-rw-r--r--" ] + then + echo The client private key need to be read by client tools + echo "as root do: chmod 644 $LIBVIRTP/clientkey.pem" + fi + fi fi else @@ -193,41 +193,41 @@ then if [ ! -r $LIBVIRT/servercert.pem ] then echo Server certificate $LIBVIRT/servercert.pem should be world readable - echo "as root do: chown root:root $LIBVIRT/servercert.pem ; chmod 644 $LIBVIRT/servercert.pem" + echo "as root do: chown root:root $LIBVIRT/servercert.pem ; chmod 644 $LIBVIRT/servercert.pem" else S_ORG=`$CERTOOL -i --infile $LIBVIRT/servercert.pem | grep Subject: | sed 's+.*O=$[a-zA-Z\. _-]*$.*+\1+'` - if [ "$ORG" != "$S_ORG" ] - then - echo The CA certificate and the server certificate do not match - echo CA organization: $ORG - echo Server organization: $S_ORG - fi - S_HOST=`$CERTOOL -i --infile $LIBVIRT/servercert.pem | grep Subject: | sed 's+.*CN=$[a-zA-Z\. _-]*$+\1+'` - if test "$S_HOST" != "`hostname -s`" && test "$S_HOST" != "`hostname`" - then - echo The server certificate does not seem to match the host name - echo hostname: '"'`hostname`'"' - echo Server certificate CN: '"'$S_HOST'"' - fi - echo Found server certificate $LIBVIRT/servercert.pem for $S_HOST - if [ ! -e $LIBVIRTP/serverkey.pem ] - then - echo Missing server private key $LIBVIRTP/serverkey.pem - else - echo Found server private key $LIBVIRTP/serverkey.pem - OWN=`ls -l $LIBVIRTP/serverkey.pem | awk '{ print $3 }'` - MOD=`ls -l $LIBVIRTP/serverkey.pem | awk '{ print $1 }'` - if [ "$OWN" != "root" ] - then - echo The server private key should be owned by root - echo "as root do: chown root $LIBVIRTP/serverkey.pem" - fi - if [ "$MOD" != "-rw-------" ] - then - echo The server private key need to be read only by root - echo "as root do: chmod 600 $LIBVIRTP/serverkey.pem" - fi - fi + if [ "$ORG" != "$S_ORG" ] + then + echo The CA certificate and the server certificate do not match + echo CA organization: $ORG + echo Server organization: $S_ORG + fi + S_HOST=`$CERTOOL -i --infile $LIBVIRT/servercert.pem | grep Subject: | sed 's+.*CN=$[a-zA-Z\. _-]*$+\1+'` + if test "$S_HOST" != "`hostname -s`" && test "$S_HOST" != "`hostname`" + then + echo The server certificate does not seem to match the host name + echo hostname: '"'`hostname`'"' + echo Server certificate CN: '"'$S_HOST'"' + fi + echo Found server certificate $LIBVIRT/servercert.pem for $S_HOST + if [ ! -e $LIBVIRTP/serverkey.pem ] + then + echo Missing server private key $LIBVIRTP/serverkey.pem + else + echo Found server private key $LIBVIRTP/serverkey.pem + OWN=`ls -l $LIBVIRTP/serverkey.pem | awk '{ print $3 }'` + MOD=`ls -l $LIBVIRTP/serverkey.pem | awk '{ print $1 }'` + if [ "$OWN" != "root" ] + then + echo The server private key should be owned by root + echo "as root do: chown root $LIBVIRTP/serverkey.pem" + fi + if [ "$MOD" != "-rw-------" ] + then + echo The server private key need to be read only by root + echo "as root do: chmod 600 $LIBVIRTP/serverkey.pem" + fi + fi fi else @@ -243,19 +243,19 @@ then if [ -r $(SYSCONFDIR)/sysconfig/libvirtd ] then if [ "`grep '^LIBVIRTD_ARGS' $(SYSCONFDIR)/sysconfig/libvirtd | grep -- '--listen'`" = "" ] - then - echo Make sure $(SYSCONFDIR)/sysconfig/libvirtd is setup to listen to - echo TCP/IP connections and restart the libvirtd service - fi + then + echo Make sure $(SYSCONFDIR)/sysconfig/libvirtd is setup to listen to + echo TCP/IP connections and restart the libvirtd service + fi fi if [ -r $(SYSCONFDIR)/sysconfig/iptables ] then if [ "`grep $PORT $(SYSCONFDIR)/sysconfig/iptables`" = "" ] - then - echo Make sure $(SYSCONFDIR)/sysconfig/iptables is setup to allow - echo incoming TCP/IP connections on port $PORT and - echo restart the iptables service - fi + then + echo Make sure $(SYSCONFDIR)/sysconfig/iptables is setup to allow + echo incoming TCP/IP connections on port $PORT and + echo restart the iptables service + fi fi fi -- 1.6.6.1

2 1

[libvirt] [PATCH] Fix initial VCPU pinning in qemu driver
by Jiri Denemark 22 Apr '10

22 Apr '10

First, inital VCPU pinning is set correctly but then it is reset by assigning qemu process to a new cgroup (which contains all CPUs). It's easily fixed by swapping these two actions. --- src/qemu/qemu_driver.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) Originally, I thought it would be better to change the initial pinning at cgroup level but then I realized it was not a good idea. AFAIK cgroup olny works for processes and is not usable for per-VCPU pinning. That is, it is fine to have all CPUs in cgroup and fine tune VCPU pinning by setting procss affinity. diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 5f4adfd..cc3e3b2 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -3081,10 +3081,10 @@ static int qemudSecurityHook(void *data) { /* This must take place before exec(), so that all QEMU * memory allocation is on the correct NUMA node */ - if (qemudInitCpuAffinity(h->vm) < 0) + if (qemuAddToCgroup(h->driver, h->vm->def) < 0) return -1; - if (qemuAddToCgroup(h->driver, h->vm->def) < 0) + if (qemudInitCpuAffinity(h->vm) < 0) return -1; if (h->driver->securityDriver && -- 1.7.0.4

2 2

[libvirt] [PATCH] Make avahi startup more robust.
by Chris Lalancette 21 Apr '10

21 Apr '10

If the hostname of the current virtualization machine could not be resolved, then libvirtd would fail to start. However, for disconnected operation (on a laptop, for instance) the hostname may very legitimately not be resolvable. This patch makes it so that if we can't resolve the hostname, avahi doesn't fail, it just uses a less useful MDNS string. Signed-off-by: Chris Lalancette <clalance(a)redhat.com> --- daemon/libvirtd.c | 28 ++++++++++++++++++++-------- 1 files changed, 20 insertions(+), 8 deletions(-) diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c index 863bf21..4533f40 100644 --- a/daemon/libvirtd.c +++ b/daemon/libvirtd.c @@ -998,22 +998,34 @@ static int qemudNetworkInit(struct qemud_server *server) { struct libvirtd_mdns_group *group; struct qemud_socket *sock; int port = 0; + int ret; server->mdns = libvirtd_mdns_new(); if (!mdns_name) { - char groupname[64], *localhost, *tmp; - /* Extract the host part of the potentially FQDN */ + char *groupname, *localhost, *tmp; + localhost = virGetHostname(NULL); if (localhost == NULL) + /* we couldn't resolve the hostname; assume that we are + * running in disconnected operation, and report a less + * useful Avahi string + */ + ret = virAsprintf(&groupname, "Virtualization Host"); + else { + /* Extract the host part of the potentially FQDN */ + if ((tmp = strchr(localhost, '.'))) + *tmp = '\0'; + ret = virAsprintf(&groupname, "Virtualization Host %s", + localhost); + } + VIR_FREE(localhost); + if (ret < 0) { + virReportOOMError(); goto cleanup; - - if ((tmp = strchr(localhost, '.'))) - *tmp = '\0'; - snprintf(groupname, sizeof(groupname)-1, "Virtualization Host %s", localhost); - groupname[sizeof(groupname)-1] = '\0'; + } group = libvirtd_mdns_add_group(server->mdns, groupname); - VIR_FREE(localhost); + VIR_FREE(groupname); } else { group = libvirtd_mdns_add_group(server->mdns, mdns_name); } -- 1.6.6.1

2 1

[libvirt] [PATCH] maint: ignore 'make syntax-check' failure files
by Eric Blake 21 Apr '10

21 Apr '10

* .gitignore: Add exemption. * cfg.mk (local-checks-to-skip): Ignore a test to silence a skip warning. --- Noticed these while fixing the 'make syntax-check' fallout. They border on trivial, but I decided to wait for an ACK. .gitignore | 1 + cfg.mk | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index a7466fd..8c275f4 100644 --- a/.gitignore +++ b/.gitignore @@ -7,6 +7,7 @@ *~ .git .git-module-status +.sc-start-sc_* /GNUmakefile /maint.mk ABOUT-NLS diff --git a/cfg.mk b/cfg.mk index 5d8103e..790d357 100644 --- a/cfg.mk +++ b/cfg.mk @@ -34,6 +34,7 @@ local-checks-to-skip = \ sc_GPL_version \ sc_always_defined_macros \ sc_cast_of_alloca_return_value \ + sc_cross_check_PATH_usage_in_tests \ sc_dd_max_sym_length \ sc_error_exit_success \ sc_file_system \ -- 1.6.6.1

2 2

[libvirt] [PATCH 1/4] Make avahi startup more robust.
by Chris Lalancette 21 Apr '10

21 Apr '10

If the hostname of the current virtualization machine could not be resolved, then libvirtd would fail to start. However, for disconnected operation (on a laptop, for instance) the hostname may very legitimately not be resolvable. This patch makes it so that if we can't resolve the hostname, avahi doesn't fail, it just uses a less useful MDNS string. Signed-off-by: Chris Lalancette <clalance(a)redhat.com> --- daemon/libvirtd.c | 19 +++++++++++++------ 1 files changed, 13 insertions(+), 6 deletions(-) diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c index 863bf21..69106ee 100644 --- a/daemon/libvirtd.c +++ b/daemon/libvirtd.c @@ -998,22 +998,29 @@ static int qemudNetworkInit(struct qemud_server *server) { struct libvirtd_mdns_group *group; struct qemud_socket *sock; int port = 0; + int ret; server->mdns = libvirtd_mdns_new(); if (!mdns_name) { - char groupname[64], *localhost, *tmp; + char *groupname, *localhost, *tmp; /* Extract the host part of the potentially FQDN */ localhost = virGetHostname(NULL); if (localhost == NULL) + ret = virAsprintf(&groupname, "Virtualization Host"); + else { + if ((tmp = strchr(localhost, '.'))) + *tmp = '\0'; + ret = virAsprintf(&groupname, "Virtualization Host %s", + localhost); + } + if (ret < 0) { + virReportOOMError(); goto cleanup; - - if ((tmp = strchr(localhost, '.'))) - *tmp = '\0'; - snprintf(groupname, sizeof(groupname)-1, "Virtualization Host %s", localhost); - groupname[sizeof(groupname)-1] = '\0'; + } group = libvirtd_mdns_add_group(server->mdns, groupname); VIR_FREE(localhost); + VIR_FREE(groupname); } else { group = libvirtd_mdns_add_group(server->mdns, mdns_name); } -- 1.6.6.1

3 5

[libvirt] empty type parameter in driver tag for disk in machine xml file
by Frederik Himpe 21 Apr '10

21 Apr '10

I updated my system from libvirt 0.7.1 to 0.7.7, one of my qemu-kvm VMs was not starting anymore, with this error: LC_ALL=C PATH=/sbin:/usr/sbin:/bin:/usr/bin HOME=/ TMPDIR=/tmp QEMU_AUDIO_DRV=none /usr/bin/qemu-kvm -S -M pc-0.11 -enable-kvm -m 512 - smp 1,sockets=1,cores=1,threads=1 -name debian-testing -uuid 54f57a86- b84c-61ba-7f2a-c69f39f80a41 -nodefaults -chardev socket,id=monitor,path=/ var/lib/libvirt/qemu/debian-testing.monitor,server,nowait -mon chardev=monitor,mode=readline -rtc base=utc -boot c -drive file=/home/ frederik/Software/iso/debian-testing-amd64- netinst.iso,if=none,media=cdrom,id=drive-ide0-1-0 -device ide- drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0 -drive file=/home/ frederik/VM/debian-testing.img,if=none,id=drive-virtio- disk0,boot=on,format= -device virtio-blk- pci,bus=pci.0,addr=0x4,drive=drive-virtio-disk0,id=virtio-disk0 -device virtio-net-pci,vlan=0,id=net0,mac=52:54:00:25:9c:a0,bus=pci.0,addr=0x5 - net tap,fd=19,vlan=0,name=hostnet0 -chardev pty,id=serial0 -device isa- serial,chardev=serial0 -usb -device usb-tablet,id=input0 -vnc 127.0.0.1:1 -k fr-be -vga vmware -device ES1370,id=sound0,bus=pci.0,addr=0x6 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 char device redirected to /dev/pts/6 qemu: '' invalid format It seems this part of the libvirt xml file was causing the problem: <disk type='file' device='disk'> <driver name='qemu' type=''/> <source file='/home/frederik/VM/debian-testing.img'/> <target dev='vda' bus='virtio'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> </disk> Notice the empty type parameter in the driver tag. Removing type='' completely, makes the machine start fine. Is this a bug which should be fixed, so that libvirt can deal empty type tags, possible set by older versions? -- Frederik Himpe

3 5

[libvirt] [PATCH] Add a test case that validates save to a block device
by Daniel P. Berrange 21 Apr '10

21 Apr '10

There are some unusual problems when saving to a block device, vs a file. This test case covers problems inherant in using block devices --- scripts/domain/103-blockdev-save-restore.t | 91 ++++++++++++++++++++++++++++ 1 files changed, 91 insertions(+), 0 deletions(-) create mode 100644 scripts/domain/103-blockdev-save-restore.t diff --git a/scripts/domain/103-blockdev-save-restore.t b/scripts/domain/103-blockdev-save-restore.t new file mode 100644 index 0000000..3cacc2f --- /dev/null +++ b/scripts/domain/103-blockdev-save-restore.t @@ -0,0 +1,91 @@ +# -*- perl -*- +# +# Copyright (C) 2009-2010 Red Hat, Inc. +# Copyright (C) 2009 Daniel P. Berrange +# +# This program is free software; You can redistribute it and/or modify +# it under the GNU General Public License as published by the Free +# Software Foundation; either version 2, or (at your option) any +# later version +# +# The file "LICENSE" distributed along with this file provides full +# details of the terms and conditions +# + +=pod + +=head1 NAME + +domain/103-blockdev-save-restore.t: Save/restore with a block device + +=head1 DESCRIPTION + +The test case validates that it is possible to save and restore +transient domains to/from a block device, instead of a plain file + +=cut + +use strict; +use warnings; + +use Test::More tests => 9; + +use Sys::Virt::TCK; +use Test::Exception; + +my $tck = Sys::Virt::TCK->new(); +my $conn = eval { $tck->setup(); }; +BAIL_OUT "failed to setup test harness: $@" if $@; +END { + $tck->cleanup if $tck; + unlink "tck.img" if -f "tck.img"; +} + + +my $xml = $tck->generic_domain("tck")->as_xml; + +my $dev = $tck->get_host_block_device(); + +my $dom; +diag "Creating a new transient domain"; +ok_domain(sub { $dom = $conn->create_domain($xml) }, "created transient domain object"); + +SKIP: { + skip "no block device available", 7 unless $dev; + + ok(-b $dev, "$dev is a block device"); + + diag "Clearing any existing data in block device"; + open DEV, ">$dev" or die "cannot open $dev: $1"; + my $zeros = "\0"x1024; + for (my $i = 0; $i < 1024 * 10 ; $i++) { + print DEV $zeros; + } + close DEV or die "cannot save $dev: $!"; + + eval { $dom->save($dev); }; + skip "save/restore not implemented", 6 if $@ && err_not_implemented($@); + + ok(!$@, "domain saved"); + die $@ if $@; + + diag "Verifying it is still a block device, not a file"; + ok(-b $dev, "$dev is a block device"); + + diag "Checking that transient domain has gone away"; + ok_error(sub { $conn->get_domain_by_name("tck") }, "NO_DOMAIN error raised from missing domain", 42); + + diag "Attempting to restore the guest"; + lives_ok { $conn->restore_domain($dev) } "domain has been restored"; + + ok_domain(sub { $dom = $conn->get_domain_by_name("tck") }, "restored domain is still there", "tck"); + + ok(-b $dev, "$dev is a block device"); +} +diag "Destroying the transient domain"; +$dom->destroy; + +diag "Checking that transient domain has gone away"; +ok_error(sub { $conn->get_domain_by_name("tck") }, "NO_DOMAIN error raised from missing domain", 42); + +# end -- 1.6.5.2

2 1

[libvirt] [PATCH[ nwfilter: lock interface by its index
by Stefan Berger 21 Apr '10

21 Apr '10

Since the name of an interface can be the same between stops and starts of different VMs I have to switch the IP address learning thread to use the index of the interface to determine whether an interface is still available or not - in the case of macvtap the thread needs to listen for traffic on the physical interface, thus having to time out periodically to check whether the VM's macvtap device is still there as an indication that the VM is still alive. Previously the following sequence of 2 VMs with macvtap device virsh start testvm1; virsh destroy testvm1 ; virsh start testvm2 would not terminate the thread upon testvm1's destroy since the name of the interface on the host could be the same (i.e, macvtap0) on testvm1 and testvm2, thus it was easily race-able. The thread would then determine the IP address parameter for testvm2 but apply the rule set for testvm1. :-( I am also introducing a lock for the interface (by name) that the thread must hold while it listens for the traffic and releases when it terminates upon VM termination or 0.5 second thereafter. Thus, the new thread for a newly started VM with the same interface name will not start while the old one still holds the lock. The only other code that I see that also needs to grab the lock to serialize operation is the one that tears down the firewall that were established on behalf of an interface. I am moving the code applying the 'basic' firewall rules during the IP address learning phase inside the thread but won't start the thread unless it is ensured that the firewall driver has the ability to apply the 'basic' firewall rules. Signed-off-by: Stefan Berger <stefanb(a)us.ibm.com> --- src/nwfilter/nwfilter_gentech_driver.c | 24 +++ src/nwfilter/nwfilter_gentech_driver.h | 2 src/nwfilter/nwfilter_learnipaddr.c | 231 +++++++++++++++++++++++++++------ src/nwfilter/nwfilter_learnipaddr.h | 7 - 4 files changed, 221 insertions(+), 43 deletions(-) Index: libvirt-acl/src/nwfilter/nwfilter_learnipaddr.c =================================================================== --- libvirt-acl.orig/src/nwfilter/nwfilter_learnipaddr.c +++ libvirt-acl/src/nwfilter/nwfilter_learnipaddr.c @@ -54,6 +54,11 @@ #define VIR_FROM_THIS VIR_FROM_NWFILTER +#define IFINDEX2STR(VARNAME, ifindex) \ + char VARNAME[20]; \ + snprintf(VARNAME, sizeof(VARNAME), "%d", ifindex); + +#define PKT_TIMEOUT_MS 500 /* ms */ /* structure of an ARP request/reply message */ struct f_arphdr { @@ -109,6 +114,81 @@ static virHashTablePtr pendingLearnReq; static virMutex ipAddressMapLock; static virNWFilterHashTablePtr ipAddressMap; +static virMutex ifaceMapLock; +static virHashTablePtr ifaceLockMap; + +typedef struct _virNWFilterIfaceLock virNWFilterIfaceLock; +typedef virNWFilterIfaceLock *virNWFilterIfaceLockPtr; +struct _virNWFilterIfaceLock { + char ifname[IF_NAMESIZE]; + virMutex lock; + int refctr; +}; + + +static bool threadsTerminate = false; + + +int +virNWFilterLockIface(const char *ifname) { + virNWFilterIfaceLockPtr ifaceLock; + + virMutexLock(&ifaceMapLock); + + ifaceLock = virHashLookup(ifaceLockMap, ifname); + if (!ifaceLock) { + if (VIR_ALLOC(ifaceLock) < 0) { + virReportOOMError(); + goto err_exit; + } + + if (virMutexInitRecursive(&ifaceLock->lock) || + virStrcpyStatic(ifaceLock->ifname, ifname) == NULL || + virHashAddEntry(ifaceLockMap, ifname, ifaceLock)) { + VIR_FREE(ifaceLock); + goto err_exit; + } + + ifaceLock->refctr = 0; + } + + ifaceLock->refctr++; + + virMutexUnlock(&ifaceMapLock); + + virMutexLock(&ifaceLock->lock); + + return 0; + + err_exit: + virMutexUnlock(&ifaceMapLock); + + return 1; +} + + +static void +freeIfaceLock(void *payload, const char *name ATTRIBUTE_UNUSED) { + VIR_FREE(payload); +} + + +void +virNWFilterUnlockIface(const char *ifname) { + virNWFilterIfaceLockPtr ifaceLock; + + virMutexLock(&ifaceMapLock); + + ifaceLock = virHashLookup(ifaceLockMap, ifname); + virMutexUnlock(&ifaceLock->lock); + + ifaceLock->refctr--; + if (ifaceLock->refctr == 0) + virHashRemoveEntry(ifaceLockMap, ifname, freeIfaceLock); + + virMutexUnlock(&ifaceMapLock); +} + static void virNWFilterIPAddrLearnReqFree(virNWFilterIPAddrLearnReqPtr req) { @@ -127,10 +207,12 @@ virNWFilterIPAddrLearnReqFree(virNWFilte static int virNWFilterRegisterLearnReq(virNWFilterIPAddrLearnReqPtr req) { int res = -1; + IFINDEX2STR(ifindex_str, req->ifindex); + virMutexLock(&pendingLearnReqLock); - if (!virHashLookup(pendingLearnReq, req->ifname)) - res = virHashAddEntry(pendingLearnReq, req->ifname, req); + if (!virHashLookup(pendingLearnReq, ifindex_str)) + res = virHashAddEntry(pendingLearnReq, ifindex_str, req); virMutexUnlock(&pendingLearnReqLock); @@ -141,12 +223,13 @@ virNWFilterRegisterLearnReq(virNWFilterI virNWFilterIPAddrLearnReqPtr -virNWFilterLookupLearnReq(const char *ifname) { +virNWFilterLookupLearnReq(int ifindex) { void *res; + IFINDEX2STR(ifindex_str, ifindex); virMutexLock(&pendingLearnReqLock); - res = virHashLookup(pendingLearnReq, ifname); + res = virHashLookup(pendingLearnReq, ifindex_str); virMutexUnlock(&pendingLearnReqLock); @@ -163,15 +246,16 @@ freeLearnReqEntry(void *payload, const c #ifdef HAVE_LIBPCAP static virNWFilterIPAddrLearnReqPtr -virNWFilterDeregisterLearnReq(const char *ifname) { +virNWFilterDeregisterLearnReq(int ifindex) { virNWFilterIPAddrLearnReqPtr res; + IFINDEX2STR(ifindex_str, ifindex); virMutexLock(&pendingLearnReqLock); - res = virHashLookup(pendingLearnReq, ifname); + res = virHashLookup(pendingLearnReq, ifindex_str); if (res) - virHashRemoveEntry(pendingLearnReq, ifname, NULL); + virHashRemoveEntry(pendingLearnReq, ifindex_str, NULL); virMutexUnlock(&pendingLearnReqLock); @@ -274,7 +358,7 @@ static void * learnIPAddressThread(void *arg) { char errbuf[PCAP_ERRBUF_SIZE] = {0}; - pcap_t *handle; + pcap_t *handle = NULL; struct bpf_program fp; struct pcap_pkthdr header; const u_char *packet; @@ -285,19 +369,26 @@ learnIPAddressThread(void *arg) unsigned int ethHdrSize; char *listen_if = (strlen(req->linkdev) != 0) ? req->linkdev : req->ifname; - int to_ms = (strlen(req->linkdev) != 0) ? 1000 - : 0; int dhcp_opts_len; char macaddr[VIR_MAC_STRING_BUFLEN]; virBuffer buf = VIR_BUFFER_INITIALIZER; - char *filter= NULL; + char *filter = NULL; uint16_t etherType; + bool showError = true; enum howDetect howDetected = 0; virNWFilterTechDriverPtr techdriver = req->techdriver; + virNWFilterLockIface(req->ifname); + req->status = 0; - handle = pcap_open_live(listen_if, BUFSIZ, 0, to_ms, errbuf); + /* anything change to the VM's interface -- check at least once */ + if (ifaceCheck(false, req->ifname, NULL, req->ifindex)) { + req->status = ENODEV; + goto done; + } + + handle = pcap_open_live(listen_if, BUFSIZ, 0, PKT_TIMEOUT_MS, errbuf); if (handle == NULL) { VIR_DEBUG("Couldn't open device %s: %s\n", listen_if, errbuf); @@ -309,11 +400,22 @@ learnIPAddressThread(void *arg) switch (req->howDetect) { case DETECT_DHCP: + if (techdriver->applyDHCPOnlyRules(req->ifname, + req->macaddr, + NULL)) { + req->status = EINVAL; + goto done; + } virBufferVSprintf(&buf, " ether dst %s" " and src port 67 and dst port 68", macaddr); break; default: + if (techdriver->applyBasicRules(req->ifname, + req->macaddr)) { + req->status = EINVAL; + goto done; + } virBufferVSprintf(&buf, "ether host %s", macaddr); } @@ -324,25 +426,36 @@ learnIPAddressThread(void *arg) filter = virBufferContentAndReset(&buf); - if (pcap_compile(handle, &fp, filter, 1, 0) != 0 || - pcap_setfilter(handle, &fp) != 0) { - VIR_DEBUG("Couldn't compile or set filter '%s'.\n", filter); + if (pcap_compile(handle, &fp, filter, 1, 0) != 0) { + VIR_DEBUG("Couldn't compile filter '%s'.\n", filter); req->status = EINVAL; goto done; } + if (pcap_setfilter(handle, &fp) != 0) { + VIR_DEBUG("Couldn't set filter '%s'.\n", filter); + req->status = EINVAL; + pcap_freecode(&fp); + goto done; + } + + pcap_freecode(&fp); + while (req->status == 0 && vmaddr == 0) { packet = pcap_next(handle, &header); if (!packet) { - if (to_ms == 0) { - /* assuming IF disappeared */ - req->status = ENODEV; + + if (threadsTerminate) { + req->status = ECANCELED; + showError = false; break; } - /* listening on linkdev, check whether VM's dev is still there */ - if (ifaceCheck(false, req->ifname, req->macaddr, -1)) { + + /* check whether VM's dev is still there */ + if (ifaceCheck(false, req->ifname, NULL, req->ifindex)) { req->status = ENODEV; + showError = false; break; } continue; @@ -470,6 +583,7 @@ learnIPAddressThread(void *arg) ret = virNWFilterInstantiateFilterLate(NULL, req->ifname, + req->ifindex, req->linkdev, req->nettype, req->macaddr, @@ -478,13 +592,22 @@ learnIPAddressThread(void *arg) req->driver); VIR_DEBUG("Result from applying firewall rules on " "%s with IP addr %s : %d\n", req->ifname, inetaddr, ret); + } else { + if (showError) + virReportSystemError(req->status, + "%s encountered an error. Shutting down " + "interface %s", + __FUNCTION__, req->ifname); + ifaceDown(req->ifname); } memset(&req->thread, 0x0, sizeof(req->thread)); VIR_DEBUG("pcap thread terminating for interface %s\n",req->ifname); - virNWFilterDeregisterLearnReq(req->ifname); + virNWFilterDeregisterLearnReq(req->ifindex); + + virNWFilterUnlockIface(req->ifname); virNWFilterIPAddrLearnReqFree(req); @@ -496,6 +619,7 @@ learnIPAddressThread(void *arg) * virNWFilterLearnIPAddress * @techdriver : driver to build firewalls * @ifname: the name of the interface + * @ifindex: the index of the interface * @linkdev : the name of the link device; currently only used in case of a * macvtap device * @nettype : the type of interface @@ -516,6 +640,7 @@ learnIPAddressThread(void *arg) int virNWFilterLearnIPAddress(virNWFilterTechDriverPtr techdriver, const char *ifname, + int ifindex, const char *linkdev, enum virDomainNetType nettype, const unsigned char *macaddr, @@ -530,6 +655,14 @@ virNWFilterLearnIPAddress(virNWFilterTec if (howDetect == 0) return 1; + if ( !techdriver->canApplyBasicRules()) { + virNWFilterReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("IP parameter must be provided since " + "snooping the IP address does not work " + "possibly due to missing tools")); + return 1; + } + if (VIR_ALLOC(req) < 0) { virReportOOMError(); goto err_no_req; @@ -538,7 +671,7 @@ virNWFilterLearnIPAddress(virNWFilterTec ht = virNWFilterHashTableCreate(0); if (ht == NULL) { virReportOOMError(); - goto err_no_ht; + goto err_free_req; } if (virNWFilterHashTablePutAll(filterparams, ht)) @@ -565,6 +698,8 @@ virNWFilterLearnIPAddress(virNWFilterTec goto err_free_ht; } } + + req->ifindex = ifindex; req->nettype = nettype; memcpy(req->macaddr, macaddr, sizeof(req->macaddr)); req->driver = driver; @@ -576,35 +711,21 @@ virNWFilterLearnIPAddress(virNWFilterTec rc = virNWFilterRegisterLearnReq(req); if (rc) - goto err_free_ht; - - switch (howDetect) { - case DETECT_DHCP: - if (techdriver->applyDHCPOnlyRules(ifname, - macaddr, - NULL)) - goto err_free_ht; - break; - default: - if (techdriver->applyBasicRules(ifname, - macaddr)) - goto err_free_ht; - } - + goto err_free_req; if (pthread_create(&req->thread, NULL, learnIPAddressThread, req) != 0) - goto err_remove_rules; + goto err_dereg_req; return 0; -err_remove_rules: - techdriver->removeBasicRules(ifname); +err_dereg_req: + virNWFilterDeregisterLearnReq(ifindex); err_free_ht: virNWFilterHashTableFree(ht); -err_no_ht: +err_free_req: virNWFilterIPAddrLearnReqFree(req); err_no_req: return 1; @@ -615,6 +736,7 @@ err_no_req: int virNWFilterLearnIPAddress(virNWFilterTechDriverPtr techdriver ATTRIBUTE_UNUSED, const char *ifname ATTRIBUTE_UNUSED, + int ifindex ATTRIBUTE_UNUSED, const char *linkdev ATTRIBUTE_UNUSED, enum virDomainNetType nettype ATTRIBUTE_UNUSED, const unsigned char *macaddr ATTRIBUTE_UNUSED, @@ -637,6 +759,12 @@ virNWFilterLearnIPAddress(virNWFilterTec */ int virNWFilterLearnInit(void) { + + if (pendingLearnReq) + return 0; + + threadsTerminate = false; + pendingLearnReq = virHashCreate(0); if (!pendingLearnReq) { virReportOOMError(); @@ -660,6 +788,18 @@ virNWFilterLearnInit(void) { return 1; } + ifaceLockMap = virHashCreate(0); + if (!ifaceLockMap) { + virReportOOMError(); + virNWFilterLearnShutdown(); + return 1; + } + + if (virMutexInit(&ifaceMapLock)) { + virNWFilterLearnShutdown(); + return 1; + } + return 0; } @@ -670,9 +810,18 @@ virNWFilterLearnInit(void) { */ void virNWFilterLearnShutdown(void) { + + threadsTerminate = true; + + while (virHashSize(pendingLearnReq) != 0) + usleep((PKT_TIMEOUT_MS * 1000) / 3); + virHashFree(pendingLearnReq, freeLearnReqEntry); pendingLearnReq = NULL; virNWFilterHashTableFree(ipAddressMap); ipAddressMap = NULL; + + virHashFree(ifaceLockMap, freeIfaceLock); + ifaceLockMap = NULL; } Index: libvirt-acl/src/nwfilter/nwfilter_learnipaddr.h =================================================================== --- libvirt-acl.orig/src/nwfilter/nwfilter_learnipaddr.h +++ libvirt-acl/src/nwfilter/nwfilter_learnipaddr.h @@ -35,6 +35,7 @@ typedef virNWFilterIPAddrLearnReq *virNW struct _virNWFilterIPAddrLearnReq { virNWFilterTechDriverPtr techdriver; char ifname[IF_NAMESIZE]; + int ifindex; char linkdev[IF_NAMESIZE]; enum virDomainNetType nettype; unsigned char macaddr[VIR_MAC_BUFLEN]; @@ -49,6 +50,7 @@ struct _virNWFilterIPAddrLearnReq { int virNWFilterLearnIPAddress(virNWFilterTechDriverPtr techdriver, const char *ifname, + int ifindex, const char *linkdev, enum virDomainNetType nettype, const unsigned char *macaddr, @@ -57,12 +59,15 @@ int virNWFilterLearnIPAddress(virNWFilte virNWFilterDriverStatePtr driver, enum howDetect howDetect); -virNWFilterIPAddrLearnReqPtr virNWFilterLookupLearnReq(const char *ifname); +virNWFilterIPAddrLearnReqPtr virNWFilterLookupLearnReq(int ifindex); void virNWFilterDelIpAddrForIfname(const char *ifname); const char *virNWFilterGetIpAddrForIfname(const char *ifname); +int virNWFilterLockIface(const char *ifname); +void virNWFilterUnlockIface(const char *ifname); + int virNWFilterLearnInit(void); void virNWFilterLearnShutdown(void); Index: libvirt-acl/src/nwfilter/nwfilter_gentech_driver.c =================================================================== --- libvirt-acl.orig/src/nwfilter/nwfilter_gentech_driver.c +++ libvirt-acl/src/nwfilter/nwfilter_gentech_driver.c @@ -557,6 +557,7 @@ virNWFilterInstantiate(virConnectPtr con enum virDomainNetType nettype, virNWFilterDefPtr filter, const char *ifname, + int ifindex, const char *linkdev, virNWFilterHashTablePtr vars, enum instCase useNewFilter, int *foundNewFilter, @@ -592,9 +593,10 @@ virNWFilterInstantiate(virConnectPtr con if (virHashSize(missing_vars->hashTable) == 1) { if (virHashLookup(missing_vars->hashTable, NWFILTER_STD_VAR_IP) != NULL) { - if (virNWFilterLookupLearnReq(ifname) == NULL) { + if (virNWFilterLookupLearnReq(ifindex) == NULL) { rc = virNWFilterLearnIPAddress(techdriver, ifname, + ifindex, linkdev, nettype, macaddr, filter->name, @@ -639,11 +641,21 @@ virNWFilterInstantiate(virConnectPtr con if (rc) goto err_exit; + virNWFilterLockIface(ifname); + rc = techdriver->applyNewRules(conn, ifname, nptrs, ptrs); if (teardownOld && rc == 0) techdriver->tearOldRules(conn, ifname); + if (rc == 0 && ifaceCheck(false, ifname, NULL, ifindex)) { + /* interface changed/disppeared */ + techdriver->allTeardown(ifname); + rc = 1; + } + + virNWFilterUnlockIface(ifname); + VIR_FREE(ptrs); } @@ -666,6 +678,7 @@ static int __virNWFilterInstantiateFilter(virConnectPtr conn, bool teardownOld, const char *ifname, + int ifindex, const char *linkdev, enum virDomainNetType nettype, const unsigned char *macaddr, @@ -767,6 +780,7 @@ __virNWFilterInstantiateFilter(virConnec nettype, filter, ifname, + ifindex, linkdev, vars, useNewFilter, &foundNewFilter, @@ -798,9 +812,15 @@ _virNWFilterInstantiateFilter(virConnect const char *linkdev = (net->type == VIR_DOMAIN_NET_TYPE_DIRECT) ? net->data.direct.linkdev : NULL; + int ifindex; + + if (ifaceGetIndex(true, net->ifname, &ifindex)) + return 1; + return __virNWFilterInstantiateFilter(conn, teardownOld, net->ifname, + ifindex, linkdev, net->type, net->mac, @@ -814,6 +834,7 @@ _virNWFilterInstantiateFilter(virConnect int virNWFilterInstantiateFilterLate(virConnectPtr conn, const char *ifname, + int ifindex, const char *linkdev, enum virDomainNetType nettype, const unsigned char *macaddr, @@ -825,6 +846,7 @@ virNWFilterInstantiateFilterLate(virConn rc = __virNWFilterInstantiateFilter(conn, 1, ifname, + ifindex, linkdev, nettype, macaddr, Index: libvirt-acl/src/nwfilter/nwfilter_gentech_driver.h =================================================================== --- libvirt-acl.orig/src/nwfilter/nwfilter_gentech_driver.h +++ libvirt-acl/src/nwfilter/nwfilter_gentech_driver.h @@ -49,6 +49,7 @@ int virNWFilterTearOldFilter(virConnectP int virNWFilterInstantiateFilterLate(virConnectPtr conn, const char *ifname, + int ifindex, const char *linkdev, enum virDomainNetType nettype, const unsigned char *macaddr, @@ -77,6 +78,7 @@ virNWFilterTearNWFilter(virDomainNetDefP static inline void virNWFilterTearVMNWFilters(virDomainObjPtr vm) { int i; + for (i = 0; i < vm->def->nnets; i++) virNWFilterTearNWFilter(vm->def->nets[i]); }

2 2

[libvirt] [PATCH] esx: Gather some XML generation macros in esx_vi.h
by Matthias Bolte 21 Apr '10

21 Apr '10

--- src/esx/esx_vi.c | 27 ++------------------------- src/esx/esx_vi.h | 37 +++++++++++++++++++++++++++++++++++++ src/esx/esx_vi_methods.c | 17 ----------------- src/esx/esx_vi_types.c | 20 -------------------- 4 files changed, 39 insertions(+), 62 deletions(-) diff --git a/src/esx/esx_vi.c b/src/esx/esx_vi.c index c6854f1..e405c80 100644 --- a/src/esx/esx_vi.c +++ b/src/esx/esx_vi.c @@ -38,38 +38,13 @@ #define VIR_FROM_THIS VIR_FROM_ESX -#define ESX_VI__SOAP__REQUEST_HEADER \ - "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" \ - "<soapenv:Envelope " \ - "xmlns:soapenv=\"http://schemas.xmlsoap.org/soap/envelope/\" " \ - "xmlns:soapenc=\"http://schemas.xmlsoap.org/soap/encoding/\" " \ - "xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" " \ - "xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\">" \ - "<soapenv:Body>" - -#define ESX_VI__SOAP__REQUEST_FOOTER \ - "</soapenv:Body>" \ - "</soapenv:Envelope>" + #define ESX_VI__SOAP__RESPONSE_XPATH(_type) \ ((char *)"/soapenv:Envelope/soapenv:Body/" \ "vim:"_type"Response/vim:returnval") -#define ESV_VI__XML_TAG__OPEN(_buffer, _element, _type) \ - do { \ - virBufferAddLit(_buffer, "<"); \ - virBufferAdd(_buffer, _element, -1); \ - virBufferAddLit(_buffer, " xmlns=\"urn:vim25\" xsi:type=\""); \ - virBufferAdd(_buffer, _type, -1); \ - virBufferAddLit(_buffer, "\">"); \ - } while (0) - -#define ESV_VI__XML_TAG__CLOSE(_buffer, _element) \ - do { \ - virBufferAddLit(_buffer, "</"); \ - virBufferAdd(_buffer, _element, -1); \ - virBufferAddLit(_buffer, ">"); \ - } while (0) + #define ESX_VI__TEMPLATE__ALLOC(_type) \ int \ @@ -78,6 +53,8 @@ return esxVI_Alloc((void **)ptrptr, sizeof(esxVI_##_type)); \ } + + #define ESX_VI__TEMPLATE__FREE(_type, _body) \ void \ esxVI_##_type##_Free(esxVI_##_type **ptrptr) \ diff --git a/src/esx/esx_vi.h b/src/esx/esx_vi.h index a3d9363..e0d731e 100644 --- a/src/esx/esx_vi.h +++ b/src/esx/esx_vi.h @@ -40,6 +40,43 @@ +#define ESX_VI__SOAP__REQUEST_HEADER \ + "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" \ + "<soapenv:Envelope\n" \ + " xmlns:soapenv=\"http://schemas.xmlsoap.org/soap/envelope/\"\n" \ + " xmlns:soapenc=\"http://schemas.xmlsoap.org/soap/encoding/\"\n" \ + " xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n" \ + " xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\">\n" \ + "<soapenv:Body>\n" + + + +#define ESX_VI__SOAP__REQUEST_FOOTER \ + "</soapenv:Body>\n" \ + "</soapenv:Envelope>" + + + +#define ESV_VI__XML_TAG__OPEN(_buffer, _element, _type) \ + do { \ + virBufferAddLit(_buffer, "<"); \ + virBufferAdd(_buffer, _element, -1); \ + virBufferAddLit(_buffer, " xmlns=\"urn:vim25\" xsi:type=\""); \ + virBufferAdd(_buffer, _type, -1); \ + virBufferAddLit(_buffer, "\">"); \ + } while (0) + + + +#define ESV_VI__XML_TAG__CLOSE(_buffer, _element) \ + do { \ + virBufferAddLit(_buffer, "</"); \ + virBufferAdd(_buffer, _element, -1); \ + virBufferAddLit(_buffer, ">"); \ + } while (0) + + + typedef enum _esxVI_APIVersion esxVI_APIVersion; typedef enum _esxVI_ProductVersion esxVI_ProductVersion; typedef enum _esxVI_Occurrence esxVI_Occurrence; diff --git a/src/esx/esx_vi_methods.c b/src/esx/esx_vi_methods.c index 5c52167..8f841e3 100644 --- a/src/esx/esx_vi_methods.c +++ b/src/esx/esx_vi_methods.c @@ -34,23 +34,6 @@ -#define ESX_VI__SOAP__REQUEST_HEADER \ - "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" \ - "<soapenv:Envelope " \ - "xmlns:soapenv=\"http://schemas.xmlsoap.org/soap/envelope/\" " \ - "xmlns:soapenc=\"http://schemas.xmlsoap.org/soap/encoding/\" " \ - "xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" " \ - "xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\">" \ - "<soapenv:Body>" - - - -#define ESX_VI__SOAP__REQUEST_FOOTER \ - "</soapenv:Body>" \ - "</soapenv:Envelope>" - - - #define ESX_VI__METHOD__CHECK_OUTPUT__None \ /* nothing */ diff --git a/src/esx/esx_vi_types.c b/src/esx/esx_vi_types.c index ed4674b..7d2c02c 100644 --- a/src/esx/esx_vi_types.c +++ b/src/esx/esx_vi_types.c @@ -39,26 +39,6 @@ -#define ESV_VI__XML_TAG__OPEN(_buffer, _element, _type) \ - do { \ - virBufferAddLit(_buffer, "<"); \ - virBufferAdd(_buffer, _element, -1); \ - virBufferAddLit(_buffer, " xmlns=\"urn:vim25\" xsi:type=\""); \ - virBufferAdd(_buffer, _type, -1); \ - virBufferAddLit(_buffer, "\">"); \ - } while (0) - - - -#define ESV_VI__XML_TAG__CLOSE(_buffer, _element) \ - do { \ - virBufferAddLit(_buffer, "</"); \ - virBufferAdd(_buffer, _element, -1); \ - virBufferAddLit(_buffer, ">"); \ - } while (0) - - - #define ESX_VI__TEMPLATE__ALLOC(__type) \ int \ esxVI_##__type##_Alloc(esxVI_##__type **ptrptr) \ -- 1.6.3.3

2 3

[libvirt] [RFC PATCH] Support for qemu aio drive option
by Matthias Dahl 21 Apr '10

21 Apr '10

This is a "quick" implementation to support the qemu aio drive option. I tried to stay true to the coding style and this has been tested w/ libvirt 0.7.6 and works just fine. Since I am not that familiar w/ the inner workings of libvirt, I am sure I missed a few spots, so I hope either someone will base his work on this patch or point me into the right direction so I can finish this up for good. :-) For everyone else, enjoy... --- src/conf/domain_conf.c | 23 +++++++++++++++++++++++ src/conf/domain_conf.h | 10 ++++++++++ src/qemu/qemu_conf.c | 14 ++++++++++++++ src/qemu/qemu_conf.h | 2 ++ 4 files changed, 49 insertions(+), 0 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 766993c..8bee7b8 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -120,6 +120,11 @@ VIR_ENUM_IMPL(virDomainDiskCache, VIR_DOMAIN_DISK_CACHE_LAST, "writethrough", "writeback") +VIR_ENUM_IMPL(virDomainDiskAIO, VIR_DOMAIN_DISK_AIO_LAST, + "default", + "native", + "threads") + VIR_ENUM_IMPL(virDomainController, VIR_DOMAIN_CONTROLLER_TYPE_LAST, "ide", "fdc", @@ -1228,6 +1233,7 @@ virDomainDiskDefParseXML(virConnectPtr conn, char *target = NULL; char *bus = NULL; char *cachetag = NULL; + char *aiotag = NULL; char *devaddr = NULL; virStorageEncryptionPtr encryption = NULL; char *serial = NULL; @@ -1293,6 +1299,7 @@ virDomainDiskDefParseXML(virConnectPtr conn, driverName = virXMLPropString(cur, "name"); driverType = virXMLPropString(cur, "type"); cachetag = virXMLPropString(cur, "cache"); + aiotag = virXMLPropString(cur, "aio"); } else if (xmlStrEqual(cur->name, BAD_CAST "readonly")) { def->readonly = 1; } else if (xmlStrEqual(cur->name, BAD_CAST "shareable")) { @@ -1409,6 +1416,13 @@ virDomainDiskDefParseXML(virConnectPtr conn, goto error; } + if (aiotag && + (def->aiomode = virDomainDiskAIOTypeFromString(aiotag)) < 0) { + virDomainReportError(conn, VIR_ERR_INTERNAL_ERROR, + _("unknown disk aio mode '%s'"), aiotag); + goto error; + } + if (devaddr) { if (sscanf(devaddr, "%x:%x:%x", &def->info.addr.pci.domain, @@ -1450,6 +1464,7 @@ cleanup: VIR_FREE(driverType); VIR_FREE(driverName); VIR_FREE(cachetag); + VIR_FREE(aiotag); VIR_FREE(devaddr); VIR_FREE(serial); virStorageEncryptionFree(encryption); @@ -4565,6 +4580,7 @@ virDomainDiskDefFormat(virConnectPtr conn, const char *device = virDomainDiskDeviceTypeToString(def->device); const char *bus = virDomainDiskBusTypeToString(def->bus); const char *cachemode = virDomainDiskCacheTypeToString(def->cachemode); + const char *aiomode = virDomainDiskAIOTypeToString(def->aiomode); if (!type) { virDomainReportError(conn, VIR_ERR_INTERNAL_ERROR, @@ -4586,6 +4602,11 @@ virDomainDiskDefFormat(virConnectPtr conn, _("unexpected disk cache mode %d"), def- >cachemode); return -1; } + if (!aiomode) { + virDomainReportError(conn, VIR_ERR_INTERNAL_ERROR, + _("unexpected disk aio mode %d"), def->aiomode); + return -1; + } virBufferVSprintf(buf, " <disk type='%s' device='%s'>\n", @@ -4597,6 +4618,8 @@ virDomainDiskDefFormat(virConnectPtr conn, virBufferVSprintf(buf, " type='%s'", def->driverType); if (def->cachemode) virBufferVSprintf(buf, " cache='%s'", cachemode); + if (def->aiomode) + virBufferVSprintf(buf, " aio='%s'", aiomode); virBufferVSprintf(buf, "/>\n"); } diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 0b79e88..07805a6 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -141,6 +141,14 @@ enum virDomainDiskCache { VIR_DOMAIN_DISK_CACHE_LAST }; +enum virDomainDiskAIO { + VIR_DOMAIN_DISK_AIO_DEFAULT, + VIR_DOMAIN_DISK_AIO_NATIVE, + VIR_DOMAIN_DISK_AIO_THREADS, + + VIR_DOMAIN_DISK_AIO_LAST +}; + /* Stores the virtual disk configuration */ typedef struct _virDomainDiskDef virDomainDiskDef; typedef virDomainDiskDef *virDomainDiskDefPtr; @@ -154,6 +162,7 @@ struct _virDomainDiskDef { char *driverType; char *serial; int cachemode; + int aiomode; unsigned int readonly : 1; unsigned int shared : 1; virDomainDeviceInfo info; @@ -897,6 +906,7 @@ VIR_ENUM_DECL(virDomainDisk) VIR_ENUM_DECL(virDomainDiskDevice) VIR_ENUM_DECL(virDomainDiskBus) VIR_ENUM_DECL(virDomainDiskCache) +VIR_ENUM_DECL(virDomainDiskAIO) VIR_ENUM_DECL(virDomainController) VIR_ENUM_DECL(virDomainFS) VIR_ENUM_DECL(virDomainNet) diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index 3d83a8f..fd3a670 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -83,6 +83,12 @@ VIR_ENUM_IMPL(qemuDiskCacheV2, VIR_DOMAIN_DISK_CACHE_LAST, "writethrough", "writeback"); +VIR_ENUM_DECL(qemuDiskAIO) +VIR_ENUM_IMPL(qemuDiskAIO, VIR_DOMAIN_DISK_AIO_LAST, + "default", + "native", + "threads"); + VIR_ENUM_DECL(qemuVideo) VIR_ENUM_IMPL(qemuVideo, VIR_DOMAIN_VIDEO_TYPE_LAST, @@ -1137,6 +1143,8 @@ static unsigned int qemudComputeCmdFlags(const char *help, flags |= QEMUD_CMD_FLAG_DRIVE_CACHE_V2; if (strstr(help, "format=")) flags |= QEMUD_CMD_FLAG_DRIVE_FORMAT; + if (strstr(help, "aio=threads|native")) + flags |= QEMUD_CMD_FLAG_DRIVE_AIO; } if (strstr(help, "-vga") && !strstr(help, "-std-vga")) flags |= QEMUD_CMD_FLAG_VGA; @@ -2340,6 +2348,12 @@ qemuBuildDriveStr(virDomainDiskDefPtr disk, virBufferAddLit(&opt, ",cache=off"); } + if (disk->aiomode && (qemuCmdFlags & QEMUD_CMD_FLAG_DRIVE_AIO)) { + const char * mode = qemuDiskAIOTypeToString(disk->aiomode); + + virBufferVSprintf(&opt, ",aio=%s", mode); + } + if (virBufferError(&opt)) { virReportOOMError(NULL); goto error; diff --git a/src/qemu/qemu_conf.h b/src/qemu/qemu_conf.h index 101f187..780ae6e 100644 --- a/src/qemu/qemu_conf.h +++ b/src/qemu/qemu_conf.h @@ -82,6 +82,8 @@ enum qemud_cmd_flags { QEMUD_CMD_FLAG_SDL = (1 << 27), /* Is the new -sdl arg available */ QEMUD_CMD_FLAG_SMP_TOPOLOGY = (1 << 28), /* Is sockets=s,cores=c,threads=t available for -smp? */ QEMUD_CMD_FLAG_NETDEV = (1 << 29), /* The -netdev flag & netdev_add/remove monitor commands */ + + QEMUD_CMD_FLAG_DRIVE_AIO = (1 << 30), /* Is -drive aio= avail */ }; /* Main driver state */ -- 1.7.0.4

3 4

[libvirt] New VM Snapshot API Not working
by Tej Parkash, ERS, HCLTech 21 Apr '10

21 Apr '10

All, I have compiled new libvirt library 0.8.0. Compilation and installation went really fine except "make check" which has show some test got failed. Here is what make check said. Failed Test: ---------------snip----------- PASS: statstest TEST: qparamtest ................................ 32 OK PASS: qparamtest TEST: capabilityschematest !!!!!!!!!!!! 12 FAILED FAIL: capabilityschematest TEST: interfaceschematest !!!!!!!!!!!!!!!!!! 18 FAILED FAIL: interfaceschematest TEST: networkschematest !!!!!!!!!!! 11 FAILED FAIL: networkschematest TEST: storagepoolschematest !!!!!!!!!!!!!!!!!!!! 20 FAILED FAIL: storagepoolschematest TEST: storagevolschematest !!!!!!!!!!!! 12 FAILED FAIL: storagevolschematest TEST: domainschematest !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! 40 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! 80 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! 120 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! 160 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! 200 !! 202 FAILED FAIL: domainschematest TEST: nodedevschematest !!!!!!!!!!!!!! 14 FAILED FAIL: nodedevschematest TEST: nwfilterschematest !!!!!!!!!!!!!!!!!!!!!!!!!!! 27 FAILED FAIL: nwfilterschematest TEST: test_conf.sh .. 2 OK ---------------- snip --------------------------- ==================== 9 of 40 tests failed ==================== make[3]: *** [check-TESTS] Error 1 make[3]: Leaving directory `/tmp/libvirt-0.8.0/tests' make[2]: *** [check-am] Error 2 make[2]: Leaving directory `/tmp/libvirt-0.8.0/tests' make[1]: *** [check-recursive] Error 1 make[1]: Leaving directory `/tmp/libvirt-0.8.0/tests' make: *** [check-recursive] Error 1 ------------------------------------------------------------------------- However installation went fine. After I started create some snapshot, I am getting some remote error: root@hcl:~# xm li Name ID Mem VCPUs State Time(s) Domain-0 0 622 2 r----- 1755.3 Test 3 256 1 -b---- 4.4 root@hcl:~# virsh snapshot-create 3 error: unmarshalling remote_error root@hcl:~# virsh snapshot-create 3 test.xml error: unmarshalling remote_error I have even written a C code with API's but same problem. Here is livirt version n all root@hcl:/tmp/libvirt-0.8.0# libvirtd --version libvirtd (libvirt) 0.8.0 root@hcl:/tmp/libvirt-0.8.0# virsh -v 0.8.0 root@hcl:/tmp/libvirt-0.8.0# Any Idea???????????????? Any suggestion???????/ Thanks Tej DISCLAIMER: ----------------------------------------------------------------------------------------------------------------------- The contents of this e-mail and any attachment(s) are confidential and intended for the named recipient(s) only. It shall not attach any liability on the originator or HCL or its affiliates. Any views or opinions presented in this email are solely those of the author and may not necessarily reflect the opinions of HCL or its affiliates. Any form of reproduction, dissemination, copying, disclosure, modification, distribution and / or publication of this message without the prior written consent of the author of this e-mail is strictly prohibited. If you have received this email in error please delete it and notify the sender immediately. Before opening any mail and attachments please check them for viruses and defect. -----------------------------------------------------------------------------------------------------------------------

3 4

[libvirt] Bug with creating snapshots in ESX in 0.8.0 (patch included)
by Chris Wong 21 Apr '10

21 Apr '10

I was testing out the new snapshot on functionality with GSX (VMWare Server 2.0.2) and noticed that it would fail to create a snapshot on a VM with no snapshots. I tracked it down to the esxDomainSnapshotCreateXML call, which would prematurely fail if the Root Snapshot Tree was empty -- which it would be. Verified that both ESXi 4.0 and GSX return an empty snapshot tree. I don't feel this should be an error, and it prevents snapshots from being created. I don't think I saw a fix for this in the master git branch. I'm not too sure if this is the proper path to go down, but at the very least it fixes my specific problem. If there is another fix or if I completely missed this point, let me know. diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c index fea887a..70bfc2c 100644 --- a/src/esx/esx_driver.c +++ b/src/esx/esx_driver.c @@ -3330,12 +3330,16 @@ esxDomainSnapshotCreateXML(virDomainPtr domain, const char *xmlDesc, (priv->host, domain->uuid, NULL, &virtualMachine, priv->autoAnswer) < 0 || esxVI_LookupRootSnapshotTreeList(priv->host, domain->uuid, - &rootSnapshotList) < 0 || - esxVI_GetSnapshotTreeByName(rootSnapshotList, def->name, - &snapshotTree, &snapshotTreeParent, - esxVI_Occurrence_OptionalItem) < 0) { + &rootSnapshotList) < 0) { goto failure; } + if (rootSnapshotList) { + if (esxVI_GetSnapshotTreeByName(rootSnapshotList, def->name, + &snapshotTree, &snapshotTreeParent, + esxVI_Occurrence_OptionalItem) < 0) { + goto failure; + } + } if (snapshotTree != NULL) { ESX_ERROR(VIR_ERR_OPERATION_INVALID, diff --git a/src/esx/esx_vi.c b/src/esx/esx_vi.c index 89ef2dd..93ef36b 100644 --- a/src/esx/esx_vi.c +++ b/src/esx/esx_vi.c @@ -2561,12 +2561,6 @@ esxVI_LookupRootSnapshotTreeList } } - if (*rootSnapshotTreeList == NULL) { - ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", - _("Could not lookup root snapshot list")); - goto failure; - } - cleanup: esxVI_String_Free(&propertyNameList); esxVI_ObjectContent_Free(&virtualMachine);

2 2

[libvirt] iface-list command in virsh
by Dev.Atom 21 Apr '10

21 Apr '10

Hi, I'm trying to list physical interface of a remote tcp host via the C API and it fails. I have tried to use virsh iface-list in remote TCP connection and it fails also. I have trying on the libvirt host with my normal account and it fails also, but when I connect under root account on the libvirt host, iface-list works. Any clue ? Best regards, Arnaud Champion

4 8

[libvirt] [PATCH] esx: Fix FindByIp response handling
by Matthias Bolte 21 Apr '10

21 Apr '10

FindByIp may return nothing if there is no host or virtual machine with the given IP address. Handle that case properly. --- src/esx/esx_vi.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/src/esx/esx_vi.c b/src/esx/esx_vi.c index 37270fe..c6854f1 100644 --- a/src/esx/esx_vi.c +++ b/src/esx/esx_vi.c @@ -1968,6 +1968,13 @@ esxVI_LookupHostSystemByIp(esxVI_Context *ctx, const char *ipAddress, goto failure; } + if (managedObjectReference == NULL) { + ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, + _("Could not find host system with IP address '%s'"), + ipAddress); + goto failure; + } + if (esxVI_LookupObjectContentByType(ctx, managedObjectReference, "HostSystem", propertyNameList, esxVI_Boolean_False, hostSystem) < 0) { -- 1.6.3.3

2 2

[libvirt] [PATCH] esx: Fix virtualHW.version generation
by Matthias Bolte 21 Apr '10

21 Apr '10

The supported virtualHW.version doesn't depend on the API version, but on the product version. --- src/esx/esx_driver.c | 8 ++-- src/esx/esx_vmx.c | 46 +++++++++++++------------- src/esx/esx_vmx.h | 4 +- tests/vmx2xmltest.c | 85 +++++++++++++++++++++++++------------------------ tests/xml2vmxtest.c | 73 ++++++++++++++++++++++--------------------- 5 files changed, 109 insertions(+), 107 deletions(-) diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c index 97c1645..c0c3195 100644 --- a/src/esx/esx_driver.c +++ b/src/esx/esx_driver.c @@ -2145,7 +2145,7 @@ esxDomainDumpXML(virDomainPtr domain, int flags) } def = esxVMX_ParseConfig(priv->host, vmx, datastoreName, directoryName, - priv->host->apiVersion); + priv->host->productVersion); if (def != NULL) { xml = virDomainDefFormat(def, flags); @@ -2188,7 +2188,7 @@ esxDomainXMLFromNative(virConnectPtr conn, const char *nativeFormat, } def = esxVMX_ParseConfig(priv->host, nativeConfig, "?", "?", - priv->host->apiVersion); + priv->host->productVersion); if (def != NULL) { xml = virDomainDefFormat(def, VIR_DOMAIN_XML_INACTIVE); @@ -2222,7 +2222,7 @@ esxDomainXMLToNative(virConnectPtr conn, const char *nativeFormat, return NULL; } - vmx = esxVMX_FormatConfig(priv->host, def, priv->host->apiVersion); + vmx = esxVMX_FormatConfig(priv->host, def, priv->host->productVersion); virDomainDefFree(def); @@ -2445,7 +2445,7 @@ esxDomainDefineXML(virConnectPtr conn, const char *xml ATTRIBUTE_UNUSED) } /* Build VMX from domain XML */ - vmx = esxVMX_FormatConfig(priv->host, def, priv->host->apiVersion); + vmx = esxVMX_FormatConfig(priv->host, def, priv->host->productVersion); if (vmx == NULL) { goto failure; diff --git a/src/esx/esx_vmx.c b/src/esx/esx_vmx.c index c2e9be6..84c4aef 100644 --- a/src/esx/esx_vmx.c +++ b/src/esx/esx_vmx.c @@ -724,7 +724,7 @@ esxVMX_ParseFileName(esxVI_Context *ctx, const char *fileName, virDomainDefPtr esxVMX_ParseConfig(esxVI_Context *ctx, const char *vmx, const char *datastoreName, const char *directoryName, - esxVI_APIVersion apiVersion) + esxVI_ProductVersion productVersion) { virConfPtr conf = NULL; virDomainDefPtr def = NULL; @@ -774,42 +774,41 @@ esxVMX_ParseConfig(esxVI_Context *ctx, const char *vmx, goto failure; } - switch (apiVersion) { - case esxVI_APIVersion_25: + /* + * virtualHW.version compatibility matrix: + * + * 4 7 API + * ESX 3.5 + 2.5 + * ESX 4.0 + + 4.0 + * GSX 2.0 + + 2.5 + */ + switch (productVersion) { + case esxVI_ProductVersion_ESX35: if (virtualHW_version != 4) { ESX_ERROR(VIR_ERR_INTERNAL_ERROR, - _("Expecting VMX entry 'virtualHW.version' to be 4 for " - "VI API version 2.5 but found %lld"), + _("Expecting VMX entry 'virtualHW.version' to be 4 " + "but found %lld"), virtualHW_version); goto failure; } break; - case esxVI_APIVersion_40: + case esxVI_ProductVersion_GSX20: + case esxVI_ProductVersion_ESX40: if (virtualHW_version != 4 && virtualHW_version != 7) { ESX_ERROR(VIR_ERR_INTERNAL_ERROR, _("Expecting VMX entry 'virtualHW.version' to be 4 or 7 " - "for VI API version 4.0 but found %lld"), + "but found %lld"), virtualHW_version); goto failure; } break; - case esxVI_APIVersion_Unknown: - if (virtualHW_version != 4 && virtualHW_version != 7) { - ESX_ERROR(VIR_ERR_INTERNAL_ERROR, - _("Expecting VMX entry 'virtualHW.version' to be 4 or 7 " - "but found %lld"), virtualHW_version); - goto failure; - } - - break; - default: ESX_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", - _("Expecting VI API version 2.5 or 4.0")); + _("Unexpected product version")); goto failure; } @@ -2189,7 +2188,7 @@ esxVMX_FormatFileName(esxVI_Context *ctx ATTRIBUTE_UNUSED, const char *src) char * esxVMX_FormatConfig(esxVI_Context *ctx, virDomainDefPtr def, - esxVI_APIVersion apiVersion) + esxVI_ProductVersion productVersion) { int i; int sched_cpu_affinity_length; @@ -2210,18 +2209,19 @@ esxVMX_FormatConfig(esxVI_Context *ctx, virDomainDefPtr def, virBufferAddLit(&buffer, "config.version = \"8\"\n"); /* vmx:virtualHW.version */ - switch (apiVersion) { - case esxVI_APIVersion_25: + switch (productVersion) { + case esxVI_ProductVersion_ESX35: virBufferAddLit(&buffer, "virtualHW.version = \"4\"\n"); break; - case esxVI_APIVersion_40: + case esxVI_ProductVersion_GSX20: + case esxVI_ProductVersion_ESX40: virBufferAddLit(&buffer, "virtualHW.version = \"7\"\n"); break; default: ESX_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", - _("Expecting VI API version 2.5 or 4.0")); + _("Unexpected product version")); goto failure; } diff --git a/src/esx/esx_vmx.h b/src/esx/esx_vmx.h index c07f8b3..081b67d 100644 --- a/src/esx/esx_vmx.h +++ b/src/esx/esx_vmx.h @@ -58,7 +58,7 @@ esxVMX_ParseFileName(esxVI_Context *ctx, const char *fileName, virDomainDefPtr esxVMX_ParseConfig(esxVI_Context *ctx, const char *vmx, const char *datastoreName, const char *directoryName, - esxVI_APIVersion apiVersion); + esxVI_ProductVersion productVersion); int esxVMX_ParseVNC(virConfPtr conf, virDomainGraphicsDefPtr *def); @@ -96,7 +96,7 @@ esxVMX_FormatFileName(esxVI_Context *ctx, const char *src); char * esxVMX_FormatConfig(esxVI_Context *ctx, virDomainDefPtr def, - esxVI_APIVersion apiVersion); + esxVI_ProductVersion productVersion); int esxVMX_FormatVNC(virDomainGraphicsDefPtr def, virBufferPtr buffer); diff --git a/tests/vmx2xmltest.c b/tests/vmx2xmltest.c index f3b3b5e..12229b9 100644 --- a/tests/vmx2xmltest.c +++ b/tests/vmx2xmltest.c @@ -17,7 +17,8 @@ static char *abs_srcdir = NULL; # define MAX_FILE 4096 static int -testCompareFiles(const char *vmx, const char *xml, esxVI_APIVersion apiVersion) +testCompareFiles(const char *vmx, const char *xml, + esxVI_ProductVersion productVersion) { int result = -1; char vmxData[MAX_FILE]; @@ -37,7 +38,7 @@ testCompareFiles(const char *vmx, const char *xml, esxVI_APIVersion apiVersion) } def = esxVMX_ParseConfig(NULL, vmxData, "datastore", "directory", - apiVersion); + productVersion); if (def == NULL) { err = virGetLastError(); @@ -70,7 +71,7 @@ testCompareFiles(const char *vmx, const char *xml, esxVI_APIVersion apiVersion) struct testInfo { const char *input; const char *output; - esxVI_APIVersion version; + esxVI_ProductVersion version; }; static int @@ -112,7 +113,7 @@ mymain(int argc, char **argv) return EXIT_FAILURE; } -# define DO_TEST(_in, _out, _version) \ +# define DO_TEST(_in, _out, _version) \ do { \ struct testInfo info = { _in, _out, _version }; \ virResetLastError(); \ @@ -122,57 +123,57 @@ mymain(int argc, char **argv) } \ } while (0) - DO_TEST("case-insensitive-1", "case-insensitive-1", esxVI_APIVersion_25); - DO_TEST("case-insensitive-2", "case-insensitive-2", esxVI_APIVersion_25); + DO_TEST("case-insensitive-1", "case-insensitive-1", esxVI_ProductVersion_ESX35); + DO_TEST("case-insensitive-2", "case-insensitive-2", esxVI_ProductVersion_ESX35); - DO_TEST("minimal", "minimal", esxVI_APIVersion_25); - DO_TEST("minimal-64bit", "minimal-64bit", esxVI_APIVersion_25); + DO_TEST("minimal", "minimal", esxVI_ProductVersion_ESX35); + DO_TEST("minimal-64bit", "minimal-64bit", esxVI_ProductVersion_ESX35); - DO_TEST("graphics-vnc", "graphics-vnc", esxVI_APIVersion_25); + DO_TEST("graphics-vnc", "graphics-vnc", esxVI_ProductVersion_ESX35); - DO_TEST("scsi-driver", "scsi-driver", esxVI_APIVersion_25); - DO_TEST("scsi-writethrough", "scsi-writethrough", esxVI_APIVersion_25); + DO_TEST("scsi-driver", "scsi-driver", esxVI_ProductVersion_ESX35); + DO_TEST("scsi-writethrough", "scsi-writethrough", esxVI_ProductVersion_ESX35); - DO_TEST("harddisk-scsi-file", "harddisk-scsi-file", esxVI_APIVersion_25); - DO_TEST("harddisk-ide-file", "harddisk-ide-file", esxVI_APIVersion_25); + DO_TEST("harddisk-scsi-file", "harddisk-scsi-file", esxVI_ProductVersion_ESX35); + DO_TEST("harddisk-ide-file", "harddisk-ide-file", esxVI_ProductVersion_ESX35); - DO_TEST("cdrom-scsi-file", "cdrom-scsi-file", esxVI_APIVersion_25); - DO_TEST("cdrom-scsi-device", "cdrom-scsi-device", esxVI_APIVersion_25); - DO_TEST("cdrom-ide-file", "cdrom-ide-file", esxVI_APIVersion_25); - DO_TEST("cdrom-ide-device", "cdrom-ide-device", esxVI_APIVersion_25); + DO_TEST("cdrom-scsi-file", "cdrom-scsi-file", esxVI_ProductVersion_ESX35); + DO_TEST("cdrom-scsi-device", "cdrom-scsi-device", esxVI_ProductVersion_ESX35); + DO_TEST("cdrom-ide-file", "cdrom-ide-file", esxVI_ProductVersion_ESX35); + DO_TEST("cdrom-ide-device", "cdrom-ide-device", esxVI_ProductVersion_ESX35); - DO_TEST("floppy-file", "floppy-file", esxVI_APIVersion_25); - DO_TEST("floppy-device", "floppy-device", esxVI_APIVersion_25); + DO_TEST("floppy-file", "floppy-file", esxVI_ProductVersion_ESX35); + DO_TEST("floppy-device", "floppy-device", esxVI_ProductVersion_ESX35); - DO_TEST("ethernet-e1000", "ethernet-e1000", esxVI_APIVersion_25); + DO_TEST("ethernet-e1000", "ethernet-e1000", esxVI_ProductVersion_ESX35); - DO_TEST("ethernet-custom", "ethernet-custom", esxVI_APIVersion_25); - DO_TEST("ethernet-bridged", "ethernet-bridged", esxVI_APIVersion_25); + DO_TEST("ethernet-custom", "ethernet-custom", esxVI_ProductVersion_ESX35); + DO_TEST("ethernet-bridged", "ethernet-bridged", esxVI_ProductVersion_ESX35); - DO_TEST("ethernet-generated", "ethernet-generated", esxVI_APIVersion_25); - DO_TEST("ethernet-static", "ethernet-static", esxVI_APIVersion_25); - DO_TEST("ethernet-vpx", "ethernet-vpx", esxVI_APIVersion_25); - DO_TEST("ethernet-other", "ethernet-other", esxVI_APIVersion_25); + DO_TEST("ethernet-generated", "ethernet-generated", esxVI_ProductVersion_ESX35); + DO_TEST("ethernet-static", "ethernet-static", esxVI_ProductVersion_ESX35); + DO_TEST("ethernet-vpx", "ethernet-vpx", esxVI_ProductVersion_ESX35); + DO_TEST("ethernet-other", "ethernet-other", esxVI_ProductVersion_ESX35); - DO_TEST("serial-file", "serial-file", esxVI_APIVersion_25); - DO_TEST("serial-device", "serial-device", esxVI_APIVersion_25); - DO_TEST("serial-pipe-client-app", "serial-pipe", esxVI_APIVersion_25); - DO_TEST("serial-pipe-server-vm", "serial-pipe", esxVI_APIVersion_25); - DO_TEST("serial-pipe-client-app", "serial-pipe", esxVI_APIVersion_25); - DO_TEST("serial-pipe-server-vm", "serial-pipe", esxVI_APIVersion_25); + DO_TEST("serial-file", "serial-file", esxVI_ProductVersion_ESX35); + DO_TEST("serial-device", "serial-device", esxVI_ProductVersion_ESX35); + DO_TEST("serial-pipe-client-app", "serial-pipe", esxVI_ProductVersion_ESX35); + DO_TEST("serial-pipe-server-vm", "serial-pipe", esxVI_ProductVersion_ESX35); + DO_TEST("serial-pipe-client-app", "serial-pipe", esxVI_ProductVersion_ESX35); + DO_TEST("serial-pipe-server-vm", "serial-pipe", esxVI_ProductVersion_ESX35); - DO_TEST("parallel-file", "parallel-file", esxVI_APIVersion_25); - DO_TEST("parallel-device", "parallel-device", esxVI_APIVersion_25); + DO_TEST("parallel-file", "parallel-file", esxVI_ProductVersion_ESX35); + DO_TEST("parallel-device", "parallel-device", esxVI_ProductVersion_ESX35); - DO_TEST("esx-in-the-wild-1", "esx-in-the-wild-1", esxVI_APIVersion_25); - DO_TEST("esx-in-the-wild-2", "esx-in-the-wild-2", esxVI_APIVersion_25); - DO_TEST("esx-in-the-wild-3", "esx-in-the-wild-3", esxVI_APIVersion_25); - DO_TEST("esx-in-the-wild-4", "esx-in-the-wild-4", esxVI_APIVersion_25); + DO_TEST("esx-in-the-wild-1", "esx-in-the-wild-1", esxVI_ProductVersion_ESX35); + DO_TEST("esx-in-the-wild-2", "esx-in-the-wild-2", esxVI_ProductVersion_ESX35); + DO_TEST("esx-in-the-wild-3", "esx-in-the-wild-3", esxVI_ProductVersion_ESX35); + DO_TEST("esx-in-the-wild-4", "esx-in-the-wild-4", esxVI_ProductVersion_ESX35); - DO_TEST("gsx-in-the-wild-1", "gsx-in-the-wild-1", esxVI_APIVersion_25); - DO_TEST("gsx-in-the-wild-2", "gsx-in-the-wild-2", esxVI_APIVersion_25); - DO_TEST("gsx-in-the-wild-3", "gsx-in-the-wild-3", esxVI_APIVersion_25); - DO_TEST("gsx-in-the-wild-4", "gsx-in-the-wild-4", esxVI_APIVersion_25); + DO_TEST("gsx-in-the-wild-1", "gsx-in-the-wild-1", esxVI_ProductVersion_ESX35); + DO_TEST("gsx-in-the-wild-2", "gsx-in-the-wild-2", esxVI_ProductVersion_ESX35); + DO_TEST("gsx-in-the-wild-3", "gsx-in-the-wild-3", esxVI_ProductVersion_ESX35); + DO_TEST("gsx-in-the-wild-4", "gsx-in-the-wild-4", esxVI_ProductVersion_ESX35); return result == 0 ? EXIT_SUCCESS : EXIT_FAILURE; } diff --git a/tests/xml2vmxtest.c b/tests/xml2vmxtest.c index f9c4730..e7720bf 100644 --- a/tests/xml2vmxtest.c +++ b/tests/xml2vmxtest.c @@ -65,7 +65,8 @@ testESXCapsInit(void) } static int -testCompareFiles(const char *xml, const char *vmx, esxVI_APIVersion apiVersion) +testCompareFiles(const char *xml, const char *vmx, + esxVI_ProductVersion productVersion) { int result = -1; char xmlData[MAX_FILE]; @@ -89,7 +90,7 @@ testCompareFiles(const char *xml, const char *vmx, esxVI_APIVersion apiVersion) goto failure; } - formatted = esxVMX_FormatConfig(NULL, def, apiVersion); + formatted = esxVMX_FormatConfig(NULL, def, productVersion); if (formatted == NULL) { goto failure; @@ -112,7 +113,7 @@ testCompareFiles(const char *xml, const char *vmx, esxVI_APIVersion apiVersion) struct testInfo { const char *input; const char *output; - esxVI_APIVersion version; + esxVI_ProductVersion version; }; static int @@ -170,51 +171,51 @@ mymain(int argc, char **argv) return EXIT_FAILURE; } - DO_TEST("minimal", "minimal", esxVI_APIVersion_25); - DO_TEST("minimal-64bit", "minimal-64bit", esxVI_APIVersion_25); + DO_TEST("minimal", "minimal", esxVI_ProductVersion_ESX35); + DO_TEST("minimal-64bit", "minimal-64bit", esxVI_ProductVersion_ESX35); - DO_TEST("graphics-vnc", "graphics-vnc", esxVI_APIVersion_25); + DO_TEST("graphics-vnc", "graphics-vnc", esxVI_ProductVersion_ESX35); - DO_TEST("scsi-driver", "scsi-driver", esxVI_APIVersion_25); - DO_TEST("scsi-writethrough", "scsi-writethrough", esxVI_APIVersion_25); + DO_TEST("scsi-driver", "scsi-driver", esxVI_ProductVersion_ESX35); + DO_TEST("scsi-writethrough", "scsi-writethrough", esxVI_ProductVersion_ESX35); - DO_TEST("harddisk-scsi-file", "harddisk-scsi-file", esxVI_APIVersion_25); - DO_TEST("harddisk-ide-file", "harddisk-ide-file", esxVI_APIVersion_25); + DO_TEST("harddisk-scsi-file", "harddisk-scsi-file", esxVI_ProductVersion_ESX35); + DO_TEST("harddisk-ide-file", "harddisk-ide-file", esxVI_ProductVersion_ESX35); - DO_TEST("cdrom-scsi-file", "cdrom-scsi-file", esxVI_APIVersion_25); - DO_TEST("cdrom-scsi-device", "cdrom-scsi-device", esxVI_APIVersion_25); - DO_TEST("cdrom-ide-file", "cdrom-ide-file", esxVI_APIVersion_25); - DO_TEST("cdrom-ide-device", "cdrom-ide-device", esxVI_APIVersion_25); + DO_TEST("cdrom-scsi-file", "cdrom-scsi-file", esxVI_ProductVersion_ESX35); + DO_TEST("cdrom-scsi-device", "cdrom-scsi-device", esxVI_ProductVersion_ESX35); + DO_TEST("cdrom-ide-file", "cdrom-ide-file", esxVI_ProductVersion_ESX35); + DO_TEST("cdrom-ide-device", "cdrom-ide-device", esxVI_ProductVersion_ESX35); - DO_TEST("floppy-file", "floppy-file", esxVI_APIVersion_25); - DO_TEST("floppy-device", "floppy-device", esxVI_APIVersion_25); + DO_TEST("floppy-file", "floppy-file", esxVI_ProductVersion_ESX35); + DO_TEST("floppy-device", "floppy-device", esxVI_ProductVersion_ESX35); - DO_TEST("ethernet-e1000", "ethernet-e1000", esxVI_APIVersion_25); + DO_TEST("ethernet-e1000", "ethernet-e1000", esxVI_ProductVersion_ESX35); - DO_TEST("ethernet-custom", "ethernet-custom", esxVI_APIVersion_25); - DO_TEST("ethernet-bridged", "ethernet-bridged", esxVI_APIVersion_25); + DO_TEST("ethernet-custom", "ethernet-custom", esxVI_ProductVersion_ESX35); + DO_TEST("ethernet-bridged", "ethernet-bridged", esxVI_ProductVersion_ESX35); - DO_TEST("ethernet-generated", "ethernet-generated", esxVI_APIVersion_25); - DO_TEST("ethernet-static", "ethernet-static", esxVI_APIVersion_25); - DO_TEST("ethernet-vpx", "ethernet-vpx", esxVI_APIVersion_25); - DO_TEST("ethernet-other", "ethernet-other", esxVI_APIVersion_25); + DO_TEST("ethernet-generated", "ethernet-generated", esxVI_ProductVersion_ESX35); + DO_TEST("ethernet-static", "ethernet-static", esxVI_ProductVersion_ESX35); + DO_TEST("ethernet-vpx", "ethernet-vpx", esxVI_ProductVersion_ESX35); + DO_TEST("ethernet-other", "ethernet-other", esxVI_ProductVersion_ESX35); - DO_TEST("serial-file", "serial-file", esxVI_APIVersion_25); - DO_TEST("serial-device", "serial-device", esxVI_APIVersion_25); - DO_TEST("serial-pipe", "serial-pipe", esxVI_APIVersion_25); + DO_TEST("serial-file", "serial-file", esxVI_ProductVersion_ESX35); + DO_TEST("serial-device", "serial-device", esxVI_ProductVersion_ESX35); + DO_TEST("serial-pipe", "serial-pipe", esxVI_ProductVersion_ESX35); - DO_TEST("parallel-file", "parallel-file", esxVI_APIVersion_25); - DO_TEST("parallel-device", "parallel-device", esxVI_APIVersion_25); + DO_TEST("parallel-file", "parallel-file", esxVI_ProductVersion_ESX35); + DO_TEST("parallel-device", "parallel-device", esxVI_ProductVersion_ESX35); - DO_TEST("esx-in-the-wild-1", "esx-in-the-wild-1", esxVI_APIVersion_25); - DO_TEST("esx-in-the-wild-2", "esx-in-the-wild-2", esxVI_APIVersion_25); - DO_TEST("esx-in-the-wild-3", "esx-in-the-wild-3", esxVI_APIVersion_25); - DO_TEST("esx-in-the-wild-4", "esx-in-the-wild-4", esxVI_APIVersion_25); + DO_TEST("esx-in-the-wild-1", "esx-in-the-wild-1", esxVI_ProductVersion_ESX35); + DO_TEST("esx-in-the-wild-2", "esx-in-the-wild-2", esxVI_ProductVersion_ESX35); + DO_TEST("esx-in-the-wild-3", "esx-in-the-wild-3", esxVI_ProductVersion_ESX35); + DO_TEST("esx-in-the-wild-4", "esx-in-the-wild-4", esxVI_ProductVersion_ESX35); - DO_TEST("gsx-in-the-wild-1", "gsx-in-the-wild-1", esxVI_APIVersion_25); - DO_TEST("gsx-in-the-wild-2", "gsx-in-the-wild-2", esxVI_APIVersion_25); - DO_TEST("gsx-in-the-wild-3", "gsx-in-the-wild-3", esxVI_APIVersion_25); - DO_TEST("gsx-in-the-wild-4", "gsx-in-the-wild-4", esxVI_APIVersion_25); + DO_TEST("gsx-in-the-wild-1", "gsx-in-the-wild-1", esxVI_ProductVersion_ESX35); + DO_TEST("gsx-in-the-wild-2", "gsx-in-the-wild-2", esxVI_ProductVersion_ESX35); + DO_TEST("gsx-in-the-wild-3", "gsx-in-the-wild-3", esxVI_ProductVersion_ESX35); + DO_TEST("gsx-in-the-wild-4", "gsx-in-the-wild-4", esxVI_ProductVersion_ESX35); virCapabilitiesFree(caps); -- 1.6.3.3

2 2

[libvirt] [PATCH] nwfilter: add support for connlimit match
by Stefan Berger 20 Apr '10

20 Apr '10

This patch adds support for the connlimit match in iptables that is used to limit number of outgoing directions. Signed-off-by" Stefan Berger <stefanb(a)us.ibm.com> --- src/conf/nwfilter_conf.c | 5 ++ src/conf/nwfilter_conf.h | 1 src/nwfilter/nwfilter_ebiptables_driver.c | 57 +++++++++++++++++++++++------- 3 files changed, 50 insertions(+), 13 deletions(-) Index: libvirt-acl/src/conf/nwfilter_conf.c =================================================================== --- libvirt-acl.orig/src/conf/nwfilter_conf.c +++ libvirt-acl/src/conf/nwfilter_conf.c @@ -875,6 +875,11 @@ static const virXMLAttr2Struct ipv6Attri .datatype = DATATYPE_UINT8,\ .dataIdx = offsetof(virNWFilterRuleDef, p.STRUCT.ipHdr.dataDSCP),\ /*.validator = dscpValidator,*/\ + },\ + {\ + .name = "connlimit-above",\ + .datatype = DATATYPE_UINT16,\ + .dataIdx = offsetof(virNWFilterRuleDef, p.STRUCT.ipHdr.dataConnlimitAbove),\ } #define COMMON_PORT_PROPS(STRUCT) \ Index: libvirt-acl/src/conf/nwfilter_conf.h =================================================================== --- libvirt-acl.orig/src/conf/nwfilter_conf.h +++ libvirt-acl/src/conf/nwfilter_conf.h @@ -153,6 +153,7 @@ struct _ipHdrDataDef { nwItemDesc dataDstIPFrom; nwItemDesc dataDstIPTo; nwItemDesc dataDSCP; + nwItemDesc dataConnlimitAbove; }; Index: libvirt-acl/src/nwfilter/nwfilter_ebiptables_driver.c =================================================================== --- libvirt-acl.orig/src/nwfilter/nwfilter_ebiptables_driver.c +++ libvirt-acl/src/nwfilter/nwfilter_ebiptables_driver.c @@ -815,7 +815,8 @@ static int iptablesHandleIpHdr(virBufferPtr buf, virNWFilterHashTablePtr vars, ipHdrDataDefPtr ipHdr, - int directionIn) + int directionIn, + bool *skipRule, bool *skipMatch) { char ipaddr[INET6_ADDRSTRLEN], number[20]; @@ -944,6 +945,24 @@ iptablesHandleIpHdr(virBufferPtr buf, number); } + if (HAS_ENTRY_ITEM(&ipHdr->dataConnlimitAbove)) { + if (directionIn) { + // only support for limit in outgoing dir. + *skipRule = true; + } else { + if (printDataType(vars, + number, sizeof(number), + &ipHdr->dataConnlimitAbove)) + goto err_exit; + + virBufferVSprintf(buf, + " -m connlimit %s --connlimit-above %s", + ENTRY_GET_NEG_SIGN(&ipHdr->dataConnlimitAbove), + number); + *skipMatch = true; + } + } + return 0; err_exit: @@ -1063,6 +1082,8 @@ _iptablesCreateRuleInstance(int directio : iptables_cmd_path; unsigned int bufUsed; bool srcMacSkipped = false; + bool skipRule = false; + bool skipMatch = false; if (!iptables_cmd) { virNWFilterReportError(VIR_ERR_INTERNAL_ERROR, @@ -1096,7 +1117,8 @@ _iptablesCreateRuleInstance(int directio if (iptablesHandleIpHdr(&buf, vars, &rule->p.tcpHdrFilter.ipHdr, - directionIn)) + directionIn, + &skipRule, &skipMatch)) goto err_exit; if (iptablesHandlePortData(&buf, @@ -1140,7 +1162,8 @@ _iptablesCreateRuleInstance(int directio if (iptablesHandleIpHdr(&buf, vars, &rule->p.udpHdrFilter.ipHdr, - directionIn)) + directionIn, + &skipRule, &skipMatch)) goto err_exit; if (iptablesHandlePortData(&buf, @@ -1171,7 +1194,8 @@ _iptablesCreateRuleInstance(int directio if (iptablesHandleIpHdr(&buf, vars, &rule->p.udpliteHdrFilter.ipHdr, - directionIn)) + directionIn, + &skipRule, &skipMatch)) goto err_exit; break; @@ -1197,7 +1221,8 @@ _iptablesCreateRuleInstance(int directio if (iptablesHandleIpHdr(&buf, vars, &rule->p.espHdrFilter.ipHdr, - directionIn)) + directionIn, + &skipRule, &skipMatch)) goto err_exit; break; @@ -1223,7 +1248,8 @@ _iptablesCreateRuleInstance(int directio if (iptablesHandleIpHdr(&buf, vars, &rule->p.ahHdrFilter.ipHdr, - directionIn)) + directionIn, + &skipRule, &skipMatch)) goto err_exit; break; @@ -1249,7 +1275,8 @@ _iptablesCreateRuleInstance(int directio if (iptablesHandleIpHdr(&buf, vars, &rule->p.sctpHdrFilter.ipHdr, - directionIn)) + directionIn, + &skipRule, &skipMatch)) goto err_exit; if (iptablesHandlePortData(&buf, @@ -1283,7 +1310,8 @@ _iptablesCreateRuleInstance(int directio if (iptablesHandleIpHdr(&buf, vars, &rule->p.icmpHdrFilter.ipHdr, - directionIn)) + directionIn, + &skipRule, &skipMatch)) goto err_exit; if (HAS_ENTRY_ITEM(&rule->p.icmpHdrFilter.dataICMPType)) { @@ -1341,7 +1369,8 @@ _iptablesCreateRuleInstance(int directio if (iptablesHandleIpHdr(&buf, vars, &rule->p.igmpHdrFilter.ipHdr, - directionIn)) + directionIn, + &skipRule, &skipMatch)) goto err_exit; break; @@ -1367,7 +1396,8 @@ _iptablesCreateRuleInstance(int directio if (iptablesHandleIpHdr(&buf, vars, &rule->p.allHdrFilter.ipHdr, - directionIn)) + directionIn, + &skipRule, &skipMatch)) goto err_exit; break; @@ -1376,7 +1406,8 @@ _iptablesCreateRuleInstance(int directio return -1; } - if (srcMacSkipped && bufUsed == virBufferUse(&buf)) { + if ((srcMacSkipped && bufUsed == virBufferUse(&buf)) || + skipRule) { virBufferFreeAndReset(&buf); return 0; } @@ -1385,10 +1416,10 @@ _iptablesCreateRuleInstance(int directio target = accept_target; else { target = "DROP"; - match = NULL; + skipMatch = true; } - if (match) + if (match && !skipMatch) virBufferVSprintf(&buf, " %s", match);

2 2

[libvirt] [PATCH] nwfilter: Extend fwall-drv interface and call functions via interface
by Stefan Berger 20 Apr '10

20 Apr '10

I moving some functions into the interface of the firewall driver and make them only accessible via the driver's interface. Adapt the code where needed. One new function is added that checks whether some 'basic' rules can be applied, which is used by a subsequent patch. Signed-off-by: Stefan Berger <stefanb(a)us.ibm.com> --- src/conf/nwfilter_conf.h | 16 ++++++++++++++++ src/nwfilter/nwfilter_ebiptables_driver.c | 24 +++++++++++++++++++++--- src/nwfilter/nwfilter_ebiptables_driver.h | 8 -------- src/nwfilter/nwfilter_gentech_driver.c | 3 ++- src/nwfilter/nwfilter_learnipaddr.c | 24 ++++++++++++++---------- src/nwfilter/nwfilter_learnipaddr.h | 4 +++- 6 files changed, 56 insertions(+), 23 deletions(-) Index: libvirt-acl/src/nwfilter/nwfilter_ebiptables_driver.c =================================================================== --- libvirt-acl.orig/src/nwfilter/nwfilter_ebiptables_driver.c +++ libvirt-acl/src/nwfilter/nwfilter_ebiptables_driver.c @@ -98,6 +98,7 @@ static const char *m_physdev_out_str = " #define MATCH_PHYSDEV_OUT m_physdev_out_str +static int ebtablesRemoveBasicRules(const char *ifname); static int ebiptablesDriverInit(void); static void ebiptablesDriverShutdown(void); @@ -2578,6 +2579,18 @@ ebiptablesInstCommand(virBufferPtr buf, /** + * ebiptablesCanApplyBasicRules + * + * Determine whether this driver can apply the basic rules, meaning + * run ebtablesApplyBasicRules and ebtablesApplyDHCPOnlyRules. + * In case of this driver we need the ebtables tool available. + */ +static int +ebiptablesCanApplyBasicRules(void) { + return (ebtables_cmd_path != NULL); +} + +/** * ebtablesApplyBasicRules * * @conn: virConnect object @@ -2591,7 +2604,7 @@ ebiptablesInstCommand(virBufferPtr buf, * - filtering for MAC address spoofing * - allowing IPv4 & ARP traffic */ -int +static int ebtablesApplyBasicRules(const char *ifname, const unsigned char *macaddr) { @@ -2685,7 +2698,7 @@ tear_down_tmpebchains: * Apply filtering rules so that the VM can only send and receive * DHCP traffic and nothing else. */ -int +static int ebtablesApplyDHCPOnlyRules(const char *ifname, const unsigned char *macaddr, const char *dhcpserver) @@ -2794,7 +2807,7 @@ tear_down_tmpebchains: } -int +static int ebtablesRemoveBasicRules(const char *ifname) { virBuffer buf = VIR_BUFFER_INITIALIZER; @@ -3188,6 +3201,11 @@ virNWFilterTechDriver ebiptables_driver .removeRules = ebiptablesRemoveRules, .freeRuleInstance = ebiptablesFreeRuleInstance, .displayRuleInstance = ebiptablesDisplayRuleInstance, + + .canApplyBasicRules = ebiptablesCanApplyBasicRules, + .applyBasicRules = ebtablesApplyBasicRules, + .applyDHCPOnlyRules = ebtablesApplyDHCPOnlyRules, + .removeBasicRules = ebtablesRemoveBasicRules, }; Index: libvirt-acl/src/nwfilter/nwfilter_ebiptables_driver.h =================================================================== --- libvirt-acl.orig/src/nwfilter/nwfilter_ebiptables_driver.h +++ libvirt-acl/src/nwfilter/nwfilter_ebiptables_driver.h @@ -45,12 +45,4 @@ extern virNWFilterTechDriver ebiptables_ # define EBIPTABLES_DRIVER_ID "ebiptables" - -int ebtablesApplyBasicRules(const char *ifname, - const unsigned char *macaddr); -int ebtablesApplyDHCPOnlyRules(const char *ifname, - const unsigned char *macaddr, - const char *dhcpServer); -int ebtablesRemoveBasicRules(const char *ifname); - #endif Index: libvirt-acl/src/conf/nwfilter_conf.h =================================================================== --- libvirt-acl.orig/src/conf/nwfilter_conf.h +++ libvirt-acl/src/conf/nwfilter_conf.h @@ -487,6 +487,17 @@ typedef int (*virNWFilterRuleFreeInstanc typedef int (*virNWFilterRuleDisplayInstanceData)(virConnectPtr conn, void *_inst); +typedef int (*virNWFilterCanApplyBasicRules)(void); + +typedef int (*virNWFilterApplyBasicRules)(const char *ifname, + const unsigned char *macaddr); + +typedef int (*virNWFilterApplyDHCPOnlyRules)(const char *ifname, + const unsigned char *macaddr, + const char *dhcpserver); + +typedef int (*virNWFilterRemoveBasicRules)(const char *ifname); + enum techDrvFlags { TECHDRV_FLAG_INITIALIZED = (1 << 0), }; @@ -506,6 +517,11 @@ struct _virNWFilterTechDriver { virNWFilterRuleAllTeardown allTeardown; virNWFilterRuleFreeInstanceData freeRuleInstance; virNWFilterRuleDisplayInstanceData displayRuleInstance; + + virNWFilterCanApplyBasicRules canApplyBasicRules; + virNWFilterApplyBasicRules applyBasicRules; + virNWFilterApplyDHCPOnlyRules applyDHCPOnlyRules; + virNWFilterRemoveBasicRules removeBasicRules; }; Index: libvirt-acl/src/nwfilter/nwfilter_learnipaddr.h =================================================================== --- libvirt-acl.orig/src/nwfilter/nwfilter_learnipaddr.h +++ libvirt-acl/src/nwfilter/nwfilter_learnipaddr.h @@ -33,6 +33,7 @@ enum howDetect { typedef struct _virNWFilterIPAddrLearnReq virNWFilterIPAddrLearnReq; typedef virNWFilterIPAddrLearnReq *virNWFilterIPAddrLearnReqPtr; struct _virNWFilterIPAddrLearnReq { + virNWFilterTechDriverPtr techdriver; char ifname[IF_NAMESIZE]; char linkdev[IF_NAMESIZE]; enum virDomainNetType nettype; @@ -46,7 +47,8 @@ struct _virNWFilterIPAddrLearnReq { pthread_t thread; }; -int virNWFilterLearnIPAddress(const char *ifname, +int virNWFilterLearnIPAddress(virNWFilterTechDriverPtr techdriver, + const char *ifname, const char *linkdev, enum virDomainNetType nettype, const unsigned char *macaddr, Index: libvirt-acl/src/nwfilter/nwfilter_gentech_driver.c =================================================================== --- libvirt-acl.orig/src/nwfilter/nwfilter_gentech_driver.c +++ libvirt-acl/src/nwfilter/nwfilter_gentech_driver.c @@ -593,7 +593,8 @@ virNWFilterInstantiate(virConnectPtr con if (virHashLookup(missing_vars->hashTable, NWFILTER_STD_VAR_IP) != NULL) { if (virNWFilterLookupLearnReq(ifname) == NULL) { - rc = virNWFilterLearnIPAddress(ifname, + rc = virNWFilterLearnIPAddress(techdriver, + ifname, linkdev, nettype, macaddr, filter->name, Index: libvirt-acl/src/nwfilter/nwfilter_learnipaddr.c =================================================================== --- libvirt-acl.orig/src/nwfilter/nwfilter_learnipaddr.c +++ libvirt-acl/src/nwfilter/nwfilter_learnipaddr.c @@ -293,6 +293,7 @@ learnIPAddressThread(void *arg) char *filter= NULL; uint16_t etherType; enum howDetect howDetected = 0; + virNWFilterTechDriverPtr techdriver = req->techdriver; req->status = 0; @@ -458,7 +459,7 @@ learnIPAddressThread(void *arg) if (handle) pcap_close(handle); - ebtablesRemoveBasicRules(req->ifname); + techdriver->removeBasicRules(req->ifname); if (req->status == 0) { int ret; @@ -493,7 +494,7 @@ learnIPAddressThread(void *arg) /** * virNWFilterLearnIPAddress - * @conn: pointer to virConnect object + * @techdriver : driver to build firewalls * @ifname: the name of the interface * @linkdev : the name of the link device; currently only used in case of a * macvtap device @@ -513,7 +514,8 @@ learnIPAddressThread(void *arg) * firewall rules on the interface. */ int -virNWFilterLearnIPAddress(const char *ifname, +virNWFilterLearnIPAddress(virNWFilterTechDriverPtr techdriver, + const char *ifname, const char *linkdev, enum virDomainNetType nettype, const unsigned char *macaddr, @@ -569,6 +571,7 @@ virNWFilterLearnIPAddress(const char *if req->filterparams = ht; ht = NULL; req->howDetect = howDetect; + req->techdriver = techdriver; rc = virNWFilterRegisterLearnReq(req); @@ -577,14 +580,14 @@ virNWFilterLearnIPAddress(const char *if switch (howDetect) { case DETECT_DHCP: - if (ebtablesApplyDHCPOnlyRules(ifname, - macaddr, - NULL)) + if (techdriver->applyDHCPOnlyRules(ifname, + macaddr, + NULL)) goto err_free_ht; break; default: - if (ebtablesApplyBasicRules(ifname, - macaddr)) + if (techdriver->applyBasicRules(ifname, + macaddr)) goto err_free_ht; } @@ -598,7 +601,7 @@ virNWFilterLearnIPAddress(const char *if return 0; err_remove_rules: - ebtablesRemoveBasicRules(ifname); + techdriver->removeBasicRules(ifname); err_free_ht: virNWFilterHashTableFree(ht); err_no_ht: @@ -610,7 +613,8 @@ err_no_req: #else int -virNWFilterLearnIPAddress(const char *ifname ATTRIBUTE_UNUSED, +virNWFilterLearnIPAddress(virNWFilterTechDriverPtr techdriver ATTRIBUTE_UNUSED, + const char *ifname ATTRIBUTE_UNUSED, const char *linkdev ATTRIBUTE_UNUSED, enum virDomainNetType nettype ATTRIBUTE_UNUSED, const unsigned char *macaddr ATTRIBUTE_UNUSED,

2 2

[libvirt] [PATCH] Mark in_open parameter of remoteAuthenticate as unused when it's unused
by Matthias Bolte 20 Apr '10

20 Apr '10

Otherwise compiling with -Werror will fail. --- I just pushed this trivial patch. src/remote/remote_driver.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index e3df27b..c2b58e6 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -6475,7 +6475,11 @@ done: /*----------------------------------------------------------------------*/ static int -remoteAuthenticate (virConnectPtr conn, struct private_data *priv, int in_open, +remoteAuthenticate (virConnectPtr conn, struct private_data *priv, int in_open +#if !HAVE_SASL && !HAVE_POLKIT + ATTRIBUTE_UNUSED +#endif + , virConnectAuthPtr auth #if !HAVE_SASL && !HAVE_POLKIT ATTRIBUTE_UNUSED -- 1.6.3.3

2 2

[libvirt] [PATCH] Explicitly set virStoragePoolTypeInfo FS and NETFS defaults
by Matthias Bolte 20 Apr '10

20 Apr '10

No semantic change, the now explicitly set default are all zero and that's what GCC sets unspecified struct members to. --- src/conf/storage_conf.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c index 620744f..6467c73 100644 --- a/src/conf/storage_conf.c +++ b/src/conf/storage_conf.c @@ -151,6 +151,7 @@ static virStoragePoolTypeInfo poolTypeInfo[] = { { .poolType = VIR_STORAGE_POOL_FS, .poolOptions = { .flags = (VIR_STORAGE_POOL_SOURCE_DEVICE), + .defaultFormat = VIR_STORAGE_POOL_FS_AUTO, .formatFromString = virStoragePoolFormatFileSystemTypeFromString, .formatToString = virStoragePoolFormatFileSystemTypeToString, }, @@ -164,7 +165,7 @@ static virStoragePoolTypeInfo poolTypeInfo[] = { .poolOptions = { .flags = (VIR_STORAGE_POOL_SOURCE_HOST | VIR_STORAGE_POOL_SOURCE_DIR), - .defaultFormat = VIR_STORAGE_POOL_FS_AUTO, + .defaultFormat = VIR_STORAGE_POOL_NETFS_AUTO, .formatFromString = virStoragePoolFormatFileSystemNetTypeFromString, .formatToString = virStoragePoolFormatFileSystemNetTypeToString, }, -- 1.6.3.3

2 2

[libvirt] [PATCH] esx: Add support for the VMXNET 2 (Enhanced) NIC model
by Matthias Bolte 20 Apr '10

20 Apr '10

Add a test case and document it. --- docs/drvesx.html.in | 5 +- src/esx/esx_vmx.c | 60 +++++++++++++++++------- tests/vmx2xmldata/vmx2xml-ethernet-vmxnet2.vmx | 9 ++++ tests/vmx2xmldata/vmx2xml-ethernet-vmxnet2.xml | 20 ++++++++ tests/vmx2xmltest.c | 1 + tests/xml2vmxdata/xml2vmx-ethernet-vmxnet2.vmx | 14 ++++++ tests/xml2vmxdata/xml2vmx-ethernet-vmxnet2.xml | 15 ++++++ tests/xml2vmxtest.c | 1 + 8 files changed, 106 insertions(+), 19 deletions(-) create mode 100644 tests/vmx2xmldata/vmx2xml-ethernet-vmxnet2.vmx create mode 100644 tests/vmx2xmldata/vmx2xml-ethernet-vmxnet2.xml create mode 100644 tests/xml2vmxdata/xml2vmx-ethernet-vmxnet2.vmx create mode 100644 tests/xml2vmxdata/xml2vmx-ethernet-vmxnet2.xml diff --git a/docs/drvesx.html.in b/docs/drvesx.html.in index 422a7f0..d454904 100644 --- a/docs/drvesx.html.in +++ b/docs/drvesx.html.in @@ -307,10 +307,11 @@ ethernet0.checkMACAddress = "false" <dd> AMD PCnet32 network card for older guests. </dd> - <dt><code>vmxnet</code>, <code>vmxnet3</code></dt> + <dt><code>vmxnet</code>, <code>vmxnet2</code>, <code>vmxnet3</code></dt> <dd> Special VMware VMXnet network card, requires VMware tools inside - the guest. + the guest. See <a href="http://kb.vmware.com/kb/1001805">VMware KB1001805</a> + for details. </dd> <dt><code>e1000</code></dt> <dd> diff --git a/src/esx/esx_vmx.c b/src/esx/esx_vmx.c index c2e9be6..52c97e5 100644 --- a/src/esx/esx_vmx.c +++ b/src/esx/esx_vmx.c @@ -265,6 +265,7 @@ def->disks[0]... def->nets[0]... ->model = <model> <=> ethernet0.virtualDev = "<model>" # default depends on guestOS value + ethernet0.features = "15" # if present and virtualDev is "vmxnet" => vmxnet2 (enhanced) ethernet0.addressType = "generated" # default to "generated" @@ -1705,6 +1706,9 @@ esxVMX_ParseEthernet(virConfPtr conf, int controller, virDomainNetDefPtr *def) char virtualDev_name[48] = ""; char *virtualDev = NULL; + char features_name[48] = ""; + long long features = 0; + char vnet_name[48] = ""; char *vnet = NULL; @@ -1737,6 +1741,7 @@ esxVMX_ParseEthernet(virConfPtr conf, int controller, virDomainNetDefPtr *def) ESX_BUILD_VMX_NAME(generatedAddress); ESX_BUILD_VMX_NAME(address); ESX_BUILD_VMX_NAME(virtualDev); + ESX_BUILD_VMX_NAME(features); ESX_BUILD_VMX_NAME(networkName); ESX_BUILD_VMX_NAME(vnet); @@ -1797,21 +1802,34 @@ esxVMX_ParseEthernet(virConfPtr conf, int controller, virDomainNetDefPtr *def) goto failure; } - /* vmx:virtualDev -> def:model */ - if (esxUtil_GetConfigString(conf, virtualDev_name, &virtualDev, 1) < 0) { + /* vmx:virtualDev, vmx:features -> def:model */ + if (esxUtil_GetConfigString(conf, virtualDev_name, &virtualDev, 1) < 0 || + esxUtil_GetConfigLong(conf, features_name, &features, 0, 1) < 0) { goto failure; } - if (virtualDev != NULL && - STRCASENEQ(virtualDev, "vlance") && - STRCASENEQ(virtualDev, "vmxnet") && - STRCASENEQ(virtualDev, "vmxnet3") && - STRCASENEQ(virtualDev, "e1000")) { - ESX_ERROR(VIR_ERR_INTERNAL_ERROR, - _("Expecting VMX entry '%s' to be 'vlance' or 'vmxnet' or " - "'vmxnet3' or 'e1000' but found '%s'"), virtualDev_name, - virtualDev); - goto failure; + if (virtualDev != NULL) { + if (STRCASENEQ(virtualDev, "vlance") && + STRCASENEQ(virtualDev, "vmxnet") && + STRCASENEQ(virtualDev, "vmxnet3") && + STRCASENEQ(virtualDev, "e1000")) { + ESX_ERROR(VIR_ERR_INTERNAL_ERROR, + _("Expecting VMX entry '%s' to be 'vlance' or 'vmxnet' or " + "'vmxnet3' or 'e1000' but found '%s'"), virtualDev_name, + virtualDev); + goto failure; + } + + if (STRCASEEQ(virtualDev, "vmxnet") && features == 15) { + VIR_FREE(virtualDev); + + virtualDev = strdup("vmxnet2"); + + if (virtualDev == NULL) { + virReportOOMError(); + goto failure; + } + } } /* vmx:networkName -> def:data.bridge.brname */ @@ -2744,21 +2762,29 @@ esxVMX_FormatEthernet(virDomainNetDefPtr def, int controller, virBufferVSprintf(buffer, "ethernet%d.present = \"true\"\n", controller); - /* def:model -> vmx:virtualDev */ + /* def:model -> vmx:virtualDev, vmx:features */ if (def->model != NULL) { if (STRCASENEQ(def->model, "vlance") && STRCASENEQ(def->model, "vmxnet") && + STRCASENEQ(def->model, "vmxnet2") && STRCASENEQ(def->model, "vmxnet3") && STRCASENEQ(def->model, "e1000")) { ESX_ERROR(VIR_ERR_INTERNAL_ERROR, _("Expecting domain XML entry 'devices/interfase/model' " - "to be 'vlance' or 'vmxnet' or 'vmxnet3' or 'e1000' " - "but found '%s'"), def->model); + "to be 'vlance' or 'vmxnet' or 'vmxnet2' or 'vmxnet3' " + "or 'e1000' but found '%s'"), def->model); return -1; } - virBufferVSprintf(buffer, "ethernet%d.virtualDev = \"%s\"\n", - controller, def->model); + if (STRCASEEQ(def->model, "vmxnet2")) { + virBufferVSprintf(buffer, "ethernet%d.virtualDev = \"vmxnet\"\n", + controller); + virBufferVSprintf(buffer, "ethernet%d.features = \"15\"\n", + controller); + } else { + virBufferVSprintf(buffer, "ethernet%d.virtualDev = \"%s\"\n", + controller, def->model); + } } /* def:type, def:ifname -> vmx:connectionType */ diff --git a/tests/vmx2xmldata/vmx2xml-ethernet-vmxnet2.vmx b/tests/vmx2xmldata/vmx2xml-ethernet-vmxnet2.vmx new file mode 100644 index 0000000..1c3f063 --- /dev/null +++ b/tests/vmx2xmldata/vmx2xml-ethernet-vmxnet2.vmx @@ -0,0 +1,9 @@ +config.version = "8" +virtualHW.version = "4" +ethernet0.present = "true" +ethernet0.virtualDev = "vmxnet" +ethernet0.features = "15" +ethernet0.networkName = "VM Network" +ethernet0.connectionType = "bridged" +ethernet0.addressType = "static" +ethernet0.address = "00:50:56:11:22:33" diff --git a/tests/vmx2xmldata/vmx2xml-ethernet-vmxnet2.xml b/tests/vmx2xmldata/vmx2xml-ethernet-vmxnet2.xml new file mode 100644 index 0000000..090f7ce --- /dev/null +++ b/tests/vmx2xmldata/vmx2xml-ethernet-vmxnet2.xml @@ -0,0 +1,20 @@ +<domain type='vmware'> + <uuid>00000000-0000-0000-0000-000000000000</uuid> + <memory>32768</memory> + <currentMemory>32768</currentMemory> + <vcpu>1</vcpu> + <os> + <type arch='i686'>hvm</type> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <interface type='bridge'> + <mac address='00:50:56:11:22:33'/> + <source bridge='VM Network'/> + <model type='vmxnet2'/> + </interface> + </devices> +</domain> diff --git a/tests/vmx2xmltest.c b/tests/vmx2xmltest.c index f3b3b5e..b26a703 100644 --- a/tests/vmx2xmltest.c +++ b/tests/vmx2xmltest.c @@ -145,6 +145,7 @@ mymain(int argc, char **argv) DO_TEST("floppy-device", "floppy-device", esxVI_APIVersion_25); DO_TEST("ethernet-e1000", "ethernet-e1000", esxVI_APIVersion_25); + DO_TEST("ethernet-vmxnet2", "ethernet-vmxnet2", esxVI_APIVersion_25); DO_TEST("ethernet-custom", "ethernet-custom", esxVI_APIVersion_25); DO_TEST("ethernet-bridged", "ethernet-bridged", esxVI_APIVersion_25); diff --git a/tests/xml2vmxdata/xml2vmx-ethernet-vmxnet2.vmx b/tests/xml2vmxdata/xml2vmx-ethernet-vmxnet2.vmx new file mode 100644 index 0000000..50709e2 --- /dev/null +++ b/tests/xml2vmxdata/xml2vmx-ethernet-vmxnet2.vmx @@ -0,0 +1,14 @@ +config.version = "8" +virtualHW.version = "4" +guestOS = "other" +uuid.bios = "56 4d 9b ef ac d9 b4 e0-c8 f0 ae a8 b9 10 35 15" +displayName = "ethernet-vmxnet2" +memsize = "4" +numvcpus = "1" +ethernet0.present = "true" +ethernet0.virtualDev = "vmxnet" +ethernet0.features = "15" +ethernet0.networkName = "VM Network" +ethernet0.connectionType = "bridged" +ethernet0.addressType = "static" +ethernet0.address = "00:50:56:11:22:33" diff --git a/tests/xml2vmxdata/xml2vmx-ethernet-vmxnet2.xml b/tests/xml2vmxdata/xml2vmx-ethernet-vmxnet2.xml new file mode 100644 index 0000000..7d6d0e5 --- /dev/null +++ b/tests/xml2vmxdata/xml2vmx-ethernet-vmxnet2.xml @@ -0,0 +1,15 @@ +<domain type='vmware'> + <name>ethernet-vmxnet2</name> + <uuid>564d9bef-acd9-b4e0-c8f0-aea8b9103515</uuid> + <memory>4096</memory> + <os> + <type>hvm</type> + </os> + <devices> + <interface type='bridge'> + <mac address='00:50:56:11:22:33'/> + <source bridge='VM Network'/> + <model type='vmxnet2'/> + </interface> + </devices> +</domain> diff --git a/tests/xml2vmxtest.c b/tests/xml2vmxtest.c index f9c4730..40386eb 100644 --- a/tests/xml2vmxtest.c +++ b/tests/xml2vmxtest.c @@ -190,6 +190,7 @@ mymain(int argc, char **argv) DO_TEST("floppy-device", "floppy-device", esxVI_APIVersion_25); DO_TEST("ethernet-e1000", "ethernet-e1000", esxVI_APIVersion_25); + DO_TEST("ethernet-vmxnet2", "ethernet-vmxnet2", esxVI_APIVersion_25); DO_TEST("ethernet-custom", "ethernet-custom", esxVI_APIVersion_25); DO_TEST("ethernet-bridged", "ethernet-bridged", esxVI_APIVersion_25); -- 1.6.3.3

2 2

[libvirt] compiler warning about unused in_open parameter
by Gustavo Morozowski 20 Apr '10

20 Apr '10

Hi, I am trying to build 0.8.0 for windows using Fedora 12 [1], the compile is breaking with the message - make[3]: Entering directory `/home/gustavo/Devel/libvirt-0.8.0/src' CC libvirt_driver_remote_la-remote_driver.lo cc1: warnings being treated as errors remote/remote_driver.c: In function 'remoteAuthenticate': remote/remote_driver.c:6478: error: unused parameter 'in_open' [-Wunused-parameter] It seems 'in_open' is not used when both SASL and POLKIT are disabled. Gustavo [1] https://www.redhat.com/archives/libvir-list/2010-March/msg00612.html

3 2

[libvirt] [PATCH] logrotate: don't rotate zero-length logfiles only
by Anton Protopopov 20 Apr '10

20 Apr '10

Hi. In logrotate configuration files used by libvirt, there is an option 'minsize 100k', which prevents logrotate from rotating small (< 100k) files into an archive. But the target goal of the http://www.mail-archive.com/libvir-list@redhat.com/msg17443.html patch was to prevent logrotate from packing _empty_ files. This indeed could be done more accurately with the 'notifempty' option, see attached patch.

2 1

[libvirt] [PATCH] Don't ship generated python/libvirt.? files.
by Philipp Hahn 20 Apr '10

20 Apr '10

libvirt.c and libvirt.h are auto-generated files. Mentioning their names in *_SOURCES includes them in the distribution. During an out-of-tree build these shipped files are included instead of the auto-generated version, potentially breaking the build (as it happend in 0.8.0, because the shipped libvirt.h was missing the declaration for 'libvirt_virDomainUpdateDeviceFlags') Use the nodist_*_SOURCES automake variable instead. Signed-off-by: Philipp Hahn <hahn(a)univention.de> --- python/Makefile.am | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-)

3 2

[libvirt] [PATCH] Support for faking emulator in qemuxml2argv tests
by Jiri Denemark 20 Apr '10

20 Apr '10

Hi, I thought I'd need it but turned out I didn't. In case someone else finds a good use for that, here's the patch. The idea was to provide a way to fake qemu responses on -M ?, -cpu ?, and the like. Jirka >From d1fa129d1018cd66d2bbdadc68a5f72e91bc6b0c Mon Sep 17 00:00:00 2001 Message-Id: <d1fa129d1018cd66d2bbdadc68a5f72e91bc6b0c.1271681198.git.jdenemar(a)redhat.com> From: Jiri Denemark <jdenemar(a)redhat.com> Date: Fri, 16 Apr 2010 08:20:33 +0200 Subject: [PATCH] Support for faking emulator in qemuxml2argv tests Mail-Followup-To: libvir-list(a)redhat.com This patch allows for using custom scripts instead of /usr/bin/qemu emulator in domain XML. To do so, one can specify relative path to the custom script in <emulator/>. The path needs to be relative to qemuxml2argvdata directory and it will be transparently made absolute in runtime. The expected command line needs to contain the exact relative path as was used in domain XML. --- tests/qemuxml2argvtest.c | 19 +++++++++++++++++++ 1 files changed, 19 insertions(+), 0 deletions(-) diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index beb5dcd..da28c93 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -38,6 +38,7 @@ static int testCompareXMLToArgvFiles(const char *xml, virDomainDefPtr vmdef = NULL; virDomainChrDef monitor_chr; virConnectPtr conn; + char *emulator = NULL; if (!(conn = virGetConnect())) goto fail; @@ -49,6 +50,17 @@ static int testCompareXMLToArgvFiles(const char *xml, VIR_DOMAIN_XML_INACTIVE))) goto fail; + if (vmdef->emulator && *vmdef->emulator != '/') { + emulator = vmdef->emulator; + vmdef->emulator = NULL; + if (virAsprintf(&vmdef->emulator, "%s/qemuxml2argvdata/%s", + abs_srcdir, emulator) < 0) { + vmdef->emulator = emulator; + emulator = NULL; + goto fail; + } + } + if (extraFlags & QEMUD_CMD_FLAG_DOMID) vmdef->id = 6; else @@ -86,6 +98,12 @@ static int testCompareXMLToArgvFiles(const char *xml, NULL, NULL, migrateFrom, NULL) < 0) goto fail; + if (emulator && *argv) { + free(*(char**) argv); + *argv = emulator; + emulator = NULL; + } + len = 1; /* for trailing newline */ tmp = qenv; while (*tmp) { @@ -125,6 +143,7 @@ static int testCompareXMLToArgvFiles(const char *xml, ret = 0; fail: + free(emulator); free(actualargv); if (argv) { tmp = argv; -- 1.7.0.4

1 1

[libvirt] [PATCH 0/6] CPU selection fixes and tests
by Jiri Denemark 20 Apr '10

20 Apr '10

4 out of the 8 tests added by patch 2/6 fail with current libvirt. After 5/6 some of them pass and some of them fail in a different way. After 6/6 all of them pass. Jirka Jiri Denemark (6): Fake host CPU for qemu tests Tests for CPU selection in qemu driver Deal with CPU models in [] Move MIN macro to util.h so that others can use it Support removing features when converting data to CPU Use configured CPU model if possible src/cpu/cpu.c | 8 +- src/cpu/cpu.h | 6 +- src/cpu/cpu_x86.c | 82 +++++++++++++++----- src/qemu/qemu_conf.c | 39 ++++++++-- src/util/util.c | 4 - src/util/util.h | 4 + .../qemuxml2argvdata/qemuxml2argv-cpu-exact1.args | 1 + tests/qemuxml2argvdata/qemuxml2argv-cpu-exact1.xml | 28 +++++++ .../qemuxml2argvdata/qemuxml2argv-cpu-exact2.args | 1 + tests/qemuxml2argvdata/qemuxml2argv-cpu-exact2.xml | 35 ++++++++ .../qemuxml2argv-cpu-minimum1.args | 1 + .../qemuxml2argvdata/qemuxml2argv-cpu-minimum1.xml | 21 +++++ .../qemuxml2argv-cpu-minimum2.args | 1 + .../qemuxml2argvdata/qemuxml2argv-cpu-minimum2.xml | 25 ++++++ .../qemuxml2argvdata/qemuxml2argv-cpu-strict1.args | 1 + .../qemuxml2argvdata/qemuxml2argv-cpu-strict1.xml | 38 +++++++++ .../qemuxml2argv-cpu-topology1.args | 1 + .../qemuxml2argv-cpu-topology1.xml | 21 +++++ .../qemuxml2argv-cpu-topology2.args | 1 + .../qemuxml2argv-cpu-topology2.xml | 22 +++++ .../qemuxml2argv-cpu-topology3.args | 1 + .../qemuxml2argv-cpu-topology3.xml | 21 +++++ tests/qemuxml2argvtest.c | 9 ++ tests/testutilsqemu.c | 30 +++++++- 24 files changed, 362 insertions(+), 39 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-cpu-exact1.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-cpu-exact1.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-cpu-exact2.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-cpu-exact2.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-cpu-minimum1.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-cpu-minimum1.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-cpu-minimum2.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-cpu-minimum2.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-cpu-strict1.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-cpu-strict1.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-cpu-topology1.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-cpu-topology1.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-cpu-topology2.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-cpu-topology2.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-cpu-topology3.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-cpu-topology3.xml

2 16

[libvirt] [PATCH] Fixup python binding for virDomainSnapshot APIs
by Daniel P. Berrange 20 Apr '10

20 Apr '10

The generator code was totally wrong for the virDomainSnapshot APIs, not generating the wrapper class, and giving methods the wrong names * generator.py: Set metadata for virDomainSnapshot type & APIs * libvirt-override-api.xml, libvirt-override.c: Hand-code the virDomainSnapshotListNames glue layer --- python/generator.py | 27 ++++++++++++++++++++++- python/libvirt-override-api.xml | 6 +++++ python/libvirt-override.c | 46 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 78 insertions(+), 1 deletions(-) diff --git a/python/generator.py b/python/generator.py index cb9f3d9..6f082e8 100755 --- a/python/generator.py +++ b/python/generator.py @@ -243,6 +243,9 @@ py_types = { 'const virStream *': ('O', "virStream", "virStreamPtr", "virStreamPtr"), 'virDomainSnapshotPtr': ('O', "virDomainSnapshot", "virDomainSnapshotPtr", "virDomainSnapshotPtr"), + 'const virDomainSnapshotPtr': ('O', "virDomainSnapshot", "virDomainSnapshotPtr", "virDomainSnapshotPtr"), + 'virDomainSnapshot *': ('O', "virDomainSnapshot", "virDomainSnapshotPtr", "virDomainSnapshotPtr"), + 'const virDomainSnapshot *': ('O', "virDomainSnapshot", "virDomainSnapshotPtr", "virDomainSnapshotPtr"), } py_return_types = { @@ -277,6 +280,7 @@ skip_impl = ( 'virConnectListDefinedStorageVols', 'virConnectListDefinedInterfaces', 'virConnectListNWFilters', + 'virDomainSnapshotListNames', 'virConnGetLastError', 'virGetLastError', 'virDomainGetInfo', @@ -643,6 +647,8 @@ classes_type = { "virStream *": ("._o", "virStream(self, _obj=%s)", "virStream"), "virConnectPtr": ("._o", "virConnect(_obj=%s)", "virConnect"), "virConnect *": ("._o", "virConnect(_obj=%s)", "virConnect"), + "virDomainSnapshotPtr": ("._o", "virDomainSnapshot(self,_obj=%s)", "virDomainSnapshot"), + "virDomainSnapshot *": ("._o", "virDomainSnapshot(self, _obj=%s)", "virDomainSnapshot"), } converter_type = { @@ -651,7 +657,7 @@ converter_type = { primary_classes = ["virDomain", "virNetwork", "virInterface", "virStoragePool", "virStorageVol", "virConnect", "virNodeDevice", "virSecret", - "virStream"] + "virStream", "virDomainSnapshot"] classes_ancestor = { } @@ -663,6 +669,7 @@ classes_destructors = { "virStorageVol": "virStorageVolFree", "virNodeDevice" : "virNodeDeviceFree", "virSecret": "virSecretFree", + "virDomainSnapshot": "virDomainSnapshotFree", # We hand-craft __del__ for this one #"virStream": "virStreamFree", } @@ -767,6 +774,24 @@ def nameFixup(name, classe, type, file): elif name[0:12] == "virDomainGet": func = name[12:] func = string.lower(func[0:1]) + func[1:] + elif name[0:29] == "virDomainSnapshotLookupByName": + func = name[9:] + func = string.lower(func[0:1]) + func[1:] + elif name[0:26] == "virDomainSnapshotListNames": + func = name[9:] + func = string.lower(func[0:1]) + func[1:] + elif name[0:20] == "virDomainSnapshotNum": + func = name[9:] + func = string.lower(func[0:1]) + func[1:] + elif name[0:26] == "virDomainSnapshotCreateXML": + func = name[9:] + func = string.lower(func[0:1]) + func[1:] + elif name[0:24] == "virDomainSnapshotCurrent": + func = name[9:] + func = string.lower(func[0:1]) + func[1:] + elif name[0:17] == "virDomainSnapshot": + func = name[17:] + func = string.lower(func[0:1]) + func[1:] elif name[0:9] == "virDomain": func = name[9:] func = string.lower(func[0:1]) + func[1:] diff --git a/python/libvirt-override-api.xml b/python/libvirt-override-api.xml index e95c46a..6f1bc04 100644 --- a/python/libvirt-override-api.xml +++ b/python/libvirt-override-api.xml @@ -243,5 +243,11 @@ <arg name='xmlCPUs' type='const char **' info='array of XML descriptions of host CPUs'/> <arg name='flags' type='unsigned int' info='fine-tuning flags, currently unused, pass 0.'/> </function> + <function name='virDomainSnapshotListNames' file='python'> + <info>collect the list of snapshots for the given domain</info> + <arg name='dom' type='virDomainPtr' info='pointer to the domain'/> + <arg name='flags' type='unsigned int' info='flags, curently unused'/> + <return type='str *' info='the list of Names of None in case of error'/> + </function> </symbols> </api> diff --git a/python/libvirt-override.c b/python/libvirt-override.c index 02bc313..ce21f60 100644 --- a/python/libvirt-override.c +++ b/python/libvirt-override.c @@ -943,6 +943,51 @@ libvirt_virConnectListDefinedDomains(PyObject *self ATTRIBUTE_UNUSED, } static PyObject * +libvirt_virDomainSnapshotListNames(PyObject *self ATTRIBUTE_UNUSED, + PyObject *args) { + PyObject *py_retval; + char **names = NULL; + int c_retval, i; + virDomainPtr dom; + PyObject *pyobj_dom; + int flags; + + if (!PyArg_ParseTuple(args, (char *)"Oi:virDomainSnapshotListNames", &pyobj_dom, &flags)) + return(NULL); + dom = (virDomainPtr) PyvirDomain_Get(pyobj_dom); + + LIBVIRT_BEGIN_ALLOW_THREADS; + c_retval = virDomainSnapshotNum(dom, flags); + LIBVIRT_END_ALLOW_THREADS; + if (c_retval < 0) + return VIR_PY_NONE; + + if (c_retval) { + names = malloc(sizeof(*names) * c_retval); + if (!names) + return VIR_PY_NONE; + LIBVIRT_BEGIN_ALLOW_THREADS; + c_retval = virDomainSnapshotListNames(dom, names, c_retval, flags); + LIBVIRT_END_ALLOW_THREADS; + if (c_retval < 0) { + free(names); + return VIR_PY_NONE; + } + } + py_retval = PyList_New(c_retval); + + if (names) { + for (i = 0;i < c_retval;i++) { + PyList_SetItem(py_retval, i, libvirt_constcharPtrWrap(names[i])); + free(names[i]); + } + free(names); + } + + return(py_retval); +} + +static PyObject * libvirt_virDomainGetInfo(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) { PyObject *py_retval; int c_retval; @@ -3275,6 +3320,7 @@ static PyMethodDef libvirtMethods[] = { {(char *) "virConnectListDefinedInterfaces", libvirt_virConnectListDefinedInterfaces, METH_VARARGS, NULL}, {(char *) "virConnectBaselineCPU", libvirt_virConnectBaselineCPU, METH_VARARGS, NULL}, {(char *) "virDomainGetJobInfo", libvirt_virDomainGetJobInfo, METH_VARARGS, NULL}, + {(char *) "virDomainSnapshotListNames", libvirt_virDomainSnapshotListNames, METH_VARARGS, NULL}, {NULL, NULL, 0, NULL} }; -- 1.6.6.1

3 3

[libvirt] KVM Forum 2010: Call for Papers
by KVM Forum 2010 Program Committee 20 Apr '10

20 Apr '10

================================================================= CALL FOR PAPERS KVM Forum 2010 ================================================================= DESCRIPTION The KVM Forum is back! After a break last year we're proud to present this year's gathering around KVM again. The idea is to have everyone involved with KVM development come together to talk about the future and current state of KVM, teaching everyone some pieces of the puzzle they might be missing without. So if you're a KVM developer, mark the dates in your calendar! If possible, also submit a talk -- we're interested in a wide variety of KVM topics, so don't hesitate to propose a talk on your work. If you're not a KVM developer, please read on nevertheless (or jump to END USER COLLABORATION). DATES / LOCATION Conference: August 9 - 10, 2010 Location: Renaissance Boston Waterfront in Boston, MA Abstracts due: May 14th, 2010 Notification: May 28th, 2010 Yes, we're colocated with LinuxCon. Tickets for the KVM Forum also count for LinuxCon. http://events.linuxfoundation.org/component/registrationpro/?func=details&d… PROCESS At first check if it's before May 14th. If you're past that date, you're out of luck. Now try to think hard and come up with a great idea that you could talk about. Once you have that set, we need you to write up a short abstract (~150 words) on it. In your submission please note how long your talk will take. Slots vary in length up to one hour. Also include in your proposal the proposal type -- one of: technical talk, breakout session, or end-user talk. Add that information to the abstract and submit it at the following URL: http://events.linuxfoundation.org/cfp/cfp-add Now, wait until May 24th. You will receive a notification on whether your talk was accepted or not. SCOPE OF TALKS We have a list of suggested presentation topics below. These suggestions are just for guidance, please feel free to submit a proposal on any of these or related topics. In general, the more it's about backend infrastructure, the better. KVM - Scaling and performance - Nested virtualization - I/O improvements - Driver domains - Time keeping - Memory management (page sharing, swapping, huge pages, etc) - Fault tolerance - VEPA, vswitch Embedded KVM - KVM on ARM, PPC, MIPS, ...? - Real-time requirements host/guest - Device pass-through w/o iommu - Custom device/platform models QEMU - Device model improvements - New devices - Security model - Scaling and performance - Desktop virtualization - Increasing robustness - Management interfaces - QMP protocol and implementation - Live migration Virtio - Speeding up existing devices - Vhost - Alternatives - Using virtio in non-kvm environments - Virtio on non-Linux Management infrastructure - Libvirt - Kvm autotest - Easy networking - Qemud BREAKOUT SESSION We will reserve some time each day to break out for working sessions. These sessions will be less formal than a presentation and more focused on developing a solution to some real development issue. If you are interested in getting developers together to hack on some code, submit your proposal and just make it clear it's a breakout session proposal. END-USER COLLABORATION One of the big challenges as developers is to know what, where and how people actually use our software. To solve this issue at least a little, there will be a few slots reserved for end users talking about their deployments, problems and achievements. So if you have a KVM based deployment running in production or are about to roll out one, please also submit a talk (see PROCESS), and simply mark it asn an end-user collaboration proposal. We would love to have an open discussion of fields where KVM/Qemu can still improve and you would have the unique chance to steer that process! Keep in mind that most of the Forum will be focused on development though, so we suggest you also come with a good portion of technical interest :-). And of course, no product marketing please! The purpose is to engage with KVM developers. LIGHTNING TALKS In addition to submitted talks we will also have some room for lightning talks. So if you have something you think might be done until the KVM Forum, but you're not sure you could fill 15 minutes with it. Or if you don't know if you'll make it until there, just keep in mind that you will still get the chance to talk about it. Lightning talk submissions and scheduling will be handled on-site at KVM Forum. Thank you for your interest in KVM. We're looking forward to your submissions and seeing you at the KVM Forum 2010 in August! Now, start thinking about that talk you want to give. Thanks, your KVM Forum 2010 Program Commitee Alexander Graf, Novell Anthony Liguori, IBM Avi Kivity, Red Hat Chris Wright, Red Hat Dor Laor, Red Hat Jan Kiszka, Siemens Please contact us with any questions or comments. KVM-Forum-2010-PC(a)redhat.com

1 0

[libvirt] [PATCH] Fix crash in nwfilter driver check
by Daniel P. Berrange 19 Apr '10

19 Apr '10

The nwfilterDriverActive() could de-reference a NULL pointer if it hadn't be started at the point it was called. It was also not thread safe, since it lacked locking around data accesses. * src/nwfilter/nwfilter_driver.c: Fix locking & NULL checks in nwfilterDriverActive() --- src/nwfilter/nwfilter_driver.c | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/nwfilter/nwfilter_driver.c b/src/nwfilter/nwfilter_driver.c index 58df4e1..412c5b8 100644 --- a/src/nwfilter/nwfilter_driver.c +++ b/src/nwfilter/nwfilter_driver.c @@ -153,9 +153,16 @@ nwfilterDriverReload(void) { */ static int nwfilterDriverActive(void) { - if (!driverState->pools.count) + int ret; + + if (!driverState) return 0; - return 1; + + nwfilterDriverLock(driverState); + ret = driverState->pools.count ? 1 : 0; + nwfilterDriverUnlock(driverState); + + return ret; } /** -- 1.6.6.1

2 1

[libvirt] ESX and inaccessible storage pools
by Matthias Bolte 19 Apr '10

19 Apr '10

I'm currently implementing the storage driver for ESX and have a mapping problem. libvirt storage pools can be either running or inactive just like the domain. ESX is a bit different here. A datastore is always active. It can be inaccessible, e.g. if an NFS is mounted as datastore but the NFS server went unreachable. I discussed this with Daniel on IRC and he summarized it like this: <DV> they are defined, the system knows them, but they are not available for use The question is, what should the ESX driver do with inaccessible datastores? Option 1: They could just be represented as inactive storage pools, but libvirt's semantic for inactive storage pools includes that the user can start an inactive storage pool. That's not possible for an inaccessible datastore, so the driver would report an error if a user tries to start an inaccessible storage pool. Option 2: Just ignore inaccessible datastores and make the ESX storage driver to pretend that they don't exist. But this would hide information from the user. Option 3: Extend libvirt's API for inaccessible storage pools. There are possibly other options and I'd like to hear your comments and suggestions. Matthias

3 3

[libvirt] [RFC PATCH 0/5] Qemu Monitor Passthrough
by Chris Lalancette 19 Apr '10

19 Apr '10

Hello, As we discussed on the list, here are RFC patches that allow both qemu monitor passthrough and the ability to specify extra arguments to be passed on the qemu command-line. I've specifically not done the more complicated regex command-line editing for now, since we don't have consensus on it. There are a few outstanding issues with these patches: 1) Should we have a separate structure for the per-driver qemuMonitorCommand entry point? 2) Due to the way that virsh parses command-line arguments, it's not possible to pass it an argument that has spaces (even if you properly quote it). Therefore I have a hack in place that will convert ^ to space before passing it along, which is pretty crappy. How should we go about fixing this? Fix virsh argument parsing, or go about it a different way? Questions or comments about the patch series are welcome. Chris Lalancette

2 14

[libvirt] That the Linux bridge configuration does not work afer I upgraded the kernel to 2.6.33.2.
by Frank Peng 19 Apr '10

19 Apr '10

Hello, When I use a standard Redhat kernel, it's ok. Everything's working right. That the Linux bridge configuration does not work afer I upgraded the kernel to 2.6.33.2. Why? [root@node78 ~]# cat /etc/issue Red Hat Enterprise Linux Server release 5.5 (Tikanga) Kernel \r on an \m [root@node78 ~]# uname -a Linux node78 2.6.33.2 #1 SMP Wed Apr 14 10:10:29 CST 2010 x86_64 x86_64 x86_64 GNU/Linux [root@node78 ~]# cat /etc/sysconfig/selinux # This file controls the state of SELinux on the system. # SELINUX= can take one of these three values: # enforcing - SELinux security policy is enforced. # permissive - SELinux prints warnings instead of enforcing. # disabled - SELinux is fully disabled. SELINUX=disabled # SELINUXTYPE= type of policy in use. Possible values are: # targeted - Only targeted network daemons are protected. # strict - Full SELinux protection. SELINUXTYPE=targeted [root@node78 ~]# iptables -L Chain INPUT (policy ACCEPT) target prot opt source destination Chain FORWARD (policy ACCEPT) target prot opt source destination Chain OUTPUT (policy ACCEPT) target prot opt source destination [root@node78 ~]# cat /etc/sysconfig/network-scripts/ifcfg-eth0 # Intel Corporation 80003ES2LAN Gigabit Ethernet Controller (Copper) DEVICE=eth0 HWADDR=00:15:17:11:16:18 BRIDGE=br0 NM_CONTROLLED=no ONBOOT=yes [root@node78 ~]# cat /etc/sysconfig/network-scripts/ifcfg-br0 DEVICE=br0 TYPE=Bridge BOOTPROTO=static BROADCAST=192.168.0.255 IPADDR=192.168.0.78 NETMASK=255.255.255.0 NETWORK=192.168.0.0 DELAY=0 NM_CONTROLLED=no ONBOOT=yes [root@node78 ~]#cd /usr/src/ [root@node78 ~]#tar jxf linux-2.6.33.2.tar.bz2 [root@node78 ~]#ln -s linux-2.6.33.2 linux [root@node78 ~]#cd linux [root@node78 ~]#cp /boot/config-2.6.18-164.el5 /usr/src/linux-2.6.33.2/.config [root@node78 ~]#make menuconfig (add the option "enable deprecated sysfs feathures to support old userspace tools") [root@node78 ~]#make && make modules && make modules_install && make install [root@node78 ~]# ifconfig br0 Link encap:Ethernet HWaddr 00:15:17:11:16:18 inet addr:192.168.0.78 Bcast:192.168.0.255 Mask:255.255.255.0 inet6 addr: fe80::215:17ff:fe11:1618/64 Scope:Link UP BROADCAST RUNNING MULTICAST MTU:1500 Metric:1 RX packets:7217 errors:0 dropped:0 overruns:0 frame:0 TX packets:273 errors:0 dropped:0 overruns:0 carrier:0 collisions:0 txqueuelen:0 RX bytes:738606 (721.2 KiB) TX bytes:36168 (35.3 KiB) eth0 Link encap:Ethernet HWaddr 00:15:17:11:16:18 inet6 addr: fe80::215:17ff:fe11:1618/64 Scope:Link UP BROADCAST RUNNING MULTICAST MTU:1500 Metric:1 RX packets:7490 errors:0 dropped:0 overruns:0 frame:0 TX packets:304 errors:0 dropped:0 overruns:0 carrier:0 collisions:0 txqueuelen:100 RX bytes:866112 (845.8 KiB) TX bytes:42312 (41.3 KiB) Memory:b8820000-b8840000 eth1 Link encap:Ethernet HWaddr 00:15:17:11:16:19 inet addr:10.0.7.78 Bcast:10.255.255.255 Mask:255.0.0.0 inet6 addr: fe80::215:17ff:fe11:1619/64 Scope:Link UP BROADCAST RUNNING MULTICAST MTU:1500 Metric:1 RX packets:4 errors:0 dropped:0 overruns:0 frame:0 TX packets:59 errors:0 dropped:0 overruns:0 carrier:0 collisions:0 txqueuelen:1000 RX bytes:1056 (1.0 KiB) TX bytes:10982 (10.7 KiB) Memory:b8800000-b8820000 lo Link encap:Local Loopback inet addr:127.0.0.1 Mask:255.0.0.0 inet6 addr: ::1/128 Scope:Host UP LOOPBACK RUNNING MTU:16436 Metric:1 RX packets:1831 errors:0 dropped:0 overruns:0 frame:0 TX packets:1831 errors:0 dropped:0 overruns:0 carrier:0 collisions:0 txqueuelen:0 RX bytes:3576260 (3.4 MiB) TX bytes:3576260 (3.4 MiB) [root@node78 ~]# ifconfig vmbr0 vmbr0: error fetching interface information: Device not found Best Regards, Frank

1 0

[libvirt] [PATCH] nwfilter: Free nwfilter hash of virConnectPtr
by Matthias Bolte 18 Apr '10

18 Apr '10

And close the driver on connection close. --- src/datatypes.c | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/src/datatypes.c b/src/datatypes.c index ebcd538..25962a6 100644 --- a/src/datatypes.c +++ b/src/datatypes.c @@ -129,6 +129,20 @@ virSecretFreeName(void *secret_, const char *name ATTRIBUTE_UNUSED) } /** + * virNWFilterPoolFreeName: + * @pool: a nwfilter pool object + * + * Destroy the nwfilter pool object, this is just used by the nwfilter pool hash callback. + * + * Returns 0 in case of success and -1 in case of failure. + */ +static int +virNWFilterPoolFreeName(virNWFilterPtr pool, const char *name ATTRIBUTE_UNUSED) +{ + return (virUnrefNWFilter(pool)); +} + +/** * virDomainSnapshotFreeName: * @snapshot: a domain snapshotobject * @@ -212,6 +226,8 @@ failed: virHashFree(ret->nodeDevices, (virHashDeallocator) virNodeDeviceFree); if (ret->secrets != NULL) virHashFree(ret->secrets, virSecretFreeName); + if (ret->nwfilterPools != NULL) + virHashFree(ret->nwfilterPools, (virHashDeallocator) virNWFilterPoolFreeName); virMutexDestroy(&ret->lock); VIR_FREE(ret); @@ -245,6 +261,8 @@ virReleaseConnect(virConnectPtr conn) { virHashFree(conn->nodeDevices, (virHashDeallocator) virNodeDeviceFree); if (conn->secrets != NULL) virHashFree(conn->secrets, virSecretFreeName); + if (conn->nwfilterPools != NULL) + virHashFree(conn->nwfilterPools, (virHashDeallocator) virNWFilterPoolFreeName); virResetError(&conn->err); @@ -292,6 +310,8 @@ virUnrefConnect(virConnectPtr conn) { conn->deviceMonitor->close (conn); if (conn->secretDriver) conn->secretDriver->close (conn); + if (conn->nwfilterDriver) + conn->nwfilterDriver->close (conn); if (conn->driver) conn->driver->close (conn); -- 1.6.3.3

2 2

[libvirt] [PATCH 00/30] Cleanup translation marks and remove virConnectPtr from error reporting
by Matthias Bolte 17 Apr '10

17 Apr '10

This set of patches removes translation marks from log messages, adds missing translation marks to error messages and removes the virConnectPtr parameter from all error reporting functions. This series is large, but most of it was done by search and replace. 105 files changed, 3574 insertions(+), 4005 deletions(-) Matthias

6 96

[libvirt] [PATCH] Mark internal.h for translation
by Jiri Denemark 16 Apr '10

16 Apr '10

Patch for virCheckFlags added a message marked for translation into internal.h without including that file in POTFILES.in. I've just pushed the following patch. Jirka >From 39f3fee4a48ef39a2baab25e306d94238d1e1361 Mon Sep 17 00:00:00 2001 Message-Id: <39f3fee4a48ef39a2baab25e306d94238d1e1361.1271439006.git.jdenemar(a)redhat.com> From: Jiri Denemark <jdenemar(a)redhat.com> Date: Fri, 16 Apr 2010 19:21:10 +0200 Subject: [PATCH] Mark internal.h for translation Mail-Followup-To: libvir-list(a)redhat.com --- po/POTFILES.in | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/po/POTFILES.in b/po/POTFILES.in index 406e4c2..58e7358 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -25,6 +25,7 @@ src/esx/esx_vi_methods.c src/esx/esx_vi_types.c src/esx/esx_vmx.c src/interface/netcf_driver.c +src/internal.h src/libvirt.c src/lxc/lxc_container.c src/lxc/lxc_controller.c -- 1.7.0.4

1 0

[libvirt] unable to set security context (NFSv4 problem?)
by Harald Dunkel 16 Apr '10

16 Apr '10

Hi folks, Since I have moved the image file of a domain to an NFS partition I get an error message at start time: # virsh start mydomain error: Failed to start domain mydomain error: unable to set security context '110:140' on '/storage/mydomain/vda.img': Invalid argument The /storage partition is mounted with these options: # cat /proc/mounts | grep /storage nasl002:/storage/ /storage nfs4 rw,relatime,vers=4,rsize=1048576,wsize=1048576,namlen=255,hard,proto=tcp,port=0,timeo=600,retrans=2,sec=sys,clientaddr=172.19.96.31,addr=172.19.96.213 0 0 If I use a local disk instead, then there is no such problem. libvirt is version 0.7.7-4, as included with Debian. Any helpful comment would be highly appreciated. Regards Harri

4 5

[libvirt] [PATCH] Don't build nwfilter examples when not building libvirtd
by Matthew Booth 16 Apr '10

16 Apr '10

* Makefile.am: Make examples/xml/nwfilter conditional on WITH_LIBVIRTD --- Makefile.am | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index dd334b5..40352c4 100644 --- a/Makefile.am +++ b/Makefile.am @@ -5,8 +5,11 @@ GENHTML = genhtml SUBDIRS = gnulib/lib include src daemon tools proxy docs gnulib/tests \ python tests po examples/domain-events/events-c examples/hellolibvirt \ - examples/dominfo examples/domsuspend examples/python examples/apparmor \ - examples/xml/nwfilter + examples/dominfo examples/domsuspend examples/python examples/apparmor + +if WITH_LIBVIRTD + SUBDIRS += examples/xml/nwfilter +endif ACLOCAL_AMFLAGS = -I m4 -I gnulib/m4 -- 1.6.6.1

2 1

[libvirt] [PATCH] esx: Add nwfilter driver stub
by Matthias Bolte 16 Apr '10

16 Apr '10

This stops libvirt trying to connect to a non-existing libvirtd on the ESX server. --- src/Makefile.am | 1 + src/esx/esx_driver.c | 4 +- src/esx/esx_nwfilter_driver.c | 86 +++++++++++++++++++++++++++++++++++++++++ src/esx/esx_nwfilter_driver.h | 29 ++++++++++++++ 4 files changed, 119 insertions(+), 1 deletions(-) create mode 100644 src/esx/esx_nwfilter_driver.c create mode 100644 src/esx/esx_nwfilter_driver.h diff --git a/src/Makefile.am b/src/Makefile.am index df577ea..66dc349 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -247,6 +247,7 @@ ESX_DRIVER_SOURCES = \ esx/esx_storage_driver.c esx/esx_storage_driver.h \ esx/esx_device_monitor.c esx/esx_device_monitor.h \ esx/esx_secret_driver.c esx/esx_secret_driver.h \ + esx/esx_nwfilter_driver.c esx/esx_nwfilter_driver.h \ esx/esx_util.c esx/esx_util.h \ esx/esx_vi.c esx/esx_vi.h \ esx/esx_vi_methods.c esx/esx_vi_methods.h \ diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c index e3340c9..a2fc85c 100644 --- a/src/esx/esx_driver.c +++ b/src/esx/esx_driver.c @@ -39,6 +39,7 @@ #include "esx_storage_driver.h" #include "esx_device_monitor.h" #include "esx_secret_driver.h" +#include "esx_nwfilter_driver.h" #include "esx_private.h" #include "esx_vi.h" #include "esx_vi_methods.h" @@ -3834,7 +3835,8 @@ esxRegister(void) esxNetworkRegister() < 0 || esxStorageRegister() < 0 || esxDeviceRegister() < 0 || - esxSecretRegister() < 0) { + esxSecretRegister() < 0 || + esxNWFilterRegister() < 0) { return -1; } diff --git a/src/esx/esx_nwfilter_driver.c b/src/esx/esx_nwfilter_driver.c new file mode 100644 index 0000000..71d7aca --- /dev/null +++ b/src/esx/esx_nwfilter_driver.c @@ -0,0 +1,86 @@ + +/* + * esx_nwfilter_driver.c: nwfilter driver functions for managing VMware ESX + * firewall rules + * + * Copyright (C) 2010 Matthias Bolte <matthias.bolte(a)googlemail.com> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + */ + +#include <config.h> + +#include "internal.h" +#include "util.h" +#include "memory.h" +#include "logging.h" +#include "uuid.h" +#include "esx_private.h" +#include "esx_nwfilter_driver.h" +#include "esx_vi.h" +#include "esx_vi_methods.h" +#include "esx_util.h" + +#define VIR_FROM_THIS VIR_FROM_ESX + + + +static virDrvOpenStatus +esxNWFilterOpen(virConnectPtr conn, + virConnectAuthPtr auth ATTRIBUTE_UNUSED, + int flags ATTRIBUTE_UNUSED) +{ + if (STRNEQ(conn->driver->name, "ESX")) { + return VIR_DRV_OPEN_DECLINED; + } + + conn->nwfilterPrivateData = conn->privateData; + + return VIR_DRV_OPEN_SUCCESS; +} + + + +static int +esxNWFilterClose(virConnectPtr conn) +{ + conn->interfacePrivateData = NULL; + + return 0; +} + + + +static virNWFilterDriver esxNWFilterDriver = { + "ESX", /* name */ + esxNWFilterOpen, /* open */ + esxNWFilterClose, /* close */ + NULL, /* numOfNWFilters */ + NULL, /* listNWFilters */ + NULL, /* nwfilterLookupByName */ + NULL, /* nwfilterLookupByUUID */ + NULL, /* defineXML */ + NULL, /* undefine */ + NULL, /* getXMLDesc */ +}; + + + +int +esxNWFilterRegister(void) +{ + return virRegisterNWFilterDriver(&esxNWFilterDriver); +} diff --git a/src/esx/esx_nwfilter_driver.h b/src/esx/esx_nwfilter_driver.h new file mode 100644 index 0000000..64cceab --- /dev/null +++ b/src/esx/esx_nwfilter_driver.h @@ -0,0 +1,29 @@ + +/* + * esx_nwfilter_driver.h: nwfilter driver functions for managing VMware ESX + * firewall rules + * + * Copyright (C) 2010 Matthias Bolte <matthias.bolte(a)googlemail.com> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + */ + +#ifndef __ESX_NWFILTER_DRIVER_H__ +# define __ESX_NWFILTER_DRIVER_H__ + +int esxNWFilterRegister(void); + +#endif /* __ESX_NWFILTER_DRIVER_H__ */ -- 1.6.3.3

3 3

[libvirt] [PATCH v2 0/2] Enhance checking of supported flags in drivers
by Jiri Denemark 16 Apr '10

16 Apr '10

I think we need a simple and consistent way of checking whether flags passed to API entry points in drivers are valid/supported or not. So far some entry points don't check flags at all and some checks for 0 when no flags are expected/supported. The first patch introduces a macro which can be called with a whitelist of supported flags (more info about it inside the patch). The second patch changes all API calls introduced in 0.8.0 release to use the macro for checking valid flags. I'm not sure if we can change existing API calls to do the same as it could break some badly written apps which pass invalid flags. My opinion is that we may often do that as such apps don't use the API in a documented/valid way. Changes in v2: - virCheckFlags moved from checks.h to existing internal.h Jirka Jiri Denemark (2): Introduce virCheckFlags for consistent flags checking Use virCheckFlags for APIs added in 0.8.0 src/esx/esx_driver.c | 43 ++++++++++++------------- src/internal.h | 23 +++++++++++++ src/nwfilter/nwfilter_driver.c | 4 ++- src/qemu/qemu_driver.c | 68 +++++++++++++++++++--------------------- src/storage/storage_driver.c | 6 +--- src/vbox/vbox_tmpl.c | 41 ++++++++++++++++------- src/xen/xend_internal.c | 4 ++ 7 files changed, 111 insertions(+), 78 deletions(-)

3 7

[libvirt] [PATCH] nwfilter: Clear all state tracking from a drop rule
by Stefan Berger 16 Apr '10

16 Apr '10

Don't use state-matching in a drop rule. Signed-off-by: Stefan Berger <stefanb(a)us.ibm.com> Index: libvirt-acl/src/nwfilter/nwfilter_ebiptables_driver.c =================================================================== --- libvirt-acl.orig/src/nwfilter/nwfilter_ebiptables_driver.c +++ libvirt-acl/src/nwfilter/nwfilter_ebiptables_driver.c @@ -1380,13 +1380,16 @@ _iptablesCreateRuleInstance(int directio return 0; } - if (match) - virBufferVSprintf(&buf, " %s", match); - if (rule->action == VIR_NWFILTER_RULE_ACTION_ACCEPT) target = accept_target; - else + else { target = "DROP"; + match = NULL; + } + + if (match) + virBufferVSprintf(&buf, " %s", match); + virBufferVSprintf(&buf, " -j %s" CMD_DEF_POST CMD_SEPARATOR

2 2

[libvirt] [PATCH] Fix network hotplug to use device_add in QEMU
by Daniel P. Berrange 16 Apr '10

16 Apr '10

The initial boot of VMs uses -device for NICs where available. The corresponding monitor command is device_add, but the network hotplug code was still using device_del by mistake. * src/qemu/qemu_driver.c: Use device_add for NIC hotplug where available --- src/qemu/qemu_driver.c | 28 ++++++++++++++++++++-------- 1 files changed, 20 insertions(+), 8 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 5c15c1d..9e0a353 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -7210,17 +7210,29 @@ static int qemudDomainAttachNetDevice(virConnectPtr conn, close(tapfd); tapfd = -1; - if (!(nicstr = qemuBuildNicStr(net, NULL, vlan))) - goto try_remove; + if (qemuCmdFlags & QEMUD_CMD_FLAG_DEVICE) { + if (!(nicstr = qemuBuildNicDevStr(net, vlan))) + goto try_remove; + } else { + if (!(nicstr = qemuBuildNicStr(net, NULL, vlan))) + goto try_remove; + } qemuDomainObjEnterMonitorWithDriver(driver, vm); - if (qemuMonitorAddPCINetwork(priv->mon, nicstr, - &guestAddr) < 0) { - qemuDomainObjExitMonitorWithDriver(driver, vm); - goto try_remove; + if (qemuCmdFlags & QEMUD_CMD_FLAG_DEVICE) { + if (qemuMonitorAddDevice(priv->mon, nicstr) < 0) { + qemuDomainObjExitMonitorWithDriver(driver, vm); + goto try_remove; + } + } else { + if (qemuMonitorAddPCINetwork(priv->mon, nicstr, + &guestAddr) < 0) { + qemuDomainObjExitMonitorWithDriver(driver, vm); + goto try_remove; + } + net->info.type = VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI; + memcpy(&net->info.addr.pci, &guestAddr, sizeof(guestAddr)); } - net->info.type = VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI; - memcpy(&net->info.addr.pci, &guestAddr, sizeof(guestAddr)); qemuDomainObjExitMonitorWithDriver(driver, vm); ret = 0; -- 1.6.6.1

2 1

[libvirt] [PATCH] Fix error reporting for getfd + host_net_add in QEMU
by Daniel P. Berrange 16 Apr '10

16 Apr '10

If either of the getfd or host_net_add monitor commands return any text, this indicates an error condition. Don't ignore this! * src/qemu/qemu_monitor_text.c: Report errors for getfd and host_net_add --- src/qemu/qemu_monitor_text.c | 16 ++++++++++++++-- 1 files changed, 14 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_monitor_text.c b/src/qemu/qemu_monitor_text.c index 48c9a54..6ad07b1 100644 --- a/src/qemu/qemu_monitor_text.c +++ b/src/qemu/qemu_monitor_text.c @@ -1666,6 +1666,13 @@ int qemuMonitorTextSendFileHandle(qemuMonitorPtr mon, goto cleanup; } + if (STRNEQ(reply, "")) { + qemuReportError(VIR_ERR_INTERNAL_ERROR, + _("unable to send TAP file handle: %s"), + reply); + goto cleanup; + } + ret = 0; cleanup: @@ -1725,11 +1732,16 @@ int qemuMonitorTextAddHostNetwork(qemuMonitorPtr mon, if (qemuMonitorCommand(mon, cmd, &reply) < 0) { qemuReportError(VIR_ERR_OPERATION_FAILED, - _("failed to close fd in qemu with '%s'"), cmd); + _("failed to add host net with '%s'"), cmd); goto cleanup; } - /* XXX error messages here ? */ + if (STRNEQ(reply, "")) { + qemuReportError(VIR_ERR_INTERNAL_ERROR, + _("unable to add host net: %s"), + reply); + goto cleanup; + } ret = 0; -- 1.6.6.1

2 1

[libvirt] [PATCH] Fix device_del in JSON mode for QEMU
by Daniel P. Berrange 16 Apr '10

16 Apr '10

The 'device_del' command expects a parameter called 'id' but we were passing 'config'. * src/qemu/qemu_monitor_json.c: Fix device_del command parameter --- src/qemu/qemu_monitor_json.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 001b32b..c3ed47c 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -2021,7 +2021,7 @@ int qemuMonitorJSONDelDevice(qemuMonitorPtr mon, virJSONValuePtr reply = NULL; cmd = qemuMonitorJSONMakeCommand("device_del", - "s:config", devalias, + "s:id", devalias, NULL); if (!cmd) return -1; -- 1.6.6.1

2 1

[libvirt] [PATCH] Install nwfilter xml files from source directory.
by Philipp Hahn 16 Apr '10

16 Apr '10

During an out-of-tree build, the current working directory is the build directory. Since the FILTERS are static and not modified or auto-generated during the build process, they need to be explicitly fetched from the source directory during install. Prefix the files with $(srcdir), which gets expanded to the absolute or relative path to the source directory, even when duing out-of-tree builds. Signed-off-by: Philipp Hahn <hahn(a)univention.de> --- examples/xml/nwfilter/Makefile.am | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)

2 1

[libvirt] Execute a command in a Guest Domain using libvirt.
by Kumar L Srikanth-B22348 16 Apr '10

16 Apr '10

Hi, I created a Domain using libvirt virsh console. Can I execute a command [like 'ifconfig'] in Guest Domain and get the output using libvirt? Please let me know other ways to do that. Regards, Srikanth.

2 1

[libvirt] [TCK PATCH] default.cfg: fix typos
by Eric Blake 15 Apr '10

15 Apr '10

* conf/default.cfg: Improve spelling. --- Pushing as obvious. conf/default.cfg | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/default.cfg b/conf/default.cfg index 288540f..01f438c 100644 --- a/conf/default.cfg +++ b/conf/default.cfg @@ -13,12 +13,12 @@ # Defaults to /var/cache/libvirt-tck for root, or `pwd`/libvirt-tck for non-root #scratch_dir = /var/cache/libvirt-tck -# To avoid filling the filessytem, the test suite will +# To avoid filling the filesystem, the test suite will # automatically set a usage limit of # # freespace(scratch_dir) - 500 MB # -# The test suite will abort if it things it will exceed +# The test suite will abort if it thinks it will exceed # the limit. # # If you want to set a artificially lower usage limit... -- 1.6.6.1

1 0

[libvirt] [TCK PATCH] maint: add copyright notices
by Eric Blake 15 Apr '10

15 Apr '10

The only non-trivial file (>15 lines, and not a simple listing of other file names) that remains without a copyright notice is the README. * Build.PL: Add copyright. * docs/intro.pod: Likewise. * lib/Sys/Virt/TCK.pm: Likewise. * lib/Sys/Virt/TCK/Capabilities.pm: Likewise. * lib/Sys/Virt/TCK/DomainBuilder.pm: Likewise. * lib/Sys/Virt/TCK/NetworkBuilder.pm: Likewise. * lib/Sys/Virt/TCK/StoragePoolBuilder.pm: Likewise. * lib/Sys/Virt/TCK/StorageVolBuilder.pm: Likewise. * lib/Sys/Virt/TCK/TAP/XMLFormatter.pm: Likewise. * lib/Sys/Virt/TCK/TAP/XMLFormatterSession.pm: Likewise. * t/050-capabilities.t: Likewise. * t/070-domain-builder.t: Likewise. * t/080-network-builder.t: Likewise. * t/090-storage-pool-builder.t: Likewise. * t/100-storage-vol-builder.t: Likewise. --- Build.PL | 12 ++++++++++++ autobuild.sh | 12 ++++++++++++ docs/intro.pod | 17 +++++++++++++++-- lib/Sys/Virt/TCK.pm | 12 ++++++++++++ lib/Sys/Virt/TCK/Capabilities.pm | 13 +++++++++++++ lib/Sys/Virt/TCK/DomainBuilder.pm | 13 +++++++++++++ lib/Sys/Virt/TCK/NetworkBuilder.pm | 13 +++++++++++++ lib/Sys/Virt/TCK/StoragePoolBuilder.pm | 13 +++++++++++++ lib/Sys/Virt/TCK/StorageVolBuilder.pm | 13 +++++++++++++ lib/Sys/Virt/TCK/TAP/XMLFormatter.pm | 13 +++++++++++++ lib/Sys/Virt/TCK/TAP/XMLFormatterSession.pm | 13 +++++++++++++ t/050-capabilities.t | 12 ++++++++++++ t/070-domain-builder.t | 12 ++++++++++++ t/080-network-builder.t | 12 ++++++++++++ t/090-storage-pool-builder.t | 12 ++++++++++++ t/100-storage-vol-builder.t | 12 ++++++++++++ 16 files changed, 202 insertions(+), 2 deletions(-) diff --git a/Build.PL b/Build.PL index c85a072..ce30f36 100644 --- a/Build.PL +++ b/Build.PL @@ -1,4 +1,16 @@ #!/usr/bin/perl +# +# Copyright (C) 2009 Red Hat, Inc. +# Copyright (C) 2009 Daniel P. Berrange +# +# This program is free software; You can redistribute it and/or modify +# it under the GNU General Public License as published by the Free +# Software Foundation; either version 2, or (at your option) any +# later version +# +# The file "LICENSE" distributed along with this file provides full +# details of the terms and conditions +# use Module::Build; diff --git a/autobuild.sh b/autobuild.sh index 8d1ad53..f195602 100755 --- a/autobuild.sh +++ b/autobuild.sh @@ -2,6 +2,18 @@ # # This script is used to Test::AutoBuild (http://www.autobuild.org) # to perform automated builds of the Sys-Virt module +# +# Copyright (C) 2009 Red Hat, Inc. +# Copyright (C) 2009 Daniel P. Berrange +# +# This program is free software; You can redistribute it and/or modify +# it under the GNU General Public License as published by the Free +# Software Foundation; either version 2, or (at your option) any +# later version +# +# The file "LICENSE" distributed along with this file provides full +# details of the terms and conditions +# NAME=Sys-Virt-TCK diff --git a/docs/intro.pod b/docs/intro.pod index 592e145..5943f3b 100644 --- a/docs/intro.pod +++ b/docs/intro.pod @@ -1,3 +1,16 @@ +# +# Copyright (C) 2009 Red Hat, Inc. +# Copyright (C) 2009 Daniel P. Berrange +# +# This program is free software; You can redistribute it and/or modify +# it under the GNU General Public License as published by the Free +# Software Foundation; either version 2, or (at your option) any +# later version +# +# The file "LICENSE" distributed along with this file provides full +# details of the terms and conditions +# + =pod =head1 libvirt TCK: Technology Compatability Kit @@ -166,7 +179,7 @@ the libvirt TCK, there is a small program Given no arguments, this will connect using the default hypervisor URI and a previously obtained kernel+initrd and run all the tests currently available for the libvirt TCK, and report on failures. -It comes witha number of options to alter the output format or +It comes with a number of options to alter the output format or choose different configurations. 'man 1 libvirt-tck' will produce details @@ -309,7 +322,7 @@ up some pre-requisite pieces. Specifically it would =item * -Build an bootable ISO image using the kernel+initrd +Build a bootable ISO image using the kernel+initrd =item * diff --git a/lib/Sys/Virt/TCK.pm b/lib/Sys/Virt/TCK.pm index d32b03d..ea2b1d2 100644 --- a/lib/Sys/Virt/TCK.pm +++ b/lib/Sys/Virt/TCK.pm @@ -1,3 +1,15 @@ +# +# Copyright (C) 2009-2010 Red Hat, Inc. +# Copyright (C) 2009 Daniel P. Berrange +# +# This program is free software; You can redistribute it and/or modify +# it under the GNU General Public License as published by the Free +# Software Foundation; either version 2, or (at your option) any +# later version +# +# The file "LICENSE" distributed along with this file provides full +# details of the terms and conditions +# package Sys::Virt::TCK; diff --git a/lib/Sys/Virt/TCK/Capabilities.pm b/lib/Sys/Virt/TCK/Capabilities.pm index b15e195..8b79db4 100644 --- a/lib/Sys/Virt/TCK/Capabilities.pm +++ b/lib/Sys/Virt/TCK/Capabilities.pm @@ -1,3 +1,16 @@ +# +# Copyright (C) 2009 Red Hat, Inc. +# Copyright (C) 2009 Daniel P. Berrange +# +# This program is free software; You can redistribute it and/or modify +# it under the GNU General Public License as published by the Free +# Software Foundation; either version 2, or (at your option) any +# later version +# +# The file "LICENSE" distributed along with this file provides full +# details of the terms and conditions +# + package Sys::Virt::TCK::Capabilities; use strict; diff --git a/lib/Sys/Virt/TCK/DomainBuilder.pm b/lib/Sys/Virt/TCK/DomainBuilder.pm index 199884b..3bf5976 100644 --- a/lib/Sys/Virt/TCK/DomainBuilder.pm +++ b/lib/Sys/Virt/TCK/DomainBuilder.pm @@ -1,3 +1,16 @@ +# +# Copyright (C) 2009-2010 Red Hat, Inc. +# Copyright (C) 2009 Daniel P. Berrange +# +# This program is free software; You can redistribute it and/or modify +# it under the GNU General Public License as published by the Free +# Software Foundation; either version 2, or (at your option) any +# later version +# +# The file "LICENSE" distributed along with this file provides full +# details of the terms and conditions +# + package Sys::Virt::TCK::DomainBuilder; use strict; diff --git a/lib/Sys/Virt/TCK/NetworkBuilder.pm b/lib/Sys/Virt/TCK/NetworkBuilder.pm index e62b3e2..00b75d2 100644 --- a/lib/Sys/Virt/TCK/NetworkBuilder.pm +++ b/lib/Sys/Virt/TCK/NetworkBuilder.pm @@ -1,3 +1,16 @@ +# +# Copyright (C) 2009, 2010 Red Hat, Inc. +# Copyright (C) 2009 Daniel P. Berrange +# +# This program is free software; You can redistribute it and/or modify +# it under the GNU General Public License as published by the Free +# Software Foundation; either version 2, or (at your option) any +# later version +# +# The file "LICENSE" distributed along with this file provides full +# details of the terms and conditions +# + package Sys::Virt::TCK::NetworkBuilder; use strict; diff --git a/lib/Sys/Virt/TCK/StoragePoolBuilder.pm b/lib/Sys/Virt/TCK/StoragePoolBuilder.pm index c9ef2dd..c33f43b 100644 --- a/lib/Sys/Virt/TCK/StoragePoolBuilder.pm +++ b/lib/Sys/Virt/TCK/StoragePoolBuilder.pm @@ -1,3 +1,16 @@ +# +# Copyright (C) 2009, 2010 Red Hat, Inc. +# Copyright (C) 2009 Daniel P. Berrange +# +# This program is free software; You can redistribute it and/or modify +# it under the GNU General Public License as published by the Free +# Software Foundation; either version 2, or (at your option) any +# later version +# +# The file "LICENSE" distributed along with this file provides full +# details of the terms and conditions +# + package Sys::Virt::TCK::StoragePoolBuilder; use strict; diff --git a/lib/Sys/Virt/TCK/StorageVolBuilder.pm b/lib/Sys/Virt/TCK/StorageVolBuilder.pm index 940d70e..00680ed 100644 --- a/lib/Sys/Virt/TCK/StorageVolBuilder.pm +++ b/lib/Sys/Virt/TCK/StorageVolBuilder.pm @@ -1,3 +1,16 @@ +# +# Copyright (C) 2009, 2010 Red Hat, Inc. +# Copyright (C) 2009 Daniel P. Berrange +# +# This program is free software; You can redistribute it and/or modify +# it under the GNU General Public License as published by the Free +# Software Foundation; either version 2, or (at your option) any +# later version +# +# The file "LICENSE" distributed along with this file provides full +# details of the terms and conditions +# + package Sys::Virt::TCK::StorageVolBuilder; use strict; diff --git a/lib/Sys/Virt/TCK/TAP/XMLFormatter.pm b/lib/Sys/Virt/TCK/TAP/XMLFormatter.pm index e601744..b4514fd 100644 --- a/lib/Sys/Virt/TCK/TAP/XMLFormatter.pm +++ b/lib/Sys/Virt/TCK/TAP/XMLFormatter.pm @@ -1,3 +1,16 @@ +# +# Copyright (C) 2009 Red Hat, Inc. +# Copyright (C) 2009 Daniel P. Berrange +# +# This program is free software; You can redistribute it and/or modify +# it under the GNU General Public License as published by the Free +# Software Foundation; either version 2, or (at your option) any +# later version +# +# The file "LICENSE" distributed along with this file provides full +# details of the terms and conditions +# + package Sys::Virt::TCK::TAP::XMLFormatter; use strict; diff --git a/lib/Sys/Virt/TCK/TAP/XMLFormatterSession.pm b/lib/Sys/Virt/TCK/TAP/XMLFormatterSession.pm index b403140..ca2a298 100644 --- a/lib/Sys/Virt/TCK/TAP/XMLFormatterSession.pm +++ b/lib/Sys/Virt/TCK/TAP/XMLFormatterSession.pm @@ -1,3 +1,16 @@ +# +# Copyright (C) 2009 Red Hat, Inc. +# Copyright (C) 2009 Daniel P. Berrange +# +# This program is free software; You can redistribute it and/or modify +# it under the GNU General Public License as published by the Free +# Software Foundation; either version 2, or (at your option) any +# later version +# +# The file "LICENSE" distributed along with this file provides full +# details of the terms and conditions +# + package Sys::Virt::TCK::TAP::XMLFormatterSession; use strict; diff --git a/t/050-capabilities.t b/t/050-capabilities.t index 9f65ef7..691b9d5 100644 --- a/t/050-capabilities.t +++ b/t/050-capabilities.t @@ -1,4 +1,16 @@ # -*- perl -*- +# +# Copyright (C) 2009 Red Hat, Inc. +# Copyright (C) 2009 Daniel P. Berrange +# +# This program is free software; You can redistribute it and/or modify +# it under the GNU General Public License as published by the Free +# Software Foundation; either version 2, or (at your option) any +# later version +# +# The file "LICENSE" distributed along with this file provides full +# details of the terms and conditions +# use Test::More tests => 77; diff --git a/t/070-domain-builder.t b/t/070-domain-builder.t index ff0eb78..c460448 100644 --- a/t/070-domain-builder.t +++ b/t/070-domain-builder.t @@ -1,4 +1,16 @@ # -*- perl -*- +# +# Copyright (C) 2009, 2010 Red Hat, Inc. +# Copyright (C) 2009 Daniel P. Berrange +# +# This program is free software; You can redistribute it and/or modify +# it under the GNU General Public License as published by the Free +# Software Foundation; either version 2, or (at your option) any +# later version +# +# The file "LICENSE" distributed along with this file provides full +# details of the terms and conditions +# use Test::More tests => 2; diff --git a/t/080-network-builder.t b/t/080-network-builder.t index 4804e32..ec2b70c 100644 --- a/t/080-network-builder.t +++ b/t/080-network-builder.t @@ -1,4 +1,16 @@ # -*- perl -*- +# +# Copyright (C) 2009, 2010 Red Hat, Inc. +# Copyright (C) 2009 Daniel P. Berrange +# +# This program is free software; You can redistribute it and/or modify +# it under the GNU General Public License as published by the Free +# Software Foundation; either version 2, or (at your option) any +# later version +# +# The file "LICENSE" distributed along with this file provides full +# details of the terms and conditions +# use Test::More tests => 2; diff --git a/t/090-storage-pool-builder.t b/t/090-storage-pool-builder.t index 67e800d..b31204a 100644 --- a/t/090-storage-pool-builder.t +++ b/t/090-storage-pool-builder.t @@ -1,4 +1,16 @@ # -*- perl -*- +# +# Copyright (C) 2009, 2010 Red Hat, Inc. +# Copyright (C) 2009 Daniel P. Berrange +# +# This program is free software; You can redistribute it and/or modify +# it under the GNU General Public License as published by the Free +# Software Foundation; either version 2, or (at your option) any +# later version +# +# The file "LICENSE" distributed along with this file provides full +# details of the terms and conditions +# use Test::More tests => 8; use strict; diff --git a/t/100-storage-vol-builder.t b/t/100-storage-vol-builder.t index 017301e..d168ecd 100644 --- a/t/100-storage-vol-builder.t +++ b/t/100-storage-vol-builder.t @@ -1,4 +1,16 @@ # -*- perl -*- +# +# Copyright (C) 2009, 2010 Red Hat, Inc. +# Copyright (C) 2009 Daniel P. Berrange +# +# This program is free software; You can redistribute it and/or modify +# it under the GNU General Public License as published by the Free +# Software Foundation; either version 2, or (at your option) any +# later version +# +# The file "LICENSE" distributed along with this file provides full +# details of the terms and conditions +# use Test::More tests => 2; -- 1.6.6.1

2 1

[libvirt] [PATCH] esx: Replace scanf with STRSKIP and strtok_r
by Matthias Bolte 15 Apr '10

15 Apr '10

This also fixes a portability problem with the %a format modifier. %a is not portable and made esxDomainDumpXML fail at runtime in MinGW builds. Pull in strtok_r from gnulib, because MinGW lacks it. --- bootstrap.conf | 1 + src/esx/esx_driver.c | 19 +++-------------- src/esx/esx_util.c | 53 +++++++++++++++++++++++++------------------------ src/esx/esx_vi.c | 50 +++++++++++++++++++++++++++++++++++++++++++++++ src/esx/esx_vi.h | 12 +++++++++++ src/esx/esx_vmx.c | 16 +++++++++++--- 6 files changed, 106 insertions(+), 45 deletions(-) diff --git a/bootstrap.conf b/bootstrap.conf index d807e40..785489b 100644 --- a/bootstrap.conf +++ b/bootstrap.conf @@ -54,6 +54,7 @@ strndup strerror strptime strsep +strtok_r sys_stat time_r timegm diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c index a2fc85c..f22634e 100644 --- a/src/esx/esx_driver.c +++ b/src/esx/esx_driver.c @@ -60,8 +60,8 @@ esxSupportsLongMode(esxPrivate *priv) esxVI_DynamicProperty *dynamicProperty = NULL; esxVI_HostCpuIdInfo *hostCpuIdInfoList = NULL; esxVI_HostCpuIdInfo *hostCpuIdInfo = NULL; + esxVI_ParsedHostCpuIdInfo parsedHostCpuIdInfo; char edxLongModeBit = '?'; - char edxFirstBit = '?'; if (priv->supportsLongMode != esxVI_Boolean_Undefined) { return priv->supportsLongMode; @@ -96,23 +96,12 @@ esxSupportsLongMode(esxPrivate *priv) for (hostCpuIdInfo = hostCpuIdInfoList; hostCpuIdInfo != NULL; hostCpuIdInfo = hostCpuIdInfo->_next) { if (hostCpuIdInfo->level->value == -2147483647) { /* 0x80000001 */ -#define _SKIP4 "%*c%*c%*c%*c" -#define _SKIP12 _SKIP4":"_SKIP4":"_SKIP4 - - /* Expected format: "--X-:----:----:----:----:----:----:----" */ - if (sscanf(hostCpuIdInfo->edx, - "%*c%*c%c%*c:"_SKIP12":"_SKIP12":%*c%*c%*c%c", - &edxLongModeBit, &edxFirstBit) != 2) { - ESX_ERROR(VIR_ERR_INTERNAL_ERROR, - _("HostSystem property 'hardware.cpuFeature[].edx' " - "with value '%s' doesn't have expected format " - "'----:----:----:----:----:----:----:----'"), - hostCpuIdInfo->edx); + if (esxVI_ParseHostCpuIdInfo(&parsedHostCpuIdInfo, + hostCpuIdInfo) < 0) { goto failure; } -#undef _SKIP4 -#undef _SKIP12 + edxLongModeBit = parsedHostCpuIdInfo.edx[29]; if (edxLongModeBit == '1') { priv->supportsLongMode = esxVI_Boolean_True; diff --git a/src/esx/esx_util.c b/src/esx/esx_util.c index 963f52e..91d19e9 100644 --- a/src/esx/esx_util.c +++ b/src/esx/esx_util.c @@ -203,6 +203,10 @@ esxUtil_ParseDatastoreRelatedPath(const char *datastoreRelatedPath, char **directoryName, char **fileName) { int result = 0; + char *copyOfDatastoreRelatedPath = NULL; + char *tmp = NULL; + char *saveptr = NULL; + char *preliminaryDatastoreName = NULL; char *directoryAndFileName = NULL; char *separator = NULL; @@ -213,37 +217,34 @@ esxUtil_ParseDatastoreRelatedPath(const char *datastoreRelatedPath, return -1; } - /* - * Parse string as '[<datastore>] <path>'. '%as' is similar to '%s', but - * sscanf() will allocate the memory for the string, so the caller doesn't - * need to preallocate a buffer that's large enough. - * - * The s in '%as' can be replaced with a character set, e.g. [a-z]. - * - * '%a[^]%]' matches <datastore>. '[^]%]' excludes ']' from the accepted - * characters, otherwise sscanf() wont match what it should. - * - * '%a[^\n]' matches <path>. '[^\n]' excludes '\n' from the accepted - * characters, otherwise sscanf() would only match up to the first space, - * but spaces are valid in <path>. - */ - if (sscanf(datastoreRelatedPath, "[%a[^]%]] %a[^\n]", datastoreName, - &directoryAndFileName) != 2) { + if (esxVI_String_DeepCopyValue(&copyOfDatastoreRelatedPath, + datastoreRelatedPath) < 0) { + goto failure; + } + + /* Expected format: '[<datastore>] <path>' */ + if ((tmp = STRSKIP(copyOfDatastoreRelatedPath, "[")) == NULL || + (preliminaryDatastoreName = strtok_r(tmp, "]", &saveptr)) == NULL || + (directoryAndFileName = strtok_r(NULL, "", &saveptr)) == NULL) { ESX_ERROR(VIR_ERR_INTERNAL_ERROR, _("Datastore related path '%s' doesn't have expected format " "'[<datastore>] <path>'"), datastoreRelatedPath); goto failure; } + if (esxVI_String_DeepCopyValue(datastoreName, + preliminaryDatastoreName) < 0) { + goto failure; + } + + directoryAndFileName += strspn(directoryAndFileName, " "); + /* Split <path> into <directory>/<file>, where <directory> is optional */ separator = strrchr(directoryAndFileName, '/'); if (separator != NULL) { *separator++ = '\0'; - *directoryName = directoryAndFileName; - directoryAndFileName = NULL; - if (*separator == '\0') { ESX_ERROR(VIR_ERR_INTERNAL_ERROR, _("Datastore related path '%s' doesn't reference a file"), @@ -251,19 +252,19 @@ esxUtil_ParseDatastoreRelatedPath(const char *datastoreRelatedPath, goto failure; } - *fileName = strdup(separator); - - if (*fileName == NULL) { - virReportOOMError(); + if (esxVI_String_DeepCopyValue(directoryName, + directoryAndFileName) < 0 || + esxVI_String_DeepCopyValue(fileName, separator) < 0) { goto failure; } } else { - *fileName = directoryAndFileName; - directoryAndFileName = NULL; + if (esxVI_String_DeepCopyValue(fileName, directoryAndFileName) < 0) { + goto failure; + } } cleanup: - VIR_FREE(directoryAndFileName); + VIR_FREE(copyOfDatastoreRelatedPath); return result; diff --git a/src/esx/esx_vi.c b/src/esx/esx_vi.c index 4318ff1..db8c927 100644 --- a/src/esx/esx_vi.c +++ b/src/esx/esx_vi.c @@ -2886,3 +2886,53 @@ esxVI_WaitForTaskCompletion(esxVI_Context *ctx, goto cleanup; } + + + +int +esxVI_ParseHostCpuIdInfo(esxVI_ParsedHostCpuIdInfo *parsedhostCpuIdInfo, + esxVI_HostCpuIdInfo *hostCpuIdInfo) +{ + int expectedLength = 39; /* = strlen("----:----:----:----:----:----:----:----"); */ + char *input[4] = { hostCpuIdInfo->eax, hostCpuIdInfo->ebx, + hostCpuIdInfo->ecx, hostCpuIdInfo->edx }; + char *output[4] = { parsedhostCpuIdInfo->eax, parsedhostCpuIdInfo->ebx, + parsedhostCpuIdInfo->ecx, parsedhostCpuIdInfo->edx }; + const char *name[4] = { "eax", "ebx", "ecx", "edx" }; + int r, i, o; + + memset(parsedhostCpuIdInfo, 0, sizeof (esxVI_ParsedHostCpuIdInfo)); + + parsedhostCpuIdInfo->level = hostCpuIdInfo->level->value; + + for (r = 0; r < 4; ++r) { + if (strlen(input[r]) != expectedLength) { + ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, + _("HostCpuIdInfo register '%s' has an unexpected length"), + name[r]); + goto failure; + } + + /* Strip the ':' and invert the "bit" order from 31..0 to 0..31 */ + for (i = 0, o = 31; i < expectedLength; i += 5, o -= 4) { + output[r][o] = input[r][i]; + output[r][o - 1] = input[r][i + 1]; + output[r][o - 2] = input[r][i + 2]; + output[r][o - 3] = input[r][i + 3]; + + if (i + 4 < expectedLength && input[r][i + 4] != ':') { + ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, + _("HostCpuIdInfo register '%s' has an unexpected format"), + name[r]); + goto failure; + } + } + } + + return 0; + + failure: + memset(parsedhostCpuIdInfo, 0, sizeof (esxVI_ParsedHostCpuIdInfo)); + + return -1; +} diff --git a/src/esx/esx_vi.h b/src/esx/esx_vi.h index a8d4cc3..45b83f5 100644 --- a/src/esx/esx_vi.h +++ b/src/esx/esx_vi.h @@ -43,6 +43,7 @@ typedef enum _esxVI_APIVersion esxVI_APIVersion; typedef enum _esxVI_ProductVersion esxVI_ProductVersion; typedef enum _esxVI_Occurrence esxVI_Occurrence; +typedef struct _esxVI_ParsedHostCpuIdInfo esxVI_ParsedHostCpuIdInfo; typedef struct _esxVI_Context esxVI_Context; typedef struct _esxVI_Response esxVI_Response; typedef struct _esxVI_Enumeration esxVI_Enumeration; @@ -76,6 +77,14 @@ enum _esxVI_Occurrence { esxVI_Occurrence_None }; +struct _esxVI_ParsedHostCpuIdInfo { + int level; + char eax[32]; + char ebx[32]; + char ecx[32]; + char edx[32]; +}; + /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * @@ -313,4 +322,7 @@ int esxVI_WaitForTaskCompletion(esxVI_Context *ctx, esxVI_Boolean autoAnswer, esxVI_TaskInfoState *finalState); +int esxVI_ParseHostCpuIdInfo(esxVI_ParsedHostCpuIdInfo *parsedhostCpuIdInfo, + esxVI_HostCpuIdInfo *hostCpuIdInfo); + #endif /* __ESX_VI_H__ */ diff --git a/src/esx/esx_vmx.c b/src/esx/esx_vmx.c index c965e00..c2e9be6 100644 --- a/src/esx/esx_vmx.c +++ b/src/esx/esx_vmx.c @@ -589,6 +589,9 @@ char * esxVMX_AbsolutePathToDatastoreRelatedPath(esxVI_Context *ctx, const char *absolutePath) { + char *copyOfAbsolutePath = NULL; + char *tmp = NULL; + char *saveptr = NULL; char *datastoreRelatedPath = NULL; char *preliminaryDatastoreName = NULL; char *directoryAndFileName = NULL; @@ -596,8 +599,14 @@ esxVMX_AbsolutePathToDatastoreRelatedPath(esxVI_Context *ctx, esxVI_ObjectContent *datastore = NULL; const char *datastoreName = NULL; - if (sscanf(absolutePath, "/vmfs/volumes/%a[^/]/%a[^\n]", - &preliminaryDatastoreName, &directoryAndFileName) != 2) { + if (esxVI_String_DeepCopyValue(&copyOfAbsolutePath, absolutePath) < 0) { + goto failure; + } + + /* Expected format: '/vmfs/volumes/<datastore>/<path>' */ + if ((tmp = STRSKIP(copyOfAbsolutePath, "/vmfs/volumes/")) == NULL || + (preliminaryDatastoreName = strtok_r(tmp, "/", &saveptr)) == NULL || + (directoryAndFileName = strtok_r(NULL, "", &saveptr)) == NULL) { ESX_ERROR(VIR_ERR_INTERNAL_ERROR, _("Absolute path '%s' doesn't have expected format " "'/vmfs/volumes/<datastore>/<path>'"), absolutePath); @@ -652,8 +661,7 @@ esxVMX_AbsolutePathToDatastoreRelatedPath(esxVI_Context *ctx, /* FIXME: Check if referenced path/file really exists */ cleanup: - VIR_FREE(preliminaryDatastoreName); - VIR_FREE(directoryAndFileName); + VIR_FREE(copyOfAbsolutePath); esxVI_ObjectContent_Free(&datastore); return datastoreRelatedPath; -- 1.6.3.3

2 2

[libvirt] [PATCH] Update to latest gnulib to get strtok_r relaxed to LGPLv2+
by Matthias Bolte 15 Apr '10

15 Apr '10

strtok_r will be used in the ESX driver to replace scanf-based code. MinGW lacks strtok_r, so we need gnulib to provide it, but until now strtok_r was licensed LGPL3. --- .gnulib | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/.gnulib b/.gnulib index 097c9ce..7c1b995 160000 --- a/.gnulib +++ b/.gnulib @@ -1 +1 @@ -Subproject commit 097c9ce08a79899ff942b9b6ee811e613605499f +Subproject commit 7c1b995a7041ea366acafeb8632e1080f349f03f -- 1.6.3.3

2 2

[libvirt] [PATCH 0/2] rebase of earlier coverity patch
by Eric Blake 15 Apr '10

15 Apr '10

A while ago, I submitted a patch to plug a hole found by coverity, but there were concerns, I revised it, and the rewrite was never reviewed: https://www.redhat.com/archives/libvir-list/2010-March/msg00443.html I've rebased the series now that 0.8.0 is out.

2 6

[libvirt] [PATCH] maint: another preprocessor fix
by Eric Blake 15 Apr '10

15 Apr '10

Regression introduced in commit 62170b995. * src/util/memory.h: Placate cppi, and fit 80 columns. --- Pushing this as obvious, for 'make syntax-check'. src/util/memory.h | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/util/memory.h b/src/util/memory.h index ad458a6..60e2be6 100644 --- a/src/util/memory.h +++ b/src/util/memory.h @@ -1,6 +1,7 @@ /* * memory.c: safer memory allocation * + * Copyright (C) 2010 Red Hat, Inc. * Copyright (C) 2008 Daniel P. Berrange * * This library is free software; you can redistribute it and/or @@ -102,7 +103,7 @@ void virFree(void *ptrptr); * arithmetic overflow in the allocation size. The check is * essentially the same as that in gnulib's xalloc_oversized. */ -#define VIR_ALLOC_VAR_OVERSIZED(M, N, S) ((((size_t)-1) - (M)) / (S) < (N)) +# define VIR_ALLOC_VAR_OVERSIZED(M, N, S) ((((size_t)-1) - (M)) / (S) < (N)) /** * VIR_ALLOC_VAR: @@ -121,7 +122,8 @@ void virFree(void *ptrptr); * Returns -1 on failure, 0 on success */ -#define VIR_ALLOC_VAR(ptr, type, count) virAllocVar(&(ptr), sizeof(*(ptr)), sizeof(type), (count)) +# define VIR_ALLOC_VAR(ptr, type, count) \ + virAllocVar(&(ptr), sizeof(*(ptr)), sizeof(type), (count)) /** * VIR_FREE: -- 1.6.6.1

1 0

[libvirt] [TCK PATCH] maint: remove duplicate file
by Eric Blake 15 Apr '10

15 Apr '10

File is a duplicate of 14f3792:lib/Sys/Virt/TCK.pm. Besides, it is already exluded by MANIFEST.SKIP. * lib/Sys/Virt/TCK.pm.orig: Delete. * .gitignore: Sort. Add *.orig. --- .gitignore | 25 +- lib/Sys/Virt/TCK.pm.orig | 766 ---------------------------------------------- 2 files changed, 13 insertions(+), 778 deletions(-) delete mode 100644 lib/Sys/Virt/TCK.pm.orig diff --git a/.gitignore b/.gitignore index 2c7ac91..cc1470e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,18 +1,19 @@ +#.*# +*.bak +*.orig *~ -pm_to_blib +Build +MANIFEST +META.yml Makefile +Makefile.PL Makefile.old -#.*# -blib/ Sys-Virt-TCK-* -MANIFEST -*.bak -results/ -data/ -META.yml -cover_db/ _build/ -perl-Sys-Virt-TCK.spec -Build -Makefile.PL +blib/ +cover_db/ +data/ libvirt-tck +perl-Sys-Virt-TCK.spec +pm_to_blib +results/ diff --git a/lib/Sys/Virt/TCK.pm.orig b/lib/Sys/Virt/TCK.pm.orig deleted file mode 100644 index 909ddd8..0000000 --- a/lib/Sys/Virt/TCK.pm.orig +++ /dev/null @@ -1,766 +0,0 @@ - -package Sys::Virt::TCK; - -use strict; -use warnings; - -use Sys::Virt; -use Sys::Virt::TCK::DomainBuilder; -use Sys::Virt::TCK::NetworkBuilder; -use Sys::Virt::TCK::StoragePoolBuilder; -use Sys::Virt::TCK::StorageVolBuilder; -use Sys::Virt::TCK::Capabilities; - -use Config::Record; -use File::Copy qw(copy); -use File::Path qw(mkpath); -use File::Spec::Functions qw(catfile catdir rootdir); -use Cwd qw(cwd); -use LWP::UserAgent; -use IO::Uncompress::Gunzip qw(gunzip); -use IO::Uncompress::Bunzip2 qw(bunzip2); -use XML::XPath; -use Carp qw(cluck carp); - -use Test::Builder; -use Sub::Uplevel qw(uplevel); -use base qw(Exporter); - -our @EXPORT = qw(ok_error ok_domain ok_pool ok_volume xpath err_not_implemented); - -our $VERSION = '0.1.0'; - -sub new { - my $proto = shift; - my $class = ref($proto) || $proto; - my $self = {}; - my %params = @_; - - $self->{config} = $params{config} ? $params{config} : - Config::Record->new(file => ($ENV{LIBVIRT_TCK_CONFIG} || "/etc/tck.conf")); - - $self->{autoclean} = $params{autoclean} ? $params{autoclean} : - ($ENV{LIBVIRT_TCK_AUTOCLEAN} || 0); - - if ($ENV{LIBVIRT_TCK_DEBUG}) { - $SIG{__WARN__} = sub { Carp::cluck $_[0]; }; - $SIG{__DIE__} = sub { Carp::confess $_[0]; }; - } - - bless $self, $class; - - return $self; -} - - -sub setup { - my $self = shift; - - my $uri = $self->config("uri", undef); - $self->{conn} = Sys::Virt->new(address => $uri); - my $type = $self->{conn}->get_type(); - $self->{type} = lc $type; - - $self->reset if $self->{autoclean}; - - $self->sanity_check; - - return $self->{conn}; -} - - -sub sanity_check { - my $self = shift; - - my @doms = grep { $_->get_name =~ /^tck/ } $self->{conn}->list_domains; - if (@doms) { - die "there is/are " . int(@doms) . " pre-existing active domain(s) in this driver"; - } - - @doms = grep { $_->get_name =~ /^tck/ } $self->{conn}->list_defined_domains; - if (@doms) { - die "there is/are " . int(@doms) . " pre-existing inactive domain(s) in this driver"; - } - - my @pools = grep { $_->get_name =~ /^tck/ } $self->{conn}->list_storage_pools; - if (@pools) { - die "there is/are " . int(@pools) . " pre-existing active storage_pool(s) in this driver"; - } - - @pools = grep { $_->get_name =~ /^tck/ } $self->{conn}->list_defined_storage_pools; - if (@pools) { - die "there is/are " . int(@pools) . " pre-existing inactive storage_pool(s) in this driver"; - } -} - -sub reset { - my $self = shift; - - my @doms = grep { $_->get_name =~ /^tck/ } $self->{conn}->list_domains; - foreach my $dom (@doms) { - if ($dom->get_id != 0) { - $dom->destroy; - } - } - - @doms = grep { $_->get_name =~ /^tck/ } $self->{conn}->list_defined_domains(); - foreach my $dom (@doms) { - $dom->undefine; - } - - my @pools = grep { $_->get_name =~ /^tck/ } $self->{conn}->list_storage_pools; - foreach my $pool (@pools) { - my @vols = $pool->list_volumes; - foreach my $vol (@vols) { - eval { $vol->delete(0) }; - } - $pool->destroy; - } - - @pools = grep { $_->get_name =~ /^tck/ } $self->{conn}->list_defined_storage_pools(); - foreach my $pool (@pools) { - eval { - $pool->delete(0); - }; - $pool->undefine; - } -} - -sub cleanup { - my $self = shift; - - $self->reset(); - - delete $self->{conn}; -} - -sub config { - my $self = shift; - my $key = shift; - if (@_) { - my $default = shift; - return $self->{config}->get($key, $default); - } else { - return $self->{config}->get($key); - } -} - - -sub conn { - my $self = shift; - return $self->{conn}; -} - - -sub scratch_dir { - my $self = shift; - - my $scratch = $self->config("scratch_dir", $< > 0 ? - catdir(cwd(), "libvirt-tck") : - catdir(rootdir(), "var", "cache", "libvirt-tck")); - - mkpath($scratch) unless -e $scratch; - - return $scratch; -} - -sub bucket_dir { - my $self = shift; - my $name = shift; - - my $scratch = $self->scratch_dir; - - my $bucket = catdir($scratch, $name); - mkpath($bucket) unless -e $bucket; - - return $bucket; -} - -sub get_scratch_resource { - my $self = shift; - my $source = shift; - my $bucket = shift; - my $name = shift; - - my $dir = $self->bucket_dir($bucket); - my $target = catfile($dir, $name); - - return $target if -e $target; - - my $uncompress = undef; - if (ref($source)) { - $uncompress = $source->{uncompress}; - $source = $source->{source}; - } - - if ($source =~ m,^/,) { - $self->copy_scratch($source, $target, $uncompress); - } else { - $self->download_scratch($source, $target, $uncompress); - } - - return $target; -} - - -sub download_scratch { - my $self = shift; - my $source = shift; - my $target = shift; - my $uncompress = shift; - - my $ua = LWP::UserAgent->new; - $ua->timeout(10); - $ua->env_proxy; - - my $response = $ua->get($source); - - if ($response->is_success) { - open TGT, ">$target" or die "cannot create $target: $!"; - if (defined $uncompress) { - my $data = $response->content; - if ($uncompress eq "gzip") { - gunzip \$data => \*TGT; - } elsif ($uncompress eq "bzip2") { - bunzip2 \$data => \*TGT; - } else { - die "unknown compression method '$uncompress'"; - } - } else { - print TGT $response->content or die "cannot write $target: $!"; - } - close TGT or die "cannot save $target: $!"; - } else { - die "cannot download $source: " . $response->status_line; - } - -} - -sub copy_scratch { - my $self = shift; - my $source = shift; - my $target = shift; - my $uncompress = shift; - - if (defined $uncompress) { - if ($uncompress eq "gzip") { - gunzip $source => $target; - } elsif ($uncompress eq "bzip2") { - bunzip2 $source => $target; - } else { - die "unknown compression method '$uncompress'"; - } - } else { - copy ($source, $target) or die "cannot copy $source to $target: $!"; - } -} - - -sub create_sparse_disk { - my $self = shift; - my $bucket = shift; - my $name = shift; - my $size = shift; - - my $dir = $self->bucket_dir($bucket); - - my $target = catfile($dir, $name); - - open DISK, ">$target" or die "cannot create $target: $!"; - - truncate DISK, ($size * 1024 * 1024); - - close DISK or die "cannot save $target: $!"; - - return $target; -} - - -sub create_minimal_vroot { - my $self = shift; - my $bucket = shift; - my $name = shift; - - my $dir = $self->bucket_dir($bucket); - my $target = catdir($dir, $name); - - mkpath($target) unless -e $target; - - my $busybox = $self->config("busybox", "/sbin/busybox"); - - die "$busybox does not exist" unless $busybox; - - my $type = `file $busybox 2>&1`; - - die "$busybox is not statically linked" unless $type =~ /statically/; - - my @dirs = qw(sbin bin dev proc sys tmp); - - foreach my $dir (@dirs) { - my $fulldir = catdir($target, $dir); - next if -e $fulldir; - mkpath($fulldir); - } - - my $dst = catfile($target, "sbin", "busybox"); - copy ($busybox, $dst) or die "cannot copy $busybox to $dst: $!"; - chmod 0755, $dst or die "cannot make $dst executable: $!"; - - my @links = qw( - ed kill ping6 svlogd - egrep killall pipe_progress swapoff -addgroup eject killall5 pivot_root swapon -adduser env klogd pkill switch_root -adjtimex envdir last poweroff sync -ar envuidgid length printenv sysctl -arp expand less printf syslogd -arping expr linux32 ps tail -ash fakeidentd linux64 pscan tar -awk false linuxrc pwd tcpsvd -basename fbset ln raidautorun tee -bunzip2 fdformat loadfont rdate telnet -busybox fdisk loadkmap readahead telnetd -bzcat fgrep logger readlink test -bzip2 find login readprofile tftp -cal fold logname realpath time -cat free logread reboot top -catv freeramdisk losetup renice touch -chattr fsck ls reset tr -chgrp fsck.minix lsattr resize traceroute -chmod ftpget lsmod rm true -chown ftpput lzmacat rmdir tty -chpasswd fuser makedevs rmmod ttysize -chpst getopt md5sum route udhcpc -chroot getty mdev rpm udhcpd -chrt grep mesg rpm2cpio udpsvd -chvt gunzip microcom runlevel umount -cksum gzip mkdir run-parts uname -clear halt mkfifo runsv uncompress -cmp hdparm mkfs.minix runsvdir unexpand -comm head mknod rx uniq -cp hexdump mkswap sed unix2dos -cpio hostid mktemp seq unlzma -crond hostname modprobe setarch unzip -crontab httpd more setconsole uptime -cryptpw hwclock mount setkeycodes usleep -cut id mountpoint setlogcons uudecode -date ifconfig msh setsid uuencode -dc ifdown mt setuidgid vconfig -dd ifup mv sh vi -deallocvt inetd nameif sha1sum vlock -delgroup init nc slattach watch -deluser insmod netstat sleep watchdog -df install nice softlimit wc -dhcprelay ip nmeter sort wget -diff ipaddr nohup split which -dirname ipcalc nslookup start-stop-daemon who -dmesg ipcrm od stat whoami -dnsd ipcs openvt strings xargs -dos2unix iplink passwd stty yes -du iproute patch su zcat -dumpkmap iprule pgrep sulogin zcip -dumpleases iptunnel pidof sum -echo kbd_mode ping sv); - - foreach my $file (@links) { - my $fullfile = catfile($target, "bin", $file); - next if -e $fullfile; - symlink "../sbin/busybox", $fullfile - or die "cannot symlink $fullfile to ../sbin/busybox: $!"; - } - - my $init = catfile($target, "sbin", "init"); - open INIT, ">$init" or die "cannot create $init: $!"; - - print INIT <<EOF; -#!/sbin/busybox - -sh -EOF - - close INIT or die "cannot save $init: $!"; - chmod 0755, $init or die "cannot make $init executable: $!"; - - return ($target, catfile(rootdir, "sbin", "init")); -} - -sub match_kernel { - my $self = shift; - my $caps = shift; - my $arch = shift; - my $ostype = shift; - - for (my $i = 0 ; $i < $caps->num_guests ; $i++) { - if ($caps->guest_os_type($i) eq $ostype && - $caps->guest_arch_name($i) eq $arch) { - - my @domains = $caps->guest_domain_types($i); - next unless int(@domains); - - return ($domains[0], - $caps->guest_domain_emulator($i, $domains[0]), - $caps->guest_domain_loader($i, $domains[0])); - } - } - - return (); -} - - -sub best_kernel { - my $self = shift; - my $caps = shift; - - my $kernels = $self->config("kernels", []); - - for (my $i = 0 ; $i <= $#{$kernels} ; $i++) { - my $arch = $kernels->[$i]->{arch}; - my $ostype = $kernels->[$i]->{ostype}; - my @ostype = ref($ostype) ? @{$ostype} : ($ostype); - - foreach $ostype (@ostype) { - my ($domain, $emulator, $loader) = - $self->match_kernel($caps, $arch, $ostype); - - if (defined $domain) { - return ($i, $domain, $arch, $ostype, $emulator, $loader) - } - } - } - - return (); -} - -sub get_kernel { - my $self = shift; - my $caps = shift; - - my ($cfgindex, $domain, $arch, $ostype, $emulator, $loader) = - $self->best_kernel($caps); - - if (!defined $cfgindex) { - die "cannot find any supported kernel configuration"; - } - - my $kernels = $self->config("kernels", []); - - my $kernel = $kernels->[$cfgindex]->{kernel}; - my $initrd = $kernels->[$cfgindex]->{initrd}; - my $disk = $kernels->[$cfgindex]->{disk}; - - my $bucket = "os-$arch-$ostype"; - - my $kfile = $self->get_scratch_resource($kernel, $bucket, "vmlinuz"); - my $ifile = $initrd ? $self->get_scratch_resource($initrd, $bucket, "initrd") : undef; - my $dfile = $disk ? $self->get_scratch_resource($disk, $bucket, "disk.img") : undef; - - unless (defined $dfile) { - $dfile = $self->create_sparse_disk($bucket, "disk.img", 100); - } - - chmod 0755, $kfile; - - my $dev; - if ($ostype eq "xen") { - $dev = "xvda"; - } elsif ($ostype eq "uml") { - $dev = "ubda"; - } elsif ($ostype eq "hvm") { - if ($domain eq "kvm" || - $domain eq "qemu" || - $domain eq "kqemu") { - $dev = "vda"; - } else { - $dev = "hda"; - } - } - - return ( - domain => $domain, - arch => $arch, - ostype => $ostype, - emulator => $emulator, - loader => $loader, - kernel => $kfile, - initrd => $ifile, - root => $dfile, - dev => $dev, - ); -} - - - -sub generic_machine_domain { - my $self = shift; - my $name = shift; - my $caps = shift; - - my %config = $self->get_kernel($caps); - - my $b = Sys::Virt::TCK::DomainBuilder->new(conn => $self->{conn}, - name => $name, - domain => $config{domain}, - ostype => $config{ostype}); - $b->memory(64 * 1024); - $b->with_acpi(); - $b->with_apic(); - - # XXX boot CDROM or vroot for other HVs - $b->boot_kernel($config{kernel}, $config{initrd}); - - $b->disk(src => $config{root}, - dst => $config{dev}, - type => "file"); - - return $b; -} - - -sub best_container_domain { - my $self = shift; - my $caps = shift; - - for (my $i = 0 ; $i < $caps->num_guests ; $i++) { - if ($caps->guest_os_type($i) eq "exe") { - my @domains = $caps->guest_domain_types($i); - next unless int(@domains); - - return $domains[0]; - } - } - - return undef; - -} - -sub generic_container_domain { - my $self = shift; - my $name = shift; - my $caps = shift; - my $domain = shift; - - my $bucket = "os-exe"; - - my $b = Sys::Virt::TCK::DomainBuilder->new(conn => $self->{conn}, - name => $name, - domain => $domain, - ostype => "exe"); - $b->memory(64 * 1024); - - my ($root, $init) = $self->create_minimal_vroot($bucket, $name); - - $b->boot_init($init); - - $b->filesystem(src => $root, - dst => "/", - type => "mount"); - - return $b; -} - - -sub generic_domain { - my $self = shift; - my $name = @_ ? shift : "tck"; - - my $caps = Sys::Virt::TCK::Capabilities->new(xml => $self->conn->get_capabilities); - - my $container = $self->best_container_domain($caps); - - if ($container) { - return $self->generic_container_domain($name, $caps, $container); - } else { - return $self->generic_machine_domain($name, $caps); - } -} - -sub generic_pool { - my $self = shift; - my $type = shift; - my $name = @_ ? shift : "tck"; - - my $bucket = $self->bucket_dir("storage-fs"); - - my $b = Sys::Virt::TCK::StoragePoolBuilder->new(name => $name, - type => $type); - - $b->target(catdir($bucket, $name)); - - return $b; -} - - -sub generic_volume { - my $self = shift; - my $name = @_ ? shift : "tck"; - my $format = @_ ? shift :undef; - my $capacity = @_ ? shift : 1024*1024*50; - - my $b = Sys::Virt::TCK::StorageVolBuilder->new(name => $name); - $b->format($format) if $format; - $b->capacity($capacity); - - return $b; -} - -# Borrowed from Test::Exception - -sub _quiet_caller (;$) { ## no critic Prototypes - my $height = $_[0]; - $height++; - if( wantarray and !@_ ) { - return (CORE::caller($height))[0..2]; - } - else { - return CORE::caller($height); - } - } - -sub _try_as_caller { - my $coderef = shift; - - # local works here because Sub::Uplevel has already overridden caller - local *CORE::GLOBAL::caller; - { no warnings 'redefine'; *CORE::GLOBAL::caller = \&_quiet_caller; } - - my $ret = eval { uplevel 3, $coderef }; - return ($ret, $@); -}; - - -my $Tester = Test::Builder->new; - -sub ok_domain(&$;$) { - my $coderef = shift; - my $description = shift; - my $name = shift; - - die "must pass coderef, description and (optional) expected name" - unless defined $description; - - my ($ret, $exception) = _try_as_caller($coderef); - - my $ok = "$exception" eq "" && - $ret && ref($ret) && $ret->isa("Sys::Virt::Domain") && - (!defined $name || ($ret->get_name() eq $name)); - - $Tester->ok($ok, $description); - unless ($ok) { - $Tester->diag("expected Sys::Virt::Domain object" . ($name ? " with name $name" : "")); - if ($exception) { - $Tester->diag("found '$exception'"); - } else { - if ($ret && ref($ret) && $ret->isa("Sys::Virt::Domain")) { - $Tester->diag("found Sys::Virt::Domain object with name " . $ret->get_name); - } else { - $Tester->diag("found '$ret'"); - } - } - } -} - -sub ok_pool(&$;$) { - my $coderef = shift; - my $description = shift; - my $name = shift; - - die "must pass coderef, description and (optional) expected name" - unless defined $description; - - my ($ret, $exception) = _try_as_caller($coderef); - - my $ok = "$exception" eq "" && - $ret && ref($ret) && $ret->isa("Sys::Virt::StoragePool") && - (!defined $name || ($ret->get_name() eq $name)); - - $Tester->ok($ok, $description); - unless ($ok) { - $Tester->diag("expected Sys::Virt::StoragePool object" . ($name ? " with name $name" : "")); - if ($exception) { - $Tester->diag("found '$exception'"); - } else { - if ($ret && ref($ret) && $ret->isa("Sys::Virt::StoragePool")) { - $Tester->diag("found Sys::Virt::StoragePool object with name " . $ret->get_name); - } else { - $Tester->diag("found '$ret'"); - } - } - } -} - -sub ok_volume(&$;$) { - my $coderef = shift; - my $description = shift; - my $name = shift; - - die "must pass coderef, description and (optional) expected name" - unless defined $description; - - my ($ret, $exception) = _try_as_caller($coderef); - - my $ok = "$exception" eq "" && - $ret && ref($ret) && $ret->isa("Sys::Virt::StorageVol") && - (!defined $name || ($ret->get_name() eq $name)); - - $Tester->ok($ok, $description); - unless ($ok) { - $Tester->diag("expected Sys::Virt::StorageVol object" . ($name ? " with name $name" : "")); - if ($exception) { - $Tester->diag("found '$exception'"); - } else { - if ($ret && ref($ret) && $ret->isa("Sys::Virt::StorageVol")) { - $Tester->diag("found Sys::Virt::StorageVol object with name " . $ret->get_name); - } else { - $Tester->diag("found '$ret'"); - } - } - } -} - -sub ok_error(&$;$) { - my $coderef = shift; - my $description = shift; - my $code = shift; - - die "must pass coderef, description and (optional) expected error code" - unless defined $description; - - my ($ret, $exception) = _try_as_caller($coderef); - - my $ok = ref($exception) && $exception->isa("Sys::Virt::Error") && - (!defined $code || ($exception->code() == $code)); - - $Tester->ok($ok, $description); - unless ($ok) { - $Tester->diag("expecting Sys::Virt::Error object" . ($code ? " with code $code" : "")); - $Tester->diag("found '$exception'"); - } - $@ = $exception; - return $ok; -} - - -sub err_not_implemented { - my $exception = shift; - - if ($exception && - ref($exception) && - $exception->isa("Sys::Virt::Error") && - $exception->code() == 3) { - return 1; - } - return 0; -} - -sub xpath { - my $object = shift; - my $path = shift; - - my $xml = $object->get_xml_description; - - my $xp = XML::XPath->new(xml => $xml); - - return $xp->find($path); -} - -1; -- 1.6.6.1

2 2

[libvirt] BUG: attaching - detaching network device only works 7 times
by Stefan Berger 15 Apr '10

15 Apr '10

With the current tip: While extending a test case I found that attaching and detaching the following network device works only 7 times with the below script: <interface type='bridge'> <source bridge='static'/> <mac address='52:54:00:4d:a2:58'/> <target dev='attach0'/> </interface> let c=1; while test 1; do virsh attach-device acl attach.xml ; virsh detach-device acl attach.xml; echo ${c}; let c=c+1; done Then the following error occurs: error: Failed to attach device from attach.xml error: operation failed: parsing pci_add reply failed: Too Many NICs failed to add macaddr=52:54:00:4d:a2:58,vlan=1,name=net1 It looks like the detachment of the device is not done by qemu? Regards, Stefan

2 8

[libvirt] [PATCH 0/4] Misc fixes + enhancements to the QEMU JSON mode monitor
by Daniel P. Berrange 15 Apr '10

15 Apr '10

This series is the latest update to the JSON mode monitor code, based on current QEMU state of development. This work is still ongoing, at the very least QEMU is still lacking support for device_del, drive_add netdev_add and delvm/loadvm/savedvm commands that libvirt needs.

2 8

[libvirt] Build failure on Ubuntu 9.10
by Chris Lalancette 15 Apr '10

15 Apr '10

Hey Jamie, I've starting doing some automated builds of libvirt, and I've run into this build failure on Ubuntu 9.10 (both for i386 and x86_64): Git head revision: cffe619bdf9943282cc9f6a0cf815ad9f0fe7fd7 make all-recursive make[1]: Entering directory `/root/libvirt' Making all in gnulib/lib make[2]: Entering directory `/root/libvirt/gnulib/lib' ... make all-am make[3]: Entering directory `/root/libvirt/src' ... CC libvirt_lxc-capabilities.o CC libvirt_lxc-domain_conf.o CC libvirt_lxc-cpu_conf.o CC libvirt_lxc-nwfilter_params.o CC virt_aa_helper-virt-aa-helper.o make[3]: *** No rule to make target `../src/libvirt_conf.la', needed by `virt-aa-helper'. Stop. make[3]: *** Waiting for unfinished jobs.... make[3]: Leaving directory `/root/libvirt/src' make[2]: *** [all] Error 2 make[2]: Leaving directory `/root/libvirt/src' make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory `/root/libvirt' make: *** [all] Error 2 (if you want the full build log, or build with V=1, let me know). Any thoughts? -- Chris Lalancette

2 1

[libvirt] [PATCH] Fix apibuild.py warnings about missing ':'
by Matthias Bolte 15 Apr '10

15 Apr '10

--- I just pushed this trivial fix. src/libvirt.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libvirt.c b/src/libvirt.c index d1b7880..ff36681 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -12616,7 +12616,7 @@ error: } /** - * virDomainRevertToSnapshot + * virDomainRevertToSnapshot: * @snapshot: a domain snapshot object * @flags: unused flag parameters; callers should pass 0 * @@ -12657,7 +12657,7 @@ error: } /** - * virDomainSnapshotDelete + * virDomainSnapshotDelete: * @snapshot: a domain snapshot object * @flags: flag parameters * -- 1.6.3.3

2 1

[libvirt] [PATCH] nwfilter: fix tear down order and consolidate functions
by Stefan Berger 15 Apr '10

15 Apr '10

To avoid race-conditions, the tear down of a filter has to happen before the tap interface disappears and another tap interface with the same name can re-appear. This patch tries to fix this. In one place, where communication with the qemu monitor may fail, I am only tearing the filters down after knowing that the function did not fail. I am also moving the tear down functions into an include file for other drivers to reuse. Signed-off-by: Stefan Berger <stefanb(a)us.ibm.com> --- src/nwfilter/nwfilter_gentech_driver.h | 14 ++++++++++++++ src/qemu/qemu_conf.c | 13 ++++++++----- src/qemu/qemu_driver.c | 28 +++++++--------------------- 3 files changed, 29 insertions(+), 26 deletions(-) Index: libvirt-acl/src/qemu/qemu_conf.c =================================================================== --- libvirt-acl.orig/src/qemu/qemu_conf.c +++ libvirt-acl/src/qemu/qemu_conf.c @@ -4074,10 +4074,13 @@ int qemudBuildCommandLine(virConnectPtr goto error; if (VIR_REALLOC_N(*tapfds, (*ntapfds)+1) < 0) { + virNWFilterTearNWFilter(net); close(tapfd); goto no_memory; } + last_good_net = i; + (*tapfds)[(*ntapfds)++] = tapfd; if (snprintf(tapfd_name, sizeof(tapfd_name), "%d", tapfd) >= sizeof(tapfd_name)) @@ -4091,10 +4094,13 @@ int qemudBuildCommandLine(virConnectPtr goto error; if (VIR_REALLOC_N(*tapfds, (*ntapfds)+1) < 0) { + virNWFilterTearNWFilter(net); close(tapfd); goto no_memory; } + last_good_net = i; + (*tapfds)[(*ntapfds)++] = tapfd; if (snprintf(tapfd_name, sizeof(tapfd_name), "%d", tapfd) >= sizeof(tapfd_name)) @@ -4154,7 +4160,6 @@ int qemudBuildCommandLine(virConnectPtr goto error; ADD_ARG(host); } - last_good_net = i; } } @@ -4603,6 +4608,8 @@ int qemudBuildCommandLine(virConnectPtr no_memory: virReportOOMError(); error: + for (i = 0; i <= last_good_net; i++) + virNWFilterTearNWFilter(def->nets[i]); if (tapfds && *tapfds) { for (i = 0; i < *ntapfds; i++) @@ -4620,11 +4627,6 @@ int qemudBuildCommandLine(virConnectPtr VIR_FREE((qenv)[i]); VIR_FREE(qenv); } - for (i = 0; i <= last_good_net; i++) { - virDomainNetDefPtr net = def->nets[i]; - if ((net->filter) && (net->ifname)) - virNWFilterTeardownFilter(net); - } return -1; #undef ADD_ARG Index: libvirt-acl/src/qemu/qemu_driver.c =================================================================== --- libvirt-acl.orig/src/qemu/qemu_driver.c +++ libvirt-acl/src/qemu/qemu_driver.c @@ -3070,21 +3070,6 @@ cleanup: } -static void -qemuTearNWFilter(virDomainNetDefPtr net) { - if ((net->filter) && (net->ifname)) - virNWFilterTeardownFilter(net); -} - - -static void -qemuTearVMNWFilters(virDomainObjPtr vm) { - int i; - for (i = 0; i < vm->def->nnets; i++) - qemuTearNWFilter(vm->def->nets[i]); -} - - struct qemudHookData { virConnectPtr conn; virDomainObjPtr vm; @@ -3397,6 +3382,9 @@ static int qemudStartVMDaemon(virConnect VIR_FREE(progenv[i]); VIR_FREE(progenv); + if (ret == -1) /* The VM failed to start; tear filters before taps */ + virNWFilterTearVMNWFilters(vm); + if (tapfds) { for (i = 0 ; i < ntapfds ; i++) { close(tapfds[i]); @@ -3461,8 +3449,6 @@ cleanup: /* We jump here if we failed to start the VM for any reason * XXX investigate if we can kill this block and safely call * qemudShutdownVMDaemon even though no PID is running */ - qemuTearVMNWFilters(vm); - qemuDomainReAttachHostDevices(driver, vm->def); if (driver->securityDriver && @@ -3511,7 +3497,7 @@ static void qemudShutdownVMDaemon(struct * reporting so we don't squash a legit error. */ orig_err = virSaveLastError(); - qemuTearVMNWFilters(vm); + virNWFilterTearVMNWFilters(vm); if (driver->macFilter) { def = vm->def; @@ -7153,7 +7139,8 @@ cleanup: qemuDomainPCIAddressReleaseAddr(priv->pciaddrs, &net->info) < 0) VIR_WARN0("Unable to release PCI address on NIC"); - qemuTearNWFilter(net); + if (ret != 0) + virNWFilterTearNWFilter(net); VIR_FREE(nicstr); VIR_FREE(netstr); @@ -7953,6 +7940,8 @@ qemudDomainDetachNetDevice(struct qemud_ } qemuDomainObjExitMonitorWithDriver(driver, vm); + virNWFilterTearNWFilter(detach); + #if WITH_MACVTAP if (detach->type == VIR_DOMAIN_NET_TYPE_DIRECT) { if (detach->ifname) @@ -7970,8 +7959,6 @@ qemudDomainDetachNetDevice(struct qemud_ } } - qemuTearNWFilter(detach); - if (vm->def->nnets > 1) { memmove(vm->def->nets + i, vm->def->nets + i + 1, Index: libvirt-acl/src/nwfilter/nwfilter_gentech_driver.h =================================================================== --- libvirt-acl.orig/src/nwfilter/nwfilter_gentech_driver.h +++ libvirt-acl/src/nwfilter/nwfilter_gentech_driver.h @@ -65,4 +65,20 @@ void virNWFilterDomainFWUpdateCB(void *p const char *name ATTRIBUTE_UNUSED, void *data); + +/* tear down an interface's filter before tearing down the interface */ +static inline void +virNWFilterTearNWFilter(virDomainNetDefPtr net) { + if ((net->filter) && (net->ifname)) + virNWFilterTeardownFilter(net); +} + + +static inline void +virNWFilterTearVMNWFilters(virDomainObjPtr vm) { + int i; + for (i = 0; i < vm->def->nnets; i++) + virNWFilterTearNWFilter(vm->def->nets[i]); +} + #endif

3 2

[libvirt] with these, clang vs. libvirt reports no errors
by Jim Meyering 15 Apr '10

15 Apr '10

I've been running clang regularly, and there have been a few pesky false-positives that just won't go away. It's not productive to reexamine them each time, so I've wanted a way to educate clang without polluting the code with work-arounds that we'll be stuck maintaining and asking questions about long after clang becomes smart enough that those work-arounds are no longer required. My solution is to mark the work-arounds with a new macro, sa_assert (for "static analysis assert"), which acts just like the classical "assert", but is only enabled when compiled by a static analyzer like clang or coverity. The advantage of using an assert-like macro is that people already know that it must have no side-effects and that will make it easy to remove later, when clang grows up. One question you may ask is why add a new symbol, when "assert" itself can already do this via NDEBUG (defined, any assertions are disabled, not defined, they are enabled). There are a few assertions in the code now, and I prefer not to touch them, and to make it clear that these are helping us cater to static analyzers. [PATCH 1/7] sa_assert: new assert-like macro, enabled only for use with static analyzers [PATCH 2/7] build: set STATIC_ANALYSIS when running via clang or coverity [PATCH 3/7] nwfilter_ebiptables_driver.c: avoid NULL dereference [PATCH 4/7] virGetHostnameLocalhost: avoid FP NULL-ptr-deref from clang [PATCH 5/7] qemudDomainAttachSCSIDisk: avoid FP NULL-ptr-deref from clang [PATCH 6/7] xend_internal.c: assure clang that we do not dereference NULL [PATCH 7/7] qemudDomainAttachSCSIDisk: avoid FP NULL-ptr-deref from clang

6 38

[libvirt] [PATCH] Add testing for CDROM media change / eject
by Daniel P. Berrange 15 Apr '10

15 Apr '10

This tests the 3 main operations in removeable media - Eject existing media - Insert new media - Change existing media (eject followed by insert) * lib/Sys/Virt/TCK.pm: Allow a specific ostype to be requested when getting a guest config * scripts/domain/207-disk-media-change.t: Test media change, eject, and re-insert --- lib/Sys/Virt/TCK.pm | 20 +++++- scripts/domain/207-disk-media-change.t | 95 ++++++++++++++++++++++++++++++++ 2 files changed, 111 insertions(+), 4 deletions(-) create mode 100644 scripts/domain/207-disk-media-change.t diff --git a/lib/Sys/Virt/TCK.pm b/lib/Sys/Virt/TCK.pm index d32b03d..9f67c08 100644 --- a/lib/Sys/Virt/TCK.pm +++ b/lib/Sys/Virt/TCK.pm @@ -416,6 +416,7 @@ sub match_kernel { sub best_kernel { my $self = shift; my $caps = shift; + my $wantostype = shift; my $kernels = $self->config("kernels", []); @@ -425,6 +426,11 @@ sub best_kernel { my @ostype = ref($ostype) ? @{$ostype} : ($ostype); foreach $ostype (@ostype) { + if ((defined $wantostype) && + ($wantostype ne $ostype)) { + next; + } + my ($domain, $emulator, $loader) = $self->match_kernel($caps, $arch, $ostype); @@ -440,9 +446,10 @@ sub best_kernel { sub get_kernel { my $self = shift; my $caps = shift; + my $wantostype = shift; my ($cfgindex, $domain, $arch, $ostype, $emulator, $loader) = - $self->best_kernel($caps); + $self->best_kernel($caps, $wantostype); if (!defined $cfgindex) { die "cannot find any supported kernel configuration"; @@ -500,8 +507,9 @@ sub generic_machine_domain { my $self = shift; my $name = shift; my $caps = shift; + my $ostype = shift; - my %config = $self->get_kernel($caps); + my %config = $self->get_kernel($caps, $ostype); my $b = Sys::Virt::TCK::DomainBuilder->new(conn => $self->{conn}, name => $name, @@ -568,15 +576,19 @@ sub generic_container_domain { sub generic_domain { my $self = shift; my $name = @_ ? shift : "tck"; + my $ostype = @_ ? shift : undef; my $caps = Sys::Virt::TCK::Capabilities->new(xml => $self->conn->get_capabilities); - my $container = $self->best_container_domain($caps); + my $container; + + $container = $self->best_container_domain($caps) + unless $ostype && $ostype ne "exe"; if ($container) { return $self->generic_container_domain($name, $caps, $container); } else { - return $self->generic_machine_domain($name, $caps); + return $self->generic_machine_domain($name, $caps, $ostype); } } diff --git a/scripts/domain/207-disk-media-change.t b/scripts/domain/207-disk-media-change.t new file mode 100644 index 0000000..2976800 --- /dev/null +++ b/scripts/domain/207-disk-media-change.t @@ -0,0 +1,95 @@ +# -*- perl -*- +# +# Copyright (C) 2009 Red Hat, Inc. +# Copyright (C) 2009 Daniel P. Berrange +# +# This program is free software; You can redistribute it and/or modify +# it under the GNU General Public License as published by the Free +# Software Foundation; either version 2, or (at your option) any +# later version +# +# The file "LICENSE" distributed along with this file provides full +# details of the terms and conditions +# + +=pod + +=head1 NAME + +domain/207-disk-media-change.t - verify disk media change works + +=head1 DESCRIPTION + +The test case validates that it is possible to change media +on a CDROM disk in a running domain. + +=cut + +use strict; +use warnings; + +use Test::More tests => 7; + +use Sys::Virt::TCK; +use Test::Exception; + +my $tck = Sys::Virt::TCK->new(); +my $conn = eval { $tck->setup(); }; +BAIL_OUT "failed to setup test harness: $@" if $@; +END { + $tck->cleanup if $tck; +} + +my $path1 = $tck->create_sparse_disk("200-disk-media-change", "extra1.img", 100); +my $path2 = $tck->create_sparse_disk("207-disk-media-change", "extra2.img", 100); + +my $xml = $tck->generic_domain("tck", "wibble") + ->disk(src => $path1, dst => "hdc", type => "file", device => "cdrom") + ->as_xml; + +diag "Creating a new transient domain"; +my $dom; +ok_domain(sub { $dom = $conn->create_domain($xml) }, "created transient domain object"); + + +my $diskxml1 = <<EOF; +<disk type='file' device='cdrom'> + <source file='$path1'/> + <target dev='hdc'/> +</disk> +EOF +my $diskxml2 = <<EOF; +<disk type='file' device='cdrom'> + <source file='$path2'/> + <target dev='hdc'/> +</disk> +EOF +my $diskxml3 = <<EOF; +<disk type='file' device='cdrom'> + <target dev='hdc'/> +</disk> +EOF + + +my $initialxml = $dom->get_xml_description; + +diag "Changing CDROM to $path2"; +lives_ok(sub { $dom->attach_device($diskxml2); }, "disk media has been changed"); + +my $newxml = $dom->get_xml_description; + +ok($newxml =~ m|$path2|, "new XML has updated media"); + +diag "Ejecting CDROM media"; +lives_ok(sub { $dom->attach_device($diskxml3); }, "disk media has been ejected"); + +$newxml = $dom->get_xml_description; + +ok($newxml !~ m|$path2|, "new XML has no media"); + +diag "Inserting CDROM media"; +lives_ok(sub { $dom->attach_device($diskxml1); }, "disk media has been inserted"); + +my $finalxml = $dom->get_xml_description; + +is($initialxml, $finalxml, "final XML matches initial XML"); -- 1.6.6.1

1 0

[libvirt] [PATCH] Fix close_used_without_including_unistd_h error
by Matthias Bolte 15 Apr '10

15 Apr '10

Triggered by gnulib when compiling with MinGW. --- I just pushed this trivial compile fix too. src/conf/nwfilter_conf.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/conf/nwfilter_conf.c b/src/conf/nwfilter_conf.c index f4af126..336ea3b 100644 --- a/src/conf/nwfilter_conf.c +++ b/src/conf/nwfilter_conf.c @@ -33,6 +33,7 @@ #if HAVE_NET_ETHERNET_H # include <net/ethernet.h> #endif +#include <unistd.h> #include "internal.h" -- 1.6.3.3

1 0

[libvirt] [PATCH 0/1] Variable length structure allocator
by David Allan 14 Apr '10

14 Apr '10

I've had this patch hanging around for a while, and I think it's worth committing even though the original reason for it went away. The kind of structure it allocates is reasonably common, and the oversize calculation is tricky to get right. Since we've already done the work (thanks Jim for the oversize calculation) I think it's worth keeping. Dave David Allan (1): Implement variable length structure allocator src/util/memory.c | 40 ++++++++++++++++++++++++++++++++++++++++ src/util/memory.h | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 75 insertions(+), 0 deletions(-)

4 9

[libvirt] [PATCH] build: fix recent 'make syntax-check' failure
by Eric Blake 14 Apr '10

14 Apr '10

* src/esx/esx_vi_methods.h: Placate cppi. --- Pushing under the rule for obvious build fixes. src/esx/esx_vi_methods.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/esx/esx_vi_methods.h b/src/esx/esx_vi_methods.h index 7b6be4e..c78c649 100644 --- a/src/esx/esx_vi_methods.h +++ b/src/esx/esx_vi_methods.h @@ -2,7 +2,7 @@ /* * esx_vi_methods.h: client for the VMware VI API 2.5 to manage ESX hosts * - * Copyright (C) 2009 Matthias Bolte <matthias.bolte(a)googlemail.com> + * Copyright (C) 2009, 2010 Matthias Bolte <matthias.bolte(a)googlemail.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -45,6 +45,6 @@ int esxVI_ValidateMigration esxVI_ManagedObjectReference *host, /* optional */ esxVI_Event **output); /* optional, list */ -#include "esx_vi_methods.generated.h" +# include "esx_vi_methods.generated.h" #endif /* __ESX_VI_METHODS_H__ */ -- 1.6.6.1

1 0

[libvirt] [PATCH] schematestutils.sh: improve shell portability: avoid "echo -e"
by Jim Meyering 14 Apr '10

14 Apr '10

echo -e is not portable. This is the sole remaining use in all of libvirt. >From a58cf340b5ebbca2157f43c6f23d4d6f56b848c7 Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Wed, 14 Apr 2010 13:25:46 +0200 Subject: [PATCH] schematestutils.sh: improve shell portability: avoid "echo -e" * tests/schematestutils.sh: Use printf rather than echo -e. --- tests/schematestutils.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tests/schematestutils.sh b/tests/schematestutils.sh index f172857..f2b3b50 100644 --- a/tests/schematestutils.sh +++ b/tests/schematestutils.sh @@ -22,7 +22,7 @@ do test_result $n $(basename $(dirname $xml))"/"$(basename $xml) $ret if test "$verbose" = "1" && test $ret != 0 ; then - echo -e "$cmd\n$result" + printf '%s\n' "$cmd" "$result" fi if test "$ret" != 0 ; then f=`expr $f + 1` -- 1.7.1.rc1.248.gcefbb

4 11

[libvirt] [RFC] maint: forbid most files without extension
by Eric Blake 14 Apr '10

14 Apr '10

* .gitignore: Add rule that requires . in name, then add exemptions. --- Given Chris' recent accident in committing a binary file, then blasting the list with it, here's a (hack) approach to prevent a relapse in the future. It assumes that non-binary files either have an extension, or are easy enough to enumerate. Personally, I do NOT want to apply this patch. It has the nasty side-effect of rendering .git/info/exclude useless (git unfortunately stops processing ignore rules once it finds an explicit accept rule, so any reject rules in .git/info/exclude for files containing '.' are overruled as accepts by this patch). Hence, this is only an RFC, documenting my thought process. .gitignore | 38 ++++++++++++++++++++++++++++++++++++++ 1 files changed, 38 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index a7466fd..7d2bce3 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,41 @@ +# To reduce likelihood of committing binaries, require that a '.' be +# in all non-directories, then add exceptions as needed. +* +!*.* +!/AUTHORS +!/ChangeLog-old +!/HACKING +!README +!TODO +!/bootstrap +!/examples/apparmor/TEMPLATE +!/examples/apparmor/libvirt-qemu +!/tests/capabilityschematest +!/tests/cpuset +!/tests/daemon-conf +!/tests/define-dev-segfault +!/tests/domainschematest +!/tests/int-overflow +!/tests/interfaceschematest +!/tests/libvirtd-fail +!/tests/libvirtd-pool +!/tests/networkschematest +!/tests/nodedevschematest +!/tests/nwfilterschematest +!/tests/qemuhelpdata/kvm-74 +!/tests/qemuhelpdata/kvm-86 +!/tests/read-bufsiz +!/tests/read-non-seekable +!/tests/start +!/tests/storagepoolschematest +!/tests/storagevolschematest +!/tests/undefine +!/tests/vcpupin +!/tests/virsh-all +!/tests/virsh-synopsis +!/tests/virt-aa-helper-test + +# Other files to exclude *#*# *.#*# *.a -- 1.6.6.1

4 3

[libvirt] clang vs. libvirt
by Jim Meyering 14 Apr '10

14 Apr '10

I've been running the clang static analyzer against libvirt regularly, but it's usually been that of F12 or F13. Yesterday I used rawhide's version of clang: scan-build -o clang ./autogen.sh --enable-compile-warnings=error && scan-build -o clang make -j6 and it spotted a few new problems. Most are false positives, but a few were not. Here are the latest additions. I have an additional handful of patches that address the remaining false positives, and will post those later today.

3 13

[libvirt] [PATCH] Implement forgotten backend of virInterfaceIsActive()
by Laine Stump 14 Apr '10

14 Apr '10

Somehow the backend of this function was never implemented in libvirt's netcf driver, and nobody noticed until now. (The required netcf function was already in place, so nothing needs to change there.) --- src/interface/netcf_driver.c | 31 ++++++++++++++++++++++++++++++- 1 files changed, 30 insertions(+), 1 deletions(-) diff --git a/src/interface/netcf_driver.c b/src/interface/netcf_driver.c index 708f1f8..7163066 100644 --- a/src/interface/netcf_driver.c +++ b/src/interface/netcf_driver.c @@ -511,6 +511,35 @@ cleanup: return ret; } +static int interfaceIsActive(virInterfacePtr ifinfo) +{ + struct interface_driver *driver = ifinfo->conn->interfacePrivateData; + struct netcf_if *iface = NULL; + unsigned int flags = 0; + + interfaceDriverLock(driver); + + iface = interfaceDriverGetNetcfIF(driver->netcf, ifinfo); + if (!iface) { + /* helper already reported error */ + goto cleanup; + } + + if (ncf_if_status(iface, &flags) < 0) { + const char *errmsg, *details; + int errcode = ncf_error(driver->netcf, &errmsg, &details); + interfaceReportError(netcf_to_vir_err(errcode), + "failed to get status of interface %s (netcf: %s - %s)", + ifinfo->name, errmsg, details ? details : ""); + goto cleanup; + } + +cleanup: + ncf_if_free(iface); + interfaceDriverUnlock(driver); + return flags & NETCF_IFACE_ACTIVE ? 1 : 0; +} + static virInterfaceDriver interfaceDriver = { "Interface", interfaceOpenInterface, /* open */ @@ -526,7 +555,7 @@ static virInterfaceDriver interfaceDriver = { interfaceUndefine, /* interfaceUndefine */ interfaceCreate, /* interfaceCreate */ interfaceDestroy, /* interfaceDestroy */ - NULL, /* interfaceIsActive */ + interfaceIsActive, /* interfaceIsActive */ }; int interfaceRegister(void) { -- 1.6.6.1

4 4

[libvirt] hellolibvirt: no hypervisor driver available for xen:///
by Ganesh Pagade 14 Apr '10

14 Apr '10

Hi, I downloaded and built the latest libvirt source code 0.8. I installed the library in a custom directory libvirt-0.8.0-install/ keeping all other configurations default. After this I tried to execute the example hellolibvirt: [hellolibvirt]# ./hellolibvirt xen Attempting to connect to hypervisor libvir: Remote error : unable to connect to '/root/ganeshp/libvirt-0.8.0-install/var/run/libvirt/libvirt-sock', libvirtd may need to be started: Connection refused No connection to hypervisor Parameter error when attempting to get last error My libvirtd was running from /etc/init.d/libvirtd. Still why is it trying to connect to the newly built libvirtd? I stopped the /etc/init.d/libvirtd and started my newly built daemon: [hellolibvirt]# /root/ganeshp/libvirt-0.8.0-install/sbin/libvirtd start & 04:47:07.534: warning : qemudStartup:1574 : Unable to create cgroup for driver: No such device or address 04:47:07.540: error : parse_socket:126 : cannot open /sys/devices/system/cpu/cpu1/topology/physical_package_id: No such file or directory 04:47:07.540: warning : qemudCapsInit:1068 : Failed to get host CPU 04:47:07.544: warning : lxcStartup:1835 : Unable to create cgroup for driver: No such device or address After this I tried running hellolibvirt example again: [hellolibvirt]# ./hellolibvirt xen Attempting to connect to hypervisor 04:48:43.166: error : virLibConnError:450 : no hypervisor driver available for xen:/// libvir: error : no hypervisor driver available for xen:/// libvir: error : no hypervisor driver available for xen:/// No connection to hypervisor Parameter error when attempting to get last error I do not understand why the program is not able to find the xen driver. I am able to launch VMM GUI and create VMs using xen connection. The system already has xen hypervisor (3.1.0). Even the newly built virsh gives similar errors. Whereas /usr/bin/virsh works perfectly fine. Am I missing some configuration or dependency? Any pointers/suggestion would greatly help. Thanks. Regards, -Ganesh

2 2

[libvirt] [PATCH] Run test suite as part of RPM build process
by Daniel P. Berrange 14 Apr '10

14 Apr '10

To ensure that patches in the RPM don't break any functionality it is neccessary to run the test suites during build. It currently has 3 tests disabled - daemon-conf: this is totally broken, since it relies on being able to resolve the 'libvirt' group & being able to resolve hostnames at daemon startup. This isn't possible in a mock build root - seclabeltest: fails to initialize selinux in the mock build root. Possibly fixable - nodeinfotest: broken on s390 + ppc - this is a real bug * libvirt.spec.in: Add a %check section, with 3 tests temporarily disabled --- libvirt.spec.in | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 748a1e7..a8b078a 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -618,6 +618,17 @@ chmod 0644 $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/libvirtd %clean rm -fr %{buildroot} +%check +cd tests +# These 3 tests don't current work in a mock build root +for i in nodeinfotest daemon-conf seclabeltest +do + rm -f $i + echo -e "#!/bin/sh\nexit 0" > $i + chmod +x $i +done +make check + %pre %if 0%{?fedora} >= 12 || 0%{?rhel} >= 6 # Normally 'setup' adds this in /etc/passwd, but this is -- 1.6.6.1

2 1

[libvirt] [PATCH] Fix off-by-one check in QEMU memory stats
by Daniel P. Berrange 14 Apr '10

14 Apr '10

The QEMU memory stats JSON monitor command was too cautious in checking array bounds, dropping the last requested stat * src/qemu/qemu_monitor_json.c: Fix off-by-1 check in memory stats --- src/qemu/qemu_monitor_json.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 7c0d372..3c97e9d 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -965,7 +965,7 @@ int qemuMonitorJSONGetMemoryStats(qemuMonitorPtr mon, goto cleanup; } - if (virJSONValueObjectHasKey(data, "mem_swapped_in") && (got < (nr_stats-1))) { + if (virJSONValueObjectHasKey(data, "mem_swapped_in") && (got < nr_stats)) { if (virJSONValueObjectGetNumberUlong(data, "mem_swapped_in", &mem) < 0) { qemuReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("info balloon reply was missing balloon mem_swapped_in")); @@ -976,7 +976,7 @@ int qemuMonitorJSONGetMemoryStats(qemuMonitorPtr mon, stats[got].val = (mem/1024); got++; } - if (virJSONValueObjectHasKey(data, "mem_swapped_out") && (got < (nr_stats-1))) { + if (virJSONValueObjectHasKey(data, "mem_swapped_out") && (got < nr_stats)) { if (virJSONValueObjectGetNumberUlong(data, "mem_swapped_out", &mem) < 0) { qemuReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("info balloon reply was missing balloon mem_swapped_out")); @@ -987,7 +987,7 @@ int qemuMonitorJSONGetMemoryStats(qemuMonitorPtr mon, stats[got].val = (mem/1024); got++; } - if (virJSONValueObjectHasKey(data, "major_page_faults") && (got < (nr_stats-1))) { + if (virJSONValueObjectHasKey(data, "major_page_faults") && (got < nr_stats)) { if (virJSONValueObjectGetNumberUlong(data, "major_page_faults", &mem) < 0) { qemuReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("info balloon reply was missing balloon major_page_faults")); @@ -998,7 +998,7 @@ int qemuMonitorJSONGetMemoryStats(qemuMonitorPtr mon, stats[got].val = mem; got++; } - if (virJSONValueObjectHasKey(data, "minor_page_faults") && (got < (nr_stats-1))) { + if (virJSONValueObjectHasKey(data, "minor_page_faults") && (got < nr_stats)) { if (virJSONValueObjectGetNumberUlong(data, "minor_page_faults", &mem) < 0) { qemuReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("info balloon reply was missing balloon minor_page_faults")); @@ -1009,7 +1009,7 @@ int qemuMonitorJSONGetMemoryStats(qemuMonitorPtr mon, stats[got].val = mem; got++; } - if (virJSONValueObjectHasKey(data, "free_mem") && (got < (nr_stats-1))) { + if (virJSONValueObjectHasKey(data, "free_mem") && (got < nr_stats)) { if (virJSONValueObjectGetNumberUlong(data, "free_mem", &mem) < 0) { qemuReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("info balloon reply was missing balloon free_mem")); @@ -1020,7 +1020,7 @@ int qemuMonitorJSONGetMemoryStats(qemuMonitorPtr mon, stats[got].val = (mem/1024); got++; } - if (virJSONValueObjectHasKey(data, "total_mem") && (got < (nr_stats-1))) { + if (virJSONValueObjectHasKey(data, "total_mem") && (got < nr_stats)) { if (virJSONValueObjectGetNumberUlong(data, "total_mem", &mem) < 0) { qemuReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("info balloon reply was missing balloon total_mem")); -- 1.6.6.1

1 1

[libvirt] php bindings
by David W King 14 Apr '10

14 Apr '10

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 I know this topic has come up multiple times in the past and every time it does people keep commenting on how it would be a good thing to do but they just don't have the time. So my question is, has anyone found the time to work on php bindings for libvirt? - -- David King Goshen College ITS davidwk(a)goshen.edu 574-535-7726 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.9 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org iEYEARECAAYFAku7NWoACgkQH+/Vg7DylXYcEACgmvs0p0YIF3pzu8Cp9xkNk+zZ 2YgAni7YdROnRIrvmpyh1kbb5MH8kT2Y =DSLD -----END PGP SIGNATURE-----

2 1

[libvirt] [PATCH] esx: Extend esx_vi_generator.py to cover methods too
by Matthias Bolte 14 Apr '10

14 Apr '10

Generate almost all SOAP method mapping code. Update the driver code to use the complete paramater list of some methods that had parameters skipped before. Improve the ESX_VI__METHOD marco to do automatic output deserialization based on output occurrence. Also incorporate automatic _this binding and output pointer check. --- src/esx/esx_driver.c | 26 +- src/esx/esx_vi.c | 7 +- src/esx/esx_vi_generator.input | 191 +++++++++- src/esx/esx_vi_generator.py | 489 ++++++++++++++++++------ src/esx/esx_vi_methods.c | 854 ++++++---------------------------------- src/esx/esx_vi_methods.h | 132 +------ 6 files changed, 723 insertions(+), 976 deletions(-) diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c index 4ed9890..e3340c9 100644 --- a/src/esx/esx_driver.c +++ b/src/esx/esx_driver.c @@ -1333,7 +1333,8 @@ esxDomainResume(virDomainPtr domain) goto failure; } - if (esxVI_PowerOnVM_Task(priv->host, virtualMachine->obj, &task) < 0 || + if (esxVI_PowerOnVM_Task(priv->host, virtualMachine->obj, NULL, + &task) < 0 || esxVI_WaitForTaskCompletion(priv->host, task, domain->uuid, priv->autoAnswer, &taskInfoState) < 0) { goto failure; @@ -1710,8 +1711,9 @@ esxDomainGetInfo(virDomainPtr domain, virDomainInfoPtr info) esxVI_PerfCounterInfo *perfCounterInfo = NULL; esxVI_PerfCounterInfo *perfCounterInfoList = NULL; esxVI_PerfQuerySpec *querySpec = NULL; + esxVI_PerfEntityMetricBase *perfEntityMetricBase = NULL; + esxVI_PerfEntityMetricBase *perfEntityMetricBaseList = NULL; esxVI_PerfEntityMetric *perfEntityMetric = NULL; - esxVI_PerfEntityMetric *perfEntityMetricList = NULL; esxVI_PerfMetricIntSeries *perfMetricIntSeries = NULL; esxVI_Long *value = NULL; @@ -1883,17 +1885,26 @@ esxDomainGetInfo(virDomainPtr domain, virDomainInfoPtr info) querySpec->metricId->instance = (char *)""; querySpec->format = (char *)"normal"; - if (esxVI_QueryPerf(priv->host, querySpec, &perfEntityMetricList) < 0) { + if (esxVI_QueryPerf(priv->host, querySpec, + &perfEntityMetricBaseList) < 0) { querySpec->entity = NULL; querySpec->metricId->instance = NULL; querySpec->format = NULL; goto failure; } - for (perfEntityMetric = perfEntityMetricList; perfEntityMetric != NULL; - perfEntityMetric = perfEntityMetric->_next) { + for (perfEntityMetricBase = perfEntityMetricBaseList; + perfEntityMetricBase != NULL; + perfEntityMetricBase = perfEntityMetricBase->_next) { VIR_DEBUG0("perfEntityMetric ..."); + perfEntityMetric = + esxVI_PerfEntityMetric_DynamicCast(perfEntityMetricBase); + + if (perfMetricIntSeries == NULL) { + VIR_ERROR0("QueryPerf returned object with unexpected type"); + } + perfMetricIntSeries = esxVI_PerfMetricIntSeries_DynamicCast(perfEntityMetric->value); @@ -1927,7 +1938,7 @@ esxDomainGetInfo(virDomainPtr domain, virDomainInfoPtr info) esxVI_Int_Free(&counterIdList); esxVI_PerfCounterInfo_Free(&perfCounterInfoList); esxVI_PerfQuerySpec_Free(&querySpec); - esxVI_PerfEntityMetric_Free(&perfEntityMetricList); + esxVI_PerfEntityMetricBase_Free(&perfEntityMetricBaseList); return result; @@ -2367,7 +2378,8 @@ esxDomainCreate(virDomainPtr domain) goto failure; } - if (esxVI_PowerOnVM_Task(priv->host, virtualMachine->obj, &task) < 0 || + if (esxVI_PowerOnVM_Task(priv->host, virtualMachine->obj, NULL, + &task) < 0 || esxVI_WaitForTaskCompletion(priv->host, task, domain->uuid, priv->autoAnswer, &taskInfoState) < 0) { goto failure; diff --git a/src/esx/esx_vi.c b/src/esx/esx_vi.c index 1a71558..4318ff1 100644 --- a/src/esx/esx_vi.c +++ b/src/esx/esx_vi.c @@ -444,7 +444,7 @@ esxVI_Context_Connect(esxVI_Context *ctx, const char *url, goto failure; } - if (esxVI_Login(ctx, username, password, &ctx->session) < 0) { + if (esxVI_Login(ctx, username, password, NULL, &ctx->session) < 0) { goto failure; } @@ -1344,7 +1344,7 @@ esxVI_EnsureSession(esxVI_Context *ctx) if (active != esxVI_Boolean_True) { esxVI_UserSession_Free(&ctx->session); - if (esxVI_Login(ctx, ctx->username, ctx->password, + if (esxVI_Login(ctx, ctx->username, ctx->password, NULL, &ctx->session) < 0) { return -1; } @@ -1378,7 +1378,8 @@ esxVI_EnsureSession(esxVI_Context *ctx) if (currentSession == NULL) { esxVI_UserSession_Free(&ctx->session); - if (esxVI_Login(ctx, ctx->username, ctx->password, &ctx->session) < 0) { + if (esxVI_Login(ctx, ctx->username, ctx->password, NULL, + &ctx->session) < 0) { goto failure; } } else if (STRNEQ(ctx->session->key, currentSession->key)) { diff --git a/src/esx/esx_vi_generator.input b/src/esx/esx_vi_generator.input index 9c545eb..a016c63 100644 --- a/src/esx/esx_vi_generator.input +++ b/src/esx/esx_vi_generator.input @@ -28,7 +28,22 @@ # - ol for an optional list # - i for an ignored item or list # -# Object member sequence has to match the WSDL sequence +# Object member sequence has to match the WSDL sequence. +# +# +# Method definition: +# +# method <name> [returns <type> <occurrence>] +# <type> <name> <occurrence> +# ... +# end +# +# The _this paramater can have a type attached to it: +# +# _this:<type> +# +# The <type> refers to one of the ServiceContent members. This make the +# generator auto-bind _this to the corresponding ServiceContent member. # @@ -436,3 +451,177 @@ object VirtualMachineSnapshotTree Boolean quiesced r VirtualMachineSnapshotTree childSnapshotList ol end + + +# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # +# Methods +# + +method AnswerVM + ManagedObjectReference _this r + String questionId r + String answerChoice r +end + + +method CancelTask + ManagedObjectReference _this r +end + + +method CreateFilter returns ManagedObjectReference r + ManagedObjectReference _this:PropertyCollector r + PropertyFilterSpec spec r + Boolean partialUpdates r +end + + +method CreateSnapshot_Task returns ManagedObjectReference r + ManagedObjectReference _this r + String name r + String description o + Boolean memory r + Boolean quiesce r +end + + +method DestroyPropertyFilter + ManagedObjectReference _this r +end + + +method FindByIp returns ManagedObjectReference o + ManagedObjectReference _this:SearchIndex r + ManagedObjectReference datacenter o + String ip r + Boolean vmSearch r +end + + +method FindByUuid returns ManagedObjectReference o + ManagedObjectReference _this:SearchIndex r + ManagedObjectReference datacenter o + String uuid r + Boolean vmSearch r +end + + +method Login returns UserSession r + ManagedObjectReference _this:SessionManager r + String userName r + String password r + String locale o +end + + +method Logout + ManagedObjectReference _this:SessionManager r +end + + +method MigrateVM_Task returns ManagedObjectReference r + ManagedObjectReference _this r + ManagedObjectReference pool o + ManagedObjectReference host o + VirtualMachineMovePriority priority r + VirtualMachinePowerState state o +end + + +method PowerOffVM_Task returns ManagedObjectReference r + ManagedObjectReference _this r +end + + +method PowerOnVM_Task returns ManagedObjectReference r + ManagedObjectReference _this r + ManagedObjectReference host o +end + + +method QueryAvailablePerfMetric returns PerfMetricId ol + ManagedObjectReference _this:PerformanceManager r + ManagedObjectReference entity r + DateTime beginTime o + DateTime endTime o + Int intervalId o +end + + +method QueryPerf returns PerfEntityMetricBase ol + ManagedObjectReference _this:PerformanceManager r + PerfQuerySpec querySpec rl +end + + +method QueryPerfCounter returns PerfCounterInfo ol + ManagedObjectReference _this:PerformanceManager r + Int counterId rl +end + + +method RebootGuest + ManagedObjectReference _this r +end + + +method ReconfigVM_Task returns ManagedObjectReference r + ManagedObjectReference _this r + VirtualMachineConfigSpec spec r +end + + +method RegisterVM_Task returns ManagedObjectReference r + ManagedObjectReference _this r + String path r + String name o + Boolean asTemplate r + ManagedObjectReference pool o + ManagedObjectReference host o +end + + +method RemoveSnapshot_Task returns ManagedObjectReference r + ManagedObjectReference _this r + Boolean removeChildren r +end + + +method RetrieveProperties returns ObjectContent ol + ManagedObjectReference _this:PropertyCollector r + PropertyFilterSpec specSet rl +end + + +method RevertToSnapshot_Task returns ManagedObjectReference r + ManagedObjectReference _this r + ManagedObjectReference host o +end + + +method SessionIsActive returns Boolean r + ManagedObjectReference _this:SessionManager r + String sessionID r + String userName r +end + + +method ShutdownGuest + ManagedObjectReference _this r +end + + +method SuspendVM_Task returns ManagedObjectReference r + ManagedObjectReference _this r +end + + +method UnregisterVM + ManagedObjectReference _this r +end + + +method WaitForUpdates returns UpdateSet r + ManagedObjectReference _this:PropertyCollector r + String version o +end diff --git a/src/esx/esx_vi_generator.py b/src/esx/esx_vi_generator.py index b933d5b..272b219 100755 --- a/src/esx/esx_vi_generator.py +++ b/src/esx/esx_vi_generator.py @@ -27,34 +27,247 @@ import os.path +OCCURRENCE__REQUIRED_ITEM = "r" +OCCURRENCE__REQUIRED_LIST = "rl" +OCCURRENCE__OPTIONAL_ITEM = "o" +OCCURRENCE__OPTIONAL_LIST = "ol" +OCCURRENCE__IGNORED = "i" +valid_occurrences = [OCCURRENCE__REQUIRED_ITEM, + OCCURRENCE__REQUIRED_LIST, + OCCURRENCE__OPTIONAL_ITEM, + OCCURRENCE__OPTIONAL_LIST, + OCCURRENCE__IGNORED] -class Property: - OCCURRENCE__REQUIRED_ITEM = "r" - OCCURRENCE__REQUIRED_LIST = "rl" - OCCURRENCE__OPTIONAL_ITEM = "o" - OCCURRENCE__OPTIONAL_LIST = "ol" - OCCURRENCE__IGNORED = "i" - - valid_occurrences = [OCCURRENCE__REQUIRED_ITEM, - OCCURRENCE__REQUIRED_LIST, - OCCURRENCE__OPTIONAL_ITEM, - OCCURRENCE__OPTIONAL_LIST, - OCCURRENCE__IGNORED] + + + + + +class Parameter: + autobind_map = { "PerformanceManager" : "perfManager", + "PropertyCollector" : "propertyCollector", + "SearchIndex" : "searchIndex", + "SessionManager" : "sessionManager" } def __init__(self, type, name, occurrence): self.type = type + self.occurrence = occurrence + + if ':' in name and name.startswith("_this"): + self.name, self.autobind_type = name.split(":") + else: + self.name = name + self.autobind_type = None + + + def is_enum(self): + global predefined_enums + global enums_by_name + + return self.type in predefined_enums or self.type in enums_by_name + + + def generate_paramater(self, is_last = False, is_header = True, offset = 0): + if self.occurrence == OCCURRENCE__IGNORED: + raise ValueError("invalid function parameter occurrence value '%s'" % self.occurrence) + elif self.autobind_type is not None: + return "" + else: + string = " " + string += " " * offset + string += "%s%s" % (self.get_type_string(), self.name) + + if is_last: + if is_header: + string += "); " + else: + string += "), " + else: + string += ", " + + while len(string) < 59: + string += " " + + return string + self.get_occurrence_comment() + "\n" + + + def generate_return(self, offset = 0, end_of_line = ";"): + if self.occurrence == OCCURRENCE__IGNORED: + raise ValueError("invalid function parameteroccurrence value '%s'" % self.occurrence) + else: + string = " " + string += " " * offset + string += "%s*%s)%s" % (self.get_type_string(), self.name, end_of_line) + + while len(string) < 59: + string += " " + + return string + self.get_occurrence_comment() + "\n" + + + def generate_require_code(self): + if self.occurrence in [OCCURRENCE__REQUIRED_ITEM, + OCCURRENCE__REQUIRED_LIST]: + return " ESX_VI__METHOD__PARAMETER__REQUIRE(%s)\n" % self.name + else: + return "" + + + def generate_serialize_code(self): + if self.occurrence in [OCCURRENCE__REQUIRED_LIST, + OCCURRENCE__OPTIONAL_LIST]: + return " ESX_VI__METHOD__PARAMETER__SERIALIZE_LIST(%s, %s)\n" % (self.type, self.name) + elif self.type == "String": + return " ESX_VI__METHOD__PARAMETER__SERIALIZE_VALUE(String, %s)\n" % self.name + else: + return " ESX_VI__METHOD__PARAMETER__SERIALIZE(%s, %s)\n" % (self.type, self.name) + + + def get_type_string(self): + if self.type == "String" and \ + self.occurrence not in [OCCURRENCE__REQUIRED_LIST, + OCCURRENCE__OPTIONAL_LIST]: + return "const char *" + elif self.is_enum(): + return "esxVI_%s " % self.type + else: + return "esxVI_%s *" % self.type + + + def get_occurrence_comment(self): + if self.occurrence == OCCURRENCE__REQUIRED_ITEM: + return "/* required */" + elif self.occurrence == OCCURRENCE__REQUIRED_LIST: + return "/* required, list */" + elif self.occurrence == OCCURRENCE__OPTIONAL_ITEM: + return "/* optional */" + elif self.occurrence == OCCURRENCE__OPTIONAL_LIST: + return "/* optional, list */" + + raise ValueError("unknown occurrence value '%s'" % self.occurrence) + + + def get_occurrence_short_enum(self): + if self.occurrence == OCCURRENCE__REQUIRED_ITEM: + return "RequiredItem" + elif self.occurrence == OCCURRENCE__REQUIRED_LIST: + return "RequiredList" + elif self.occurrence == OCCURRENCE__OPTIONAL_ITEM: + return "OptionalItem" + elif self.occurrence == OCCURRENCE__OPTIONAL_LIST: + return "OptionalList" + + raise ValueError("unknown occurrence value '%s'" % self.occurrence) + + + +class Method: + def __init__(self, name, parameters, returns): + self.name = name + self.parameters = [] + self.autobind_parameter = None + self.returns = returns + + for parameter in parameters: + if parameter.autobind_type is None: + self.parameters.append(parameter) + else: + self.autobind_parameter = parameter + + + def generate_header(self): + header = "int esxVI_%s\n" % self.name + header += " (esxVI_Context *ctx" + + if len(self.parameters) > 0 or self.returns is not None: + header += ",\n" + + for parameter in self.parameters[:-1]: + header += parameter.generate_paramater() + + if self.returns is None: + header += self.parameters[-1].generate_paramater(is_last = True) + else: + header += self.parameters[-1].generate_paramater() + header += self.returns.generate_return() + else: + header += ");\n" + + header += "\n" + + return header + + + def generate_source(self): + source = "/* esxVI_%s */\n" % self.name + source += "ESX_VI__METHOD(%s," % self.name + + if self.autobind_parameter is not None: + source += " %s,\n" % Parameter.autobind_map[self.autobind_parameter.autobind_type] + else: + source += " /* explicit _this */,\n" + + source += " (esxVI_Context *ctx" + + if len(self.parameters) > 0 or self.returns is not None: + source += ",\n" + + for parameter in self.parameters[:-1]: + source += parameter.generate_paramater(is_header = False, offset = 9) + + if self.returns is None: + source += self.parameters[-1].generate_paramater(is_last = True, is_header = False, offset = 9) + else: + source += self.parameters[-1].generate_paramater(is_header = False, offset = 9) + source += self.returns.generate_return(offset = 9, end_of_line = ",") + else: + source += "),\n" + + if self.returns is None: + source += " void, None,\n" + else: + source += " %s, %s,\n" % (self.returns.type, self.returns.get_occurrence_short_enum()) + + source += "{\n" + + if self.autobind_parameter is not None: + source += self.autobind_parameter.generate_require_code() + + for parameter in self.parameters: + source += parameter.generate_require_code() + + source += "},\n" + source += "{\n" + + if self.autobind_parameter is not None: + source += self.autobind_parameter.generate_serialize_code() + + for parameter in self.parameters: + source += parameter.generate_serialize_code() + + source += "})\n\n\n\n" + + return source + + + +class Property: + def __init__(self, type, name, occurrence): + self.type = type self.name = name self.occurrence = occurrence + def is_enum(self): global predefined_enums global enums_by_name return self.type in predefined_enums or self.type in enums_by_name + def generate_struct_member(self): - if self.occurrence == Property.OCCURRENCE__IGNORED: + if self.occurrence == OCCURRENCE__IGNORED: return " /* FIXME: %s is currently ignored */\n" % self.name else: string = " %s%s; " % (self.get_type_string(), self.name) @@ -62,36 +275,39 @@ class Property: while len(string) < 59: string += " " - return string + "/* %s */\n" % self.get_occurrence_string() + return string + self.get_occurrence_comment() + "\n" + def generate_free_code(self): if self.type == "String" and \ - self.occurrence not in [Property.OCCURRENCE__REQUIRED_LIST, - Property.OCCURRENCE__OPTIONAL_LIST, - Property.OCCURRENCE__IGNORED]: + self.occurrence not in [OCCURRENCE__REQUIRED_LIST, + OCCURRENCE__OPTIONAL_LIST, + OCCURRENCE__IGNORED]: return " VIR_FREE(item->%s);\n" % self.name elif self.is_enum(): return "" else: - if self.occurrence == Property.OCCURRENCE__IGNORED: + if self.occurrence == OCCURRENCE__IGNORED: return " /* FIXME: %s is currently ignored */\n" % self.name else: return " esxVI_%s_Free(&item->%s);\n" % (self.type, self.name) + def generate_validate_code(self): - if self.occurrence in [Property.OCCURRENCE__REQUIRED_ITEM, - Property.OCCURRENCE__REQUIRED_LIST]: + if self.occurrence in [OCCURRENCE__REQUIRED_ITEM, + OCCURRENCE__REQUIRED_LIST]: return " ESX_VI__TEMPLATE__PROPERTY__REQUIRE(%s)\n" % self.name - elif self.occurrence == Property.OCCURRENCE__IGNORED: + elif self.occurrence == OCCURRENCE__IGNORED: return " /* FIXME: %s is currently ignored */\n" % self.name else: return "" + def generate_deep_copy_code(self): - if self.occurrence == Property.OCCURRENCE__IGNORED: + if self.occurrence == OCCURRENCE__IGNORED: return " /* FIXME: %s is currently ignored */\n" % self.name - elif self.occurrence in [Property.OCCURRENCE__REQUIRED_LIST, - Property.OCCURRENCE__OPTIONAL_LIST]: + elif self.occurrence in [OCCURRENCE__REQUIRED_LIST, + OCCURRENCE__OPTIONAL_LIST]: return " ESX_VI__TEMPLATE__PROPERTY__DEEP_COPY_LIST(%s, %s)\n" % (self.type, self.name) elif self.type == "String": return " ESX_VI__TEMPLATE__PROPERTY__DEEP_COPY_VALUE(String, %s)\n" % self.name @@ -100,54 +316,53 @@ class Property: else: return " ESX_VI__TEMPLATE__PROPERTY__DEEP_COPY(%s, %s)\n" % (self.type, self.name) + def generate_serialize_code(self): - if self.occurrence == Property.OCCURRENCE__IGNORED: + if self.occurrence == OCCURRENCE__IGNORED: return " /* FIXME: %s is currently ignored */\n" % self.name - elif self.occurrence in [Property.OCCURRENCE__REQUIRED_LIST, - Property.OCCURRENCE__OPTIONAL_LIST]: + elif self.occurrence in [OCCURRENCE__REQUIRED_LIST, + OCCURRENCE__OPTIONAL_LIST]: return " ESX_VI__TEMPLATE__PROPERTY__SERIALIZE_LIST(%s, %s)\n" % (self.type, self.name) elif self.type == "String": return " ESX_VI__TEMPLATE__PROPERTY__SERIALIZE_VALUE(String, %s)\n" % self.name else: return " ESX_VI__TEMPLATE__PROPERTY__SERIALIZE(%s, %s)\n" % (self.type, self.name) + def generate_deserialize_code(self): - if self.occurrence == Property.OCCURRENCE__IGNORED: + if self.occurrence == OCCURRENCE__IGNORED: return " ESX_VI__TEMPLATE__PROPERTY__DESERIALIZE_IGNORE(%s) /* FIXME */\n" % self.name - elif self.occurrence in [Property.OCCURRENCE__REQUIRED_LIST, - Property.OCCURRENCE__OPTIONAL_LIST]: + elif self.occurrence in [OCCURRENCE__REQUIRED_LIST, + OCCURRENCE__OPTIONAL_LIST]: return " ESX_VI__TEMPLATE__PROPERTY__DESERIALIZE_LIST(%s, %s)\n" % (self.type, self.name) elif self.type == "String": return " ESX_VI__TEMPLATE__PROPERTY__DESERIALIZE_VALUE(String, %s)\n" % self.name else: return " ESX_VI__TEMPLATE__PROPERTY__DESERIALIZE(%s, %s)\n" % (self.type, self.name) + def get_type_string(self): if self.type == "String" and \ - self.occurrence not in [Property.OCCURRENCE__REQUIRED_LIST, - Property.OCCURRENCE__OPTIONAL_LIST]: + self.occurrence not in [OCCURRENCE__REQUIRED_LIST, + OCCURRENCE__OPTIONAL_LIST]: return "char *" elif self.is_enum(): return "esxVI_%s " % self.type else: return "esxVI_%s *" % self.type - def get_occurrence_string(self): - if self.occurrence == Property.OCCURRENCE__REQUIRED_ITEM: - return "required" - elif self.occurrence == Property.OCCURRENCE__REQUIRED_LIST: - return "required, list" - elif self.occurrence == Property.OCCURRENCE__OPTIONAL_ITEM: - return "optional" - elif self.occurrence == Property.OCCURRENCE__OPTIONAL_LIST: - return "optional, list" - - raise ValueError("unknown cardinality value '%s'" % self.cardinality) - - - + def get_occurrence_comment(self): + if self.occurrence == OCCURRENCE__REQUIRED_ITEM: + return "/* required */" + elif self.occurrence == OCCURRENCE__REQUIRED_LIST: + return "/* required, list */" + elif self.occurrence == OCCURRENCE__OPTIONAL_ITEM: + return "/* optional */" + elif self.occurrence == OCCURRENCE__OPTIONAL_LIST: + return "/* optional, list */" + raise ValueError("unknown occurrence value '%s'" % self.occurrence) @@ -159,6 +374,7 @@ class Object: FEATURE__SERIALIZE = (1 << 5) FEATURE__DESERIALIZE = (1 << 6) + def __init__(self, name, extends, properties, features = 0, extended_by = None): self.name = name self.extends = extends @@ -166,10 +382,6 @@ class Object: self.properties = properties self.extended_by = extended_by - self.properties_by_name = {} - - for property in self.properties: - self.properties_by_name[property.name] = property def generate_struct_members(self, add_banner = False, struct_gap = False): global objects_by_name @@ -201,6 +413,7 @@ class Object: return members + def generate_free_code(self, add_banner = False): global objects_by_name source = "" @@ -226,6 +439,7 @@ class Object: return source + def generate_validate_code(self, add_banner = False): global objects_by_name source = "" @@ -251,6 +465,7 @@ class Object: return source + def generate_dynamic_cast_code(self): global objects_by_name source = "" @@ -266,6 +481,7 @@ class Object: return source + def generate_deep_copy_code(self, add_banner = False): global objects_by_name source = "" @@ -291,6 +507,7 @@ class Object: return source + def generate_serialize_code(self, add_banner = False): global objects_by_name source = "" @@ -309,6 +526,7 @@ class Object: return source + def generate_deserialize_code(self, add_banner = False): global objects_by_name source = "" @@ -327,18 +545,22 @@ class Object: return source + def generate_typedef(self): return "typedef struct _esxVI_%s esxVI_%s;\n" % (self.name, self.name) + def generate_typeenum(self): return " esxVI_Type_%s,\n" % self.name + def generate_typetostring(self): string = " case esxVI_Type_%s:\n" % self.name string += " return \"%s\";\n\n" % self.name return string + def generate_typefromstring(self): string = " else if (STREQ(type, \"%s\")) {\n" % self.name string += " return esxVI_Type_%s;\n" % self.name @@ -346,6 +568,7 @@ class Object: return string + def generate_header(self): header = "/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *\n" header += " * VI Type: %s\n" % self.name @@ -424,6 +647,7 @@ class Object: return header + def generate_source(self): source = "/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *\n" source += " * VI Type: %s\n" % self.name @@ -601,11 +825,6 @@ class Object: - - - - - class Enum: FEATURE__ANY_TYPE = (1 << 1) FEATURE__SERIALIZE = (1 << 2) @@ -617,18 +836,22 @@ class Enum: self.values = values self.features = features | Enum.FEATURE__SERIALIZE | Enum.FEATURE__DESERIALIZE + def generate_typedef(self): return "typedef enum _esxVI_%s esxVI_%s;\n" % (self.name, self.name) + def generate_typeenum(self): return " esxVI_Type_%s,\n" % self.name + def generate_typetostring(self): string = " case esxVI_Type_%s:\n" % self.name string += " return \"%s\";\n\n" % self.name return string + def generate_typefromstring(self): string = " else if (STREQ(type, \"%s\")) {\n" % self.name string += " return esxVI_Type_%s;\n" % self.name @@ -636,6 +859,7 @@ class Enum: return string + def generate_header(self): header = "/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *\n" header += " * VI Enum: %s\n" % self.name @@ -664,6 +888,7 @@ class Enum: return header + def generate_source(self): source = "/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *\n" source += " * VI Enum: %s\n" % self.name @@ -698,20 +923,12 @@ class Enum: - - def report_error(message): print "error: " + message sys.exit(1) -def usage(): - print "%s <input-filename> <output-directory>" % sys.argv[0] - sys.exit(0) - - - def capitalize_first(string): return string[:1].upper() + string[1:] @@ -744,7 +961,7 @@ def parse_object(block): if len(items) != 3: report_error("line %d: invalid property" % line[0]) - if items[2] not in Property.valid_occurrences: + if items[2] not in valid_occurrences: report_error("line %d: invalid occurrence" % line[0]) properties.append(Property(type = items[0], name = items[1], @@ -775,6 +992,44 @@ def parse_enum(block): +def parse_method(block): + # expected format: method <name> [returns <type> <occurrence>] + header_items = block[0][1].split() + + if len(header_items) < 2: + report_error("line %d: invalid block header" % (number)) + + assert header_items[0] == "method" + + name = header_items[1] + returns = None + + if len(header_items) > 2: + if header_items[2] != "returns": + report_error("line %d: invalid block header" % (number)) + else: + returns = Parameter(type = header_items[3], name = "output", + occurrence = header_items[4]) + + parameters = [] + + for line in block[1:]: + # expected format: <type> <name> <occurrence> + items = line[1].split() + + if len(items) != 3: + report_error("line %d: invalid property" % line[0]) + + if items[2] not in valid_occurrences: + report_error("line %d: invalid occurrence" % line[0]) + + parameters.append(Parameter(type = items[0], name = items[1], + occurrence = items[2])) + + return Method(name = name, parameters = parameters, returns = returns) + + + def inherit_features(obj): if obj.extended_by is not None: for extended_by in obj.extended_by: @@ -834,7 +1089,7 @@ additional_object_features = { "Event" : Object.FEATURE__LI "ManagedObjectReference" : Object.FEATURE__ANY_TYPE, "ObjectContent" : Object.FEATURE__DEEP_COPY | Object.FEATURE__LIST, "PerfCounterInfo" : Object.FEATURE__LIST, - "PerfEntityMetric" : Object.FEATURE__LIST, + "PerfEntityMetric" : Object.FEATURE__LIST | Object.FEATURE__DYNAMIC_CAST, "PerfQuerySpec" : Object.FEATURE__LIST, "PerfMetricIntSeries" : Object.FEATURE__DYNAMIC_CAST, "PropertyFilterSpec" : Object.FEATURE__LIST, @@ -859,7 +1114,6 @@ removed_object_features = { "DynamicProperty" : Object.FEATURE__SERIA - if "srcdir" in os.environ: input_filename = os.path.join(os.environ["srcdir"], "esx/esx_vi_generator.input") output_dirname = os.path.join(os.environ["srcdir"], "esx") @@ -869,18 +1123,21 @@ else: -typedef = open_and_print(os.path.join(output_dirname, "esx_vi_types.generated.typedef")) -typeenum = open_and_print(os.path.join(output_dirname, "esx_vi_types.generated.typeenum")) -typetostring = open_and_print(os.path.join(output_dirname, "esx_vi_types.generated.typetostring")) -typefromstring = open_and_print(os.path.join(output_dirname, "esx_vi_types.generated.typefromstring")) -header = open_and_print(os.path.join(output_dirname, "esx_vi_types.generated.h")) -source = open_and_print(os.path.join(output_dirname, "esx_vi_types.generated.c")) +types_typedef = open_and_print(os.path.join(output_dirname, "esx_vi_types.generated.typedef")) +types_typeenum = open_and_print(os.path.join(output_dirname, "esx_vi_types.generated.typeenum")) +types_typetostring = open_and_print(os.path.join(output_dirname, "esx_vi_types.generated.typetostring")) +types_typefromstring = open_and_print(os.path.join(output_dirname, "esx_vi_types.generated.typefromstring")) +types_header = open_and_print(os.path.join(output_dirname, "esx_vi_types.generated.h")) +types_source = open_and_print(os.path.join(output_dirname, "esx_vi_types.generated.c")) +methods_header = open_and_print(os.path.join(output_dirname, "esx_vi_methods.generated.h")) +methods_source = open_and_print(os.path.join(output_dirname, "esx_vi_methods.generated.c")) number = 0 objects_by_name = {} enums_by_name = {} +methods_by_name = {} block = None @@ -896,7 +1153,7 @@ for line in file(input_filename, "rb").readlines(): if len(line) < 1: continue - if line.startswith("object") or line.startswith("enum"): + if line.startswith("object") or line.startswith("enum") or line.startswith("method"): if block is not None: report_error("line %d: nested block found" % (number)) else: @@ -907,9 +1164,12 @@ for line in file(input_filename, "rb").readlines(): if block[0][1].startswith("object"): obj = parse_object(block) objects_by_name[obj.name] = obj - else: + elif block[0][1].startswith("enum"): enum = parse_enum(block) enums_by_name[enum.name] = enum + else: + method = parse_method(block) + methods_by_name[method.name] = method block = None else: @@ -926,7 +1186,7 @@ for enum in enums_by_name.values(): for obj in objects_by_name.values(): for property in obj.properties: - if property.occurrence != Property.OCCURRENCE__IGNORED and \ + if property.occurrence != OCCURRENCE__IGNORED and \ not is_known_type(property.type): report_error("object '%s' contains unknown property type '%s'" % (obj.name, property.type)) @@ -936,8 +1196,8 @@ for obj in objects_by_name.values(): # detect list usage for property in obj.properties: - if (property.occurrence == Property.OCCURRENCE__REQUIRED_LIST or \ - property.occurrence == Property.OCCURRENCE__OPTIONAL_LIST) and \ + if (property.occurrence == OCCURRENCE__REQUIRED_LIST or \ + property.occurrence == OCCURRENCE__OPTIONAL_LIST) and \ property.type not in predefined_objects: objects_by_name[property.type].features |= Object.FEATURE__LIST @@ -951,7 +1211,7 @@ for obj in objects_by_name.values(): # spread deep copy onto properties if obj.features & Object.FEATURE__DEEP_COPY: for property in obj.properties: - if property.occurrence != Property.OCCURRENCE__IGNORED and \ + if property.occurrence != OCCURRENCE__IGNORED and \ property.type not in predefined_objects and \ property.type in objects_by_name: objects_by_name[property.type].features |= Object.FEATURE__DEEP_COPY @@ -976,55 +1236,62 @@ for obj in objects_by_name.values(): -typedef.write("/* Generated by esx_vi_generator.py */\n\n\n\n") -typeenum.write("/* Generated by esx_vi_generator.py */\n\n") -typetostring.write("/* Generated by esx_vi_generator.py */\n\n") -typefromstring.write("/* Generated by esx_vi_generator.py */\n\n") -header.write("/* Generated by esx_vi_generator.py */\n\n\n\n") -source.write("/* Generated by esx_vi_generator.py */\n\n\n\n") - - -typedef.write("/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *\n" + - " * VI Enums\n" + - " */\n\n") +types_typedef.write("/* Generated by esx_vi_generator.py */\n\n\n\n") +types_typeenum.write("/* Generated by esx_vi_generator.py */\n\n") +types_typetostring.write("/* Generated by esx_vi_generator.py */\n\n") +types_typefromstring.write("/* Generated by esx_vi_generator.py */\n\n") +types_header.write("/* Generated by esx_vi_generator.py */\n\n\n\n") +types_source.write("/* Generated by esx_vi_generator.py */\n\n\n\n") +methods_header.write("/* Generated by esx_vi_generator.py */\n\n\n\n") +methods_source.write("/* Generated by esx_vi_generator.py */\n\n\n\n") +# output enums +types_typedef.write("/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *\n" + + " * VI Enums\n" + + " */\n\n") names = enums_by_name.keys() names.sort() - for name in names: - typedef.write(enums_by_name[name].generate_typedef()) - typeenum.write(enums_by_name[name].generate_typeenum()) - typetostring.write(enums_by_name[name].generate_typetostring()) - typefromstring.write(enums_by_name[name].generate_typefromstring()) - header.write(enums_by_name[name].generate_header()) - source.write(enums_by_name[name].generate_source()) + types_typedef.write(enums_by_name[name].generate_typedef()) + types_typeenum.write(enums_by_name[name].generate_typeenum()) + types_typetostring.write(enums_by_name[name].generate_typetostring()) + types_typefromstring.write(enums_by_name[name].generate_typefromstring()) + types_header.write(enums_by_name[name].generate_header()) + types_source.write(enums_by_name[name].generate_source()) -typedef.write("\n\n\n" + - "/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *\n" + - " * VI Types\n" + - " */\n\n") +# output objects +types_typedef.write("\n\n\n" + + "/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *\n" + + " * VI Types\n" + + " */\n\n") +types_typeenum.write("\n") +types_typetostring.write("\n") +types_typefromstring.write("\n") -typeenum.write("\n") -typetostring.write("\n") -typefromstring.write("\n") +names = objects_by_name.keys() +names.sort() +for name in names: + types_typedef.write(objects_by_name[name].generate_typedef()) + types_typeenum.write(objects_by_name[name].generate_typeenum()) + types_typetostring.write(objects_by_name[name].generate_typetostring()) + types_typefromstring.write(objects_by_name[name].generate_typefromstring()) + types_header.write(objects_by_name[name].generate_header()) + types_source.write(objects_by_name[name].generate_source()) -names = objects_by_name.keys() -names.sort() +# output methods +names = methods_by_name.keys() +names.sort() for name in names: - typedef.write(objects_by_name[name].generate_typedef()) - typeenum.write(objects_by_name[name].generate_typeenum()) - typetostring.write(objects_by_name[name].generate_typetostring()) - typefromstring.write(objects_by_name[name].generate_typefromstring()) - header.write(objects_by_name[name].generate_header()) - source.write(objects_by_name[name].generate_source()) + methods_header.write(methods_by_name[name].generate_header()) + methods_source.write(methods_by_name[name].generate_source()) diff --git a/src/esx/esx_vi_methods.c b/src/esx/esx_vi_methods.c index b2b3e8d..5c52167 100644 --- a/src/esx/esx_vi_methods.c +++ b/src/esx/esx_vi_methods.c @@ -51,18 +51,88 @@ -#define ESX_VI__METHOD(_name, _parameters, _occurrence, _prolog, _validate, \ - _serialize, _deserialize) \ +#define ESX_VI__METHOD__CHECK_OUTPUT__None \ + /* nothing */ + + + +#define ESX_VI__METHOD__CHECK_OUTPUT__NotNone \ + if (output == NULL || *output != 0) { \ + ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", _("Invalid argument")); \ + return -1; \ + } + + + +#define ESX_VI__METHOD__CHECK_OUTPUT__RequiredItem \ + ESX_VI__METHOD__CHECK_OUTPUT__NotNone + + + +#define ESX_VI__METHOD__CHECK_OUTPUT__RequiredList \ + ESX_VI__METHOD__CHECK_OUTPUT__NotNone + + + +#define ESX_VI__METHOD__CHECK_OUTPUT__OptionalItem \ + ESX_VI__METHOD__CHECK_OUTPUT__NotNone + + + +#define ESX_VI__METHOD__CHECK_OUTPUT__OptionalList \ + ESX_VI__METHOD__CHECK_OUTPUT__NotNone + + + +#define ESX_VI__METHOD__DESERIALIZE_OUTPUT__None(_type) \ + /* nothing */ + + + +#define ESX_VI__METHOD__DESERIALIZE_OUTPUT__RequiredItem(_type) \ + if (esxVI_##_type##_Deserialize(response->node, output) < 0) { \ + goto failure; \ + } + + + +#define ESX_VI__METHOD__DESERIALIZE_OUTPUT__RequiredList(_type) \ + if (esxVI_##_type##_DeserializeList(response->node, output) < 0) { \ + goto failure; \ + } + + + +#define ESX_VI__METHOD__DESERIALIZE_OUTPUT__OptionalItem(_type) \ + if (response->node != NULL && \ + esxVI_##_type##_Deserialize(response->node, output) < 0) { \ + goto failure; \ + } + + + +#define ESX_VI__METHOD__DESERIALIZE_OUTPUT__OptionalList(_type) \ + if (response->node != NULL && \ + esxVI_##_type##_DeserializeList(response->node, output) < 0) { \ + goto failure; \ + } + + + +#define ESX_VI__METHOD(_name, _this_from_service, _parameters, _output_type, \ + _occurrence, _validate, _serialize) \ int \ esxVI_##_name _parameters \ { \ int result = 0; \ - const char* method_name = #_name; \ + const char *methodName = #_name; \ virBuffer buffer = VIR_BUFFER_INITIALIZER; \ char *request = NULL; \ esxVI_Response *response = NULL; \ \ - _prolog \ + ESX_VI__METHOD__PARAMETER__THIS__##_this_from_service \ + \ + ESX_VI__METHOD__CHECK_OUTPUT__##_occurrence \ \ _validate \ \ @@ -81,14 +151,12 @@ \ request = virBufferContentAndReset(&buffer); \ \ - if (esxVI_Context_Execute(ctx, #_name, request, &response, \ + if (esxVI_Context_Execute(ctx, methodName, request, &response, \ esxVI_Occurrence_##_occurrence) < 0) { \ goto failure; \ } \ \ - if (response->node != NULL) { \ - _deserialize \ - } \ + ESX_VI__METHOD__DESERIALIZE_OUTPUT__##_occurrence(_output_type) \ \ cleanup: \ VIR_FREE(request); \ @@ -106,19 +174,44 @@ -#define ESX_VI__METHOD__CHECK_SERVICE() \ +#define ESX_VI__METHOD__PARAMETER__THIS_FROM_SERVICE(_type, _name) \ + esxVI_##_type *_this = NULL; \ + \ if (ctx->service == NULL) { \ ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", _("Invalid call")); \ return -1; \ - } + } \ + \ + _this = ctx->service->_name; -#define ESX_VI__METHOD__PARAMETER__CHECK_OUTPUT(_name) \ - if (_name == NULL || *_name != NULL) { \ - ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", _("Invalid argument")); \ - return -1; \ - } +#define ESX_VI__METHOD__PARAMETER__THIS__/* explicit _this */ \ + /* nothing */ + + + +#define ESX_VI__METHOD__PARAMETER__THIS__perfManager \ + ESX_VI__METHOD__PARAMETER__THIS_FROM_SERVICE(ManagedObjectReference, \ + perfManager) + + + +#define ESX_VI__METHOD__PARAMETER__THIS__propertyCollector \ + ESX_VI__METHOD__PARAMETER__THIS_FROM_SERVICE(ManagedObjectReference, \ + propertyCollector) + + + +#define ESX_VI__METHOD__PARAMETER__THIS__searchIndex \ + ESX_VI__METHOD__PARAMETER__THIS_FROM_SERVICE(ManagedObjectReference, \ + searchIndex) + + + +#define ESX_VI__METHOD__PARAMETER__THIS__sessionManager \ + ESX_VI__METHOD__PARAMETER__THIS_FROM_SERVICE(ManagedObjectReference, \ + sessionManager) @@ -132,17 +225,7 @@ if (_name == 0) { \ ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, \ "Required parameter '%s' is missing for call to %s", \ - #_name, method_name); \ - return -1; \ - } - - - -#define ESX_VI__METHOD__PARAMETER__REQUIRE_THIS(_name) \ - if (_name == 0) { \ - ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, \ - "Required parameter '_this' is missing for call to %s", \ - method_name); \ + #_name, methodName); \ return -1; \ } @@ -169,13 +252,6 @@ -#define ESX_VI__METHOD__PARAMETER__SERIALIZE_THIS(_type, _name) \ - if (esxVI_##_type##_Serialize(_name, "_this", &buffer) < 0) { \ - goto failure; \ - } - - - /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * VI Methods */ @@ -220,553 +296,16 @@ esxVI_RetrieveServiceContent(esxVI_Context *ctx, -/* esxVI_Login */ -ESX_VI__METHOD(Login, - (esxVI_Context *ctx, - const char *userName, const char *password, - esxVI_UserSession **userSession), - RequiredItem, -{ - ESX_VI__METHOD__CHECK_SERVICE() - ESX_VI__METHOD__PARAMETER__CHECK_OUTPUT(userSession) -}, -{ - ESX_VI__METHOD__PARAMETER__REQUIRE_THIS(ctx->service->sessionManager) - ESX_VI__METHOD__PARAMETER__REQUIRE(userName) - ESX_VI__METHOD__PARAMETER__REQUIRE(password) -}, -{ - ESX_VI__METHOD__PARAMETER__SERIALIZE_THIS(ManagedObjectReference, - ctx->service->sessionManager) - ESX_VI__METHOD__PARAMETER__SERIALIZE_VALUE(String, userName) - ESX_VI__METHOD__PARAMETER__SERIALIZE_VALUE(String, password) -}, -{ - if (esxVI_UserSession_Deserialize(response->node, userSession) < 0) { - goto failure; - } -}) - - - -/* esxVI_Logout */ -ESX_VI__METHOD(Logout, (esxVI_Context *ctx), None, -{ - ESX_VI__METHOD__CHECK_SERVICE() -}, -{ - ESX_VI__METHOD__PARAMETER__REQUIRE_THIS(ctx->service->sessionManager) -}, -{ - ESX_VI__METHOD__PARAMETER__SERIALIZE_THIS(ManagedObjectReference, - ctx->service->sessionManager) -}, -{ -}) - - - -/* esxVI_SessionIsActive */ -ESX_VI__METHOD(SessionIsActive, - (esxVI_Context *ctx, const char *sessionID, - const char *userName, esxVI_Boolean *active), - RequiredItem, -{ - ESX_VI__METHOD__CHECK_SERVICE() - - if (active == NULL) { - ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", _("Invalid argument")); - return -1; - } -}, -{ - ESX_VI__METHOD__PARAMETER__REQUIRE_THIS(ctx->service->sessionManager) - ESX_VI__METHOD__PARAMETER__REQUIRE(sessionID) - ESX_VI__METHOD__PARAMETER__REQUIRE(userName) -}, -{ - ESX_VI__METHOD__PARAMETER__SERIALIZE_THIS(ManagedObjectReference, - ctx->service->sessionManager) - ESX_VI__METHOD__PARAMETER__SERIALIZE_VALUE(String, sessionID) - ESX_VI__METHOD__PARAMETER__SERIALIZE_VALUE(String, userName) -}, -{ - if (esxVI_Boolean_Deserialize(response->node, active) < 0) { - goto failure; - } -}) - - - -/* esxVI_RetrieveProperties */ -ESX_VI__METHOD(RetrieveProperties, - (esxVI_Context *ctx, - esxVI_PropertyFilterSpec *specSet, /* list */ - esxVI_ObjectContent **objectContentList), - OptionalList, -{ - ESX_VI__METHOD__CHECK_SERVICE() - ESX_VI__METHOD__PARAMETER__CHECK_OUTPUT(objectContentList) -}, -{ - ESX_VI__METHOD__PARAMETER__REQUIRE_THIS(ctx->service->propertyCollector) - ESX_VI__METHOD__PARAMETER__REQUIRE(specSet) -}, -{ - ESX_VI__METHOD__PARAMETER__SERIALIZE_THIS(ManagedObjectReference, - ctx->service->propertyCollector) - ESX_VI__METHOD__PARAMETER__SERIALIZE_LIST(PropertyFilterSpec, specSet) -}, -{ - if (esxVI_ObjectContent_DeserializeList(response->node, - objectContentList) < 0) { - goto failure; - } -}) - - - -/* esxVI_PowerOnVM_Task */ -ESX_VI__METHOD(PowerOnVM_Task, - (esxVI_Context *ctx, - esxVI_ManagedObjectReference *virtualMachine, - esxVI_ManagedObjectReference **task), - RequiredItem, -{ - ESX_VI__METHOD__PARAMETER__CHECK_OUTPUT(task) -}, -{ - ESX_VI__METHOD__PARAMETER__REQUIRE_THIS(virtualMachine) -}, -{ - ESX_VI__METHOD__PARAMETER__SERIALIZE_THIS(ManagedObjectReference, - virtualMachine) -}, -{ - if (esxVI_ManagedObjectReference_Deserialize(response->node, task) < 0) { - goto failure; - } -}) - - - -/* esxVI_PowerOffVM_Task */ -ESX_VI__METHOD(PowerOffVM_Task, - (esxVI_Context *ctx, - esxVI_ManagedObjectReference *virtualMachine, - esxVI_ManagedObjectReference **task), - RequiredItem, -{ - ESX_VI__METHOD__PARAMETER__CHECK_OUTPUT(task) -}, -{ - ESX_VI__METHOD__PARAMETER__REQUIRE_THIS(virtualMachine) -}, -{ - ESX_VI__METHOD__PARAMETER__SERIALIZE_THIS(ManagedObjectReference, - virtualMachine) -}, -{ - if (esxVI_ManagedObjectReference_Deserialize(response->node, task) < 0) { - goto failure; - } -}) - - - -/* esxVI_SuspendVM_Task */ -ESX_VI__METHOD(SuspendVM_Task, - (esxVI_Context *ctx, - esxVI_ManagedObjectReference *virtualMachine, - esxVI_ManagedObjectReference **task), - RequiredItem, -{ - ESX_VI__METHOD__PARAMETER__CHECK_OUTPUT(task) -}, -{ - ESX_VI__METHOD__PARAMETER__REQUIRE_THIS(virtualMachine) -}, -{ - ESX_VI__METHOD__PARAMETER__SERIALIZE_THIS(ManagedObjectReference, - virtualMachine) -}, -{ - if (esxVI_ManagedObjectReference_Deserialize(response->node, task) < 0) { - goto failure; - } -}) - - - -/* esxVI_MigrateVM_Task */ -ESX_VI__METHOD(MigrateVM_Task, - (esxVI_Context *ctx, - esxVI_ManagedObjectReference *virtualMachine, - esxVI_ManagedObjectReference *pool, - esxVI_ManagedObjectReference *host, - esxVI_VirtualMachineMovePriority priority, - esxVI_VirtualMachinePowerState state, - esxVI_ManagedObjectReference **task), - RequiredItem, -{ - ESX_VI__METHOD__PARAMETER__CHECK_OUTPUT(task) -}, -{ - ESX_VI__METHOD__PARAMETER__REQUIRE_THIS(virtualMachine) - ESX_VI__METHOD__PARAMETER__REQUIRE(priority) -}, -{ - ESX_VI__METHOD__PARAMETER__SERIALIZE_THIS(ManagedObjectReference, - virtualMachine) - ESX_VI__METHOD__PARAMETER__SERIALIZE(ManagedObjectReference, pool) - ESX_VI__METHOD__PARAMETER__SERIALIZE(ManagedObjectReference, host) - ESX_VI__METHOD__PARAMETER__SERIALIZE(VirtualMachineMovePriority, priority) - ESX_VI__METHOD__PARAMETER__SERIALIZE(VirtualMachinePowerState, state) -}, -{ - if (esxVI_ManagedObjectReference_Deserialize(response->node, task) < 0) { - goto failure; - } -}) - - - -/* esxVI_ReconfigVM_Task */ -ESX_VI__METHOD(ReconfigVM_Task, - (esxVI_Context *ctx, - esxVI_ManagedObjectReference *virtualMachine, - esxVI_VirtualMachineConfigSpec *spec, - esxVI_ManagedObjectReference **task), - RequiredItem, -{ - ESX_VI__METHOD__PARAMETER__CHECK_OUTPUT(task) -}, -{ - ESX_VI__METHOD__PARAMETER__REQUIRE_THIS(virtualMachine) - ESX_VI__METHOD__PARAMETER__REQUIRE(spec) -}, -{ - ESX_VI__METHOD__PARAMETER__SERIALIZE_THIS(ManagedObjectReference, - virtualMachine) - ESX_VI__METHOD__PARAMETER__SERIALIZE(VirtualMachineConfigSpec, spec) -}, -{ - if (esxVI_ManagedObjectReference_Deserialize(response->node, task) < 0) { - goto failure; - } -}) - - - -/* esxVI_RegisterVM_Task */ -ESX_VI__METHOD(RegisterVM_Task, - (esxVI_Context *ctx, - esxVI_ManagedObjectReference *folder, - const char *path, const char *name, - esxVI_Boolean asTemplate, - esxVI_ManagedObjectReference *pool, - esxVI_ManagedObjectReference *host, - esxVI_ManagedObjectReference **task), - RequiredItem, -{ - ESX_VI__METHOD__PARAMETER__CHECK_OUTPUT(task) -}, -{ - ESX_VI__METHOD__PARAMETER__REQUIRE_THIS(folder) - ESX_VI__METHOD__PARAMETER__REQUIRE(path) -}, -{ - ESX_VI__METHOD__PARAMETER__SERIALIZE_THIS(ManagedObjectReference, folder) - ESX_VI__METHOD__PARAMETER__SERIALIZE_VALUE(String, path) - ESX_VI__METHOD__PARAMETER__SERIALIZE_VALUE(String, name) - ESX_VI__METHOD__PARAMETER__SERIALIZE(Boolean, asTemplate) - ESX_VI__METHOD__PARAMETER__SERIALIZE(ManagedObjectReference, pool) - ESX_VI__METHOD__PARAMETER__SERIALIZE(ManagedObjectReference, host) -}, -{ - if (esxVI_ManagedObjectReference_Deserialize(response->node, task) < 0) { - goto failure; - } -}) - - - -/* esxVI_CreateSnapshot_Task */ -ESX_VI__METHOD(CreateSnapshot_Task, - (esxVI_Context *ctx, - esxVI_ManagedObjectReference *virtualMachine, - const char *name, const char *description, - esxVI_Boolean memory, esxVI_Boolean quiesce, - esxVI_ManagedObjectReference **task), - RequiredItem, -{ - ESX_VI__METHOD__PARAMETER__CHECK_OUTPUT(task) -}, -{ - ESX_VI__METHOD__PARAMETER__REQUIRE_THIS(virtualMachine) - ESX_VI__METHOD__PARAMETER__REQUIRE(name) - ESX_VI__METHOD__PARAMETER__REQUIRE(memory) - ESX_VI__METHOD__PARAMETER__REQUIRE(quiesce) -}, -{ - ESX_VI__METHOD__PARAMETER__SERIALIZE_THIS(ManagedObjectReference, - virtualMachine) - ESX_VI__METHOD__PARAMETER__SERIALIZE_VALUE(String, name) - ESX_VI__METHOD__PARAMETER__SERIALIZE_VALUE(String, description) - ESX_VI__METHOD__PARAMETER__SERIALIZE(Boolean, memory) - ESX_VI__METHOD__PARAMETER__SERIALIZE(Boolean, quiesce) -}, -{ - if (esxVI_ManagedObjectReference_Deserialize(response->node, task) < 0) { - goto failure; - } -}) - - - -/* esxVI_RevertToSnapshot_Task */ -ESX_VI__METHOD(RevertToSnapshot_Task, - (esxVI_Context *ctx, - esxVI_ManagedObjectReference *virtualMachineSnapshot, - esxVI_ManagedObjectReference *host, - esxVI_ManagedObjectReference **task), - RequiredItem, -{ - ESX_VI__METHOD__PARAMETER__CHECK_OUTPUT(task) -}, -{ - ESX_VI__METHOD__PARAMETER__REQUIRE_THIS(virtualMachineSnapshot) -}, -{ - ESX_VI__METHOD__PARAMETER__SERIALIZE_THIS(ManagedObjectReference, - virtualMachineSnapshot) - ESX_VI__METHOD__PARAMETER__SERIALIZE(ManagedObjectReference, host) -}, -{ - if (esxVI_ManagedObjectReference_Deserialize(response->node, task) < 0) { - goto failure; - } -}) - - - -/* esxVI_RemoveSnapshot_Task */ -ESX_VI__METHOD(RemoveSnapshot_Task, - (esxVI_Context *ctx, - esxVI_ManagedObjectReference *virtualMachineSnapshot, - esxVI_Boolean removeChildren, - esxVI_ManagedObjectReference **task), - RequiredItem, -{ - ESX_VI__METHOD__PARAMETER__CHECK_OUTPUT(task) -}, -{ - ESX_VI__METHOD__PARAMETER__REQUIRE_THIS(virtualMachineSnapshot) - ESX_VI__METHOD__PARAMETER__REQUIRE(removeChildren) -}, -{ - ESX_VI__METHOD__PARAMETER__SERIALIZE_THIS(ManagedObjectReference, - virtualMachineSnapshot) - ESX_VI__METHOD__PARAMETER__SERIALIZE(Boolean, removeChildren) -}, -{ - if (esxVI_ManagedObjectReference_Deserialize(response->node, task) < 0) { - goto failure; - } -}) - - - -/* esxVI_CancelTask */ -ESX_VI__METHOD(CancelTask, - (esxVI_Context *ctx, - esxVI_ManagedObjectReference *task), - None, -{ -}, -{ - ESX_VI__METHOD__PARAMETER__REQUIRE_THIS(task) -}, -{ - ESX_VI__METHOD__PARAMETER__SERIALIZE_THIS(ManagedObjectReference, task) -}, -{ -}) - - - -/* esxVI_UnregisterVM */ -ESX_VI__METHOD(UnregisterVM, - (esxVI_Context *ctx, - esxVI_ManagedObjectReference *virtualMachine), - None, -{ -}, -{ - ESX_VI__METHOD__PARAMETER__REQUIRE_THIS(virtualMachine) -}, -{ - ESX_VI__METHOD__PARAMETER__SERIALIZE_THIS(ManagedObjectReference, - virtualMachine) -}, -{ -}) - - - -/* esxVI_AnswerVM */ -ESX_VI__METHOD(AnswerVM, - (esxVI_Context *ctx, - esxVI_ManagedObjectReference *virtualMachine, - const char *questionId, - const char *answerChoice), - None, -{ -}, -{ - ESX_VI__METHOD__PARAMETER__REQUIRE_THIS(virtualMachine) - ESX_VI__METHOD__PARAMETER__REQUIRE(questionId) - ESX_VI__METHOD__PARAMETER__REQUIRE(answerChoice) -}, -{ - ESX_VI__METHOD__PARAMETER__SERIALIZE_THIS(ManagedObjectReference, - virtualMachine) - ESX_VI__METHOD__PARAMETER__SERIALIZE_VALUE(String, questionId) - ESX_VI__METHOD__PARAMETER__SERIALIZE_VALUE(String, answerChoice) -}, -{ -}) - - - -/* esxVI_CreateFilter */ -ESX_VI__METHOD(CreateFilter, - (esxVI_Context *ctx, - esxVI_PropertyFilterSpec *spec, - esxVI_Boolean partialUpdates, - esxVI_ManagedObjectReference **propertyFilter), - RequiredItem, -{ - ESX_VI__METHOD__CHECK_SERVICE() - ESX_VI__METHOD__PARAMETER__CHECK_OUTPUT(propertyFilter) -}, -{ - ESX_VI__METHOD__PARAMETER__REQUIRE_THIS(ctx->service->propertyCollector) - ESX_VI__METHOD__PARAMETER__REQUIRE(spec) - ESX_VI__METHOD__PARAMETER__REQUIRE(partialUpdates) -}, -{ - ESX_VI__METHOD__PARAMETER__SERIALIZE_THIS(ManagedObjectReference, - ctx->service->propertyCollector) - ESX_VI__METHOD__PARAMETER__SERIALIZE(PropertyFilterSpec, spec) - ESX_VI__METHOD__PARAMETER__SERIALIZE(Boolean, partialUpdates) -}, -{ - if (esxVI_ManagedObjectReference_Deserialize(response->node, - propertyFilter) < 0) { - goto failure; - } -}) - - - -/* esxVI_DestroyPropertyFilter */ -ESX_VI__METHOD(DestroyPropertyFilter, - (esxVI_Context *ctx, - esxVI_ManagedObjectReference *propertyFilter), - None, -{ -}, -{ - ESX_VI__METHOD__PARAMETER__REQUIRE_THIS(propertyFilter) -}, -{ - ESX_VI__METHOD__PARAMETER__SERIALIZE_THIS(ManagedObjectReference, - propertyFilter) -}, -{ -}) - - - -/* esxVI_WaitForUpdates */ -ESX_VI__METHOD(WaitForUpdates, - (esxVI_Context *ctx, - const char *version, - esxVI_UpdateSet **updateSet), - RequiredItem, -{ - ESX_VI__METHOD__CHECK_SERVICE() - ESX_VI__METHOD__PARAMETER__CHECK_OUTPUT(updateSet) -}, -{ - ESX_VI__METHOD__PARAMETER__REQUIRE_THIS(ctx->service->propertyCollector) - ESX_VI__METHOD__PARAMETER__REQUIRE(version) -}, -{ - ESX_VI__METHOD__PARAMETER__SERIALIZE_THIS(ManagedObjectReference, - ctx->service->propertyCollector) - ESX_VI__METHOD__PARAMETER__SERIALIZE_VALUE(String, version) -}, -{ - if (esxVI_UpdateSet_Deserialize(response->node, updateSet) < 0) { - goto failure; - } -}) - - - -/* esxVI_RebootGuest */ -ESX_VI__METHOD(RebootGuest, - (esxVI_Context *ctx, - esxVI_ManagedObjectReference *virtualMachine), - None, -{ -}, -{ - ESX_VI__METHOD__PARAMETER__REQUIRE_THIS(virtualMachine) -}, -{ - ESX_VI__METHOD__PARAMETER__SERIALIZE_THIS(ManagedObjectReference, - virtualMachine) -}, -{ -}) - - - -/* esxVI_ShutdownGuest */ -ESX_VI__METHOD(ShutdownGuest, - (esxVI_Context *ctx, - esxVI_ManagedObjectReference *virtualMachine), - None, -{ -}, -{ - ESX_VI__METHOD__PARAMETER__REQUIRE_THIS(virtualMachine) -}, -{ - ESX_VI__METHOD__PARAMETER__SERIALIZE_THIS(ManagedObjectReference, - virtualMachine) -}, -{ -}) - - - /* esxVI_ValidateMigration */ -ESX_VI__METHOD(ValidateMigration, +ESX_VI__METHOD(ValidateMigration, /* special _this */, (esxVI_Context *ctx, - esxVI_ManagedObjectReference *vm, /* list */ - esxVI_VirtualMachinePowerState state, - esxVI_String *testType, /* list */ - esxVI_ManagedObjectReference *pool, - esxVI_ManagedObjectReference *host, - esxVI_Event **eventList), - OptionalList, -{ - ESX_VI__METHOD__PARAMETER__CHECK_OUTPUT(eventList) -}, + esxVI_ManagedObjectReference *vm, /* required, list */ + esxVI_VirtualMachinePowerState state, /* optional */ + esxVI_String *testType, /* optional, list */ + esxVI_ManagedObjectReference *pool, /* optional */ + esxVI_ManagedObjectReference *host, /* optional */ + esxVI_Event **output), /* optional, list */ + Event, OptionalList, { ESX_VI__METHOD__PARAMETER__REQUIRE(vm) }, @@ -781,165 +320,8 @@ ESX_VI__METHOD(ValidateMigration, ESX_VI__METHOD__PARAMETER__SERIALIZE_LIST(String, testType) ESX_VI__METHOD__PARAMETER__SERIALIZE(ManagedObjectReference, pool) ESX_VI__METHOD__PARAMETER__SERIALIZE(ManagedObjectReference, host) -}, -{ - if (esxVI_Event_DeserializeList(response->node, eventList) < 0) { - goto failure; - } }) -/* esxVI_FindByIp */ -ESX_VI__METHOD(FindByIp, - (esxVI_Context *ctx, - esxVI_ManagedObjectReference *datacenter, - const char *ip, - esxVI_Boolean vmSearch, - esxVI_ManagedObjectReference **managedObjectReference), - OptionalItem, -{ - ESX_VI__METHOD__CHECK_SERVICE() - ESX_VI__METHOD__PARAMETER__CHECK_OUTPUT(managedObjectReference) -}, -{ - ESX_VI__METHOD__PARAMETER__REQUIRE_THIS(ctx->service->searchIndex) - ESX_VI__METHOD__PARAMETER__REQUIRE(ip) - ESX_VI__METHOD__PARAMETER__REQUIRE(vmSearch) -}, -{ - ESX_VI__METHOD__PARAMETER__SERIALIZE_THIS(ManagedObjectReference, - ctx->service->searchIndex) - ESX_VI__METHOD__PARAMETER__SERIALIZE(ManagedObjectReference, datacenter) - ESX_VI__METHOD__PARAMETER__SERIALIZE_VALUE(String, ip) - ESX_VI__METHOD__PARAMETER__SERIALIZE(Boolean, vmSearch) -}, -{ - if (esxVI_ManagedObjectReference_Deserialize(response->node, - managedObjectReference) < 0) { - goto failure; - } -}) - - - -/* esxVI_FindByUuid */ -ESX_VI__METHOD(FindByUuid, - (esxVI_Context *ctx, - esxVI_ManagedObjectReference *datacenter, - const char *uuid, /* string */ - esxVI_Boolean vmSearch, - esxVI_ManagedObjectReference **managedObjectReference), - OptionalItem, -{ - ESX_VI__METHOD__CHECK_SERVICE() - ESX_VI__METHOD__PARAMETER__CHECK_OUTPUT(managedObjectReference) -}, -{ - ESX_VI__METHOD__PARAMETER__REQUIRE_THIS(ctx->service->searchIndex) - ESX_VI__METHOD__PARAMETER__REQUIRE(uuid) - ESX_VI__METHOD__PARAMETER__REQUIRE(vmSearch) -}, -{ - ESX_VI__METHOD__PARAMETER__SERIALIZE_THIS(ManagedObjectReference, - ctx->service->searchIndex) - ESX_VI__METHOD__PARAMETER__SERIALIZE(ManagedObjectReference, datacenter) - ESX_VI__METHOD__PARAMETER__SERIALIZE_VALUE(String, uuid) - ESX_VI__METHOD__PARAMETER__SERIALIZE(Boolean, vmSearch) -}, -{ - if (esxVI_ManagedObjectReference_Deserialize(response->node, - managedObjectReference) < 0) { - goto failure; - } -}) - - - -/* esxVI_QueryAvailablePerfMetric */ -ESX_VI__METHOD(QueryAvailablePerfMetric, - (esxVI_Context *ctx, - esxVI_ManagedObjectReference *entity, - esxVI_DateTime *beginTime, - esxVI_DateTime *endTime, - esxVI_Int *intervalId, - esxVI_PerfMetricId **perfMetricIdList), - OptionalList, -{ - ESX_VI__METHOD__CHECK_SERVICE() - ESX_VI__METHOD__PARAMETER__CHECK_OUTPUT(perfMetricIdList) -}, -{ - ESX_VI__METHOD__PARAMETER__REQUIRE_THIS(ctx->service->perfManager) - ESX_VI__METHOD__PARAMETER__REQUIRE(entity) -}, -{ - ESX_VI__METHOD__PARAMETER__SERIALIZE_THIS(ManagedObjectReference, - ctx->service->perfManager) - ESX_VI__METHOD__PARAMETER__SERIALIZE(ManagedObjectReference, entity) - ESX_VI__METHOD__PARAMETER__SERIALIZE(DateTime, beginTime) - ESX_VI__METHOD__PARAMETER__SERIALIZE(DateTime, endTime) - ESX_VI__METHOD__PARAMETER__SERIALIZE(Int, intervalId) -}, -{ - if (esxVI_PerfMetricId_DeserializeList(response->node, - perfMetricIdList) < 0) { - goto failure; - } -}) - - - -/* esxVI_QueryPerfCounter */ -ESX_VI__METHOD(QueryPerfCounter, - (esxVI_Context *ctx, - esxVI_Int *counterId, /* list */ - esxVI_PerfCounterInfo **perfCounterInfoList), - OptionalList, -{ - ESX_VI__METHOD__CHECK_SERVICE() - ESX_VI__METHOD__PARAMETER__CHECK_OUTPUT(perfCounterInfoList) -}, -{ - ESX_VI__METHOD__PARAMETER__REQUIRE_THIS(ctx->service->perfManager) - ESX_VI__METHOD__PARAMETER__REQUIRE(counterId) -}, -{ - ESX_VI__METHOD__PARAMETER__SERIALIZE_THIS(ManagedObjectReference, - ctx->service->perfManager) - ESX_VI__METHOD__PARAMETER__SERIALIZE_LIST(Int, counterId) -}, -{ - if (esxVI_PerfCounterInfo_DeserializeList(response->node, - perfCounterInfoList) < 0) { - goto failure; - } -}) - - - -/* esxVI_QueryPerf */ -ESX_VI__METHOD(QueryPerf, - (esxVI_Context *ctx, - esxVI_PerfQuerySpec *querySpec, /* list */ - esxVI_PerfEntityMetric **perfEntityMetricList), - OptionalList, -{ - ESX_VI__METHOD__CHECK_SERVICE() - ESX_VI__METHOD__PARAMETER__CHECK_OUTPUT(perfEntityMetricList) -}, -{ - ESX_VI__METHOD__PARAMETER__REQUIRE_THIS(ctx->service->perfManager) - ESX_VI__METHOD__PARAMETER__REQUIRE(querySpec) -}, -{ - ESX_VI__METHOD__PARAMETER__SERIALIZE_THIS(ManagedObjectReference, - ctx->service->perfManager) - ESX_VI__METHOD__PARAMETER__SERIALIZE_LIST(PerfQuerySpec, querySpec) -}, -{ - if (esxVI_PerfEntityMetric_DeserializeList(response->node, - perfEntityMetricList) < 0) { - goto failure; - } -}) +#include "esx_vi_methods.generated.c" diff --git a/src/esx/esx_vi_methods.h b/src/esx/esx_vi_methods.h index 9ff8b4b..7b6be4e 100644 --- a/src/esx/esx_vi_methods.h +++ b/src/esx/esx_vi_methods.h @@ -32,123 +32,19 @@ * VI Methods */ -int esxVI_RetrieveServiceContent(esxVI_Context *ctx, - esxVI_ServiceContent **serviceContent); - -int esxVI_Login(esxVI_Context *ctx, const char *userName, const char *password, - esxVI_UserSession **userSession); - -int esxVI_Logout(esxVI_Context *ctx); - -int esxVI_SessionIsActive(esxVI_Context *ctx, const char *sessionID, - const char *userName, esxVI_Boolean *active); - -int esxVI_RetrieveProperties(esxVI_Context *ctx, - esxVI_PropertyFilterSpec *specSet, /* list */ - esxVI_ObjectContent **objectContentList); - -int esxVI_PowerOnVM_Task(esxVI_Context *ctx, - esxVI_ManagedObjectReference *virtualMachine, - esxVI_ManagedObjectReference **task); - -int esxVI_PowerOffVM_Task(esxVI_Context *ctx, - esxVI_ManagedObjectReference *virtualMachine, - esxVI_ManagedObjectReference **task); - -int esxVI_SuspendVM_Task(esxVI_Context *ctx, - esxVI_ManagedObjectReference *virtualMachine, - esxVI_ManagedObjectReference **task); - -int esxVI_MigrateVM_Task(esxVI_Context *ctx, - esxVI_ManagedObjectReference *virtualMachine, - esxVI_ManagedObjectReference *pool, - esxVI_ManagedObjectReference *host, - esxVI_VirtualMachineMovePriority priority, - esxVI_VirtualMachinePowerState state, - esxVI_ManagedObjectReference **task); - -int esxVI_ReconfigVM_Task(esxVI_Context *ctx, - esxVI_ManagedObjectReference *virtualMachine, - esxVI_VirtualMachineConfigSpec *spec, - esxVI_ManagedObjectReference **task); - -int esxVI_RegisterVM_Task(esxVI_Context *ctx, - esxVI_ManagedObjectReference *folder, - const char *path, const char *name, - esxVI_Boolean asTemplate, - esxVI_ManagedObjectReference *pool, - esxVI_ManagedObjectReference *host, - esxVI_ManagedObjectReference **task); - -int esxVI_CreateSnapshot_Task(esxVI_Context *ctx, - esxVI_ManagedObjectReference *virtualMachine, - const char *name, const char *description, - esxVI_Boolean memory, esxVI_Boolean quiesce, - esxVI_ManagedObjectReference **task); - -int esxVI_RevertToSnapshot_Task - (esxVI_Context *ctx, esxVI_ManagedObjectReference *virtualMachineSnapshot, - esxVI_ManagedObjectReference *host, esxVI_ManagedObjectReference **task); - -int esxVI_RemoveSnapshot_Task - (esxVI_Context *ctx, esxVI_ManagedObjectReference *virtualMachineSnapshot, - esxVI_Boolean removeChildren, esxVI_ManagedObjectReference **task); - -int esxVI_CancelTask(esxVI_Context *ctx, esxVI_ManagedObjectReference *task); - -int esxVI_UnregisterVM(esxVI_Context *ctx, - esxVI_ManagedObjectReference *virtualMachine); - -int esxVI_AnswerVM(esxVI_Context *ctx, - esxVI_ManagedObjectReference *virtualMachine, - const char *questionId, const char *answerChoice); - -int esxVI_CreateFilter(esxVI_Context *ctx, - esxVI_PropertyFilterSpec *spec, - esxVI_Boolean partialUpdates, - esxVI_ManagedObjectReference **propertyFilter); - -int esxVI_DestroyPropertyFilter(esxVI_Context *ctx, - esxVI_ManagedObjectReference *propertyFilter); - -int esxVI_WaitForUpdates(esxVI_Context *ctx, const char *version, - esxVI_UpdateSet **updateSet); - -int esxVI_RebootGuest(esxVI_Context *ctx, - esxVI_ManagedObjectReference *virtualMachine); - -int esxVI_ShutdownGuest(esxVI_Context *ctx, - esxVI_ManagedObjectReference *virtualMachine); - -int esxVI_ValidateMigration(esxVI_Context *ctx, - esxVI_ManagedObjectReference *vm, /* list */ - esxVI_VirtualMachinePowerState state, - esxVI_String *testType, /* list */ // FIXME: see ValidateMigrationTestType - esxVI_ManagedObjectReference *pool, - esxVI_ManagedObjectReference *host, - esxVI_Event **eventList); - -int esxVI_FindByIp(esxVI_Context *ctx, esxVI_ManagedObjectReference *datacenter, - const char *ip, esxVI_Boolean vmSearch, - esxVI_ManagedObjectReference **managedObjectReference); - -int esxVI_FindByUuid(esxVI_Context *ctx, - esxVI_ManagedObjectReference *datacenter, - const char *uuid, /* string */ - esxVI_Boolean vmSearch, - esxVI_ManagedObjectReference **managedObjectReference); - -int esxVI_QueryAvailablePerfMetric(esxVI_Context *ctx, - esxVI_ManagedObjectReference *entity, - esxVI_DateTime *beginTime, - esxVI_DateTime *endTime, - esxVI_Int *intervalId, - esxVI_PerfMetricId **perfMetricIdList); - -int esxVI_QueryPerfCounter(esxVI_Context *ctx, esxVI_Int *counterId, /* list */ - esxVI_PerfCounterInfo **perfCounterInfoList); - -int esxVI_QueryPerf(esxVI_Context *ctx, esxVI_PerfQuerySpec *querySpecList, - esxVI_PerfEntityMetric **perfEntityMetricList); +int esxVI_RetrieveServiceContent + (esxVI_Context *ctx, + esxVI_ServiceContent **serviceContent); /* required */ + +int esxVI_ValidateMigration + (esxVI_Context *ctx, + esxVI_ManagedObjectReference *vm, /* required, list */ + esxVI_VirtualMachinePowerState state, /* optional */ + esxVI_String *testType, /* optional, list */ + esxVI_ManagedObjectReference *pool, /* optional */ + esxVI_ManagedObjectReference *host, /* optional */ + esxVI_Event **output); /* optional, list */ + +#include "esx_vi_methods.generated.h" #endif /* __ESX_VI_METHODS_H__ */ -- 1.6.3.3

2 2

[libvirt] [PATCH] nwfilter: use virFindFileInPath for needed CLI tools
by Stefan Berger 14 Apr '10

14 Apr '10

I am getting rid of determining the path to necessary CLI tools at compile time. Instead, now the firewall driver has an initialization function that uses virFindFileInPath() to determine the path to necessary CLI tools and a shutdown function to free allocated memory. The rest of the patch mostly deals with availability of the CLI tools and to not call certain code blocks if a tool is not available and that strings now have to be built slightly differently. Signed-off-by: Stefan Berger <stefanb(a)us.ibm.com> --- configure.ac | 12 src/conf/nwfilter_conf.h | 10 src/nwfilter/nwfilter_driver.c | 3 src/nwfilter/nwfilter_ebiptables_driver.c | 454 +++++++++++++++++++----------- src/nwfilter/nwfilter_gentech_driver.c | 25 + src/nwfilter/nwfilter_gentech_driver.h | 2 6 files changed, 337 insertions(+), 169 deletions(-) Index: libvirt-acl/src/conf/nwfilter_conf.h =================================================================== --- libvirt-acl.orig/src/conf/nwfilter_conf.h +++ libvirt-acl/src/conf/nwfilter_conf.h @@ -451,6 +451,9 @@ struct domUpdateCBStruct { }; +typedef int (*virNWFilterTechDrvInit)(void); +typedef void (*virNWFilterTechDrvShutdown)(void); + enum virDomainNetType; typedef int (*virNWFilterRuleCreateInstance)(virConnectPtr conn, @@ -484,9 +487,16 @@ typedef int (*virNWFilterRuleFreeInstanc typedef int (*virNWFilterRuleDisplayInstanceData)(virConnectPtr conn, void *_inst); +enum techDrvFlags { + TECHDRV_FLAG_INITIALIZED = (1 << 0), +}; struct _virNWFilterTechDriver { const char *name; + enum techDrvFlags flags; + + virNWFilterTechDrvInit init; + virNWFilterTechDrvShutdown shutdown; virNWFilterRuleCreateInstance createRuleInstance; virNWFilterRuleApplyNewRules applyNewRules; Index: libvirt-acl/src/nwfilter/nwfilter_ebiptables_driver.c =================================================================== --- libvirt-acl.orig/src/nwfilter/nwfilter_ebiptables_driver.c +++ libvirt-acl/src/nwfilter/nwfilter_ebiptables_driver.c @@ -62,12 +62,13 @@ : "" -#define EBTABLES_CMD EBTABLES_PATH -#define IPTABLES_CMD IPTABLES_PATH -#define IP6TABLES_CMD IP6TABLES_PATH -#define BASH_CMD BASH_PATH -#define GREP_CMD GREP_PATH -#define GAWK_CMD GAWK_PATH +static char *ebtables_cmd_path; +static char *iptables_cmd_path; +static char *ip6tables_cmd_path; +static char *bash_cmd_path; +static char *grep_cmd_path; +static char *gawk_cmd_path; + #define PRINT_ROOT_CHAIN(buf, prefix, ifname) \ snprintf(buf, sizeof(buf), "libvirt-%c-%s", prefix, ifname) @@ -97,6 +98,10 @@ static const char *m_physdev_out_str = " #define MATCH_PHYSDEV_OUT m_physdev_out_str +static int ebiptablesDriverInit(void); +static void ebiptablesDriverShutdown(void); + + static const char *supported_protocols[] = { "ipv4", "ipv6", @@ -367,11 +372,11 @@ static int iptablesLinkIPTablesBaseChain { virBufferVSprintf(buf, "res=$(%s -L %s -n --line-number | " - GREP_CMD " \" %s \")\n" + "%s \" %s \")\n" "if [ $? -ne 0 ]; then\n" " %s -I %s %d -j %s\n" "else\n" - " r=$(echo $res | " GAWK_CMD " '{print $1}')\n" + " r=$(echo $res | %s '{print $1}')\n" " if [ \"${r}\" != \"%d\" ]; then\n" " " CMD_DEF("%s -I %s %d -j %s") CMD_SEPARATOR " " CMD_EXEC @@ -384,9 +389,10 @@ static int iptablesLinkIPTablesBaseChain "fi\n", iptables_cmd, syschain, - udchain, + grep_cmd_path, udchain, iptables_cmd, syschain, pos, udchain, + gawk_cmd_path, pos, @@ -1052,10 +1058,19 @@ _iptablesCreateRuleInstance(int directio char number[20]; virBuffer buf = VIR_BUFFER_INITIALIZER; const char *target; - const char *iptables_cmd = (isIPv6) ? IP6TABLES_CMD : IPTABLES_CMD; + const char *iptables_cmd = (isIPv6) ? ip6tables_cmd_path + : iptables_cmd_path; unsigned int bufUsed; bool srcMacSkipped = false; + if (!iptables_cmd) { + virNWFilterReportError(VIR_ERR_INTERNAL_ERROR, + _("cannot create rule since %s tool is " + "missing."), + isIPv6 ? "ip6tables" : "iptables"); + goto err_exit; + } + PRINT_IPT_ROOT_CHAIN(chain, chainPrefix, ifname); switch (rule->prtclType) { @@ -1518,6 +1533,13 @@ ebtablesCreateRuleInstance(char chainPre char chain[MAX_CHAINNAME_LENGTH]; virBuffer buf = VIR_BUFFER_INITIALIZER; + if (!ebtables_cmd_path) { + virNWFilterReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("cannot create rule since ebtables tool is " + "missing.")); + goto err_exit; + } + if (nwfilter->chainsuffix == VIR_NWFILTER_CHAINSUFFIX_ROOT) PRINT_ROOT_CHAIN(chain, chainPrefix, ifname); else @@ -1529,8 +1551,8 @@ ebtablesCreateRuleInstance(char chainPre case VIR_NWFILTER_RULE_PROTOCOL_MAC: virBufferVSprintf(&buf, - CMD_DEF_PRE EBTABLES_CMD " -t %s -%%c %s %%s", - EBTABLES_DEFAULT_TABLE, chain); + CMD_DEF_PRE "%s -t %s -%%c %s %%s", + ebtables_cmd_path, EBTABLES_DEFAULT_TABLE, chain); if (ebtablesHandleEthHdr(&buf, @@ -1554,8 +1576,8 @@ ebtablesCreateRuleInstance(char chainPre case VIR_NWFILTER_RULE_PROTOCOL_ARP: virBufferVSprintf(&buf, - CMD_DEF_PRE EBTABLES_CMD " -t %s -%%c %s %%s", - EBTABLES_DEFAULT_TABLE, chain); + CMD_DEF_PRE "%s -t %s -%%c %s %%s", + ebtables_cmd_path, EBTABLES_DEFAULT_TABLE, chain); if (ebtablesHandleEthHdr(&buf, vars, @@ -1653,8 +1675,8 @@ ebtablesCreateRuleInstance(char chainPre case VIR_NWFILTER_RULE_PROTOCOL_IP: virBufferVSprintf(&buf, - CMD_DEF_PRE EBTABLES_CMD " -t %s -%%c %s %%s", - EBTABLES_DEFAULT_TABLE, chain); + CMD_DEF_PRE "%s -t %s -%%c %s %%s", + ebtables_cmd_path, EBTABLES_DEFAULT_TABLE, chain); if (ebtablesHandleEthHdr(&buf, vars, @@ -1789,8 +1811,8 @@ ebtablesCreateRuleInstance(char chainPre case VIR_NWFILTER_RULE_PROTOCOL_IPV6: virBufferVSprintf(&buf, - CMD_DEF_PRE EBTABLES_CMD " -t %s -%%c %s %%s", - EBTABLES_DEFAULT_TABLE, chain); + CMD_DEF_PRE "%s -t %s -%%c %s %%s", + ebtables_cmd_path, EBTABLES_DEFAULT_TABLE, chain); if (ebtablesHandleEthHdr(&buf, vars, @@ -1913,8 +1935,8 @@ ebtablesCreateRuleInstance(char chainPre case VIR_NWFILTER_RULE_PROTOCOL_NONE: virBufferVSprintf(&buf, - CMD_DEF_PRE EBTABLES_CMD " -t %s -%%c %s %%s", - EBTABLES_DEFAULT_TABLE, chain); + CMD_DEF_PRE "%s -t %s -%%c %s %%s", + ebtables_cmd_path, EBTABLES_DEFAULT_TABLE, chain); break; default: @@ -2103,16 +2125,26 @@ ebiptablesWriteToTempFile(const char *st char filename[] = "/tmp/virtdXXXXXX"; int len; char *filnam; - const char header[] = "#!" BASH_CMD "\n"; + virBuffer buf = VIR_BUFFER_INITIALIZER; + char *header; size_t written; + virBufferVSprintf(&buf, "#!%s\n", bash_cmd_path); + + if (virBufferError(&buf)) { + virBufferFreeAndReset(&buf); + virReportOOMError(); + return NULL; + } + header = virBufferContentAndReset(&buf); + int fd = mkstemp(filename); if (fd < 0) { virNWFilterReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("cannot create temporary file")); - return NULL; + goto err_exit; } if (fchmod(fd, S_IXUSR| S_IRUSR | S_IWUSR) < 0) { @@ -2146,10 +2178,12 @@ ebiptablesWriteToTempFile(const char *st goto err_exit; } + VIR_FREE(header); close(fd); return filnam; err_exit: + VIR_FREE(header); close(fd); unlink(filename); return NULL; @@ -2227,10 +2261,10 @@ ebtablesCreateTmpRootChain(virBufferPtr PRINT_ROOT_CHAIN(chain, chainPrefix, ifname); virBufferVSprintf(buf, - CMD_DEF(EBTABLES_CMD " -t %s -N %s") CMD_SEPARATOR + CMD_DEF("%s -t %s -N %s") CMD_SEPARATOR CMD_EXEC "%s", - EBTABLES_DEFAULT_TABLE, chain, + ebtables_cmd_path, EBTABLES_DEFAULT_TABLE, chain, CMD_STOPONERR(stopOnError)); return 0; @@ -2250,10 +2284,10 @@ ebtablesLinkTmpRootChain(virBufferPtr bu PRINT_ROOT_CHAIN(chain, chainPrefix, ifname); virBufferVSprintf(buf, - CMD_DEF(EBTABLES_CMD " -t %s -A %s -%c %s -j %s") CMD_SEPARATOR + CMD_DEF("%s -t %s -A %s -%c %s -j %s") CMD_SEPARATOR CMD_EXEC "%s", - EBTABLES_DEFAULT_TABLE, + ebtables_cmd_path, EBTABLES_DEFAULT_TABLE, (incoming) ? EBTABLES_CHAIN_INCOMING : EBTABLES_CHAIN_OUTGOING, iodev, ifname, chain, @@ -2281,10 +2315,10 @@ _ebtablesRemoveRootChain(virBufferPtr bu PRINT_ROOT_CHAIN(chain, chainPrefix, ifname); virBufferVSprintf(buf, - EBTABLES_CMD " -t %s -F %s" CMD_SEPARATOR - EBTABLES_CMD " -t %s -X %s" CMD_SEPARATOR, - EBTABLES_DEFAULT_TABLE, chain, - EBTABLES_DEFAULT_TABLE, chain); + "%s -t %s -F %s" CMD_SEPARATOR + "%s -t %s -X %s" CMD_SEPARATOR, + ebtables_cmd_path, EBTABLES_DEFAULT_TABLE, chain, + ebtables_cmd_path, EBTABLES_DEFAULT_TABLE, chain); return 0; } @@ -2326,8 +2360,8 @@ _ebtablesUnlinkRootChain(virBufferPtr bu PRINT_ROOT_CHAIN(chain, chainPrefix, ifname); virBufferVSprintf(buf, - EBTABLES_CMD " -t %s -D %s -%c %s -j %s" CMD_SEPARATOR, - EBTABLES_DEFAULT_TABLE, + "%s -t %s -D %s -%c %s -j %s" CMD_SEPARATOR, + ebtables_cmd_path, EBTABLES_DEFAULT_TABLE, (incoming) ? EBTABLES_CHAIN_INCOMING : EBTABLES_CHAIN_OUTGOING, iodev, ifname, chain); @@ -2367,20 +2401,19 @@ ebtablesCreateTmpSubChain(virBufferPtr b PRINT_CHAIN(chain, chainPrefix, ifname, protocol); virBufferVSprintf(buf, - CMD_DEF(EBTABLES_CMD " -t %s -N %s") CMD_SEPARATOR + CMD_DEF("%s -t %s -N %s") CMD_SEPARATOR CMD_EXEC "%s" - CMD_DEF(EBTABLES_CMD " -t %s -A %s -p %s -j %s") CMD_SEPARATOR + CMD_DEF("%s -t %s -A %s -p %s -j %s") CMD_SEPARATOR CMD_EXEC "%s", - EBTABLES_DEFAULT_TABLE, chain, + ebtables_cmd_path, EBTABLES_DEFAULT_TABLE, chain, CMD_STOPONERR(stopOnError), - EBTABLES_DEFAULT_TABLE, - rootchain, - protocol, chain, + ebtables_cmd_path, EBTABLES_DEFAULT_TABLE, + rootchain, protocol, chain, CMD_STOPONERR(stopOnError)); @@ -2409,16 +2442,15 @@ _ebtablesRemoveSubChain(virBufferPtr buf PRINT_CHAIN(chain, chainPrefix, ifname, protocol); virBufferVSprintf(buf, - EBTABLES_CMD " -t %s -D %s -p %s -j %s" CMD_SEPARATOR - EBTABLES_CMD " -t %s -F %s" CMD_SEPARATOR - EBTABLES_CMD " -t %s -X %s" CMD_SEPARATOR, - EBTABLES_DEFAULT_TABLE, - rootchain, - protocol, chain, + "%s -t %s -D %s -p %s -j %s" CMD_SEPARATOR + "%s -t %s -F %s" CMD_SEPARATOR + "%s -t %s -X %s" CMD_SEPARATOR, + ebtables_cmd_path, EBTABLES_DEFAULT_TABLE, + rootchain, protocol, chain, - EBTABLES_DEFAULT_TABLE, chain, + ebtables_cmd_path, EBTABLES_DEFAULT_TABLE, chain, - EBTABLES_DEFAULT_TABLE, chain); + ebtables_cmd_path, EBTABLES_DEFAULT_TABLE, chain); return 0; } @@ -2497,10 +2529,8 @@ ebtablesRenameTmpSubChain(virBufferPtr b } virBufferVSprintf(buf, - EBTABLES_CMD " -t %s -E %s %s" CMD_SEPARATOR, - EBTABLES_DEFAULT_TABLE, - tmpchain, - chain); + "%s -t %s -E %s %s" CMD_SEPARATOR, + ebtables_cmd_path, EBTABLES_DEFAULT_TABLE, tmpchain, chain); return 0; } @@ -2568,6 +2598,13 @@ ebtablesApplyBasicRules(const char *ifna char chainPrefix = CHAINPREFIX_HOST_IN_TEMP; char macaddr_str[VIR_MAC_STRING_BUFLEN]; + if (!ebtables_cmd_path) { + virNWFilterReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("cannot create rules since ebtables tool is " + "missing.")); + return 1; + } + virFormatMacAddr(macaddr, macaddr_str); ebtablesUnlinkTmpRootChain(&buf, 1, ifname); @@ -2581,44 +2618,36 @@ ebtablesApplyBasicRules(const char *ifna PRINT_ROOT_CHAIN(chain, chainPrefix, ifname); virBufferVSprintf(&buf, - CMD_DEF(EBTABLES_CMD - " -t %s -A %s -s ! %s -j DROP") CMD_SEPARATOR + CMD_DEF("%s -t %s -A %s -s ! %s -j DROP") CMD_SEPARATOR CMD_EXEC "%s", - EBTABLES_DEFAULT_TABLE, - chain, - macaddr_str, + ebtables_cmd_path, EBTABLES_DEFAULT_TABLE, + chain, macaddr_str, CMD_STOPONERR(1)); virBufferVSprintf(&buf, - CMD_DEF(EBTABLES_CMD - " -t %s -A %s -p IPv4 -j ACCEPT") CMD_SEPARATOR + CMD_DEF("%s -t %s -A %s -p IPv4 -j ACCEPT") CMD_SEPARATOR CMD_EXEC "%s", - EBTABLES_DEFAULT_TABLE, - chain, + ebtables_cmd_path, EBTABLES_DEFAULT_TABLE, chain, CMD_STOPONERR(1)); virBufferVSprintf(&buf, - CMD_DEF(EBTABLES_CMD - " -t %s -A %s -p ARP -j ACCEPT") CMD_SEPARATOR + CMD_DEF("%s -t %s -A %s -p ARP -j ACCEPT") CMD_SEPARATOR CMD_EXEC "%s", - EBTABLES_DEFAULT_TABLE, - chain, + ebtables_cmd_path, EBTABLES_DEFAULT_TABLE, chain, CMD_STOPONERR(1)); virBufferVSprintf(&buf, - CMD_DEF(EBTABLES_CMD - " -t %s -A %s -j DROP") CMD_SEPARATOR + CMD_DEF("%s -t %s -A %s -j DROP") CMD_SEPARATOR CMD_EXEC "%s", - EBTABLES_DEFAULT_TABLE, - chain, + ebtables_cmd_path, EBTABLES_DEFAULT_TABLE, chain, CMD_STOPONERR(1)); ebtablesLinkTmpRootChain(&buf, 1, ifname, 1); @@ -2665,6 +2694,13 @@ ebtablesApplyDHCPOnlyRules(const char *i char macaddr_str[VIR_MAC_STRING_BUFLEN]; char *srcIPParam = NULL; + if (!ebtables_cmd_path) { + virNWFilterReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("cannot create rules since ebtables tool is " + "missing.")); + return 1; + } + if (dhcpserver) { virBufferVSprintf(&buf, " --ip-src %s", dhcpserver); if (virBufferError(&buf)) @@ -2688,8 +2724,7 @@ ebtablesApplyDHCPOnlyRules(const char *i PRINT_ROOT_CHAIN(chain_out, CHAINPREFIX_HOST_OUT_TEMP, ifname); virBufferVSprintf(&buf, - CMD_DEF(EBTABLES_CMD - " -t %s -A %s" + CMD_DEF("%s -t %s -A %s" " -s %s -d Broadcast " " -p ipv4 --ip-protocol udp" " --ip-src 0.0.0.0 --ip-dst 255.255.255.255" @@ -2698,24 +2733,20 @@ ebtablesApplyDHCPOnlyRules(const char *i CMD_EXEC "%s", - EBTABLES_DEFAULT_TABLE, - chain_in, + ebtables_cmd_path, EBTABLES_DEFAULT_TABLE, chain_in, macaddr_str, CMD_STOPONERR(1)); virBufferVSprintf(&buf, - CMD_DEF(EBTABLES_CMD - " -t %s -A %s -j DROP") CMD_SEPARATOR + CMD_DEF("%s -t %s -A %s -j DROP") CMD_SEPARATOR CMD_EXEC "%s", - EBTABLES_DEFAULT_TABLE, - chain_in, + ebtables_cmd_path, EBTABLES_DEFAULT_TABLE, chain_in, CMD_STOPONERR(1)); virBufferVSprintf(&buf, - CMD_DEF(EBTABLES_CMD - " -t %s -A %s" + CMD_DEF("%s -t %s -A %s" " -d %s" " -p ipv4 --ip-protocol udp" " %s" @@ -2724,20 +2755,17 @@ ebtablesApplyDHCPOnlyRules(const char *i CMD_EXEC "%s", - EBTABLES_DEFAULT_TABLE, - chain_out, + ebtables_cmd_path, EBTABLES_DEFAULT_TABLE, chain_out, macaddr_str, srcIPParam != NULL ? srcIPParam : "", CMD_STOPONERR(1)); virBufferVSprintf(&buf, - CMD_DEF(EBTABLES_CMD - " -t %s -A %s -j DROP") CMD_SEPARATOR + CMD_DEF("%s -t %s -A %s -j DROP") CMD_SEPARATOR CMD_EXEC "%s", - EBTABLES_DEFAULT_TABLE, - chain_out, + ebtables_cmd_path, EBTABLES_DEFAULT_TABLE, chain_out, CMD_STOPONERR(1)); ebtablesLinkTmpRootChain(&buf, 1, ifname, 1); @@ -2769,6 +2797,9 @@ ebtablesRemoveBasicRules(const char *ifn virBuffer buf = VIR_BUFFER_INITIALIZER; int cli_status; + if (!ebtables_cmd_path) + return 0; + ebtablesUnlinkTmpRootChain(&buf, 1, ifname); ebtablesUnlinkTmpRootChain(&buf, 0, ifname); ebtablesRemoveTmpSubChains(&buf, ifname); @@ -2800,8 +2831,8 @@ ebiptablesApplyNewRules(virConnectPtr co ebiptablesRuleInstPtr *inst = (ebiptablesRuleInstPtr *)_inst; int chains_in = 0, chains_out = 0; virBuffer buf = VIR_BUFFER_INITIALIZER; - int haveIptables = 0; - int haveIp6tables = 0; + bool haveIptables = false; + bool haveIp6tables = false; if (inst) qsort(inst, nruleInstances, sizeof(inst[0]), @@ -2816,12 +2847,14 @@ ebiptablesApplyNewRules(virConnectPtr co } } - ebtablesUnlinkTmpRootChain(&buf, 1, ifname); - ebtablesUnlinkTmpRootChain(&buf, 0, ifname); - ebtablesRemoveTmpSubChains(&buf, ifname); - ebtablesRemoveTmpRootChain(&buf, 1, ifname); - ebtablesRemoveTmpRootChain(&buf, 0, ifname); - ebiptablesExecCLI(&buf, &cli_status); + if (ebtables_cmd_path) { + ebtablesUnlinkTmpRootChain(&buf, 1, ifname); + ebtablesUnlinkTmpRootChain(&buf, 0, ifname); + ebtablesRemoveTmpSubChains(&buf, ifname); + ebtablesRemoveTmpRootChain(&buf, 1, ifname); + ebtablesRemoveTmpRootChain(&buf, 0, ifname); + ebiptablesExecCLI(&buf, &cli_status); + } if (chains_in != 0) ebtablesCreateTmpRootChain(&buf, 1, ifname, 1); @@ -2855,34 +2888,32 @@ ebiptablesApplyNewRules(virConnectPtr co 'A', -1, 1); break; case RT_IPTABLES: - haveIptables = 1; + haveIptables = true; break; case RT_IP6TABLES: - haveIp6tables = 1; + haveIp6tables = true; break; } if (ebiptablesExecCLI(&buf, &cli_status) || cli_status != 0) goto tear_down_tmpebchains; - // FIXME: establishment of iptables user define table tree goes here - if (haveIptables) { - iptablesUnlinkTmpRootChains(IPTABLES_CMD, &buf, ifname); - iptablesRemoveTmpRootChains(IPTABLES_CMD, &buf, ifname); + iptablesUnlinkTmpRootChains(iptables_cmd_path, &buf, ifname); + iptablesRemoveTmpRootChains(iptables_cmd_path, &buf, ifname); - iptablesCreateBaseChains(IPTABLES_CMD, &buf); + iptablesCreateBaseChains(iptables_cmd_path, &buf); if (ebiptablesExecCLI(&buf, &cli_status) || cli_status != 0) goto tear_down_tmpebchains; - iptablesCreateTmpRootChains(IPTABLES_CMD, &buf, ifname); + iptablesCreateTmpRootChains(iptables_cmd_path, &buf, ifname); if (ebiptablesExecCLI(&buf, &cli_status) || cli_status != 0) goto tear_down_tmpiptchains; - iptablesLinkTmpRootChains(IPTABLES_CMD, &buf, ifname); - iptablesSetupVirtInPost(IPTABLES_CMD, &buf, ifname); + iptablesLinkTmpRootChains(iptables_cmd_path, &buf, ifname); + iptablesSetupVirtInPost(iptables_cmd_path, &buf, ifname); if (ebiptablesExecCLI(&buf, &cli_status) || cli_status != 0) goto tear_down_tmpiptchains; @@ -2898,21 +2929,21 @@ ebiptablesApplyNewRules(virConnectPtr co } if (haveIp6tables) { - iptablesUnlinkTmpRootChains(IP6TABLES_CMD, &buf, ifname); - iptablesRemoveTmpRootChains(IP6TABLES_CMD, &buf, ifname); + iptablesUnlinkTmpRootChains(ip6tables_cmd_path, &buf, ifname); + iptablesRemoveTmpRootChains(ip6tables_cmd_path, &buf, ifname); - iptablesCreateBaseChains(IP6TABLES_CMD, &buf); + iptablesCreateBaseChains(ip6tables_cmd_path, &buf); if (ebiptablesExecCLI(&buf, &cli_status) || cli_status != 0) goto tear_down_tmpiptchains; - iptablesCreateTmpRootChains(IP6TABLES_CMD, &buf, ifname); + iptablesCreateTmpRootChains(ip6tables_cmd_path, &buf, ifname); if (ebiptablesExecCLI(&buf, &cli_status) || cli_status != 0) goto tear_down_tmpip6tchains; - iptablesLinkTmpRootChains(IP6TABLES_CMD, &buf, ifname); - iptablesSetupVirtInPost(IP6TABLES_CMD, &buf, ifname); + iptablesLinkTmpRootChains(ip6tables_cmd_path, &buf, ifname); + iptablesSetupVirtInPost(ip6tables_cmd_path, &buf, ifname); if (ebiptablesExecCLI(&buf, &cli_status) || cli_status != 0) goto tear_down_tmpip6tchains; @@ -2927,9 +2958,6 @@ ebiptablesApplyNewRules(virConnectPtr co goto tear_down_tmpip6tchains; } - - // END IPTABLES stuff - if (chains_in != 0) ebtablesLinkTmpRootChain(&buf, 1, ifname, 1); if (chains_out != 0) @@ -2941,25 +2969,29 @@ ebiptablesApplyNewRules(virConnectPtr co return 0; tear_down_ebsubchains_and_unlink: - ebtablesUnlinkTmpRootChain(&buf, 1, ifname); - ebtablesUnlinkTmpRootChain(&buf, 0, ifname); + if (ebtables_cmd_path) { + ebtablesUnlinkTmpRootChain(&buf, 1, ifname); + ebtablesUnlinkTmpRootChain(&buf, 0, ifname); + } tear_down_tmpip6tchains: if (haveIp6tables) { - iptablesUnlinkTmpRootChains(IP6TABLES_CMD, &buf, ifname); - iptablesRemoveTmpRootChains(IP6TABLES_CMD, &buf, ifname); + iptablesUnlinkTmpRootChains(ip6tables_cmd_path, &buf, ifname); + iptablesRemoveTmpRootChains(ip6tables_cmd_path, &buf, ifname); } tear_down_tmpiptchains: if (haveIptables) { - iptablesUnlinkTmpRootChains(IPTABLES_CMD, &buf, ifname); - iptablesRemoveTmpRootChains(IPTABLES_CMD, &buf, ifname); + iptablesUnlinkTmpRootChains(iptables_cmd_path, &buf, ifname); + iptablesRemoveTmpRootChains(iptables_cmd_path, &buf, ifname); } tear_down_tmpebchains: - ebtablesRemoveTmpSubChains(&buf, ifname); - ebtablesRemoveTmpRootChain(&buf, 1, ifname); - ebtablesRemoveTmpRootChain(&buf, 0, ifname); + if (ebtables_cmd_path) { + ebtablesRemoveTmpSubChains(&buf, ifname); + ebtablesRemoveTmpRootChain(&buf, 1, ifname); + ebtablesRemoveTmpRootChain(&buf, 0, ifname); + } ebiptablesExecCLI(&buf, &cli_status); @@ -2978,18 +3010,24 @@ ebiptablesTearNewRules(virConnectPtr con int cli_status; virBuffer buf = VIR_BUFFER_INITIALIZER; - iptablesUnlinkTmpRootChains(IPTABLES_CMD, &buf, ifname); - iptablesRemoveTmpRootChains(IPTABLES_CMD, &buf, ifname); + if (iptables_cmd_path) { + iptablesUnlinkTmpRootChains(iptables_cmd_path, &buf, ifname); + iptablesRemoveTmpRootChains(iptables_cmd_path, &buf, ifname); + } - iptablesUnlinkTmpRootChains(IP6TABLES_CMD, &buf, ifname); - iptablesRemoveTmpRootChains(IP6TABLES_CMD, &buf, ifname); + if (ip6tables_cmd_path) { + iptablesUnlinkTmpRootChains(ip6tables_cmd_path, &buf, ifname); + iptablesRemoveTmpRootChains(ip6tables_cmd_path, &buf, ifname); + } - ebtablesUnlinkTmpRootChain(&buf, 1, ifname); - ebtablesUnlinkTmpRootChain(&buf, 0, ifname); + if (ebtables_cmd_path) { + ebtablesUnlinkTmpRootChain(&buf, 1, ifname); + ebtablesUnlinkTmpRootChain(&buf, 0, ifname); - ebtablesRemoveTmpSubChains(&buf, ifname); - ebtablesRemoveTmpRootChain(&buf, 1, ifname); - ebtablesRemoveTmpRootChain(&buf, 0, ifname); + ebtablesRemoveTmpSubChains(&buf, ifname); + ebtablesRemoveTmpRootChain(&buf, 1, ifname); + ebtablesRemoveTmpRootChain(&buf, 0, ifname); + } ebiptablesExecCLI(&buf, &cli_status); @@ -3005,31 +3043,37 @@ ebiptablesTearOldRules(virConnectPtr con virBuffer buf = VIR_BUFFER_INITIALIZER; // switch to new iptables user defined chains - iptablesUnlinkRootChains(IPTABLES_CMD, &buf, ifname); - iptablesRemoveRootChains(IPTABLES_CMD, &buf, ifname); + if (iptables_cmd_path) { + iptablesUnlinkRootChains(iptables_cmd_path, &buf, ifname); + iptablesRemoveRootChains(iptables_cmd_path, &buf, ifname); - iptablesRenameTmpRootChains(IPTABLES_CMD, &buf, ifname); - ebiptablesExecCLI(&buf, &cli_status); + iptablesRenameTmpRootChains(iptables_cmd_path, &buf, ifname); + ebiptablesExecCLI(&buf, &cli_status); + } - iptablesUnlinkRootChains(IP6TABLES_CMD, &buf, ifname); - iptablesRemoveRootChains(IP6TABLES_CMD, &buf, ifname); + if (ip6tables_cmd_path) { + iptablesUnlinkRootChains(ip6tables_cmd_path, &buf, ifname); + iptablesRemoveRootChains(ip6tables_cmd_path, &buf, ifname); - iptablesRenameTmpRootChains(IP6TABLES_CMD, &buf, ifname); - ebiptablesExecCLI(&buf, &cli_status); + iptablesRenameTmpRootChains(ip6tables_cmd_path, &buf, ifname); + ebiptablesExecCLI(&buf, &cli_status); + } - ebtablesUnlinkRootChain(&buf, 1, ifname); - ebtablesUnlinkRootChain(&buf, 0, ifname); + if (ebtables_cmd_path) { + ebtablesUnlinkRootChain(&buf, 1, ifname); + ebtablesUnlinkRootChain(&buf, 0, ifname); - ebtablesRemoveSubChains(&buf, ifname); + ebtablesRemoveSubChains(&buf, ifname); - ebtablesRemoveRootChain(&buf, 1, ifname); - ebtablesRemoveRootChain(&buf, 0, ifname); + ebtablesRemoveRootChain(&buf, 1, ifname); + ebtablesRemoveRootChain(&buf, 0, ifname); - ebtablesRenameTmpSubChains(&buf, ifname); - ebtablesRenameTmpRootChain(&buf, 1, ifname); - ebtablesRenameTmpRootChain(&buf, 0, ifname); + ebtablesRenameTmpSubChains(&buf, ifname); + ebtablesRenameTmpRootChain(&buf, 1, ifname); + ebtablesRenameTmpRootChain(&buf, 0, ifname); - ebiptablesExecCLI(&buf, &cli_status); + ebiptablesExecCLI(&buf, &cli_status); + } return 0; } @@ -3095,21 +3139,27 @@ ebiptablesAllTeardown(const char *ifname virBuffer buf = VIR_BUFFER_INITIALIZER; int cli_status; - iptablesUnlinkRootChains(IPTABLES_CMD, &buf, ifname); - iptablesClearVirtInPost (IPTABLES_CMD, &buf, ifname); - iptablesRemoveRootChains(IPTABLES_CMD, &buf, ifname); + if (iptables_cmd_path) { + iptablesUnlinkRootChains(iptables_cmd_path, &buf, ifname); + iptablesClearVirtInPost (iptables_cmd_path, &buf, ifname); + iptablesRemoveRootChains(iptables_cmd_path, &buf, ifname); + } - iptablesUnlinkRootChains(IP6TABLES_CMD, &buf, ifname); - iptablesClearVirtInPost (IP6TABLES_CMD, &buf, ifname); - iptablesRemoveRootChains(IP6TABLES_CMD, &buf, ifname); + if (ip6tables_cmd_path) { + iptablesUnlinkRootChains(ip6tables_cmd_path, &buf, ifname); + iptablesClearVirtInPost (ip6tables_cmd_path, &buf, ifname); + iptablesRemoveRootChains(ip6tables_cmd_path, &buf, ifname); + } - ebtablesUnlinkRootChain(&buf, 1, ifname); - ebtablesUnlinkRootChain(&buf, 0, ifname); + if (ebtables_cmd_path) { + ebtablesUnlinkRootChain(&buf, 1, ifname); + ebtablesUnlinkRootChain(&buf, 0, ifname); - ebtablesRemoveRootChain(&buf, 1, ifname); - ebtablesRemoveRootChain(&buf, 0, ifname); + ebtablesRemoveRootChain(&buf, 1, ifname); + ebtablesRemoveRootChain(&buf, 0, ifname); - ebtablesRemoveSubChains(&buf, ifname); + ebtablesRemoveSubChains(&buf, ifname); + } ebiptablesExecCLI(&buf, &cli_status); @@ -3119,6 +3169,10 @@ ebiptablesAllTeardown(const char *ifname virNWFilterTechDriver ebiptables_driver = { .name = EBIPTABLES_DRIVER_ID, + .flags = 0, + + .init = ebiptablesDriverInit, + .shutdown = ebiptablesDriverShutdown, .createRuleInstance = ebiptablesCreateRuleInstance, .applyNewRules = ebiptablesApplyNewRules, @@ -3129,3 +3183,91 @@ virNWFilterTechDriver ebiptables_driver .freeRuleInstance = ebiptablesFreeRuleInstance, .displayRuleInstance = ebiptablesDisplayRuleInstance, }; + + +static int +ebiptablesDriverInit(void) +{ + virBuffer buf = VIR_BUFFER_INITIALIZER; + int cli_status; + + bash_cmd_path = virFindFileInPath("bash"); + gawk_cmd_path = virFindFileInPath("gawk"); + grep_cmd_path = virFindFileInPath("grep"); + + ebtables_cmd_path = virFindFileInPath("ebtables"); + if (ebtables_cmd_path) { + /* basic probing */ + virBufferVSprintf(&buf, + CMD_DEF("%s -t %s -L") CMD_SEPARATOR + CMD_EXEC + "%s", + ebtables_cmd_path, EBTABLES_DEFAULT_TABLE, + CMD_STOPONERR(1)); + + if (ebiptablesExecCLI(&buf, &cli_status) || cli_status) + VIR_FREE(ebtables_cmd_path); + } + + iptables_cmd_path = virFindFileInPath("iptables"); + if (iptables_cmd_path) { + virBufferVSprintf(&buf, + CMD_DEF("%s -L FORWARD") CMD_SEPARATOR + CMD_EXEC + "%s", + iptables_cmd_path, + CMD_STOPONERR(1)); + + if (ebiptablesExecCLI(&buf, &cli_status) || cli_status) + VIR_FREE(iptables_cmd_path); + } + + ip6tables_cmd_path = virFindFileInPath("ip6tables"); + if (ip6tables_cmd_path) { + virBufferVSprintf(&buf, + CMD_DEF("%s -L FORWARD") CMD_SEPARATOR + CMD_EXEC + "%s", + ip6tables_cmd_path, + CMD_STOPONERR(1)); + + if (ebiptablesExecCLI(&buf, &cli_status) || cli_status) + VIR_FREE(ip6tables_cmd_path); + } + + /* ip(6)tables support needs bash, gawk & grep, ebtables doesn't */ + if ((iptables_cmd_path != NULL || ip6tables_cmd_path != NULL) && + (!grep_cmd_path || !bash_cmd_path || !gawk_cmd_path)) { + virNWFilterReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("essential tools to support ip(6)tables " + "firewalls could not be located")); + VIR_FREE(iptables_cmd_path); + VIR_FREE(ip6tables_cmd_path); + } + + + if (!ebtables_cmd_path && !iptables_cmd_path && !ip6tables_cmd_path) { + virNWFilterReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("firewall tools were not found or " + "cannot be used")); + ebiptablesDriverShutdown(); + return ENOTSUP; + } + + ebiptables_driver.flags = TECHDRV_FLAG_INITIALIZED; + + return 0; +} + + +static void +ebiptablesDriverShutdown() +{ + VIR_FREE(gawk_cmd_path); + VIR_FREE(bash_cmd_path); + VIR_FREE(grep_cmd_path); + VIR_FREE(ebtables_cmd_path); + VIR_FREE(iptables_cmd_path); + VIR_FREE(ip6tables_cmd_path); + ebiptables_driver.flags = 0; +} Index: libvirt-acl/src/nwfilter/nwfilter_gentech_driver.c =================================================================== --- libvirt-acl.orig/src/nwfilter/nwfilter_gentech_driver.c +++ libvirt-acl/src/nwfilter/nwfilter_gentech_driver.c @@ -50,12 +50,35 @@ static virNWFilterTechDriverPtr filter_t }; +void virNWFilterTechDriversInit() { + int i = 0; + while (filter_tech_drivers[i]) { + if (!(filter_tech_drivers[i]->flags & TECHDRV_FLAG_INITIALIZED)) + filter_tech_drivers[i]->init(); + i++; + } +} + + +void virNWFilterTechDriversShutdown() { + int i = 0; + while (filter_tech_drivers[i]) { + if ((filter_tech_drivers[i]->flags & TECHDRV_FLAG_INITIALIZED)) + filter_tech_drivers[i]->shutdown(); + i++; + } +} + + virNWFilterTechDriverPtr virNWFilterTechDriverForName(const char *name) { int i = 0; while (filter_tech_drivers[i]) { - if (STREQ(filter_tech_drivers[i]->name, name)) + if (STREQ(filter_tech_drivers[i]->name, name)) { + if ((filter_tech_drivers[i]->flags & TECHDRV_FLAG_INITIALIZED) == 0) + break; return filter_tech_drivers[i]; + } i++; } return NULL; Index: libvirt-acl/configure.ac =================================================================== --- libvirt-acl.orig/configure.ac +++ libvirt-acl/configure.ac @@ -295,24 +295,12 @@ if test x"$with_rhel5_api" = x"yes"; the AC_DEFINE([WITH_RHEL5_API], [1], [whether building for the RHEL-5 API]) fi -AC_PATH_PROG([BASH_PATH], [bash], /bin/bash, [/bin:$PATH]) -AC_DEFINE_UNQUOTED([BASH_PATH], "$BASH_PATH", [path to bash binary]) - AC_PATH_PROG([IPTABLES_PATH], [iptables], /sbin/iptables, [/usr/sbin:$PATH]) AC_DEFINE_UNQUOTED([IPTABLES_PATH], "$IPTABLES_PATH", [path to iptables binary]) -AC_PATH_PROG([IP6TABLES_PATH], [ip6tables], /sbin/ip6tables, [/usr/sbin:$PATH]) -AC_DEFINE_UNQUOTED([IP6TABLES_PATH], "$IP6TABLES_PATH", [path to ip6tables binary]) - AC_PATH_PROG([EBTABLES_PATH], [ebtables], /sbin/ebtables, [/usr/sbin:$PATH]) AC_DEFINE_UNQUOTED([EBTABLES_PATH], "$EBTABLES_PATH", [path to ebtables binary]) -AC_PATH_PROG([GREP_PATH], [grep], /bin/grep, [/bin:$PATH]) -AC_DEFINE_UNQUOTED([GREP_PATH], "$GREP_PATH", [path to grep binary]) - -AC_PATH_PROG([GAWK_PATH], [gawk], /bin/gawk, [/bin:$PATH]) -AC_DEFINE_UNQUOTED([GAWK_PATH], "$GAWK_PATH", [path to gawk binary]) - if test "$with_openvz" = "yes"; then AC_DEFINE_UNQUOTED([WITH_OPENVZ], 1, [whether OpenVZ driver is enabled]) Index: libvirt-acl/src/nwfilter/nwfilter_driver.c =================================================================== --- libvirt-acl.orig/src/nwfilter/nwfilter_driver.c +++ libvirt-acl/src/nwfilter/nwfilter_driver.c @@ -70,6 +70,8 @@ nwfilterDriverStartup(int privileged) { if (virNWFilterLearnInit() < 0) return -1; + virNWFilterTechDriversInit(); + if (virNWFilterConfLayerInit(virNWFilterDomainFWUpdateCB) < 0) goto conf_init_err; @@ -126,6 +128,7 @@ alloc_err_exit: virNWFilterConfLayerShutdown(); conf_init_err: + virNWFilterTechDriversShutdown(); virNWFilterLearnShutdown(); return -1; Index: libvirt-acl/src/nwfilter/nwfilter_gentech_driver.h =================================================================== --- libvirt-acl.orig/src/nwfilter/nwfilter_gentech_driver.h +++ libvirt-acl/src/nwfilter/nwfilter_gentech_driver.h @@ -28,6 +28,8 @@ virNWFilterTechDriverPtr virNWFilterTech int virNWFilterRuleInstAddData(virNWFilterRuleInstPtr res, void *data); +void virNWFilterTechDriversInit(void); +void virNWFilterTechDriversShutdown(void); enum instCase { INSTANTIATE_ALWAYS,

2 1

[libvirt] [PATCH] Fix build of openvz on RHEL-5.
by Chris Lalancette 13 Apr '10

13 Apr '10

When building libvirt on RHEL-5, I saw this error: cc1: warnings being treated as errors openvz/openvz_conf.c: In function 'openvzGetVPSUUID': openvz/openvz_conf.c:835: warning: 'saveptr' may be used uninitialized in this function make[3]: *** [libvirt_driver_openvz_la-openvz_conf.lo] Error 1 gcc in RHEL-5 gets upset about this usage of strtok_r (even though it is perfectly valid). Just set *saveptr to NULL at the start to quiet it down. Signed-off-by: Chris Lalancette <clalance(a)redhat.com> --- src/openvz/openvz_conf.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/openvz/openvz_conf.c b/src/openvz/openvz_conf.c index 51567d4..8735cc1 100644 --- a/src/openvz/openvz_conf.c +++ b/src/openvz/openvz_conf.c @@ -832,7 +832,7 @@ openvzGetVPSUUID(int vpsid, char *uuidstr, size_t len) { char conf_file[PATH_MAX]; char line[1024]; - char *saveptr; + char *saveptr = NULL; char *uuidbuf; char *iden; int fd, ret; -- 1.6.6.1

2 2

[libvirt] FYI: pushed trivial patches
by Chris Lalancette 13 Apr '10

13 Apr '10

I just pushed these 4 trivial patches: >From 9295dfda8632aeb19f2c7553b35817f01381491a Mon Sep 17 00:00:00 2001 From: Chris Lalancette <clalance(a)redhat.com> Date: Wed, 7 Apr 2010 11:23:11 -0400 Subject: [PATCH] Fix up formatting of remote protocol stuff. Signed-off-by: Chris Lalancette <clalance(a)redhat.com> --- daemon/remote_dispatch_prototypes.h | 66 +++++++++++++++++----------------- src/remote/remote_protocol.x | 1 + 2 files changed, 34 insertions(+), 33 deletions(-) diff --git a/daemon/remote_dispatch_prototypes.h b/daemon/remote_dispatch_prototypes.h index 5ce2873..f6fcff8 100644 --- a/daemon/remote_dispatch_prototypes.h +++ b/daemon/remote_dispatch_prototypes.h @@ -282,6 +282,14 @@ static int remoteDispatchDomainGetVcpus( remote_error *err, remote_domain_get_vcpus_args *args, remote_domain_get_vcpus_ret *ret); +static int remoteDispatchDomainHasCurrentSnapshot( + struct qemud_server *server, + struct qemud_client *client, + virConnectPtr conn, + remote_message_header *hdr, + remote_error *err, + remote_domain_has_current_snapshot_args *args, + remote_domain_has_current_snapshot_ret *ret); static int remoteDispatchDomainHasManagedSaveImage( struct qemud_server *server, struct qemud_client *client, @@ -458,6 +466,14 @@ static int remoteDispatchDomainResume( remote_error *err, remote_domain_resume_args *args, void *ret); +static int remoteDispatchDomainRevertToSnapshot( + struct qemud_server *server, + struct qemud_client *client, + virConnectPtr conn, + remote_message_header *hdr, + remote_error *err, + remote_domain_revert_to_snapshot_args *args, + void *ret); static int remoteDispatchDomainSave( struct qemud_server *server, struct qemud_client *client, @@ -522,22 +538,30 @@ static int remoteDispatchDomainSnapshotCreateXml( remote_error *err, remote_domain_snapshot_create_xml_args *args, remote_domain_snapshot_create_xml_ret *ret); -static int remoteDispatchDomainSnapshotDumpXml( +static int remoteDispatchDomainSnapshotCurrent( struct qemud_server *server, struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, remote_error *err, - remote_domain_snapshot_dump_xml_args *args, - remote_domain_snapshot_dump_xml_ret *ret); -static int remoteDispatchDomainSnapshotNum( + remote_domain_snapshot_current_args *args, + remote_domain_snapshot_current_ret *ret); +static int remoteDispatchDomainSnapshotDelete( struct qemud_server *server, struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, remote_error *err, - remote_domain_snapshot_num_args *args, - remote_domain_snapshot_num_ret *ret); + remote_domain_snapshot_delete_args *args, + void *ret); +static int remoteDispatchDomainSnapshotDumpXml( + struct qemud_server *server, + struct qemud_client *client, + virConnectPtr conn, + remote_message_header *hdr, + remote_error *err, + remote_domain_snapshot_dump_xml_args *args, + remote_domain_snapshot_dump_xml_ret *ret); static int remoteDispatchDomainSnapshotListNames( struct qemud_server *server, struct qemud_client *client, @@ -554,38 +578,14 @@ static int remoteDispatchDomainSnapshotLookupByName( remote_error *err, remote_domain_snapshot_lookup_by_name_args *args, remote_domain_snapshot_lookup_by_name_ret *ret); -static int remoteDispatchDomainHasCurrentSnapshot( - struct qemud_server *server, - struct qemud_client *client, - virConnectPtr conn, - remote_message_header *hdr, - remote_error *err, - remote_domain_has_current_snapshot_args *args, - remote_domain_has_current_snapshot_ret *ret); -static int remoteDispatchDomainSnapshotCurrent( - struct qemud_server *server, - struct qemud_client *client, - virConnectPtr conn, - remote_message_header *hdr, - remote_error *err, - remote_domain_snapshot_current_args *args, - remote_domain_snapshot_current_ret *ret); -static int remoteDispatchDomainRevertToSnapshot( - struct qemud_server *server, - struct qemud_client *client, - virConnectPtr conn, - remote_message_header *hdr, - remote_error *err, - remote_domain_revert_to_snapshot_args *args, - void *ret); -static int remoteDispatchDomainSnapshotDelete( +static int remoteDispatchDomainSnapshotNum( struct qemud_server *server, struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, remote_error *err, - remote_domain_snapshot_delete_args *args, - void *ret); + remote_domain_snapshot_num_args *args, + remote_domain_snapshot_num_ret *ret); static int remoteDispatchDomainSuspend( struct qemud_server *server, struct qemud_client *client, diff --git a/src/remote/remote_protocol.x b/src/remote/remote_protocol.x index 61b4bc1..9aa3a7e 100644 --- a/src/remote/remote_protocol.x +++ b/src/remote/remote_protocol.x @@ -1967,6 +1967,7 @@ enum remote_procedure { REMOTE_PROC_DOMAIN_SNAPSHOT_LIST_NAMES = 188, REMOTE_PROC_DOMAIN_SNAPSHOT_LOOKUP_BY_NAME = 189, REMOTE_PROC_DOMAIN_HAS_CURRENT_SNAPSHOT = 190, + REMOTE_PROC_DOMAIN_SNAPSHOT_CURRENT = 191, REMOTE_PROC_DOMAIN_REVERT_TO_SNAPSHOT = 192, REMOTE_PROC_DOMAIN_SNAPSHOT_DELETE = 193 -- 1.6.6.1 >From 1aad611e3a88940e275e795c0963ac26d7dcf350 Mon Sep 17 00:00:00 2001 From: Chris Lalancette <clalance(a)redhat.com> Date: Thu, 8 Apr 2010 08:19:35 -0400 Subject: [PATCH] Fix messsage -> message. Signed-off-by: Chris Lalancette <clalance(a)redhat.com> --- daemon/dispatch.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/daemon/dispatch.c b/daemon/dispatch.c index f024900..e24acc1 100644 --- a/daemon/dispatch.c +++ b/daemon/dispatch.c @@ -348,7 +348,7 @@ remoteDispatchClientCall (struct qemud_server *server, * @msg: the complete incoming message packet, with header already decoded * * This function gets called from qemud when it pulls a incoming - * remote protocol messsage off the dispatch queue for processing. + * remote protocol message off the dispatch queue for processing. * * The @msg parameter must have had its header decoded already by * calling remoteDecodeClientMessageHeader -- 1.6.6.1 >From a94484ad7b7dbd4a16f12ae86053b876a253c337 Mon Sep 17 00:00:00 2001 From: Chris Lalancette <clalance(a)redhat.com> Date: Thu, 8 Apr 2010 08:47:02 -0400 Subject: [PATCH] Fix up a debug typo. Signed-off-by: Chris Lalancette <clalance(a)redhat.com> --- daemon/dispatch.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/daemon/dispatch.c b/daemon/dispatch.c index e24acc1..8f55eaa 100644 --- a/daemon/dispatch.c +++ b/daemon/dispatch.c @@ -363,7 +363,7 @@ remoteDispatchClientRequest (struct qemud_server *server, int ret; remote_error rerr; - DEBUG("prog=%d ver=%d type=%d satus=%d serial=%d proc=%d", + DEBUG("prog=%d ver=%d type=%d status=%d serial=%d proc=%d", msg->hdr.prog, msg->hdr.vers, msg->hdr.type, msg->hdr.status, msg->hdr.serial, msg->hdr.proc); -- 1.6.6.1 >From 33857dfdeee444a7f5c7d856ebe5e64fb22610cd Mon Sep 17 00:00:00 2001 From: Chris Lalancette <clalance(a)redhat.com> Date: Thu, 8 Apr 2010 10:29:46 -0400 Subject: [PATCH] Remove some debugging leftovers. Signed-off-by: Chris Lalancette <clalance(a)redhat.com> --- src/remote/remote_driver.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index 98cc7f9..eec3322 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -7421,15 +7421,12 @@ remoteDomainReadEventGraphics(virConnectPtr conn, XDR *xdr) !(remoteAddr->node = strdup(msg.remote.node))) goto no_memory; - fprintf(stderr, "Got %d\n", msg.subject.subject_len); if (VIR_ALLOC(subject) < 0) goto no_memory; if (VIR_ALLOC_N(subject->identities, msg.subject.subject_len) < 0) goto no_memory; subject->nidentity = msg.subject.subject_len; for (i = 0 ; i < subject->nidentity ; i++) { - fprintf(stderr, " %s=%s\n", msg.subject.subject_val[i].type, - msg.subject.subject_val[i].name); if (!(subject->identities[i].type = strdup(msg.subject.subject_val[i].type)) || !(subject->identities[i].name = strdup(msg.subject.subject_val[i].name))) goto no_memory; -- 1.6.6.1

1 0

[libvirt] small bug in spec file (0.8.0)
by Daniel Berteaud 13 Apr '10

13 Apr '10

Hi. I've downloaded libvirt 0.8.0, and tried to re-build a rpm (on CentOS 5.4 x86_64), and found that there's a small bug in the spec file. Line 608: rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/libvirtd.qemu Should be: rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/libvirtd.lxc Without this modification, the package fails to build when LXC is disabled or not abailable. (Sorry, I really don't know GIT, and so, cannot provide a clean patch) Regards, Daniel -- Daniel Berteaud FIREWALL-SERVICES SARL. Société de Services en Logiciels Libres Technopôle Montesquieu 33650 MARTILLAC Tel : 05 56 64 15 32 Fax : 05 56 64 15 32 Mail: daniel(a)firewall-services.com Web : http://www.firewall-services.com

3 3

[libvirt] [PATCH v2] Consolidate interface related functions in interface.c
by Stefan Berger 13 Apr '10

13 Apr '10

Changes from v1 to v2: - changed function name prefixes to 'iface' from previous 'Iface' I am consolidating network interface related functions used in nwfilter and macvtap code in utils/interface.c. All function names are prefixed with 'Iface'. The following functions are now available through interface.h: int ifaceCtrl(const char *name, bool up); int ifaceUp(const char *name); int ifaceDown(const char *name); int ifaceCheck(bool reportError, const char *ifname, const unsigned char *macaddr, int ifindex); int ifaceGetIndex(bool reportError, const char *ifname, int *ifindex); I added 'int ifindex' as parameter to ifaceCheck to the original function and modified the code accordingly. Signed-off-by: Stefan Berger <stefanb(a)us.ibm.com> --- src/Makefile.am | 1 src/libvirt_private.syms | 4 src/nwfilter/nwfilter_gentech_driver.c | 120 ----------------- src/nwfilter/nwfilter_gentech_driver.h | 2 src/nwfilter/nwfilter_learnipaddr.c | 3 src/util/interface.c | 224 +++++++++++++++++++++++++++++++++ src/util/interface.h | 31 ++++ src/util/macvtap.c | 112 ---------------- 8 files changed, 269 insertions(+), 228 deletions(-) Index: libvirt-acl/src/nwfilter/nwfilter_gentech_driver.c =================================================================== --- libvirt-acl.orig/src/nwfilter/nwfilter_gentech_driver.c +++ libvirt-acl/src/nwfilter/nwfilter_gentech_driver.c @@ -23,16 +23,11 @@ #include <config.h> -#include <stdint.h> -#include <sys/socket.h> -#include <sys/ioctl.h> -#include <linux/if.h> - #include "internal.h" #include "memory.h" #include "logging.h" -#include "datatypes.h" +#include "interface.h" #include "domain_conf.h" #include "virterror_internal.h" #include "nwfilter_gentech_driver.h" @@ -792,117 +787,6 @@ _virNWFilterInstantiateFilter(virConnect } -// FIXME: move chgIfFlags, ifUp, checkIf into common file & share w/ macvtap.c - -/* - * chgIfFlags: Change flags on an interface - * @ifname : name of the interface - * @flagclear : the flags to clear - * @flagset : the flags to set - * - * The new flags of the interface will be calculated as - * flagmask = (~0 ^ flagclear) - * newflags = (curflags & flagmask) | flagset; - * - * Returns 0 on success, errno on failure. - */ -static int chgIfFlags(const char *ifname, short flagclear, short flagset) { - struct ifreq ifr; - int rc = 0; - int flags; - short flagmask = (~0 ^ flagclear); - int fd = socket(PF_PACKET, SOCK_DGRAM, 0); - - if (fd < 0) - return errno; - - if (virStrncpy(ifr.ifr_name, - ifname, strlen(ifname), sizeof(ifr.ifr_name)) == NULL) { - rc = ENODEV; - goto err_exit; - } - - if (ioctl(fd, SIOCGIFFLAGS, &ifr) < 0) { - rc = errno; - goto err_exit; - } - - flags = (ifr.ifr_flags & flagmask) | flagset; - - if (ifr.ifr_flags != flags) { - ifr.ifr_flags = flags; - - if (ioctl(fd, SIOCSIFFLAGS, &ifr) < 0) - rc = errno; - } - -err_exit: - close(fd); - return rc; -} - -/* - * ifUp - * @name: name of the interface - * @up: 1 for up, 0 for down - * - * Function to control if an interface is activated (up, 1) or not (down, 0) - * - * Returns 0 in case of success or an errno code in case of failure. - */ -static int -ifUp(const char *name, int up) -{ - return chgIfFlags(name, - (up) ? 0 : IFF_UP, - (up) ? IFF_UP : 0); -} - - -/** - * checkIf - * - * @ifname: Name of the interface - * @macaddr: expected MAC address of the interface - * - * FIXME: the interface's index is another good parameter to check - * - * Determine whether a given interface is still available. If so, - * it must have the given MAC address. - * - * Returns an error code ENODEV in case the interface does not exist - * anymore or its MAC address is different, 0 otherwise. - */ -int -checkIf(const char *ifname, const unsigned char *macaddr) -{ - struct ifreq ifr; - int fd = socket(PF_PACKET, SOCK_DGRAM, 0); - int rc = 0; - - if (fd < 0) - return errno; - - if (virStrncpy(ifr.ifr_name, - ifname, strlen(ifname), sizeof(ifr.ifr_name)) == NULL) { - rc = ENODEV; - goto err_exit; - } - - if (ioctl(fd, SIOCGIFHWADDR, &ifr) < 0) { - rc = errno; - goto err_exit; - } - - if (memcmp(&ifr.ifr_hwaddr.sa_data, macaddr, 6) != 0) - rc = ENODEV; - - err_exit: - close(fd); - return rc; -} - - int virNWFilterInstantiateFilterLate(virConnectPtr conn, const char *ifname, @@ -926,7 +810,7 @@ virNWFilterInstantiateFilterLate(virConn driver); if (rc) { //something went wrong... 'DOWN' the interface - if (ifUp(ifname ,0)) { + if (ifaceDown(ifname)) { // assuming interface disappeared... _virNWFilterTeardownFilter(ifname); } Index: libvirt-acl/src/util/interface.c =================================================================== --- /dev/null +++ libvirt-acl/src/util/interface.c @@ -0,0 +1,226 @@ +/* + * interface.c: interface support functions + * + * Copyright (C) 2010 IBM Corp. + * Copyright (C) 2010 Stefan Berger + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * chgIfaceFlags originated from bridge.c + * + * Author: Stefan Berger <stefanb(a)us.ibm.com> + */ + +#include <config.h> + +#include <sys/socket.h> +#include <sys/ioctl.h> +#include <linux/if.h> + +#include "internal.h" + +#include "util.h" +#include "interface.h" +#include "virterror_internal.h" + +#define ifaceError(code, ...) \ + virReportErrorHelper(NULL, VIR_FROM_NET, code, __FILE__, \ + __FUNCTION__, __LINE__, __VA_ARGS__) + +/* + * chgIfFlags: Change flags on an interface + * + * @ifname : name of the interface + * @flagclear : the flags to clear + * @flagset : the flags to set + * + * The new flags of the interface will be calculated as + * flagmask = (~0 ^ flagclear) + * newflags = (curflags & flagmask) | flagset; + * + * Returns 0 on success, errno on failure. + */ +static int chgIfaceFlags(const char *ifname, short flagclear, short flagset) { + struct ifreq ifr; + int rc = 0; + int flags; + short flagmask = (~0 ^ flagclear); + int fd = socket(PF_PACKET, SOCK_DGRAM, 0); + + if (fd < 0) + return errno; + + if (virStrncpy(ifr.ifr_name, + ifname, strlen(ifname), sizeof(ifr.ifr_name)) == NULL) { + rc = ENODEV; + goto err_exit; + } + + if (ioctl(fd, SIOCGIFFLAGS, &ifr) < 0) { + rc = errno; + goto err_exit; + } + + flags = (ifr.ifr_flags & flagmask) | flagset; + + if (ifr.ifr_flags != flags) { + ifr.ifr_flags = flags; + + if (ioctl(fd, SIOCSIFFLAGS, &ifr) < 0) + rc = errno; + } + +err_exit: + close(fd); + return rc; +} + + +/* + * ifaceCtrl + * @name: name of the interface + * @up: true (1) for up, false (0) for down + * + * Function to control if an interface is activated (up, 1) or not (down, 0) + * + * Returns 0 in case of success or an errno code in case of failure. + */ +int +ifaceCtrl(const char *name, bool up) +{ + return chgIfaceFlags(name, + (up) ? 0 : IFF_UP, + (up) ? IFF_UP : 0); +} + + +/** + * ifaceCheck + * + * @reportError: whether to report errors or keep silent + * @ifname: Name of the interface + * @macaddr: expected MAC address of the interface; not checked if NULL + * @ifindex: expected index of the interface; not checked if '-1' + * + * Determine whether a given interface is still available. If so, + * it must have the given MAC address and if an interface index is + * passed, it must also match the interface index. + * + * Returns 0 on success, an error code on failure. + * ENODEV : if interface with given name does not exist or its interface + * index is different than the one passed + * EINVAL : if interface name is invalid (too long) + */ +int +ifaceCheck(bool reportError, const char *ifname, + const unsigned char *macaddr, int ifindex) +{ + struct ifreq ifr; + int fd = -1; + int rc = 0; + int idx; + + if (macaddr != NULL) { + fd = socket(PF_PACKET, SOCK_DGRAM, 0); + if (fd < 0) + return errno; + + if (virStrncpy(ifr.ifr_name, + ifname, strlen(ifname), sizeof(ifr.ifr_name)) == NULL) { + if (reportError) + ifaceError(VIR_ERR_INTERNAL_ERROR, + _("invalid interface name %s"), + ifname); + rc = EINVAL; + goto err_exit; + } + + if (ioctl(fd, SIOCGIFHWADDR, &ifr) < 0) { + if (reportError) + ifaceError(VIR_ERR_INTERNAL_ERROR, + _("coud not get MAC address of interface %s"), + ifname); + rc = errno; + goto err_exit; + } + + if (memcmp(&ifr.ifr_hwaddr.sa_data, macaddr, VIR_MAC_BUFLEN) != 0) { + rc = ENODEV; + goto err_exit; + } + } + + if (ifindex != -1) { + rc = ifaceGetIndex(reportError, ifname, &idx); + if (rc == 0 && idx != ifindex) + rc = ENODEV; + } + + err_exit: + if (fd >= 0) + close(fd); + + return rc; +} + + +/** + * ifaceGetIndex + * + * @reportError: whether to report errors or keep silent + * @ifname : Name of the interface whose index is to be found + * @ifindex: Pointer to int where the index will be written into + * + * Get the index of an interface given its name. + * + * Returns 0 on success, an error code on failure. + * ENODEV : if interface with given name does not exist + * EINVAL : if interface name is invalid (too long) + */ +int +ifaceGetIndex(bool reportError, const char *ifname, int *ifindex) +{ + int rc = 0; + struct ifreq ifreq; + int fd = socket(PF_PACKET, SOCK_DGRAM, 0); + + if (fd < 0) + return errno; + + if (virStrncpy(ifreq.ifr_name, ifname, strlen(ifname), + sizeof(ifreq.ifr_name)) == NULL) { + if (reportError) + ifaceError(VIR_ERR_INTERNAL_ERROR, + _("invalid interface name %s"), + ifname); + rc = EINVAL; + goto err_exit; + } + + if (ioctl(fd, SIOCGIFINDEX, &ifreq) >= 0) + *ifindex = ifreq.ifr_ifindex; + else { + if (reportError) + ifaceError(VIR_ERR_INTERNAL_ERROR, + _("interface %s does not exist"), + ifname); + rc = ENODEV; + } + +err_exit: + close(fd); + + return rc; +} Index: libvirt-acl/src/util/interface.h =================================================================== --- /dev/null +++ libvirt-acl/src/util/interface.h @@ -0,0 +1,31 @@ +/* + * interface.h: interface helper APIs for libvirt + * + * Copyright (C) 2010 IBM Corporation, Inc. + * + * See COPYING.LIB for the License of this software + * + * Stefan Berger <stefanb(a)us.ibm.com> + */ +#ifndef __VIR_INTERFACE_H__ +# define __VIR_INTERFACE_H__ + +#include "datatypes.h" + +int ifaceCtrl(const char *name, bool up); + +static inline int ifaceUp(const char *name) { + return ifaceCtrl(name, true); +} + +static inline int ifaceDown(const char *name) { + return ifaceCtrl(name, false); +} + +int ifaceCheck(bool reportError, const char *ifname, + const unsigned char *macaddr, int ifindex); + +int ifaceGetIndex(bool reportError, const char *ifname, int *ifindex); + +#endif /* __VIR_INTERFACE_H__ */ + Index: libvirt-acl/src/Makefile.am =================================================================== --- libvirt-acl.orig/src/Makefile.am +++ libvirt-acl/src/Makefile.am @@ -67,6 +67,7 @@ UTIL_SOURCES = \ util/processinfo.c util/processinfo.h \ util/hostusb.c util/hostusb.h \ util/network.c util/network.h \ + util/interface.c util/interface.h \ util/qparams.c util/qparams.h \ util/stats_linux.c util/stats_linux.h \ util/storage_file.c util/storage_file.h \ Index: libvirt-acl/src/libvirt_private.syms =================================================================== --- libvirt-acl.orig/src/libvirt_private.syms +++ libvirt-acl/src/libvirt_private.syms @@ -681,6 +681,10 @@ virFileWaitForDevices; virFileMatchesNameSuffix; virArgvToString; +# interface.h +ifaceCtrl; +ifaceCheck; +ifaceGetIndex; # usb.h usbGetDevice; Index: libvirt-acl/src/nwfilter/nwfilter_learnipaddr.c =================================================================== --- libvirt-acl.orig/src/nwfilter/nwfilter_learnipaddr.c +++ libvirt-acl/src/nwfilter/nwfilter_learnipaddr.c @@ -43,6 +43,7 @@ #include "memory.h" #include "logging.h" #include "datatypes.h" +#include "interface.h" #include "virterror_internal.h" #include "threads.h" #include "conf/nwfilter_params.h" @@ -339,7 +340,7 @@ learnIPAddressThread(void *arg) break; } /* listening on linkdev, check whether VM's dev is still there */ - if (checkIf(req->ifname, req->macaddr)) { + if (ifaceCheck(false, req->ifname, req->macaddr, -1)) { req->status = ENODEV; break; } Index: libvirt-acl/src/util/macvtap.c =================================================================== --- libvirt-acl.orig/src/util/macvtap.c +++ libvirt-acl/src/util/macvtap.c @@ -44,6 +44,7 @@ # include "util.h" # include "memory.h" # include "macvtap.h" +# include "interface.h" # include "conf/domain_conf.h" # include "virterror_internal.h" @@ -193,109 +194,6 @@ nlAppend(struct nlmsghdr *nlm, int totle static int -getIfIndex(bool reportError, - const char *ifname, - int *idx) -{ - int rc = 0; - struct ifreq ifreq; - int fd = socket(PF_PACKET, SOCK_DGRAM, 0); - - if (fd < 0) - return errno; - - if (virStrncpy(ifreq.ifr_name, ifname, strlen(ifname), - sizeof(ifreq.ifr_name)) == NULL) { - if (reportError) - macvtapError(VIR_ERR_INTERNAL_ERROR, - _("invalid interface name %s"), - ifname); - rc = EINVAL; - goto err_exit; - } - if (ioctl(fd, SIOCGIFINDEX, &ifreq) >= 0) - *idx = ifreq.ifr_ifindex; - else { - if (reportError) - macvtapError(VIR_ERR_INTERNAL_ERROR, - _("interface %s does not exist"), - ifname); - rc = ENODEV; - } - -err_exit: - close(fd); - - return rc; -} - - -/* - * chgIfFlags: Change flags on an interface - * @ifname : name of the interface - * @flagclear : the flags to clear - * @flagset : the flags to set - * - * The new flags of the interface will be calculated as - * flagmask = (~0 ^ flagclear) - * newflags = (curflags & flagmask) | flagset; - * - * Returns 0 on success, errno on failure. - */ -static int chgIfFlags(const char *ifname, short flagclear, short flagset) { - struct ifreq ifr; - int rc = 0; - int flags; - short flagmask = (~0 ^ flagclear); - int fd = socket(PF_PACKET, SOCK_DGRAM, 0); - - if (fd < 0) - return errno; - - if (virStrncpy(ifr.ifr_name, - ifname, strlen(ifname), sizeof(ifr.ifr_name)) == NULL) { - rc = ENODEV; - goto err_exit; - } - - if (ioctl(fd, SIOCGIFFLAGS, &ifr) < 0) { - rc = errno; - goto err_exit; - } - - flags = (ifr.ifr_flags & flagmask) | flagset; - - if (ifr.ifr_flags != flags) { - ifr.ifr_flags = flags; - - if (ioctl(fd, SIOCSIFFLAGS, &ifr) < 0) - rc = errno; - } - -err_exit: - close(fd); - return rc; -} - -/* - * ifUp - * @name: name of the interface - * @up: 1 for up, 0 for down - * - * Function to control if an interface is activated (up, 1) or not (down, 0) - * - * Returns 0 in case of success or an errno code in case of failure. - */ -static int -ifUp(const char *name, int up) -{ - return chgIfFlags(name, - (up) ? 0 : IFF_UP, - (up) ? IFF_UP : 0); -} - - -static int link_add(const char *type, const unsigned char *macaddress, int macaddrsize, const char *ifname, @@ -314,7 +212,7 @@ link_add(const char *type, char *recvbuf = NULL; int recvbuflen; - if (getIfIndex(true, srcdev, &ifindex) != 0) + if (ifaceGetIndex(true, srcdev, &ifindex) != 0) return -1; *retry = 0; @@ -708,7 +606,7 @@ openMacvtapTap(const char *tgifname, *res_ifname = NULL; if (tgifname) { - if(getIfIndex(false, tgifname, &ifindex) == 0) { + if(ifaceGetIndex(false, tgifname, &ifindex) == 0) { if (STRPREFIX(tgifname, MACVTAP_NAME_PREFIX)) { goto create_name; @@ -727,7 +625,7 @@ create_name: retries = 5; for (c = 0; c < 8192; c++) { snprintf(ifname, sizeof(ifname), MACVTAP_NAME_PATTERN, c); - if (getIfIndex(false, ifname, &ifindex) == ENODEV) { + if (ifaceGetIndex(false, ifname, &ifindex) == ENODEV) { rc = link_add(type, macaddress, 6, ifname, linkdev, macvtapMode, &do_retry); if (rc == 0) @@ -741,7 +639,7 @@ create_name: cr_ifname = ifname; } - rc = ifUp(cr_ifname, 1); + rc = ifaceUp(cr_ifname); if (rc != 0) { virReportSystemError(errno, _("cannot 'up' interface %s -- another " Index: libvirt-acl/src/nwfilter/nwfilter_gentech_driver.h =================================================================== --- libvirt-acl.orig/src/nwfilter/nwfilter_gentech_driver.h +++ libvirt-acl/src/nwfilter/nwfilter_gentech_driver.h @@ -63,6 +63,4 @@ void virNWFilterDomainFWUpdateCB(void *p const char *name ATTRIBUTE_UNUSED, void *data); -int checkIf(const char *ifname, const unsigned char *macaddr); - #endif

2 2

[libvirt] [PATCH] build: include usleep gnulib module
by Eric Blake 13 Apr '10

13 Apr '10

Without this module, attempts to sleep for 1 or more seconds on mingw instead become a no-delay no-op. * bootstrap.conf (gnulib_modules): Add usleep. --- bootstrap.conf | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/bootstrap.conf b/bootstrap.conf index ac2f8e6..d55dc71 100644 --- a/bootstrap.conf +++ b/bootstrap.conf @@ -56,6 +56,7 @@ strsep sys_stat time_r useless-if-before-free +usleep vasprintf verify vc-list-files -- 1.6.6.1

2 2

[libvirt] [PATCH] Fix nodeinfotest on NUMA machines
by Daniel P. Berrange 13 Apr '10

13 Apr '10

The nodeinfotest was reliant on the host NUMA topology, but all the test data files assumed 1 single NUMA node. This test thus failed on any NUMA machine with > 1 node * tests/nodeinfotest.c: Hardcode 1 single numa node --- tests/nodeinfotest.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/tests/nodeinfotest.c b/tests/nodeinfotest.c index 768fd4d..9aeb459 100644 --- a/tests/nodeinfotest.c +++ b/tests/nodeinfotest.c @@ -46,6 +46,11 @@ static int linuxTestCompareFiles(const char *cpuinfofile, const char *outputfile } fclose(cpuinfo); + /* 'nodes' is filled using libnuma.so from current machine + * topology, which makes it unsuitable for the test suite + * so blank it to a predictable value */ + nodeinfo.nodes = 1; + snprintf(actualData, MAX_FILE, "CPUs: %u, MHz: %u, Nodes: %u, Cores: %u\n", nodeinfo.cpus, nodeinfo.mhz, nodeinfo.nodes, nodeinfo.cores); -- 1.6.6.1

2 1

Re: [libvirt] Domain not stable while created...
by Sankamesh 13 Apr '10

13 Apr '10

Thanks Mr.Stefan I was getting some errors when i ran like xm create libvirt-ttylinux.conf ---------------------------------------------------------------------------------------------------------------------------------------- Mounting root filesystem. mount: could not find filesystem '/dev/root' Setting up other filesystems. Setting up new root fs setuproot: moving /dev failed: No such file or directory no fstab.sys, mounting internal defaults setuproot: error mounting /proc: No such file or directory setuproot: error mounting /sys: No such file or directory Switching to new root and running init. unmounting old /dev unmounting old /proc unmounting old /sys switchroot: mount failed: No such file or directory ------------------------------------------------------------------------ So this time as sure that there is some problem with my configuration file. I googled , then I found some solution to change the ramdisk option by some command mentioned in the following link. http://www.virtuatopia.com/index.php/A_Xen_Guest_OS_fails_to_boot_with_a_%2…. But after doing this when I restart my process by "xm create..." and "virsh console..." , I get -------------------------------------------------------------- Creating root device. Mounting root filesystem. ext3: No journal on filesystem on sda1 mount: error mounting /dev/root on /sysroot as ext3: Invalid argument Setting up other filesystems. Setting up new root fs setuproot: moving /dev failed: No such file or directory no fstab.sys, mounting internal defaults setuproot: error mounting /proc: No such file or directory setuproot: error mounting /sys: No such file or directory Switching to new root and running init. unmounting old /dev unmounting old /proc unmounting old /sys -------------------------------------------------------------------------------------------------------------------------- Similary when I try other way by changing the ramdisk option in ttylinux.xml file and use "virsh -c xen:/// create libvirt-ttylinux.xml" , then virsh console domainname, I get some kernel error -------------------------------------------------------------------------------------------------- .............................................................. Initalizing network drop monitor service Freeing unused kernel memory: 176k freed Write protecting the kernel read-only data: 390k Registering block device major 8 USB Universal Host Controller Interface driver v3.0 SCSI subsystem initialized device-mapper: uevent: version 1.0.3 device-mapper: ioctl: 4.11.5-ioctl (2007-12-12) initialised: dm-devel(a)redhat.com device-mapper: dm-raid45: initialized v0.2594l netfront: Initialising virtual ethernet driver. netfront: device eth0 has flipping receive path. ext3: No journal on filesystem on sda1 Kernel panic - not syncing: Attempted to kill init! -------------------------------------------------------------------------------------------------- So , There is something terribly wrong with my kernel options in the configuration file in both cases, that doesn't allow the image to boot. Can you identify the nature of the error? Can You help me out in someway? Thanks ________________________________ Sankamesh <sankamesh_rb(a)yahoo.co.in> wrote on 04/12/2010 04:29:36 AM: > > Thanks Mr. Stefan > Will that crash mainly be due to the kernel ? Since am not sure > about that,else I should try with different image. > When I use via a config file using "xm create libvirt-ttylinux.conf > ", then the domain runs stable.... > > But when I use the virsh -c xen:/// define libvirt-ttylinux.xml" and > "virsh start ttyimage, it crashes after sometime. > > The ibvirt-ttylinux.conf file :: > > -------------------------------------------------------------------------------------------------------------------------------- > kernel = "/boot/vmlinuz-2.6.18-164.2.1.el5xen" > ramdisk= "/boot/initrd-2.6.18-164.2.1.el5xen.img" > memory = 64 Maybe try to give it some more memory... Otherwise I can just guess as to why there is such a difference in this vm running stable. Are there any significant difference between an 'xm list' after the 'xm create' and an 'xm list' after the 'virsh -c ... define'? Did you ever try 'xm new <vm config file name>' followed by an 'xm start <domainname>'? > name = "ttylinux" > disk = ['file:/usr/local/ttylinux-xen-libvirt/ttylinux-xen.img,sda1,w'] > root = "/dev/sda1 ro" > vif = [''] > -------------------------------------------------------------------------------------------------------------------------------- > > I give the same Xen kernel parameter here in xml file, and use virsh > to create domain > > --------------------------------------------------------------------------------------------------------------------------------------- > <?xml version="1.0" encoding="utf-8"?> > <domain type='xen'> > <name>ttyimage</name> > <os> > <type>linux</type> > <kernel>/boot/vmlinuz-2.6.18-164.2.1.el5xen</kernel> > <initrd>/boot/initrd-2.6.18-164.2.1.el5xen.img</initrd> > </os> > <memory>65536</memory> > <vcpu>1</vcpu> > <on_poweroff>destroy</on_poweroff> > <on_reboot>restart</on_reboot> > <on_crash>destroy</on_crash> > <devices> > <graphics type='vnc' port='5900'/> > <disk type='file'> > <source file='/usr/local/ttylinux-xen-libvirt/ttylinux-xen.img' /> > <target dev='sda1' /> > </disk> > <interface type='bridge'> > <source bridge='virbr0' /> > <mac address='00:1d:60:ec:ae:1c' /> > <target dev='testnimb-0' /> > </interface> > </devices> > </domain> > --------------------------------------------------------------------------------------------------------------------------------------- > My Boot grub file data:: > > -------------------------------------------------------------------------------------------------------------------------------------- > title Scientific Linux (2.6.18-164.2.1.el5xen) > root (hd0,0) > kernel /xen.gz-2.6.18-164.2.1.el5 > module /vmlinuz-2.6.18-164.2.1.el5xen ro root=LABEL=/1 rhgb quiet > module /initrd-2.6.18-164.2.1.el5xen.img > -------------------------------------------------------------------------------------------------------------------------------------- > > > Why is this difference between the xm (when i destroy the > image,domain is also destroyed) and virsh (domain is not destroyed > while destroying the image) . xm new <vm definition filename> -> xm start <domainname> -> xm destroy <domainname> -> xm delete <domainname> is similar to virsh ... define -> virsh start <domainname> -> virsh destroy <domainname> -> virsh undefine <domainname> Stefan > > I doubt that am making some mistake with the xml file .... Is that true? > > Kindly give some suggestions > > Thanks > > > libvir-list-bounces(a)redhat.com wrote on 04/10/2010 09:47:17 AM: > > > > libvir-list > > > > Hello, > > > > Thanks Alex > > > > I created a domain using "virsh -c xen:/// define libvirt-ttylinux.xml" and > > "virsh start ttyimage" for a simple ttyimage. > > > > Problem I face is that the image shutsdown immedialtely once virsh > > start guest is typed. > > I checked the Xend Logs > > > ---------------------------------------------------------------------------------------------------------- > > ---[2010-04-11 07:08:02 xend 3155] DEBUG (DevController:116) > > DevController: writing {'frontend-id': '6', 'domain': 'ttyimage', > [...] > > [2010-04-11 07:08:02 xend 3155] DEBUG (vfbif:11) Spawn: ['/usr/lib/ > > xen/bin/qemu-dm', '-M', 'xenpv', '-d', '6', '-domain-name', > > 'ttyimage', '-vnc', '127.0.0.1:0', '-vncunused', '-k', 'en-us'] > > [2010-04-11 07:08:02 xend.XendDomainInfo 3155] DEBUG > > (XendDomainInfo:992) Storing VM details: {'shadow_memory': '0', > > 'uuid': 'd5e916b0-bc2d-01f9-8156-4808c754f67a', 'on_reboot': > > 'restart', 'start_time': '1270937282.29', 'on_poweroff': 'destroy', > > 'name': 'ttyimage', 'xend/restart_count': '0', 'vcpus': '1', > > 'vcpu_avail': '1', 'memory': '64', 'on_crash': 'destroy', 'image': > > '(linux (kernel /boot/vmlinuz-2.6.18-164.2.1.el5xen))', 'maxmem': '64'} > > [2010-04-11 07:08:02 xend.XendDomainInfo 3155] DEBUG > > (XendDomainInfo:1027) Storing domain details: {'console/ring-ref': > > '65674', 'console/port': '2', 'name': 'ttyimage', 'console/limit': > > '1048576', 'vm': '/vm/d5e916b0-bc2d-01f9-8156-4808c754f67a', > > 'domid': '6', 'cpu/0/availability': 'online', 'memory/target': > > '65536', 'store/ring-ref': '65675', 'store/port': '1'} > > [2010-04-11 07:08:02 xend.XendDomainInfo 3155] DEBUG > > (XendDomainInfo:1249) XendDomainInfo.handleShutdownWatch > > [2010-04-11 07:08:02 xend 3155] DEBUG (DevController:158) Waiting > > for devices vif. > > [2010-04-11 07:08:02 xend 3155] DEBUG (DevController:164) Waiting for 0. > > [2010-04-11 07:08:02 xend 3155] DEBUG (DevController:509) > > hotplugStatusCallback /local/domain/0/backend/vif/6/0/hotplug-status. > > [2010-04-11 07:08:51 xend 3155] INFO (XendDomain:387) Domain > > ttyimage (6) unpaused. > > [2010-04-11 07:08:54 xend.XendDomainInfo 3155] WARNING > > (XendDomainInfo:1177) Domain has crashed: name=ttyimage id=6. > > You domain crashed here... Is the VM image and kernel in that image > known to work? > > Regards, > Stefan > > Send free SMS to your Friends on Mobile from your Yahoo! Messenger. > Download Now! http://messenger.yahoo.com/download.php Send free SMS to your Friends on Mobile from your Yahoo! Messenger. Download Now! http://messenger.yahoo.com/download.php

1 0

[libvirt] [PATCH] build: fix syntax-check problems
by Eric Blake 13 Apr '10

13 Apr '10

* .x-sc_prohibit_gettext_noop: Add new exemption. * .x-sc_prohibit_test_minus_ao: Likewise. * Makefile.am (EXTRA_DIST): Distribute new files. * .gitignore: Ignore built file. --- Pushing as obvious, since otherwise 'make syntax-check' fails, and with my name prominently listed in the failure message, even though I wasn't the one that touched docs/news.html.in. It's interesting that documenting the commit logs for what we fixed introduces new instances of the broken semantics. :) .gitignore | 1 + .x-sc_prohibit_gettext_noop | 2 ++ .x-sc_prohibit_test_minus_ao | 1 + Makefile.am | 2 ++ 4 files changed, 6 insertions(+), 0 deletions(-) create mode 100644 .x-sc_prohibit_gettext_noop create mode 100644 .x-sc_prohibit_test_minus_ao diff --git a/.gitignore b/.gitignore index a638e0d..a7466fd 100644 --- a/.gitignore +++ b/.gitignore @@ -44,4 +44,5 @@ stamp-h stamp-h.in stamp-h1 tests/*.log +tests/nwfilterxml2xmltest update.log diff --git a/.x-sc_prohibit_gettext_noop b/.x-sc_prohibit_gettext_noop new file mode 100644 index 0000000..c40474e --- /dev/null +++ b/.x-sc_prohibit_gettext_noop @@ -0,0 +1,2 @@ +ChangeLog* +docs/news.html.in diff --git a/.x-sc_prohibit_test_minus_ao b/.x-sc_prohibit_test_minus_ao new file mode 100644 index 0000000..3939616 --- /dev/null +++ b/.x-sc_prohibit_test_minus_ao @@ -0,0 +1 @@ +docs/news.html.in diff --git a/Makefile.am b/Makefile.am index dd334b5..286b13b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -27,12 +27,14 @@ EXTRA_DIST = \ .x-sc_prohibit_asprintf \ .x-sc_prohibit_gethostby \ .x-sc_prohibit_gethostname \ + .x-sc_prohibit_gettext_noop \ .x-sc_prohibit_have_config_h \ .x-sc_prohibit_HAVE_MBRTOWC \ .x-sc_prohibit_nonreentrant \ .x-sc_prohibit_strcmp \ .x-sc_prohibit_strcmp_and_strncmp \ .x-sc_prohibit_strncpy \ + .x-sc_prohibit_test_minus_ao \ .x-sc_prohibit_VIR_ERR_NO_MEMORY \ .x-sc_require_config_h \ .x-sc_require_config_h_first \ -- 1.6.6.1

2 1

[libvirt] [PATCH] Consolidate interface related functions in interface.c
by Stefan Berger 12 Apr '10

12 Apr '10

I am consolidating network interface related functions used in nwfilter and macvtap code in utils/interface.c. All function names are prefixed with 'Iface'. The following functions are now available through interface.h: int IfaceCtrl(const char *name, bool up); int IfaceUp(const char *name); int IfaceDown(const char *name); int IfaceCheck(bool reportError, const char *ifname, const unsigned char *macaddr, int ifindex); int IfaceGetIndex(bool reportError, const char *ifname, int *ifindex); I added 'int ifindex' as parameter to IfaceCheck to the original function and modified the code accordingly. Signed-off-by: Stefan Berger <stefanb(a)us.ibm.com> --- src/Makefile.am | 1 src/libvirt_private.syms | 4 src/nwfilter/nwfilter_gentech_driver.c | 120 ----------------- src/nwfilter/nwfilter_gentech_driver.h | 2 src/nwfilter/nwfilter_learnipaddr.c | 3 src/util/interface.c | 224 +++++++++++++++++++++++++++++++++ src/util/interface.h | 31 ++++ src/util/macvtap.c | 112 ---------------- 8 files changed, 269 insertions(+), 228 deletions(-) Index: libvirt-acl/src/nwfilter/nwfilter_gentech_driver.c =================================================================== --- libvirt-acl.orig/src/nwfilter/nwfilter_gentech_driver.c +++ libvirt-acl/src/nwfilter/nwfilter_gentech_driver.c @@ -23,16 +23,11 @@ #include <config.h> -#include <stdint.h> -#include <sys/socket.h> -#include <sys/ioctl.h> -#include <linux/if.h> - #include "internal.h" #include "memory.h" #include "logging.h" -#include "datatypes.h" +#include "interface.h" #include "domain_conf.h" #include "virterror_internal.h" #include "nwfilter_gentech_driver.h" @@ -792,117 +787,6 @@ _virNWFilterInstantiateFilter(virConnect } -// FIXME: move chgIfFlags, ifUp, checkIf into common file & share w/ macvtap.c - -/* - * chgIfFlags: Change flags on an interface - * @ifname : name of the interface - * @flagclear : the flags to clear - * @flagset : the flags to set - * - * The new flags of the interface will be calculated as - * flagmask = (~0 ^ flagclear) - * newflags = (curflags & flagmask) | flagset; - * - * Returns 0 on success, errno on failure. - */ -static int chgIfFlags(const char *ifname, short flagclear, short flagset) { - struct ifreq ifr; - int rc = 0; - int flags; - short flagmask = (~0 ^ flagclear); - int fd = socket(PF_PACKET, SOCK_DGRAM, 0); - - if (fd < 0) - return errno; - - if (virStrncpy(ifr.ifr_name, - ifname, strlen(ifname), sizeof(ifr.ifr_name)) == NULL) { - rc = ENODEV; - goto err_exit; - } - - if (ioctl(fd, SIOCGIFFLAGS, &ifr) < 0) { - rc = errno; - goto err_exit; - } - - flags = (ifr.ifr_flags & flagmask) | flagset; - - if (ifr.ifr_flags != flags) { - ifr.ifr_flags = flags; - - if (ioctl(fd, SIOCSIFFLAGS, &ifr) < 0) - rc = errno; - } - -err_exit: - close(fd); - return rc; -} - -/* - * ifUp - * @name: name of the interface - * @up: 1 for up, 0 for down - * - * Function to control if an interface is activated (up, 1) or not (down, 0) - * - * Returns 0 in case of success or an errno code in case of failure. - */ -static int -ifUp(const char *name, int up) -{ - return chgIfFlags(name, - (up) ? 0 : IFF_UP, - (up) ? IFF_UP : 0); -} - - -/** - * checkIf - * - * @ifname: Name of the interface - * @macaddr: expected MAC address of the interface - * - * FIXME: the interface's index is another good parameter to check - * - * Determine whether a given interface is still available. If so, - * it must have the given MAC address. - * - * Returns an error code ENODEV in case the interface does not exist - * anymore or its MAC address is different, 0 otherwise. - */ -int -checkIf(const char *ifname, const unsigned char *macaddr) -{ - struct ifreq ifr; - int fd = socket(PF_PACKET, SOCK_DGRAM, 0); - int rc = 0; - - if (fd < 0) - return errno; - - if (virStrncpy(ifr.ifr_name, - ifname, strlen(ifname), sizeof(ifr.ifr_name)) == NULL) { - rc = ENODEV; - goto err_exit; - } - - if (ioctl(fd, SIOCGIFHWADDR, &ifr) < 0) { - rc = errno; - goto err_exit; - } - - if (memcmp(&ifr.ifr_hwaddr.sa_data, macaddr, 6) != 0) - rc = ENODEV; - - err_exit: - close(fd); - return rc; -} - - int virNWFilterInstantiateFilterLate(virConnectPtr conn, const char *ifname, @@ -926,7 +810,7 @@ virNWFilterInstantiateFilterLate(virConn driver); if (rc) { //something went wrong... 'DOWN' the interface - if (ifUp(ifname ,0)) { + if (IfaceDown(ifname)) { // assuming interface disappeared... _virNWFilterTeardownFilter(ifname); } Index: libvirt-acl/src/util/interface.c =================================================================== --- /dev/null +++ libvirt-acl/src/util/interface.c @@ -0,0 +1,226 @@ +/* + * interface.c: interface support functions + * + * Copyright (C) 2010 IBM Corp. + * Copyright (C) 2010 Stefan Berger + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * chgIfaceFlags originated from bridge.c + * + * Author: Stefan Berger <stefanb(a)us.ibm.com> + */ + +#include <config.h> + +#include <sys/socket.h> +#include <sys/ioctl.h> +#include <linux/if.h> + +#include "internal.h" + +#include "util.h" +#include "interface.h" +#include "virterror_internal.h" + +#define ifaceError(code, ...) \ + virReportErrorHelper(NULL, VIR_FROM_NET, code, __FILE__, \ + __FUNCTION__, __LINE__, __VA_ARGS__) + +/* + * chgIfFlags: Change flags on an interface + * + * @ifname : name of the interface + * @flagclear : the flags to clear + * @flagset : the flags to set + * + * The new flags of the interface will be calculated as + * flagmask = (~0 ^ flagclear) + * newflags = (curflags & flagmask) | flagset; + * + * Returns 0 on success, errno on failure. + */ +static int chgIfaceFlags(const char *ifname, short flagclear, short flagset) { + struct ifreq ifr; + int rc = 0; + int flags; + short flagmask = (~0 ^ flagclear); + int fd = socket(PF_PACKET, SOCK_DGRAM, 0); + + if (fd < 0) + return errno; + + if (virStrncpy(ifr.ifr_name, + ifname, strlen(ifname), sizeof(ifr.ifr_name)) == NULL) { + rc = ENODEV; + goto err_exit; + } + + if (ioctl(fd, SIOCGIFFLAGS, &ifr) < 0) { + rc = errno; + goto err_exit; + } + + flags = (ifr.ifr_flags & flagmask) | flagset; + + if (ifr.ifr_flags != flags) { + ifr.ifr_flags = flags; + + if (ioctl(fd, SIOCSIFFLAGS, &ifr) < 0) + rc = errno; + } + +err_exit: + close(fd); + return rc; +} + + +/* + * IfaceCtrl + * @name: name of the interface + * @up: true (1) for up, false (0) for down + * + * Function to control if an interface is activated (up, 1) or not (down, 0) + * + * Returns 0 in case of success or an errno code in case of failure. + */ +int +IfaceCtrl(const char *name, bool up) +{ + return chgIfaceFlags(name, + (up) ? 0 : IFF_UP, + (up) ? IFF_UP : 0); +} + + +/** + * IfaceCheck + * + * @reportError: whether to report errors or keep silent + * @ifname: Name of the interface + * @macaddr: expected MAC address of the interface; not checked if NULL + * @ifindex: expected index of the interface; not checked if '-1' + * + * Determine whether a given interface is still available. If so, + * it must have the given MAC address and if an interface index is + * passed, it must also match the interface index. + * + * Returns 0 on success, an error code on failure. + * ENODEV : if interface with given name does not exist or its interface + * index is different than the one passed + * EINVAL : if interface name is invalid (too long) + */ +int +IfaceCheck(bool reportError, const char *ifname, + const unsigned char *macaddr, int ifindex) +{ + struct ifreq ifr; + int fd = -1; + int rc = 0; + int idx; + + if (macaddr != NULL) { + fd = socket(PF_PACKET, SOCK_DGRAM, 0); + if (fd < 0) + return errno; + + if (virStrncpy(ifr.ifr_name, + ifname, strlen(ifname), sizeof(ifr.ifr_name)) == NULL) { + if (reportError) + ifaceError(VIR_ERR_INTERNAL_ERROR, + _("invalid interface name %s"), + ifname); + rc = EINVAL; + goto err_exit; + } + + if (ioctl(fd, SIOCGIFHWADDR, &ifr) < 0) { + if (reportError) + ifaceError(VIR_ERR_INTERNAL_ERROR, + _("coud not get MAC address of interface %s"), + ifname); + rc = errno; + goto err_exit; + } + + if (memcmp(&ifr.ifr_hwaddr.sa_data, macaddr, VIR_MAC_BUFLEN) != 0) { + rc = ENODEV; + goto err_exit; + } + } + + if (ifindex != -1) { + rc = IfaceGetIndex(reportError, ifname, &idx); + if (rc == 0 && idx != ifindex) + rc = ENODEV; + } + + err_exit: + if (fd >= 0) + close(fd); + + return rc; +} + + +/** + * IfaceGetIndex + * + * @reportError: whether to report errors or keep silent + * @ifname : Name of the interface whose index is to be found + * @ifindex: Pointer to int where the index will be written into + * + * Get the index of an interface given its name. + * + * Returns 0 on success, an error code on failure. + * ENODEV : if interface with given name does not exist + * EINVAL : if interface name is invalid (too long) + */ +int +IfaceGetIndex(bool reportError, const char *ifname, int *ifindex) +{ + int rc = 0; + struct ifreq ifreq; + int fd = socket(PF_PACKET, SOCK_DGRAM, 0); + + if (fd < 0) + return errno; + + if (virStrncpy(ifreq.ifr_name, ifname, strlen(ifname), + sizeof(ifreq.ifr_name)) == NULL) { + if (reportError) + ifaceError(VIR_ERR_INTERNAL_ERROR, + _("invalid interface name %s"), + ifname); + rc = EINVAL; + goto err_exit; + } + + if (ioctl(fd, SIOCGIFINDEX, &ifreq) >= 0) + *ifindex = ifreq.ifr_ifindex; + else { + if (reportError) + ifaceError(VIR_ERR_INTERNAL_ERROR, + _("interface %s does not exist"), + ifname); + rc = ENODEV; + } + +err_exit: + close(fd); + + return rc; +} Index: libvirt-acl/src/util/interface.h =================================================================== --- /dev/null +++ libvirt-acl/src/util/interface.h @@ -0,0 +1,31 @@ +/* + * interface.h: interface helper APIs for libvirt + * + * Copyright (C) 2010 IBM Corporation, Inc. + * + * See COPYING.LIB for the License of this software + * + * Stefan Berger <stefanb(a)us.ibm.com> + */ +#ifndef __VIR_INTERFACE_H__ +# define __VIR_INTERFACE_H__ + +#include "datatypes.h" + +int IfaceCtrl(const char *name, bool up); + +static inline int IfaceUp(const char *name) { + return IfaceCtrl(name, true); +} + +static inline int IfaceDown(const char *name) { + return IfaceCtrl(name, false); +} + +int IfaceCheck(bool reportError, const char *ifname, + const unsigned char *macaddr, int ifindex); + +int IfaceGetIndex(bool reportError, const char *ifname, int *ifindex); + +#endif /* __VIR_INTERFACE_H__ */ + Index: libvirt-acl/src/Makefile.am =================================================================== --- libvirt-acl.orig/src/Makefile.am +++ libvirt-acl/src/Makefile.am @@ -67,6 +67,7 @@ UTIL_SOURCES = \ util/processinfo.c util/processinfo.h \ util/hostusb.c util/hostusb.h \ util/network.c util/network.h \ + util/interface.c util/interface.h \ util/qparams.c util/qparams.h \ util/stats_linux.c util/stats_linux.h \ util/storage_file.c util/storage_file.h \ Index: libvirt-acl/src/libvirt_private.syms =================================================================== --- libvirt-acl.orig/src/libvirt_private.syms +++ libvirt-acl/src/libvirt_private.syms @@ -681,6 +681,10 @@ virFileWaitForDevices; virFileMatchesNameSuffix; virArgvToString; +# interface.h +IfaceCtrl; +IfaceCheck; +IfaceGetIndex; # usb.h usbGetDevice; Index: libvirt-acl/src/nwfilter/nwfilter_learnipaddr.c =================================================================== --- libvirt-acl.orig/src/nwfilter/nwfilter_learnipaddr.c +++ libvirt-acl/src/nwfilter/nwfilter_learnipaddr.c @@ -43,6 +43,7 @@ #include "memory.h" #include "logging.h" #include "datatypes.h" +#include "interface.h" #include "virterror_internal.h" #include "threads.h" #include "conf/nwfilter_params.h" @@ -339,7 +340,7 @@ learnIPAddressThread(void *arg) break; } /* listening on linkdev, check whether VM's dev is still there */ - if (checkIf(req->ifname, req->macaddr)) { + if (IfaceCheck(false, req->ifname, req->macaddr, -1)) { req->status = ENODEV; break; } Index: libvirt-acl/src/util/macvtap.c =================================================================== --- libvirt-acl.orig/src/util/macvtap.c +++ libvirt-acl/src/util/macvtap.c @@ -44,6 +44,7 @@ # include "util.h" # include "memory.h" # include "macvtap.h" +# include "interface.h" # include "conf/domain_conf.h" # include "virterror_internal.h" @@ -193,109 +194,6 @@ nlAppend(struct nlmsghdr *nlm, int totle static int -getIfIndex(bool reportError, - const char *ifname, - int *idx) -{ - int rc = 0; - struct ifreq ifreq; - int fd = socket(PF_PACKET, SOCK_DGRAM, 0); - - if (fd < 0) - return errno; - - if (virStrncpy(ifreq.ifr_name, ifname, strlen(ifname), - sizeof(ifreq.ifr_name)) == NULL) { - if (reportError) - macvtapError(VIR_ERR_INTERNAL_ERROR, - _("invalid interface name %s"), - ifname); - rc = EINVAL; - goto err_exit; - } - if (ioctl(fd, SIOCGIFINDEX, &ifreq) >= 0) - *idx = ifreq.ifr_ifindex; - else { - if (reportError) - macvtapError(VIR_ERR_INTERNAL_ERROR, - _("interface %s does not exist"), - ifname); - rc = ENODEV; - } - -err_exit: - close(fd); - - return rc; -} - - -/* - * chgIfFlags: Change flags on an interface - * @ifname : name of the interface - * @flagclear : the flags to clear - * @flagset : the flags to set - * - * The new flags of the interface will be calculated as - * flagmask = (~0 ^ flagclear) - * newflags = (curflags & flagmask) | flagset; - * - * Returns 0 on success, errno on failure. - */ -static int chgIfFlags(const char *ifname, short flagclear, short flagset) { - struct ifreq ifr; - int rc = 0; - int flags; - short flagmask = (~0 ^ flagclear); - int fd = socket(PF_PACKET, SOCK_DGRAM, 0); - - if (fd < 0) - return errno; - - if (virStrncpy(ifr.ifr_name, - ifname, strlen(ifname), sizeof(ifr.ifr_name)) == NULL) { - rc = ENODEV; - goto err_exit; - } - - if (ioctl(fd, SIOCGIFFLAGS, &ifr) < 0) { - rc = errno; - goto err_exit; - } - - flags = (ifr.ifr_flags & flagmask) | flagset; - - if (ifr.ifr_flags != flags) { - ifr.ifr_flags = flags; - - if (ioctl(fd, SIOCSIFFLAGS, &ifr) < 0) - rc = errno; - } - -err_exit: - close(fd); - return rc; -} - -/* - * ifUp - * @name: name of the interface - * @up: 1 for up, 0 for down - * - * Function to control if an interface is activated (up, 1) or not (down, 0) - * - * Returns 0 in case of success or an errno code in case of failure. - */ -static int -ifUp(const char *name, int up) -{ - return chgIfFlags(name, - (up) ? 0 : IFF_UP, - (up) ? IFF_UP : 0); -} - - -static int link_add(const char *type, const unsigned char *macaddress, int macaddrsize, const char *ifname, @@ -314,7 +212,7 @@ link_add(const char *type, char *recvbuf = NULL; int recvbuflen; - if (getIfIndex(true, srcdev, &ifindex) != 0) + if (IfaceGetIndex(true, srcdev, &ifindex) != 0) return -1; *retry = 0; @@ -708,7 +606,7 @@ openMacvtapTap(const char *tgifname, *res_ifname = NULL; if (tgifname) { - if(getIfIndex(false, tgifname, &ifindex) == 0) { + if(IfaceGetIndex(false, tgifname, &ifindex) == 0) { if (STRPREFIX(tgifname, MACVTAP_NAME_PREFIX)) { goto create_name; @@ -727,7 +625,7 @@ create_name: retries = 5; for (c = 0; c < 8192; c++) { snprintf(ifname, sizeof(ifname), MACVTAP_NAME_PATTERN, c); - if (getIfIndex(false, ifname, &ifindex) == ENODEV) { + if (IfaceGetIndex(false, ifname, &ifindex) == ENODEV) { rc = link_add(type, macaddress, 6, ifname, linkdev, macvtapMode, &do_retry); if (rc == 0) @@ -741,7 +639,7 @@ create_name: cr_ifname = ifname; } - rc = ifUp(cr_ifname, 1); + rc = IfaceUp(cr_ifname); if (rc != 0) { virReportSystemError(errno, _("cannot 'up' interface %s -- another " Index: libvirt-acl/src/nwfilter/nwfilter_gentech_driver.h =================================================================== --- libvirt-acl.orig/src/nwfilter/nwfilter_gentech_driver.h +++ libvirt-acl/src/nwfilter/nwfilter_gentech_driver.h @@ -63,6 +63,4 @@ void virNWFilterDomainFWUpdateCB(void *p const char *name ATTRIBUTE_UNUSED, void *data); -int checkIf(const char *ifname, const unsigned char *macaddr); - #endif

2 2

[libvirt] [PATCH] add nwfilter functions to virsh man page
by Stefan Berger 12 Apr '10

12 Apr '10

Unfortunately after the 0.8.0 release, but here's a beginning of the documentation of the nwfilter functionality. Signed-off-by; Stefan Berger <stefanb(a)us.ibm.com> --- tools/virsh.pod | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) Index: libvirt-acl/tools/virsh.pod =================================================================== --- libvirt-acl.orig/tools/virsh.pod +++ libvirt-acl/tools/virsh.pod @@ -840,6 +840,59 @@ children of this snapshot. =back +=head1 NWFILTER COMMMANDS + +The following commands manipulate network filters. Network filters allow +to filter the network traffic comming from and going to virtual machines. +Individual network traffic filters are written in XML, may contain +references to other network filters, describe traffic filtering rules, +or contain both. Network filters are referenced by virtual machines +from within their interface description. A network filter may be referenced +by multiple virtual machines' interfaces. + +=over 4 + +=item B<nwfilter-define> I<xmlfile> + +Make a new network filter known to libvirt. If a network filter with +the same name already exists, it will be replaced with the new XML. +Any running virtual machine referencing this network filter will have +its network traffic rules adapted. If for any reason the network traffic +filtering rules cannot be instantiated by any of the running virtual +machines, then the new XML will be rejected. + +=item B<nwfilter-undefine> I<nwfilter-name> + +Delete a network filter. The deletion will fail if any running virtual +machine is currently using this network filter. + +=item B<nwfilter-list> + +List all of the available network filters. + +=item B<nwfilter-dumpxml> I<nwfilter-name> + +Output the network filter XML. + +=item B<nwfilter-edit> I<nwfilter-name> + +Edit the XML of a network filter. + +This is equivalent to: + + virsh nwfilter-dumpxml myfilter > myfilter.xml + edit myfilter.xml + virsh nwfilter-define myfilter.xml + +except that it does some error checking. +The new network filter may be rejected due to the same reason as +mention in I<nwfilter-define>. + +The editor used can be supplied by the C<$VISUAL> or C<$EDITOR> environment +variables, and defaults to C<vi>. + +=back + =head1 ENVIRONMENT The following environment variables can be set to alter the behaviour

2 2

[libvirt] cannot start a qemu64 model on an Intel host
by Dan Kenigsberg 12 Apr '10

12 Apr '10

If I specify <cpu match="exact"> <model>qemu64</model> </cpu> according to the new cpu schema, I get error: internal error guest CPU is not compatible with host CPU because qemu64 supports svm, and my host does not. However, the error remains when I explicitly ask to disable svm with <feature policy="disable" name="svm"/> I am not sure if this is a bug or an intended feature, but I'd expect cpu_disable taken into account when doing x86ModelCompare(host_model, cpu_require) Regards, Dan.

2 2

[libvirt] Release of libvirt-0.8.0
by Daniel Veillard 12 Apr '10

12 Apr '10

After heroic efforts in the last couple of weeks it is out ! That's by large the release packed with most new features ever, and the changelog is simply huge. I hope we didn't introduce too many bugs, but we certainly fixed a very large amount in the first place ! Tarball is available as usual from ftp://libvirt.org/libvirt/ And I won't try to sumarize the following ! Features: - esx: Add domain snapshot support (Matthias Bolte) - Snapshot API framework. (Chris Lalancette) - Add managed save API entry points (Daniel Veillard) - timer subselection for domain clock (Laine Stump) - Add hook utilities (Daniel Veillard) - cpuUpdate() for updating guest CPU according to host CPU (Jiri Denemark) - Network filtering API (Stefan Berger) - Introduce a new virDomainUpdateDeviceFlags public API (Daniel P. Berrange) - Introduce a new public API for domain events (Daniel P. Berrange) - Public virDomainMigrateSetMaxDowntime API (Jiri Denemark) - Add public API for volume wiping (David Allan) - xenapi: Initial commit of the new driver (Sharadha Prabhakar) Documentation: - Add documentation for synchronous hooks (Daniel Veillard) - Small fixes to virsh man page (Luiz Capitulino) - Avoid using multicast addresses for Ethernet MAC examples (redshift) - Fix unterminated B<...> in virsh man page (Jiri Denemark) - Document all options of virsh dumpxml (Jiri Denemark) - virsh: improve documentation (Eric Blake) - Document snapshot virsh commands in the man page. (Chris Lalancette) - Website documentation for the snapshot XML. (Chris Lalancette) - website: Add archive link for libvirt-users list (Matthias Bolte) - virsh: improve man page (Eric Blake) - Mention direct device support since 0.7.7 in docs (Stefan Berger) - esx: Improve documentation about remote URIs (Matthias Bolte) - doc: fix typos in hacking.html.in; mark HACKING as read-only (Jim Meyering) - doc: fix more typos in HACKING (Jim Meyering) - hacking: add a section on preprocessor conventions (Eric Blake) - hacking: fix typos (Eric Blake) - Update hacking.html.in (David Allan) Portability: - Fix Win32 portability problems (Daniel P. Berrange) - This patch fixes some compilation issues for the RHEL5 build (Stefan Berger) - util: Add stubs for some functions on Windows (Matthias Bolte) - Add HAVE_PTHREAD_H guard for pthread_sigmask (Matthias Bolte) - bootstrap: Enable copy-mode for MinGW builds (Matthias Bolte) - util: Handle lack of (f)chmod and (f)chown on Windows (Matthias Bolte) - bootstrap: Remove rsync from buildreq list (Matthias Bolte) - Make sure virtTestCaptureProgramOutput has a body on Windows (Matthias Bolte) - Fix export of virConnectAuthPtrDefault for MinGW builds (Matthias Bolte) - Make sure uid_t and gid_t are available (Matthias Bolte) Bug Fixes: - nwfilter: Fix memory leak on daemon init and shutdown (Stefan Berger) - More event callback fixes (Daniel P. Berrange) - Fix error in nwfilter test driver (Stefan Berger) - qemu: catch cdrom change error (Ryan Harper) - nwfilter: fix for directionality of ICMP traffic (Stefan Berger) - Fix CPU comparison for x86 arch (Jiri Denemark) - Don't ignore guest CPU selection when unsupported by HV (Jiri Denemark) - domain_event.c: don't deref NULL on an OOM error path (Jim Meyering) - nwfiler: fix due to non-symmetric src mac address match in iptables (Stefan Berger) - qemu_driver.c: don't close an arbitrary file descriptor (Jim Meyering) - Add VIR_DOMAIN_XML_INACTIVE flag when parsing domain XML (Jamie Strandboge) - virt-aa-helper should not fail if profile was removed (Jamie Strandboge) - Do nor clear caps when invoking virt-aa-helper (Jamie Strandboge) - virterror.c: avoid erroneous case "fall-through" (Jim Meyering) - Increase the number of available VNC ports. (Chris Lalancette) - Only assign newDef when we have a new def. (Chris Lalancette) - nwfilter: Fix random index in virNWFilterRuleDefDetailsFormat (Matthias Bolte) - xenapi: Fix uninitialized variable warning (Matthias Bolte) - Add a missing break statement to nwfilter errors. (Chris Lalancette) - VBox: Fix use of uninitialized value (Jiri Denemark) - Allow domain disk images on root-squash NFS to coexist with security driver. (Laine Stump) - Don't use virFileReadLimFD in qemuDomainRestore. (Chris Lalancette) - nwfilter's XML parser bug fixes (Stefan Berger) - ESX test case needs '/' in interface name (Stefan Berger) - Fix linker errors in proxy (Matthias Bolte) - virConnectGetLibVersion: Avoid error message on success. (Paolo Smiraglia) - Fix daemon hook script initialization (Daniel Veillard) - Fix QEMU cpu affinity at startup to include all threads (Daniel P. Berrange) - Fix "make check" run requesting authentication (Stefan Berger) - Don't replace persistent domain config with migrated config (Jiri Denemark) - Fix build break (David Allan) - esx: Make the conf parser compare names case insensitive in VMX mode (Matthias Bolte) - vbox: Fix segfault on empty device source (Matthias Bolte) - python example: poll(-0.001) does not sleep forever (Philipp Hahn) - Fix error reporting when parsing CPU XML strings (Jiri Denemark) - virDiskNameToIndex: ignore trailing digits (Jim Meyering) - esx: Fix potential memory leak in esxVI_BuildFullTraversalSpecItem (Matthias Bolte) - Avoid libvirtd crash when cgroups is not configured on host (Jim Fehlig) - security: selinux: Fix crash when releasing non-existent label (Cole Robinson) - Don't crash without a security driver (Guido Günther) - qemu: Fix FD leak in qemudStartVMDaemon (Matthias Bolte) - util: ensure virMutexInit is not recursive (Eric Blake) - Fix logroate rpm build breakage (Daniel Veillard) - Fix LSB compliance of init script (Daniel Veillard) - python: Fix networkLookupByUUID (Philip Hahn) - Fix make dist with XenAPI changes (Cole Robinson) - xenapi: Don't leak url and caps in case of error (Matthias Bolte) - xenapi: Check for NULL before accessing the scheme (Matthias Bolte) - xenapi: Request a username if there is non in the URI (Matthias Bolte) - xenapi: Check for valid private data in xenapiSessionErrorHandle (Matthias Bolte) - Use fsync() at the end of file allocation instead of O_DSYNC (Jiri Denemark) - security: Set permissions for kernel/initrd (Cole Robinson) - qemu: Fix USB by product with security enabled (Cole Robinson) - Make nodeGetInfo report the correct number of NUMA nodes. (Chris Lalancette) - Fix crash in virsh after bogus command (Chris Lalancette) - Fix virsh command 'cd' (Chris Lalancette) - Fix hang in qemudDomainCoreDump. (Chris Lalancette) - Make sure qemudDomainSetVcpus doesn't hang. (Chris Lalancette) - Fix a JSON CPU information bug. (Chris Lalancette) - Free resources on error in udev startup (David Allan) - Fix up nodeinfo parsing code. (Chris Lalancette) - Wipe nodeinfo structure before filling it (Jiri Denemark) - macvtap build detection fix (Stefan Berger) - Fix virDomainGetXMLDesc cache settings output (Soren Hansen) - Fix locking in qemudDomainMemoryStats (Adam Litke) - qemu restore: don't let corrupt input provoke unwarranted OOM (Jim Meyering) - virFileReadLimFD: diagnose maxlen <= 0, rather than passing it on... (Jim Meyering) - xen: don't let bogus packets trigger over-allocation and segfault (Jim Meyering) Improvements: - Rename virsh "revert-to-snapshot" to "snapshot-revert" (Chris Lalancette) - nwfilter: Process DHCP option to determine whether packet is a DHCP_OFFER (Stefan Berger) - Add enospace option to qemu disk error policy (David Allan) - nwfilter: More XML parser test cases (Stefan Berger) - remote: Replace some virRaiseError with remoteError (Matthias Bolte) - Generate libvirt.def from libvirt.syms (Matthias Bolte) - Fix up python bindings for new event callbacks (Daniel P. Berrange) - esx: Allow 'lsisas1068' as SCSI controller type (Matthias Bolte) - esx: Report an error for invalid arguments in esxList(Defined)Domains (Matthias Bolte) - nwfilter: Support for learning a VM's IP address (Stefan Berger) - Properly advertise cpuselection guest capability (Jiri Denemark) - Update of the apparmor regression tests (Jamie Strandboge) - Improve the apparmor example (Jamie Strandboge) - Improve virt-aa-helper to handle SDL graphics and cleanups (Jamie Strandboge) - Adjust virt-aa-helper to handle pci devices (Jamie Strandboge) - Add backingstore support to apparmor (Jamie Strandboge) - build: avoid autogen on 'make clean' (Eric Blake) - Add filter schema for nwfilter XML, extend domain XML schema (Stefan Berger) - Add filter schema for nwfilter XML, extend domain XML schema (Stefan Berger) - nwfilter: Fix instantiated layer 2 rules for 'inout' direction (Stefan Berger) - Better error reporting in virsh. (Chris Lalancette) - Snapshot virsh implementation. (Chris Lalancette) - Snapshots for VBox (Jiri Denemark) - Snapshot QEMU driver. (Chris Lalancette) - Snapshot internal methods. (Chris Lalancette) - xenapi: Add managedsave entries to the driver struct (Matthias Bolte) - Add a managedsave command to virsh (Daniel Veillard) - Implement managed save operations for qemu driver (Daniel Veillard) - Implement remote protocol for managed save (Daniel Veillard) - build: improve check for out-of-date .gnulib submodule (Eric Blake) - optimizes the validation of the name of an interface (Stefan Berger) - adds a couple of test cases for the XML parsing test suite (Stefan Berger) - build: import latest gnulib (Eric Blake) - Changes to clock timer XML to match final design. (Laine Stump) - Keep build quiet for generated file (Daniel P. Berrange) - Keep track of guest paused state after disk IO / watchdog events (Daniel P. Berrange) - virsh: add 'exit' as an alias for 'quit' (Eric Blake) - maint: mark xenapiSessionErrorHandler messages for translation (Jim Meyering) - Blank out invalid interface names with escaped letters etc. (Stefan Berger) - esx: Generate most SOAP mapping and improve inheritance handling (Matthias Bolte) - Distribute nwfilter xml files and add them to rpm (Daniel Veillard) - Make sure nwfilter headers are part of distribution (Daniel Veillard) - maint: show which compiler warning triggered (Eric Blake) - build: automate the rerun of autogen.sh (Eric Blake) - makes the entries in the int-2-string maps more readable (Stefan Berger) - Add ip6tables support for IPv6 filtering (Stefan Berger) - Add support for so-far missing protocols for iptables filtering (Stefan Berger) - Implement the qemu-kvm backend of clock timer elements (Laine Stump) - Add flags to indicate presence of timekeeping-related qemu options (Laine Stump) - Add timer element to domain schema (Laine Stump) - virsh: support VISUAL, and allow metacharacters in EDITOR (Eric Blake) - Add dummy nwfilter driver to test driver (Stefan Berger) - Add script hook support to the LXC driver (Daniel Veillard) - Add script hook support to the QEmu driver (Daniel Veillard) - Add the script hook support to the libvirt daemon (Daniel Veillard) - Add an error module and message for the hooks subsystem (Daniel Veillard) - Export virPipeReadUntilEOF internally (Daniel Veillard) - Introduce UPDATE_CPU flag for virDomainGetXMLDesc (Jiri Denemark) - Helper function for making a copy of virCPUDefPtr (Jiri Denemark) - filter new files through cppi, so syntax-check passes once again (Jim Meyering) - Add disk error policy to domain XML (David Allan) - build: don't lose prior configure args on autogen.sh (Eric Blake) - build: update gnulib (Eric Blake) - Add some examples filters (Stefan Berger) - Extensions for iptables rules (Stefan Berger) - Add IPv6 support for the ebtables layer (Stefan Berger) - Add qemu support (Stefan Berger) - Core driver implementation with ebtables support (Stefan Berger) - Add XML parser extensions for network filtering (Stefan Berger) - Add virsh support for new CLI commands (Stefan Berger) - Definition of the wire format, RPC client & server (Stefan Berger) - Add Network filtering internal API (Stefan Berger) - Add Network filtering public API (Stefan Berger) - Add recursive locks (Stefan Berger) - Implement VNC password change in QEMU (Daniel P. Berrange) - Allow parsing <graphics> in device XML (Daniel P. Berrange) - Introduce a update-device command in virsh (Daniel P. Berrange) - Implement virDomainUpdateDeviceFlags API in all drivers with media change (Daniel P. Berrange) - Remote protocol impl for virDomainUpdateDeviceFlags (Daniel P. Berrange) - Add domain events for graphics network clients (Daniel P. Berrange) - Add support for an explicit IO error event (Daniel P. Berrange) - Add support for an explicit watchdog event (Daniel P. Berrange) - Add support for an explicit RTC change event (Daniel P. Berrange) - Add support for an explicit guest reboot event (Daniel P. Berrange) - Rename domain lifecycle event message (Daniel P. Berrange) - Convert domain events example to new API (Daniel P. Berrange) - Remote driver & daemon impl of new event API (Daniel P. Berrange) - Support new event register/deregister APis in all drivers except remote (Daniel P. Berrange) - Add new internal domain events APIs for handling other event types (Daniel P. Berrange) - Refactor domain events to handle multiple event types (Daniel P. Berrange) - Make internal domain events struct definitions private (Daniel P. Berrange) - tests: teach syntax-check that virDomainDefFree has free-like semantics (Jim Meyering) - Add entry point logging for cpu functions (Jiri Denemark) - build: suppress distracting build output (Jim Meyering) - maint: add syntax-check rule to prohibit use of test's -a operator (Jim Meyering) - tests: shell script portability and clean-up (Jim Meyering) - tests: Don't add extra padding if counter mod 40 is 0 (Matthias Bolte) - Use common XML parsing functions (Jiri Denemark) - Introduce XML parsing utility functions (Jiri Denemark) - virDomainDiskDefAssignAddress: return int, not void (Jim Meyering) - tests: do not use the ":disk" suffix in sample xml input (Jim Meyering) - util: Make some conditional symbols unconditional (Matthias Bolte) - Export conditional state driver symbols only when they are defined (Matthias Bolte) - esx: Add esxVI_LookupVirtualMachineByName (Matthias Bolte) - esx: Generate method mappings via macros (Matthias Bolte) - Add migrate-setmaxdowntime command to virsh (Jiri Denemark) - Implement virDomainMigrateSetMaxDowntime in qemu driver (Jiri Denemark) - Implement virDomainMigrateSetMaxDowntime in remote driver (Jiri Denemark) - Wire protocol and dispatcher for virDomainMigrateSetMaxDowntime (Jiri Denemark) - Internal driver API for virDomainMigrateSetMaxDowntime (Jiri Denemark) - Virsh support for vol wiping (David Allan) - Simplified version of volume wiping based on feedback from the list. (David Allan) - Implement remote bits for vol wiping (David Allan) - Implement the public API for vol wiping (David Allan) - Define the internal driver API for vol wiping (David Allan) - Support vhost-net mode at qemu startup for virtio network devices (Laine Stump) - maint: enforce recent N_ usage (Eric Blake) - Allow suspend during live migration (Jiri Denemark) - do not require two ./autogen.sh runs to permit "make" (Jim Meyering) - esx: Move username and password helper functions to authhelper.c (Matthias Bolte) - Use WARN_CFLAGS when compiling virsh.c (Jiri Denemark) - qemu: Add some debugging at domain startup (Cole Robinson) - qemu: pass the information when disks are read-only (Daniel Veillard) - macvtap: Only export symbols if support is enabled (Matthias Bolte) - Only use the numa functions when they are available. (Chris Lalancette) - Allow devices without a parent (Ed Swierk) - build: change to gnulib module list should rerun bootstrap (Eric Blake) - build: enforce preprocessor indentation (Eric Blake) - build: update gnulib submodule to newer (but not latest) (Jim Meyering) - Make virsh reconnect when losing connection (Daniel Veillard) - Change logrotate to be per-hypervisor logs (Daniel Veillard) - build: consistently indent preprocessor directives (Eric Blake) - virsh: use N_ rather than gettext_noop (Eric Blake) - virsh: fix existing N_ uses (Eric Blake) - Get thread and socket information in virsh nodeinfo. (Chris Lalancette) - Eliminate large stack buffer in doTunnelSendAll (Laine Stump) - build: consistently use C99 varargs macros (Eric Blake) Cleanups: - Fix some cppi prepocessor indentation issues (Daniel Veillard) - Cleanup the msg_gen_function list in cfg.mk (Matthias Bolte) - remote: Remove virConnectPtr from error/errorf (Matthias Bolte) - Remove undefined symbols from symbols file (Matthias Bolte) - Add missing nwfilter_learnipaddr.c to POTFILES.in (Daniel P. Berrange) - Avoid searching for windres when not building for Windows (Diego Elio Pettenò) - Executable does not belong into repository. (Stefan Berger) - xenXMDomainDefineXML: remove dead store and useless/leaky virGetDomain (Jim Meyering) - createRawFileOpHook: avoid dead stores (Jim Meyering) - qemudDomainGetSecurityLabel: avoid dead store to "type" (Jim Meyering) - Cleanup x86Compute() (Jiri Denemark) - qemuDomainSnapshotLoad: avoid dead store (Jim Meyering) - maint: s/initialis/initializ/ (Eric Blake) - Fix 'avialable' typo (Matthias Bolte) - macvtap: Remove virConnectPtr from ReportError (Matthias Bolte) - phyp: Remove virConnectPtr from PHYP_ERROR (Matthias Bolte) - esx: Mark error messages for translation (Matthias Bolte) - vbox: Mark all error messages for translation (Matthias Bolte) - Clarify an error message in setmem. (Chris Lalancette) - Fix up comments for isEncrypted, isSecure, domainIsActive, and domainIsPersistent. (Chris Lalancette) - Fix compiler warning about unused conn parameter (Matthias Bolte) - openvz: Remove virConnectPtr from openvzError (Matthias Bolte) - one: Remove virConnectPtr from oneError (Matthias Bolte) - uml: Remove virConnectPtr from umlReportError (Matthias Bolte) - Remove virConnectPtr from eventReportError (Matthias Bolte) - Remove virConnectPtr from virLibConnError (Matthias Bolte) - xen: Remove virConnectPtr from xenUnifiedError (Matthias Bolte) - Remove virConnectPtr from nodeReportError (Matthias Bolte) - netcf: Remove virConnectPtr from interfaceReportError (Matthias Bolte) - xen: Remove virConnectPtr from virXenInotifyError (Matthias Bolte) - xen: Remove virConnectPtr from virXenStoreError (Matthias Bolte) - xen: Remove virConnectPtr from virXenError/virXenErrorFunc (Matthias Bolte) - xen: Remove virConnectPtr from virXMError (Matthias Bolte) - xen: Remove virConnectPtr from virXendError (Matthias Bolte) - proxy: Remove virConnectPtr from virProxyError (Matthias Bolte) - vbox: Remove virConnectPtr from vboxError (Matthias Bolte) - test: Remove virConnectPtr from testError (Matthias Bolte) - Remove unnecessary trailing \n in log messages (Matthias Bolte) - Fix compiler warning about non-literal format string (Matthias Bolte) - removes the virConnectPtr parameter where not necessary (Stefan Berger) - Clarified error message (David Allan) - Eliminate compiler warning about non-const format string (Laine Stump) - Get rid of the regular expressions (Stefan Berger) - Use the virStrToLong_ui() function rather than virStrToLong_i() (Stefan Berger) - Make virDomainLoadConfig static. (Chris Lalancette) - Eliminate compile warnings in nwfilter error log calls (Laine Stump) - Only parse 'CPU XML' in virCPUDefParseXML() (Jim Fehlig) - Replace sscanf in PCI device address parsing (Matthias Bolte) - xen: Use virStrToLong_i instead of sscanf for XenD port parsing (Matthias Bolte) - xenapi: Use virStrToLong_i instead of sscanf for CPU map parsing (Matthias Bolte) - openvz: Use strtok_r instead of sscanf for VPS UUID parsing (Matthias Bolte) - xen: Use virParseMacAddr instead of sscanf (Matthias Bolte) - vbox: Replace atoi with virStrToLong_i (Matthias Bolte) - cgroup: Replace sscanf with virStrToLong_ll (Matthias Bolte) - Refactor major.minor.micro version parsing into a function (Matthias Bolte) - Replace sscanf in nwfilter rule parsing (Matthias Bolte) - Replace sscanf in legacy device address parsing (Matthias Bolte) - build: more fallout from test -a (Eric Blake) - Fix apibuild.py warning about virNWFilterLookupByUUIDString (Matthias Bolte) - maint: remove redundant tests after virStrToLong (Eric Blake) - maint: update AUTHORS (Eric Blake) - maint: fix cpp indentation syntax-check failure (Jim Meyering) - Add virt-aa-helper and secaatest to .gitignore (Matthias Bolte) - esx: Remove redundant semicolons (Matthias Bolte) - Use libvirt's existing ipv6/ipv4 parser/printer (Stefan Berger) - Remove driver dependency from nwfilter_conf.c (Stefan Berger) - Fix a merge error leftover (Daniel Veillard) - Use enum of virDomainNetType (Stefan Berger) - Silence cppi syntax-check warning (Daniel Veillard) - maint: update syntax-check rule to also catch test's -o operator (Eric Blake) - build: don't use "test cond1 -o cond2": it's not portable (Eric Blake) - build: don't use "test cond1 -a cond2" in configure: it's not portable (Jim Meyering) - Remove interfaceRegister from libvirt_private.syms (Matthias Bolte) - esx: Cleanup file header comments (Matthias Bolte) - maint: enforce recent copyright style (Eric Blake) - maint: make Red Hat copyright notices consistent (Eric Blake) - maint: fix typo (Eric Blake) - docs: <pre> cannot be nested in (Matthias Bolte) - .gitignore: Ignore generated daemon/libvirtd.logrotate (Cole Robinson) - phyp: Use virRequestUsername and virRequestPassword (Matthias Bolte) - fix two "make syntax check" failures (Jim Meyering) - Fix syntax-check errors (Jiri Denemark) - Fix error messages in qemu text monitor (Jiri Denemark) - Fix compiler warnings in virsh.c (Laine Stump) - Silence compiler complaints about non-literal format strings (Laine Stump) - Remove qemudDomainSetMaxMemory. (Chris Lalancette) - Fix copy&paste typos in virProcessInfoGetAffinity (Jiri Denemark) - AUTHORS: add recent contributors (Eric Blake) - Fix format string warnings (Laine Stump) - ebtablesAddRemoveRule: avoid dead store (Jim Meyering) - virInterfaceDefParseBond: avoid dead stores (Jim Meyering) - xenXMDomainConfigParse: avoid dead store (Jim Meyering) - qemuMonitorTextGetMemoryStats: decrease risk of false positive in parsing (Jim Meyering) A lot of people helped for this release, including a number of new contributors, so let's all enjoy before the bugs start to pop up :-) ! Daniel -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel(a)veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/

1 0

[libvirt] Documentation for synchronous hooks
by Daniel Veillard 12 Apr '10

12 Apr '10

Was still missing from main commits and would be needed for 0.8.0 Add documentation for synchronous hooks * docs/sitemap.html.in: add in navigation under Documentation/Deployment/Hooks * docs/hooks.html.in: new doc describing current support for 0.8.0 diff --git a/docs/hooks.html.in b/docs/hooks.html.in new file mode 100644 index 0000000..4ebeec3 --- /dev/null +++ b/docs/hooks.html.in @@ -0,0 +1,71 @@ +<?xml version="1.0"?> +<html> + <body> + <h1>Hooks for specific system management</h1> + Libvirt includes synchronous hooks starting from version 0.8.0, + this is a way to tie specific tailored system actions at specific + time. This is based on scripts being called on the Host where the + hypervisor is running, if the script is present when the libvirtd + daemon is doing some significant actions. + The scripts are expected to execute quickly, return a zero exit + status if all conditions are set for the daemon to continue the + action (non zero will be considered a failure which may + be ignored but in general will stops the ongoing operation). + The script also should not call back into libvirt as the daemon + is waiting for the script exit and deadlock is likely to occur + otherwise. + The scripts are stored in the directory <code>/etc/libvirt/hooks/</code> + when using a standard installation path + (<code>$SYSCONF_DIR/libvirt/hook/</code> in general). + The scripts gets arguments as parameter on their command line: + <ul> + <li> the first argument is the name of the object involved in the + operation or '-' if there is none. + <li> the second argument is the name of the operation. + <li> the third argument is a suboperation indication like 'start' + 'end' or '-' if there is none. + <li> the last argument is an extra argument string or '-' if there + is none. + </ul> + There is currently scripts for 3 domains of operation: + <ul> + <li><code>/etc/libvirt/hooks/daemon</code> script if + present is called at 3 points in time: + at daemon startup, typically started with the following + arguments: + <pre>/etc/libvirt/hooks/daemon - start - start</pre> + at daemon shutdown when it is about to exit, with the following + arguments: + <pre>/etc/libvirt/hooks/daemon - shutdown - shutdown</pre> + When the daemon is asked to reload its driver state when + receiving the SIGHUP signal, arguments are: + <pre>/etc/libvirt/hooks/daemon - reload begin SIGHUP</pre> + </li> + <li><code>/etc/libvirt/hooks/qemu</code> script and + <code>/etc/libvirt/hooks/lxc</code> to associate hooks for domain + operation on the respective QEmu/KVM and LXC drivers. + The domain related hooks also receive the full XML description + for the concerned domain on their stdin, which allows to get + all the informations from the domain, including UUID or storage + if that is needed for the script operation. + Currently only domain startup and domain end operations + involve the hook, the first one just before the domain gets + created. + For example if starting a QEmu domain named <code>test</code> + the following script will get called: + <pre>/etc/libvirt/hooks/qemu test start begin -</pre> + note that a non-zero return value from the script will abort the + domain startup operation, and if an error string is passed on + stderr by the hook script, it will be provided back to the user + at the libvirt API level. + For domain shutdown, the script will be called just after the + domain has finished execution, and the script will get: + <pre>/etc/libvirt/hooks/qemu test stopped end -</pre> + It is expected that other operation will be associated to hooks + but at the time of 0.8.0 only those 2 are associated to domains + lifecycle + </li> + </ul> + + </body> +</html> diff --git a/docs/sitemap.html.in b/docs/sitemap.html.in index 0c3f0c3..0117c8d 100644 --- a/docs/sitemap.html.in +++ b/docs/sitemap.html.in @@ -50,6 +50,10 @@ <a href="logging.html">Logging</a> The library and the daemon logging support </li> + <li> + <a href="hooks.html">Hooks</a> + Hooks for system specific management + </li> </ul> </li> <li> -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel(a)veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/

3 3

[libvirt] [PATCH v1 0/2] Add missing protocol filters for IPv4 and add IPv6 support
by Stefan Berger 12 Apr '10

12 Apr '10

The first one of the following two patches adds support for filtering of ah, esp and udplite protocols. The 2nd one adds support for filtering of IPv6 traffic. With this now nearly all protocols of IPv4 and IPv6 (except mh) as supported by iptables/ip6tables are reachable via the filtering XML. Some features of those protocols still need support in data structures and XML attributes, though. Another thing that's missing is support for filtering of IPv6's NDP traffic (IPv6 equivalent of ARP) but there's no support for this in ebtables. Regards, Stefan

2 7

[libvirt] migration flags
by Kenneth Nagin 12 Apr '10

12 Apr '10

Could someone explain the usage of the following migration flags: --p2p --direct --tunneled --persistent Kenneth Nagin

2 1

[libvirt] creating domain with same name and different UUID
by Nikola Ciprich 12 Apr '10

12 Apr '10

Hello, I have small problem with libvirt, which I'm trying to solve... I'm using defineXML function to create KVM machines. from time to time, I need to delete the domain, and create new one with the same name. every newly created domain has new UUID. and this is where the problem starts, defineXML function documentation tells that previous definition domain would be overriden if it already exists, but it ends up with following error: libvir: Domain Config error : operation failed: domain 'vmnci01' already exists with uuid 8d9795b3-461e-11df-9882-00304834195b Traceback (most recent call last): File "/usr/libexec/vm2.py", line 173, in ? vm.start() File "/usr/libexec/vmmain2.py", line 433, in start self.dom = self.svconn.defineXML(self.xmldef.vm.domain.xml()) File "/usr/lib64/python2.4/site-packages/libvirt.py", line 1120, in defineXML if ret is None:raise libvirtError('virDomainDefineXML() failed', conn=self) libvirt.libvirtError: operation failed: domain 'vmnci01' already exists with uuid 8d9795b3-461e-11df-9882-00304834195b If I try to undefine domain first, it still seems to behave weirdly: [root@vbox1 libexec]# vm __start__ vmnci01 undefining domain... Starting HVM guest vmnci01 libvir: QEMU error : Domain not found: no domain with matching uuid '8d9795b3-461e-11df-9882-00304834195b' Traceback (most recent call last): File "/usr/libexec/vm2.py", line 173, in ? vm.start() File "/usr/libexec/vmmain2.py", line 436, in start self.dom.create() File "/usr/lib64/python2.4/site-packages/libvirt.py", line 300, in create if ret == -1: raise libvirtError ('virDomainCreate() failed', dom=self) libvirt.libvirtError: Domain not found: no domain with matching uuid '8d9795b3-461e-11df-9882-00304834195b' Could anybody help me with this? Am I doing something wrong? Currently, I'm using libvirt-0.7.6 Thanks a lot in advance! with best regards nik A -- ------------------------------------- Ing. Nikola CIPRICH LinuxBox.cz, s.r.o. 28. rijna 168, 709 01 Ostrava tel.: +420 596 603 142 fax: +420 596 621 273 mobil: +420 777 093 799 www.linuxbox.cz mobil servis: +420 737 238 656 email servis: servis(a)linuxbox.cz -------------------------------------

2 1

[libvirt] question about libvirt-tck/libivrt-perl
by Gerhard Stenzel 12 Apr '10

12 Apr '10

Hi, I have a small libvirt-TCK script, which fails in a for me unexpected way: ########################################################## use strict; use warnings; use Term::ReadKey; use Test::More tests => 4; use Sys::Virt::TCK; my $tck = Sys::Virt::TCK->new(); my $conn = eval { $tck->setup(); }; BAIL_OUT "failed to setup test harness: $@" if $@; END { $tck->cleanup if $tck; } # first domain my $xml = $tck->generic_domain("tck")->as_xml; my $dom; ok_domain(sub { $dom = $conn->create_domain($xml) }, "defined domain config"); my $uuid = $dom->get_uuid_string(); diag $uuid; $xml = $dom->get_xml_description; diag "Starting inactive domain config"; ok($dom->get_id() > 0, "running domain has an ID > 0"); $dom->destroy; # new domain my $newxml = $tck->generic_domain("tck")->as_xml; my $newdom; ok_domain(sub { $newdom = $conn->create_domain($newxml) }, "defined domain config"); my $newuuid = $newdom->get_uuid_string(); diag $newuuid; $newxml = $newdom->get_xml_description(); ok($newdom->get_id() > 0, "running domain has an ID > 0"); $newdom->destroy; ########################################################## scripts/network/001-prepare-image.t .. 1..4 ok 1 - defined domain config # 4317db52-00bb-3cac-5639-91cdce05a717 # Starting inactive domain config ok 2 - running domain has an ID > 0 ok 3 - defined domain config # 4317db52-00bb-3cac-5639-91cdce05a717 libvirt error code: 42, message: Domain not found: no domain with matching uuid '4317db52-00bb-3cac-5639-91cdce05a717' # Looks like you planned 4 tests but ran 3. # Looks like your test exited with 255 just after 3. Dubious, test returned 255 (wstat 65280, 0xff00) Failed 1/4 subtests Test Summary Report ------------------- scripts/network/001-prepare-image.t (Wstat: 65280 Tests: 3 Failed: 0) Non-zero exit status: 255 Parse errors: Bad plan. You planned 4 tests but ran 3. Files=1, Tests=3, 1 wallclock secs ( 0.02 usr 0.01 sys + 0.19 cusr 0.04 csys = 0.26 CPU) Result: FAIL ########################################################## If I change my $newxml = $tck->generic_domain("tck")->as_xml; to my $newxml = $tck->generic_domain("tck2")->as_xml; the script works as expected. I am wondering if this is a problem in the libvirt-perl wrapper or working as designed and my expectation is simply wrong? Thanks in advance... -- Best regards, Gerhard Stenzel, ----------------------------------------------------------------------------------------------------------------------------------- IBM Deutschland Research & Development GmbH Vorsitzender des Aufsichtsrats: Martin Jetter Geschäftsführung: Dirk Wittkopp Sitz der Gesellschaft: Böblingen Registergericht: Amtsgericht Stuttgart, HRB 243294

3 4

[libvirt] [PATCH 0/1] enospace disk error policy
by David Allan 12 Apr '10

12 Apr '10

Dan Kenigsberg requested that we add an option to explicitly request enospace as the disk error policy. David Allan (1): Add enospace option to qemu disk error policy docs/schemas/domain.rng | 1 + src/conf/domain_conf.c | 3 +- src/conf/domain_conf.h | 1 + src/qemu/qemu_conf.c | 2 + tests/qemuargv2xmltest.c | 3 ++ ...uxml2argv-disk-drive-error-policy-enospace.args | 1 + ...muxml2argv-disk-drive-error-policy-enospace.xml | 32 ++++++++++++++++++++ 7 files changed, 42 insertions(+), 1 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-drive-error-policy-enospace.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-drive-error-policy-enospace.xml

5 6

[libvirt] libvirt: C++ or Java?
by Ganesh Pagade 12 Apr '10

12 Apr '10

Hello, I am planning to develop a management application for managing Redhat Xen and Redhat KVM hypervisors. I am evaluating the Java bindings versus the C++ version of libvirt. As part of evaluation, I could not find meaningful answers to the questions below. Hence, I thought that people on this mailing list would be the most appropriate to comment on them. Can you please let me know your views? 1. Are all functions that are available in C API available in Java? 2. Are Java bindings added along with every enhancement to C API? 3. If answer to above question is negative, typically how long does it takes for the addition of Java bindings for the enhancement? 4. Most of libvirt based third party management applications use which of Java bindings or C API? 5. What are your good/bad experiences while using either of C API or Java bindings? 6. What is your concluding personal recommendation? And finally, since libvirt is a Redhat Emerging Technology project, does Redhat or any other third party service providers provide paid assistance, support? Appreciate your time. Thanks. Regards, Ganesh

3 2

[libvirt] [PATCH 0/6]: Domain Snapshot API
by Chris Lalancette 12 Apr '10

12 Apr '10

Hello, Here is the next set of patches for the snapshot API. This set is much more complete, and implements the virDomainRevertToSnapshot() semantic instead of virDomainCreateFromSnapshot() that we discussed earlier. I've also incorporated all of the comments from the review of the first round of patches. Aside from implementation bugs, I consider this patchset complete. The only thing missing from the patches is real documentation along the lines of the API docs that we had discussed on-list. Next week I'll followup with some additions to the documentation that explain the semantics of these calls. Again review and comments are welcome. Chris Lalancette

6 24

[libvirt] [PATCH] Rename virsh "revert-to-snapshot" to "snapshot-revert"
by Chris Lalancette 12 Apr '10

12 Apr '10

Signed-off-by: Chris Lalancette <clalance(a)redhat.com> --- tools/virsh.c | 10 +++++----- tools/virsh.pod | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 8017beb..d5fe6c4 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -8514,22 +8514,22 @@ cleanup: } /* - * "revert-to-snapshot" command + * "snapshot-revert" command */ -static const vshCmdInfo info_revert_to_snapshot[] = { +static const vshCmdInfo info_snapshot_revert[] = { {"help", N_("Revert a domain to a snapshot")}, {"desc", N_("Revert domain to snapshot")}, {NULL, NULL} }; -static const vshCmdOptDef opts_revert_to_snapshot[] = { +static const vshCmdOptDef opts_snapshot_revert[] = { {"domain", VSH_OT_DATA, VSH_OFLAG_REQ, N_("domain name, id or uuid")}, {"snapshotname", VSH_OT_DATA, VSH_OFLAG_REQ, N_("snapshot name")}, {NULL, 0, 0, NULL} }; static int -cmdDomainRevertToSnapshot(vshControl *ctl, const vshCmd *cmd) +cmdDomainSnapshotRevert(vshControl *ctl, const vshCmd *cmd) { virDomainPtr dom = NULL; int ret = FALSE; @@ -8786,7 +8786,7 @@ static const vshCmdDef commands[] = { {"snapshot-delete", cmdSnapshotDelete, opts_snapshot_delete, info_snapshot_delete}, {"snapshot-dumpxml", cmdSnapshotDumpXML, opts_snapshot_dumpxml, info_snapshot_dumpxml}, {"snapshot-list", cmdSnapshotList, opts_snapshot_list, info_snapshot_list}, - {"revert-to-snapshot", cmdDomainRevertToSnapshot, opts_revert_to_snapshot, info_revert_to_snapshot}, + {"snapshot-revert", cmdDomainSnapshotRevert, opts_snapshot_revert, info_snapshot_revert}, {NULL, NULL, NULL, NULL} }; diff --git a/tools/virsh.pod b/tools/virsh.pod index 46ba813..4af5603 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -819,12 +819,12 @@ List all of the available snapshots for the given domain. Output the snapshot XML for the domain's snapshot named I<snapshot>. -=item B<revert-to-snapshot> I<domain> I<snapshot> +=item B<snapshot-revert> I<domain> I<snapshot> Revert the given domain to the snapshot specified by I<snapshot>. Be aware that this is a destructive action; any changes in the domain since the snapshot was taken will be lost. Also note that the state of the domain after -revert-to-snapshot is complete will be the state of the domain at the time +snapshot-revert is complete will be the state of the domain at the time the original snapshot was taken. =item B<snapshot-delete> I<domain> I<snapshot> I<--children> -- 1.6.6.1

2 2

[libvirt] [PATCH 0/2]: Two small fixes
by Luiz Capitulino 12 Apr '10

12 Apr '10

Two small issues I found while testing libvirt under QMP, there is also a third I won't fix today: dommemstat doesn't work under QMP.

2 5

[libvirt] [PATCH 0/2] Enhance checking of supported flags in drivers
by Jiri Denemark 12 Apr '10

12 Apr '10

I think we need a simple and consistent way of checking whether flags passed to API entry points in drivers are valid/supported or not. So far some entry points don't check flags at all and some checks for 0 when no flags are expected/supported. The first patch introduces a macro which can be called with a whitelist of supported flags (more info about it inside the patch). I don't particularily like introducing a new header file but non of existing header files looked like a good place to stick this macro in. If you think such a place exist, I'll be very happy to adapt the patch. The second patch changes all API calls introduced since the last release to use the macro for checking valid flags. I'm not sure if we can change existing API calls to do the same as it could break some badly written apps which pass invalid flags. My opinion is that we may often do that as such apps don't use the API in a documented/valid way. But even if my thinking is correct, we don't want to change it before 0.8.0. Jirka Jiri Denemark (2): Introduce virCheckFlags for consistent flags checking Use virCheckFlags for APIs added in 0.8.0 src/Makefile.am | 3 +- src/esx/esx_driver.c | 44 ++++++++++++------------- src/nwfilter/nwfilter_driver.c | 5 ++- src/qemu/qemu_driver.c | 69 +++++++++++++++++++--------------------- src/storage/storage_driver.c | 7 +--- src/util/checks.h | 37 +++++++++++++++++++++ src/vbox/vbox_tmpl.c | 42 +++++++++++++++++------- src/xen/xend_internal.c | 5 +++ 8 files changed, 133 insertions(+), 79 deletions(-) create mode 100644 src/util/checks.h

2 3

[libvirt] [PATCH] nwfilter: Fix memory leak on daemon init and shutdown
by Stefan Berger 12 Apr '10

12 Apr '10

This patch fixes a memory leak on daemon init and shutdown. The module was initialized twice and not shut down. Signed-off-by: Stefan Berger <stefanb(a)us.ibm.com>

2 2

[libvirt] libvirt Error Domain didn't show up
by Roche, Christian (EXT-Other - MA/Rabat) 12 Apr '10

12 Apr '10

Hi there, I'm trying to use kvm on CentOS 5.4 64-bit to virtualize Windows Server 2003. I've been able to install and start the system using 1GB of memory, however when I try to increase the amount of memory available to the VM to 4GB by editing /etc/libvirt/qemu/windows2003.xml, I get the following message when starting the VM through virt-manager: --------------------------------- Error starting domain: internal error Domain windows2003 didn't show up Traceback (most recent call last): File "/usr/share/virt-manager/virtManager/engine.py", line 498, in run_domain vm.startup() File "/usr/share/virt-manager/virtManager/domain.py", line 573, in startup self.vm.create() File "/usr/lib64/python2.4/site-packages/libvirt.py", line 287, in create if ret == -1: raise libvirtError ('virDomainCreate() failed', dom=self) libvirtError: internal error Domain windows2003 didn't show up --------------------------------- Here is the content of /var/log/libvirt/qemu/windows2003.log : --------------------------------- LC_ALL=C PATH=/sbin:/usr/sbin:/bin:/usr/bin /usr/bin/qemu-system-x86_64 -S -M pc -no-kqemu -m 4096 -smp 4 -monitor pty -pidfile /var/run/libvirt/qemu//windows2003.pid -localtime -boot c -hda /dev/mapper/Raid5-Windows -cdrom /var/lib/libvirt/images/viostor.iso -net nic,macaddr=54:52:00:07:a9:b6,vlan=0 -net tap,fd=16,script=,vlan=0,ifname=vnet0 -serial pty -parallel none -usb -usbdevice tablet -vnc 127.0.0.1:0 -k fr QEMU PC emulator version 0.9.0, Copyright (c) 2003-2007 Fabrice Bellard usage: qemu [options] [disk_image] 'disk_image' is a raw hard image image for IDE hard disk 0 Standard options: -M machine select emulated machine (-M ? for list) -fda/-fdb file use 'file' as floppy disk 0/1 image -hda/-hdb file use 'file' as IDE hard disk 0/1 image blah blah blah --------------------------------- It looks like qemu is unhappy about the memory parameter. Here is my config: >uname -a Linux silver 2.6.18-164.15.1.el5 #1 SMP Wed Mar 17 11:30:06 EDT 2010 x86_64 x86_64 x86_64 GNU/Linux >grep virt /var/log/rpmpkgs libvirt-0.6.3-20.1.el5_4.x86_64.rpm libvirt-python-0.6.3-20.1.el5_4.x86_64.rpm python-virtinst-0.400.3-5.el5.noarch.rpm virt-manager-0.6.1-8.el5.x86_64.rpm Any idea ? Thanks, Christian Roche NSN/Rabat +212 6 61 44 11 71

1 0

Re: [libvirt] Domain not stable while created...
by Sankamesh 12 Apr '10

12 Apr '10

Thanks Mr. Stefan Will that crash mainly be due to the kernel ? Since am not sure about that,else I should try with different image. When I use via a config file using "xm create libvirt-ttylinux.conf ", then the domain runs stable.... But when I use the virsh -c xen:/// define libvirt-ttylinux.xml" and "virsh start ttyimage, it crashes after sometime. The ibvirt-ttylinux.conf file :: -------------------------------------------------------------------------------------------------------------------------------- kernel = "/boot/vmlinuz-2.6.18-164.2.1.el5xen" ramdisk= "/boot/initrd-2.6.18-164.2.1.el5xen.img" memory = 64 name = "ttylinux" disk = ['file:/usr/local/ttylinux-xen-libvirt/ttylinux-xen.img,sda1,w'] root = "/dev/sda1 ro" vif = [''] -------------------------------------------------------------------------------------------------------------------------------- I give the same Xen kernel parameter here in xml file, and use virsh to create domain --------------------------------------------------------------------------------------------------------------------------------------- <?xml version="1.0" encoding="utf-8"?> <domain type='xen'> <name>ttyimage</name> <os> <type>linux</type> <kernel>/boot/vmlinuz-2.6.18-164.2.1.el5xen</kernel> <initrd>/boot/initrd-2.6.18-164.2.1.el5xen.img</initrd> </os> <memory>65536</memory> <vcpu>1</vcpu> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> <graphics type='vnc' port='5900'/> <disk type='file'> <source file='/usr/local/ttylinux-xen-libvirt/ttylinux-xen.img' /> <target dev='sda1' /> </disk> <interface type='bridge'> <source bridge='virbr0' /> <mac address='00:1d:60:ec:ae:1c' /> <target dev='testnimb-0' /> </interface> </devices> </domain> --------------------------------------------------------------------------------------------------------------------------------------- My Boot grub file data:: --------------------------------------------------------------------------------------------------------------------------------------title Scientific Linux (2.6.18-164.2.1.el5xen) root (hd0,0) kernel /xen.gz-2.6.18-164.2.1.el5 module /vmlinuz-2.6.18-164.2.1.el5xen ro root=LABEL=/1 rhgb quiet module /initrd-2.6.18-164.2.1.el5xen.img -------------------------------------------------------------------------------------------------------------------------------------- Why is this difference between the xm (when i destroy the image,domain is also destroyed) and virsh (domain is not destroyed while destroying the image) . I doubt that am making some mistake with the xml file .... Is that true? Kindly give some suggestions Thanks ________________________________ libvir-list-bounces(a)redhat.com wrote on 04/10/2010 09:47:17 AM: > libvir-list > > Hello, > > Thanks Alex > > I created a domain using "virsh -c xen:/// define libvirt-ttylinux.xml" and > "virsh start ttyimage" for a simple ttyimage. > > Problem I face is that the image shutsdown immedialtely once virsh > start guest is typed. > I checked the Xend Logs > ---------------------------------------------------------------------------------------------------------- > ---[2010-04-11 07:08:02 xend 3155] DEBUG (DevController:116) > DevController: writing {'frontend-id': '6', 'domain': 'ttyimage', [...] > [2010-04-11 07:08:02 xend 3155] DEBUG (vfbif:11) Spawn: ['/usr/lib/ > xen/bin/qemu-dm', '-M', 'xenpv', '-d', '6', '-domain-name', > 'ttyimage', '-vnc', '127.0.0.1:0', '-vncunused', '-k', 'en-us'] > [2010-04-11 07:08:02 xend.XendDomainInfo 3155] DEBUG > (XendDomainInfo:992) Storing VM details: {'shadow_memory': '0', > 'uuid': 'd5e916b0-bc2d-01f9-8156-4808c754f67a', 'on_reboot': > 'restart', 'start_time': '1270937282.29', 'on_poweroff': 'destroy', > 'name': 'ttyimage', 'xend/restart_count': '0', 'vcpus': '1', > 'vcpu_avail': '1', 'memory': '64', 'on_crash': 'destroy', 'image': > '(linux (kernel /boot/vmlinuz-2.6.18-164.2.1.el5xen))', 'maxmem': '64'} > [2010-04-11 07:08:02 xend.XendDomainInfo 3155] DEBUG > (XendDomainInfo:1027) Storing domain details: {'console/ring-ref': > '65674', 'console/port': '2', 'name': 'ttyimage', 'console/limit': > '1048576', 'vm': '/vm/d5e916b0-bc2d-01f9-8156-4808c754f67a', > 'domid': '6', 'cpu/0/availability': 'online', 'memory/target': > '65536', 'store/ring-ref': '65675', 'store/port': '1'} > [2010-04-11 07:08:02 xend.XendDomainInfo 3155] DEBUG > (XendDomainInfo:1249) XendDomainInfo.handleShutdownWatch > [2010-04-11 07:08:02 xend 3155] DEBUG (DevController:158) Waiting > for devices vif. > [2010-04-11 07:08:02 xend 3155] DEBUG (DevController:164) Waiting for 0. > [2010-04-11 07:08:02 xend 3155] DEBUG (DevController:509) > hotplugStatusCallback /local/domain/0/backend/vif/6/0/hotplug-status. > [2010-04-11 07:08:51 xend 3155] INFO (XendDomain:387) Domain > ttyimage (6) unpaused. > [2010-04-11 07:08:54 xend.XendDomainInfo 3155] WARNING > (XendDomainInfo:1177) Domain has crashed: name=ttyimage id=6. You domain crashed here... Is the VM image and kernel in that image known to work? Regards, Stefan Send free SMS to your Friends on Mobile from your Yahoo! Messenger. Download Now! http://messenger.yahoo.com/download.php

2 1

[libvirt] about qemu monitor mode.
by Osier Yang 12 Apr '10

12 Apr '10

Hello there libvirt compiles JSON mode as the default qemu monitor mode if yajl-devel is available. As a result of this solution, the user has no way to change into the text mode. And because the qemu QMP always lacks commands currently, such as "savevm", it will prevent us creating the snapshot of domain, especially for us who want to do some testing. What I think is could we add the configuration item in qemu.conf? so that the user can choose which mode to use, such as: monitor_mode=json #monitor_mode=text Regards osier

2 1

[libvirt] libvirt: C++ or Java
by Gokhale, Shashibhushan 11 Apr '10

11 Apr '10

Hello, I am planning to develop a management application for managing Redhat Xen and Redhat KVM hypervisors. I am evaluating the Java bindings versus the C++ version of libvirt. As part of evaluation, I could not find meaningful answers to the questions below. Hence, I thought that people on this mailing list would be the most appropriate to comment on them. Can you please let me know your views? 1. Are all functions that are available in C API available in Java? 2. Are Java bindings added along with every enhancement to C API? 3. If answer to above question is negative, typically how long does it takes for the addition of Java bindings for the enhancement? 4. Most of libvirt based third party management applications use which of Java bindings or C API? 5. What are your good/bad experiences while using either of C API or Java bindings? 6. What is your concluding personal recommendation? And finally, since libvirt is a Redhat Emerging Technology project, does Redhat or any other third party service providers provide paid assistance, support? Thanks, Shashi

1 0

[libvirt] Domain not stable while created...
by Sankamesh 10 Apr '10

10 Apr '10

Hello, I am using Scientific Linux 5.4 and xen. I want to deploy a sample ttyimage by creating a domain using virsh create. My configuration file is : ----------------------------------------------------------------------------------------------------- <?xml version="1.0" encoding="utf-8"?> <domain type='xen'> <name>ttyimage</name> <os> <type>linux</type> <kernel>/boot/vmlinuz-2.6.18-164.2.1.el5xen</kernel> </os> <memory>65536</memory> <vcpu>1</vcpu> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> <graphics type='vnc' port='5900'/> <disk type='file'> <source file='/usr/local/ttylinux-xen-libvirt/ttylinux-xen.img' /> <target dev='sda' /> </disk> <interface type='bridge'> <source bridge='virbr0' /> <mac address='00:1d:60:ec:ae:1c' /> <target dev='testnimb-0' /> </interface> </devices> </domain> ------------------------------------------------------------------------------------------------------- when I use "virsh -c "xen:///" create libvirt-ttylinux.xml " to create a domain, the domain is crated and i can view the image (in paused mode) using the virt-manager. and when I resume the image it ,disappears (domain gets destroyed) after nearly 10 seconds..... Further when I use vncviewer localhost::5900 when the image is running (during the 10 sec) ,i can view the console. But it closes once the domain is destroyed. Can someone explain why the image is not stable??? how can I make the domain to be stable???? Thanks in advance The INTERNET now has a personality. YOURS! See your Yahoo! Homepage. http://in.yahoo.com/

3 3