July 2012 - Devel - libvirt List Archives

[libvirt] libvirt + kvm external snapshots: use case?
by Cole Robinson 29 Jul '12

29 Jul '12

Forgive my ignorance, but I'm trying to fill in some details for a Fedora feature page: https://fedoraproject.org/w/index.php?title=Features/Virt_Live_Snapshots Yet things aren't working quite as expected in my tests. I'm trying to think of this from an end user use case perspective. For example - I want to test some changes to my vm, and either throw them away, or commit them to my base disk image. - I want to have a base disk image, but have multiple snapshots with various mutually exclusive VM changes in each, like one snapshot with libvirt 0.7.0 installed, another with 0.8.0 installed. I want to switch between them (maybe those assumptions are off base to begin with) So for a running guest, I do: virsh snapshot-create-as myvm snapshot1 "snapshot1 description" --disk-only virsh snapshot-create-as myvm snapshot2 "snapshot2 description" --disk-only I make some changes that I want to discard, so I try and switch back to the older vm and want to switch back to an older snapshot state, odo: virsh snapshot-revert myvm snapshot1 But I get: 'revert to external disk snapshot not supported yet'. Hmm, that kind of invalidates all my use cases then. Additionally I don't see any API option for merging snapshots, to fold my changes in snapshot2 into parent snapshot1 or similar. I tried using snapshot-delete, but that also fails with external disk snapshots: 'deletion of 1 external disk snapshots not supported yet' Additionally, there's the --atomic option to snapshot-create-as, but it fails for guests with more than 1 snapshotable disks: 'atomic live snapshot of multiple disks is unsupported'. But isn't that what some of the recent qemu additions explicitly supposed to support (that's the impression I got from jtc)? So am I missing anything? If not, are things just not fully wired up or are there missing chunks of functionality? And what's the use case for the current impl of disk snapshoting (while I've read around and found lot's of info about the implementation side of things, not too much about intended uses)? Thanks, Cole

3 4

[libvirt] [PATCH] esx: Improve error reporting for unknown VI types
by Matthias Bolte 29 Jul '12

29 Jul '12

Print the actual unknown type name instead of <other> for AnyType objects. --- src/esx/esx_vi.c | 2 +- src/esx/esx_vi_types.c | 36 +++++++++++++++++++++++++----------- src/esx/esx_vi_types.h | 1 + 3 files changed, 27 insertions(+), 12 deletions(-) diff --git a/src/esx/esx_vi.c b/src/esx/esx_vi.c index b1b5d70..9fa37e1 100644 --- a/src/esx/esx_vi.c +++ b/src/esx/esx_vi.c @@ -1481,7 +1481,7 @@ esxVI_Enumeration_CastFromAnyType(const esxVI_Enumeration *enumeration, virReportError(VIR_ERR_INTERNAL_ERROR, _("Expecting type '%s' but found '%s'"), esxVI_Type_ToString(enumeration->type), - esxVI_Type_ToString(anyType->type)); + esxVI_AnyType_TypeToString(anyType)); return -1; } diff --git a/src/esx/esx_vi_types.c b/src/esx/esx_vi_types.c index 9e67eff..cbc92d6 100644 --- a/src/esx/esx_vi_types.c +++ b/src/esx/esx_vi_types.c @@ -533,8 +533,8 @@ * Macros to implement dynamic dispatched functions */ -#define ESX_VI__TEMPLATE__DISPATCH(_actual_type, __type, _dispatch, \ - _error_return) \ +#define ESX_VI__TEMPLATE__DISPATCH(_actual_type, _actual_type_name, __type, \ + _dispatch, _error_return) \ switch (_actual_type) { \ _dispatch \ \ @@ -543,8 +543,8 @@ \ default: \ virReportError(VIR_ERR_INTERNAL_ERROR, \ - _("Call to %s for unexpected type '%s'"), __FUNCTION__,\ - esxVI_Type_ToString(_actual_type)); \ + _("Call to %s for unexpected type '%s'"), \ + __FUNCTION__, _actual_type_name); \ return _error_return; \ } @@ -586,7 +586,9 @@ #define ESX_VI__TEMPLATE__DYNAMIC_FREE(__type, _dispatch, _body) \ ESX_VI__TEMPLATE__FREE(__type, \ - ESX_VI__TEMPLATE__DISPATCH(item->_type, __type, _dispatch, \ + ESX_VI__TEMPLATE__DISPATCH(item->_type, \ + esxVI_Type_ToString(item->_type), \ + __type, _dispatch, \ /* nothing */) \ _body) @@ -620,14 +622,18 @@ #define ESX_VI__TEMPLATE__DYNAMIC_CAST_FROM_ANY_TYPE(__type, _dispatch) \ ESX_VI__TEMPLATE__CAST_FROM_ANY_TYPE_EXTRA(__type, esxVI_##__type, \ - ESX_VI__TEMPLATE__DISPATCH(anyType->type, __type, _dispatch, -1), \ + ESX_VI__TEMPLATE__DISPATCH(anyType->type, \ + esxVI_AnyType_TypeToString(anyType), \ + __type, _dispatch, -1), \ /* nothing */) #define ESX_VI__TEMPLATE__DYNAMIC_SERIALIZE(__type, _dispatch, _serialize) \ ESX_VI__TEMPLATE__SERIALIZE_EXTRA(__type, \ - ESX_VI__TEMPLATE__DISPATCH(item->_type, __type, _dispatch, -1), \ + ESX_VI__TEMPLATE__DISPATCH(item->_type, \ + esxVI_Type_ToString(item->_type), \ + __type, _dispatch, -1), \ _serialize) @@ -683,7 +689,7 @@ esxVI_GetActualObjectType(xmlNodePtr node, esxVI_Type baseType, *actualType = esxVI_Type_FromString(type); - if (*actualType == esxVI_Type_Undefined) { + if (*actualType == esxVI_Type_Undefined || *actualType == esxVI_Type_Other) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Unknown value '%s' for %s 'type' property"), type, esxVI_Type_ToString(baseType)); @@ -862,6 +868,16 @@ ESX_VI__TEMPLATE__FREE(AnyType, VIR_FREE(item->value); }) +const char * +esxVI_AnyType_TypeToString(esxVI_AnyType *anyType) +{ + if (anyType->type == esxVI_Type_Other) { + return anyType->other; + } else { + return esxVI_Type_ToString(anyType->type); + } +} + int esxVI_AnyType_ExpectType(esxVI_AnyType *anyType, esxVI_Type type) { @@ -869,9 +885,7 @@ esxVI_AnyType_ExpectType(esxVI_AnyType *anyType, esxVI_Type type) virReportError(VIR_ERR_INTERNAL_ERROR, _("Expecting type '%s' but found '%s'"), esxVI_Type_ToString(type), - anyType->type != esxVI_Type_Other - ? esxVI_Type_ToString(anyType->type) - : anyType->other); + esxVI_AnyType_TypeToString(anyType)); return -1; } diff --git a/src/esx/esx_vi_types.h b/src/esx/esx_vi_types.h index 3d843bf..d412a8f 100644 --- a/src/esx/esx_vi_types.h +++ b/src/esx/esx_vi_types.h @@ -154,6 +154,7 @@ struct _esxVI_AnyType { int esxVI_AnyType_Alloc(esxVI_AnyType **anyType); void esxVI_AnyType_Free(esxVI_AnyType **anyType); +const char *esxVI_AnyType_TypeToString(esxVI_AnyType *anyType); int esxVI_AnyType_ExpectType(esxVI_AnyType *anyType, esxVI_Type type); int esxVI_AnyType_DeepCopy(esxVI_AnyType **dest, esxVI_AnyType *src); int esxVI_AnyType_Deserialize(xmlNodePtr node, esxVI_AnyType **anyType); -- 1.7.4.1

2 2

[libvirt] [glib PATCH V3] Add bindings for virDomainRestore*()
by Jovanka Gulicoska 29 Jul '12

29 Jul '12

--- libvirt-gobject/libvirt-gobject-connection.c | 160 ++++++++++++++++++++++++++ libvirt-gobject/libvirt-gobject-connection.h | 20 ++++ libvirt-gobject/libvirt-gobject.sym | 3 + 3 files changed, 183 insertions(+) diff --git a/libvirt-gobject/libvirt-gobject-connection.c b/libvirt-gobject/libvirt-gobject-connection.c index 3a99034..54e4d2c 100644 --- a/libvirt-gobject/libvirt-gobject-connection.c +++ b/libvirt-gobject/libvirt-gobject-connection.c @@ -1605,3 +1605,163 @@ gvir_connection_get_capabilities_finish(GVirConnection *conn, return g_object_ref(caps); } + +/** + * gvir_connection_domain_restore_from_file: + * @conn: a #GVirConnection + * @filename: path to input file + * @custom_conf: (allow-none): configuration for domain or NULL + * @flags: the flags + * + * Returns: TRUE on success, FALSE otherwise + */ +gboolean gvir_connection_domain_restore_from_file(GVirConnection *conn, + gchar *filename, + GVirConfigDomain *custom_conf, + guint flags, + GError **err) +{ + GVirConnectionPrivate *priv; + int ret; + + g_return_val_if_fail(GVIR_IS_CONNECTION(conn), FALSE); + g_return_val_if_fail((filename != NULL), FALSE); + g_return_val_if_fail((err == NULL) || (*err == NULL), FALSE); + + priv = conn->priv; + + if(flags || (custom_conf != NULL)) { + gchar *custom_xml = NULL; + + if(custom_conf != NULL) + custom_xml = gvir_config_object_to_xml(GVIR_CONFIG_OBJECT(custom_conf)); + + ret = virDomainRestoreFlags(priv->conn, filename, custom_xml, flags); + g_free (custom_xml); + } + else { + ret = virDomainRestore(priv->conn, filename); + } + + if(ret < 0) { + gvir_set_error_literal(err, GVIR_CONNECTION_ERROR, + 0, + "Unable to restore domain"); + + return FALSE; + } + + return TRUE; +} + +typedef struct { + gchar *filename; + GVirConfigDomain *custom_conf; + guint flags; +} DomainRestoreFromFileData; + +static void domain_restore_from_file_data_free(DomainRestoreFromFileData *data) +{ + g_free(data->filename); + g_object_unref(data->custom_conf); + g_slice_free(DomainRestoreFromFileData, data); +} + + +static void +gvir_connection_domain_restore_from_file_helper + (GSimpleAsyncResult *res, + GObject *object, + GCancellable *cancellable G_GNUC_UNUSED) +{ + GVirConnection *conn = GVIR_CONNECTION(object); + DomainRestoreFromFileData *data; + GError *err = NULL; + + data = g_simple_async_result_get_op_res_gpointer(res); + + if(!gvir_connection_domain_restore_from_file(conn, data->filename, + data->custom_conf, + data->flags, &err)) + g_simple_async_result_take_error(res, err); +} + +/** + * gvir_connection_domain_restore_async: + * @conn: a #GVirConnection + * @filename: path to input file + * @custom_conf: (allow-none): configuration for domain + * @flags: the flags + * @cancellable: (allow-none) (transfer none):cancallation object + * @callback: (scope async): completion callback + * @user_data: (closure): opaque data for callback + * + * Asynchronous variant of #gvir_connection_domain_restore + */ +void +gvir_connection_domain_restore_from_file_async(GVirConnection *conn, + gchar *filename, + GVirConfigDomain *custom_conf, + guint flags, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data) +{ + GSimpleAsyncResult *res; + DomainRestoreFromFileData *data; + + g_return_if_fail(GVIR_IS_CONNECTION(conn)); + g_return_if_fail(filename != NULL); + g_return_if_fail((cancellable == NULL) || G_IS_CANCELLABLE(cancellable)); + + data = g_slice_new0(DomainRestoreFromFileData); + data->filename = g_strdup(filename); + if(custom_conf != NULL) + data->custom_conf = g_object_ref(custom_conf); + data->flags = flags; + + res = g_simple_async_result_new + (G_OBJECT(conn), + callback, + user_data, + gvir_connection_domain_restore_from_file_async); + g_simple_async_result_set_op_res_gpointer + (res, data, + (GDestroyNotify)domain_restore_from_file_data_free); + + g_simple_async_result_run_in_thread + (res, + gvir_connection_domain_restore_from_file_helper, + G_PRIORITY_DEFAULT, + cancellable); + + g_object_unref(res); +} + +/** + * gvir_connection_domain_finish: + * @conn: a #GVirConnection + * @result: (transfer none): async method result + * @err: Place-holder for possible errors + * + * Finishes the operation started by #gvir_domain_restore_async. + * + * Returns: TRUE if domain was restored successfully, FALSE otherwise. + */ +gboolean +gvir_connection_domain_restore_from_file_finish(GVirConnection *conn, + GAsyncResult *result, + GError **err) +{ + g_return_val_if_fail(GVIR_IS_CONNECTION(conn), FALSE); + g_return_val_if_fail(g_simple_async_result_is_valid + (result, G_OBJECT(conn), + gvir_connection_domain_restore_from_file_async), + FALSE); + + if (g_simple_async_result_propagate_error(G_SIMPLE_ASYNC_RESULT(result), + err)) + return FALSE; + + return TRUE; +} diff --git a/libvirt-gobject/libvirt-gobject-connection.h b/libvirt-gobject/libvirt-gobject-connection.h index c80eecf..f475918 100644 --- a/libvirt-gobject/libvirt-gobject-connection.h +++ b/libvirt-gobject/libvirt-gobject-connection.h @@ -202,6 +202,26 @@ gvir_connection_get_capabilities_finish(GVirConnection *conn, GAsyncResult *result, GError **err); +gboolean +gvir_connection_domain_restore_from_file(GVirConnection *conn, + gchar *filename, + GVirConfigDomain *custom_conf, + guint flags, + GError **err); + +void +gvir_connection_domain_restore_from_file_async(GVirConnection *conn, + gchar *filename, + GVirConfigDomain *custom_conf, + guint flags, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data); + +gboolean +gvir_connection_domain_restore_from_file_finish(GVirConnection *conn, + GAsyncResult *result, + GError **err); G_END_DECLS #endif /* __LIBVIRT_GOBJECT_CONNECTION_H__ */ diff --git a/libvirt-gobject/libvirt-gobject.sym b/libvirt-gobject/libvirt-gobject.sym index 54a093a..a2b0428 100644 --- a/libvirt-gobject/libvirt-gobject.sym +++ b/libvirt-gobject/libvirt-gobject.sym @@ -31,6 +31,9 @@ LIBVIRT_GOBJECT_0.0.8 { gvir_connection_create_storage_pool; gvir_connection_start_domain; gvir_connection_get_node_info; + gvir_connection_domain_restore_from_file; + gvir_connection_domain_restore_from_file_async; + gvir_connection_domain_restore_from_file_finish; gvir_domain_device_get_type; gvir_domain_device_get_domain; -- 1.7.10.4

