- Devel - libvirt List Archives

[libvirt] [PATCH 0/2] xen/libxl: support enabling or disabling the HPET
by Paolo Bonzini 10 May '11

10 May '11

This patch series add support for enabling or disabling the HPET in Xen domains. It's split in two because I didn't have means to test the libxl part. Paolo Bonzini (2): xen: parse and generate hpet item in sxpr libxl: support enabling the HPET src/libxl/libxl_conf.c | 8 ++++ src/xenxs/xen_sxpr.c | 26 +++++++++++ src/xenxs/xen_xm.c | 26 +++++++++++ tests/sexpr2xmldata/sexpr2xml-fv-force-hpet.sexpr | 9 ++++ tests/sexpr2xmldata/sexpr2xml-fv-force-hpet.xml | 44 +++++++++++++++++++ .../sexpr2xmldata/sexpr2xml-fv-force-nohpet.sexpr | 9 ++++ tests/sexpr2xmldata/sexpr2xml-fv-force-nohpet.xml | 44 +++++++++++++++++++ tests/sexpr2xmltest.c | 2 + tests/xmconfigdata/test-fullvirt-force-hpet.cfg | 26 +++++++++++ tests/xmconfigdata/test-fullvirt-force-hpet.xml | 45 ++++++++++++++++++++ tests/xmconfigdata/test-fullvirt-force-nohpet.cfg | 26 +++++++++++ tests/xmconfigdata/test-fullvirt-force-nohpet.xml | 45 ++++++++++++++++++++ tests/xmconfigtest.c | 3 + tests/xml2sexprdata/xml2sexpr-fv-force-hpet.sexpr | 9 ++++ tests/xml2sexprdata/xml2sexpr-fv-force-hpet.xml | 39 +++++++++++++++++ .../xml2sexprdata/xml2sexpr-fv-force-nohpet.sexpr | 9 ++++ tests/xml2sexprdata/xml2sexpr-fv-force-nohpet.xml | 39 +++++++++++++++++ tests/xml2sexprtest.c | 2 + 18 files changed, 411 insertions(+), 0 deletions(-) create mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-force-hpet.sexpr create mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-force-hpet.xml create mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-force-nohpet.sexpr create mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-force-nohpet.xml create mode 100644 tests/xmconfigdata/test-fullvirt-force-hpet.cfg create mode 100644 tests/xmconfigdata/test-fullvirt-force-hpet.xml create mode 100644 tests/xmconfigdata/test-fullvirt-force-nohpet.cfg create mode 100644 tests/xmconfigdata/test-fullvirt-force-nohpet.xml create mode 100644 tests/xml2sexprdata/xml2sexpr-fv-force-hpet.sexpr create mode 100644 tests/xml2sexprdata/xml2sexpr-fv-force-hpet.xml create mode 100644 tests/xml2sexprdata/xml2sexpr-fv-force-nohpet.sexpr create mode 100644 tests/xml2sexprdata/xml2sexpr-fv-force-nohpet.xml -- 1.7.4.4

3 7

[libvirt] how to assign an ip when assign a NIC or VF to the Virtual Machine?
by guan qin 10 May '11

10 May '11

Hi， I use the *Intel Virtualization Technology for Directed I/O*(VT-d) or *Single-Root I/O Virtualization*(SR-IOV) to assign a network card or Virtual Function(VF) to a Virtual Machine(VM) to access the network by the hostdev element in libvirt Domain XML. But the ethX in the VM hasn't an ip,I must to enter the VM to assign an ip to the VM manually. So how can I assign an ip to the VM when assign the NIC or VF to the VM ?thanks. best regards, qinguan

4 6

[libvirt] [PATCH 2/2] docs: updates to CA cert and client cert/key info
by Doug Goldstein 10 May '11

10 May '11

Update the documentation to mention that the CA certificate and the client cert/key pair can come from the user's location or the global location independent of each other. Signed-off-by: Doug Goldstein <cardoe(a)gentoo.org> --- docs/remote.html.in | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/docs/remote.html.in b/docs/remote.html.in index 33dbba2..42eb14c 100644 --- a/docs/remote.html.in +++ b/docs/remote.html.in @@ -395,10 +395,13 @@ next section. </p> <ul> <li> For a non-root user, libvirt tries to find the certificates - in $HOME/.pki/libvirt. If any of the required certificates can - not be found, then the global default locations - (/etc/pki/CA/cacert.pem, /etc/pki/libvirt/private/clientkey, - /etc/pki/libvirt/clientcert.pem) will be used. + in $HOME/.pki/libvirt. If the required CA certificate can + not be found, then the global default location + (/etc/pki/CA/cacert.pem) will be used. + Likewise, if either the client certificate + or the client key can not be found, then the global default + locations (/etc/pki/libvirt/clientcert.pem, + /etc/pki/libvirt/private/clientkey.pem) will be used. </li> <li> For the root user, the global default locations will be used.</li> </ul> -- 1.7.5.rc3

3 3

[libvirt] [PATCH 1/2] virsh: flexibility in CA cert and user cert/key
by Doug Goldstein 10 May '11

10 May '11

