- Devel - libvirt List Archives

[libvirt] [PATCH 0/5] expose per-device blkio weight tuning, via string param
by Hu Tao 15 Nov '11

15 Nov '11

based on v6 by Eric. v6: https://www.redhat.com/archives/libvir-list/2011-November/msg00202.html Patches 1-3 are identical to v6 and have been already ACKed. posted here for your convenience. changes in patch 4: - fix some memory leaks - type of device weight changed to unsigned int - replace strncpy with virStrcpy changes in patch 5: - remove virCgroupGetBlkioDeviceWeight - live value of blkio.device_weight is read from vm's def - commas to seprate fields rather than commas between device and weight and semicolon between device-weight pairs - add virCgroupSetBlkioDeviceWeight to libvirt_private.syms Eric Blake (3): API: add VIR_TYPED_PARAM_STRING API: remote support for VIR_TYPED_PARAM_STRING API: add trivial qemu support for VIR_TYPED_PARAM_STRING Hu Tao (2): blkiotune: add interface for blkiotune.device_weight blkiotune: add qemu support for blkiotune.device_weight daemon/remote.c | 88 +++++++++++----- docs/formatdomain.html.in | 29 +++++- docs/schemas/domaincommon.rng | 12 ++ include/libvirt/libvirt.h.in | 42 +++++++- src/conf/domain_conf.c | 138 +++++++++++++++++++++++- src/conf/domain_conf.h | 17 +++ src/libvirt.c | 92 ++++++++++++++--- src/libvirt_internal.h | 9 ++- src/libvirt_private.syms | 4 + src/qemu/qemu_cgroup.c | 22 ++++ src/qemu/qemu_driver.c | 238 +++++++++++++++++++++++++++++++++++++++-- src/remote/remote_driver.c | 28 +++++- src/remote/remote_protocol.x | 2 + src/remote_protocol-structs | 2 + src/rpc/gendispatch.pl | 3 +- src/util/cgroup.c | 20 ++++ src/util/cgroup.h | 3 + src/util/util.c | 14 +++ src/util/util.h | 2 + tools/virsh.c | 44 +++++++- tools/virsh.pod | 6 +- 21 files changed, 750 insertions(+), 65 deletions(-) -- 1.7.3.1

3 14

[libvirt] [libvirt-glib PATCH] Add vapi dependency to Makefile.am and fix parallel build
by nirbheek＠gentoo.org 14 Nov '11

14 Nov '11

From: Nirbheek Chauhan <nirbheek(a)gentoo.org> libvirt-glib-1.0.vapi is needed to generate libvirt-gobject-1.0.vapi Without an explicit dependency, make -jN fails Signed-off-by: Nirbheek Chauhan <nirbheek(a)gentoo.org> --- vapi/Makefile.am | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/vapi/Makefile.am b/vapi/Makefile.am index 0af8f6f..2ecc3e3 100644 --- a/vapi/Makefile.am +++ b/vapi/Makefile.am @@ -17,7 +17,7 @@ libvirt-glib-1.0.vapi: $(top_builddir)/libvirt-glib/LibvirtGLib-1.0.gir --library libvirt-glib-1.0 \ $< -libvirt-gobject-1.0.vapi: $(top_builddir)/libvirt-gobject/LibvirtGObject-1.0.gir +libvirt-gobject-1.0.vapi: $(top_builddir)/libvirt-gobject/LibvirtGObject-1.0.gir libvirt-glib-1.0.vapi $(AM_V_GEN)$(VAPIGEN) \ --vapidir=$(builddir) \ --pkg gobject-2.0 \ -- 1.7.3.4

1 0

[libvirt] [PATCH] storage: forbid rebuilding existing disk storage pools
by Guido Günther 14 Nov '11

14 Nov '11

which would blow away all volumes. Honor VIR_STORAGE_POOL_BUILD_OVERWRITE to force a rebuild. This was caught by libvirt-tck's storage/110-disk-pool.t. Cheers, -- Guido --- src/storage/storage_backend_disk.c | 72 ++++++++++++++++++++++++++++++++++-- 1 files changed, 68 insertions(+), 4 deletions(-) diff --git a/src/storage/storage_backend_disk.c b/src/storage/storage_backend_disk.c index 82d6e8a..995ad2f 100644 --- a/src/storage/storage_backend_disk.c +++ b/src/storage/storage_backend_disk.c @@ -335,6 +335,40 @@ virStorageBackendDiskRefreshPool(virConnectPtr conn ATTRIBUTE_UNUSED, /** + * Check for a valid disk label (partition table) on device + * + * return: 0 - valid disk label found + * >0 - no or unrecognized disk label + * <0 - error finding the disk label + */ +static int +virStorageBackendDiskFindLabel(const char* device) +{ + const char *const args[] = { + device, "print", "--script", NULL, + }; + virCommandPtr cmd = virCommandNew(PARTED); + char *output = NULL; + int ret = -1; + + virCommandAddArgSet(cmd, args); + virCommandAddEnvString(cmd, "LC_ALL=C"); + virCommandSetOutputBuffer(cmd, &output); + + /* if parted succeeds we have a valid partition table */ + ret = virCommandRun(cmd, NULL); + if (ret < 0) { + if (strstr (output, "unrecognised disk label")) + ret = 1; + } + + virCommandFree(cmd); + VIR_FREE(output); + return ret; +} + + +/** * Write a new partition table header */ static int @@ -342,6 +376,8 @@ virStorageBackendDiskBuildPool(virConnectPtr conn ATTRIBUTE_UNUSED, virStoragePoolObjPtr pool, unsigned int flags) { + bool ok_to_mklabel = false; + int ret = -1; /* eg parted /dev/sda mklabel msdos */ const char *prog[] = { PARTED, @@ -353,12 +389,40 @@ virStorageBackendDiskBuildPool(virConnectPtr conn ATTRIBUTE_UNUSED, NULL, }; - virCheckFlags(0, -1); + virCheckFlags(VIR_STORAGE_POOL_BUILD_OVERWRITE | + VIR_STORAGE_POOL_BUILD_NO_OVERWRITE, ret); - if (virRun(prog, NULL) < 0) - return -1; + if (flags == (VIR_STORAGE_POOL_BUILD_OVERWRITE | + VIR_STORAGE_POOL_BUILD_NO_OVERWRITE)) { + virStorageReportError(VIR_ERR_OPERATION_INVALID, + _("Overwrite and no overwrite flags" + " are mutually exclusive")); + goto error; + } - return 0; + if (flags & VIR_STORAGE_POOL_BUILD_OVERWRITE) + ok_to_mklabel = true; + else { + int check; + + check = virStorageBackendDiskFindLabel ( + pool->def->source.devices[0].path); + if (check > 0) { + ok_to_mklabel = true; + } else if (check < 0) { + virStorageReportError(VIR_ERR_OPERATION_FAILED, + _("Error checking for disk label")); + } else { + virStorageReportError(VIR_ERR_OPERATION_INVALID, + _("Disk label already present")); + } + } + + if (ok_to_mklabel) + ret = virRun(prog, NULL); + +error: + return ret; } /** -- 1.7.7.1

2 2

[libvirt] [PATCH libvirt-glib 1/6] Add GVirDomainDevice abstract class
by Marc-André Lureau 14 Nov '11

14 Nov '11

