- Devel - libvirt List Archives

[libvirt] [PATCHv4 0/5] Handling of undefine and redefine snapshots with VirtualBox 4.2
by Manuel VIVES 02 Jan '14

02 Jan '14

Hi, This is a serie of patches in order to support undefining and redefining snapshots with VirtualBox 4.2. The serie of patches is rather big, and adds among other things some utility functions unrelated to VirtualBox in patches 1 & 2. The code review could be done in several parts: e.g. patches 1 & 2 separately to validate the utility functions. The VirtualBox API provides only high level operations to manipulate snapshots, so it not possible to support flags like VIR_DOMAIN_SNAPSHOT_CREATE_REDEFINE and VIR_DOMAIN_SNAPSHOT_DELETE_METADATA_ONLY with only API calls. Following an IRC talk with Eric Blake, the decision was taken to emulate these behaviours by manipulating directly the .vbox XML files. The first two patches are some util methods for handling uuid and strings that will be used after. The third patch brings more details in the snapshot XML returned by libvirt. We will need those modifications in order to redefine the snapshots. The fourth patch brings the support of the VIR_DOMAIN_SNAPSHOT_CREATE_REDEFINE and VIR_DOMAIN_SNAPSHOT_CREATE_CURRENT flags in virDomainSnapshotCreateXML. The fifth and last patch brings the support of the VIR_DOMAIN_SNAPSHOT_DELETE_METADATA_ONLY flag in virDomainSnapshotDelete. The patches are only tested with Virtualbox 4.2 but the code is compliant with Virtualbox 4.3 API. Regards, Manuel VIVES V4: * The code is compliant with Virtualbox 4.3 API * Some minor modifications in order to satisfy "make syntax-check" V3: * Use of STREQ_NULLABLE instead of STREQ in one case * Fix the method for finding uuids according to Ján Tomko review V2: * Fix a licence problem with the method for string replacement Manuel VIVES (5): viruuid.h/c: Util method for finding uuid patterns in some strings virstring.h/c: Util method for making some find and replace in strings vbox_tmpl.c: Better XML description for snapshots vbox_tmpl.c: Patch for redefining snapshots vbox_tmpl.c: Add methods for undefining snapshots po/POTFILES.in | 1 + src/conf/domain_conf.c | 2 +- src/libvirt_private.syms | 2 + src/util/virstring.c | 48 ++ src/util/virstring.h | 2 + src/util/viruuid.c | 81 ++ src/util/viruuid.h | 1 + src/vbox/vbox_tmpl.c | 1854 +++++++++++++++++++++++++++++++++++++++++++--- 8 files changed, 1879 insertions(+), 112 deletions(-) -- 1.7.10.4

3 17

[libvirt] [PATCH] event: don't overwrite registration error message
by Eric Blake 02 Jan '14

02 Jan '14

Prior to this patch, an attempt to register an event without an event loop started results in the vague: libvirt: Remote Driver error : adding cb to list Now it gives the much nicer: libvirt: error : internal error: could not initialize domain event timer This also avoids hiding other reasonable error messages, such as attempts to register a duplicate callback or OOM errors. Also, document the event loop usage requirement, since that was how I ran into the issue. * src/remote/remote_driver.c (remoteConnectNetworkEventRegisterAny) (remoteConnectDomainEventRegister) (remoteConnectDomainEventRegisterAny): Preserve more detailed error. * src/libvirt.c (virConnectDomainEventRegister) (virConnectDomainEventRegisterAny) (virConnectNetworkEventRegisterAny): Document event loop requirement. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- src/libvirt.c | 24 +++++++++++++++--------- src/remote/remote_driver.c | 12 +++--------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/libvirt.c b/src/libvirt.c index 90773bb..f8b11b3 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -14829,11 +14829,13 @@ error: * @freecb: optional function to deallocate opaque when not used anymore * * Adds a callback to receive notifications of domain lifecycle events - * occurring on a connection + * occurring on a connection. This function requires that an event loop + * has been previously registered with virEventRegisterImpl() or + * virEventRegisterDefaultImpl(). * * Use of this method is no longer recommended. Instead applications * should try virConnectDomainEventRegisterAny() which has a more flexible - * API contract + * API contract. * * The virDomainPtr object handle passed into the callback upon delivery * of an event is only valid for the duration of execution of the callback. @@ -14842,7 +14844,7 @@ error: * The reference can be released once the object is no longer required * by calling virDomainFree. * - * Returns 0 on success, -1 on failure + * Returns 0 on success, -1 on failure. */ int virConnectDomainEventRegister(virConnectPtr conn, @@ -17541,10 +17543,12 @@ error: * @freecb: optional function to deallocate opaque when not used anymore * * Adds a callback to receive notifications of arbitrary domain events - * occurring on a domain. + * occurring on a domain. This function requires that an event loop + * has been previously registered with virEventRegisterImpl() or + * virEventRegisterDefaultImpl(). * * If @dom is NULL, then events will be monitored for any domain. If @dom - * is non-NULL, then only the specific domain will be monitored + * is non-NULL, then only the specific domain will be monitored. * * Most types of event have a callback providing a custom set of parameters * for the event. When registering an event, it is thus necessary to use @@ -17562,7 +17566,7 @@ error: * for the callback. To unregister a callback, this callback ID should * be passed to the virConnectDomainEventDeregisterAny() method. * - * Returns a callback identifier on success, -1 on failure + * Returns a callback identifier on success, -1 on failure. */ int virConnectDomainEventRegisterAny(virConnectPtr conn, @@ -17657,10 +17661,12 @@ error: * @freecb: optional function to deallocate opaque when not used anymore * * Adds a callback to receive notifications of arbitrary network events - * occurring on a network. + * occurring on a network. This function requires that an event loop + * has been previously registered with virEventRegisterImpl() or + * virEventRegisterDefaultImpl(). * * If @net is NULL, then events will be monitored for any network. If @net - * is non-NULL, then only the specific network will be monitored + * is non-NULL, then only the specific network will be monitored. * * Most types of event have a callback providing a custom set of parameters * for the event. When registering an event, it is thus necessary to use @@ -17678,7 +17684,7 @@ error: * for the callback. To unregister a callback, this callback ID should * be passed to the virConnectNetworkEventDeregisterAny() method. * - * Returns a callback identifier on success, -1 on failure + * Returns a callback identifier on success, -1 on failure. */ int virConnectNetworkEventRegisterAny(virConnectPtr conn, diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index be282d6..11785e2 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -2932,10 +2932,8 @@ remoteConnectNetworkEventRegisterAny(virConnectPtr conn, net, eventID, VIR_OBJECT_EVENT_CALLBACK(callback), opaque, freecb, - &callbackID)) < 0) { - virReportError(VIR_ERR_RPC, "%s", _("adding cb to list")); + &callbackID)) < 0) goto done; - } /* If this is the first callback for this eventID, we need to enable * events on the server */ @@ -4424,10 +4422,8 @@ static int remoteConnectDomainEventRegister(virConnectPtr conn, remoteDriverLock(priv); if ((count = virDomainEventStateRegister(conn, priv->domainEventState, - callback, opaque, freecb)) < 0) { - virReportError(VIR_ERR_RPC, "%s", _("adding cb to list")); + callback, opaque, freecb)) < 0) goto done; - } if (count == 1) { /* Tell the server when we are the first callback deregistering */ @@ -5234,10 +5230,8 @@ static int remoteConnectDomainEventRegisterAny(virConnectPtr conn, priv->domainEventState, dom, eventID, callback, opaque, freecb, - &callbackID)) < 0) { - virReportError(VIR_ERR_RPC, "%s", _("adding cb to list")); + &callbackID)) < 0) goto done; - } /* If this is the first callback for this eventID, we need to enable * events on the server */ -- 1.8.4.2

2 3

[libvirt] How to execute an initial script in a container to start the network interface automatically
by WANG Cheng D 02 Jan '14

02 Jan '14

Dear All, Happy new year to you. I have a similar question which had been replied by Daniel in the following post: http://www.redhat.com/archives/libvir-list/2010-March/msg00296.html I also want to assign a static IP to the container. As Daniel said, I can successfully assign a static IP to the container manually using " # ifconfig eth0 192.168.122.3 netmask 255.255.255.0 up". Daniel also said that we can use "the regular distro initscripts" to automatically start the network interface, but this doesn't work on my system. My host is fedora16. I used the command "yum --installroot=/root/fedora16lxc --releasever=16 install -y openssh, bridge-utils" to setup the rootfs for my container, but I am not sure if it is a right way. After rootfs installation, there is no sub-directory named "network-scripts" in "/etc/sysconfig" . So, I created this directory manually and added a file named "ifcfg-eth0". In my container's XML script, I use "<init>/bin/sh</init>". If I use "<init>/bin/init</init>", it seems that the container doesn't boot correctly because there are strings keeping rolling in the console. My libvirtd and virsh version is 1.0.3. I tried to add files ".bash_profile" and ".bashrc" in which I revised the shell environment variable such as PATH, I also added the "ifconfig" in the script to try to configure eth0 automatically, but it doesn't work. I wonder if there is a ".bashrc" for the root of a container? If there is, where should this file be located? In summary, I have two questions 1) How to setup rootfs for a container? 2) If a container can automatically execute an initial script when booting? Your reply is highly appreciated. With my warmest regards, Cheng

2 1

Re: [libvirt] libvirt live modify
by Michal Novotny 01 Jan '14

01 Jan '14

Hi Umar, please contact libvirt guys for python bindings. Python bindings for libvirt are not handled by me, I handle just the PHP bindings and I'm not aware of the function support in the Python bindings. Happy New Year! Thanks, Michal ----- Original Message ----- From: "Umar Draz" <unix.co(a)gmail.com> To: "Michal Novotny" <minovotn(a)redhat.com> Sent: Monday, December 23, 2013 7:03:17 PM Subject: Re: [libvirt] libvirt live modify Hi Michal Thanks, its work, Ok one question http://libvirt.org/php/api-reference.html#libvirt_domain_set_metadata the above link is php api reference link is there same kind of thing is available for python? Br. Umar On Mon, Dec 23, 2013 at 3:27 PM, Michal Novotny <minovotn(a)redhat.com> wrote: > Hi Umar, > I'm on PTO, fortunately I was checking my e-mail because of the goods to > declare so I can reply to you. > > For updating this please use the libvirt_domain_set_metadata() API > function, please see [1] for documentation. > > Hope it helps, > Michal > > [1] http://libvirt.org/php/api-reference.html#libvirt_domain_set_metadata > > ----- Original Message ----- > From: "Umar Draz" <unix.co(a)gmail.com> > To: "Michal Novotny" <minovotn(a)redhat.com> > Sent: Monday, December 23, 2013 11:05:11 AM > Subject: Re: [libvirt] libvirt live modify > > Hi Michal, > > Sorry to disturb you again, this works great > > $info = @libvirt_domain_get_metadata($res, > VIR_DOMAIN_METADATA_DESCRIPTION, '', VIR_DOMAIN_AFFECT_CURRENT); > > Now what I need to do for setting/updating for the domain description or > title > > Br. > > Umar > > > On Wed, Dec 18, 2013 at 8:25 PM, Michal Novotny <minovotn(a)redhat.com> > wrote: > > > Hi Umar, > > then you don't have working automake setup. Please google how to solve > > it, I apologize but I don't really have much time to solve it right now. > > > > Thanks for understanding, > > Michal > > > > On 12/18/2013 04:21 PM, Umar Draz wrote: > > > Hi Michal > > > > > > I tried > > > > > > but on autogen.sh is failed > > > > > > automake: error: global options already processed > > > automake: Please contact <bug-automake(a)gnu.org > > > <mailto:bug-automake@gnu.org>>. > > > at /usr/share/automake-1.14/Automake/Channels.pm line 662, <GEN0> > > > line 77. > > > Automake::Channels::msg('automake', '', 'global options > > > already processed') called at > > > /usr/share/automake-1.14/Automake/ChannelDefs.pm line 212 > > > Automake::ChannelDefs::prog_error('global options already > > > processed') called at /usr/share/automake-1.14/Automake/Options.pm > > > line 421 > > > > > > Automake::Options::process_global_option_list('HASH(0x246df60)') > > > called at /usr/bin/automake line 5331 > > > Automake::scan_autoconf_traces('configure.ac > > > <http://configure.ac>') called at /usr/bin/automake line 5431 > > > Automake::scan_autoconf_files() called at /usr/bin/automake > > > line 8259 > > > autoreconf: automake failed with exit status: 29 > > > > > > > > > Br. > > > > > > Umar > > > > > > > > > On Wed, Dec 18, 2013 at 7:50 PM, Michal Novotny <minovotn(a)redhat.com > > > <mailto:minovotn@redhat.com>> wrote: > > > > > > Hi Umar, > > > you have to clone it from git repository and compile it and > > > install. You > > > can simply do it by: > > > > > > git clone git://libvirt.org/libvirt-php.git > > > <http://libvirt.org/libvirt-php.git> > > > ./autogen.sh > > > make > > > sudo make install > > > > > > And then you have to restart your Apache webserver. > > > > > > For example how to use it, see the test in > > > test-domain-create-get-metadata.phpt file (it's normal PHP script, > > > however I use phpt extension as PHP test but it's standard PHP > code). > > > > > > Michal > > > > > > On 12/18/2013 03:45 PM, Umar Draz wrote: > > > > Hi Michal, > > > > > > > > Thanks, Now what I need here? I already have > > > > installed libvirt-php-0.4.8, do I need to copy > > > > > > > > libvirt-php.c > > > > > > > < > > > http://libvirt.org/git/?p=libvirt-php.git;a=blob;f=src/libvirt-php.c;h=7a2a… > > > > > > > libvirt-php. > > > > > > > < > > > http://libvirt.org/git/?p=libvirt-php.git;a=blob;f=src/libvirt-php.c;h=7a2a… > > >h > > > > in the src directory and reconfigure the php-libvirt? > > > > > > > > Br. > > > > > > > > Umar > > > > > > > > > > > > On Wed, Dec 18, 2013 at 7:31 PM, Michal Novotny > > > <minovotn(a)redhat.com <mailto:minovotn@redhat.com> > > > > <mailto:minovotn@redhat.com <mailto:minovotn@redhat.com>>> > wrote: > > > > > > > > Hi Umar, > > > > please see commit > > > > > > > > > > http://libvirt.org/git/?p=libvirt-php.git;a=commit;h=e3e783413d8f001ee0a266… > > > > . > > > > > > > > The functions mentioned below have been implemented. > > > > > > > > Michal > > > > > > > > On 12/18/2013 01:29 PM, Umar Draz wrote: > > > > > Hi Michal, > > > > > > > > > > Thanks for your efforts and help. If I need any other API > > > I will > > > > > definitely ask you. > > > > > > > > > > Br. > > > > > > > > > > Umar > > > > > > > > > > > > > > > On Wed, Dec 18, 2013 at 5:19 PM, Michal Novotny > > > > <minovotn(a)redhat.com <mailto:minovotn@redhat.com> > > > <mailto:minovotn@redhat.com <mailto:minovotn@redhat.com>> > > > > > <mailto:minovotn@redhat.com <mailto:minovotn@redhat.com> > > > <mailto:minovotn@redhat.com <mailto:minovotn@redhat.com>>>> wrote: > > > > > > > > > > Hi Umar, > > > > > that's fine. Give one or two days for this please. > > > Maybe I'll > > > > > implement > > > > > earlier but I'm a bit overloaded after my PTO so I > > > can't promise > > > > > it will > > > > > be earlier. > > > > > > > > > > Also, what APIs would you like to implement? > > > > > > > > > > I'm thinking of implementing these two: > > > > > > > > > > > > > > > > > http://libvirt.org/html/libvirt-libvirt.html#virDomainGetMetadata > > > > > > > > > > > > http://libvirt.org/html/libvirt-libvirt.html#virDomainSetMetadata > > > > > > > > > > Would you like any other APIs? > > > > > > > > > > Thanks, > > > > > Michal > > > > > > > > > > On 12/18/2013 01:15 PM, Umar Draz wrote: > > > > > > HI Michal, > > > > > > > > > > > > Ok , I will wait. I hope you will get sometime to do > > > this. > > > > > > > > > > > > Br. > > > > > > > > > > > > Umar > > > > > > > > > > > > > > > > > > On Wed, Dec 18, 2013 at 5:06 PM, Michal Novotny > > > > > <minovotn(a)redhat.com <mailto:minovotn@redhat.com> > > > <mailto:minovotn@redhat.com <mailto:minovotn@redhat.com>> > > > > <mailto:minovotn@redhat.com <mailto:minovotn@redhat.com> > > > <mailto:minovotn@redhat.com <mailto:minovotn@redhat.com>>> > > > > > > <mailto:minovotn@redhat.com > > > <mailto:minovotn@redhat.com> <mailto:minovotn@redhat.com > > > <mailto:minovotn@redhat.com>> > > > > <mailto:minovotn@redhat.com <mailto:minovotn@redhat.com> > > > <mailto:minovotn@redhat.com <mailto:minovotn@redhat.com>>>>> > wrote: > > > > > > > > > > > > Hi Michal and Umar, > > > > > > it's correct I can't invoke this APIs via PHP > > > yet. Please > > > > > note that > > > > > > libvirt-php is not automatically generated when > > > doing > > > > libvirt > > > > > > build and > > > > > > it's a separate project. It's rather easy to > > > implement > > > > it to the > > > > > > libvirt-php so if you want to implement it, feel > > > free to > > > > > implement > > > > > > or if > > > > > > you can wait a day or two until I have some time > > > I can > > > > implement > > > > > > it (the > > > > > > project is not officially supported and it's done > > in > > > > the spare > > > > > > time mainly). > > > > > > > > > > > > I'd just like to ask you whether there are some > > more > > > > APIs you'd > > > > > > like me > > > > > > to implement when I'll be implementing it. Are > > > there any > > > > > other APIs > > > > > > you'd like? > > > > > > > > > > > > Thanks, > > > > > > Michal > > > > > > > > > > > > On 12/18/2013 12:59 PM, Michal Privoznik wrote: > > > > > > > On 18.12.2013 12:27, Umar Draz wrote: > > > > > > >> Hi Peter, > > > > > > >> > > > > > > >> Thanks for the response, Would you please > > > help how > > > > I can > > > > > > >> use *virDomainSetMetadata* with PHP or any > > > url for > > > > help? > > > > > > >> > > > > > > >> Br. > > > > > > >> > > > > > > >> Umar > > > > > > > [CC'ing Michal Novotny - the libvirt-php > > > maintainer] > > > > > > > > > > > > > > I don't think you can invoke those APIs via > > > PHP. But > > > > I expect > > > > > > them to be > > > > > > > able to add easily. Michal? > > > > > > > > > > > > > > Michal > > > > > > > > > > > > -- > > > > > > Michal Novotny <minovotn(a)redhat.com > > > <mailto:minovotn@redhat.com> > > > > <mailto:minovotn@redhat.com <mailto:minovotn@redhat.com>> > > > > > <mailto:minovotn@redhat.com > > > <mailto:minovotn@redhat.com> <mailto:minovotn@redhat.com > > > <mailto:minovotn@redhat.com>>> > > > > <mailto:minovotn@redhat.com <mailto:minovotn@redhat.com> > > > <mailto:minovotn@redhat.com <mailto:minovotn@redhat.com>> > > > > > <mailto:minovotn@redhat.com > > > <mailto:minovotn@redhat.com> <mailto:minovotn@redhat.com > > > <mailto:minovotn@redhat.com>>>>>, > > > > > > RHCE, Red Hat > > > > > > Virtualization | libvirt-php bindings | > > > > php-virt-control.org <http://php-virt-control.org> > > > <http://php-virt-control.org> > > > > > <http://php-virt-control.org> > > > > > > <http://php-virt-control.org> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > -- > > > > > > Umar Draz > > > > > > Network Architect > > > > > > > > > > -- > > > > > Michal Novotny <minovotn(a)redhat.com > > > <mailto:minovotn@redhat.com> > > > > <mailto:minovotn@redhat.com <mailto:minovotn@redhat.com>> > > > <mailto:minovotn@redhat.com <mailto:minovotn@redhat.com> > > > > <mailto:minovotn@redhat.com <mailto:minovotn@redhat.com>>>>, > > > > > RHCE, Red Hat > > > > > Virtualization | libvirt-php bindings | > > > php-virt-control.org <http://php-virt-control.org> > > > > <http://php-virt-control.org> > > > > > <http://php-virt-control.org> > > > > > > > > > > > > > > > > > > > > > > > > > -- > > > > > Umar Draz > > > > > Network Architect > > > > > > > > -- > > > > Michal Novotny <minovotn(a)redhat.com > > > <mailto:minovotn@redhat.com> <mailto:minovotn@redhat.com > > > <mailto:minovotn@redhat.com>>>, > > > > RHCE, Red Hat > > > > Virtualization | libvirt-php bindings | php-virt-control.org > > > <http://php-virt-control.org> > > > > <http://php-virt-control.org> > > > > > > > > > > > > > > > > > > > > -- > > > > Umar Draz > > > > Network Architect > > > > > > -- > > > Michal Novotny <minovotn(a)redhat.com <mailto:minovotn@redhat.com>>, > > > RHCE, Red Hat > > > Virtualization | libvirt-php bindings | php-virt-control.org > > > <http://php-virt-control.org> > > > > > > > > > > > > > > > -- > > > Umar Draz > > > Network Architect > > > > -- > > Michal Novotny <minovotn(a)redhat.com>, RHCE, Red Hat > > Virtualization | libvirt-php bindings | php-virt-control.org > > > > > > > -- > Umar Draz > Network Architect > -- Umar Draz Network Architect

