September 2010 - Devel - libvirt List Archives

[libvirt] [PATCH v2] nwfilter: Don't compile nwfilter driver on other systems than Linux
by Stefan Berger 28 Sep '10

28 Sep '10

v2: check 'with_linux' rather than using uname -s for checking for target system Don't compile the nwfilter driver (instantiating the rules) on other systems than Linux. Signed-off-by: Stefan Berger <stefanb(a)us.ibm.com> diff --git a/configure.ac b/configure.ac index 23181dd..6100610 100644 --- a/configure.ac +++ b/configure.ac @@ -1360,15 +1360,6 @@ if test "$with_secrets" = "yes" ; then fi AM_CONDITIONAL([WITH_SECRETS], [test "$with_secrets" = "yes"]) -with_nwfilter=yes -if test "$with_libvirtd" = "no"; then - with_nwfilter=no -fi -if test "$with_nwfilter" = "yes" ; then - AC_DEFINE([WITH_NWFILTER], 1, [whether local network filter management driver is available]) -fi -AM_CONDITIONAL([WITH_NWFILTER], [test "$with_nwfilter" = "yes"]) - AC_ARG_WITH([storage-fs], AC_HELP_STRING([--with-storage-fs], [with FileSystem backend for the storage driver @<:@default=check@:>@]),[],[with_storage_fs=check]) @@ -2040,6 +2031,16 @@ esac AM_CONDITIONAL([WITH_LINUX], [test "$with_linux" = "yes"]) +with_nwfilter=yes +if test "$with_libvirtd" = "no" || test "$with_linux" != "yes"; then + with_nwfilter=no +fi +if test "$with_nwfilter" = "yes" ; then + AC_DEFINE([WITH_NWFILTER], 1, [whether local network filter management driver is available]) +fi +AM_CONDITIONAL([WITH_NWFILTER], [test "$with_nwfilter" = "yes"]) + + AC_ARG_WITH([qemu-user], AC_HELP_STRING([--with-qemu-user], [username to run QEMU system instance as @<:@default=root@:>@]), [QEMU_USER=${withval}],

3 6

[libvirt] [PATCH] virtualbox: fix a typo in the expected location on mac os x
by Justin Clift 28 Sep '10

28 Sep '10

Mac OS X provides an "/Applications" folder, not an "/Application" folder, so installed VirtualBox wasn't being detected by default. This 1 character patch fixes this. --- Pushed this under the "trivial" rule. It really is fixing someones typo. :) configure.ac | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/configure.ac b/configure.ac index 6100610..0403d1c 100644 --- a/configure.ac +++ b/configure.ac @@ -340,7 +340,7 @@ if test "x$with_vbox" = "xyes" || test "x$with_vbox" = "xcheck"; then /opt/VirtualBox/amd64/VBoxXPCOMC.so \ /usr/local/lib/virtualbox/VBoxXPCOMC.so \ /usr/local/lib/VirtualBox/VBoxXPCOMC.so \ - /Application/VirtualBox.app/Contents/MacOS/VBoxXPCOMC.dylib \ + /Applications/VirtualBox.app/Contents/MacOS/VBoxXPCOMC.dylib \ ; do if test -f "$vbox"; then vbox_xpcomc_dir=`AS_DIRNAME(["$vbox"])` -- 1.7.2.3

1 0

[libvirt] nwfilter: Don't compile nwfilter driver on other systems than Linux
by Stefan Berger 28 Sep '10

28 Sep '10

Don't compile the nwfilter driver (instantiating the rules) on other systems than Linux. Signed-off-by: Stefan Berger <stefanb(a)us.ibm.com> diff --git a/configure.ac b/configure.ac index 23181dd..4cb0f50 100644 --- a/configure.ac +++ b/configure.ac @@ -1361,7 +1361,7 @@ fi AM_CONDITIONAL([WITH_SECRETS], [test "$with_secrets" = "yes"]) with_nwfilter=yes -if test "$with_libvirtd" = "no"; then +if test "$with_libvirtd" = "no" || test `uname -s` != "Linux"; then with_nwfilter=no fi if test "$with_nwfilter" = "yes" ; then

3 2

[libvirt] [PATCH] python: drop unneccesary conn assignment
by Dan Kenigsberg 28 Sep '10

28 Sep '10

Since 554d82a200289938d5639a782a9f12e3e2e968f0, conn is unused. Let's drop it - but keep the signature of the constructor for backward compatibility. --- python/libvirt-override.py | 9 --------- 1 files changed, 0 insertions(+), 9 deletions(-) diff --git a/python/libvirt-override.py b/python/libvirt-override.py index de1af2d..d544a0e 100644 --- a/python/libvirt-override.py +++ b/python/libvirt-override.py @@ -18,15 +18,6 @@ import types class libvirtError(Exception): def __init__(self, defmsg, conn=None, dom=None, net=None, pool=None, vol=None): - if dom is not None: - conn = dom._conn - elif net is not None: - conn = net._conn - elif pool is not None: - conn = pool._conn - elif vol is not None: - conn = vol._conn - # Never call virConnGetLastError(). # virGetLastError() is now thread local err = virGetLastError() -- 1.7.2.1

2 1

[libvirt] [PATCH] nwfilter: add a missing define, so libvirtd builds on macos x
by Justin Clift 28 Sep '10

28 Sep '10

The nwfilter code uses ETH_ALEN, which isn't defined on MacOS X. This is a simple workaround, to add it when missing. --- src/nwfilter/nwfilter_learnipaddr.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/src/nwfilter/nwfilter_learnipaddr.c b/src/nwfilter/nwfilter_learnipaddr.c index 7c94fc2..554422b 100644 --- a/src/nwfilter/nwfilter_learnipaddr.c +++ b/src/nwfilter/nwfilter_learnipaddr.c @@ -38,6 +38,11 @@ #include <net/if_arp.h> #include <intprops.h> +// Add Linux define missing from OSX +#ifndef ETH_ALEN +#define ETH_ALEN 6 /* Octets in one ethernet addr */ +#endif + #include "internal.h" #include "buf.h" -- 1.7.2.3

3 3

[libvirt] [patch 0/5] nwfilter: Support comment attribute in filter rule descriptions
by Stefan Berger 25 Sep '10

25 Sep '10

The following patch series adds support for a comment node to the XML attributes of all protocols. If possible, as for example in case of iptables, the comments are instantiated (iptables ... -m comment --comment ...). The patches do the following: - extend the parser and XML generator to parse and create XML with the comment attribute - instantiate the comment in case of ip(6)tables - extend the nwfilter.rng schema with the comment attribute - add the information to the web docs - add a test case for the XML parser/generator to be run during 'make check' Regards, Stefan

2 9

[libvirt] [PATCH] [TCK] nwfilter: test case for comment attribute
by Stefan Berger 25 Sep '10

25 Sep '10