--- libvirt-gobject/Makefile.am | 3 + .../libvirt-gobject-domain-device-private.h | 31 +++++ libvirt-gobject/libvirt-gobject-domain-device.c | 139 ++++++++++++++++++++ libvirt-gobject/libvirt-gobject-domain-device.h | 64 +++++++++ libvirt-gobject/libvirt-gobject.h | 1 + libvirt-gobject/libvirt-gobject.sym | 2 + 6 files changed, 240 insertions(+), 0 deletions(-) create mode 100644 libvirt-gobject/libvirt-gobject-domain-device-private.h create mode 100644 libvirt-gobject/libvirt-gobject-domain-device.c create mode 100644 libvirt-gobject/libvirt-gobject-domain-device.h diff --git a/libvirt-gobject/Makefile.am b/libvirt-gobject/Makefile.am index 4f84b8b..56a047e 100644 --- a/libvirt-gobject/Makefile.am +++ b/libvirt-gobject/Makefile.am @@ -7,6 +7,7 @@ GOBJECT_HEADER_FILES = \ libvirt-gobject.h \ libvirt-gobject-main.h \ libvirt-gobject-domain-snapshot.h \ + libvirt-gobject-domain-device.h \ libvirt-gobject-domain.h \ libvirt-gobject-interface.h \ libvirt-gobject-network.h \ @@ -21,6 +22,7 @@ GOBJECT_HEADER_FILES = \ GOBJECT_SOURCE_FILES = \ libvirt-gobject-main.c \ libvirt-gobject-domain-snapshot.c \ + libvirt-gobject-domain-device.c \ libvirt-gobject-domain.c \ libvirt-gobject-interface.c \ libvirt-gobject-network.c \ @@ -42,6 +44,7 @@ libvirt_gobject_1_0_la_HEADERS = \ $(GOBJECT_HEADER_FILES) \ libvirt-gobject-input-stream.h nodist_libvirt_gobject_1_0_la_HEADERS = \ + libvirt-gobject-domain-device-private.h \ libvirt-gobject-enums.h libvirt_gobject_1_0_la_SOURCES = \ $(libvirt_gobject_1_0_la_HEADERS) \ diff --git a/libvirt-gobject/libvirt-gobject-domain-device-private.h b/libvirt-gobject/libvirt-gobject-domain-device-private.h new file mode 100644 index 0000000..2a34309 --- /dev/null +++ b/libvirt-gobject/libvirt-gobject-domain-device-private.h @@ -0,0 +1,31 @@ +/* + * libvirt-gobject-domain-device-private.h: libvirt gobject integration + * + * Copyright (C) 2011 Red Hat + * + * 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, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * Author: Marc-André Lureau <marcandre.lureau(a)redhat.com> + */ +#ifndef __LIBVIRT_GOBJECT_DOMAIN_DEVICE_PRIVATE_H__ +#define __LIBVIRT_GOBJECT_DOMAIN_DEVICE_PRIVATEH__ + +G_BEGIN_DECLS + +virDomainPtr gvir_domain_device_get_domain_handle(GVirDomainDevice *self); + +G_END_DECLS + +#endif /* __LIBVIRT_GOBJECT_DOMAIN_DEVICE_PRIVATEH__ */ diff --git a/libvirt-gobject/libvirt-gobject-domain-device.c b/libvirt-gobject/libvirt-gobject-domain-device.c new file mode 100644 index 0000000..ae03489 --- /dev/null +++ b/libvirt-gobject/libvirt-gobject-domain-device.c @@ -0,0 +1,139 @@ +/* + * libvirt-gobject-domain-device.c: libvirt gobject integration + * + * Copyright (C) 2011 Red Hat + * + * 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, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * Author: Marc-André Lureau <marcandre.lureau(a)redhat.com> + */ + +#include <config.h> + +#include <libvirt/virterror.h> +#include <string.h> + +#include "libvirt-glib/libvirt-glib.h" +#include "libvirt-gobject/libvirt-gobject.h" + +#include "libvirt-gobject/libvirt-gobject-domain-device-private.h" + +extern gboolean debugFlag; + +#define DEBUG(fmt, ...) do { if (G_UNLIKELY(debugFlag)) g_debug(fmt, ## __VA_ARGS__); } while (0) + +#define GVIR_DOMAIN_DEVICE_GET_PRIVATE(obj) \ + (G_TYPE_INSTANCE_GET_PRIVATE((obj), GVIR_TYPE_DOMAIN_DEVICE, GVirDomainDevicePrivate)) + +struct _GVirDomainDevicePrivate +{ + GVirDomain *domain; +}; + +G_DEFINE_ABSTRACT_TYPE(GVirDomainDevice, gvir_domain_device, G_TYPE_OBJECT); + +enum { + PROP_0, + PROP_DOMAIN, +}; + +static void gvir_domain_device_get_property(GObject *object, + guint prop_id, + GValue *value, + GParamSpec *pspec) +{ + GVirDomainDevice *self = GVIR_DOMAIN_DEVICE(object); + GVirDomainDevicePrivate *priv = self->priv; + + switch (prop_id) { + case PROP_DOMAIN: + g_value_set_object(value, priv->domain); + break; + + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec); + } +} + + +static void gvir_domain_device_set_property(GObject *object, + guint prop_id, + const GValue *value, + GParamSpec *pspec) +{ + GVirDomainDevice *self = GVIR_DOMAIN_DEVICE(object); + GVirDomainDevicePrivate *priv = self->priv; + + switch (prop_id) { + case PROP_DOMAIN: + g_clear_object(&priv->domain); + priv->domain = g_value_dup_object(value); + break; + + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec); + } +} + + +static void gvir_domain_device_finalize(GObject *object) +{ + GVirDomainDevice *self = GVIR_DOMAIN_DEVICE(object); + GVirDomainDevicePrivate *priv = self->priv; + + DEBUG("Finalize GVirDomainDevice=%p", self); + + g_clear_object(&priv->domain); + + G_OBJECT_CLASS(gvir_domain_device_parent_class)->finalize(object); +} + +static void gvir_domain_device_class_init(GVirDomainDeviceClass *klass) +{ + GObjectClass *object_class = G_OBJECT_CLASS (klass); + + object_class->finalize = gvir_domain_device_finalize; + object_class->get_property = gvir_domain_device_get_property; + object_class->set_property = gvir_domain_device_set_property; + + g_object_class_install_property(object_class, + PROP_DOMAIN, + g_param_spec_object("domain", + "domain", + "The associated domain", + GVIR_TYPE_DOMAIN, + G_PARAM_READWRITE | + G_PARAM_CONSTRUCT_ONLY | + G_PARAM_STATIC_STRINGS)); + + g_type_class_add_private(klass, sizeof(GVirDomainDevicePrivate)); +} + +static void gvir_domain_device_init(GVirDomainDevice *self) +{ + DEBUG("Init GVirDomainDevice=%p", self); + + self->priv = GVIR_DOMAIN_DEVICE_GET_PRIVATE(self); +} + +G_GNUC_INTERNAL +virDomainPtr gvir_domain_device_get_domain_handle(GVirDomainDevice *self) +{ + virDomainPtr handle; + + g_object_get(self->priv->domain, "handle", &handle, NULL); + + return handle; +} diff --git a/libvirt-gobject/libvirt-gobject-domain-device.h b/libvirt-gobject/libvirt-gobject-domain-device.h new file mode 100644 index 0000000..35d70f5 --- /dev/null +++ b/libvirt-gobject/libvirt-gobject-domain-device.h @@ -0,0 +1,64 @@ +/* + * libvirt-gobject-domain-device.h: libvirt gobject integration + * + * Copyright (C) 2011 Red Hat + * + * 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, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * Author: Marc-André Lureau <marcandre.lureau(a)redhat.com> + */ + +#if !defined(__LIBVIRT_GOBJECT_H__) && !defined(LIBVIRT_GOBJECT_BUILD) +#error "Only <libvirt-gobject/libvirt-gobject.h> can be included directly." +#endif + +#ifndef __LIBVIRT_GOBJECT_DOMAIN_DEVICE_H__ +#define __LIBVIRT_GOBJECT_DOMAIN_DEVICE_H__ + +G_BEGIN_DECLS + +#define GVIR_TYPE_DOMAIN_DEVICE (gvir_domain_device_get_type ()) +#define GVIR_DOMAIN_DEVICE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GVIR_TYPE_DOMAIN_DEVICE, GVirDomainDevice)) +#define GVIR_DOMAIN_DEVICE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GVIR_TYPE_DOMAIN_DEVICE, GVirDomainDeviceClass)) +#define GVIR_IS_DOMAIN_DEVICE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GVIR_TYPE_DOMAIN_DEVICE)) +#define GVIR_IS_DOMAIN_DEVICE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GVIR_TYPE_DOMAIN_DEVICE)) +#define GVIR_DOMAIN_DEVICE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GVIR_TYPE_DOMAIN_DEVICE, GVirDomainDeviceClass)) + +typedef struct _GVirDomainDevice GVirDomainDevice; +typedef struct _GVirDomainDevicePrivate GVirDomainDevicePrivate; +typedef struct _GVirDomainDeviceClass GVirDomainDeviceClass; + +struct _GVirDomainDevice +{ + GObject parent; + + GVirDomainDevicePrivate *priv; + + /* Do not add fields to this struct */ +}; + +struct _GVirDomainDeviceClass +{ + GObjectClass parent_class; + + gpointer padding[20]; +}; + + +GType gvir_domain_device_get_type(void); + +G_END_DECLS + +#endif /* __LIBVIRT_GOBJECT_DOMAIN_DEVICE_H__ */ diff --git a/libvirt-gobject/libvirt-gobject.h b/libvirt-gobject/libvirt-gobject.h index 12124e9..3bec2c9 100644 --- a/libvirt-gobject/libvirt-gobject.h +++ b/libvirt-gobject/libvirt-gobject.h @@ -30,6 +30,7 @@ #include <libvirt-gobject/libvirt-gobject-main.h> #include <libvirt-gobject/libvirt-gobject-enums.h> #include <libvirt-gobject/libvirt-gobject-stream.h> +#include <libvirt-gobject/libvirt-gobject-domain-device.h> #include <libvirt-gobject/libvirt-gobject-domain-snapshot.h> #include <libvirt-gobject/libvirt-gobject-domain.h> #include <libvirt-gobject/libvirt-gobject-interface.h> diff --git a/libvirt-gobject/libvirt-gobject.sym b/libvirt-gobject/libvirt-gobject.sym index f0e8402..da03001 100644 --- a/libvirt-gobject/libvirt-gobject.sym +++ b/libvirt-gobject/libvirt-gobject.sym @@ -29,6 +29,8 @@ LIBVIRT_GOBJECT_0.0.1 { gvir_connection_create_domain; gvir_connection_create_storage_pool; + gvir_domain_device_get_type; + gvir_domain_get_type; gvir_domain_handle_get_type; gvir_domain_info_get_type; -- 1.7.7

2 7

[libvirt] [PATCH TECHPREVIEW RFC 0/4] LibSSH2 transport option for libvirt
by Peter Krempa 14 Nov '11

14 Nov '11

This patchset adds a new secure transport layer to enable secure connections without the need to spawn external processes. The layer is implemented into virNetSocket. This patches still lack some functionality, which I will add before the final version is done, but I'd like to have some feedback about the features and mistakes I made, so I can incorporate them into the final version. Unfortunately, while working with libssh2, I found several bugs, and older versions (1.2.2, which is default in gentoo) are unusable (same error codes on authentication failure and closed socket and others). I decided to limit version of libssh2 to 1.3.0 for the transport to work. Please let me know if you find something that would you like to see implemented or improoved or I've done wrong, or you've got some questions. Usage: virsh -c qemu+libssh://root@locahost:22/system (user/port/host may be omitted, these are defaults) Possible problems: - segmentation fault in libssh2 when corrupted known_hosts file is used (will investigate) Things that have to be done: - private key authentication - SSH agent support - Add unknown host key dialog - documentation - change error codes and messages (any suggestions?) Thanks for your time Peter Peter Krempa (4): libssh2_transport: add main libssh2 transport implementation libssh2_transport: add ssh context support to virNetSocket libssh2_transport: Add libssh2 session support to net client code libssh2_transport: Use libssh2 driver code in remote driver configure.ac | 40 ++- po/POTFILES.in | 1 + src/Makefile.am | 9 + src/libvirt_private.syms | 1 + src/remote/remote_driver.c | 97 ++++-- src/rpc/virnetclient.c | 66 +++ src/rpc/virnetclient.h | 11 + src/rpc/virnetlibsshcontext.c | 900 +++++++++++++++++++++++++++++++++++++++++ src/rpc/virnetlibsshcontext.h | 76 ++++ src/rpc/virnetsocket.c | 137 +++++++- src/rpc/virnetsocket.h | 12 + 11 files changed, 1318 insertions(+), 32 deletions(-) create mode 100644 src/rpc/virnetlibsshcontext.c create mode 100644 src/rpc/virnetlibsshcontext.h -- 1.7.3.4

1 4

[libvirt] [PATCH libvirt-glib 1/3] Add GVirDomainDevice abstract class
by Marc-André Lureau 14 Nov '11

14 Nov '11

