- Devel - libvirt List Archives

[libvirt] [test-API PATCH] use global variable domain_cache_folder to as cache folder for guest install
by Guannan Ren 25 Apr '12

25 Apr '12

--- global.cfg | 15 +++++++++------ repos/domain/install_linux_cdrom.py | 22 ++++++++++------------ 2 files changed, 19 insertions(+), 18 deletions(-) diff --git a/global.cfg b/global.cfg index 6cfdcac..7b7b7cb 100644 --- a/global.cfg +++ b/global.cfg @@ -142,6 +143,8 @@ defaultnic = virtio static_uuid = 05867c1a-afeb-300e-e55e-2673391ae080 # path to a disk image containing a preinstalled guest for testing testfullimagepath = /var/lib/libvirt/images/f14.img +# path to store temporary iso and kickstart file +domain_cache_folder = /var/cache/libvirt-test-api ################################################################ # diff --git a/repos/domain/install_linux_cdrom.py b/repos/domain/install_linux_cdrom.py index 60d12a7..f70ebc3 100644 --- a/repos/domain/install_linux_cdrom.py +++ b/repos/domain/install_linux_cdrom.py @@ -36,18 +36,16 @@ VM_STAT = "virsh --quiet list --all| grep \"\\b%s\\b\"|grep off" VM_DESTROY = "virsh destroy %s" VM_UNDEFINE = "virsh undefine %s" -BOOT_DIR = "/var/lib/libvirt/boot/" HOME_PATH = os.getcwd() -def prepare_cdrom(*args): +def prepare_cdrom(ostree, ks, guestname, cache_folder, logger): """ to customize boot.iso file to add kickstart file into it for automatic guest installation """ - ostree, ks, guestname, logger = args ks_name = os.path.basename(ks) - new_dir = os.path.join(HOME_PATH, guestname) - logger.info("creating a new folder for customizing custom.iso file in it") + new_dir = os.path.join(cache_folder, guestname) + logger.info("creating a workshop folder for customizing custom.iso file") if os.path.exists(new_dir): logger.info("the folder exists, remove it") @@ -68,7 +66,7 @@ def prepare_cdrom(*args): shutil.copy('utils/ksiso.sh', new_dir) src_path = os.getcwd() - logger.info("enter into the workshop folder: %s" % new_dir) + logger.debug("enter folder: %s" % new_dir) os.chdir(new_dir) shell_cmd = 'sh ksiso.sh %s' % ks_name @@ -76,8 +74,8 @@ def prepare_cdrom(*args): (status, text) = commands.getstatusoutput(shell_cmd) logger.debug(text) - logger.info("make custom.iso file, change to original directory: %s" % - src_path) + + logger.debug("go back to original directory: %s" % src_path) os.chdir(src_path) def prepare_boot_guest(domobj, xmlstr, guestname, installtype, logger): @@ -194,13 +192,13 @@ def install_linux_cdrom(params): logger.debug('kisckstart file: \n %s' % ks) logger.info('prepare installation...') + cache_folder = envparser.get_value("variables", "domain_cache_folder") - bootcd = '%s/custom.iso' % \ - (os.path.join(HOME_PATH, guestname)) - logger.debug("the bootcd path is %s" % bootcd) logger.info("begin to customize the custom.iso file") - prepare_cdrom(ostree, ks, guestname, logger) + prepare_cdrom(ostree, ks, guestname, cache_folder, logger) + bootcd = '%s/custom.iso' % \ + (os.path.join(cache_folder, guestname)) xmlstr = xmlstr.replace('CUSTOMISO', bootcd) logger.debug('dump installation guest xml:\n%s' % xmlstr) -- 1.7.7.5

1 0

[libvirt] [test-API PATCH 0/4] problems fixed during testcase run
by Guannan Ren 25 Apr '12

25 Apr '12

I ran a loop of existing testcases to ensure the cleanup that we did these days is neat and successful. The four patches is the final update. first, update testcase config files in cases folder to use new params of testcases. second, Fix a framework bug. third, add missing modules. fourth, final testcases cleanup.

3 21

[libvirt] [test-API PATCH] move log.py and format.py into src, cleanup module import code
by Guannan Ren 24 Apr '12

24 Apr '12