Allow the CA certificate to come from the user's home directory or from the global location independently of the client certificate/key pair. Mostly for the case when each user on a system has their own cert/key pair but the system as a whole shares the same CA. Signed-off-by: Doug Goldstein <cardoe(a)gentoo.org> --- src/remote/remote_driver.c | 19 ++++++++++++------- 1 files changed, 12 insertions(+), 7 deletions(-) diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index 4c3bdf3..9965d38 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -1222,21 +1222,26 @@ initialize_gnutls(char *pkipath, int flags) "clientcert.pem")) < 0) goto out_of_memory; - /* Use default location as long as one of CA certificate, + /* Use the default location of the CA certificate if it + * cannot be found in $HOME/.pki/libvirt + */ + if (!virFileExists(libvirt_cacert)) { + VIR_FREE(libvirt_cacert); + + libvirt_cacert = strdup(LIBVIRT_CACERT); + if (!libvirt_cacert) goto out_of_memory; + } + + /* Use default location as long as one of * client key, and client certificate cannot be found in * $HOME/.pki/libvirt, we don't want to make user confused * with one file is here, the other is there. */ - if (!virFileExists(libvirt_cacert) || - !virFileExists(libvirt_clientkey) || + if (!virFileExists(libvirt_clientkey) || !virFileExists(libvirt_clientcert)) { - VIR_FREE(libvirt_cacert); VIR_FREE(libvirt_clientkey); VIR_FREE(libvirt_clientcert); - libvirt_cacert = strdup(LIBVIRT_CACERT); - if (!libvirt_cacert) goto out_of_memory; - libvirt_clientkey = strdup(LIBVIRT_CLIENTKEY); if (!libvirt_clientkey) goto out_of_memory; -- 1.7.5.rc3

3 3

[libvirt] [PATCH] Remove all generated RPC files from GIT
by Daniel P. Berrange 10 May '11

10 May '11

commit 7a2fd256cb85dd9a9d6640d9faed0b66ca617411 Author: Daniel P. Berrange <berrange(a)redhat.com> Date: Fri May 6 13:36:21 2011 +0100 Remove all generated files for remote protocol Stop storing the generated files for the remote protocol client and server in source control. The generated files will still be included in the result of 'make dist' to avoid end-users needing to generate the files * daemon/Makefile.am: Removed generated files with maintainer-clean target * src/Makefile.am: Removed generated files with maintainer-clean target. Always run 'rpcgen' if generated files are missing NB: hand edited diff to remove the huge deleted files diff --git a/daemon/Makefile.am b/daemon/Makefile.am index af71188..49e94d2 100644 --- a/daemon/Makefile.am +++ b/daemon/Makefile.am @@ -2,11 +2,7 @@ CLEANFILES = -DAEMON_SOURCES = \ - libvirtd.c libvirtd.h \ - remote.c remote.h \ - dispatch.c dispatch.h \ - stream.c stream.h \ +DAEMON_GENERATED = \ remote_dispatch_prototypes.h \ remote_dispatch_table.h \ remote_dispatch_args.h \ @@ -14,9 +10,16 @@ DAEMON_SOURCES = \ qemu_dispatch_prototypes.h \ qemu_dispatch_table.h \ qemu_dispatch_args.h \ - qemu_dispatch_ret.h \ + qemu_dispatch_ret.h + +DAEMON_SOURCES = \ + libvirtd.c libvirtd.h \ + remote.c remote.h \ + dispatch.c dispatch.h \ + stream.c stream.h \ ../src/remote/remote_protocol.c \ - ../src/remote/qemu_protocol.c + ../src/remote/qemu_protocol.c \ + $(DAEMON_GENERATED) AVAHI_SOURCES = \ mdns.c mdns.h @@ -201,17 +204,8 @@ uninstall-data-polkit:: endif -remote.c: \ - remote_dispatch_prototypes.h \ - remote_dispatch_table.h \ - qemu_dispatch_prototypes.h \ - qemu_dispatch_table.h - -remote.h: \ - remote_dispatch_args.h \ - remote_dispatch_ret.h \ - qemu_dispatch_args.h \ - qemu_dispatch_ret.h +remote.c: $(DAEMON_GENERATED) +remote.h: $(DAEMON_GENERATED) REMOTE_PROTOCOL = $(top_srcdir)/src/remote/remote_protocol.x QEMU_PROTOCOL = $(top_srcdir)/src/remote/qemu_protocol.x @@ -350,4 +344,4 @@ endif CLEANFILES += $(BUILT_SOURCES) $(man8_MANS) CLEANFILES += *.cov *.gcov .libs/*.gcda .libs/*.gcno *.gcno *.gcda -MAINTAINERCLEANFILES = $(srcdir)/libvirtd.8.in +MAINTAINERCLEANFILES = $(srcdir)/libvirtd.8.in $(DAEMON_GENERATED) diff --git a/daemon/qemu_dispatch_args.h b/daemon/qemu_dispatch_args.h deleted file mode 100644 index e278fa4..0000000 --- a/daemon/qemu_dispatch_args.h +++ /dev/null @@ -1,5 +0,0 @@ -/* Automatically generated by remote_generate_stubs.pl. - * Do not edit this file. Any changes you make will be lost. - */ - - qemu_monitor_command_args val_qemu_monitor_command_args; diff --git a/daemon/qemu_dispatch_prototypes.h b/daemon/qemu_dispatch_prototypes.h deleted file mode 100644 index 4ec1ab4..0000000 --- a/daemon/qemu_dispatch_prototypes.h +++ /dev/null diff --git a/daemon/qemu_dispatch_ret.h b/daemon/qemu_dispatch_ret.h deleted file mode 100644 index 492dcf9..0000000 --- a/daemon/qemu_dispatch_ret.h +++ /dev/null diff --git a/daemon/qemu_dispatch_table.h b/daemon/qemu_dispatch_table.h deleted file mode 100644 index c196a3c..0000000 --- a/daemon/qemu_dispatch_table.h +++ /dev/null diff --git a/daemon/remote_dispatch_args.h b/daemon/remote_dispatch_args.h deleted file mode 100644 index f9537d7..0000000 --- a/daemon/remote_dispatch_args.h +++ /dev/null diff --git a/daemon/remote_dispatch_prototypes.h b/daemon/remote_dispatch_prototypes.h deleted file mode 100644 index cf2f38c..0000000 --- a/daemon/remote_dispatch_prototypes.h +++ /dev/null diff --git a/daemon/remote_dispatch_ret.h b/daemon/remote_dispatch_ret.h deleted file mode 100644 index 114e832..0000000 --- a/daemon/remote_dispatch_ret.h +++ /dev/null diff --git a/daemon/remote_dispatch_table.h b/daemon/remote_dispatch_table.h deleted file mode 100644 index b39f7c2..0000000 --- a/daemon/remote_dispatch_table.h +++ /dev/null diff --git a/src/Makefile.am b/src/Makefile.am index 1eaa7d1..00c5e04 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -154,15 +154,22 @@ CONF_SOURCES = \ $(CPU_CONF_SOURCES) # The remote RPC driver, covering domains, storage, networks, etc -REMOTE_DRIVER_SOURCES = \ - gnutls_1_0_compat.h \ - remote/remote_driver.c remote/remote_driver.h \ +REMOTE_DRIVER_GENERATED = \ remote/remote_protocol.c \ remote/remote_protocol.h \ remote/qemu_protocol.c \ remote/qemu_protocol.h -EXTRA_DIST += remote/remote_protocol.x remote/qemu_protocol.x \ +REMOTE_DRIVER_PROTOCOL = \ + remote/remote_protocol.x \ + remote/qemu_protocol.x + +REMOTE_DRIVER_SOURCES = \ + gnutls_1_0_compat.h \ + remote/remote_driver.c remote/remote_driver.h \ + $(REMOTE_DRIVER_GENERATED) + +EXTRA_DIST += $(REMOTE_DRIVER_PROTOCOL) \ remote/rpcgen_fix.pl # Ensure that we don't change the struct or member names or member ordering @@ -528,68 +535,17 @@ libvirt_driver_remote_la_LDFLAGS += -module -avoid-version endif libvirt_driver_remote_la_SOURCES = $(REMOTE_DRIVER_SOURCES) -if HAVE_RPCGEN -# -# Maintainer-only target for re-generating the derived .c/.h source -# files, which are actually derived from the .x file. -# -# For committing protocol changes to GIT, the GLIBC rpcgen *must* -# be used. -# -# Support for non-GLIB rpcgen is here as a convenience for -# non-Linux people needing to test changes during dev. -# -rpcgen-normal: - rm -f rp.c-t rp.h-t rp.c-t1 rp.c-t2 rp.h-t1 - $(RPCGEN) -h -o rp.h-t $(srcdir)/remote/remote_protocol.x - $(RPCGEN) -c -o rp.c-t $(srcdir)/remote/remote_protocol.x -if HAVE_GLIBC_RPCGEN - perl -w $(srcdir)/remote/rpcgen_fix.pl rp.h-t > rp.h-t1 - perl -w $(srcdir)/remote/rpcgen_fix.pl rp.c-t > rp.c-t1 - (echo '#include <config.h>'; cat rp.c-t1) > rp.c-t2 - chmod 0444 rp.c-t2 rp.h-t1 - mv -f rp.h-t1 $(srcdir)/remote/remote_protocol.h - mv -f rp.c-t2 $(srcdir)/remote/remote_protocol.c - rm -f rp.c-t rp.h-t rp.c-t1 -else - chmod 0444 rp.c-t rp.h-t - mv -f rp.h-t $(srcdir)/remote/remote_protocol.h - mv -f rp.c-t $(srcdir)/remote/remote_protocol.c -endif - -rpcgen-qemu: - rm -f rp_qemu.c-t rp_qemu.h-t rp_qemu.c-t1 rp_qemu.c-t2 rp_qemu.h-t1 - $(RPCGEN) -h -o rp_qemu.h-t $(srcdir)/remote/qemu_protocol.x - $(RPCGEN) -c -o rp_qemu.c-t $(srcdir)/remote/qemu_protocol.x -if HAVE_GLIBC_RPCGEN - perl -w $(srcdir)/remote/rpcgen_fix.pl rp_qemu.h-t > rp_qemu.h-t1 - perl -w $(srcdir)/remote/rpcgen_fix.pl rp_qemu.c-t > rp_qemu.c-t1 - (echo '#include <config.h>'; cat rp_qemu.c-t1) > rp_qemu.c-t2 - chmod 0444 rp_qemu.c-t2 rp_qemu.h-t1 - mv -f rp_qemu.h-t1 $(srcdir)/remote/qemu_protocol.h - mv -f rp_qemu.c-t2 $(srcdir)/remote/qemu_protocol.c - rm -f rp_qemu.c-t rp_qemu.h-t rp_qemu.c-t1 -else - chmod 0444 rp_qemu.c-t rp_qemu.h-t - mv -f rp_qemu.h-t $(srcdir)/remote/qemu_protocol.h - mv -f rp_qemu.c-t $(srcdir)/remote/qemu_protocol.c -endif -# -# Maintainer-only target for re-generating the derived .c/.h source -# files, which are actually derived from the .x file. -# -# For committing protocol changes to GIT, the GLIBC rpcgen *must* -# be used. -# -# Support for non-GLIB rpcgen is here as a convenience for -# non-Linux people needing to test changes during dev. -# -rpcgen: rpcgen-normal rpcgen-qemu +remote/remote_driver.c: $(REMOTE_DRIVER_GENERATED) -endif +remote/%_protocol.c: remote/%_protocol.x remote/%_protocol.h + $(AM_V_GEN)perl -w $(srcdir)/remote/rpcgen_fix.pl $(RPCGEN) -c \ + $< $@ + +remote/%_protocol.h: remote/%_protocol.x + $(AM_V_GEN)perl -w $(srcdir)/remote/rpcgen_fix.pl $(RPCGEN) -h \ + $< $@ -remote/remote_protocol.c: remote/remote_protocol.h endif if WITH_XEN @@ -1339,3 +1295,4 @@ endif CLEANFILES = *.gcov .libs/*.gcda .libs/*.gcno *.gcno *.gcda *.i *.s DISTCLEANFILES = $(BUILT_SOURCES) +MAINTAINERCLEANFILES = $(REMOTE_DRIVER_GENERATED) diff --git a/src/remote/qemu_protocol.c b/src/remote/qemu_protocol.c deleted file mode 100644 index 81916ed..0000000 --- a/src/remote/qemu_protocol.c +++ /dev/null diff --git a/src/remote/qemu_protocol.h b/src/remote/qemu_protocol.h deleted file mode 100644 index b822187..0000000 --- a/src/remote/qemu_protocol.h +++ /dev/null diff --git a/src/remote/remote_protocol.c b/src/remote/remote_protocol.c deleted file mode 100644 index 5604371..0000000 --- a/src/remote/remote_protocol.c +++ /dev/null diff --git a/src/remote/remote_protocol.h b/src/remote/remote_protocol.h deleted file mode 100644 index d9bf151..0000000 --- a/src/remote/remote_protocol.h +++ /dev/null diff --git a/src/remote/rpcgen_fix.pl b/src/remote/rpcgen_fix.pl index 3cf5479..d11bbd4 100644 --- a/src/remote/rpcgen_fix.pl +++ b/src/remote/rpcgen_fix.pl @@ -1,4 +1,6 @@ -# Fix XDR code (generated by rpcgen) so that it compiles +# +# Generate code for an XDR protocol, optionally applying +# fixups to the glibc rpcgen code so that it compiles # with warnings turned on. # # This code is evil. Arguably better would be just to compile @@ -17,10 +19,35 @@ use strict; my $in_function = 0; my @function = (); -while (<>) { +my $rpcgen = shift; +my $mode = shift; +my $xdrdef = shift; +my $target = shift; + +unlink $target; + +open RPCGEN, "-|", $rpcgen, $mode, $xdrdef + or die "cannot run $rpcgen $mode $xdrdef: $!"; +open TARGET, ">$target" + or die "cannot create $target: $!"; + +my $fixup = $^O eq "linux"; + +if ($mode eq "-c") { + print TARGET "#include <config.h>\n"; +} + +while (<RPCGEN>) { + # We only want to fixup the GLibc rpcgen output + # So just print data unchanged, if non-Linux + unless ($fixup) { + print TARGET; + next; + } + if (m/^{/) { $in_function = 1; - print; + print TARGET; next; } @@ -79,13 +106,21 @@ while (<>) { map { s/\bXDR_INLINE\b/(int32_t*)XDR_INLINE/; $_ } @function; - print (join ("", @function)); + print TARGET (join ("", @function)); @function = (); } unless ($in_function) { - print; + print TARGET; } else { push @function, $_; } } + +close TARGET + or die "cannot save $target: $!"; +close RPCGEN + or die "cannot shutdown $rpcgen: $!"; + +chmod 0444, $target + or die "cannot set $target readonly: $!"; -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|

4 24

[libvirt] [PATCH 0/5] Improvements for the remote generator
by Matthias Bolte 10 May '11

10 May '11

Adds whitelists and moves black and whitelists to their own files. Also makes parsing stricter and more uniform. Matthias

4 21

[libvirt] [PATCH 0/6] lxc: Improve startup debugging
by Cole Robinson 10 May '11

10 May '11

The following patches improve lxc container startup debugging, by logging the lxc_controller and <init> commands to the domain log file. To get there, we convert the commands to use virCommand. Cole Robinson (6): command: Add virCommandEnvAddFormat lxc: driver: Convert emulator launching to virCommand lxc: driver: Improve logging when launching emulator command: Add virCommandExec helper lxc: container: Convert <init> exec to virCommand lxc: container: Build init cmd before we close stdout src/libvirt_private.syms | 2 + src/lxc/lxc_container.c | 68 ++++++++-------- src/lxc/lxc_driver.c | 200 +++++++++++++--------------------------------- src/util/command.c | 45 +++++++++- src/util/command.h | 17 ++++ 5 files changed, 146 insertions(+), 186 deletions(-) -- 1.7.4.4

2 13

[libvirt] [PATCH] Fix two uninitialized variable warnings
by Matthias Bolte 10 May '11

10 May '11

gcc only reports them when compiling with -O3. --- src/util/interface.c | 2 +- tools/virsh.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/util/interface.c b/src/util/interface.c index 5e1987a..04a922c 100644 --- a/src/util/interface.c +++ b/src/util/interface.c @@ -91,7 +91,7 @@ ifaceGetFlags(const char *ifname, short *flags) { int ifaceIsUp(const char *ifname, bool *up) { - short flags; + short flags = 0; int rc = ifaceGetFlags(ifname, &flags); if (rc) diff --git a/tools/virsh.c b/tools/virsh.c index 2b16714..8b5572c 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -2857,7 +2857,7 @@ static bool cmdSetvcpus(vshControl *ctl, const vshCmd *cmd) { virDomainPtr dom; - int count; + int count = 0; bool ret = true; int maximum = vshCommandOptBool(cmd, "maximum"); int config = vshCommandOptBool(cmd, "config"); -- 1.7.0.4

2 2

[libvirt] [PATCH v2] Allow destroying QEMU VM even if a job is active
by Daniel P. Berrange 10 May '11

10 May '11

Introduce a virProcessKill function that can be safely called even when the job mutex is held. This allows virDomainDestroy to kill any VM even if it is asleep in a monitor job. The PID will die and the thread asleep on the monitor will then wake up releasing the job mutex. * src/qemu/qemu_driver.c: Kill process before using qemuProcessStop to ensure job is released * src/qemu/qemu_process.c: Add virProcessKill for killing off QEMU processes --- src/qemu/qemu_driver.c | 7 ++++++ src/qemu/qemu_process.c | 49 +++++++++++++++++++++++++++++++++++++++------- src/qemu/qemu_process.h | 2 + 3 files changed, 50 insertions(+), 8 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index b3f9e00..e12dfd8 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -1482,6 +1482,13 @@ static int qemudDomainDestroy(virDomainPtr dom) { goto cleanup; } + /* Although qemuProcessStop does this already, there may + * be an outstanding job active. We want to make sure we + * can kill the process even if a job is active. Killing + * it now means the job will be released + */ + qemuProcessKill(vm); + if (qemuDomainObjBeginJobWithDriver(driver, vm) < 0) goto cleanup; diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 4c2bb84..285d1e8 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -2369,6 +2369,46 @@ cleanup: } +void qemuProcessKill(virDomainObjPtr vm) +{ + int i; + int rc; + VIR_DEBUG("vm=%s pid=%d", vm->def->name, vm->pid); + + if (!virDomainObjIsActive(vm)) { + VIR_DEBUG("VM '%s' not active", vm->def->name); + return; + } + + /* This loop sends SIGTERM, then waits a few iterations + * (1.6 seconds) to see if it dies. If still alive then + * it does SIGKILL, and waits a few more iterations (1.6 + * seconds more) to confirm that it has really gone. + */ + for (i = 0 ; i < 15 ; i++) { + int signum; + if (i == 0) + signum = SIGTERM; + else if (i == 8) + signum = SIGKILL; + else + signum = 0; /* Just check for existence */ + + rc = virKillProcess(vm->pid, signum); + if (rc < 0) { + if (rc != -ERSCH) { + char ebuf[1024]; + VIR_WARN("Failed to kill process %d %s", + vm->pid, virStrerror(errno, ebuf, sizeof ebuf)); + } + break; + } + + usleep(200 * 1000); + } +} + + void qemuProcessStop(struct qemud_driver *driver, virDomainObjPtr vm, int migrated) @@ -2436,13 +2476,6 @@ void qemuProcessStop(struct qemud_driver *driver, } } - /* This will safely handle a non-running guest with pid=0 or pid=-1*/ - if (virKillProcess(vm->pid, 0) == 0 && - virKillProcess(vm->pid, SIGTERM) < 0) - virReportSystemError(errno, - _("Failed to send SIGTERM to %s (%d)"), - vm->def->name, vm->pid); - if (priv->mon) qemuMonitorClose(priv->mon); @@ -2454,7 +2487,7 @@ void qemuProcessStop(struct qemud_driver *driver, } /* shut it off for sure */ - virKillProcess(vm->pid, SIGKILL); + qemuProcessKill(vm); /* now that we know it's stopped call the hook if present */ if (virHookPresent(VIR_HOOK_DRIVER_QEMU)) { diff --git a/src/qemu/qemu_process.h b/src/qemu/qemu_process.h index f1ab599..d8afab0 100644 --- a/src/qemu/qemu_process.h +++ b/src/qemu/qemu_process.h @@ -49,4 +49,6 @@ void qemuProcessStop(struct qemud_driver *driver, virDomainObjPtr vm, int migrated); +void qemuProcessKill(virDomainObjPtr vm); + #endif /* __QEMU_PROCESS_H__ */ -- 1.7.4.4

2 1

[libvirt] [PATCH v2] Add support for YAJL version 2 API/ABI
by Daniel P. Berrange 10 May '11

10 May '11

Version 2.0.0 or yajl changed API. It is fairly trivial for us to cope with both APIs in libvirt, so adapt. * configure.ac: Probe for yajl2 API * src/util/json.c: Conditional support for yajl2 API --- configure.ac | 8 ++++++ src/util/json.c | 74 +++++++++++++++++++++++++++++++++++++++++------------- 2 files changed, 64 insertions(+), 18 deletions(-) diff --git a/configure.ac b/configure.ac index dcec371..62c0560 100644 --- a/configure.ac +++ b/configure.ac @@ -878,6 +878,7 @@ AC_ARG_WITH([yajl], YAJL_CFLAGS= YAJL_LIBS= +with_yajl2=no if test "x$with_yajl" != "xno"; then if test "x$with_yajl" != "xyes" && test "x$with_yajl" != "xcheck"; then YAJL_CFLAGS="-I$with_yajl/include" @@ -898,6 +899,9 @@ if test "x$with_yajl" != "xno"; then AC_CHECK_LIB([yajl], [yajl_parse],[ YAJL_LIBS="$YAJL_LIBS -lyajl" with_yajl=yes + AC_CHECK_LIB([yajl], [yajl_tree_parse],[ + with_yajl2=yes + ],[]) ],[ if test "x$with_yajl" = "xcheck" ; then with_yajl=no @@ -914,6 +918,10 @@ if test "x$with_yajl" != "xno"; then AC_DEFINE_UNQUOTED([HAVE_YAJL], 1, [whether YAJL is available for JSON parsing/formatting]) fi + if test "x$with_yajl2" = "xyes" ; then + AC_DEFINE_UNQUOTED([HAVE_YAJL2], 1, + [whether YAJL has API version 2]) + fi fi AM_CONDITIONAL([HAVE_YAJL], [test "x$with_yajl" = "xyes"]) AC_SUBST([YAJL_CFLAGS]) diff --git a/src/util/json.c b/src/util/json.c index df4771d..8bbb87b 100644 --- a/src/util/json.c +++ b/src/util/json.c @@ -32,6 +32,13 @@ #if HAVE_YAJL # include <yajl/yajl_gen.h> # include <yajl/yajl_parse.h> + +#ifdef HAVE_YAJL2 +#define yajl_size_t size_t +#else +#define yajl_size_t unsigned int +#endif + #endif /* XXX fixme */ @@ -672,7 +679,7 @@ static int virJSONParserInsertValue(virJSONParserPtr parser, return 0; } -static int virJSONParserHandleNull(void * ctx) +static int virJSONParserHandleNull(void *ctx) { virJSONParserPtr parser = ctx; virJSONValuePtr value = virJSONValueNewNull(); @@ -690,7 +697,7 @@ static int virJSONParserHandleNull(void * ctx) return 1; } -static int virJSONParserHandleBoolean(void * ctx, int boolean_) +static int virJSONParserHandleBoolean(void *ctx, int boolean_) { virJSONParserPtr parser = ctx; virJSONValuePtr value = virJSONValueNewBoolean(boolean_); @@ -708,9 +715,9 @@ static int virJSONParserHandleBoolean(void * ctx, int boolean_) return 1; } -static int virJSONParserHandleNumber(void * ctx, - const char * s, - unsigned int l) +static int virJSONParserHandleNumber(void *ctx, + const char *s, + yajl_size_t l) { virJSONParserPtr parser = ctx; char *str = strndup(s, l); @@ -734,9 +741,9 @@ static int virJSONParserHandleNumber(void * ctx, return 1; } -static int virJSONParserHandleString(void * ctx, - const unsigned char * stringVal, - unsigned int stringLen) +static int virJSONParserHandleString(void *ctx, + const unsigned char *stringVal, + yajl_size_t stringLen) { virJSONParserPtr parser = ctx; virJSONValuePtr value = virJSONValueNewStringLen((const char *)stringVal, @@ -755,9 +762,9 @@ static int virJSONParserHandleString(void * ctx, return 1; } -static int virJSONParserHandleMapKey(void * ctx, - const unsigned char * stringVal, - unsigned int stringLen) +static int virJSONParserHandleMapKey(void *ctx, + const unsigned char *stringVal, + yajl_size_t stringLen) { virJSONParserPtr parser = ctx; virJSONParserStatePtr state; @@ -776,7 +783,7 @@ static int virJSONParserHandleMapKey(void * ctx, return 1; } -static int virJSONParserHandleStartMap(void * ctx) +static int virJSONParserHandleStartMap(void *ctx) { virJSONParserPtr parser = ctx; virJSONValuePtr value = virJSONValueNewObject(); @@ -803,7 +810,7 @@ static int virJSONParserHandleStartMap(void * ctx) } -static int virJSONParserHandleEndMap(void * ctx) +static int virJSONParserHandleEndMap(void *ctx) { virJSONParserPtr parser = ctx; virJSONParserStatePtr state; @@ -827,7 +834,7 @@ static int virJSONParserHandleEndMap(void * ctx) return 1; } -static int virJSONParserHandleStartArray(void * ctx) +static int virJSONParserHandleStartArray(void *ctx) { virJSONParserPtr parser = ctx; virJSONValuePtr value = virJSONValueNewArray(); @@ -853,7 +860,7 @@ static int virJSONParserHandleStartArray(void * ctx) return 1; } -static int virJSONParserHandleEndArray(void * ctx) +static int virJSONParserHandleEndArray(void *ctx) { virJSONParserPtr parser = ctx; virJSONParserStatePtr state; @@ -895,14 +902,29 @@ static const yajl_callbacks parserCallbacks = { /* XXX add an incremental streaming parser - yajl trivially supports it */ virJSONValuePtr virJSONValueFromString(const char *jsonstring) { - yajl_parser_config cfg = { 1, 1 }; yajl_handle hand; virJSONParser parser = { NULL, NULL, 0 }; virJSONValuePtr ret = NULL; +#ifndef HAVE_YAJL2 + yajl_parser_config cfg = { 1, 1 }; +#endif VIR_DEBUG("string=%s", jsonstring); +#ifdef HAVE_YAJL2 + hand = yajl_alloc(&parserCallbacks, NULL, &parser); + if (hand) { + yajl_config(hand, yajl_allow_comments, 1); + yajl_config(hand, yajl_dont_validate_strings, 0); + } +#else hand = yajl_alloc(&parserCallbacks, &cfg, NULL, &parser); +#endif + if (!hand) { + virJSONError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Unable to create JSON parser")); + goto cleanup; + } if (yajl_parse(hand, (const unsigned char *)jsonstring, @@ -1003,15 +1025,31 @@ static int virJSONValueToStringOne(virJSONValuePtr object, char *virJSONValueToString(virJSONValuePtr object) { - yajl_gen_config conf = { 0, " " }; /* Turns off pretty printing since QEMU can't cope */ yajl_gen g; const unsigned char *str; char *ret = NULL; - unsigned int len; + yajl_size_t len; +#ifndef HAVE_YAJL2 + yajl_gen_config conf = { 0, " " }; /* Turns off pretty printing since QEMU can't cope */ +#endif VIR_DEBUG("object=%p", object); +#ifdef HAVE_YAJL2 + g = yajl_gen_alloc(NULL); + if (g) { + yajl_gen_config(g, yajl_gen_beautify, 0); + yajl_gen_config(g, yajl_gen_indent_string, " "); + yajl_gen_config(g, yajl_gen_validate_utf8, 1); + } +#else g = yajl_gen_alloc(&conf, NULL); +#endif + if (!g) { + virJSONError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Unable to create JSON formatter")); + goto cleanup; + } if (virJSONValueToStringOne(object, g) < 0) { virReportOOMError(); -- 1.7.4.4

2 1

[libvirt] [PATCH v3 0/8] Add support for taking screenshots of domain console
by Michal Privoznik 10 May '11

10 May '11

This series adds support for taking screenshots of a running domain console. The iohelper was added a new argument - delete file after transfer. This is needed, because the screenshot is written to file and asynchronously transferred to client. New API is accessible via virsh screenshot <domain> <path>; For now, we just save the file in format as returned by hypervisor: PPM for Qemu, PNG for VirtualBox. diff to v2: - rebase Michal Privoznik (8): screenshot: Defining the public API screenshot: Defining the internal API screenshot: Implementing the public API screenshot: Implementing the remote protocol screenshot: Expose the new API in virsh virFDStream: Add option for delete file after it's opening qemu: Implement the driver methods vbox: Implement the driver methods daemon/remote.c | 57 +++++++++++++++++++++ daemon/remote_generator.pl | 2 + include/libvirt/libvirt.h.in | 7 +++ src/driver.h | 5 ++ src/esx/esx_driver.c | 1 + src/fdstream.c | 29 ++++++++--- src/fdstream.h | 6 ++- src/libvirt.c | 56 ++++++++++++++++++++ src/libvirt_public.syms | 5 ++ src/libxl/libxl_driver.c | 1 + src/lxc/lxc_driver.c | 4 +- src/openvz/openvz_driver.c | 1 + src/phyp/phyp_driver.c | 1 + src/qemu/qemu_driver.c | 82 ++++++++++++++++++++++++++++++- src/qemu/qemu_monitor.c | 20 +++++++ src/qemu/qemu_monitor.h | 3 + src/qemu/qemu_monitor_json.c | 23 ++++++++ src/qemu/qemu_monitor_json.h | 4 ++ src/qemu/qemu_monitor_text.c | 31 +++++++++++ src/qemu/qemu_monitor_text.h | 2 + src/remote/remote_driver.c | 39 ++++++++++++++ src/remote/remote_protocol.x | 12 ++++- src/remote_protocol-structs | 7 +++ src/storage/storage_driver.c | 4 +- src/test/test_driver.c | 1 + src/uml/uml_driver.c | 4 +- src/util/iohelper.c | 12 ++++- src/vbox/vbox_tmpl.c | 114 ++++++++++++++++++++++++++++++++++++++++++ src/vmware/vmware_driver.c | 1 + src/xen/xen_driver.c | 4 +- src/xen/xen_driver.h | 1 + src/xen/xen_hypervisor.c | 1 + src/xen/xen_inotify.c | 1 + src/xen/xend_internal.c | 1 + src/xen/xm_internal.c | 1 + src/xen/xs_internal.c | 1 + src/xenapi/xenapi_driver.c | 1 + tools/virsh.c | 90 +++++++++++++++++++++++++++++++++ tools/virsh.pod | 4 ++ 39 files changed, 621 insertions(+), 18 deletions(-) -- 1.7.5.rc3

2 9

[libvirt] [TCK] [PATCH] Switch to installation of FC14 image and other fixes
by Stefan Berger 10 May '11

10 May '11

This patch fixes the creation of VM images. Previously, FC12 images were created but the files necessary for FC12 image creation are no longer available in the public repositories. This patch now switches it to create FC14 images. To get such a new image one may want to remove all content in /var/cache/libvirt-tck. I takes a long time for the image to install, though. The new FC14 image takes a lot longer to boot. Rather than waiting a fixed timeout during which the VM presumably has booted it is now waiting for the VM to become pingable and then starts the actual tests. Also, the name of the DHCP lease file used by dnsmasq has changed. Rather than hardcoding its name, try to pick it up from the running dnsmasq process's parameters. Fall back to the old name if the name of the leasefile could be determined via 'ps aux'. Signed-off-by: Stefan Berger <stefanb(a)linux.vnet.ibm.com> --- conf/default.cfg | 12 ++-- conf/ks.cfg | 3 - lib/Sys/Virt/TCK/NetworkHelpers.pm | 84 +++++++++++++++++++++++++++--- scripts/nwfilter/090-install-image.t | 11 ++- scripts/nwfilter/100-ping-still-working.t | 5 - scripts/nwfilter/210-no-mac-spoofing.t | 5 - scripts/nwfilter/220-no-ip-spoofing.t | 5 - scripts/nwfilter/230-no-mac-broadcast.t | 5 - scripts/nwfilter/240-no-arp-spoofing.t | 5 - scripts/nwfilter/300-vsitype.t | 3 - 10 files changed, 104 insertions(+), 34 deletions(-) Index: libvirt-tck/lib/Sys/Virt/TCK/NetworkHelpers.pm =================================================================== --- libvirt-tck.orig/lib/Sys/Virt/TCK/NetworkHelpers.pm +++ libvirt-tck/lib/Sys/Virt/TCK/NetworkHelpers.pm @@ -11,12 +11,76 @@ sub get_first_macaddress { sub get_ip_from_leases{ my $mac = shift; - my $tmp = `grep $mac /var/lib/dnsmasq/dnsmasq.leases`; + my $leasefile = `ps x | sed -n "s/.*dnsmasq.*default.*dhcp-leasefile=\$[/.[:alnum:]]*\$.*/\\1/p"`; + if ( $leasefile eq "" ) { + $leasefile = "/var/lib/dnsmasq/dnsmasq.leases"; + } + diag "leasefile is ${leasefile}"; + my $tmp = `grep $mac $leasefile`; my @fields = split(/ /, $tmp); my $ip = $fields[2]; return $ip; } +sub wait_for_vm_if_up { + my $mac = shift; + my $timeout = shift; + my $ipaddr = ""; + my $tmp = ""; + + while ( $timeout > 0 ) { + $ipaddr = get_ip_from_leases($mac); + if ( $ipaddr != "" ) { + last; + } + sleep(1); + $timeout -= 1; + diag "... waiting for the VM's DHCP lease to show up..." + } + + if ( $ipaddr != "" ) { + while ( $timeout > 0 ) { + $tmp = `ping $ipaddr -c 1 -W 2`; + if ( $tmp =~ "100% packet loss" ) { + $timeout -= 2; + } else { + sleep(5); + return $ipaddr; + } + diag "... waiting for the VM to become pingable..." + } + } + return 0; +} + +sub wait_for_vm_if_down { + my $mac = shift; + my $timeout = shift; + my $ipaddr = ""; + my $tmp = ""; + + $ipaddr = get_ip_from_leases($mac); + if ( $ipaddr == "" ) { + diag "Could not get the IP address of the VM."; + return 0; + } + + while ( $timeout > 0 ) { + $tmp = `ping $ipaddr -c 1 -W 2`; + if ( $tmp =~ "100% packet loss" ) { + diag "VM is off the network now."; + sleep(5); + return 1; + } + $timeout -= 2; + sleep(2); + diag "... waiting for the VM to be off the network ($timeout) ... " + } + return 0; +} + + + sub build_cdrom_ks_image { my $tck = shift; @@ -139,11 +203,19 @@ sub prepare_test_disk_and_vm{ my $dom = $conn->define_domain($guest->as_xml); diag "Starting installation domain"; $dom->create; - diag "wait for installation to finish .. "; - while($dom->is_active()) { - sleep(10); - diag ".. to view progress connect to virtual machine ${domain_name} .. "; - } + # Wait for the interface to come up; this may take a good while + my $guestip = wait_for_vm_if_up(get_first_macaddress($dom), 600); + if ( $guestip eq "" ) { + diag "Installation domain did not show an IP address. Destroying VM."; + $dom->destroy(); + } else { + diag "IP address of installating VM is $guestip"; + # wait until the installation is done -- may take a long time + if (!wait_for_vm_if_down(get_first_macaddress($dom), 7200)) { + diag "Installation did not complete in time. Destroying VM."; + $dom->destroy(); + } + } # cleanup install domain $dom->undefine; $dom = undef; Index: libvirt-tck/conf/default.cfg =================================================================== --- libvirt-tck.orig/conf/default.cfg +++ libvirt-tck/conf/default.cfg @@ -52,25 +52,25 @@ ks = /etc/libvirt-tck/ks.cfg # empty sparse root FS will be created # kernels = ( - # Fedora 11 i686 PAE has pv_ops, so one kernel can do both Xen and KVM guests here + # Fedora 14 i686 PAE has pv_ops, so one kernel can do both Xen and KVM guests here { arch = i686 ostype = ( hvm xen ) - kernel = http://download.fedora.redhat.com/pub/fedora/linux/releases/11/Fedora/i386/… - initrd = http://download.fedora.redhat.com/pub/fedora/linux/releases/11/Fedora/i386/… + kernel = http://download.fedora.redhat.com/pub/fedora/linux/releases/14/Fedora/i386/… + initrd = http://download.fedora.redhat.com/pub/fedora/linux/releases/14/Fedora/i386/… } - # Fedora 11 x86_64 has pv_ops, so one kernel can do both Xen and KVM guests here + # Fedora 14 x86_64 has pv_ops, so one kernel can do both Xen and KVM guests here { arch = x86_64 ostype = ( hvm xen ) - kernel = http://download.fedora.redhat.com/pub/fedora/linux/releases/11/Fedora/x86_6… - initrd = http://download.fedora.redhat.com/pub/fedora/linux/releases/11/Fedora/x86_6… + kernel = http://download.fedora.redhat.com/pub/fedora/linux/releases/14/Fedora/x86_6… + initrd = http://download.fedora.redhat.com/pub/fedora/linux/releases/14/Fedora/x86_6… } # User mode linux i686 needs custom kernel + root filesystem { Index: libvirt-tck/conf/ks.cfg =================================================================== --- libvirt-tck.orig/conf/ks.cfg +++ libvirt-tck/conf/ks.cfg @@ -1,6 +1,6 @@ install text -url --url=http://ftp-stud.hs-esslingen.de/Mirrors/fedora.redhat.com/linux/releases/12/Fedora/i386/os/ +url --url=http://download.fedora.redhat.com/pub/fedora/linux/releases/14/Fedora/i386/os/ lang en_US.UTF-8 keyboard de-latin1-nodeadkeys network --device eth0 --bootproto dhcp @@ -27,3 +27,4 @@ poweroff @base @core @hardware-support +%end Index: libvirt-tck/scripts/nwfilter/100-ping-still-working.t =================================================================== --- libvirt-tck.orig/scripts/nwfilter/100-ping-still-working.t +++ libvirt-tck/scripts/nwfilter/100-ping-still-working.t @@ -46,7 +46,7 @@ END { # create first domain and start it diag "Trying domain lookup by name"; my $dom1; -my $dom_name ="tckf12nwtest"; +my $dom_name ="tck-fedora-nwtest"; $dom1 = prepare_test_disk_and_vm($tck, $conn, $dom_name); $dom1->create(); @@ -63,8 +63,7 @@ ok($dom1->get_id() > 0, "running domain my $mac1 = get_first_macaddress($dom1); diag "mac is $mac1"; -sleep(30); -my $guestip1 = get_ip_from_leases($mac1); +my $guestip1 = wait_for_vm_if_up($mac1, 60); diag "ip is $guestip1"; # check ebtables entry Index: libvirt-tck/scripts/nwfilter/210-no-mac-spoofing.t =================================================================== --- libvirt-tck.orig/scripts/nwfilter/210-no-mac-spoofing.t +++ libvirt-tck/scripts/nwfilter/210-no-mac-spoofing.t @@ -44,7 +44,7 @@ END { # create first domain and start it -my $dom_name ="tckf12nwtest"; +my $dom_name ="tck-fedora-nwtest"; my $dom1; $dom1 = prepare_test_disk_and_vm($tck, $conn, $dom_name); @@ -58,8 +58,7 @@ diag $xml; my $mac1 = get_first_macaddress($dom1); diag "mac is $mac1"; -sleep(30); -my $guestip1 = get_ip_from_leases($mac1); +my $guestip1 = wait_for_vm_if_up($mac1, 60); diag "ip is $guestip1"; # check ebtables entry Index: libvirt-tck/scripts/nwfilter/220-no-ip-spoofing.t =================================================================== --- libvirt-tck.orig/scripts/nwfilter/220-no-ip-spoofing.t +++ libvirt-tck/scripts/nwfilter/220-no-ip-spoofing.t @@ -44,7 +44,7 @@ END { # looking up domain my $dom1; -my $dom_name ="tckf12nwtest"; +my $dom_name ="tck-fedora-nwtest"; $dom1 = prepare_test_disk_and_vm($tck, $conn, $dom_name); $dom1->create(); @@ -55,8 +55,7 @@ diag $xml; my $mac1 = get_first_macaddress($dom1); diag "mac is $mac1"; -sleep(30); -my $guestip1 = get_ip_from_leases($mac1); +my $guestip1 = wait_for_vm_if_up($mac1, 60); diag "ip is $guestip1"; # check ebtables entry Index: libvirt-tck/scripts/nwfilter/230-no-mac-broadcast.t =================================================================== --- libvirt-tck.orig/scripts/nwfilter/230-no-mac-broadcast.t +++ libvirt-tck/scripts/nwfilter/230-no-mac-broadcast.t @@ -43,7 +43,7 @@ END { # create first domain and start it my $dom1; -my $dom_name ="tckf12nwtest"; +my $dom_name ="tck-fedora-nwtest"; $dom1 = prepare_test_disk_and_vm($tck, $conn, $dom_name); $dom1->create(); @@ -54,8 +54,7 @@ diag $xml; my $mac1 = get_first_macaddress($dom1); diag "mac is $mac1"; -sleep(30); -my $guestip1 = get_ip_from_leases($mac1); +my $guestip1 = wait_for_vm_if_up($mac1, 60); diag "ip is $guestip1"; # check ebtables entry Index: libvirt-tck/scripts/nwfilter/240-no-arp-spoofing.t =================================================================== --- libvirt-tck.orig/scripts/nwfilter/240-no-arp-spoofing.t +++ libvirt-tck/scripts/nwfilter/240-no-arp-spoofing.t @@ -45,7 +45,7 @@ END { # creating domain my $dom1; -my $dom_name ="tckf12nwtest"; +my $dom_name ="tck-fedora-nwtest"; $dom1 = prepare_test_disk_and_vm($tck, $conn, $dom_name); $dom1->create(); @@ -56,8 +56,7 @@ diag $xml; my $mac1 = get_first_macaddress($dom1); diag "mac is $mac1"; -sleep(30); -my $guestip1 = get_ip_from_leases($mac1); +my $guestip1 = wait_for_vm_if_up($mac1, 60); diag "ip is $guestip1"; # check ebtables entry Index: libvirt-tck/scripts/nwfilter/090-install-image.t =================================================================== --- libvirt-tck.orig/scripts/nwfilter/090-install-image.t +++ libvirt-tck/scripts/nwfilter/090-install-image.t @@ -19,7 +19,7 @@ network/000-install-image.t - install ne =head1 DESCRIPTION -The test case creates and install a 2GB fedora virtual +The test case creates and install a 2GB fedora virtual disk via kickstart file from the network. =cut @@ -41,15 +41,16 @@ END { $tck->cleanup if $tck; } use File::Spec::Functions qw(catfile catdir rootdir); # variables which may need to be adapted -my $dom_name ="tckf12nwtest"; +my $dom_name ="tck-fedora-nwtest"; my $testdom = prepare_test_disk_and_vm($tck, $conn, $dom_name); $testdom->create(); ok($testdom->get_id() > 0, "running domain has an ID > 0"); -sleep(20); + +my $mac1 = get_first_macaddress($testdom); +diag "mac is $mac1"; +my $guestip1 = wait_for_vm_if_up($mac1, 60); shutdown_vm_gracefully($testdom); exit 0; - - Index: libvirt-tck/scripts/nwfilter/300-vsitype.t =================================================================== --- libvirt-tck.orig/scripts/nwfilter/300-vsitype.t +++ libvirt-tck/scripts/nwfilter/300-vsitype.t @@ -43,6 +43,7 @@ END { SKIP: { skip "lldptool not present", 3 unless -e "/usr/sbin/lldptool"; + skip "eth2 not available", 3 unless `ifconfig eth2` =~ "Link encap:"; # creating domain my $dom1; @@ -58,7 +59,7 @@ SKIP: { my $mac1 = get_first_macaddress($dom1); diag "mac is $mac1"; - sleep(30); + wait_for_vm_if_up($mac1, 60); # check vsi information diag "Verifying VSI information using lldptool";

3 12

[libvirt] [PATCH v3 0/4] vcpupin: configure inactive domains' CPU affinity setting
by Taku Izumi 10 May '11

10 May '11

Hi all, This patchset enables us to configure inactive domains' CPU affinity setting. v2 -> v3: - rebase *[PATCH 1/4] vcpupin: inroduce a new libvir API (virDomainPinVcpuFlags) *[PATCH 2/4] vcpupin: implement the code to address the new API in the qemu driver *[PATCH 3/4] vcpupin: implement the remote protocol to address the new API *[PATCH 4/4] vcpupin: add the new options to "virsh vcpupin" command Best regards, Taku Izumi

1 4

[libvirt] [PATCH] apparmor: Fix uninitalized variable warning in virt-aa-helper
by Matthias Bolte 10 May '11

10 May '11

--- src/security/virt-aa-helper.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c index a4e8549..e481095 100644 --- a/src/security/virt-aa-helper.c +++ b/src/security/virt-aa-helper.c @@ -245,7 +245,7 @@ update_include_file(const char *include_file, const char *included_files, bool append) { int rc = -1; - int plen, flen; + int plen, flen = 0; int fd; char *pcontent = NULL; char *existing = NULL; -- 1.7.0.4

2 2

[libvirt] [PATCH] Allow bootstrap to build gnulib from local git source if $GNULIB_SRCDIR is non-empty.
by Prerna Saxena 10 May '11

10 May '11

'bootstrap' script clones the .gnulib submodule from upstream git sources only (provided in .gitmodules), irrespective of whether $GNULIB_SRCDIR is provided. This patch allows gnulib git sources provided by $GNULIB_SRCDIR to be used for adding the gnulib submodule. >From c5428697c4a1c34daaefaa38708bd59d3b9eefed Mon Sep 17 00:00:00 2001 From: Prerna Saxena <prerna(a)linux.vnet.ibm.com> Date: Mon, 9 May 2011 13:30:59 +0530 Subject: [PATCH] [Fix] Do not pull from upstream git repo if local copy of git sources is provided. Presently, gnulib gets cloned from git://git.sv.gnu.org/gnulib.git irrespective of local sources in $GNULIB_SRCDIR. --- bootstrap | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/bootstrap b/bootstrap index 7cbb5dc..145e4cf 100755 --- a/bootstrap +++ b/bootstrap @@ -528,7 +528,7 @@ case ${GNULIB_SRCDIR--} in echo "$0: getting gnulib files..." if git submodule -h|grep -- --reference > /dev/null; then # Prefer the one-liner available in git 1.6.4 or newer. - git submodule update --init --reference "$GNULIB_SRCDIR" \ + git submodule update --reference "$GNULIB_SRCDIR" \ "$gnulib_path" || exit $? else # This fallback allows at least git 1.5.5. -- 1.7.2.5 -- Prerna Saxena Linux Technology Centre, IBM Systems and Technology Lab, Bangalore, India

2 2

[libvirt] [PATCH v2 0/4] support for changing cpu.shares for inactive domains from virsh cmd
by Hu Tao 10 May '11

10 May '11

Currently cpu.shares can only be configured by editing domains' xmls. this series enables us to change cpu.shares from virsh cmd schedinfo even when domain is inactive. changes: v2: - since v1 patches that delete all generated RPC files(by Daniel) and that refactor remote generator(by Matthias) have gone into master branch, which affects the series heavily. So rebase the series on the latest code. Hu Tao (4): introduce virDomainSetSchedulerParametersFlags qemu: introduce qemuSetSchedulerParametersFlags remote: introduce remoteSetSchedulerParametersFlags virsh: add --persistent to cmd schedinfo daemon/remote.c | 71 ++++++++++++++++++++++++++++++++++++++++++ daemon/remote_generator.pl | 2 + include/libvirt/libvirt.h.in | 13 ++++++++ python/generator.py | 1 + src/driver.h | 8 +++++ src/esx/esx_driver.c | 1 + src/libvirt.c | 62 ++++++++++++++++++++++++++++++++++++ src/libvirt_public.syms | 5 +++ src/libxl/libxl_driver.c | 1 + src/lxc/lxc_driver.c | 1 + src/openvz/openvz_driver.c | 1 + src/phyp/phyp_driver.c | 1 + src/qemu/qemu_driver.c | 66 ++++++++++++++++++++++++++++++--------- src/remote/remote_driver.c | 69 ++++++++++++++++++++++++++++++++++++++++ src/remote/remote_protocol.x | 10 +++++- src/test/test_driver.c | 1 + src/uml/uml_driver.c | 1 + src/vbox/vbox_tmpl.c | 1 + src/vmware/vmware_driver.c | 1 + src/xen/xen_driver.c | 1 + src/xenapi/xenapi_driver.c | 1 + tools/virsh.c | 14 ++++++++- 22 files changed, 315 insertions(+), 17 deletions(-) -- 1.7.3.1 -- Thanks, Hu Tao

2 7

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

09 May '11

This patch adds DHCP Snooping support to libvirt. Signed-off-by: David L Stevens <dlstevens(a)us.ibm.com> diff --git a/examples/xml/nwfilter/no-ip-spoofing.xml b/examples/xml/nwfilter/no-ip-spoofing.xml index 2fccd12..2ae9500 100644 --- a/examples/xml/nwfilter/no-ip-spoofing.xml +++ b/examples/xml/nwfilter/no-ip-spoofing.xml @@ -4,4 +4,9 @@ <rule action='return' direction='out'> <ip match='yes' srcipaddr='$IP' /> </rule> +  + <rule action='return' direction='out'> + <ip match='yes' srcipaddr='0.0.0.0' protocol='udp' srcportstart='68' + srcportend='68' /> + </rule> </filter> diff --git a/src/Makefile.am b/src/Makefile.am index 1eaa7d1..3da0797 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -386,6 +386,8 @@ NWFILTER_DRIVER_SOURCES = \ nwfilter/nwfilter_driver.h nwfilter/nwfilter_driver.c \ nwfilter/nwfilter_gentech_driver.c \ nwfilter/nwfilter_gentech_driver.h \ + nwfilter/nwfilter_dhcpsnoop.c \ + nwfilter/nwfilter_dhcpsnoop.h \ nwfilter/nwfilter_ebiptables_driver.c \ nwfilter/nwfilter_ebiptables_driver.h \ nwfilter/nwfilter_learnipaddr.c \ diff --git a/src/nwfilter/nwfilter_dhcpsnoop.c b/src/nwfilter/nwfilter_dhcpsnoop.c new file mode 100644 index 0000000..af83149 --- /dev/null +++ b/src/nwfilter/nwfilter_dhcpsnoop.c @@ -0,0 +1,582 @@ + +/* + * nwfilter_dhcpsnoop.c: support for DHCP snooping used by a VM + * on an interface + * + * Copyright (C) 2011 IBM Corp. + * Copyright (C) 2011 David L Stevens + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * Author: David L Stevens <dlstevens(a)us.ibm.com> + * Based in part on work by Stefan Berger <stefanb(a)us.ibm.com> + */ + +#include <config.h> + +#ifdef HAVE_LIBPCAP +#include <pcap.h> +#endif + +#include <fcntl.h> +#include <sys/ioctl.h> +#include <signal.h> + +#include <arpa/inet.h> +#include <net/ethernet.h> +#include <netinet/ip.h> +#include <netinet/udp.h> +#include <net/if.h> +#include <net/if_arp.h> +#include <intprops.h> + +#include "internal.h" + +#include "buf.h" +#include "memory.h" +#include "logging.h" +#include "datatypes.h" +#include "interface.h" +#include "virterror_internal.h" +#include "threads.h" +#include "conf/nwfilter_params.h" +#include "conf/domain_conf.h" +#include "nwfilter_gentech_driver.h" +#include "nwfilter_ebiptables_driver.h" +#include "nwfilter_dhcpsnoop.h" + +#define VIR_FROM_THIS VIR_FROM_NWFILTER + +static virHashTablePtr SnoopReqs; + +struct virNWFilterSnoopReq { + virConnectPtr conn; + virNWFilterTechDriverPtr techdriver; + enum virDomainNetType nettype; + virNWFilterDefPtr filter; + const char *ifname; + virNWFilterHashTablePtr vars; + virNWFilterDriverStatePtr driver; + pthread_t thread; + /* start and end of lease list, ordered by lease time */ + struct iplease *start; + struct iplease *end; + bool die; +}; + +#define POLL_INTERVAL 10*1000 /* 10 secs */ + +struct iplease { + uint32_t ipl_ipaddr; + uint32_t ipl_server; + struct virNWFilterSnoopReq *ipl_req; + unsigned int ipl_timeout; + /* timer list */ + struct iplease *ipl_prev; + struct iplease *ipl_next; +}; + +static struct iplease *ipl_getbyip(struct iplease *start, uint32_t ipaddr); +static void ipl_update(struct iplease *pl, uint32_t timeout); + + +/* + * ipl_tadd - add an IP lease to the timer list + */ +static void +ipl_tadd(struct iplease *plnew) +{ + struct virNWFilterSnoopReq *req = plnew->ipl_req; + struct iplease *pl; + + plnew->ipl_next = plnew->ipl_prev = 0; + if (!req->start) { + plnew->ipl_prev = plnew->ipl_next = 0; + req->start = req->end = plnew; + return; + } + for (pl = req->end; pl && plnew->ipl_timeout < pl->ipl_timeout; + pl = pl->ipl_prev) + /* empty */ ; + if (!pl) { + plnew->ipl_next = req->start; + req->start = plnew; + } else { + plnew->ipl_next = pl->ipl_next; + pl->ipl_next = plnew; + } + plnew->ipl_prev = pl; + if (plnew->ipl_next) + plnew->ipl_next->ipl_prev = plnew; + else + req->end = plnew; +} + +/* + * ipl_add - create or update an IP lease + */ +static void +ipl_add(struct iplease *plnew) +{ + struct iplease *pl; + int rc; + char ipbuf[20]; /* dotted decimal IP addr string */ + char *ipstr; + + pl = ipl_getbyip(plnew->ipl_req->start, plnew->ipl_ipaddr); + if (pl) { + ipl_update(pl, plnew->ipl_timeout); + return; + } + if (VIR_ALLOC(pl) < 0) { + virReportOOMError(); + return; + } + *pl = *plnew; + + if (!inet_ntop(AF_INET, &pl->ipl_ipaddr, ipbuf, sizeof(ipbuf))) { + virNWFilterReportError(VIR_ERR_INTERNAL_ERROR, + _("ipl_add inet_ntop " "failed (0x%08X)"), + pl->ipl_ipaddr); + VIR_FREE(pl); + return; + + } + + ipstr = strdup(ipbuf); + if (!ipstr) { + VIR_FREE(pl); + virReportOOMError(); + return; + } + rc = virNWFilterChangeVar(pl->ipl_req->conn, + pl->ipl_req->techdriver, + pl->ipl_req->nettype, + pl->ipl_req->filter, + pl->ipl_req->ifname, + pl->ipl_req->vars, + pl->ipl_req->driver, "IP", ipstr, 0); + if (rc) { + VIR_FREE(ipstr); + VIR_FREE(pl); + return; + } + ipl_tadd(pl); +} + +/* + * ipl_tdel - remove an IP lease from the timer list + */ +static void +ipl_tdel(struct iplease *ipl) +{ + struct virNWFilterSnoopReq *req = ipl->ipl_req; + + if (ipl->ipl_prev) + ipl->ipl_prev->ipl_next = ipl->ipl_next; + else + req->start = ipl->ipl_next; + if (ipl->ipl_next) + ipl->ipl_next->ipl_prev = ipl->ipl_prev; + else + req->end = ipl->ipl_prev; + ipl->ipl_next = ipl->ipl_prev = 0; +} + +/* + * ipl_del - delete an IP lease + */ +static void +ipl_del(struct iplease *ipl) +{ + struct virNWFilterSnoopReq *req; + char ipbuf[20]; /* dotted decimal IP addr string */ + char *ipstr; + + if (!ipl) + return; + + req = ipl->ipl_req; + + ipl_tdel(ipl); + + if (inet_ntop(AF_INET, &ipl->ipl_ipaddr, ipbuf, sizeof(ipbuf))) { + ipstr = strdup(ipbuf); + if (virNWFilterChangeVar(req->conn, + req->techdriver, + req->nettype, + req->filter, + req->ifname, + req->vars, req->driver, "IP", ipstr, 1)) + virNWFilterReportError(VIR_ERR_INTERNAL_ERROR, + _("ipl_del virNWFilterChangeVar failed; " + "filter not deleted")); + } else + virNWFilterReportError(VIR_ERR_INTERNAL_ERROR, + _("ipl_del inet_ntop " "failed (0x%08X)"), + ipl->ipl_ipaddr); + VIR_FREE(ipl); +} + +/* + * ipl_update - update the timeout on an IP lease + */ +static void +ipl_update(struct iplease *ipl, uint32_t timeout) +{ + ipl_tdel(ipl); + ipl->ipl_timeout = timeout; + ipl_tadd(ipl); + return; +} + +/* + * ipl_getbyip - lookup IP lease by IP address + */ +static struct iplease * +ipl_getbyip(struct iplease *start, uint32_t ipaddr) +{ + struct iplease *pl; + + for (pl = start; pl && pl->ipl_ipaddr != ipaddr; pl = pl->ipl_next) + /* empty */ ; + return pl; +} + +#define GRACE 5 + +/* + * ipl_trun - run the IP lease timeout list + */ +static unsigned int +ipl_trun(struct virNWFilterSnoopReq *req) +{ + uint32_t now; + + now = time(0); + while (req->start && req->start->ipl_timeout <= now) + ipl_del(req->start); + return 0; +} + +typedef unsigned char Eaddr[6]; + +struct eth { + Eaddr eh_dst; + Eaddr eh_src; + unsigned short eh_type; + unsigned char eh_data[0]; +}; + +struct dhcp { + unsigned char d_op; + unsigned char d_htype; + unsigned char d_hlen; + unsigned char d_hops; + unsigned int d_xid; + unsigned short d_secs; + unsigned short d_flags; + unsigned int d_ciaddr; + unsigned int d_yiaddr; + unsigned int d_siaddr; + unsigned int d_giaddr; + unsigned char d_chaddr[16]; + char d_sname[64]; + char d_file[128]; + unsigned char d_opts[0]; +}; + +/* DHCP options */ + +#define DHCPO_PAD 0 +#define DHCPO_LEASE 51 /* lease time in secs */ +#define DHCPO_MTYPE 53 /* message type */ +#define DHCPO_END 255 /* end of options */ + +/* DHCP message types */ +#define DHCPDECLINE 4 +#define DHCPACK 5 +#define DHCPRELEASE 7 + +unsigned char dhcp_magic[4] = { 99, 130, 83, 99 }; + +static int +dhcp_getopt(struct dhcp *pd, int len, int *pmtype, int *pleasetime) +{ + int oind, olen; + int oend; + + olen = len - sizeof *pd; + oind = 0; + + if (olen < 4) /* bad magic */ + return -1; + for (oind = 0; oind < sizeof dhcp_magic; ++oind) + if (pd->d_opts[oind] != dhcp_magic[oind]) + return -1; /* bad magic */ + + oend = 0; + + *pmtype = *pleasetime = 0; + + while (oind < olen) { + switch (pd->d_opts[oind]) { + case DHCPO_LEASE: + if (olen - oind < 6) + goto malformed; + if (*pleasetime) + return -1; /* duplicate lease time */ + *pleasetime = + ntohl(*(unsigned int *) (pd->d_opts + oind + 2)); + break; + case DHCPO_MTYPE: + if (olen - oind < 3) + goto malformed; + if (*pmtype) + return -1; /* duplicate message type */ + *pmtype = pd->d_opts[oind + 2]; + break; + case DHCPO_PAD: + oind++; + continue; + + case DHCPO_END: + oend = 1; + break; + default: + if (olen - oind < 2) + goto malformed; + } + if (oend) + break; + oind += pd->d_opts[oind + 1] + 2; + } + return 0; + malformed: + VIR_WARN0(_("got lost in the options!")); + return -1; +} + +static void +dhcpdecode(struct virNWFilterSnoopReq *req, struct eth *pep, int len) +{ + struct iphdr *pip; + struct udphdr *pup; + struct dhcp *pd; + struct iplease ipl, *pipl; + int mtype, leasetime; + + /* go through the protocol headers */ + pip = (struct iphdr *) pep->eh_data; + len -= sizeof(*pep); + pup = (struct udphdr *) ((char *) pip + (pip->ihl << 2)); + len -= pip->ihl << 2; + pd = (struct dhcp *) ((char *) pup + sizeof(*pup)); + len -= sizeof(*pup); + if (len < 0) + return; /* dhcpdecode: invalid packet length */ + if (dhcp_getopt(pd, len, &mtype, &leasetime) < 0) + return; + + memset(&ipl, 0, sizeof(ipl)); + ipl.ipl_ipaddr = pd->d_yiaddr; + ipl.ipl_server = pd->d_siaddr; + if (leasetime == ~0) + ipl.ipl_timeout = ~0; + else + ipl.ipl_timeout = time(0) + leasetime; + ipl.ipl_req = req; + + switch (mtype) { + case DHCPACK: + ipl_add(&ipl); + break; + case DHCPDECLINE: + case DHCPRELEASE: + pipl = ipl_getbyip(req->start, ipl.ipl_ipaddr); + ipl_del(pipl); + break; + default: + break; + } +} + +#define PBUFSIZE 576 /* >= IP/TCP/DHCP headers */ + +static pcap_t * +dhcpopen(const char *intf) +{ + pcap_t *handle; + struct bpf_program fp; + char filter[64]; + char pcap_errbuf[PCAP_ERRBUF_SIZE]; + + handle = pcap_open_live(intf, PBUFSIZE, 0, POLL_INTERVAL, pcap_errbuf); + if (handle == NULL) { + virNWFilterReportError(VIR_ERR_INTERNAL_ERROR, + _("pcap_open_live: %s"), pcap_errbuf); + return 0; + } + + sprintf(filter, "port 67 or dst port 68"); + if (pcap_compile(handle, &fp, filter, 1, PCAP_NETMASK_UNKNOWN) != 0) { + virNWFilterReportError(VIR_ERR_INTERNAL_ERROR, + _("pcap_compile: %s"), pcap_geterr(handle)); + return 0; + } + if (pcap_setfilter(handle, &fp) != 0) { + virNWFilterReportError(VIR_ERR_INTERNAL_ERROR, + _("pcap_setfilter: %s"), pcap_geterr(handle)); + return 0; + } + pcap_freecode(&fp); + return handle; +} + +static void * +virNWFilterDHCPSnoop(void *req0) +{ + struct virNWFilterSnoopReq *req = req0; + pcap_t *handle; + struct pcap_pkthdr hdr; + struct eth *packet; + struct iplease *ipl; + int ifindex; + + handle = dhcpopen(req->ifname); + if (!handle) + return 0; + + ifindex = if_nametoindex(req->ifname); + + while (1) { + if (req->die) + break; + ipl_trun(req); + + packet = (struct eth *) pcap_next(handle, &hdr); + + if (!packet) { + if (ifaceCheck(false, req->ifname, NULL, ifindex)) + virNWFilterDHCPSnoopEnd(req->ifname); + continue; + } + + dhcpdecode(req, packet, hdr.caplen); + } + /* free all leases */ + for (ipl = req->start; ipl; ipl = req->start) + ipl_del(ipl); + + /* free all req data */ + VIR_FREE(req->ifname); + virNWFilterHashTableFree(req->vars); + VIR_FREE(req); + return 0; +} + +int +virNWFilterDHCPSnoopReq(virConnectPtr conn, + virNWFilterTechDriverPtr techdriver ATTRIBUTE_UNUSED, + enum virDomainNetType nettype ATTRIBUTE_UNUSED, + virNWFilterDefPtr filter ATTRIBUTE_UNUSED, + const char *ifname ATTRIBUTE_UNUSED, + virNWFilterHashTablePtr vars ATTRIBUTE_UNUSED, + virNWFilterDriverStatePtr driver ATTRIBUTE_UNUSED) +{ + struct virNWFilterSnoopReq *req; + + req = virHashLookup(SnoopReqs, ifname); + if (req) + return 0; + if (VIR_ALLOC(req) < 0) { + virReportOOMError(); + return 1; + } + + req->conn = conn; + req->techdriver = techdriver; + req->nettype = nettype; + req->filter = filter; + req->ifname = strdup(ifname); + req->vars = virNWFilterHashTableCreate(0); + if (!req->vars) { + virReportOOMError(); + return 1; + } + if (virNWFilterHashTablePutAll(vars, req->vars)) { + virNWFilterReportError(VIR_ERR_INTERNAL_ERROR, + _("virNWFilterDHCPSnoopReq: can't copy variables" + " on if %s"), ifname); + return 1; + } + req->driver = driver; + req->start = req->end = 0; + + if (virHashAddEntry(SnoopReqs, ifname, req)) { + VIR_FREE(req); + virNWFilterReportError(VIR_ERR_INTERNAL_ERROR, + _("virNWFilterDHCPSnoopReq req add failed on" + "interface \"%s\""), ifname); + return 1; + } + if (pthread_create(&req->thread, NULL, virNWFilterDHCPSnoop, req) != 0) { + (void) virHashRemoveEntry(SnoopReqs, ifname); + VIR_FREE(req); + virNWFilterReportError(VIR_ERR_INTERNAL_ERROR, + _("virNWFilterDHCPSnoopReq pthread_create failed" + " oninterface \"%s\""), ifname); + return 1; + } + return 0; +} + +/* + * freeReq - hash table free function to kill a request + */ +static void +freeReq(void *req0, const void *name ATTRIBUTE_UNUSED) +{ + struct virNWFilterSnoopReq *req = (struct virNWFilterSnoopReq *) req0; + + if (!req) + return; + + req->die = 1; +} + +int +virNWFilterDHCPSnoopInit(void) +{ + if (SnoopReqs) + return 0; + SnoopReqs = virHashCreate(0, freeReq); + if (!SnoopReqs) { + virReportOOMError(); + return -1; + } + return 0; +} + +void +virNWFilterDHCPSnoopEnd(const char *ifname) +{ + if (!SnoopReqs) + return; + if (ifname) + virHashRemoveEntry(SnoopReqs, ifname); + else /* free all of them */ + virHashFree(SnoopReqs); +} diff --git a/src/nwfilter/nwfilter_dhcpsnoop.h b/src/nwfilter/nwfilter_dhcpsnoop.h new file mode 100644 index 0000000..248b1a0 --- /dev/null +++ b/src/nwfilter/nwfilter_dhcpsnoop.h @@ -0,0 +1,36 @@ +/* + * nwfilter_dhcpsnoop.h: support DHCP snooping for a VM on an interface + * + * Copyright (C) 2010 IBM Corp. + * Copyright (C) 2010 David L Stevens + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * Author: David L Stevens <dlstevens(a)us.ibm.com> + */ + +#ifndef __NWFILTER_DHCPSNOOP_H +# define __NWFILTER_DHCPSNOOP_H + +int virNWFilterDHCPSnoopInit(void); +int virNWFilterDHCPSnoopReq(virConnectPtr conn, + virNWFilterTechDriverPtr techdriver, + enum virDomainNetType, + virNWFilterDefPtr filter, + const char *ifname, + virNWFilterHashTablePtr vars, + virNWFilterDriverStatePtr driver); +void virNWFilterDHCPSnoopEnd(const char *ifname); +#endif /* __NWFILTER_DHCPSNOOP_H */ diff --git a/src/nwfilter/nwfilter_driver.c b/src/nwfilter/nwfilter_driver.c index 8af3f8a..2e20e59 100644 --- a/src/nwfilter/nwfilter_driver.c +++ b/src/nwfilter/nwfilter_driver.c @@ -39,6 +39,7 @@ #include "nwfilter_gentech_driver.h" #include "configmake.h" +#include "nwfilter_dhcpsnoop.h" #include "nwfilter_learnipaddr.h" #define VIR_FROM_THIS VIR_FROM_NWFILTER @@ -66,6 +67,8 @@ static int nwfilterDriverStartup(int privileged) { char *base = NULL; + if (virNWFilterDHCPSnoopInit() < 0) + return -1; if (virNWFilterLearnInit() < 0) return -1; @@ -127,6 +130,7 @@ alloc_err_exit: conf_init_err: virNWFilterTechDriversShutdown(); + virNWFilterDHCPSnoopEnd(0); virNWFilterLearnShutdown(); return -1; @@ -201,6 +205,7 @@ nwfilterDriverShutdown(void) { virNWFilterConfLayerShutdown(); virNWFilterTechDriversShutdown(); + virNWFilterDHCPSnoopEnd(0); virNWFilterLearnShutdown(); nwfilterDriverLock(driverState); diff --git a/src/nwfilter/nwfilter_gentech_driver.c b/src/nwfilter/nwfilter_gentech_driver.c index a459974..c6e6600 100644 --- a/src/nwfilter/nwfilter_gentech_driver.c +++ b/src/nwfilter/nwfilter_gentech_driver.c @@ -33,6 +33,7 @@ #include "virterror_internal.h" #include "nwfilter_gentech_driver.h" #include "nwfilter_ebiptables_driver.h" +#include "nwfilter_dhcpsnoop.h" #include "nwfilter_learnipaddr.h" @@ -670,13 +671,12 @@ virNWFilterInstantiate(virConnectPtr conn, virNWFilterDefPtr filter, const char *ifname, int ifindex, - const char *linkdev, + const char *linkdev ATTRIBUTE_UNUSED, virNWFilterHashTablePtr vars, enum instCase useNewFilter, bool *foundNewFilter, bool teardownOld, - const unsigned char *macaddr, - virNWFilterDriverStatePtr driver, - bool forceWithPendingReq) + const unsigned char *macaddr ATTRIBUTE_UNUSED, + virNWFilterDriverStatePtr driver) { int rc; int j, nptrs; @@ -704,39 +704,38 @@ virNWFilterInstantiate(virConnectPtr conn, if (virHashSize(missing_vars->hashTable) == 1) { if (virHashLookup(missing_vars->hashTable, NWFILTER_STD_VAR_IP) != NULL) { - if (virNWFilterLookupLearnReq(ifindex) == NULL) { - rc = virNWFilterLearnIPAddress(techdriver, - ifname, - ifindex, - linkdev, - nettype, macaddr, - filter->name, - vars, driver, - DETECT_DHCP|DETECT_STATIC); - } + + rc = _virNWFilterInstantiateRec(conn, + techdriver, + nettype, + filter, + ifname, + vars, + NWFILTER_STD_VAR_IP, 1, + &nEntries, &insts, + useNewFilter, foundNewFilter, + driver); + if (!rc) + rc = virNWFilterDHCPSnoopReq(conn, techdriver, nettype, filter, + ifname, vars, driver); + } else + rc = 1; + if (rc) goto err_exit; - } - rc = 1; - goto err_exit; } else if (virHashSize(missing_vars->hashTable) > 1) { rc = 1; goto err_exit; - } else if (!forceWithPendingReq && - virNWFilterLookupLearnReq(ifindex) != NULL) { - goto err_exit; - } - - rc = _virNWFilterInstantiateRec(conn, - techdriver, - nettype, - filter, - ifname, - vars, - 0, 0, - &nEntries, &insts, - useNewFilter, foundNewFilter, - driver); - + } else + rc = _virNWFilterInstantiateRec(conn, + techdriver, + nettype, + filter, + ifname, + vars, + 0, 0, + &nEntries, &insts, + useNewFilter, foundNewFilter, + driver); if (rc) goto err_exit; @@ -802,7 +801,6 @@ __virNWFilterInstantiateFilter(virConnectPtr conn, virNWFilterHashTablePtr filterparams, enum instCase useNewFilter, virNWFilterDriverStatePtr driver, - bool forceWithPendingReq, bool *foundNewFilter) { int rc; @@ -903,8 +901,7 @@ __virNWFilterInstantiateFilter(virConnectPtr conn, useNewFilter, foundNewFilter, teardownOld, macaddr, - driver, - forceWithPendingReq); + driver); virNWFilterHashTableFree(vars); @@ -950,7 +947,6 @@ _virNWFilterInstantiateFilter(virConnectPtr conn, net->filterparams, useNewFilter, conn->nwfilterPrivateData, - false, foundNewFilter); virNWFilterUnlockFilterUpdates(); @@ -986,7 +982,6 @@ virNWFilterInstantiateFilterLate(virConnectPtr conn, filterparams, INSTANTIATE_ALWAYS, driver, - true, &foundNewFilter); if (rc) { /* something went wrong... 'DOWN' the interface */ @@ -1098,6 +1093,8 @@ _virNWFilterTeardownFilter(const char *ifname) return 1; } + virNWFilterDHCPSnoopEnd(ifname); + virNWFilterTerminateLearnReq(ifname); if (virNWFilterLockIface(ifname))

1 0

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

09 May '11

1 0

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

09 May '11

This patch adds a function that applies or deletes filter rules to existing chains. Rules referencing the given variable are instantiated with the given value, or optionally deleted. For example, passing variable "IP" with different values will install rules using the IP variable with each of the different values. These rules can later be removed by calling this function with the same variable and value and "delete" argument set to "1". Signed-off-by: David L Stevens <dlstevens(a)us.ibm.com> diff --git a/src/nwfilter/nwfilter_gentech_driver.c b/src/nwfilter/nwfilter_gentech_driver.c index 0bc3537..a36edbc 100644 --- a/src/nwfilter/nwfilter_gentech_driver.c +++ b/src/nwfilter/nwfilter_gentech_driver.c @@ -558,6 +558,92 @@ virNWFilterRuleInstancesToArray(int nEntries, /** + * virNWFilterChangeVar: + * @conn: pointer to virConnect object + * @techdriver: The driver to use for instantiation + * @filter: The filter to instantiate + * @ifname: The name of the interface to apply the rules to + * @vars: A map holding variable names and values used for instantiating + * the filter and its subfilters. + * @var: name of variable to change + * @value: value of variable to change + * @delete: =0 to create or =1 to delete the rules + * + * Returns 0 on success, a value otherwise. + * + * Instantiate or delete a filter and all subfilters with variable "var" + * set to value "value". + * The name of the interface to which the rules belong must be + * provided. + * + * Call this function while holding the NWFilter filter update lock + */ +int +virNWFilterChangeVar(virConnectPtr conn, + virNWFilterTechDriverPtr techdriver, + enum virDomainNetType nettype, + virNWFilterDefPtr filter, + const char *ifname, + virNWFilterHashTablePtr vars, + virNWFilterDriverStatePtr driver, + const char *var, + char *value, + bool delete) +{ + int rc; + int j, nptrs; + int nEntries = 0; + virNWFilterRuleInstPtr *insts = NULL; + void **ptrs = NULL; + bool foundNewFilter = 0; + + if (virNWFilterHashTablePut(vars, var, value, 1)) { + virNWFilterReportError(VIR_ERR_INTERNAL_ERROR, _("Cound not add " + "variable \"%s\" to hashmap"), var); + return 1; + } + rc = _virNWFilterInstantiateRec(conn, + techdriver, + nettype, + filter, + ifname, + vars, + NWFILTER_STD_VAR_IP, 0, + &nEntries, &insts, + INSTANTIATE_ALWAYS, &foundNewFilter, + driver); + if (rc) + goto err_exit; + rc = virNWFilterRuleInstancesToArray(nEntries, insts, &ptrs, &nptrs); + if (rc) + goto err_exit; + + if (virNWFilterHashTableRemoveEntry(vars, var) < 0) { + virNWFilterReportError(VIR_ERR_INTERNAL_ERROR, _("Cound not remove " + "variable \"%s\" from hashmap"), var); + return 1; + } + + if (virNWFilterLockIface(ifname)) + goto err_exit; + + if (delete) + rc = techdriver->removeRules(conn, ifname, nptrs, ptrs); + else + rc = techdriver->addRules(conn, ifname, nptrs, ptrs); + virNWFilterUnlockIface(ifname); + VIR_FREE(ptrs); + +err_exit: + + for (j = 0; j < nEntries; j++) + virNWFilterRuleInstFree(insts[j]); + VIR_FREE(insts); + return rc; +} + + +/** * virNWFilterInstantiate: * @conn: pointer to virConnect object * @techdriver: The driver to use for instantiation diff --git a/src/nwfilter/nwfilter_gentech_driver.h b/src/nwfilter/nwfilter_gentech_driver.h index fa86030..48e87d6 100644 --- a/src/nwfilter/nwfilter_gentech_driver.h +++ b/src/nwfilter/nwfilter_gentech_driver.h @@ -48,6 +48,17 @@ int virNWFilterRollbackUpdateFilter(virConnectPtr conn, int virNWFilterTearOldFilter(virConnectPtr conn, const virDomainNetDefPtr net); +int virNWFilterChangeVar(virConnectPtr conn, + virNWFilterTechDriverPtr techdriver, + enum virDomainNetType nettype, + virNWFilterDefPtr filter, + const char *ifname, + virNWFilterHashTablePtr vars, + virNWFilterDriverStatePtr driver, + const char *var, + char *value, + bool delete); + int virNWFilterInstantiateFilterLate(virConnectPtr conn, const char *ifname, int ifindex,

1 0

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

09 May '11

This patch adds a function that applies or deletes filter rules to existing chains. Rules referencing the given variable are instantiated with the given value, or optionally deleted. For example, passing variable "IP" with different values will install rules using the IP variable with each of the different values. These rules can later be removed by calling this function with the same variable and value and "delete" argument set to "1". Signed-off-by: David L Stevens <dlstevens(a)us.ibm.com> diff --git a/src/nwfilter/nwfilter_gentech_driver.c b/src/nwfilter/nwfilter_gentech_driver.c index 0bc3537..a36edbc 100644 --- a/src/nwfilter/nwfilter_gentech_driver.c +++ b/src/nwfilter/nwfilter_gentech_driver.c @@ -558,6 +558,92 @@ virNWFilterRuleInstancesToArray(int nEntries, /** + * virNWFilterChangeVar: + * @conn: pointer to virConnect object + * @techdriver: The driver to use for instantiation + * @filter: The filter to instantiate + * @ifname: The name of the interface to apply the rules to + * @vars: A map holding variable names and values used for instantiating + * the filter and its subfilters. + * @var: name of variable to change + * @value: value of variable to change + * @delete: =0 to create or =1 to delete the rules + * + * Returns 0 on success, a value otherwise. + * + * Instantiate or delete a filter and all subfilters with variable "var" + * set to value "value". + * The name of the interface to which the rules belong must be + * provided. + * + * Call this function while holding the NWFilter filter update lock + */ +int +virNWFilterChangeVar(virConnectPtr conn, + virNWFilterTechDriverPtr techdriver, + enum virDomainNetType nettype, + virNWFilterDefPtr filter, + const char *ifname, + virNWFilterHashTablePtr vars, + virNWFilterDriverStatePtr driver, + const char *var, + char *value, + bool delete) +{ + int rc; + int j, nptrs; + int nEntries = 0; + virNWFilterRuleInstPtr *insts = NULL; + void **ptrs = NULL; + bool foundNewFilter = 0; + + if (virNWFilterHashTablePut(vars, var, value, 1)) { + virNWFilterReportError(VIR_ERR_INTERNAL_ERROR, _("Cound not add " + "variable \"%s\" to hashmap"), var); + return 1; + } + rc = _virNWFilterInstantiateRec(conn, + techdriver, + nettype, + filter, + ifname, + vars, + NWFILTER_STD_VAR_IP, 0, + &nEntries, &insts, + INSTANTIATE_ALWAYS, &foundNewFilter, + driver); + if (rc) + goto err_exit; + rc = virNWFilterRuleInstancesToArray(nEntries, insts, &ptrs, &nptrs); + if (rc) + goto err_exit; + + if (virNWFilterHashTableRemoveEntry(vars, var) < 0) { + virNWFilterReportError(VIR_ERR_INTERNAL_ERROR, _("Cound not remove " + "variable \"%s\" from hashmap"), var); + return 1; + } + + if (virNWFilterLockIface(ifname)) + goto err_exit; + + if (delete) + rc = techdriver->removeRules(conn, ifname, nptrs, ptrs); + else + rc = techdriver->addRules(conn, ifname, nptrs, ptrs); + virNWFilterUnlockIface(ifname); + VIR_FREE(ptrs); + +err_exit: + + for (j = 0; j < nEntries; j++) + virNWFilterRuleInstFree(insts[j]); + VIR_FREE(insts); + return rc; +} + + +/** * virNWFilterInstantiate: * @conn: pointer to virConnect object * @techdriver: The driver to use for instantiation diff --git a/src/nwfilter/nwfilter_gentech_driver.h b/src/nwfilter/nwfilter_gentech_driver.h index fa86030..48e87d6 100644 --- a/src/nwfilter/nwfilter_gentech_driver.h +++ b/src/nwfilter/nwfilter_gentech_driver.h @@ -48,6 +48,17 @@ int virNWFilterRollbackUpdateFilter(virConnectPtr conn, int virNWFilterTearOldFilter(virConnectPtr conn, const virDomainNetDefPtr net); +int virNWFilterChangeVar(virConnectPtr conn, + virNWFilterTechDriverPtr techdriver, + enum virDomainNetType nettype, + virNWFilterDefPtr filter, + const char *ifname, + virNWFilterHashTablePtr vars, + virNWFilterDriverStatePtr driver, + const char *var, + char *value, + bool delete); + int virNWFilterInstantiateFilterLate(virConnectPtr conn, const char *ifname, int ifindex,

1 0

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

09 May '11

This patch adds the capability of adding individual rules to existing chains. Signed-off-by: David L Stevens <dlstevens(a)us.ibm.com> diff --git a/src/conf/nwfilter_conf.h b/src/conf/nwfilter_conf.h index 25f7b60..4b6759a 100644 --- a/src/conf/nwfilter_conf.h +++ b/src/conf/nwfilter_conf.h @@ -532,6 +532,11 @@ typedef int (*virNWFilterRuleTeardownNewRules)(virConnectPtr conn, typedef int (*virNWFilterRuleTeardownOldRules)(virConnectPtr conn, const char *ifname); +typedef int (*virNWFilterRuleAddRules)(virConnectPtr conn, + const char *ifname, + int nruleInstances, + void **_inst); + typedef int (*virNWFilterRuleRemoveRules)(virConnectPtr conn, const char *ifname, int nruleInstances, @@ -572,6 +577,7 @@ struct _virNWFilterTechDriver { virNWFilterRuleApplyNewRules applyNewRules; virNWFilterRuleTeardownNewRules tearNewRules; virNWFilterRuleTeardownOldRules tearOldRules; + virNWFilterRuleAddRules addRules; virNWFilterRuleRemoveRules removeRules; virNWFilterRuleAllTeardown allTeardown; virNWFilterRuleFreeInstanceData freeRuleInstance; diff --git a/src/nwfilter/nwfilter_ebiptables_driver.c b/src/nwfilter/nwfilter_ebiptables_driver.c index f74f63b..0cb4d00 100644 --- a/src/nwfilter/nwfilter_ebiptables_driver.c +++ b/src/nwfilter/nwfilter_ebiptables_driver.c @@ -3686,6 +3686,78 @@ err_exit: return rc; } +/** + * ebiptablesAddRules: + * @conn : pointer to virConnect object + * @ifname : the name of the interface to which the rules apply + * @nRuleInstance : the number of given rules + * @_inst : array of rule instantiation data + * + * Add all rules one after the other + * + * Return 0 on success, 1 if execution of one or more cleanup + * commands failed. + */ +static int +ebiptablesAddRules(virConnectPtr conn, + const char *ifname, + int nruleInstances, + void **_inst) +{ + int i; + int cli_status; + ebiptablesRuleInstPtr *inst = (ebiptablesRuleInstPtr *)_inst; + virBuffer buf = VIR_BUFFER_INITIALIZER; + bool haveIptables = false; + bool haveIp6tables = false; + + for (i = 0; i < nruleInstances; i++) { + sa_assert (inst); + switch (inst[i]->ruleType) { + case RT_EBTABLES: + ebiptablesInstCommand(&buf, + inst[i]->commandTemplate, + 'A', -1, 1); + break; + case RT_IPTABLES: + if (inst[i]->ruleType == RT_IPTABLES) + iptablesInstCommand(&buf, + inst[i]->commandTemplate, + 'A', -1, 1); + haveIptables = true; + break; + case RT_IP6TABLES: + if (inst[i]->ruleType == RT_IP6TABLES) + iptablesInstCommand(&buf, + inst[i]->commandTemplate, + 'A', -1, 1); + haveIp6tables = true; + break; + } + } + + if (ebiptablesExecCLI(&buf, &cli_status) || cli_status != 0) + goto err_exit; + + if (haveIptables) + iptablesCheckBridgeNFCallEnabled(false); + + if (haveIp6tables) + iptablesCheckBridgeNFCallEnabled(true); + + return 0; + +err_exit: + (void) ebiptablesRemoveRules(conn, ifname, nruleInstances, _inst); + + virNWFilterReportError(VIR_ERR_BUILD_FIREWALL, + _("Some rules could not be created for " + "interface %s."), + ifname); + + return 1; +} + /** * ebiptablesAllTeardown: @@ -3742,6 +3814,7 @@ virNWFilterTechDriver ebiptables_driver = { .tearNewRules = ebiptablesTearNewRules, .tearOldRules = ebiptablesTearOldRules, .allTeardown = ebiptablesAllTeardown, + .addRules = ebiptablesAddRules, .removeRules = ebiptablesRemoveRules, .freeRuleInstance = ebiptablesFreeRuleInstance, .displayRuleInstance = ebiptablesDisplayRuleInstance,

1 0

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

09 May '11

This patch adds the capability of adding individual rules to existing chains. Signed-off-by: David L Stevens <dlstevens(a)us.ibm.com> diff --git a/src/conf/nwfilter_conf.h b/src/conf/nwfilter_conf.h index 25f7b60..4b6759a 100644 --- a/src/conf/nwfilter_conf.h +++ b/src/conf/nwfilter_conf.h @@ -532,6 +532,11 @@ typedef int (*virNWFilterRuleTeardownNewRules)(virConnectPtr conn, typedef int (*virNWFilterRuleTeardownOldRules)(virConnectPtr conn, const char *ifname); +typedef int (*virNWFilterRuleAddRules)(virConnectPtr conn, + const char *ifname, + int nruleInstances, + void **_inst); + typedef int (*virNWFilterRuleRemoveRules)(virConnectPtr conn, const char *ifname, int nruleInstances, @@ -572,6 +577,7 @@ struct _virNWFilterTechDriver { virNWFilterRuleApplyNewRules applyNewRules; virNWFilterRuleTeardownNewRules tearNewRules; virNWFilterRuleTeardownOldRules tearOldRules; + virNWFilterRuleAddRules addRules; virNWFilterRuleRemoveRules removeRules; virNWFilterRuleAllTeardown allTeardown; virNWFilterRuleFreeInstanceData freeRuleInstance; diff --git a/src/nwfilter/nwfilter_ebiptables_driver.c b/src/nwfilter/nwfilter_ebiptables_driver.c index f74f63b..0cb4d00 100644 --- a/src/nwfilter/nwfilter_ebiptables_driver.c +++ b/src/nwfilter/nwfilter_ebiptables_driver.c @@ -3686,6 +3686,78 @@ err_exit: return rc; } +/** + * ebiptablesAddRules: + * @conn : pointer to virConnect object + * @ifname : the name of the interface to which the rules apply + * @nRuleInstance : the number of given rules + * @_inst : array of rule instantiation data + * + * Add all rules one after the other + * + * Return 0 on success, 1 if execution of one or more cleanup + * commands failed. + */ +static int +ebiptablesAddRules(virConnectPtr conn, + const char *ifname, + int nruleInstances, + void **_inst) +{ + int i; + int cli_status; + ebiptablesRuleInstPtr *inst = (ebiptablesRuleInstPtr *)_inst; + virBuffer buf = VIR_BUFFER_INITIALIZER; + bool haveIptables = false; + bool haveIp6tables = false; + + for (i = 0; i < nruleInstances; i++) { + sa_assert (inst); + switch (inst[i]->ruleType) { + case RT_EBTABLES: + ebiptablesInstCommand(&buf, + inst[i]->commandTemplate, + 'A', -1, 1); + break; + case RT_IPTABLES: + if (inst[i]->ruleType == RT_IPTABLES) + iptablesInstCommand(&buf, + inst[i]->commandTemplate, + 'A', -1, 1); + haveIptables = true; + break; + case RT_IP6TABLES: + if (inst[i]->ruleType == RT_IP6TABLES) + iptablesInstCommand(&buf, + inst[i]->commandTemplate, + 'A', -1, 1); + haveIp6tables = true; + break; + } + } + + if (ebiptablesExecCLI(&buf, &cli_status) || cli_status != 0) + goto err_exit; + + if (haveIptables) + iptablesCheckBridgeNFCallEnabled(false); + + if (haveIp6tables) + iptablesCheckBridgeNFCallEnabled(true); + + return 0; + +err_exit: + (void) ebiptablesRemoveRules(conn, ifname, nruleInstances, _inst); + + virNWFilterReportError(VIR_ERR_BUILD_FIREWALL, + _("Some rules could not be created for " + "interface %s."), + ifname); + + return 1; +} + /** * ebiptablesAllTeardown: @@ -3742,6 +3814,7 @@ virNWFilterTechDriver ebiptables_driver = { .tearNewRules = ebiptablesTearNewRules, .tearOldRules = ebiptablesTearOldRules, .allTeardown = ebiptablesAllTeardown, + .addRules = ebiptablesAddRules, .removeRules = ebiptablesRemoveRules, .freeRuleInstance = ebiptablesFreeRuleInstance, .displayRuleInstance = ebiptablesDisplayRuleInstance,

1 0

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

09 May '11

This patch adds the internal capability to add rules to existing chains instead of using temporary chains and to generate placeholders for chains that are referenced without generating a rule for them immediately. Finally, it includes variable matching for filter instantiation (i.e., instantiate only when a given variable is present in a filter, or only when it is not). Signed-off-by: David L Stevens <dlstevens(a)us.ibm.com> diff --git a/src/conf/nwfilter_conf.h b/src/conf/nwfilter_conf.h index 72bdade..25f7b60 100644 --- a/src/conf/nwfilter_conf.h +++ b/src/conf/nwfilter_conf.h @@ -517,7 +517,9 @@ typedef int (*virNWFilterRuleCreateInstance)(virConnectPtr conn, virNWFilterRuleDefPtr rule, const char *ifname, virNWFilterHashTablePtr vars, - virNWFilterRuleInstPtr res); + virNWFilterRuleInstPtr res, + bool usetemp, + bool dummy); typedef int (*virNWFilterRuleApplyNewRules)(virConnectPtr conn, const char *ifname, diff --git a/src/nwfilter/nwfilter_ebiptables_driver.c b/src/nwfilter/nwfilter_ebiptables_driver.c index f16a143..f74f63b 100644 --- a/src/nwfilter/nwfilter_ebiptables_driver.c +++ b/src/nwfilter/nwfilter_ebiptables_driver.c @@ -1134,6 +1134,7 @@ iptablesEnforceDirection(int directionIn, * @isIPv6 : Whether this is an IPv6 rule * @maySkipICMP : whether this rule may under certain circumstances skip * the ICMP rule from being created + * @dummy : generate rule placeholder without installing * * Convert a single rule into its representation for later instantiation * @@ -1152,7 +1153,8 @@ _iptablesCreateRuleInstance(int directionIn, const char *match, bool defMatch, const char *accept_target, bool isIPv6, - bool maySkipICMP) + bool maySkipICMP, + bool dummy) { char chain[MAX_CHAINNAME_LENGTH]; char number[20]; @@ -1179,6 +1181,13 @@ _iptablesCreateRuleInstance(int directionIn, PRINT_IPT_ROOT_CHAIN(chain, chainPrefix, ifname); + if (dummy) { + virBufferVSprintf(&buf, CMD_DEF_PRE "%s -- %s -%%c %s %%s", + "echo", iptables_cmd, chain); + bufUsed = virBufferUse(&buf); + goto prskip; + } + switch (rule->prtclType) { case VIR_NWFILTER_RULE_PROTOCOL_TCP: case VIR_NWFILTER_RULE_PROTOCOL_TCPoIPV6: @@ -1510,6 +1519,8 @@ _iptablesCreateRuleInstance(int directionIn, return -1; } +prskip: + if ((srcMacSkipped && bufUsed == virBufferUse(&buf)) || skipRule) { virBufferFreeAndReset(&buf); @@ -1625,7 +1636,9 @@ iptablesCreateRuleInstanceStateCtrl(virNWFilterDefPtr nwfilter, const char *ifname, virNWFilterHashTablePtr vars, virNWFilterRuleInstPtr res, - bool isIPv6) + bool isIPv6, + bool usetemp, + bool dummy) { int rc; int directionIn = 0, directionOut = 0; @@ -1658,7 +1671,7 @@ iptablesCreateRuleInstanceStateCtrl(virNWFilterDefPtr nwfilter, return 1; } - chainPrefix[1] = CHAINPREFIX_HOST_IN_TEMP; + chainPrefix[1] = usetemp ? CHAINPREFIX_HOST_IN_TEMP : CHAINPREFIX_HOST_IN; if (create) { rc = _iptablesCreateRuleInstance(directionIn, chainPrefix, @@ -1670,7 +1683,8 @@ iptablesCreateRuleInstanceStateCtrl(virNWFilterDefPtr nwfilter, matchState, false, "RETURN", isIPv6, - maySkipICMP); + maySkipICMP, + dummy); VIR_FREE(matchState); if (rc) @@ -1690,7 +1704,8 @@ iptablesCreateRuleInstanceStateCtrl(virNWFilterDefPtr nwfilter, return 1; } - chainPrefix[1] = CHAINPREFIX_HOST_OUT_TEMP; + chainPrefix[1] = usetemp ? CHAINPREFIX_HOST_OUT_TEMP : + CHAINPREFIX_HOST_OUT; if (create) { rc = _iptablesCreateRuleInstance(!directionIn, chainPrefix, @@ -1702,7 +1717,8 @@ iptablesCreateRuleInstanceStateCtrl(virNWFilterDefPtr nwfilter, matchState, false, "ACCEPT", isIPv6, - maySkipICMP); + maySkipICMP, + dummy); VIR_FREE(matchState); @@ -1726,7 +1742,8 @@ iptablesCreateRuleInstanceStateCtrl(virNWFilterDefPtr nwfilter, if (create) { chainPrefix[0] = 'H'; - chainPrefix[1] = CHAINPREFIX_HOST_IN_TEMP; + chainPrefix[1] = usetemp ? CHAINPREFIX_HOST_IN_TEMP : + CHAINPREFIX_HOST_IN; rc = _iptablesCreateRuleInstance(directionIn, chainPrefix, nwfilter, @@ -1737,7 +1754,8 @@ iptablesCreateRuleInstanceStateCtrl(virNWFilterDefPtr nwfilter, matchState, false, "RETURN", isIPv6, - maySkipICMP); + maySkipICMP, + dummy); VIR_FREE(matchState); } @@ -1751,7 +1769,9 @@ iptablesCreateRuleInstance(virNWFilterDefPtr nwfilter, const char *ifname, virNWFilterHashTablePtr vars, virNWFilterRuleInstPtr res, - bool isIPv6) + bool isIPv6, + bool usetemp, + bool dummy) { int rc; int directionIn = 0; @@ -1767,7 +1787,9 @@ iptablesCreateRuleInstance(virNWFilterDefPtr nwfilter, ifname, vars, res, - isIPv6); + isIPv6, + usetemp, + dummy); } if ((rule->tt == VIR_NWFILTER_RULE_DIRECTION_IN) || @@ -1790,7 +1812,7 @@ iptablesCreateRuleInstance(virNWFilterDefPtr nwfilter, else matchState = NULL; - chainPrefix[1] = CHAINPREFIX_HOST_IN_TEMP; + chainPrefix[1] = usetemp ? CHAINPREFIX_HOST_IN_TEMP : CHAINPREFIX_HOST_IN; rc = _iptablesCreateRuleInstance(directionIn, chainPrefix, nwfilter, @@ -1801,7 +1823,8 @@ iptablesCreateRuleInstance(virNWFilterDefPtr nwfilter, matchState, true, "RETURN", isIPv6, - maySkipICMP); + maySkipICMP, + dummy); if (rc) return rc; @@ -1812,7 +1835,7 @@ iptablesCreateRuleInstance(virNWFilterDefPtr nwfilter, else matchState = NULL; - chainPrefix[1] = CHAINPREFIX_HOST_OUT_TEMP; + chainPrefix[1] = usetemp ? CHAINPREFIX_HOST_OUT_TEMP : CHAINPREFIX_HOST_OUT; rc = _iptablesCreateRuleInstance(!directionIn, chainPrefix, nwfilter, @@ -1823,7 +1846,8 @@ iptablesCreateRuleInstance(virNWFilterDefPtr nwfilter, matchState, true, "ACCEPT", isIPv6, - maySkipICMP); + maySkipICMP, + dummy); if (rc) return rc; @@ -1834,7 +1858,7 @@ iptablesCreateRuleInstance(virNWFilterDefPtr nwfilter, matchState = NULL; chainPrefix[0] = 'H'; - chainPrefix[1] = CHAINPREFIX_HOST_IN_TEMP; + chainPrefix[1] = usetemp ? CHAINPREFIX_HOST_IN_TEMP : CHAINPREFIX_HOST_IN; rc = _iptablesCreateRuleInstance(directionIn, chainPrefix, nwfilter, @@ -1845,7 +1869,8 @@ iptablesCreateRuleInstance(virNWFilterDefPtr nwfilter, matchState, true, "RETURN", isIPv6, - maySkipICMP); + maySkipICMP, + dummy); return rc; } @@ -1876,7 +1901,8 @@ ebtablesCreateRuleInstance(char chainPrefix, const char *ifname, virNWFilterHashTablePtr vars, virNWFilterRuleInstPtr res, - bool reverse) + bool reverse, + bool dummy) { char macaddr[VIR_MAC_STRING_BUFLEN], ipaddr[INET_ADDRSTRLEN], @@ -1899,6 +1925,11 @@ ebtablesCreateRuleInstance(char chainPrefix, PRINT_CHAIN(chain, chainPrefix, ifname, virNWFilterChainSuffixTypeToString(nwfilter->chainsuffix)); + if (dummy) { + virBufferVSprintf(&buf, CMD_DEF_PRE "%s -- -t %s -%%c %s %%s", + "echo", EBTABLES_DEFAULT_TABLE, chain); + goto prskip; + } switch (rule->prtclType) { case VIR_NWFILTER_RULE_PROTOCOL_MAC: @@ -2300,6 +2331,8 @@ ebtablesCreateRuleInstance(char chainPrefix, return -1; } +prskip: + switch (rule->action) { case VIR_NWFILTER_RULE_ACTION_REJECT: /* REJECT not supported */ @@ -2357,11 +2390,15 @@ ebiptablesCreateRuleInstance(virConnectPtr conn ATTRIBUTE_UNUSED, virNWFilterRuleDefPtr rule, const char *ifname, virNWFilterHashTablePtr vars, - virNWFilterRuleInstPtr res) + virNWFilterRuleInstPtr res, + bool usetemp, + bool dummy) { int rc = 0; bool isIPv6; + char chainPrefix; + chainPrefix = usetemp ? CHAINPREFIX_HOST_IN_TEMP : CHAINPREFIX_HOST_IN; switch (rule->prtclType) { case VIR_NWFILTER_RULE_PROTOCOL_IP: case VIR_NWFILTER_RULE_PROTOCOL_MAC: @@ -2372,26 +2409,30 @@ ebiptablesCreateRuleInstance(virConnectPtr conn ATTRIBUTE_UNUSED, if (rule->tt == VIR_NWFILTER_RULE_DIRECTION_OUT || rule->tt == VIR_NWFILTER_RULE_DIRECTION_INOUT) { - rc = ebtablesCreateRuleInstance(CHAINPREFIX_HOST_IN_TEMP, + rc = ebtablesCreateRuleInstance(chainPrefix, nwfilter, rule, ifname, vars, res, - rule->tt == VIR_NWFILTER_RULE_DIRECTION_INOUT); + rule->tt == VIR_NWFILTER_RULE_DIRECTION_INOUT, + dummy); if (rc) return rc; } + chainPrefix = usetemp ? CHAINPREFIX_HOST_OUT_TEMP : + CHAINPREFIX_HOST_OUT; if (rule->tt == VIR_NWFILTER_RULE_DIRECTION_IN || rule->tt == VIR_NWFILTER_RULE_DIRECTION_INOUT) { - rc = ebtablesCreateRuleInstance(CHAINPREFIX_HOST_OUT_TEMP, + rc = ebtablesCreateRuleInstance(chainPrefix, nwfilter, rule, ifname, vars, res, - false); + false, + dummy); } break; @@ -2417,7 +2458,9 @@ ebiptablesCreateRuleInstance(virConnectPtr conn ATTRIBUTE_UNUSED, ifname, vars, res, - isIPv6); + isIPv6, + usetemp, + dummy); break; case VIR_NWFILTER_RULE_PROTOCOL_TCPoIPV6: @@ -2441,7 +2484,9 @@ ebiptablesCreateRuleInstance(virConnectPtr conn ATTRIBUTE_UNUSED, ifname, vars, res, - isIPv6); + isIPv6, + usetemp, + dummy); break; case VIR_NWFILTER_RULE_PROTOCOL_LAST: diff --git a/src/nwfilter/nwfilter_gentech_driver.c b/src/nwfilter/nwfilter_gentech_driver.c index f89fb79..0bc3537 100644 --- a/src/nwfilter/nwfilter_gentech_driver.c +++ b/src/nwfilter/nwfilter_gentech_driver.c @@ -222,7 +222,9 @@ virNWFilterRuleInstantiate(virConnectPtr conn, virNWFilterDefPtr filter, virNWFilterRuleDefPtr rule, const char *ifname, - virNWFilterHashTablePtr vars) + virNWFilterHashTablePtr vars, + bool usetemp, + bool dummy) { int rc; int i; @@ -235,8 +237,8 @@ virNWFilterRuleInstantiate(virConnectPtr conn, ret->techdriver = techdriver; - rc = techdriver->createRuleInstance(conn, nettype, filter, - rule, ifname, vars, ret); + rc = techdriver->createRuleInstance(conn, nettype, filter, rule, ifname, + vars, ret, usetemp, dummy); if (rc) { for (i = 0; i < ret->ndata; i++) @@ -292,6 +294,8 @@ err_exit: * @ifname: The name of the interface to apply the rules to * @vars: A map holding variable names and values used for instantiating * the filter and its subfilters. + * @matchvar: if non-null, variable name to match + * @notmatch: if matchvar set, match filters that do not reference matchvar * @nEntries: number of virNWFilterInst objects collected * @insts: pointer to array for virNWFilterIns object pointers * @useNewFilter: instruct whether to use a newDef pointer rather than a @@ -315,6 +319,8 @@ _virNWFilterInstantiateRec(virConnectPtr conn, virNWFilterDefPtr filter, const char *ifname, virNWFilterHashTablePtr vars, + const char *matchvar, + bool notmatch, int *nEntries, virNWFilterRuleInstPtr **insts, enum instCase useNewFilter, bool *foundNewFilter, @@ -325,18 +331,34 @@ _virNWFilterInstantiateRec(virConnectPtr conn, int i; virNWFilterRuleInstPtr inst; virNWFilterDefPtr next_filter; + bool usetemp, dummy; for (i = 0; i < filter->nentries; i++) { virNWFilterRuleDefPtr rule = filter->filterEntries[i]->rule; virNWFilterIncludeDefPtr inc = filter->filterEntries[i]->include; if (rule) { + usetemp = 1; + dummy = 0; + if (matchvar) { + int j; + + for (j = 0; j < rule->nvars; ++j) + if (strcmp(rule->vars[j], matchvar) == 0) + break; + /* use temp chains only on base rule install */ + usetemp = notmatch; + /* skip if not found; notmatch reverses the sense */ + dummy = (j == rule->nvars) ^ notmatch; + } inst = virNWFilterRuleInstantiate(conn, techdriver, nettype, filter, rule, ifname, - vars); + vars, + usetemp, + dummy); if (!inst) { rc = 1; break; @@ -394,6 +416,7 @@ _virNWFilterInstantiateRec(virConnectPtr conn, next_filter, ifname, tmpvars, + matchvar, notmatch, nEntries, insts, useNewFilter, foundNewFilter, @@ -623,6 +646,7 @@ virNWFilterInstantiate(virConnectPtr conn, filter, ifname, vars, + 0, 0, &nEntries, &insts, useNewFilter, foundNewFilter, driver);

1 0

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

09 May '11

This patch adds the internal capability to add rules to existing chains instead of using temporary chains and to generate placeholders for chains that are referenced without generating a rule for them immediately. Finally, it includes variable matching for filter instantiation (i.e., instantiate only when a given variable is present in a filter, or only when it is not). Signed-off-by: David L Stevens <dlstevens(a)us.ibm.com> diff --git a/src/conf/nwfilter_conf.h b/src/conf/nwfilter_conf.h index 72bdade..25f7b60 100644 --- a/src/conf/nwfilter_conf.h +++ b/src/conf/nwfilter_conf.h @@ -517,7 +517,9 @@ typedef int (*virNWFilterRuleCreateInstance)(virConnectPtr conn, virNWFilterRuleDefPtr rule, const char *ifname, virNWFilterHashTablePtr vars, - virNWFilterRuleInstPtr res); + virNWFilterRuleInstPtr res, + bool usetemp, + bool dummy); typedef int (*virNWFilterRuleApplyNewRules)(virConnectPtr conn, const char *ifname, diff --git a/src/nwfilter/nwfilter_ebiptables_driver.c b/src/nwfilter/nwfilter_ebiptables_driver.c index f16a143..f74f63b 100644 --- a/src/nwfilter/nwfilter_ebiptables_driver.c +++ b/src/nwfilter/nwfilter_ebiptables_driver.c @@ -1134,6 +1134,7 @@ iptablesEnforceDirection(int directionIn, * @isIPv6 : Whether this is an IPv6 rule * @maySkipICMP : whether this rule may under certain circumstances skip * the ICMP rule from being created + * @dummy : generate rule placeholder without installing * * Convert a single rule into its representation for later instantiation * @@ -1152,7 +1153,8 @@ _iptablesCreateRuleInstance(int directionIn, const char *match, bool defMatch, const char *accept_target, bool isIPv6, - bool maySkipICMP) + bool maySkipICMP, + bool dummy) { char chain[MAX_CHAINNAME_LENGTH]; char number[20]; @@ -1179,6 +1181,13 @@ _iptablesCreateRuleInstance(int directionIn, PRINT_IPT_ROOT_CHAIN(chain, chainPrefix, ifname); + if (dummy) { + virBufferVSprintf(&buf, CMD_DEF_PRE "%s -- %s -%%c %s %%s", + "echo", iptables_cmd, chain); + bufUsed = virBufferUse(&buf); + goto prskip; + } + switch (rule->prtclType) { case VIR_NWFILTER_RULE_PROTOCOL_TCP: case VIR_NWFILTER_RULE_PROTOCOL_TCPoIPV6: @@ -1510,6 +1519,8 @@ _iptablesCreateRuleInstance(int directionIn, return -1; } +prskip: + if ((srcMacSkipped && bufUsed == virBufferUse(&buf)) || skipRule) { virBufferFreeAndReset(&buf); @@ -1625,7 +1636,9 @@ iptablesCreateRuleInstanceStateCtrl(virNWFilterDefPtr nwfilter, const char *ifname, virNWFilterHashTablePtr vars, virNWFilterRuleInstPtr res, - bool isIPv6) + bool isIPv6, + bool usetemp, + bool dummy) { int rc; int directionIn = 0, directionOut = 0; @@ -1658,7 +1671,7 @@ iptablesCreateRuleInstanceStateCtrl(virNWFilterDefPtr nwfilter, return 1; } - chainPrefix[1] = CHAINPREFIX_HOST_IN_TEMP; + chainPrefix[1] = usetemp ? CHAINPREFIX_HOST_IN_TEMP : CHAINPREFIX_HOST_IN; if (create) { rc = _iptablesCreateRuleInstance(directionIn, chainPrefix, @@ -1670,7 +1683,8 @@ iptablesCreateRuleInstanceStateCtrl(virNWFilterDefPtr nwfilter, matchState, false, "RETURN", isIPv6, - maySkipICMP); + maySkipICMP, + dummy); VIR_FREE(matchState); if (rc) @@ -1690,7 +1704,8 @@ iptablesCreateRuleInstanceStateCtrl(virNWFilterDefPtr nwfilter, return 1; } - chainPrefix[1] = CHAINPREFIX_HOST_OUT_TEMP; + chainPrefix[1] = usetemp ? CHAINPREFIX_HOST_OUT_TEMP : + CHAINPREFIX_HOST_OUT; if (create) { rc = _iptablesCreateRuleInstance(!directionIn, chainPrefix, @@ -1702,7 +1717,8 @@ iptablesCreateRuleInstanceStateCtrl(virNWFilterDefPtr nwfilter, matchState, false, "ACCEPT", isIPv6, - maySkipICMP); + maySkipICMP, + dummy); VIR_FREE(matchState); @@ -1726,7 +1742,8 @@ iptablesCreateRuleInstanceStateCtrl(virNWFilterDefPtr nwfilter, if (create) { chainPrefix[0] = 'H'; - chainPrefix[1] = CHAINPREFIX_HOST_IN_TEMP; + chainPrefix[1] = usetemp ? CHAINPREFIX_HOST_IN_TEMP : + CHAINPREFIX_HOST_IN; rc = _iptablesCreateRuleInstance(directionIn, chainPrefix, nwfilter, @@ -1737,7 +1754,8 @@ iptablesCreateRuleInstanceStateCtrl(virNWFilterDefPtr nwfilter, matchState, false, "RETURN", isIPv6, - maySkipICMP); + maySkipICMP, + dummy); VIR_FREE(matchState); } @@ -1751,7 +1769,9 @@ iptablesCreateRuleInstance(virNWFilterDefPtr nwfilter, const char *ifname, virNWFilterHashTablePtr vars, virNWFilterRuleInstPtr res, - bool isIPv6) + bool isIPv6, + bool usetemp, + bool dummy) { int rc; int directionIn = 0; @@ -1767,7 +1787,9 @@ iptablesCreateRuleInstance(virNWFilterDefPtr nwfilter, ifname, vars, res, - isIPv6); + isIPv6, + usetemp, + dummy); } if ((rule->tt == VIR_NWFILTER_RULE_DIRECTION_IN) || @@ -1790,7 +1812,7 @@ iptablesCreateRuleInstance(virNWFilterDefPtr nwfilter, else matchState = NULL; - chainPrefix[1] = CHAINPREFIX_HOST_IN_TEMP; + chainPrefix[1] = usetemp ? CHAINPREFIX_HOST_IN_TEMP : CHAINPREFIX_HOST_IN; rc = _iptablesCreateRuleInstance(directionIn, chainPrefix, nwfilter, @@ -1801,7 +1823,8 @@ iptablesCreateRuleInstance(virNWFilterDefPtr nwfilter, matchState, true, "RETURN", isIPv6, - maySkipICMP); + maySkipICMP, + dummy); if (rc) return rc; @@ -1812,7 +1835,7 @@ iptablesCreateRuleInstance(virNWFilterDefPtr nwfilter, else matchState = NULL; - chainPrefix[1] = CHAINPREFIX_HOST_OUT_TEMP; + chainPrefix[1] = usetemp ? CHAINPREFIX_HOST_OUT_TEMP : CHAINPREFIX_HOST_OUT; rc = _iptablesCreateRuleInstance(!directionIn, chainPrefix, nwfilter, @@ -1823,7 +1846,8 @@ iptablesCreateRuleInstance(virNWFilterDefPtr nwfilter, matchState, true, "ACCEPT", isIPv6, - maySkipICMP); + maySkipICMP, + dummy); if (rc) return rc; @@ -1834,7 +1858,7 @@ iptablesCreateRuleInstance(virNWFilterDefPtr nwfilter, matchState = NULL; chainPrefix[0] = 'H'; - chainPrefix[1] = CHAINPREFIX_HOST_IN_TEMP; + chainPrefix[1] = usetemp ? CHAINPREFIX_HOST_IN_TEMP : CHAINPREFIX_HOST_IN; rc = _iptablesCreateRuleInstance(directionIn, chainPrefix, nwfilter, @@ -1845,7 +1869,8 @@ iptablesCreateRuleInstance(virNWFilterDefPtr nwfilter, matchState, true, "RETURN", isIPv6, - maySkipICMP); + maySkipICMP, + dummy); return rc; } @@ -1876,7 +1901,8 @@ ebtablesCreateRuleInstance(char chainPrefix, const char *ifname, virNWFilterHashTablePtr vars, virNWFilterRuleInstPtr res, - bool reverse) + bool reverse, + bool dummy) { char macaddr[VIR_MAC_STRING_BUFLEN], ipaddr[INET_ADDRSTRLEN], @@ -1899,6 +1925,11 @@ ebtablesCreateRuleInstance(char chainPrefix, PRINT_CHAIN(chain, chainPrefix, ifname, virNWFilterChainSuffixTypeToString(nwfilter->chainsuffix)); + if (dummy) { + virBufferVSprintf(&buf, CMD_DEF_PRE "%s -- -t %s -%%c %s %%s", + "echo", EBTABLES_DEFAULT_TABLE, chain); + goto prskip; + } switch (rule->prtclType) { case VIR_NWFILTER_RULE_PROTOCOL_MAC: @@ -2300,6 +2331,8 @@ ebtablesCreateRuleInstance(char chainPrefix, return -1; } +prskip: + switch (rule->action) { case VIR_NWFILTER_RULE_ACTION_REJECT: /* REJECT not supported */ @@ -2357,11 +2390,15 @@ ebiptablesCreateRuleInstance(virConnectPtr conn ATTRIBUTE_UNUSED, virNWFilterRuleDefPtr rule, const char *ifname, virNWFilterHashTablePtr vars, - virNWFilterRuleInstPtr res) + virNWFilterRuleInstPtr res, + bool usetemp, + bool dummy) { int rc = 0; bool isIPv6; + char chainPrefix; + chainPrefix = usetemp ? CHAINPREFIX_HOST_IN_TEMP : CHAINPREFIX_HOST_IN; switch (rule->prtclType) { case VIR_NWFILTER_RULE_PROTOCOL_IP: case VIR_NWFILTER_RULE_PROTOCOL_MAC: @@ -2372,26 +2409,30 @@ ebiptablesCreateRuleInstance(virConnectPtr conn ATTRIBUTE_UNUSED, if (rule->tt == VIR_NWFILTER_RULE_DIRECTION_OUT || rule->tt == VIR_NWFILTER_RULE_DIRECTION_INOUT) { - rc = ebtablesCreateRuleInstance(CHAINPREFIX_HOST_IN_TEMP, + rc = ebtablesCreateRuleInstance(chainPrefix, nwfilter, rule, ifname, vars, res, - rule->tt == VIR_NWFILTER_RULE_DIRECTION_INOUT); + rule->tt == VIR_NWFILTER_RULE_DIRECTION_INOUT, + dummy); if (rc) return rc; } + chainPrefix = usetemp ? CHAINPREFIX_HOST_OUT_TEMP : + CHAINPREFIX_HOST_OUT; if (rule->tt == VIR_NWFILTER_RULE_DIRECTION_IN || rule->tt == VIR_NWFILTER_RULE_DIRECTION_INOUT) { - rc = ebtablesCreateRuleInstance(CHAINPREFIX_HOST_OUT_TEMP, + rc = ebtablesCreateRuleInstance(chainPrefix, nwfilter, rule, ifname, vars, res, - false); + false, + dummy); } break; @@ -2417,7 +2458,9 @@ ebiptablesCreateRuleInstance(virConnectPtr conn ATTRIBUTE_UNUSED, ifname, vars, res, - isIPv6); + isIPv6, + usetemp, + dummy); break; case VIR_NWFILTER_RULE_PROTOCOL_TCPoIPV6: @@ -2441,7 +2484,9 @@ ebiptablesCreateRuleInstance(virConnectPtr conn ATTRIBUTE_UNUSED, ifname, vars, res, - isIPv6); + isIPv6, + usetemp, + dummy); break; case VIR_NWFILTER_RULE_PROTOCOL_LAST: diff --git a/src/nwfilter/nwfilter_gentech_driver.c b/src/nwfilter/nwfilter_gentech_driver.c index f89fb79..0bc3537 100644 --- a/src/nwfilter/nwfilter_gentech_driver.c +++ b/src/nwfilter/nwfilter_gentech_driver.c @@ -222,7 +222,9 @@ virNWFilterRuleInstantiate(virConnectPtr conn, virNWFilterDefPtr filter, virNWFilterRuleDefPtr rule, const char *ifname, - virNWFilterHashTablePtr vars) + virNWFilterHashTablePtr vars, + bool usetemp, + bool dummy) { int rc; int i; @@ -235,8 +237,8 @@ virNWFilterRuleInstantiate(virConnectPtr conn, ret->techdriver = techdriver; - rc = techdriver->createRuleInstance(conn, nettype, filter, - rule, ifname, vars, ret); + rc = techdriver->createRuleInstance(conn, nettype, filter, rule, ifname, + vars, ret, usetemp, dummy); if (rc) { for (i = 0; i < ret->ndata; i++) @@ -292,6 +294,8 @@ err_exit: * @ifname: The name of the interface to apply the rules to * @vars: A map holding variable names and values used for instantiating * the filter and its subfilters. + * @matchvar: if non-null, variable name to match + * @notmatch: if matchvar set, match filters that do not reference matchvar * @nEntries: number of virNWFilterInst objects collected * @insts: pointer to array for virNWFilterIns object pointers * @useNewFilter: instruct whether to use a newDef pointer rather than a @@ -315,6 +319,8 @@ _virNWFilterInstantiateRec(virConnectPtr conn, virNWFilterDefPtr filter, const char *ifname, virNWFilterHashTablePtr vars, + const char *matchvar, + bool notmatch, int *nEntries, virNWFilterRuleInstPtr **insts, enum instCase useNewFilter, bool *foundNewFilter, @@ -325,18 +331,34 @@ _virNWFilterInstantiateRec(virConnectPtr conn, int i; virNWFilterRuleInstPtr inst; virNWFilterDefPtr next_filter; + bool usetemp, dummy; for (i = 0; i < filter->nentries; i++) { virNWFilterRuleDefPtr rule = filter->filterEntries[i]->rule; virNWFilterIncludeDefPtr inc = filter->filterEntries[i]->include; if (rule) { + usetemp = 1; + dummy = 0; + if (matchvar) { + int j; + + for (j = 0; j < rule->nvars; ++j) + if (strcmp(rule->vars[j], matchvar) == 0) + break; + /* use temp chains only on base rule install */ + usetemp = notmatch; + /* skip if not found; notmatch reverses the sense */ + dummy = (j == rule->nvars) ^ notmatch; + } inst = virNWFilterRuleInstantiate(conn, techdriver, nettype, filter, rule, ifname, - vars); + vars, + usetemp, + dummy); if (!inst) { rc = 1; break; @@ -394,6 +416,7 @@ _virNWFilterInstantiateRec(virConnectPtr conn, next_filter, ifname, tmpvars, + matchvar, notmatch, nEntries, insts, useNewFilter, foundNewFilter, @@ -623,6 +646,7 @@ virNWFilterInstantiate(virConnectPtr conn, filter, ifname, vars, + 0, 0, &nEntries, &insts, useNewFilter, foundNewFilter, driver);

1 0

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

09 May '11

This patch simplifies the table rules by setting the protocol chains policy to be "DROP" and removes the explicit "-j DROP" entries that the protocol rules had previously. It also makes "no-other-rarp-traffic.xml" obsolete. Signed-off-by: David L Stevens <dlstevens(a)us.ibm.com> diff --git a/examples/xml/nwfilter/Makefile.am b/examples/xml/nwfilter/Makefile.am index 8ef9a71..60301c9 100644 --- a/examples/xml/nwfilter/Makefile.am +++ b/examples/xml/nwfilter/Makefile.am @@ -14,7 +14,6 @@ FILTERS = \ no-mac-broadcast.xml \ no-mac-spoofing.xml \ no-other-l2-traffic.xml \ - no-other-rarp-traffic.xml \ qemu-announce-self.xml \ qemu-announce-self-rarp.xml diff --git a/examples/xml/nwfilter/no-arpip-spoofing.xml b/examples/xml/nwfilter/no-arpip-spoofing.xml index ee42d40..7ef6f0f 100644 --- a/examples/xml/nwfilter/no-arpip-spoofing.xml +++ b/examples/xml/nwfilter/no-arpip-spoofing.xml @@ -7,6 +7,4 @@ <rule action='return' direction='out' priority='410' > <arp match='yes' arpsrcipaddr='0.0.0.0' /> </rule> -  - <rule action='drop' direction='out' priority='1000' /> </filter> diff --git a/examples/xml/nwfilter/no-arpmac-spoofing.xml b/examples/xml/nwfilter/no-arpmac-spoofing.xml index 90499d3..3834047 100644 --- a/examples/xml/nwfilter/no-arpmac-spoofing.xml +++ b/examples/xml/nwfilter/no-arpmac-spoofing.xml @@ -2,6 +2,4 @@ <rule action='return' direction='out' priority='350' > <arp match='yes' arpsrcmacaddr='$MAC'/> </rule> -  - <rule action='drop' direction='out' priority='1000' /> </filter> diff --git a/examples/xml/nwfilter/no-ip-spoofing.xml b/examples/xml/nwfilter/no-ip-spoofing.xml index 84e8a5e..2fccd12 100644 --- a/examples/xml/nwfilter/no-ip-spoofing.xml +++ b/examples/xml/nwfilter/no-ip-spoofing.xml @@ -4,6 +4,4 @@ <rule action='return' direction='out'> <ip match='yes' srcipaddr='$IP' /> </rule> -  - <rule action='drop' direction='out' /> </filter> diff --git a/examples/xml/nwfilter/no-mac-spoofing.xml b/examples/xml/nwfilter/no-mac-spoofing.xml index aee56c7..e2e8c03 100644 --- a/examples/xml/nwfilter/no-mac-spoofing.xml +++ b/examples/xml/nwfilter/no-mac-spoofing.xml @@ -4,6 +4,4 @@ <rule action='return' direction='out' priority='350' > <mac match='yes' srcmacaddr='$MAC'/> </rule> -  - <rule action='drop' direction='out' priority='1000' /> </filter> diff --git a/examples/xml/nwfilter/no-other-rarp-traffic.xml b/examples/xml/nwfilter/no-other-rarp-traffic.xml deleted file mode 100644 index 7729996..0000000 --- a/examples/xml/nwfilter/no-other-rarp-traffic.xml +++ /dev/null @@ -1,3 +0,0 @@ -<filter name='no-other-rarp-traffic' chain='rarp'> - <rule action='drop' direction='inout' priority='1000'/> -</filter> diff --git a/examples/xml/nwfilter/qemu-announce-self.xml b/examples/xml/nwfilter/qemu-announce-self.xml index 352db50..12957b5 100644 --- a/examples/xml/nwfilter/qemu-announce-self.xml +++ b/examples/xml/nwfilter/qemu-announce-self.xml @@ -8,6 +8,5 @@  <filterref filter='qemu-announce-self-rarp'/> - <filterref filter='no-other-rarp-traffic'/> </filter> diff --git a/src/nwfilter/nwfilter_ebiptables_driver.c b/src/nwfilter/nwfilter_ebiptables_driver.c index fa6f719..dc0ad2e 100644 --- a/src/nwfilter/nwfilter_ebiptables_driver.c +++ b/src/nwfilter/nwfilter_ebiptables_driver.c @@ -2783,7 +2783,7 @@ ebtablesCreateTmpSubChain(virBufferPtr buf, protostr[0] = '\0'; virBufferVSprintf(buf, - CMD_DEF("%s -t %s -N %s") CMD_SEPARATOR + CMD_DEF("%s -t %s -N %s -P DROP") CMD_SEPARATOR CMD_EXEC "%s" CMD_DEF("%s -t %s -A %s %s -j %s") CMD_SEPARATOR @@ -3006,14 +3006,6 @@ ebtablesApplyBasicRules(const char *ifname, ebtablesCreateTmpRootChain(&buf, 1, ifname, 1); PRINT_ROOT_CHAIN(chain, chainPrefix, ifname); - virBufferVSprintf(&buf, - CMD_DEF("%s -t %s -A %s -s ! %s -j DROP") CMD_SEPARATOR - CMD_EXEC - "%s", - - ebtables_cmd_path, EBTABLES_DEFAULT_TABLE, - chain, macaddr_str, - CMD_STOPONERR(1)); virBufferVSprintf(&buf, CMD_DEF("%s -t %s -A %s -p IPv4 -j ACCEPT") CMD_SEPARATOR

1 0

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

09 May '11

This patch changes rules of the form: if ! addr drop accept to: if addr return ... drop The patch adds a "mac" chain to do a mac address list and separates the "arp" chain into separate "arpmac" and "arpip" chains that can check multiple MAC or IP addresses in any combination. This patch itself does not support multiple addresses via the MAC and IP variables, but only changes the form of the rules to allow multiple addresses in the future. Signed-off-by: David L Stevens <dlstevens(a)us.ibm.com> diff --git a/examples/xml/nwfilter/Makefile.am b/examples/xml/nwfilter/Makefile.am index 439e7b8..8ef9a71 100644 --- a/examples/xml/nwfilter/Makefile.am +++ b/examples/xml/nwfilter/Makefile.am @@ -7,6 +7,8 @@ FILTERS = \ allow-ipv4.xml \ clean-traffic.xml \ no-arp-spoofing.xml \ + no-arpmac-spoofing.xml \ + no-arpip-spoofing.xml \ no-ip-multicast.xml \ no-ip-spoofing.xml \ no-mac-broadcast.xml \ diff --git a/examples/xml/nwfilter/allow-arp.xml b/examples/xml/nwfilter/allow-arp.xml index 63a92b2..006bb54 100644 --- a/examples/xml/nwfilter/allow-arp.xml +++ b/examples/xml/nwfilter/allow-arp.xml @@ -1,3 +1,6 @@ -<filter name='allow-arp' chain='arp'> +<filter name='allow-arp' chain='arpmac'> + <rule direction='inout' action='accept'/> +</filter> +<filter name='allow-arp' chain='arpip'> <rule direction='inout' action='accept'/> </filter> diff --git a/examples/xml/nwfilter/clean-traffic.xml b/examples/xml/nwfilter/clean-traffic.xml index 40f0ecb..9cee799 100644 --- a/examples/xml/nwfilter/clean-traffic.xml +++ b/examples/xml/nwfilter/clean-traffic.xml @@ -11,10 +11,10 @@  <filterref filter='no-arp-spoofing'/> -  - <filterref filter='no-other-l2-traffic'/> -  <filterref filter='qemu-announce-self'/> +  + <filterref filter='no-other-l2-traffic'/> + </filter> diff --git a/examples/xml/nwfilter/no-arp-spoofing.xml b/examples/xml/nwfilter/no-arp-spoofing.xml index fdd4e60..1979b20 100644 --- a/examples/xml/nwfilter/no-arp-spoofing.xml +++ b/examples/xml/nwfilter/no-arp-spoofing.xml @@ -1,17 +1,4 @@ -<filter name='no-arp-spoofing' chain='arp'> - <uuid>f88f1932-debf-4aa1-9fbe-f10d3aa4bc95</uuid> - <rule action='drop' direction='out' priority='300' > - <mac match='no' srcmacaddr='$MAC'/> - </rule> - -  -  - <rule action='drop' direction='out' priority='350' > - <arp match='no' arpsrcmacaddr='$MAC'/> - </rule> - <rule action='drop' direction='out' priority='400' > - <arp match='no' arpsrcipaddr='$IP' /> - </rule> -  - <rule action='drop' direction='out' priority='1000' /> +<filter name='no-arp-spoofing'> + <filterref filter='no-arpmac-spoofing' /> + <filterref filter='no-arpip-spoofing' /> </filter> diff --git a/examples/xml/nwfilter/no-arpip-spoofing.xml b/examples/xml/nwfilter/no-arpip-spoofing.xml new file mode 100644 index 0000000..ee42d40 --- /dev/null +++ b/examples/xml/nwfilter/no-arpip-spoofing.xml @@ -0,0 +1,12 @@ +<filter name='no-arpip-spoofing' chain='arpip'> +  +  + <rule action='return' direction='out' priority='400' > + <arp match='yes' arpsrcipaddr='$IP' /> + </rule> + <rule action='return' direction='out' priority='410' > + <arp match='yes' arpsrcipaddr='0.0.0.0' /> + </rule> +  + <rule action='drop' direction='out' priority='1000' /> +</filter> diff --git a/examples/xml/nwfilter/no-arpmac-spoofing.xml b/examples/xml/nwfilter/no-arpmac-spoofing.xml new file mode 100644 index 0000000..90499d3 --- /dev/null +++ b/examples/xml/nwfilter/no-arpmac-spoofing.xml @@ -0,0 +1,7 @@ +<filter name='no-arpmac-spoofing' chain='arpmac'> + <rule action='return' direction='out' priority='350' > + <arp match='yes' arpsrcmacaddr='$MAC'/> + </rule> +  + <rule action='drop' direction='out' priority='1000' /> +</filter> diff --git a/examples/xml/nwfilter/no-ip-spoofing.xml b/examples/xml/nwfilter/no-ip-spoofing.xml index b8c94c8..84e8a5e 100644 --- a/examples/xml/nwfilter/no-ip-spoofing.xml +++ b/examples/xml/nwfilter/no-ip-spoofing.xml @@ -1,7 +1,9 @@ <filter name='no-ip-spoofing' chain='ipv4'>  - <rule action='drop' direction='out'> - <ip match='no' srcipaddr='$IP' /> + <rule action='return' direction='out'> + <ip match='yes' srcipaddr='$IP' /> </rule> +  + <rule action='drop' direction='out' /> </filter> diff --git a/examples/xml/nwfilter/no-mac-spoofing.xml b/examples/xml/nwfilter/no-mac-spoofing.xml index f210623..aee56c7 100644 --- a/examples/xml/nwfilter/no-mac-spoofing.xml +++ b/examples/xml/nwfilter/no-mac-spoofing.xml @@ -1,5 +1,9 @@ -<filter name='no-mac-spoofing' chain='ipv4'> - <rule action='drop' direction='out' priority='10'> - <mac match='no' srcmacaddr='$MAC' /> - </rule> +<filter name='no-mac-spoofing' chain='mac'> +  +  + <rule action='return' direction='out' priority='350' > + <mac match='yes' srcmacaddr='$MAC'/> + </rule> +  + <rule action='drop' direction='out' priority='1000' /> </filter> diff --git a/examples/xml/nwfilter/no-other-l2-traffic.xml b/examples/xml/nwfilter/no-other-l2-traffic.xml index 8bad86e..0501b1a 100644 --- a/examples/xml/nwfilter/no-other-l2-traffic.xml +++ b/examples/xml/nwfilter/no-other-l2-traffic.xml @@ -1,7 +1,12 @@ -<filter name='no-other-l2-traffic'> +<filter name='no-other-l2-traffic' chain='root'> -  - <rule action='drop' direction='inout' priority='1000'/> +  + <rule action='accept' direction='inout'> + <mac protocolid='0x800' /> + </rule> + <rule action='accept' direction='inout'> + <mac protocolid='0x806' /> + </rule> + <rule action='drop' direction='inout' priority='1000' /> </filter> diff --git a/src/conf/nwfilter_conf.c b/src/conf/nwfilter_conf.c index c5705c1..df1a012 100644 --- a/src/conf/nwfilter_conf.c +++ b/src/conf/nwfilter_conf.c @@ -82,7 +82,9 @@ VIR_ENUM_IMPL(virNWFilterEbtablesTable, VIR_NWFILTER_EBTABLES_TABLE_LAST, VIR_ENUM_IMPL(virNWFilterChainSuffix, VIR_NWFILTER_CHAINSUFFIX_LAST, "root", - "arp", + "mac", + "arpmac", + "arpip", "rarp", "ipv4", "ipv6"); diff --git a/src/conf/nwfilter_conf.h b/src/conf/nwfilter_conf.h index ef60b6b..4d60751 100644 --- a/src/conf/nwfilter_conf.h +++ b/src/conf/nwfilter_conf.h @@ -425,7 +425,9 @@ struct _virNWFilterEntry { enum virNWFilterChainSuffixType { VIR_NWFILTER_CHAINSUFFIX_ROOT = 0, - VIR_NWFILTER_CHAINSUFFIX_ARP, + VIR_NWFILTER_CHAINSUFFIX_MAC, + VIR_NWFILTER_CHAINSUFFIX_ARPMAC, + VIR_NWFILTER_CHAINSUFFIX_ARPIP, VIR_NWFILTER_CHAINSUFFIX_RARP, VIR_NWFILTER_CHAINSUFFIX_IPv4, VIR_NWFILTER_CHAINSUFFIX_IPv6, diff --git a/src/nwfilter/nwfilter_ebiptables_driver.c b/src/nwfilter/nwfilter_ebiptables_driver.c index 39bd4a5..fa6f719 100644 --- a/src/nwfilter/nwfilter_ebiptables_driver.c +++ b/src/nwfilter/nwfilter_ebiptables_driver.c @@ -129,20 +129,24 @@ struct ushort_map { enum l3_proto_idx { - L3_PROTO_IPV4_IDX = 0, - L3_PROTO_IPV6_IDX, - L3_PROTO_ARP_IDX, + L3_PROTO_MAC_IDX = 0, + L3_PROTO_ARPMAC_IDX, + L3_PROTO_ARPIP_IDX, L3_PROTO_RARP_IDX, + L3_PROTO_IPV4_IDX, + L3_PROTO_IPV6_IDX, L3_PROTO_LAST_IDX }; #define USHORTMAP_ENTRY_IDX(IDX, ATT, VAL) [IDX] = { .attr = ATT, .val = VAL } static const struct ushort_map l3_protocols[] = { - USHORTMAP_ENTRY_IDX(L3_PROTO_IPV4_IDX, ETHERTYPE_IP , "ipv4"), - USHORTMAP_ENTRY_IDX(L3_PROTO_IPV6_IDX, ETHERTYPE_IPV6 , "ipv6"), - USHORTMAP_ENTRY_IDX(L3_PROTO_ARP_IDX , ETHERTYPE_ARP , "arp"), - USHORTMAP_ENTRY_IDX(L3_PROTO_RARP_IDX, ETHERTYPE_REVARP, "rarp"), + USHORTMAP_ENTRY_IDX(L3_PROTO_MAC_IDX, 0 , "mac"), + USHORTMAP_ENTRY_IDX(L3_PROTO_IPV4_IDX, ETHERTYPE_IP , "ipv4"), + USHORTMAP_ENTRY_IDX(L3_PROTO_IPV6_IDX, ETHERTYPE_IPV6 , "ipv6"), + USHORTMAP_ENTRY_IDX(L3_PROTO_ARPMAC_IDX,ETHERTYPE_ARP , "arpmac"), + USHORTMAP_ENTRY_IDX(L3_PROTO_ARPIP_IDX, ETHERTYPE_ARP , "arpip"), + USHORTMAP_ENTRY_IDX(L3_PROTO_RARP_IDX, ETHERTYPE_REVARP, "rarp"), USHORTMAP_ENTRY_IDX(L3_PROTO_LAST_IDX, 0 , NULL), }; @@ -1946,7 +1950,7 @@ ebtablesCreateRuleInstance(char chainPrefix, virBufferVSprintf(&buf, " -p 0x%x", (rule->prtclType == VIR_NWFILTER_RULE_PROTOCOL_ARP) - ? l3_protocols[L3_PROTO_ARP_IDX].attr + ? l3_protocols[L3_PROTO_ARPMAC_IDX].attr : l3_protocols[L3_PROTO_RARP_IDX].attr); if (HAS_ENTRY_ITEM(&rule->p.arpHdrFilter.dataHWType)) { @@ -2767,15 +2771,22 @@ ebtablesCreateTmpSubChain(virBufferPtr buf, char rootchain[MAX_CHAINNAME_LENGTH], chain[MAX_CHAINNAME_LENGTH]; char chainPrefix = (incoming) ? CHAINPREFIX_HOST_IN_TEMP : CHAINPREFIX_HOST_OUT_TEMP; + char protostr[16]; PRINT_ROOT_CHAIN(rootchain, chainPrefix, ifname); PRINT_CHAIN(chain, chainPrefix, ifname, l3_protocols[protoidx].val); + if (l3_protocols[protoidx].attr) + snprintf(protostr, sizeof(protostr), "-p 0x%04x ", + l3_protocols[protoidx].attr); + else + protostr[0] = '\0'; + virBufferVSprintf(buf, CMD_DEF("%s -t %s -N %s") CMD_SEPARATOR CMD_EXEC "%s" - CMD_DEF("%s -t %s -A %s -p 0x%x -j %s") CMD_SEPARATOR + CMD_DEF("%s -t %s -A %s %s -j %s") CMD_SEPARATOR CMD_EXEC "%s", @@ -2784,7 +2795,7 @@ ebtablesCreateTmpSubChain(virBufferPtr buf, CMD_STOPONERR(stopOnError), ebtables_cmd_path, EBTABLES_DEFAULT_TABLE, - rootchain, l3_protocols[protoidx].attr, chain, + rootchain, protostr, chain, CMD_STOPONERR(stopOnError)); @@ -3357,6 +3368,11 @@ ebiptablesApplyNewRules(virConnectPtr conn ATTRIBUTE_UNUSED, if (chains_out != 0) ebtablesCreateTmpRootChain(&buf, 0, ifname, 1); + if (chains_in & (1 << VIR_NWFILTER_CHAINSUFFIX_MAC)) + ebtablesCreateTmpSubChain(&buf, 1, ifname, L3_PROTO_MAC_IDX, 1); + if (chains_out & (1 << VIR_NWFILTER_CHAINSUFFIX_MAC)) + ebtablesCreateTmpSubChain(&buf, 0, ifname, L3_PROTO_MAC_IDX, 1); + if (chains_in & (1 << VIR_NWFILTER_CHAINSUFFIX_IPv4)) ebtablesCreateTmpSubChain(&buf, 1, ifname, L3_PROTO_IPV4_IDX, 1); if (chains_out & (1 << VIR_NWFILTER_CHAINSUFFIX_IPv4)) @@ -3368,10 +3384,14 @@ ebiptablesApplyNewRules(virConnectPtr conn ATTRIBUTE_UNUSED, ebtablesCreateTmpSubChain(&buf, 0, ifname, L3_PROTO_IPV6_IDX, 1); /* keep arp,rarp as last */ - if (chains_in & (1 << VIR_NWFILTER_CHAINSUFFIX_ARP)) - ebtablesCreateTmpSubChain(&buf, 1, ifname, L3_PROTO_ARP_IDX, 1); - if (chains_out & (1 << VIR_NWFILTER_CHAINSUFFIX_ARP)) - ebtablesCreateTmpSubChain(&buf, 0, ifname, L3_PROTO_ARP_IDX, 1); + if (chains_in & (1 << VIR_NWFILTER_CHAINSUFFIX_ARPMAC)) + ebtablesCreateTmpSubChain(&buf, 1, ifname, L3_PROTO_ARPMAC_IDX, 1); + if (chains_in & (1 << VIR_NWFILTER_CHAINSUFFIX_ARPIP)) + ebtablesCreateTmpSubChain(&buf, 1, ifname, L3_PROTO_ARPIP_IDX, 1); + if (chains_out & (1 << VIR_NWFILTER_CHAINSUFFIX_ARPMAC)) + ebtablesCreateTmpSubChain(&buf, 0, ifname, L3_PROTO_ARPMAC_IDX, 1); + if (chains_out & (1 << VIR_NWFILTER_CHAINSUFFIX_ARPIP)) + ebtablesCreateTmpSubChain(&buf, 0, ifname, L3_PROTO_ARPIP_IDX, 1); if (chains_in & (1 << VIR_NWFILTER_CHAINSUFFIX_RARP)) ebtablesCreateTmpSubChain(&buf, 1, ifname, L3_PROTO_RARP_IDX, 1); if (chains_out & (1 << VIR_NWFILTER_CHAINSUFFIX_RARP))

1 0

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

09 May '11

This patch adds support for "continue" and "return" actions in filter rules. Signed-off-by: David L Stevens <dlstevens(a)us.ibm.com> diff --git a/src/conf/nwfilter_conf.c b/src/conf/nwfilter_conf.c index 13b5b38..6a15f04 100644 --- a/src/conf/nwfilter_conf.c +++ b/src/conf/nwfilter_conf.c @@ -54,12 +54,16 @@ VIR_ENUM_IMPL(virNWFilterRuleAction, VIR_NWFILTER_RULE_ACTION_LAST, "drop", "accept", - "reject"); + "reject", + "return", + "continue"); VIR_ENUM_IMPL(virNWFilterJumpTarget, VIR_NWFILTER_RULE_ACTION_LAST, "DROP", "ACCEPT", - "REJECT"); + "REJECT", + "RETURN", + "CONTINUE"); VIR_ENUM_IMPL(virNWFilterRuleDirection, VIR_NWFILTER_RULE_DIRECTION_LAST, "in", diff --git a/src/conf/nwfilter_conf.h b/src/conf/nwfilter_conf.h index 40da8c3..ab9d4c1 100644 --- a/src/conf/nwfilter_conf.h +++ b/src/conf/nwfilter_conf.h @@ -291,6 +291,8 @@ enum virNWFilterRuleActionType { VIR_NWFILTER_RULE_ACTION_DROP = 0, VIR_NWFILTER_RULE_ACTION_ACCEPT, VIR_NWFILTER_RULE_ACTION_REJECT, + VIR_NWFILTER_RULE_ACTION_RETURN, + VIR_NWFILTER_RULE_ACTION_CONTINUE, VIR_NWFILTER_RULE_ACTION_LAST, };

1 0

[libvirt] [PATCH] build: Fix problem of building Python bindings
by Osier Yang 09 May '11

09 May '11

If one specify "--with-python=yes" but no python-devel package is installed, we ignore it with just a notice message, which doesn't give clear guide to user. --- configure.ac | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index 190bf40..758c893 100644 --- a/configure.ac +++ b/configure.ac @@ -1917,15 +1917,13 @@ if test "$with_python" != "no" ; then then PYTHON_INCLUDES=-I/usr/include/python$PYTHON_VERSION else - AC_MSG_NOTICE([Could not find python$PYTHON_VERSION/Python.h, disabling bindings]) - with_python=no + AC_MSG_ERROR([You must install python-devel to build Python bindings]) fi fi fi fi else - AC_MSG_NOTICE([Could not find python interpreter, disabling bindings]) - with_python=no + AC_MSG_ERROR([You must install python to build Python bindings]) fi else AC_MSG_NOTICE([Could not find python in $with_python, disabling bindings]) -- 1.7.4

3 4

[libvirt] Magic error introduced by commit f09accc
by Jiri Denemark 09 May '11

09 May '11

Hi all, After commit f09accc (buf: add virBufferVasprintf) libvirt no longer compiles with -Werror because of the following error: CC libvirt_util_la-macvtap.lo cc1: warnings being treated as errors /usr/include/netlink/object.h:58: error: inline function 'nl_object_priv' declared but never defined I must admit I don't understand why including stdarg.h (which seems to be the only change visible in macvtap.c) results in this warning. Does anyone have an idea? Jirka

3 6

[libvirt] libvirt.pc file
by Eric Blake 09 May '11

09 May '11

Why is libvirt.pc included in the tarball? It contains information learned at configure time, thus its contents depend on who built the tarball, which is in violation of the normal rule that any generated file that depends on config.status must not be shipped. Unless anyone has a good reason why it is distributed, I'm working on a patch to fix that. -- Eric Blake eblake(a)redhat.com +1-801-349-2682 Libvirt virtualization library http://libvirt.org

4 8

[libvirt] virsh nodedev-dempxml is not supported by the connection driver
by guan qin 09 May '11

09 May '11

Hi, I meet a problem when I use the command "virsh nodedev-dumpxml pci_0000_00_19_0",it shows as follows: root@shahe26:~# virsh nodedev-list error: Failed to count node devices error: this function is not supported by the connection driver: virNodeNumOfDevices root@shahe26:~# virsh nodedev-dumpxml pci_0000_00_19_0 error: Could not find matching device 'pci_0000_00_19_0' error: this function is not supported by the connection driver: virNodeDeviceLookupByName root@shahe26:~# virsh -version 0.9.0 root@shahe26:~# virsh net-list Name State Autostart ----------------------------------------- default active yes root@shahe26:~# virsh list Id Name State ---------------------------------- root@shahe26:~# I find that only the command "virsh nodedev-? ***" can't work . How can I solve this problem ? thanks. best regards, qinguan

2 5

[libvirt] [PATCH] json: Fix *GetBoolean functions
by Jiri Denemark 09 May '11

09 May '11

They were not used anywhere so far so nobody noticed they are broken. --- src/util/json.c | 11 ++++++----- src/util/json.h | 4 ++-- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/util/json.c b/src/util/json.c index 0daeae9..df4771d 100644 --- a/src/util/json.c +++ b/src/util/json.c @@ -491,12 +491,13 @@ int virJSONValueGetNumberDouble(virJSONValuePtr number, double *value) } -int virJSONValueGetBoolean(virJSONValuePtr val) +int virJSONValueGetBoolean(virJSONValuePtr val, bool *value) { - if (val->type != VIR_JSON_TYPE_NUMBER) + if (val->type != VIR_JSON_TYPE_BOOLEAN) return -1; - return val->data.boolean; + *value = val->data.boolean; + return 0; } @@ -593,7 +594,7 @@ int virJSONValueObjectGetNumberDouble(virJSONValuePtr object, const char *key, d } -int virJSONValueObjectGetBoolean(virJSONValuePtr object, const char *key) +int virJSONValueObjectGetBoolean(virJSONValuePtr object, const char *key, bool *value) { virJSONValuePtr val; if (object->type != VIR_JSON_TYPE_OBJECT) @@ -603,7 +604,7 @@ int virJSONValueObjectGetBoolean(virJSONValuePtr object, const char *key) if (!val) return -1; - return virJSONValueGetBoolean(val); + return virJSONValueGetBoolean(val, value); } diff --git a/src/util/json.h b/src/util/json.h index ea28de6..4572654 100644 --- a/src/util/json.h +++ b/src/util/json.h @@ -105,7 +105,7 @@ int virJSONValueGetNumberUint(virJSONValuePtr object, unsigned int *value); int virJSONValueGetNumberLong(virJSONValuePtr object, long long *value); int virJSONValueGetNumberUlong(virJSONValuePtr object, unsigned long long *value); int virJSONValueGetNumberDouble(virJSONValuePtr object, double *value); -int virJSONValueGetBoolean(virJSONValuePtr object); +int virJSONValueGetBoolean(virJSONValuePtr object, bool *value); int virJSONValueIsNull(virJSONValuePtr object); const char *virJSONValueObjectGetString(virJSONValuePtr object, const char *key); @@ -114,7 +114,7 @@ int virJSONValueObjectGetNumberUint(virJSONValuePtr object, const char *key, uns int virJSONValueObjectGetNumberLong(virJSONValuePtr object, const char *key, long long *value); int virJSONValueObjectGetNumberUlong(virJSONValuePtr object, const char *key, unsigned long long *value); int virJSONValueObjectGetNumberDouble(virJSONValuePtr object, const char *key, double *value); -int virJSONValueObjectGetBoolean(virJSONValuePtr object, const char *key); +int virJSONValueObjectGetBoolean(virJSONValuePtr object, const char *key, bool *value); int virJSONValueObjectIsNull(virJSONValuePtr object, const char *key); int virJSONValueObjectAppendString(virJSONValuePtr object, const char *key, const char *value); -- 1.7.5.rc3

2 2

[libvirt] How to suppress error printing to stderr from virConnectOpen*?
by Richard W.M. Jones 09 May '11

09 May '11

I can set the global error handling function (virSetErrorFunc). That doesn't seem to be a good idea from a library. Looking at the code, it doesn't appear that the internal virErrorHandler is thread-local, so I can't set it and restore it around the function call. I can set the error handling function _after_ I've got a connection object (virConnSetErrorFunc). That doesn't help with making the initial connection. libguestfs itself has the same problem with the guestfs_create call, so I'm not going to point any fingers :-) However it seems like a shortcoming of the libvirt API. Am I missing something here? Rich. -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones New in Fedora 11: Fedora Windows cross-compiler. Compile Windows programs, test, and build Windows installers. Over 70 libraries supprt'd http://fedoraproject.org/wiki/MinGW http://www.annexia.org/fedora_mingw

2 2

[libvirt] [PATCH] Allow destroying QEMU VM even if a job is active
by Daniel P. Berrange 09 May '11

09 May '11

Introduce a virProcessKill function that can be safely called even when the job mutex is held. This allows virDomainDestroy to kill any VM even if it is asleep in a monitor job. The PID will die and the thread asleep on the monitor will then wake up releasing the job mutex. * src/qemu/qemu_driver.c: Kill process before using qemuProcessStop to ensure job is released * src/qemu/qemu_process.c: Add virProcessKill for killing off QEMU processes --- src/qemu/qemu_driver.c | 7 +++++++ src/qemu/qemu_process.c | 39 +++++++++++++++++++++++++++++++-------- src/qemu/qemu_process.h | 2 ++ 3 files changed, 40 insertions(+), 8 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index b3f9e00..6d6fb51 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -1482,6 +1482,13 @@ static int qemudDomainDestroy(virDomainPtr dom) { goto cleanup; } + /* Although qemuProcessStop does this already, there may + * be an outstanding job active. We want to make sure we + * can kill the process even if a job is active. Killing + * it now, means the job will be released + */ + qemuProcessKill(vm); + if (qemuDomainObjBeginJobWithDriver(driver, vm) < 0) goto cleanup; diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index a6c0dc8..c60c51f 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -2369,6 +2369,36 @@ cleanup: } +void qemuProcessKill(virDomainObjPtr vm) +{ + int i; + int rc; + VIR_DEBUG("vm=%s pid=%d", vm->def->name, vm->pid); + + if (!virDomainObjIsActive(vm)) { + VIR_DEBUG("VM '%s' not active", vm->def->name); + return; + } + + for (i = 0 ; i < 15 ; i++) { + int signum; + if (i == 0) + signum = SIGTERM; + else if (i == 8) + signum = SIGKILL; + else + signum = 0; /* Just check for existance */ + + rc = virKillProcess(vm->pid, signum); + VIR_DEBUG("Iteration %d rc=%d", i, rc); + if (rc < 0) + break; + + usleep(200 * 1000); + } +} + + void qemuProcessStop(struct qemud_driver *driver, virDomainObjPtr vm, int migrated) @@ -2436,13 +2466,6 @@ void qemuProcessStop(struct qemud_driver *driver, } } - /* This will safely handle a non-running guest with pid=0 or pid=-1*/ - if (virKillProcess(vm->pid, 0) == 0 && - virKillProcess(vm->pid, SIGTERM) < 0) - virReportSystemError(errno, - _("Failed to send SIGTERM to %s (%d)"), - vm->def->name, vm->pid); - if (priv->mon) qemuMonitorClose(priv->mon); @@ -2454,7 +2477,7 @@ void qemuProcessStop(struct qemud_driver *driver, } /* shut it off for sure */ - virKillProcess(vm->pid, SIGKILL); + qemuProcessKill(vm); /* now that we know it's stopped call the hook if present */ if (virHookPresent(VIR_HOOK_DRIVER_QEMU)) { diff --git a/src/qemu/qemu_process.h b/src/qemu/qemu_process.h index f1ab599..d8afab0 100644 --- a/src/qemu/qemu_process.h +++ b/src/qemu/qemu_process.h @@ -49,4 +49,6 @@ void qemuProcessStop(struct qemud_driver *driver, virDomainObjPtr vm, int migrated); +void qemuProcessKill(virDomainObjPtr vm); + #endif /* __QEMU_PROCESS_H__ */ -- 1.7.4.4

2 2

[libvirt] RFC: APIs for managing a subset of a domain's disks
by Eric Blake 09 May '11

09 May '11

Consider the case of a guest that has multiple virtual disks, some residing on shared storage (such as the OS proper) and some on local storage (scratch space, where the OS has faster response if the virtual disk does not have to go over the network, and possibly one where the guest can still work even if the disk is hot-unplugged). During migration, you'd want different handling of the two disks (the destination can already see the shared disk, but must either copy the contents or recreate a blank scratch volume for the local disk). Or, consider the case where a guest has one disk as qcow2 (it is not modified frequently, and benefits from sharing a common backing file with other guests), while another disk is raw (for better read-write performance). Right now, 'virsh snapshot' fails, because it only works if all disks are qcow2; and in fact it may be the case that it is desirable to only take a snapshot of a subset of the domain's disks. So, I think we need some way to request an operation on a subset of VM disks, in a manner that can be shared between migration and volume management APIs. And I'm not sure it makes sense to add two more parameters to migration commands (an array of disks, and the size of that array), nor to modify the snapshot XML to describe which disks belong to the snapshot. So I'm thinking we need some sort of API set to manage a stateful set of disk operations. Maybe the trick is to define that every VM has a (possibly empty) set of selected disks, with APIs to manage moving a single disk in or out of the set, an API for listing the entire set, then a single flag to migration that states that live block migration is attempted for all disks currently in the VMs selected disk set. Being stateful, this would have to be represented in XML (so that if libvirtd is restarted, it remembers which disks are selected); I'm thinking of adding a new selected='yes|no' attribute to <disk>, as in: <disk type='file' device='disk' selected='yes'/> <driver name='qemu' type='raw'/> ... </disk> where if the attribute is absent, it defaults to no. For hypervisors where the state is maintained by libvirtd (qemu, lxc), the XML works; for other hypervisors, the notion of a subset of selected disks would have to just fail unless there is some hypervisor-specific way to track that information alongside a domain. For my API proposal, I'm including an unused flags argument to all the virDomainDiskSet* commands (experience has taught me well). In fact, we could even use that flags parameter, to maintain parallel sets (set 0 is the set of disks to migrate, set 1 is the set of disks to snapshot, ...), although I don't think we need that complexity yet (besides, it would affect the proposed XML). /* Add disk to the domain's set of selected disks; flags ignored for now; return 0 on success, 1 if already in the set, -1 on failure */ int virDomainDiskSetAdd(virDomainPtr dom, char *disk, unsigned int flags); /* Remove disk from the domain's set of selected disks; flags ignored for now; return 0 on success, 1 if already absent from the set, -1 on failure */ int virDomainDiskSetRemove(virDomainPtr dom, char *disk, unsigned int flags); /* Add all disks to the domain's set of selected disks; flags ignored for now; return 0 on success, -1 on failure */ int virDomainDiskSetAddAll(virDomainPtr dom, unsigned int flags); /* Remove all disks from the domain's set of selected disks; flags ignored for now; return 0 on success, -1 on failure */ int virDomainDiskSetRemoveAll(virDomainPtr dom, unsigned int flags); /* Return the size of the domain's currently selected disk set, or -1 on failure; flags ignored for now */ int virDomainDiskSetSize(virDomainPtr dom, unsigned int flags); /* Populate up to n entries of the array with the names of the domain's selected disk set, and return how many entries were populated, or -1 on failure; flags ignored for now */ int virDomainDiskSetList(virDomainPtr dom, char **array, int n, unsigned int flags) With API in place for tracking a subset of selected disks, we can then extend existing APIs with new flags: /* Old way - domain migration without any disks migrated */ virDomainMigrate(dom, dconn, flags | 0, dname, uri, bandwidth) /* New way - domain migration, including all disks in the domain's selected disk set being copied to the destination */ virDomainMigrate(dom, dconn, flags | VIR_MIGRATE_WITH_DISK_SET, dname, uri, bandwidth) /* Old way - snapshot of all disks */ virDomainSnapshotCreateXML(dom, xml, 0) /* New way - snapshot of just disks in selected disk set */ virDomainSnapshotCreateXML(dom, xml, VIR_DOMAIN_SAVE_DISK_SET) I'd also like to see some collaboration between virDomainSave (for memory) and virDomainSmapshotCreateXML (for disks); unfortunately, virDomainSave doesn't take a flags argument. Maybe this calls for a new API, and possibly a new version of the header to a 'virsh save' image to track the location of snapshotted disks alongside the saved memory state: /* Save the RAM state of domain to the base file "to". If "xml" is NULL, no disks are snapshotted. Otherwise, "xml" is a snapshot XML that describes how disk state will also be saved; if flags includes VIR_DOMAIN_SAVE_DISK_SET, then the domain's selected disk set is snapshotted, otherwise all disks are snapshotted. If flags contains VIR_DOMAIN_SAVE_LIVE, then the guest is resumed after snapshot is completed; otherwise the guest is halted. */ int virDomainSaveFlags(virDomainPtr dom, const char *to, const char *xml, unsigned int flags); Thoughts before I start implementing some of this for post-0.9.1? -- Eric Blake eblake(a)redhat.com +1-801-349-2682 Libvirt virtualization library http://libvirt.org

4 5

[libvirt] [RFC PATCH] NUMA tuning support
by Osier Yang 09 May '11

09 May '11

Hi, All, This is a simple implenmentation for NUMA tuning support based on binary program 'numactl', currently only supports to bind memory to specified nodes, using option "--membind", perhaps it need to support more, but I'd like send it early so that could make sure if the principle is correct. Ideally, NUMA tuning support should be added in qemu-kvm first, such as they could provide command options, then what we need to do in libvirt is just to pass the options to qemu-kvm, but unfortunately qemu-kvm doesn't support it yet, what we could do currently is only to use numactl, it forks process, a bit expensive than qemu-kvm supports NUMA tuning inside with libnuma, but it shouldn't affects much I guess. The NUMA tuning XML is like: <numatune> <membind nodeset='+0-4,8-12'/> </numatune> Any thoughts/feedback is appreciated. Regards Osier [PATCH 1/5] build: Define NUMACTL for numa tuning use [PATCH 2/5] docs: Define XML schema for numa tuning and add docs [PATCH 3/5] conf: Support NUMA tuning XML [PATCH 4/5] qemu: Build command line for NUMA tuning [PATCH 5/5] tests: Add tests for guest use NUMA tuning

4 23

[libvirt] libvirt: TLS client certificate handling
by Doug Goldstein 06 May '11

06 May '11

Trying to setup qemu+tls here and I'm running into a few oddities (well that I feel are oddities) that I wanted clarification on before I submitted patches. The documentation I am following is: [1] http://libvirt.org/remote.html#Remote_certificates [2] http://wiki.libvirt.org/page/TLSSetup [3] http://wiki.libvirt.org/page/VNCTLSSetup All my storage is on iSCSI. I have 3 VM servers. 2 which every user can access and 1 which only a subset of users can access via the "tls_allowed_dn_list" parameter. Now how I envision this is that each of the 3 machines have their server certs & client certs in /etc/pki/libvirt, while each of the clients have their certs in $HOME/.pki/libvirt. That way a user, who doesn't have root or sudo access on the machine they are on could access the 2 VM servers they are allowed to access. However, if you look at the code, the only time $HOME/.pki/libvirt is used is when getuid() != 0 (this is correct) but the user either had to not specify a server to connect to and is using /session or you're auto-probing the local auto-spawned daemon for the remote URI. Effectively this means my approach can't happen. To complicate matters further, the documentation tells you to chown the client cert & key as root:root and set the permissions to 400. Which effectively means users can never use qemu+tls. I propose that we change the code for getuid() != 0 to always try $HOME/.pki/libvirt/ first and then try the system certificate. If everyone agrees, then I'll submit patches shortly. Additionally I wanted to note that as per [3], the default path for libvirt's user keys in $HOME differs from all other applications out there so I would also make it check $HOME/.pki/libvirt/private/clientkey.pem as well as $HOME/.pki/libvirt/clientkey.pem so that we'd match other application configurations. -- Doug Goldstein

1 0

[libvirt] [PATCH 00/22] Extend remote generator to generate function bodies too
by Matthias Bolte 06 May '11

06 May '11

Richard W.M. Jones suggested [1] that the code that directly deals with the XDR protocol should be generated. The remote_generate_stubs.pl script already generates all the headers, just the bodies in the daemon and remote driver are manually written. But most of the functions just follow simple patterns. So I extended the generator to exploit this patterns and move 11 kLOC code from manually written to generated code. During this I came a cross many small variations and problems in the XDR protocol. For example, NWFilterDefineXML has a flags parameter in the public API, but it's not transferred in the XDR protocol. Another things is the variations in the usage of unsigned VS signed types. This comes in two forms. public API VS XDR procotol and in between different functions. For example, some functions use int for the flags paramater and some use unsigned int. This results in quite a lot of special case handling in the generator. cfg.mk | 10 +- daemon/Makefile.am | 46 +- daemon/qemu_dispatch_args.h | 2 +- daemon/qemu_dispatch_bodies.c | 6 + daemon/qemu_dispatch_prototypes.h | 2 +- daemon/qemu_dispatch_ret.h | 2 +- daemon/qemu_dispatch_table.h | 2 +- daemon/remote.c | 5765 +---------------------------------- daemon/remote_dispatch_args.h | 2 +- daemon/remote_dispatch_bodies.c | 5933 +++++++++++++++++++++++++++++++++++ daemon/remote_dispatch_prototypes.h | 80 +- daemon/remote_dispatch_ret.h | 2 +- daemon/remote_dispatch_table.h | 158 +- daemon/remote_generate_stubs.pl | 195 -- daemon/remote_generator.pl | 1198 +++++++ po/POTFILES.in | 1 + src/Makefile.am | 13 +- src/remote/qemu_client_bodies.c | 4 + src/remote/qemu_protocol.c | 2 +- src/remote/qemu_protocol.h | 2 +- src/remote/qemu_protocol.x | 2 +- src/remote/remote_client_bodies.c | 4664 +++++++++++++++++++++++++++ src/remote/remote_driver.c | 4907 +---------------------------- src/remote/remote_protocol.c | 26 +- src/remote/remote_protocol.h | 26 +- src/remote/remote_protocol.x | 34 +- src/remote_protocol-structs | 26 +- 27 files changed, 12093 insertions(+), 11017 deletions(-) [1] https://www.redhat.com/archives/libvir-list/2011-April/msg00884.html Matthias

4 31

[libvirt] [PATCH] Balloon dom0 in libxl driver
by Markus Groß 06 May '11

06 May '11

Creating a domU on a freshly booted dom0 does not work, because the libxl driver does not allocate memory for the domU. After creating a domain with xl libvirt is able to create domains too. This patch reserves enough memory for the domU first. --- src/libxl/libxl_driver.c | 48 ++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 46 insertions(+), 2 deletions(-) diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index 247d78e..d4ca025 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -498,6 +498,46 @@ cleanup: return ret; } +static int +libxlFreeMem(libxlDomainObjPrivatePtr priv, libxl_domain_config *d_config) +{ + uint32_t needed_mem; + uint32_t free_mem; + int i; + int ret = -1; + int tries = 3; + int wait_secs = 10; + + if ((ret = libxl_domain_need_memory(&priv->ctx, &d_config->b_info, + &d_config->dm_info, + &needed_mem)) >= 0) { + for (i = 0; i < tries; ++i) { + if ((ret = libxl_get_free_memory(&priv->ctx, &free_mem)) < 0) + break; + + if (free_mem >= needed_mem) { + ret = 0; + break; + } + + if ((ret = libxl_set_memory_target(&priv->ctx, 0, + free_mem - needed_mem, + /* relative */ 1, 0)) < 0) + break; + + ret = libxl_wait_for_free_memory(&priv->ctx, 0, needed_mem, + wait_secs); + if (ret == 0 || ret != ERROR_NOMEM) + break; + + if ((ret = libxl_wait_for_memory_target(&priv->ctx, 0, 1)) < 0) + break; + } + } + + return ret; +} + /* * Start a domain through libxenlight. * @@ -521,8 +561,12 @@ libxlVmStart(libxlDriverPrivatePtr driver, if (libxlBuildDomainConfig(driver, def, &d_config) < 0 ) return -1; - //TODO: Balloon dom0 ?? - //ret = freemem(&d_config->b_info, &d_config->dm_info); + if (libxlFreeMem(priv, &d_config) < 0) { + libxlError(VIR_ERR_INTERNAL_ERROR, + _("libxenlight failed to get free memory for domain '%s'"), + d_config.c_info.name); + goto error; + } ret = libxl_domain_create_new(&priv->ctx, &d_config, NULL, &child_console_pid, &domid); -- 1.7.4.3

3 2

[libvirt] [PATCH] virsh: check actual access to the cert
by Doug Goldstein 06 May '11

06 May '11

Instead of calling stat(), check that we'll actually be able to access and read the file. Signed-off-by: Doug Goldstein <cardoe(a)gentoo.org> --- src/remote/remote_driver.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index 9965d38..c4e43aa 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -1140,8 +1140,7 @@ static gnutls_certificate_credentials_t x509_cred; static int check_cert_file(const char *type, const char *file) { - struct stat sb; - if (stat(file, &sb) < 0) { + if (access(file, F_OK|R_OK)) { virReportSystemError(errno, _("Cannot access %s '%s'"), type, file); -- 1.7.5.rc3

2 1

[libvirt] [PATCH] maint: avoid comparisons to bool constants
by Eric Blake 06 May '11

06 May '11

HACKING already mentions that comparisons against literal 'true' are unsafe; for consistency, also shorten comparisons against 'false'. * src/conf/domain_conf.c (virDomainNetDefParseXML): Simplify. * src/nwfilter/nwfilter_gentech_driver.c (virNWFilterDomainFWUpdateCB): Likewise. * tools/virsh.c (cmdVolDownload, vshCommandRun, vshPrintExtra): Likewise. --- src/conf/domain_conf.c | 2 +- src/nwfilter/nwfilter_gentech_driver.c | 2 +- tools/virsh.c | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 70ea350..a936ea4 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -2581,7 +2581,7 @@ virDomainNetDefParseXML(virCapsPtr caps, xmlStrEqual(cur->name, BAD_CAST "source")) { dev = virXMLPropString(cur, "dev"); mode = virXMLPropString(cur, "mode"); - } else if ((virtPortParsed == false) && + } else if (!virtPortParsed && (def->type == VIR_DOMAIN_NET_TYPE_DIRECT) && xmlStrEqual(cur->name, BAD_CAST "virtualport")) { if (virVirtualPortProfileParamsParseXML(cur, &virtPort)) diff --git a/src/nwfilter/nwfilter_gentech_driver.c b/src/nwfilter/nwfilter_gentech_driver.c index f89fb79..3e8961d 100644 --- a/src/nwfilter/nwfilter_gentech_driver.c +++ b/src/nwfilter/nwfilter_gentech_driver.c @@ -1032,7 +1032,7 @@ virNWFilterDomainFWUpdateCB(void *payload, cb->err = virNWFilterUpdateInstantiateFilter(cb->conn, net, &skipIface); - if (cb->err == 0 && skipIface == true) { + if (cb->err == 0 && skipIface) { /* filter tree unchanged -- no update needed */ cb->err = virHashAddEntry(cb->skipInterfaces, net->ifname, diff --git a/tools/virsh.c b/tools/virsh.c index e32680c..2b16714 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -7318,7 +7318,7 @@ cmdVolDownload (vshControl *ctl, const vshCmd *cmd) cleanup: VIR_FORCE_CLOSE(fd); - if (ret == false && created) + if (!ret && created) unlink(file); if (vol) virStorageVolFree(vol); @@ -11697,11 +11697,11 @@ vshCommandRun(vshControl *ctl, const vshCmd *cmd) if (enable_timing) GETTIMEOFDAY(&after); - if (ret == false) + if (!ret) virshReportError(ctl); /* try to automatically catch disconnections */ - if ((ret == false) && + if (!ret && ((disconnected != 0) || ((last_error != NULL) && (((last_error->code == VIR_ERR_SYSTEM_ERROR) && @@ -12105,7 +12105,7 @@ vshPrintExtra(vshControl *ctl, const char *format, ...) va_list ap; char *str; - if (ctl && ctl->quiet == true) + if (ctl && ctl->quiet) return; va_start(ap, format); -- 1.7.4.4

2 2

[libvirt] [PATCH 1/3] command: Add virCommandEnvAddFormat
by Cole Robinson 06 May '11

06 May '11

Similar to virCommandArgAddFormat. We will use this shortly. Signed-off-by: Cole Robinson <crobinso(a)redhat.com> --- src/libvirt_private.syms | 1 + src/util/command.c | 30 ++++++++++++++++++++++++++++++ src/util/command.h | 7 +++++++ 3 files changed, 38 insertions(+), 0 deletions(-) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 1b22be6..d89b191 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -99,6 +99,7 @@ virCommandAddArgList; virCommandAddArgPair; virCommandAddArgSet; virCommandAddEnvBuffer; +virCommandAddEnvFormat; virCommandAddEnvPair; virCommandAddEnvPass; virCommandAddEnvPassCommon; diff --git a/src/util/command.c b/src/util/command.c index 862a913..f382cc5 100644 --- a/src/util/command.c +++ b/src/util/command.c @@ -259,6 +259,36 @@ virCommandNonblockingFDs(virCommandPtr cmd) } /* + * Add an environment variable to the child created by a printf-style format + */ +void +virCommandAddEnvFormat(virCommandPtr cmd, const char *format, ...) +{ + char *env; + va_list list; + + if (!cmd || cmd->has_error) + return; + + va_start(list, format); + if (virVasprintf(&env, format, list) < 0) { + cmd->has_error = ENOMEM; + va_end(list); + return; + } + va_end(list); + + /* Arg plus trailing NULL. */ + if (VIR_RESIZE_N(cmd->env, cmd->maxenv, cmd->nenv, 1 + 1) < 0) { + VIR_FREE(env); + cmd->has_error = ENOMEM; + return; + } + + cmd->env[cmd->nenv++] = env; +} + +/* * Add an environment variable to the child * using separate name & value strings */ diff --git a/src/util/command.h b/src/util/command.h index ff8ccf5..69e9169 100644 --- a/src/util/command.h +++ b/src/util/command.h @@ -98,6 +98,13 @@ void virCommandDaemonize(virCommandPtr cmd); void virCommandNonblockingFDs(virCommandPtr cmd); /* + * Add an environment variable to the child created by a printf-style format + */ +void +virCommandAddEnvFormat(virCommandPtr cmd, const char *format, ...) + ATTRIBUTE_NONNULL(2) ATTRIBUTE_FMT_PRINTF(2, 3); + +/* * Add an environment variable to the child * using separate name & value strings */ -- 1.7.4.4

2 6

[libvirt] [PATCH v3] Add warning message to XML definition files stored on disk
by Michal Privoznik 06 May '11

06 May '11

Users often edit XML file stored in configuration directory thinking of modifying a domain/network/pool/etc. Thus it is wise to let them know they are using the wrong way and give them hint. --- diff to v2: - remove redundant flag VIR_XML_EMIT_WARNING - remove enum, pass const string instead - don't translate warning message diff to v1: - instead of pointing users to web, write down the actual virsh command - write to passed FD instead of buffer src/conf/domain_conf.c | 2 ++ src/conf/network_conf.c | 2 ++ src/conf/nwfilter_conf.c | 4 ++++ src/conf/storage_conf.c | 2 ++ src/libvirt_private.syms | 1 + src/util/util.c | 37 +++++++++++++++++++++++++++++++++++++ src/util/util.h | 4 ++++ 7 files changed, 52 insertions(+), 0 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index eae178b..e98af0f 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -8561,6 +8561,8 @@ int virDomainSaveXML(const char *configDir, goto cleanup; } + virEmitXMLWarning(fd, def->name, "edit"); + towrite = strlen(xml); if (safewrite(fd, xml, towrite) < 0) { virReportSystemError(errno, diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index 08f7b77..4eb46fa 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -925,6 +925,8 @@ int virNetworkSaveXML(const char *configDir, goto cleanup; } + virEmitXMLWarning(fd, def->name, "net-edit"); + towrite = strlen(xml); if (safewrite(fd, xml, towrite) < 0) { virReportSystemError(errno, diff --git a/src/conf/nwfilter_conf.c b/src/conf/nwfilter_conf.c index 5ba2972..eb75bad 100644 --- a/src/conf/nwfilter_conf.c +++ b/src/conf/nwfilter_conf.c @@ -2249,6 +2249,8 @@ int virNWFilterSaveXML(const char *configDir, goto cleanup; } + virEmitXMLWarning(fd, def->name, "nwfilter-edit"); + towrite = strlen(xml); if (safewrite(fd, xml, towrite) < 0) { virReportSystemError(errno, @@ -2645,6 +2647,8 @@ virNWFilterObjSaveDef(virNWFilterDriverStatePtr driver, goto cleanup; } + virEmitXMLWarning(fd, def->name, "nwfilter-edit"); + towrite = strlen(xml); if (safewrite(fd, xml, towrite) != towrite) { virReportSystemError(errno, diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c index aeb1596..9be4cae 100644 --- a/src/conf/storage_conf.c +++ b/src/conf/storage_conf.c @@ -1551,6 +1551,8 @@ virStoragePoolObjSaveDef(virStorageDriverStatePtr driver, goto cleanup; } + virEmitXMLWarning(fd, def->name, "pool-edit"); + towrite = strlen(xml); if (safewrite(fd, xml, towrite) != towrite) { virReportSystemError(errno, diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index ea4bf74..e2e706d 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -901,6 +901,7 @@ virArgvToString; virAsprintf; virBuildPathInternal; virDirCreate; +virEmitXMLWarning; virEnumFromString; virEnumToString; virEventAddHandle; diff --git a/src/util/util.c b/src/util/util.c index 9041ab6..3b151f4 100644 --- a/src/util/util.c +++ b/src/util/util.c @@ -3207,3 +3207,40 @@ bool virIsDevMapperDevice(const char *devname ATTRIBUTE_UNUSED) return false; } #endif + +int virEmitXMLWarning(int fd, + const char *name, + const char *cmd) { + size_t len; + const char *prologue = "\n\n"; + + if (fd < 0 || !name || !cmd) + return -1; + + len = strlen(prologue); + if (safewrite(fd, prologue, len) != len) + return -1; + + len = strlen(cmd); + if (safewrite(fd, cmd, len) != len) + return -1; + + if (safewrite(fd, " ", 1) != 1) + return -1; + + len = strlen(name); + if (safewrite(fd, name, len) != len) + return -1; + + len = strlen(epilogue); + if (safewrite(fd, epilogue, len) != len) + return -1; + + return 0; +} diff --git a/src/util/util.h b/src/util/util.h index d320c40..9d8df06 100644 --- a/src/util/util.h +++ b/src/util/util.h @@ -299,4 +299,8 @@ int virBuildPathInternal(char **path, ...) ATTRIBUTE_SENTINEL; char *virTimestamp(void); bool virIsDevMapperDevice(const char *devname) ATTRIBUTE_NONNULL(1); + +int virEmitXMLWarning(int fd, + const char *name, + const char *cmd) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3); #endif /* __VIR_UTIL_H__ */ -- 1.7.4.4

3 2

[libvirt] [PATCH] qemu: Don't flag domain running when qemu dies
by Michal Privoznik 06 May '11

06 May '11

When we try to stop domain's CPUs and qemu crash meanwhile, a cleanup of domain is performed and domain gets into state VIR_DOMAIN_SHUTOFF. But this is later overwritten and thus results in domain marked as running but with negative ID. --- src/qemu/qemu_process.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 7691cbe..539e4f3 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -1919,7 +1919,7 @@ int qemuProcessStopCPUs(struct qemud_driver *driver, virDomainObjPtr vm) qemuDomainObjEnterMonitorWithDriver(driver, vm); ret = qemuMonitorStopCPUs(priv->mon); qemuDomainObjExitMonitorWithDriver(driver, vm); - if (ret < 0) { + if (ret < 0 && vm->state == VIR_DOMAIN_PAUSED) { vm->state = oldState; } return ret; -- 1.7.4.4

3 2

[libvirt] [PATCH 0/8] Introduce virDomainGetState API
by Jiri Denemark 06 May '11

06 May '11

This new API solves several problems: - calling virDomainGetInfo for just getting domain status is an overkill since it may result in sending requests to guest OS - since virDomainGetInfo can hang when guest OS is not responding and it is used by virsh list, listing domains can hang - virDomainGetState provides additional info about what action led to domain's current state, which can be used instead of listening to domain events I'm undecided whether this API should support flags parameter or not. On one hand the API seems simple and focused enough not to allow any fine-tuning but on the other hand we've already had too many issues with APIs that didn't support flags. Another thing is that it would be nice to somehow report that a domain is running but libvirt is currently waiting for reply from hypervisor and is not able to do anything else with the domain until it gets the reply. In case of qemu driver, this translates to the driver being stuck in comunication with qemu monitor. I'm not sure if we should somehow integrate this into virDomainGetState API. Probably not. Jiri Denemark (8): virDomainGetState public API Internal driver API for virDomainGetState virDomainGetState public API implementation Wire protocol format and dispatcher for virDomainGetState virsh: Prefer virDomainGetState over virDomainGetInfo remote: Implement virDomainGetState Implement basic virDomainGetState in all drivers Implement domain state reason daemon/remote.c | 33 ++++++ daemon/remote_dispatch_prototypes.h | 8 ++ daemon/remote_dispatch_table.h | 5 + include/libvirt/libvirt.h.in | 55 ++++++++++ python/generator.py | 1 + python/libvirt-override-api.xml | 5 + python/libvirt-override.c | 26 +++++ src/conf/domain_conf.c | 163 ++++++++++++++++++++++++++++- src/conf/domain_conf.h | 26 +++++- src/driver.h | 5 + src/esx/esx_driver.c | 53 ++++++++++ src/libvirt.c | 47 +++++++++ src/libvirt_private.syms | 4 + src/libvirt_public.syms | 5 + src/libxl/libxl_driver.c | 75 ++++++++++--- src/lxc/lxc_driver.c | 76 ++++++++++---- src/openvz/openvz_conf.c | 16 ++- src/openvz/openvz_driver.c | 52 ++++++++-- src/phyp/phyp_driver.c | 11 ++ src/qemu/qemu_driver.c | 90 ++++++++++++----- src/qemu/qemu_migration.c | 24 +++-- src/qemu/qemu_process.c | 61 +++++++----- src/qemu/qemu_process.h | 12 ++- src/remote/remote_driver.c | 30 ++++++ src/remote/remote_protocol.c | 20 ++++ src/remote/remote_protocol.h | 16 +++ src/remote/remote_protocol.x | 12 ++- src/remote_protocol-structs | 7 ++ src/test/test_driver.c | 102 +++++++++++++------ src/uml/uml_driver.c | 53 ++++++++-- src/vbox/vbox_tmpl.c | 55 ++++++++++ src/vmware/vmware_conf.c | 3 +- src/vmware/vmware_driver.c | 55 ++++++++--- src/xen/xen_driver.c | 17 +++ src/xen/xen_driver.h | 1 + src/xen/xen_hypervisor.c | 33 ++++++ src/xen/xen_hypervisor.h | 4 + src/xen/xen_inotify.c | 1 + src/xen/xend_internal.c | 96 +++++++++++++----- src/xen/xend_internal.h | 1 + src/xen/xm_internal.c | 18 +++ src/xen/xm_internal.h | 1 + src/xen/xs_internal.c | 31 ++++++ src/xen/xs_internal.h | 3 + src/xenapi/xenapi_driver.c | 44 ++++++++ tools/virsh.c | 195 +++++++++++++++++++++++++++++------ 46 files changed, 1415 insertions(+), 236 deletions(-) -- 1.7.5.rc3

3 21

[libvirt] libvirt commands during migration
by Dan Kenigsberg 06 May '11

06 May '11

Hi, We've noticed that most of libvirt domain-specific calls block while qemu is migrating. Isn't it kind-of-a-bug? Migration can take a while; qemu allows to do it in the background, and accepts monitor commands. So why should a libvirt user be blocked from his favorite domblkstat? Regards, Dan.

2 1

Re: [libvirt] failure to build on rawhide
by Ludovic Courtès 06 May '11

06 May '11

Hi Eric, Eric Blake <eblake(a)redhat.com> writes: > I'm getting this when trying to build libvirt on rawhide (using the > package gnutls-devel-2.12.3-1.fc16.x86_64): > > remote/remote_driver.c: In function 'negotiate_gnutls_on_connection': > remote/remote_driver.c:1361:9: error: > 'gnutls_certificate_type_set_priority' is deprecated (declared at > /usr/include/gnutls/compat.h:347) [-Werror=deprecated-declarations] > > but I can't find anything in the gnutls man pages that says why it is > deprecated or what to use in its place. Any ideas? This has been replaced by “priority strings” (info "(gnutls) Priority Strings"). ‘NEWS’ doesn’t seem to mention it, but I agree that it should. Thanks, Ludo’.

1 0

[libvirt] converting save/dump output into physical memory image
by Andrew Tappert 06 May '11

06 May '11

A lot of people in the security community, myself included, are interested in memory forensics these days. Virtualization is a natural fit with memory forensics because it allows one to get access to a guest's memory without having to introduce any extra software into the guest or otherwise interfere with it. Incident responders are particularly interested in getting memory dumps from systems they're investigating. Virsh has "save" and "dump" commands for storing the state of a guest to a file on disk, but memory of KVM guests doesn't get saved in the "standard" input format for memory forensics tools, which is a raw physical memory image. (This is what you'd get via the classical "dd /dev/mem" approach or the contemporary equivalent using the crash driver; and VMware Server and Workstation produce .vmem files, which are such raw physical memory images, when a guest is paused or snapshotted.) In order to analyze the memory of Libvirt/KVM guests with my Linux memory forensics software, Second Look, I've created a tool for converting Libvirt-QEMU-save files (output of virsh save command) or QEMU-savevm files (output of virsh dump command) to raw physical memory images. I've got a basic working capability, though I'm still tracking down some problems with a guest allocated 8GB RAM--not all the memory seems to be present in the save or dump file. And I haven't tested very extensively yet, version support is limited to what I myself am currently running, etc. I'd like to know if this is a capability that others are interested in. Is this something that would be of interest to the Libvirt project if I were to contribute the code, or to the KVM project, or do you think it best exists as a separate project? I've also got a proof-of-concept tool for converting hibernate images to raw physical memory images. Perhaps a collection of tools for converting various memory dump formats would be a good project. Anyone else interested in this kind of stuff? As an author of commercial memory forensics software I've got a vested interest in availability of good memory acquisition capabilities. But there are a number of people working on FOSS Linux memory analysis tools, too... Andrew

3 3

[libvirt] [PATCH 0/5] Support for marking domains as "tainted" (v2)
by Daniel P. Berrange 06 May '11

06 May '11

There are various configurations for virtual domains that we allow, but do not wish to actively support in production environments. The support situation is similar to that of binary only or non-GPL kernel modules, so borrow the kernel's idea of "tainting". When an undesirable configuration is used on a running VM, set a suitable taint flag and log a warning. OS distro bug triagers can see these warnings and decide whether to support users filing bugs in this scenarios In v2: - Split up the 3rd patch into 3 pieces - Add a dedicated API for appending a formatted string to the domain logfile (optionally opening the log if not already opened) - Use 'enum virDomainTaintFlags' for parameters instead of 'int'

2 11

[libvirt] [PATCH] rm daemon/remote_dispatch_table.h
by Hu Tao 06 May '11

06 May '11

1. this file is automatically generated at compile-time, so rm it to avoid further commit to this file. 2. any update should made to file src/remote/remote_protocol.x. --- daemon/remote_dispatch_table.h | 1054 ---------------------------------------- 1 files changed, 0 insertions(+), 1054 deletions(-) delete mode 100644 daemon/remote_dispatch_table.h diff --git a/daemon/remote_dispatch_table.h b/daemon/remote_dispatch_table.h deleted file mode 100644 index b39f7c2..0000000 --- a/daemon/remote_dispatch_table.h +++ /dev/null @@ -1,1054 +0,0 @@ -/* Automatically generated by remote_generate_stubs.pl. - * Do not edit this file. Any changes you make will be lost. - */ - -{ /* (unused) => 0 */ - .fn = NULL, - .args_filter = (xdrproc_t) xdr_void, - .ret_filter = (xdrproc_t) xdr_void, -}, -{ /* Open => 1 */ - .fn = (dispatch_fn) remoteDispatchOpen, - .args_filter = (xdrproc_t) xdr_remote_open_args, - .ret_filter = (xdrproc_t) xdr_void, -}, -{ /* Close => 2 */ - .fn = (dispatch_fn) remoteDispatchClose, - .args_filter = (xdrproc_t) xdr_void, - .ret_filter = (xdrproc_t) xdr_void, -}, -{ /* GetType => 3 */ - .fn = (dispatch_fn) remoteDispatchGetType, - .args_filter = (xdrproc_t) xdr_void, - .ret_filter = (xdrproc_t) xdr_remote_get_type_ret, -}, -{ /* GetVersion => 4 */ - .fn = (dispatch_fn) remoteDispatchGetVersion, - .args_filter = (xdrproc_t) xdr_void, - .ret_filter = (xdrproc_t) xdr_remote_get_version_ret, -}, -{ /* GetMaxVcpus => 5 */ - .fn = (dispatch_fn) remoteDispatchGetMaxVcpus, - .args_filter = (xdrproc_t) xdr_remote_get_max_vcpus_args, - .ret_filter = (xdrproc_t) xdr_remote_get_max_vcpus_ret, -}, -{ /* NodeGetInfo => 6 */ - .fn = (dispatch_fn) remoteDispatchNodeGetInfo, - .args_filter = (xdrproc_t) xdr_void, - .ret_filter = (xdrproc_t) xdr_remote_node_get_info_ret, -}, -{ /* GetCapabilities => 7 */ - .fn = (dispatch_fn) remoteDispatchGetCapabilities, - .args_filter = (xdrproc_t) xdr_void, - .ret_filter = (xdrproc_t) xdr_remote_get_capabilities_ret, -}, -{ /* DomainAttachDevice => 8 */ - .fn = (dispatch_fn) remoteDispatchDomainAttachDevice, - .args_filter = (xdrproc_t) xdr_remote_domain_attach_device_args, - .ret_filter = (xdrproc_t) xdr_void, -}, -{ /* DomainCreate => 9 */ - .fn = (dispatch_fn) remoteDispatchDomainCreate, - .args_filter = (xdrproc_t) xdr_remote_domain_create_args, - .ret_filter = (xdrproc_t) xdr_void, -}, -{ /* DomainCreateXml => 10 */ - .fn = (dispatch_fn) remoteDispatchDomainCreateXml, - .args_filter = (xdrproc_t) xdr_remote_domain_create_xml_args, - .ret_filter = (xdrproc_t) xdr_remote_domain_create_xml_ret, -}, -{ /* DomainDefineXml => 11 */ - .fn = (dispatch_fn) remoteDispatchDomainDefineXml, - .args_filter = (xdrproc_t) xdr_remote_domain_define_xml_args, - .ret_filter = (xdrproc_t) xdr_remote_domain_define_xml_ret, -}, -{ /* DomainDestroy => 12 */ - .fn = (dispatch_fn) remoteDispatchDomainDestroy, - .args_filter = (xdrproc_t) xdr_remote_domain_destroy_args, - .ret_filter = (xdrproc_t) xdr_void, -}, -{ /* DomainDetachDevice => 13 */ - .fn = (dispatch_fn) remoteDispatchDomainDetachDevice, - .args_filter = (xdrproc_t) xdr_remote_domain_detach_device_args, - .ret_filter = (xdrproc_t) xdr_void, -}, -{ /* DomainDumpXml => 14 */ - .fn = (dispatch_fn) remoteDispatchDomainDumpXml, - .args_filter = (xdrproc_t) xdr_remote_domain_dump_xml_args, - .ret_filter = (xdrproc_t) xdr_remote_domain_dump_xml_ret, -}, -{ /* DomainGetAutostart => 15 */ - .fn = (dispatch_fn) remoteDispatchDomainGetAutostart, - .args_filter = (xdrproc_t) xdr_remote_domain_get_autostart_args, - .ret_filter = (xdrproc_t) xdr_remote_domain_get_autostart_ret, -}, -{ /* DomainGetInfo => 16 */ - .fn = (dispatch_fn) remoteDispatchDomainGetInfo, - .args_filter = (xdrproc_t) xdr_remote_domain_get_info_args, - .ret_filter = (xdrproc_t) xdr_remote_domain_get_info_ret, -}, -{ /* DomainGetMaxMemory => 17 */ - .fn = (dispatch_fn) remoteDispatchDomainGetMaxMemory, - .args_filter = (xdrproc_t) xdr_remote_domain_get_max_memory_args, - .ret_filter = (xdrproc_t) xdr_remote_domain_get_max_memory_ret, -}, -{ /* DomainGetMaxVcpus => 18 */ - .fn = (dispatch_fn) remoteDispatchDomainGetMaxVcpus, - .args_filter = (xdrproc_t) xdr_remote_domain_get_max_vcpus_args, - .ret_filter = (xdrproc_t) xdr_remote_domain_get_max_vcpus_ret, -}, -{ /* DomainGetOsType => 19 */ - .fn = (dispatch_fn) remoteDispatchDomainGetOsType, - .args_filter = (xdrproc_t) xdr_remote_domain_get_os_type_args, - .ret_filter = (xdrproc_t) xdr_remote_domain_get_os_type_ret, -}, -{ /* DomainGetVcpus => 20 */ - .fn = (dispatch_fn) remoteDispatchDomainGetVcpus, - .args_filter = (xdrproc_t) xdr_remote_domain_get_vcpus_args, - .ret_filter = (xdrproc_t) xdr_remote_domain_get_vcpus_ret, -}, -{ /* ListDefinedDomains => 21 */ - .fn = (dispatch_fn) remoteDispatchListDefinedDomains, - .args_filter = (xdrproc_t) xdr_remote_list_defined_domains_args, - .ret_filter = (xdrproc_t) xdr_remote_list_defined_domains_ret, -}, -{ /* DomainLookupById => 22 */ - .fn = (dispatch_fn) remoteDispatchDomainLookupById, - .args_filter = (xdrproc_t) xdr_remote_domain_lookup_by_id_args, - .ret_filter = (xdrproc_t) xdr_remote_domain_lookup_by_id_ret, -}, -{ /* DomainLookupByName => 23 */ - .fn = (dispatch_fn) remoteDispatchDomainLookupByName, - .args_filter = (xdrproc_t) xdr_remote_domain_lookup_by_name_args, - .ret_filter = (xdrproc_t) xdr_remote_domain_lookup_by_name_ret, -}, -{ /* DomainLookupByUuid => 24 */ - .fn = (dispatch_fn) remoteDispatchDomainLookupByUuid, - .args_filter = (xdrproc_t) xdr_remote_domain_lookup_by_uuid_args, - .ret_filter = (xdrproc_t) xdr_remote_domain_lookup_by_uuid_ret, -}, -{ /* NumOfDefinedDomains => 25 */ - .fn = (dispatch_fn) remoteDispatchNumOfDefinedDomains, - .args_filter = (xdrproc_t) xdr_void, - .ret_filter = (xdrproc_t) xdr_remote_num_of_defined_domains_ret, -}, -{ /* DomainPinVcpu => 26 */ - .fn = (dispatch_fn) remoteDispatchDomainPinVcpu, - .args_filter = (xdrproc_t) xdr_remote_domain_pin_vcpu_args, - .ret_filter = (xdrproc_t) xdr_void, -}, -{ /* DomainReboot => 27 */ - .fn = (dispatch_fn) remoteDispatchDomainReboot, - .args_filter = (xdrproc_t) xdr_remote_domain_reboot_args, - .ret_filter = (xdrproc_t) xdr_void, -}, -{ /* DomainResume => 28 */ - .fn = (dispatch_fn) remoteDispatchDomainResume, - .args_filter = (xdrproc_t) xdr_remote_domain_resume_args, - .ret_filter = (xdrproc_t) xdr_void, -}, -{ /* DomainSetAutostart => 29 */ - .fn = (dispatch_fn) remoteDispatchDomainSetAutostart, - .args_filter = (xdrproc_t) xdr_remote_domain_set_autostart_args, - .ret_filter = (xdrproc_t) xdr_void, -}, -{ /* DomainSetMaxMemory => 30 */ - .fn = (dispatch_fn) remoteDispatchDomainSetMaxMemory, - .args_filter = (xdrproc_t) xdr_remote_domain_set_max_memory_args, - .ret_filter = (xdrproc_t) xdr_void, -}, -{ /* DomainSetMemory => 31 */ - .fn = (dispatch_fn) remoteDispatchDomainSetMemory, - .args_filter = (xdrproc_t) xdr_remote_domain_set_memory_args, - .ret_filter = (xdrproc_t) xdr_void, -}, -{ /* DomainSetVcpus => 32 */ - .fn = (dispatch_fn) remoteDispatchDomainSetVcpus, - .args_filter = (xdrproc_t) xdr_remote_domain_set_vcpus_args, - .ret_filter = (xdrproc_t) xdr_void, -}, -{ /* DomainShutdown => 33 */ - .fn = (dispatch_fn) remoteDispatchDomainShutdown, - .args_filter = (xdrproc_t) xdr_remote_domain_shutdown_args, - .ret_filter = (xdrproc_t) xdr_void, -}, -{ /* DomainSuspend => 34 */ - .fn = (dispatch_fn) remoteDispatchDomainSuspend, - .args_filter = (xdrproc_t) xdr_remote_domain_suspend_args, - .ret_filter = (xdrproc_t) xdr_void, -}, -{ /* DomainUndefine => 35 */ - .fn = (dispatch_fn) remoteDispatchDomainUndefine, - .args_filter = (xdrproc_t) xdr_remote_domain_undefine_args, - .ret_filter = (xdrproc_t) xdr_void, -}, -{ /* ListDefinedNetworks => 36 */ - .fn = (dispatch_fn) remoteDispatchListDefinedNetworks, - .args_filter = (xdrproc_t) xdr_remote_list_defined_networks_args, - .ret_filter = (xdrproc_t) xdr_remote_list_defined_networks_ret, -}, -{ /* ListDomains => 37 */ - .fn = (dispatch_fn) remoteDispatchListDomains, - .args_filter = (xdrproc_t) xdr_remote_list_domains_args, - .ret_filter = (xdrproc_t) xdr_remote_list_domains_ret, -}, -{ /* ListNetworks => 38 */ - .fn = (dispatch_fn) remoteDispatchListNetworks, - .args_filter = (xdrproc_t) xdr_remote_list_networks_args, - .ret_filter = (xdrproc_t) xdr_remote_list_networks_ret, -}, -{ /* NetworkCreate => 39 */ - .fn = (dispatch_fn) remoteDispatchNetworkCreate, - .args_filter = (xdrproc_t) xdr_remote_network_create_args, - .ret_filter = (xdrproc_t) xdr_void, -}, -{ /* NetworkCreateXml => 40 */ - .fn = (dispatch_fn) remoteDispatchNetworkCreateXml, - .args_filter = (xdrproc_t) xdr_remote_network_create_xml_args, - .ret_filter = (xdrproc_t) xdr_remote_network_create_xml_ret, -}, -{ /* NetworkDefineXml => 41 */ - .fn = (dispatch_fn) remoteDispatchNetworkDefineXml, - .args_filter = (xdrproc_t) xdr_remote_network_define_xml_args, - .ret_filter = (xdrproc_t) xdr_remote_network_define_xml_ret, -}, -{ /* NetworkDestroy => 42 */ - .fn = (dispatch_fn) remoteDispatchNetworkDestroy, - .args_filter = (xdrproc_t) xdr_remote_network_destroy_args, - .ret_filter = (xdrproc_t) xdr_void, -}, -{ /* NetworkDumpXml => 43 */ - .fn = (dispatch_fn) remoteDispatchNetworkDumpXml, - .args_filter = (xdrproc_t) xdr_remote_network_dump_xml_args, - .ret_filter = (xdrproc_t) xdr_remote_network_dump_xml_ret, -}, -{ /* NetworkGetAutostart => 44 */ - .fn = (dispatch_fn) remoteDispatchNetworkGetAutostart, - .args_filter = (xdrproc_t) xdr_remote_network_get_autostart_args, - .ret_filter = (xdrproc_t) xdr_remote_network_get_autostart_ret, -}, -{ /* NetworkGetBridgeName => 45 */ - .fn = (dispatch_fn) remoteDispatchNetworkGetBridgeName, - .args_filter = (xdrproc_t) xdr_remote_network_get_bridge_name_args, - .ret_filter = (xdrproc_t) xdr_remote_network_get_bridge_name_ret, -}, -{ /* NetworkLookupByName => 46 */ - .fn = (dispatch_fn) remoteDispatchNetworkLookupByName, - .args_filter = (xdrproc_t) xdr_remote_network_lookup_by_name_args, - .ret_filter = (xdrproc_t) xdr_remote_network_lookup_by_name_ret, -}, -{ /* NetworkLookupByUuid => 47 */ - .fn = (dispatch_fn) remoteDispatchNetworkLookupByUuid, - .args_filter = (xdrproc_t) xdr_remote_network_lookup_by_uuid_args, - .ret_filter = (xdrproc_t) xdr_remote_network_lookup_by_uuid_ret, -}, -{ /* NetworkSetAutostart => 48 */ - .fn = (dispatch_fn) remoteDispatchNetworkSetAutostart, - .args_filter = (xdrproc_t) xdr_remote_network_set_autostart_args, - .ret_filter = (xdrproc_t) xdr_void, -}, -{ /* NetworkUndefine => 49 */ - .fn = (dispatch_fn) remoteDispatchNetworkUndefine, - .args_filter = (xdrproc_t) xdr_remote_network_undefine_args, - .ret_filter = (xdrproc_t) xdr_void, -}, -{ /* NumOfDefinedNetworks => 50 */ - .fn = (dispatch_fn) remoteDispatchNumOfDefinedNetworks, - .args_filter = (xdrproc_t) xdr_void, - .ret_filter = (xdrproc_t) xdr_remote_num_of_defined_networks_ret, -}, -{ /* NumOfDomains => 51 */ - .fn = (dispatch_fn) remoteDispatchNumOfDomains, - .args_filter = (xdrproc_t) xdr_void, - .ret_filter = (xdrproc_t) xdr_remote_num_of_domains_ret, -}, -{ /* NumOfNetworks => 52 */ - .fn = (dispatch_fn) remoteDispatchNumOfNetworks, - .args_filter = (xdrproc_t) xdr_void, - .ret_filter = (xdrproc_t) xdr_remote_num_of_networks_ret, -}, -{ /* DomainCoreDump => 53 */ - .fn = (dispatch_fn) remoteDispatchDomainCoreDump, - .args_filter = (xdrproc_t) xdr_remote_domain_core_dump_args, - .ret_filter = (xdrproc_t) xdr_void, -}, -{ /* DomainRestore => 54 */ - .fn = (dispatch_fn) remoteDispatchDomainRestore, - .args_filter = (xdrproc_t) xdr_remote_domain_restore_args, - .ret_filter = (xdrproc_t) xdr_void, -}, -{ /* DomainSave => 55 */ - .fn = (dispatch_fn) remoteDispatchDomainSave, - .args_filter = (xdrproc_t) xdr_remote_domain_save_args, - .ret_filter = (xdrproc_t) xdr_void, -}, -{ /* DomainGetSchedulerType => 56 */ - .fn = (dispatch_fn) remoteDispatchDomainGetSchedulerType, - .args_filter = (xdrproc_t) xdr_remote_domain_get_scheduler_type_args, - .ret_filter = (xdrproc_t) xdr_remote_domain_get_scheduler_type_ret, -}, -{ /* DomainGetSchedulerParameters => 57 */ - .fn = (dispatch_fn) remoteDispatchDomainGetSchedulerParameters, - .args_filter = (xdrproc_t) xdr_remote_domain_get_scheduler_parameters_args, - .ret_filter = (xdrproc_t) xdr_remote_domain_get_scheduler_parameters_ret, -}, -{ /* DomainSetSchedulerParameters => 58 */ - .fn = (dispatch_fn) remoteDispatchDomainSetSchedulerParameters, - .args_filter = (xdrproc_t) xdr_remote_domain_set_scheduler_parameters_args, - .ret_filter = (xdrproc_t) xdr_void, -}, -{ /* GetHostname => 59 */ - .fn = (dispatch_fn) remoteDispatchGetHostname, - .args_filter = (xdrproc_t) xdr_void, - .ret_filter = (xdrproc_t) xdr_remote_get_hostname_ret, -}, -{ /* SupportsFeature => 60 */ - .fn = (dispatch_fn) remoteDispatchSupportsFeature, - .args_filter = (xdrproc_t) xdr_remote_supports_feature_args, - .ret_filter = (xdrproc_t) xdr_remote_supports_feature_ret, -}, -{ /* DomainMigratePrepare => 61 */ - .fn = (dispatch_fn) remoteDispatchDomainMigratePrepare, - .args_filter = (xdrproc_t) xdr_remote_domain_migrate_prepare_args, - .ret_filter = (xdrproc_t) xdr_remote_domain_migrate_prepare_ret, -}, -{ /* DomainMigratePerform => 62 */ - .fn = (dispatch_fn) remoteDispatchDomainMigratePerform, - .args_filter = (xdrproc_t) xdr_remote_domain_migrate_perform_args, - .ret_filter = (xdrproc_t) xdr_void, -}, -{ /* DomainMigrateFinish => 63 */ - .fn = (dispatch_fn) remoteDispatchDomainMigrateFinish, - .args_filter = (xdrproc_t) xdr_remote_domain_migrate_finish_args, - .ret_filter = (xdrproc_t) xdr_remote_domain_migrate_finish_ret, -}, -{ /* DomainBlockStats => 64 */ - .fn = (dispatch_fn) remoteDispatchDomainBlockStats, - .args_filter = (xdrproc_t) xdr_remote_domain_block_stats_args, - .ret_filter = (xdrproc_t) xdr_remote_domain_block_stats_ret, -}, -{ /* DomainInterfaceStats => 65 */ - .fn = (dispatch_fn) remoteDispatchDomainInterfaceStats, - .args_filter = (xdrproc_t) xdr_remote_domain_interface_stats_args, - .ret_filter = (xdrproc_t) xdr_remote_domain_interface_stats_ret, -}, -{ /* AuthList => 66 */ - .fn = (dispatch_fn) remoteDispatchAuthList, - .args_filter = (xdrproc_t) xdr_void, - .ret_filter = (xdrproc_t) xdr_remote_auth_list_ret, -}, -{ /* AuthSaslInit => 67 */ - .fn = (dispatch_fn) remoteDispatchAuthSaslInit, - .args_filter = (xdrproc_t) xdr_void, - .ret_filter = (xdrproc_t) xdr_remote_auth_sasl_init_ret, -}, -{ /* AuthSaslStart => 68 */ - .fn = (dispatch_fn) remoteDispatchAuthSaslStart, - .args_filter = (xdrproc_t) xdr_remote_auth_sasl_start_args, - .ret_filter = (xdrproc_t) xdr_remote_auth_sasl_start_ret, -}, -{ /* AuthSaslStep => 69 */ - .fn = (dispatch_fn) remoteDispatchAuthSaslStep, - .args_filter = (xdrproc_t) xdr_remote_auth_sasl_step_args, - .ret_filter = (xdrproc_t) xdr_remote_auth_sasl_step_ret, -}, -{ /* AuthPolkit => 70 */ - .fn = (dispatch_fn) remoteDispatchAuthPolkit, - .args_filter = (xdrproc_t) xdr_void, - .ret_filter = (xdrproc_t) xdr_remote_auth_polkit_ret, -}, -{ /* NumOfStoragePools => 71 */ - .fn = (dispatch_fn) remoteDispatchNumOfStoragePools, - .args_filter = (xdrproc_t) xdr_void, - .ret_filter = (xdrproc_t) xdr_remote_num_of_storage_pools_ret, -}, -{ /* ListStoragePools => 72 */ - .fn = (dispatch_fn) remoteDispatchListStoragePools, - .args_filter = (xdrproc_t) xdr_remote_list_storage_pools_args, - .ret_filter = (xdrproc_t) xdr_remote_list_storage_pools_ret, -}, -{ /* NumOfDefinedStoragePools => 73 */ - .fn = (dispatch_fn) remoteDispatchNumOfDefinedStoragePools, - .args_filter = (xdrproc_t) xdr_void, - .ret_filter = (xdrproc_t) xdr_remote_num_of_defined_storage_pools_ret, -}, -{ /* ListDefinedStoragePools => 74 */ - .fn = (dispatch_fn) remoteDispatchListDefinedStoragePools, - .args_filter = (xdrproc_t) xdr_remote_list_defined_storage_pools_args, - .ret_filter = (xdrproc_t) xdr_remote_list_defined_storage_pools_ret, -}, -{ /* FindStoragePoolSources => 75 */ - .fn = (dispatch_fn) remoteDispatchFindStoragePoolSources, - .args_filter = (xdrproc_t) xdr_remote_find_storage_pool_sources_args, - .ret_filter = (xdrproc_t) xdr_remote_find_storage_pool_sources_ret, -}, -{ /* StoragePoolCreateXml => 76 */ - .fn = (dispatch_fn) remoteDispatchStoragePoolCreateXml, - .args_filter = (xdrproc_t) xdr_remote_storage_pool_create_xml_args, - .ret_filter = (xdrproc_t) xdr_remote_storage_pool_create_xml_ret, -}, -{ /* StoragePoolDefineXml => 77 */ - .fn = (dispatch_fn) remoteDispatchStoragePoolDefineXml, - .args_filter = (xdrproc_t) xdr_remote_storage_pool_define_xml_args, - .ret_filter = (xdrproc_t) xdr_remote_storage_pool_define_xml_ret, -}, -{ /* StoragePoolCreate => 78 */ - .fn = (dispatch_fn) remoteDispatchStoragePoolCreate, - .args_filter = (xdrproc_t) xdr_remote_storage_pool_create_args, - .ret_filter = (xdrproc_t) xdr_void, -}, -{ /* StoragePoolBuild => 79 */ - .fn = (dispatch_fn) remoteDispatchStoragePoolBuild, - .args_filter = (xdrproc_t) xdr_remote_storage_pool_build_args, - .ret_filter = (xdrproc_t) xdr_void, -}, -{ /* StoragePoolDestroy => 80 */ - .fn = (dispatch_fn) remoteDispatchStoragePoolDestroy, - .args_filter = (xdrproc_t) xdr_remote_storage_pool_destroy_args, - .ret_filter = (xdrproc_t) xdr_void, -}, -{ /* StoragePoolDelete => 81 */ - .fn = (dispatch_fn) remoteDispatchStoragePoolDelete, - .args_filter = (xdrproc_t) xdr_remote_storage_pool_delete_args, - .ret_filter = (xdrproc_t) xdr_void, -}, -{ /* StoragePoolUndefine => 82 */ - .fn = (dispatch_fn) remoteDispatchStoragePoolUndefine, - .args_filter = (xdrproc_t) xdr_remote_storage_pool_undefine_args, - .ret_filter = (xdrproc_t) xdr_void, -}, -{ /* StoragePoolRefresh => 83 */ - .fn = (dispatch_fn) remoteDispatchStoragePoolRefresh, - .args_filter = (xdrproc_t) xdr_remote_storage_pool_refresh_args, - .ret_filter = (xdrproc_t) xdr_void, -}, -{ /* StoragePoolLookupByName => 84 */ - .fn = (dispatch_fn) remoteDispatchStoragePoolLookupByName, - .args_filter = (xdrproc_t) xdr_remote_storage_pool_lookup_by_name_args, - .ret_filter = (xdrproc_t) xdr_remote_storage_pool_lookup_by_name_ret, -}, -{ /* StoragePoolLookupByUuid => 85 */ - .fn = (dispatch_fn) remoteDispatchStoragePoolLookupByUuid, - .args_filter = (xdrproc_t) xdr_remote_storage_pool_lookup_by_uuid_args, - .ret_filter = (xdrproc_t) xdr_remote_storage_pool_lookup_by_uuid_ret, -}, -{ /* StoragePoolLookupByVolume => 86 */ - .fn = (dispatch_fn) remoteDispatchStoragePoolLookupByVolume, - .args_filter = (xdrproc_t) xdr_remote_storage_pool_lookup_by_volume_args, - .ret_filter = (xdrproc_t) xdr_remote_storage_pool_lookup_by_volume_ret, -}, -{ /* StoragePoolGetInfo => 87 */ - .fn = (dispatch_fn) remoteDispatchStoragePoolGetInfo, - .args_filter = (xdrproc_t) xdr_remote_storage_pool_get_info_args, - .ret_filter = (xdrproc_t) xdr_remote_storage_pool_get_info_ret, -}, -{ /* StoragePoolDumpXml => 88 */ - .fn = (dispatch_fn) remoteDispatchStoragePoolDumpXml, - .args_filter = (xdrproc_t) xdr_remote_storage_pool_dump_xml_args, - .ret_filter = (xdrproc_t) xdr_remote_storage_pool_dump_xml_ret, -}, -{ /* StoragePoolGetAutostart => 89 */ - .fn = (dispatch_fn) remoteDispatchStoragePoolGetAutostart, - .args_filter = (xdrproc_t) xdr_remote_storage_pool_get_autostart_args, - .ret_filter = (xdrproc_t) xdr_remote_storage_pool_get_autostart_ret, -}, -{ /* StoragePoolSetAutostart => 90 */ - .fn = (dispatch_fn) remoteDispatchStoragePoolSetAutostart, - .args_filter = (xdrproc_t) xdr_remote_storage_pool_set_autostart_args, - .ret_filter = (xdrproc_t) xdr_void, -}, -{ /* StoragePoolNumOfVolumes => 91 */ - .fn = (dispatch_fn) remoteDispatchStoragePoolNumOfVolumes, - .args_filter = (xdrproc_t) xdr_remote_storage_pool_num_of_volumes_args, - .ret_filter = (xdrproc_t) xdr_remote_storage_pool_num_of_volumes_ret, -}, -{ /* StoragePoolListVolumes => 92 */ - .fn = (dispatch_fn) remoteDispatchStoragePoolListVolumes, - .args_filter = (xdrproc_t) xdr_remote_storage_pool_list_volumes_args, - .ret_filter = (xdrproc_t) xdr_remote_storage_pool_list_volumes_ret, -}, -{ /* StorageVolCreateXml => 93 */ - .fn = (dispatch_fn) remoteDispatchStorageVolCreateXml, - .args_filter = (xdrproc_t) xdr_remote_storage_vol_create_xml_args, - .ret_filter = (xdrproc_t) xdr_remote_storage_vol_create_xml_ret, -}, -{ /* StorageVolDelete => 94 */ - .fn = (dispatch_fn) remoteDispatchStorageVolDelete, - .args_filter = (xdrproc_t) xdr_remote_storage_vol_delete_args, - .ret_filter = (xdrproc_t) xdr_void, -}, -{ /* StorageVolLookupByName => 95 */ - .fn = (dispatch_fn) remoteDispatchStorageVolLookupByName, - .args_filter = (xdrproc_t) xdr_remote_storage_vol_lookup_by_name_args, - .ret_filter = (xdrproc_t) xdr_remote_storage_vol_lookup_by_name_ret, -}, -{ /* StorageVolLookupByKey => 96 */ - .fn = (dispatch_fn) remoteDispatchStorageVolLookupByKey, - .args_filter = (xdrproc_t) xdr_remote_storage_vol_lookup_by_key_args, - .ret_filter = (xdrproc_t) xdr_remote_storage_vol_lookup_by_key_ret, -}, -{ /* StorageVolLookupByPath => 97 */ - .fn = (dispatch_fn) remoteDispatchStorageVolLookupByPath, - .args_filter = (xdrproc_t) xdr_remote_storage_vol_lookup_by_path_args, - .ret_filter = (xdrproc_t) xdr_remote_storage_vol_lookup_by_path_ret, -}, -{ /* StorageVolGetInfo => 98 */ - .fn = (dispatch_fn) remoteDispatchStorageVolGetInfo, - .args_filter = (xdrproc_t) xdr_remote_storage_vol_get_info_args, - .ret_filter = (xdrproc_t) xdr_remote_storage_vol_get_info_ret, -}, -{ /* StorageVolDumpXml => 99 */ - .fn = (dispatch_fn) remoteDispatchStorageVolDumpXml, - .args_filter = (xdrproc_t) xdr_remote_storage_vol_dump_xml_args, - .ret_filter = (xdrproc_t) xdr_remote_storage_vol_dump_xml_ret, -}, -{ /* StorageVolGetPath => 100 */ - .fn = (dispatch_fn) remoteDispatchStorageVolGetPath, - .args_filter = (xdrproc_t) xdr_remote_storage_vol_get_path_args, - .ret_filter = (xdrproc_t) xdr_remote_storage_vol_get_path_ret, -}, -{ /* NodeGetCellsFreeMemory => 101 */ - .fn = (dispatch_fn) remoteDispatchNodeGetCellsFreeMemory, - .args_filter = (xdrproc_t) xdr_remote_node_get_cells_free_memory_args, - .ret_filter = (xdrproc_t) xdr_remote_node_get_cells_free_memory_ret, -}, -{ /* NodeGetFreeMemory => 102 */ - .fn = (dispatch_fn) remoteDispatchNodeGetFreeMemory, - .args_filter = (xdrproc_t) xdr_void, - .ret_filter = (xdrproc_t) xdr_remote_node_get_free_memory_ret, -}, -{ /* DomainBlockPeek => 103 */ - .fn = (dispatch_fn) remoteDispatchDomainBlockPeek, - .args_filter = (xdrproc_t) xdr_remote_domain_block_peek_args, - .ret_filter = (xdrproc_t) xdr_remote_domain_block_peek_ret, -}, -{ /* DomainMemoryPeek => 104 */ - .fn = (dispatch_fn) remoteDispatchDomainMemoryPeek, - .args_filter = (xdrproc_t) xdr_remote_domain_memory_peek_args, - .ret_filter = (xdrproc_t) xdr_remote_domain_memory_peek_ret, -}, -{ /* DomainEventsRegister => 105 */ - .fn = (dispatch_fn) remoteDispatchDomainEventsRegister, - .args_filter = (xdrproc_t) xdr_void, - .ret_filter = (xdrproc_t) xdr_remote_domain_events_register_ret, -}, -{ /* DomainEventsDeregister => 106 */ - .fn = (dispatch_fn) remoteDispatchDomainEventsDeregister, - .args_filter = (xdrproc_t) xdr_void, - .ret_filter = (xdrproc_t) xdr_remote_domain_events_deregister_ret, -}, -{ /* Async event DomainEventLifecycle => 107 */ - .fn = NULL, - .args_filter = (xdrproc_t) xdr_void, - .ret_filter = (xdrproc_t) xdr_void, -}, -{ /* DomainMigratePrepare2 => 108 */ - .fn = (dispatch_fn) remoteDispatchDomainMigratePrepare2, - .args_filter = (xdrproc_t) xdr_remote_domain_migrate_prepare2_args, - .ret_filter = (xdrproc_t) xdr_remote_domain_migrate_prepare2_ret, -}, -{ /* DomainMigrateFinish2 => 109 */ - .fn = (dispatch_fn) remoteDispatchDomainMigrateFinish2, - .args_filter = (xdrproc_t) xdr_remote_domain_migrate_finish2_args, - .ret_filter = (xdrproc_t) xdr_remote_domain_migrate_finish2_ret, -}, -{ /* GetUri => 110 */ - .fn = (dispatch_fn) remoteDispatchGetUri, - .args_filter = (xdrproc_t) xdr_void, - .ret_filter = (xdrproc_t) xdr_remote_get_uri_ret, -}, -{ /* NodeNumOfDevices => 111 */ - .fn = (dispatch_fn) remoteDispatchNodeNumOfDevices, - .args_filter = (xdrproc_t) xdr_remote_node_num_of_devices_args, - .ret_filter = (xdrproc_t) xdr_remote_node_num_of_devices_ret, -}, -{ /* NodeListDevices => 112 */ - .fn = (dispatch_fn) remoteDispatchNodeListDevices, - .args_filter = (xdrproc_t) xdr_remote_node_list_devices_args, - .ret_filter = (xdrproc_t) xdr_remote_node_list_devices_ret, -}, -{ /* NodeDeviceLookupByName => 113 */ - .fn = (dispatch_fn) remoteDispatchNodeDeviceLookupByName, - .args_filter = (xdrproc_t) xdr_remote_node_device_lookup_by_name_args, - .ret_filter = (xdrproc_t) xdr_remote_node_device_lookup_by_name_ret, -}, -{ /* NodeDeviceDumpXml => 114 */ - .fn = (dispatch_fn) remoteDispatchNodeDeviceDumpXml, - .args_filter = (xdrproc_t) xdr_remote_node_device_dump_xml_args, - .ret_filter = (xdrproc_t) xdr_remote_node_device_dump_xml_ret, -}, -{ /* NodeDeviceGetParent => 115 */ - .fn = (dispatch_fn) remoteDispatchNodeDeviceGetParent, - .args_filter = (xdrproc_t) xdr_remote_node_device_get_parent_args, - .ret_filter = (xdrproc_t) xdr_remote_node_device_get_parent_ret, -}, -{ /* NodeDeviceNumOfCaps => 116 */ - .fn = (dispatch_fn) remoteDispatchNodeDeviceNumOfCaps, - .args_filter = (xdrproc_t) xdr_remote_node_device_num_of_caps_args, - .ret_filter = (xdrproc_t) xdr_remote_node_device_num_of_caps_ret, -}, -{ /* NodeDeviceListCaps => 117 */ - .fn = (dispatch_fn) remoteDispatchNodeDeviceListCaps, - .args_filter = (xdrproc_t) xdr_remote_node_device_list_caps_args, - .ret_filter = (xdrproc_t) xdr_remote_node_device_list_caps_ret, -}, -{ /* NodeDeviceDettach => 118 */ - .fn = (dispatch_fn) remoteDispatchNodeDeviceDettach, - .args_filter = (xdrproc_t) xdr_remote_node_device_dettach_args, - .ret_filter = (xdrproc_t) xdr_void, -}, -{ /* NodeDeviceReAttach => 119 */ - .fn = (dispatch_fn) remoteDispatchNodeDeviceReAttach, - .args_filter = (xdrproc_t) xdr_remote_node_device_re_attach_args, - .ret_filter = (xdrproc_t) xdr_void, -}, -{ /* NodeDeviceReset => 120 */ - .fn = (dispatch_fn) remoteDispatchNodeDeviceReset, - .args_filter = (xdrproc_t) xdr_remote_node_device_reset_args, - .ret_filter = (xdrproc_t) xdr_void, -}, -{ /* DomainGetSecurityLabel => 121 */ - .fn = (dispatch_fn) remoteDispatchDomainGetSecurityLabel, - .args_filter = (xdrproc_t) xdr_remote_domain_get_security_label_args, - .ret_filter = (xdrproc_t) xdr_remote_domain_get_security_label_ret, -}, -{ /* NodeGetSecurityModel => 122 */ - .fn = (dispatch_fn) remoteDispatchNodeGetSecurityModel, - .args_filter = (xdrproc_t) xdr_void, - .ret_filter = (xdrproc_t) xdr_remote_node_get_security_model_ret, -}, -{ /* NodeDeviceCreateXml => 123 */ - .fn = (dispatch_fn) remoteDispatchNodeDeviceCreateXml, - .args_filter = (xdrproc_t) xdr_remote_node_device_create_xml_args, - .ret_filter = (xdrproc_t) xdr_remote_node_device_create_xml_ret, -}, -{ /* NodeDeviceDestroy => 124 */ - .fn = (dispatch_fn) remoteDispatchNodeDeviceDestroy, - .args_filter = (xdrproc_t) xdr_remote_node_device_destroy_args, - .ret_filter = (xdrproc_t) xdr_void, -}, -{ /* StorageVolCreateXmlFrom => 125 */ - .fn = (dispatch_fn) remoteDispatchStorageVolCreateXmlFrom, - .args_filter = (xdrproc_t) xdr_remote_storage_vol_create_xml_from_args, - .ret_filter = (xdrproc_t) xdr_remote_storage_vol_create_xml_from_ret, -}, -{ /* NumOfInterfaces => 126 */ - .fn = (dispatch_fn) remoteDispatchNumOfInterfaces, - .args_filter = (xdrproc_t) xdr_void, - .ret_filter = (xdrproc_t) xdr_remote_num_of_interfaces_ret, -}, -{ /* ListInterfaces => 127 */ - .fn = (dispatch_fn) remoteDispatchListInterfaces, - .args_filter = (xdrproc_t) xdr_remote_list_interfaces_args, - .ret_filter = (xdrproc_t) xdr_remote_list_interfaces_ret, -}, -{ /* InterfaceLookupByName => 128 */ - .fn = (dispatch_fn) remoteDispatchInterfaceLookupByName, - .args_filter = (xdrproc_t) xdr_remote_interface_lookup_by_name_args, - .ret_filter = (xdrproc_t) xdr_remote_interface_lookup_by_name_ret, -}, -{ /* InterfaceLookupByMacString => 129 */ - .fn = (dispatch_fn) remoteDispatchInterfaceLookupByMacString, - .args_filter = (xdrproc_t) xdr_remote_interface_lookup_by_mac_string_args, - .ret_filter = (xdrproc_t) xdr_remote_interface_lookup_by_mac_string_ret, -}, -{ /* InterfaceGetXmlDesc => 130 */ - .fn = (dispatch_fn) remoteDispatchInterfaceGetXmlDesc, - .args_filter = (xdrproc_t) xdr_remote_interface_get_xml_desc_args, - .ret_filter = (xdrproc_t) xdr_remote_interface_get_xml_desc_ret, -}, -{ /* InterfaceDefineXml => 131 */ - .fn = (dispatch_fn) remoteDispatchInterfaceDefineXml, - .args_filter = (xdrproc_t) xdr_remote_interface_define_xml_args, - .ret_filter = (xdrproc_t) xdr_remote_interface_define_xml_ret, -}, -{ /* InterfaceUndefine => 132 */ - .fn = (dispatch_fn) remoteDispatchInterfaceUndefine, - .args_filter = (xdrproc_t) xdr_remote_interface_undefine_args, - .ret_filter = (xdrproc_t) xdr_void, -}, -{ /* InterfaceCreate => 133 */ - .fn = (dispatch_fn) remoteDispatchInterfaceCreate, - .args_filter = (xdrproc_t) xdr_remote_interface_create_args, - .ret_filter = (xdrproc_t) xdr_void, -}, -{ /* InterfaceDestroy => 134 */ - .fn = (dispatch_fn) remoteDispatchInterfaceDestroy, - .args_filter = (xdrproc_t) xdr_remote_interface_destroy_args, - .ret_filter = (xdrproc_t) xdr_void, -}, -{ /* DomainXmlFromNative => 135 */ - .fn = (dispatch_fn) remoteDispatchDomainXmlFromNative, - .args_filter = (xdrproc_t) xdr_remote_domain_xml_from_native_args, - .ret_filter = (xdrproc_t) xdr_remote_domain_xml_from_native_ret, -}, -{ /* DomainXmlToNative => 136 */ - .fn = (dispatch_fn) remoteDispatchDomainXmlToNative, - .args_filter = (xdrproc_t) xdr_remote_domain_xml_to_native_args, - .ret_filter = (xdrproc_t) xdr_remote_domain_xml_to_native_ret, -}, -{ /* NumOfDefinedInterfaces => 137 */ - .fn = (dispatch_fn) remoteDispatchNumOfDefinedInterfaces, - .args_filter = (xdrproc_t) xdr_void, - .ret_filter = (xdrproc_t) xdr_remote_num_of_defined_interfaces_ret, -}, -{ /* ListDefinedInterfaces => 138 */ - .fn = (dispatch_fn) remoteDispatchListDefinedInterfaces, - .args_filter = (xdrproc_t) xdr_remote_list_defined_interfaces_args, - .ret_filter = (xdrproc_t) xdr_remote_list_defined_interfaces_ret, -}, -{ /* NumOfSecrets => 139 */ - .fn = (dispatch_fn) remoteDispatchNumOfSecrets, - .args_filter = (xdrproc_t) xdr_void, - .ret_filter = (xdrproc_t) xdr_remote_num_of_secrets_ret, -}, -{ /* ListSecrets => 140 */ - .fn = (dispatch_fn) remoteDispatchListSecrets, - .args_filter = (xdrproc_t) xdr_remote_list_secrets_args, - .ret_filter = (xdrproc_t) xdr_remote_list_secrets_ret, -}, -{ /* SecretLookupByUuid => 141 */ - .fn = (dispatch_fn) remoteDispatchSecretLookupByUuid, - .args_filter = (xdrproc_t) xdr_remote_secret_lookup_by_uuid_args, - .ret_filter = (xdrproc_t) xdr_remote_secret_lookup_by_uuid_ret, -}, -{ /* SecretDefineXml => 142 */ - .fn = (dispatch_fn) remoteDispatchSecretDefineXml, - .args_filter = (xdrproc_t) xdr_remote_secret_define_xml_args, - .ret_filter = (xdrproc_t) xdr_remote_secret_define_xml_ret, -}, -{ /* SecretGetXmlDesc => 143 */ - .fn = (dispatch_fn) remoteDispatchSecretGetXmlDesc, - .args_filter = (xdrproc_t) xdr_remote_secret_get_xml_desc_args, - .ret_filter = (xdrproc_t) xdr_remote_secret_get_xml_desc_ret, -}, -{ /* SecretSetValue => 144 */ - .fn = (dispatch_fn) remoteDispatchSecretSetValue, - .args_filter = (xdrproc_t) xdr_remote_secret_set_value_args, - .ret_filter = (xdrproc_t) xdr_void, -}, -{ /* SecretGetValue => 145 */ - .fn = (dispatch_fn) remoteDispatchSecretGetValue, - .args_filter = (xdrproc_t) xdr_remote_secret_get_value_args, - .ret_filter = (xdrproc_t) xdr_remote_secret_get_value_ret, -}, -{ /* SecretUndefine => 146 */ - .fn = (dispatch_fn) remoteDispatchSecretUndefine, - .args_filter = (xdrproc_t) xdr_remote_secret_undefine_args, - .ret_filter = (xdrproc_t) xdr_void, -}, -{ /* SecretLookupByUsage => 147 */ - .fn = (dispatch_fn) remoteDispatchSecretLookupByUsage, - .args_filter = (xdrproc_t) xdr_remote_secret_lookup_by_usage_args, - .ret_filter = (xdrproc_t) xdr_remote_secret_lookup_by_usage_ret, -}, -{ /* DomainMigratePrepareTunnel => 148 */ - .fn = (dispatch_fn) remoteDispatchDomainMigratePrepareTunnel, - .args_filter = (xdrproc_t) xdr_remote_domain_migrate_prepare_tunnel_args, - .ret_filter = (xdrproc_t) xdr_void, -}, -{ /* IsSecure => 149 */ - .fn = (dispatch_fn) remoteDispatchIsSecure, - .args_filter = (xdrproc_t) xdr_void, - .ret_filter = (xdrproc_t) xdr_remote_is_secure_ret, -}, -{ /* DomainIsActive => 150 */ - .fn = (dispatch_fn) remoteDispatchDomainIsActive, - .args_filter = (xdrproc_t) xdr_remote_domain_is_active_args, - .ret_filter = (xdrproc_t) xdr_remote_domain_is_active_ret, -}, -{ /* DomainIsPersistent => 151 */ - .fn = (dispatch_fn) remoteDispatchDomainIsPersistent, - .args_filter = (xdrproc_t) xdr_remote_domain_is_persistent_args, - .ret_filter = (xdrproc_t) xdr_remote_domain_is_persistent_ret, -}, -{ /* NetworkIsActive => 152 */ - .fn = (dispatch_fn) remoteDispatchNetworkIsActive, - .args_filter = (xdrproc_t) xdr_remote_network_is_active_args, - .ret_filter = (xdrproc_t) xdr_remote_network_is_active_ret, -}, -{ /* NetworkIsPersistent => 153 */ - .fn = (dispatch_fn) remoteDispatchNetworkIsPersistent, - .args_filter = (xdrproc_t) xdr_remote_network_is_persistent_args, - .ret_filter = (xdrproc_t) xdr_remote_network_is_persistent_ret, -}, -{ /* StoragePoolIsActive => 154 */ - .fn = (dispatch_fn) remoteDispatchStoragePoolIsActive, - .args_filter = (xdrproc_t) xdr_remote_storage_pool_is_active_args, - .ret_filter = (xdrproc_t) xdr_remote_storage_pool_is_active_ret, -}, -{ /* StoragePoolIsPersistent => 155 */ - .fn = (dispatch_fn) remoteDispatchStoragePoolIsPersistent, - .args_filter = (xdrproc_t) xdr_remote_storage_pool_is_persistent_args, - .ret_filter = (xdrproc_t) xdr_remote_storage_pool_is_persistent_ret, -}, -{ /* InterfaceIsActive => 156 */ - .fn = (dispatch_fn) remoteDispatchInterfaceIsActive, - .args_filter = (xdrproc_t) xdr_remote_interface_is_active_args, - .ret_filter = (xdrproc_t) xdr_remote_interface_is_active_ret, -}, -{ /* GetLibVersion => 157 */ - .fn = (dispatch_fn) remoteDispatchGetLibVersion, - .args_filter = (xdrproc_t) xdr_void, - .ret_filter = (xdrproc_t) xdr_remote_get_lib_version_ret, -}, -{ /* CpuCompare => 158 */ - .fn = (dispatch_fn) remoteDispatchCpuCompare, - .args_filter = (xdrproc_t) xdr_remote_cpu_compare_args, - .ret_filter = (xdrproc_t) xdr_remote_cpu_compare_ret, -}, -{ /* DomainMemoryStats => 159 */ - .fn = (dispatch_fn) remoteDispatchDomainMemoryStats, - .args_filter = (xdrproc_t) xdr_remote_domain_memory_stats_args, - .ret_filter = (xdrproc_t) xdr_remote_domain_memory_stats_ret, -}, -{ /* DomainAttachDeviceFlags => 160 */ - .fn = (dispatch_fn) remoteDispatchDomainAttachDeviceFlags, - .args_filter = (xdrproc_t) xdr_remote_domain_attach_device_flags_args, - .ret_filter = (xdrproc_t) xdr_void, -}, -{ /* DomainDetachDeviceFlags => 161 */ - .fn = (dispatch_fn) remoteDispatchDomainDetachDeviceFlags, - .args_filter = (xdrproc_t) xdr_remote_domain_detach_device_flags_args, - .ret_filter = (xdrproc_t) xdr_void, -}, -{ /* CpuBaseline => 162 */ - .fn = (dispatch_fn) remoteDispatchCpuBaseline, - .args_filter = (xdrproc_t) xdr_remote_cpu_baseline_args, - .ret_filter = (xdrproc_t) xdr_remote_cpu_baseline_ret, -}, -{ /* DomainGetJobInfo => 163 */ - .fn = (dispatch_fn) remoteDispatchDomainGetJobInfo, - .args_filter = (xdrproc_t) xdr_remote_domain_get_job_info_args, - .ret_filter = (xdrproc_t) xdr_remote_domain_get_job_info_ret, -}, -{ /* DomainAbortJob => 164 */ - .fn = (dispatch_fn) remoteDispatchDomainAbortJob, - .args_filter = (xdrproc_t) xdr_remote_domain_abort_job_args, - .ret_filter = (xdrproc_t) xdr_void, -}, -{ /* StorageVolWipe => 165 */ - .fn = (dispatch_fn) remoteDispatchStorageVolWipe, - .args_filter = (xdrproc_t) xdr_remote_storage_vol_wipe_args, - .ret_filter = (xdrproc_t) xdr_void, -}, -{ /* DomainMigrateSetMaxDowntime => 166 */ - .fn = (dispatch_fn) remoteDispatchDomainMigrateSetMaxDowntime, - .args_filter = (xdrproc_t) xdr_remote_domain_migrate_set_max_downtime_args, - .ret_filter = (xdrproc_t) xdr_void, -}, -{ /* DomainEventsRegisterAny => 167 */ - .fn = (dispatch_fn) remoteDispatchDomainEventsRegisterAny, - .args_filter = (xdrproc_t) xdr_remote_domain_events_register_any_args, - .ret_filter = (xdrproc_t) xdr_void, -}, -{ /* DomainEventsDeregisterAny => 168 */ - .fn = (dispatch_fn) remoteDispatchDomainEventsDeregisterAny, - .args_filter = (xdrproc_t) xdr_remote_domain_events_deregister_any_args, - .ret_filter = (xdrproc_t) xdr_void, -}, -{ /* Async event DomainEventReboot => 169 */ - .fn = NULL, - .args_filter = (xdrproc_t) xdr_void, - .ret_filter = (xdrproc_t) xdr_void, -}, -{ /* Async event DomainEventRtcChange => 170 */ - .fn = NULL, - .args_filter = (xdrproc_t) xdr_void, - .ret_filter = (xdrproc_t) xdr_void, -}, -{ /* Async event DomainEventWatchdog => 171 */ - .fn = NULL, - .args_filter = (xdrproc_t) xdr_void, - .ret_filter = (xdrproc_t) xdr_void, -}, -{ /* Async event DomainEventIoError => 172 */ - .fn = NULL, - .args_filter = (xdrproc_t) xdr_void, - .ret_filter = (xdrproc_t) xdr_void, -}, -{ /* Async event DomainEventGraphics => 173 */ - .fn = NULL, - .args_filter = (xdrproc_t) xdr_void, - .ret_filter = (xdrproc_t) xdr_void, -}, -{ /* DomainUpdateDeviceFlags => 174 */ - .fn = (dispatch_fn) remoteDispatchDomainUpdateDeviceFlags, - .args_filter = (xdrproc_t) xdr_remote_domain_update_device_flags_args, - .ret_filter = (xdrproc_t) xdr_void, -}, -{ /* NwfilterLookupByName => 175 */ - .fn = (dispatch_fn) remoteDispatchNwfilterLookupByName, - .args_filter = (xdrproc_t) xdr_remote_nwfilter_lookup_by_name_args, - .ret_filter = (xdrproc_t) xdr_remote_nwfilter_lookup_by_name_ret, -}, -{ /* NwfilterLookupByUuid => 176 */ - .fn = (dispatch_fn) remoteDispatchNwfilterLookupByUuid, - .args_filter = (xdrproc_t) xdr_remote_nwfilter_lookup_by_uuid_args, - .ret_filter = (xdrproc_t) xdr_remote_nwfilter_lookup_by_uuid_ret, -}, -{ /* NwfilterGetXmlDesc => 177 */ - .fn = (dispatch_fn) remoteDispatchNwfilterGetXmlDesc, - .args_filter = (xdrproc_t) xdr_remote_nwfilter_get_xml_desc_args, - .ret_filter = (xdrproc_t) xdr_remote_nwfilter_get_xml_desc_ret, -}, -{ /* NumOfNwfilters => 178 */ - .fn = (dispatch_fn) remoteDispatchNumOfNwfilters, - .args_filter = (xdrproc_t) xdr_void, - .ret_filter = (xdrproc_t) xdr_remote_num_of_nwfilters_ret, -}, -{ /* ListNwfilters => 179 */ - .fn = (dispatch_fn) remoteDispatchListNwfilters, - .args_filter = (xdrproc_t) xdr_remote_list_nwfilters_args, - .ret_filter = (xdrproc_t) xdr_remote_list_nwfilters_ret, -}, -{ /* NwfilterDefineXml => 180 */ - .fn = (dispatch_fn) remoteDispatchNwfilterDefineXml, - .args_filter = (xdrproc_t) xdr_remote_nwfilter_define_xml_args, - .ret_filter = (xdrproc_t) xdr_remote_nwfilter_define_xml_ret, -}, -{ /* NwfilterUndefine => 181 */ - .fn = (dispatch_fn) remoteDispatchNwfilterUndefine, - .args_filter = (xdrproc_t) xdr_remote_nwfilter_undefine_args, - .ret_filter = (xdrproc_t) xdr_void, -}, -{ /* DomainManagedSave => 182 */ - .fn = (dispatch_fn) remoteDispatchDomainManagedSave, - .args_filter = (xdrproc_t) xdr_remote_domain_managed_save_args, - .ret_filter = (xdrproc_t) xdr_void, -}, -{ /* DomainHasManagedSaveImage => 183 */ - .fn = (dispatch_fn) remoteDispatchDomainHasManagedSaveImage, - .args_filter = (xdrproc_t) xdr_remote_domain_has_managed_save_image_args, - .ret_filter = (xdrproc_t) xdr_remote_domain_has_managed_save_image_ret, -}, -{ /* DomainManagedSaveRemove => 184 */ - .fn = (dispatch_fn) remoteDispatchDomainManagedSaveRemove, - .args_filter = (xdrproc_t) xdr_remote_domain_managed_save_remove_args, - .ret_filter = (xdrproc_t) xdr_void, -}, -{ /* DomainSnapshotCreateXml => 185 */ - .fn = (dispatch_fn) remoteDispatchDomainSnapshotCreateXml, - .args_filter = (xdrproc_t) xdr_remote_domain_snapshot_create_xml_args, - .ret_filter = (xdrproc_t) xdr_remote_domain_snapshot_create_xml_ret, -}, -{ /* DomainSnapshotDumpXml => 186 */ - .fn = (dispatch_fn) remoteDispatchDomainSnapshotDumpXml, - .args_filter = (xdrproc_t) xdr_remote_domain_snapshot_dump_xml_args, - .ret_filter = (xdrproc_t) xdr_remote_domain_snapshot_dump_xml_ret, -}, -{ /* DomainSnapshotNum => 187 */ - .fn = (dispatch_fn) remoteDispatchDomainSnapshotNum, - .args_filter = (xdrproc_t) xdr_remote_domain_snapshot_num_args, - .ret_filter = (xdrproc_t) xdr_remote_domain_snapshot_num_ret, -}, -{ /* DomainSnapshotListNames => 188 */ - .fn = (dispatch_fn) remoteDispatchDomainSnapshotListNames, - .args_filter = (xdrproc_t) xdr_remote_domain_snapshot_list_names_args, - .ret_filter = (xdrproc_t) xdr_remote_domain_snapshot_list_names_ret, -}, -{ /* DomainSnapshotLookupByName => 189 */ - .fn = (dispatch_fn) remoteDispatchDomainSnapshotLookupByName, - .args_filter = (xdrproc_t) xdr_remote_domain_snapshot_lookup_by_name_args, - .ret_filter = (xdrproc_t) xdr_remote_domain_snapshot_lookup_by_name_ret, -}, -{ /* DomainHasCurrentSnapshot => 190 */ - .fn = (dispatch_fn) remoteDispatchDomainHasCurrentSnapshot, - .args_filter = (xdrproc_t) xdr_remote_domain_has_current_snapshot_args, - .ret_filter = (xdrproc_t) xdr_remote_domain_has_current_snapshot_ret, -}, -{ /* DomainSnapshotCurrent => 191 */ - .fn = (dispatch_fn) remoteDispatchDomainSnapshotCurrent, - .args_filter = (xdrproc_t) xdr_remote_domain_snapshot_current_args, - .ret_filter = (xdrproc_t) xdr_remote_domain_snapshot_current_ret, -}, -{ /* DomainRevertToSnapshot => 192 */ - .fn = (dispatch_fn) remoteDispatchDomainRevertToSnapshot, - .args_filter = (xdrproc_t) xdr_remote_domain_revert_to_snapshot_args, - .ret_filter = (xdrproc_t) xdr_void, -}, -{ /* DomainSnapshotDelete => 193 */ - .fn = (dispatch_fn) remoteDispatchDomainSnapshotDelete, - .args_filter = (xdrproc_t) xdr_remote_domain_snapshot_delete_args, - .ret_filter = (xdrproc_t) xdr_void, -}, -{ /* DomainGetBlockInfo => 194 */ - .fn = (dispatch_fn) remoteDispatchDomainGetBlockInfo, - .args_filter = (xdrproc_t) xdr_remote_domain_get_block_info_args, - .ret_filter = (xdrproc_t) xdr_remote_domain_get_block_info_ret, -}, -{ /* Async event DomainEventIoErrorReason => 195 */ - .fn = NULL, - .args_filter = (xdrproc_t) xdr_void, - .ret_filter = (xdrproc_t) xdr_void, -}, -{ /* DomainCreateWithFlags => 196 */ - .fn = (dispatch_fn) remoteDispatchDomainCreateWithFlags, - .args_filter = (xdrproc_t) xdr_remote_domain_create_with_flags_args, - .ret_filter = (xdrproc_t) xdr_remote_domain_create_with_flags_ret, -}, -{ /* DomainSetMemoryParameters => 197 */ - .fn = (dispatch_fn) remoteDispatchDomainSetMemoryParameters, - .args_filter = (xdrproc_t) xdr_remote_domain_set_memory_parameters_args, - .ret_filter = (xdrproc_t) xdr_void, -}, -{ /* DomainGetMemoryParameters => 198 */ - .fn = (dispatch_fn) remoteDispatchDomainGetMemoryParameters, - .args_filter = (xdrproc_t) xdr_remote_domain_get_memory_parameters_args, - .ret_filter = (xdrproc_t) xdr_remote_domain_get_memory_parameters_ret, -}, -{ /* DomainSetVcpusFlags => 199 */ - .fn = (dispatch_fn) remoteDispatchDomainSetVcpusFlags, - .args_filter = (xdrproc_t) xdr_remote_domain_set_vcpus_flags_args, - .ret_filter = (xdrproc_t) xdr_void, -}, -{ /* DomainGetVcpusFlags => 200 */ - .fn = (dispatch_fn) remoteDispatchDomainGetVcpusFlags, - .args_filter = (xdrproc_t) xdr_remote_domain_get_vcpus_flags_args, - .ret_filter = (xdrproc_t) xdr_remote_domain_get_vcpus_flags_ret, -}, -{ /* DomainOpenConsole => 201 */ - .fn = (dispatch_fn) remoteDispatchDomainOpenConsole, - .args_filter = (xdrproc_t) xdr_remote_domain_open_console_args, - .ret_filter = (xdrproc_t) xdr_void, -}, -{ /* DomainIsUpdated => 202 */ - .fn = (dispatch_fn) remoteDispatchDomainIsUpdated, - .args_filter = (xdrproc_t) xdr_remote_domain_is_updated_args, - .ret_filter = (xdrproc_t) xdr_remote_domain_is_updated_ret, -}, -{ /* GetSysinfo => 203 */ - .fn = (dispatch_fn) remoteDispatchGetSysinfo, - .args_filter = (xdrproc_t) xdr_remote_get_sysinfo_args, - .ret_filter = (xdrproc_t) xdr_remote_get_sysinfo_ret, -}, -{ /* DomainSetMemoryFlags => 204 */ - .fn = (dispatch_fn) remoteDispatchDomainSetMemoryFlags, - .args_filter = (xdrproc_t) xdr_remote_domain_set_memory_flags_args, - .ret_filter = (xdrproc_t) xdr_void, -}, -{ /* DomainSetBlkioParameters => 205 */ - .fn = (dispatch_fn) remoteDispatchDomainSetBlkioParameters, - .args_filter = (xdrproc_t) xdr_remote_domain_set_blkio_parameters_args, - .ret_filter = (xdrproc_t) xdr_void, -}, -{ /* DomainGetBlkioParameters => 206 */ - .fn = (dispatch_fn) remoteDispatchDomainGetBlkioParameters, - .args_filter = (xdrproc_t) xdr_remote_domain_get_blkio_parameters_args, - .ret_filter = (xdrproc_t) xdr_remote_domain_get_blkio_parameters_ret, -}, -{ /* DomainMigrateSetMaxSpeed => 207 */ - .fn = (dispatch_fn) remoteDispatchDomainMigrateSetMaxSpeed, - .args_filter = (xdrproc_t) xdr_remote_domain_migrate_set_max_speed_args, - .ret_filter = (xdrproc_t) xdr_void, -}, -{ /* StorageVolUpload => 208 */ - .fn = (dispatch_fn) remoteDispatchStorageVolUpload, - .args_filter = (xdrproc_t) xdr_remote_storage_vol_upload_args, - .ret_filter = (xdrproc_t) xdr_void, -}, -{ /* StorageVolDownload => 209 */ - .fn = (dispatch_fn) remoteDispatchStorageVolDownload, - .args_filter = (xdrproc_t) xdr_remote_storage_vol_download_args, - .ret_filter = (xdrproc_t) xdr_void, -}, -- 1.7.3.1 -- Thanks, Hu Tao

6 12