--- libvirt-gobject/Makefile.am | 3 + .../libvirt-gobject-domain-device-private.h | 31 +++++ libvirt-gobject/libvirt-gobject-domain-device.c | 139 ++++++++++++++++++++ libvirt-gobject/libvirt-gobject-domain-device.h | 64 +++++++++ libvirt-gobject/libvirt-gobject.h | 1 + libvirt-gobject/libvirt-gobject.sym | 2 + 6 files changed, 240 insertions(+), 0 deletions(-) create mode 100644 libvirt-gobject/libvirt-gobject-domain-device-private.h create mode 100644 libvirt-gobject/libvirt-gobject-domain-device.c create mode 100644 libvirt-gobject/libvirt-gobject-domain-device.h diff --git a/libvirt-gobject/Makefile.am b/libvirt-gobject/Makefile.am index 4f84b8b..56a047e 100644 --- a/libvirt-gobject/Makefile.am +++ b/libvirt-gobject/Makefile.am @@ -7,6 +7,7 @@ GOBJECT_HEADER_FILES = \ libvirt-gobject.h \ libvirt-gobject-main.h \ libvirt-gobject-domain-snapshot.h \ + libvirt-gobject-domain-device.h \ libvirt-gobject-domain.h \ libvirt-gobject-interface.h \ libvirt-gobject-network.h \ @@ -21,6 +22,7 @@ GOBJECT_HEADER_FILES = \ GOBJECT_SOURCE_FILES = \ libvirt-gobject-main.c \ libvirt-gobject-domain-snapshot.c \ + libvirt-gobject-domain-device.c \ libvirt-gobject-domain.c \ libvirt-gobject-interface.c \ libvirt-gobject-network.c \ @@ -42,6 +44,7 @@ libvirt_gobject_1_0_la_HEADERS = \ $(GOBJECT_HEADER_FILES) \ libvirt-gobject-input-stream.h nodist_libvirt_gobject_1_0_la_HEADERS = \ + libvirt-gobject-domain-device-private.h \ libvirt-gobject-enums.h libvirt_gobject_1_0_la_SOURCES = \ $(libvirt_gobject_1_0_la_HEADERS) \ diff --git a/libvirt-gobject/libvirt-gobject-domain-device-private.h b/libvirt-gobject/libvirt-gobject-domain-device-private.h new file mode 100644 index 0000000..2a34309 --- /dev/null +++ b/libvirt-gobject/libvirt-gobject-domain-device-private.h @@ -0,0 +1,31 @@ +/* + * libvirt-gobject-domain-device-private.h: libvirt gobject integration + * + * Copyright (C) 2011 Red Hat + * + * 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, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * Author: Marc-André Lureau <marcandre.lureau(a)redhat.com> + */ +#ifndef __LIBVIRT_GOBJECT_DOMAIN_DEVICE_PRIVATE_H__ +#define __LIBVIRT_GOBJECT_DOMAIN_DEVICE_PRIVATEH__ + +G_BEGIN_DECLS + +virDomainPtr gvir_domain_device_get_domain_handle(GVirDomainDevice *self); + +G_END_DECLS + +#endif /* __LIBVIRT_GOBJECT_DOMAIN_DEVICE_PRIVATEH__ */ diff --git a/libvirt-gobject/libvirt-gobject-domain-device.c b/libvirt-gobject/libvirt-gobject-domain-device.c new file mode 100644 index 0000000..ae03489 --- /dev/null +++ b/libvirt-gobject/libvirt-gobject-domain-device.c @@ -0,0 +1,139 @@ +/* + * libvirt-gobject-domain-device.c: libvirt gobject integration + * + * Copyright (C) 2011 Red Hat + * + * 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, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * Author: Marc-André Lureau <marcandre.lureau(a)redhat.com> + */ + +#include <config.h> + +#include <libvirt/virterror.h> +#include <string.h> + +#include "libvirt-glib/libvirt-glib.h" +#include "libvirt-gobject/libvirt-gobject.h" + +#include "libvirt-gobject/libvirt-gobject-domain-device-private.h" + +extern gboolean debugFlag; + +#define DEBUG(fmt, ...) do { if (G_UNLIKELY(debugFlag)) g_debug(fmt, ## __VA_ARGS__); } while (0) + +#define GVIR_DOMAIN_DEVICE_GET_PRIVATE(obj) \ + (G_TYPE_INSTANCE_GET_PRIVATE((obj), GVIR_TYPE_DOMAIN_DEVICE, GVirDomainDevicePrivate)) + +struct _GVirDomainDevicePrivate +{ + GVirDomain *domain; +}; + +G_DEFINE_ABSTRACT_TYPE(GVirDomainDevice, gvir_domain_device, G_TYPE_OBJECT); + +enum { + PROP_0, + PROP_DOMAIN, +}; + +static void gvir_domain_device_get_property(GObject *object, + guint prop_id, + GValue *value, + GParamSpec *pspec) +{ + GVirDomainDevice *self = GVIR_DOMAIN_DEVICE(object); + GVirDomainDevicePrivate *priv = self->priv; + + switch (prop_id) { + case PROP_DOMAIN: + g_value_set_object(value, priv->domain); + break; + + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec); + } +} + + +static void gvir_domain_device_set_property(GObject *object, + guint prop_id, + const GValue *value, + GParamSpec *pspec) +{ + GVirDomainDevice *self = GVIR_DOMAIN_DEVICE(object); + GVirDomainDevicePrivate *priv = self->priv; + + switch (prop_id) { + case PROP_DOMAIN: + g_clear_object(&priv->domain); + priv->domain = g_value_dup_object(value); + break; + + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec); + } +} + + +static void gvir_domain_device_finalize(GObject *object) +{ + GVirDomainDevice *self = GVIR_DOMAIN_DEVICE(object); + GVirDomainDevicePrivate *priv = self->priv; + + DEBUG("Finalize GVirDomainDevice=%p", self); + + g_clear_object(&priv->domain); + + G_OBJECT_CLASS(gvir_domain_device_parent_class)->finalize(object); +} + +static void gvir_domain_device_class_init(GVirDomainDeviceClass *klass) +{ + GObjectClass *object_class = G_OBJECT_CLASS (klass); + + object_class->finalize = gvir_domain_device_finalize; + object_class->get_property = gvir_domain_device_get_property; + object_class->set_property = gvir_domain_device_set_property; + + g_object_class_install_property(object_class, + PROP_DOMAIN, + g_param_spec_object("domain", + "domain", + "The associated domain", + GVIR_TYPE_DOMAIN, + G_PARAM_READWRITE | + G_PARAM_CONSTRUCT_ONLY | + G_PARAM_STATIC_STRINGS)); + + g_type_class_add_private(klass, sizeof(GVirDomainDevicePrivate)); +} + +static void gvir_domain_device_init(GVirDomainDevice *self) +{ + DEBUG("Init GVirDomainDevice=%p", self); + + self->priv = GVIR_DOMAIN_DEVICE_GET_PRIVATE(self); +} + +G_GNUC_INTERNAL +virDomainPtr gvir_domain_device_get_domain_handle(GVirDomainDevice *self) +{ + virDomainPtr handle; + + g_object_get(self->priv->domain, "handle", &handle, NULL); + + return handle; +} diff --git a/libvirt-gobject/libvirt-gobject-domain-device.h b/libvirt-gobject/libvirt-gobject-domain-device.h new file mode 100644 index 0000000..35d70f5 --- /dev/null +++ b/libvirt-gobject/libvirt-gobject-domain-device.h @@ -0,0 +1,64 @@ +/* + * libvirt-gobject-domain-device.h: libvirt gobject integration + * + * Copyright (C) 2011 Red Hat + * + * 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, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * Author: Marc-André Lureau <marcandre.lureau(a)redhat.com> + */ + +#if !defined(__LIBVIRT_GOBJECT_H__) && !defined(LIBVIRT_GOBJECT_BUILD) +#error "Only <libvirt-gobject/libvirt-gobject.h> can be included directly." +#endif + +#ifndef __LIBVIRT_GOBJECT_DOMAIN_DEVICE_H__ +#define __LIBVIRT_GOBJECT_DOMAIN_DEVICE_H__ + +G_BEGIN_DECLS + +#define GVIR_TYPE_DOMAIN_DEVICE (gvir_domain_device_get_type ()) +#define GVIR_DOMAIN_DEVICE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GVIR_TYPE_DOMAIN_DEVICE, GVirDomainDevice)) +#define GVIR_DOMAIN_DEVICE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GVIR_TYPE_DOMAIN_DEVICE, GVirDomainDeviceClass)) +#define GVIR_IS_DOMAIN_DEVICE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GVIR_TYPE_DOMAIN_DEVICE)) +#define GVIR_IS_DOMAIN_DEVICE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GVIR_TYPE_DOMAIN_DEVICE)) +#define GVIR_DOMAIN_DEVICE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GVIR_TYPE_DOMAIN_DEVICE, GVirDomainDeviceClass)) + +typedef struct _GVirDomainDevice GVirDomainDevice; +typedef struct _GVirDomainDevicePrivate GVirDomainDevicePrivate; +typedef struct _GVirDomainDeviceClass GVirDomainDeviceClass; + +struct _GVirDomainDevice +{ + GObject parent; + + GVirDomainDevicePrivate *priv; + + /* Do not add fields to this struct */ +}; + +struct _GVirDomainDeviceClass +{ + GObjectClass parent_class; + + gpointer padding[20]; +}; + + +GType gvir_domain_device_get_type(void); + +G_END_DECLS + +#endif /* __LIBVIRT_GOBJECT_DOMAIN_DEVICE_H__ */ diff --git a/libvirt-gobject/libvirt-gobject.h b/libvirt-gobject/libvirt-gobject.h index 12124e9..3bec2c9 100644 --- a/libvirt-gobject/libvirt-gobject.h +++ b/libvirt-gobject/libvirt-gobject.h @@ -30,6 +30,7 @@ #include <libvirt-gobject/libvirt-gobject-main.h> #include <libvirt-gobject/libvirt-gobject-enums.h> #include <libvirt-gobject/libvirt-gobject-stream.h> +#include <libvirt-gobject/libvirt-gobject-domain-device.h> #include <libvirt-gobject/libvirt-gobject-domain-snapshot.h> #include <libvirt-gobject/libvirt-gobject-domain.h> #include <libvirt-gobject/libvirt-gobject-interface.h> diff --git a/libvirt-gobject/libvirt-gobject.sym b/libvirt-gobject/libvirt-gobject.sym index f0e8402..da03001 100644 --- a/libvirt-gobject/libvirt-gobject.sym +++ b/libvirt-gobject/libvirt-gobject.sym @@ -29,6 +29,8 @@ LIBVIRT_GOBJECT_0.0.1 { gvir_connection_create_domain; gvir_connection_create_storage_pool; + gvir_domain_device_get_type; + gvir_domain_get_type; gvir_domain_handle_get_type; gvir_domain_info_get_type; -- 1.7.7

3 9

[libvirt] make install libvirt failled.
by ShaoHe Feng 14 Nov '11

14 Nov '11

I make install libvirt failed on my Ubuntu 11.11. I think some html dependent packages are missed on my build environment. Does anyone know the reason? Thanks. the info of make install is as follow: /bin/bash /home/fsh/work/VM/libvirt/build-aux/install-sh -d /usr/share/doc/libvirt-0.9.6/html for f in generic.css libvirt.css main.css api.html api_extension.html apps.html archdomain.html architecture.html archnetwork.html archnode.html archstorage.html auth.html bindings.html bugs.html compiling.html contact.html csharp.html deployment.html devguide.html docs.html downloads.html drivers.html drvesx.html drvhyperv.html drvlxc.html drvopenvz.html drvqemu.html drvremote.html drvtest.html drvuml.html drvvbox.html drvvmware.html drvxen.html errors.html firewall.html format.html formatcaps.html formatdomain.html formatnetwork.html formatnode.html formatnwfilter.html formatsecret.html formatsnapshot.html formatstorage.html formatstorageencryption.html goals.html hacking.html hooks.html hvsupport.html index.html internals.html intro.html java.html locking.html logging.html news.html php.html python.html relatedlinks.html remote.html sitemap.html storage.html testapi.html testsuites.html testtck.html todo.html uri.html virshcmdref.html windows.html todo.html hvsupport.html internals/command.html internals/locking.html internals/rpc.html architecture.gif node.gif 32favicon.png footer_corner.png footer_pattern.png libvirt-header-bg.png libvirt-header-logo.png libvirtLogo.png libvirt-net-logical.png libvirt-net-physical.png libvirt-daemon-arch.png libvirt-driver-arch.png libvirt-object-model.png madeWith.png et.png; do \ /usr/bin/install -c -m 0644 ./$f /usr/share/doc/libvirt-0.9.6/html; done /usr/bin/install: cannot stat `./api.html': No such file or directory /usr/bin/install: cannot stat `./api_extension.html': No such file or directory /usr/bin/install: cannot stat `./apps.html': No such file or directory /usr/bin/install: cannot stat `./archdomain.html': No such file or directory /usr/bin/install: cannot stat `./architecture.html': No such file or directory /usr/bin/install: cannot stat `./archnetwork.html': No such file or directory /usr/bin/install: cannot stat `./archnode.html': No such file or directory /usr/bin/install: cannot stat `./archstorage.html': No such file or directory /usr/bin/install: cannot stat `./auth.html': No such file or directory /usr/bin/install: cannot stat `./bindings.html': No such file or directory /usr/bin/install: cannot stat `./bugs.html': No such file or directory /usr/bin/install: cannot stat `./compiling.html': No such file or directory /usr/bin/install: cannot stat `./contact.html': No such file or directory /usr/bin/install: cannot stat `./csharp.html': No such file or directory /usr/bin/install: cannot stat `./deployment.html': No such file or directory /usr/bin/install: cannot stat `./devguide.html': No such file or directory /usr/bin/install: cannot stat `./docs.html': No such file or directory /usr/bin/install: cannot stat `./downloads.html': No such file or directory /usr/bin/install: cannot stat `./drivers.html': No such file or directory /usr/bin/install: cannot stat `./drvesx.html': No such file or directory /usr/bin/install: cannot stat `./drvhyperv.html': No such file or directory /usr/bin/install: cannot stat `./drvlxc.html': No such file or directory /usr/bin/install: cannot stat `./drvopenvz.html': No such file or directory /usr/bin/install: cannot stat `./drvqemu.html': No such file or directory /usr/bin/install: cannot stat `./drvremote.html': No such file or directory /usr/bin/install: cannot stat `./drvtest.html': No such file or directory /usr/bin/install: cannot stat `./drvuml.html': No such file or directory /usr/bin/install: cannot stat `./drvvbox.html': No such file or directory /usr/bin/install: cannot stat `./drvvmware.html': No such file or directory /usr/bin/install: cannot stat `./drvxen.html': No such file or directory /usr/bin/install: cannot stat `./errors.html': No such file or directory /usr/bin/install: cannot stat `./firewall.html': No such file or directory /usr/bin/install: cannot stat `./format.html': No such file or directory /usr/bin/install: cannot stat `./formatcaps.html': No such file or directory /usr/bin/install: cannot stat `./formatdomain.html': No such file or directory /usr/bin/install: cannot stat `./formatnetwork.html': No such file or directory /usr/bin/install: cannot stat `./formatnode.html': No such file or directory /usr/bin/install: cannot stat `./formatnwfilter.html': No such file or directory /usr/bin/install: cannot stat `./formatsecret.html': No such file or directory /usr/bin/install: cannot stat `./formatsnapshot.html': No such file or directory /usr/bin/install: cannot stat `./formatstorage.html': No such file or directory /usr/bin/install: cannot stat `./formatstorageencryption.html': No such file or directory /usr/bin/install: cannot stat `./goals.html': No such file or directory /usr/bin/install: cannot stat `./hacking.html': No such file or directory /usr/bin/install: cannot stat `./hooks.html': No such file or directory /usr/bin/install: cannot stat `./hvsupport.html': No such file or directory /usr/bin/install: cannot stat `./index.html': No such file or directory /usr/bin/install: cannot stat `./internals.html': No such file or directory /usr/bin/install: cannot stat `./intro.html': No such file or directory /usr/bin/install: cannot stat `./java.html': No such file or directory /usr/bin/install: cannot stat `./locking.html': No such file or directory /usr/bin/install: cannot stat `./logging.html': No such file or directory /usr/bin/install: cannot stat `./news.html': No such file or directory /usr/bin/install: cannot stat `./php.html': No such file or directory /usr/bin/install: cannot stat `./python.html': No such file or directory /usr/bin/install: cannot stat `./relatedlinks.html': No such file or directory /usr/bin/install: cannot stat `./remote.html': No such file or directory /usr/bin/install: cannot stat `./sitemap.html': No such file or directory /usr/bin/install: cannot stat `./storage.html': No such file or directory /usr/bin/install: cannot stat `./testapi.html': No such file or directory /usr/bin/install: cannot stat `./testsuites.html': No such file or directory /usr/bin/install: cannot stat `./testtck.html': No such file or directory /usr/bin/install: cannot stat `./todo.html': No such file or directory /usr/bin/install: cannot stat `./uri.html': No such file or directory /usr/bin/install: cannot stat `./virshcmdref.html': No such file or directory /usr/bin/install: cannot stat `./windows.html': No such file or directory /usr/bin/install: cannot stat `./todo.html': No such file or directory /usr/bin/install: cannot stat `./hvsupport.html': No such file or directory /usr/bin/install: cannot stat `./internals/command.html': No such file or directory /usr/bin/install: cannot stat `./internals/locking.html': No such file or directory /usr/bin/install: cannot stat `./internals/rpc.html': No such file or directory /bin/bash /home/fsh/work/VM/libvirt/build-aux/install-sh -d /usr/share/doc/libvirt-0.9.6/html/html for h in html/index.html html/libvirt-libvirt.html html/libvirt-virterror.html; do \ /usr/bin/install -c -m 0644 ./$h /usr/share/doc/libvirt-0.9.6/html/html; done /usr/bin/install: cannot stat `./html/index.html': No such file or directory /usr/bin/install: cannot stat `./html/libvirt-libvirt.html': No such file or directory /usr/bin/install: cannot stat `./html/libvirt-virterror.html': No such file or directory make[4]: *** [install-data-local] Error 1 make[4]: Leaving directory `/home/fsh/work/VM/libvirt/docs' make[3]: *** [install-am] Error 2 make[3]: Leaving directory `/home/fsh/work/VM/libvirt/docs' make[2]: *** [install-recursive] Error 1 make[2]: Leaving directory `/home/fsh/work/VM/libvirt/docs' make[1]: *** [install] Error 2 make[1]: Leaving directory `/home/fsh/work/VM/libvirt/docs' make: *** [install-recursive] Error 1