--- libvirt-test-api | 2 +- src/casecfgcheck.py | 2 -- src/env_clear.py | 4 ++-- src/env_inspect.py | 2 +- src/env_parser.py | 6 +----- src/exception.py | 2 -- {utils => src}/format.py | 0 src/generator.py | 12 ++++++------ {utils => src}/log.py | 0 src/log.xsl | 2 +- src/log_generator.py | 2 +- src/parser.py | 4 ++-- src/proxy.py | 2 +- 13 files changed, 16 insertions(+), 24 deletions(-) rename {utils => src}/format.py (100%) rename {utils => src}/log.py (100%) diff --git a/libvirt-test-api b/libvirt-test-api index cec7679..4c8d515 100755 --- a/libvirt-test-api +++ b/libvirt-test-api @@ -27,7 +27,7 @@ from src import proxy from src import generator from src import env_clear from src import process -from utils import log +from src import log from src.log_generator import LogGenerator from src.activityfilter import Filter from src.casecfgcheck import CaseCfgCheck diff --git a/src/casecfgcheck.py b/src/casecfgcheck.py index 252f4a4..755b03f 100644 --- a/src/casecfgcheck.py +++ b/src/casecfgcheck.py @@ -15,8 +15,6 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -from src import proxy - class CaseCfgCheck(object): """validate the options in testcase config file""" def __init__(self, proxy_obj, activities_list): diff --git a/src/env_clear.py b/src/env_clear.py index a4a8a8e..fa3b62c 100644 --- a/src/env_clear.py +++ b/src/env_clear.py @@ -18,8 +18,8 @@ # This module matches the reference of clearing function from each testcase # to the corresponding testcase's argument in the order of testcase running -from src import mapper -from utils import log +import mapper +import log class EnvClear(object): """ Generate a callable class of executing clearing function in diff --git a/src/env_inspect.py b/src/env_inspect.py index 4942b33..b260ff8 100644 --- a/src/env_inspect.py +++ b/src/env_inspect.py @@ -19,7 +19,7 @@ import commands import libvirt -from src import sharedmod +import sharedmod def check_libvirt(logger): virsh = 'virsh -v' diff --git a/src/env_parser.py b/src/env_parser.py index cf4168f..f02af57 100644 --- a/src/env_parser.py +++ b/src/env_parser.py @@ -21,11 +21,7 @@ import ConfigParser import os import sys -dir = os.path.dirname(sys.modules[__name__].__file__) -absdir = os.path.abspath(dir) -sys.path.append(os.path.split(absdir)[0]) - -from src import exception +import exception class Envparser(object): def __init__(self, configfile): diff --git a/src/exception.py b/src/exception.py index 9b61bac..70d0175 100644 --- a/src/exception.py +++ b/src/exception.py @@ -17,8 +17,6 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -import libvirt - class LibvirtException(Exception): code = 200 message = "General libvirt-test-suite Exception" diff --git a/utils/format.py b/src/format.py similarity index 100% rename from utils/format.py rename to src/format.py diff --git a/src/generator.py b/src/generator.py index 5b9a0a2..d4b0388 100644 --- a/src/generator.py +++ b/src/generator.py @@ -24,12 +24,12 @@ import sys import os import traceback -from src import mapper -from src.testcasexml import xml_file_to_str -from src import env_parser -from src import env_inspect -from utils import log -from utils import format +import mapper +from testcasexml import xml_file_to_str +import env_parser +import env_inspect +import log +import format class FuncGen(object): """ To generate a callable testcase""" diff --git a/utils/log.py b/src/log.py similarity index 100% rename from utils/log.py rename to src/log.py diff --git a/src/log.xsl b/src/log.xsl index 577a0a5..589a720 100644 --- a/src/log.xsl +++ b/src/log.xsl @@ -5,7 +5,7 @@ <html> <head> <title>Libvirt testing log</title> - <link rel="stylesheet" href="src/log.css" type="text/css" media="screen" /> + <link rel="stylesheet" href="log.css" type="text/css" media="screen" /> <script language="javascript"> <![CDATA[ var xmlDOc; diff --git a/src/log_generator.py b/src/log_generator.py index a001ef2..be483d6 100644 --- a/src/log_generator.py +++ b/src/log_generator.py @@ -22,7 +22,7 @@ import copy from xml.dom import minidom from xml.dom.minidom import Document -from src import exception +import exception class LogGenerator(object): """ Generate and parser log xml file diff --git a/src/parser.py b/src/parser.py index 8a861fd..38f0424 100644 --- a/src/parser.py +++ b/src/parser.py @@ -23,8 +23,8 @@ import sys import copy import string -from src import exception -from src import env_parser +import exception +import env_parser class CaseFileParser(object): """ Parser the case configuration file to generate a data list. diff --git a/src/proxy.py b/src/proxy.py index fe50fff..4751b3b 100644 --- a/src/proxy.py +++ b/src/proxy.py @@ -20,7 +20,7 @@ # The proxy examines the list of unique test cases, received from the # generator and import each test case from appropriate module directory. -from src import exception +import exception class Proxy(object): """ The Proxy class is used for getting function reference """ -- 1.7.7.5

