- Devel - libvirt List Archives

[libvirt] [PATCHv7 0/2] util: Add netlink event handling code
by Laine Stump 29 Feb '12

29 Feb '12

This is hopefully the final spin of these patches, It squashes in all the changes from: https://www.redhat.com/archives/libvir-list/2012-February/msg01103.html as well as: https://www.redhat.com/archives/libvir-list/2012-February/msg01173.html Dirk, please test these out and let me know if they're okay to push. Thanks!

1 2

Re: [libvirt] Need your help with virsh desc
by Zhimou Peng 29 Feb '12

29 Feb '12

Hi Eric, I discussed this in my team. And i don't think refuse newlines is a good idea. Description can contains several lines is better. I agree with you of the second one, keep the format of user's input is better(virt-manager shows description too). And i need more information from upstream libvirt list, pls help. Thanks. zhpeng BR ----- Original Message ----- From: "Eric Blake" <eblake(a)redhat.com> To: "Zhimou Peng" <zhpeng(a)redhat.com> Cc: "Alex Jia" <ajia(a)redhat.com>, "Rita Wu" <rwu(a)redhat.com> Sent: Wednesday, February 29, 2012 12:28:48 AM Subject: Re: Need your help with virsh desc On 02/27/2012 10:49 PM, Zhimou Peng wrote: > Hi Eric, > > I try to add some description to my guest, and i find xml format isn't like good. > > For example: > When i add/edit description with: > > # virsh desc kvm1 asdfsadfssafsadfa > Domain description updated successfully > # virsh dumpxml kvm1 > <domain type='kvm'> > <name>kvm1</name> > <uuid>d5cd1756-eb3b-fd9b-1f91-0cc801dfc622</uuid> > <description>asdfsadfssafsadfa</description> ------> looks good > > # virsh desc --edit --config kvm1 > This is a test desc of kvm1 > > # virsh dumpxml kvm1 > <domain type='kvm'> > <name>kvm1</name> > <uuid>d5cd1756-eb3b-fd9b-1f91-0cc801dfc622</uuid> > <description>This is a test desc of kvm1 --------> I think the end of line *$* should be delete > </description> > This is a case where your editor added a trailing newline, and libvirt passed that newline on through to the xml. We are already deleting the newline for <title> (which refuses newlines), but <description> allows newlines. I think we should open a BZ to have virsh strip the trailing newline always, and not just for <title>. > Expect result: > <domain type='kvm'> > <name>kvm1</name> > <uuid>d5cd1756-eb3b-fd9b-1f91-0cc801dfc622</uuid> > <description>This is a test desc of kvm1</description> > > ---------------------------------------------------------- > Description can contain several lines: > > # virsh desc --edit --config kvm2 > This is a test desc of kvm2 > We have 3 lines > test test test > > # virsh dumpxml kvm2 > <domain type='kvm'> > <name>kvm1</name> > <uuid>d5cd1756-eb3b-fd9b-1f91-0cc801dfc622</uuid> > <description>This is a test desc of kvm2 > We have 3 lines > test test test > </description> ---------------------> I think libvirt should uniform XML format in guest configuration. > > Expect result: > <domain type='kvm'> > <name>kvm1</name> > <uuid>d5cd1756-eb3b-fd9b-1f91-0cc801dfc622</uuid> > <description> > This is a test desc of kvm2 > We have 3 lines > test test test > </description> Sorry. We _cannot_ alter the whitespace of the text in the element. While whitespace in between <> tags is flexible (and thus we format things to make it look nested), whitespace within the text surrounded by a <description></description> block is significant, because it was provided by the user, and must be given back to the user in the same format. Perhaps we could encode things using &#0a; instead of a literal newline, as in: <description>Line 1&#0a;Line 2</description> but I don't know if libxml2 can be made to do that reliably. This question would be better asked on the upstream libvirt list. -- Eric Blake eblake(a)redhat.com +1-919-301-3266 Libvirt virtualization library http://libvirt.org

2 1

[libvirt] [PATCH] Do not include binaries in EXTRA_DIST
by Daniel Veillard 29 Feb '12

29 Feb '12

commit f27f616ff899732fe90ce1f0f4abb3887cea5e17 broke "make dist" by adding qemumonitortest which is a generated binary to the EXTRA_DIST, hence breaking "make dist" Pushed as trivial build breaker. diff --git a/tests/Makefile.am b/tests/Makefile.am index 3e505a5..0c8cf37 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -72,7 +72,6 @@ EXTRA_DIST = \ nwfilterxml2xmlout \ oomtrace.pl \ qemuhelpdata \ - qemumonitortest \ qemuxml2argvdata \ qemuxml2xmloutdata \ qemuxmlnsdata \ -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel(a)veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/

1 0

[libvirt] [libvirt-glib] Remove now redundant 'path' property
by Zeeshan Ali (Khattak) 29 Feb '12

29 Feb '12

From: "Zeeshan Ali (Khattak)" <zeeshanak(a)gnome.org> Remove now redundant 'path' property from GVirDomainDevice subclasses. These classes now have access to their configurations, from which they can easily get the path (among other properties) internally. --- libvirt-gobject/libvirt-gobject-domain-disk.c | 88 ++++---------------- libvirt-gobject/libvirt-gobject-domain-disk.h | 3 +- libvirt-gobject/libvirt-gobject-domain-interface.c | 89 +++----------------- libvirt-gobject/libvirt-gobject-domain-interface.h | 3 +- 4 files changed, 31 insertions(+), 152 deletions(-) diff --git a/libvirt-gobject/libvirt-gobject-domain-disk.c b/libvirt-gobject/libvirt-gobject-domain-disk.c index fb7672e..42e0e6c 100644 --- a/libvirt-gobject/libvirt-gobject-domain-disk.c +++ b/libvirt-gobject/libvirt-gobject-domain-disk.c @@ -34,75 +34,22 @@ #define GVIR_DOMAIN_DISK_GET_PRIVATE(obj) \ (G_TYPE_INSTANCE_GET_PRIVATE((obj), GVIR_TYPE_DOMAIN_DISK, GVirDomainDiskPrivate)) -struct _GVirDomainDiskPrivate -{ - gchar *path; -}; - G_DEFINE_TYPE(GVirDomainDisk, gvir_domain_disk, GVIR_TYPE_DOMAIN_DEVICE); -enum { - PROP_0, - PROP_PATH, -}; - #define GVIR_DOMAIN_DISK_ERROR gvir_domain_disk_error_quark() - static GQuark gvir_domain_disk_error_quark(void) { return g_quark_from_static_string("gvir-domain-disk"); } -static void gvir_domain_disk_get_property(GObject *object, - guint prop_id, - GValue *value, - GParamSpec *pspec) -{ - GVirDomainDisk *self = GVIR_DOMAIN_DISK(object); - GVirDomainDiskPrivate *priv = self->priv; - - switch (prop_id) { - case PROP_PATH: - g_value_set_string(value, priv->path); - break; - - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec); - } -} - - -static void gvir_domain_disk_set_property(GObject *object, - guint prop_id, - const GValue *value, - GParamSpec *pspec) -{ - GVirDomainDisk *self = GVIR_DOMAIN_DISK(object); - GVirDomainDiskPrivate *priv = self->priv; - - switch (prop_id) { - case PROP_PATH: - g_free(priv->path); - priv->path = g_value_dup_string(value); - break; - - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec); - } -} - - static void gvir_domain_disk_finalize(GObject *object) { GVirDomainDisk *self = GVIR_DOMAIN_DISK(object); - GVirDomainDiskPrivate *priv = self->priv; g_debug("Finalize GVirDomainDisk=%p", self); - g_free(priv->path); - G_OBJECT_CLASS(gvir_domain_disk_parent_class)->finalize(object); } @@ -111,27 +58,11 @@ static void gvir_domain_disk_class_init(GVirDomainDiskClass *klass) GObjectClass *object_class = G_OBJECT_CLASS (klass); object_class->finalize = gvir_domain_disk_finalize; - object_class->get_property = gvir_domain_disk_get_property; - object_class->set_property = gvir_domain_disk_set_property; - - g_object_class_install_property(object_class, - PROP_PATH, - g_param_spec_string("path", - "Path", - "The disk path", - NULL, - G_PARAM_READWRITE | - G_PARAM_CONSTRUCT_ONLY | - G_PARAM_STATIC_STRINGS)); - - g_type_class_add_private(klass, sizeof(GVirDomainDiskPrivate)); } static void gvir_domain_disk_init(GVirDomainDisk *self) { g_debug("Init GVirDomainDisk=%p", self); - - self->priv = GVIR_DOMAIN_DISK_GET_PRIVATE(self); } static GVirDomainDiskStats * @@ -151,6 +82,15 @@ gvir_domain_disk_stats_free(GVirDomainDiskStats *stats) G_DEFINE_BOXED_TYPE(GVirDomainDiskStats, gvir_domain_disk_stats, gvir_domain_disk_stats_copy, gvir_domain_disk_stats_free) +static const gchar *gvir_domain_disk_get_path(GVirDomainDisk *self) +{ + GVirConfigDomainDevice *config; + + config = gvir_domain_device_get_config(GVIR_DOMAIN_DEVICE(self)); + + return gvir_config_domain_disk_get_target_dev (GVIR_CONFIG_DOMAIN_DISK (config)); +} + /** * gvir_domain_disk_get_stats: * @self: the domain disk @@ -166,15 +106,15 @@ GVirDomainDiskStats *gvir_domain_disk_get_stats(GVirDomainDisk *self, GError **e { GVirDomainDiskStats *ret = NULL; virDomainBlockStatsStruct stats; - GVirDomainDiskPrivate *priv; virDomainPtr handle; + const gchar *path; g_return_val_if_fail(GVIR_IS_DOMAIN_DISK(self), NULL); - priv = self->priv; handle = gvir_domain_device_get_domain_handle(GVIR_DOMAIN_DEVICE(self)); + path = gvir_domain_disk_get_path (self); - if (virDomainBlockStats(handle, priv->path, &stats, sizeof (stats)) < 0) { + if (virDomainBlockStats(handle, path, &stats, sizeof (stats)) < 0) { gvir_set_error_literal(err, GVIR_DOMAIN_DISK_ERROR, 0, "Unable to get domain disk stats"); @@ -211,13 +151,15 @@ gboolean gvir_domain_disk_resize(GVirDomainDisk *self, { gboolean ret = FALSE; virDomainPtr handle; + const gchar *path; g_return_val_if_fail(GVIR_IS_DOMAIN_DISK(self), FALSE); g_return_val_if_fail(err == NULL || *err != NULL, FALSE); handle = gvir_domain_device_get_domain_handle(GVIR_DOMAIN_DEVICE(self)); + path = gvir_domain_disk_get_path (self); - if (virDomainBlockResize(handle, self->priv->path, size, flags) < 0) { + if (virDomainBlockResize(handle, path, size, flags) < 0) { gvir_set_error_literal(err, GVIR_DOMAIN_DISK_ERROR, 0, "Failed to resize domain disk"); diff --git a/libvirt-gobject/libvirt-gobject-domain-disk.h b/libvirt-gobject/libvirt-gobject-domain-disk.h index 1788d63..fb8b3dc 100644 --- a/libvirt-gobject/libvirt-gobject-domain-disk.h +++ b/libvirt-gobject/libvirt-gobject-domain-disk.h @@ -56,7 +56,8 @@ struct _GVirDomainDisk { GVirDomainDevice parent; - GVirDomainDiskPrivate *priv; + /* In case we need a private struct in future */ + gpointer padding[1]; /* Do not add fields to this struct */ }; diff --git a/libvirt-gobject/libvirt-gobject-domain-interface.c b/libvirt-gobject/libvirt-gobject-domain-interface.c index 0917e03..9ec3877 100644 --- a/libvirt-gobject/libvirt-gobject-domain-interface.c +++ b/libvirt-gobject/libvirt-gobject-domain-interface.c @@ -31,78 +31,22 @@ #include "libvirt-gobject/libvirt-gobject-domain-device-private.h" -#define GVIR_DOMAIN_INTERFACE_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE((obj), GVIR_TYPE_DOMAIN_INTERFACE, GVirDomainInterfacePrivate)) - -struct _GVirDomainInterfacePrivate -{ - gchar *path; -}; - G_DEFINE_TYPE(GVirDomainInterface, gvir_domain_interface, GVIR_TYPE_DOMAIN_DEVICE); -enum { - PROP_0, - PROP_PATH, -}; - #define GVIR_DOMAIN_INTERFACE_ERROR gvir_domain_interface_error_quark() - static GQuark gvir_domain_interface_error_quark(void) { return g_quark_from_static_string("gvir-domain-interface"); } -static void gvir_domain_interface_get_property(GObject *object, - guint prop_id, - GValue *value, - GParamSpec *pspec) -{ - GVirDomainInterface *self = GVIR_DOMAIN_INTERFACE(object); - GVirDomainInterfacePrivate *priv = self->priv; - - switch (prop_id) { - case PROP_PATH: - g_value_set_string(value, priv->path); - break; - - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec); - } -} - - -static void gvir_domain_interface_set_property(GObject *object, - guint prop_id, - const GValue *value, - GParamSpec *pspec) -{ - GVirDomainInterface *self = GVIR_DOMAIN_INTERFACE(object); - GVirDomainInterfacePrivate *priv = self->priv; - - switch (prop_id) { - case PROP_PATH: - g_free(priv->path); - priv->path = g_value_dup_string(value); - break; - - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec); - } -} - - static void gvir_domain_interface_finalize(GObject *object) { GVirDomainInterface *self = GVIR_DOMAIN_INTERFACE(object); - GVirDomainInterfacePrivate *priv = self->priv; g_debug("Finalize GVirDomainInterface=%p", self); - g_free(priv->path); - G_OBJECT_CLASS(gvir_domain_interface_parent_class)->finalize(object); } @@ -111,27 +55,11 @@ static void gvir_domain_interface_class_init(GVirDomainInterfaceClass *klass) GObjectClass *object_class = G_OBJECT_CLASS (klass); object_class->finalize = gvir_domain_interface_finalize; - object_class->get_property = gvir_domain_interface_get_property; - object_class->set_property = gvir_domain_interface_set_property; - - g_object_class_install_property(object_class, - PROP_PATH, - g_param_spec_string("path", - "Path", - "The interface path", - NULL, - G_PARAM_READWRITE | - G_PARAM_CONSTRUCT_ONLY | - G_PARAM_STATIC_STRINGS)); - - g_type_class_add_private(klass, sizeof(GVirDomainInterfacePrivate)); } static void gvir_domain_interface_init(GVirDomainInterface *self) { g_debug("Init GVirDomainInterface=%p", self); - - self->priv = GVIR_DOMAIN_INTERFACE_GET_PRIVATE(self); } static GVirDomainInterfaceStats * @@ -140,17 +68,24 @@ gvir_domain_interface_stats_copy(GVirDomainInterfaceStats *stats) return g_slice_dup(GVirDomainInterfaceStats, stats); } - static void gvir_domain_interface_stats_free(GVirDomainInterfaceStats *stats) { g_slice_free(GVirDomainInterfaceStats, stats); } - G_DEFINE_BOXED_TYPE(GVirDomainInterfaceStats, gvir_domain_interface_stats, gvir_domain_interface_stats_copy, gvir_domain_interface_stats_free) +static const gchar *gvir_domain_interface_get_path(GVirDomainInterface *self) +{ + GVirConfigDomainDevice *config; + + config = gvir_domain_device_get_config(GVIR_DOMAIN_DEVICE(self)); + + return gvir_config_domain_interface_get_ifname (GVIR_CONFIG_DOMAIN_INTERFACE (config)); +} + /** * gvir_domain_interface_get_stats: * @self: the domain interface @@ -166,15 +101,15 @@ GVirDomainInterfaceStats *gvir_domain_interface_get_stats(GVirDomainInterface *s { GVirDomainInterfaceStats *ret = NULL; virDomainInterfaceStatsStruct stats; - GVirDomainInterfacePrivate *priv; virDomainPtr handle; + const gchar *path; g_return_val_if_fail(GVIR_IS_DOMAIN_INTERFACE(self), NULL); - priv = self->priv; handle = gvir_domain_device_get_domain_handle(GVIR_DOMAIN_DEVICE(self)); + path = gvir_domain_interface_get_path (self); - if (virDomainInterfaceStats(handle, priv->path, &stats, sizeof (stats)) < 0) { + if (virDomainInterfaceStats(handle, path, &stats, sizeof (stats)) < 0) { gvir_set_error_literal(err, GVIR_DOMAIN_INTERFACE_ERROR, 0, "Unable to get domain interface stats"); diff --git a/libvirt-gobject/libvirt-gobject-domain-interface.h b/libvirt-gobject/libvirt-gobject-domain-interface.h index 62848db..26b7d1c 100644 --- a/libvirt-gobject/libvirt-gobject-domain-interface.h +++ b/libvirt-gobject/libvirt-gobject-domain-interface.h @@ -59,7 +59,8 @@ struct _GVirDomainInterface { GVirDomainDevice parent; - GVirDomainInterfacePrivate *priv; + /* In case we need a private struct in future */ + gpointer padding[1]; /* Do not add fields to this struct */ }; -- 1.7.7.6

