- Devel - libvirt List Archives

[libvirt] [PATCH] Fix race condition reconnecting to vms & loading configs
by Daniel P. Berrange 31 Oct '13

31 Oct '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> The following sequence 1. Define a persistent QMEU guest 2. Start the QEMU guest 3. Stop libvirtd 4. Kill the QEMU process 5. Start libvirtd 6. List persistent guets At the last step, the previously running persistent guest will be missing. This is because of a race condition in the QEMU driver startup code. It does 1. Load all VM state files 2. Spawn thread to reconnect to each VM 3. Load all VM config files Only at the end of step 3, does the 'virDomainObjPtr' get marked as "persistent". There is therefore a window where the thread reconnecting to the VM will remove the persistent VM from the list. The easy fix is to simply switch the order of steps 2 & 3. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/qemu/qemu_driver.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index c613967..9c3daad 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -816,8 +816,6 @@ qemuStateInitialize(bool privileged, conn = virConnectOpen(cfg->uri); - qemuProcessReconnectAll(conn, qemu_driver); - /* Then inactive persistent configs */ if (virDomainObjListLoadAllConfigs(qemu_driver->domains, cfg->configDir, @@ -828,6 +826,7 @@ qemuStateInitialize(bool privileged, NULL, NULL) < 0) goto error; + qemuProcessReconnectAll(conn, qemu_driver); virDomainObjListForEach(qemu_driver->domains, qemuDomainSnapshotLoad, -- 1.8.3.1

3 12

[libvirt] [libvirt-glib][PATCH V3] Add filterref and filterref parameter support.
by Ian Main 31 Oct '13

31 Oct '13