1 0

[libvirt] [PATCH] test: share state driver between test:///default connections
by Eric Blake 01 Jan '14

01 Jan '14

Prior to this patch, every test:/// URI has its own event manager, which means that registering for an event can only ever receive events from the connection where it issued the API that triggered the event. But the whole idea of events is to be able to learn about something where an API call did NOT trigger the action. In order to actually test asynchronous events, I wanted to be able to tie multiple test connections to the same state. Use of a file in a test URI is still per-connection state, but now parallel connections to test:///default (from the same binary, of course) now share common state and can affect one another. Here's the test program I used to expose the difference (maybe not the most polished, but does the trick): #include <stdbool.h> #include <stdlib.h> #include <errno.h> #include <stdio.h> #include <unistd.h> #include <signal.h> #include <libvirt/libvirt.h> #include <libvirt/virterror.h> static int counter; static int counter2; static virConnectPtr conn1; static virConnectPtr conn2; static virDomainPtr dom1; static virDomainPtr dom2; static int common(virConnectPtr conn, virDomainPtr dom, int event, int detail, void *opaque, int caller) { printf("%d: in callback %d, from domain %s (%d), event/detail %d/%d\n", counter2++, caller, virDomainGetName(dom), virDomainGetID(dom), event, detail); return 0; } static int callback1(virConnectPtr conn, virDomainPtr dom, int event, int detail, void *opaque) { return common(conn, dom, event, detail, opaque, 1); } static int callback2(virConnectPtr conn, virDomainPtr dom, int event, int detail, void *opaque) { return common(conn, dom, event, detail, opaque, 2); } static bool quit; static void handler(int sig) { quit = true; } static void timer(int id, void *opaque) { printf("%d: timer %d firing\n", counter++, id); unsigned long l; switch (counter) { case 1: if (virDomainSuspend(dom2) < 0) exit(10); printf("suspended\n"); break; case 2: if (virDomainResume(dom2) < 0) exit(11); printf("resumed\n"); break; case 4: quit = true; /* fallthrough */ default: virConnectGetLibVersion(conn1, &l); break; } } int main(int argc, char **argv) { signal(SIGINT, handler); conn1 = virConnectOpen("test:///default"); conn2 = virConnectOpen("test:///default"); if (!conn1 || !conn2) return 1; dom1 = virDomainLookupByName(conn1, "test"); dom2 = virDomainLookupByName(conn2, "test"); if (!dom1 || !dom2) return 2; if (virEventRegisterDefaultImpl() < 0) return 3; int id0 = virEventAddTimeout(1000, timer, NULL, NULL); if (id0 < 0) return 4; int id1 = virConnectDomainEventRegisterAny(conn1, dom1, VIR_DOMAIN_EVENT_ID_LIFECYCLE, VIR_DOMAIN_EVENT_CALLBACK(callback1), NULL, NULL); if (id1 < 0) return 5; int id2 = -1; if (argc > 1) { id2 = virConnectDomainEventRegisterAny(conn2, dom2, VIR_DOMAIN_EVENT_ID_LIFECYCLE, VIR_DOMAIN_EVENT_CALLBACK(callback2), NULL, NULL); if (id2 < 0) return 6; if (argc > 2) { if (virConnectDomainEventDeregisterAny(conn2, id2) < 0) return 7; } } while (!quit) if (virEventRunDefaultImpl() < 0) return 20; if (virConnectDomainEventDeregisterAny(conn1, id1) < 0) return 21; if (id2 >= 0 && virConnectDomainEventDeregisterAny(conn2, id2) < 0) return 22; if (virEventRemoveTimeout(id0) < 0) return 23; if (virDomainFree(dom1) < 0 || virDomainFree(dom2) < 0 || virConnectClose(conn1) < 0 || virConnectClose(conn2) < 0) return 24; return 0; } Pre-patch results: $ ./run ./bar 0: timer 1 firing suspended 1: timer 1 firing resumed 2: timer 1 firing 3: timer 1 firing Post-patch results: $ ./run ./bar 0: timer 1 firing suspended 0: in callback 1, from domain test (1), event/detail 3/0 1: timer 1 firing resumed 1: in callback 1, from domain test (1), event/detail 4/0 2: timer 1 firing 3: timer 1 firing $ ./run ./bar 1 0: timer 1 firing suspended 0: in callback 1, from domain test (1), event/detail 3/0 1: in callback 2, from domain test (1), event/detail 3/0 1: timer 1 firing resumed 2: in callback 1, from domain test (1), event/detail 4/0 3: in callback 2, from domain test (1), event/detail 4/0 2: timer 1 firing 3: timer 1 firing Valgrind didn't report any leaks. * src/test/test_driver.c (testConnectOpen): Move per-connection state initialization... (testOpenFromFile): ...here. (defaultConn, defaultConnections, defaultLock, testOnceInit): New shared state. (testOpenDefault): Only initialize on first connection. (testConnectClose): Don't clobber state if still shared. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- I'm actually playing with moving my test out of the commit message and into tests/objecteventtest.c; if I get that working, I'll post a v2. src/test/test_driver.c | 88 ++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 64 insertions(+), 24 deletions(-) diff --git a/src/test/test_driver.c b/src/test/test_driver.c index a48404a..9696044 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -1,7 +1,7 @@ /* * test.c: A "mock" hypervisor for use by application unit tests * - * Copyright (C) 2006-2013 Red Hat, Inc. + * Copyright (C) 2006-2014 Red Hat, Inc. * Copyright (C) 2006 Daniel P. Berrange * * This library is free software; you can redistribute it and/or @@ -105,6 +105,10 @@ struct _testConn { typedef struct _testConn testConn; typedef struct _testConn *testConnPtr; +static testConn defaultConn; +static int defaultConnections; +static virMutex defaultLock; + #define TEST_MODEL "i686" #define TEST_MODEL_WORDSIZE 32 #define TEST_EMULATOR "/usr/bin/test-hv" @@ -125,6 +129,14 @@ static int testConnectClose(virConnectPtr conn); static void testObjectEventQueue(testConnPtr driver, virObjectEventPtr event); +static int +testOnceInit(void) +{ + return virMutexInit(&defaultLock); +} + +VIR_ONCE_GLOBAL_INIT(test) + static void testDriverLock(testConnPtr driver) { @@ -665,9 +677,15 @@ cleanup: return ret; } -static int testOpenDefault(virConnectPtr conn) { + +/* Simultaneous test:///default connections should share the same + * common state (among other things, this allows testing event + * detection in one connection for an action caused in another). */ +static int +testOpenDefault(virConnectPtr conn) +{ int u; - testConnPtr privconn; + testConnPtr privconn = &defaultConn; virDomainDefPtr domdef = NULL; virDomainObjPtr domobj = NULL; virNetworkDefPtr netdef = NULL; @@ -679,18 +697,26 @@ static int testOpenDefault(virConnectPtr conn) { virNodeDeviceDefPtr nodedef = NULL; virNodeDeviceObjPtr nodeobj = NULL; - if (VIR_ALLOC(privconn) < 0) - return VIR_DRV_OPEN_ERROR; + virMutexLock(&defaultLock); + if (defaultConnections++) { + conn->privateData = &defaultConn; + virMutexUnlock(&defaultLock); + return VIR_DRV_OPEN_SUCCESS; + } + if (virMutexInit(&privconn->lock) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("cannot initialize mutex")); - VIR_FREE(privconn); + defaultConnections--; + virMutexUnlock(&defaultLock); return VIR_DRV_OPEN_ERROR; } - testDriverLock(privconn); conn->privateData = privconn; + if (!(privconn->domainEventState = virObjectEventStateNew())) + goto error; + if (!(privconn->domains = virDomainObjListNew())) goto error; @@ -791,7 +817,7 @@ static int testOpenDefault(virConnectPtr conn) { } virNodeDeviceObjUnlock(nodeobj); - testDriverUnlock(privconn); + virMutexUnlock(&defaultLock); return VIR_DRV_OPEN_SUCCESS; @@ -802,10 +828,12 @@ error: virStoragePoolObjListFree(&privconn->pools); virNodeDeviceObjListFree(&privconn->devs); virObjectUnref(privconn->caps); - testDriverUnlock(privconn); + virObjectEventStateFree(privconn->domainEventState); + virMutexDestroy(&privconn->lock); conn->privateData = NULL; - VIR_FREE(privconn); virDomainDefFree(domdef); + defaultConnections--; + virMutexUnlock(&defaultLock); return VIR_DRV_OPEN_ERROR; } @@ -1327,6 +1355,9 @@ error: return ret; } + +/* No shared state between simultaneous test connections initialized + * from a file. */ static int testOpenFromFile(virConnectPtr conn, const char *file) { @@ -1355,6 +1386,9 @@ testOpenFromFile(virConnectPtr conn, const char *file) if (!(privconn->xmlopt = testBuildXMLConfig())) goto error; + if (!(privconn->domainEventState = virObjectEventStateNew())) + goto error; + if (!(doc = virXMLParseFileCtxt(file, &ctxt))) { goto error; } @@ -1398,6 +1432,7 @@ testOpenFromFile(virConnectPtr conn, const char *file) virInterfaceObjListFree(&privconn->ifaces); virStoragePoolObjListFree(&privconn->pools); VIR_FREE(privconn->path); + virObjectEventStateFree(privconn->domainEventState); testDriverUnlock(privconn); VIR_FREE(privconn); conn->privateData = NULL; @@ -1410,10 +1445,12 @@ static virDrvOpenStatus testConnectOpen(virConnectPtr conn, unsigned int flags) { int ret; - testConnPtr privconn; virCheckFlags(VIR_CONNECT_RO, VIR_DRV_OPEN_ERROR); + if (testInitialize() < 0) + return VIR_DRV_OPEN_ERROR; + if (!conn->uri) return VIR_DRV_OPEN_DECLINED; @@ -1442,24 +1479,24 @@ static virDrvOpenStatus testConnectOpen(virConnectPtr conn, if (ret != VIR_DRV_OPEN_SUCCESS) return ret; - privconn = conn->privateData; - testDriverLock(privconn); - - privconn->domainEventState = virObjectEventStateNew(); - if (!privconn->domainEventState) { - testDriverUnlock(privconn); - testConnectClose(conn); - return VIR_DRV_OPEN_ERROR; - } - - testDriverUnlock(privconn); - return VIR_DRV_OPEN_SUCCESS; } static int testConnectClose(virConnectPtr conn) { testConnPtr privconn = conn->privateData; + + if (testInitialize() < 0) + return -1; + + if (privconn == &defaultConn) { + virMutexLock(&defaultLock); + if (--defaultConnections) { + virMutexUnlock(&defaultLock); + return 0; + } + } + testDriverLock(privconn); virObjectUnref(privconn->caps); virObjectUnref(privconn->xmlopt); @@ -1474,7 +1511,10 @@ static int testConnectClose(virConnectPtr conn) testDriverUnlock(privconn); virMutexDestroy(&privconn->lock); - VIR_FREE(privconn); + if (privconn == &defaultConn) + virMutexUnlock(&defaultLock); + else + VIR_FREE(privconn); conn->privateData = NULL; return 0; } -- 1.8.4.2

1 1

[libvirt] [PATCHv2] test: share state driver between test:///default connections
by Eric Blake 01 Jan '14

01 Jan '14

Prior to this patch, every test:/// URI has its own event manager, which means that registering for an event can only ever receive events from the connection where it issued the API that triggered the event. But the whole idea of events is to be able to learn about something where an API call did NOT trigger the action. In order to actually test asynchronous events, I wanted to be able to tie multiple test connections to the same state. Use of a file in a test URI is still per-connection state, but now parallel connections to test:///default (from the same binary, of course) now share common state and can affect one another. The updated testsuite fails without the rest of this patch. Valgrind didn't report any leaks. * src/test/test_driver.c (testConnectOpen): Move per-connection state initialization... (testOpenFromFile): ...here. (defaultConn, defaultConnections, defaultLock, testOnceInit): New shared state. (testOpenDefault): Only initialize on first connection. (testConnectClose): Don't clobber state if still shared. * tests/objecteventtest.c (testDomainStartStopEvent): Enhance to cover this. (timeout, mymain): Ensure test fails rather than blocks. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- src/test/test_driver.c | 88 +++++++++++++++++++++++++++++++++++-------------- tests/objecteventtest.c | 50 ++++++++++++++++++++++++---- 2 files changed, 107 insertions(+), 31 deletions(-) diff --git a/src/test/test_driver.c b/src/test/test_driver.c index a48404a..9696044 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -1,7 +1,7 @@ /* * test.c: A "mock" hypervisor for use by application unit tests * - * Copyright (C) 2006-2013 Red Hat, Inc. + * Copyright (C) 2006-2014 Red Hat, Inc. * Copyright (C) 2006 Daniel P. Berrange * * This library is free software; you can redistribute it and/or @@ -105,6 +105,10 @@ struct _testConn { typedef struct _testConn testConn; typedef struct _testConn *testConnPtr; +static testConn defaultConn; +static int defaultConnections; +static virMutex defaultLock; + #define TEST_MODEL "i686" #define TEST_MODEL_WORDSIZE 32 #define TEST_EMULATOR "/usr/bin/test-hv" @@ -125,6 +129,14 @@ static int testConnectClose(virConnectPtr conn); static void testObjectEventQueue(testConnPtr driver, virObjectEventPtr event); +static int +testOnceInit(void) +{ + return virMutexInit(&defaultLock); +} + +VIR_ONCE_GLOBAL_INIT(test) + static void testDriverLock(testConnPtr driver) { @@ -665,9 +677,15 @@ cleanup: return ret; } -static int testOpenDefault(virConnectPtr conn) { + +/* Simultaneous test:///default connections should share the same + * common state (among other things, this allows testing event + * detection in one connection for an action caused in another). */ +static int +testOpenDefault(virConnectPtr conn) +{ int u; - testConnPtr privconn; + testConnPtr privconn = &defaultConn; virDomainDefPtr domdef = NULL; virDomainObjPtr domobj = NULL; virNetworkDefPtr netdef = NULL; @@ -679,18 +697,26 @@ static int testOpenDefault(virConnectPtr conn) { virNodeDeviceDefPtr nodedef = NULL; virNodeDeviceObjPtr nodeobj = NULL; - if (VIR_ALLOC(privconn) < 0) - return VIR_DRV_OPEN_ERROR; + virMutexLock(&defaultLock); + if (defaultConnections++) { + conn->privateData = &defaultConn; + virMutexUnlock(&defaultLock); + return VIR_DRV_OPEN_SUCCESS; + } + if (virMutexInit(&privconn->lock) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("cannot initialize mutex")); - VIR_FREE(privconn); + defaultConnections--; + virMutexUnlock(&defaultLock); return VIR_DRV_OPEN_ERROR; } - testDriverLock(privconn); conn->privateData = privconn; + if (!(privconn->domainEventState = virObjectEventStateNew())) + goto error; + if (!(privconn->domains = virDomainObjListNew())) goto error; @@ -791,7 +817,7 @@ static int testOpenDefault(virConnectPtr conn) { } virNodeDeviceObjUnlock(nodeobj); - testDriverUnlock(privconn); + virMutexUnlock(&defaultLock); return VIR_DRV_OPEN_SUCCESS; @@ -802,10 +828,12 @@ error: virStoragePoolObjListFree(&privconn->pools); virNodeDeviceObjListFree(&privconn->devs); virObjectUnref(privconn->caps); - testDriverUnlock(privconn); + virObjectEventStateFree(privconn->domainEventState); + virMutexDestroy(&privconn->lock); conn->privateData = NULL; - VIR_FREE(privconn); virDomainDefFree(domdef); + defaultConnections--; + virMutexUnlock(&defaultLock); return VIR_DRV_OPEN_ERROR; } @@ -1327,6 +1355,9 @@ error: return ret; } + +/* No shared state between simultaneous test connections initialized + * from a file. */ static int testOpenFromFile(virConnectPtr conn, const char *file) { @@ -1355,6 +1386,9 @@ testOpenFromFile(virConnectPtr conn, const char *file) if (!(privconn->xmlopt = testBuildXMLConfig())) goto error; + if (!(privconn->domainEventState = virObjectEventStateNew())) + goto error; + if (!(doc = virXMLParseFileCtxt(file, &ctxt))) { goto error; } @@ -1398,6 +1432,7 @@ testOpenFromFile(virConnectPtr conn, const char *file) virInterfaceObjListFree(&privconn->ifaces); virStoragePoolObjListFree(&privconn->pools); VIR_FREE(privconn->path); + virObjectEventStateFree(privconn->domainEventState); testDriverUnlock(privconn); VIR_FREE(privconn); conn->privateData = NULL; @@ -1410,10 +1445,12 @@ static virDrvOpenStatus testConnectOpen(virConnectPtr conn, unsigned int flags) { int ret; - testConnPtr privconn; virCheckFlags(VIR_CONNECT_RO, VIR_DRV_OPEN_ERROR); + if (testInitialize() < 0) + return VIR_DRV_OPEN_ERROR; + if (!conn->uri) return VIR_DRV_OPEN_DECLINED; @@ -1442,24 +1479,24 @@ static virDrvOpenStatus testConnectOpen(virConnectPtr conn, if (ret != VIR_DRV_OPEN_SUCCESS) return ret; - privconn = conn->privateData; - testDriverLock(privconn); - - privconn->domainEventState = virObjectEventStateNew(); - if (!privconn->domainEventState) { - testDriverUnlock(privconn); - testConnectClose(conn); - return VIR_DRV_OPEN_ERROR; - } - - testDriverUnlock(privconn); - return VIR_DRV_OPEN_SUCCESS; } static int testConnectClose(virConnectPtr conn) { testConnPtr privconn = conn->privateData; + + if (testInitialize() < 0) + return -1; + + if (privconn == &defaultConn) { + virMutexLock(&defaultLock); + if (--defaultConnections) { + virMutexUnlock(&defaultLock); + return 0; + } + } + testDriverLock(privconn); virObjectUnref(privconn->caps); virObjectUnref(privconn->xmlopt); @@ -1474,7 +1511,10 @@ static int testConnectClose(virConnectPtr conn) testDriverUnlock(privconn); virMutexDestroy(&privconn->lock); - VIR_FREE(privconn); + if (privconn == &defaultConn) + virMutexUnlock(&defaultLock); + else + VIR_FREE(privconn); conn->privateData = NULL; return 0; } diff --git a/tests/objecteventtest.c b/tests/objecteventtest.c index ae29792..1f43070 100644 --- a/tests/objecteventtest.c +++ b/tests/objecteventtest.c @@ -1,4 +1,5 @@ /* + * Copyright (C) 2014 Red Hat, Inc. * Copyright (C) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. * * This library is free software; you can redistribute it and/or @@ -220,8 +221,10 @@ testDomainStartStopEvent(const void *data) lifecycleEventCounter counter; int eventId = VIR_DOMAIN_EVENT_ID_LIFECYCLE; int id; - int ret = 0; + int ret = -1; virDomainPtr dom; + virConnectPtr conn2 = NULL; + virDomainPtr dom2 = NULL; lifecycleEventCounter_reset(&counter); @@ -237,20 +240,40 @@ testDomainStartStopEvent(const void *data) virDomainDestroy(dom); virDomainCreate(dom); - if (virEventRunDefaultImpl() < 0) { - ret = -1; + if (virEventRunDefaultImpl() < 0) goto cleanup; - } if (counter.startEvents != 1 || counter.stopEvents != 1 || - counter.unexpectedEvents > 0) { - ret = -1; + counter.unexpectedEvents > 0) + goto cleanup; + + /* Repeat the test, but this time, trigger the events via an + * alternate connection. */ + if (!(conn2 = virConnectOpen("test:///default"))) + goto cleanup; + if (!(dom2 = virDomainLookupByName(conn2, "test"))) goto cleanup; - } + if (virDomainDestroy(dom2) < 0) + goto cleanup; + if (virDomainCreate(dom2) < 0) + goto cleanup; + + if (virEventRunDefaultImpl() < 0) + goto cleanup; + + if (counter.startEvents != 2 || counter.stopEvents != 2 || + counter.unexpectedEvents > 0) + goto cleanup; + + ret = 0; cleanup: virConnectDomainEventDeregisterAny(test->conn, id); virDomainFree(dom); + if (dom2) + virDomainFree(dom2); + if (conn2) + virConnectClose(conn2); return ret; } @@ -374,14 +397,26 @@ cleanup: return ret; } +static void +timeout(int id ATTRIBUTE_UNUSED, void *opaque ATTRIBUTE_UNUSED) +{ + fputs("test taking too long; giving up", stderr); + exit(EXIT_FAILURE); +} + static int mymain(void) { objecteventTest test; int ret = EXIT_SUCCESS; + int timer; virEventRegisterDefaultImpl(); + /* Set up a timer to abort this test if it takes 10 seconds. */ + if ((timer = virEventAddTimeout(10 * 1000, timeout, NULL, NULL)) < 0) + return EXIT_FAILURE; + if (!(test.conn = virConnectOpen("test:///default"))) return EXIT_FAILURE; @@ -411,6 +446,7 @@ mymain(void) virNetworkUndefine(test.net); virNetworkFree(test.net); virConnectClose(test.conn); + virEventRemoveTimeout(timer); return ret; } -- 1.8.4.2