1 0

[libvirt] Integration with XtreemFS
by Renich Bon Ciric 28 Feb '12

28 Feb '12

Hello is somebody here interested in integrating http://xtreemfs.org/ into libvirt? We're willing to pay for it and contribute it we need to take advantage of libxtreemfs; as described in this thread: https://groups.google.com/d/topic/xtreemfs/mkfPKk1YVeU/discussion Please, contact me if so. Have a great day. -- Renich Bon Ciric CloudSigma

1 0

[libvirt] Fwd: for help
by 李成双 28 Feb '12

28 Feb '12

---------- 已转发邮件 ---------- 发件人：李成双 <lichengshuang(a)gmail.com> 日期： 2012年2月28日下午8:15 主题： for help 收件人： netwiz(a)crc.id.au hi Some of the problems encountered in the installation process your document to you for help. PASS: vmx2xmltest TEST: xml2vmxtest ........................................ 40 . 41 OK PASS: xml2vmxtest TEST: eventtest ............... 15 OK PASS: eventtest TEST: networkxml2xmltest ............ 12 OK PASS: networkxml2xmltest TEST: networkxml2argvtest ....... 7 OK PASS: networkxml2argvtest TEST: storagevolxml2xmltest ...... 6 OK PASS: storagevolxml2xmltest TEST: storagepoolxml2xmltest ............ 12 OK PASS: storagepoolxml2xmltest TEST: nodedevxml2xmltest ............. 13 OK PASS: nodedevxml2xmltest TEST: interfacexml2xmltest ................... 19 OK PASS: interfacexml2xmltest TEST: cputest ........................................ 40 ................. 57 OK PASS: cputest ======================================= 1 of 59 tests failed (2 tests were not run) Please report to libvir-list(a)redhat.com ======================================= make[1]: *** [check-TESTS] Error 1 make[1]: Leaving directory `/root/rpmbuild/BUILD/libvirt-0.9.4/tests' make: *** [check-am] Error 2 error: Bad exit status from /var/tmp/rpm-tmp.r4iOXk (%check) RPM build errors: Bad exit status from /var/tmp/rpm-tmp.r4iOXk (%check) -- 李成双 -- 李成双

2 1

[libvirt] [PATCH] docs: Fix libvirt name in qemu commandline namespace URL
by Michal Privoznik 28 Feb '12

28 Feb '12

s/libirt/libvirt/g --- Pushed under trivial rule. docs/drvqemu.html.in | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/drvqemu.html.in b/docs/drvqemu.html.in index fc76829..9afae13 100644 --- a/docs/drvqemu.html.in +++ b/docs/drvqemu.html.in @@ -551,7 +551,7 @@ $ virsh domxml-to-native qemu-argv demo.xml (Since 0.8.3). In order to use the XML additions, it is necessary to issue an XML namespace request (the special <code>xmlns:name</code> attribute) that - pulls in <code>http://libirt.org/schemas/domain/qemu/1.0</code>; + pulls in <code>http://libvirt.org/schemas/domain/qemu/1.0</code>; typically, the namespace is given the name of <code>qemu</code>. With the namespace in place, it is then possible to add an element <code><qemu:commandline></code> @@ -571,7 +571,7 @@ $ virsh domxml-to-native qemu-argv demo.xml </dl> Example:<pre> -<domain type='qemu' xmlns:qemu='http://libirt.org/schemas/domain/qemu/1.0'> +<domain type='qemu' xmlns:qemu='http://libvirt.org/schemas/domain/qemu/1.0'> <name>QEmu-fedora-i686</name> <memory>219200</memory> <os> -- 1.7.3.4

1 0

[libvirt] [PATCH 1/1] Clarify what documentation is being referenced
by Dave Allan 28 Feb '12

28 Feb '12

virsh.pod had several instances in which it referred to "the documentation" which was a little puzzling to me since it is documentation. Reading the document from end to end makes it clear that it means a specific URI which was noted previously in the text, but I had never noticed those URI in several years of referring to the man page. This patch adds those URIs to several additional places in the text. --- tools/virsh.pod | 38 ++++++++++++++++++++++---------------- 1 files changed, 22 insertions(+), 16 deletions(-) diff --git a/tools/virsh.pod b/tools/virsh.pod index cb0d9b9..6040d40 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -73,7 +73,7 @@ instead of the default connection. Enable debug messages at integer I<LEVEL> and above. I<LEVEL> can range from 0 to 4 (default). See the documentation of B<VIRSH_DEBUG> -environment variable for the description of each I<LEVEL>. +environment variable below for the description of each I<LEVEL>. =item B<-l>, B<--log> I<FILE> @@ -224,7 +224,8 @@ connect to a local linux container =back -For remote access see the documentation page on how to make URIs. +For remote access see the documentation page at +L<http://libvirt.org/uri.html> list on how to make URIs. The I<--readonly> option allows for read-only connection =item B<uri> @@ -1433,12 +1434,14 @@ format of the device sections to get the most accurate set of accepted values. =item B<attach-device> I<domain-id> I<FILE> -Attach a device to the domain, using a device definition in an XML file. -See the documentation to learn about libvirt XML format for a device. -For cdrom and floppy devices, this command only replaces the media within -the single existing device; consider using B<update-device> for this usage. -For passthrough host devices, see also B<nodedev-dettach>, needed if -the device does not use managed mode. +Attach a device to the domain, using a device definition in an XML +file. See the documentation at +L<http://libvirt.org/formatdomain.html> to learn about libvirt XML +format for a device. For cdrom and floppy devices, this command only +replaces the media within the single existing device; consider using +B<update-device> for this usage. For passthrough host devices, see +also B<nodedev-dettach>, needed if the device does not use managed +mode. =item B<attach-disk> I<domain-id> I<source> I<target> [I<--driver driver>] [I<--subdriver subdriver>] [I<--cache cache>] @@ -1508,12 +1511,14 @@ if more than one are present on the domain. =item B<update-device> I<domain-id> I<file> [I<--persistent>] [I<--force>] -Update the characteristics of a device associated with I<domain-id>, based on -the device definition in an XML I<file>. If the I<--persistent> option is -used, the changes will affect the next boot of the domain. The I<--force> -option can be used to force device update, e.g., to eject a CD-ROM even if it -is locked/mounted in the domain. See the documentation to learn about libvirt -XML format for a device. +Update the characteristics of a device associated with I<domain-id>, +based on the device definition in an XML I<file>. If the +I<--persistent> option is used, the changes will affect the next boot +of the domain. The I<--force> option can be used to force device +update, e.g., to eject a CD-ROM even if it is locked/mounted in the +domain. See the documentation at +L<http://libvirt.org/formatdomain.html> to learn about libvirt XML +format for a device. =back @@ -1617,8 +1622,9 @@ The I<--disable> option disable autostarting. =item B<net-create> I<file> -Create a virtual network from an XML I<file>, see the documentation to get -a description of the XML network format used by libvirt. +Create a virtual network from an XML I<file>, see the documentation at +L<http://libvirt.org/formatnetwork.html> to get a description of the +XML network format used by libvirt. =item B<net-define> I<file> -- 1.7.7.6

2 2

[libvirt] libvirt TCK wrapper for autotest review
by Lucas Meneghel Rodrigues 28 Feb '12

28 Feb '12

Hi guys, I was here looking at the autotest wrapper for libvirt TCK and then decided to work on it, as I had the review fresh on my mind. Things that I've worked on: * Fixed some download links, that were already sent to upstream tck and applied (thanks Dan Berrange) * Instead of making all tests output to the same DEBUG log, make them output to separate .tap files on the results directory * Run all tests available for a given item, rather than stopping the test on the first failure * removed capitalization on the wrapper name, since it's project policy * Use os.environ, and some features of the subcommand execution API to execute the tests * Remove usages of error.JobError, as the problems there are more error.TestError, since they are restricted to the libvirt_tck test, not the entire job (in autotest, a job can do more stuff than just a sequence of job.runtest() calls). * Made the error messages more descriptive, with info of all failed tests So, the current output of the tests is like this: $ sudo client/bin/autotest run libvirt_tck 18:29:27 INFO | Writing results to /home/lmr/Code/autotest.lmr/client/results/default 18:29:27 INFO | START ---- ---- timestamp=1329942567 localtime=Feb 22 18:29:27 18:29:27 INFO | START libvirt_tck.domain libvirt_tck.domain timestamp=1329942567 localtime=Feb 22 18:29:27 18:30:19 ERROR| child process failed 18:30:19 INFO | FAIL libvirt_tck.domain libvirt_tck.domain timestamp=1329942619 localtime=Feb 22 18:30:19 FAIL: ['120-disks-stats.t', '205-disk-hotplug-ordering.t'] 18:30:19 INFO | END FAIL libvirt_tck.domain libvirt_tck.domain timestamp=1329942619 localtime=Feb 22 18:30:19 18:30:19 INFO | START libvirt_tck.hooks libvirt_tck.hooks timestamp=1329942619 localtime=Feb 22 18:30:19 18:30:19 ERROR| child process failed 18:30:19 INFO | FAIL libvirt_tck.hooks libvirt_tck.hooks timestamp=1329942619 localtime=Feb 22 18:30:19 FAIL: ['051-daemon-hook.t', '052-domain-hook.t'] 18:30:19 INFO | END FAIL libvirt_tck.hooks libvirt_tck.hooks timestamp=1329942619 localtime=Feb 22 18:30:19 18:30:19 INFO | START libvirt_tck.networks libvirt_tck.networks timestamp=1329942619 localtime=Feb 22 18:30:19 18:30:28 INFO | GOOD libvirt_tck.networks libvirt_tck.networks timestamp=1329942628 localtime=Feb 22 18:30:28 completed successfully 18:30:28 INFO | END GOOD libvirt_tck.networks libvirt_tck.networks timestamp=1329942628 localtime=Feb 22 18:30:28 18:30:28 INFO | START libvirt_tck.nwfilter libvirt_tck.nwfilter timestamp=1329942628 localtime=Feb 22 18:30:28 18:30:32 ERROR| child process failed 18:30:32 INFO | FAIL libvirt_tck.nwfilter libvirt_tck.nwfilter timestamp=1329942632 localtime=Feb 22 18:30:32 FAIL: ['090-install-image.t', '100-ping-still-working.t', '210-no-mac-spoofing.t', '220-no-ip-spoofing.t', '230-no-mac-broadcast.t', '240-no-arp-spoofing.t', '300-vsitype.t'] 18:30:32 INFO | END FAIL libvirt_tck.nwfilter libvirt_tck.nwfilter timestamp=1329942632 localtime=Feb 22 18:30:32 18:30:32 INFO | START libvirt_tck.qemu libvirt_tck.qemu timestamp=1329942632 localtime=Feb 22 18:30:32 18:30:40 ERROR| child process failed 18:30:40 INFO | FAIL libvirt_tck.qemu libvirt_tck.qemu timestamp=1329942640 localtime=Feb 22 18:30:40 FAIL: ['205-qcow2-double-backing-file.t'] 18:30:40 INFO | END FAIL libvirt_tck.qemu libvirt_tck.qemu timestamp=1329942640 localtime=Feb 22 18:30:40 18:30:40 INFO | START libvirt_tck.selinux libvirt_tck.selinux timestamp=1329942640 localtime=Feb 22 18:30:40 18:30:49 ERROR| child process failed 18:30:49 INFO | FAIL libvirt_tck.selinux libvirt_tck.selinux timestamp=1329942649 localtime=Feb 22 18:30:49 FAIL: ['055-dynamic-base-label.t', '100-static-relabel-no.t'] 18:30:49 INFO | END FAIL libvirt_tck.selinux libvirt_tck.selinux timestamp=1329942649 localtime=Feb 22 18:30:49 18:30:49 INFO | START libvirt_tck.storage libvirt_tck.storage timestamp=1329942649 localtime=Feb 22 18:30:49 18:31:24 INFO | GOOD libvirt_tck.storage libvirt_tck.storage timestamp=1329942684 localtime=Feb 22 18:31:24 completed successfully 18:31:24 INFO | END GOOD libvirt_tck.storage libvirt_tck.storage timestamp=1329942684 localtime=Feb 22 18:31:24 18:31:24 INFO | END GOOD ---- ---- timestamp=1329942684 localtime=Feb 22 18:31:24 As time allows, I might take a look at the failures and help with libvirt_tck. I've combined all modifications to a single, self contained commit. Also, as the work is self contained, it could be very very easily rebased to the latest upstream tree. I've updated my personal repo and sent a github pull request that you guys can see and review: https://github.com/autotest/autotest/pull/192 I'm still not going to merge this to the upstream tree just yet, since I'd like to hear some feedback from you guys. As for developing together with autotest, I guess you can easily use the clone you have on libvirt now, and on your working directory you can add the following remote: [remote "upstream"] fetch = +refs/heads/*:refs/remotes/origin/* url = git://github.com/autotest/autotest.git Then from time to time, you can just pull from upstream to your master branch: git pull upstream master And then rebase your development trees: git checkout tck git rebase master It should be painless, given the fact that the wrapper is pretty much self contained, and isolated from the rest of the code. Please let me know what you think, Lucas

3 5

[libvirt] [PATCH] qemu: fix cleanup of bridge during failure of qemuDomainAttachNetDevice
by Laine Stump 28 Feb '12

28 Feb '12

From: Laine Stump <laine(a)redhat.com> In qemuDomainAttachNetDevice, the guest's tap interface has only been attached to the bridge if iface_connected is true. It's possible for an error to occur prior to that happening, and previously we would attempt to remove the tap interface from the bridge even if it hadn't been attached. --- src/qemu/qemu_hotplug.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index e90ea6c..375b822 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -837,13 +837,14 @@ cleanup: net->info.addr.pci.slot) < 0) VIR_WARN("Unable to release PCI address on NIC"); - if (iface_connected) + if (iface_connected) { virDomainConfNWFilterTeardown(net); - vport = virDomainNetGetActualVirtPortProfile(net); - if (vport && vport->virtPortType == VIR_NETDEV_VPORT_PROFILE_OPENVSWITCH) - ignore_value(virNetDevOpenvswitchRemovePort( - virDomainNetGetActualBridgeName(net), net->ifname)); + vport = virDomainNetGetActualVirtPortProfile(net); + if (vport && vport->virtPortType == VIR_NETDEV_VPORT_PROFILE_OPENVSWITCH) + ignore_value(virNetDevOpenvswitchRemovePort( + virDomainNetGetActualBridgeName(net), net->ifname)); + } networkReleaseActualDevice(net); } -- 1.7.7.6

2 2

[libvirt] [PATCH] libxl: eliminate memory leak in libxmlDomainModifyDeviceFlags
by Laine Stump 28 Feb '12

28 Feb '12

I found this randomly by examination when a tag search led me to this file. I don't have a setup to test it, but it appears fairly obvious that this call to virDomainDeviceDefParse is both unnecessary (since it will again be called at the top of the immediately following if(), and if not there, then at the top of the if following that), but it also creates a leak of one virDomainDeviceDef and one [whatever type of device the DeviceDef is pointing to; probably a virDomainDiskDef] in the case that the function has been called with VIR_DOMAIN_DEVICE_MODIFY_CONFIG (the second parse will overwrite the devicedef that was just created). --- src/libxl/libxl_driver.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index 6db33c2..d5fa64a 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -3243,10 +3243,6 @@ libxlDomainModifyDeviceFlags(virDomainPtr dom, const char *xml, goto cleanup; } - if (!(dev = virDomainDeviceDefParse(driver->caps, vm->def, xml, - VIR_DOMAIN_XML_INACTIVE))) - goto cleanup; - priv = vm->privateData; if (flags & VIR_DOMAIN_DEVICE_MODIFY_CONFIG) { -- 1.7.7.6

2 2

[libvirt] Does libvirt support spice agent-mouse?
by Zhou Peng 28 Feb '12

28 Feb '12

Hi all, How to set the qemu-kvm argv agent-mouse=on/off option in libvirt xml file pls? I googled but failed. Thanks, -- Zhou Peng

2 1

[libvirt] [PATCH] virsh: Break long lines in virsh.pod
by Osier Yang 28 Feb '12

28 Feb '12

No content changes, just breaking long lines. Pushed under trivial rule. --- tools/virsh.pod | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-) diff --git a/tools/virsh.pod b/tools/virsh.pod index aa4c560..c306a38 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -468,7 +468,8 @@ Flags I<--live> or I<--config> select whether this command works on live or persistent definitions of the domain. If both I<--live> and I<--config> are specified, the I<--config> option takes precedence on getting the current description and both live configuration and config are updated while setting -the description. I<--current> is exclusive and implied if none of these was specified. +the description. I<--current> is exclusive and implied if none of these was +specified. Flag I<--edit> specifies that an editor with the contents of current description or title should be opened and the contents saved back afterwards. @@ -1471,7 +1472,8 @@ address. [I<--persistent>] [I<--inbound average,peak,burst>] [I<--outbound average,peak,burst>] Attach a new network interface to the domain. -I<type> can be either I<network> to indicate a physical network device or I<bridge> to indicate a bridge to a device. +I<type> can be either I<network> to indicate a physical network device or +I<bridge> to indicate a bridge to a device. I<source> indicates the source device. I<target> allows to indicate the target device in the guest. I<mac> allows to specify the MAC address of the network interface. @@ -1502,9 +1504,10 @@ from the domain. =item B<detach-interface> I<domain-id> I<type> [I<--mac mac>] Detach a network interface from a domain. -I<type> can be either I<network> to indicate a physical network device or I<bridge> to indicate a bridge to a device. -It is recommended to use the I<mac> option to distinguish between the interfaces -if more than one are present on the domain. +I<type> can be either I<network> to indicate a physical network device or +I<bridge> to indicate a bridge to a device. It is recommended to use the +I<mac> option to distinguish between the interfaces if more than one are +present on the domain. =item B<update-device> I<domain-id> I<file> [I<--persistent>] [I<--force>] -- 1.7.7.3

1 0

[libvirt] [PATCH 0/3 v4] New command for changing media
by Osier Yang 28 Feb '12

28 Feb '12

[PATCH 0/3] introduces two new helper functions: vshFindDisk is to find the disk XML node in xml doc with the type (indicates it's normal disk or changeable disk). VshPrepareDiskXML is to prepare the disk XML for disk changing commands' use, such as detach-disk. The purpose of this patch is to prepare for upcoming new command "change-disk", which will use the two helper functions too. Please see [PATCH 3/3] for a overall description of the new command. v2 - v3 * Update vshFindDisk to support search the disk node with both the source path and target name. * Change names of the two new enums ([PATCH 1/3]). * Use virXMLParseStringCtxt instead of xmlReadDoc * Use VIR_ALLOC_N instead of vshCalloc. * [PATCH 3/4] and [PATCH 4/4] are merged into [PATCH 3/3] * Change option "--target" into "--path". * Defaults to use "--update" if none of "--eject", "--insert", and "--update" is specified. * Update docs to be consistent with the changes on codes. * Other nits. v3 - v4: * No changes. Osier Yang (3) virsh: Two new helper functions for disk device changes virsh: Use vshFindDisk and vshPrepareDiskXML in virsh: New command cmdChangeMedia tools/virsh.c | 418 ++++++++++++++++++++++++++++++++++++++++++++++++------- tools/virsh.pod | 33 ++++- 2 files changed, 395 insertions(+), 56 deletions(-) Regards, Osier

2 7

[libvirt] [PATCH 0/7 v2] virtio-scsi: New device address logic for SCSI devices
by Osier Yang 28 Feb '12

28 Feb '12

This patch series completed the support for the first 3 parts of Paolo's proposal: http://permalink.gmane.org/gmane.comp.emulators.libvirt/50428 The 3 parts are: * SCSI controller models * Stable addressing for SCSI devices * LUN passthrough: block devices [PATCH 1/10] and [PATCH 2/10] add two new "scsi" controllers, "ibmvscsi" and "virtio-scsi". [PATCH 3/10] adds a helper functions to get a disk controller's model. [PATCH 4/10] introduces attribute "target" for device addressing XML. Updates lots of tests to be consistent with the newly introduced attribute. [PATCH 6/10] builds the qemu command line for the new addressing format. The logic is: 1) If the disk controller model is "lsilogic": -drive file=/dev/sda,if=none,id=drive-scsi0-0-3,\ format=raw -device scsi-disk,bus=scsi0.0,\ scsi-id=0,drive=drive-scsi0-0-3-0,id=scsi0-0-3-0 libvirt attrs --> qdev properties: bus=scsi<controller>.0 scsi-id=<unit> 2) If the disk controller model is other else: The command line will be like: -drive file=/dev/sda,if=none,id=drive-scsi0-0-3-0,\ format=raw -device scsi-disk,bus=scsi0.0,channel=0,\ scsi-id=3,lun=0,drive=drive-scsi0-0-3-0,id=scsi0-0-3-0 libvirt attrs --> qdev properties: bus=scsi<controller>.0 channel=<bus> scsi-id=<target> lun=<unit> Paolo Bonzini (2) qemu: add ibmvscsi controller model qemu: add virtio-scsi controller model Osier Yang (5) conf: Add helper function to look up disk controller conf: Introduce new attribute for device address format qemu: New cap flag to indicate if channel is supported qemu: Build command line for the new address format tests: Add tests for virtio-scsi and ibmvscsi v1 ~ v2: * [PATCH 3/10] is removed * "target" will be formated to all bus type, once it's device address is of type "drive". * Error if "target != 0" and the disk bus is not SCSI or the scsi controller model is "lsilogic". * [PATCH 9/10] and [PATCH 8/10] are meged into [PATCH 4/7] docs/formatdomain.html.in | 16 ++- docs/schemas/domaincommon.rng | 12 ++ src/conf/domain_conf.c | 38 ++++- src/conf/domain_conf.h | 6 + src/libvirt_private.syms | 1 + src/qemu/qemu_capabilities.c | 4 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 156 +++++++++++++++++--- src/qemu/qemu_command.h | 7 +- src/qemu/qemu_hotplug.c | 12 +- src/vmx/vmx.c | 4 +- tests/domainsnapshotxml2xmlout/disk_snapshot.xml | 12 +- tests/domainsnapshotxml2xmlout/full_domain.xml | 2 +- tests/domainsnapshotxml2xmlout/metadata.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-bios.xml | 2 +- .../qemuxml2argvdata/qemuxml2argv-blkdeviotune.xml | 4 +- .../qemuxml2argv-blkiotune-device.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-blkiotune.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-boot-cdrom.xml | 2 +- .../qemuxml2argv-boot-complex-bootindex.xml | 10 +- .../qemuxml2argvdata/qemuxml2argv-boot-complex.xml | 10 +- .../qemuxml2argvdata/qemuxml2argv-boot-floppy.xml | 4 +- ...uxml2argv-boot-menu-disable-drive-bootindex.xml | 2 +- .../qemuxml2argv-boot-menu-disable-drive.xml | 2 +- .../qemuxml2argv-boot-menu-disable.xml | 2 +- .../qemuxml2argv-boot-menu-enable.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-boot-multi.xml | 2 +- .../qemuxml2argvdata/qemuxml2argv-boot-network.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-boot-order.xml | 6 +- tests/qemuxml2argvdata/qemuxml2argv-bootloader.xml | 2 +- .../qemuxml2argv-channel-guestfwd.xml | 2 +- .../qemuxml2argv-channel-spicevmc-old.xml | 2 +- .../qemuxml2argv-channel-spicevmc.xml | 2 +- .../qemuxml2argv-channel-virtio-auto.xml | 2 +- .../qemuxml2argv-channel-virtio.xml | 2 +- .../qemuxml2argvdata/qemuxml2argv-clock-france.xml | 2 +- .../qemuxml2argv-clock-localtime.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-clock-utc.xml | 2 +- .../qemuxml2argv-clock-variable.xml | 2 +- .../qemuxml2argv-console-compat-auto.xml | 2 +- .../qemuxml2argv-console-compat-chardev.xml | 2 +- .../qemuxml2argv-console-compat.xml | 2 +- .../qemuxml2argv-console-virtio-many.xml | 2 +- .../qemuxml2argv-console-virtio.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-cputune.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-disk-aio.xml | 4 +- .../qemuxml2argv-disk-cdrom-empty.xml | 4 +- tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom.xml | 4 +- .../qemuxml2argv-disk-copy_on_read.xml | 2 +- .../qemuxml2argv-disk-drive-boot-cdrom.xml | 4 +- .../qemuxml2argv-disk-drive-boot-disk.xml | 4 +- .../qemuxml2argv-disk-drive-cache-directsync.xml | 4 +- .../qemuxml2argv-disk-drive-cache-unsafe.xml | 4 +- .../qemuxml2argv-disk-drive-cache-v1-none.xml | 4 +- .../qemuxml2argv-disk-drive-cache-v1-wb.xml | 4 +- .../qemuxml2argv-disk-drive-cache-v1-wt.xml | 4 +- .../qemuxml2argv-disk-drive-cache-v2-none.xml | 4 +- .../qemuxml2argv-disk-drive-cache-v2-wb.xml | 4 +- .../qemuxml2argv-disk-drive-cache-v2-wt.xml | 4 +- ...muxml2argv-disk-drive-error-policy-enospace.xml | 4 +- .../qemuxml2argv-disk-drive-error-policy-stop.xml | 4 +- ...rgv-disk-drive-error-policy-wreport-rignore.xml | 4 +- .../qemuxml2argv-disk-drive-fat.xml | 2 +- .../qemuxml2argv-disk-drive-fmt-qcow.xml | 4 +- .../qemuxml2argv-disk-drive-network-nbd.xml | 2 +- .../qemuxml2argv-disk-drive-network-rbd-auth.xml | 2 +- ...emuxml2argv-disk-drive-network-rbd-ceph-env.xml | 2 +- .../qemuxml2argv-disk-drive-network-rbd.xml | 2 +- .../qemuxml2argv-disk-drive-network-sheepdog.xml | 2 +- .../qemuxml2argv-disk-drive-no-boot.xml | 6 +- .../qemuxml2argv-disk-drive-readonly-disk.xml | 4 +- .../qemuxml2argv-disk-drive-readonly-no-device.xml | 4 +- .../qemuxml2argv-disk-drive-shared.xml | 4 +- .../qemuxml2argvdata/qemuxml2argv-disk-floppy.xml | 6 +- .../qemuxml2argv-disk-ioeventfd.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-disk-many.xml | 8 +- .../qemuxml2argv-disk-sata-device.xml | 2 +- .../qemuxml2argv-disk-scsi-device.xml | 6 +- .../qemuxml2argv-disk-scsi-virtio-scsi.args | 9 + .../qemuxml2argv-disk-scsi-virtio-scsi.xml | 32 ++++ .../qemuxml2argv-disk-scsi-vscsi.args | 8 + .../qemuxml2argv-disk-scsi-vscsi.xml | 32 ++++ .../qemuxml2argv-disk-snapshot.xml | 6 +- .../qemuxml2argv-disk-transient.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-disk-usb.xml | 2 +- .../qemuxml2argvdata/qemuxml2argv-disk-virtio.xml | 4 +- .../qemuxml2argvdata/qemuxml2argv-disk-xenvbd.xml | 4 +- tests/qemuxml2argvdata/qemuxml2argv-event_idx.xml | 2 +- .../qemuxml2argv-floppy-drive-fat.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-fs9p.xml | 2 +- .../qemuxml2argv-graphics-listen-network.xml | 2 +- .../qemuxml2argv-graphics-listen-network2.xml | 2 +- .../qemuxml2argv-graphics-sdl-fullscreen.xml | 2 +- .../qemuxml2argvdata/qemuxml2argv-graphics-sdl.xml | 2 +- .../qemuxml2argv-graphics-spice-compression.xml | 2 +- .../qemuxml2argv-graphics-spice-qxl-vga.xml | 2 +- .../qemuxml2argv-graphics-spice-timeout.xml | 2 +- .../qemuxml2argv-graphics-spice.xml | 2 +- .../qemuxml2argv-graphics-vnc-sasl.xml | 2 +- .../qemuxml2argv-graphics-vnc-socket.xml | 2 +- .../qemuxml2argv-graphics-vnc-tls.xml | 2 +- .../qemuxml2argvdata/qemuxml2argv-graphics-vnc.xml | 2 +- .../qemuxml2argv-hostdev-pci-address.xml | 2 +- .../qemuxml2argv-hostdev-usb-address.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-hugepages.xml | 2 +- .../qemuxml2argv-input-usbmouse-addr.xml | 2 +- .../qemuxml2argv-input-usbmouse.xml | 2 +- .../qemuxml2argv-input-usbtablet.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-input-xen.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-lease.xml | 4 +- .../qemuxml2argv-machine-aliases1.xml | 2 +- .../qemuxml2argv-machine-aliases2.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-memtune.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-metadata.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-migrate.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-minimal.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-misc-acpi.xml | 2 +- .../qemuxml2argv-misc-no-reboot.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-misc-uuid.xml | 2 +- .../qemuxml2argv-multifunction-pci-device.xml | 2 +- .../qemuxml2argv-net-bandwidth.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-net-client.xml | 2 +- .../qemuxml2argv-net-eth-ifname.xml | 2 +- .../qemuxml2argv-net-eth-names.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-net-eth.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-net-mcast.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-net-server.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-net-user.xml | 2 +- .../qemuxml2argv-net-virtio-device.xml | 2 +- .../qemuxml2argv-net-virtio-network-portgroup.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-net-virtio.xml | 2 +- .../qemuxml2argv-nographics-vga.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-nographics.xml | 2 +- .../qemuxml2argv-numatune-memory.xml | 2 +- .../qemuxml2argv-parallel-tcp-chardev.xml | 2 +- .../qemuxml2argvdata/qemuxml2argv-parallel-tcp.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-pci-rom.xml | 2 +- .../qemuxml2argv-pseries-vio-user-assigned.args | 13 ++- .../qemuxml2argvdata/qemuxml2argv-pseries-vio.args | 13 ++- .../qemuxml2argv-qemu-ns-no-env.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-qemu-ns.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-restore-v1.xml | 2 +- .../qemuxml2argv-restore-v2-fd.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-restore-v2.xml | 2 +- .../qemuxml2argv-seclabel-dynamic-baselabel.xml | 2 +- .../qemuxml2argv-seclabel-dynamic-override.xml | 4 +- .../qemuxml2argv-seclabel-dynamic.xml | 2 +- .../qemuxml2argv-seclabel-none.xml | 2 +- .../qemuxml2argv-seclabel-static-relabel.xml | 2 +- .../qemuxml2argv-seclabel-static.xml | 2 +- .../qemuxml2argv-serial-dev-chardev.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-serial-dev.xml | 2 +- .../qemuxml2argv-serial-file-chardev.xml | 2 +- .../qemuxml2argvdata/qemuxml2argv-serial-file.xml | 2 +- .../qemuxml2argv-serial-many-chardev.xml | 2 +- .../qemuxml2argvdata/qemuxml2argv-serial-many.xml | 2 +- .../qemuxml2argv-serial-pty-chardev.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-serial-pty.xml | 2 +- .../qemuxml2argv-serial-target-port-auto.xml | 2 +- .../qemuxml2argv-serial-tcp-chardev.xml | 2 +- .../qemuxml2argv-serial-tcp-telnet-chardev.xml | 2 +- .../qemuxml2argv-serial-tcp-telnet.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-serial-tcp.xml | 2 +- .../qemuxml2argv-serial-udp-chardev.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-serial-udp.xml | 2 +- .../qemuxml2argv-serial-unix-chardev.xml | 2 +- .../qemuxml2argvdata/qemuxml2argv-serial-unix.xml | 2 +- .../qemuxml2argv-serial-vc-chardev.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-serial-vc.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-smbios.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-smp.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-sound.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-watchdog.xml | 2 +- tests/qemuxml2argvtest.c | 4 + .../qemuxml2xmlout-balloon-device-auto.xml | 2 +- .../qemuxml2xmlout-channel-virtio-auto.xml | 2 +- .../qemuxml2xmlout-console-compat-auto.xml | 2 +- .../qemuxml2xmlout-console-virtio.xml | 2 +- .../qemuxml2xmlout-disk-cdrom-empty.xml | 4 +- .../qemuxml2xmlout-disk-scsi-device-auto.xml | 4 +- .../qemuxml2xmlout-graphics-listen-network2.xml | 2 +- .../qemuxml2xmlout-graphics-spice-timeout.xml | 2 +- .../qemuxml2xmloutdata/qemuxml2xmlout-metadata.xml | 2 +- .../qemuxml2xmlout-serial-target-port-auto.xml | 2 +- tests/qemuxml2xmltest.c | 4 +- tests/vmx2xmldata/vmx2xml-case-insensitive-1.xml | 2 +- tests/vmx2xmldata/vmx2xml-case-insensitive-2.xml | 2 +- tests/vmx2xmldata/vmx2xml-cdrom-ide-device.xml | 2 +- tests/vmx2xmldata/vmx2xml-cdrom-ide-file.xml | 2 +- tests/vmx2xmldata/vmx2xml-cdrom-scsi-device.xml | 2 +- tests/vmx2xmldata/vmx2xml-cdrom-scsi-file.xml | 2 +- tests/vmx2xmldata/vmx2xml-esx-in-the-wild-1.xml | 2 +- tests/vmx2xmldata/vmx2xml-esx-in-the-wild-2.xml | 12 +- tests/vmx2xmldata/vmx2xml-esx-in-the-wild-3.xml | 6 +- tests/vmx2xmldata/vmx2xml-esx-in-the-wild-4.xml | 2 +- tests/vmx2xmldata/vmx2xml-esx-in-the-wild-5.xml | 4 +- tests/vmx2xmldata/vmx2xml-esx-in-the-wild-6.xml | 4 +- tests/vmx2xmldata/vmx2xml-floppy-device.xml | 2 +- tests/vmx2xmldata/vmx2xml-floppy-file.xml | 2 +- tests/vmx2xmldata/vmx2xml-gsx-in-the-wild-1.xml | 2 +- tests/vmx2xmldata/vmx2xml-gsx-in-the-wild-2.xml | 2 +- tests/vmx2xmldata/vmx2xml-gsx-in-the-wild-3.xml | 2 +- tests/vmx2xmldata/vmx2xml-gsx-in-the-wild-4.xml | 2 +- tests/vmx2xmldata/vmx2xml-harddisk-ide-file.xml | 2 +- tests/vmx2xmldata/vmx2xml-harddisk-scsi-file.xml | 2 +- tests/vmx2xmldata/vmx2xml-scsi-driver.xml | 8 +- tests/vmx2xmldata/vmx2xml-scsi-writethrough.xml | 2 +- tests/vmx2xmldata/vmx2xml-ws-in-the-wild-1.xml | 4 +- tests/vmx2xmldata/vmx2xml-ws-in-the-wild-2.xml | 4 +- 209 files changed, 588 insertions(+), 300 deletions(-) Regards, Osier

3 15

[libvirt] [PATCH] qemu: unescape HMP commands before converting them to json
by Josh Durgin 27 Feb '12

27 Feb '12

QMP commands don't need to be escaped since converting them to json also escapes special characters. When a QMP command fails, however, libvirt falls back to HMP commands. These fallback functions (qemuMonitorText*) do their own escaping, and pass the result directly to qemuMonitorHMPCommandWithFd. If the monitor is in json mode, these pre-escaped commands will be escaped again when converted to json, which can result in the wrong arguments being sent. For example, a filename test\file would be sent in json as test\\file. This prevented attaching an image file with a " or \ in its name in qemu 1.0.50, and also broke rbd attachment (which uses backslashes to escape some internal arguments.) Reported-by: Masuko Tomoya <tomoya.masuko(a)gmail.com> Signed-off-by: Josh Durgin <josh.durgin(a)dreamhost.com> --- .gitignore | 1 + src/qemu/qemu_monitor.c | 59 +++++++++++++++++++++++- src/qemu/qemu_monitor.h | 1 + tests/Makefile.am | 12 ++++- tests/qemumonitortest.c | 114 +++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 181 insertions(+), 6 deletions(-) create mode 100644 tests/qemumonitortest.c diff --git a/.gitignore b/.gitignore index b7561dc..264a419 100644 --- a/.gitignore +++ b/.gitignore @@ -128,6 +128,7 @@ /tests/openvzutilstest /tests/qemuargv2xmltest /tests/qemuhelptest +/tests/qemumonitortest /tests/qemuxmlnstest /tests/qparamtest /tests/reconnect diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index 93f3505..85212a7 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -153,6 +153,49 @@ char *qemuMonitorEscapeArg(const char *in) return out; } +char *qemuMonitorUnescapeArg(const char *in) +{ + int i, j; + char *out; + int len = strlen(in) + 1; + char next; + + if (VIR_ALLOC_N(out, len) < 0) + return NULL; + + for (i = j = 0; i < len; ++i) { + next = in[i]; + if (in[i] == '\\') { + if (len < i + 1) { + // trailing backslash shouldn't be possible + VIR_FREE(out); + return NULL; + } + ++i; + switch(in[i]) { + case 'r': + next = '\r'; + break; + case 'n': + next = '\n'; + break; + case '"': + case '\\': + next = in[i]; + break; + default: + // invalid input + VIR_FREE(out); + return NULL; + } + } + out[j++] = next; + } + out[j] = '\0'; + + return out; +} + #if DEBUG_RAW_IO # include <c-ctype.h> static char * qemuMonitorEscapeNonPrintable(const char *text) @@ -852,10 +895,20 @@ int qemuMonitorHMPCommandWithFd(qemuMonitorPtr mon, int scm_fd, char **reply) { - if (mon->json) - return qemuMonitorJSONHumanCommandWithFd(mon, cmd, scm_fd, reply); - else + char *json_cmd = NULL; + if (mon->json) { + // hack to avoid complicating each call to text monitor functions + json_cmd = qemuMonitorUnescapeArg(cmd); + if (!json_cmd) { + VIR_DEBUG("Could not unescape command: %s", cmd); + qemuReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Unable to unescape command")); + return -1; + } + return qemuMonitorJSONHumanCommandWithFd(mon, json_cmd, scm_fd, reply); + } else { return qemuMonitorTextCommandWithFd(mon, cmd, scm_fd, reply); + } } /* Ensure proper locking around callbacks. */ diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h index 7c6c52b..9768457 100644 --- a/src/qemu/qemu_monitor.h +++ b/src/qemu/qemu_monitor.h @@ -128,6 +128,7 @@ struct _qemuMonitorCallbacks { char *qemuMonitorEscapeArg(const char *in); +char *qemuMonitorUnescapeArg(const char *in); qemuMonitorPtr qemuMonitorOpen(virDomainObjPtr vm, virDomainChrSourceDefPtr config, diff --git a/tests/Makefile.am b/tests/Makefile.am index 9974c2f..3e505a5 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -72,6 +72,7 @@ EXTRA_DIST = \ nwfilterxml2xmlout \ oomtrace.pl \ qemuhelpdata \ + qemumonitortest \ qemuxml2argvdata \ qemuxml2xmloutdata \ qemuxmlnsdata \ @@ -110,7 +111,8 @@ check_PROGRAMS += xml2sexprtest sexpr2xmltest \ endif if WITH_QEMU check_PROGRAMS += qemuxml2argvtest qemuxml2xmltest qemuxmlnstest \ - qemuargv2xmltest qemuhelptest domainsnapshotxml2xmltest + qemuargv2xmltest qemuhelptest domainsnapshotxml2xmltest \ + qemumonitortest endif if WITH_OPENVZ @@ -237,7 +239,8 @@ endif if WITH_QEMU TESTS += qemuxml2argvtest qemuxml2xmltest qemuxmlnstest qemuargv2xmltest \ - qemuhelptest domainsnapshotxml2xmltest nwfilterxml2xmltest + qemuhelptest domainsnapshotxml2xmltest nwfilterxml2xmltest \ + qemumonitortest endif if WITH_OPENVZ @@ -365,6 +368,9 @@ qemuargv2xmltest_LDADD = $(qemu_LDADDS) $(LDADDS) qemuhelptest_SOURCES = qemuhelptest.c testutils.c testutils.h qemuhelptest_LDADD = $(qemu_LDADDS) $(LDADDS) +qemumonitortest_SOURCES = qemumonitortest.c testutils.c testutils.h +qemumonitortest_LDADD = $(qemu_LDADDS) $(LDADDS) + domainsnapshotxml2xmltest_SOURCES = \ domainsnapshotxml2xmltest.c testutilsqemu.c testutilsqemu.h \ testutils.c testutils.h @@ -372,7 +378,7 @@ domainsnapshotxml2xmltest_LDADD = $(qemu_LDADDS) $(LDADDS) else EXTRA_DIST += qemuxml2argvtest.c qemuxml2xmltest.c qemuargv2xmltest.c \ qemuxmlnstest.c qemuhelptest.c domainsnapshotxml2xmltest.c \ - testutilsqemu.c testutilsqemu.h + qemumonitortest.c testutilsqemu.c testutilsqemu.h endif if WITH_OPENVZ diff --git a/tests/qemumonitortest.c b/tests/qemumonitortest.c new file mode 100644 index 0000000..bf90502 --- /dev/null +++ b/tests/qemumonitortest.c @@ -0,0 +1,114 @@ +#include <config.h> + +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <unistd.h> + +#ifdef WITH_QEMU + +# include "internal.h" +# include "memory.h" +# include "testutils.h" +# include "util.h" +# include "qemu/qemu_monitor.h" + +struct testEscapeString +{ + const char* unescaped; + const char* escaped; +}; + +static struct testEscapeString escapeStrings[] = { + { "", "" }, + { " ", " " }, + { "\\", "\\\\" }, + { "\n", "\\n" }, + { "\r", "\\r" }, + { "\"", "\\\"" }, + { "\"\"\"\\\\\n\r\\\\\n\r\"\"\"", "\\\"\\\"\\\"\\\\\\\\\\n\\r\\\\\\\\\\n\\r\\\"\\\"\\\"" }, + { "drive_add dummy file=foo\\", "drive_add dummy file=foo\\\\" }, + { "block info", "block info" }, + { "set_password \":\\\"\"", "set_password \\\":\\\\\\\"\\\"" }, +}; + +static int testEscapeArg(const void *data ATTRIBUTE_UNUSED) +{ + int i; + char *escaped = NULL; + for (i = 0; i < ARRAY_CARDINALITY(escapeStrings); ++i) { + escaped = qemuMonitorEscapeArg(escapeStrings[i].unescaped); + if (!escaped) { + if (virTestGetDebug() > 0) { + fprintf(stderr, "\nUnescaped string [%s]\n", escapeStrings[i].unescaped); + fprintf(stderr, "Expect result [%s]\n", escapeStrings[i].escaped); + fprintf(stderr, "Actual result [%s]\n", escaped); + } + return -1; + } + if (STRNEQ(escapeStrings[i].escaped, escaped)) { + virtTestDifference(stderr, escapeStrings[i].escaped, escaped); + VIR_FREE(escaped); + return -1; + } + VIR_FREE(escaped); + } + + return 0; +} + +static int testUnescapeArg(const void *data ATTRIBUTE_UNUSED) +{ + int i; + char *unescaped = NULL; + for (i = 0; i < ARRAY_CARDINALITY(escapeStrings); ++i) { + unescaped = qemuMonitorUnescapeArg(escapeStrings[i].escaped); + if (!unescaped) { + if (virTestGetDebug() > 0) { + fprintf(stderr, "\nEscaped string [%s]\n", escapeStrings[i].escaped); + fprintf(stderr, "Expect result [%s]\n", escapeStrings[i].unescaped); + fprintf(stderr, "Actual result [%s]\n", unescaped); + } + return -1; + } + if (STRNEQ(escapeStrings[i].unescaped, unescaped)) { + virtTestDifference(stderr, escapeStrings[i].unescaped, unescaped); + VIR_FREE(unescaped); + return -1; + } + VIR_FREE(unescaped); + } + + return 0; +} + +static int +mymain(void) +{ + int result = 0; + +#define DO_TEST(_name) \ + do { \ + if (virtTestRun("qemu monitor "#_name, 1, test##_name, \ + NULL) < 0) { \ + result = -1; \ + } \ + } while (0) + + DO_TEST(EscapeArg); + DO_TEST(UnescapeArg); + + return result == 0 ? EXIT_SUCCESS : EXIT_FAILURE; +} + +VIRT_TEST_MAIN(mymain) + +#else +# include "testutils.h" + +int main(void) +{ + return EXIT_AM_SKIP; +} + +#endif /* WITH_QEMU */ -- 1.7.1

2 2

[libvirt] [virsh] [PATCH BZ#732364] please add a .virsh/rc file
by Feniks Gordon Freeman 27 Feb '12

27 Feb '12

Hi, libvirt developers I found very interesting libvirt and i wrote patch for BZ#732264 I added support for parsing ~/.virsh/rc file. rc file in format KEY = VALUE symbol '#' - comment Now, only one value added for parsing - VIRSH_DEFAULT_CONNECT_URI. This value can be overwrite by env variable VIRSH_DEFAULT_CONNECT_URI. Thanks P.S. How to add patch file? As attached file or in mail body? P.P.S. I am using irc, my nick - fenksa --- diff --git a/tools/virsh.c b/tools/virsh.c index e712e53..8360c57 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -33,6 +33,7 @@ #include <signal.h> #include <poll.h> #include <strings.h> +#include <pwd.h> #include <libxml/parser.h> #include <libxml/tree.h> @@ -19313,6 +19314,132 @@ vshParseArgv(vshControl *ctl, int argc, char **argv) return true; } +#define DEFAULT_RC_FILENAME ".virsh/rc" + +static const char* +vshRcPath(vshControl* ctl) { + const char* home; + char* path; + + home = virGetUserDirectory(getuid()); + path = vshMalloc(ctl, strlen(home) + strlen(DEFAULT_RC_FILENAME) + 2); + + memcpy(path, home, strlen(home)); + path[strlen(home)] = '/'; + memcpy(path + strlen(home) + 1, DEFAULT_RC_FILENAME, strlen(DEFAULT_RC_FILENAME)); + + VIR_FREE(home); + + return path; +} + +typedef struct { + char* buf; + int len; + int p; +} RcParseBuffer; + +static void +vshClearRcParseBuffer(RcParseBuffer* buf) { + buf->p = 0; + bzero(buf->buf, buf->len); +} + +static void +vshInitRcParseBuffer(vshControl* ctl, RcParseBuffer* buf, int len) { + buf->buf = vshMalloc(ctl, len); + buf->len = len; + vshClearRcParseBuffer(buf); +}; + +static void +vshAddCharRcParseBuffer(RcParseBuffer* buf, char ch) { + if (buf->p < buf->len) { + buf->buf[buf->p] = ch; + buf->p = buf->p + 1; + } +} + +static void +vshParseRc(vshControl *ctl) +{ + int fd; + const char* fileName = vshRcPath(ctl); + bool parseValue = false; + + RcParseBuffer keyBuffer; + RcParseBuffer valueBuffer; + char buffer[1024]; + + vshInitRcParseBuffer(ctl, &keyBuffer, 255); + vshInitRcParseBuffer(ctl, &valueBuffer, 255); + + /* open ~/.virsh/rc file */ + if ((fd = open(fileName, O_RDONLY)) <= 0) { + vshDebug(ctl, VSH_ERR_INFO, "can't open file %s\n", fileName); + goto cleanup; + } + + struct stat statBuf; + if (fstat(fd, &statBuf) == -1) { + vshDebug(ctl, VSH_ERR_INFO, "file %s not stated\n", fileName); + goto cleanup; + } + + if (!S_ISREG(statBuf.st_mode)) { + vshError(ctl, _("file %s is not regular\n"), fileName); + goto cleanup; + } + + int bytesRead; + while ((bytesRead = read(fd, buffer, sizeof(buffer))) > 0) { + for (int i = 0; i < bytesRead; i++) { + /* ignore empty spaces and comments */ + if (buffer[i] == ' ' || buffer[i] == '#') { + continue; + } + + /* found separator = */ + if (buffer[i] == '=') { + if (!parseValue) { + parseValue = true; + continue; + } + } + + /* end of line*/ + if (buffer[i] == '\n') { + if (STREQ(keyBuffer.buf, "VIRSH_DEFAULT_CONNECT_URI")) { + ctl->name = vshStrdup(ctl, valueBuffer.buf); + } + + vshClearRcParseBuffer(&keyBuffer); + vshClearRcParseBuffer(&valueBuffer); + + parseValue = false; + continue; + } + + if (parseValue) { + vshAddCharRcParseBuffer(&valueBuffer, buffer[i]); + } else { + vshAddCharRcParseBuffer(&keyBuffer, buffer[i]); + } + } + } + +cleanup: + if (fd >= 0) { + if (close(fd) < 0) { + vshError(ctl, _("cannot close file %s"), fileName); + } + } + VIR_FREE(fileName); + VIR_FREE(keyBuffer.buf); + VIR_FREE(valueBuffer.buf); +} + + int main(int argc, char **argv) { @@ -19355,6 +19482,8 @@ main(int argc, char **argv) else progname++; + vshParseRc(ctl); + if ((defaultConn = getenv("VIRSH_DEFAULT_CONNECT_URI"))) { ctl->name = vshStrdup(ctl, defaultConn); } -- With best wishes, Maxim Sditanov

2 2

[libvirt] [PATCH v5 0/7] Console corruption patchset
by Peter Krempa 27 Feb '12

27 Feb '12

Yet another spin of the console corruption patches. Current state: * 1/7 - pidfile: Make checking binary path in virPidFileRead optional - No changes to v4. - ACKed by Eric * 2/7 - Add flags for virDomainOpenConsole - No changes to v4. - ACKed by Eric * 3/7 - virsh: add support for VIR_DOMAIN_CONSOLE_* flags - No changes to v4. - ACKed by Eric * 4/7 - fdstream: Emit stream abort callback even if poll() doesnt. - Tweaked according to Eric's review * 5/7 - fdstream: Add internal callback on stream close - Tweaked according to Eric's review * 6/7 - util: Add helpers for safe domain console operations - Tweaked according to Eric's review * 7/7 - qemu: Add ability to abort existing console while creating new one - No changes to v4. - ACKed by Eric Peter Krempa (7): pidfile: Make checking binary path in virPidFileRead optional Add flags for virDomainOpenConsole virsh: add support for VIR_DOMAIN_CONSOLE_* flags fdstream: Emit stream abort callback even if poll() doesnt. fdstream: Add internal callback on stream close util: Add helpers for safe domain console operations qemu: Add ability to abort existing console while creating new one configure.ac | 25 +++ include/libvirt/libvirt.h.in | 12 ++ po/POTFILES.in | 1 + src/Makefile.am | 6 +- src/conf/virconsole.c | 408 ++++++++++++++++++++++++++++++++++++++++++ src/conf/virconsole.h | 36 ++++ src/fdstream.c | 97 ++++++++++- src/fdstream.h | 13 ++- src/libvirt.c | 18 ++- src/libvirt_private.syms | 6 + src/qemu/qemu_domain.c | 5 + src/qemu/qemu_domain.h | 3 + src/qemu/qemu_driver.c | 21 ++- src/util/virpidfile.c | 21 ++- tools/console.c | 5 +- tools/console.h | 3 +- tools/virsh.c | 24 ++- tools/virsh.pod | 8 +- 18 files changed, 680 insertions(+), 32 deletions(-) create mode 100644 src/conf/virconsole.c create mode 100644 src/conf/virconsole.h -- 1.7.3.4

2 10

[libvirt] [virsh] [PATCH BZ#732364] please add a .virsh/rc file
by Feniks Gordon Freeman 27 Feb '12

27 Feb '12

Hi, libvirt developers I found very interesting libvirt and i wrote patch for BZ#732264 I added support for parsing ~/.virsh/rc file. rc file in format KEY = VALUE symbol '#' - comment Now, only one value added for parsing - VIRSH_DEFAULT_CONNECT_URI. This value can be overwrite by env variable VIRSH_DEFAULT_CONNECT_URI. Thanks P.S. How to add patch file? As attached file or in mail body? P.P.S. I am using irc, my nick - fenksa --- diff --git a/tools/virsh.c b/tools/virsh.c index e712e53..8360c57 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -33,6 +33,7 @@ #include <signal.h> #include <poll.h> #include <strings.h> +#include <pwd.h> #include <libxml/parser.h> #include <libxml/tree.h> @@ -19313,6 +19314,132 @@ vshParseArgv(vshControl *ctl, int argc, char **argv) return true; } +#define DEFAULT_RC_FILENAME ".virsh/rc" + +static const char* +vshRcPath(vshControl* ctl) { + const char* home; + char* path; + + home = virGetUserDirectory(getuid()); + path = vshMalloc(ctl, strlen(home) + strlen(DEFAULT_RC_FILENAME) + 2); + + memcpy(path, home, strlen(home)); + path[strlen(home)] = '/'; + memcpy(path + strlen(home) + 1, DEFAULT_RC_FILENAME, strlen(DEFAULT_RC_FILENAME)); + + VIR_FREE(home); + + return path; +} + +typedef struct { + char* buf; + int len; + int p; +} RcParseBuffer; + +static void +vshClearRcParseBuffer(RcParseBuffer* buf) { + buf->p = 0; + bzero(buf->buf, buf->len); +} + +static void +vshInitRcParseBuffer(vshControl* ctl, RcParseBuffer* buf, int len) { + buf->buf = vshMalloc(ctl, len); + buf->len = len; + vshClearRcParseBuffer(buf); +}; + +static void +vshAddCharRcParseBuffer(RcParseBuffer* buf, char ch) { + if (buf->p < buf->len) { + buf->buf[buf->p] = ch; + buf->p = buf->p + 1; + } +} + +static void +vshParseRc(vshControl *ctl) +{ + int fd; + const char* fileName = vshRcPath(ctl); + bool parseValue = false; + + RcParseBuffer keyBuffer; + RcParseBuffer valueBuffer; + char buffer[1024]; + + vshInitRcParseBuffer(ctl, &keyBuffer, 255); + vshInitRcParseBuffer(ctl, &valueBuffer, 255); + + /* open ~/.virsh/rc file */ + if ((fd = open(fileName, O_RDONLY)) <= 0) { + vshDebug(ctl, VSH_ERR_INFO, "can't open file %s\n", fileName); + goto cleanup; + } + + struct stat statBuf; + if (fstat(fd, &statBuf) == -1) { + vshDebug(ctl, VSH_ERR_INFO, "file %s not stated\n", fileName); + goto cleanup; + } + + if (!S_ISREG(statBuf.st_mode)) { + vshError(ctl, _("file %s is not regular\n"), fileName); + goto cleanup; + } + + int bytesRead; + while ((bytesRead = read(fd, buffer, sizeof(buffer))) > 0) { + for (int i = 0; i < bytesRead; i++) { + /* ignore empty spaces and comments */ + if (buffer[i] == ' ' || buffer[i] == '#') { + continue; + } + + /* found separator = */ + if (buffer[i] == '=') { + if (!parseValue) { + parseValue = true; + continue; + } + } + + /* end of line*/ + if (buffer[i] == '\n') { + if (STREQ(keyBuffer.buf, "VIRSH_DEFAULT_CONNECT_URI")) { + ctl->name = vshStrdup(ctl, valueBuffer.buf); + } + + vshClearRcParseBuffer(&keyBuffer); + vshClearRcParseBuffer(&valueBuffer); + + parseValue = false; + continue; + } + + if (parseValue) { + vshAddCharRcParseBuffer(&valueBuffer, buffer[i]); + } else { + vshAddCharRcParseBuffer(&keyBuffer, buffer[i]); + } + } + } + +cleanup: + if (fd >= 0) { + if (close(fd) < 0) { + vshError(ctl, _("cannot close file %s"), fileName); + } + } + VIR_FREE(fileName); + VIR_FREE(keyBuffer.buf); + VIR_FREE(valueBuffer.buf); +} + + int main(int argc, char **argv) { @@ -19355,6 +19482,8 @@ main(int argc, char **argv) else progname++; + vshParseRc(ctl); + if ((defaultConn = getenv("VIRSH_DEFAULT_CONNECT_URI"))) { ctl->name = vshStrdup(ctl, defaultConn); } -- With best wishes, Maxim Sditanov

1 0

[libvirt] [PATCH v2 0/3] Introduce virDomainPMWakeup API
by Michal Privoznik 27 Feb '12

27 Feb '12

This is counterpart for virDomainPMSuspendForDuration API which we have already in. It allows user to wake up guest from S3 state. 1/3 is already ACKed, but I am sending it for the completeness sake. Michal Privoznik (3): Introduce virDomainPMWakeup API virsh: Expose virDomainPMWakeup qemu: Implement virDomainPMWakeup API include/libvirt/libvirt.h.in | 2 + src/driver.h | 4 +++ src/libvirt.c | 50 ++++++++++++++++++++++++++++++++++++++ src/libvirt_public.syms | 1 + src/qemu/qemu_driver.c | 55 ++++++++++++++++++++++++++++++++++++++++++ src/qemu/qemu_monitor.c | 19 ++++++++++++++ src/qemu/qemu_monitor.h | 2 + src/qemu/qemu_monitor_json.c | 21 ++++++++++++++++ src/qemu/qemu_monitor_json.h | 2 + src/remote/remote_driver.c | 1 + src/remote/remote_protocol.x | 8 +++++- src/remote_protocol-structs | 5 ++++ tools/virsh.c | 46 +++++++++++++++++++++++++++++++++++ tools/virsh.pod | 6 ++++ 14 files changed, 221 insertions(+), 1 deletions(-) -- 1.7.3.4

2 9

[libvirt] [PATCH] BlockJob: Support sync/async virDomainBlockJobAbort
by Adam Litke 27 Feb '12

27 Feb '12

Qemu has changed the semantics of the "block_job_cancel" API. Originally, the operation was synchronous (ie. upon command completion, the operation was guaranteed to be completely stopped). With the new semantics, a "block_job_cancel" merely requests that the operation be cancelled and an event is triggered once the cancellation request has been honored. To adopt the new semantics while preserving compatibility I propose the following updates to the virDomainBlockJob API: A new block job event type VIR_DOMAIN_BLOCK_JOB_CANCELLED will be recognized by libvirt. Regardless of the flags used with virDomainBlockJobAbort, this event will be raised whenever it is received from qemu. This event indicates that a block job has been successfully cancelled. A new extension flag VIR_DOMAIN_BLOCK_JOB_ABORT_ASYNC will be added to the virDomainBlockJobAbort API. When enabled, this function will operate asynchronously (ie, it can return before the job has actually been cancelled). When the API is used in this mode, it is the responsibility of the caller to wait for a VIR_DOMAIN_BLOCK_JOB_CANCELLED event or poll via the virDomainGetBlockJobInfo API to check the cancellation status. Without the VIR_DOMAIN_BLOCK_JOB_ABORT_ASYNC flag, libvirt will internally poll using qemu's "query-block-jobs" API and will not return until the operation has been completed. API users are advised that this operation is unbounded and further interaction with the domain during this period may block. This patch implements the new event type, the API flag, and the polling. The main outstanding issue is whether we should bound the amount of time we will wait for cancellation and return an error. Comments on this proposal? Signed-off-by: Adam Litke <agl(a)us.ibm.com> Cc: Stefan Hajnoczi <stefanha(a)gmail.com> Cc: Eric Blake <eblake(a)redhat.com> --- include/libvirt/libvirt.h.in | 10 ++++++++++ src/libvirt.c | 9 ++++++++- src/qemu/qemu_driver.c | 24 +++++++++++++++++------- src/qemu/qemu_monitor.c | 24 ++++++++++++++++++++++++ src/qemu/qemu_monitor.h | 2 ++ src/qemu/qemu_monitor_json.c | 36 +++++++++++++++++++++++++++++------- 6 files changed, 90 insertions(+), 15 deletions(-) diff --git a/include/libvirt/libvirt.h.in b/include/libvirt/libvirt.h.in index e436f3c..fc7f028 100644 --- a/include/libvirt/libvirt.h.in +++ b/include/libvirt/libvirt.h.in @@ -1776,6 +1776,15 @@ typedef enum { VIR_DOMAIN_BLOCK_JOB_TYPE_PULL = 1, } virDomainBlockJobType; +/** + * virDomainBlockJobAbortFlags: + * + * VIR_DOMAIN_BLOCK_JOB_ABORT_ASYNC: Request only, do not wait for completion + */ +typedef enum { + VIR_DOMAIN_BLOCK_JOB_ABORT_ASYNC = 1, +} virDomainBlockJobAbortFlags; + /* An iterator for monitoring block job operations */ typedef unsigned long long virDomainBlockJobCursor; @@ -3293,6 +3302,7 @@ typedef void (*virConnectDomainEventGraphicsCallback)(virConnectPtr conn, typedef enum { VIR_DOMAIN_BLOCK_JOB_COMPLETED = 0, VIR_DOMAIN_BLOCK_JOB_FAILED = 1, + VIR_DOMAIN_BLOCK_JOB_CANCELLED = 2, } virConnectDomainEventBlockJobStatus; /** diff --git a/src/libvirt.c b/src/libvirt.c index a540424..0e886f5 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -17299,7 +17299,7 @@ error: * virDomainBlockJobAbort: * @dom: pointer to domain object * @disk: path to the block device, or device shorthand - * @flags: extra flags; not used yet, so callers should always pass 0 + * @flags: bitwise or of virDomainBlockJobAbortFlags * * Cancel the active block job on the given disk. * @@ -17310,6 +17310,13 @@ error: * can be found by calling virDomainGetXMLDesc() and inspecting * elements within //domain/devices/disk. * + * By default, this function performs a synchronous operation and the caller + * may assume that the operation has completed when 0 is returned. However, + * BlockJob operations may take a long time to complete, and during this time + * further domain interactions may be unresponsive. To avoid this problem, pass + * VIR_DOMAIN_BLOCK_JOB_ABORT_ASYNC in the flags argument to enable asynchronous + * behavior. When the job has been cancelled, a BlockJob event will be emitted. + * * Returns -1 in case of failure, 0 when successful. */ int virDomainBlockJobAbort(virDomainPtr dom, const char *disk, diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 712f1fc..d971a5f 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -11379,7 +11379,7 @@ cleanup: static int qemuDomainBlockJobImpl(virDomainPtr dom, const char *path, unsigned long bandwidth, virDomainBlockJobInfoPtr info, - int mode) + int flags, int mode) { struct qemud_driver *driver = dom->conn->privateData; virDomainObjPtr vm = NULL; @@ -11420,6 +11420,15 @@ qemuDomainBlockJobImpl(virDomainPtr dom, const char *path, qemuDomainObjEnterMonitorWithDriver(driver, vm); priv = vm->privateData; ret = qemuMonitorBlockJob(priv->mon, device, bandwidth, info, mode); + /* + * Qemu provides asynchronous block job cancellation but without the + * VIR_DOMAIN_BLOCK_JOB_ABORT_ASYNC flag libvirt guarantees a synchronous + * operation. Provide this behavior by waiting here (with the monitor + * locked) so we don't get confused by newly scheduled block jobs. + */ + if (ret == 0 && mode == BLOCK_JOB_ABORT && + !(flags & VIR_DOMAIN_BLOCK_JOB_ABORT_ASYNC)) + ret = qemuMonitorBlockJobCancelWait(priv->mon, device); qemuDomainObjExitMonitorWithDriver(driver, vm); endjob: @@ -11439,8 +11448,7 @@ cleanup: static int qemuDomainBlockJobAbort(virDomainPtr dom, const char *path, unsigned int flags) { - virCheckFlags(0, -1); - return qemuDomainBlockJobImpl(dom, path, 0, NULL, BLOCK_JOB_ABORT); + return qemuDomainBlockJobImpl(dom, path, 0, NULL, flags, BLOCK_JOB_ABORT); } static int @@ -11448,7 +11456,7 @@ qemuDomainGetBlockJobInfo(virDomainPtr dom, const char *path, virDomainBlockJobInfoPtr info, unsigned int flags) { virCheckFlags(0, -1); - return qemuDomainBlockJobImpl(dom, path, 0, info, BLOCK_JOB_INFO); + return qemuDomainBlockJobImpl(dom, path, 0, info, flags, BLOCK_JOB_INFO); } static int @@ -11456,7 +11464,8 @@ qemuDomainBlockJobSetSpeed(virDomainPtr dom, const char *path, unsigned long bandwidth, unsigned int flags) { virCheckFlags(0, -1); - return qemuDomainBlockJobImpl(dom, path, bandwidth, NULL, BLOCK_JOB_SPEED); + return qemuDomainBlockJobImpl(dom, path, bandwidth, NULL, flags, + BLOCK_JOB_SPEED); } static int @@ -11466,9 +11475,10 @@ qemuDomainBlockPull(virDomainPtr dom, const char *path, unsigned long bandwidth, int ret; virCheckFlags(0, -1); - ret = qemuDomainBlockJobImpl(dom, path, bandwidth, NULL, BLOCK_JOB_PULL); + ret = qemuDomainBlockJobImpl(dom, path, bandwidth, NULL, flags, + BLOCK_JOB_PULL); if (ret == 0 && bandwidth != 0) - ret = qemuDomainBlockJobImpl(dom, path, bandwidth, NULL, + ret = qemuDomainBlockJobImpl(dom, path, bandwidth, NULL, flags, BLOCK_JOB_SPEED); return ret; } diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index ad7e2a5..5c22486 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -2585,6 +2585,30 @@ int qemuMonitorScreendump(qemuMonitorPtr mon, return ret; } +/* Poll the monitor to wait for the block job on a given disk to end. + * We don't need to worry about another block job starting since we have the + * driver locked. */ +int +qemuMonitorBlockJobCancelWait(qemuMonitorPtr mon, const char *device) +{ + VIR_DEBUG("mon=%p, device=%p", mon, device); + /* XXX: Should we provide some sort of escape hatch for this wait? */ + while (1) { + /* Poll every 100ms */ + int ret; + struct timespec ts = { .tv_sec = 0, .tv_nsec = 100 * 1000 * 1000ull }; + virDomainBlockJobInfo info; + + ret = qemuMonitorBlockJob(mon, device, 0, &info, BLOCK_JOB_INFO); + if (ret < 0) + return -1; + else if (ret == 0) + return 0; + else + nanosleep(&ts, NULL); + } +} + int qemuMonitorBlockJob(qemuMonitorPtr mon, const char *device, unsigned long bandwidth, diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h index 15acf8b..afc081e 100644 --- a/src/qemu/qemu_monitor.h +++ b/src/qemu/qemu_monitor.h @@ -510,6 +510,8 @@ typedef enum { BLOCK_JOB_PULL = 3, } BLOCK_JOB_CMD; +int qemuMonitorBlockJobCancelWait(qemuMonitorPtr mon, const char *device); + int qemuMonitorBlockJob(qemuMonitorPtr mon, const char *device, unsigned long bandwidth, diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 7eb2a92..2ca8eeb 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -57,7 +57,8 @@ static void qemuMonitorJSONHandleIOError(qemuMonitorPtr mon, virJSONValuePtr dat static void qemuMonitorJSONHandleVNCConnect(qemuMonitorPtr mon, virJSONValuePtr data); static void qemuMonitorJSONHandleVNCInitialize(qemuMonitorPtr mon, virJSONValuePtr data); static void qemuMonitorJSONHandleVNCDisconnect(qemuMonitorPtr mon, virJSONValuePtr data); -static void qemuMonitorJSONHandleBlockJob(qemuMonitorPtr mon, virJSONValuePtr data); +static void qemuMonitorJSONHandleBlockJobCompleted(qemuMonitorPtr mon, virJSONValuePtr data); +static void qemuMonitorJSONHandleBlockJobCancelled(qemuMonitorPtr mon, virJSONValuePtr data); struct { const char *type; @@ -73,7 +74,8 @@ struct { { "VNC_CONNECTED", qemuMonitorJSONHandleVNCConnect, }, { "VNC_INITIALIZED", qemuMonitorJSONHandleVNCInitialize, }, { "VNC_DISCONNECTED", qemuMonitorJSONHandleVNCDisconnect, }, - { "BLOCK_JOB_COMPLETED", qemuMonitorJSONHandleBlockJob, }, + { "BLOCK_JOB_COMPLETED", qemuMonitorJSONHandleBlockJobCompleted, }, + { "BLOCK_JOB_CANCELLED", qemuMonitorJSONHandleBlockJobCancelled, }, }; @@ -685,13 +687,14 @@ static void qemuMonitorJSONHandleVNCDisconnect(qemuMonitorPtr mon, virJSONValueP qemuMonitorJSONHandleVNC(mon, data, VIR_DOMAIN_EVENT_GRAPHICS_DISCONNECT); } -static void qemuMonitorJSONHandleBlockJob(qemuMonitorPtr mon, virJSONValuePtr data) +static void qemuMonitorJSONHandleBlockJobImpl(qemuMonitorPtr mon, + virJSONValuePtr data, + int event) { const char *device; const char *type_str; int type = VIR_DOMAIN_BLOCK_JOB_TYPE_UNKNOWN; unsigned long long offset, len; - int status = VIR_DOMAIN_BLOCK_JOB_FAILED; if ((device = virJSONValueObjectGetString(data, "device")) == NULL) { VIR_WARN("missing device in block job event"); @@ -716,13 +719,32 @@ static void qemuMonitorJSONHandleBlockJob(qemuMonitorPtr mon, virJSONValuePtr da if (STREQ(type_str, "stream")) type = VIR_DOMAIN_BLOCK_JOB_TYPE_PULL; - if (offset != 0 && offset == len) - status = VIR_DOMAIN_BLOCK_JOB_COMPLETED; + switch (event) { + case VIR_DOMAIN_BLOCK_JOB_COMPLETED: + /* Make sure the whole device has been processed */ + if (offset != len) + event = VIR_DOMAIN_BLOCK_JOB_FAILED; + break; + case VIR_DOMAIN_BLOCK_JOB_FAILED: + case VIR_DOMAIN_BLOCK_JOB_CANCELLED: + break; + } out: - qemuMonitorEmitBlockJob(mon, device, type, status); + qemuMonitorEmitBlockJob(mon, device, type, event); +} + +static void qemuMonitorJSONHandleBlockJobCompleted(qemuMonitorPtr mon, + virJSONValuePtr data) +{ + qemuMonitorJSONHandleBlockJobImpl(mon, data, VIR_DOMAIN_BLOCK_JOB_COMPLETED); } +static void qemuMonitorJSONHandleBlockJobCancelled(qemuMonitorPtr mon, + virJSONValuePtr data) +{ + qemuMonitorJSONHandleBlockJobImpl(mon, data, VIR_DOMAIN_BLOCK_JOB_CANCELLED); +} int qemuMonitorJSONHumanCommandWithFd(qemuMonitorPtr mon, -- 1.7.5.rc1

5 9

[libvirt] [libvirt-sandbox PATCH 1/2] main: Don't free error twice
by Guido Günther 27 Feb '12

27 Feb '12

It's already being cleared in cleanup. Otherwise we see: Unknown option -D Run 'libvirt-sandbox --help' to see a full list of available command line options *** glibc detected *** /var/scratch/debian/libvirt-sandbox/libvirt-sandbox/bin/.libs/lt-virt-sandbox: double free or corruption (fasttop): 0x08d888b0 *** ======= Backtrace: ========= /lib/i386-linux-gnu/i686/cmov/libc.so.6(+0x6e221)[0xb7255221] /lib/i386-linux-gnu/i686/cmov/libc.so.6(+0x6fa88)[0xb7256a88] /lib/i386-linux-gnu/i686/cmov/libc.so.6(cfree+0x6d)[0xb7259b3d] /lib/i386-linux-gnu/libglib-2.0.so.0(+0x4c38b)[0xb73c038b] /lib/i386-linux-gnu/i686/cmov/libc.so.6(__libc_start_main+0xe6)[0xb71fde46] --- bin/virt-sandbox.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/bin/virt-sandbox.c b/bin/virt-sandbox.c index b24b24b..00b2a29 100644 --- a/bin/virt-sandbox.c +++ b/bin/virt-sandbox.c @@ -112,7 +112,6 @@ int main(int argc, char **argv) { g_printerr("%s\n%s\n", error->message, gettext(help_msg)); - g_error_free(error); goto cleanup; } -- 1.7.9.1

2 2

[libvirt] [libvirt-sandbox PATCH 2/2] Debug is '-d' not '-D'
by Guido Günther 26 Feb '12

26 Feb '12

--- bin/virt-sandbox.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/bin/virt-sandbox.c b/bin/virt-sandbox.c index 00b2a29..b3b5166 100644 --- a/bin/virt-sandbox.c +++ b/bin/virt-sandbox.c @@ -300,7 +300,7 @@ Display the version number and exit Display verbose progress information -=item B<-D>, B<--debug> +=item B<-d>, B<--debug> Display debugging information -- 1.7.9.1

2 1

[libvirt] [PATCH] Fixed URI parsing
by Martin Kletzander 25 Feb '12

25 Feb '12

Function xmlParseURI does not remove square brackets around IPv6 address when parsing. One of the solutions is making wrappers around functions working with xmlURI*. This assures that uri->server will be always properly assigned and it doesn't have to be changed when used on some new place in the code. For this purpose, functions virParseURI and virSaveURI were added. These function are wrappers around xmlParseURI and xmlSaveUri respectively. Also there is one new syntax check function to prohibit these functions anywhere else. File changes: - src/util/viruri.h -- declaration - src/util/viruri.c -- definition - src/libvirt_private.syms -- symbol export - src/Makefile.am -- added source and header files - cfg.mk -- added sc_prohibit_xmlURI - all others -- ID name and include fixes --- v4: - fixed NULL pointer dereference - fixed minor typo - copyright added to header v3: - wrappers moved to new files - syntax check added - virAsprintf used instead of nasty memory mechanics v2: - added virSaveURI for building back the original string cfg.mk | 8 ++++ src/Makefile.am | 3 +- src/datatypes.h | 2 +- src/driver.h | 2 +- src/esx/esx_driver.c | 5 +- src/esx/esx_util.c | 2 +- src/esx/esx_util.h | 4 +- src/hyperv/hyperv_util.c | 2 +- src/hyperv/hyperv_util.h | 5 +- src/libvirt.c | 10 ++-- src/libvirt_private.syms | 5 ++ src/libxl/libxl_driver.c | 3 +- src/lxc/lxc_driver.c | 3 +- src/openvz/openvz_driver.c | 3 +- src/qemu/qemu_driver.c | 2 +- src/qemu/qemu_migration.c | 7 ++- src/remote/remote_driver.c | 9 ++-- src/uml/uml_driver.c | 3 +- src/util/qparams.c | 3 +- src/util/viruri.c | 93 ++++++++++++++++++++++++++++++++++++++++++++ src/util/viruri.h | 22 ++++++++++ src/vbox/vbox_tmpl.c | 3 +- src/vmx/vmx.c | 6 +- src/xen/xen_driver.c | 4 +- src/xen/xen_hypervisor.h | 3 +- src/xen/xend_internal.c | 4 +- src/xen/xend_internal.h | 2 +- src/xenapi/xenapi_driver.c | 2 +- src/xenapi/xenapi_utils.c | 4 +- src/xenapi/xenapi_utils.h | 4 +- 30 files changed, 180 insertions(+), 48 deletions(-) create mode 100644 src/util/viruri.c create mode 100644 src/util/viruri.h diff --git a/cfg.mk b/cfg.mk index dcf44bb..9759d87 100644 --- a/cfg.mk +++ b/cfg.mk @@ -457,6 +457,12 @@ sc_prohibit_xmlGetProp: halt='use virXMLPropString, not xmlGetProp' \ $(_sc_search_regexp) +# xml(ParseURI|SaveUri) doesn't handle IPv6 URIs well +sc_prohibit_xmlURI: + @prohibit='\<xml(ParseURI|SaveUri) *\(' \ + halt='use virURI(Parse|Format), not xml(ParseURI|SaveUri)' \ + $(_sc_search_regexp) + # ATTRIBUTE_UNUSED should only be applied in implementations, not # header declarations sc_avoid_attribute_unused_in_header: @@ -758,6 +764,8 @@ exclude_file_name_regexp--sc_prohibit_strncpy = \ exclude_file_name_regexp--sc_prohibit_xmlGetProp = ^src/util/xml\.c$$ +exclude_file_name_regexp--sc_prohibit_xmlURI = ^src/util/viruri\.c$$ + exclude_file_name_regexp--sc_require_config_h = ^examples/ exclude_file_name_regexp--sc_require_config_h_first = ^examples/ diff --git a/src/Makefile.am b/src/Makefile.am index d5f52a0..e2542b1 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -104,7 +104,8 @@ UTIL_SOURCES = \ util/virnetlink.c util/virnetlink.h \ util/virrandom.h util/virrandom.c \ util/virsocketaddr.h util/virsocketaddr.c \ - util/virtime.h util/virtime.c + util/virtime.h util/virtime.c \ + util/viruri.h util/viruri.c EXTRA_DIST += $(srcdir)/util/virkeymaps.h $(srcdir)/util/keymaps.csv \ $(srcdir)/util/virkeycode-mapgen.py diff --git a/src/datatypes.h b/src/datatypes.h index 47058ed..fc284d2 100644 --- a/src/datatypes.h +++ b/src/datatypes.h @@ -151,7 +151,7 @@ struct _virConnect { */ unsigned int magic; /* specific value to check */ unsigned int flags; /* a set of connection flags */ - xmlURIPtr uri; /* connection URI */ + virURIPtr uri; /* connection URI */ /* The underlying hypervisor driver and network driver. */ virDriverPtr driver; diff --git a/src/driver.h b/src/driver.h index d27fa99..b04b254 100644 --- a/src/driver.h +++ b/src/driver.h @@ -9,9 +9,9 @@ # include "config.h" # include <unistd.h> -# include <libxml/uri.h> # include "internal.h" +# include "viruri.h" /* * List of registered drivers numbers */ diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c index f5e1cc7..b6b22f8 100644 --- a/src/esx/esx_driver.c +++ b/src/esx/esx_driver.c @@ -44,6 +44,7 @@ #include "esx_vi.h" #include "esx_vi_methods.h" #include "esx_util.h" +#include "viruri.h" #define VIR_FROM_THIS VIR_FROM_ESX @@ -3945,7 +3946,7 @@ esxDomainMigratePerform(virDomainPtr domain, { int result = -1; esxPrivate *priv = domain->conn->privateData; - xmlURIPtr parsedUri = NULL; + virURIPtr parsedUri = NULL; char *saveptr; char *path_resourcePool; char *path_hostSystem; @@ -3976,7 +3977,7 @@ esxDomainMigratePerform(virDomainPtr domain, } /* Parse migration URI */ - parsedUri = xmlParseURI(uri); + parsedUri = virURIParse(uri); if (parsedUri == NULL) { virReportOOMError(); diff --git a/src/esx/esx_util.c b/src/esx/esx_util.c index 2c5ac1a..7d4b908 100644 --- a/src/esx/esx_util.c +++ b/src/esx/esx_util.c @@ -42,7 +42,7 @@ int -esxUtil_ParseUri(esxUtil_ParsedUri **parsedUri, xmlURIPtr uri) +esxUtil_ParseUri(esxUtil_ParsedUri **parsedUri, virURIPtr uri) { int result = -1; struct qparam_set *queryParamSet = NULL; diff --git a/src/esx/esx_util.h b/src/esx/esx_util.h index 2bee510..a69b3f4 100644 --- a/src/esx/esx_util.h +++ b/src/esx/esx_util.h @@ -22,9 +22,9 @@ #ifndef __ESX_UTIL_H__ # define __ESX_UTIL_H__ -# include <libxml/uri.h> # include <netdb.h> # include "internal.h" +# include "viruri.h" typedef struct _esxUtil_ParsedUri esxUtil_ParsedUri; @@ -40,7 +40,7 @@ struct _esxUtil_ParsedUri { char *path; }; -int esxUtil_ParseUri(esxUtil_ParsedUri **parsedUri, xmlURIPtr uri); +int esxUtil_ParseUri(esxUtil_ParsedUri **parsedUri, virURIPtr uri); void esxUtil_FreeParsedUri(esxUtil_ParsedUri **parsedUri); diff --git a/src/hyperv/hyperv_util.c b/src/hyperv/hyperv_util.c index 298cfe0..2e6a2d4 100644 --- a/src/hyperv/hyperv_util.c +++ b/src/hyperv/hyperv_util.c @@ -37,7 +37,7 @@ int -hypervParseUri(hypervParsedUri **parsedUri, xmlURIPtr uri) +hypervParseUri(hypervParsedUri **parsedUri, virURIPtr uri) { int result = -1; struct qparam_set *queryParamSet = NULL; diff --git a/src/hyperv/hyperv_util.h b/src/hyperv/hyperv_util.h index 9057f55..d9d1c84 100644 --- a/src/hyperv/hyperv_util.h +++ b/src/hyperv/hyperv_util.h @@ -23,9 +23,8 @@ #ifndef __HYPERV_UTIL_H__ # define __HYPERV_UTIL_H__ -# include <libxml/uri.h> - # include "internal.h" +# include "viruri.h" typedef struct _hypervParsedUri hypervParsedUri; @@ -33,7 +32,7 @@ struct _hypervParsedUri { char *transport; }; -int hypervParseUri(hypervParsedUri **parsedUri, xmlURIPtr uri); +int hypervParseUri(hypervParsedUri **parsedUri, virURIPtr uri); void hypervFreeParsedUri(hypervParsedUri **parsedUri); diff --git a/src/libvirt.c b/src/libvirt.c index 6294196..3eca512 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -23,7 +23,6 @@ #include <libxml/parser.h> #include <libxml/xpath.h> -#include <libxml/uri.h> #include "getpass.h" #ifdef HAVE_WINSOCK2_H @@ -44,6 +43,7 @@ #include "command.h" #include "virnodesuspend.h" #include "virrandom.h" +#include "viruri.h" #ifndef WITH_DRIVER_MODULES # ifdef WITH_TEST @@ -1127,7 +1127,7 @@ do_open (const char *name, virConnectOpenResolveURIAlias(name, &alias) < 0) goto failed; - ret->uri = xmlParseURI (alias ? alias : name); + ret->uri = virURIParse (alias ? alias : name); if (!ret->uri) { virLibConnError(VIR_ERR_INVALID_ARG, _("could not parse connection URI %s"), @@ -1729,7 +1729,7 @@ virConnectGetURI (virConnectPtr conn) return NULL; } - name = (char *)xmlSaveUri(conn->uri); + name = (char *)virURIFormat(conn->uri); if (!name) { virReportOOMError(); goto error; @@ -4952,7 +4952,7 @@ virDomainMigratePeer2Peer (virDomainPtr domain, const char *uri, unsigned long bandwidth) { - xmlURIPtr tempuri = NULL; + virURIPtr tempuri = NULL; VIR_DOMAIN_DEBUG(domain, "xmlin=%s, flags=%lx, dname=%s, " "dconnuri=%s, uri=%s, bandwidth=%lu", NULLSTR(xmlin), flags, NULLSTR(dname), @@ -4964,7 +4964,7 @@ virDomainMigratePeer2Peer (virDomainPtr domain, return -1; } - tempuri = xmlParseURI(dconnuri); + tempuri = virURIParse(dconnuri); if (!tempuri) { virLibConnError(VIR_ERR_INVALID_ARG, __FUNCTION__); virDispatchError(domain->conn); diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 9e3573f..047231f 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1430,6 +1430,11 @@ virTypedParameterArrayValidate; virTypedParameterAssign; +# viruri.h +virURIFormat; +virURIParse; + + # xml.h virXMLChildElementCount; virXMLParseHelper; diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index 6cfc5eb..6db33c2 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -44,6 +44,7 @@ #include "libxl_conf.h" #include "xen_xm.h" #include "virtypedparam.h" +#include "viruri.h" #define VIR_FROM_THIS VIR_FROM_LIBXL @@ -1043,7 +1044,7 @@ libxlOpen(virConnectPtr conn, if (libxl_driver == NULL) return VIR_DRV_OPEN_DECLINED; - conn->uri = xmlParseURI("xen:///"); + conn->uri = virURIParse("xen:///"); if (!conn->uri) { virReportOOMError(); return VIR_DRV_OPEN_ERROR; diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index b6962cf7..d77afcc 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -60,6 +60,7 @@ #include "virnodesuspend.h" #include "virtime.h" #include "virtypedparam.h" +#include "viruri.h" #define VIR_FROM_THIS VIR_FROM_LXC @@ -139,7 +140,7 @@ static virDrvOpenStatus lxcOpen(virConnectPtr conn, if (lxc_driver == NULL) return VIR_DRV_OPEN_DECLINED; - conn->uri = xmlParseURI("lxc:///"); + conn->uri = virURIParse("lxc:///"); if (!conn->uri) { virReportOOMError(); return VIR_DRV_OPEN_ERROR; diff --git a/src/openvz/openvz_driver.c b/src/openvz/openvz_driver.c index 833a98d..aef1491 100644 --- a/src/openvz/openvz_driver.c +++ b/src/openvz/openvz_driver.c @@ -56,6 +56,7 @@ #include "virfile.h" #include "logging.h" #include "command.h" +#include "viruri.h" #define VIR_FROM_THIS VIR_FROM_OPENVZ @@ -1335,7 +1336,7 @@ static virDrvOpenStatus openvzOpen(virConnectPtr conn, if (access("/proc/vz", W_OK) < 0) return VIR_DRV_OPEN_DECLINED; - conn->uri = xmlParseURI("openvz:///system"); + conn->uri = virURIParse("openvz:///system"); if (conn->uri == NULL) { virReportOOMError(); return VIR_DRV_OPEN_ERROR; diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 717bdf1..c5c7afc 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -857,7 +857,7 @@ static virDrvOpenStatus qemudOpen(virConnectPtr conn, if (qemu_driver == NULL) return VIR_DRV_OPEN_DECLINED; - conn->uri = xmlParseURI(qemu_driver->privileged ? + conn->uri = virURIParse(qemu_driver->privileged ? "qemu:///system" : "qemu:///session"); if (!conn->uri) { diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index f0af494..cf64981 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -45,6 +45,7 @@ #include "virtime.h" #include "locking/domain_lock.h" #include "rpc/virnetsocket.h" +#include "viruri.h" #define VIR_FROM_THIS VIR_FROM_QEMU @@ -1759,7 +1760,7 @@ static int doNativeMigrate(struct qemud_driver *driver, virConnectPtr dconn) { qemuDomainObjPrivatePtr priv = vm->privateData; - xmlURIPtr uribits = NULL; + virURIPtr uribits = NULL; int ret = -1; qemuMigrationSpec spec; @@ -1775,10 +1776,10 @@ static int doNativeMigrate(struct qemud_driver *driver, virReportOOMError(); return -1; } - uribits = xmlParseURI(tmp); + uribits = virURIParse(tmp); VIR_FREE(tmp); } else { - uribits = xmlParseURI(uri); + uribits = virURIParse(uri); } if (!uribits) { qemuReportError(VIR_ERR_INTERNAL_ERROR, diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index 2dacb70..8fb46e1 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -26,8 +26,6 @@ #include <unistd.h> #include <assert.h> -#include <libxml/uri.h> - #include "virnetclient.h" #include "virnetclientprogram.h" #include "virnetclientstream.h" @@ -47,6 +45,7 @@ #include "command.h" #include "intprops.h" #include "virtypedparam.h" +#include "viruri.h" #define VIR_FROM_THIS VIR_FROM_REMOTE @@ -488,7 +487,7 @@ doRemoteOpen (virConnectPtr conn, /* Allow remote serve to probe */ name = strdup(""); } else { - xmlURI tmpuri = { + virURI tmpuri = { .scheme = conn->uri->scheme, #ifdef HAVE_XMLURI_QUERY_RAW .query_raw = qparam_get_query (vars), @@ -505,7 +504,7 @@ doRemoteOpen (virConnectPtr conn, transport_str[-1] = '\0'; } - name = (char *) xmlSaveUri (&tmpuri); + name = (char *) virURIFormat (&tmpuri); #ifdef HAVE_XMLURI_QUERY_RAW VIR_FREE(tmpuri.query_raw); @@ -719,7 +718,7 @@ doRemoteOpen (virConnectPtr conn, goto failed; VIR_DEBUG("Auto-probed URI is %s", uriret.uri); - conn->uri = xmlParseURI(uriret.uri); + conn->uri = virURIParse(uriret.uri); VIR_FREE(uriret.uri); if (!conn->uri) { virReportOOMError(); diff --git a/src/uml/uml_driver.c b/src/uml/uml_driver.c index a4cf945..cbb2c0e 100644 --- a/src/uml/uml_driver.c +++ b/src/uml/uml_driver.c @@ -63,6 +63,7 @@ #include "configmake.h" #include "virnetdevtap.h" #include "virnodesuspend.h" +#include "viruri.h" #define VIR_FROM_THIS VIR_FROM_UML @@ -1138,7 +1139,7 @@ static virDrvOpenStatus umlOpen(virConnectPtr conn, if (uml_driver == NULL) return VIR_DRV_OPEN_DECLINED; - conn->uri = xmlParseURI(uml_driver->privileged ? + conn->uri = virURIParse(uml_driver->privileged ? "uml:///system" : "uml:///session"); if (!conn->uri) { diff --git a/src/util/qparams.c b/src/util/qparams.c index f6d0713..83b568e 100644 --- a/src/util/qparams.c +++ b/src/util/qparams.c @@ -26,12 +26,11 @@ #include <stdlib.h> #include <stdarg.h> -#include <libxml/uri.h> - #include "virterror_internal.h" #include "buf.h" #include "memory.h" #include "qparams.h" +#include "viruri.h" #define VIR_FROM_THIS VIR_FROM_NONE diff --git a/src/util/viruri.c b/src/util/viruri.c new file mode 100644 index 0000000..0cbfc5a --- /dev/null +++ b/src/util/viruri.c @@ -0,0 +1,93 @@ +/* + * viruri.c: URI parsing wrappers for libxml2 functions + * + * Copyright (C) 2012 Red Hat, Inc. + * + * See COPYING.LIB for the License of this software + */ + +#include <config.h> + +#include "viruri.h" + +#include "memory.h" +#include "util.h" + +/** + * virURIParse: + * @uri: URI to parse + * + * Wrapper for xmlParseURI + * + * Unfortunately there are few things that should be managed after + * parsing the URI. Fortunately there is only one thing now and its + * removing of square brackets around IPv6 addresses. + * + * @returns the parsed uri object with some fixes + */ +xmlURIPtr +virURIParse(const char *uri) +{ + xmlURIPtr ret = xmlParseURI(uri); + + /* First check: does it even make sense to jump inside */ + if (ret != NULL && + ret->server != NULL && + ret->server[0] == '[') { + size_t length = strlen(ret->server); + + /* We want to modify the server string only if there are + * square brackets on both ends and inside there is IPv6 + * address. Otherwise we could make a mistake by modifying + * something other than an IPv6 address. */ + if (ret->server[length - 1] == ']' && strchr(ret->server, ':')) { + memmove(&ret->server[0], &ret->server[1], length - 2); + ret->server[length - 2] = '\0'; + } + /* Even after such modification, it is completely ok to free + * the uri with xmlFreeURI() */ + } + + return ret; +} + +/** + * virURIFormat: + * @uri: URI to format + * + * Wrapper for xmlSaveUri + * + * This function constructs back everything that @ref virURIParse + * changes after parsing + * + * @returns the constructed uri as a string + */ +unsigned char * +virURIFormat(xmlURIPtr uri) +{ + char *backupserver = NULL; + char *tmpserver = NULL; + unsigned char *ret; + + /* First check: does it make sense to do anything */ + if (uri != NULL && + uri->server != NULL && + strchr(uri->server, ':') != NULL) { + + backupserver = uri->server; + if (virAsprintf(&tmpserver, "[%s]", uri->server) < 0) + return NULL; + + uri->server = tmpserver; + } + + ret = xmlSaveUri(uri); + + /* Put the fixed version back */ + if (tmpserver) { + uri->server = backupserver; + VIR_FREE(tmpserver); + } + + return ret; +} diff --git a/src/util/viruri.h b/src/util/viruri.h new file mode 100644 index 0000000..b2b0ca8 --- /dev/null +++ b/src/util/viruri.h @@ -0,0 +1,22 @@ +/* + * viruri.h: internal definitions used for URI parsing. + * + * Copyright (C) 2012 Red Hat, Inc. + * + * See COPYING.LIB for the License of this software + */ + +#ifndef __VIR_URI_H__ +# define __VIR_URI_H__ + +# include <libxml/uri.h> + +# include "internal.h" + +typedef xmlURI virURI; +typedef xmlURIPtr virURIPtr; + +virURIPtr virURIParse(const char *uri); +unsigned char * virURIFormat(virURIPtr uri); + +#endif /* __VIR_URI_H__ */ diff --git a/src/vbox/vbox_tmpl.c b/src/vbox/vbox_tmpl.c index b168c7d..a39b567 100644 --- a/src/vbox/vbox_tmpl.c +++ b/src/vbox/vbox_tmpl.c @@ -56,6 +56,7 @@ #include "configmake.h" #include "virfile.h" #include "fdstream.h" +#include "viruri.h" /* This one changes from version to version. */ #if VBOX_API_VERSION == 2002 @@ -980,7 +981,7 @@ static virDrvOpenStatus vboxOpen(virConnectPtr conn, virCheckFlags(VIR_CONNECT_RO, VIR_DRV_OPEN_ERROR); if (conn->uri == NULL) { - conn->uri = xmlParseURI(uid ? "vbox:///session" : "vbox:///system"); + conn->uri = virURIParse(uid ? "vbox:///session" : "vbox:///system"); if (conn->uri == NULL) { virReportOOMError(); return VIR_DRV_OPEN_ERROR; diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c index 823d5df..9c83de4 100644 --- a/src/vmx/vmx.c +++ b/src/vmx/vmx.c @@ -24,7 +24,6 @@ #include <config.h> #include <c-ctype.h> -#include <libxml/uri.h> #include "internal.h" #include "virterror_internal.h" @@ -33,6 +32,7 @@ #include "logging.h" #include "uuid.h" #include "vmx.h" +#include "viruri.h" /* @@ -2518,7 +2518,7 @@ virVMXParseSerial(virVMXContext *ctx, virConfPtr conf, int port, char network_endPoint_name[48] = ""; char *network_endPoint = NULL; - xmlURIPtr parsedUri = NULL; + virURIPtr parsedUri = NULL; if (def == NULL || *def != NULL) { VMX_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", _("Invalid argument")); @@ -2608,7 +2608,7 @@ virVMXParseSerial(virVMXContext *ctx, virConfPtr conf, int port, (*def)->target.port = port; (*def)->source.type = VIR_DOMAIN_CHR_TYPE_TCP; - parsedUri = xmlParseURI(fileName); + parsedUri = virURIParse(fileName); if (parsedUri == NULL) { virReportOOMError(); diff --git a/src/xen/xen_driver.c b/src/xen/xen_driver.c index 635f468..19ce7da 100644 --- a/src/xen/xen_driver.c +++ b/src/xen/xen_driver.c @@ -26,7 +26,6 @@ #include <sys/types.h> #include <fcntl.h> #include <xen/dom0_ops.h> -#include <libxml/uri.h> #include "virterror_internal.h" #include "logging.h" @@ -50,6 +49,7 @@ #include "uuid.h" #include "fdstream.h" #include "virfile.h" +#include "viruri.h" #include "command.h" #include "virnodesuspend.h" @@ -270,7 +270,7 @@ xenUnifiedOpen (virConnectPtr conn, virConnectAuthPtr auth, unsigned int flags) if (!xenUnifiedProbe()) return VIR_DRV_OPEN_DECLINED; - conn->uri = xmlParseURI("xen:///"); + conn->uri = virURIParse("xen:///"); if (!conn->uri) { virReportOOMError(); return VIR_DRV_OPEN_ERROR; diff --git a/src/xen/xen_hypervisor.h b/src/xen/xen_hypervisor.h index 77c6f74..55a99f1 100644 --- a/src/xen/xen_hypervisor.h +++ b/src/xen/xen_hypervisor.h @@ -11,11 +11,10 @@ #ifndef __VIR_XEN_INTERNAL_H__ # define __VIR_XEN_INTERNAL_H__ -# include <libxml/uri.h> - # include "internal.h" # include "capabilities.h" # include "driver.h" +# include "viruri.h" /* See xenHypervisorInit() for details. */ struct xenHypervisorVersions { diff --git a/src/xen/xend_internal.c b/src/xen/xend_internal.c index 5c3838f..83bfac0 100644 --- a/src/xen/xend_internal.c +++ b/src/xen/xend_internal.c @@ -27,7 +27,6 @@ #include <netinet/tcp.h> #include <arpa/inet.h> #include <netdb.h> -#include <libxml/uri.h> #include <errno.h> #include "virterror_internal.h" @@ -46,6 +45,7 @@ #include "memory.h" #include "count-one-bits.h" #include "virfile.h" +#include "viruri.h" /* required for cpumap_t */ #include <xen/dom0_ops.h> @@ -3224,7 +3224,7 @@ xenDaemonDomainMigratePerform (virDomainPtr domain, * "hostname", "hostname:port" or "xenmigr://hostname[:port]/". */ if (strstr (uri, "//")) { /* Full URI. */ - xmlURIPtr uriptr = xmlParseURI (uri); + virURIPtr uriptr = virURIParse (uri); if (!uriptr) { virXendError(VIR_ERR_INVALID_ARG, "%s", _("xenDaemonDomainMigrate: invalid URI")); diff --git a/src/xen/xend_internal.h b/src/xen/xend_internal.h index eee67b5..3f0b63d 100644 --- a/src/xen/xend_internal.h +++ b/src/xen/xend_internal.h @@ -18,13 +18,13 @@ # include <sys/types.h> # include <stdint.h> -# include <libxml/uri.h> # include "internal.h" # include "capabilities.h" # include "domain_conf.h" # include "driver.h" # include "buf.h" +# include "viruri.h" int xenDaemonOpen_unix(virConnectPtr conn, const char *path); diff --git a/src/xenapi/xenapi_driver.c b/src/xenapi/xenapi_driver.c index f877f67..94644ae 100644 --- a/src/xenapi/xenapi_driver.c +++ b/src/xenapi/xenapi_driver.c @@ -25,7 +25,6 @@ #include <limits.h> #include <stdint.h> #include <string.h> -#include <libxml/uri.h> #include <curl/curl.h> #include <xen/api/xen_all.h> #include "internal.h" @@ -37,6 +36,7 @@ #include "uuid.h" #include "memory.h" #include "buf.h" +#include "viruri.h" #include "xenapi_driver.h" #include "xenapi_driver_private.h" #include "xenapi_utils.h" diff --git a/src/xenapi/xenapi_utils.c b/src/xenapi/xenapi_utils.c index ddc7736..943b6c0 100644 --- a/src/xenapi/xenapi_utils.c +++ b/src/xenapi/xenapi_utils.c @@ -25,7 +25,6 @@ #include <stdio.h> #include <string.h> #include <stdint.h> -#include <libxml/uri.h> #include <xen/api/xen_all.h> #include "internal.h" #include "domain_conf.h" @@ -37,6 +36,7 @@ #include "buf.h" #include "logging.h" #include "qparams.h" +#include "viruri.h" #include "xenapi_driver_private.h" #include "xenapi_utils.h" @@ -94,7 +94,7 @@ xenapiUtil_RequestPassword(virConnectAuthPtr auth, const char *username, } int -xenapiUtil_ParseQuery(virConnectPtr conn, xmlURIPtr uri, int *noVerify) +xenapiUtil_ParseQuery(virConnectPtr conn, virURIPtr uri, int *noVerify) { int result = 0; int i; diff --git a/src/xenapi/xenapi_utils.h b/src/xenapi/xenapi_utils.h index 40506d5..aa1ff74 100644 --- a/src/xenapi/xenapi_utils.h +++ b/src/xenapi/xenapi_utils.h @@ -23,9 +23,9 @@ # define __VIR_XENAPI_UTILS__ # include <stdint.h> -# include <libxml/uri.h> # include <xen/api/xen_all.h> # include "internal.h" +# include "viruri.h" # include "domain_conf.h" # define NETWORK_DEVID_SIZE (12) @@ -40,7 +40,7 @@ xenapiUtil_RequestPassword(virConnectAuthPtr auth, const char *username, const char *hostname); int -xenapiUtil_ParseQuery(virConnectPtr conn, xmlURIPtr uri, int *noVerify); +xenapiUtil_ParseQuery(virConnectPtr conn, virURIPtr uri, int *noVerify); enum xen_on_normal_exit actionShutdownLibvirt2XenapiEnum(enum virDomainLifecycleAction action); -- 1.7.3.4

3 2

[libvirt] [PATCH] Fixed service handling in specfile
by Martin Kletzander 24 Feb '12

24 Feb '12

After adding the libvirt-guests service into usual runlevels, we used to start the libvirt-guests service. However this is usually not a good practice. As mentioned on fedoraproject wiki, the installations can be in changeroots, in an installer context, or in other situations where we don't want the services autostarted. --- libvirt.spec.in | 8 -------- 1 files changed, 0 insertions(+), 8 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 67cde23..072fd8e 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1027,14 +1027,6 @@ fi %if %{with_systemd} %else /sbin/chkconfig --add libvirt-guests -if [ $1 -ge 1 ]; then - level=$(/sbin/runlevel | /bin/cut -d ' ' -f 2) - if /sbin/chkconfig --levels $level libvirt-guests; then - # this doesn't do anything but allowing for libvirt-guests to be - # stopped on the first shutdown - /sbin/service libvirt-guests start > /dev/null 2>&1 || true - fi -fi %endif %postun client -p /sbin/ldconfig -- 1.7.3.4

2 1