This patch adds data for a test case for the comment attribute in the nwfilter XML. Signed-off-by: Stefan Berger <stefanb(a)us.ibm.com> --- scripts/nwfilter/nwfilterxml2fwallout/comment-test.fwall | 71 +++++++++++++++ scripts/nwfilter/nwfilterxml2xmlin/comment-test.xml | 68 ++++++++++++++ 2 files changed, 139 insertions(+) Index: libvirt-tck/scripts/nwfilter/nwfilterxml2xmlin/comment-test.xml =================================================================== --- /dev/null +++ libvirt-tck/scripts/nwfilter/nwfilterxml2xmlin/comment-test.xml @@ -0,0 +1,68 @@ +<filter name='tck-testcase'> + <uuid>0a5288ea-612c-834a-6bbf-82a03a1a3244</uuid> + + <rule action='accept' direction='in'> + <mac protocolid='0x1234' comment='mac rule'/> + </rule> + + <rule action='accept' direction='out'> + <ip srcmacaddr='1:2:3:4:5:6' srcmacmask='ff:ff:ff:ff:ff:ff' + dstmacaddr='aa:bb:cc:dd:ee:ff' dstmacmask='ff:ff:ff:ff:ff:ff' + srcipaddr='10.1.2.3' srcipmask='255.255.255.255' + dstipaddr='10.1.2.3' dstipmask='255.255.255.255' + protocol='udp' + srcportstart='0x123' srcportend='0x234' + dstportstart='0x3456' dstportend='0x4567' + dscp='0x32' comment='ip rule'/> + </rule> + + <rule action='accept' direction='out'> + <ipv6 srcmacaddr='1:2:3:4:5:6' srcmacmask='ff:ff:ff:ff:ff:fe' + dstmacaddr='aa:bb:cc:dd:ee:ff' dstmacmask='ff:ff:ff:ff:ff:80' + srcipaddr='::10.1.2.3' srcipmask='22' + dstipaddr='::10.1.2.3' + dstipmask='ffff:ffff:ffff:ffff:ffff:ffff:ffff:8000' + protocol='tcp' + srcportstart='0x111' srcportend='400' + dstportstart='0x3333' dstportend='65535' comment='ipv6 rule'/> + </rule> + + <rule action='accept' direction='out'> + <arp srcmacaddr='1:2:3:4:5:6' srcmacmask='ff:ff:ff:ff:ff:ff' + dstmacaddr='aa:bb:cc:dd:ee:ff' dstmacmask='ff:ff:ff:ff:ff:ff' + hwtype='0x12' + protocoltype='0x56' + opcode='Request' + arpsrcmacaddr='1:2:3:4:5:6' + arpdstmacaddr='a:b:c:d:e:f' + comment='arp rule'/> + </rule> + + <rule action='accept' direction='out'> + <udp srcmacaddr='1:2:3:4:5:6' + dstipaddr='10.1.2.3' dstipmask='255.255.255.255' + dscp='0x22' + srcportstart='0x123' srcportend='400' + dstportstart='0x234' dstportend='0x444' + comment='udp rule'/> + </rule> + + <rule action='accept' direction='in'> + <tcp-ipv6 srcmacaddr='1:2:3:4:5:6' + srcipaddr='a:b:c::' srcipmask='128' + dscp='0x40' + srcportstart='0x20' srcportend='0x21' + dstportstart='0x100' dstportend='0x1111' + comment='tcp/ipv6 rule'/> + </rule> + + <rule action='accept' direction='in'> + <udp-ipv6 srcmacaddr='1:2:3:4:5:6' + srcipaddr='a:b:c::' srcipmask='128' + dscp='0x40' + srcportstart='0x20' srcportend='0x21' + dstportstart='0x100' dstportend='0x1111' + comment='`ls`;${COLUMNS};$(ls);"test";&'/> + </rule> + +</filter> Index: libvirt-tck/scripts/nwfilter/nwfilterxml2fwallout/comment-test.fwall =================================================================== --- /dev/null +++ libvirt-tck/scripts/nwfilter/nwfilterxml2fwallout/comment-test.fwall @@ -0,0 +1,71 @@ +#ebtables -t nat -L PREROUTING | grep vnet0 | grep -v "^Bridge" | grep -v "^$" +-i vnet0 -j libvirt-I-vnet0 +#ebtables -t nat -L POSTROUTING | grep vnet0 | grep -v "^Bridge" | grep -v "^$" +-o vnet0 -j libvirt-O-vnet0 +#ebtables -t nat -L libvirt-I-vnet0 | grep -v "^Bridge" | grep -v "^$" +-p IPv4 -s 1:2:3:4:5:6 -d aa:bb:cc:dd:ee:ff --ip-src 10.1.2.3 --ip-dst 10.1.2.3 --ip-tos 0x32 --ip-proto udp --ip-sport 291:564 --ip-dport 13398:17767 -j ACCEPT +-p IPv6 -s 1:2:3:4:5:6/ff:ff:ff:ff:ff:fe -d aa:bb:cc:dd:ee:80/ff:ff:ff:ff:ff:80 --ip6-src ::/ffff:fc00:: --ip6-dst ::10.1.0.0/ffff:ffff:ffff:ffff:ffff:ffff:ffff:8000 --ip6-proto tcp --ip6-sport 273:400 --ip6-dport 13107:65535 -j ACCEPT +-p ARP -s 1:2:3:4:5:6 -d aa:bb:cc:dd:ee:ff --arp-op Request --arp-htype 18 --arp-ptype 0x56 --arp-mac-src 1:2:3:4:5:6 --arp-mac-dst a:b:c:d:e:f -j ACCEPT +#ebtables -t nat -L libvirt-O-vnet0 | grep -v "^Bridge" | grep -v "^$" +-p 0x1234 -j ACCEPT +#iptables -L FI-vnet0 -n +Chain FI-vnet0 (1 references) +target prot opt source destination +RETURN udp -- 0.0.0.0/0 10.1.2.3 MAC 01:02:03:04:05:06 DSCP match 0x22/* udp rule */ udp spts:291:400 dpts:564:1092 state NEW,ESTABLISHED +#iptables -L FO-vnet0 -n +Chain FO-vnet0 (1 references) +target prot opt source destination +ACCEPT udp -- 10.1.2.3 0.0.0.0/0 DSCP match 0x22/* udp rule */ udp spts:564:1092 dpts:291:400 state ESTABLISHED +#iptables -L HI-vnet0 -n +Chain HI-vnet0 (1 references) +target prot opt source destination +ACCEPT udp -- 0.0.0.0/0 10.1.2.3 MAC 01:02:03:04:05:06 DSCP match 0x22/* udp rule */ udp spts:291:400 dpts:564:1092 +#iptables -L libvirt-host-in -n | grep HI-vnet0 | tr -s " " +HI-vnet0 all -- 0.0.0.0/0 0.0.0.0/0 [goto] PHYSDEV match --physdev-in vnet0 +#iptables -L libvirt-in -n | grep FI-vnet0 | tr -s " " +FI-vnet0 all -- 0.0.0.0/0 0.0.0.0/0 [goto] PHYSDEV match --physdev-in vnet0 +#iptables -L libvirt-in-post -n | grep vnet0 +ACCEPT all -- 0.0.0.0/0 0.0.0.0/0 PHYSDEV match --physdev-in vnet0 +#iptables -L libvirt-out -n | grep vnet0 | tr -s " " +FO-vnet0 all -- 0.0.0.0/0 0.0.0.0/0 [goto] PHYSDEV match --physdev-out vnet0 +#ip6tables -L FI-vnet0 -n +Chain FI-vnet0 (1 references) +target prot opt source destination +RETURN tcp ::/0 a:b:c::/128 /* tcp/ipv6 rule */ tcp spts:256:4369 dpts:32:33 state ESTABLISHED +RETURN udp ::/0 a:b:c::/128 /* `ls`;${COLUMNS};$(ls);"test";& */ udp spts:256:4369 dpts:32:33 state ESTABLISHED +#ip6tables -L FO-vnet0 -n +Chain FO-vnet0 (1 references) +target prot opt source destination +ACCEPT tcp a:b:c::/128 ::/0 MAC 01:02:03:04:05:06 /* tcp/ipv6 rule */ tcp spts:32:33 dpts:256:4369 state NEW,ESTABLISHED +ACCEPT udp a:b:c::/128 ::/0 MAC 01:02:03:04:05:06 /* `ls`;${COLUMNS};$(ls);"test";& */ udp spts:32:33 dpts:256:4369 state NEW,ESTABLISHED +#ip6tables -L HI-vnet0 -n +Chain HI-vnet0 (1 references) +target prot opt source destination +ACCEPT tcp ::/0 a:b:c::/128 /* tcp/ipv6 rule */ tcp spts:256:4369 dpts:32:33 +ACCEPT udp ::/0 a:b:c::/128 /* `ls`;${COLUMNS};$(ls);"test";& */ udp spts:256:4369 dpts:32:33 +#ip6tables -L libvirt-host-in -n | grep vnet0 | tr -s " " +HI-vnet0 all ::/0 ::/0 [goto] PHYSDEV match --physdev-in vnet0 +#ip6tables -L libvirt-in -n | grep vnet0 | tr -s " " +FI-vnet0 all ::/0 ::/0 [goto] PHYSDEV match --physdev-in vnet0 +#ip6tables -L libvirt-in-post -n | grep vnet0 +ACCEPT all ::/0 ::/0 PHYSDEV match --physdev-in vnet0 +#ip6tables -L libvirt-out -n | grep vnet0 | tr -s " " +FO-vnet0 all ::/0 ::/0 [goto] PHYSDEV match --physdev-out vnet0 +#iptables -L libvirt-host-in -n | grep vnet0 | tr -s " " +HI-vnet0 all -- 0.0.0.0/0 0.0.0.0/0 [goto] PHYSDEV match --physdev-in vnet0 +#iptables -L libvirt-in -n | grep vnet0 | tr -s " " +FI-vnet0 all -- 0.0.0.0/0 0.0.0.0/0 [goto] PHYSDEV match --physdev-in vnet0 +#iptables -L libvirt-in-post -n | grep vnet0 +ACCEPT all -- 0.0.0.0/0 0.0.0.0/0 PHYSDEV match --physdev-in vnet0 +#iptables -L libvirt-out -n | grep vnet0 | tr -s " " +FO-vnet0 all -- 0.0.0.0/0 0.0.0.0/0 [goto] PHYSDEV match --physdev-out vnet0 +#ip6tables -L INPUT -n --line-numbers | grep libvirt +1 libvirt-host-in all ::/0 ::/0 +#ip6tables -L libvirt-host-in -n | grep vnet0 | tr -s " " +HI-vnet0 all ::/0 ::/0 [goto] PHYSDEV match --physdev-in vnet0 +#ip6tables -L libvirt-in -n | grep vnet0 | tr -s " " +FI-vnet0 all ::/0 ::/0 [goto] PHYSDEV match --physdev-in vnet0 +#ip6tables -L libvirt-in-post -n | grep vnet0 +ACCEPT all ::/0 ::/0 PHYSDEV match --physdev-in vnet0 +#ip6tables -L libvirt-out -n | grep vnet0 | tr -s " " +FO-vnet0 all ::/0 ::/0 [goto] PHYSDEV match --physdev-out vnet0

1 0

[libvirt] [PATCH] nwfilter: report if ip(6)tables rules would not be effective
by Stefan Berger 25 Sep '10

25 Sep '10

The patch below reports a warning in the log if the generated ip(6)tables rules would not be effective due to the proc filesystem entries /proc/sys/net/bridge/bridge-nf-call-iptables /proc/sys/net/bridge/bridge-nf-call-ip6tables containing a '0'. The warning tells the user what to do. I am rate-limiting the warning message to appear only every 10 seconds. Signed-off-by: Stefan Berger <stefanb(a)us.ibm.com> --- src/nwfilter/nwfilter_ebiptables_driver.c | 51 ++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) Index: libvirt-acl/src/nwfilter/nwfilter_ebiptables_driver.c =================================================================== --- libvirt-acl.orig/src/nwfilter/nwfilter_ebiptables_driver.c +++ libvirt-acl/src/nwfilter/nwfilter_ebiptables_driver.c @@ -24,6 +24,7 @@ #include <config.h> #include <sys/stat.h> +#include <fcntl.h> #include "internal.h" @@ -63,6 +64,13 @@ : "" +#define PROC_BRIDGE_NF_CALL_IPTABLES \ + "/proc/sys/net/bridge/bridge-nf-call-iptables" +#define PROC_BRIDGE_NF_CALL_IP6TABLES \ + "/proc/sys/net/bridge/bridge-nf-call-ip6tables" + +#define BRIDGE_NF_CALL_ALERT_INTERVAL 10 /* seconds */ + static char *ebtables_cmd_path; static char *iptables_cmd_path; static char *ip6tables_cmd_path; @@ -2986,6 +2994,45 @@ ebiptablesRuleOrderSort(const void *a, c } +static void +iptablesCheckBridgeNFCallEnabled(bool isIPv6) +{ + static time_t lastReport, lastReportIPv6; + const char *pathname = NULL; + char buffer[1]; + time_t now = time(NULL); + + if (isIPv6 && + (now - lastReportIPv6) > BRIDGE_NF_CALL_ALERT_INTERVAL ) { + pathname = PROC_BRIDGE_NF_CALL_IP6TABLES; + } else if (now - lastReport > BRIDGE_NF_CALL_ALERT_INTERVAL) { + pathname = PROC_BRIDGE_NF_CALL_IPTABLES; + } + + if (pathname) { + int fd = open(pathname, O_RDONLY); + if (fd >= 0) { + if (read(fd, buffer, 1) == 1) { + if (buffer[0] == '0') { + char msg[256]; + snprintf(msg, sizeof(msg), + _("To enable ip%stables filtering for the VM do " + "'echo 1 > %s'\n"), + isIPv6 ? "6" : "", + pathname); + VIR_WARN0(msg); + if (isIPv6) + lastReportIPv6 = now; + else + lastReport = now; + } + } + close(fd); + } + } +} + + static int ebiptablesApplyNewRules(virConnectPtr conn ATTRIBUTE_UNUSED, const char *ifname, @@ -3099,6 +3146,8 @@ ebiptablesApplyNewRules(virConnectPtr co if (ebiptablesExecCLI(&buf, &cli_status) || cli_status != 0) goto tear_down_tmpiptchains; + + iptablesCheckBridgeNFCallEnabled(false); } if (haveIp6tables) { @@ -3129,6 +3178,8 @@ ebiptablesApplyNewRules(virConnectPtr co if (ebiptablesExecCLI(&buf, &cli_status) || cli_status != 0) goto tear_down_tmpip6tchains; + + iptablesCheckBridgeNFCallEnabled(true); } if (chains_in != 0)

2 2

[libvirt] [PATCH] qemu: patch to support security model for filesystem type
by Harsh Prateek Bora 25 Sep '10

25 Sep '10