2 1

[libvirt] [test-API][PATCH 1/2] update env_clear for new way of function reference
by Guannan Ren 14 Nov '11

14 Nov '11

--- env_clear.py | 23 ++++++++++------------- 1 files changed, 10 insertions(+), 13 deletions(-) diff --git a/env_clear.py b/env_clear.py index 302ff62..5e78ab5 100644 --- a/env_clear.py +++ b/env_clear.py @@ -14,7 +14,7 @@ # distribution and at <http://www.gnu.org/licenses>. # # This module matches the reference of clearing function from each testcase -# to the corresponding testcase's argument in the order of testcase running +# to the corresponding testcase's argument in the order of testcase running # import mapper @@ -28,17 +28,17 @@ class EnvClear(object): self.cases_clearfunc_ref_dict = cases_clearfunc_ref_dict self.logfile = logfile self.loglevel = loglevel - + mapper_obj = mapper.Mapper(activity) - pkg_tripped_cases = mapper_obj.get_package_tripped() + clean_pkg_casename_func = mapper_obj.clean_package_casename_func_map() self.cases_ref_names = [] - for case in pkg_tripped_cases: + for case in clean_pkg_casename_func: case_ref_name = case.keys()[0] self.cases_ref_names.append(case_ref_name) self.cases_params_list = [] - for case in pkg_tripped_cases: + for case in clean_pkg_casename_func: case_params = case.values()[0] self.cases_params_list.append(case_params) @@ -48,10 +48,10 @@ class EnvClear(object): def env_clear(self): """ Run each clearing function with the corresponding arguments """ - + envlog = log.EnvLog(self.logfile, self.loglevel) logger = envlog.env_log() - + testcase_number = len(self.cases_ref_names) for i in range(testcase_number): @@ -59,12 +59,9 @@ class EnvClear(object): case_ref_name = self.cases_ref_names[i] case_params = self.cases_params_list[i] - if case_ref_name == 'sleep': - continue - else: - case_params['logger'] = logger - self.cases_clearfunc_ref_dict[case_ref_name](case_params) + case_params['logger'] = logger + self.cases_clearfunc_ref_dict[case_ref_name](case_params) del envlog - return 0 + return 0 -- 1.7.1

2 3

[libvirt] using php-libvirt libvirt_domain_is_active function
by Eduard B 14 Nov '11

14 Nov '11

Hi All, Im trying to figure how to use libvirt_domain_is_active but I'm unable to find what I am doing wrong. I tested it with php-libvirt-0.4.4 an with 0.4.3 but i have the same problem Im using libvirt-0.9.6-2.fc16.x86_64 with the following code Can someone point me in the right direction with the use of libvirt_domain_is_active ? Thanks ------8<------CODE --------8<------------------------------------ print_r ( libvirt_version() ); $domains=libvirt_list_domains($conn); print_r ($domains); foreach ( $domains as $domain ) { print "$domain\n"; print libvirt_domain_is_active($domain); } ---------8<------- OUTPUT ----------------8<------------------- Array ( [libvirt.release] => 6 [libvirt.minor] => 9 [libvirt.major] => 0 [connector.version] => 0.4.3 [connector.major] => 0 [connector.minor] => 4 [connector.release] => 3 ) Array ( [0] => Domain-0 [1] => vm1 [2] => vm2 [3] => vm3 ) Domain-0 PHP Warning: libvirt_domain_is_active() expects parameter 1 to be resource, integer given in /var/www/html/libvirt/index.php on line 20 PHP Warning: libvirt_domain_is_active(): Invalid arguments in /var/www/html/libvirt/index.php on line 20 vm1 PHP Warning: libvirt_domain_is_active() expects parameter 1 to be resource, integer given in /var/www/html/libvirt/index.php on line 20 PHP Warning: libvirt_domain_is_active(): Invalid arguments in /var/www/html/libvirt/index.php on line 20 vm2 PHP Warning: libvirt_domain_is_active() expects parameter 1 to be resource, integer given in /var/www/html/libvirt/index.php on line 20 PHP Warning: libvirt_domain_is_active(): Invalid arguments in /var/www/html/libvirt/index.php on line 20 vm3 PHP Warning: libvirt_domain_is_active() expects parameter 1 to be resource, integer given in /var/www/html/libvirt/index.php on line 20 PHP Warning: libvirt_domain_is_active(): Invalid arguments in /var/www/html/libvirt/index.php on line 20

2 1

[libvirt] Bridged Networking Wiki Up-to-Date?
by Bob Cochran 14 Nov '11

14 Nov '11

Greetings, I just installed Fedora 16 on a new server and want to create a Fedora 16 virtual machine. I have not created or used VMs on Fedora in quite some time. Now I have several compelling reasons to use Fedora virtualization so I am kind of "coming back" to it. Is the libvirt bridged networking wiki up-to-date? http://wiki.libvirt.org/page/Networking My hope is that the default networking support provided on Fedora 16 will let any virtual guest connect to any other host on my internal LAN (within reason, of course) so that for example one virtual guest can be dedicated as a DNS server and all the other hosts on my network can query it. That is, I hope I won't need to do extensive additional networking support when I create the guest OS, but I am willing to if I have to. Thanks Bob Cochran

2 1

[libvirt] [PATCH] util: Compile error
by taget＠linux.vnet.ibm.com 14 Nov '11

14 Nov '11

From: Eli Qiao <taget(a)linux.vnet.ibm.com> Add virnetdev.h,virnetdevbridge.h,virnetdevtap.h to private symbols Signed-off-by: Eli Qiao <taget(a)linux.vnet.ibm.com> --- src/libvirt_private.syms | 29 +++++++++++++++++++++++++++++ 1 files changed, 29 insertions(+), 0 deletions(-) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 81de6b4..ebe34c9 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1195,6 +1195,35 @@ virFileRewrite; # virnetclient.h virNetClientHasPassFD; +# virnetdev.h +virNetDevClearIPv4Address; +virNetDevExists; +virNetDevGetMAC; +virNetDevGetMTU; +virNetDevIsOnline; +virNetDevSetIPv4Address; +virNetDevSetMAC; +virNetDevSetMTU; +virNetDevSetMTUFromDevice; +virNetDevSetOnline; + + +# virnetdevbridge.h +virNetDevBridgeAddPort; +virNetDevBridgeCreate; +virNetDevBridgeDelete; +virNetDevBridgeGetSTP; +virNetDevBridgeGetSTPDelay; +virNetDevBridgeRemovePort; +virNetDevBridgeSetSTP; +virNetDevBridgeSetSTPDelay; + + +# virnetdevtap.h +virNetDevTapCreate; +virNetDevTapCreateInBridgePort; +virNetDevTapDelete; + # virnetmessage.h virNetMessageClear; -- 1.7.4.4

6 7

[libvirt] [PATCH] qemu: fix domjobabort regression
by Eric Blake 12 Nov '11

12 Nov '11

This reverts commit ef1065cf5ac; see also this bug report: https://bugzilla.redhat.com/show_bug.cgi?id=751900 In qemu 0.15.1 and earlier, during migration to file, the qemu_savevm_state_begin and qemu_savevm_state_iterate methods will both process as much migration data as possible until either 1. The file descriptor returns EAGAIN 2. The bandwidth rate limit is reached If we set the rate limit to ULONG_MAX, test 2 never becomes true. We're passing a plain file descriptor to QEMU and POSIX does not support EAGAIN on regular files / block devices, so test 1 never becomes true either. In the 'virsh save --bypass-cache' case, we pass a pipe instead of a regular fd, but using a pipe adds I/O overhead, so always passing a pipe just so qemu can see EAGAIN doesn't seem nice. The ultimate fix needs to come from qemu - background migration must respect asynchronous abort requests, or else periodically return control to the main handling loop without an EAGAIN and without waiting to hit an insanely large amount of data. But until a version of qemu is fixed to support "unlimited" data rates while still allowing cancellation, the best we can do is avoid the automatic use of unlimited rates from within libvirt (users can still explicitly change the migration rates, if they are aware that they are giving up the ability to cancel a job). Reverting the lone use of QEMU_DOMAIN_FILE_MIG_BANDWIDTH_MAX is the simplest patch; this slows migration back down to a default 32M/sec cap, but also ensures that the main qemu processing loop will still be responsive to cancellation requests. Hopefully upstream qemu will provide us a means of safely using unlimited speed, including a runtime probe of that capability. * src/qemu/qemu_migration.c (qemuMigrationToFile): Revert attempt to use unlimited migration bandwidth when migrating to file. Signed-off-by: Daniel Veillard <veillard(a)redhat.com> Signed-off-by: Eric Blake <eblake(a)redhat.com> --- src/qemu/qemu_migration.c | 17 ----------------- 1 files changed, 0 insertions(+), 17 deletions(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 838a31f..30f805d 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -2825,16 +2825,6 @@ qemuMigrationToFile(struct qemud_driver *driver, virDomainObjPtr vm, bool restoreLabel = false; virCommandPtr cmd = NULL; int pipeFD[2] = { -1, -1 }; - unsigned long saveMigBandwidth = priv->migMaxBandwidth; - - /* Increase migration bandwidth to unlimited since target is a file. - * Failure to change migration speed is not fatal. */ - if (qemuDomainObjEnterMonitorAsync(driver, vm, asyncJob) == 0) { - qemuMonitorSetMigrationSpeed(priv->mon, - QEMU_DOMAIN_FILE_MIG_BANDWIDTH_MAX); - priv->migMaxBandwidth = QEMU_DOMAIN_FILE_MIG_BANDWIDTH_MAX; - qemuDomainObjExitMonitorWithDriver(driver, vm); - } if (qemuCapsGet(priv->qemuCaps, QEMU_CAPS_MIGRATE_QEMU_FD) && (!compressor || pipe(pipeFD) == 0)) { @@ -2946,13 +2936,6 @@ qemuMigrationToFile(struct qemud_driver *driver, virDomainObjPtr vm, ret = 0; cleanup: - /* Restore max migration bandwidth */ - if (qemuDomainObjEnterMonitorAsync(driver, vm, asyncJob) == 0) { - qemuMonitorSetMigrationSpeed(priv->mon, saveMigBandwidth); - priv->migMaxBandwidth = saveMigBandwidth; - qemuDomainObjExitMonitorWithDriver(driver, vm); - } - VIR_FORCE_CLOSE(pipeFD[0]); VIR_FORCE_CLOSE(pipeFD[1]); virCommandFree(cmd); -- 1.7.4.4

3 3

[libvirt] [PATCH] fix two bugs in bridge_driver.c
by Hu Tao 12 Nov '11

12 Nov '11