1 0

[libvirt] Build failed in Jenkins: libvirt-syntax-check #1807
by Jenkins CI 01 Jan '14

01 Jan '14

See <http://honk.sigxcpu.org:8001/job/libvirt-syntax-check/1807/> ------------------------------------------ Started by upstream project "libvirt-build" build number 2016 Building on master in workspace <http://honk.sigxcpu.org:8001/job/libvirt-syntax-check/ws/> [workspace] $ /bin/sh -xe /tmp/hudson5237641448459273791.sh + make syntax-check GEN bracket-spacing-check tests/virnetsockettest.c:64: perror ("getifaddrs"); maint.mk: incorrect whitespace, see HACKING for rules make: *** [bracket-spacing-check] Error 1 Build step 'Execute shell' marked build as failure

1 1

[libvirt] [PATCH 1/3] tests: virnetsockettest: Print the error if getifaddrs fails.
by Richard W.M. Jones 01 Jan '14

01 Jan '14

From: "Richard W.M. Jones" <rjones(a)redhat.com> --- tests/virnetsockettest.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/virnetsockettest.c b/tests/virnetsockettest.c index eda95bc..82c202e 100644 --- a/tests/virnetsockettest.c +++ b/tests/virnetsockettest.c @@ -60,8 +60,10 @@ checkProtocols(bool *hasIPv4, bool *hasIPv6, *hasIPv4 = *hasIPv6 = false; *freePort = 0; - if (getifaddrs(&ifaddr) < 0) + if (getifaddrs(&ifaddr) < 0) { + perror ("getifaddrs"); goto cleanup; + } for (ifa = ifaddr; ifa != NULL; ifa = ifa->ifa_next) { if (!ifa->ifa_addr) -- 1.8.3.1

2 6

[libvirt] FYI: aarch64 test suite failures
by Richard W.M. Jones 01 Jan '14

01 Jan '14

Libvirt compiles fine on aarch64. You will need to configure with --without-dtrace as systemtap tracepoints are pretty broken, giving lots of strange compile-time errors/link failures in both libvirt and qemu. The test suite fails, see attachment. Note this is all running under qemu-arm64 userspace emulation[1], so certain things are expected to be a bit different. In particular, any aarch64 binary which the test suite runs is actually run under the qemu-arm64 interpreter (using binfmt). I'm guessing this explains the extra file descriptor in some tests. Also qemu intercepts system calls and thunks them into host system calls (an x86-64 host in this case), and its support for IPv6 seems shaky at best. Rich. [1] http://rwmj.wordpress.com/2013/12/22/how-to-run-aarch64-binaries-on-an-x86-… -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones Fedora Windows cross-compiler. Compile Windows programs, test, and build Windows installers. Over 100 libraries supported. http://fedoraproject.org/wiki/MinGW

1 3

[libvirt] [PATCH] aarch64: Disable -fstack-protector.
by Richard W.M. Jones 01 Jan '14

01 Jan '14

From: "Richard W.M. Jones" <rjones(a)redhat.com> I'm using gcc-4.8.2-7.fc21.aarch64 which does not appear to support this option. --- m4/virt-compile-warnings.m4 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/m4/virt-compile-warnings.m4 b/m4/virt-compile-warnings.m4 index 1547e03..574fbc4 100644 --- a/m4/virt-compile-warnings.m4 +++ b/m4/virt-compile-warnings.m4 @@ -163,6 +163,9 @@ AC_DEFUN([LIBVIRT_COMPILE_WARNINGS],[ dnl -fstack-protector stuff passes gl_WARN_ADD with gcc dnl on Mingw32, but fails when actually used case $host in + aarch64-*-*) + dnl "error: -fstack-protector not supported for this target [-Werror]" + ;; *-*-linux*) dnl Fedora only uses -fstack-protector, but doesn't seem to dnl be great overhead in adding -fstack-protector-all instead -- 1.8.3.1

2 2

[libvirt] Build failed in Jenkins: libvirt-syntax-check #1804
by Jenkins CI 01 Jan '14

01 Jan '14

See <http://honk.sigxcpu.org:8001/job/libvirt-syntax-check/1804/> ------------------------------------------ Started by upstream project "libvirt-build" build number 2013 Building on master in workspace <http://honk.sigxcpu.org:8001/job/libvirt-syntax-check/ws/> [workspace] $ /bin/sh -xe /tmp/hudson1250971132809350241.sh + make syntax-check GEN bracket-spacing-check GFDL_version 0.53 GFDL_version TAB_in_indentation 0.41 TAB_in_indentation Wundef_boolean 0.21 Wundef_boolean avoid_attribute_unused_in_header 0.25 avoid_attribute_unused_in_header avoid_ctype_macros 0.64 avoid_ctype_macros avoid_if_before_free 8.01 avoid_if_before_free avoid_strcase 0.81 avoid_strcase avoid_write 0.55 avoid_write bindtextdomain 0.50 bindtextdomain cast_of_argument_to_free 1.37 cast_of_argument_to_free cast_of_x_alloc_return_value 1.22 cast_of_x_alloc_return_value changelog 0.22 changelog const_long_option 0.67 const_long_option copyright_check ./.gnulib/lib/version-etc.c maint.mk: out of date copyright in ./.gnulib/lib/version-etc.c; update it make: *** [sc_copyright_check] Error 1 Build step 'Execute shell' marked build as failure

2 2

[libvirt] [PATCH] maint: update to latest gnulib
by Eric Blake 01 Jan '14

01 Jan '14

'make syntax-check' wants a newer gnulib for 2014 copyright. Also, a couple of fixes for bootstrap issues reported on IRC: - on some older glibc systems, ./configure could deadlock due to a glibc malloc bug - on FreeBSD systems, a broken autom4te coupled with gettext 0.18.3 prevents bootstrap; we can't work around it, but can at least inform the user why they have a problem And as always, portability fixes in other modules, some of which are used by libvirt. * .gnulib: Update to latest, in part for bootstrap improvements, and for the new year. * bootstrap: Resync to gnulib. * gnulib/local/m4/ssize_t.m4.diff: Regenerate. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Pushing under the build-breaker rule now that 'make syntax-check' is impacted. * .gnulib 831b84c...c7802e2 (33): > doc: update main copyright year > maint: update copyright > version-etc: new year > autoupdate > passfd: give nicer error for recvfd at eof > autoupdate > gettimeofday: port recent C++ fix to Emacs > gettimeofday: fix C++ crosscompilation > qacl: port to Windows better > md5, sha1, sha256, sha512: fix compile error in c++ mode > open-tests: fix build failure with -Werror=old-style-declaration > md5, sha1, sha256, sha512: fix link error with partial libcrypto > md5, sha1, sha256, sha512: add gl_SET_CRYPTO_CHECK_DEFAULT > md5, sha1, sha256, sha512: add 'auto', and a way to specify default > autoupdate > bootstrap: warn about BSD toolchain snafu > open-tests: port to glibc with _FORTIFY_SOURCE and -O1 > include_next: minimize code duplication > getcwd: fix compile error in configure check > regex: suppress core dumps from detection code > md5, sha1, sha256, sha512: support mandating use of openssl > test-xvasprintf: disable some -Wformat-security diagnostics > regex: avoid glibc deadlock during configure > md5, sha1, sha256, sha512: use openssl routines if available > base64: fix recent compilation regression on some compilers > autoupdate > autoupdate > ignore-value: revert previous code change > selinux-h: improve stub types and add more stub functions > ignore-value: prefer GCC version back through 2.0 > pty: Activate the signature wrapper of forkpty. > maint: fix gendocs.sh permissions > autoupdate .gnulib | 2 +- bootstrap | 12 ++++++++++-- gnulib/local/m4/ssize_t.m4.diff | 2 +- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/.gnulib b/.gnulib index 831b84c..1276a2c 160000 --- a/.gnulib +++ b/.gnulib @@ -1 +1 @@ -Subproject commit 831b84c59ef413c57a36b67344467d66a8a2ba70 +Subproject commit 1276a2c5f24c0c932426aca9c899fa524d2443f2 diff --git a/bootstrap b/bootstrap index e31d17d..ce90bc4 100755 --- a/bootstrap +++ b/bootstrap @@ -1,10 +1,10 @@ #! /bin/sh # Print a version string. -scriptversion=2013-08-15.22; # UTC +scriptversion=2013-12-05.23; # UTC # Bootstrap this package from checked-out sources. -# Copyright (C) 2003-2013 Free Software Foundation, Inc. +# Copyright (C) 2003-2014 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -551,6 +551,14 @@ if ! printf "$buildreq" | check_versions; then fi fi +# Warn the user if autom4te appears to be broken; this causes known +# issues with at least gettext 0.18.3. +probe=$(echo 'm4_quote([hi])' | autom4te -l M4sugar -t 'm4_quote:$%' -) +if test "x$probe" != xhi; then + warn_ "WARNING: your autom4te wrapper eats stdin;" + warn_ "if bootstrap fails, consider upgrading your autotools" +fi + echo "$0: Bootstrapping from checked-out $package sources..." # See if we can use gnulib's git-merge-changelog merge driver. diff --git a/gnulib/local/m4/ssize_t.m4.diff b/gnulib/local/m4/ssize_t.m4.diff index 93f8ad7..08c2b9c 100644 --- a/gnulib/local/m4/ssize_t.m4.diff +++ b/gnulib/local/m4/ssize_t.m4.diff @@ -5,7 +5,7 @@ index 209d64c..5ea72a1 100644 @@ -1,4 +1,4 @@ -# ssize_t.m4 serial 5 (gettext-0.18.2) +# ssize_t.m4 serial 6 (gettext-0.18.2) - dnl Copyright (C) 2001-2003, 2006, 2010-2013 Free Software Foundation, Inc. + dnl Copyright (C) 2001-2003, 2006, 2010-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -17,7 +17,21 @@ AC_DEFUN([gt_TYPE_SSIZE_T], -- 1.8.4.2

1 0

[libvirt] [PATCH] docs: return paragraph must be last
by Eric Blake 01 Jan '14

01 Jan '14

Commit eb70ceb tried to create a code block for libvirt-libvirt.html#virConnectGetType, but failed to note that our doc generator treats everything after "Returns" as part of the return description rather than looking for paragraph and code layout. Fix some other API that also had generic details crammed into the return type paragraph. * src/libvirt.c (virConnectOpen, virConnectOpenReadOnly) (virConnectOpenAuth, virConnectListAllDomains): Fit doc pattern. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Pushing under the trivial rule. src/libvirt.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/libvirt.c b/src/libvirt.c index f43718d..0752c3f 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -1379,8 +1379,6 @@ failed: * This function should be called first to get a connection to the * Hypervisor and xen store * - * Returns a pointer to the hypervisor connection or NULL in case of error - * * If @name is NULL, if the LIBVIRT_DEFAULT_URI environment variable is set, * then it will be used. Otherwise if the client configuration file * has the "uri_default" parameter set, then it will be used. Finally @@ -1393,6 +1391,8 @@ failed: * environment variable LIBVIRT_AUTOSTART=0 * * URIs are documented at http://libvirt.org/uri.html + * + * Returns a pointer to the hypervisor connection or NULL in case of error */ virConnectPtr virConnectOpen(const char *name) @@ -1425,9 +1425,9 @@ error: * See virConnectOpen for notes about environment variables which can * have an effect on opening drivers * - * Returns a pointer to the hypervisor connection or NULL in case of error - * * URIs are documented at http://libvirt.org/uri.html + * + * Returns a pointer to the hypervisor connection or NULL in case of error */ virConnectPtr virConnectOpenReadOnly(const char *name) @@ -1462,9 +1462,9 @@ error: * See virConnectOpen for notes about environment variables which can * have an effect on opening drivers * - * Returns a pointer to the hypervisor connection or NULL in case of error - * * URIs are documented at http://libvirt.org/uri.html + * + * Returns a pointer to the hypervisor connection or NULL in case of error */ virConnectPtr virConnectOpenAuth(const char *name, @@ -9374,12 +9374,6 @@ error: * VIR_CONNECT_LIST_DOMAINS_NO_SNAPSHOT, for filtering based on whether * a domain has snapshots. * - * Returns the number of domains found or -1 and sets domains to NULL in case of - * error. On success, the array stored into @domains is guaranteed to have an - * extra allocated element set to NULL but not included in the return count, to - * make iteration easier. The caller is responsible for calling virDomainFree() - * on each array element, then calling free() on @domains. - * * Example of usage: * * virDomainPtr *domains; @@ -9396,6 +9390,12 @@ error: * virDomainFree(domains[i]); * } * free(domains); + * + * Returns the number of domains found or -1 and sets domains to NULL in case of + * error. On success, the array stored into @domains is guaranteed to have an + * extra allocated element set to NULL but not included in the return count, to + * make iteration easier. The caller is responsible for calling virDomainFree() + * on each array element, then calling free() on @domains. */ int virConnectListAllDomains(virConnectPtr conn, -- 1.8.4.2

1 0

[libvirt] Release of libvirt-python-1.2.0
by Daniel Veillard 31 Dec '13

31 Dec '13

So this is the first release fo the separated libvirt-python code base out of the main libvirt git. In this case the two release have been made in tandem to avoid disruptions, but there is no guarantee that the future releases of both project will be bound together (though I will try to sync those to minimize churn when possible !) Tarball and rpms are now available on the new location: ftp://libvirt.org/libvirt/python/ The release obviously is mostly around making the switch to an independant package, and making sure that this will build on older version of libvirt already released. Hence a very large set of the patches are specific to portability issues: Features: - Separating libvirt-python releases from libvirt releases (Daniel P. Berrange and Doug Goldstein) - Add missing binding of security model/label APIs (Daniel P. Berrange) Bug Fixes: - Return right error code for baselineCPU (Don Dugger) - Add missing break to switch-case block (Doug Goldstein) Documentation: - Update README file contents and add HACKING file (Daniel P. Berrange) Portability: - Deal with old filenames for events/error functions (Daniel P. Berrange) - Ensure API overrides only used if API exists (Daniel P. Berrange) - Relax min required libvirt to version 0.9.11 (Daniel P. Berrange) - virConnectGetCPUModelNames API appeared in 1.1.3 (Doug Goldstein) - VIR_DOMAIN_EVENT_ID_DEVICE_REMOVED appeared in 1.1.1 (Daniel P. Berrange) - virDomainCreateXMLWithFiles and virDomainCreateWithFiles APIs appeared in 1.1.1 (Doug Goldstein) - virDomainMigrate3 and virDomainMigrateToURI3 appeared in 1.1.0 (Doug Goldstein) - virTypedParams* API appeared in 1.0.2 and used in 1.1.0 (Doug Goldstein) - virDomainMigrateGetCompressionCache API appeared in 1.0.3 (Doug Goldstein) - virDomainGetJobStats API appeared in 1.0.3 (Doug Goldstein) - virNodeGetCPUMap API appeared in 1.0.0 (Doug Goldstein) - VIR_DOMAIN_EVENT_ID_PMSUSPEND_DISK appeared in 1.0.0 (Daniel P. Berrange) - virStoragePoolListAllVolumes API appeared in 0.10.2 (Doug Goldstein) - virNode{Get,Set}MemoryParameters API appeared in 0.10.2 (Doug Goldstein) - virConnectListAll* APIs appeared in 0.10.2 (Doug Goldstein) - virDomainQemuAgentCommand appeared in 0.10.0 (Daniel P. Berrange) - virDomainPinEmulator and virDomainGetEmulatorPinInfo APIs appeared in 0.10.0 (Doug Goldstein) - VIR_DOMAIN_EVENT_ID_BALLOON_CHANGED appeared in 0.10.0 (Daniel P. Berrange) - virConnect{Unr,R}egisterCloseCallback API appeared in 0.10.0 (Doug Goldstein) - virDomainSnapshotListAllChildren API appeared in 0.9.13 (Doug Goldstein) - virConnectListAllDomains API appeared in 0.9.13 (Doug Goldstein) - virDomainListAllSnapshots API appeared in 0.9.13 (Doug Goldstein) - Don't build LXC module when building less than 1.0.2 (Doug Goldstein) Improvements: - Improve quality of sanitytest check (Daniel P. Berrange) - Skip copying manually written python for C APIs which don't exist (Daniel P. Berrange) - Fix misc RPM specfile flaws (Daniel P. Berrange) - Fix code for avoiding overrides of non-existant functions (Daniel P. Berrange) - Avoid generating the methods in multiple classes (Daniel P. Berrange) - Make block pull event dispatcher private (Daniel P. Berrange) - Don't include virDomainSnapshotRef in python API (Daniel P. Berrange) - Call virGetLastError from mod rather than py wrapper (Doug Goldstein) - Make setup.py executable (Martin Kletzander) - maint: next release is 1.2.0 (Eric Blake) - Create array of modules to be built (Doug Goldstein) - Break generator.py to be called per module (Doug Goldstein) - Setup distutils build system (Daniel P. Berrange) - Add execute permission for sanitytest.py (Daniel P. Berrange) - Add build/ to python module path for sanitytest.py (Daniel P. Berrange) - Import some virTypedParams* APIs from libvirt (Doug Goldstein) - Import LIBVIR_CHECK_VERSION macro from libvirt (Doug Goldstein) - Import VIR_FORCE_CLOSE macro from libvirt (Daniel P. Berrange) - Remove use of virStrcpyStatic (Daniel P. Berrange) - Import VIR_ALLOC / VIR_ALLOC_N / VIR_REALLOC_N functions (Daniel P. Berrange) - Import code annotation macros from libvirt (Daniel P. Berrange) - Import gnulib's ignore_value macro (Daniel P. Berrange) - Import gnulib's xalloc_oversized macro (Daniel P. Berrange) - Add decl of MIN macro (Daniel P. Berrange) - Import STREQ macro from libvirt (Daniel P. Berrange) - Update header file includes (Daniel P. Berrange) - Update generator for new code layout (Daniel P. Berrange) - Remove obsolete Makefile.am (Daniel P. Berrange) - Move python example programs into python/examples/ subdirectory (Daniel P. Berrange) Cleanups: - Mostly revert "python: remove virConnectGetCPUModelNames from globals" (Daniel P. Berrange) - python: remove virConnectGetCPUModelNames from globals (Doug Goldstein) - python: remove virConnectGetCPUModelNames from globals (Doug Goldstein) - maint: fix comma style issues: python (Eric Blake) thanks everybody for your contributions to this release, Daniel -- Daniel Veillard | Open Source and Standards, Red Hat veillard(a)redhat.com | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | virtualization library http://libvirt.org/

3 2

[libvirt] [RFC/PATCH python] expose the bindings version to Python
by Doug Goldstein 31 Dec '13

31 Dec '13

The method getVersion() retrieves the version of the libvirt library that the binaries are linked against but there is no way to retrieve the version of the bindings you are using. In the future if we support new APIs in Python that don't rely on features in the library there needs to be a way for programmers to detect the version. --- I would expect there's a cleaner way to implement this than I've done but I opted for what I saw as the smallest implementation. If anyone has a suggestion for a better way to do this I'm ok with redoing this patch. --- libvirt-override.py | 3 +++ setup.py | 16 ++++++++++++++++ 2 files changed, 19 insertions(+) diff --git a/libvirt-override.py b/libvirt-override.py index 63f8ecb..ed8f73a 100644 --- a/libvirt-override.py +++ b/libvirt-override.py @@ -2,6 +2,9 @@ # Manually written part of python bindings for libvirt # +__version__ = '@VERSION@' +version = @VER_TUPLE@ + # On cygwin, the DLL is called cygvirtmod.dll import sys diff --git a/setup.py b/setup.py index 24d4cf2..ad4f406 100755 --- a/setup.py +++ b/setup.py @@ -119,6 +119,21 @@ if have_libvirt_lxc: class my_build(build): + def gen_version(self, filename): + os.rename(filename, filename + '.tmp') + + version = self.distribution.get_version() + ver_tuple = tuple(int(x) for x in version.split('.')) + + f1 = open(filename + '.tmp', 'r') + f2 = open(filename, 'w') + for line in f1: + f2.write(line + .replace('@VER_TUPLE@', str(ver_tuple)) + .replace('@VERSION@', version)) + f1.close() + f2.close() + def run(self): apis = get_api_xml_files() @@ -127,6 +142,7 @@ class my_build(build): if have_libvirt_lxc: self.spawn([sys.executable, "generator.py", "libvirt-lxc", apis[2]]) + self.gen_version('build/libvirt.py') build.run(self) class my_sdist(sdist): -- 1.8.3.2

3 3

[libvirt] [CFT] FreeBSD: new libvirt-python package
by Jason Helfman 31 Dec '13

31 Dec '13

Hello Everyone, Believe it or not, I don't have any test framework for testing FreeBSD libvirt, so was hoping there may be some folks out there that could help out on that front with this new port I was going to put into our ports tree. :) https://svn.redports.org/jgh/devel/py-libvirt/ Thanks! -jgh -- Jason Helfman | FreeBSD Committer jgh(a)FreeBSD.org | http://people.freebsd.org/~jgh | The Power to Serve

1 1

[libvirt] [PATCH] Add test for transient disk support in VMX files
by Wout Mertens 30 Dec '13

30 Dec '13

From: Wout Mertens <Wout.Mertens(a)gmail.com> Adds test for transient disk translation in vmx files --- tests/vmx2xmldata/vmx2xml-harddisk-transient.vmx | 6 +++++ tests/vmx2xmldata/vmx2xml-harddisk-transient.xml | 25 ++++++++++++++++++++++ tests/vmx2xmltest.c | 1 + 3 files changed, 32 insertions(+), 0 deletions(-) create mode 100644 tests/vmx2xmldata/vmx2xml-harddisk-transient.vmx create mode 100644 tests/vmx2xmldata/vmx2xml-harddisk-transient.xml diff --git a/tests/vmx2xmldata/vmx2xml-harddisk-transient.vmx b/tests/vmx2xmldata/vmx2xml-harddisk-transient.vmx new file mode 100644 index 0000000..68ef382 --- /dev/null +++ b/tests/vmx2xmldata/vmx2xml-harddisk-transient.vmx @@ -0,0 +1,6 @@ +config.version = "8" +virtualHW.version = "4" +ide0:0.present = "true" +ide0:0.deviceType = "ata-hardDisk" +ide0:0.fileName = "harddisk.vmdk" +ide0:0.mode = "independent-nonpersistent" diff --git a/tests/vmx2xmldata/vmx2xml-harddisk-transient.xml b/tests/vmx2xmldata/vmx2xml-harddisk-transient.xml new file mode 100644 index 0000000..3786e2f --- /dev/null +++ b/tests/vmx2xmldata/vmx2xml-harddisk-transient.xml @@ -0,0 +1,25 @@ +<domain type='vmware'> + <uuid>00000000-0000-0000-0000-000000000000</uuid> + <memory unit='KiB'>32768</memory> + <currentMemory unit='KiB'>32768</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='i686'>hvm</type> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <disk type='file' device='disk'> + <source file='[datastore] directory/harddisk.vmdk'/> + <target dev='hda' bus='ide'/> + <transient/> + <address type='drive' controller='0' bus='0' target='0' unit='0'/> + </disk> + <controller type='ide' index='0'/> + <video> + <model type='vmvga' vram='4096'/> + </video> + </devices> +</domain> diff --git a/tests/vmx2xmltest.c b/tests/vmx2xmltest.c index 13515f0..70178f7 100644 --- a/tests/vmx2xmltest.c +++ b/tests/vmx2xmltest.c @@ -221,6 +221,7 @@ mymain(void) DO_TEST("harddisk-scsi-file", "harddisk-scsi-file"); DO_TEST("harddisk-ide-file", "harddisk-ide-file"); + DO_TEST("harddisk-transient", "harddisk-transient"); DO_TEST("cdrom-scsi-file", "cdrom-scsi-file"); DO_TEST("cdrom-scsi-device", "cdrom-scsi-device"); -- 1.7.1

1 0

[libvirt] can't build python bindings on FreeBSD
by Jason Helfman 30 Dec '13

30 Dec '13

Any ideas? Clang: FreeBSD clang version 3.1 creating build/temp.freebsd-9.1-RELEASE-p4-i386-2.7 creating build/temp.freebsd-9.1-RELEASE-p4-i386-2.7/build clang -DNDEBUG -O2 -pipe -fno-strict-aliasing -O2 -pipe -fno-strict-aliasing -fPIC -I. -I/usr/local/include/python2.7 -c libvirt-override.c -o build/temp.freebsd-9.1-RELEASE-p4-i386-2.7/libvirt-override.o -I/usr/local/include In file included from libvirt-override.c:26: ./libvirt-utils.h:87:22: error: token is not a valid binary operator in a preprocessor subexpression # if __GNUC_PREREQ (3, 3) ~~~~~~~~~~~~~ ^ ./libvirt-utils.h:99:22: error: token is not a valid binary operator in a preprocessor subexpression # if __GNUC_PREREQ (3, 4) ~~~~~~~~~~~~~ ^ 2 errors generated. error: command 'clang' failed with exit status 1 *** [do-build] Error code 1 Stop in /usr/home/jgh/workspace/ports/devel/py-libvirt. Gcc: gcc (GCC) 4.2.1 20070831 gcc -DNDEBUG -O2 -pipe -fno-strict-aliasing -O2 -pipe -fno-strict-aliasing -fPIC -I. -I/usr/local/include/python2.7 -c libvirt-override.c -o build/temp.freebsd-9.1-RELEASE-p4-i386-2.7/libvirt-override.o -I/usr/local/include In file included from libvirt-override.c:26: libvirt-utils.h:87:22: error: missing binary operator before token "(" libvirt-utils.h:99:22: error: missing binary operator before token "(" error: command 'gcc' failed with exit status 1 *** [do-build] Error code 1 Thanks! -jgh -- Jason Helfman | FreeBSD Committer jgh(a)FreeBSD.org | http://people.freebsd.org/~jgh | The Power to Serve

2 3

[libvirt] newer libvirt version issues
by Franky Van Liedekerke 29 Dec '13

29 Dec '13

Hi, since we're running more than 20 hosts per KVM server, we needed to update libvirt to at least 1.1.2 for virtlockd to be able to cope with this (due to an old hardcoded limit that was in there before). But where 1.1.0 compiles and runs just fine on a fully-patched CentOS 6.4 server, newer version have all kinds of issues: Every version of libvirt >= 1.1.2 crashes with a segfault on up-to-date CentOS 6.4 servers (see below). Also, versions of libvirt >= 1.1.3 need a change in the spec file to be able to compile: apparently the %doc entries that are different with 1.1.2 prevent rpmbuild to succeed on CentOS servers. Using the %doc lines as per the 1.1.2 spec file results in a working rpmbuild. The 1.1.4 version has issues with a symbol not found after compiling and letting it run: error : virDriverLoadModule:78 : failed to load module /usr/lib64/libvirt/connection-driver/libvirt_driver_network.so /usr/lib64/libvirt/connection-driver/libvirt_driver_network.so: undefined symbol: virNetworkList error : virDriverLoadModule:78 : failed to load module /usr/lib64/libvirt/connection-driver/libvirt_driver_storage.so /usr/lib64/libvirt/connection-driver/libvirt_driver_storage.so: undefined symbol: virAsprintf error : virDriverLoadModule:78 : failed to load module /usr/lib64/libvirt/connection-driver/libvirt_driver_nodedev.so /usr/lib64/libvirt/connection-driver/libvirt_driver_nodedev.so: undefined symbol: virNodeDeviceList 31677: error : virDriverLoadModule:78 : failed to load module /usr/lib64/libvirt/connection-driver/libvirt_driver_secret.so /usr/lib64/libvirt/connection-driver/libvirt_driver_secret.so: undefined symbol: virAsprintf 31677: error : virDriverLoadModule:78 : failed to load module /usr/lib64/libvirt/connection-driver/libvirt_driver_nwfilter.so /usr/lib64/libvirt/connection-driver/libvirt_driver_nwfilter.so: undefined symbol: virAsprintf 31677: error : virDriverLoadModule:78 : failed to load module /usr/lib64/libvirt/connection-driver/libvirt_driver_interface.so /usr/lib64/libvirt/connection-driver/libvirt_driver_interface.so: undefined symbol: virAsprintf 31677: error : virDriverLoadModule:78 : failed to load module /usr/lib64/libvirt/connection-driver/libvirt_driver_qemu.so /usr/lib64/libvirt/connection-driver/libvirt_driver_qemu.so: undefined symbol: networkAllocateActualDevice 31677: error : virDriverLoadModule:78 : failed to load module /usr/lib64/libvirt/connection-driver/libvirt_driver_lxc.so /usr/lib64/libvirt/connection-driver/libvirt_driver_lxc.so: undefined symbol: networkAllocateActualDevice And every time libvirt segfaults, there's this in the logs: debug : virJSONValueToString:1133 : result={"id":"libvirt-6","error":{"class":"CommandNotFound","desc":"The command qom-list has not been found","data":{"name":"qom-list"}}} debug : virEventPollRunOnce:627 : EVENT_POLL_RUN: nhandles=32 timeout=1684 9479: debug : qemuMonitorJSONCheckError:341 : unable to execute QEMU command {"execute":"qom-list","arguments":{"path":"/"},"id":"libvirt-6"}: {"id":"libvirt-6","error":{"class":"CommandNotFound","desc":"The command qom-list has not been found","data":{"name":"qom-list"}}} 9479: error : qemuMonitorJSONCheckError:352 : internal error: unable to execute QEMU command 'qom-list': The command qom-list has not been found Any insights on any of these issues? Franky

3 3

[libvirt] [PATCH] libxl: avoid crashing if calling `virsh numatune' on inactive domain
by Dario Faggioli 28 Dec '13

28 Dec '13

by, in libxlDomainGetNumaParameters(), calling libxl_bitmap_init() as soon as possible, which avoids getting to 'cleanup:', where libxl_bitmap_dispose() happens, without having initialized the nodemap, and hence crashing after some invalid free()-s: # ./daemon/libvirtd -v *** Error in `/home/xen/libvirt.git/daemon/.libs/lt-libvirtd': munmap_chunk(): invalid pointer: 0x00007fdd42592666 *** ======= Backtrace: ========= /lib64/libc.so.6(+0x7bbe7)[0x7fdd3f767be7] /lib64/libxenlight.so.4.3(libxl_bitmap_dispose+0xd)[0x7fdd2c88c045] /home/xen/libvirt.git/daemon/.libs/../../src/.libs/libvirt_driver_libxl.so(+0x12d26)[0x7fdd2caccd26] /home/xen/libvirt.git/src/.libs/libvirt.so.0(virDomainGetNumaParameters+0x15c)[0x7fdd4247898c] /home/xen/libvirt.git/daemon/.libs/lt-libvirtd(+0x1d9a2)[0x7fdd42ecc9a2] /home/xen/libvirt.git/src/.libs/libvirt.so.0(virNetServerProgramDispatch+0x3da)[0x7fdd424e9eaa] /home/xen/libvirt.git/src/.libs/libvirt.so.0(+0x1a6f38)[0x7fdd424e3f38] /home/xen/libvirt.git/src/.libs/libvirt.so.0(+0xa81e5)[0x7fdd423e51e5] /home/xen/libvirt.git/src/.libs/libvirt.so.0(+0xa783e)[0x7fdd423e483e] /lib64/libpthread.so.0(+0x7c53)[0x7fdd3febbc53] /lib64/libc.so.6(clone+0x6d)[0x7fdd3f7e1dbd] Signed-off-by: Dario Faggili <dario.faggioli(a)citrix.com> Cc: Jim Fehlig <jfehlig(a)suse.com> Cc: Ian Jackson <Ian.Jackson(a)eu.citrix.com> --- src/libxl/libxl_driver.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index 29aa6c7..d91744f 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -3958,6 +3958,8 @@ libxlDomainGetNumaParameters(virDomainPtr dom, * the filtering on behalf of older clients that can't parse it. */ flags &= ~VIR_TYPED_PARAM_STRING_OKAY; + libxl_bitmap_init(&nodemap); + if (!(vm = libxlDomObjFromDomain(dom))) goto cleanup; @@ -3972,8 +3974,6 @@ libxlDomainGetNumaParameters(virDomainPtr dom, priv = vm->privateData; - libxl_bitmap_init(&nodemap); - if ((*nparams) == 0) { *nparams = LIBXL_NUMA_NPARAM; ret = 0;

4 5

[libvirt] [PATCH] docs: fix layout of code snippets
by Eric Blake 28 Dec '13

28 Dec '13

Similar to commit 52dbeac, we should indent code snippets in other places to ensure they appear correctly in html. See http://libvirt.org/html/libvirt-libvirt.html#virNodeGetCPUStats for an example improved by this patch. Also fix some missing semicolons in the samples. * src/libvirt.c: Indent code samples in comments. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Pushing under the trivial rule. src/libvirt.c | 97 +++++++++++++++++++++++++++++------------------------------ 1 file changed, 47 insertions(+), 50 deletions(-) diff --git a/src/libvirt.c b/src/libvirt.c index 77f481e..66841c8 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -1150,9 +1150,9 @@ do_open(const char *name, } /* - * If no URI is passed, then check for an environment string if not - * available probe the compiled in drivers to find a default hypervisor - * if detectable. + * If no URI is passed, then check for an environment string if not + * available probe the compiled in drivers to find a default hypervisor + * if detectable. */ if (!name && virConnectGetDefaultURI(conf, &name) < 0) @@ -7629,14 +7629,14 @@ error: * * Here is a sample code snippet: * - * if ((virNodeGetCPUStats(conn, cpuNum, NULL, &nparams, 0) == 0) && - * (nparams != 0)) { - * if ((params = malloc(sizeof(virNodeCPUStats) * nparams)) == NULL) - * goto error; - * memset(params, 0, sizeof(virNodeCPUStats) * nparams); - * if (virNodeGetCPUStats(conn, cpuNum, params, &nparams, 0)) - * goto error; - * } + * if (virNodeGetCPUStats(conn, cpuNum, NULL, &nparams, 0) == 0 && + * nparams != 0) { + * if ((params = malloc(sizeof(virNodeCPUStats) * nparams)) == NULL) + * goto error; + * memset(params, 0, sizeof(virNodeCPUStats) * nparams); + * if (virNodeGetCPUStats(conn, cpuNum, params, &nparams, 0)) + * goto error; + * } * * This function doesn't require privileged access to the hypervisor. * This function expects the caller to allocate the @params. @@ -7722,14 +7722,14 @@ error: * * Here is the sample code snippet: * - * if ((virNodeGetMemoryStats(conn, cellNum, NULL, &nparams, 0) == 0) && - * (nparams != 0)) { - * if ((params = malloc(sizeof(virNodeMemoryStats) * nparams)) == NULL) - * goto error; - * memset(params, cellNum, 0, sizeof(virNodeMemoryStats) * nparams); - * if (virNodeGetMemoryStats(conn, params, &nparams, 0)) - * goto error; - * } + * if (virNodeGetMemoryStats(conn, cellNum, NULL, &nparams, 0) == 0 && + * nparams != 0) { + * if ((params = malloc(sizeof(virNodeMemoryStats) * nparams)) == NULL) + * goto error; + * memset(params, cellNum, 0, sizeof(virNodeMemoryStats) * nparams); + * if (virNodeGetMemoryStats(conn, params, &nparams, 0)) + * goto error; + * } * * This function doesn't require privileged access to the hypervisor. * This function expects the caller to allocate the @params. @@ -8134,14 +8134,14 @@ error: * * Here is a sample code snippet: * - * char *ret = virDomainGetSchedulerType(dom, &nparams); - * if (ret && nparams != 0) { - * if ((params = malloc(sizeof(*params) * nparams)) == NULL) - * goto error; - * memset(params, 0, sizeof(*params) * nparams); - * if (virDomainGetSchedulerParametersFlags(dom, params, &nparams, 0)) - * goto error; - * } + * char *ret = virDomainGetSchedulerType(dom, &nparams); + * if (ret && nparams != 0) { + * if ((params = malloc(sizeof(*params) * nparams)) == NULL) + * goto error; + * memset(params, 0, sizeof(*params) * nparams); + * if (virDomainGetSchedulerParametersFlags(dom, params, &nparams, 0)) + * goto error; + * } * * Returns -1 in case of error, 0 in case of success. */ @@ -9381,24 +9381,21 @@ error: * on each array element, then calling free() on @domains. * * Example of usage: - * virDomainPtr *domains; - * size_t i; - * int ret; - * unsigned int flags = VIR_CONNECT_LIST_DOMAINS_RUNNING | - * VIR_CONNECT_LIST_DOMAINS_PERSISTENT; - * - * ret = virConnectListAllDomains(conn, &domains, flags); - * if (ret < 0) - * error(); * - * for (i = 0; i < ret; i++) { - * do_something_with_domain(domains[i]); - * - * //here or in a separate loop if needed - * virDomainFree(domains[i]); - * } - * - * free(domains); + * virDomainPtr *domains; + * size_t i; + * int ret; + * unsigned int flags = VIR_CONNECT_LIST_DOMAINS_RUNNING | + * VIR_CONNECT_LIST_DOMAINS_PERSISTENT; + * ret = virConnectListAllDomains(conn, &domains, flags); + * if (ret < 0) + * error(); + * for (i = 0; i < ret; i++) { + * do_something_with_domain(domains[i]); + * //here or in a separate loop if needed + * virDomainFree(domains[i]); + * } + * free(domains); */ int virConnectListAllDomains(virConnectPtr conn, @@ -17023,7 +17020,7 @@ virStreamRef(virStreamPtr stream) * API looks like * * virStreamPtr st = virStreamNew(conn, 0); - * int fd = open("demo.iso", O_RDONLY) + * int fd = open("demo.iso", O_RDONLY); * * virConnectUploadFile(conn, "demo.iso", st); * @@ -17040,7 +17037,7 @@ virStreamRef(virStreamPtr stream) * } * int offset = 0; * while (offset < got) { - * int sent = virStreamSend(st, buf+offset, got-offset) + * int sent = virStreamSend(st, buf+offset, got-offset); * if (sent < 0) { * virStreamAbort(st); * goto done; @@ -17117,7 +17114,7 @@ error: * API looks like * * virStreamPtr st = virStreamNew(conn, 0); - * int fd = open("demo.iso", O_WRONLY, 0600) + * int fd = open("demo.iso", O_WRONLY, 0600); * * virConnectDownloadFile(conn, "demo.iso", st); * @@ -17132,7 +17129,7 @@ error: * } * int offset = 0; * while (offset < got) { - * int sent = write(fd, buf+offset, got-offset) + * int sent = write(fd, buf + offset, got - offset); * if (sent < 0) { * virStreamAbort(st); * goto done; @@ -17216,7 +17213,7 @@ error: * } * * virStreamPtr st = virStreamNew(conn, 0); - * int fd = open("demo.iso", O_RDONLY) + * int fd = open("demo.iso", O_RDONLY); * * virConnectUploadFile(conn, st); * if (virStreamSendAll(st, mysource, &fd) < 0) { @@ -17313,7 +17310,7 @@ cleanup: * } * * virStreamPtr st = virStreamNew(conn, 0); - * int fd = open("demo.iso", O_WRONLY) + * int fd = open("demo.iso", O_WRONLY); * * virConnectUploadFile(conn, st); * if (virStreamRecvAll(st, mysink, &fd) < 0) { -- 1.8.4.2

1 0

[libvirt] [PATCH] maint: update to latest gnulib
by Eric Blake 28 Dec '13

28 Dec '13

A couple of fixes for bootstrap issues reported on IRC: - on some older glibc systems, ./configure could deadlock due to a glibc malloc bug - on FreeBSD systems, a broken autom4te coupled with gettext 0.18.3 prevents bootstrap; we can't work around it, but can at least inform the user why they have a problem And as always, portability fixes in other modules, some of which are used by libvirt. * .gnulib: Update to latest, in part for bootstrap improvements. * bootstrap: Resync to gnulib. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Hmm, in reading this gnulib changelog, I'm not sure I want to push right away: the line about md5 being tweaked to use openssl makes me wonder if this update is dragging in a new library dependency; I'll have to do a bit more investigation. But here's the patch, if anyone else also wants to investigate. * .gnulib 831b84c...fdfe96f (18): > bootstrap: warn about BSD toolchain snafu > open-tests: port to glibc with _FORTIFY_SOURCE and -O1 > include_next: minimize code duplication > getcwd: fix compile error in configure check > regex: suppress core dumps from detection code > md5, sha1, sha256, sha512: support mandating use of openssl > test-xvasprintf: disable some -Wformat-security diagnostics > regex: avoid glibc deadlock during configure > md5, sha1, sha256, sha512: use openssl routines if available > base64: fix recent compilation regression on some compilers > autoupdate > autoupdate > ignore-value: revert previous code change > selinux-h: improve stub types and add more stub functions > ignore-value: prefer GCC version back through 2.0 > pty: Activate the signature wrapper of forkpty. > maint: fix gendocs.sh permissions > autoupdate .gnulib | 2 +- bootstrap | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/.gnulib b/.gnulib index 831b84c..fdfe96f 160000 --- a/.gnulib +++ b/.gnulib @@ -1 +1 @@ -Subproject commit 831b84c59ef413c57a36b67344467d66a8a2ba70 +Subproject commit fdfe96fe43746d63364f823ab3032c8301d53d1f diff --git a/bootstrap b/bootstrap index e31d17d..5acbe5b 100755 --- a/bootstrap +++ b/bootstrap @@ -1,6 +1,6 @@ #! /bin/sh # Print a version string. -scriptversion=2013-08-15.22; # UTC +scriptversion=2013-12-05.23; # UTC # Bootstrap this package from checked-out sources. @@ -551,6 +551,14 @@ if ! printf "$buildreq" | check_versions; then fi fi +# Warn the user if autom4te appears to be broken; this causes known +# issues with at least gettext 0.18.3. +probe=$(echo 'm4_quote([hi])' | autom4te -l M4sugar -t 'm4_quote:$%' -) +if test "x$probe" != xhi; then + warn_ "WARNING: your autom4te wrapper eats stdin;" + warn_ "if bootstrap fails, consider upgrading your autotools" +fi + echo "$0: Bootstrapping from checked-out $package sources..." # See if we can use gnulib's git-merge-changelog merge driver. -- 1.8.3.1

2 2

[libvirt] [PATCHv2] maint: improve debug of libvirt-{qemu, lxc} apis
by Eric Blake 28 Dec '13

28 Dec '13

I noticed that the virDomainQemuMonitorCommand debug output wasn't telling me the name of the domain it was working on. While it was easy enough to determine which pointer matches the domain based on other log messages, it is nicer to be consistent. * src/util/viruuid.h (VIR_UUID_DEBUG): Moved here from... * src/libvirt.c (VIR_UUID_DEBUG): ...here. (VIR_ARG15, VIR_HAS_COMMA, VIR_DOMAIN_DEBUG_EXPAND) (VIR_DOMAIN_DEBUG_PASTE, VIR_DOMAIN_DEBUG_0, VIR_DOMAIN_DEBUG_1) (VIR_DOMAIN_DEBUG_2, VIR_DOMAIN_DEBUG): Move... * src/datatypes.h: ...here. * src/libvirt-qemu.c (virDomainQemuMonitorCommand) (virDomainQemuAgentCommand): Better debug messages. * src/libvirt-lxc.c (virDomainLxcOpenNamespace): Likewise. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- The simpler part of my changes; the work on cleaning up the remaining virLib*Error() calls in libvirt.c is turning into a bigger cleanup project. src/datatypes.h | 60 ++++++++++++++++++++++++++++++++++++++++++++- src/libvirt-lxc.c | 4 +-- src/libvirt-qemu.c | 11 +++++---- src/libvirt.c | 71 ------------------------------------------------------ src/util/viruuid.h | 20 ++++++++++++++- 5 files changed, 86 insertions(+), 80 deletions(-) diff --git a/src/datatypes.h b/src/datatypes.h index 6026bb0..7f325b0 100644 --- a/src/datatypes.h +++ b/src/datatypes.h @@ -1,7 +1,7 @@ /* * datatypes.h: management of structs for public data types * - * Copyright (C) 2006-2008, 2010-2011 Red Hat, Inc. + * Copyright (C) 2006-2008, 2010-2011, 2013 Red Hat, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -94,6 +94,64 @@ extern virClassPtr virStoragePoolClass; (VIR_IS_SNAPSHOT(obj) && VIR_IS_DOMAIN((obj)->domain)) +/* Helper macros to implement VIR_DOMAIN_DEBUG using just C99. This + * assumes you pass fewer than 15 arguments to VIR_DOMAIN_DEBUG, but + * can easily be expanded if needed. + * + * Note that gcc provides extensions of "define a(b...) b" or + * "define a(b,...) b,##__VA_ARGS__" as a means of eliding a comma + * when no var-args are present, but we don't want to require gcc. + */ +# define VIR_ARG15(_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, \ + _11, _12, _13, _14, _15, ...) _15 +# define VIR_HAS_COMMA(...) VIR_ARG15(__VA_ARGS__, \ + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0) + +/* Form the name VIR_DOMAIN_DEBUG_[01], then call that macro, + * according to how many arguments are present. Two-phase due to + * macro expansion rules. */ +# define VIR_DOMAIN_DEBUG_EXPAND(a, b, ...) \ + VIR_DOMAIN_DEBUG_PASTE(a, b, __VA_ARGS__) +# define VIR_DOMAIN_DEBUG_PASTE(a, b, ...) \ + a##b(__VA_ARGS__) + +/* Internal use only, when VIR_DOMAIN_DEBUG has one argument. */ +# define VIR_DOMAIN_DEBUG_0(dom) \ + VIR_DOMAIN_DEBUG_2(dom, "%s", "") + +/* Internal use only, when VIR_DOMAIN_DEBUG has three or more arguments. */ +# define VIR_DOMAIN_DEBUG_1(dom, fmt, ...) \ + VIR_DOMAIN_DEBUG_2(dom, ", " fmt, __VA_ARGS__) + +/* Internal use only, with final format. */ +# define VIR_DOMAIN_DEBUG_2(dom, fmt, ...) \ + do { \ + char _uuidstr[VIR_UUID_STRING_BUFLEN]; \ + const char *_domname = NULL; \ + \ + if (!VIR_IS_DOMAIN(dom)) { \ + memset(_uuidstr, 0, sizeof(_uuidstr)); \ + } else { \ + virUUIDFormat((dom)->uuid, _uuidstr); \ + _domname = (dom)->name; \ + } \ + \ + VIR_DEBUG("dom=%p, (VM: name=%s, uuid=%s)" fmt, \ + dom, NULLSTR(_domname), _uuidstr, __VA_ARGS__); \ + } while (0) + +/** + * VIR_DOMAIN_DEBUG: + * @dom: domain + * @fmt: optional format for additional information + * @...: optional arguments corresponding to @fmt. + */ +# define VIR_DOMAIN_DEBUG(...) \ + VIR_DOMAIN_DEBUG_EXPAND(VIR_DOMAIN_DEBUG_, \ + VIR_HAS_COMMA(__VA_ARGS__), \ + __VA_ARGS__) + + typedef struct _virConnectCloseCallbackData virConnectCloseCallbackData; typedef virConnectCloseCallbackData *virConnectCloseCallbackDataPtr; diff --git a/src/libvirt-lxc.c b/src/libvirt-lxc.c index c8cdcea..5cbe8bf 100644 --- a/src/libvirt-lxc.c +++ b/src/libvirt-lxc.c @@ -28,6 +28,7 @@ #include "virfile.h" #include "virlog.h" #include "virprocess.h" +#include "viruuid.h" #include "datatypes.h" #ifdef WITH_SELINUX # include <selinux/selinux.h> @@ -69,8 +70,7 @@ virDomainLxcOpenNamespace(virDomainPtr domain, { virConnectPtr conn; - VIR_DEBUG("domain=%p, fdlist=%p flags=%x", - domain, fdlist, flags); + VIR_DOMAIN_DEBUG(domain, "fdlist=%p flags=%x", fdlist, flags); virResetLastError(); diff --git a/src/libvirt-qemu.c b/src/libvirt-qemu.c index 83fb3b3..2fa5522 100644 --- a/src/libvirt-qemu.c +++ b/src/libvirt-qemu.c @@ -2,7 +2,7 @@ * libvirt-qemu.c: Interfaces for the libvirt library to handle qemu-specific * APIs. * - * Copyright (C) 2010-2012 Red Hat, Inc. + * Copyright (C) 2010-2013 Red Hat, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -25,6 +25,7 @@ #include "virerror.h" #include "virlog.h" +#include "viruuid.h" #include "datatypes.h" #define VIR_FROM_THIS VIR_FROM_NONE @@ -75,8 +76,8 @@ virDomainQemuMonitorCommand(virDomainPtr domain, const char *cmd, { virConnectPtr conn; - VIR_DEBUG("domain=%p, cmd=%s, result=%p, flags=%x", - domain, cmd, result, flags); + VIR_DOMAIN_DEBUG(domain, "cmd=%s, result=%p, flags=%x", + cmd, result, flags); virResetLastError(); @@ -213,8 +214,8 @@ virDomainQemuAgentCommand(virDomainPtr domain, virConnectPtr conn; char *ret; - VIR_DEBUG("domain=%p, cmd=%s, timeout=%d, flags=%x", - domain, cmd, timeout, flags); + VIR_DOMAIN_DEBUG(domain, "cmd=%s, timeout=%d, flags=%x", + cmd, timeout, flags); if (!VIR_IS_CONNECTED_DOMAIN(domain)) { virLibDomainError(NULL, VIR_ERR_INVALID_DOMAIN, __FUNCTION__); diff --git a/src/libvirt.c b/src/libvirt.c index 77f481e..37de991 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -327,77 +327,6 @@ static struct gcry_thread_cbs virTLSThreadImpl = { }; #endif /* WITH_GNUTLS_GCRYPT */ -/* Helper macros to implement VIR_DOMAIN_DEBUG using just C99. This - * assumes you pass fewer than 15 arguments to VIR_DOMAIN_DEBUG, but - * can easily be expanded if needed. - * - * Note that gcc provides extensions of "define a(b...) b" or - * "define a(b,...) b,##__VA_ARGS__" as a means of eliding a comma - * when no var-args are present, but we don't want to require gcc. - */ -#define VIR_ARG15(_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, ...) _15 -#define VIR_HAS_COMMA(...) VIR_ARG15(__VA_ARGS__, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0) - -/* Form the name VIR_DOMAIN_DEBUG_[01], then call that macro, - * according to how many arguments are present. Two-phase due to - * macro expansion rules. */ -#define VIR_DOMAIN_DEBUG_EXPAND(a, b, ...) \ - VIR_DOMAIN_DEBUG_PASTE(a, b, __VA_ARGS__) -#define VIR_DOMAIN_DEBUG_PASTE(a, b, ...) \ - a##b(__VA_ARGS__) - -/* Internal use only, when VIR_DOMAIN_DEBUG has one argument. */ -#define VIR_DOMAIN_DEBUG_0(dom) \ - VIR_DOMAIN_DEBUG_2(dom, "%s", "") - -/* Internal use only, when VIR_DOMAIN_DEBUG has three or more arguments. */ -#define VIR_DOMAIN_DEBUG_1(dom, fmt, ...) \ - VIR_DOMAIN_DEBUG_2(dom, ", " fmt, __VA_ARGS__) - -/* Internal use only, with final format. */ -#define VIR_DOMAIN_DEBUG_2(dom, fmt, ...) \ - do { \ - char _uuidstr[VIR_UUID_STRING_BUFLEN]; \ - const char *_domname = NULL; \ - \ - if (!VIR_IS_DOMAIN(dom)) { \ - memset(_uuidstr, 0, sizeof(_uuidstr)); \ - } else { \ - virUUIDFormat((dom)->uuid, _uuidstr); \ - _domname = (dom)->name; \ - } \ - \ - VIR_DEBUG("dom=%p, (VM: name=%s, uuid=%s)" fmt, \ - dom, NULLSTR(_domname), _uuidstr, __VA_ARGS__); \ - } while (0) - -/** - * VIR_DOMAIN_DEBUG: - * @dom: domain - * @fmt: optional format for additional information - * @...: optional arguments corresponding to @fmt. - */ -#define VIR_DOMAIN_DEBUG(...) \ - VIR_DOMAIN_DEBUG_EXPAND(VIR_DOMAIN_DEBUG_, \ - VIR_HAS_COMMA(__VA_ARGS__), \ - __VA_ARGS__) - -/** - * VIR_UUID_DEBUG: - * @conn: connection - * @uuid: possibly null UUID array - */ -#define VIR_UUID_DEBUG(conn, uuid) \ - do { \ - if (uuid) { \ - char _uuidstr[VIR_UUID_STRING_BUFLEN]; \ - virUUIDFormat(uuid, _uuidstr); \ - VIR_DEBUG("conn=%p, uuid=%s", conn, _uuidstr); \ - } else { \ - VIR_DEBUG("conn=%p, uuid=(null)", conn); \ - } \ - } while (0) - static bool virGlobalError = false; static virOnceControl virGlobalOnce = VIR_ONCE_CONTROL_INITIALIZER; diff --git a/src/util/viruuid.h b/src/util/viruuid.h index bebd338..b3b1d49 100644 --- a/src/util/viruuid.h +++ b/src/util/viruuid.h @@ -1,7 +1,7 @@ /* * viruuid.h: helper APIs for dealing with UUIDs * - * Copyright (C) 2007, 2011, 2012 Red Hat, Inc. + * Copyright (C) 2007, 2011-2013 Red Hat, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -26,6 +26,24 @@ # include "internal.h" + +/** + * VIR_UUID_DEBUG: + * @conn: connection + * @uuid: possibly null UUID array + */ +# define VIR_UUID_DEBUG(conn, uuid) \ + do { \ + if (uuid) { \ + char _uuidstr[VIR_UUID_STRING_BUFLEN]; \ + virUUIDFormat(uuid, _uuidstr); \ + VIR_DEBUG("conn=%p, uuid=%s", conn, _uuidstr); \ + } else { \ + VIR_DEBUG("conn=%p, uuid=(null)", conn); \ + } \ + } while (0) + + int virSetHostUUIDStr(const char *host_uuid); int virGetHostUUID(unsigned char *host_uuid) ATTRIBUTE_NONNULL(1); -- 1.8.4.2

1 1

[libvirt] [PATCH] maint: fix typo in error message
by Eric Blake 27 Dec '13

27 Dec '13

* src/util/virerror.h (virReportInvalidZeroArg): Fix double space. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Pushing under the trivial rule. src/util/virerror.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/util/virerror.h b/src/util/virerror.h index 05e9950..87272e9 100644 --- a/src/util/virerror.h +++ b/src/util/virerror.h @@ -1,7 +1,7 @@ /* * virerror.c: error handling and reporting code for libvirt * - * Copyright (C) 2006-2009, 2011 Red Hat, Inc. + * Copyright (C) 2006-2013 Red Hat, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -121,7 +121,7 @@ void virReportSystemErrorFull(int domcode, #argname, \ NULL, \ 0, 0, \ - _("%s in %s must be zero"), \ + _("%s in %s must be zero"), \ #argname, __FUNCTION__) # define virReportInvalidNonNegativeArg(argname) \ virRaiseErrorFull(__FILE__, __FUNCTION__, __LINE__, \ -- 1.8.4.2

1 0

[libvirt] fail to live migration is related to virtio-console
by yue 27 Dec '13

27 Dec '13

hi,all this error occured when live migration windows os, log of that vm is: features 0x1e unsupported allowed features 0x71000002 qemu warning error while loading state for instance 0x0 of device '0000:00:04.4/virtio-console' do you have some idea about that? thanks

2 1

[libvirt] [PATCH] initial version of the bhyve driver
by Roman Bogorodskiy 27 Dec '13

27 Dec '13

Hi, This is an initial version of the bhyve driver. bhyve is a hypervisor for FreeBSD: http://bhyve.org/. I've tried to make this initial version as small as possible but functional, e.g. so it could be tested without lots of manual actions outside of libvirt. Hopefully it's not large enough for review, because I have no idea how to make it smaller yet functional. About the driver itself. It supports the following operations on domains (not counting service ones): * define * start * destroy Domain configuration is limited, user can define RAM, vcpus, can specify only one block device and attach the domain to only one network of 'bridge' type (default network works fine). Having that, you can start a bhyve VM and it will get a network connectivity. Network supported added at the early state, because the only way to get inside VM but network is via stdout/stdin, which is not convenient at all. That was fixed in -CURRENT and one could use tty device, but I haven't upgrade my development box to that version yet. Testing information: I use an domain xml like that: https://gist.github.com/novel/8151244 On both host and guest I use FreeBSD amd64 10-BETA3. Guest image doesn't have much configuration except: ifconfig_vtnet0="DHCP" in /etc/rc.conf And allowing root loging for sshd. Also, if one wants to manually test the image outside of libvirt, this line is needed in /etc/ttys to be able to login from console: ttyu2 "/usr/libexec/getty std.9600" vt100 on secure Roman Bogorodskiy (1): bhyve: add a basic driver configure.ac | 37 ++++ daemon/libvirtd.c | 9 + include/libvirt/virterror.h | 1 + src/Makefile.am | 35 +++ src/bhyve/bhyve_driver.c | 529 ++++++++++++++++++++++++++++++++++++++++++++ src/bhyve/bhyve_driver.h | 28 +++ src/bhyve/bhyve_process.c | 386 ++++++++++++++++++++++++++++++++ src/bhyve/bhyve_process.h | 36 +++ src/bhyve/bhyve_utils.h | 48 ++++ src/conf/domain_conf.c | 3 +- src/conf/domain_conf.h | 1 + src/driver.h | 1 + src/libvirt.c | 3 + src/util/virerror.c | 1 + 14 files changed, 1117 insertions(+), 1 deletion(-) create mode 100644 src/bhyve/bhyve_driver.c create mode 100644 src/bhyve/bhyve_driver.h create mode 100644 src/bhyve/bhyve_process.c create mode 100644 src/bhyve/bhyve_process.h create mode 100644 src/bhyve/bhyve_utils.h -- 1.8.4.3

1 1

[libvirt] fail to live migration
by yue 26 Dec '13

26 Dec '13

hi,all i have no idea why? does this error have anything to do with virtio-channel via which outside process can communicate with guest's process. ------------------my app log-------- File "/usr/lib64/python2.6/site-packages/mcvda/libvirtconnection.py", line 87, in wrapper ret = f(*args, **kwargs) File "/usr/lib64/python2.6/site-packages/libvirt.py", line 1178, in migrateToURI2 if ret == -1: raise libvirtError ('virDomainMigrateToURI2() failed', dom=self) libvirtError: Failed to inquire lock: No such process --log libvirtd.log 2013-12-26 09:09:15.514+0000: 18953: error : qemuMonitorIORead:513 : Unable to read from monitor: Connection reset by peer 2013-12-26 09:09:15.514+0000: 18953: debug : qemuMonitorIO:646 : Error on monitor Unable to read from monitor: Connection reset by peer 2013-12-26 09:09:15.514+0000: 18953: debug : virObjectUnref:135 : OBJECT_UNREF: obj=0x7fd6940d0530 2013-12-26 09:09:15.514+0000: 18953: debug : qemuMonitorIO:680 : Triggering error callback 2013-12-26 09:09:15.514+0000: 18953: debug : qemuProcessHandleMonitorError:357 : Received error on 0x7fd6940cd410 'QY-n1' 2013-12-26 09:09:15.514+0000: 18953: debug : virObjectRef:168 : OBJECT_REF: obj=0x7fd6940d0640 2013-12-26 09:09:15.514+0000: 18953: error : qemuAgentIO:642 : internal error End of file from monitor 2013-12-26 09:09:15.514+0000: 18953: debug : qemuAgentIO:675 : Error on monitor internal error End of file from monitor 2013-12-26 09:09:15.514+0000: 18953: debug : virObjectUnref:135 : OBJECT_UNREF: obj=0x7fd6940d0640 2013-12-26 09:09:15.514+0000: 18953: debug : qemuAgentIO:698 : Triggering EOF callback 2013-12-26 09:09:15.514+0000: 18953: debug : qemuProcessHandleAgentEOF:125 : Received EOF from agent on 0x7fd6940cd410 'QY-n1' 2013-12-26 09:09:15.514+0000: 18953: debug : qemuAgentClose:814 : mon=0x7fd6940d0640 2013-12-26 09:09:15.514+0000: 18953: debug : virFileClose:72 : Closed fd 29 2013-12-26 09:09:15.514+0000: 18953: debug : virObjectUnref:135 : OBJECT_UNREF: obj=0x7fd6940d0640 2013-12-26 09:09:15.514+0000: 18953: debug : virObjectUnref:135 : OBJECT_UNREF: obj=0x7fd6940d0640 2013-12-26 09:09:15.514+0000: 18953: debug : virObjectUnref:137 : OBJECT_DISPOSE: obj=0x7fd6940d0640 2013-12-26 09:09:15.514+0000: 18953: debug : qemuAgentDispose:169 : mon=0x7fd6940d0640 2013-12-26 09:09:15.514+0000: 18953: debug : qemuProcessHandleAgentDestroy:186 : Received destroy agent=0x7fd6940d0640 vm=0x7fd6940cd410 2013-12-26 09:09:15.514+0000: 18953: debug : virObjectUnref:135 : OBJECT_UNREF: obj=0x7fd6940cd410 2013-12-26 09:09:15.514+0000: 18953: debug : virObjectRef:168 : OBJECT_REF: obj=0x7fd6940d0530 2013-12-26 09:09:15.514+0000: 18953: debug : qemuMonitorIO:646 : Error on monitor Unable to read from monitor: Connection reset by peer 2013-12-26 09:09:15.514+0000: 18953: debug : virObjectUnref:135 : OBJECT_UNREF: obj=0x7fd6940d0530 2013-12-26 09:09:15.514+0000: 18953: debug : qemuMonitorIO:669 : Triggering EOF callback 2013-12-26 09:09:15.514+0000: 18953: debug : qemuProcessHandleMonitorEOF:298 : Received EOF on 0x7fd6940cd410 'QY-n1' 2013-12-26 09:09:15.514+0000: 18953: debug : qemuProcessHandleMonitorEOF:317 : Monitor connection to 'QY-n1' closed without SHUTDOWN event; assuming the domain crashed 2013-12-26 09:09:15.514+0000: 18953: debug : qemuProcessStop:4192 : Shutting down VM 'QY-n1' pid=20542 flags=0 2013-12-26 09:09:15.515+0000: 18953: debug : virFileClose:72 : Closed fd 28 2013-12-26 09:09:15.515+0000: 18953: debug : qemuMonitorClose:837 : QEMU_MONITOR_CLOSE: mon=0x7fd6940d0530 refs=3 2013-12-26 09:09:15.515+0000: 18953: debug : virFileClose:72 : Closed fd 30 2013-12-26 09:09:15.515+0000: 18953: debug : virObjectUnref:135 : OBJECT_UNREF: obj=0x7fd6940d0530 2013-12-26 09:09:15.515+0000: 18953: debug : qemuProcessKill:4090 : vm=QY-n1 pid=20542 flags=5 2013-12-26 09:09:15.515+0000: 18957: debug : qemuMonitorSend:915 : Send command resulted in error Unable to read from monitor: Connection reset by peer 2013-12-26 09:09:15.715+0000: 18953: debug : virObjectRef:168 : OBJECT_REF: obj=0x7fd6940cd410 2013-12-26 09:09:15.715+0000: 18957: debug : virObjectUnref:135 : OBJECT_UNREF: obj=0x7fd6940cd410 2013-12-26 09:09:15.715+0000: 18957: debug : virDomainLockProcessPause:194 : plugin=0x7fd698003020 dom=0x7fd6940cd410 state=0x7fd6940d93d8 2013-12-26 09:09:15.715+0000: 18957: debug : virDomainLockManagerNew:128 : plugin=0x7fd698003020 dom=0x7fd6940cd410 withResources=1 2013-12-26 09:09:15.715+0000: 18957: debug : virLockManagerPluginGetDriver:283 : plugin=0x7fd698003020 2013-12-26 09:09:15.715+0000: 18957: debug : virLockManagerNew:307 : driver=0x7fd69d17e900 type=0 nparams=5 params=0x7fd6a2f33720 flags=0 2013-12-26 09:09:15.715+0000: 18957: debug : virLockManagerLogParams:107 : key=uuid type=uuid value=2619ef7c-d047-4468-b047-3099695f95b7 2013-12-26 09:09:15.715+0000: 18957: debug : virLockManagerLogParams:100 : key=name type=string value=QY-n1 2013-12-26 09:09:15.715+0000: 18957: debug : virLockManagerLogParams:88 : key=id type=uint value=4294967295 2013-12-26 09:09:15.715+0000: 18957: debug : virLockManagerLogParams:88 : key=pid type=uint value=20542 2013-12-26 09:09:15.715+0000: 18957: debug : virLockManagerLogParams:103 : key=uri type=cstring value=(null) 2013-12-26 09:09:15.715+0000: 18957: debug : virDomainLockManagerNew:140 : Adding leases 2013-12-26 09:09:15.715+0000: 18957: debug : virDomainLockManagerNew:145 : Adding disks 2013-12-26 09:09:15.715+0000: 18957: debug : virDomainLockManagerAddDisk:86 : Add disk /rhev/data-center/e0495ee4-cc01-41ca-9530-a58e184f6e29/c3a83221-1393-4bec-bc3a-214d82e7433c/images/cae86c44-d7fd-45d4-9c2c-ffba89ae31ad/1d04094d-9d76-407e-8924-63d2015f17ed 2013-12-26 09:09:15.715+0000: 18957: debug : virLockManagerAddResource:336 : lock=0x7fd6880018f0 type=0 name=/rhev/data-center/e0495ee4-cc01-41ca-9530-a58e184f6e29/c3a83221-1393-4bec-bc3a-214d82e7433c/images/cae86c44-d7fd-45d4-9c2c-ffba89ae31ad/1d04094d-9d76-407e-8924-63d2015f17ed nparams=0 params=(nil) flags=0 2013-12-26 09:09:15.715+0000: 18957: debug : virLockManagerRelease:369 : lock=0x7fd6880018f0 state=0x7fd6940d93d8 flags=0 2013-12-26 09:09:15.715+0000: 18957: error : virLockManagerSanlockRelease:1047 : Failed to inquire lock: No such process 2013-12-26 09:09:15.715+0000: 18957: debug : virLockManagerFree:391 : lock=0x7fd6880018f0 2013-12-26 09:09:15.715+0000: 18957: warning : qemuProcessStartCPUs:2846 : Unable to release lease on QY-n1 2013-12-26 09:09:15.715+0000: 18957: debug : qemuProcessStartCPUs:2847 : Preserving lock state '(null)' 2013-12-26 09:09:15.715+0000: 18957: debug : qemuProcessStop:4192 : Shutting down VM 'QY-n1' pid=20542 flags=1 2013-12-26 09:09:15.715+0000: 18957: debug : qemuProcessStop:4195 : VM 'QY-n1' not active 2013-12-26 09:09:15.715+0000: 18957: debug : qemuDomainObjEndAsyncJob:955 : Stopping async job: migration in 2013-12-26 09:09:15.715+0000: 18957: debug : virObjectUnref:135 : OBJECT_UNREF: obj=0x7fd6940cd410 2013-12-26 09:09:15.715+0000: 18957: debug : virObjectUnref:135 : OBJECT_UNREF: obj=0x7fd6940cd410 2013-12-26 09:09:15.715+0000: 18957: debug : virNetServerProgramSendError:150 : prog=536903814 ver=1 proc=217 type=1 serial=6 msg=0x2263720 rerr=0x7fd6a2f33b80 2013-12-26 09:09:15.715+0000: 18953: debug : virObjectUnref:135 : OBJECT_UNREF: obj=0x7fd6940cd410 2013-12-26 09:09:15.715+0000: 18953: debug : qemuDomainCleanupRun:1995 : driver=0x7fd69801fe50, vm=QY-n1 2013-12-26 09:09:15.715+0000: 18953: debug : qemuProcessAutoDestroyRemove:4670 : vm=QY-n1

1 0

[libvirt] python setMetadata issue
by Umar Draz 25 Dec '13

25 Dec '13

Hi I am trying to set Metada of running virtual machine, but its giving me an error. Here is my code import libvirt conn = libvirt.open('qemu+tcp://10.0.128.12/system') dom = conn.lookupByName('virtspace') type = 'VIR_DOMAIN_METADATA_DESCRIPTION' key = '' uri = '' dom.setMetadata(conn, type, 'myDescription', key, uri) and here is the error. Traceback (most recent call last): File "setMeta.py", line 11, in <module> dom.setMetadata(conn, type, 'meta_test', key, uri) File "/usr/lib64/python2.6/site-packages/libvirt.py", line 1460, in setMetadata ret = libvirtmod.virDomainSetMetadata(self._o, type, metadata, key, uri, flags) AttributeError: virConnect instance has no attribute '__trunc__'

2 1

[libvirt] [PATCH] domain: don't try to interpret <driver> as virtio config for hostdev interfaces
by Laine Stump 24 Dec '13

24 Dec '13

This resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1046337 The <driver> type attribute of an interface is interpreted in two different ways depending on the <interface> type - if the interface is type='hostdev', then the driver name describes which backend to use for the hostdev device assignment (vfio or kvm), but if the interface is any emulated type *and* the model type is "virtio", then the driver name can be "vhost" or "qemu", telling which backend qemu should use to communicate with the emulated device. The problem comes when someone has defined a an interface like this (which is accepted by the parser as long as no <driver name='xxx'/> is specified): <interface type='hostdev'> ... <model type='virtio'/> ... </interface> As libvirt storing this definition in the domain's status, the driver name is automatically filled in with the backend that was automatically decided by libvirt, so it stores this in the status: <interface type='hostdev'> ... <driver name='vfio'/> ... <model type='virtio'/> ... </interface> This isn't noticed until the next time libvirtd is restarted - as it is reading the status of all domains, it encounters the above interface definition, logs an error: internal error: Unknown interface <driver name='vfio'> has been specified and fails to reload the domain status, so the domain is marked as inactive. The solution is to stop the parser from interpreting <driver> attributes as if the device was an emulated virtio device, when it is actually a hostdev. (Although the bug has existed since vfio support was added, it has just recently become more apparent because libvirt previously didn't automatically set the driver name for hostdev interfaces in the domain status to vfio/kvm as it does since commit f094aa, first appearing in v1.1.4.) --- src/conf/domain_conf.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 80bc85f..e65f3e3 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -6752,7 +6752,8 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xmlopt, model = NULL; } - if (def->model && STREQ(def->model, "virtio")) { + if (def->type != VIR_DOMAIN_NET_TYPE_HOSTDEV && + STREQ_NULLABLE(def->model, "virtio")) { if (backend != NULL) { int name; if ((name = virDomainNetBackendTypeFromString(backend)) < 0 || -- 1.8.3.1

2 1

[libvirt] [PATCH v2 0/3] libxl: improve vcpu pinning
by Dario Faggioli 24 Dec '13

24 Dec '13

Hi, Take two, with the comments from Jim on v1 fixed. Basically, that means I've added a few comments and removed some non necessary safety checking. Series available here: git://xenbits.xen.org/people/dariof/libvirt.git libxl/VcpuPinX-v2 Regards, Dario --- Dario Faggioli (3): libxl: implement virDomainGetVcpuPinInfo libxl: implement virDomainPinVcpuFlags libxl: correctly handle affinity reset in virDomainPinVcpu[Flags] src/libxl/libxl_driver.c | 166 ++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 145 insertions(+), 21 deletions(-) -- <<This happens because I choose it to happen!>> (Raistlin Majere) ----------------------------------------------------------------- Dario Faggioli, Ph.D, http://about.me/dario.faggioli Senior Software Engineer, Citrix Systems R&D Ltd., Cambridge (UK)

2 4

[libvirt] [PATCH] virt-login-shell: clean up usage
by Eric Blake 24 Dec '13

24 Dec '13

I noticed a couple odd things in 'virt-login-shell --help' output. * tools/virt-login-shell.c (usage): At most one option accepted, drop trailing colon. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Pushing under the trivial rule. tools/virt-login-shell.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/virt-login-shell.c b/tools/virt-login-shell.c index 758d1af..8b35e34 100644 --- a/tools/virt-login-shell.c +++ b/tools/virt-login-shell.c @@ -161,10 +161,10 @@ usage(void) fprintf(stdout, _("\n" "Usage:\n" - " %s [options]\n\n" + " %s [option]\n\n" "Options:\n" - " -h | --help Display program help:\n" - " -V | --version Display program version:\n" + " -h | --help Display program help\n" + " -V | --version Display program version\n" "\n" "libvirt login shell\n"), progname); -- 1.8.4.2

1 0

[libvirt] [PATCH 00/14] Fix flaw in virt-login-shell CVE-2013-4400
by Daniel P. Berrange 23 Dec '13

23 Dec '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> The following series of patches have been pushed to master as a fix for CVE-2013-4400. The first four patches are the core fix. The remaining 10 patches are preventative measures to help avoid further problems in the future. I will be pushing at least the first 4 patches to stable branches and any of the further patches if I find they apply without merge problems. Daniel P. Berrange (14): Add helpers for getting env vars in a setuid environment Only allow 'stderr' log output when running setuid (CVE-2013-4400) Close all non-stdio FDs in virt-login-shell (CVE-2013-4400) Don't link virt-login-shell against libvirt.so (CVE-2013-4400) Set a sane $PATH for virt-login-shell Make virCommand env handling robust in setuid env Remove all direct use of getenv Block all use of getenv with syntax-check Only allow the UNIX transport in remote driver when setuid Don't allow remote driver daemon autostart when running setuid Add stub getegid impl for platforms lacking it Remove (nearly) all use of getuid()/getgid() Block all use of libvirt.so in setuid programs Move virt-login-shell into libvirt-login-shell sub-RPM Makefile.am | 1 + bootstrap.conf | 1 + cfg.mk | 8 ++++ config-post.h | 44 ++++++++++++++++++ configure.ac | 1 + daemon/Makefile.am | 1 + daemon/libvirtd.c | 2 +- examples/domain-events/events-c/Makefile.am | 3 +- examples/hellolibvirt/Makefile.am | 2 +- examples/openauth/Makefile.am | 2 +- gnulib/lib/Makefile.am | 2 +- libvirt.spec.in | 28 +++++++---- python/Makefile.am | 1 + src/Makefile.am | 72 +++++++++++++++++++++++++++++ src/driver.c | 3 +- src/libvirt.c | 54 +++++++++++++++------- src/libvirt_private.syms | 6 ++- src/locking/lock_daemon.c | 6 +-- src/locking/lock_driver_lockd.c | 6 +-- src/locking/lock_manager.c | 2 +- src/lxc/lxc_controller.c | 2 +- src/lxc/lxc_driver.c | 4 +- src/lxc/lxc_process.c | 2 +- src/qemu/qemu_command.c | 8 ++-- src/qemu/qemu_driver.c | 6 +-- src/remote/remote_driver.c | 37 +++++++++++---- src/rpc/virnetsocket.c | 16 +++---- src/rpc/virnettlscontext.c | 4 +- src/storage/storage_backend.c | 4 +- src/storage/storage_backend_fs.c | 4 +- src/storage/storage_backend_logical.c | 2 +- src/util/virauth.c | 2 +- src/util/vircommand.c | 50 +++++++++++++++----- src/util/vircommand.h | 8 +++- src/util/virfile.c | 23 +++++---- src/util/viridentity.c | 8 ++-- src/util/virlog.c | 18 ++++++-- src/util/virrandom.c | 2 +- src/util/virstoragefile.c | 2 +- src/util/virutil.c | 47 +++++++++++++++++-- src/util/virutil.h | 8 ++++ src/vbox/vbox_XPCOMCGlue.c | 2 +- src/vbox/vbox_driver.c | 2 +- src/vbox/vbox_tmpl.c | 6 +-- tests/commandtest.c | 8 ++-- tests/qemumonitortestutils.c | 2 +- tests/virnetsockettest.c | 4 +- tools/Makefile.am | 9 +++- tools/virsh.c | 18 ++++---- tools/virt-login-shell.c | 14 ++++++ 50 files changed, 430 insertions(+), 137 deletions(-) create mode 100644 config-post.h -- 1.8.3.1

2 16

[libvirt] [PATCH v2] virnettlscontexttest fails with GNUTLS 3.0.28
by Cédric Bosdonnat 23 Dec '13

23 Dec '13

On openSUSE 12.x with GNUTLS 3.0.28, virnettlscontexttest fails. It has been reported to work from GNUTLS 3.1.11 on Fedora 19. Changed the constraints on gnutls to 3.1+ for unit test cacert4req. --- v2: Changed the condition for 4.0 to work and made commit message more explicit. tests/virnettlscontexttest.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/virnettlscontexttest.c b/tests/virnettlscontexttest.c index fc512fc..f3917bf 100644 --- a/tests/virnettlscontexttest.c +++ b/tests/virnettlscontexttest.c @@ -268,7 +268,9 @@ mymain(void) * be rejected. GNUTLS < 3 does not reject it and * we don't anticipate them changing this behaviour */ - DO_CTX_TEST(true, cacert4req.filename, servercert4req.filename, GNUTLS_VERSION_MAJOR >= 3); + DO_CTX_TEST(true, cacert4req.filename, servercert4req.filename, + (GNUTLS_VERSION_MAJOR == 3 && GNUTLS_VERSION_MINOR >= 1) || + GNUTLS_VERSION_MAJOR > 3); DO_CTX_TEST(true, cacert5req.filename, servercert5req.filename, true); DO_CTX_TEST(true, cacert6req.filename, servercert6req.filename, true); -- 1.8.4.4

2 1

[libvirt] python api list
by Umar Draz 23 Dec '13

23 Dec '13

Hi All, http://libvirt.org/php/api-reference.html The above link has a complete list of the functions regarding php api for libvrt. Where I can find the same kind of page for python? Br. Umar

2 1

[libvirt] [PATCH v2] PanicCheckABIStability: Need to check for existence
by John Ferlan 21 Dec '13

21 Dec '13

Commit id '4313fead' added a call to virDomainPanicCheckABIStability() which did not check whether the panic device existed before making a call to virDomainDeviceInfoCheckABIStability() which ended up segfaulting: Thread 1 (Thread 0x7f5332837700 (LWP 10964)): (src=<optimized out>, dst=<optimized out>) at conf/domain_conf.c:13007 (dst=<optimized out>, src=<optimized out>) at conf/domain_conf.c:13712 (src=<optimized out>, dst=<optimized out>) at conf/domain_conf.c:14056 (domain=domain@entry=0x7f53000057c0, vm=vm@entry=0x7f53000036d0, defptr=defptr@entry=0x7f5332836978, snap=snap@entry=0x7f5332836970, update_current=update_current@entry=0x7f5332836962, flags=flags@entry=1) at conf/snapshot_conf.c:1230 (domain=0x7f53000057c0, xmlDesc=<optimized out>, flags=1) at qemu/qemu_driver.c:12719 (domain=domain@entry=0x7f53000057c0, xmlDesc=0x7f53000081d0 "<domainsnapshot>\n <name>snap2</name>\n <description>new-desc</description>\n <state>running</state>\n <parent>\n <name>snap1</name>\n </parent>\n <creationTime>1387487268</creationTime>\n <memory s"..., flags=1) at libvirt.c:19695 ... (gdb) up 3 (gdb) print *other->def->dom $2 = {virtType = 2, id = -1, .. ... rng = 0x0, panic = 0x0, namespaceData = 0x0,... ... (gdb) print *def->dom $3 = {virtType = 2, id = -1, ... ... rng = 0x0, panic = 0x0, namespaceData = 0x0,... ... (gdb) Also seen using following sequence: virsh save $dom $file virsh save-image-edit $file add (or remove) a <panic/> line <devices> ... <panic> <address type='isa' iobase='0x505'/> </panic> ... </devices> Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- Changes since v1 - Added !src && !dst check, which results in: error: unsupported configuration: Target domain panic device count '0' does not match source count '1' src/conf/domain_conf.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 0079234..773c29d 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -13709,6 +13709,17 @@ static bool virDomainPanicCheckABIStability(virDomainPanicDefPtr src, virDomainPanicDefPtr dst) { + if (!src && !dst) + return true; + + if (!src || !dst) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("Target domain panic device count '%d' " + "does not match source count '%d'"), + src ? 1 : 0, dst ? 1 : 0); + return false; + } + return virDomainDeviceInfoCheckABIStability(&src->info, &dst->info); } -- 1.8.3.1

2 1

[libvirt] [PATCH 1/2] Implementation deficiency in virInitctlSetRunLevel v4
by Reco 21 Dec '13

21 Dec '13

Implement virProcessRunInMountNamespace, which runs callback of type virProcessNamespaceCallback in a container namespace. Hope it'll nail it this time. --- src/libvirt_private.syms | 1 + src/util/virprocess.c | 63 ++++++++++++++++++++++++++++++++++++++++++++++ src/util/virprocess.h | 6 +++++ 3 files changed, 70 insertions(+) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 2dbb8f8..e210fd0 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1646,6 +1646,7 @@ virProcessGetNamespaces; virProcessGetStartTime; virProcessKill; virProcessKillPainfully; +virProcessRunInMountNamespace; virProcessSetAffinity; virProcessSetMaxFiles; virProcessSetMaxMemLock; diff --git a/src/util/virprocess.c b/src/util/virprocess.c index 9fc3207..7bb494e 100644 --- a/src/util/virprocess.c +++ b/src/util/virprocess.c @@ -31,6 +31,7 @@ # include <sys/resource.h> #endif #include <sched.h> +#include <stdlib.h> #ifdef __FreeBSD__ # include <sys/param.h> @@ -847,3 +848,65 @@ int virProcessGetStartTime(pid_t pid, return 0; } #endif + +#ifdef HAVE_SETNS +int virProcessRunInMountNamespace(pid_t pid, + virProcessNamespaceCallback cb, + void *opaque) +{ + char* path = NULL; + int ret = -1; + int cpid = -1; + int status = -1; + int fd = -1; + + if (virAsprintf(&path, "/proc/%llu/ns/mnt", + (unsigned long long)pid) < 0) { + goto cleanup; + } + + if ((fd = open(path, O_RDONLY)) < 0) { + virReportSystemError(errno, "%s", + _("Kernel does not provide mount namespace")); + goto cleanup; + } + + switch (cpid = fork()) { + case 0: + if (setns(fd, 0) == -1) { + _exit(-1); + } + + ret = cb(pid, opaque); + _exit(ret); + break; + case -1: + virReportSystemError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Fork failed")); + goto cleanup; + default: + if (virProcessWait(cpid, &status) < 0 || status < 0) { + virReportSystemError(errno, + _("Callback failed with status %i"), + status); + ret = 1; + } else { + ret = 0; + } + } + +cleanup: + VIR_FREE(path); + VIR_FORCE_CLOSE(fd); + return ret; +} +#else +int virProcessRunInMountNamespace(pid_t pid ATTRIBUTE_UNUSED, + virProcessNamespaceCallback cb ATTRIBUTE_UNUSED, + void *opaque ATTRIBUTE_UNUSED) +{ + virReportSystemError(ENOSYS, "%s", + _("Mount namespaces are not available on this platform")); + return -1; +} +#endif diff --git a/src/util/virprocess.h b/src/util/virprocess.h index 9f77bc5..205abf7 100644 --- a/src/util/virprocess.h +++ b/src/util/virprocess.h @@ -60,4 +60,10 @@ int virProcessSetNamespaces(size_t nfdlist, int virProcessSetMaxMemLock(pid_t pid, unsigned long long bytes); int virProcessSetMaxProcesses(pid_t pid, unsigned int procs); int virProcessSetMaxFiles(pid_t pid, unsigned int files); + +typedef int (*virProcessNamespaceCallback)(pid_t pid, void *opaque); + +int virProcessRunInMountNamespace(pid_t pid, + virProcessNamespaceCallback cb, + void *opaque); #endif /* __VIR_PROCESS_H__ */ -- 1.7.10.4

3 8

[libvirt] [PATCHv6 0/3] Implement RBD storage pool support
by Adam Walters 21 Dec '13

21 Dec '13

Here is a re-based re-submission of my patches to implement RBD storage pool support for QEMU domains. Nothing in it has changed other than it has been rebased against the latest. The race condition I located still exists, but I have some patches forthcoming to address that issue. The code here still works well for me, but I only have the one host to test this on. If possible, I would like to try and get this merged for the 1.2.1 release cycle, so that other users can benefit from the addition of added storage pool support. As always, if you find any problems with my patches, please let me know, and I will fix them as soon as I can. Adam Walters (3): qemu: conf: Implement qemuAddRBDPoolSourceHost function qemu: conf: Implement RBD storage pool support domain: conf: Fix secret type checking src/conf/domain_conf.c | 6 +++-- src/qemu/qemu_conf.c | 62 +++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 65 insertions(+), 3 deletions(-) -- 1.8.5.2

1 3

[libvirt] [PATCH 2/2] Implementation deficiency in virInitctlSetRunLevel v4
by Reco 20 Dec '13

20 Dec '13

Use helper virProcessRunInMountNamespace in lxcDomainShutdownFlags and lxcDomainReboot. --- src/lxc/lxc_driver.c | 44 ++++++++++++++++++++++++++++---------------- 1 file changed, 28 insertions(+), 16 deletions(-) diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index e5298d1..2385f5b 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -2694,12 +2694,21 @@ lxcConnectListAllDomains(virConnectPtr conn, static int +virDomainShutdownCallback(pid_t pid ATTRIBUTE_UNUSED, + void *opaque ATTRIBUTE_UNUSED) +{ + int rc; + rc = virInitctlSetRunLevel(VIR_INITCTL_RUNLEVEL_POWEROFF, NULL); + return rc; +} + + +static int lxcDomainShutdownFlags(virDomainPtr dom, unsigned int flags) { virLXCDomainObjPrivatePtr priv; virDomainObjPtr vm; - char *vroot = NULL; int ret = -1; int rc; @@ -2726,14 +2735,12 @@ lxcDomainShutdownFlags(virDomainPtr dom, goto cleanup; } - if (virAsprintf(&vroot, "/proc/%llu/root", - (unsigned long long)priv->initpid) < 0) - goto cleanup; - if (flags == 0 || (flags & VIR_DOMAIN_SHUTDOWN_INITCTL)) { - if ((rc = virInitctlSetRunLevel(VIR_INITCTL_RUNLEVEL_POWEROFF, - vroot)) < 0) { + rc = virProcessRunInMountNamespace(priv->initpid, + virDomainShutdownCallback, + NULL); + if (rc < 0) { goto cleanup; } if (rc == 0 && flags != 0 && @@ -2761,7 +2768,6 @@ lxcDomainShutdownFlags(virDomainPtr dom, ret = 0; cleanup: - VIR_FREE(vroot); if (vm) virObjectUnlock(vm); return ret; @@ -2773,13 +2779,22 @@ lxcDomainShutdown(virDomainPtr dom) return lxcDomainShutdownFlags(dom, 0); } + +virDomainRebootCallback(pid_t pid ATTRIBUTE_UNUSED, + void *opaque ATTRIBUTE_UNUSED) +{ + int rc; + rc = virInitctlSetRunLevel(VIR_INITCTL_RUNLEVEL_REBOOT, NULL); + return rc; +} + + static int lxcDomainReboot(virDomainPtr dom, unsigned int flags) { virLXCDomainObjPrivatePtr priv; virDomainObjPtr vm; - char *vroot = NULL; int ret = -1; int rc; @@ -2806,14 +2821,12 @@ lxcDomainReboot(virDomainPtr dom, goto cleanup; } - if (virAsprintf(&vroot, "/proc/%llu/root", - (unsigned long long)priv->initpid) < 0) - goto cleanup; - if (flags == 0 || (flags & VIR_DOMAIN_REBOOT_INITCTL)) { - if ((rc = virInitctlSetRunLevel(VIR_INITCTL_RUNLEVEL_REBOOT, - vroot)) < 0) { + rc = virProcessRunInMountNamespace(priv->initpid, + virDomainRebootCallback, + NULL); + if (rc < 0) { goto cleanup; } if (rc == 0 && flags != 0 && @@ -2841,7 +2854,6 @@ lxcDomainReboot(virDomainPtr dom, ret = 0; cleanup: - VIR_FREE(vroot); if (vm) virObjectUnlock(vm); return ret; -- 1.7.10.4

3 3

[libvirt] [PATCH] libxl: fix segfault when domain create fail
by Bamvor Jian Zhang 20 Dec '13

20 Dec '13

there is a segfault in libxl logging in libxl_ctx_free when domain create fail. because the log output handler vmessage is freed by xtl_logger_destroy before libxl_ctx_free in virDomainObjListRemove. move xtl_logger_destroy after libxl_ctx_free could fix this bug. Signed-off-by: Bamvor Jian Zhang <bjzhang(a)suse.com> --- src/libxl/libxl_domain.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/libxl/libxl_domain.c b/src/libxl/libxl_domain.c index 68009db..e72c483 100644 --- a/src/libxl/libxl_domain.c +++ b/src/libxl/libxl_domain.c @@ -354,12 +354,11 @@ libxlDomainObjPrivateDispose(void *obj) libxl_evdisable_domain_death(priv->ctx, priv->deathW); virChrdevFree(priv->devs); - - xtl_logger_destroy(priv->logger); + libxl_ctx_free(priv->ctx); if (priv->logger_file) VIR_FORCE_FCLOSE(priv->logger_file); - libxl_ctx_free(priv->ctx); + xtl_logger_destroy(priv->logger); } static void -- 1.8.1.4

2 1

[libvirt] [PATCH] PanicCheckABIStability: Need to check for existence
by John Ferlan 20 Dec '13

20 Dec '13

Commit id '4313fead' added a call to virDomainPanicCheckABIStability() which did not check whether the panic device existed before making a call to virDomainDeviceInfoCheckABIStability() which ended up segfaulting: Thread 1 (Thread 0x7f5332837700 (LWP 10964)): (src=<optimized out>, dst=<optimized out>) at conf/domain_conf.c:13007 (dst=<optimized out>, src=<optimized out>) at conf/domain_conf.c:13712 (src=<optimized out>, dst=<optimized out>) at conf/domain_conf.c:14056 (domain=domain@entry=0x7f53000057c0, vm=vm@entry=0x7f53000036d0, defptr=defptr@entry=0x7f5332836978, snap=snap@entry=0x7f5332836970, update_current=update_current@entry=0x7f5332836962, flags=flags@entry=1) at conf/snapshot_conf.c:1230 (domain=0x7f53000057c0, xmlDesc=<optimized out>, flags=1) at qemu/qemu_driver.c:12719 (domain=domain@entry=0x7f53000057c0, xmlDesc=0x7f53000081d0 "<domainsnapshot>\n <name>snap2</name>\n <description>new-desc</description>\n <state>running</state>\n <parent>\n <name>snap1</name>\n </parent>\n <creationTime>1387487268</creationTime>\n <memory s"..., flags=1) at libvirt.c:19695 ... (gdb) up 3 (gdb) print *other->def->dom $2 = {virtType = 2, id = -1, .. ... rng = 0x0, panic = 0x0, namespaceData = 0x0,... ... (gdb) print *def->dom $3 = {virtType = 2, id = -1, ... ... rng = 0x0, panic = 0x0, namespaceData = 0x0,... ... (gdb) Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- NOTE: Optionally the call could be changed to: "if (src->panic && !virDomainPanicCheckABIStability(...)" I went with what I did following the RNGDefCheckABIStability. src/conf/domain_conf.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 0079234..c86af9a 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -13709,6 +13709,9 @@ static bool virDomainPanicCheckABIStability(virDomainPanicDefPtr src, virDomainPanicDefPtr dst) { + if (!src && !dst) + return true; + return virDomainDeviceInfoCheckABIStability(&src->info, &dst->info); } -- 1.8.3.1

2 1

[libvirt] [RFC PATCH] qemu: new API for tracking arbitrary monitor events
by Eric Blake 20 Dec '13

20 Dec '13

Several times in the past, qemu has implemented a new event, but libvirt has not yet caught up to reporting that event to the user applications. While it is possible to track libvirt logs to see that an unknown event was received and ignored, it would be nicer to copy what 'virsh qemu-monitor-command' does, and expose this information to the end developer as one of our unsupported qemu-specific commands. If you find yourself needing to use this API for more than just development purposes, please ask on the libvirt list for a supported counterpart event to be added in libvirt.so. While the supported virConnectDomainEventRegisterAny() API takes an id which determines the signature of the callback, this version takes a string filter and always uses the same signature. Furthermore, I chose to expose this as a new API instead of trying to add a new eventID at the top level, in part because the generic option lacks event name filtering, and in part because the normal domain event namespace should not be polluted by a qemu-only event. I also added a flags argument; unused for now, but we might decide to use it to allow a user to request event names by glob or regex instead of literal match. * include/libvirt/libvirt-qemu.h (virConnectDomainQemuMonitorEventCallback) (virConnectDomainQemuMonitorEventRegister) (virConnectDomainQemuMonitorEventDeregister): New prototypes. * src/libvirt-qemu.c (virConnectDomainQemuMonitorEventRegister) (virConnectDomainQemuMonitorEventDeregister): New functions. * src/libvirt_qemu.syms (LIBVIRT_QEMU_1.2.1): Export them. * src/driver.h (virDrvConnectDomainQemuMonitorEventRegister) (virDrvConnectDomainQemuMonitorEventDeregister): New callbacks. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Before I go and implement the guts of this new API, I first wanted to get approval from the list that I'm on the right track. include/libvirt/libvirt-qemu.h | 31 ++++++++++- src/driver.h | 15 +++++ src/libvirt-qemu.c | 123 +++++++++++++++++++++++++++++++++++++++++ src/libvirt_qemu.syms | 6 ++ 4 files changed, 174 insertions(+), 1 deletion(-) diff --git a/include/libvirt/libvirt-qemu.h b/include/libvirt/libvirt-qemu.h index 3e79a8c..5403093 100644 --- a/include/libvirt/libvirt-qemu.h +++ b/include/libvirt/libvirt-qemu.h @@ -4,7 +4,7 @@ * Description: Provides the interfaces of the libvirt library to handle * qemu specific methods * - * Copyright (C) 2010, 2012 Red Hat, Inc. + * Copyright (C) 2010, 2012-2013 Red Hat, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -54,6 +54,35 @@ typedef enum { char *virDomainQemuAgentCommand(virDomainPtr domain, const char *cmd, int timeout, unsigned int flags); +/** + * virConnectDomainQemuMonitorEventCallback: + * @conn: the connection pointer + * @dom: the domain pointer + * @event: the name of the event + * @details: the JSON details of the event + * @opaque: application specified data + * + * The callback signature to use when registering for a qemu monitor + * event with virConnectDomainQemuMonitorEventRegister(). + */ +typedef void (*virConnectDomainQemuMonitorEventCallback)(virConnectPtr conn, + virDomainPtr dom, + const char *event, + const char *details, + void *opaque); + +int virConnectDomainQemuMonitorEventRegister(virConnectPtr conn, + virDomainPtr dom, + const char *event, + virConnectDomainQemuMonitorEventCallback cb, + void *opaque, + virFreeCallback freecb, + unsigned int flags); + +int virConnectDomainQemuMonitorEventDeregister(virConnectPtr conn, + int callbackID); + + # ifdef __cplusplus } # endif diff --git a/src/driver.h b/src/driver.h index b6927ea..e9bf5cb 100644 --- a/src/driver.h +++ b/src/driver.h @@ -841,6 +841,19 @@ typedef virDomainPtr unsigned int flags); typedef int +(*virDrvConnectDomainQemuMonitorEventRegister)(virConnectPtr conn, + virDomainPtr dom, + const char *event, + virConnectDomainQemuMonitorEventCallback cb, + void *opaque, + virFreeCallback freecb, + unsigned int flags); + +typedef int +(*virDrvConnectDomainQemuMonitorEventDeregister)(virConnectPtr conn, + int callbackID); + +typedef int (*virDrvDomainOpenConsole)(virDomainPtr dom, const char *dev_name, virStreamPtr st, @@ -1300,6 +1313,8 @@ struct _virDriver { virDrvDomainQemuMonitorCommand domainQemuMonitorCommand; virDrvDomainQemuAttach domainQemuAttach; virDrvDomainQemuAgentCommand domainQemuAgentCommand; + virDrvConnectDomainQemuMonitorEventRegister connectDomainQemuMonitorEventRegister; + virDrvConnectDomainQemuMonitorEventDeregister connectDomainQemuMonitorEventDeregister; virDrvDomainOpenConsole domainOpenConsole; virDrvDomainOpenChannel domainOpenChannel; virDrvDomainOpenGraphics domainOpenGraphics; diff --git a/src/libvirt-qemu.c b/src/libvirt-qemu.c index db52c65..849932d 100644 --- a/src/libvirt-qemu.c +++ b/src/libvirt-qemu.c @@ -237,3 +237,126 @@ error: virDispatchError(conn); return NULL; } + + +/** + * virConnectDomainQemuMonitorEventRegister: + * @conn: pointer to the connection + * @dom: pointer to the domain, or NULL + * @event: name of the event, or NULL + * @cb: callback to the function handling monitor events + * @opaque: opaque data to pass on to the callback + * @freecb: optional function to deallocate opaque when not used anymore + * @flags: extra flags; not used yet, so callers should always pass 0 + * + * This API is QEMU specific, so it will only work with hypervisor + * connections to the QEMU driver. + * + * Adds a callback to receive notifications of arbitrary qemu monitor events + * occurring on a domain. Many qemu monitor events also result in a libvirt + * event which can be delivered via virConnectDomainEventRegisterAny(); this + * command is primarily for testing new qemu events that have not yet been + * given a libvirt counterpart event. + * + * If @dom is NULL, then events will be monitored for any domain. If @dom + * is non-NULL, then only the specific domain will be monitored. + * + * If @event is NULL, then all monitor events will be reported. If @event is + * non-NULL, then only the specific monitor event will be reported. @flags + * is currently unused, but in the future may support a flag for passing + * @event as a glob instead of a literal name to match a category of events. + * + * The virDomainPtr object handle passed into the callback upon delivery + * of an event is only valid for the duration of execution of the callback. + * If the callback wishes to keep the domain object after the callback returns, + * it shall take a reference to it, by calling virDomainRef(). + * The reference can be released once the object is no longer required + * by calling virDomainFree(). + * + * The return value from this method is a positive integer identifier + * for the callback. To unregister a callback, this callback ID should + * be passed to the virConnectDomainQemuMonitorEventDeregister() method. + * + * Returns a callback identifier on success, -1 on failure + */ +int +virConnectDomainQemuMonitorEventRegister(virConnectPtr conn, + virDomainPtr dom, + const char *event, + virConnectDomainQemuMonitorEventCallback cb, + void *opaque, + virFreeCallback freecb, + unsigned int flags) +{ + VIR_DOMAIN_DEBUG(dom, + "conn=%p, event=%s, cb=%p, opaque=%p, freecb=%p, flags=%x", + conn, NULLSTR(event), cb, opaque, freecb, flags); + + virResetLastError(); + + if (!VIR_IS_CONNECT(conn)) { + virLibConnError(VIR_ERR_INVALID_CONN, __FUNCTION__); + virDispatchError(NULL); + return -1; + } + if (dom && + !(VIR_IS_CONNECTED_DOMAIN(dom) && dom->conn == conn)) { + virLibConnError(VIR_ERR_INVALID_CONN, __FUNCTION__); + virDispatchError(conn); + return -1; + } + virCheckNonNullArgGoto(cb, error); + + if ((conn->driver) && (conn->driver->connectDomainQemuMonitorEventRegister)) { + int ret; + ret = conn->driver->connectDomainQemuMonitorEventRegister(conn, dom, event, cb, opaque, freecb, flags); + if (ret < 0) + goto error; + return ret; + } + + virLibConnError(VIR_ERR_NO_SUPPORT, __FUNCTION__); +error: + virDispatchError(conn); + return -1; +} + +/** + * virConnectDomainQemuMonitorEventDeregister: + * @conn: pointer to the connection + * @callbackID: the callback identifier + * + * Removes an event callback. The callbackID parameter should be the + * value obtained from a previous virConnectDomainQemuMonitorEventRegister() + * method. + * + * Returns 0 on success, -1 on failure + */ +int +virConnectDomainQemuMonitorEventDeregister(virConnectPtr conn, + int callbackID) +{ + VIR_DEBUG("conn=%p, callbackID=%d", conn, callbackID); + + virResetLastError(); + + if (!VIR_IS_CONNECT(conn)) { + virLibConnError(VIR_ERR_INVALID_CONN, __FUNCTION__); + virDispatchError(NULL); + return -1; + } + virCheckNonNegativeArgGoto(callbackID, error); + + if ((conn->driver) && (conn->driver->connectDomainQemuMonitorEventDeregister)) { + int ret; + ret = conn->driver->connectDomainQemuMonitorEventDeregister(conn, callbackID); + if (ret < 0) + goto error; + return ret; + } + + virLibConnError(VIR_ERR_NO_SUPPORT, __FUNCTION__); +error: + virDispatchError(conn); + return -1; +} diff --git a/src/libvirt_qemu.syms b/src/libvirt_qemu.syms index f968d91..7698c5c 100644 --- a/src/libvirt_qemu.syms +++ b/src/libvirt_qemu.syms @@ -24,3 +24,9 @@ LIBVIRT_QEMU_0.10.0 { global: virDomainQemuAgentCommand; } LIBVIRT_QEMU_0.9.4; + +LIBVIRT_QEMU_1.2.1 { + global: + virConnectDomainQemuMonitorEventDeregister; + virConnectDomainQemuMonitorEventRegister; +} LIBVIRT_QEMU_0.10.0; -- 1.8.4.2

3 8

[libvirt] [PATCH 1/2] Implementation deficiency in virInitctlSetRunLevel v3
by Reco 20 Dec '13

20 Dec '13

Implement virProcessRunInMountNamespace, which runs callback of type virProcessNamespaceCallback in a container namespace. --- src/libvirt_private.syms | 1 + src/util/virprocess.c | 63 ++++++++++++++++++++++++++++++++++++++++++++++ src/util/virprocess.h | 6 +++++ 3 files changed, 70 insertions(+) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 2dbb8f8..3f4b350 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1646,6 +1646,7 @@ virProcessGetNamespaces; virProcessGetStartTime; virProcessKill; virProcessKillPainfully; +virProcessRunInMountNamespace virProcessSetAffinity; virProcessSetMaxFiles; virProcessSetMaxMemLock; diff --git a/src/util/virprocess.c b/src/util/virprocess.c index 9fc3207..2e8535e 100644 --- a/src/util/virprocess.c +++ b/src/util/virprocess.c @@ -31,6 +31,7 @@ # include <sys/resource.h> #endif #include <sched.h> +#include <stdlib.h> #ifdef __FreeBSD__ # include <sys/param.h> @@ -847,3 +848,65 @@ int virProcessGetStartTime(pid_t pid, return 0; } #endif + +#ifdef HAVE_SETNS +int virProcessRunInMountNamespace(pid_t pid, + virProcessNamespaceCallback cb, + void *opaque) +{ + char* path = NULL; + int ret = -1; + int cpid = -1; + int status = -1; + int fd = -1; + + if (virAsprintf(&path, "/proc/%llu/ns/mnt", + (unsigned long long)pid) < 0) { + goto cleanup; + } + + if ((fd = open(path, O_RDONLY)) < 0) { + virReportSystemError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", + _("Kernel does not provide mount namespace")); + goto cleanup; + } + + switch (cpid = fork()) { + case 0: + if (setns(fd, 0) == -1) { + exit(-1); + } + + ret = cb(pid, opaque); + exit(ret); + break; + case -1: + virReportSystemError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Fork failed")); + goto cleanup; + default: + if (waitpid(cpid, &status, 0) < 0 || status < 0) { + virReportSystemError(errno, + _("Callback failed with status %i"), + status); + ret = 1; + } else { + ret = 0; + } + } + +cleanup: + VIR_FREE(path); + VIR_FORCE_CLOSE(fd); + return ret; +} +#else +int virProcessRunInMountNamespace(pid_t pid ATTRIBUTE_UNUSED, + virProcessNamespaceCallback cb ATTRIBUTE_UNUSED, + void *opaque ATTRIBUTE_UNUSED) +{ + virReportSystemError(ENOSYS, "%s", + _("Mount namespaces are not available on this platform")); + return -1; +} +#endif diff --git a/src/util/virprocess.h b/src/util/virprocess.h index 9f77bc5..205abf7 100644 --- a/src/util/virprocess.h +++ b/src/util/virprocess.h @@ -60,4 +60,10 @@ int virProcessSetNamespaces(size_t nfdlist, int virProcessSetMaxMemLock(pid_t pid, unsigned long long bytes); int virProcessSetMaxProcesses(pid_t pid, unsigned int procs); int virProcessSetMaxFiles(pid_t pid, unsigned int files); + +typedef int (*virProcessNamespaceCallback)(pid_t pid, void *opaque); + +int virProcessRunInMountNamespace(pid_t pid, + virProcessNamespaceCallback cb, + void *opaque); #endif /* __VIR_PROCESS_H__ */ -- 1.7.10.4

2 3

[libvirt] [PATCH v3 0/4] add support for panic device
by Hu Tao 20 Dec '13

20 Dec '13

panic device is a device that enables libvirt to receive notification of guest panic event. qemu implements it by pvpanic. This series adds support for panic device. It is implemented in qemu driver only. changes in v3: - introduce generic ISA address - rename pvpanic to panic. - add RNG schemas for new elements - add tests for panic device - error out if panic device is requested but qemu is too old Hu Tao (4): conf: introduce generic ISA address conf: add support for panic device qemu: add support for -device pvpanic test: add test for panic device docs/formatdomain.html.in | 33 ++++++ docs/schemas/basictypes.rng | 17 ++++ docs/schemas/domaincommon.rng | 16 +++ src/conf/domain_conf.c | 135 ++++++++++++++++++++++++- src/conf/domain_conf.h | 18 ++++ src/qemu/qemu_capabilities.c | 3 + src/qemu/qemu_capabilities.h | 2 + src/qemu/qemu_command.c | 16 +++ tests/qemucapabilitiesdata/caps_1.5.3-1.caps | 1 + tests/qemucapabilitiesdata/caps_1.6.0-1.caps | 1 + tests/qemucapabilitiesdata/caps_1.6.50-1.caps | 1 + tests/qemuxml2argvdata/qemuxml2argv-panic.args | 6 ++ tests/qemuxml2argvdata/qemuxml2argv-panic.xml | 31 ++++++ tests/qemuxml2argvtest.c | 3 + tests/qemuxml2xmltest.c | 2 + 15 files changed, 284 insertions(+), 1 deletion(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-panic.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-panic.xml -- 1.7.11.7

4 16

[libvirt] SECURITY: CVE-2013-6436: libvirtd daemon crash when reading memory tunables for LXC guest in shutoff status
by Daniel P. Berrange 20 Dec '13

20 Dec '13

Libvirt Security Notice ======================= Summary: libvirtd daemon crash when reading memory tunables for LXC guest in shutoff status Reported on: 20131209 Published on: 20131220 Fixed on: 20131220 Reported by: Martin Kletzander <mkletzan(a)redhat.com> Patched by: Martin Kletzander <mkletzan(a)redhat.com> See also: CVE-2013-6436 Description ----------- The lxcDomainGetMemoryParameters method in the LXC driver did not check whether the guest being accessed was running or not. When shutoff there will be no virCgroupPtr instance associated with the guest. Reading memory tunables involves calling methods with the virCgroupPtr object as a parameter. This will lead to a crash accessing a NULL pointer. Impact ------ A user who has permission to invoke the virDomainGetMemoryParameters API against the LXC driver will be able to crash the libvirtd daemon. Access to this API is granted to any user who connects to the read-only libvirtd UNIX domain socket. If ACLs are active, access is granted to any user with the 'read' permission on the 'domain' object, which is granted by default to all users. As a result an unprivileged user will be able to inflict a denial of service attack on other users of the libvirtd daemon with higher privilege. Workaround ---------- The impact can be mitigated by blocking access to the read-only libvirtd UNIX domain socket, with policykit or the 'auth_unix_ro' parameter in '/etc/libvirt/libvirtd.conf'. If ACLs are active, the 'read' permission should be removed from any untrusted users. This will not prevent the crash, but will stop unprivileged users from inflicting the denial of service on higher privileged users. Affected product ---------------- Name: libvirt Repository: git://libvirt.org/git/libvirt.git Branch: master Broken by: cfed9ad4fb28e268e1467a0071c2fbc0c0873969 Fixed by: f8c1cb90213508c4f32549023b0572ed774e48aa Branch: v1.0.5-maint Broken in: v1.0.5 Broken in: v1.0.5.1 Broken in: v1.0.5.2 Broken in: v1.0.5.3 Broken in: v1.0.5.4 Broken in: v1.0.5.5 Broken in: v1.0.5.6 Broken in: v1.0.5.7 Broken by: cfed9ad4fb28e268e1467a0071c2fbc0c0873969 Fixed by: 218bd2e8716bcb4c90acf6ecaf879d606b46606b Branch: v1.0.6-maint Broken in: v1.0.6 Broken by: cfed9ad4fb28e268e1467a0071c2fbc0c0873969 Fixed by: 80d682fd90bb7e97d8670be4cba1fe153438d7a0 Branch: v1.1.0-maint Broken in: v1.1.0 Broken by: cfed9ad4fb28e268e1467a0071c2fbc0c0873969 Fixed by: 30a589bc4731488ca3428515ed57ce5446a83bbd Branch: v1.1.1-maint Broken in: v1.1.1 Broken by: cfed9ad4fb28e268e1467a0071c2fbc0c0873969 Fixed by: 9a68d1354233f4cfca686655f8021e9477977e6e Branch: v1.1.2-maint Broken in: v1.1.2 Broken by: cfed9ad4fb28e268e1467a0071c2fbc0c0873969 Fixed by: 79384018480f11ec6f2c2196039e67a9196d3e3a Branch: v1.1.3-maint Broken in: v1.1.3 Broken in: v1.1.3.1 Broken by: cfed9ad4fb28e268e1467a0071c2fbc0c0873969 Fixed by: 66247dc5fffe5b9447f4db377c5adf02e6db97c4 Branch: v1.1.4-maint Broken in: v1.1.4 Broken by: cfed9ad4fb28e268e1467a0071c2fbc0c0873969 Fixed by: 09956c7db764a0958034de6fac58aaaaf8e878bf Branch: v1.2.0-maint Broken in: v1.2.0 Broken by: cfed9ad4fb28e268e1467a0071c2fbc0c0873969 Fixed by: 705f388bceb4fce21b7c5ebc6310cb467c362239 Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|

1 0

[libvirt] [PATCH 0/3] libxl: improve vcpu pinning
by Dario Faggioli 20 Dec '13

20 Dec '13

Basically, by making it possible to both query and change the vcpu to pcpu pinning of a (persistent) domain, even when it is not running. That happens by providing the implementation of virDomainGetVcpuPinInfo() and virDomainPinVcpuFlags() within he libxl driver, which is what happens in the first two patches. The third patch is something that can also be seen as a bugfix, and that's why I kept it separated from the second one, for easier review (although, the 'bug' does not really manifests, until virDomainPinVcpuFlags is implemented in patch 2). The logic is a lot similar to what happens in the QEMU driver. The patches are available in the following git branch: git://xenbits.xen.org/people/dariof/libvirt.git libxl/VcpuPinX Thanks and Regards, Dario --- Dario Faggioli (3): libxl: implement virDomainGetVcpuPinInfo libxl: implement virDomainPinVcpuFlags libxl: correctly handle affinity reset in virDomainPinVcpu[Flags] src/libxl/libxl_driver.c | 171 ++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 150 insertions(+), 21 deletions(-) -- <<This happens because I choose it to happen!>> (Raistlin Majere) ----------------------------------------------------------------- Dario Faggioli, Ph.D, http://about.me/dario.faggioli Senior Software Engineer, Citrix Systems R&D Ltd., Cambridge (UK)

2 5

[libvirt] [PATCH 0/3] PCI device assignment bugfixes
by Laine Stump 20 Dec '13

20 Dec '13

These were all found as a result of researching Bug 1035490. Patch 1 fixes the originally reported problem, Patch 2 fixes the cause of incorrect error reporting in a later comment of that bug, and Patch 3 fixes a behavior that I encountered while searching for the cause. Laine Stump (3): qemu: properly set MaxMemLock when hotplugging with VFIO qemu: avoid duplicate security label restore on hostdev attach failure qemu: re-add hostdev interfaces to hostdev array on libvirtd restart src/conf/domain_conf.c | 9 ++++++--- src/qemu/qemu_hotplug.c | 22 +++++++++++----------- 2 files changed, 17 insertions(+), 14 deletions(-) -- 1.8.3.1

2 4

[libvirt] [BUG] pinvcpu before migration
by Wangyufei (James) 20 Dec '13

20 Dec '13

hi , I am confused by pinvcpu before migration. I have two physical machine. One has 12 CPUs (E5645 2*6 ) as src and the other has 8 CPUs (2*4) as des. Step 1 : VM is running on src host (E5645 2*6 CPUs) with its VCPUs pinned on some PCPUs Step 2 :Because PCPU count is different between src and des , I should pin VCPUs to all PCPUs . virsh vcpupin vmname 0 0-11 --config --live Step 3: Do migrate ,and it failed with error in des libvirt log "Unable to set cpuset.cpus: Invalid argument" I find that VM's cpu bitmap on src turns to <vcpupin vcpu='0' cpuset='0-11'/> . vm start fails on des due to its pin info cpuset='0-11' in vm->def. In usual case, after I pin VCPU to all PCPU, vcpupin info will be deleted in vm->def. -- qemuDomainPinVcpuFlags -- if (virBitmapIsAllSet(pcpumap, pCpuCount)) doReset = true; -- if (doReset) if (virDomainVcpuPinDel(vm->def, vcpu) < 0) I debug libvirt and find that on src which PCPU count is 12 (2*6) virBitmapIsAllSet(pcpumap, pCpuCount) return false pcpumap->max_bit is 16. pcpumap = virBitmapNewData(cpumap, maplen) --> bitmap = virBitmapNew(len * CHAR_BIT); //here len is 2. Although my physical machine only has 12 PCPUs , but here pcpumap->max_bit is len*CHAR_BIT . So bitmap is 0000 1111 1111 1111 ,and it's not ALL SET (ALL SET is 1111 1111 1111 1111). I tried to fix the bug in this case , but I have not found a good solution. Any suggestions will be thankful. Best Regards, -WangYufei

2 1

[libvirt] [PATCH] virnettlscontexttest fails with GNUTLS 3.0.28
by Cédric Bosdonnat 20 Dec '13

20 Dec '13

Changed the constraints on gnutls to 3.1+ --- tests/virnettlscontexttest.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/virnettlscontexttest.c b/tests/virnettlscontexttest.c index fc512fc..d9a4e9d 100644 --- a/tests/virnettlscontexttest.c +++ b/tests/virnettlscontexttest.c @@ -268,7 +268,8 @@ mymain(void) * be rejected. GNUTLS < 3 does not reject it and * we don't anticipate them changing this behaviour */ - DO_CTX_TEST(true, cacert4req.filename, servercert4req.filename, GNUTLS_VERSION_MAJOR >= 3); + DO_CTX_TEST(true, cacert4req.filename, servercert4req.filename, + GNUTLS_VERSION_MAJOR >= 3 && GNUTLS_VERSION_MINOR >= 1); DO_CTX_TEST(true, cacert5req.filename, servercert5req.filename, true); DO_CTX_TEST(true, cacert6req.filename, servercert6req.filename, true); -- 1.8.4.4

4 4

[libvirt] [PATCH 0/2] Fix crash handling memory parameters in LXC
by Daniel P. Berrange 20 Dec '13

20 Dec '13

The first of these 2 issues is a security issue CVE-2013-6436 Both patches have been pushed to GIT master. Martin Kletzander (2): CVE-2013-6436: fix crash in lxcDomainGetMemoryParameters Fix crash in lxcDomainSetMemoryParameters src/lxc/lxc_driver.c | 153 +++++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 130 insertions(+), 23 deletions(-) -- 1.8.4.2

1 2

[libvirt] [PATCH] Fix explicit usage of default video PCI slots
by Ján Tomko 20 Dec '13

20 Dec '13

Don't set the PCI address of primary video to the default if it's already occupied by another device. Without this, a primary video card that doesn't have an address gets the default one on the 1st pass of PCI address allocation, even if it's occupied. This address gets picked up by the second pass, and a conflict occurs: XML error: Attempted double use of PCI slot 0000:00:02.0 (may need "multifunction='on'" for device on function 0) Also fix the test that was supposed to catch this. --- src/qemu/qemu_command.c | 50 +++++++++++++++++++++--------------------------- tests/qemuxml2argvtest.c | 3 ++- 2 files changed, 24 insertions(+), 29 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index d723dc8..2a64cd1 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -2379,7 +2379,6 @@ qemuValidateDevicePCISlotsPIIX3(virDomainDefPtr def, size_t i; virDevicePCIAddress tmp_addr; bool qemuDeviceVideoUsable = virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_VIDEO_PRIMARY); - virDevicePCIAddressPtr addrptr; char *addrStr = NULL; qemuDomainPCIConnectFlags flags = QEMU_PCI_CONNECT_HOTPLUGGABLE | QEMU_PCI_CONNECT_TYPE_PCI; @@ -2446,22 +2445,17 @@ qemuValidateDevicePCISlotsPIIX3(virDomainDefPtr def, */ virDomainVideoDefPtr primaryVideo = def->videos[0]; if (primaryVideo->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI) { - primaryVideo->info.type = VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI; - primaryVideo->info.addr.pci.domain = 0; - primaryVideo->info.addr.pci.bus = 0; - primaryVideo->info.addr.pci.slot = 2; - primaryVideo->info.addr.pci.function = 0; - addrptr = &primaryVideo->info.addr.pci; - - if (!(addrStr = qemuDomainPCIAddressAsString(addrptr))) + memset(&tmp_addr, 0, sizeof(tmp_addr)); + tmp_addr.slot = 2; + + if (!(addrStr = qemuDomainPCIAddressAsString(&tmp_addr))) goto cleanup; - if (!qemuDomainPCIAddressValidate(addrs, addrptr, + if (!qemuDomainPCIAddressValidate(addrs, &tmp_addr, addrStr, flags, false)) goto cleanup; - if (qemuDomainPCIAddressSlotInUse(addrs, addrptr)) { + if (qemuDomainPCIAddressSlotInUse(addrs, &tmp_addr)) { if (qemuDeviceVideoUsable) { - virResetLastError(); if (qemuDomainPCIAddressReserveNextSlot(addrs, &primaryVideo->info, flags) < 0) @@ -2472,8 +2466,11 @@ qemuValidateDevicePCISlotsPIIX3(virDomainDefPtr def, "QEMU needs it for primary video")); goto cleanup; } - } else if (qemuDomainPCIAddressReserveSlot(addrs, addrptr, flags) < 0) { - goto cleanup; + } else { + if (qemuDomainPCIAddressReserveSlot(addrs, &tmp_addr, flags) < 0) + goto cleanup; + primaryVideo->info.addr.pci = tmp_addr; + primaryVideo->info.type = VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI; } } else if (!qemuDeviceVideoUsable) { if (primaryVideo->info.addr.pci.domain != 0 || @@ -2535,7 +2532,6 @@ qemuDomainValidateDevicePCISlotsQ35(virDomainDefPtr def, size_t i; virDevicePCIAddress tmp_addr; bool qemuDeviceVideoUsable = virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_VIDEO_PRIMARY); - virDevicePCIAddressPtr addrptr; char *addrStr = NULL; qemuDomainPCIConnectFlags flags = QEMU_PCI_CONNECT_TYPE_PCIE; @@ -2619,22 +2615,17 @@ qemuDomainValidateDevicePCISlotsQ35(virDomainDefPtr def, */ virDomainVideoDefPtr primaryVideo = def->videos[0]; if (primaryVideo->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI) { - primaryVideo->info.type = VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI; - primaryVideo->info.addr.pci.domain = 0; - primaryVideo->info.addr.pci.bus = 0; - primaryVideo->info.addr.pci.slot = 1; - primaryVideo->info.addr.pci.function = 0; - addrptr = &primaryVideo->info.addr.pci; - - if (!(addrStr = qemuDomainPCIAddressAsString(addrptr))) + memset(&tmp_addr, 0, sizeof(tmp_addr)); + tmp_addr.slot = 1; + + if (!(addrStr = qemuDomainPCIAddressAsString(&tmp_addr))) goto cleanup; - if (!qemuDomainPCIAddressValidate(addrs, addrptr, + if (!qemuDomainPCIAddressValidate(addrs, &tmp_addr, addrStr, flags, false)) goto cleanup; - if (qemuDomainPCIAddressSlotInUse(addrs, addrptr)) { + if (qemuDomainPCIAddressSlotInUse(addrs, &tmp_addr)) { if (qemuDeviceVideoUsable) { - virResetLastError(); if (qemuDomainPCIAddressReserveNextSlot(addrs, &primaryVideo->info, flags) < 0) @@ -2645,8 +2636,11 @@ qemuDomainValidateDevicePCISlotsQ35(virDomainDefPtr def, "QEMU needs it for primary video")); goto cleanup; } - } else if (qemuDomainPCIAddressReserveSlot(addrs, addrptr, flags) < 0) { - goto cleanup; + } else { + if (qemuDomainPCIAddressReserveSlot(addrs, &tmp_addr, flags) < 0) + goto cleanup; + primaryVideo->info.type = VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI; + primaryVideo->info.addr.pci = tmp_addr; } } else if (!qemuDeviceVideoUsable) { if (primaryVideo->info.addr.pci.domain != 0 || diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 847e96f..5a2bfcc 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1193,7 +1193,8 @@ mymain(void) DO_TEST("video-device-pciaddr-default", QEMU_CAPS_KVM, QEMU_CAPS_VNC, QEMU_CAPS_DEVICE, QEMU_CAPS_DEVICE_VIDEO_PRIMARY, - QEMU_CAPS_DEVICE_QXL, QEMU_CAPS_DEVICE_QXL_VGA); + QEMU_CAPS_DEVICE_QXL, QEMU_CAPS_DEVICE_QXL_VGA, + QEMU_CAPS_DEVICE_PCI_BRIDGE); DO_TEST("virtio-rng-default", QEMU_CAPS_DEVICE, QEMU_CAPS_DEVICE_VIRTIO_RNG, QEMU_CAPS_OBJECT_RNG_RANDOM); -- 1.8.3.2

4 5