This patch introduces a new attribute security_model to <filesystem> tag, which can have any of the following three values: passthrough, mapped or none. This patch is based on Daniel's patch to support 9pfs qemu commandline options. Usage: <filesystem type='mount' security_model='passthrough'> <source dir='/export/to/guest'/> <target dir='mount_tag'/> </filesystem> --- docs/schemas/domain.rng | 7 +++ src/conf/domain_conf.c | 30 +++++++++++++- src/conf/domain_conf.h | 10 +++++ src/qemu/qemu_conf.c | 103 +++++++++++++++++++++++++++++++++++++++++++++++ src/qemu/qemu_conf.h | 5 ++ 5 files changed, 153 insertions(+), 2 deletions(-) diff --git a/docs/schemas/domain.rng b/docs/schemas/domain.rng index ccb8cf3..43a292d 100644 --- a/docs/schemas/domain.rng +++ b/docs/schemas/domain.rng @@ -761,6 +761,13 @@ </choice> <optional> <ref name="address"/> + <attribute name="security_model"> + <choice> + <value>passthrough</value> + <value>mapped</value> + <value>none</value> + </choice> + </attribute> </optional> </element> </define> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index e05d5d7..a9881d1 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -161,6 +161,12 @@ VIR_ENUM_IMPL(virDomainFS, VIR_DOMAIN_FS_TYPE_LAST, "file", "template") +VIR_ENUM_IMPL(virDomainFSSecurityModel, VIR_DOMAIN_FS_SECURITY_LAST, + "passthrough", + "mapped", + "none") + + VIR_ENUM_IMPL(virDomainNet, VIR_DOMAIN_NET_TYPE_LAST, "user", "ethernet", @@ -1847,6 +1853,7 @@ virDomainFSDefParseXML(xmlNodePtr node, char *type = NULL; char *source = NULL; char *target = NULL; + char *security_model; if (VIR_ALLOC(def) < 0) { virReportOOMError(); @@ -1864,6 +1871,17 @@ virDomainFSDefParseXML(xmlNodePtr node, def->type = VIR_DOMAIN_FS_TYPE_MOUNT; } + security_model = virXMLPropString(node, "security_model"); + if (security_model) { + if ((def->security_model = virDomainFSSecurityModelTypeFromString(security_model)) < 0) { + virDomainReportError(VIR_ERR_INTERNAL_ERROR, + _("unknown security model '%s'"), security_model); + goto error; + } + } else { + def->security_model = VIR_DOMAIN_FS_SECURITY_PASSTHROUGH; + } + cur = node->children; while (cur != NULL) { if (cur->type == XML_ELEMENT_NODE) { @@ -5602,6 +5620,7 @@ virDomainFSDefFormat(virBufferPtr buf, int flags) { const char *type = virDomainFSTypeToString(def->type); + const char *sec_model = virDomainFSSecurityModelTypeToString(def->security_model); if (!type) { virDomainReportError(VIR_ERR_INTERNAL_ERROR, @@ -5609,9 +5628,16 @@ virDomainFSDefFormat(virBufferPtr buf, return -1; } + if (!sec_model) { + virDomainReportError(VIR_ERR_INTERNAL_ERROR, + _("unexpected security model %d"), def->security_model); + return -1; + } + + virBufferVSprintf(buf, - " <filesystem type='%s'>\n", - type); + " <filesystem type='%s' security_model='%s'>\n", + type, sec_model); if (def->src) { switch (def->type) { diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 7195c04..6adf027 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -236,10 +236,20 @@ enum virDomainFSType { VIR_DOMAIN_FS_TYPE_LAST }; +/* Filesystem mount security model */ +enum virDomainFSSecurityModel { + VIR_DOMAIN_FS_SECURITY_PASSTHROUGH, + VIR_DOMAIN_FS_SECURITY_MAPPED, + VIR_DOMAIN_FS_SECURITY_NONE, + + VIR_DOMAIN_FS_SECURITY_LAST +}; + typedef struct _virDomainFSDef virDomainFSDef; typedef virDomainFSDef *virDomainFSDefPtr; struct _virDomainFSDef { int type; + int security_model; char *src; char *dst; unsigned int readonly : 1; diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index 7a37c70..a637dee 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -1212,6 +1212,8 @@ static unsigned long long qemudComputeCmdFlags(const char *help, flags |= QEMUD_CMD_FLAG_TDF; if (strstr(help, ",menu=on")) flags |= QEMUD_CMD_FLAG_BOOT_MENU; + if (strstr(help, "-fsdev")) + flags |= QEMUD_CMD_FLAG_FSDEV; /* Keep disabled till we're actually ready to turn on netdev mode * The plan is todo it in 0.13.0 QEMU, but lets wait & see... */ @@ -2008,6 +2010,11 @@ qemuAssignDeviceAliases(virDomainDefPtr def, unsigned long long qemuCmdFlags) if (!(qemuCmdFlags & QEMUD_CMD_FLAG_DEVICE)) return 0; + for (i=0; i < def->nfss ; i++) { + if (virAsprintf(&def->fss[i]->info.alias, "fs%d", i) < 0) + goto no_memory; + } + for (i = 0; i < def->nsounds ; i++) { if (virAsprintf(&def->sounds[i]->info.alias, "sound%d", i) < 0) goto no_memory; @@ -2371,6 +2378,15 @@ qemuAssignDevicePCISlots(virDomainDefPtr def, qemuDomainPCIAddressSetPtr addrs) goto error; } } + for (i = 0; i < def->nfss ; i++) { + if (def->fss[i]->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE) + continue; + + /* Only support VirtIO-9p-pci so far. If that changes, + * we might need to skip devices here */ + if (qemuDomainPCIAddressSetNextAddr(addrs, &def->fss[i]->info) < 0) + goto error; + } /* Network interfaces */ for (i = 0; i < def->nnets ; i++) { @@ -2761,6 +2777,70 @@ error: } +char *qemuBuildFSStr(virDomainFSDefPtr fs, + unsigned long long qemuCmdFlags ATTRIBUTE_UNUSED) +{ + virBuffer opt = VIR_BUFFER_INITIALIZER; + + if (fs->type != VIR_DOMAIN_FS_TYPE_MOUNT) { + qemuReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("only supports mount filesystem type")); + goto error; + } + + virBufferAddLit(&opt, "local"); + if (fs->security_model == VIR_DOMAIN_FS_SECURITY_PASSTHROUGH) + virBufferAddLit(&opt, ",security_model=passthrough"); + else if (fs->security_model == VIR_DOMAIN_FS_SECURITY_MAPPED) + virBufferAddLit(&opt, ",security_model=mapped"); + else if (fs->security_model == VIR_DOMAIN_FS_SECURITY_NONE) + virBufferAddLit(&opt, ",security_model=none"); + virBufferVSprintf(&opt, ",id=%s%s", QEMU_FSDEV_HOST_PREFIX, fs->info.alias); + virBufferVSprintf(&opt, ",path=%s", fs->src); + + if (virBufferError(&opt)) { + virReportOOMError(); + goto error; + } + + return virBufferContentAndReset(&opt); + +error: + virBufferFreeAndReset(&opt); + return NULL; +} + + +char * +qemuBuildFSDevStr(virDomainFSDefPtr fs) +{ + virBuffer opt = VIR_BUFFER_INITIALIZER; + + if (fs->type != VIR_DOMAIN_FS_TYPE_MOUNT) { + qemuReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("can only passthrough directories")); + goto error; + } + + virBufferAddLit(&opt, "virtio-9p-pci"); + virBufferVSprintf(&opt, ",id=%s", fs->info.alias); + virBufferVSprintf(&opt, ",fsdev=%s%s", QEMU_FSDEV_HOST_PREFIX, fs->info.alias); + virBufferVSprintf(&opt, ",mount_tag=%s", fs->dst); + qemuBuildDeviceAddressStr(&opt, &fs->info); + + if (virBufferError(&opt)) { + virReportOOMError(); + goto error; + } + + return virBufferContentAndReset(&opt); + +error: + virBufferFreeAndReset(&opt); + return NULL; +} + + char * qemuBuildControllerDevStr(virDomainControllerDefPtr def) { @@ -4377,6 +4457,29 @@ int qemudBuildCommandLine(virConnectPtr conn, } } + if (qemuCmdFlags & QEMUD_CMD_FLAG_FSDEV) { + for (i = 0 ; i < def->nfss ; i++) { + char *optstr; + virDomainFSDefPtr fs = def->fss[i]; + + ADD_ARG_LIT("-fsdev"); + if (!(optstr = qemuBuildFSStr(fs, qemuCmdFlags))) + goto error; + ADD_ARG(optstr); + + ADD_ARG_LIT("-device"); + if (!(optstr = qemuBuildFSDevStr(fs))) + goto error; + ADD_ARG(optstr); + } + } else { + if (def->nfss) { + qemuReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("filesystem passthrough not supported by this QEMU")); + goto error; + } + } + if (!def->nnets) { /* If we have -device, then we set -nodefault already */ if (!(qemuCmdFlags & QEMUD_CMD_FLAG_DEVICE)) { diff --git a/src/qemu/qemu_conf.h b/src/qemu/qemu_conf.h index 2c9e608..7005466 100644 --- a/src/qemu/qemu_conf.h +++ b/src/qemu/qemu_conf.h @@ -93,6 +93,7 @@ enum qemud_cmd_flags { QEMUD_CMD_FLAG_NODEFCONFIG = (1LL << 37), /* -nodefconfig */ QEMUD_CMD_FLAG_BOOT_MENU = (1LL << 38), /* -boot menu=on support */ QEMUD_CMD_FLAG_ENABLE_KQEMU = (1LL << 39), /* -enable-kqemu flag */ + QEMUD_CMD_FLAG_FSDEV = (1LL << 40) /* -fstype filesystem passthrough */ }; /* Main driver state */ @@ -188,6 +189,7 @@ struct _qemuDomainCmdlineDef { # define QEMU_DRIVE_HOST_PREFIX "drive-" # define QEMU_VIRTIO_SERIAL_PREFIX "virtio-serial" +# define QEMU_FSDEV_HOST_PREFIX "fsdev-" # define qemuReportError(code, ...) \ virReportErrorHelper(NULL, VIR_FROM_QEMU, code, __FILE__, \ @@ -248,9 +250,12 @@ char *qemuDeviceDriveHostAlias(virDomainDiskDefPtr disk, char *qemuBuildDriveStr(virDomainDiskDefPtr disk, int bootable, unsigned long long qemuCmdFlags); +char *qemuBuildFSStr(virDomainFSDefPtr fs, + unsigned long long qemuCmdFlags); /* Current, best practice */ char * qemuBuildDriveDevStr(virDomainDiskDefPtr disk); +char * qemuBuildFSDevStr(virDomainFSDefPtr fs); /* Current, best practice */ char * qemuBuildControllerDevStr(virDomainControllerDefPtr def); -- 1.7.1.1

3 2

[libvirt] PATCH 3/4: AppArmor updates
by Jamie Strandboge 24 Sep '10

24 Sep '10

Attached is 0003-apparmor-examples.patch -- Jamie Strandboge | http://www.canonical.com

2 7

[libvirt] Error starting VM as a root user, but works fine as a normal (non-root) user
by Harsh Bora 24 Sep '10

24 Sep '10

[harsh@harshbora libvirt]$ sudo virsh create ~/testVMs/my_vm.xml error: Failed to create domain from /home/harsh/testVMs/my_vm.xml error: internal error cannot parse /home/harsh/local/qemu/bin/qemu-system-x86_64 version number in '' [harsh@harshbora libvirt]$ virsh create ~/testVMs/my_vm.xml Domain my_vm created from /home/harsh/testVMs/my_vm.xml Anyone, help?

3 2

[libvirt] [PATCH] esx: Allow '-' in VMX entry names
by Matthias Bolte 24 Sep '10

24 Sep '10

Add a test for this. Reported by Frank Dirks. --- src/util/conf.c | 2 +- src/util/conf.h | 4 +- tests/vmx2xmldata/vmx2xml-esx-in-the-wild-5.vmx | 97 +++++++++++++++++++++++ tests/vmx2xmldata/vmx2xml-esx-in-the-wild-5.xml | 34 ++++++++ tests/vmx2xmltest.c | 1 + 5 files changed, 135 insertions(+), 3 deletions(-) create mode 100644 tests/vmx2xmldata/vmx2xml-esx-in-the-wild-5.vmx create mode 100644 tests/vmx2xmldata/vmx2xml-esx-in-the-wild-5.xml diff --git a/src/util/conf.c b/src/util/conf.c index 8682f7b..0aef2c2 100644 --- a/src/util/conf.c +++ b/src/util/conf.c @@ -561,7 +561,7 @@ virConfParseName(virConfParserCtxtPtr ctxt) while ((ctxt->cur < ctxt->end) && (c_isalnum(CUR) || (CUR == '_') || ((ctxt->conf->flags & VIR_CONF_FLAG_VMX_FORMAT) && - ((CUR == ':') || (CUR == '.'))))) + ((CUR == ':') || (CUR == '.') || (CUR == '-'))))) NEXT; ret = strndup(base, ctxt->cur - base); if (ret == NULL) { diff --git a/src/util/conf.h b/src/util/conf.h index 8282bd4..e7d470d 100644 --- a/src/util/conf.h +++ b/src/util/conf.h @@ -25,8 +25,8 @@ typedef enum { } virConfType; typedef enum { - VIR_CONF_FLAG_VMX_FORMAT = 1, /* allow : and . in names for compatibility with - VMware VMX configuration file, but restrict + VIR_CONF_FLAG_VMX_FORMAT = 1, /* allow ':', '.' and '-' in names for compatibility + with VMware VMX configuration file, but restrict allowed value types to string only */ } virConfFlags; diff --git a/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-5.vmx b/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-5.vmx new file mode 100644 index 0000000..6b11cc2 --- /dev/null +++ b/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-5.vmx @@ -0,0 +1,97 @@ +.encoding = "UTF-8" +config.version = "8" +virtualHW.version = "7" +pciBridge0.present = "true" +pciBridge4.present = "true" +pciBridge4.virtualDev = "pcieRootPort" +pciBridge4.functions = "8" +pciBridge5.present = "true" +pciBridge5.virtualDev = "pcieRootPort" +pciBridge5.functions = "8" +pciBridge6.present = "true" +pciBridge6.virtualDev = "pcieRootPort" +pciBridge6.functions = "8" +pciBridge7.present = "true" +pciBridge7.virtualDev = "pcieRootPort" +pciBridge7.functions = "8" +vmci0.present = "true" +nvram = "vmtest.nvram" +virtualHW.productCompatibility = "hosted" +powerType.powerOff = "soft" +powerType.powerOn = "hard" +powerType.suspend = "hard" +powerType.reset = "soft" +displayName = "vmtest.local" +extendedConfigFile = "vmtest.vmxf" +numvcpus = "2" +scsi0.present = "true" +scsi0.sharedBus = "none" +scsi0.virtualDev = "lsilogic" +memsize = "2048" +scsi0:0.present = "true" +scsi0:0.fileName = "vmtest-000001.vmdk" +scsi0:0.deviceType = "scsi-hardDisk" +sched.scsi0:0.shares = "normal" +ide0:0.present = "true" +ide0:0.fileName = "/vmfs/volumes/4af0231d-1eff559a-6369-0024e84773b6/isos/CentOS-5.5-x86_64-bin-DVD-1of2.iso" +ide0:0.deviceType = "cdrom-image" +ide1:0.present = "true" +ide1:0.clientDevice = "true" +ide1:0.deviceType = "atapi-cdrom" +ide1:0.startConnected = "false" +ethernet0.present = "true" +ethernet0.virtualDev = "e1000" +ethernet0.networkName = "VM-LAN" +ethernet0.addressType = "vpx" +ethernet0.generatedAddress = "00:50:56:be:00:15" +guestOS = "centos-64" +uuid.bios = "42 3e 94 a9 a1 c7 b3 1d-71 61 76 c7 58 6c 83 0e" +vc.uuid = "50 3e 06 db f8 d5 45 8e-a2 fb f9 82 02 53 a7 be" +log.fileName = "vmware.log" +snapshot.action = "keep" +sched.cpu.min = "0" +sched.cpu.units = "mhz" +sched.cpu.shares = "normal" +sched.mem.minsize = "0" +sched.mem.shares = "normal" +tools.upgrade.policy = "manual" +cpuid.80000001.eax = "--------------------------------" +cpuid.80000001.eax.amd = "--------------------------------" +cpuid.80000001.ebx = "--------------------------------" +cpuid.80000001.ebx.amd = "--------------------------------" +cpuid.80000001.ecx = "--------------------------------" +cpuid.80000001.ecx.amd = "--------------------------------" +cpuid.80000001.edx = "-----------H--------------------" +cpuid.80000001.edx.amd = "-----------H--------------------" +replay.supported = "FALSE" +replay.filename = "" +scsi0:0.redo = "" +pciBridge0.pciSlotNumber = "17" +pciBridge4.pciSlotNumber = "21" +pciBridge5.pciSlotNumber = "22" +pciBridge6.pciSlotNumber = "23" +pciBridge7.pciSlotNumber = "24" +scsi0.pciSlotNumber = "16" +ethernet0.pciSlotNumber = "33" +vmci0.pciSlotNumber = "32" +scsi0.sasWWID = "50 05 05 6b 91 ac 28 90" +vmotion.checkpointFBSize = "4194304" +hostCPUID.0 = "0000000568747541444d416369746e65" +hostCPUID.1 = "00100f420004080000802009178bfbff" +hostCPUID.80000001 = "00100f42000004ef000037ffefd3fbff" +guestCPUID.0 = "0000000568747541444d416369746e65" +guestCPUID.1 = "00100f420000080080802001078bfbff" +guestCPUID.80000001 = "00100f42000004ef000001e9ebd3fbff" +userCPUID.0 = "0000000568747541444d416369746e65" +userCPUID.1 = "00100f420004080080802001078bfbff" +userCPUID.80000001 = "00100f42000004ef000001e9ebd3fbff" +evcCompatibilityMode = "FALSE" +sched.scsi0:0.throughputCap = "off" +guest.commands.sharedSecretLogin.hostd-quiescedsnap = "9ARGZmWQPtsUVrAVi/XviNUSQUF0td426itHw2cqHwg=" +floppy0.present = "FALSE" +vmci0.id = "1483506446" +tools.syncTime = "FALSE" +annotation = "Centos 5.5 64bit Server" +uuid.location = "56 4d 58 2e 12 3c 07 e4-0b 84 af d9 ea 5d 83 0a" +cleanShutdown = "FALSE" +sched.swap.derivedName = "/vmfs/volumes/4bd1a428-b723f5bb-d406-0024e84773db/vmtest/vmtest-56acee0d.vswp" diff --git a/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-5.xml b/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-5.xml new file mode 100644 index 0000000..c324673 --- /dev/null +++ b/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-5.xml @@ -0,0 +1,34 @@ +<domain type='vmware'> + <name>vmtest.local</name> + <uuid>423e94a9-a1c7-b31d-7161-76c7586c830e</uuid> + <description>Centos 5.5 64bit Server</description> + <memory>2097152</memory> + <currentMemory>2097152</currentMemory> + <vcpu>2</vcpu> + <os> + <type arch='x86_64'>hvm</type> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <disk type='file' device='disk'> + <source file='[datastore] directory/vmtest-000001.vmdk'/> + <target dev='sda' bus='scsi'/> + <address type='drive' controller='0' bus='0' unit='0'/> + </disk> + <disk type='file' device='cdrom'> + <source file='[4af0231d-1eff559a-6369-0024e84773b6] isos/CentOS-5.5-x86_64-bin-DVD-1of2.iso'/> + <target dev='hda' bus='ide'/> + <address type='drive' controller='0' bus='0' unit='0'/> + </disk> + <controller type='scsi' index='0' model='lsilogic'/> + <controller type='ide' index='0'/> + <interface type='bridge'> + <mac address='00:50:56:be:00:15'/> + <source bridge='VM-LAN'/> + <model type='e1000'/> + </interface> + </devices> +</domain> diff --git a/tests/vmx2xmltest.c b/tests/vmx2xmltest.c index 67296d6..c71f536 100644 --- a/tests/vmx2xmltest.c +++ b/tests/vmx2xmltest.c @@ -274,6 +274,7 @@ mymain(int argc, char **argv) DO_TEST("esx-in-the-wild-2", "esx-in-the-wild-2", esxVI_ProductVersion_ESX35); DO_TEST("esx-in-the-wild-3", "esx-in-the-wild-3", esxVI_ProductVersion_ESX35); DO_TEST("esx-in-the-wild-4", "esx-in-the-wild-4", esxVI_ProductVersion_ESX35); + DO_TEST("esx-in-the-wild-5", "esx-in-the-wild-5", esxVI_ProductVersion_ESX40); DO_TEST("gsx-in-the-wild-1", "gsx-in-the-wild-1", esxVI_ProductVersion_ESX35); DO_TEST("gsx-in-the-wild-2", "gsx-in-the-wild-2", esxVI_ProductVersion_ESX35); -- 1.7.0.4

3 3

[libvirt] [PATCH] Add automatic generation of a todo item page
by Daniel P. Berrange 24 Sep '10

24 Sep '10

This adds a script to generate the todo item page from bugzilla. This requires a valid username+password for bugzilla, so it is intended that this only be run on the libvirt.org website via cron. Normal usage will just generate an empty stub page. * docs/todo.pl: Script to extract todo items from bugzilla * docs/todo.cfg-example: Example config file * docs/sitemap.html.in: Add todo page * docs/Makefile.am: Generation rules for todo items --- docs/.gitignore | 1 + docs/Makefile.am | 20 +++++++- docs/sitemap.html.in | 6 +++ docs/todo.cfg-example | 26 +++++++++++ docs/todo.pl | 120 +++++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 171 insertions(+), 2 deletions(-) create mode 100644 docs/todo.cfg-example create mode 100644 docs/todo.pl diff --git a/docs/.gitignore b/docs/.gitignore index 80bf00f..dd78dd0 100644 --- a/docs/.gitignore +++ b/docs/.gitignore @@ -5,3 +5,4 @@ apibuild.pyc *.html libvirt-api.xml libvirt-refs.xml +todo.html.in diff --git a/docs/Makefile.am b/docs/Makefile.am index 114ea1f..9a80ec0 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -1,6 +1,8 @@ ## Process this file with automake to produce Makefile.in SUBDIRS= schemas +PERL = perl + # The directory containing the source code (if it contains documentation). DOC_SOURCE_DIR=../src @@ -53,7 +55,7 @@ gif = \ architecture.gif \ node.gif -dot_html_in = $(notdir $(wildcard $(srcdir)/*.html.in)) +dot_html_in = $(notdir $(wildcard $(srcdir)/*.html.in)) todo.html.in dot_html = $(dot_html_in:%.html.in=%.html) patches = $(wildcard api_extension/*.patch) @@ -97,6 +99,20 @@ ChangeLog.html.in: ChangeLog.xml ChangeLog.xsl $(XSLTPROC) --nonet $(top_srcdir)/docs/ChangeLog.xsl $< > $@ \ || { rm $@ && exit 1; }; fi +todo.html.in: todo.pl + if [ -f todo.cfg ]; then \ + echo "Generating $@"; \ + $(PERL) $(srcdir)/$< > $@ \ + || { rm $@ && exit 1; }; \ + else \ + echo "Stubbing $@"; \ + echo "<html><body><h1>Todo list</h1></body></html>" >> $@ ; \ + fi + +todo: + rm -f todo.html.in + $(MAKE) todo.html + %.png: %.fig convert -rotate 90 $< $@ @@ -153,7 +169,7 @@ clean-local: rm -f *~ *.bak *.hierarchy *.signals *-unused.txt *.html maintainer-clean-local: clean-local - rm -rf libvirt-api.xml libvirt-refs.xml + rm -rf libvirt-api.xml libvirt-refs.xml todo.html.in rebuild: api all diff --git a/docs/sitemap.html.in b/docs/sitemap.html.in index bb9cd8e..481507e 100644 --- a/docs/sitemap.html.in +++ b/docs/sitemap.html.in @@ -275,6 +275,12 @@ <li> <a href="bugs.html">Bug reports</a> <span>How and where to report bugs and request features</span> + <ul> + <li> + <a href="todo.html">Todo list</a> + <span>Main feature request list</span> + </li> + </ul> </li> <li> <a href="contact.html">Contact</a> diff --git a/docs/todo.cfg-example b/docs/todo.cfg-example new file mode 100644 index 0000000..a99c61a --- /dev/null +++ b/docs/todo.cfg-example @@ -0,0 +1,26 @@ +bugzilla = { + #username = ...some email addr... + #password = ...some bz password... + server = https://bugzilla.redhat.com +} +query = { + product = Virtualization Tools + alias = libvirtTodo +} + +output = { + title = Todo list + blurb = <<EOF +This is a summary of all the ideas submitted for future todo items in +libvirt. Listing an idea here does not imply that it is committed to +for inclusion in libvirt, just that someone thought it might be a +useful feature. Discussion for final approval of features always takes +place on the <a href="contact.html">development mailing list</a>. +If you intend to work on one of the items here, it is recommended to +add a comment to the corresponding bugzilla ticket to this effect. +This will reduce the risk of duplicated effort between developers. +It is also strongly recommended to mail the development mailing list +with proposals for new APIs & XML before fully implementing them, to +allow for early design review. +EOF +} diff --git a/docs/todo.pl b/docs/todo.pl new file mode 100644 index 0000000..e541932 --- /dev/null +++ b/docs/todo.pl @@ -0,0 +1,120 @@ +#!/usr/bin/perl + +use strict; +use warnings; + +use BZ::Client; +use BZ::Client::Bug; + +use Config::Record; + +my $cfg = Config::Record->new(file => "todo.cfg"); +my $server = $cfg->get("bugzilla/server", "https://bugzilla.redhat.com"); +my $username = $cfg->get("bugzilla/username"); +my $password = $cfg->get("bugzilla/password"); + +my $product = $cfg->get("query/product", "Virtualization Tools"); +my $todoalias = $cfg->get("query/todoalias", "libvirtTodo"); + +my $title = $cfg->get("output/title", undef); +my $blurb = $cfg->get("output/blurb", undef); + +$SIG{__DIE__} = sub { + my $err = shift; + if (UNIVERSAL::isa($err, "BZ::Client::Exception")) { + die "Unable to access bugzilla: " . $err->message; + } + die $err; +}; + +my $client = BZ::Client->new(url => $server, + user => $username, + password => $password); + +my $todo = BZ::Client::Bug->search($client, {'product' => $product, + 'alias' => $todoalias}); + +die "Cannot find bug alias 'libvirtTodo'" unless $#{$todo} > -1; +my $todoid = $todo->[0]->{'bug_id'}; +my $todosummary = $todo->[0]->{'short_desc'}; +$todosummary =~ s/^\s*RFE\s*:\s*//; +$todosummary =~ s/^\s*\[\s*RFE\s*\]\s*:?\s*//; +$todosummary =~ s/^\s*Tracker\s*:\s*//; + +my $trackers = BZ::Client::Bug->search($client, {'product' => $product, + 'blocked' => $todoid }); + +my @trackers; + +foreach my $tracker (@{$trackers}) { + my $summary = $tracker->{'short_desc'}; + $summary =~ s/^\s*RFE\s*:\s*//; + $summary =~ s/^\s*\[\s*RFE\s*\]\s*:?\s*//; + $summary =~ s/^\s*Tracker\s*:\s*//; + + push @trackers, { + id => $tracker->{'bug_id'}, + summary => $summary, + features => [], + }; +} + +foreach my $tracker (@trackers) { + my $features = BZ::Client::Bug->search($client, {'product' => $product, + 'blocked' => $tracker->{id}}); + + foreach my $feature (@{$features}) { + my $summary = $feature->{'short_desc'}; + $summary =~ s/^\s*RFE\s*:\s*//; + $summary =~ s/^\s*\[\s*RFE\s*\]\s*:?\s*//; + + push @{$tracker->{features}}, { + id => $feature->{'bug_id'}, + summary => $summary, + }; + } +} + +sub escape { + my $txt = shift; + $txt =~ s/&/&/g; + $txt =~ s/</</g; + $txt =~ s/>/>/g; + return $txt; +}; + +print "<?xml version=\"1.0\"?>\n"; +print "<html>\n"; +print " <body>\n"; +if (defined $title) { + print " <h1>", &escape($title), "</h1>\n"; +} else { + print " <h1>", &escape($todosummary), "</h1>\n"; +} +if (defined $blurb) { + print " <p>\n"; + print $blurb; + print " </p>\n"; +} +foreach my $tracker (sort { $a->{summary} cmp $b->{summary} } @trackers) { + next unless $#{$tracker->{features}} > 0; + + my $summary = &escape($tracker->{summary}); + my $id = $tracker->{id}; + print " <h2><a href=\"$server/$id\">$summary</a></h2>\n"; + print " <ul>\n"; + foreach my $feature (sort { $a->{summary} cmp $b->{summary} } @{$tracker->{features}}) { + $summary = &escape($feature->{summary}); + $summary =~ s,^([^:]+):,<strong>$1</strong>,; + + $id = $feature->{id}; + print " <li>$summary (<strong>rhbz <a href=\"$server/$id\">$id</a></strong>)</li>\n"; + } + print " </ul>\n"; +} + +print " <p>\n"; +print " This page is automatatically generated from <a href=\"$server/$todoid\">", &escape($todosummary), "</a>\n"; +print " </p>\n"; +print " </body>\n"; +print "</html>\n"; -- 1.7.2.3

2 2

[libvirt] PATCH 1/4: AppArmor updates
by Jamie Strandboge 24 Sep '10

24 Sep '10

Attached is 0001-apparmor-dont-ignore-open.patch -- Jamie Strandboge | http://www.canonical.com

3 7

[libvirt] [PATCH] maint: grammar cleanups
by Eric Blake 24 Sep '10

24 Sep '10

* docs/logging.html.in: Fix spelling and grammar. --- This quickly grew into something large enough that I no longer feel comfortable applying it under the obvious rule, even though it only touches documentation. docs/logging.html.in | 34 +++++++++++++++++----------------- 1 files changed, 17 insertions(+), 17 deletions(-) diff --git a/docs/logging.html.in b/docs/logging.html.in index f4a5878..dc1f107 100644 --- a/docs/logging.html.in +++ b/docs/logging.html.in @@ -4,33 +4,33 @@ <h1 >Logging in the library and the daemon</h1> <p>Libvirt includes logging facilities starting from version 0.6.0, this complements the <a href="errors.html">error handling</a> - mechanism and APIs to allow tracing though the execution of the + mechanism and APIs to allow tracing through the execution of the library as well as in the libvirtd daemon.</p> <p>The logging functionalities in libvirt are based on 3 key concepts, similar to the one present in other generic logging facilities like log4j:</p> <ul> <li>log messages: they are information generated at runtime by - the libvirt code, it includes a priority level (DEBUG = 1, + the libvirt code. Each message includes a priority level (DEBUG = 1, INFO = 2, WARNING = 3, ERROR = 4), a category, function name and line number, indicating where it originated from, and finally - a formatted message, in addition the library adds a timestamp + a formatted message. In addition the library adds a timestamp at the begining of the message</li> - <li>log filters: it's a set of patter and priorities allowing to acept - or reject a log message, if the message category matches a filter, + <li>log filters: a set of patterns and priorities to accept + or reject a log message. If the message category matches a filter, the message priority is compared to the filter priority, if lower the message is discarded, if higher the message is output. If no filter matches, then a general priority level is applied to - all remaining messages. This allows to capture for example all - debug messages for the QEmu driver, but otherwise only allow - errors to show up from other parts</li> - <li>log outputs: once a message has gone though filtering a set of + all remaining messages. This allows, for example, capturing all + debug messages for the QEmu driver, but otherwise only allowing + errors to show up from other parts.</li> + <li>log outputs: once a message has gone through filtering a set of output defines where to send the message, they can also filter based on the priority, for example it may be useful to output all messages to a debugging file but only allow errors to be - logged though syslog.</li> + logged through syslog.</li> </ul> - <p>The library configuration of logging is though 3 environment variables + <p>The library configuration of logging is through 3 environment variables allowing to control the logging behaviour:</p> <ul> <li>LIBVIRT_DEBUG: it can take the four following values: @@ -41,14 +41,14 @@ <li>3 or "warn": log warnings and errors, that's the default value</li> <li>4 or "error": log only error messages</li> </ul></li> - <li>LIBVIRT_LOG_FILTERS: allow to define logging filters</li> - <li>LIBVIRT_LOG_OUTPUTS: allow to define logging outputs</li> + <li>LIBVIRT_LOG_FILTERS: defines logging filters</li> + <li>LIBVIRT_LOG_OUTPUTS: defines logging outputs</li> </ul> <p>Note that, for example, setting LIBVIRT_DEBUG= is the same as unset. If you specify an invalid value, it will be ignored with a warning. If you have an error in a filter or output string, some of the settings may be applied up to the point at which libvirt encountered the error.</p> - <p>Similary the daemon logging behaviour can be tuned using 3 config + <p>Similarly the daemon logging behaviour can be tuned using 3 config variables, stored in the configuration file: <ul> <li>log_level: accepts the following values: @@ -58,8 +58,8 @@ <li>2: informations, warnings and errors</li> <li>1: debug and everything</li> </ul></li> - <li>log_filters: allow to define logging filters</li> - <li>log_outputs: allow to define logging outputs</li> + <li>log_filters: defines logging filters</li> + <li>log_outputs: defines logging outputs</li> </ul> <p>When starting the libvirt daemon, any logging environment variable settings will override settings in the config file. Command line options @@ -106,7 +106,7 @@ <li>3: WARNING</li> <li>4: ERROR</li> </ul> - <p>Multiple output can be defined , they just need to be separated by + <p>Multiple output can be defined, they just need to be separated by spaces, e.g.: <code>"3:syslog:libvirtd 1:file:/tmp/libvirt.log"</code> will log all warnings and errors to syslog under the libvirtd ident but also log everything debugging and informations included in the -- 1.7.2.3

2 2

[libvirt] PATCH 2/4: AppArmor updates
by Jamie Strandboge 24 Sep '10

24 Sep '10

Attached is 0002-apparmor-chardev.patch -- Jamie Strandboge | http://www.canonical.com

3 5

[libvirt] [PATCH] Enable support for nested SVM
by Daniel P. Berrange 24 Sep '10

24 Sep '10

This enables support for nested SVM using the regular CPU model/features block. If the CPU model or features include 'svm' or 'vmx', then the '-enable-nesting' flag will be added to the QEMU command line. Several of the models already include svm support, but QEMU was just masking out the svm bit silently. So this will enable SVM on such models * src/qemu/qemu_conf.h: flag for -enable-nesting * src/qemu/qemu_conf.c: Use -enable-nesting if VMX or SVM are in the CPUID * src/cpu/cpu.h, src/cpu/cpu.c: API to check for a named feature * src/cpu/cpu_x86.c: x86 impl of feature check * src/libvirt_private.syms: Add cpuHasFeature --- src/cpu/cpu.c | 24 ++++++++++++++++++++++ src/cpu/cpu.h | 12 +++++++++++ src/cpu/cpu_x86.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++ src/libvirt_private.syms | 1 + src/qemu/qemu_conf.c | 19 +++++++++++++++- src/qemu/qemu_conf.h | 1 + 6 files changed, 105 insertions(+), 2 deletions(-) diff --git a/src/cpu/cpu.c b/src/cpu/cpu.c index def6974..c7a282e 100644 --- a/src/cpu/cpu.c +++ b/src/cpu/cpu.c @@ -424,3 +424,27 @@ cpuUpdate(virCPUDefPtr guest, return driver->update(guest, host); } + +bool +cpuHasFeature(const char *arch, + const union cpuData *data, + const char *feature) +{ + struct cpuArchDriver *driver; + + VIR_DEBUG("arch=%s, data=%p, feature=%s", + arch, data, feature); + + if ((driver = cpuGetSubDriver(arch)) == NULL) + return -1; + + if (driver->hasFeature == NULL) { + virCPUReportError(VIR_ERR_NO_SUPPORT, + _("cannot check guest CPU data for %s architecture"), + arch); + return -1; + } + + return driver->hasFeature(arch, data, feature); +} + diff --git a/src/cpu/cpu.h b/src/cpu/cpu.h index a745917..405af48 100644 --- a/src/cpu/cpu.h +++ b/src/cpu/cpu.h @@ -82,6 +82,11 @@ typedef int (*cpuArchUpdate) (virCPUDefPtr guest, const virCPUDefPtr host); +typedef bool +(*cpuArchHasFeature) (const char *arch, + const union cpuData *data, + const char *feature); + struct cpuArchDriver { const char *name; @@ -95,6 +100,7 @@ struct cpuArchDriver { cpuArchGuestData guestData; cpuArchBaseline baseline; cpuArchUpdate update; + cpuArchHasFeature hasFeature; }; @@ -151,4 +157,10 @@ extern int cpuUpdate (virCPUDefPtr guest, const virCPUDefPtr host); +extern bool +cpuHasFeature(const char *arch, + const union cpuData *data, + const char *feature); + + #endif /* __VIR_CPU_H__ */ diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c index 1937901..cc82d58 100644 --- a/src/cpu/cpu_x86.c +++ b/src/cpu/cpu_x86.c @@ -1754,6 +1754,55 @@ cleanup: return ret; } +static bool x86HasFeature(const char *arch ATTRIBUTE_UNUSED, + const union cpuData *data, + const char *name) +{ + struct x86_map *map; + struct x86_feature *feature; + bool ret = false; + int i; + + if (!(map = x86LoadMap())) + return false; + + if (!(feature = x86FeatureFind(map, name))) + goto cleanup; + + for (i = 0 ; i < data->x86.basic_len ; i++) { + if (data->x86.basic[i].function == feature->cpuid->function && + ((data->x86.basic[i].eax & feature->cpuid->eax) + == feature->cpuid->eax) && + ((data->x86.basic[i].ebx & feature->cpuid->ebx) + == feature->cpuid->ebx) && + ((data->x86.basic[i].ecx & feature->cpuid->ecx) + == feature->cpuid->ecx) && + ((data->x86.basic[i].edx & feature->cpuid->edx) + == feature->cpuid->edx)) { + ret = true; + goto cleanup; + } + } + + for (i = 0 ; i < data->x86.extended_len ; i++) { + if (data->x86.extended[i].function == feature->cpuid->function && + ((data->x86.extended[i].eax & feature->cpuid->eax) + == feature->cpuid->eax) && + ((data->x86.extended[i].ebx & feature->cpuid->ebx) + == feature->cpuid->ebx) && + ((data->x86.extended[i].ecx & feature->cpuid->ecx) + == feature->cpuid->ecx) && + ((data->x86.extended[i].edx & feature->cpuid->edx) + == feature->cpuid->edx)) { + ret = true; + goto cleanup; + } + } + +cleanup: + x86MapFree(map); + return ret; +} struct cpuArchDriver cpuDriverX86 = { .name = "x86", @@ -1771,4 +1820,5 @@ struct cpuArchDriver cpuDriverX86 = { .guestData = x86GuestData, .baseline = x86Baseline, .update = x86Update, + .hasFeature = x86HasFeature, }; diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index c2905ba..428b887 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -90,6 +90,7 @@ cpuEncode; cpuGuestData; cpuNodeData; cpuUpdate; +cpuHasFeature; # cpu_conf.h diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index 7a37c70..88dbf9b 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -1210,6 +1210,8 @@ static unsigned long long qemudComputeCmdFlags(const char *help, flags |= QEMUD_CMD_FLAG_NO_KVM_PIT; if (strstr(help, "-tdf")) flags |= QEMUD_CMD_FLAG_TDF; + if (strstr(help, "-enable-nesting")) + flags |= QEMUD_CMD_FLAG_NESTING; if (strstr(help, ",menu=on")) flags |= QEMUD_CMD_FLAG_BOOT_MENU; @@ -3500,7 +3502,8 @@ qemuBuildCpuArgStr(const struct qemud_driver *driver, const char *emulator, unsigned long long qemuCmdFlags, const struct utsname *ut, - char **opt) + char **opt, + bool *hasHwVirt) { const virCPUDefPtr host = driver->caps->host.cpu; virCPUDefPtr guest = NULL; @@ -3511,6 +3514,8 @@ qemuBuildCpuArgStr(const struct qemud_driver *driver, virBuffer buf = VIR_BUFFER_INITIALIZER; int i; + *hasHwVirt = false; + if (def->cpu && def->cpu->model) { if (qemudProbeCPUModels(emulator, qemuCmdFlags, ut->machine, &ncpus, &cpus) < 0) @@ -3552,6 +3557,10 @@ qemuBuildCpuArgStr(const struct qemud_driver *driver, if (cpuDecode(guest, data, cpus, ncpus, preferred) < 0) goto cleanup; + *hasHwVirt = + cpuHasFeature(guest->arch, data, "svm") || + cpuHasFeature(guest->arch, data, "vmx"); + virBufferVSprintf(&buf, "%s", guest->model); for (i = 0; i < guest->nfeatures; i++) { char sign; @@ -3678,6 +3687,7 @@ int qemudBuildCommandLine(virConnectPtr conn, char *cpu; char *smp; int last_good_net = -1; + bool hasHwVirt = false; uname_normalize(&ut); @@ -3871,13 +3881,18 @@ int qemudBuildCommandLine(virConnectPtr conn, ADD_ARG_LIT(def->os.machine); } - if (qemuBuildCpuArgStr(driver, def, emulator, qemuCmdFlags, &ut, &cpu) < 0) + if (qemuBuildCpuArgStr(driver, def, emulator, qemuCmdFlags, + &ut, &cpu, &hasHwVirt) < 0) goto error; if (cpu) { ADD_ARG_LIT("-cpu"); ADD_ARG_LIT(cpu); VIR_FREE(cpu); + + if ((qemuCmdFlags & QEMUD_CMD_FLAG_NESTING) && + hasHwVirt) + ADD_ARG_LIT("-enable-nesting"); } if (disableKQEMU) diff --git a/src/qemu/qemu_conf.h b/src/qemu/qemu_conf.h index 2c9e608..16f72f5 100644 --- a/src/qemu/qemu_conf.h +++ b/src/qemu/qemu_conf.h @@ -93,6 +93,7 @@ enum qemud_cmd_flags { QEMUD_CMD_FLAG_NODEFCONFIG = (1LL << 37), /* -nodefconfig */ QEMUD_CMD_FLAG_BOOT_MENU = (1LL << 38), /* -boot menu=on support */ QEMUD_CMD_FLAG_ENABLE_KQEMU = (1LL << 39), /* -enable-kqemu flag */ + QEMUD_CMD_FLAG_NESTING = (1LL << 40), /* -enable-nesting (SVM/VMX) */ }; /* Main driver state */ -- 1.7.2.3

4 5

[libvirt] [PATCH] Fix spelling of Xen
by Philipp Hahn 24 Sep '10

24 Sep '10

Trivial s/Xem/Xen/ in 4 comments. Signed-off-by: Philipp Hahn <hahn(a)univention.de> --- src/xen/xend_internal.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-)

2 1

[libvirt] [PATCH] nwfilter: enable bridge netfilter calls via proc filesystem
by Stefan Berger 24 Sep '10

24 Sep '10

On a recent installation of FC13, the filtering of IP/IPv6 using iptables/ip6tables traffic did not work since the proc filesystem entries /proc/sys/net/bridge/bridge-nf-call-iptables and /proc/sys/net/bridge/bridge-nf-call-ip6tables contained a zero each and no traffic went into the FORWARD chain. The patch below makes sure that if iptables or ip6tables are being used by the nwfilter driver that a '1' is written into the relevant proc filesystem entry so that the traffic goes into the FORWARD chain. Signed-off-by: Stefan Berger <stefanb(a)us.ibm.com> --- src/nwfilter/nwfilter_ebiptables_driver.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) Index: libvirt-acl/src/nwfilter/nwfilter_ebiptables_driver.c =================================================================== --- libvirt-acl.orig/src/nwfilter/nwfilter_ebiptables_driver.c +++ libvirt-acl/src/nwfilter/nwfilter_ebiptables_driver.c @@ -63,6 +63,11 @@ : "" +#define PROC_BRIDGE_NF_CALL_IPTABLES \ + "/proc/sys/net/bridge/bridge-nf-call-iptables" +#define PROC_BRIDGE_NF_CALL_IP6TABLES\ + "/proc/sys/net/bridge/bridge-nf-call-ip6tables" + static char *ebtables_cmd_path; static char *iptables_cmd_path; static char *ip6tables_cmd_path; @@ -429,16 +434,20 @@ static int iptablesLinkIPTablesBaseChain static int iptablesCreateBaseChains(const char *iptables_cmd, - virBufferPtr buf) + virBufferPtr buf, + bool isIPv6) { virBufferVSprintf(buf,"%s -N " VIRT_IN_CHAIN CMD_SEPARATOR "%s -N " VIRT_OUT_CHAIN CMD_SEPARATOR "%s -N " VIRT_IN_POST_CHAIN CMD_SEPARATOR - "%s -N " HOST_IN_CHAIN CMD_SEPARATOR, + "%s -N " HOST_IN_CHAIN CMD_SEPARATOR + "echo 1 > %s" CMD_SEPARATOR, + iptables_cmd, iptables_cmd, iptables_cmd, iptables_cmd, - iptables_cmd); + isIPv6 ? PROC_BRIDGE_NF_CALL_IP6TABLES + : PROC_BRIDGE_NF_CALL_IPTABLES); iptablesLinkIPTablesBaseChain(iptables_cmd, buf, VIRT_IN_CHAIN , "FORWARD", 1, 1); iptablesLinkIPTablesBaseChain(iptables_cmd, buf, @@ -3074,7 +3083,7 @@ ebiptablesApplyNewRules(virConnectPtr co iptablesUnlinkTmpRootChains(iptables_cmd_path, &buf, ifname); iptablesRemoveTmpRootChains(iptables_cmd_path, &buf, ifname); - iptablesCreateBaseChains(iptables_cmd_path, &buf); + iptablesCreateBaseChains(iptables_cmd_path, &buf, false); if (ebiptablesExecCLI(&buf, &cli_status) || cli_status != 0) goto tear_down_tmpebchains; @@ -3105,7 +3114,7 @@ ebiptablesApplyNewRules(virConnectPtr co iptablesUnlinkTmpRootChains(ip6tables_cmd_path, &buf, ifname); iptablesRemoveTmpRootChains(ip6tables_cmd_path, &buf, ifname); - iptablesCreateBaseChains(ip6tables_cmd_path, &buf); + iptablesCreateBaseChains(ip6tables_cmd_path, &buf, true); if (ebiptablesExecCLI(&buf, &cli_status) || cli_status != 0) goto tear_down_tmpiptchains;

3 12

[libvirt] [RFC PATCH] maint: update to latest gnulib
by Eric Blake 23 Sep '10

23 Sep '10

* .gnulib: Update to latest. * bootstrap.conf (gnulib_modules): Add new termios module. (gnulib_tool_option_extras): Make libtool usage explicit. * src/util/util.c (includes): Gnulib now guarantees termios.h. * bootstrap: Resync from gnulib. --- On IRC, hallyn_ pointed out that libvirt doesn't build with the latest gnulib. This fixes that situation. However, until http://thread.gmane.org/gmane.comp.lib.gnulib.bugs/23111/focus=23241 is fixed upstream, this patch points .gnulib at a commit that is only in my repository; hence marking it as an RFC (I can't push this until I rebase it to point .gnulib to a public commit that works). .gnulib | 2 +- bootstrap | 11 +++++++---- bootstrap.conf | 2 ++ src/util/util.c | 4 +--- 4 files changed, 11 insertions(+), 8 deletions(-) * .gnulib 7ba06c8...d2a65f2 (174): > termios: relax license > threadlib: Allow the package to change the default to 'no'. > autoupdate > Fix endless loop in mbmemcasecoll. > Tests for module 'memcoll'. > memcoll, xmemcoll: Clarify size vs. length. > Tests for module 'memcasecmp'. > pthread: add to system <pthread.h> instead of replacing it all, for MacOS > net_if: enhance tests > Add ChangeLog entry for last commit. > Manual: improve out-of-memory documentation. > autoupdate > Add ChangeLog entry. > Use src/ not lib/ as root of source in example Makefile.am code. > Set cut_dir properly, and add mode line for Emacs. > Set cut_dir properly, and add mode line for Emacs. > Make Makefile.am example code more cut-and-paste friendly. > New module to test <net/if.h> interfaces. > pthread: add pthread_spin_destroy > gnulib-tool: Fix --help output. > maint.mk: avoid unexpanded \n in two diagnostics > netinet_in: Doc tweak. > init.sh: correct an outdated comment > init.sh: don't let an ephemeral "*.exe" make us skip all dir entries > mirbsd: add some more support > tests: fix unportable assumption on sys/wait.h > init.sh: accomodate directory with no .exes > tests: avoid compiler warning > fdutimens, fdutimensat: update signature, again > Take over the maintenance of some older macros from Autoconf. > fdutimensat: drop atflag validation > unlockpt: Fix declaration within GNULIB_POSIXCHECK. > login_tty: Fix detection of function on FreeBSD, OpenBSD, NetBSD. > login_tty: Make the replacement code work on BSD systems. > login_tty: Stricter unit test. > New module 'tcgetsid'. > Tests for module 'termios'. > New module 'termios'. > fdutimensat: add an atflag parameter > Fix typos in comments. > Fix typo in last commit. > stdlib: clarify MirBSD WEXITSTATUS bug > stdlib: work around MirBSD WEXITSTATUS bug > docs: mention MacOS issue with WEXITSTATUS(constant) > strnlen: add tests > unistr/base: Avoid link errors when module 'libunistring' is also used. > test-rawmemchr: make more robust > memchr: detect glibc Alpha bug > fts, getcwd, glob: audit for dirfd returning -1 > float: fix broken MirBSD header > fts: use O_NOFOLLOW to avoid race condition when opening a directory > fdopendir: preserve argument fd before returning > regex: Pass the system regex if its only problem is 32-bit regoff_t. > fts: don't operate on an invalid file descriptor after failed dup > savedir: add streamsavedir, deprecate fdsavedir > autoupdate > langinfo: Fix last commit. > relocatable-prog-wrapper: Fix compilation failure due to O_EXEC. > Improve NEWS entry. > * NEWS: Document recent changes to fcntl-h. > fcntl-h: define O_CLOEXEC and O_EXEC if not defined; use new defines > langinfo, nl_langinfo: Fix for IRIX 5.3. > pty, readutmp: Fix for FreeBSD 8.0 and OpenBSD 4.6. > strsignal: work around NetBSD bug > gnulib-tool: work with NetBSD /bin/sh > autoupdate > gnulib-tool: Avoid stderr output on IRIX related to 'alias', 'unalias'. > init.sh: penalize a set-x-impaired shell; don't disqualify it > unsetenv: fix OpenBSD bug > strtod: work around IRIX 6.5 bug > autoupdate > maint: fix ChangeLog ordering > getopt: optimize previous patch > init.sh: disqualify shells for which set -x corrupts stderr > gnulib-tool: Avoid stderr output on IRIX related to 'alias', 'unalias'. > Fix formatting of ChangeLog entry. > regex documentation update from Reuben Thomas <rrt(a)sc3d.org>, 20 Aug 2010 12:04:39 +0100 > regex documentation update from Reuben Thomas <rrt(a)sc3d.org>, 20 Aug 2010 12:04:39 +0100 > getopt: handle POSIXLY_CORRECT set but not exported > gnulib-tool: Highlight the changed options. > update from texinfo > doc tweaks > uniwidth/width: Update comment. > isinf, isnan: Relax license. > gnulib-tool: Help migration from --import to --add-import or --update. > Update doc about gnulib-tool. > gnulib-tool: Change --import. New options --add/remove-import. > Doc update. > gnulib-tool: Don't talk about CVS any more. > maint.mk: avoid obscure sc_copyright_check failure in coreutils > gnulib-tool: Fix expression that counts directories. > avoid coreutils "make distcheck" failure > gnulib-tool: Avoid error when run in a package without Makefile.am. > update-copyright test: Improve output when perl is missing or too old. > Don't augment PATH in TESTS_ENVIRONMENT. > tests: prohibit augmenting PATH via TESTS_ENVIRONMENT > strdup: Fix compilation error in C++ mode. > dirfd: Fix compilation error in C++ mode on MacOS X, *BSD, IRIX. > Set PATH_SEPARATOR the same way autoconf does. > Set PATH_SEPARATOR the same way autoconf does. > autoupdate > tests: init.sh improvements for re-exec'ing with zsh > hash: fix safe_hasher const typo > test-update-copyright.sh: require perl 5.8.0 > wctype: fix typo in previous commit > test-update-copyright.sh: skip test if Perl is too old > wctype: Avoid compilation error on IRIX 6.5.30. > New module 'socketlib'. > fcntl-h, etc.: prefer O_SEARCH to O_RDONLY when applicable > autoupdate > New module 'host-cpu-c-abi'. > hash: factor, and guard against misbehaving hasher function > hash: silence spurious clang warning > strstr, memmem, strcasestr: avoid leaked shell message > tests: silence clang warning > gettext: Fix recent mistake. > selinux-h: Offer a --without-selinux option. > Make the module 'realloc-gnu' work again on AIX and OSF/1. > Make the module 'calloc-gnu' work again on AIX and OSF/1. > Make the module 'malloc-gnu' work again on AIX and OSF/1. > Update modules list. > realloc-gnu: Really add the module description. > Tests for module 'realloc-gnu'. * modules/realloc-gnu-tests: New file. * tests/test-realloc-gnu.c: New file. > Tests for module 'calloc-gnu'. * modules/calloc-gnu-tests: New file. * tests/test-calloc-gnu.c: New file. > Tests for module 'malloc-gnu'. * modules/malloc-gnu-tests: New file. * tests/test-malloc-gnu.c: New file. > Rename module 'realloc' -> 'realloc-gnu'. > Rename module 'calloc' -> 'calloc-gnu'. > Rename module 'malloc' -> 'malloc-gnu'. > pread, pwrite: add missing dependency > unistr/u*-strchr: Fix tests dependencies. > read-file: Don't occupy too much unused memory. > read-file: Avoid memory reallocations with regular files. * lib/read-file.c: Include <sys/stat.h>, <stdio.h>, <stdint.h>. (fread_file): With regular files, use the remaining length as the initial buffer size. Check against overflow. * modules/read-file (Depends-on): Add ftello, malloc-posix, stdint, sys_stat. > autoupdate > ftello: Relax license. > Avoid relocwrapper link errors due to gnulib replacement functions. > Prefer using AC_DEFUN_ONCE over AC_DEFUN in projects with gnulib. > sys_socket, netdb: Ensure socklen_t gets defined. > * ChangeLog: fix typo > login_tty: add missing dependeny > lib-symbol-versions: fix m4 quoting > glob: fix compile test > btowc: fix missing file > lseek: fix link test > include_next: silence autoconf 2.68 warning > acl: fix compilation test > Modernize AC_TRY_RUN invocations. > Modernize AC_TRY_LINK invocations. > Modernize AC_TRY_COMPILE invocations. > stat-time: relax license LGPL > autoupdate > poll: return immediately on POLLHUP. > Fix test-unlinkat, test-rmdir failure on AIX 5.3. > stdbool: avoid spurious failure with modern xlc > getloadavg: simplify code > getloadavg: don't define SVR4 on cygwin > priv-set: fix comment > priv-set: fix comments > stdbool: avoid rejecting clang > argz: fix shell quoting issue > poll, select: handle ERROR_BROKEN_PIPE. > fts: allow compilation with C++ > autoupdate > Fix gnulib-tool sed script de-commentation for AIX sed. > update from texinfo > autoupdate > test-stddef: test for (some) offsetof bugs > stpncpy: Allow stpncpy to be defined as a macro. > Rename module 'memxfrm' to 'amemxfrm'. > Tests for module 'astrxfrm'. > New module 'astrxfrm'. > Document not_eol. > Document not_eol and remove mention of regex.c. > Ignore one more generated index from makeinfo. > git-merge-changelog: add doc relating to use with bzr and hg. diff --git a/.gnulib b/.gnulib index 7ba06c8..d2a65f2 160000 --- a/.gnulib +++ b/.gnulib @@ -1 +1 @@ -Subproject commit 7ba06c8ff37d8725cb824c64b94be41b9294ffb7 +Subproject commit d2a65f2441f89114642a5dc9a775050839423dca diff --git a/bootstrap b/bootstrap index 2422549..5ab4cf7 100755 --- a/bootstrap +++ b/bootstrap @@ -1,6 +1,6 @@ #! /bin/sh # Print a version string. -scriptversion=2010-05-17.18; # UTC +scriptversion=2010-07-06.10; # UTC # Bootstrap this package from checked-out sources. @@ -90,7 +90,8 @@ bootstrap_epilogue() { :; } # options because the latest/%s directory and the .po files within are # all symlinks. po_download_command_format=\ -"rsync -Lrtvz 'translationproject.org::tp/latest/%s/' '%s'" +"rsync --delete --exclude '*.s1' -Lrtvz \ + 'translationproject.org::tp/latest/%s/' '%s'" extract_package_name=' /^AC_INIT(/{ @@ -475,15 +476,17 @@ download_po_files() { eval "$cmd" } -# Download .po files to $po_dir/.reference and copy only the new +# Mirror .po files to $po_dir/.reference and copy only the new # or modified ones into $po_dir. Also update $po_dir/LINGUAS. +# Note po files that exist locally only are left in $po_dir but will +# not be included in LINGUAS and hence will not be distributed. update_po_files() { # Directory containing primary .po files. # Overwrite them only when we're sure a .po file is new. po_dir=$1 domain=$2 - # Download *.po files into this dir. + # Mirror *.po files into this dir. # Usually contains *.s1 checksum files. ref_po_dir="$po_dir/.reference" diff --git a/bootstrap.conf b/bootstrap.conf index 8a85b91..1f1d416 100644 --- a/bootstrap.conf +++ b/bootstrap.conf @@ -65,6 +65,7 @@ strsep strtok_r sys_stat sys_wait +termios time_r timegm uname @@ -132,6 +133,7 @@ gnulib_mk=Makefile.am gnulib_tool_option_extras="\ --lgpl=2\ --with-tests\ + --libtool\ " # Convince bootstrap to use multiple m4 directories. diff --git a/src/util/util.c b/src/util/util.c index b6b9712..586baee 100644 --- a/src/util/util.c +++ b/src/util/util.c @@ -43,9 +43,7 @@ #endif #include <string.h> #include <signal.h> -#if HAVE_TERMIOS_H -# include <termios.h> -#endif +#include <termios.h> #include "c-ctype.h" #ifdef HAVE_PATHS_H -- 1.7.2.3