2 1

[libvirt] [PATCH v4 3/3] ESX: Add routines to interface driver
by Ata E Husain Bohra 28 Jul '12

28 Jul '12

Updated the variable names to match vSphere terminology. Signed-off-by: Ata E Husain Bohra <ata.husain(a)hotmail.com> --- src/esx/esx_interface_driver.c | 179 ++++++++++++++++++++-------------------- src/esx/esx_vi.c | 30 +++---- src/esx/esx_vi.h | 6 +- 3 files changed, 107 insertions(+), 108 deletions(-) diff --git a/src/esx/esx_interface_driver.c b/src/esx/esx_interface_driver.c index 0b07259..ab8c13b 100644 --- a/src/esx/esx_interface_driver.c +++ b/src/esx/esx_interface_driver.c @@ -75,31 +75,32 @@ static int esxNumOfInterfaces(virConnectPtr conn) { esxPrivate *priv = conn->interfacePrivateData; - esxVI_HostVirtualNic *virtualNicList = NULL; - const esxVI_HostVirtualNic *virtualNic = NULL; + esxVI_HostVirtualNic *hostVirtualNicList = NULL; + const esxVI_HostVirtualNic *hostVirtualNic = NULL; int count = 0; if (esxVI_EnsureSession(priv->primary) < 0 || - esxVI_LookupVirtualNicList(priv->primary, &virtualNicList) < 0) { + esxVI_LookupHostVirtualNicList(priv->primary, + &hostVirtualNicList) < 0) { goto cleanup; } - if (virtualNicList == NULL) { - ESX_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", + if (hostVirtualNicList == NULL) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Could not retrieve vNic List")); goto cleanup; } - for (virtualNic = virtualNicList; - virtualNic != NULL; - virtualNic = virtualNic->_next) { + for (hostVirtualNic = hostVirtualNicList; + hostVirtualNic != NULL; + hostVirtualNic = hostVirtualNic->_next) { count++; } cleanup: - esxVI_HostVirtualNic_Free(&virtualNicList); + esxVI_HostVirtualNic_Free(&hostVirtualNicList); return count; } @@ -119,27 +120,27 @@ static int esxListInterfaces(virConnectPtr conn, char **names, int maxnames) { esxPrivate *priv = conn->interfacePrivateData; - esxVI_HostVirtualNic *virtualNicList = NULL; - const esxVI_HostVirtualNic *virtualNic = NULL; + esxVI_HostVirtualNic *hostVirtualNicList = NULL; + const esxVI_HostVirtualNic *hostVirtualNic = NULL; int result = -1; int i = 0; if (esxVI_EnsureSession(priv->primary) < 0 || - esxVI_LookupVirtualNicList(priv->primary, - &virtualNicList) < 0) { + esxVI_LookupHostVirtualNicList(priv->primary, + &hostVirtualNicList) < 0) { goto cleanup; } - if (virtualNicList == NULL) { - ESX_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", + if (hostVirtualNicList == NULL) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Could not retrieve vNIC List")); goto cleanup; } - for (i= 0, virtualNic = virtualNicList; - virtualNic != NULL && i < maxnames; - ++i, virtualNic = virtualNic->_next) { - names[i] = strdup(virtualNic->device); + for (i= 0, hostVirtualNic = hostVirtualNicList; + hostVirtualNic != NULL && i < maxnames; + ++i, hostVirtualNic = hostVirtualNic->_next) { + names[i] = strdup(hostVirtualNic->device); if (names[i] == NULL) { for(;i >=0;--i) { @@ -152,7 +153,7 @@ esxListInterfaces(virConnectPtr conn, char **names, int maxnames) result = i; cleanup: - esxVI_HostVirtualNic_Free(&virtualNicList); + esxVI_HostVirtualNic_Free(&hostVirtualNicList); return result; } @@ -174,41 +175,42 @@ static virInterfacePtr esxInterfaceLookupByName(virConnectPtr conn, const char *name) { esxPrivate *priv = conn->interfacePrivateData; - esxVI_HostVirtualNic *virtualNicList = NULL; - const esxVI_HostVirtualNic *virtualNic = NULL; + esxVI_HostVirtualNic *hostVirtualNicList = NULL; + const esxVI_HostVirtualNic *hostVirtualNic = NULL; virInterfacePtr ret = NULL; if (esxVI_EnsureSession(priv->primary) < 0 || - esxVI_LookupVirtualNicList(priv->primary, - &virtualNicList) < 0) { + esxVI_LookupHostVirtualNicList(priv->primary, + &hostVirtualNicList) < 0) { goto cleanup; } - if (virtualNicList == 0) { - ESX_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", + if (hostVirtualNicList == 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Could not retrieve vNIC List")); goto cleanup; } - for(virtualNic = virtualNicList; - virtualNic != NULL; - virtualNic = virtualNic->_next) { - if (STREQ(virtualNic->device, name)) { - if (virtualNic->spec == NULL || - virtualNic->spec->mac == NULL) { - ESX_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", + for(hostVirtualNic = hostVirtualNicList; + hostVirtualNic != NULL; + hostVirtualNic = hostVirtualNic->_next) { + if (STREQ(hostVirtualNic->device, name)) { + if (hostVirtualNic->spec == NULL || + hostVirtualNic->spec->mac == NULL) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Malformed HostVirtualNicSpec")); goto cleanup; } - ret = virGetInterface(conn, virtualNic->device, virtualNic->spec->mac); + ret = virGetInterface(conn, hostVirtualNic->device, + hostVirtualNic->spec->mac); break; } } cleanup: - esxVI_HostVirtualNic_Free(&virtualNicList); + esxVI_HostVirtualNic_Free(&hostVirtualNicList); return ret; } @@ -219,41 +221,42 @@ static virInterfacePtr esxInterfaceLookupByMACString(virConnectPtr conn, const char *mac) { esxPrivate *priv = conn->interfacePrivateData; - esxVI_HostVirtualNic *virtualNicList = NULL; - const esxVI_HostVirtualNic *virtualNic = NULL; + esxVI_HostVirtualNic *hostVirtualNicList = NULL; + const esxVI_HostVirtualNic *hostVirtualNic = NULL; virInterfacePtr ret = NULL; if (esxVI_EnsureSession(priv->primary) < 0 || - esxVI_LookupVirtualNicList(priv->primary, - &virtualNicList) < 0) { + esxVI_LookupHostVirtualNicList(priv->primary, + &hostVirtualNicList) < 0) { goto cleanup; } - if (virtualNicList == 0) { - ESX_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", + if (hostVirtualNicList == 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Could not retrieve vNIC List")); goto cleanup; } - for(virtualNic = virtualNicList; - virtualNic != NULL; - virtualNic = virtualNic->_next) { - if (virtualNic->spec == NULL || - virtualNic->spec->mac == NULL) { - ESX_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", + for(hostVirtualNic = hostVirtualNicList; + hostVirtualNic != NULL; + hostVirtualNic = hostVirtualNic->_next) { + if (hostVirtualNic->spec == NULL || + hostVirtualNic->spec->mac == NULL) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Malformed HostVirtualNicSpec")); goto cleanup; } - if (STREQ(virtualNic->spec->mac, mac)) { - ret = virGetInterface(conn, virtualNic->device, virtualNic->spec->mac); + if (STREQ(hostVirtualNic->spec->mac, mac)) { + ret = virGetInterface(conn, hostVirtualNic->device, + hostVirtualNic->spec->mac); break; } } cleanup: - esxVI_HostVirtualNic_Free(&virtualNicList); + esxVI_HostVirtualNic_Free(&hostVirtualNicList); return ret; } @@ -264,14 +267,14 @@ static char* esxInterfaceGetXMLDesc(virInterfacePtr iface, unsigned int flags) { esxPrivate *priv = iface->conn->interfacePrivateData; - esxVI_HostVirtualNic *virtualNicList = NULL; - const esxVI_HostVirtualNic *virtualNic = NULL; + esxVI_HostVirtualNic *hostVirtualNicList = NULL; + const esxVI_HostVirtualNic *hostVirtualNic = NULL; esxVI_PhysicalNic *physicalNicList = NULL; const esxVI_PhysicalNic *physicalNic = NULL; esxVI_PhysicalNic *matchingPhysicalNicList = NULL; esxVI_HostIpRouteConfig *ipRouteConfig = NULL; esxVI_HostPortGroup *portGroupList = NULL; - esxVI_HostVirtualSwitch *virtualSwitchList = NULL; + esxVI_HostVirtualSwitch *hostVirtualSwitchList = NULL; esxVI_String *propertyNameList = NULL; esxVI_ObjectContent *hostSystem = NULL; esxVI_DynamicProperty *dynamicProperty = NULL; @@ -304,7 +307,7 @@ esxInterfaceGetXMLDesc(virInterfacePtr iface, unsigned int flags) dynamicProperty = dynamicProperty->_next) { if (STREQ(dynamicProperty->name, "config.network.vnic")) { if (esxVI_HostVirtualNic_CastListFromAnyType( - dynamicProperty->val, &virtualNicList) < 0) { + dynamicProperty->val, &hostVirtualNicList) < 0) { goto cleanup; } } else if (STREQ(dynamicProperty->name, @@ -315,7 +318,7 @@ esxInterfaceGetXMLDesc(virInterfacePtr iface, unsigned int flags) } } else if (STREQ(dynamicProperty->name, "config.network.vswitch")) { if (esxVI_HostVirtualSwitch_CastListFromAnyType - (dynamicProperty->val, &virtualSwitchList) < 0) { + (dynamicProperty->val, &hostVirtualSwitchList) < 0) { goto cleanup; } } else if (STREQ(dynamicProperty->name, "config.network.pnic")) { @@ -333,36 +336,36 @@ esxInterfaceGetXMLDesc(virInterfacePtr iface, unsigned int flags) } } - if (!virtualNicList || + if (!hostVirtualNicList || !ipRouteConfig || - !virtualSwitchList || + !hostVirtualSwitchList || !portGroupList) { - ESX_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Unable to retrieve network parameters")); goto cleanup; } - for (virtualNic = virtualNicList; - virtualNic != NULL; - virtualNic = virtualNic->_next) { - if (STREQ(virtualNic->device, iface->name)) { + for (hostVirtualNic = hostVirtualNicList; + hostVirtualNic != NULL; + hostVirtualNic = hostVirtualNic->_next) { + if (STREQ(hostVirtualNic->device, iface->name)) { break; } } - if (virtualNic == NULL) { - ESX_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", + if (hostVirtualNic == NULL) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Could not find Interface")); goto cleanup; } - if (esxVI_LookupPhysicalNicFromPortGroup(virtualNic->portgroup, + if (esxVI_LookupPhysicalNicFromPortGroup(hostVirtualNic->portgroup, portGroupList, - virtualSwitchList, + hostVirtualSwitchList, physicalNicList, &matchingPhysicalNicList) < 0) { - ESX_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("No Physical NIC found matching Virtual NIC's portgroup")); goto cleanup; } @@ -377,24 +380,24 @@ esxInterfaceGetXMLDesc(virInterfacePtr iface, unsigned int flags) } def->type = VIR_INTERFACE_TYPE_BRIDGE; - def->name = strdup(virtualNic->device); - if (virtualNic->spec->mtu && virtualNic->spec->mtu->value) { - def->mtu = virtualNic->spec->mtu->value; + def->name = strdup(hostVirtualNic->device); + if (hostVirtualNic->spec->mtu && hostVirtualNic->spec->mtu->value) { + def->mtu = hostVirtualNic->spec->mtu->value; } else { def->mtu = 1500; } def->startmode = VIR_INTERFACE_START_ONBOOT; - if (!use_static && virtualNic->spec->mac) { - def->mac = strdup(virtualNic->spec->mac); + if (!use_static && hostVirtualNic->spec->mac) { + def->mac = strdup(hostVirtualNic->spec->mac); } /* TODO - Handle VLAN (via portgroup?) */ - if (virtualNic->spec->ip->subnetMask && - *virtualNic->spec->ip->subnetMask && - inet_aton(virtualNic->spec->ip->subnetMask, &addr) == 0) { - ESX_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", + if (hostVirtualNic->spec->ip->subnetMask && + *hostVirtualNic->spec->ip->subnetMask && + inet_aton(hostVirtualNic->spec->ip->subnetMask, &addr) == 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Error parsing netmask")); goto cleanup; } @@ -424,13 +427,13 @@ esxInterfaceGetXMLDesc(virInterfacePtr iface, unsigned int flags) } def->protos[i]->family = strdup("ipv4"); - if (virtualNic->spec->ip->dhcp == 1) { + if (hostVirtualNic->spec->ip->dhcp == 1) { def->protos[i]->dhcp = 1; } def->protos[i]->nips = 1; - if (virtualNic->spec->ip->dhcp != 1 || !use_static) { - if (virtualNic->spec->ip->ipAddress && - *virtualNic->spec->ip->ipAddress) { + if (hostVirtualNic->spec->ip->dhcp != 1 || !use_static) { + if (hostVirtualNic->spec->ip->ipAddress && + *hostVirtualNic->spec->ip->ipAddress) { int j =0; if (VIR_ALLOC_N(def->protos[i]->ips, def->protos[i]->nips) < 0) { @@ -444,7 +447,7 @@ esxInterfaceGetXMLDesc(virInterfacePtr iface, unsigned int flags) goto cleanup; } def->protos[i]->ips[0]->address = - strdup(virtualNic->spec->ip->ipAddress); + strdup(hostVirtualNic->spec->ip->ipAddress); def->protos[i]->ips[0]->prefix = masklen; def->protos[i]->gateway = strdup(ipRouteConfig->defaultGateway); @@ -493,11 +496,11 @@ esxInterfaceGetXMLDesc(virInterfacePtr iface, unsigned int flags) } cleanup: - esxVI_HostVirtualNic_Free(&virtualNicList); + esxVI_HostVirtualNic_Free(&hostVirtualNicList); esxVI_PhysicalNic_Free(&physicalNicList); esxVI_PhysicalNic_Free(&matchingPhysicalNicList); esxVI_HostPortGroup_Free(&portGroupList); - esxVI_HostVirtualSwitch_Free(&virtualSwitchList); + esxVI_HostVirtualSwitch_Free(&hostVirtualSwitchList); esxVI_HostIpRouteConfig_Free(&ipRouteConfig); esxVI_ObjectContent_Free(&hostSystem); esxVI_String_Free(&propertyNameList); @@ -517,7 +520,7 @@ esxInterfaceUndefine(virInterfacePtr iface) priv->primary, priv->primary->hostSystem->configManager->networkSystem, iface->name) < 0) { - ESX_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Error deleting interface")); return -1; } @@ -528,10 +531,8 @@ esxInterfaceUndefine(virInterfacePtr iface) static int -esxInterfaceCreate(virInterfacePtr iface, unsigned int flags) +esxInterfaceCreate(virInterfacePtr iface ATTRIBUTE_UNUSED, unsigned int flags) { - iface->conn->interfacePrivateData = NULL; - virCheckFlags(0, -1); /* ESX interfaces are always active */ @@ -541,10 +542,8 @@ esxInterfaceCreate(virInterfacePtr iface, unsigned int flags) static int -esxInterfaceDestroy(virInterfacePtr iface, unsigned int flags) +esxInterfaceDestroy(virInterfacePtr iface ATTRIBUTE_UNUSED, unsigned int flags) { - iface->conn->interfacePrivateData = NULL; - virCheckFlags(0, -1); /* ESX interfaces can not be deactivated */ diff --git a/src/esx/esx_vi.c b/src/esx/esx_vi.c index e5f92b2..41c9be3 100644 --- a/src/esx/esx_vi.c +++ b/src/esx/esx_vi.c @@ -4570,8 +4570,8 @@ esxVI_LookupManagedObjectHelper(esxVI_Context *ctx, } int -esxVI_LookupVirtualNicList(esxVI_Context* ctx, - esxVI_HostVirtualNic** virtualNicList) +esxVI_LookupHostVirtualNicList(esxVI_Context* ctx, + esxVI_HostVirtualNic** hostVirtualNicList) { int result = -1; esxVI_String *propertyNameList = NULL; @@ -4585,7 +4585,7 @@ esxVI_LookupVirtualNicList(esxVI_Context* ctx, } if (hostSystem == NULL) { - ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Could not retrieve the HostSystem object")); goto cleanup; @@ -4596,7 +4596,7 @@ esxVI_LookupVirtualNicList(esxVI_Context* ctx, dynamicProperty = dynamicProperty->_next) { if (STREQ(dynamicProperty->name, "config.network.vnic")) { if (esxVI_HostVirtualNic_CastListFromAnyType(dynamicProperty->val, - virtualNicList) < 0) { + hostVirtualNicList) < 0) { goto cleanup; } break; @@ -4618,20 +4618,20 @@ int esxVI_LookupPhysicalNicFromPortGroup( const char *portgroup, const esxVI_HostPortGroup *portGroupList, - const esxVI_HostVirtualSwitch *virtualSwitchList, + const esxVI_HostVirtualSwitch *hostVirtualSwitchList, const esxVI_PhysicalNic *physicalNicList, esxVI_PhysicalNic **ret_physicalNicList) { int result = -1; const esxVI_HostPortGroup *portGroup = NULL; - const esxVI_HostVirtualSwitch *virtualSwitch = NULL; + const esxVI_HostVirtualSwitch *hostVirtualSwitch = NULL; esxVI_PhysicalNic *matchingPhysicalNicList = NULL; const esxVI_PhysicalNic *physicalNic = NULL; esxVI_PhysicalNic *tempPhysicalNic = NULL; const esxVI_String *pnicKey = NULL; if (portgroup == NULL) { - ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("No Portgroup found!")); goto cleanup; } @@ -4646,28 +4646,28 @@ esxVI_LookupPhysicalNicFromPortGroup( } if (portGroup == NULL) { - ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Could not find Host port group")); goto cleanup; } /* Go through all the virtual switches to find the one that matches */ - for (virtualSwitch = virtualSwitchList; - virtualSwitch != NULL; - virtualSwitch = virtualSwitch->_next) { - if (STREQ(portGroup->spec->vswitchName, virtualSwitch->name)) { + for (hostVirtualSwitch = hostVirtualSwitchList; + hostVirtualSwitch != NULL; + hostVirtualSwitch = hostVirtualSwitch->_next) { + if (STREQ(portGroup->spec->vswitchName, hostVirtualSwitch->name)) { break; } } - if (virtualSwitch == NULL) { - ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", + if (hostVirtualSwitch == NULL) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Could not find Virtual Switch")); goto cleanup; } /* Go through all physical nics */ - for (pnicKey = virtualSwitch->pnic; + for (pnicKey = hostVirtualSwitch->pnic; pnicKey != NULL; pnicKey = pnicKey->_next) { /* O(n^2), but probably faster than a hash due to small N */ diff --git a/src/esx/esx_vi.h b/src/esx/esx_vi.h index 54b53ec..9f75d84 100644 --- a/src/esx/esx_vi.h +++ b/src/esx/esx_vi.h @@ -499,13 +499,13 @@ int esxVI_ParseHostCpuIdInfo(esxVI_ParsedHostCpuIdInfo *parsedHostCpuIdInfo, int esxVI_ProductVersionToDefaultVirtualHWVersion(esxVI_ProductVersion productVersion); -int esxVI_LookupVirtualNicList(esxVI_Context* ctx, - esxVI_HostVirtualNic** virtualNicList); +int esxVI_LookupHostVirtualNicList(esxVI_Context* ctx, + esxVI_HostVirtualNic** virtualNicList); int esxVI_LookupPhysicalNicFromPortGroup( const char *portgroup, const esxVI_HostPortGroup *portGroupList, - const esxVI_HostVirtualSwitch *virtualSwitchList, + const esxVI_HostVirtualSwitch *hostVirtualSwitchList, const esxVI_PhysicalNic *physicalNicList, esxVI_PhysicalNic **ret_physicalNicList); -- 1.7.9.5

1 0

[libvirt] [PATCH v4 2/3] ESX: Add routines to interface driver
by Ata E Husain Bohra 28 Jul '12

28 Jul '12

Use ATTRIBUTE_UNUSED for unused variable. Signed-off-by: Ata E Husain Bohra <ata.husain(a)hotmail.com> --- src/esx/esx_interface_driver.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/src/esx/esx_interface_driver.c b/src/esx/esx_interface_driver.c index 1c1aaf2..0b07259 100644 --- a/src/esx/esx_interface_driver.c +++ b/src/esx/esx_interface_driver.c @@ -107,10 +107,8 @@ cleanup: static int -esxNumOfDefinedInterfaces(virConnectPtr conn) +esxNumOfDefinedInterfaces(virConnectPtr conn ATTRIBUTE_UNUSED) { - conn->interfacePrivateData = NULL; - // ESX interfaces are always active return 0; } @@ -162,14 +160,10 @@ esxListInterfaces(virConnectPtr conn, char **names, int maxnames) static int -esxListDefinedInterfaces(virConnectPtr conn, char **names, int maxnames) +esxListDefinedInterfaces(virConnectPtr conn ATTRIBUTE_UNUSED, + char **names ATTRIBUTE_UNUSED, + int maxnames ATTRIBUTE_UNUSED) { - conn->interfacePrivateData = conn->privateData; - *names = NULL; - - /* keeps compiler happy */ - VIR_DEBUG("max interfaces: %d", maxnames); - // ESX interfaces are always active return 0; } -- 1.7.9.5

1 0

[libvirt] [PATCH v4 1/3] ESX: Add routines to interface driver
by Ata E Husain Bohra 28 Jul '12

28 Jul '12

Add following routines to esx_interface_driver: esxNumOfInterfaces, esxNumOfDefinedInterfaces, esxListInterfaces, esxListDefinedInterfaces, esxInterfaceLookupByMACString, esxInterfaceGetXMLDesc, esxInterfaceUndefine, esxInterfaceCreate, esxInterfaceDestroy Signed-off-by: Ata E Husain Bohra <ata.husain(a)hotmail.com> --- src/esx/esx_interface_driver.c | 506 +++++++++++++++++++++++++++++++++++++++- src/esx/esx_vi.c | 126 ++++++++++ src/esx/esx_vi.h | 10 + src/esx/esx_vi_generator.input | 227 ++++++++++++++++++ src/esx/esx_vi_generator.py | 31 ++- src/esx/esx_vi_types.c | 18 +- 6 files changed, 913 insertions(+), 5 deletions(-) diff --git a/src/esx/esx_interface_driver.c b/src/esx/esx_interface_driver.c index 501409a..1c1aaf2 100644 --- a/src/esx/esx_interface_driver.c +++ b/src/esx/esx_interface_driver.c @@ -23,6 +23,9 @@ */ #include <config.h> +#include <sys/socket.h> +#include <netinet/in.h> +#include <arpa/inet.h> #include "internal.h" #include "util.h" @@ -34,6 +37,7 @@ #include "esx_vi.h" #include "esx_vi_methods.h" #include "esx_util.h" +#include "interface_conf.h" #define VIR_FROM_THIS VIR_FROM_ESX @@ -67,10 +71,508 @@ esxInterfaceClose(virConnectPtr conn) +static int +esxNumOfInterfaces(virConnectPtr conn) +{ + esxPrivate *priv = conn->interfacePrivateData; + esxVI_HostVirtualNic *virtualNicList = NULL; + const esxVI_HostVirtualNic *virtualNic = NULL; + int count = 0; + + if (esxVI_EnsureSession(priv->primary) < 0 || + esxVI_LookupVirtualNicList(priv->primary, &virtualNicList) < 0) { + goto cleanup; + } + + if (virtualNicList == NULL) { + ESX_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", + _("Could not retrieve vNic List")); + + goto cleanup; + } + + for (virtualNic = virtualNicList; + virtualNic != NULL; + virtualNic = virtualNic->_next) { + count++; + } + +cleanup: + + esxVI_HostVirtualNic_Free(&virtualNicList); + + return count; +} + + + +static int +esxNumOfDefinedInterfaces(virConnectPtr conn) +{ + conn->interfacePrivateData = NULL; + + // ESX interfaces are always active + return 0; +} + + + +static int +esxListInterfaces(virConnectPtr conn, char **names, int maxnames) +{ + esxPrivate *priv = conn->interfacePrivateData; + esxVI_HostVirtualNic *virtualNicList = NULL; + const esxVI_HostVirtualNic *virtualNic = NULL; + int result = -1; + int i = 0; + + if (esxVI_EnsureSession(priv->primary) < 0 || + esxVI_LookupVirtualNicList(priv->primary, + &virtualNicList) < 0) { + goto cleanup; + } + + if (virtualNicList == NULL) { + ESX_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", + _("Could not retrieve vNIC List")); + goto cleanup; + } + + for (i= 0, virtualNic = virtualNicList; + virtualNic != NULL && i < maxnames; + ++i, virtualNic = virtualNic->_next) { + names[i] = strdup(virtualNic->device); + + if (names[i] == NULL) { + for(;i >=0;--i) { + VIR_FREE(names[i]); + } + virReportOOMError(); + goto cleanup; + } + } + + result = i; + cleanup: + esxVI_HostVirtualNic_Free(&virtualNicList); + + return result; +} + + + +static int +esxListDefinedInterfaces(virConnectPtr conn, char **names, int maxnames) +{ + conn->interfacePrivateData = conn->privateData; + *names = NULL; + + /* keeps compiler happy */ + VIR_DEBUG("max interfaces: %d", maxnames); + + // ESX interfaces are always active + return 0; +} + + + +static virInterfacePtr +esxInterfaceLookupByName(virConnectPtr conn, const char *name) +{ + esxPrivate *priv = conn->interfacePrivateData; + esxVI_HostVirtualNic *virtualNicList = NULL; + const esxVI_HostVirtualNic *virtualNic = NULL; + virInterfacePtr ret = NULL; + + if (esxVI_EnsureSession(priv->primary) < 0 || + esxVI_LookupVirtualNicList(priv->primary, + &virtualNicList) < 0) { + goto cleanup; + } + + if (virtualNicList == 0) { + ESX_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", + _("Could not retrieve vNIC List")); + goto cleanup; + } + + + for(virtualNic = virtualNicList; + virtualNic != NULL; + virtualNic = virtualNic->_next) { + if (STREQ(virtualNic->device, name)) { + if (virtualNic->spec == NULL || + virtualNic->spec->mac == NULL) { + ESX_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", + _("Malformed HostVirtualNicSpec")); + goto cleanup; + } + + ret = virGetInterface(conn, virtualNic->device, virtualNic->spec->mac); + break; + } + } + + cleanup: + esxVI_HostVirtualNic_Free(&virtualNicList); + + return ret; +} + + + +static virInterfacePtr +esxInterfaceLookupByMACString(virConnectPtr conn, const char *mac) +{ + esxPrivate *priv = conn->interfacePrivateData; + esxVI_HostVirtualNic *virtualNicList = NULL; + const esxVI_HostVirtualNic *virtualNic = NULL; + virInterfacePtr ret = NULL; + + if (esxVI_EnsureSession(priv->primary) < 0 || + esxVI_LookupVirtualNicList(priv->primary, + &virtualNicList) < 0) { + goto cleanup; + } + + if (virtualNicList == 0) { + ESX_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", + _("Could not retrieve vNIC List")); + goto cleanup; + } + + + for(virtualNic = virtualNicList; + virtualNic != NULL; + virtualNic = virtualNic->_next) { + if (virtualNic->spec == NULL || + virtualNic->spec->mac == NULL) { + ESX_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", + _("Malformed HostVirtualNicSpec")); + goto cleanup; + } + + if (STREQ(virtualNic->spec->mac, mac)) { + ret = virGetInterface(conn, virtualNic->device, virtualNic->spec->mac); + break; + } + } + + cleanup: + esxVI_HostVirtualNic_Free(&virtualNicList); + + return ret; +} + + + +static char* +esxInterfaceGetXMLDesc(virInterfacePtr iface, unsigned int flags) +{ + esxPrivate *priv = iface->conn->interfacePrivateData; + esxVI_HostVirtualNic *virtualNicList = NULL; + const esxVI_HostVirtualNic *virtualNic = NULL; + esxVI_PhysicalNic *physicalNicList = NULL; + const esxVI_PhysicalNic *physicalNic = NULL; + esxVI_PhysicalNic *matchingPhysicalNicList = NULL; + esxVI_HostIpRouteConfig *ipRouteConfig = NULL; + esxVI_HostPortGroup *portGroupList = NULL; + esxVI_HostVirtualSwitch *virtualSwitchList = NULL; + esxVI_String *propertyNameList = NULL; + esxVI_ObjectContent *hostSystem = NULL; + esxVI_DynamicProperty *dynamicProperty = NULL; + virInterfaceDefPtr def = NULL; + int use_static = 0; + struct in_addr addr; + uint32_t host_addr = 0; + int zero_count = 0; + int masklen = 0; + int i = 0; + char *ret = NULL; + + if (VIR_INTERFACE_XML_INACTIVE & flags) { + use_static = 1; + } + + if (esxVI_EnsureSession(priv->primary) < 0 || + esxVI_String_AppendValueListToList(&propertyNameList, + "config.network.vnic\0" + "config.network.ipRouteConfig\0" + "config.network.vswitch\0" + "config.network.pnic\0" + "config.network.portgroup\0") < 0 || + esxVI_LookupHostSystemProperties(priv->primary, propertyNameList, + &hostSystem) < 0) { + goto cleanup; + } + + for (dynamicProperty = hostSystem->propSet; dynamicProperty != NULL; + dynamicProperty = dynamicProperty->_next) { + if (STREQ(dynamicProperty->name, "config.network.vnic")) { + if (esxVI_HostVirtualNic_CastListFromAnyType( + dynamicProperty->val, &virtualNicList) < 0) { + goto cleanup; + } + } else if (STREQ(dynamicProperty->name, + "config.network.ipRouteConfig")) { + if (esxVI_HostIpRouteConfig_CastFromAnyType( + dynamicProperty->val, &ipRouteConfig)) { + goto cleanup; + } + } else if (STREQ(dynamicProperty->name, "config.network.vswitch")) { + if (esxVI_HostVirtualSwitch_CastListFromAnyType + (dynamicProperty->val, &virtualSwitchList) < 0) { + goto cleanup; + } + } else if (STREQ(dynamicProperty->name, "config.network.pnic")) { + if (esxVI_PhysicalNic_CastListFromAnyType( + dynamicProperty->val, &physicalNicList) < 0) { + goto cleanup; + } + } else if (STREQ(dynamicProperty->name, "config.network.portgroup")) { + if (esxVI_HostPortGroup_CastListFromAnyType( + dynamicProperty->val, &portGroupList) < 0) { + goto cleanup; + } + } else { + VIR_WARN("Unexpected '%s' property", dynamicProperty->name); + } + } + + if (!virtualNicList || + !ipRouteConfig || + !virtualSwitchList || + !portGroupList) { + ESX_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", + _("Unable to retrieve network parameters")); + + goto cleanup; + } + + for (virtualNic = virtualNicList; + virtualNic != NULL; + virtualNic = virtualNic->_next) { + if (STREQ(virtualNic->device, iface->name)) { + break; + } + } + + if (virtualNic == NULL) { + ESX_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", + _("Could not find Interface")); + goto cleanup; + } + + if (esxVI_LookupPhysicalNicFromPortGroup(virtualNic->portgroup, + portGroupList, + virtualSwitchList, + physicalNicList, + &matchingPhysicalNicList) < 0) { + ESX_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", + _("No Physical NIC found matching Virtual NIC's portgroup")); + goto cleanup; + } + + /* + * populate virInterfaceDef object to obtain + * libvirt interface domain xml. + */ + if (VIR_ALLOC(def) < 0) { + virReportOOMError(); + goto cleanup; + } + + def->type = VIR_INTERFACE_TYPE_BRIDGE; + def->name = strdup(virtualNic->device); + if (virtualNic->spec->mtu && virtualNic->spec->mtu->value) { + def->mtu = virtualNic->spec->mtu->value; + } else { + def->mtu = 1500; + } + + def->startmode = VIR_INTERFACE_START_ONBOOT; + + if (!use_static && virtualNic->spec->mac) { + def->mac = strdup(virtualNic->spec->mac); + } + + /* TODO - Handle VLAN (via portgroup?) */ + if (virtualNic->spec->ip->subnetMask && + *virtualNic->spec->ip->subnetMask && + inet_aton(virtualNic->spec->ip->subnetMask, &addr) == 0) { + ESX_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", + _("Error parsing netmask")); + goto cleanup; + } + + host_addr = ntohl(addr.s_addr); + /* Calculate masklen */ + for (i = 0; i < 32; ++i) { + if (host_addr & 0x01) { + break; + } + zero_count++; + host_addr >>= 1; + } + masklen = 32 - zero_count; + + /* append protocol field */ + def->nprotos = 1; + if (VIR_ALLOC_N(def->protos, def->nprotos) < 0) { + virReportOOMError(); + goto cleanup; + } + + /* TODO - Add IPv6 Support */ + for (i = 0; i < def->nprotos; ++i) { + if (VIR_ALLOC(def->protos[i]) < 0) { + goto cleanup; + } + + def->protos[i]->family = strdup("ipv4"); + if (virtualNic->spec->ip->dhcp == 1) { + def->protos[i]->dhcp = 1; + } + def->protos[i]->nips = 1; + if (virtualNic->spec->ip->dhcp != 1 || !use_static) { + if (virtualNic->spec->ip->ipAddress && + *virtualNic->spec->ip->ipAddress) { + int j =0; + if (VIR_ALLOC_N(def->protos[i]->ips, def->protos[i]->nips) + < 0) { + virReportOOMError(); + goto cleanup; + } + + for (j=0; j < def->protos[i]->nips; ++j) { + if (VIR_ALLOC(def->protos[i]->ips[j]) < 0) { + virReportOOMError(); + goto cleanup; + } + def->protos[i]->ips[0]->address = + strdup(virtualNic->spec->ip->ipAddress); + def->protos[i]->ips[0]->prefix = masklen; + def->protos[i]->gateway = + strdup(ipRouteConfig->defaultGateway); + } + } + } + } + + /* Add bridge information */ + def->data.bridge.stp = 0; /* off */ + + /** + * traversing physical nic list twice, first to get total + * interfaces and second to populate interface items. + * Total Complexity ~= O(N); also total physical nics + * cannot be that large number + */ + for (physicalNic = matchingPhysicalNicList, i = 0; physicalNic != NULL; + physicalNic = physicalNic->_next, ++i) { + } + + if ( i > 0) { + if (VIR_ALLOC_N(def->data.bridge.itf, i) < 0) { + virReportOOMError(); + goto cleanup; + } + def->data.bridge.nbItf = i; + for (physicalNic = matchingPhysicalNicList, i = 0; physicalNic != NULL; + physicalNic = physicalNic->_next, ++i) { + virInterfaceDefPtr itf = NULL; + if (VIR_ALLOC(itf) < 0) { + virReportOOMError(); + goto cleanup; + } + itf->type = VIR_INTERFACE_TYPE_ETHERNET; + itf->name = strdup(physicalNic->device); + itf->mac = strdup(physicalNic->mac); + + def->data.bridge.itf[i] = itf; + } + } + + ret = virInterfaceDefFormat(def); + if (!ret) { + goto cleanup; + } + + cleanup: + esxVI_HostVirtualNic_Free(&virtualNicList); + esxVI_PhysicalNic_Free(&physicalNicList); + esxVI_PhysicalNic_Free(&matchingPhysicalNicList); + esxVI_HostPortGroup_Free(&portGroupList); + esxVI_HostVirtualSwitch_Free(&virtualSwitchList); + esxVI_HostIpRouteConfig_Free(&ipRouteConfig); + esxVI_ObjectContent_Free(&hostSystem); + esxVI_String_Free(&propertyNameList); + virInterfaceDefFree(def); + + return ret; +} + + + +static int +esxInterfaceUndefine(virInterfacePtr iface) +{ + esxPrivate *priv = iface->conn->interfacePrivateData; + + if (esxVI_RemoveVirtualNic( + priv->primary, + priv->primary->hostSystem->configManager->networkSystem, + iface->name) < 0) { + ESX_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", + _("Error deleting interface")); + return -1; + } + + return 0; +} + + + +static int +esxInterfaceCreate(virInterfacePtr iface, unsigned int flags) +{ + iface->conn->interfacePrivateData = NULL; + + virCheckFlags(0, -1); + + /* ESX interfaces are always active */ + return 0; +} + + + +static int +esxInterfaceDestroy(virInterfacePtr iface, unsigned int flags) +{ + iface->conn->interfacePrivateData = NULL; + + virCheckFlags(0, -1); + + /* ESX interfaces can not be deactivated */ + return 1; +} + + + static virInterfaceDriver esxInterfaceDriver = { .name = "ESX", - .open = esxInterfaceOpen, /* 0.7.6 */ - .close = esxInterfaceClose, /* 0.7.6 */ + .open = esxInterfaceOpen, /* 0.7.6 */ + .close = esxInterfaceClose, /* 0.7.6 */ + .numOfInterfaces = esxNumOfInterfaces, /* 0.9.x */ + .numOfDefinedInterfaces = esxNumOfDefinedInterfaces, /* 0.9.x */ + .listInterfaces = esxListInterfaces, /* 0.9.x */ + .listDefinedInterfaces = esxListDefinedInterfaces, /* 0.9.x */ + .interfaceLookupByName = esxInterfaceLookupByName, /* 0.9.x */ + .interfaceLookupByMACString = esxInterfaceLookupByMACString, /* 0.9.x */ + .interfaceGetXMLDesc = esxInterfaceGetXMLDesc, /* 0.9.x */ + .interfaceUndefine = esxInterfaceUndefine, /* 0.9.x */ + .interfaceCreate = esxInterfaceCreate, /* 0.9.x */ + .interfaceDestroy = esxInterfaceDestroy, /* 0.9.x */ }; diff --git a/src/esx/esx_vi.c b/src/esx/esx_vi.c index ab79afe..e5f92b2 100644 --- a/src/esx/esx_vi.c +++ b/src/esx/esx_vi.c @@ -4569,6 +4569,132 @@ esxVI_LookupManagedObjectHelper(esxVI_Context *ctx, return result; } +int +esxVI_LookupVirtualNicList(esxVI_Context* ctx, + esxVI_HostVirtualNic** virtualNicList) +{ + int result = -1; + esxVI_String *propertyNameList = NULL; + esxVI_DynamicProperty *dynamicProperty = NULL; + esxVI_ObjectContent* hostSystem = NULL; + + if (esxVI_String_AppendValueListToList( + &propertyNameList, "config.network.vnic\0") < 0 || + esxVI_LookupHostSystemProperties(ctx, propertyNameList, &hostSystem) < 0) { + goto cleanup; + } + if (hostSystem == NULL) { + ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", + _("Could not retrieve the HostSystem object")); + + goto cleanup; + } + + for (dynamicProperty = hostSystem->propSet; + dynamicProperty != NULL; + dynamicProperty = dynamicProperty->_next) { + if (STREQ(dynamicProperty->name, "config.network.vnic")) { + if (esxVI_HostVirtualNic_CastListFromAnyType(dynamicProperty->val, + virtualNicList) < 0) { + goto cleanup; + } + break; + } else { + VIR_WARN("Unexpected '%s' property", dynamicProperty->name); + } + } + + result = 0; + +cleanup: + esxVI_String_Free(&propertyNameList); + esxVI_ObjectContent_Free(&hostSystem); + + return result; +} + +int +esxVI_LookupPhysicalNicFromPortGroup( + const char *portgroup, + const esxVI_HostPortGroup *portGroupList, + const esxVI_HostVirtualSwitch *virtualSwitchList, + const esxVI_PhysicalNic *physicalNicList, + esxVI_PhysicalNic **ret_physicalNicList) +{ + int result = -1; + const esxVI_HostPortGroup *portGroup = NULL; + const esxVI_HostVirtualSwitch *virtualSwitch = NULL; + esxVI_PhysicalNic *matchingPhysicalNicList = NULL; + const esxVI_PhysicalNic *physicalNic = NULL; + esxVI_PhysicalNic *tempPhysicalNic = NULL; + const esxVI_String *pnicKey = NULL; + + if (portgroup == NULL) { + ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", + _("No Portgroup found!")); + goto cleanup; + } + + /* Go through all the port groups to find the one that matches. */ + for (portGroup = portGroupList; + portGroup != NULL; + portGroup = portGroup->_next) { + if (STREQ(portGroup->spec->name, portgroup)) { + break; + } + } + + if (portGroup == NULL) { + ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", + _("Could not find Host port group")); + goto cleanup; + } + + /* Go through all the virtual switches to find the one that matches */ + for (virtualSwitch = virtualSwitchList; + virtualSwitch != NULL; + virtualSwitch = virtualSwitch->_next) { + if (STREQ(portGroup->spec->vswitchName, virtualSwitch->name)) { + break; + } + } + + if (virtualSwitch == NULL) { + ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", + _("Could not find Virtual Switch")); + goto cleanup; + } + + /* Go through all physical nics */ + for (pnicKey = virtualSwitch->pnic; + pnicKey != NULL; + pnicKey = pnicKey->_next) { + /* O(n^2), but probably faster than a hash due to small N */ + for (physicalNic = physicalNicList; + physicalNic != NULL; + physicalNic = physicalNic->_next) { + + if (STREQ(pnicKey->value, physicalNic->key)) { + if (esxVI_PhysicalNic_DeepCopy(&tempPhysicalNic, + (esxVI_PhysicalNic *)physicalNic) < 0 || + esxVI_PhysicalNic_AppendToList(&matchingPhysicalNicList, + tempPhysicalNic) < 0) { + goto cleanup; + } + tempPhysicalNic = NULL; + } + } + } + + *ret_physicalNicList = matchingPhysicalNicList; + matchingPhysicalNicList = NULL; /* no cleanup needed */ + tempPhysicalNic = NULL; /* no cleanup needed */ + result = 0; + cleanup: + esxVI_PhysicalNic_Free(&matchingPhysicalNicList); + esxVI_PhysicalNic_Free(&tempPhysicalNic); + return result; +} #include "esx_vi.generated.c" diff --git a/src/esx/esx_vi.h b/src/esx/esx_vi.h index 4b84be8..54b53ec 100644 --- a/src/esx/esx_vi.h +++ b/src/esx/esx_vi.h @@ -499,6 +499,16 @@ int esxVI_ParseHostCpuIdInfo(esxVI_ParsedHostCpuIdInfo *parsedHostCpuIdInfo, int esxVI_ProductVersionToDefaultVirtualHWVersion(esxVI_ProductVersion productVersion); +int esxVI_LookupVirtualNicList(esxVI_Context* ctx, + esxVI_HostVirtualNic** virtualNicList); + +int esxVI_LookupPhysicalNicFromPortGroup( + const char *portgroup, + const esxVI_HostPortGroup *portGroupList, + const esxVI_HostVirtualSwitch *virtualSwitchList, + const esxVI_PhysicalNic *physicalNicList, + esxVI_PhysicalNic **ret_physicalNicList); + # include "esx_vi.generated.h" #endif /* __ESX_VI_H__ */ diff --git a/src/esx/esx_vi_generator.input b/src/esx/esx_vi_generator.input index 1a67a8c..64f8389 100644 --- a/src/esx/esx_vi_generator.input +++ b/src/esx/esx_vi_generator.input @@ -57,6 +57,29 @@ enum AutoStartWaitHeartbeatSetting systemDefault end +enum HostConfigChangeOperation + add + edit + remove +end + +enum HostIpConfigIpV6AdressStatus + deprecated + duplicate + inaccessible + invalid + preferred + tentative + unknown +end + +enum HostIpConfigV6AdressConfigType + dhcp + linklayer + manual + other + random +end enum ManagedEntityStatus gray @@ -197,6 +220,12 @@ object DeviceBackedVirtualDiskSpec extends VirtualDiskSpec String device r end +object DistributedVirtualSwitchPortConnection + Int connectionCookie o + String portgroupKey o + String portKey o + String switchUuid r +end object DynamicProperty String name r @@ -316,6 +345,34 @@ object HostFileSystemVolume Long capacity r end +object HostIpConfig + Boolean dhcp r + String ipAddress o + HostIpConfigIpV6AddressConfiguration ipV6Config o + String subnetMask o +end + +object HostIpConfigIpV6Address + String dadState o + String ipAddress r + DateTime lifetime o + String operation o + String origin o + Int prefixLength r +end + +object HostIpConfigIpV6AddressConfiguration + Boolean autoConfigurationEnabled o + Boolean dhcpV6Enabled o + HostIpConfigIpV6Address ipV6Address ol +end + +object HostIpRouteConfig + String defaultGateway o + String gatewayDevice o + String ipV6DefaultGateway o + String ipV6GatewayDevice o +end object HostMountInfo String path o @@ -331,11 +388,131 @@ object HostNasVolume extends HostFileSystemVolume end +object HostNicTeamingPolicy + String policy o + Boolean reversePolicy o + Boolean notifySwitches o + Boolean rollingOrder o + HostNicFailureCriteria failureCriteria o + HostNicOrderPolicy nicOrder o +end + +object HostNetOffloadCapabilities + Boolean csumOffload o + Boolean tcpSegmentation o + Boolean zeroCopyXmit o +end + +object HostNetworkSecurityPolicy + Boolean allowPromiscuous o + Boolean macChanges o + Boolean forgedTransmits o +end + +object HostNetworkPolicy + HostNetworkSecurityPolicy security o + HostNicTeamingPolicy nicTeaming o + HostNetOffloadCapabilities offloadPolicy o + HostNetworkTrafficShapingPolicy shapingPolicy o +end + +object HostNetworkTrafficShapingPolicy + Boolean enabled o +end + +object HostNicFailureCriteria + String checkSpeed o + Int speed o + Boolean checkDuplex o + Boolean fullDuplex o + Boolean checkErrorPercent o + Int percentage o + Boolean checkBeacon o +end + +object HostNicOrderPolicy + String activeNic ol + String standbyNic ol +end + +object HostPortGroup + String key r + HostPortGroupPort port ol + String vswitch r + HostNetworkPolicy computedPolicy r + HostPortGroupSpec spec r +end + +object HostPortGroupPort + String key o + String mac ol + String type r +end + +object HostPortGroupSpec + String name r + Int vlanId r + String vswitchName r + HostNetworkPolicy policy r +end + object HostScsiDiskPartition String diskName r Int partition r end +object HostVirtualNic + String device r + String key r + String port o + String portgroup r + HostVirtualNicSpec spec r +end + +object HostVirtualNicSpec + DistributedVirtualSwitchPortConnection distributedVirtualPort o + HostIpConfig ip o + String mac o + Int mtu o + String portgroup o + Boolean tsoEnabled o +end + + +object HostVirtualSwitch + String key r + Int mtu o + String name r + Int numPorts r + Int numPortsAvailable r + String pnic ol + String portgroup ol + HostVirtualSwitchSpec spec r +end + +object HostVirtualSwitchBridge +end + +object HostVirtualSwitchAutoBridge extends HostVirtualSwitchBridge + String excludedNicDevice ol +end + +object HostVirtualSwitchBeaconBridge extends HostVirtualSwitchBridge + Int interval r +end + +object HostVirtualSwitchBondBridge extends HostVirtualSwitchBridge + HostVirtualSwitchBeaconBridge beacon o + LinkDiscoveryProtocolConfig linkDiscoveryProtocolConfig o + String nicDevice rl +end + +object HostVirtualSwitchSpec + HostVirtualSwitchBridge bridge o + Int mtu o + Int numPorts r + HostNetworkPolicy policy o +end object HostVmfsVolume extends HostFileSystemVolume Int blockSizeMb r @@ -355,6 +532,10 @@ end object IsoImageFileQuery extends FileQuery end +object LinkDiscoveryProtocolConfig + String operation r + String protocol r +end object LocalDatastoreInfo extends DatastoreInfo String path o @@ -398,6 +579,10 @@ object OptionType Boolean valueIsReadonly o end +object OptionValue + String key r + AnyType value r +end object PerfCounterInfo Int key r @@ -454,6 +639,27 @@ object PerfSampleInfo Int interval r end +object PhysicalNic + String device r + String driver o + String key o + PhysicalNicInfo linkSpeed o + String mac r + String pci r + PhysicalNicSpec spec r + PhysicalNicInfo validLinkSpecification ol + Boolean wakeOnLanSupported r +end + +object PhysicalNicInfo + Boolean duplex r + Int speedMb r +end + +object PhysicalNicSpec + HostIpConfig ip o + PhysicalNicInfo linkSpeed o +end object PropertyChange String name r @@ -773,6 +979,13 @@ end # Methods # +method AddVirtualNic returns String r + ManagedObjectReference _this r + String portgroup r + HostVirtualNicSpec nic r +end + + method AnswerVM ManagedObjectReference _this r String questionId r @@ -954,6 +1167,10 @@ method RemoveSnapshot_Task returns ManagedObjectReference r Boolean removeChildren r end +method RemoveVirtualNic + ManagedObjectReference _this r + String device r +end method RetrieveProperties returns ObjectContent ol ManagedObjectReference _this:propertyCollector r @@ -1002,6 +1219,16 @@ method UnregisterVM ManagedObjectReference _this r end +method UpdateIpRouteConfig + ManagedObjectReference _this r + HostIpRouteConfig config r +end + +method UpdateVirtualNic + ManagedObjectReference _this r + String device r + HostVirtualNicSpec nic r +end method WaitForUpdates returns UpdateSet r ManagedObjectReference _this:propertyCollector r diff --git a/src/esx/esx_vi_generator.py b/src/esx/esx_vi_generator.py index 910478c..c45be6a 100755 --- a/src/esx/esx_vi_generator.py +++ b/src/esx/esx_vi_generator.py @@ -371,8 +371,12 @@ class Property(Member): % self.name elif self.occurrence in [OCCURRENCE__REQUIRED_LIST, OCCURRENCE__OPTIONAL_LIST]: - return " ESX_VI__TEMPLATE__PROPERTY__DESERIALIZE_LIST(%s, %s)\n" \ - % (self.type, self.name) + if self.type == "String": + return " ESX_VI__TEMPLATE__PROPERTY__DESERIALIZE_STRING_LIST(%s, %s)\n" \ + % (self.type, self.name) + else: + return " ESX_VI__TEMPLATE__PROPERTY__DESERIALIZE_LIST(%s, %s)\n" \ + % (self.type, self.name) elif self.type == "String": return " ESX_VI__TEMPLATE__PROPERTY__DESERIALIZE_VALUE(String, %s)\n" \ % self.name @@ -1519,8 +1523,31 @@ additional_object_features = { "AutoStartDefaults" : Object.FEATURE__AN Object.FEATURE__ANY_TYPE, "HostDatastoreBrowserSearchResults" : Object.FEATURE__LIST | Object.FEATURE__ANY_TYPE, + "HostIpConfig" : Object.FEATURE__DEEP_COPY, + "HostIpRouteConfig" : Object.FEATURE__ANY_TYPE, + "HostIpConfigIpV6Address" : Object.FEATURE__LIST | + Object.FEATURE__ANY_TYPE | + Object.FEATURE__DEEP_COPY, + "HostIpConfigIpV6AddressConfiguration" : Object.FEATURE__DEEP_COPY, + "HostPortGroup" : Object.FEATURE__LIST | + Object.FEATURE__ANY_TYPE, + "HostVirtualNic" : Object.FEATURE__ANY_TYPE | + Object.FEATURE__LIST, + "HostVirtualSwitch" : Object.FEATURE__ANY_TYPE | + Object.FEATURE__LIST, + "KeyValue" : Object.FEATURE__ANY_TYPE, "ManagedObjectReference" : Object.FEATURE__ANY_TYPE, + "PhysicalNic" : Object.FEATURE__LIST | + Object.FEATURE__ANY_TYPE | + Object.FEATURE__DEEP_COPY, "ObjectContent" : Object.FEATURE__DEEP_COPY, + "OptionValue" : Object.FEATURE__ANY_TYPE | + Object.FEATURE__LIST, + "PhysicalNic" : Object.FEATURE__LIST | + Object.FEATURE__ANY_TYPE | + Object.FEATURE__DEEP_COPY, + "PhysicalNicSpec" : Object.FEATURE__DEEP_COPY, + "PhysicalNicLinkInfo" : Object.FEATURE__LIST, "ResourcePoolResourceUsage" : Object.FEATURE__ANY_TYPE, "ServiceContent" : Object.FEATURE__DESERIALIZE, "SharesInfo" : Object.FEATURE__ANY_TYPE, diff --git a/src/esx/esx_vi_types.c b/src/esx/esx_vi_types.c index a0efb68..47c3b20 100644 --- a/src/esx/esx_vi_types.c +++ b/src/esx/esx_vi_types.c @@ -475,7 +475,23 @@ continue; \ } - +#define ESX_VI__TEMPLATE__PROPERTY__DESERIALIZE_STRING_LIST(_type, _name) \ + if (xmlStrEqual(childNode->name, BAD_CAST #_name)) { \ + char *value = NULL; \ + \ + if (esxVI_String_DeserializeValue(childNode, &value) < 0 || \ + value == NULL) { \ + goto failure; \ + } \ + \ + if (esxVI_##_type##_AppendValueToList(&(*ptrptr)->_name, \ + value) < 0) { \ + VIR_FREE(value); \ + goto failure; \ + } \ + \ + continue; \ + } /* * A required property must be != 0 (NULL for pointers, "undefined" == 0 for -- 1.7.9.5

1 0

[libvirt] [libvirt-php] Bug(?) in getting domain resource from sub-function
by Katelyn Schiesser 28 Jul '12

28 Jul '12

Hi everyone! I ran into a rather annoying bug this evening. It appears that having a special function to connect to libvirt (in a class), like: <?php function libvirtConnect(){ return libvirt_connect('qemu+tls://'.$this->hostname.':16514/system', false); } ?> ..causes any calls to get a domain resource to be corrupted somehow, like: <?php function getDomainResource(){ $lvd = $this->libvirtConnect(); return libvirt_domain_lookup_by_uuid_string($lvd, $this->uuid); } function doSomething(){ $res = $this->getDomainResource(); libvirt_domain_create($res); } ?> This throws a warning: invalid domain pointer in virDomainGetXMLDesc However, doing everything in one function, or maunally doing a libvirt_connect(), makes everything work fine. Which is why my bug senses are tingling- or am I just not understanding how LV pointers work? libvirt_version returns: $ php -r 'print_r(libvirt_version());' Array ( [libvirt.release] => 3 [libvirt.minor] => 8 [libvirt.major] => 0 [connector.version] => 0.4.5 [connector.major] => 0 [connector.minor] => 4 [connector.release] => 5 ) Full, working test code: http://pastie.org/4347100 Thank you! Katelyn Schiesser

1 0

[libvirt] KVM Forum 2012 Call For Participation
by KVM Forum 2012 Program Committee 27 Jul '12

27 Jul '12

================================================================= KVM Forum 2012: Call For Participation November 7-9, 2012 - Hotel Fira Palace - Barcelona, Spain (All submissions must be received before midnight Aug 31st, 2012) ================================================================= KVM is an industry leading open source hypervisor that provides an ideal platform for datacenter virtualization, virtual desktop infrastructure, and cloud computing. Once again, it's time to bring together the community of developers and users that define the KVM ecosystem for our annual technical conference. We will discuss the current state of affairs and plan for the future of KVM, its surrounding infrastructure, and management tools. We are also excited to announce the oVirt Workshop will run in parallel with the KVM Forum, bringing in a community focused on enterprise datacenter virtualization management built on KVM. For topics which overlap we will have shared sessions. So mark your calendar and join us in advancing KVM. http://events.linuxfoundation.org/events/kvm-forum/ Once again we are colocated with The Linux Foundation's LinuxCon, Based on feedback from last year, this time it's LinuxCon Europe! KVM Forum attendees will be able to attend oVirt Workshop sessions and are eligible to attend LinuxCon Europe for a discounted rate. http://events.linuxfoundation.org/events/kvm-forum/register We invite you to lead part of the discussion by submitting a speaking proposal for KVM Forum 2012. http://events.linuxfoundation.org/cfp Suggested topics: KVM - Scaling and performance - Nested virtualization - I/O improvements - PCI device assignment - Driver domains - Time keeping - Resource management (cpu, memory, i/o) - Memory management (page sharing, swapping, huge pages, etc) - VEPA, VN-Link, vswitch - Security - Architecture ports QEMU - Device model improvements - New devices and chipsets - Scaling and performance - Desktop virtualization - Spice - Increasing robustness and hardening - Security model - Management interfaces - QMP protocol and implementation - Image formats - Firmware (SeaBIOS, OVMF, UEFI, etc) - Live migration - Live snapshots and merging - Fault tolerance, high availability, continuous backup - Real-time guest support Virtio - Speeding up existing devices - Alternatives - Virtio on non-Linux or non-virtualized Management infrastructure - oVirt (shared track w/ oVirt Workshop) - Libvirt - KVM autotest - OpenStack - Network virtualization management - Enterprise storage management Cloud computing - Scalable storage - Virtual networking - Security - Provisioning SUBMISSION REQUIREMENTS Abstracts due: Aug 31st, 2012 Notification: Sep 14th, 2012 Please submit a short abstract (~150 words) describing your presentation proposal. In your submission please note how long your talk will take. Slots vary in length up to 45 minutes. Also include in your proposal the proposal type -- one of: - technical talk - end-user talk - birds of a feather (BOF) session Submit your proposal here: http://events.linuxfoundation.org/cfp You will receive a notification whether or not your presentation proposal was accepted by Sep 14th. END-USER COLLABORATION One of the big challenges as developers is to know what, where and how people actually use our software. We will reserve a few slots for end users talking about their deployment challenges and achievements. If you are using KVM in production you are encouraged submit a speaking proposal. Simply mark it as an end-user collaboration proposal. As an end user, this is a unique opportunity to get your input to developers. BOF SESSION We will reserve some slots in the evening after the main conference tracks, for birds of a feather (BOF) sessions. These sessions will be less formal than presentation tracks and targetted for people who would like to discuss specific issues with other developers and/or users. If you are interested in getting developers and/or uses together to discuss a specific problem, please submit a BOF proposal. LIGHTNING TALKS In addition to submitted talks we will also have some room for lightning talks. These are short (5 minute) discussions to highlight new work or ideas that aren't complete enough to warrant a full presentation slot. Lightning talk submissions and scheduling will be handled on-site at KVM Forum. HOTEL / TRAVEL The KVM Forum 2012 will be held in Barcelona, Spain at the Hotel Fira Palace. http://events.linuxfoundation.org/events/kvm-forum/hotel Thank you for your interest in KVM. We're looking forward to your submissions and seeing you at the KVM Forum 2012 in November! Thanks, your KVM Forum 2012 Program Commitee Please contact us with any questions or comments. KVM-Forum-2012-PC(a)redhat.com

1 0

[libvirt] Support to transfer OVSDB:Interface stats during Live Migration
by kiran Chunduri 27 Jul '12

27 Jul '12

Hi, I was experimenting 'live migration' with libvirt (using virsh) and observed that post migration the Interface stats in 'OVSDB:Interface' table are not transferred. Only the values in 'external_ids' column seem to be synced up. The libvirt version I'm using is 0.9.11.3. The virsh command used for migration is: 'virsh migrate --live fc17-vm qemu+ssh:// 10.23.167.219/system' Is this the right behavior (or) Have I missed out on some option? Can some one please guide on the approach and the source files to look at If i need to add this support? thanks Kiran

2 3

[libvirt] [PATCH] build: update to latest gnulib, for secure tarball
by Eric Blake 27 Jul '12

27 Jul '12

Pick up some build fixes in the latest gnulib. In particular, we want to ensure that official tarballs are secure, but don't want to penalize people who don't run 'make dist', since fixed automake still hasn't hit common platforms like Fedora 17. * .gnulib: Update to latest, for Automake CVE-2012-3386 detection. * bootstrap: Resync from gnulib. * bootstrap.conf (gnulib_extra_files): Drop missing, since gnulib has dropped it in favor of Automake's version. * cfg.mk (local-checks-to-skip): Conditionally skip the security check in cases where it doesn't matter. --- I'm stoked! I figured out how to upgrade to the latest automake and make our release process secure (tested with 'make dist' on a system with insecure automake), without penalizing normal development (tested with 'make check' on the same system). * .gnulib a02ba4b...6c37e0a (76): > verify: document conflict with -Wnested-externs > maint.mk: forbid exit(-1) > fsusage: port back to Solaris > gnu-web-doc-update: fix error messages > gnu-web-doc-update: check the requirements. > maint.mk: minor simplification. > gitlog-to-changelog: VPATH build issues. > fpending: Assume AC_CHECK_DECLS_ONCE invocation, like in fpending.m4. > pthread_sigmask: fix bug on FreeBSD 9 > README-release: make it more legible > autoupdate > maint: require that each sc_... command start with "@" > maint.mk: add leading "@" to quiet new "make syntax-check" rule > autoupdate > maint.mk: new syntax check for HAVE_DECL checks > argp: make HAVE_DECL usage consistent > stat-time: relax license to LGPLv2+ > strndup: fix m4 usage error > maint: enable the sc_avoid_if_before_free syntax-check rule > gettext: do not assume '#define ... defined ...' behavior > getloadavg: clean out old Emacs and Autoconf cruft > bootstrap: let warn be like tests/init.sh's warn_ > getopt: Simplify after Emacs changed. > maint.mk: add sc_vulnerable_makefile_CVE-2012-3386 > maint.mk: _sc_search_regexp, sc_vulnerable_makefile_CVE-2009-4029: fix > getloadavg, getopt: fix commentary re configure.in > timespec: mark functions with const attributes > canonicalize[-lgpl]: handle "guessing" values when cross-building > canonicalize: make the right guess when cross-compiling to GNU > update from texinfo > timespec-sub: avoid duplicate include > bootstrap: use a more consistent error reporting scheme > sys_time: allow too-wide tv_sec > pthread: check for both pthread_create and pthread_join > parse-datetime: doc tuneup > do-release-commit-and-tag: fix the previous commit > do-release-commit-and-tag: fix typo > pthread: check for pthread_create, not pthread_join > parse-datetime: fix failure to diagnose invalid input > bootstrap: do not require now-removed build-aux/missing > alloca: add support for HP NonStop TNS/E native > fsusage: remove code not needed on non GNU/Linux systems. > fsusage: include files needed for glibc 2.6 fallback > fsusage: avoid needless check on GNU/Linux > log: Fix an autoconf >= 2.64 warning. > autoupdate > autoupdate > log10f: Fix possible configuration problem. > Fix typo in ChangeLog entry. > remove: No longer override on all platforms. Fixes bug from 2012-03-20. > config: drop scripts that automake says are not independent > root-uid: new module > regex: use locale-independent comparison for codeset name > getopt-posix: No longer guarantee that option processing is resettable. > argp, regex: Ensure strcasecmp gets declared. > autoupdate > ptsname_r: Fix typo in last commit. > ptsname_r: Make it consistent with ptsname on AIX. > ptsname_r: Make it consistent with ptsname on OSF/1. > ttyname_r: Fix result on OSF/1, Solaris. > ptsname_r: Add support for Solaris. > ptsname_r: Fix test failure on native Windows. > ptsname_r: Fix test failures on IRIX, Solaris. > ptsname test: Extend test. > time: fix obsolete comment > getopt-gnu: Handle suboptimal getopt_long's abbreviation handling. > time_r: fix typo that always overrode localtime_r decl > Write "Mac OS X" instead of "MacOS X". > grantpt: Relax requirement regarding invalid file descriptors. > fbufmode test: Don't test unportable behaviour. > gnulib-tool: Refactor inctests variable. > gnulib-tool: --create-[mega]testdir, --[mega]test implies --with-tests. > parse-duration test: Avoid spurious output. > testing: fix typo in here doc > maint: disable the strncpy prohibition > Fix misspellings in comments. .gnulib | 2 +- bootstrap | 118 +++++++++++++++++++++++++++++++++----------------------- bootstrap.conf | 1 - cfg.mk | 11 ++++++ 4 files changed, 81 insertions(+), 51 deletions(-) diff --git a/.gnulib b/.gnulib index a02ba4b..6c37e0a 160000 --- a/.gnulib +++ b/.gnulib @@ -1 +1 @@ -Subproject commit a02ba4bf889fee4622db87f185c3d0af84d74ae7 +Subproject commit 6c37e0a73c7c1b6fe6eac4d794e2e65791a2700d diff --git a/bootstrap b/bootstrap index ce37a2c..e3e270b 100755 --- a/bootstrap +++ b/bootstrap @@ -1,6 +1,6 @@ #! /bin/sh # Print a version string. -scriptversion=2012-05-15.06; # UTC +scriptversion=2012-07-19.14; # UTC # Bootstrap this package from checked-out sources. @@ -77,6 +77,33 @@ Running without arguments will suffice in most cases. EOF } +# warnf_ FORMAT-STRING ARG1... +warnf_ () +{ + warnf_format_=$1 + shift + nl=' +' + case $* in + *$nl*) me_=$(printf "$me"|tr "$nl|" '??') + printf "$warnf_format_" "$@" | sed "s|^|$me_: |" ;; + *) printf "$me: $warnf_format_" "$@" ;; + esac >&2 +} + +# warn_ WORD1... +warn_ () +{ + # If IFS does not start with ' ', set it and emit the warning in a subshell. + case $IFS in + ' '*) warnf_ '%s\n' "$*";; + *) (IFS=' '; warn_ "$@");; + esac +} + +# die WORD1... +die() { warn_ "$@"; exit 1; } + # Configuration. # Name of the Makefile.am @@ -130,7 +157,8 @@ extract_package_name=' p } ' -package=$(sed -n "$extract_package_name" configure.ac) || exit +package=$(sed -n "$extract_package_name" configure.ac) \ + || die 'cannot find package name in configure.ac' gnulib_name=lib$package build_aux=build-aux @@ -186,6 +214,8 @@ use_git=true # otherwise find the first of the NAMES that can be run (i.e., # supports --version). If found, set ENVVAR to the program name, # die otherwise. +# +# FIXME: code duplication, see also gnu-web-doc-update. find_tool () { find_tool_envvar=$1 @@ -203,19 +233,15 @@ find_tool () else find_tool_error_prefix="\$$find_tool_envvar: " fi - if test x"$find_tool_res" = x; then - echo >&2 "$me: one of these is required: $find_tool_names" - exit 1 - fi - ($find_tool_res --version </dev/null) >/dev/null 2>&1 || { - echo >&2 "$me: ${find_tool_error_prefix}cannot run $find_tool_res --version" - exit 1 - } + test x"$find_tool_res" != x \ + || die "one of these is required: $find_tool_names" + ($find_tool_res --version </dev/null) >/dev/null 2>&1 \ + || die "${find_tool_error_prefix}cannot run $find_tool_res --version" eval "$find_tool_envvar=\$find_tool_res" eval "export $find_tool_envvar" } -# Find sha1sum, named gsha1sum on MacPorts, and shasum on MacOS 10.6. +# Find sha1sum, named gsha1sum on MacPorts, and shasum on Mac OS X 10.6. find_tool SHA1SUM sha1sum gsha1sum shasum # Override the default configuration, if necessary. @@ -230,7 +256,6 @@ esac test -z "${gnulib_extra_files}" && \ gnulib_extra_files=" $build_aux/install-sh - $build_aux/missing $build_aux/mdate-sh $build_aux/texinfo.tex $build_aux/depcomp @@ -270,21 +295,15 @@ do --no-git) use_git=false;; *) - echo >&2 "$0: $option: unknown option" - exit 1;; + die "$option: unknown option";; esac done -if $use_git || test -d "$GNULIB_SRCDIR"; then - : -else - echo "$0: Error: --no-git requires --gnulib-srcdir" >&2 - exit 1 -fi +$use_git || test -d "$GNULIB_SRCDIR" \ + || die "Error: --no-git requires --gnulib-srcdir" if test -n "$checkout_only_file" && test ! -r "$checkout_only_file"; then - echo "$0: Bootstrapping from a non-checked-out distribution is risky." >&2 - exit 1 + die "Bootstrapping from a non-checked-out distribution is risky." fi # Ensure that lines starting with ! sort last, per gitignore conventions @@ -310,7 +329,7 @@ insert_sorted_if_absent() { echo "$str" | sort_patterns - $file | cmp -s - $file > /dev/null \ || { echo "$str" | sort_patterns - $file > $file.bak \ && mv $file.bak $file; } \ - || exit 1 + || die "insert_sorted_if_absent $file $str: failed" } # Adjust $PATTERN for $VC_IGNORE_FILE and insert it with @@ -334,11 +353,8 @@ grep '^[ ]*AC_CONFIG_AUX_DIR(\['"$build_aux"'\])' configure.ac \ >/dev/null && found_aux_dir=yes grep '^[ ]*AC_CONFIG_AUX_DIR('"$build_aux"')' configure.ac \ >/dev/null && found_aux_dir=yes -if test $found_aux_dir = no; then - echo "$0: expected line not found in configure.ac. Add the following:" >&2 - echo " AC_CONFIG_AUX_DIR([$build_aux])" >&2 - exit 1 -fi +test $found_aux_dir = yes \ + || die "configure.ac lacks 'AC_CONFIG_AUX_DIR([$build_aux])'; add it" # If $build_aux doesn't exist, create it now, otherwise some bits # below will malfunction. If creating it, also mark it as ignored. @@ -444,7 +460,7 @@ check_versions() { automake-ng|aclocal-ng) app=${app%-ng} ($app --version | grep '(GNU automake-ng)') >/dev/null 2>&1 || { - echo "$me: Error: '$app' not found or not from Automake-NG" >&2 + warn_ "Error: '$app' not found or not from Automake-NG" ret=1 continue } ;; @@ -454,20 +470,21 @@ check_versions() { # so we have to rely on $? rather than get_version. $app --version >/dev/null 2>&1 if [ 126 -le $? ]; then - echo "$me: Error: '$app' not found" >&2 + warn_ "Error: '$app' not found" ret=1 fi else # Require app to produce a new enough version string. inst_ver=$(get_version $app) if [ ! "$inst_ver" ]; then - echo "$me: Error: '$app' not found" >&2 + warn_ "Error: '$app' not found" ret=1 else latest_ver=$(sort_ver $req_ver $inst_ver | cut -d' ' -f2) if [ ! "$latest_ver" = "$inst_ver" ]; then - echo "$me: Error: '$app' version == $inst_ver is too old" >&2 - echo " '$app' version >= $req_ver is required" >&2 + warnf_ '%s\n' \ + "Error: '$app' version == $inst_ver is too old" \ + " '$app' version >= $req_ver is required" ret=1 fi fi @@ -524,11 +541,10 @@ fi if ! printf "$buildreq" | check_versions; then echo >&2 if test -f README-prereq; then - echo "$0: See README-prereq for how to get the prerequisite programs" >&2 + die "See README-prereq for how to get the prerequisite programs" else - echo "$0: Please install the prerequisite programs" >&2 + die "Please install the prerequisite programs" fi - exit 1 fi echo "$0: Bootstrapping from checked-out $package sources..." @@ -739,11 +755,10 @@ symlink_to_dir() *) case /$dst/ in *//* | */../* | */./* | /*/*/*/*/*/) - echo >&2 "$me: invalid symlink calculation: $src -> $dst" - exit 1;; - /*/*/*/*/) dot_dots=../../../;; - /*/*/*/) dot_dots=../../;; - /*/*/) dot_dots=../;; + die "invalid symlink calculation: $src -> $dst";; + /*/*/*/*/) dot_dots=../../../;; + /*/*/*/) dot_dots=../../;; + /*/*/) dot_dots=../;; esac;; esac @@ -765,7 +780,7 @@ version_controlled_file() { grep -F "/${file##*/}/" "$parent/CVS/Entries" 2>/dev/null | grep '^/[^/]*/[0-9]' > /dev/null else - echo "$me: no version control for $file?" >&2 + warn_ "no version control for $file?" false fi } @@ -855,11 +870,12 @@ echo "$0: $gnulib_tool $gnulib_tool_options --import ..." $gnulib_tool $gnulib_tool_options --import $gnulib_modules && for file in $gnulib_files; do - symlink_to_dir "$GNULIB_SRCDIR" $file || exit + symlink_to_dir "$GNULIB_SRCDIR" $file \ + || die "failed to symlink $file" done bootstrap_post_import_hook \ - || { echo >&2 "$me: bootstrap_post_import_hook failed"; exit 1; } + || die "bootstrap_post_import_hook failed" # Remove any dangling symlink matching "*.m4" or "*.[ch]" in some # gnulib-populated directories. Such .m4 files would cause aclocal to fail. @@ -887,7 +903,7 @@ echo "running: AUTOPOINT=true LIBTOOLIZE=true " \ "$AUTORECONF --verbose --install $no_recursive -I $m4_base $ACLOCAL_FLAGS" AUTOPOINT=true LIBTOOLIZE=true \ $AUTORECONF --verbose --install $no_recursive -I $m4_base $ACLOCAL_FLAGS \ - || exit 1 + || die "autoreconf failed" # Get some extra files from gnulib, overriding existing files. for file in $gnulib_extra_files; do @@ -896,7 +912,8 @@ for file in $gnulib_extra_files; do build-aux/*) dst=$build_aux/${file#build-aux/};; *) dst=$file;; esac - symlink_to_dir "$GNULIB_SRCDIR" $file $dst || exit + symlink_to_dir "$GNULIB_SRCDIR" $file $dst \ + || die "failed to symlink $file" done if test $with_gettext = yes; then @@ -912,7 +929,8 @@ if test $with_gettext = yes; then a\ '"$XGETTEXT_OPTIONS"' $${end_of_xgettext_options+} } - ' po/Makevars.template >po/Makevars || exit 1 + ' po/Makevars.template >po/Makevars \ + || die 'cannot generate po/Makevars' # If the 'gettext' module is in use, grab the latest Makefile.in.in. # If only the 'gettext-h' module is in use, assume autopoint already @@ -920,7 +938,8 @@ if test $with_gettext = yes; then case $gnulib_modules in *gettext-h*) ;; *gettext*) - cp $GNULIB_SRCDIR/build-aux/po/Makefile.in.in po/Makefile.in.in || exit 1 + cp $GNULIB_SRCDIR/build-aux/po/Makefile.in.in po/Makefile.in.in \ + || die "cannot create po/Makefile.in.in" ;; esac @@ -936,7 +955,8 @@ if test $with_gettext = yes; then a\ '"$XGETTEXT_OPTIONS_RUNTIME"' $${end_of_xgettext_options+} } - ' po/Makevars.template >runtime-po/Makevars || exit 1 + ' po/Makevars.template >runtime-po/Makevars \ + || die 'cannot generate runtime-po/Makevars' # Copy identical files from po to runtime-po. (cd po && cp -p Makefile.in.in *-quot *.header *.sed *.sin ../runtime-po) diff --git a/bootstrap.conf b/bootstrap.conf index 9b42cbf..3ac84f4 100644 --- a/bootstrap.conf +++ b/bootstrap.conf @@ -223,7 +223,6 @@ touch ChangeLog || exit 1 # Override bootstrap's list - we don't use mdate-sh or texinfo.tex. gnulib_extra_files=" $build_aux/install-sh - $build_aux/missing $build_aux/depcomp $build_aux/config.guess $build_aux/config.sub diff --git a/cfg.mk b/cfg.mk index 39d19b4..d054e5a 100644 --- a/cfg.mk +++ b/cfg.mk @@ -76,6 +76,17 @@ local-checks-to-skip = \ sc_makefile_check \ sc_useless_cpp_parens +# Most developers don't run 'make distcheck'. We want the official +# dist to be secure, but don't want to penalize other developers +# using a distro that has not yet picked up the automake fix. +# FIXME remove this ifeq (making the syntax check unconditional) +# once fixed automake (1.11.6 or 1.12.2+) is more common. +ifeq ($(filter dist%, $(MAKECMDGOALS)), ) +local-checks-to-skip += sc_vulnerable_makefile_CVE-2012-3386 +else +distdir: sc_vulnerable_makefile_CVE-2012-3386 +endif + # Files that should never cause syntax check failures. VC_LIST_ALWAYS_EXCLUDE_REGEX = \ (^(HACKING|docs/(news\.html\.in|.*\.patch))|\.po)$$ -- 1.7.10.4

2 4