- Devel - libvirt List Archives

[libvirt] [PATCH] Make int-overflow test case pass
by Stefan Berger 29 Mar '10

29 Mar '10

This fix makes the int-overflow test case pass. Signed-off-by: Stefan Berger <stefanb(a)us.ibm.com> Index: libvirt/tests/int-overflow =================================================================== --- libvirt.orig/tests/int-overflow +++ libvirt/tests/int-overflow @@ -14,6 +14,7 @@ fi . "$srcdir/test-lib.sh" echo "error: failed to get domain '4294967298'" > exp || fail=1 +echo "error: Failed to start the nwfilter driver: Is the daemon running ?" >> exp || fail=1 echo domname 4294967298 | $abs_top_builddir/tools/virsh --quiet \ --connect test://$abs_top_srcdir/examples/xml/test/testnode.xml \ > /dev/null 2> err || fail=1

3 4

[libvirt] [PATCH v4 00/15] Network filtering (ACL) extensions for libvirt
by Stefan Berger 29 Mar '10

29 Mar '10

Hi! This is a repost of this set of patches with some of the suggested fixes applied and ipv6 support on the ebtables layer added. Between V3 and V4 of this patch series the following changes were made: - occurrences of typo 'scp' were changed to 'sctp' - the root ebtables chain for each interface now has the previx of 'libvirt-' - additional calls into tear-down functions in case something goes wrong while starting the qemu/kvm VM in 2nd level error paths - additional functions in the driver interface to split up the application of firewall rules into - creation of new firewall rules 'tree' - switch-over to new firewall rules 'tree', tear down of old one and renaming of new firewall 'tree' - tear down of new firewall rules 'tree' in case an error happend during update of several VMs. - additional patch with example filters The following set of patches add network filtering (ACL) extensions to libvirt and enable network traffic filtering for VMs using ebtables and, depending on the networking technology being used (tap, but not macvtap), also iptables. Usage of either is optional and controlled through filters that a VM is referencing. The ebtables-level filtering is based on the XML derived from the CIM network slide 10 (filtering) from the DMTF website (http://www.dmtf.org/standards/cim/cim_schema_v2230/CIM_Network.pdf) The XML we derived from this was discussed on the list before. On the ebtables level we currently handle filtering of IPv4 and ARP traffic. The iptables-level filtering is based on similar XML where XML nodes described the particular protocol to filter for. Its extensions enable the filtering of traffic using iptables for tcp, udp, icmp, igmp, sctp and 'all' types of traffic. This list of protocols maps to the features supported by iptables and only excludes protocols like 'esp', 'ah' and 'udplite'. Currently only bridging mode is supported and based on availability of the physdev match. The filtering framework adds new libvirt virsh commands for managing the filters. The 5 new commands are: - virsh nwfilter-list - virsh nwfilter-dumpxml <name of filter> - virsh nwfilter-define <name of file containing filter desc.> - virsh nwfilter-undefine <name of filter> - virsh nwfilter-edit <name of filter> Above commands are similar to commands for already existing pools and as such much of the code directly related to the above commands could be borrowed from other drivers. The network filters can either contain rules using the above mentioned XML or contain references to other filters in order to build more complex filters that form some sort of filter tree or can contain both. An example for a filter referencing other filters would be this one here: <filter name='demofilter4' chain='root'> <uuid>66f62d1d-34c1-1421-824f-c62d5ee5e8b6</uuid> <filterref filter='no-mac-spoofing'/> <filterref filter='no-mac-broadcast'/> <filterref filter='no-arp-spoofing'/> <filterref filter='allow-dhcp'> <parameter name='DHCPSERVER' value='10.0.0.1'/> </filterref> <filterref filter='no-other-l2-traffic'/> <filterref filter='recv-only-vm-ipaddress'/> <filterref filter='recv-only-vm-macaddress'/> <filterref filter='l3-test'/> <filterref filter='ipv6test'/> </filter> A filter containing actual rules would look like this: <filter name='no-mac-broadcast' chain='ipv4'> <uuid>ffe2ccd6-edec-7360-1852-6b5ccb553234</uuid> <rule action='drop' direction='out' priority='500'> <mac dstmacaddr='ff:ff:ff:ff:ff:ff'/> </rule> </filter> The filter XML now also holds a priority attribute in the rule. This provides control over the ordering of the applied ebtables/iptables rules beyond their appearance in the XML. The domain XML has been extended to reference a top level filter from within each <interface> XML node. A valid reference to such a top level filter looks like this: <interface type='bridge'> <source bridge='static'/> <filterref filter='demofilter4'> <parameter name='IP' value='9.59.241.151'/> </filterref> </interface> In this XML a parameter IP is passed for instantiation of the referenced filters, that may require the availability of this parameter. In the above case the IP parameter's value describes the value of the IP address of the VM and allows to enable those filters to be instantiated that require this 'IP' variable. If a filter requires a parameter that is not provided, the VM will not start or the interface will not attach to a running VM. Any names of parameters can be provided for instantiation of filters and their names and values only need to pass a regular expression test. In a subsequent patch we will be adding capability to allow users to omit the IP parameter (only) and enable libvirt to learn the IP address of the VM and have it instantiate the filter once it knows it. While virtual machines are running, it is possible to update their filters. For that all running VMs' filter 'trees' are traversed to detect whether the updated filter is referenced by the VM. If so, its ebtables/iptable rules are applied. If one of the VMs' update fails allupdates are rolled back and the filter XML update is rejected. One comment about the instantiation of the rules: Since the XML allows to create nearly any possible combination of parameters to ebtables or iptables commands, I haven't used the ebtables or iptables wrappers. Instead, I am writing ebtables/iptables command into a buffer, add command line options to each one of them as described in the rule's XML, write the buffer into a file and run it as a script. For those commands that are not allowed to fail I am using the following format to run them: cmd="ebtables <some options>" r=`${cmd}` if [ $? -ne 0 ]; then echo "Failure in command ${cmd}." exit 1 fi cmd="..." [...] If one of the command fails in such a batch, the libvirt code is going pick up the error code '1', tear down anything previously established and report an error back. The actual error message shown above is currently not reported back, but can be later on with some changes to the commands running external programs that need to read the script's stdout. One comment to patch 14: It currently #include's a .c file into a .c file only for the reason so I don't have to change too much code once I change code in the underlying patch. So this has to be changed. The patch series works without patch 13, but then only supports ebtables. The patches apply to the current tip. They pass 'make syntax-check' and have been frequently run in valgrind for memory leak checks. Looking forward to your feedback on the patches. Thanks and regards, Stefan and Gerhard

3 21

[libvirt] [PATCH] nwfilter_conf.c: don't test an uninitialized local variable
by Jim Meyering 29 Mar '10

29 Mar '10

I've just run the code through clang, and it spotted a few new problems. Here's one: >From 4c848787c8268e37db9a1d0754b8fcd8e5774f73 Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Mon, 29 Mar 2010 17:34:32 +0200 Subject: [PATCH] nwfilter_conf.c: don't test an uninitialized local variable * src/conf/nwfilter_conf.c (virNWIPAddressFormat): Do not use "i" uninitialized. --- src/conf/nwfilter_conf.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/conf/nwfilter_conf.c b/src/conf/nwfilter_conf.c index e82aae6..f673e69 100644 --- a/src/conf/nwfilter_conf.c +++ b/src/conf/nwfilter_conf.c @@ -2423,7 +2423,7 @@ virNWIPAddressFormat(virBufferPtr buf, nwIPAddressPtr ipaddr) ipaddr->addr.ipv4Addr[2], ipaddr->addr.ipv4Addr[3]); } else { - int i; + unsigned int i = 0; int dcshown = 0, in_dc = 0; unsigned short n; while (i < 8) { -- 1.7.0.3.448.g82eeb

3 2

[libvirt] [PATCH] Fix 'make check' runs due to usage of conn parameter in error reporting
by Stefan Berger 29 Mar '10

29 Mar '10

This patch fixes the 'make check' runs for me which, under certain circumstances and login configurations, did invoke popups requesting authentication. I removed the parameter conn from being passed into the error reporting function. Signed-off-by; Stefan Berger <stefanb(a)us.ibm.com> --- src/conf/nwfilter_conf.c | 15 ++++++--------- src/conf/nwfilter_conf.h | 3 ++- 2 files changed, 8 insertions(+), 10 deletions(-) Index: libvirt/src/conf/nwfilter_conf.c =================================================================== --- libvirt.orig/src/conf/nwfilter_conf.c +++ libvirt/src/conf/nwfilter_conf.c @@ -44,9 +44,6 @@ #define VIR_FROM_THIS VIR_FROM_NWFILTER -#define virNWFilterError(conn, code, fmt...) \ - virReportErrorHelper(conn, VIR_FROM_NWFILTER, code, __FILE__,\ - __FUNCTION__, __LINE__, fmt) VIR_ENUM_IMPL(virNWFilterRuleAction, VIR_NWFILTER_RULE_ACTION_LAST, "drop", @@ -2248,9 +2245,9 @@ virNWFilterPoolObjLoad(virConnectPtr con } if (!virFileMatchesNameSuffix(file, def->name, ".xml")) { - virNWFilterError(conn, VIR_ERR_INVALID_NWFILTER, - "NWFilter pool config filename '%s' does not match pool name '%s'", - path, def->name); + virNWFilterReportError(conn, VIR_ERR_INVALID_NWFILTER, + _("network filter pool config filename '%s' does not match pool name '%s'"), + path, def->name); virNWFilterDefFree(def); return NULL; } @@ -2300,9 +2297,9 @@ virNWFilterPoolLoadAllConfigs(virConnect if (virFileBuildPath(configDir, entry->d_name, NULL, path, PATH_MAX) < 0) { - virNWFilterError(conn, VIR_ERR_INTERNAL_ERROR, - "Config filename '%s/%s' is too long", - configDir, entry->d_name); + virNWFilterReportError(conn, VIR_ERR_INTERNAL_ERROR, + _("config filename '%s/%s' is too long"), + configDir, entry->d_name); continue; } Index: libvirt/src/conf/nwfilter_conf.h =================================================================== --- libvirt.orig/src/conf/nwfilter_conf.h +++ libvirt/src/conf/nwfilter_conf.h @@ -523,7 +523,8 @@ int virNWFilterParamConfLayerInit(void); void virNWFilterParamConfLayerShutdown(void); # define virNWFilterReportError(conn, code, fmt...) \ - virReportErrorHelper(conn, VIR_FROM_NWFILTER, code, __FILE__, \ + (void)conn; \ + virReportErrorHelper(NULL, VIR_FROM_NWFILTER, code, __FILE__, \ __FUNCTION__, __LINE__, fmt)

1 0

[libvirt] issues about Migrating with virsh and libvirt functions
by wei ma 29 Mar '10

29 Mar '10

Hi everyone i've been trying to migrate a domain from hostA to hostB.But everytime i did it with "virsh --live migrate <Domain> xen+ssh://root@Destination", it failed and told me something like "Error Domain not found:xenUnifiedDomainLookupByName". The same thing happened when i tried to do the same thing with libvirt API like virDomainMigrate & virDomainMigrateToURI. i am confused about this. So can anybody can tell me why?Thanks a lot. BTW,the OS is CentOS 5.4 with libvirt 0.7.7 and Xen 3.4.0.

2 1

[libvirt] [PATCH] filter new files through cppi, so syntax-check passes once again
by Jim Meyering 27 Mar '10

27 Mar '10

FYI, just pushed (no semantic change): >From d0e79bd5fa280a568d5b919fabd5f2f4dacf8f89 Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Fri, 26 Mar 2010 19:29:54 +0100 Subject: [PATCH] filter new files through cppi, so syntax-check passes once again * src/conf/nwfilter_conf.h: Indent cpp directives. * src/conf/nwfilter_params.h: Likewise. * src/datatypes.h: Likewise. * src/nwfilter/nwfilter_driver.h: Likewise. * src/nwfilter/nwfilter_ebiptables_driver.h: Likewise. * src/nwfilter/nwfilter_gentech_driver.h: Likewise. --- src/conf/nwfilter_conf.h | 24 ++++++++++++------------ src/conf/nwfilter_params.h | 4 ++-- src/datatypes.h | 6 +++--- src/nwfilter/nwfilter_driver.h | 6 +++--- src/nwfilter/nwfilter_ebiptables_driver.h | 6 +++--- src/nwfilter/nwfilter_gentech_driver.h | 2 +- 6 files changed, 24 insertions(+), 24 deletions(-) diff --git a/src/conf/nwfilter_conf.h b/src/conf/nwfilter_conf.h index 5ba2f41..9b6ca40 100644 --- a/src/conf/nwfilter_conf.h +++ b/src/conf/nwfilter_conf.h @@ -24,15 +24,15 @@ * Author: Stefan Berger <stefanb(a)us.ibm.com> */ #ifndef NWFILTER_CONF_H -#define NWFILTER_CONF_H +# define NWFILTER_CONF_H -#include <stdint.h> -#include <stddef.h> +# include <stdint.h> +# include <stddef.h> -#include "internal.h" -#include "util.h" -#include "hash.h" -#include "xml.h" +# include "internal.h" +# include "util.h" +# include "hash.h" +# include "xml.h" /** * Chain suffix size is: @@ -43,7 +43,7 @@ * terminating '0' = * 32-3-15-1-1 = 12 */ -#define MAX_CHAIN_SUFFIX_SIZE 12 +# define MAX_CHAIN_SUFFIX_SIZE 12 enum virNWFilterEntryItemFlags { @@ -53,10 +53,10 @@ enum virNWFilterEntryItemFlags { }; -#define HAS_ENTRY_ITEM(data) \ +# define HAS_ENTRY_ITEM(data) \ (((data)->flags) & NWFILTER_ENTRY_ITEM_FLAG_EXISTS) -#define ENTRY_GET_NEG_SIGN(data) \ +# define ENTRY_GET_NEG_SIGN(data) \ ((((data)->flags) & NWFILTER_ENTRY_ITEM_FLAG_IS_NEG) ? "!" : "") // datatypes appearing in rule attributes @@ -288,7 +288,7 @@ enum virNWFilterEbtablesTableType { }; -#define MAX_RULE_PRIORITY 1000 +# define MAX_RULE_PRIORITY 1000 typedef struct _virNWFilterRuleDef virNWFilterRuleDef; @@ -522,7 +522,7 @@ void virNWFilterConfLayerShutdown(void); int virNWFilterParamConfLayerInit(void); void virNWFilterParamConfLayerShutdown(void); -#define virNWFilterReportError(conn, code, fmt...) \ +# define virNWFilterReportError(conn, code, fmt...) \ virReportErrorHelper(conn, VIR_FROM_NWFILTER, code, __FILE__, \ __FUNCTION__, __LINE__, fmt) diff --git a/src/conf/nwfilter_params.h b/src/conf/nwfilter_params.h index 7a9b1ee..5b4afba 100644 --- a/src/conf/nwfilter_params.h +++ b/src/conf/nwfilter_params.h @@ -20,9 +20,9 @@ * Author: Stefan Berger <stefanb(a)us.ibm.com> */ #ifndef NWFILTER_PARAMS_H -#define NWFILTER_PARAMS_H +# define NWFILTER_PARAMS_H -#include "hash.h" +# include "hash.h" typedef struct _virNWFilterHashTable virNWFilterHashTable; typedef virNWFilterHashTable *virNWFilterHashTablePtr; diff --git a/src/datatypes.h b/src/datatypes.h index c221119..4663c9c 100644 --- a/src/datatypes.h +++ b/src/datatypes.h @@ -126,9 +126,9 @@ * magic value used to protect the API when pointers to network filter * pool structures are passed down by the users. */ -#define VIR_NWFILTER_MAGIC 0xDEAD7777 -#define VIR_IS_NWFILTER(obj) ((obj) && (obj)->magic==VIR_NWFILTER_MAGIC) -#define VIR_IS_CONNECTED_NWFILTER(obj) (VIR_IS_NWFILTER(obj) && VIR_IS_CONNECT((obj)->conn)) +# define VIR_NWFILTER_MAGIC 0xDEAD7777 +# define VIR_IS_NWFILTER(obj) ((obj) && (obj)->magic==VIR_NWFILTER_MAGIC) +# define VIR_IS_CONNECTED_NWFILTER(obj) (VIR_IS_NWFILTER(obj) && VIR_IS_CONNECT((obj)->conn)) /** diff --git a/src/nwfilter/nwfilter_driver.h b/src/nwfilter/nwfilter_driver.h index b7d8668..3f60560 100644 --- a/src/nwfilter/nwfilter_driver.h +++ b/src/nwfilter/nwfilter_driver.h @@ -26,10 +26,10 @@ */ #ifndef __VIR_NWFILTER_DRIVER_H__ -#define __VIR_NWFILTER_DRIVER_H__ +# define __VIR_NWFILTER_DRIVER_H__ -#include "nwfilter_params.h" -#include "nwfilter_conf.h" +# include "nwfilter_params.h" +# include "nwfilter_conf.h" int nwfilterRegister(void); diff --git a/src/nwfilter/nwfilter_ebiptables_driver.h b/src/nwfilter/nwfilter_ebiptables_driver.h index a036b99..ff22844 100644 --- a/src/nwfilter/nwfilter_ebiptables_driver.h +++ b/src/nwfilter/nwfilter_ebiptables_driver.h @@ -21,9 +21,9 @@ * Author: Stefan Berger <stefanb(a)us.ibm.com> */ #ifndef VIR_NWFILTER_EBTABLES_DRIVER_H__ -#define VIR_NWFILTER_EBTABLES_DRIVER_H__ +# define VIR_NWFILTER_EBTABLES_DRIVER_H__ -#define MAX_CHAINNAME_LENGTH 32 /* see linux/netfilter_bridge/ebtables.h */ +# define MAX_CHAINNAME_LENGTH 32 /* see linux/netfilter_bridge/ebtables.h */ enum RuleType { RT_EBTABLES, @@ -43,6 +43,6 @@ struct _ebiptablesRuleInst { extern virNWFilterTechDriver ebiptables_driver; -#define EBIPTABLES_DRIVER_ID "ebiptables" +# define EBIPTABLES_DRIVER_ID "ebiptables" #endif diff --git a/src/nwfilter/nwfilter_gentech_driver.h b/src/nwfilter/nwfilter_gentech_driver.h index a77d95a..6b7da71 100644 --- a/src/nwfilter/nwfilter_gentech_driver.h +++ b/src/nwfilter/nwfilter_gentech_driver.h @@ -21,7 +21,7 @@ * Author: Stefan Berger <stefanb(a)us.ibm.com> */ #ifndef __NWFILTER_GENTECH_DRIVER_H -#define __NWFILTER_GENTECH_DRIVER_H +# define __NWFILTER_GENTECH_DRIVER_H virNWFilterTechDriverPtr virNWFilterTechDriverForName(const char *name); -- 1.7.0.3.448.g82eeb

2 2

[libvirt] [PATCH 0/3] Check CPU features during migration
by Jiri Denemark 26 Mar '10

26 Mar '10

Jiri Denemark (3): cpuUpdate() for updating guest CPU according to host CPU Helper function for making a deep-copy of virCPUDefPtr Introduce UPDATE_CPU flag for virDomainGetXMLDesc include/libvirt/libvirt.h.in | 5 +- src/conf/cpu_conf.c | 37 ++++++++++ src/conf/cpu_conf.h | 3 + src/cpu/cpu.c | 22 ++++++ src/cpu/cpu.h | 9 +++ src/cpu/cpu_generic.c | 1 + src/cpu/cpu_x86.c | 161 +++++++++++++++++++++++++++++++++++++----- src/libvirt.c | 3 +- src/libvirt_private.syms | 2 + src/qemu/qemu_driver.c | 54 ++++++++++++-- tools/virsh.c | 4 + 11 files changed, 273 insertions(+), 28 deletions(-)

3 11

[libvirt] [PATCH] Don't replace persistent domain config with migrated config
by Jiri Denemark 26 Mar '10

26 Mar '10

When a domain is defined on host1, migrated to host2 and then migrated back to host1, its current configuration would overwrite the libvirtd's in-memory copy of persistent configuration of that domain. This is not desired as we want to preserve the persistent configuration untouched. This patch introduces new 'live' parameter to virDomainAssignDef. Passing 'true' for 'live' means the configuration passed to virDomainAssignDef describes a configuration of live instance of the domain. This applies for saved domains which are being restored or for incoming domains during migration. All callers have been changed to pass the appropriate value. --- src/conf/domain_conf.c | 19 +++++++++++++------ src/conf/domain_conf.h | 5 ++++- src/lxc/lxc_driver.c | 4 ++-- src/opennebula/one_driver.c | 4 ++-- src/openvz/openvz_driver.c | 4 ++-- src/qemu/qemu_driver.c | 10 +++++----- src/test/test_driver.c | 10 +++++----- src/uml/uml_driver.c | 4 ++-- 8 files changed, 35 insertions(+), 25 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 22e1679..4cc27ff 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -749,18 +749,25 @@ static virDomainObjPtr virDomainObjNew(virCapsPtr caps) virDomainObjPtr virDomainAssignDef(virCapsPtr caps, virDomainObjListPtr doms, - const virDomainDefPtr def) + const virDomainDefPtr def, + bool live) { virDomainObjPtr domain; char uuidstr[VIR_UUID_STRING_BUFLEN]; if ((domain = virDomainFindByUUID(doms, def->uuid))) { if (!virDomainObjIsActive(domain)) { - virDomainDefFree(domain->def); - domain->def = def; + if (live) { + /* save current configuration to be restored on domain shutdown */ + if (!domain->newDef) + domain->newDef = domain->def; + domain->def = def; + } else { + virDomainDefFree(domain->def); + domain->def = def; + } } else { - if (domain->newDef) - virDomainDefFree(domain->newDef); + virDomainDefFree(domain->newDef); domain->newDef = def; } @@ -5780,7 +5787,7 @@ virDomainObjPtr virDomainLoadConfig(virCapsPtr caps, newVM = 0; } - if (!(dom = virDomainAssignDef(caps, doms, def))) + if (!(dom = virDomainAssignDef(caps, doms, def, false))) goto error; dom->autostart = autostart; diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 44fff0c..9e6cb69 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -810,9 +810,12 @@ void virDomainObjRef(virDomainObjPtr vm); /* Returns 1 if the object was freed, 0 if more refs exist */ int virDomainObjUnref(virDomainObjPtr vm); +/* live == true means def describes an active domain (being migrated or + * restored) as opposed to a new persistent configuration of the domain */ virDomainObjPtr virDomainAssignDef(virCapsPtr caps, virDomainObjListPtr doms, - const virDomainDefPtr def); + const virDomainDefPtr def, + bool live); void virDomainRemoveInactive(virDomainObjListPtr doms, virDomainObjPtr dom); diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index ba13065..9786cc0 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -381,7 +381,7 @@ static virDomainPtr lxcDomainDefine(virConnectPtr conn, const char *xml) } if (!(vm = virDomainAssignDef(driver->caps, - &driver->domains, def))) + &driver->domains, def, false))) goto cleanup; def = NULL; vm->persistent = 1; @@ -1368,7 +1368,7 @@ lxcDomainCreateAndStart(virConnectPtr conn, if (!(vm = virDomainAssignDef(driver->caps, - &driver->domains, def))) + &driver->domains, def, false))) goto cleanup; def = NULL; diff --git a/src/opennebula/one_driver.c b/src/opennebula/one_driver.c index e1d1efc..f7fbd46 100644 --- a/src/opennebula/one_driver.c +++ b/src/opennebula/one_driver.c @@ -251,7 +251,7 @@ static virDomainPtr oneDomainDefine(virConnectPtr conn, const char *xml) goto return_point; if (!(vm = virDomainAssignDef(driver->caps, - &driver->domains, def))) { + &driver->domains, def, false))) { virDomainDefFree(def); goto return_point; } @@ -456,7 +456,7 @@ oneDomainCreateAndStart(virConnectPtr conn, } if (!(vm = virDomainAssignDef(driver->caps, - &driver->domains, def))) { + &driver->domains, def, false))) { virDomainDefFree(def); goto return_point; } diff --git a/src/openvz/openvz_driver.c b/src/openvz/openvz_driver.c index 50aadfc..e0a0768 100644 --- a/src/openvz/openvz_driver.c +++ b/src/openvz/openvz_driver.c @@ -825,7 +825,7 @@ openvzDomainDefineXML(virConnectPtr conn, const char *xml) goto cleanup; } if (!(vm = virDomainAssignDef(driver->caps, - &driver->domains, vmdef))) + &driver->domains, vmdef, false))) goto cleanup; vmdef = NULL; vm->persistent = 1; @@ -905,7 +905,7 @@ openvzDomainCreateXML(virConnectPtr conn, const char *xml, goto cleanup; } if (!(vm = virDomainAssignDef(driver->caps, - &driver->domains, vmdef))) + &driver->domains, vmdef, false))) goto cleanup; vmdef = NULL; /* All OpenVZ domains seem to be persistent - this is a bit of a violation diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 257f914..2c81d68 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -3563,7 +3563,7 @@ static virDomainPtr qemudDomainCreate(virConnectPtr conn, const char *xml, if (!(vm = virDomainAssignDef(driver->caps, &driver->domains, - def))) + def, false))) goto cleanup; def = NULL; @@ -5220,7 +5220,7 @@ static int qemudDomainRestore(virConnectPtr conn, if (!(vm = virDomainAssignDef(driver->caps, &driver->domains, - def))) { + def, true))) { qemuReportError(VIR_ERR_OPERATION_FAILED, "%s", _("failed to assign new VM")); goto cleanup; @@ -5761,7 +5761,7 @@ static virDomainPtr qemudDomainDefine(virConnectPtr conn, const char *xml) { if (!(vm = virDomainAssignDef(driver->caps, &driver->domains, - def))) { + def, false))) { goto cleanup; } def = NULL; @@ -8391,7 +8391,7 @@ qemudDomainMigratePrepareTunnel(virConnectPtr dconn, if (!(vm = virDomainAssignDef(driver->caps, &driver->domains, - def))) { + def, true))) { qemuReportError(VIR_ERR_OPERATION_FAILED, "%s", _("failed to assign new VM")); goto cleanup; @@ -8622,7 +8622,7 @@ qemudDomainMigratePrepare2 (virConnectPtr dconn, if (!(vm = virDomainAssignDef(driver->caps, &driver->domains, - def))) { + def, true))) { qemuReportError(VIR_ERR_OPERATION_FAILED, "%s", _("failed to assign new VM")); goto cleanup; diff --git a/src/test/test_driver.c b/src/test/test_driver.c index f54ebae..9a880f1 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -554,7 +554,7 @@ static int testOpenDefault(virConnectPtr conn) { if (testDomainGenerateIfnames(conn, domdef) < 0) goto error; if (!(domobj = virDomainAssignDef(privconn->caps, - &privconn->domains, domdef))) + &privconn->domains, domdef, false))) goto error; domdef = NULL; @@ -910,7 +910,7 @@ static int testOpenFromFile(virConnectPtr conn, if (testDomainGenerateIfnames(conn, def) < 0 || !(dom = virDomainAssignDef(privconn->caps, - &privconn->domains, def))) { + &privconn->domains, def, false))) { virDomainDefFree(def); goto error; } @@ -1308,7 +1308,7 @@ testDomainCreateXML(virConnectPtr conn, const char *xml, if (testDomainGenerateIfnames(conn, def) < 0) goto cleanup; if (!(dom = virDomainAssignDef(privconn->caps, - &privconn->domains, def))) + &privconn->domains, def, false))) goto cleanup; def = NULL; @@ -1853,7 +1853,7 @@ static int testDomainRestore(virConnectPtr conn, if (testDomainGenerateIfnames(conn, def) < 0) goto cleanup; if (!(dom = virDomainAssignDef(privconn->caps, - &privconn->domains, def))) + &privconn->domains, def, true))) goto cleanup; def = NULL; @@ -2302,7 +2302,7 @@ static virDomainPtr testDomainDefineXML(virConnectPtr conn, if (testDomainGenerateIfnames(conn, def) < 0) goto cleanup; if (!(dom = virDomainAssignDef(privconn->caps, - &privconn->domains, def))) + &privconn->domains, def, false))) goto cleanup; def = NULL; dom->persistent = 1; diff --git a/src/uml/uml_driver.c b/src/uml/uml_driver.c index bf06787..0c12469 100644 --- a/src/uml/uml_driver.c +++ b/src/uml/uml_driver.c @@ -1283,7 +1283,7 @@ static virDomainPtr umlDomainCreate(virConnectPtr conn, const char *xml, if (!(vm = virDomainAssignDef(driver->caps, &driver->domains, - def))) + def, false))) goto cleanup; def = NULL; @@ -1619,7 +1619,7 @@ static virDomainPtr umlDomainDefine(virConnectPtr conn, const char *xml) { if (!(vm = virDomainAssignDef(driver->caps, &driver->domains, - def))) + def, false))) goto cleanup; def = NULL; vm->persistent = 1; -- 1.7.0.3

3 5

[libvirt] [PATCH 0/1] Disk error policy
by David Allan 26 Mar '10

26 Mar '10

Here's a revised patch for disk error policy XML incorporating the feedback from Dan and Daniel. Dave David Allan (1): Add disk error policy to domain XML docs/schemas/domain.rng | 12 +++++++- src/conf/domain_conf.c | 18 +++++++++++ src/conf/domain_conf.h | 10 ++++++ src/libvirt_private.syms | 2 +- src/qemu/qemu_conf.c | 17 +++++++++- tests/qemuargv2xmltest.c | 3 ++ .../qemuxml2argv-disk-drive-error-policy-stop.args | 1 + .../qemuxml2argv-disk-drive-error-policy-stop.xml | 32 ++++++++++++++++++++ tests/qemuxml2argvtest.c | 3 ++ 9 files changed, 94 insertions(+), 4 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-drive-error-policy-stop.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-drive-error-policy-stop.xml

3 3

[libvirt] [PATCH] fix build break
by Dave Allan 26 Mar '10

26 Mar '10

I pushed this trivial patch to fix a build break earlier today. Dave

2 1