2 3

[libvirt] [PATCH] Set sensible defaults for cpu match and feature policy
by Daniel P. Berrange 23 Sep '10

23 Sep '10

To enable the CPU XML from the capabilities to be pasted directly into the guest XML with no editing, pick a sensible default for match and feature policy. The CPU match will be exact and the feature policy will be require. This should ensure safety for migration and give DWIM semantics for users * src/conf/cpu_conf.c: Default to exact match and require policy * docs/formatdomain.html.in: Document new defaults --- docs/formatdomain.html.in | 6 ++++++ src/conf/cpu_conf.c | 15 ++++++++------- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 5e56dae..45709e4 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -268,6 +268,9 @@ <dd>The guest will not be created unless the host CPU does exactly match the specification.</dd> </dl> + + <span class="since">Since 0.8.5</span> the <code>match</code> + attribute can be omitted and will default to <code>exact</code>. </dd> <dt><code>model</code></dt> @@ -314,6 +317,9 @@ <dd>Guest creation will fail if the feature is supported by host CPU.</dd> </dl> + + <span class="since">Since 0.8.5</span> the <code>policy</code> + attribute can be omitted and will default to <code>require</code>. </dd> </dl> diff --git a/src/conf/cpu_conf.c b/src/conf/cpu_conf.c index 3274659..68d3daf 100644 --- a/src/conf/cpu_conf.c +++ b/src/conf/cpu_conf.c @@ -147,12 +147,10 @@ virCPUDefParseXML(const xmlNodePtr node, char *match = virXMLPropString(node, "match"); if (!match) { - if (virXPathBoolean("boolean(./model)", ctxt)) { - virCPUReportError(VIR_ERR_INTERNAL_ERROR, - "%s", _("Missing match attribute for CPU specification")); - goto error; - } - def->match = -1; + if (virXPathBoolean("boolean(./model)", ctxt)) + def->match = VIR_CPU_MATCH_EXACT; + else + def->match = -1; } else { def->match = virCPUMatchTypeFromString(match); VIR_FREE(match); @@ -251,7 +249,10 @@ virCPUDefParseXML(const xmlNodePtr node, char *strpolicy; strpolicy = virXMLPropString(nodes[i], "policy"); - policy = virCPUFeaturePolicyTypeFromString(strpolicy); + if (strpolicy == NULL) + policy = VIR_CPU_FEATURE_REQUIRE; + else + policy = virCPUFeaturePolicyTypeFromString(strpolicy); VIR_FREE(strpolicy); if (policy < 0) { -- 1.7.2.3

3 2

[libvirt] [PATCH v2 00/11] Implement memory control api
by Nikunj A. Dadhania 23 Sep '10

23 Sep '10

Changelog from v1: * Patch re-ordering for compilation * Folded python bindings changes to patch 01 * Added defines for string constants for memory tunables * Typo fix: min_guarantee * Moved initialization of function pointers in driver.h patch This patch series implement public api for controlling various memory tunables exported by the OS. This is based on the following RFC[1]. * Implement virDomainSetMemoryParameters api * Provide implementation for remote, QEmu and LXC drivers * Enable memory controller support fro QEmu * virsh command for runtime changes to the memory parameters * Domain configuration parsing for memory control parameters * Cgroup memory controller code for memory hard_limit/soft_limit, swap hard_limit To Do * Python bindings is just a place holder, need to implement * virDomainGetMemoryParameters 1. https://www.redhat.com/archives/libvir-list/2010-August/msg00607.html 2. https://www.redhat.com/archives/libvir-list/2010-August/msg00699.html --- Nikunj A. Dadhania (11): Adding structure and defines for virDomainSetMemoryParameter Adding virDomainSetMemoryParameters API Adds xml entries for memory tunables XML parsing for memory tunables Implement cgroup memory controller tunables Implement driver interface domainSetMemoryParamters for QEmu Adding memtunables to libvirt-lxc command Adding memtunables to qemuSetupCgroup Adding memtune command to virsh tool Implements virDomainSetMemoryParameters for the remote driver Implement domainSetMemoryParameters function daemon/remote.c | 66 +++++++++++++++++ daemon/remote_dispatch_prototypes.h | 8 ++ daemon/remote_dispatch_table.h | 5 + docs/schemas/domain.rng | 31 ++++++++ include/libvirt/libvirt.h.in | 60 +++++++++++++++ python/generator.py | 1 python/libvirt-override-api.xml | 6 ++ python/libvirt-override.c | 7 ++ src/conf/domain_conf.c | 50 +++++++++++-- src/conf/domain_conf.h | 12 ++- src/driver.h | 6 ++ src/esx/esx_driver.c | 1 src/esx/esx_vmx.c | 30 ++++---- src/libvirt.c | 48 ++++++++++++ src/libvirt_private.syms | 6 ++ src/libvirt_public.syms | 5 + src/lxc/lxc_controller.c | 24 ++++++ src/lxc/lxc_driver.c | 101 ++++++++++++++++++++++++-- src/openvz/openvz_driver.c | 9 +- src/phyp/phyp_driver.c | 1 src/qemu/qemu.conf | 4 + src/qemu/qemu_conf.c | 11 ++- src/qemu/qemu_driver.c | 138 +++++++++++++++++++++++++++++++++-- src/remote/remote_driver.c | 66 +++++++++++++++++ src/remote/remote_protocol.c | 62 +++++++++++++++- src/remote/remote_protocol.h | 36 +++++++++ src/test/test_driver.c | 13 ++- src/uml/uml_conf.c | 2 - src/uml/uml_driver.c | 15 ++-- src/util/cgroup.c | 106 +++++++++++++++++++++++++++ src/util/cgroup.h | 7 ++ src/xen/xen_driver.c | 1 tools/virsh.c | 89 +++++++++++++++++++++++ 33 files changed, 959 insertions(+), 68 deletions(-)

1 11

[libvirt] [PATCH] pciFindStubDriver should return NULL on error
by Chris Wright 23 Sep '10

23 Sep '10

pciFindStubDriver currently returns 0 in one of the error cases. While it's correct...NULL is more readable. Signed-off-by: Chris Wright <chrisw(a)redhat.com> --- src/util/pci.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/util/pci.c b/src/util/pci.c index a559476..22c66fa 100644 --- a/src/util/pci.c +++ b/src/util/pci.c @@ -826,7 +826,7 @@ recheck: char ebuf[1024]; VIR_WARN("failed to load pci-stub or pciback drivers: %s", virStrerror(errno, ebuf, sizeof ebuf)); - return 0; + return NULL; } goto recheck;

2 1

[libvirt] [PATCH] libvirt-guests: start late and stop early
by Jiri Denemark 23 Sep '10

23 Sep '10

libvirt-guests init script should be started as late as possible during host startup and stopped as early as possible during host shutdown to make sure required services are already/still up and running at the time libvirt-guests runs. --- tools/libvirt-guests.init.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/libvirt-guests.init.in b/tools/libvirt-guests.init.in index 993c12d..4e0682d 100644 --- a/tools/libvirt-guests.init.in +++ b/tools/libvirt-guests.init.in @@ -17,7 +17,7 @@ # # libvirt-guests: suspend/resume libvirt guests on shutdown/boot # -# chkconfig: 345 98 02 +# chkconfig: 345 99 01 # description: This is a script for suspending active libvirt guests \ # on shutdown and resuming them on next boot \ # See http://libvirt.org -- 1.7.3

2 2

[libvirt] I can help, but I don't know how
by arnaud.champion＠devatom.fr 23 Sep '10

23 Sep '10

?Hi there, with your help, I have created a Windows tools to manage libvirt/kvm hypervisor and it is free for libvirt/kvm connections. I have done it in C# (not mono) and to do that, I have make a lot of modifications in C# bindings (which in fact works in mono) to improve bindings (my modifications are mainly around callback handling). You can download the tool at this web site : http://www.devatom.fr and sorry, for now it's in french only, I have to work on the translation. Anyway, I think I can help by handling C# bindings for libvirt, I don't know if I must put them on my web site or push them to you, let me know if it interest you. Best regards, Arnaud Champion

2 3