2 5

[libvirt] some questions
by user-mirror 24 Apr '12

24 Apr '12

Nice to meet you!I'm a college student from Xi'an China.I have some questions when using virt-manager to migrate virtual machine live based on shared memory.I found a website telling me how to migrate virtual machine live by virt-manager and here is the websitehttp://www.ibm.com/developerworks/cn/linux/l-cn-mgrtvm2/index.html(s… it's written in Chinese).However,we find that the virtual machine running on the dest host is a blank screen and virt-manager shows the virtual machine is running.We don't know why it's a blank screen and i wish you dear developers can do me a favor.Thanks very much and hope to receive your E-mails!

3 2

[libvirt] some questions
by user-mirror 24 Apr '12

24 Apr '12

Nice to meet you!I'm a college student from Xi'an China.I have some questions when using virt-manager to migrate virtual machine live based on shared memory.I found a website telling me how to migrate virtual machine live by virt-manager and here is the websitehttp://www.ibm.com/developerworks/cn/linux/l-cn-mgrtvm2/index.html(s… it's written in Chinese).However,we find that the virtual machine running on the dest host is a blank screen and virt-manager shows the virtual machine is running.We don't know why it's a blank screen and i wish you dear developers can do me a favor.Thanks very much and hope to receive your E-mails!

1 0

[libvirt] [PATCH 0/2] Filesystem limits for containers
by Guido Günther 24 Apr '12

24 Apr '12

Hi, the following two patches are a first stab at filesystem limits for containers. They're not ment for detailed review just to start the discussion. With these two patches space and inode limits in openvz containers are printed in the domain config as: <filesystem type='template' accessmode='passthrough'> <source name='debian'/> <target dir='/'/> <hardlimit>1153024</hardlimit> <softlimit>1048576</softlimit> <inodes_hardlimit>220000</inodes_hardlimit> <inodes_softlimit>200000</inodes_softlimit> </filesystem> Does this look o.k.? If so I'd cook up the schema updates and more parsing code. Other container solutions like lxc might have similar needs. Cheers, -- Guido Guido Günther (2): domain_conf: add filesystem limits to virDomainFSDef openvz; support file system quota reporting src/conf/domain_conf.c | 15 ++++++ src/conf/domain_conf.h | 4 ++ src/openvz/openvz_conf.c | 114 +++++++++++++++++++++++++++++----------------- 3 files changed, 92 insertions(+), 41 deletions(-) -- 1.7.10

2 1

[libvirt] [PATCH 1/2] domain_conf: add filesystem limits to virDomainFSDef
by Guido Günther 24 Apr '12

24 Apr '12