steps to reproduce: 1. having a network xml file(named default.xml) like this one: <network> <name>default</name> <uuid>c5322c4c-81d0-4985-a363-ad6389780d89</uuid> <bridge name="virbr0" /> <forward/> <ip address="192.168.122.1" netmask="255.255.255.0"> <dhcp> <range start="192.168.122.2" end="192.168.122.254" /> </dhcp> </ip> </network> in /etc/libvirt/qemu/networks/, and mark it as autostart: $ ls -l /etc/libvirt/qemu/networks/autostart total 0 lrwxrwxrwx 1 root root 14 Oct 12 14:02 default.xml -> ../default.xml 2. start libvirtd and the device virbr0 is not automatically up. The reason is that the function virNetDevExists is now returns 1 if the device exists, comparing to the former one returns 0 if the device exists. But with only this fix will cause a segmentation fault(the same steps as above) that is fixed by the second chunk of code. --- src/network/bridge_driver.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 32cceb0..951b5aa 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -214,7 +214,7 @@ networkFindActiveConfigs(struct network_driver *driver) { /* If bridge exists, then mark it active */ if (obj->def->bridge && - virNetDevExists(obj->def->bridge) == 0) { + virNetDevExists(obj->def->bridge) == 1) { obj->active = 1; /* Try and read dnsmasq/radvd pids if any */ @@ -1815,8 +1815,10 @@ networkStartNetworkVirtual(struct network_driver *driver, if (!save_err) save_err = virSaveLastError(); - ignore_value(virNetDevTapDelete(macTapIfName)); - VIR_FREE(macTapIfName); + if (macTapIfName) { + ignore_value(virNetDevTapDelete(macTapIfName)); + VIR_FREE(macTapIfName); + } err0: if (!save_err) -- 1.7.3.1

3 2

[libvirt] [PATCH] build: drop useless dirent.h includes
by Eric Blake 11 Nov '11

11 Nov '11

* .gnulib: Update to latest, for improved syntax-check. * src/lxc/lxc_container.c (includes): Drop unused include. * src/network/bridge_driver.c: Likewise. * src/node_device/node_device_linux_sysfs.c: Likewise. * src/openvz/openvz_driver.c: Likewise. * src/qemu/qemu_conf.c: Likewise. * src/storage/storage_backend_iscsi.c: Likewise. * src/storage/storage_backend_mpath.c: Likewise. * src/uml/uml_conf.c: Likewise. * src/uml/uml_driver.c: Likewise. --- I'm not sure whether to include this in 0.9.7. On the one hand, this is pretty trivial; on the other hand, I hate making more .gnulib updates than necessary after release candidates have been posted, in case an unintended regression sneaks in from a half-baked gnulib change. But looking at the 22 patches, I'm not seeing anything likely to impact libvirt besides the new syntax check rule. * .gnulib 0031e4f...e56e96f (22): > maint.mk: silence new syntax check > Doc about floating-point and math API. > stdalign tests: Skip the test when compiled by Sun C. > ansi-c++-opt: Complete the 2011-06-05 change. > * doc/posix-headers/stdalign.texi (stdalign.h): Mention Sun review ID. > copysignl: Fix result for zero argument on HP-UX 11 with HP C. > update from texinfo > ldexp, ldexpf, ldexpl: Enhance tests. > math tests: Cosmetics. > fma*: Simplify test. > Tests for module 'fmal'. > New module 'fmal'. > Tests for module 'fmaf'. > New module 'fmaf'. > Tests for module 'fma'. > New module 'fma'. > Extend gl_MATHFUNC. > New modules 'at-internal', 'openat-h', split off from module 'openat'. > maint.mk: also prohibit inclusion of dirent.h without use > ldexpl tests: Avoid test failure on MSVC 9. > New modules 'at-internal', 'openat-h', split off from module 'openat'. > openat: Include <stdbool.h>. .gnulib | 2 +- src/lxc/lxc_container.c | 1 - src/network/bridge_driver.c | 1 - src/node_device/node_device_linux_sysfs.c | 3 +-- src/openvz/openvz_driver.c | 1 - src/qemu/qemu_conf.c | 1 - src/storage/storage_backend_iscsi.c | 1 - src/storage/storage_backend_mpath.c | 3 +-- src/uml/uml_conf.c | 1 - src/uml/uml_driver.c | 1 - 10 files changed, 3 insertions(+), 12 deletions(-) diff --git a/.gnulib b/.gnulib index 0031e4f..e56e96f 160000 --- a/.gnulib +++ b/.gnulib @@ -1 +1 @@ -Subproject commit 0031e4f6353cc7077a9d0dad0c793bd6e3dc7aaa +Subproject commit e56e96fe20f72586e9ec5c528b9a9a06daa2ecc6 diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index c4e5f28..c2484a7 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -35,7 +35,6 @@ #include <sys/stat.h> #include <unistd.h> #include <mntent.h> -#include <dirent.h> /* Yes, we want linux private one, for _syscall2() macro */ #include <linux/unistd.h> diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 445c3cb..e897b32 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -25,7 +25,6 @@ #include <sys/types.h> #include <sys/poll.h> -#include <dirent.h> #include <limits.h> #include <string.h> #include <stdio.h> diff --git a/src/node_device/node_device_linux_sysfs.c b/src/node_device/node_device_linux_sysfs.c index 844231a..d352800 100644 --- a/src/node_device/node_device_linux_sysfs.c +++ b/src/node_device/node_device_linux_sysfs.c @@ -2,7 +2,7 @@ * node_device_hal_linuc.c: Linux specific code to gather device data * not available through HAL. * - * Copyright (C) 2009-2010 Red Hat, Inc. + * Copyright (C) 2009-2011 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 @@ -32,7 +32,6 @@ #include "memory.h" #include "logging.h" #include "virfile.h" -#include <dirent.h> #define VIR_FROM_THIS VIR_FROM_NODEDEV diff --git a/src/openvz/openvz_driver.c b/src/openvz/openvz_driver.c index 69ff444..4eed8ad 100644 --- a/src/openvz/openvz_driver.c +++ b/src/openvz/openvz_driver.c @@ -30,7 +30,6 @@ #include <sys/types.h> #include <sys/poll.h> -#include <dirent.h> #include <limits.h> #include <string.h> #include <stdio.h> diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index d1bf075..0cf921f 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -23,7 +23,6 @@ #include <config.h> -#include <dirent.h> #include <string.h> #include <limits.h> #include <sys/types.h> diff --git a/src/storage/storage_backend_iscsi.c b/src/storage/storage_backend_iscsi.c index 99e69c9..354f99b 100644 --- a/src/storage/storage_backend_iscsi.c +++ b/src/storage/storage_backend_iscsi.c @@ -32,7 +32,6 @@ #include <regex.h> #include <fcntl.h> #include <unistd.h> -#include <dirent.h> #include <sys/stat.h> #include "virterror_internal.h" diff --git a/src/storage/storage_backend_mpath.c b/src/storage/storage_backend_mpath.c index 4f3add3..f09ce9b 100644 --- a/src/storage/storage_backend_mpath.c +++ b/src/storage/storage_backend_mpath.c @@ -1,7 +1,7 @@ /* * storage_backend_mpath.c: storage backend for multipath handling * - * Copyright (C) 2009-2010 Red Hat, Inc. + * Copyright (C) 2009-2011 Red Hat, Inc. * Copyright (C) 2009-2008 Dave Allan * * This library is free software; you can redistribute it and/or @@ -25,7 +25,6 @@ #include <unistd.h> #include <stdio.h> -#include <dirent.h> #include <fcntl.h> #include <libdevmapper.h> diff --git a/src/uml/uml_conf.c b/src/uml/uml_conf.c index f2bdd74..e06eb90 100644 --- a/src/uml/uml_conf.c +++ b/src/uml/uml_conf.c @@ -23,7 +23,6 @@ #include <config.h> -#include <dirent.h> #include <string.h> #include <limits.h> #include <sys/types.h> diff --git a/src/uml/uml_driver.c b/src/uml/uml_driver.c index 772e1c6..35b73b6 100644 --- a/src/uml/uml_driver.c +++ b/src/uml/uml_driver.c @@ -25,7 +25,6 @@ #include <sys/types.h> #include <sys/poll.h> -#include <dirent.h> #include <limits.h> #include <string.h> #include <stdio.h> -- 1.7.4.4

1 1

[libvirt] [PATCH] xenapi: remove unused variable
by Eric Blake 11 Nov '11

11 Nov '11

CC libvirt_driver_xenapi_la-xenapi_driver.lo xenapi/xenapi_driver.c: In function 'xenapiDomainGetVcpus': xenapi/xenapi_driver.c:1209:21: error: variable 'cpus' set but not used [-Werror=unused-but-set-variable] * src/xenapi/xenapi_driver.c (xenapiDomainGetVcpus): Silence compiler warning. --- Pushing under the build-breaker rule. src/xenapi/xenapi_driver.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/xenapi/xenapi_driver.c b/src/xenapi/xenapi_driver.c index d454589..a835b2d 100644 --- a/src/xenapi/xenapi_driver.c +++ b/src/xenapi/xenapi_driver.c @@ -1206,7 +1206,7 @@ xenapiDomainGetVcpus (virDomainPtr dom, xen_vm_set *vms = NULL; xen_vm vm = NULL; xen_string_string_map *vcpu_params = NULL; - int nvcpus = 0, cpus = 0, i; + int nvcpus = 0, i; virDomainInfo domInfo; virNodeInfo nodeInfo; virVcpuInfoPtr ifptr; @@ -1221,9 +1221,7 @@ xenapiDomainGetVcpus (virDomainPtr dom, _("Couldn't fetch Domain Information")); return -1; } - if (xenapiNodeGetInfo(dom->conn, &nodeInfo) == 0) - cpus = nodeInfo.cpus; - else { + if (xenapiNodeGetInfo(dom->conn, &nodeInfo) != 0) { xenapiSessionErrorHandler(dom->conn, VIR_ERR_INTERNAL_ERROR, _("Couldn't fetch Node Information")); return -1; -- 1.7.7.1

1 0

[libvirt] 0.9.7 virsh console regression?
by Albert W. Hopkins 11 Nov '11

11 Nov '11

Hi folks, I have a few "headless" qemu domains that use serial consoles. Typically i connect to the consoles with # virsh console <domain> However with 0.9.7 I get Connected to domain gentoo-base Escape character is ^] error: internal error character device (null) is not using a PTY I am still able to connect to the console if i go into the virt-manager gui and use the "gui" console, but I'd rather not do that as sometimes I don't have access to the gui. Is this a regression or am I expected to do some kind of migration on my domains. These are qemu guests running on Gentoo Linux. An xml dump of a typical domain follows: <domain type='kvm'> <name>base</name> <uuid>b4a528dd-4c31-03ca-bdde-795c4c38592d</uuid> <memory>524288</memory> <currentMemory>61440</currentMemory> <vcpu>1</vcpu> <os> <type arch='x86_64' machine='pc-0.12'>hvm</type> <kernel>/var/lib/libvirt/images/vmlinuz</kernel> <cmdline>root=/dev/vda1 rootfstype=ext4 quiet console=ttyS0 TERM=vt100</cmdline> <boot dev='hd'/> <bootmenu enable='no'/> </os> <features> <acpi/> <pae/> </features> <cpu match='exact'> <model>Nehalem</model> <vendor>Intel</vendor> <feature policy='require' name='tm2'/> <feature policy='require' name='est'/> <feature policy='require' name='monitor'/> <feature policy='require' name='ss'/> <feature policy='require' name='vme'/> <feature policy='require' name='rdtscp'/> <feature policy='require' name='ht'/> <feature policy='require' name='ds'/> <feature policy='require' name='pbe'/> <feature policy='require' name='tm'/> <feature policy='require' name='vmx'/> <feature policy='require' name='ds_cpl'/> <feature policy='require' name='xtpr'/> <feature policy='require' name='acpi'/> <feature policy='require' name='x2apic'/> </cpu> <clock offset='utc'/> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> <on_crash>restart</on_crash> <devices> <emulator>/usr/bin/qemu-kvm</emulator> <disk type='file' device='disk'> <driver name='qemu' type='qcow2' cache='none'/> <source file='/var/lib/libvirt/images/base.qcow'/> <target dev='vda' bus='virtio'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> </disk> <interface type='network'> <mac address='52:54:00:06:84:c0'/> <source network='default'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0'/> </interface> <serial type='pty'> <target port='0'/> </serial> <console type='pty'> <target type='serial' port='0'/> </console> <memballoon model='virtio'> <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> </memballoon> </devices> </domain> Thanks in advance, -a

3 2

[libvirt] Open Source Virtualization and Cloud at FOSDEM
by Mark McLoughlin 11 Nov '11

11 Nov '11

Hey, Here's one for the calendar - a 2 day track at FOSDEM devoted to Open Source Virtualization and Cloud. Hope to see you there! :) Cheers, Mark. -------- Forwarded Message -------- > From: Thierry Carrez <thierry(a)openstack.org> > To: openstack(a)lists.launchpad.net <openstack(a)lists.launchpad.net> > Subject: [Openstack] OpenStack at FOSDEM > Date: Fri, 11 Nov 2011 11:34:22 +0100 > > Hi everyone, > > Our OpenStack devroom was accepted for FOSDEM, February 4-5, 2012 in > Brussels. It was actually grouped with other "Open Source virtualization > and cloud" projects in a giant devroom (550-seat auditorium) that lasts > the full 2 days ! > > Expect a CFP in the coming weeks... > > See other devrooms at: > http://fosdem.org/2012/devrooms_for_2012 > > -- > Thierry Carrez (ttx) > Release Manager, OpenStack > > _______________________________________________ > Mailing list: https://launchpad.net/~openstack > Post to : openstack(a)lists.launchpad.net > Unsubscribe : https://launchpad.net/~openstack > More help : https://help.launchpad.net/ListHelp

1 0

[libvirt] Long QEMU main loop pauses during migration (to file) under heavy load
by Daniel P. Berrange 11 Nov '11

11 Nov '11

Libvirt recently introduced a change to the way it does 'save to file' with QEMU. Historically QEMU has a 32MB/s I/O limit on migration by default. When saving to file, we didn't want any artificial limit, but rather to max out the underlying storage. So when doing save to file, we set a large bandwidth limit (INT64_MAX / (1024 * 1024)) so it is effectively unlimited. After doing this, we discovered that the QEMU monitor was becoming entirely blocked. It did not even return from the 'migrate' command until migration was complete despite the 'detach' flag being set. This was a bug in libvirt, because we passed a plain file descriptor which does not support EAGAIN. Thank you POSIX. Libvirt has another mode where it uses an I/O helper command so get O_DIRECT, and in this mode we pass a pipe() FD to QEMU. After ensuring that this pipe FD really does have O_NONBLOCK set, we still saw some odd behaviour. I'm not sure whether what I describe can neccessarily be called a QEMU bug, but I wanted to raise it for discussion anyway.... The sequence of steps is - libvirt sets qemu migration bandwidth to "unlimited" - libvirt opens a pipe() and sets O_NONBLOCK on the write end - libvirt spawns libvirt-iohelper giving it the target file on disk, and the read end of the pipe - libvirt does 'getfd migfile' monitor command to give QEMU the write end of the pipe - libvirt does 'migrate fd:migfile -d' to run migration - In parallel - QEMU is writing to the pipe (which is non-blocking) - libvirt_helper reading the pipe & writing to disk with O_DIRECT The initial 'migrate' command detaches into the background OK, and libvirt can enter its loop doing 'query-migrate' frequently to monitor progress. Initially this works fine, but at some points during the migration, QEMU will get "stuck" for a very long time and not respond to the monitor (or indeed the mainloop at all). These blackouts are anywhere from 10 to 20 seconds long. Using a combination of systemtap, gdb and strace I managed to determine out the following - Most of the qemu_savevm_state_iterate() calls complete in 10-20 ms - Reasonably often a qemu_savevm_state_iterate() call takes 300-400 ms - Fairly rarely a qemu_savevm_state_iterate() call takes 10-20 *seconds* - I can see EAGAIN from the FD QEMU is migrating from - hence most of the iterations are quite short. - In the 10-20 second long calls, no EAGAIN is seen for the entire period. - The host OS in general is fairly "laggy", presumably due to the high rate of direct I/O being performed by the I/O helper, and bad schedular tuning IIUC, there are two things which will cause a qemu_savevm_state_iterate() call to return - Getting EAGAIN on the migration FD - Hitting the max bandwidth limit We have set effectively unlimited bandwidth, so everything relies on the EAGAIN behaviour. If the OS is doing a good job at scheduling processes & I/O, then this seems to work reasonably well. If the OS is highly loaded and becoming less responsive to scheduling apps, then QEMU gets itself into a bad way. What I think is happening is that the OS is giving too much time to the I/O helper process that is reading the other end of the pipe given to QEMU, and then doing the O_DIRECT to disk. Thus in the shorter-than-normal windows of time when QEMU itself is scheduled by the OS, the pipe is fairly empty, so QEMU does not see EAGAIN for a very long period of wallclock time. So we get into a case where QEMU sees 10-20 second gaps betweeen iterations of the main loop. Having a non-inifinite max-bandwidth for the migration, would likely mitigate this to some extent, but I still think it'd be possible to get QEMU into these pathelogical conditions under high load for a host. Is this a scenario we need to worry about for QEMU ? On the one hand it seems like it is a rare edge case in OS behaviour overall. On the other hand, times when a host is highly loaded and non-responsive are exactly the times when a mgmt app might want to save a guest to disk, or migrate it elsewhere. Which would mean we need QEMU to behave as well as possible in these adverse conditions. Thus should we consider having an absolute bound on the execution time of qemu_savevm_state_iterate(), independant of EAGAIN & bandwidth limits, to ensure the main loop doesn't get starved ? Or perhaps moving migration to a separate thread, out of the mainloop is what we need to strive for ? Regards, Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|

1 1

[libvirt] [PATCH 0/3] Guest NUMA topology support - v1
by Bharata B Rao 11 Nov '11

11 Nov '11

Hi, This patch series adds support for specifying NUMA topology for guests. <cpu> ... <topology sockets='2' cores='4' threads='2'/> <numa> <cell cpus='0-7' mems='512000'/> <cell cpus='8-15' mems='512000'/> </numa> ... </cpu> This change allows libvirt to generate -numa options for QEMU/KVM. Changes since v0 ---------------- - Patch re-organization as per danpb's comments. - Use of virBufferAsPrintf instead of snprintf as per danpb's comments. - Use "cell" instead of "node" as per danpb's suggestion. - Add a helper to truncate virBuffer as per Eric's suggestion. - Add documentation. - Add testcases - Add basic validity check for cpus specified in <numa> ... </numa> Testing -------- The patches pass all tests except domainschema test. I think this is not a real failure, but the test is probably failing to pickup the right domaincommon.rng file. Will investigate further. TEST: domainschematest ........................................ 40 ........................................ 80 .........!.............................. 120 ........................................ 160 .................!...................... 200 ........................................ 240 ........................................ 280 ........................................ 320 ... 323 FAILED daemon-conf fails, but it fails even without my patches too. I guess my patches are really affecting it. TEST: daemon-conf .....!!!!!!...!!!!!!!!!!!!!!!!!!!./daemon-conf: line 98: kill: (7811) - No such process ! 34 FAILED v0 -- - https://www.redhat.com/archives/libvir-list/2011-October/msg00025.html RFC --- - http://permalink.gmane.org/gmane.comp.emulators.libvirt/44626 Regards, Bharata.

2 11

[libvirt] [RFC PATCH 0/8 v3] Summary on block IO throttle
by Lei Li 11 Nov '11

11 Nov '11

Changes since V2 - Implement the Python binding support for setting blkio throttling. - Implement --current --live --config options support to unify the libvirt API. - Add changes in docs and tests. - Some changes suggested by Adam Litke, Eric Blake, Daniel P. Berrange. - Change the XML schema. - API name to virDomain{Set, Get}BlockIoTune. - Parameters changed to make them more self-explanatory. - virsh command name to blkdeviotune. - And other fixups. Changes since V1 - Implement the support to get the block io throttling for a device as read only connection - QMP/HMP. - Split virDomainBlockIoThrottle into two separate functions virDomainSetBlockIoThrottle - Set block I/O limits for a device - Requires a connection in 'write' mode. - Limits (info) structure passed as an input parameter virDomainGetBlockIoThrottle - Get the current block I/O limits for a device - Works on a read-only connection. - Current limits are written to the output parameter (reply). - And Other fixups suggested by Adam Litke, Daniel P. Berrange. - For dynamically allocate the blkiothrottle struct, I will fix it when implement --current --live --config options support. Today libvirt supports the cgroups blkio-controller, which handles proportional shares and throughput/iops limits on host block devices. blkio-controller does not support network file systems (NFS) or other QEMU remote block drivers (curl, Ceph/rbd, sheepdog) since they are not host block devices. QEMU I/O throttling works with all types of drive and can be applied independently to each drive attached to a guest and supports throughput/iops limits. To help add QEMU I/O throttling support to libvirt, we plan to complete it with add new API virDomain{Set, Get}BlockIoThrottle(), new command 'blkdeviotune' and Python bindings. Notes: Now all the planed features were implemented (#1#2 were implemented by Zhi Yong Wu), the previous comments were all fixed up too. And the qemu part patches have been accepted upstream just now and are expected to be part of the QEMU 1.1 release, git tree from Zhi Yong: http://repo.or.cz/w/qemu/kevin.git/shortlog/refs/heads/block 1) Enable the blkio throttling in xml when guest is starting up. Add blkio throttling in xml as follows: <disk type='file' device='disk'> ... <iotune> <total_bytes_sec>nnn</total_bytes_sec> ... </iotune> ... </disk> 2) Enable blkio throttling setting at guest running time. virsh blkdeviotune <domain> <device> [--total_bytes_sec<number>] [--read_bytes_sec<number>] \ [--write_bytes_sec<number>] [--total_iops_sec<number>] [--read_iops_sec<number>] [--write_iops_sec<number>] 3) The support to get the current block i/o throttling for a device - HMP/QMP. virsh blkiothrottle <domain> <device> total_bytes_sec: read_bytes_sec: write_bytes_sec: total_iops_sec: read_iops_sec: write_iops_sec: 4) Python binding support for setting blkio throttling. 5) --current --live --config options support to unify the libvirt API. virsh blkdeviotune <domain> <device> [--total_bytes_sec <number>] [--read_bytes_sec <number>] [--write_bytes_sec <number>] [--total_iops_sec <number>] [--read_iops_sec <number>] [--write_iops_sec <number>] [--config] [--live] [--current] daemon/remote.c | 87 +++++++ docs/formatdomain.html.in | 30 ++ docs/schemas/domaincommon.rng | 24 + include/libvirt/libvirt.h.in | 25 ++ python/generator.py | 2 python/libvirt-override-api.xml | 16 + python/libvirt-override.c | 85 +++++++ src/conf/domain_conf.c | 101 ++++++++ src/conf/domain_conf.h | 12 src/driver.h | 18 + src/libvirt.c | 115 +++++++++ src/libvirt_public.syms | 2 src/qemu/qemu_command.c | 33 ++ src/qemu/qemu_driver.c | 217 ++++++++++++++++++ src/qemu/qemu_monitor.c | 36 ++ src/qemu/qemu_monitor.h | 10 src/qemu/qemu_monitor_json.c | 191 +++++++++++++++ src/qemu/qemu_monitor_json.h | 10 src/qemu/qemu_monitor_text.c | 152 ++++++++++++ src/qemu/qemu_monitor_text.h | 10 src/remote/remote_driver.c | 81 ++++++ src/remote/remote_protocol.x | 39 +++ src/remote_protocol-structs | 34 ++ src/util/xml.h | 3 tests/qemuxml2argvdata/qemuxml2argv-blkdeviotune.args | 4 tests/qemuxml2argvdata/qemuxml2argv-blkdeviotune.xml | 36 ++ tests/qemuxml2argvtest.c | 2 tests/qemuxml2xmltest.c | 2 tools/virsh.c | 146 ++++++++++++ tools/virsh.pod | 23 + 30 files changed, 1540 insertions(+), 6 deletions(-) -- Lei

4 6

[libvirt] Problem with listDomains() in Xen
by PREETHI RAMESH 11 Nov '11

11 Nov '11

This question concerns the usage of the listDomains(). When I run this piece of code in KVM, it works perfectly fine but throws an array out of bounds exception in Xen. Connect conn=null; conn = new Connect("xen:///", true); int[] id = conn.listDomains(); System.out.println("lD of VM " +id[0]); Answer I'd got: Well, your code assumes that id.length is >= 1, but listDomains() can return an empty array when there are no active domains known to libvirt. So you need to check id.length before accessing any element in the array. Follow up- I tried accessing the length of the array and it's 0 all the time. And there are active domains available. In fact, I'm able to getUUID from the domain name. Other functions work fine too. Am I missing something?Can someone please help me? Thanks!

1 0

[libvirt] [PATCH 7/8] Support virDomain{Set, Get}BlockIoThrottle in the python API
by Lei Li 10 Nov '11

10 Nov '11

Python support for both set and get block I/O throttle. Signed-off-by: Zhi Yong Wu <wuzhy(a)linux.vnet.ibm.com> Signed-off-by: Lei Li <lilei(a)linux.vnet.ibm.com> --- python/generator.py | 2 + python/libvirt-override-api.xml | 16 +++++++ python/libvirt-override.c | 85 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 103 insertions(+), 0 deletions(-) diff --git a/python/generator.py b/python/generator.py index 71afdb7..88c52b9 100755 --- a/python/generator.py +++ b/python/generator.py @@ -414,6 +414,8 @@ skip_impl = ( 'virDomainGetBlockJobInfo', 'virDomainMigrateGetMaxSpeed', 'virDomainBlockStatsFlags', + 'virDomainSetBlockIoTune', + 'virDomainGetBlockIoTune', ) qemu_skip_impl = ( diff --git a/python/libvirt-override-api.xml b/python/libvirt-override-api.xml index ef02f34..e8d9138 100644 --- a/python/libvirt-override-api.xml +++ b/python/libvirt-override-api.xml @@ -375,5 +375,21 @@ <arg name='flags' type='unsigned int' info='flags, currently unused, pass 0.'/> <return type='unsigned long' info='current max migration speed, or None in case of error'/> </function> + <function name='virDomainSetBlockIoTune' file='python'> + <info>Change the I/O throttle for a block device</info> + <arg name='dom' type='virDomainPtr' info='pointer to the domain'/> + <arg name='disk' type='const char *' info='disk name'/> + <arg name='info' type='virDomainBlockIoTuneInfoPtr' info='io throttle limits'/> + <arg name='flags' type='unsigned int' info='an OR'ed set of virDomainModificationImpact'/> + <return type='virDomainSetBlockIoTuneInfo' info='0 in case of operation has started, -1 in case of failure'/> + </function> + <function name='virDomainGetBlockIoTune' file='python'> + <info>Get the I/O throttle a block device</info> + <arg name='dom' type='virDomainPtr' info='pointer to the domain'/> + <arg name='disk' type='const char *' info='disk name'/> + <arg name='reply' type='virDomainBlockIoTuneInfoPtr' info='io throttle info'/> + <arg name='flags' type='unsigned int' info='an OR'ed set of virDomainModificationImpact'/> + <return type='virDomainGetBlockIoTuneInfo' info='A dictionary containing block I/O limits information.'/> + </function> </symbols> </api> diff --git a/python/libvirt-override.c b/python/libvirt-override.c index 1759bae..d4b023a 100644 --- a/python/libvirt-override.c +++ b/python/libvirt-override.c @@ -3195,6 +3195,89 @@ LIBVIRT_END_ALLOW_THREADS; return ret; } +static PyObject * +libvirt_virDomainSetBlockIoTune(PyObject *self ATTRIBUTE_UNUSED, + PyObject *args) +{ + virDomainPtr domain; + PyObject *pyobj_domain, *pyinfo; + const char *disk; + unsigned int flags; + virDomainBlockIoTuneInfo info; + int c_ret; + PyObject *ret; + + if (!PyArg_ParseTuple(args, (char *)"Ozi:virDomainSetBlockIoTune", + &pyobj_domain, &disk, &pyinfo, &flags)) + return(NULL); + domain = (virDomainPtr) PyvirDomain_Get(pyobj_domain); + + info.total_bytes_sec = (unsigned long long)PyLong_AsLongLong(PyDict_GetItem(pyinfo, + libvirt_constcharPtrWrap("bps"))); + info.read_bytes_sec = (unsigned long long)PyLong_AsLongLong(PyDict_GetItem(pyinfo, + libvirt_constcharPtrWrap("bps_rd"))); + info.write_bytes_sec = (unsigned long long)PyLong_AsLongLong(PyDict_GetItem(pyinfo, + libvirt_constcharPtrWrap("bps_wr"))); + info.total_iops_sec = (unsigned long long)PyLong_AsLongLong(PyDict_GetItem(pyinfo, + libvirt_constcharPtrWrap("iops"))); + info.read_iops_sec = (unsigned long long)PyLong_AsLongLong(PyDict_GetItem(pyinfo, + libvirt_constcharPtrWrap("iops_rd"))); + info.write_iops_sec = (unsigned long long)PyLong_AsLongLong(PyDict_GetItem(pyinfo, + libvirt_constcharPtrWrap("iops_wr"))); + + LIBVIRT_BEGIN_ALLOW_THREADS; + c_ret = virDomainSetBlockIoTune(domain, disk, &info, flags); + LIBVIRT_END_ALLOW_THREADS; + + if (c_ret < 0) { + return VIR_PY_NONE; + } + + return VIR_PY_INT_SUCCESS; +} + +static PyObject * +libvirt_virDomainGetBlockIoTune(PyObject *self ATTRIBUTE_UNUSED, + PyObject *args) +{ + virDomainPtr domain; + PyObject *pyobj_domain; + const char *disk; + unsigned int flags; + virDomainBlockIoTuneInfo reply; + int c_ret; + PyObject *ret; + + if (!PyArg_ParseTuple(args, (char *)"Oi:virDomainGetBlockIoTune", + &pyobj_domain, &disk, &flags)) + return(NULL); + domain = (virDomainPtr) PyvirDomain_Get(pyobj_domain); + + LIBVIRT_BEGIN_ALLOW_THREADS; + c_ret = virDomainGetBlockIoTune(domain, disk, &reply, flags); + LIBVIRT_END_ALLOW_THREADS; + + if (c_ret < 0) + return VIR_PY_NONE; + + if ((ret = PyDict_New()) == NULL) + return VIR_PY_NONE; + + PyDict_SetItem(ret, libvirt_constcharPtrWrap("total_bytes_sec"), + libvirt_ulonglongWrap(reply.total_bytes_sec)); + PyDict_SetItem(ret, libvirt_constcharPtrWrap("read_bytes_sec"), + libvirt_ulonglongWrap(reply.read_bytes_sec)); + PyDict_SetItem(ret, libvirt_constcharPtrWrap("write_bytes_sec"), + libvirt_ulonglongWrap(reply.write_bytes_sec)); + PyDict_SetItem(ret, libvirt_constcharPtrWrap("total_iops_sec"), + libvirt_ulonglongWrap(reply.total_iops_sec)); + PyDict_SetItem(ret, libvirt_constcharPtrWrap("read_iops_sec"), + libvirt_ulonglongWrap(reply.read_iops_sec)); + PyDict_SetItem(ret, libvirt_constcharPtrWrap("write_iops_sec"), + libvirt_ulonglongWrap(reply.write_iops_sec)); + return ret; +} + /******************************************* * Helper functions to avoid importing modules * for every callback @@ -4837,6 +4920,8 @@ static PyMethodDef libvirtMethods[] = { {(char *) "virDomainSnapshotListNames", libvirt_virDomainSnapshotListNames, METH_VARARGS, NULL}, {(char *) "virDomainRevertToSnapshot", libvirt_virDomainRevertToSnapshot, METH_VARARGS, NULL}, {(char *) "virDomainGetBlockJobInfo", libvirt_virDomainGetBlockJobInfo, METH_VARARGS, NULL}, + {(char *) "virDomainSetBlockIoTune", libvirt_virDomainSetBlockIoTune, METH_VARARGS, NULL}, + {(char *) "virDomainGetBlockIoTune", libvirt_virDomainGetBlockIoTune, METH_VARARGS, NULL}, {(char *) "virDomainSendKey", libvirt_virDomainSendKey, METH_VARARGS, NULL}, {(char *) "virDomainMigrateGetMaxSpeed", libvirt_virDomainMigrateGetMaxSpeed, METH_VARARGS, NULL}, {NULL, NULL, 0, NULL} -- 1.7.1

2 1

[libvirt] Wiki spam!
by Cole Robinson 10 Nov '11

10 Nov '11

The wiki's been spammed, see November 9 for example: http://wiki.libvirt.org/page/Special:Recentchanges virt-manager.org had a similar problem. Any one know any good proactive ways to prevent this? - Cole

2 3

[libvirt] [PATCH 5/8] Enable the blkdeviotune command in virsh
by Lei Li 10 Nov '11

10 Nov '11

Support virsh command blkdeviotune. Can set or query a block disk I/O throttle setting. Signed-off-by: Zhi Yong Wu <wuzhy(a)linux.vnet.ibm.com> Signed-off-by: Lei Li <lilei(a)linux.vnet.ibm.com> --- tools/virsh.c | 146 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ tools/virsh.pod | 23 +++++++++ 2 files changed, 169 insertions(+), 0 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 83dc3c7..df2b399 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -6023,6 +6023,151 @@ cmdBlockJob(vshControl *ctl, const vshCmd *cmd) return true; } +/* + * "blkdeviotune" command + */ +static const vshCmdInfo info_blkdeviotune[] = { + {"help", N_("Set or query a block disk I/O throttle setting.")}, + {"desc", N_("Set or query a block disk I/O throttle setting.\n" \ + " To query the block disk I/O throttle setting use the following" \ + " command: \n\n" \ + " virsh # blkdeviotune <domain> <device>")}, + {NULL, NULL} +}; + +static const vshCmdOptDef opts_blkdeviotune[] = { + {"domain", VSH_OT_DATA, VSH_OFLAG_REQ, N_("domain name, id or uuid")}, + {"device", VSH_OT_DATA, VSH_OFLAG_REQ, N_("block device")}, + {"total_bytes_sec", VSH_OT_INT, VSH_OFLAG_NONE, N_("total throughput limit in bytes per second/s")}, + {"read_bytes_sec", VSH_OT_INT, VSH_OFLAG_NONE, N_("read throughput limit in bytes per second/s")}, + {"write_bytes_sec", VSH_OT_INT, VSH_OFLAG_NONE, N_("write throughput limit in bytes per second/s")}, + {"total_iops_sec", VSH_OT_INT, VSH_OFLAG_NONE, N_("total I/O operations limit per second/s")}, + {"read_iops_sec", VSH_OT_INT, VSH_OFLAG_NONE, N_("read I/O operations limit per second/s")}, + {"write_iops_sec", VSH_OT_INT, VSH_OFLAG_NONE, N_("write I/O operations limit per second/s")}, + {"config", VSH_OT_BOOL, 0, N_("affect next boot")}, + {"live", VSH_OT_BOOL, 0, N_("affect running domain")}, + {"current", VSH_OT_BOOL, 0, N_("affect current domain")}, + {NULL, 0, 0, NULL} +}; + +static bool +cmdBlkdeviotune(vshControl *ctl, const vshCmd *cmd) +{ + virDomainPtr dom = NULL; + const char *name, *disk; + virDomainBlockIoTuneInfo info; + virDomainBlockIoTuneInfo reply; + unsigned int flags = 0; + int ret = -1; + int rv = 0; + int set = 0; + int current = vshCommandOptBool(cmd, "current"); + int config = vshCommandOptBool(cmd, "config"); + int live = vshCommandOptBool(cmd, "live"); + + if (current) { + if (live || config) { + vshError(ctl, "%s", _("--current must be specified exclusively")); + return false; + } + flags = VIR_DOMAIN_AFFECT_CURRENT; + } else { + if (config) + flags |= VIR_DOMAIN_AFFECT_CONFIG; + if (live) + flags |= VIR_DOMAIN_AFFECT_LIVE; + } + + memset(&info, 0, sizeof(info)); + + if (!vshConnectionUsability(ctl, ctl->conn)) + goto out; + + if (!(dom = vshCommandOptDomain(ctl, cmd, &name))) + goto out; + + if (vshCommandOptString(cmd, "device", &disk) < 0) + goto out; + + if ((rv = vshCommandOptULongLong(cmd, "total_bytes_sec", &info.total_bytes_sec)) < 0) { + vshError(ctl, "%s", + _("Unable to parse integer parameter")); + goto out; + } else if (rv > 0) { + set++; + } + + if ((rv = vshCommandOptULongLong(cmd, "read_bytes_sec", &info.read_bytes_sec)) < 0) { + vshError(ctl, "%s", + _("Unable to parse integer parameter")); + goto out; + } else if (rv > 0) { + set++; + } + + if ((rv = vshCommandOptULongLong(cmd, "write_bytes_sec", &info.write_bytes_sec)) < 0) { + vshError(ctl, "%s", + _("Unable to parse integer parameter")); + goto out; + } else if (rv > 0) { + set++; + } + + if ((rv = vshCommandOptULongLong(cmd, "total_iops_sec", &info.total_iops_sec)) < 0) { + vshError(ctl, "%s", + _("Unable to parse integer parameter")); + goto out; + } else if (rv > 0) { + set++; + } + + if ((rv = vshCommandOptULongLong(cmd, "read_iops_sec", &info.read_iops_sec)) < 0) { + vshError(ctl, "%s", + _("Unable to parse integer parameter")); + goto out; + } else if (rv > 0) { + set++; + } + + if ((rv = vshCommandOptULongLong(cmd, "write_iops_sec", &info.write_iops_sec)) < 0) { + vshError(ctl, "%s", + _("Unable to parse integer parameter")); + goto out; + } else if (rv > 0) { + set++; + } + + if (!set) { + + ret = virDomainGetBlockIoTune(dom, disk, &reply, flags); + + if (ret != 0) + goto out; + + vshPrint(ctl, "%-15s %llu\n", _("total_bytes_sec:"), reply.total_bytes_sec); + vshPrint(ctl, "%-15s %llu\n", _("read_bytes_sec:"), reply.read_bytes_sec); + vshPrint(ctl, "%-15s %llu\n", _("write_bytes_sec:"), reply.write_bytes_sec); + vshPrint(ctl, "%-15s %llu\n", _("total_iops_sec:"), reply.total_iops_sec); + vshPrint(ctl, "%-15s %llu\n", _("read_iops_sec:"), reply.read_iops_sec); + vshPrint(ctl, "%-15s %llu\n", _("write_iops_sec:"), reply.write_iops_sec); + + virDomainFree(dom); + return true; + } else { + + ret = virDomainSetBlockIoTune(dom, disk, &info, flags); + + if (ret == 0) { + virDomainFree(dom); + return true; + } + } + +out: + virDomainFree(dom); + return false; +} + /* * "net-autostart" command @@ -14023,6 +14168,7 @@ static const vshCmdDef domManagementCmds[] = { {"blkiotune", cmdBlkiotune, opts_blkiotune, info_blkiotune, 0}, {"blockpull", cmdBlockPull, opts_block_pull, info_block_pull, 0}, {"blockjob", cmdBlockJob, opts_block_job, info_block_job, 0}, + {"blkdeviotune", cmdBlkdeviotune, opts_blkdeviotune, info_blkdeviotune, 0}, #ifndef WIN32 {"console", cmdConsole, opts_console, info_console, 0}, #endif diff --git a/tools/virsh.pod b/tools/virsh.pod index 775d302..58fcb51 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -572,6 +572,29 @@ operation can be checked with B<blockjob>. I<path> specifies fully-qualified path of the disk. I<bandwidth> specifies copying bandwidth limit in Mbps. +=item B<blkdeviotune> I<domain> I<device> [[I<--total_bytes_sec> B<total_bytes_sec>] +| [[I<--read_bytes_sec> B<read_bytes_sec>] [I<--write_bytes_sec> B<write_bytes_sec>]] +[[I<--total_iops_sec> B<total_iops_sec>] | [[I<--read_iops_sec> B<read_iops_sec>] +[I<--write_iops_sec> B<write_iops_sec>]] [[I<--config>] [I<--live>] | [I<--current>]] + +Set or query the block disk io limits settting. +I<path> specifies block disk name. +I<--total_bytes_sec> specifies total throughput limit in bytes per second/s. +I<--read_bytes_sec> specifies read throughput limit in bytes per second/s. +I<--write_bytes_sec> specifies write throughput limit in bytes per second/s. +I<--total_iops_sec> specifies total I/O operations limit per second/s. +I<--read_iops_sec> specifies read I/O operations limit per second/s. +I<--write_iops_sec> specifies write I/O operations limit per second/s. + +If I<--live> is specified, affect a running guest. +If I<--config> is specified, affect the next boot of a persistent guest. +If I<--current> is specified, affect the current guest state. +Both I<--live> and I<--current> flags may be given, but I<--current> is +exclusive. If no flag is specified, behavior is different depending +on hypervisor. + +If no limit is specified, it will query current I/O limits setting. + =item B<blockjob> I<domain> I<path> [I<--abort>] [I<--info>] [I<bandwidth>] Manage active block operations. -- 1.7.1

2 1

[libvirt] [PATCH 4/8] Support block I/O throtte in XML
by Lei Li 10 Nov '11

10 Nov '11

Enable block I/O throttle for per-disk in XML. Signed-off-by: Zhi Yong Wu <wuzhy(a)linux.vnet.ibm.com> Signed-off-by: Lei Li <lilei(a)linux.vnet.ibm.com> --- src/conf/domain_conf.c | 101 +++++++++++++++++++++++++++++++++++++++++++++- src/conf/domain_conf.h | 12 ++++++ src/qemu/qemu_command.c | 33 +++++++++++++++ src/util/xml.h | 2 + 4 files changed, 145 insertions(+), 3 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 58f4d0f..564914e 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -2318,7 +2318,8 @@ static virDomainDiskDefPtr virDomainDiskDefParseXML(virCapsPtr caps, xmlNodePtr node, virBitmapPtr bootMap, - unsigned int flags) + unsigned int flags, + xmlXPathContextPtr ctxt) { virDomainDiskDefPtr def; xmlNodePtr cur, child; @@ -2517,6 +2518,62 @@ virDomainDiskDefParseXML(virCapsPtr caps, } child = child->next; } + } else if (xmlStrEqual(cur->name, BAD_CAST "iotune")) { + if (virXPathULongLong("string(./devices/disk/iotune/total_bytes_sec)", + ctxt, &def->blkdeviotune.total_bytes_sec) < 0) { + def->blkdeviotune.total_bytes_sec = 0; + } else { + def->blkdeviotune.mark = 1; + } + + if (virXPathULongLong("string(./devices/disk/iotune/read_bytes_sec)", + ctxt, &def->blkdeviotune.read_bytes_sec) < 0) { + def->blkdeviotune.read_bytes_sec = 0; + } else { + def->blkdeviotune.mark = 1; + } + + if (virXPathULongLong("string(./devices/disk/iotune/write_bytes_sec)", + ctxt, &def->blkdeviotune.write_bytes_sec) < 0) { + def->blkdeviotune.write_bytes_sec = 0; + } else { + def->blkdeviotune.mark = 1; + } + + if (virXPathULongLong("string(./devices/disk/iotune/total_iops_sec)", + ctxt, &def->blkdeviotune.total_iops_sec) < 0) { + def->blkdeviotune.total_iops_sec = 0; + } else { + def->blkdeviotune.mark = 1; + } + + if (virXPathULongLong("string(./devices/disk/iotune/read_iops_sec)", + ctxt, &def->blkdeviotune.read_iops_sec) < 0) { + def->blkdeviotune.read_iops_sec = 0; + } else { + def->blkdeviotune.mark = 1; + } + + if (virXPathULongLong("string(./devices/disk/iotune/write_iops_sec)", + ctxt, &def->blkdeviotune.write_iops_sec) < 0) { + def->blkdeviotune.write_iops_sec = 0; + } else { + def->blkdeviotune.mark = 1; + } + + if ((def->blkdeviotune.total_bytes_sec && def->blkdeviotune.read_bytes_sec) + || (def->blkdeviotune.total_bytes_sec && def->blkdeviotune.write_bytes_sec)) { + virDomainReportError(VIR_ERR_XML_ERROR, + _("bps and bps_rd/bps_wr cannot be set at the same time")); + goto error; + } + + if ((def->blkdeviotune.total_iops_sec && def->blkdeviotune.read_iops_sec) + || (def->blkdeviotune.total_iops_sec && def->blkdeviotune.write_iops_sec)) { + virDomainReportError(VIR_ERR_XML_ERROR, + _("iops and iops_rd/iops_wr cannot be set at the same time")); + goto error; + } } else if (xmlStrEqual(cur->name, BAD_CAST "readonly")) { def->readonly = 1; } else if (xmlStrEqual(cur->name, BAD_CAST "shareable")) { @@ -6003,7 +6060,7 @@ virDomainDeviceDefPtr virDomainDeviceDefParse(virCapsPtr caps, if (xmlStrEqual(node->name, BAD_CAST "disk")) { dev->type = VIR_DOMAIN_DEVICE_DISK; if (!(dev->data.disk = virDomainDiskDefParseXML(caps, node, - NULL, flags))) + NULL, flags, NULL))) goto error; } else if (xmlStrEqual(node->name, BAD_CAST "lease")) { dev->type = VIR_DOMAIN_DEVICE_LEASE; @@ -7076,7 +7133,8 @@ static virDomainDefPtr virDomainDefParseXML(virCapsPtr caps, virDomainDiskDefPtr disk = virDomainDiskDefParseXML(caps, nodes[i], bootMap, - flags); + flags, + ctxt); if (!disk) goto error; @@ -9511,6 +9569,43 @@ virDomainDiskDefFormat(virBufferPtr buf, virBufferAsprintf(buf, " <target dev='%s' bus='%s'/>\n", def->dst, bus); + /*disk I/O throttling*/ + if (def->blkdeviotune.mark) { + virBufferAddLit(buf, " <iotune>\n"); + if (def->blkdeviotune.total_bytes_sec) { + virBufferAsprintf(buf, " <total_bytes_sec>%llu</total_bytes_sec>\n", + def->blkdeviotune.total_bytes_sec); + } + + if (def->blkdeviotune.read_bytes_sec) { + virBufferAsprintf(buf, " <read_bytes_sec>%llu</read_bytes_sec>\n", + def->blkdeviotune.read_bytes_sec); + + } + + if (def->blkdeviotune.write_bytes_sec) { + virBufferAsprintf(buf, " <write_bytes_sec>%llu</write_bytes_sec>\n", + def->blkdeviotune.write_bytes_sec); + } + + if (def->blkdeviotune.total_iops_sec) { + virBufferAsprintf(buf, " <total_iops_sec>%llu</total_iops_sec>\n", + def->blkdeviotune.total_iops_sec); + } + + if (def->blkdeviotune.read_iops_sec) { + virBufferAsprintf(buf, " <read_iops_sec>%llu</read_iops_sec>", + def->blkdeviotune.read_iops_sec); + } + + if (def->blkdeviotune.write_iops_sec) { + virBufferAsprintf(buf, " <write_iops_sec>%llu</write_iops_sec>", + def->blkdeviotune.write_iops_sec); + } + + virBufferAddLit(buf, " </iotune>\n"); + } + if (def->bootIndex) virBufferAsprintf(buf, " <boot order='%d'/>\n", def->bootIndex); if (def->readonly) diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index a3cb834..d95e239 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -333,6 +333,18 @@ struct _virDomainDiskDef { } auth; char *driverName; char *driverType; + + /*disk I/O throttling*/ + struct { + unsigned long long total_bytes_sec; + unsigned long long read_bytes_sec; + unsigned long long write_bytes_sec; + unsigned long long total_iops_sec; + unsigned long long read_iops_sec; + unsigned long long write_iops_sec; + unsigned int mark; + } blkdeviotune; + char *serial; int cachemode; int error_policy; /* enum virDomainDiskErrorPolicy */ diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 11ebb69..3a8575b 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -1715,6 +1715,39 @@ qemuBuildDriveStr(virConnectPtr conn ATTRIBUTE_UNUSED, } } + /*block I/O throttling*/ + if (disk->blkdeviotune.mark) { + if (disk->blkdeviotune.total_bytes_sec) { + virBufferAsprintf(&opt, ",bps=%llu", + disk->blkdeviotune.total_bytes_sec); + } + + if (disk->blkdeviotune.read_bytes_sec) { + virBufferAsprintf(&opt, ",bps_rd=%llu", + disk->blkdeviotune.read_bytes_sec); + } + + if (disk->blkdeviotune.write_bytes_sec) { + virBufferAsprintf(&opt, ",bps_wr=%llu", + disk->blkdeviotune.write_bytes_sec); + } + + if (disk->blkdeviotune.total_iops_sec) { + virBufferAsprintf(&opt, ",iops=%llu", + disk->blkdeviotune.total_iops_sec); + } + + if (disk->blkdeviotune.read_iops_sec) { + virBufferAsprintf(&opt, ",iops_rd=%llu", + disk->blkdeviotune.read_iops_sec); + } + + if (disk->blkdeviotune.write_iops_sec) { + virBufferAsprintf(&opt, ",iops_wr=%llu", + disk->blkdeviotune.write_iops_sec); + } + } + if (virBufferError(&opt)) { virReportOOMError(); goto error; diff --git a/src/util/xml.h b/src/util/xml.h index c492063..5742f19 100644 --- a/src/util/xml.h +++ b/src/util/xml.h @@ -50,6 +50,8 @@ xmlNodePtr virXPathNode(const char *xpath, int virXPathNodeSet(const char *xpath, xmlXPathContextPtr ctxt, xmlNodePtr **list); +int virXMLStringToULongLong (const char *stringval, + unsigned long long *value); char * virXMLPropString(xmlNodePtr node, const char *name); -- 1.7.1

2 1