- Devel - libvirt List Archives

[libvirt] [libvirt-glib 1/2] Rely on libvirt API to detect transient domains
by Zeeshan Ali (Khattak) 30 Nov '11

30 Nov '11

From: "Zeeshan Ali (Khattak)" <zeeshanak(a)gnome.org> --- libvirt-gobject/libvirt-gobject-connection.c | 6 +----- 1 files changed, 1 insertions(+), 5 deletions(-) diff --git a/libvirt-gobject/libvirt-gobject-connection.c b/libvirt-gobject/libvirt-gobject-connection.c index c9985b2..b647bfa 100644 --- a/libvirt-gobject/libvirt-gobject-connection.c +++ b/libvirt-gobject/libvirt-gobject-connection.c @@ -260,7 +260,6 @@ static int domain_event_cb(virConnectPtr conn G_GNUC_UNUSED, GVirConnection *gconn = opaque; GVirDomain *gdom; GVirConnectionPrivate *priv = gconn->priv; - gboolean was_unknown = FALSE; if (virDomainGetUUIDString(dom, uuid) < 0) { g_warning("Failed to get domain UUID on %p", dom); @@ -279,8 +278,6 @@ static int domain_event_cb(virConnectPtr conn G_GNUC_UNUSED, g_mutex_lock(priv->lock); g_hash_table_insert(priv->domains, (gpointer)gvir_domain_get_uuid(gdom), gdom); g_mutex_unlock(priv->lock); - - was_unknown = TRUE; } switch (event) { @@ -307,8 +304,7 @@ static int domain_event_cb(virConnectPtr conn G_GNUC_UNUSED, case VIR_DOMAIN_EVENT_STARTED: if (detail == VIR_DOMAIN_EVENT_STARTED_BOOTED) { - if (was_unknown) - /* Most probably a transient domain */ + if (!virDomainIsPersistent(dom)) g_signal_emit(gconn, signals[VIR_DOMAIN_ADDED], 0, gdom); g_signal_emit_by_name(gdom, "started::booted"); } else if (detail == VIR_DOMAIN_EVENT_STARTED_MIGRATED) -- 1.7.7.3

3 5

[libvirt] [libvirt-glib 01/13] Add GVirConfigXmlDoc type
by Christophe Fergeau 30 Nov '11

30 Nov '11

This class derives from GObject and wraps an xmlDocPtr. It will be useful to refcount xmlDoc so that it can be shared between multiple GVirConfigObject instances. --- libvirt-gconfig/Makefile.am | 4 +- libvirt-gconfig/libvirt-gconfig-xml-doc.c | 137 +++++++++++++++++++++++++++++ libvirt-gconfig/libvirt-gconfig-xml-doc.h | 66 ++++++++++++++ 3 files changed, 206 insertions(+), 1 deletions(-) create mode 100644 libvirt-gconfig/libvirt-gconfig-xml-doc.c create mode 100644 libvirt-gconfig/libvirt-gconfig-xml-doc.h diff --git a/libvirt-gconfig/Makefile.am b/libvirt-gconfig/Makefile.am index e91c601..8276d07 100644 --- a/libvirt-gconfig/Makefile.am +++ b/libvirt-gconfig/Makefile.am @@ -35,6 +35,7 @@ GCONFIG_HEADER_FILES = \ noinst_HEADERS = \ libvirt-gconfig-helpers-private.h \ libvirt-gconfig-object-private.h + libvirt-gconfig-xml-doc.h GCONFIG_SOURCE_FILES = \ libvirt-gconfig-object.c \ libvirt-gconfig-capabilities.c \ @@ -59,7 +60,8 @@ GCONFIG_SOURCE_FILES = \ libvirt-gconfig-node-device.c \ libvirt-gconfig-secret.c \ libvirt-gconfig-storage-pool.c \ - libvirt-gconfig-storage-vol.c + libvirt-gconfig-storage-vol.c \ + libvirt-gconfig-xml-doc.c libvirt_gconfig_1_0_ladir = $(includedir)/libvirt-gconfig-1.0/libvirt-gconfig libvirt_gconfig_1_0_la_HEADERS = \ diff --git a/libvirt-gconfig/libvirt-gconfig-xml-doc.c b/libvirt-gconfig/libvirt-gconfig-xml-doc.c new file mode 100644 index 0000000..7906158 --- /dev/null +++ b/libvirt-gconfig/libvirt-gconfig-xml-doc.c @@ -0,0 +1,137 @@ +/* + * libvirt-gobject-config-xml-node.c: libvirt glib 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: Christophe Fergeau <cfergeau(a)gmail.com> + */ + +#include <config.h> + +#include <string.h> + +#include <libxml/tree.h> + +#include "libvirt-gconfig/libvirt-gconfig.h" +#include "libvirt-gconfig/libvirt-gconfig-xml-doc.h" + +extern gboolean debugFlag; + +#define DEBUG(fmt, ...) do { if (G_UNLIKELY(debugFlag)) g_debug(fmt, ## __VA_ARGS__); } while (0) + +#define GVIR_CONFIG_XML_DOC_GET_PRIVATE(obj) \ + (G_TYPE_INSTANCE_GET_PRIVATE((obj), GVIR_TYPE_CONFIG_XML_DOC, GVirConfigXmlDocPrivate)) + +struct _GVirConfigXmlDocPrivate +{ + xmlDocPtr doc; +}; + +G_DEFINE_TYPE(GVirConfigXmlDoc, gvir_config_xml_doc, G_TYPE_OBJECT); + +enum { + PROP_0, + PROP_DOC +}; + +static void gvir_config_xml_doc_get_property(GObject *object, + guint prop_id, + GValue *value, + GParamSpec *pspec) +{ + GVirConfigXmlDoc *xml_doc = GVIR_CONFIG_XML_DOC(object); + + switch (prop_id) { + case PROP_DOC: + g_value_set_pointer(value, xml_doc->priv->doc); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec); + } +} + +static void gvir_config_xml_doc_set_property(GObject *object, + guint prop_id, + const GValue *value, + GParamSpec *pspec) +{ + GVirConfigXmlDoc *doc = GVIR_CONFIG_XML_DOC(object); + + switch (prop_id) { + case PROP_DOC: + doc->priv->doc = g_value_get_pointer(value); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec); + } +} + +static void gvir_config_xml_doc_finalize(GObject *object) +{ + GVirConfigXmlDoc *doc = GVIR_CONFIG_XML_DOC(object); + GVirConfigXmlDocPrivate *priv = doc->priv; + + DEBUG("Finalize GVirConfigXmlDoc=%p", doc); + + if (priv->doc) + xmlFreeDoc(priv->doc); + + G_OBJECT_CLASS(gvir_config_xml_doc_parent_class)->finalize(object); +} + +static void gvir_config_xml_doc_class_init(GVirConfigXmlDocClass *klass) +{ + GObjectClass *object_class = G_OBJECT_CLASS(klass); + + g_type_class_add_private(klass, sizeof(GVirConfigXmlDocPrivate)); + + object_class->finalize = gvir_config_xml_doc_finalize; + object_class->get_property = gvir_config_xml_doc_get_property; + object_class->set_property = gvir_config_xml_doc_set_property; + + g_object_class_install_property(object_class, + PROP_DOC, + g_param_spec_pointer("doc", + "XML Doc", + "The XML doc this config object corresponds to", + G_PARAM_READWRITE | + G_PARAM_CONSTRUCT_ONLY | + G_PARAM_STATIC_STRINGS)); +} + + +static void gvir_config_xml_doc_init(GVirConfigXmlDoc *xml_doc) +{ + GVirConfigXmlDocPrivate *priv; + + DEBUG("Init GVirConfigXmlDoc=%p", xml_doc); + + priv = xml_doc->priv = GVIR_CONFIG_XML_DOC_GET_PRIVATE(xml_doc); + + memset(priv, 0, sizeof(*priv)); +} + + +GVirConfigXmlDoc *gvir_config_xml_doc_new(xmlDocPtr doc) +{ + if (doc == NULL) { + doc = xmlNewDoc((xmlChar *)"1.0"); + } + return GVIR_CONFIG_XML_DOC(g_object_new(GVIR_TYPE_CONFIG_XML_DOC, + "doc", doc, + NULL)); +} diff --git a/libvirt-gconfig/libvirt-gconfig-xml-doc.h b/libvirt-gconfig/libvirt-gconfig-xml-doc.h new file mode 100644 index 0000000..079de1e --- /dev/null +++ b/libvirt-gconfig/libvirt-gconfig-xml-doc.h @@ -0,0 +1,66 @@ +/* + * libvirt-gobject-xml-doc.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: Christophe Fergeau <cfergeau(a)gmail.com> + */ + +#if !defined(__LIBVIRT_GCONFIG_H__) && !defined(LIBVIRT_GCONFIG_BUILD) +#error "Only <libvirt-gconfig/libvirt-gconfig.h> can be included directly." +#endif + +#ifndef __LIBVIRT_GCONFIG_XML_DOC_H__ +#define __LIBVIRT_GCONFIG_XML_DOC_H__ + +G_BEGIN_DECLS + +#define GVIR_TYPE_CONFIG_XML_DOC (gvir_config_xml_doc_get_type ()) +#define GVIR_CONFIG_XML_DOC(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GVIR_TYPE_CONFIG_XML_DOC, GVirConfigXmlDoc)) +#define GVIR_CONFIG_XML_DOC_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GVIR_TYPE_CONFIG_XML_DOC, GVirConfigXmlDocClass)) +#define GVIR_IS_CONFIG_XML_DOC(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GVIR_TYPE_CONFIG_XML_DOC)) +#define GVIR_IS_CONFIG_XML_DOC_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GVIR_TYPE_CONFIG_XML_DOC)) +#define GVIR_CONFIG_XML_DOC_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GVIR_TYPE_CONFIG_XML_DOC, GVirConfigXmlDocClass)) + +typedef struct _GVirConfigXmlDoc GVirConfigXmlDoc; +typedef struct _GVirConfigXmlDocPrivate GVirConfigXmlDocPrivate; +typedef struct _GVirConfigXmlDocClass GVirConfigXmlDocClass; + +struct _GVirConfigXmlDoc +{ + GObject parent; + + GVirConfigXmlDocPrivate *priv; + + /* Do not add fields to this struct */ +}; + +struct _GVirConfigXmlDocClass +{ + GObjectClass parent_class; + + gpointer padding[20]; +}; + + +GType gvir_config_xml_doc_get_type(void); + +GVirConfigXmlDoc *gvir_config_xml_doc_new(xmlDocPtr doc); + +G_END_DECLS + +#endif /* __LIBVIRT_GCONFIG_XML_DOC_H__ */ -- 1.7.7.3

2 25

[libvirt] [libvirt-glib] Remove transient domain reference on shutdown
by Zeeshan Ali (Khattak) 30 Nov '11

30 Nov '11

From: "Zeeshan Ali (Khattak)" <zeeshanak(a)gnome.org> --- libvirt-gobject/libvirt-gobject-connection.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/libvirt-gobject/libvirt-gobject-connection.c b/libvirt-gobject/libvirt-gobject-connection.c index b647bfa..59b828d 100644 --- a/libvirt-gobject/libvirt-gobject-connection.c +++ b/libvirt-gobject/libvirt-gobject-connection.c @@ -362,6 +362,15 @@ static int domain_event_cb(virConnectPtr conn G_GNUC_UNUSED, g_signal_emit_by_name(gdom, "stopped::from-snapshot"); else g_warn_if_reached(); + + if (virDomainIsPersistent(dom) != 1) { + g_mutex_lock(priv->lock); + g_hash_table_steal(priv->domains, uuid); + g_mutex_unlock(priv->lock); + + g_signal_emit(gconn, signals[VIR_DOMAIN_REMOVED], 0, gdom); + g_object_unref(gdom); + } break; default: -- 1.7.7.3

2 1

[libvirt] Associate a LUN as disk with WWNN/WWPN
by Osier Yang 30 Nov '11

30 Nov '11

Hi, all This is a rough thought about how to allow the user to associate a LUN as disk with WWNN/WWPN. Never mind if some thought is complete wrong, I'm complete new to this area. :-) The initial idea was to introduce new XML for the vHBA which the LUN which be assisned to in a domain XML, just like comment #2 of RHBZ# 543037: <quote> AFAIU libvirt needs a way to: - Associate a virtual adapter WWN with a VM (in the VM xml) - Learn to start a virtual adapter when the VM is started, and destroy the adapter when the VM is stopped. - Possibly a way to associate a WWN with a scsi pool, to start / stop a virtual adapter with the pool. </quote> But afer thinking more, I'd think it might be not good idea: As far as I could understand, the requirement of the BZ wants a way to create/migrate a guest with NPIV. I'm goint to talk create first,and migration then. === Creation If we try to support this all inside libvirt, it means we need to new XML for indicates the WWNN/WWPN of the vHBA or Physical HBA, this is fine we can do it, though it's a bit annoyed where to add it. The biggest problem is there is a race here, we can't known the path of the LUN unless the storage admin assigned (zone / mask, will already use assign for brevity) a LUN to the (v)HBA, and it appears on host successfully. However, domain define/create doesn't allow the disk source path be empty, except it's CDROM, or Floppy. The works which need to be done before domain define should be: - If the user wants to create new vHBA. 1) auto-generate /or specify WWNN/WWPN (with Qumranet's OUI: 00-1A-4A) 2) allows to select fabric WWN, (to guide the choice of which FC adapter to select for the Vport creation, assuming different adapters connect to different fabrics) 3) create the vHBA with virNodeDeviceCreateXML API 4) Ask / prompt the user to ask the storage admin assigns the LUN to the vHBA. 5) Waits for the LUN shows up on host (perhaps via storage pool API) 6) Use the LUN's path (e.g. /dev/disk/by-id/scsi-3600c0ff000d7a2a5d163ff4490100000000-part1) as the disk source path. - If the user wants to select a existed (v)HBA. 1), 2) and 3) are ommited 3) and 4) might be also ommited if there is a LUN already assigned to the selected (v)HBA. As we can see, there are lots of interaction. If we simply wants to do all these work inside libvirt, we lose the user friendly interaction, and just makes our life harder. So, I would these work should be done in external / upper apps, e.g. virt-manager, or Boxes in future. What libvirt needs to do (as far as I could get): 1) support the fabric WWN in node device XML 2) may be we can do auto-generating the WWNN/WWPN inside libvirt if they are not specified. But from a user's p.o.v, I'd see it is in UI, but not in codes silently. 3) perhaps provides methods to get the (v)HBA's fabric's WWN? === Migration If we do things as explained above for domain's creation, the disk XML will be like: <disk type='disk' device='disk'> <driver name='qemu' type='raw'/> <source file='/dev/disk/by-id/scsi-3600c0ff000d7a2a5d163ff4490100000000-part1/'> <target dev='vda' bus='virtio'/> <alias name='virtio-disk0'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x03 function='0x0'/> </disk> It's just similiar with disk which uses a normal disk image. So we needs to something to indentify it's special, it's a LUN assigned to a (v)HBA. Ways to do that in my mind are: 1) If we could find the WWNN/WWPN/fabricwwn by the LUN's path, (I'm not sure if there is a good way yet), things will be much simpler, what we need might be just a simple flag to tell the disk source path is LUN assigned to (v)HBA. e.g. <source file='$path_of_lun' type='fc_hba'/> 2) if there is no way to get the WWNN/WWPN/fabricwwn by LUN's path, we might need the whole config of (v)HBA. e.g. <souce protocol='fc' file='$path_of_lun'> <hba> <wwnn>$wwnn</wwnn> <wwpn>$wwpn</wwpn> <fabricwwn>$fabricwwn</fabricwwn> </hba> </source> And then in virt-manager or Boxes, it needs to detect if there is disk use FC LUN, if it's it should teach dest libvirt to create another vHBA, and assign the same LUN to it. Then migration could do just as normal. But problem of doing like so is the migration won't work anyway with virsh. Hmmm, /me thinking if it will be disireable to introduce hook support for migration. Things will be much simpler if we support hooks? Thoughts and Opinions? Regards, Osier

4 9

[libvirt] [PATCH] virsh: correct return value error
by ajia＠redhat.com 30 Nov '11

30 Nov '11

From: Alex Jia <ajia(a)redhat.com> The 'true' bool value should be 1, and false is 0. https://bugzilla.redhat.com/show_bug.cgi?id=758590 Signed-off-by: Alex Jia <ajia(a)redhat.com> --- tools/virsh.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 01da8e5..618b0c1 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -1745,7 +1745,7 @@ cmdDomblklist(vshControl *ctl, const vshCmd *cmd) VIR_FREE(source); } - ret = 0; + ret = true; cleanup: VIR_FREE(disks); -- 1.7.1

3 3

[libvirt] [PATCH] util: avoid null deref on qcowXGetBackingStore
by ajia＠redhat.com 30 Nov '11

30 Nov '11

From: Alex Jia <ajia(a)redhat.com> Detected by Coverity. the only case is caller passes a NULL to 'format' variable, then taking 'if (format)' false branch, the function qcow2GetBackingStoreFormat will directly dereferences the NULL 'format' pointer variable. Signed-off-by: Alex Jia <ajia(a)redhat.com> --- src/util/storage_file.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/util/storage_file.c b/src/util/storage_file.c index f33ea74..ba9cfc5 100644 --- a/src/util/storage_file.c +++ b/src/util/storage_file.c @@ -333,7 +333,7 @@ qcowXGetBackingStore(char **res, * between the end of the header (QCOW2_HDR_TOTAL_SIZE) * and the start of the backingStoreName (offset) */ - if (isQCow2) + if (isQCow2 && format) qcow2GetBackingStoreFormat(format, buf, buf_size, QCOW2_HDR_TOTAL_SIZE, offset); return BACKING_STORE_OK; -- 1.7.1

2 1

[libvirt] [PATCH 00/14] Cleanup node suspend code
by Daniel P. Berrange 30 Nov '11

30 Nov '11

This patch series does a large number of pretty small / trivial cleanups of the recently committed node suspend code. There are a few important changes though - Patch 1 changes public API enum values - Patch 3 changes the capabilities XML schema - Patch 11 ensures we don't probe suspend info unles we need it - Patch 14 fixes a bug Obviously due to 1 & 3 we need to do this before the next release

4 44

[libvirt] [libvirt-glib] gir: use libraries from build tree, not installed ones
by Christophe Fergeau 29 Nov '11

29 Nov '11

If we don't explicitly mention path to our uninstalled libraries to g-ir-scanner, it will use installed libvirt-* libraries instead of the ones we just built to run a binary during the generation of the gir file. However this binary will have been compiled with the uninstalled ones, This is an issue if the installed libraries are not ABI compatible with the uninstalled one, and will cause a compile failure because the binary will fail to run. This fix has been suggested by Colin Walters (gobject-introspection maintainer). --- libvirt-gobject/Makefile.am | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/libvirt-gobject/Makefile.am b/libvirt-gobject/Makefile.am index 1e0f851..c4405f0 100644 --- a/libvirt-gobject/Makefile.am +++ b/libvirt-gobject/Makefile.am @@ -130,6 +130,8 @@ LibvirtGObject-1.0.gir: libvirt-gobject-1.0.la $(G_IR_SCANNER) Makefile.am --include-uninstalled $(top_builddir)/libvirt-gconfig/LibvirtGConfig-1.0.gir \ --identifier-prefix=GVir \ --symbol-prefix=gvir \ + --library=$(top_builddir)/libvirt-glib/libvirt-glib-1.0.la \ + --library=$(top_builddir)/libvirt-gconfig/libvirt-gconfig-1.0.la \ --library=$(builddir)/libvirt-gobject-1.0.la \ --output $@ \ -I$(top_builddir) \ -- 1.7.7.3

2 1

[libvirt] [PATCH 0/3 v2] Improve async signal safety of timestamp APIs
by Daniel P. Berrange 29 Nov '11

29 Nov '11

An update of https://www.redhat.com/archives/libvir-list/2011-November/msg01609.html In v2: - Rename all APIs which return with errno set to have a Raw postfix ( async signal safe) - Add variants of all APIs which raise errors (async signal dangerous)

2 6

[libvirt] [PATCH] virsh: Update docs for block related commands
by Osier Yang 29 Nov '11

29 Nov '11

commit 3ac26e26 allows to lookup the disk via both target name and source path. But virsh documents were not updated. --- tools/virsh.c | 15 ++++++++++----- tools/virsh.pod | 14 +++++++++----- 2 files changed, 19 insertions(+), 10 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 27ecaf3..94b5478 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -1059,7 +1059,8 @@ static const vshCmdInfo info_domblkstat[] = { static const vshCmdOptDef opts_domblkstat[] = { {"domain", VSH_OT_DATA, VSH_OFLAG_REQ, N_("domain name, id or uuid")}, - {"device", VSH_OT_DATA, VSH_OFLAG_REQ, N_("block device")}, + {"device", VSH_OT_DATA, VSH_OFLAG_REQ, N_("Fully-qualified source path or unique " + "target name of the block device")}, {"human", VSH_OT_BOOL, 0, N_("print a more human readable output")}, {NULL, 0, 0, NULL} }; @@ -1637,7 +1638,8 @@ static const vshCmdInfo info_domblkinfo[] = { static const vshCmdOptDef opts_domblkinfo[] = { {"domain", VSH_OT_DATA, VSH_OFLAG_REQ, N_("domain name, id or uuid")}, - {"device", VSH_OT_DATA, VSH_OFLAG_REQ, N_("block device")}, + {"device", VSH_OT_DATA, VSH_OFLAG_REQ, N_("Fully-qualified source path or unique target" + "name of the block device")}, {NULL, 0, 0, NULL} }; @@ -5959,7 +5961,8 @@ static const vshCmdInfo info_block_pull[] = { static const vshCmdOptDef opts_block_pull[] = { {"domain", VSH_OT_DATA, VSH_OFLAG_REQ, N_("domain name, id or uuid")}, - {"path", VSH_OT_DATA, VSH_OFLAG_REQ, N_("Fully-qualified path of disk")}, + {"path", VSH_OT_DATA, VSH_OFLAG_REQ, N_("Fully-qualified source path or unique " + "target name of the disk")}, {"bandwidth", VSH_OT_DATA, VSH_OFLAG_NONE, N_("Bandwidth limit in MB/s")}, {NULL, 0, 0, NULL} }; @@ -5983,7 +5986,8 @@ static const vshCmdInfo info_block_job[] = { static const vshCmdOptDef opts_block_job[] = { {"domain", VSH_OT_DATA, VSH_OFLAG_REQ, N_("domain name, id or uuid")}, - {"path", VSH_OT_DATA, VSH_OFLAG_REQ, N_("Fully-qualified path of disk")}, + {"path", VSH_OT_DATA, VSH_OFLAG_REQ, N_("Fully-qualified source path or unique" + "target name of the disk")}, {"abort", VSH_OT_BOOL, VSH_OFLAG_NONE, N_("Abort the active job on the speficied disk")}, {"info", VSH_OT_BOOL, VSH_OFLAG_NONE, N_("Get active job information for the specified disk")}, {"bandwidth", VSH_OT_DATA, VSH_OFLAG_NONE, N_("Set the Bandwidth limit in MB/s")}, @@ -6039,7 +6043,8 @@ static const vshCmdInfo info_block_resize[] = { static const vshCmdOptDef opts_block_resize[] = { {"domain", VSH_OT_DATA, VSH_OFLAG_REQ, N_("domain name, id or uuid")}, - {"path", VSH_OT_DATA, VSH_OFLAG_REQ, N_("Fully-qualified path of block device")}, + {"path", VSH_OT_DATA, VSH_OFLAG_REQ, N_("Fully-qualified source path or unique " + "target name of the block device")}, {"size", VSH_OT_INT, VSH_OFLAG_REQ, N_("New size of the block device in kilobytes, " "the size must be integer")}, {NULL, 0, 0, NULL} diff --git a/tools/virsh.pod b/tools/virsh.pod index a5758f4..61951e6 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -569,14 +569,16 @@ image has been pulled, the disk no longer depends on the backing image. It pulls data for the entire disk in the background, the process of the operation can be checked with B<blockjob>. -I<path> specifies fully-qualified path of the disk. +I<path> specifies fully-qualified source path (<source file='name'/>) or +unique target name (<target dev='name'/>) of the disk. I<bandwidth> specifies copying bandwidth limit in Mbps. =item B<blockjob> I<domain> I<path> [I<--abort>] [I<--info>] [I<bandwidth>] Manage active block operations. -I<path> specifies fully-qualified path of the disk. +I<path> specifies fully-qualified source path (<source file='name'/>) or +unique target name (<target dev='name'/>) of the disk. If I<--abort> is specified, the active job on the specified disk will be aborted. If I<--info> is specified, the active job information on the specified @@ -585,9 +587,11 @@ I<bandwidth> can be used to set bandwidth limit for the active job. =item B<blockresize> I<domain> I<--path> I<--size> -Resize a block device of domain while the domain is running, I<--path> -specifies the absolute path of the block device, I<--size> specifies the -new size in kilobytes +Resize a block device of domain while the domain is running. + +I<path> specifies fully-qualified source path (<source file='name'/>) or +unique target name (<target dev='name'/>) of the disk. +I<--size> specifies the new size in kilobytes. =item B<dominfo> I<domain-id> -- 1.7.7.3

2 1