This patch adds support for setting filterref's on interfaces. Also supported are parameters to the filterref's. V2: - alphabetical orderized (don't look it up!) Makefile.am - s/set_filter/set_name/ s/get_filter/get_name/ - remove trailing whitespace. - fix missing line. - add return_val_if_fail check. - moved qcow fix in demo to a new patch. - fixed new_from_xml(). V3: - added g_debug in add_filterref_parameter(); - more fixing new_from_xml(). - orderized (I like this word now) libvirt-gconfig.h includes. Signed-off-by: Ian Main <imain(a)redhat.com> --- examples/config-demo.py | 7 + libvirt-gconfig/Makefile.am | 4 + ...-gconfig-domain-interface-filterref-parameter.c | 101 +++++++++++++ ...-gconfig-domain-interface-filterref-parameter.h | 75 ++++++++++ .../libvirt-gconfig-domain-interface-filterref.c | 159 +++++++++++++++++++++ .../libvirt-gconfig-domain-interface-filterref.h | 76 ++++++++++ libvirt-gconfig/libvirt-gconfig-domain-interface.c | 41 ++++++ libvirt-gconfig/libvirt-gconfig-domain-interface.h | 5 + libvirt-gconfig/libvirt-gconfig.h | 2 + libvirt-gconfig/libvirt-gconfig.sym | 18 +++ 10 files changed, 488 insertions(+) create mode 100644 libvirt-gconfig/libvirt-gconfig-domain-interface-filterref-parameter.c create mode 100644 libvirt-gconfig/libvirt-gconfig-domain-interface-filterref-parameter.h create mode 100644 libvirt-gconfig/libvirt-gconfig-domain-interface-filterref.c create mode 100644 libvirt-gconfig/libvirt-gconfig-domain-interface-filterref.h diff --git a/examples/config-demo.py b/examples/config-demo.py index 09b9e89..367d99a 100644 --- a/examples/config-demo.py +++ b/examples/config-demo.py @@ -35,6 +35,13 @@ domain.add_device(disk) interface = LibvirtGConfig.DomainInterfaceNetwork.new() interface.set_source("default") +filterref = LibvirtGConfig.DomainInterfaceFilterref.new() +filterref.set_name("clean-traffic") +parameter = LibvirtGConfig.DomainInterfaceFilterrefParameter.new() +parameter.set_name("IP") +parameter.set_value("205.23.12.40") +filterref.add_parameter(parameter) +interface.set_filterref(filterref) domain.add_device(interface) interface = LibvirtGConfig.DomainInterfaceUser.new() diff --git a/libvirt-gconfig/Makefile.am b/libvirt-gconfig/Makefile.am index 35dc978..0793da1 100644 --- a/libvirt-gconfig/Makefile.am +++ b/libvirt-gconfig/Makefile.am @@ -47,6 +47,8 @@ GCONFIG_HEADER_FILES = \ libvirt-gconfig-domain-input.h \ libvirt-gconfig-domain-interface.h \ libvirt-gconfig-domain-interface-bridge.h \ + libvirt-gconfig-domain-interface-filterref.h \ + libvirt-gconfig-domain-interface-filterref-parameter.h \ libvirt-gconfig-domain-interface-network.h \ libvirt-gconfig-domain-interface-user.h \ libvirt-gconfig-domain-memballoon.h \ @@ -129,6 +131,8 @@ GCONFIG_SOURCE_FILES = \ libvirt-gconfig-domain-input.c \ libvirt-gconfig-domain-interface.c \ libvirt-gconfig-domain-interface-bridge.c \ + libvirt-gconfig-domain-interface-filterref.c \ + libvirt-gconfig-domain-interface-filterref-parameter.c \ libvirt-gconfig-domain-interface-network.c \ libvirt-gconfig-domain-interface-user.c \ libvirt-gconfig-domain-memballoon.c \ diff --git a/libvirt-gconfig/libvirt-gconfig-domain-interface-filterref-parameter.c b/libvirt-gconfig/libvirt-gconfig-domain-interface-filterref-parameter.c new file mode 100644 index 0000000..e697e86 --- /dev/null +++ b/libvirt-gconfig/libvirt-gconfig-domain-interface-filterref-parameter.c @@ -0,0 +1,101 @@ +/* + * libvirt-gconfig-domain-interface-filterref-parameter.c: + * libvirt filterref parameters + * + * Copyright (C) 2013 Red Hat, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see + * <http://www.gnu.org/licenses/>. + * + * Authors: Ian Main <imain(a)redhat.com> + * Daniel P. Berrange <berrange(a)redhat.com> + */ + +#include <config.h> + +#include "libvirt-gconfig/libvirt-gconfig.h" +#include "libvirt-gconfig/libvirt-gconfig-private.h" + +#define GVIR_CONFIG_DOMAIN_INTERFACE_FILTERREF_PARAMETER_GET_PRIVATE(obj) \ + (G_TYPE_INSTANCE_GET_PRIVATE((obj), GVIR_CONFIG_TYPE_DOMAIN_INTERFACE_FILTERREF_PARAMETER, GVirConfigDomainInterfaceFilterrefParameterPrivate)) + +struct _GVirConfigDomainInterfaceFilterrefParameterPrivate +{ + gboolean unused; +}; + +G_DEFINE_TYPE(GVirConfigDomainInterfaceFilterrefParameter, gvir_config_domain_interface_filterref_parameter, GVIR_CONFIG_TYPE_OBJECT); + +static void gvir_config_domain_interface_filterref_parameter_class_init(GVirConfigDomainInterfaceFilterrefParameterClass *klass) +{ + g_type_class_add_private(klass, sizeof(GVirConfigDomainInterfaceFilterrefParameterPrivate)); +} + +static void gvir_config_domain_interface_filterref_parameter_init(GVirConfigDomainInterfaceFilterrefParameter *parameter) +{ + g_debug("Init GVirConfigDomainInterfaceFilterrefParameter=%p", parameter); + + parameter->priv = GVIR_CONFIG_DOMAIN_INTERFACE_FILTERREF_PARAMETER_GET_PRIVATE(parameter); +} + +GVirConfigDomainInterfaceFilterrefParameter *gvir_config_domain_interface_filterref_parameter_new(void) +{ + GVirConfigObject *object; + + object = gvir_config_object_new(GVIR_CONFIG_TYPE_DOMAIN_INTERFACE_FILTERREF_PARAMETER, + "parameter", NULL); + return GVIR_CONFIG_DOMAIN_INTERFACE_FILTERREF_PARAMETER(object); +} + +GVirConfigDomainInterfaceFilterrefParameter * +gvir_config_domain_interface_filterref_parameter_new_from_xml(const gchar *xml, GError **error) +{ + GVirConfigObject *object; + + object = gvir_config_object_new_from_xml(GVIR_CONFIG_TYPE_DOMAIN_INTERFACE_FILTERREF_PARAMETER, + "parameter", + NULL, + xml, + error); + + return GVIR_CONFIG_DOMAIN_INTERFACE_FILTERREF_PARAMETER(object); +} + +void gvir_config_domain_interface_filterref_parameter_set_name(GVirConfigDomainInterfaceFilterrefParameter *parameter, const gchar *name) +{ + g_return_if_fail(GVIR_CONFIG_IS_DOMAIN_INTERFACE_FILTERREF_PARAMETER(parameter)); + gvir_config_object_set_attribute(GVIR_CONFIG_OBJECT(parameter), + "name", name, NULL); +} + +void gvir_config_domain_interface_filterref_parameter_set_value(GVirConfigDomainInterfaceFilterrefParameter *parameter, const gchar *value) +{ + g_return_if_fail(GVIR_CONFIG_IS_DOMAIN_INTERFACE_FILTERREF_PARAMETER(parameter)); + gvir_config_object_set_attribute(GVIR_CONFIG_OBJECT(parameter), + "value", value, NULL); +} + +const gchar *gvir_config_domain_interface_filterref_parameter_get_name(GVirConfigDomainInterfaceFilterrefParameter *parameter) +{ + return gvir_config_object_get_attribute(GVIR_CONFIG_OBJECT(parameter), + NULL, + "name"); +} +const gchar *gvir_config_domain_interface_filterref_parameter_get_value(GVirConfigDomainInterfaceFilterrefParameter *parameter) +{ + return gvir_config_object_get_attribute(GVIR_CONFIG_OBJECT(parameter), + NULL, + "value"); +} + diff --git a/libvirt-gconfig/libvirt-gconfig-domain-interface-filterref-parameter.h b/libvirt-gconfig/libvirt-gconfig-domain-interface-filterref-parameter.h new file mode 100644 index 0000000..a768c84 --- /dev/null +++ b/libvirt-gconfig/libvirt-gconfig-domain-interface-filterref-parameter.h @@ -0,0 +1,75 @@ +/* + * libvirt-gconfig-domain-interface-filterref-parameter.h: + * libvirt filterref parameters + * + * Copyright (C) 2013 Red Hat, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see + * <http://www.gnu.org/licenses/>. + * + * Authors: Ian Main <imain(a)redhat.com> + * Daniel P. Berrange <berrange(a)redhat.com> + */ + +#if !defined(__LIBVIRT_GCONFIG_H__) && !defined(LIBVIRT_GCONFIG_BUILD) +#error "Only <libvirt-gconfig/libvirt-gconfig.h> can be included directly." +#endif + +#ifndef __LIBVIRT_GCONFIG_DOMAIN_INTERFACE_FILTERREF_PARAMETER_H__ +#define __LIBVIRT_GCONFIG_DOMAIN_INTERFACE_FILTERREF_PARAMETER_H__ + +G_BEGIN_DECLS + +#define GVIR_CONFIG_TYPE_DOMAIN_INTERFACE_FILTERREF_PARAMETER (gvir_config_domain_interface_filterref_parameter_get_type ()) +#define GVIR_CONFIG_DOMAIN_INTERFACE_FILTERREF_PARAMETER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GVIR_CONFIG_TYPE_DOMAIN_INTERFACE_FILTERREF_PARAMETER, GVirConfigDomainInterfaceFilterrefParameter)) +#define GVIR_CONFIG_DOMAIN_INTERFACE_FILTERREF_PARAMETER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GVIR_CONFIG_TYPE_DOMAIN_INTERFACE_FILTERREF_PARAMETER, GVirConfigDomainInterfaceFilterrefParameterClass)) +#define GVIR_CONFIG_IS_DOMAIN_INTERFACE_FILTERREF_PARAMETER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GVIR_CONFIG_TYPE_DOMAIN_INTERFACE_FILTERREF_PARAMETER)) +#define GVIR_CONFIG_IS_DOMAIN_INTERFACE_FILTERREF_PARAMETER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GVIR_CONFIG_TYPE_DOMAIN_INTERFACE_FILTERREF_PARAMETER)) +#define GVIR_CONFIG_DOMAIN_INTERFACE_FILTERREF_PARAMETER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GVIR_CONFIG_TYPE_DOMAIN_INTERFACE_FILTERREF_PARAMETER, GVirConfigDomainInterfaceFilterrefParameterClass)) + +typedef struct _GVirConfigDomainInterfaceFilterrefParameter GVirConfigDomainInterfaceFilterrefParameter; +typedef struct _GVirConfigDomainInterfaceFilterrefParameterPrivate GVirConfigDomainInterfaceFilterrefParameterPrivate; +typedef struct _GVirConfigDomainInterfaceFilterrefParameterClass GVirConfigDomainInterfaceFilterrefParameterClass; + +struct _GVirConfigDomainInterfaceFilterrefParameter +{ + GVirConfigObject parent; + + GVirConfigDomainInterfaceFilterrefParameterPrivate *priv; + + /* Do not add fields to this struct */ +}; + +struct _GVirConfigDomainInterfaceFilterrefParameterClass +{ + GVirConfigObjectClass parent_class; + + gpointer padding[20]; +}; + +GType gvir_config_domain_interface_filterref_parameter_get_type(void); + +GVirConfigDomainInterfaceFilterrefParameter *gvir_config_domain_interface_filterref_parameter_new(void); + +GVirConfigDomainInterfaceFilterrefParameter * +gvir_config_domain_interface_filterref_parameter_new_from_xml(const gchar *xml, GError **error); + +void gvir_config_domain_interface_filterref_parameter_set_name(GVirConfigDomainInterfaceFilterrefParameter *parameter, const gchar *name); +void gvir_config_domain_interface_filterref_parameter_set_value(GVirConfigDomainInterfaceFilterrefParameter *parameter, const gchar *value); +const gchar *gvir_config_domain_interface_filterref_parameter_get_name(GVirConfigDomainInterfaceFilterrefParameter *parameter); +const gchar *gvir_config_domain_interface_filterref_parameter_get_value(GVirConfigDomainInterfaceFilterrefParameter *parameter); + +G_END_DECLS + +#endif /* __LIBVIRT_GCONFIG_DOMAIN_INTERFACE_FILTERREF_PARAMETER_H__ */ diff --git a/libvirt-gconfig/libvirt-gconfig-domain-interface-filterref.c b/libvirt-gconfig/libvirt-gconfig-domain-interface-filterref.c new file mode 100644 index 0000000..c192249 --- /dev/null +++ b/libvirt-gconfig/libvirt-gconfig-domain-interface-filterref.c @@ -0,0 +1,159 @@ +/* + * libvirt-gconfig-domain-interface-network-filterref.c: + * libvirt filter reference config. + * + * Copyright (C) 2013 Red Hat, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see + * <http://www.gnu.org/licenses/>. + * + * Author: Ian Main <imain(a)redhat.com> + */ + +#include <config.h> + +#include "libvirt-gconfig/libvirt-gconfig.h" +#include "libvirt-gconfig/libvirt-gconfig-private.h" + +#define GVIR_CONFIG_DOMAIN_INTERFACE_FILTERREF_GET_PRIVATE(obj) \ + (G_TYPE_INSTANCE_GET_PRIVATE((obj), GVIR_CONFIG_TYPE_DOMAIN_INTERFACE_FILTERREF, GVirConfigDomainInterfaceFilterrefPrivate)) + +struct _GVirConfigDomainInterfaceFilterrefPrivate +{ + gboolean unused; +}; + +G_DEFINE_TYPE(GVirConfigDomainInterfaceFilterref, gvir_config_domain_interface_filterref, GVIR_CONFIG_TYPE_OBJECT); + +static void gvir_config_domain_interface_filterref_class_init(GVirConfigDomainInterfaceFilterrefClass *klass) +{ + g_type_class_add_private(klass, sizeof(GVirConfigDomainInterfaceFilterrefPrivate)); +} + +static void gvir_config_domain_interface_filterref_init(GVirConfigDomainInterfaceFilterref *filterref) +{ + g_debug("Init GVirConfigDomainInterfaceFilterref=%p", filterref); + + filterref->priv = GVIR_CONFIG_DOMAIN_INTERFACE_FILTERREF_GET_PRIVATE(filterref); +} + + +GVirConfigDomainInterfaceFilterref *gvir_config_domain_interface_filterref_new(void) +{ + GVirConfigObject *object; + + object = gvir_config_object_new(GVIR_CONFIG_TYPE_DOMAIN_INTERFACE_FILTERREF, + "filterref", NULL); + return GVIR_CONFIG_DOMAIN_INTERFACE_FILTERREF(object); +} + +GVirConfigDomainInterfaceFilterref *gvir_config_domain_interface_filterref_new_from_xml(const gchar *xml, + GError **error) +{ + GVirConfigObject *object; + + object = gvir_config_object_new_from_xml(GVIR_CONFIG_TYPE_DOMAIN_INTERFACE_FILTERREF, + "filterref", NULL, xml, error); + if (gvir_config_object_get_attribute(object, NULL, "filter") == NULL) { + g_object_unref(G_OBJECT(object)); + return NULL; + } + return GVIR_CONFIG_DOMAIN_INTERFACE_FILTERREF(object); +} + +void gvir_config_domain_interface_filterref_set_name(GVirConfigDomainInterfaceFilterref *filterref, + const char *filter) +{ + g_return_if_fail(GVIR_CONFIG_IS_DOMAIN_INTERFACE_FILTERREF(filterref)); + + gvir_config_object_set_attribute(GVIR_CONFIG_OBJECT(filterref), + "filter", filter, NULL); +} + +const char *gvir_config_domain_interface_filterref_get_name(GVirConfigDomainInterfaceFilterref *filterref) +{ + g_return_val_if_fail(GVIR_CONFIG_IS_DOMAIN_INTERFACE_FILTERREF(filterref), NULL); + return gvir_config_object_get_attribute(GVIR_CONFIG_OBJECT(filterref), + NULL, + "filter"); +} + +void gvir_config_domain_interface_filterref_add_parameter(GVirConfigDomainInterfaceFilterref *filterref, + GVirConfigDomainInterfaceFilterrefParameter *parameter) +{ + g_return_if_fail(GVIR_CONFIG_IS_DOMAIN_INTERFACE_FILTERREF(filterref)); + g_return_if_fail(GVIR_CONFIG_IS_DOMAIN_INTERFACE_FILTERREF_PARAMETER(parameter)); + + gvir_config_object_attach_add(GVIR_CONFIG_OBJECT(filterref), + GVIR_CONFIG_OBJECT(parameter)); +} + +struct GetParameterData { + GVirConfigXmlDoc *doc; + GList *parameters; +}; + + +static gboolean add_filterref_parameter(xmlNodePtr node, gpointer opaque) +{ + struct GetParameterData* data = (struct GetParameterData*)opaque; + GVirConfigObject *parameter; + + if (g_strcmp0((const gchar *)node->name, "parameter") != 0) { + g_debug("unexpected node %s", node->name); + return TRUE; + } + + parameter = gvir_config_object_new_from_tree(GVIR_CONFIG_TYPE_DOMAIN_INTERFACE_FILTERREF_PARAMETER, + data->doc, NULL, node); + if (parameter != NULL) + data->parameters = g_list_append(data->parameters, parameter); + else + g_debug("Failed to parse %s node", node->name); + + return TRUE; +} + +/** + * gvir_config_domain_interface_filterref_get_parameters: + * @filterref: a #GVirConfigDomainInterfaceFilterref + * + * Gets the list of parameters attached to @filterref. The returned list should be + * freed with g_list_free(), after its elements have been unreffed with + * g_object_unref(). + * + * Returns: (element-type LibvirtGConfig.DomainInterfaceFilterrefParameter) (transfer full): + * a newly allocated #GList of #GVirConfigDomainInterfaceFilterrefParameter. + */ +GList *gvir_config_domain_interface_filterref_get_parameters(GVirConfigDomainInterfaceFilterref *filterref) +{ + struct GetParameterData data; + + g_return_val_if_fail(GVIR_CONFIG_IS_DOMAIN_INTERFACE_FILTERREF(filterref), NULL); + + g_object_get(G_OBJECT(filterref), "doc", &data.doc, NULL); + data.parameters = NULL; + + gvir_config_object_foreach_child(GVIR_CONFIG_OBJECT(filterref), + NULL, + add_filterref_parameter, + &data); + + if (data.doc != NULL) { + g_object_unref(G_OBJECT(data.doc)); + } + + return data.parameters; +} + diff --git a/libvirt-gconfig/libvirt-gconfig-domain-interface-filterref.h b/libvirt-gconfig/libvirt-gconfig-domain-interface-filterref.h new file mode 100644 index 0000000..4a2bfd4 --- /dev/null +++ b/libvirt-gconfig/libvirt-gconfig-domain-interface-filterref.h @@ -0,0 +1,76 @@ +/* + * libvirt-gconfig-domain-interface-network-filterref.h: libvirt filter reference config + * + * Copyright (C) 2013 Red Hat, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see + * <http://www.gnu.org/licenses/>. + * + * Author: Ian Main <imain(a)redhat.com> + */ + +#if !defined(__LIBVIRT_GCONFIG_H__) && !defined(LIBVIRT_GCONFIG_BUILD) +#error "Only <libvirt-gconfig/libvirt-gconfig.h> can be included directly." +#endif + +#ifndef __LIBVIRT_GCONFIG_DOMAIN_INTERFACE_FILTERREF_H__ +#define __LIBVIRT_GCONFIG_DOMAIN_INTERFACE_FILTERREF_H__ + +G_BEGIN_DECLS + +#define GVIR_CONFIG_TYPE_DOMAIN_INTERFACE_FILTERREF (gvir_config_domain_interface_filterref_get_type ()) +#define GVIR_CONFIG_DOMAIN_INTERFACE_FILTERREF(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GVIR_CONFIG_TYPE_DOMAIN_INTERFACE_FILTERREF, GVirConfigDomainInterfaceFilterref)) +#define GVIR_CONFIG_DOMAIN_INTERFACE_FILTERREF_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GVIR_CONFIG_TYPE_DOMAIN_INTERFACE_FILTERREF, GVirConfigDomainInterfaceFilterrefClass)) +#define GVIR_CONFIG_IS_DOMAIN_INTERFACE_FILTERREF(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GVIR_CONFIG_TYPE_DOMAIN_INTERFACE_FILTERREF)) +#define GVIR_CONFIG_IS_DOMAIN_INTERFACE_FILTERREF_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GVIR_CONFIG_TYPE_DOMAIN_INTERFACE_FILTERREF)) +#define GVIR_CONFIG_DOMAIN_INTERFACE_FILTERREF_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GVIR_CONFIG_TYPE_DOMAIN_INTERFACE_FILTERREF, GVirConfigDomainInterfaceFilterrefClass)) + +typedef struct _GVirConfigDomainInterfaceFilterref GVirConfigDomainInterfaceFilterref; +typedef struct _GVirConfigDomainInterfaceFilterrefPrivate GVirConfigDomainInterfaceFilterrefPrivate; +typedef struct _GVirConfigDomainInterfaceFilterrefClass GVirConfigDomainInterfaceFilterrefClass; + +struct _GVirConfigDomainInterfaceFilterref +{ + GVirConfigObject parent; + + GVirConfigDomainInterfaceFilterrefPrivate *priv; + + /* Do not add fields to this struct */ +}; + +struct _GVirConfigDomainInterfaceFilterrefClass +{ + GVirConfigObjectClass parent_class; + + gpointer padding[20]; +}; + +GType gvir_config_domain_interface_filterref_get_type(void); + +GVirConfigDomainInterfaceFilterref *gvir_config_domain_interface_filterref_new(void); + +GVirConfigDomainInterfaceFilterref * +gvir_config_domain_interface_filterref_new_from_xml(const gchar *xml, GError **error); + +void gvir_config_domain_interface_filterref_set_name(GVirConfigDomainInterfaceFilterref *filterref, + const char *filter); +const char *gvir_config_domain_interface_filterref_get_name(GVirConfigDomainInterfaceFilterref *filterref); + +void gvir_config_domain_interface_filterref_add_parameter(GVirConfigDomainInterfaceFilterref *filterref, + GVirConfigDomainInterfaceFilterrefParameter *parameter); +GList *gvir_config_domain_interface_filterref_get_parameters(GVirConfigDomainInterfaceFilterref *filterref); + +G_END_DECLS + +#endif /* __LIBVIRT_GCONFIG_DOMAIN_INTERFACE_FILTERREF_H__ */ diff --git a/libvirt-gconfig/libvirt-gconfig-domain-interface.c b/libvirt-gconfig/libvirt-gconfig-domain-interface.c index 86a0c34..ce1b3f0 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-interface.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-interface.c @@ -131,6 +131,47 @@ const char *gvir_config_domain_interface_get_model(GVirConfigDomainInterface *in "model", "type"); } +/** + * gvir_config_domain_interface_set_filterref: + * @interface: a #GVirConfigDomainInterface + * @filterref: (allow-none): the filterref to set + */ +void gvir_config_domain_interface_set_filterref(GVirConfigDomainInterface *interface, + GVirConfigDomainInterfaceFilterref *filterref) +{ + g_return_if_fail(GVIR_CONFIG_IS_DOMAIN_INTERFACE(interface)); + g_return_if_fail(filterref == NULL || GVIR_CONFIG_IS_DOMAIN_INTERFACE_FILTERREF(filterref)); + + gvir_config_object_attach_replace(GVIR_CONFIG_OBJECT(interface), + "filterref", + GVIR_CONFIG_OBJECT(filterref)); +} + +/** + * gvir_config_domain_interface_get_filterref: + * @interface: a #GVirConfigDomainInterface + * + * Gets the filterref associated with the @interface + * + * Returns: (transfer full): A #GVirConfigDomainInterfaceFilterref. The returned + * object should be unreffed with g_object_unref() when no longer needed. + */ + +GVirConfigDomainInterfaceFilterref *gvir_config_domain_interface_get_filterref(GVirConfigDomainInterface *interface) +{ + GVirConfigObject *object; + + g_return_val_if_fail(GVIR_CONFIG_IS_DOMAIN_INTERFACE(interface), NULL); + + object = gvir_config_object_get_child_with_type + (GVIR_CONFIG_OBJECT(interface), + "filterref", + GVIR_CONFIG_TYPE_DOMAIN_INTERFACE_FILTERREF); + + return GVIR_CONFIG_DOMAIN_INTERFACE_FILTERREF(object); +} + + G_GNUC_INTERNAL GVirConfigDomainDevice * gvir_config_domain_interface_new_from_tree(GVirConfigXmlDoc *doc, xmlNodePtr tree) diff --git a/libvirt-gconfig/libvirt-gconfig-domain-interface.h b/libvirt-gconfig/libvirt-gconfig-domain-interface.h index 65c5d0b..2b0c22f 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-interface.h +++ b/libvirt-gconfig/libvirt-gconfig-domain-interface.h @@ -27,6 +27,8 @@ #ifndef __LIBVIRT_GCONFIG_DOMAIN_INTERFACE_H__ #define __LIBVIRT_GCONFIG_DOMAIN_INTERFACE_H__ +#include <libvirt-gconfig/libvirt-gconfig-domain-interface-filterref.h> + G_BEGIN_DECLS #define GVIR_CONFIG_TYPE_DOMAIN_INTERFACE (gvir_config_domain_interface_get_type ()) @@ -76,6 +78,9 @@ const char *gvir_config_domain_interface_get_ifname(GVirConfigDomainInterface *i GVirConfigDomainInterfaceLinkState gvir_config_domain_interface_get_link_state(GVirConfigDomainInterface *interface); const char *gvir_config_domain_interface_get_mac(GVirConfigDomainInterface *interface); const char *gvir_config_domain_interface_get_model(GVirConfigDomainInterface *interface); +void gvir_config_domain_interface_set_filterref(GVirConfigDomainInterface *interface, + GVirConfigDomainInterfaceFilterref *filterref); +GVirConfigDomainInterfaceFilterref *gvir_config_domain_interface_get_filterref(GVirConfigDomainInterface *interface); G_END_DECLS diff --git a/libvirt-gconfig/libvirt-gconfig.h b/libvirt-gconfig/libvirt-gconfig.h index 03e8ce7..af80241 100644 --- a/libvirt-gconfig/libvirt-gconfig.h +++ b/libvirt-gconfig/libvirt-gconfig.h @@ -64,6 +64,8 @@ #include <libvirt-gconfig/libvirt-gconfig-domain-input.h> #include <libvirt-gconfig/libvirt-gconfig-domain-interface.h> #include <libvirt-gconfig/libvirt-gconfig-domain-interface-bridge.h> +#include <libvirt-gconfig/libvirt-gconfig-domain-interface-filterref-parameter.h> +#include <libvirt-gconfig/libvirt-gconfig-domain-interface-filterref.h> #include <libvirt-gconfig/libvirt-gconfig-domain-interface-network.h> #include <libvirt-gconfig/libvirt-gconfig-domain-interface-user.h> #include <libvirt-gconfig/libvirt-gconfig-domain-memballoon.h> diff --git a/libvirt-gconfig/libvirt-gconfig.sym b/libvirt-gconfig/libvirt-gconfig.sym index 72eafc1..a5f8b05 100644 --- a/libvirt-gconfig/libvirt-gconfig.sym +++ b/libvirt-gconfig/libvirt-gconfig.sym @@ -608,6 +608,24 @@ global: gvir_config_domain_graphics_rdp_set_replace_user; gvir_config_object_new_from_xml; + + gvir_config_domain_interface_set_filterref; + gvir_config_domain_interface_get_filterref; + + gvir_config_domain_interface_filterref_get_type; + gvir_config_domain_interface_filterref_new; + gvir_config_domain_interface_filterref_new_from_xml; + gvir_config_domain_interface_filterref_set_name; + gvir_config_domain_interface_filterref_get_name; + gvir_config_domain_interface_filterref_add_parameter; + gvir_config_domain_interface_filterref_get_parameters; + gvir_config_domain_interface_filterref_parameter_get_type; + gvir_config_domain_interface_filterref_parameter_new; + gvir_config_domain_interface_filterref_parameter_new_from_xml; + gvir_config_domain_interface_filterref_parameter_set_name; + gvir_config_domain_interface_filterref_parameter_set_value; + gvir_config_domain_interface_filterref_parameter_get_name; + gvir_config_domain_interface_filterref_parameter_get_value; } LIBVIRT_GCONFIG_0.1.7; # .... define new API here using predicted next version number .... -- 1.8.1.4

2 3

[libvirt] [PATCH] Improve debugging of job enter/exit code
by Daniel P. Berrange 31 Oct '13

31 Oct '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> In debugging a recent oVirt/libvirt race condition, I was very frustrated by lack of logging in the job enter/exit code. This patch adds some key data which would have been useful in by debugging attempts. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/qemu/qemu_domain.c | 45 +++++++++++++++++++++++++++++++++++---------- 1 file changed, 35 insertions(+), 10 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index b8aec2d..81d0ba9 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -1014,6 +1014,12 @@ qemuDomainObjBeginJobInternal(virQEMUDriverPtr driver, bool nested = job == QEMU_JOB_ASYNC_NESTED; virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver); + VIR_DEBUG("Starting %s: %s (async=%s vm=%p name=%s)", + job == QEMU_JOB_ASYNC ? "async job" : "job", + qemuDomainJobTypeToString(job), + qemuDomainAsyncJobTypeToString(priv->job.asyncJob), + obj, obj->def->name); + priv->jobs_queued++; if (virTimeMillisNow(&now) < 0) { @@ -1032,11 +1038,13 @@ retry: } while (!nested && !qemuDomainNestedJobAllowed(priv, job)) { + VIR_DEBUG("Waiting for async job (vm=%p name=%s)", obj, obj->def->name); if (virCondWaitUntil(&priv->job.asyncCond, &obj->parent.lock, then) < 0) goto error; } while (priv->job.active) { + VIR_DEBUG("Waiting for job (vm=%p name=%s)", obj, obj->def->name); if (virCondWaitUntil(&priv->job.cond, &obj->parent.lock, then) < 0) goto error; } @@ -1049,14 +1057,16 @@ retry: qemuDomainObjResetJob(priv); if (job != QEMU_JOB_ASYNC) { - VIR_DEBUG("Starting job: %s (async=%s)", + VIR_DEBUG("Started job: %s (async=%s vm=%p name=%s)", qemuDomainJobTypeToString(job), - qemuDomainAsyncJobTypeToString(priv->job.asyncJob)); + qemuDomainAsyncJobTypeToString(priv->job.asyncJob), + obj, obj->def->name); priv->job.active = job; priv->job.owner = virThreadSelfID(); } else { - VIR_DEBUG("Starting async job: %s", - qemuDomainAsyncJobTypeToString(asyncJob)); + VIR_DEBUG("Started async job: %s (vm=%p name=%s)", + qemuDomainAsyncJobTypeToString(asyncJob), + obj, obj->def->name); qemuDomainObjResetAsyncJob(priv); priv->job.asyncJob = asyncJob; priv->job.asyncOwner = virThreadSelfID(); @@ -1161,9 +1171,10 @@ bool qemuDomainObjEndJob(virQEMUDriverPtr driver, virDomainObjPtr obj) priv->jobs_queued--; - VIR_DEBUG("Stopping job: %s (async=%s)", + VIR_DEBUG("Stopping job: %s (async=%s vm=%p name=%s)", qemuDomainJobTypeToString(job), - qemuDomainAsyncJobTypeToString(priv->job.asyncJob)); + qemuDomainAsyncJobTypeToString(priv->job.asyncJob), + obj, obj->def->name); qemuDomainObjResetJob(priv); if (qemuDomainTrackJob(job)) @@ -1180,8 +1191,9 @@ qemuDomainObjEndAsyncJob(virQEMUDriverPtr driver, virDomainObjPtr obj) priv->jobs_queued--; - VIR_DEBUG("Stopping async job: %s", - qemuDomainAsyncJobTypeToString(priv->job.asyncJob)); + VIR_DEBUG("Stopping async job: %s (vm=%p name=%s)", + qemuDomainAsyncJobTypeToString(priv->job.asyncJob), + obj, obj->def->name); qemuDomainObjResetAsyncJob(priv); qemuDomainObjSaveJob(driver, obj); @@ -1195,8 +1207,9 @@ qemuDomainObjAbortAsyncJob(virDomainObjPtr obj) { qemuDomainObjPrivatePtr priv = obj->privateData; - VIR_DEBUG("Requesting abort of async job: %s", - qemuDomainAsyncJobTypeToString(priv->job.asyncJob)); + VIR_DEBUG("Requesting abort of async job: %s (vm=%p name=%s)", + qemuDomainAsyncJobTypeToString(priv->job.asyncJob), + obj, obj->def->name); priv->job.asyncAbort = true; } @@ -1232,6 +1245,8 @@ qemuDomainObjEnterMonitorInternal(virQEMUDriverPtr driver, " monitor without asking for a nested job is dangerous"); } + VIR_DEBUG("Entering monitor (mon=%p vm=%p name=%s)", + priv->mon, obj, obj->def->name); virObjectLock(priv->mon); virObjectRef(priv->mon); ignore_value(virTimeMillisNow(&priv->monStart)); @@ -1253,6 +1268,8 @@ qemuDomainObjExitMonitorInternal(virQEMUDriverPtr driver, virObjectUnlock(priv->mon); virObjectLock(obj); + VIR_DEBUG("Exited monitor (mon=%p vm=%p name=%s)", + priv->mon, obj, obj->def->name); priv->monStart = 0; if (!hasRefs) @@ -1321,6 +1338,8 @@ qemuDomainObjEnterAgent(virDomainObjPtr obj) { qemuDomainObjPrivatePtr priv = obj->privateData; + VIR_DEBUG("Entering agent (agent=%p vm=%p name=%s)", + priv->agent, obj, obj->def->name); virObjectLock(priv->agent); virObjectRef(priv->agent); ignore_value(virTimeMillisNow(&priv->agentStart)); @@ -1344,6 +1363,8 @@ qemuDomainObjExitAgent(virDomainObjPtr obj) virObjectUnlock(priv->agent); virObjectLock(obj); + VIR_DEBUG("Exited agent (agent=%p vm=%p name=%s)", + priv->agent, obj, obj->def->name); priv->agentStart = 0; if (!hasRefs) @@ -1352,6 +1373,8 @@ qemuDomainObjExitAgent(virDomainObjPtr obj) void qemuDomainObjEnterRemote(virDomainObjPtr obj) { + VIR_DEBUG("Entering remote (vm=%p name=%s)", + obj, obj->def->name); virObjectRef(obj); virObjectUnlock(obj); } @@ -1359,6 +1382,8 @@ void qemuDomainObjEnterRemote(virDomainObjPtr obj) void qemuDomainObjExitRemote(virDomainObjPtr obj) { virObjectLock(obj); + VIR_DEBUG("Exited remote (vm=%p name=%s)", + obj, obj->def->name); virObjectUnref(obj); } -- 1.8.3.1

2 1

[libvirt] [PATCH] Improve debugging of QEMU start/stop
by Daniel P. Berrange 31 Oct '13

31 Oct '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> Include reference of the VM object pointer and name in debug logs for QEMU start/stop functions. Also make sure we log the PID that we started, since it isn't available elsewhere in the logs. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/qemu/qemu_process.c | 33 ++++++++++++--------------------- 1 file changed, 12 insertions(+), 21 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index bdffdf8..dd7566b 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -3499,6 +3499,9 @@ int qemuProcessStart(virConnectPtr conn, virQEMUDriverConfigPtr cfg; virCapsPtr caps = NULL; + VIR_DEBUG("vm=%p name=%s id=%d pid=%d", + vm, vm->def->name, vm->def->id, vm->pid); + /* Okay, these are just internal flags, * but doesn't hurt to check */ virCheckFlags(VIR_QEMU_PROCESS_START_COLD | @@ -3845,23 +3848,11 @@ int qemuProcessStart(virConnectPtr conn, _("Domain %s didn't show up"), vm->def->name); ret = -1; } -#if 0 - } else if (ret == -2) { - /* - * XXX this is bogus. It isn't safe to set vm->pid = child - * because the child no longer exists. - */ - - /* The virCommand process that launches the daemon failed. Pending on - * when it failed (we can't determine for sure), there may be - * extra info in the domain log (if the hook failed for example). - * - * Pretend like things succeeded, and let 'WaitForMonitor' report - * the log contents for us. - */ - vm->pid = child; - ret = 0; -#endif + VIR_DEBUG("QEMU vm=%p name=%s running with pid=%llu", + vm, vm->def->name, (unsigned long long)vm->pid); + } else { + VIR_DEBUG("QEMU vm=%p name=%s failed to spawn", + vm, vm->def->name); } VIR_DEBUG("Writing early domain status to disk"); @@ -4085,8 +4076,8 @@ qemuProcessKill(virDomainObjPtr vm, unsigned int flags) { int ret; - VIR_DEBUG("vm=%s pid=%d flags=%x", - vm->def->name, vm->pid, flags); + VIR_DEBUG("vm=%p name=%s pid=%d flags=%x", + vm, vm->def->name, vm->pid, flags); if (!(flags & VIR_QEMU_PROCESS_KILL_NOCHECK)) { if (!virDomainObjIsActive(vm)) { @@ -4126,8 +4117,8 @@ void qemuProcessStop(virQEMUDriverPtr driver, char ebuf[1024]; virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver); - VIR_DEBUG("Shutting down VM '%s' pid=%d flags=%x", - vm->def->name, vm->pid, flags); + VIR_DEBUG("Shutting down vm=%p name=%s id=%d pid=%d flags=%x", + vm, vm->def->name, vm->def->id, vm->pid, flags); if (!virDomainObjIsActive(vm)) { VIR_DEBUG("VM '%s' not active", vm->def->name); -- 1.8.3.1

2 1

[libvirt] [PATCH] storage: use correct type for array count
by Eric Blake 31 Oct '13

31 Oct '13

Using size_t counts will let us use VIR_APPEND_ELEMENT and friends. * src/conf/storage_conf.h (_virStoragePoolObjList) (_virStorageVolDefList): Track list sizes with size_t. * src/storage/storage_backend_rbd.c (virStorageBackendRBDRefreshPool): Fix type fallout. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- src/conf/storage_conf.h | 4 ++-- src/storage/storage_backend_rbd.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/conf/storage_conf.h b/src/conf/storage_conf.h index 251e897..d13cb99 100644 --- a/src/conf/storage_conf.h +++ b/src/conf/storage_conf.h @@ -112,7 +112,7 @@ struct _virStorageVolDef { typedef struct _virStorageVolDefList virStorageVolDefList; typedef virStorageVolDefList *virStorageVolDefListPtr; struct _virStorageVolDefList { - unsigned int count; + size_t count; virStorageVolDefPtr *objs; }; @@ -341,7 +341,7 @@ struct _virStoragePoolObj { typedef struct _virStoragePoolObjList virStoragePoolObjList; typedef virStoragePoolObjList *virStoragePoolObjListPtr; struct _virStoragePoolObjList { - unsigned int count; + size_t count; virStoragePoolObjPtr *objs; }; diff --git a/src/storage/storage_backend_rbd.c b/src/storage/storage_backend_rbd.c index 4e18bf9..b7a41c2 100644 --- a/src/storage/storage_backend_rbd.c +++ b/src/storage/storage_backend_rbd.c @@ -381,7 +381,7 @@ static int virStorageBackendRBDRefreshPool(virConnectPtr conn, pool->volumes.objs[pool->volumes.count++] = vol; } - VIR_DEBUG("Found %d images in RBD pool %s", + VIR_DEBUG("Found %zu images in RBD pool %s", pool->volumes.count, pool->def->source.name); ret = 0; -- 1.8.3.1

2 2

[libvirt] QEMU 1.6 and drive discard parameter
by whitearchey 31 Oct '13

31 Oct '13

In QEMU 1.6 parameters of 'drive' option were removed: QemuOptsList qemu_drive_opts = { .name = "drive", .head = QTAILQ_HEAD_INITIALIZER(qemu_drive_opts.head), .desc = { /* * no elements => accept any params * validation will happen later */ { /* end of list */ } }, }; But libvirt still checks for QEMU_CAPS_DRIVE_DISCARD using QMP query-command-line-options: static struct virQEMUCapsCommandLineProps virQEMUCapsCommandLine[] = { { "machine", "mem-merge", QEMU_CAPS_MEM_MERGE }, { "drive", "discard", QEMU_CAPS_DRIVE_DISCARD }, { "realtime", "mlock", QEMU_CAPS_MLOCK }, }; ... qemuMonitorGetCommandLineOptionParameters(mon, virQEMUCapsCommandLine[i].option, &values) So, when I try to use discard option in domain xml I get this error: error : qemuBuildDriveStr:3986 : unsupported configuration: discard is not supported by this QEMU binary

3 3

Re: [libvirt] Unable to provision VM attaching it directly to a OVS bridge
by Lucas Brasilino 31 Oct '13

31 Oct '13

Moving this discussion from libvirt-users: Getting deeper and deeper :) $ egrep '^int vir*' util/virnetdevopenvswitch.c int virNetDevOpenvswitchAddPort(const char *brname, const char *ifname, int virNetDevOpenvswitchRemovePort(const char *brname ATTRIBUTE_UNUSED, const char *ifname) int virNetDevOpenvswitchGetMigrateData(char **migrate, const char *ifname) int virNetDevOpenvswitchSetMigrateData(char *migrate, const char *ifname) Libvirt by now basically support adding/removing port to a OVS bridge . Is there some planning on an OVS full support, like bridge creation/destroy, creating a VM attaching it to a OVS brige, etc, just like 'traditional' Linux bridge ? If so, Is anybody working on it ? regards Lucas Brasilino MSc Student @ Federal University of Pernambuco (UFPE) twitter: @lucas_brasilino 2013/10/29 Lucas Brasilino <lrbbs(a)cin.ufpe.br>: > Hi > > Getting deeper, the error is raised by 'virDomainCreateLinux()'. > Here comes the snippet of the XML argument passed to this call: > > (Pdb) print xmlDesc > <domain type='kvm'> > <name>vm2</name> > <uuid>3d713513-e8ee-994a-0eba-51128bd4b42e</uuid> > [...] > <interface type='bridge'> > <source bridge='databr0'/> > <mac address='00:00:00:00:00:03'/> > <model type='virtio'/> > </interface> > [...] > </domain> > > So libvirt network driver is surely trying to use 'databr0' as the > common Linux bridge implementation, not an Open vSwitch bridge. > > I tried to add an > > <virtualport='openvswitch'/> > > element in the XML created by virt-install and use 'virsh create' to > create it but > seems that libvirt's network driver does not support Open vSwitch when > creating VM's. > Is there some planning to support it ? > > Thanks! > > regards > Lucas Brasilino > MSc Student @ Federal University of Pernambuco (UFPE) > twitter: @lucas_brasilino > > 2013/10/28 Lucas Brasilino <lrbbs(a)cin.ufpe.br>: >> Reposting from virt-tools mailing list: >> >> Hi! >> >> I'm facing a problem that could be triggered by some lacking >> of support from libvirt on Open vSwitch (or could be my mistake). >> >> I have interests in researching on virtual networks and >> SDN. To keep things simple, I've decided to use libvirt/virt-tools to >> manage VM's since my focus is on the network, instead of using a >> full feature system like OpenStack. >> >> I'm quite new with libvirt/virt-tools, but I have a good experience with >> openvswitch and other virtualizations technologies (which I dropped in >> libvirt/kvm favor). >> >> I'm using Fedora 19 packages >> >> openvswitch (1.11.0-1.fc19.x86_64) >> libvirt (1.0.5.6-3.fc19.x86_64) >> virt-install (0.10.0-4.fc19.noarch) >> >> I've created an OVS bridge (databr0) outside libvirt, and then defined it >> inside libvirt with: >> >> <network> >> <name>databr0</name> >> <forward mode='bridge'/> >> <bridge name='databr0'/> >> <virtualport type='openvswitch'/> >> </network> >> >> And then 'net-autostart' and 'net-start' it with virsh. Now I've got: >> # virsh net-list >> Name State Autostart Persistent >> ---------------------------------------------------------- >> databr0 active yes yes >> >> When I try to provision an VM, if I use the virt-install option >> "--network=bridge:databr0,model=virtio,mac=00:00:00:00:00:03" >> I got the following error: >> >> # virt-install --connect qemu:///system --virt-type kvm --name vm2 >> --ram 768 --disk path=/home/lucas/local/vm/images/vm2.img --vnc >> --cdrom /home/lucas/local/vm/fc19-x86_64.iso >> --network=bridge:databr0,model=virtio,mac=00:00:00:00:00:03 >> --os-type=linux --os-variant fedora19 >> >> Starting install... >> ERROR Unable to add bridge databr0 port vnet0: Operation not supported >> Domain installation does not appear to have been successful. >> If it was, you can restart your domain by running: >> virsh --connect qemu:///system start vm2 >> otherwise, please restart your installation. >> >> I just managed to create a VM when I use '--nonetworks' option and after >> I do a 'virtsh edit vm2' and add: >> >> <interface type='bridge'> >> <mac address='00:00:00:00:00:03'/> >> <source bridge='databr0'/> >> <virtualport type='openvswitch'/> >> <model type='virtio'/> >> <address type='pci' domain='0x0000' bus='0x00' slot='0x05' >> function='0x0'/> >> </interface> >> >> Well, I read elsewhere that openvswitch bridging isn't fully >> supported. Is it the case or I'm facing another kind of problem ? >> >> regards >> >> Att >> Lucas Brasilino >> MSc Student @ Federal University of Pernambuco (UFPE) >> twitter: @lucas_brasilino

2 3

[libvirt] [PATCH] LXC: mount /dev/pts/0 to /dev/console
by Gao feng 31 Oct '13

31 Oct '13

Now, /dev/console is linked to the /dev/pts/0, so for the process agetty, the tty device of agetty is pts/0. this will cause login container failed. since pts/0 is not in the /etc/securetty. so pam module pam_securetty will prevent the root user logging on the system. this patch doesn't make /dev/console a symbol but binds /dev/pts/0 to it. so the tty device of agetty will be console. root can login the system successfully. Signed-off-by: Gao feng <gaofeng(a)cn.fujitsu.com> --- src/lxc/lxc_container.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index 255c711..1cede41 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -1049,12 +1049,19 @@ static int lxcContainerSetupDevices(char **ttyPaths, size_t nttyPaths) return -1; } VIR_FREE(tty); - if (i == 0 && - symlink(ttyPaths[i], "/dev/console") < 0) { - virReportSystemError(errno, - _("Failed to symlink %s to /dev/console"), - ttyPaths[i]); - return -1; + if (i == 0) { + if (virFileTouch("/dev/console", 0600) < 0) { + virReportSystemError(errno, "%s", + _("Failed to create /dev/console")); + return -1; + } + + if (mount(ttyPaths[0], "/dev/console", NULL, MS_BIND, NULL) < 0) { + virReportSystemError(errno, + _("Failed to symlink %s to /dev/console"), + ttyPaths[i]); + return -1; + } } } return 0; -- 1.8.3.1

2 3

[libvirt] [PATCH] qemu: fix well-formed migration URI formatting
by Michael Chapman 31 Oct '13

31 Oct '13

When adding an automatically allocated port to a well-formed migration URI, keep it well-formed: tcp://1.2.3.4/ -> tcp://1.2.3.4/:12345 # wrong tcp://1.2.3.4/ -> tcp://1.2.3.4:12345/ # fixed tcp://1.2.3.4 -> tcp://1.2.3.4:12345 # still works tcp:1.2.3.4 -> tcp:1.2.3.4:12345 # still works (old syntax) Signed-off-by: Michael Chapman <mike(a)very.puzzling.org> --- src/qemu/qemu_migration.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 0439ba4..cb59620 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -2535,6 +2535,7 @@ qemuMigrationPrepareDirect(virQEMUDriverPtr driver, char *uri_str = NULL; int ret = -1; virURIPtr uri = NULL; + bool well_formed_uri = true; VIR_DEBUG("driver=%p, dconn=%p, cookiein=%s, cookieinlen=%d, " "cookieout=%p, cookieoutlen=%p, uri_in=%s, uri_out=%p, " @@ -2597,6 +2598,7 @@ qemuMigrationPrepareDirect(virQEMUDriverPtr driver, /* Convert uri_in to well-formed URI with // after tcp: */ if (!(STRPREFIX(uri_in, "tcp://"))) { + well_formed_uri = false; if (virAsprintf(&uri_str, "tcp://%s", p) < 0) goto cleanup; } @@ -2626,9 +2628,17 @@ qemuMigrationPrepareDirect(virQEMUDriverPtr driver, goto cleanup; } - /* Caller frees */ - if (virAsprintf(uri_out, "%s:%d", uri_in, port) < 0) - goto cleanup; + if (well_formed_uri) { + uri->port = port; + + /* Caller frees */ + if (!(*uri_out = virURIFormat(uri))) + goto cleanup; + } else { + /* Caller frees */ + if (virAsprintf(uri_out, "%s:%d", uri_in, port) < 0) + goto cleanup; + } } else { port = uri->port; -- 1.8.3.1

2 3

[libvirt] [PATCH]virsh: track alias option and improve error message when option duplicate its alias
by Chen Hanxiao 30 Oct '13

30 Oct '13

From: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> commit 2b172a8effa712aee97a21a64d2d02060958f9b2 allow alias to expand to opt=value pair. That means alias may not look alike since then. With this patch we will also track alias. If we type command with one option and another marked as its alias, we will get an error message like: error: option '--AA' duplicate its alias '--AAA' Signed-off-by: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> --- tools/virsh.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index bad78c9..423e2d8 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -1101,11 +1101,18 @@ vshCmddefGetOption(vshControl *ctl, const vshCmdDef *cmd, const char *name, if (VIR_STRDUP(*optstr, value + 1) < 0) goto cleanup; } + *opts_seen |= 1 << i; continue; } if ((*opts_seen & (1 << i)) && opt->type != VSH_OT_ARGV) { - vshError(ctl, _("option --%s already seen"), name); - goto cleanup; + if ((*opts_seen & (1 << (i - 1)))) { + vshError(ctl, _("option '--%s' duplicates its alias '--%s'"), + cmd->opts[i].name, cmd->opts[i-1].name); + goto cleanup; + } else { + vshError(ctl, _("option '--%s' already seen"), name); + goto cleanup; + } } *opts_seen |= 1 << i; *opt_index = i; -- 1.8.2.1

3 4