--- src/conf/domain_conf.c | 15 +++++++++++++++ src/conf/domain_conf.h | 4 ++++ 2 files changed, 19 insertions(+) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 184ff23..2b2a1d9 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -11101,6 +11101,21 @@ virDomainFSDefFormat(virBufferPtr buf, if (virDomainDeviceInfoFormat(buf, &def->info, flags) < 0) return -1; + if (def->hard_limit) + virBufferAsprintf(buf, " <hardlimit>%llu</hardlimit>\n", + def->hard_limit); + if (def->soft_limit) + virBufferAsprintf(buf, " <softlimit>%llu</softlimit>\n", + def->soft_limit); + if (def->inodes_hard_limit) + virBufferAsprintf(buf, + " <inodes_hardlimit>%llu</inodes_hardlimit>\n", + def->inodes_hard_limit); + if (def->inodes_soft_limit) + virBufferAsprintf(buf, + " <inodes_softlimit>%llu</inodes_softlimit>\n", + def->inodes_soft_limit); + virBufferAddLit(buf, " </filesystem>\n"); return 0; diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 5aa8fc1..149607e 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -692,6 +692,10 @@ struct _virDomainFSDef { char *dst; unsigned int readonly : 1; virDomainDeviceInfo info; + unsigned long long hard_limit; /* in kibibytes */ + unsigned long long soft_limit; /* in kibibytes */ + unsigned long long inodes_hard_limit; + unsigned long long inodes_soft_limit; }; -- 1.7.10

2 1

[libvirt] [PATCH 2/2] openvz; support file system quota reporting
by Guido Günther 24 Apr '12

24 Apr '12

--- src/openvz/openvz_conf.c | 114 +++++++++++++++++++++++++++++----------------- 1 file changed, 73 insertions(+), 41 deletions(-) diff --git a/src/openvz/openvz_conf.c b/src/openvz/openvz_conf.c index 579fcfc..7ea5e25 100644 --- a/src/openvz/openvz_conf.c +++ b/src/openvz/openvz_conf.c @@ -129,6 +129,51 @@ int openvzExtractVersion(struct openvz_driver *driver) } +/* Parse config values of the form barrier:limit into barrier and limit */ +static int +openvzParseBarrierAndLimit(const char *value, + unsigned long long *barrier, + unsigned long long *limit) +{ + char *token; + char *saveptr = NULL; + char *str = strdup(value); + + if (strcmp(value, "unlimited") == 0) { + barrier = limit = 0; + return 0; + } + + if (str == NULL) { + virReportOOMError(); + goto error; + } + + token = strtok_r(str, ":", &saveptr); + if (token == NULL) { + goto error; + } else { + if (barrier != NULL) { + if (virStrToLong_ull(token, NULL, 10, barrier)) + goto error; + } + } + token = strtok_r(NULL, ":", &saveptr); + if (token == NULL) { + goto error; + } else { + if (limit != NULL) { + if (virStrToLong_ull(token, NULL, 10, limit)) + goto error; + } + } + return 0; +error: + VIR_FREE(str); + return -1; +} + + static int openvzDefaultConsoleType(const char *ostype ATTRIBUTE_UNUSED) { return VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_OPENVZ; @@ -366,6 +411,7 @@ openvzReadFSConf(virDomainDefPtr def, virDomainFSDefPtr fs = NULL; char *veid_str = NULL; char *temp = NULL; + const char *param; ret = openvzReadVPSConfigParam(veid, "OSTEMPLATE", &temp); if (ret < 0) { @@ -403,6 +449,32 @@ openvzReadFSConf(virDomainDefPtr def, fs->dst = strdup("/"); + param = "DISKSPACE"; + ret = openvzReadVPSConfigParam(veid, param, &temp); + if (ret > 0) { + if (openvzParseBarrierAndLimit(temp, + &fs->soft_limit, + &fs->hard_limit)) { + openvzError(VIR_ERR_INTERNAL_ERROR, + _("Could not read '%s' from config for container %d"), + param, veid); + goto error; + } + } + + param = "DISKINODES"; + ret = openvzReadVPSConfigParam(veid, param, &temp); + if (ret > 0) { + if (openvzParseBarrierAndLimit(temp, + &fs->inodes_soft_limit, + &fs->inodes_hard_limit)) { + openvzError(VIR_ERR_INTERNAL_ERROR, + _("Could not read '%s' from config for container %d"), + param, veid); + goto error; + } + } + if (fs->src == NULL || fs->dst == NULL) goto no_memory; @@ -423,52 +495,12 @@ error: } -/* Parse config values of the form barrier:limit into barrier and limit */ -static int -openvzParseBarrierAndLimit(const char* value, - unsigned long *barrier, - unsigned long *limit) -{ - char *token; - char *saveptr = NULL; - char *str = strdup(value); - - if (str == NULL) { - virReportOOMError(); - goto error; - } - - token = strtok_r(str, ":", &saveptr); - if (token == NULL) { - goto error; - } else { - if (barrier != NULL) { - if (virStrToLong_ul(token, NULL, 10, barrier)) - goto error; - } - } - token = strtok_r(NULL, ":", &saveptr); - if (token == NULL) { - goto error; - } else { - if (limit != NULL) { - if (virStrToLong_ul(token, NULL, 10, limit)) - goto error; - } - } - return 0; -error: - VIR_FREE(str); - return -1; -} - - static int openvzReadMemConf(virDomainDefPtr def, int veid) { int ret; char *temp = NULL; - unsigned long barrier, limit; + unsigned long long barrier, limit; const char *param; unsigned long kb_per_pages; -- 1.7.10

1 0

[libvirt] [PATCH] Add support for firewalld
by Thomas Woerner 24 Apr '12

24 Apr '12

Add support for firewalld * bridge_driver, nwfilter_driver: new dbus filters to get FirewallD1.Reloaded signal and DBus.NameOwnerChanged on org.fedoraproject.FirewallD1 * iptables, ebtables, nwfilter_ebiptables_driver: use firewall-cmd direct passthrough interface --- configure.ac | 9 ++++++ src/Makefile.am | 8 ++--- src/network/bridge_driver.c | 50 +++++++++++++++++++++++++++++ src/nwfilter/nwfilter_driver.c | 49 ++++++++++++++++++++++++++++ src/nwfilter/nwfilter_ebiptables_driver.c | 27 ++++++++++++++++ src/util/ebtables.c | 32 ++++++++++++++++++ src/util/iptables.c | 25 ++++++++++++--- 7 files changed, 192 insertions(+), 8 deletions(-) diff --git a/configure.ac b/configure.ac index 89fe818..41d9371 100644 --- a/configure.ac +++ b/configure.ac @@ -1191,6 +1191,15 @@ AM_CONDITIONAL([HAVE_POLKIT1], [test "x$with_polkit1" = "xyes"]) AC_SUBST([POLKIT_CFLAGS]) AC_SUBST([POLKIT_LIBS]) +dnl firewalld +AC_ARG_WITH([firewalld], + AC_HELP_STRING([--with-firewalld], [enable firewalld support])) +if test "x$with_firewalld" = "xyes" ; then + AC_DEFINE_UNQUOTED([HAVE_FIREWALLD], [1], [whether firewalld support is enabled]) +fi +AM_CONDITIONAL([HAVE_FIREWALLD], [test "x$with_firewalld" = "xyes"]) + + dnl Avahi library AC_ARG_WITH([avahi], AC_HELP_STRING([--with-avahi], [use avahi to advertise remote daemon @<:@default=check@:>@]), diff --git a/src/Makefile.am b/src/Makefile.am index e48dfa5..e60a8af 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -941,9 +941,9 @@ noinst_LTLIBRARIES += libvirt_driver_network.la #libvirt_la_BUILT_LIBADD += libvirt_driver_network.la endif libvirt_driver_network_la_CFLAGS = \ - -I$(top_srcdir)/src/conf $(AM_CFLAGS) + -I$(top_srcdir)/src/conf $(AM_CFLAGS) $(DBUS_CFLAGS) if WITH_DRIVER_MODULES -libvirt_driver_network_la_LIBADD = ../gnulib/lib/libgnu.la +libvirt_driver_network_la_LIBADD = ../gnulib/lib/libgnu.la $(DBUS_LIBS) libvirt_driver_network_la_LDFLAGS = -module -avoid-version $(AM_LDFLAGS) endif libvirt_driver_network_la_SOURCES = $(NETWORK_DRIVER_SOURCES) @@ -1086,9 +1086,9 @@ libvirt_la_BUILT_LIBADD += libvirt_driver_nwfilter.la noinst_LTLIBRARIES += libvirt_driver_nwfilter.la endif libvirt_driver_nwfilter_la_CFLAGS = $(LIBPCAP_CFLAGS) \ - -I$(top_srcdir)/src/conf $(AM_CFLAGS) + -I$(top_srcdir)/src/conf $(AM_CFLAGS) $(DBUS_CFLAGS) libvirt_driver_nwfilter_la_LDFLAGS = $(LD_AMFLAGS) -libvirt_driver_nwfilter_la_LIBADD = $(LIBPCAP_LIBS) +libvirt_driver_nwfilter_la_LIBADD = $(LIBPCAP_LIBS) $(DBUS_LIBS) if WITH_DRIVER_MODULES libvirt_driver_nwfilter_la_LIBADD += ../gnulib/lib/libgnu.la libvirt_driver_nwfilter_la_LDFLAGS += -module -avoid-version diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index d82212f..094bbae 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -63,6 +63,11 @@ #include "virnetdevbridge.h" #include "virnetdevtap.h" +#if HAVE_FIREWALLD +#include "virdbus.h" +#include "logging.h" +#endif + #define NETWORK_PID_DIR LOCALSTATEDIR "/run/libvirt/network" #define NETWORK_STATE_DIR LOCALSTATEDIR "/lib/libvirt/network" @@ -253,6 +258,24 @@ networkAutostartConfigs(struct network_driver *driver) { } } +#if HAVE_FIREWALLD +static DBusHandlerResult +firewalld_dbus_filter_bridge(DBusConnection *connection ATTRIBUTE_UNUSED, DBusMessage *message, void *user_data) { + struct network_driver *_driverState = (struct network_driver *) user_data; + + if (dbus_message_is_signal(message, DBUS_INTERFACE_DBUS, + "NameOwnerChanged") || + dbus_message_is_signal(message, "org.fedoraproject.FirewallD1", + "Reloaded")) + { + VIR_DEBUG("Reload in bridge_driver because of firewalld."); + networkReloadIptablesRules(_driverState); + } + + return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; +} +#endif + /** * networkStartup: * @@ -262,6 +285,9 @@ static int networkStartup(int privileged) { uid_t uid = geteuid(); char *base = NULL; +#ifdef HAVE_FIREWALLD + DBusConnection *sysbus = NULL; +#endif if (VIR_ALLOC(driverState) < 0) goto error; @@ -326,6 +352,30 @@ networkStartup(int privileged) { networkDriverUnlock(driverState); +#ifdef HAVE_FIREWALLD + if (!(sysbus = virDBusGetSystemBus())) { + virErrorPtr err = virGetLastError(); + VIR_WARN("DBus not available, disabling firewalld support in bridge_driver: %s", err->message); + } else { + /* add matches for + * NameOwnerChanged on org.freedesktop.DBus for firewalld start/stop + * Reloaded on org.fedoraproject.FirewallD1 for firewalld reload + */ + dbus_bus_add_match(sysbus, + "type='signal'" + ",interface='"DBUS_INTERFACE_DBUS"'" + ",member='NameOwnerChanged'" + ",arg0='org.fedoraproject.FirewallD1'", + NULL); + dbus_bus_add_match(sysbus, + "type='signal'" + ",interface='org.fedoraproject.FirewallD1'" + ",member='Reloaded'", + NULL); + dbus_connection_add_filter(sysbus, firewalld_dbus_filter_bridge, (void *)driverState, NULL); + } +#endif + return 0; out_of_memory: diff --git a/src/nwfilter/nwfilter_driver.c b/src/nwfilter/nwfilter_driver.c index ffb4b5d..da9f4a0 100644 --- a/src/nwfilter/nwfilter_driver.c +++ b/src/nwfilter/nwfilter_driver.c @@ -27,6 +27,11 @@ #include <config.h> +#if HAVE_FIREWALLD +#include "virdbus.h" +#include "logging.h" +#endif + #include "internal.h" #include "virterror_internal.h" @@ -47,6 +52,8 @@ static virNWFilterDriverStatePtr driverState; static int nwfilterDriverShutdown(void); +static int nwfilterDriverReload(void); + static void nwfilterDriverLock(virNWFilterDriverStatePtr driver) { virMutexLock(&driver->lock); @@ -57,6 +64,22 @@ static void nwfilterDriverUnlock(virNWFilterDriverStatePtr driver) } +#if HAVE_FIREWALLD +static DBusHandlerResult +firewalld_dbus_filter_nwfilter(DBusConnection *connection ATTRIBUTE_UNUSED, DBusMessage *message, void *user_data ATTRIBUTE_UNUSED) { + if (dbus_message_is_signal(message, DBUS_INTERFACE_DBUS, + "NameOwnerChanged") || + dbus_message_is_signal(message, "org.fedoraproject.FirewallD1", + "Reloaded")) + { + VIR_DEBUG("Reload in nwfilter_driver because of firewalld."); + nwfilterDriverReload(); + } + + return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; +} +#endif + /** * virNWFilterStartup: * @@ -66,6 +89,32 @@ static int nwfilterDriverStartup(int privileged) { char *base = NULL; +#ifdef HAVE_FIREWALLD + DBusConnection *sysbus = NULL; + + if (!(sysbus = virDBusGetSystemBus())) { + virErrorPtr err = virGetLastError(); + VIR_WARN("DBus not available, disabling firewalld support in nwfilter_driver: %s", err->message); + } else { + /* add matches for + * NameOwnerChanged on org.freedesktop.DBus for firewalld start/stop + * Reloaded on org.fedoraproject.FirewallD1 for firewalld reload + */ + dbus_bus_add_match(sysbus, + "type='signal'" + ",interface='"DBUS_INTERFACE_DBUS"'" + ",member='NameOwnerChanged'" + ",arg0='org.fedoraproject.FirewallD1'", + NULL); + dbus_bus_add_match(sysbus, + "type='signal'" + ",interface='org.fedoraproject.FirewallD1'" + ",member='Reloaded'", + NULL); + dbus_connection_add_filter(sysbus, firewalld_dbus_filter_nwfilter, NULL, NULL); + } +#endif + if (virNWFilterLearnInit() < 0) return -1; diff --git a/src/nwfilter/nwfilter_ebiptables_driver.c b/src/nwfilter/nwfilter_ebiptables_driver.c index 8e4436f..0cd047a 100644 --- a/src/nwfilter/nwfilter_ebiptables_driver.c +++ b/src/nwfilter/nwfilter_ebiptables_driver.c @@ -4051,6 +4051,7 @@ ebiptablesDriverInit(bool privileged) { virBuffer buf = VIR_BUFFER_INITIALIZER; char *errmsg = NULL; + char *firewall_cmd_path = NULL; if (!privileged) return 0; @@ -4061,6 +4062,30 @@ ebiptablesDriverInit(bool privileged) gawk_cmd_path = virFindFileInPath("gawk"); grep_cmd_path = virFindFileInPath("grep"); + firewall_cmd_path = virFindFileInPath("firewall-cmd"); + if (firewall_cmd_path) { + virBufferAsprintf(&buf, "IPT=%s\n", firewall_cmd_path); + /* basic probing */ + virBufferAsprintf(&buf, + CMD_DEF("$IPT --state") CMD_SEPARATOR + CMD_EXEC + "%s", + CMD_STOPONERR(1)); + + if (ebiptablesExecCLI(&buf, NULL, NULL) >= 0) { + VIR_DEBUG("Using firewall-cmd in nwfilter_ebiptables_driver."); + ebtables_cmd_path = NULL; + iptables_cmd_path = NULL; + ip6tables_cmd_path = NULL; + virAsprintf(&ebtables_cmd_path, "%s --direct --passthrough eb", firewall_cmd_path); + virAsprintf(&iptables_cmd_path, "%s --direct --passthrough ipv4", firewall_cmd_path); + virAsprintf(&ip6tables_cmd_path, "%s --direct --passthrough ipv6", firewall_cmd_path); + } + VIR_FREE(firewall_cmd_path); + } + if (ebtables_cmd_path == NULL || iptables_cmd_path == NULL || + ip6tables_cmd_path == NULL) { + ebtables_cmd_path = virFindFileInPath("ebtables"); if (ebtables_cmd_path) { NWFILTER_SET_EBTABLES_SHELLVAR(&buf); @@ -4099,6 +4124,8 @@ ebiptablesDriverInit(bool privileged) VIR_WARN("Could not find 'iptables' executable"); } + } + ip6tables_cmd_path = virFindFileInPath("ip6tables"); if (ip6tables_cmd_path) { NWFILTER_SET_IP6TABLES_SHELLVAR(&buf); diff --git a/src/util/ebtables.c b/src/util/ebtables.c index dcb3eb9..b7773ea 100644 --- a/src/util/ebtables.c +++ b/src/util/ebtables.c @@ -176,11 +176,34 @@ ebtablesAddRemoveRule(ebtRules *rules, int action, const char *arg, ...) const char *s; int n, command_idx; +#if HAVE_FIREWALLD + int ret; + char *firewall_cmd_path = NULL; + virCommandPtr cmd = NULL; + + firewall_cmd_path = virFindFileInPath("firewall-cmd"); + if (firewall_cmd_path) { + cmd = virCommandNew(firewall_cmd_path); + virCommandAddArgList(cmd, "--state", NULL); + ret = virCommandRun(cmd, NULL); + if (ret != 0) { + VIR_FREE(firewall_cmd_path); + firewall_cmd_path = NULL; + } + virCommandFree(cmd); + } +#endif + n = 1 + /* /sbin/ebtables */ 2 + /* --table foo */ 2 + /* --insert bar */ 1; /* arg */ +#if HAVE_FIREWALLD + if (firewall_cmd_path) + n += 3; /* --direct --passthrough eb */ +#endif + va_start(args, arg); while (va_arg(args, const char *)) n++; @@ -192,6 +215,15 @@ ebtablesAddRemoveRule(ebtRules *rules, int action, const char *arg, ...) n = 0; +#if HAVE_FIREWALLD + if (firewall_cmd_path) { + if (!(argv[n++] = strdup(firewall_cmd_path))) + goto error; + argv[n++] = strdup("--direct"); + argv[n++] = strdup("--passthrough"); + argv[n++] = strdup("eb"); + } else +#endif if (!(argv[n++] = strdup(EBTABLES_PATH))) goto error; diff --git a/src/util/iptables.c b/src/util/iptables.c index 3023900..0cb3293 100644 --- a/src/util/iptables.c +++ b/src/util/iptables.c @@ -104,11 +104,28 @@ iptablesAddRemoveRule(iptRules *rules, int family, int action, { va_list args; int ret; - virCommandPtr cmd; + virCommandPtr cmd = NULL; const char *s; - - cmd = virCommandNew((family == AF_INET6) - ? IP6TABLES_PATH : IPTABLES_PATH); + char *firewall_cmd_path = NULL; + +#if HAVE_FIREWALLD + firewall_cmd_path = virFindFileInPath("firewall-cmd"); + if (firewall_cmd_path) { + cmd = virCommandNew(firewall_cmd_path); + virCommandAddArgList(cmd, "--state", NULL); + ret = virCommandRun(cmd, NULL); + if (ret == 0) { + cmd = virCommandNew(firewall_cmd_path); + virCommandAddArgList(cmd, "--direct", "--passthrough", + (family == AF_INET6) ? "ipv6" : "ipv4", NULL); + } else + cmd = NULL; + VIR_FREE(firewall_cmd_path); + } + if (!cmd) +#endif + cmd = virCommandNew((family == AF_INET6) + ? IP6TABLES_PATH : IPTABLES_PATH); virCommandAddArgList(cmd, "--table", rules->table, action == ADD ? "--insert" : "--delete", -- 1.7.10

3 7

[libvirt] [PATCH] keepalive: Add ability to disable keepalive messages
by Peter Krempa 24 Apr '12

24 Apr '12

The docs for virConnectSetKeepAlive() advertise that this function should be able to disable keepalives on negative or zero interval time. This patch removes the check that prohibited this and adds code to disable keepalives on negative/zero interval. * src/libvirt.c: virConnectSetKeepAlive(): - remove check for negative values * src/rpc/virnetclient.c * src/rpc/virnetclient.h: - add virNetClientKeepAliveStop() to disable keepalive messages * src/remote/remote_driver.c: remoteSetKeepAlive(): -add ability to disable keepalives --- src/libvirt.c | 6 ------ src/remote/remote_driver.c | 7 ++++++- src/rpc/virnetclient.c | 8 ++++++++ src/rpc/virnetclient.h | 2 ++ 4 files changed, 16 insertions(+), 7 deletions(-) diff --git a/src/libvirt.c b/src/libvirt.c index af42d3b..3f043e1 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -18452,12 +18452,6 @@ int virConnectSetKeepAlive(virConnectPtr conn, return -1; } - if (interval <= 0) { - virLibConnError(VIR_ERR_INVALID_ARG, - _("negative or zero interval make no sense")); - goto error; - } - if (conn->driver->setKeepAlive) { ret = conn->driver->setKeepAlive(conn, interval, count); if (ret < 0) diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index af46384..7863b73 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -4631,7 +4631,12 @@ remoteSetKeepAlive(virConnectPtr conn, int interval, unsigned int count) goto cleanup; } - ret = virNetClientKeepAliveStart(priv->client, interval, count); + if (interval > 0) { + ret = virNetClientKeepAliveStart(priv->client, interval, count); + } else { + virNetClientKeepAliveStop(priv->client); + ret = 0; + } cleanup: remoteDriverUnlock(priv); diff --git a/src/rpc/virnetclient.c b/src/rpc/virnetclient.c index 33b7701..2629c14 100644 --- a/src/rpc/virnetclient.c +++ b/src/rpc/virnetclient.c @@ -248,6 +248,14 @@ virNetClientKeepAliveStart(virNetClientPtr client, return ret; } +void +virNetClientKeepAliveStop(virNetClientPtr client) +{ + virNetClientLock(client); + virKeepAliveStop(client->keepalive); + virNetClientUnlock(client); +} + static void virNetClientKeepAliveDeadCB(void *opaque) { diff --git a/src/rpc/virnetclient.h b/src/rpc/virnetclient.h index 7c30d2b..13b4f96 100644 --- a/src/rpc/virnetclient.h +++ b/src/rpc/virnetclient.h @@ -104,4 +104,6 @@ int virNetClientKeepAliveStart(virNetClientPtr client, int interval, unsigned int count); +void virNetClientKeepAliveStop(virNetClientPtr client); + #endif /* __VIR_NET_CLIENT_H__ */ -- 1.7.3.4

2 1