- Devel - libvirt List Archives

[libvirt] [PATCH 2/3] cgroup: Implement blkio.weight tuning API.
by Gui Jianfeng 28 Jan '11

28 Jan '11

Implement blkio.weight tuning API. Signed-off-by: Gui Jianfeng <guijianfeng(a)cn.fujitsu.com> --- src/libvirt_private.syms | 2 ++ src/util/cgroup.c | 36 ++++++++++++++++++++++++++++++++++++ src/util/cgroup.h | 3 +++ 3 files changed, 41 insertions(+), 0 deletions(-) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 2ce4bed..97b9851 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -77,6 +77,8 @@ virCgroupMounted; virCgroupRemove; virCgroupSetCpuShares; virCgroupSetFreezerState; +virCgroupSetWeight; +virCgroupGetWeight; virCgroupSetMemory; virCgroupSetMemoryHardLimit; virCgroupSetMemorySoftLimit; diff --git a/src/util/cgroup.c b/src/util/cgroup.c index 309f4e9..a3d3f29 100644 --- a/src/util/cgroup.c +++ b/src/util/cgroup.c @@ -851,6 +851,42 @@ int virCgroupForDomain(virCgroupPtr driver ATTRIBUTE_UNUSED, #endif /** + * virCgroupSetWeight: + * + * @group: The cgroup to change io weight for + * @weight: The Weight for this cgroup + * + * Returns: 0 on success + */ +int virCgroupSetWeight(virCgroupPtr group, unsigned long weight) +{ + return virCgroupSetValueU64(group, + VIR_CGROUP_CONTROLLER_BLKIO, + "blkio.weight", + weight); +} + +/** + * virCgroupGetWeight: + * + * @group: The cgroup to get weight for + * @Weight: Pointer to returned weight + * + * Returns: 0 on success + */ +int virCgroupGetWeight(virCgroupPtr group, unsigned long *weight) +{ + long long unsigned int __weight; + int ret; + ret = virCgroupGetValueU64(group, + VIR_CGROUP_CONTROLLER_BLKIO, + "blkio.weight", &__weight); + if (ret == 0) + *weight = (unsigned long) __weight; + return ret; +} + +/** * virCgroupSetMemory: * * @group: The cgroup to change memory for diff --git a/src/util/cgroup.h b/src/util/cgroup.h index 67b1299..99c1cfe 100644 --- a/src/util/cgroup.h +++ b/src/util/cgroup.h @@ -41,6 +41,9 @@ int virCgroupForDomain(virCgroupPtr driver, int virCgroupAddTask(virCgroupPtr group, pid_t pid); +int virCgroupSetWeight(virCgroupPtr group, unsigned long weight); +int virCgroupGetWeight(virCgroupPtr group, unsigned long *weight); + int virCgroupSetMemory(virCgroupPtr group, unsigned long long kb); int virCgroupGetMemoryUsage(virCgroupPtr group, unsigned long *kb); -- 1.7.1

3 2

[libvirt] [PATCH 0/3] qemu aio mode per disk
by Eric Blake 28 Jan '11

28 Jan '11

I've taken the patch that Matthias Dahl originally posted _months_ ago: https://www.redhat.com/archives/libvir-list/2010-April/msg00888.html and updated it by splitting into three patches, adding more testsuite coverage, improving documentation, and altering the names slightly. The end result is that you use: <devices> <disk type='file' device='disk'> <driver name='qemu' type='raw' io='native'/> ... </disk> </devices> as the way to request qemu -drive ...,aio=native Let's get this reviewed and in, rather than dragging our feet for a few more months :) Eric Blake (1): qemu aio: enable support Matthias Dahl (2): qemu aio: add XML parsing qemu aio: parse aio support from qemu -help AUTHORS | 1 + docs/formatdomain.html.in | 40 +++++++++++++++++---- docs/schemas/domain.rng | 11 ++++++ src/conf/domain_conf.c | 25 +++++++++++++ src/conf/domain_conf.h | 10 +++++ src/libvirt_private.syms | 3 ++ src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 3 +- src/qemu/qemu_command.c | 17 +++++++++ tests/qemuhelptest.c | 12 ++++-- tests/qemuxml2argvdata/qemuxml2argv-disk-aio.args | 1 + tests/qemuxml2argvdata/qemuxml2argv-disk-aio.xml | 33 +++++++++++++++++ tests/qemuxml2argvtest.c | 2 + tests/qemuxml2xmltest.c | 1 + 14 files changed, 149 insertions(+), 12 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-aio.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-aio.xml -- 1.7.3.4

2 8

[libvirt] l10n/i18n ~ po files and their cycle
by Zdenek Styblik 28 Jan '11

28 Jan '11

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Hello, I somehow dared to open 'po/cs.po' file and it made me wonder what's the life cycle of these files. Especially this file seems to be somehow "shifted", because translations don't even match to their English counterpart. I doubt anybody is using Czech translation for libvirt and to be honest, I would be enormously surprised if someone, anyone, did. To save myself time, let's ask somewhat obvious. How to use translation? Is LC_LANG going to do the trick? Thanks for answers ~ yeh, I'm actually interested into the very first question of mine - the life cycle of .po files :o) Thanks, Z. - -- Zdenek Styblik Net/Linux admin OS TurnovFree.net email: stybla(a)turnovfree.net jabber: stybla(a)jabber.turnovfree.net -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.10 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/ iEYEARECAAYFAk0/GlkACgkQ8MreUbSH7ilzzgCff1ixlPxXusi6YvlaLQK4MXgf kQEAoK11Axh+iOldlXZucmd7ti9W5PgJ =dh3C -----END PGP SIGNATURE-----

7 25

[libvirt] [PATCH] docs: replace CRLF with LF
by Juerg Haefliger 28 Jan '11

28 Jan '11

--- docs/page.xsl | 350 ++++++++++++++++++++++++++++---------------------------- 1 files changed, 175 insertions(+), 175 deletions(-) diff --git a/docs/page.xsl b/docs/page.xsl index 4f1c92f..fc782a2 100644 --- a/docs/page.xsl +++ b/docs/page.xsl @@ -1,175 +1,175 @@ -<?xml version="1.0"?> -<xsl:stylesheet - xmlns:xsl="http://www.w3.org/1999/XSL/Transform" - xmlns:exsl="http://exslt.org/common" - exclude-result-prefixes="xsl exsl" - version="1.0"> - -  - <xsl:variable name="sitemap" select="document('sitemap.html.in')/html/body/div[@id='sitemap']"/> - - <xsl:template match="code[@class='docref']" mode="content"> - <xsl:variable name="name"><xsl:value-of select="."/></xsl:variable> - <a href="html/libvirt-libvirt.html#{$name}"><code><xsl:value-of select="$name"/></code></a> - </xsl:template> - - <xsl:template match="node() | @*" mode="content"> - <xsl:copy> - <xsl:apply-templates select="node() | @*" mode="content"/> - </xsl:copy> - </xsl:template> - - - <xsl:template match="ul[@id='toc']" mode="content"> - <xsl:call-template name="toc"/> - </xsl:template> - -  - <xsl:template match="ul" mode="menu"> - <xsl:param name="pagename"/> - <xsl:param name="level"/> - <ul class="{concat('l', $level)}"> - <xsl:for-each select="li"> -  - <li><div> -  - <xsl:variable name="class"> - <xsl:choose> - <xsl:when test="count(.//a[@href = $pagename]) > 0"> - <xsl:text>active</xsl:text> - </xsl:when> - <xsl:otherwise> - <xsl:text>inactive</xsl:text> - </xsl:otherwise> - </xsl:choose> - </xsl:variable> - -  - <xsl:choose> - <xsl:when test="$pagename = a/@href"> - <span class="{$class}"><xsl:value-of select="a"/></span> - </xsl:when> - <xsl:when test="a/@href = 'http://wiki.libvirt.org'"> - <a title="{./span}" class="{$class}" href="{a/@href}"><xsl:value-of select="a"/></a> - </xsl:when> - <xsl:otherwise> - <a title="{./span}" class="{$class}" href="{concat($href_base, a/@href)}"><xsl:value-of select="a"/></a> - </xsl:otherwise> - </xsl:choose> - -  - <xsl:if test="count(.//a[@href = $pagename]) > 0"> - <xsl:apply-templates select="ul" mode="menu"> - <xsl:with-param name="pagename" select="$pagename"/> - <xsl:with-param name="level" select="$level + 1"/> - </xsl:apply-templates> - </xsl:if> - </div></li> - </xsl:for-each> - </ul> - </xsl:template> - - <xsl:template name="toc"> - <ul> - <xsl:for-each select="/html/body/h2[count(a) = 1]"> - <xsl:variable name="thish2" select="."/> - <li> - <a href="#{a/@name}"><xsl:value-of select="a/text()"/></a> - <xsl:if test="count(./following-sibling::h3[preceding-sibling::h2[1] = $thish2 and count(a) = 1]) > 0"> - <ul> - <xsl:for-each select="./following-sibling::h3[preceding-sibling::h2[1] = $thish2 and count(a) = 1]"> - <xsl:variable name="thish3" select="."/> - <li> - <a href="#{a/@name}"><xsl:value-of select="a/text()"/></a> - <xsl:if test="count(./following-sibling::h4[preceding-sibling::h3[1] = $thish3 and count(a) = 1]) > 0"> - <ul> - <xsl:for-each select="./following-sibling::h4[preceding-sibling::h3[1] = $thish3 and count(a) = 1]"> - <xsl:variable name="thish4" select="."/> - <li> - <a href="#{a/@name}"><xsl:value-of select="a/text()"/></a> - <xsl:if test="count(./following-sibling::h5[preceding-sibling::h4[1] = $thish4 and count(a) = 1]) > 0"> - <ul> - <xsl:for-each select="./following-sibling::h5[preceding-sibling::h4[1] = $thish4 and count(a) = 1]"> - <xsl:variable name="thish5" select="."/> - <li> - <a href="#{a/@name}"><xsl:value-of select="a/text()"/></a> - <xsl:if test="count(./following-sibling::h6[preceding-sibling::h5[1] = $thish5 and count(a) = 1]) > 0"> - <ul> - <xsl:for-each select="./following-sibling::h6[preceding-sibling::h5[1] = $thish5 and count(a) = 1]"> - <li> - <a href="#{a/@name}"><xsl:value-of select="a/text()"/></a> - </li> - </xsl:for-each> - </ul> - </xsl:if> - </li> - </xsl:for-each> - </ul> - </xsl:if> - </li> - </xsl:for-each> - </ul> - </xsl:if> - </li> - </xsl:for-each> - </ul> - </xsl:if> - </li> - </xsl:for-each> - </ul> - </xsl:template> - -  - <xsl:template match="/" mode="page"> - <xsl:param name="pagename"/> - <html> - <xsl:comment> - This file is autogenerated from <xsl:value-of select="$pagename"/>.in - Do not edit this file. Changes will be lost. - </xsl:comment> - <head> - <link rel="stylesheet" type="text/css" href="{$href_base}main.css"/> - <link rel="SHORTCUT ICON" href="{$href_base}32favicon.png"/> - <title>libvirt: <xsl:value-of select="html/body/h1"/></title> - <meta name="description" content="libvirt, virtualization, virtualization API"/> - </head> - <body> - <div id="header"> - <div id="headerLogo"/> - <div id="headerSearch"> - <form action="{$href_base}search.php" enctype="application/x-www-form-urlencoded" method="get"> - <div> - <input id="query" name="query" type="text" size="12" value=""/> - <input id="submit" name="submit" type="submit" value="Search"/> - </div> - </form> - </div> - </div> - <div id="body"> - <div id="menu"> - <xsl:apply-templates select="exsl:node-set($sitemap)/ul" mode="menu"> - <xsl:with-param name="pagename" select="$pagename"/> - <xsl:with-param name="level" select="0"/> - </xsl:apply-templates> - </div> - <div id="content"> - <xsl:apply-templates select="/html/body/*" mode="content"/> - </div> - </div> - <div id="footer"> - <p id="sponsor"> - Sponsored by:<br/> - <a href="http://et.redhat.com/"><img src="{$href_base}et.png" alt="Project sponsored by Red Hat Emerging Technology"/></a> - </p> - </div> - </body> - </html> - </xsl:template> - -</xsl:stylesheet> +<?xml version="1.0"?> +<xsl:stylesheet + xmlns:xsl="http://www.w3.org/1999/XSL/Transform" + xmlns:exsl="http://exslt.org/common" + exclude-result-prefixes="xsl exsl" + version="1.0"> + +  + <xsl:variable name="sitemap" select="document('sitemap.html.in')/html/body/div[@id='sitemap']"/> + + <xsl:template match="code[@class='docref']" mode="content"> + <xsl:variable name="name"><xsl:value-of select="."/></xsl:variable> + <a href="html/libvirt-libvirt.html#{$name}"><code><xsl:value-of select="$name"/></code></a> + </xsl:template> + + <xsl:template match="node() | @*" mode="content"> + <xsl:copy> + <xsl:apply-templates select="node() | @*" mode="content"/> + </xsl:copy> + </xsl:template> + + + <xsl:template match="ul[@id='toc']" mode="content"> + <xsl:call-template name="toc"/> + </xsl:template> + +  + <xsl:template match="ul" mode="menu"> + <xsl:param name="pagename"/> + <xsl:param name="level"/> + <ul class="{concat('l', $level)}"> + <xsl:for-each select="li"> +  + <li><div> +  + <xsl:variable name="class"> + <xsl:choose> + <xsl:when test="count(.//a[@href = $pagename]) > 0"> + <xsl:text>active</xsl:text> + </xsl:when> + <xsl:otherwise> + <xsl:text>inactive</xsl:text> + </xsl:otherwise> + </xsl:choose> + </xsl:variable> + +  + <xsl:choose> + <xsl:when test="$pagename = a/@href"> + <span class="{$class}"><xsl:value-of select="a"/></span> + </xsl:when> + <xsl:when test="a/@href = 'http://wiki.libvirt.org'"> + <a title="{./span}" class="{$class}" href="{a/@href}"><xsl:value-of select="a"/></a> + </xsl:when> + <xsl:otherwise> + <a title="{./span}" class="{$class}" href="{concat($href_base, a/@href)}"><xsl:value-of select="a"/></a> + </xsl:otherwise> + </xsl:choose> + +  + <xsl:if test="count(.//a[@href = $pagename]) > 0"> + <xsl:apply-templates select="ul" mode="menu"> + <xsl:with-param name="pagename" select="$pagename"/> + <xsl:with-param name="level" select="$level + 1"/> + </xsl:apply-templates> + </xsl:if> + </div></li> + </xsl:for-each> + </ul> + </xsl:template> + + <xsl:template name="toc"> + <ul> + <xsl:for-each select="/html/body/h2[count(a) = 1]"> + <xsl:variable name="thish2" select="."/> + <li> + <a href="#{a/@name}"><xsl:value-of select="a/text()"/></a> + <xsl:if test="count(./following-sibling::h3[preceding-sibling::h2[1] = $thish2 and count(a) = 1]) > 0"> + <ul> + <xsl:for-each select="./following-sibling::h3[preceding-sibling::h2[1] = $thish2 and count(a) = 1]"> + <xsl:variable name="thish3" select="."/> + <li> + <a href="#{a/@name}"><xsl:value-of select="a/text()"/></a> + <xsl:if test="count(./following-sibling::h4[preceding-sibling::h3[1] = $thish3 and count(a) = 1]) > 0"> + <ul> + <xsl:for-each select="./following-sibling::h4[preceding-sibling::h3[1] = $thish3 and count(a) = 1]"> + <xsl:variable name="thish4" select="."/> + <li> + <a href="#{a/@name}"><xsl:value-of select="a/text()"/></a> + <xsl:if test="count(./following-sibling::h5[preceding-sibling::h4[1] = $thish4 and count(a) = 1]) > 0"> + <ul> + <xsl:for-each select="./following-sibling::h5[preceding-sibling::h4[1] = $thish4 and count(a) = 1]"> + <xsl:variable name="thish5" select="."/> + <li> + <a href="#{a/@name}"><xsl:value-of select="a/text()"/></a> + <xsl:if test="count(./following-sibling::h6[preceding-sibling::h5[1] = $thish5 and count(a) = 1]) > 0"> + <ul> + <xsl:for-each select="./following-sibling::h6[preceding-sibling::h5[1] = $thish5 and count(a) = 1]"> + <li> + <a href="#{a/@name}"><xsl:value-of select="a/text()"/></a> + </li> + </xsl:for-each> + </ul> + </xsl:if> + </li> + </xsl:for-each> + </ul> + </xsl:if> + </li> + </xsl:for-each> + </ul> + </xsl:if> + </li> + </xsl:for-each> + </ul> + </xsl:if> + </li> + </xsl:for-each> + </ul> + </xsl:template> + +  + <xsl:template match="/" mode="page"> + <xsl:param name="pagename"/> + <html> + <xsl:comment> + This file is autogenerated from <xsl:value-of select="$pagename"/>.in + Do not edit this file. Changes will be lost. + </xsl:comment> + <head> + <link rel="stylesheet" type="text/css" href="{$href_base}main.css"/> + <link rel="SHORTCUT ICON" href="{$href_base}32favicon.png"/> + <title>libvirt: <xsl:value-of select="html/body/h1"/></title> + <meta name="description" content="libvirt, virtualization, virtualization API"/> + </head> + <body> + <div id="header"> + <div id="headerLogo"/> + <div id="headerSearch"> + <form action="{$href_base}search.php" enctype="application/x-www-form-urlencoded" method="get"> + <div> + <input id="query" name="query" type="text" size="12" value=""/> + <input id="submit" name="submit" type="submit" value="Search"/> + </div> + </form> + </div> + </div> + <div id="body"> + <div id="menu"> + <xsl:apply-templates select="exsl:node-set($sitemap)/ul" mode="menu"> + <xsl:with-param name="pagename" select="$pagename"/> + <xsl:with-param name="level" select="0"/> + </xsl:apply-templates> + </div> + <div id="content"> + <xsl:apply-templates select="/html/body/*" mode="content"/> + </div> + </div> + <div id="footer"> + <p id="sponsor"> + Sponsored by:<br/> + <a href="http://et.redhat.com/"><img src="{$href_base}et.png" alt="Project sponsored by Red Hat Emerging Technology"/></a> + </p> + </div> + </body> + </html> + </xsl:template> + +</xsl:stylesheet> -- 1.7.1

3 3

Re: [libvirt] [PATCH] cgroup : remove the ns_cgroup
by Daniel Lezcano 28 Jan '11

28 Jan '11

On 01/27/2011 02:45 AM, Andrew Morton wrote: > On Thu, 27 Jan 2011 09:08:51 +0800 Li Zefan<lizf(a)cn.fujitsu.com> wrote: > >> Andrew Morton wrote: >>> On Tue, 25 Jan 2011 10:39:48 +0100 >>> Daniel Lezcano<daniel.lezcano(a)free.fr> wrote: >>> >>>> This patch removes the ns_cgroup as suggested in the following thread: >>> I had this patch queued up in September last year, but dropped it. Why >>> did I do that? >> Because you wanted to wait for some time for users (if any) to notice this >> coming change. >> >> Author: Daniel Lezcano<daniel.lezcano(a)free.fr> >> Date: Wed Oct 27 15:33:38 2010 -0700 >> >> cgroup: notify ns_cgroup deprecated >> >> The ns_cgroup will be removed very soon. Let's warn, for this version, >> ns_cgroup is deprecated. >> >> Make ns_cgroup and clone_children exclusive. If the clone_children is set >> and the ns_cgroup is mounted, let's fail with EINVAL when the ns_cgroup >> subsys is created (a printk will help the user to understand why the >> creation fails). >> >> Update the feature remove schedule file with the deprecated ns_cgroup. >> >> Signed-off-by: Daniel Lezcano<daniel.lezcano(a)free.fr> >> Acked-by: Paul Menage<menage(a)google.com> >> Signed-off-by: Andrew Morton<akpm(a)linux-foundation.org> >> Signed-off-by: Linus Torvalds<torvalds(a)linux-foundation.org> > ooh, that was clever of me. > > Here is the text which was missing from the changelog: > > This is a userspace-visible change. Commit 45531757b45c ("cgroup: > notify ns_cgroup deprecated") (merged into 2.6.27) caused the kernel > to emit a printk warning users that the feature is planned for > removal. Since that time we have heard from XXX users who were > affected by this. > > Please provide XXX. Ok, AFAIK nobody makes use of the ns_cgroup except the LXC userspace tools which I maintain and where the backward compatibility with the ns_cgroup and the clone_children flag is already implemented. Since today nobody seems to be affected by this. I Cc'ed the libvirt mailing list. > How do we know that 2.6.37->2.6.38 is long enough? Will any major > distros be released containing this warning in that timeframe? I doubt > it. Hmm, maybe it is too short but I don't think someone will complain about this feature removal. Google chromium is using the namespaces, hence a lot of cgroup is created on the system. The vsftpd and some pam modules uses the namespaces too. I won't be surprised if one of these applications fails with 'clone' returning EEXIST ...

2 1

[libvirt] C# bindings need and advice from the experts
by arnaud.champion＠devatom.fr 28 Jan '11

28 Jan '11

?Hi, I'm working on C# bindings. The goal is to obtain a more C# API for the API users. So I have create object for libvirt familly function (an object Connect, Domain, Storage and so on). All is almost done, but I need and advice about the way to handle object properties. For example, for the Connect object, I expose a "RunningDomains" property that can be used in this manner : Connect myConn = new Connect("qemu+tcp://192.168.220.198/system"); List<Domain> runningDomains = myConn.RunningsDomains; In the Connect object, the property "RunningDomains" is coded in this : /// <summary> /// Get the list of running domains /// </summary> public List<Domain> RunningDomains { get { if (_conn == IntPtr.Zero) return null; int nbRunningDomain = NumOfDomains(_conn); int[] runningDomainIds = new int[nbRunningDomain]; ListDomains(_conn, runningDomainIds, nbRunningDomain); return runningDomainIds.Select(id => new Domain(Domain.LookupByID(_conn, id), this)).ToList(); } } So the property call "virConnectNumOfDomains" and "virConnectListDomains" each time the property is called. And I don't know if it is a good thing. The other way, is to keep the list in the Connect object and handle domain adding or removing in this via callbacks. This avoid multiple call to the librar. Any advice ? Regards, Arnaud

1 0

[libvirt] [PATCH 0/4 v2] Add blkio cgroup support
by Gui Jianfeng 28 Jan '11

28 Jan '11

Hi This patchset adds blkio cgroup support for qemu and lxc. [PATCH 1/4] cgroup: Enable cgroup hierarchy for blkio cgroup [PATCH 2/4 v2] cgroup: Implement blkio.weight tuning API. [PATCH 3/4 v2] qemu: Implement blkio tunable XML configuration and parsing. [PATCH 4/4] LXC： LXC Blkio weight configuration support. Will post a patchset to implement virsh command "blkiotune" to tune blkio cgroup parameter later on. conf/domain_conf.c | 15 ++++++++++++++- conf/domain_conf.h | 4 ++++ libvirt_private.syms | 2 ++ lxc/lxc_controller.c | 10 ++++++++++ qemu/qemu_cgroup.c | 16 +++++++++++++++- qemu/qemu_conf.c | 3 ++- util/cgroup.c | 41 ++++++++++++++++++++++++++++++++++++++++- util/cgroup.h | 4 ++++ 8 files changed, 91 insertions(+), 4 deletions(-) Thanks Gui

3 3

[libvirt] [RFC/PATCH REPOST] Adding persistent entry for cpu tunable
by Nikunj A. Dadhania 28 Jan '11

28 Jan '11

From: Nikunj A. Dadhania <nikunj(a)linux.vnet.ibm.com> Make cpu share persistent and add support for parsing them. docs/formatdomain.html.in: Document cputune element src/conf/domain_conf.c,src/conf/domain_conf.h: Add cputune element parsing src/lxc/lxc_controller.c: Use the parsed cputune shares value src/qemu/qemu_cgroup.c: Use the parsed cputune shares value Signed-off-by: Nikunj A. Dadhania <nikunj(a)linux.vnet.ibm.com> --- docs/formatdomain.html.in | 11 +++++++++++ src/conf/domain_conf.c | 14 ++++++++++++++ src/conf/domain_conf.h | 3 +++ src/lxc/lxc_controller.c | 10 ++++++++++ src/qemu/qemu_cgroup.c | 15 +++++++++++++++ 5 files changed, 53 insertions(+), 0 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 55e2cbd..522dc06 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -280,6 +280,9 @@ <swap_hard_limit>2097152</swap_hard_limit> <min_guarantee>65536</min_guarantee> </memtune> + <cputune> + <shares>1024</shares> + </cputune> <vcpu cpuset="1-4,^3,6" current="1">2</vcpu> ...</pre> @@ -317,6 +320,14 @@ <dd> The optional <code>min_guarantee</code> element is the guaranteed minimum memory allocation for the guest. The units for this value are kilobytes (i.e. blocks of 1024 bytes)</dd> + <dt><code>cputune</code></dt> + <dd> The optional <code>cputune</code> element provides details + regarding the cpu tuneable parameters for the domain. If this is + omitted, it defaults to the OS provided defaults.</dd> + <dt><code>shares</code></dt> + <dd> The optional <code>shares</code> element is the proportional + weighted share for the domain. If this is omitted, it defaults to the OS + provided defaults.</dd> <dt><code>vcpu</code></dt> <dd>The content of this element defines the maximum number of virtual CPUs allocated for the guest OS, which must be between 1 and diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 645767e..63c8927 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -4904,6 +4904,11 @@ static virDomainDefPtr virDomainDefParseXML(virCapsPtr caps, &def->mem.swap_hard_limit) < 0) def->mem.swap_hard_limit = 0; + /* Extract cpu tunables */ + if (virXPathULong("string(./cputune/shares[1])", ctxt, + &def->cputune.shares) < 0) + def->cputune.shares = 0; + n = virXPathULong("string(./vcpu[1])", ctxt, &count); if (n == -2) { virDomainReportError(VIR_ERR_XML_ERROR, "%s", @@ -7313,6 +7318,15 @@ char *virDomainDefFormat(virDomainDefPtr def, def->mem.swap_hard_limit) virBufferVSprintf(&buf, " </memtune>\n"); + if (def->cputune.shares) + virBufferVSprintf(&buf, " <cputune>\n"); + if (def->cputune.shares) { + virBufferVSprintf(&buf, " <shares>%lu</shares>\n", + def->cputune.shares); + } + if (def->cputune.shares) + virBufferVSprintf(&buf, " </cputune>\n"); + if (def->mem.hugepage_backed) { virBufferAddLit(&buf, " <memoryBacking>\n"); virBufferAddLit(&buf, " <hugepages/>\n"); diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index cf7bdc0..a2c83d3 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -981,6 +981,9 @@ struct _virDomainDef { unsigned short maxvcpus; int cpumasklen; char *cpumask; + struct { + unsigned long shares; /* proportional weight */ + } cputune; /* These 3 are based on virDomainLifeCycleAction enum flags */ int onReboot; diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c index af0b70c..24edb49 100644 --- a/src/lxc/lxc_controller.c +++ b/src/lxc/lxc_controller.c @@ -144,6 +144,16 @@ static int lxcSetContainerResources(virDomainDefPtr def) } } + if(def->cputune.shares) { + rc = virCgroupSetCpuShares(cgroup, def->cputune.shares); + if (rc != 0) { + virReportSystemError(-rc, + _("Unable to set cpu shares for domain %s"), + def->name); + goto cleanup; + } + } + rc = virCgroupDenyAllDevices(cgroup); if (rc != 0) { virReportSystemError(-rc, diff --git a/src/qemu/qemu_cgroup.c b/src/qemu/qemu_cgroup.c index e5536c0..d4e73bd 100644 --- a/src/qemu/qemu_cgroup.c +++ b/src/qemu/qemu_cgroup.c @@ -304,6 +304,21 @@ int qemuSetupCgroup(struct qemud_driver *driver, vm->def->name); } + if ((rc = qemuCgroupControllerActive(driver, VIR_CGROUP_CONTROLLER_CPU))) { + if (vm->def->cputune.shares != 0) { + rc = virCgroupSetCpuShares(cgroup, vm->def->cputune.shares); + if (rc != 0) { + virReportSystemError(-rc, + _("Unable to set cpu shares for domain %s"), + vm->def->name); + goto cleanup; + } + } + } else { + VIR_WARN("CPU cgroup is disabled in qemu configuration file: %s", + vm->def->name); + } + done: virCgroupFree(&cgroup); return 0;

2 2

[libvirt] [PATCH] docs: Add docs for new extra parameter pkipath
by Osier Yang 28 Jan '11

28 Jan '11

* docs/remote.html.in --- docs/remote.html.in | 30 ++++++++++++++++++++++++++++++ 1 files changed, 30 insertions(+), 0 deletions(-) diff --git a/docs/remote.html.in b/docs/remote.html.in index b0fdb7c..a68d0fa 100644 --- a/docs/remote.html.in +++ b/docs/remote.html.in @@ -308,6 +308,22 @@ Note that parameter values must be <td colspan="2"/> <td> Example: <code>no_tty=1</code> </td> </tr> + <tr> + <td> + <code>pkipath</code> + </td> + <td> tls</td> + <td> + Specifies x509 certificates path for client. As long as one of the + certificates (CA cerfificate, client key, client certificate) doesn't + exist in the specified path, the connection will fail with fatal + error. +</td> + </tr> + <tr> + <td colspan="2"/> + <td> Example: <code>pkipath=/tmp/pki/client</code> </td> + </tr> </table> <h3> <a name="Remote_certificates">Generating TLS certificates</a> @@ -372,6 +388,20 @@ next section. </td> </tr> </table> + <p> +If 'pkipath' is specified in URI, then all the client certificates should +be able to found in the path specified, otherwise, connection will fail +with fatal error. And if 'pkipath' is not specified: +</p> + <ul> + <li> For user who is non-root, libvirt trys to find the certificates +in $HOME/.pki/libvirt, if one of the required certificates can not be found, +global default locations(/etc/pki/CA/cacert.pem, +/etc/pki/libvirt/private/clientkey, /etc/pki/libvirt/clientcert.pem) will be +used. +</li> + <li> For user who is root, global default location will be used. </li> + </ul> <h4> <a name="Remote_TLS_background">Background to TLS certificates</a> </h4> -- 1.7.3.2

4 9

[libvirt] [PATCH 4/4] LXC： LXC Blkio weight configuration support.
by Gui Jianfeng 28 Jan '11

28 Jan '11

LXC Blkio weight configuration support. Signed-off-by: Gui Jianfeng <guijianfeng(a)cn.fujitsu.com> --- src/lxc/lxc_controller.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c index af0b70c..7bb3581 100644 --- a/src/lxc/lxc_controller.c +++ b/src/lxc/lxc_controller.c @@ -104,6 +104,16 @@ static int lxcSetContainerResources(virDomainDefPtr def) goto cleanup; } + if (def->blkio.weight) { + rc = virCgroupSetWeight(cgroup, def->blkio.weight); + if (rc != 0) { + virReportSystemError(-rc, + _("Unable to set Blkio weight for domain %s"), + def->name); + goto cleanup; + } + } + rc = virCgroupSetMemory(cgroup, def->mem.max_balloon); if (rc != 0) { virReportSystemError(-rc, -- 1.7.1

2 1

[libvirt] [PATCH 3/4 v2] qemu: Implement blkio tunable XML configuration and parsing.
by Gui Jianfeng 28 Jan '11

28 Jan '11

Implement blkio tunable XML configuration and parsing. Signed-off-by: Gui Jianfeng <guijianfeng(a)cn.fujitsu.com> --- src/conf/domain_conf.c | 15 ++++++++++++++- src/conf/domain_conf.h | 4 ++++ src/qemu/qemu_cgroup.c | 16 +++++++++++++++- src/qemu/qemu_conf.c | 3 ++- 4 files changed, 35 insertions(+), 3 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 645767e..1d4cd30 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -4810,7 +4810,7 @@ static virDomainDefPtr virDomainDefParseXML(virCapsPtr caps, { xmlNodePtr *nodes = NULL, node = NULL; char *tmp = NULL; - int i, n; + int i, n, w; long id = -1; virDomainDefPtr def; unsigned long count; @@ -4887,6 +4887,11 @@ static virDomainDefPtr virDomainDefParseXML(virCapsPtr caps, if (node) def->mem.hugepage_backed = 1; + /* Extract blkio cgroup tunables */ + if (virXPathULong("string(./blkiotune/weight)", ctxt, + &def->blkio.weight) < 0) + def->blkio.weight = 0; + /* Extract other memory tunables */ if (virXPathULong("string(./memtune/hard_limit)", ctxt, &def->mem.hard_limit) < 0) @@ -7289,6 +7294,14 @@ char *virDomainDefFormat(virDomainDefPtr def, virBufferVSprintf(&buf, " <currentMemory>%lu</currentMemory>\n", def->mem.cur_balloon); + /* add blkiotune only if there are any */ + if (def->blkio.weight) { + virBufferVSprintf(&buf, " <blkiotune>\n"); + virBufferVSprintf(&buf, " <weight>%lu</weight>\n", + def->blkio.weight); + virBufferVSprintf(&buf, " </blkiotune>\n"); + } + /* add memtune only if there are any */ if (def->mem.hard_limit || def->mem.soft_limit || def->mem.min_guarantee || def->mem.swap_hard_limit) diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index cf7bdc0..b117869 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -969,6 +969,10 @@ struct _virDomainDef { char *description; struct { + unsigned long weight; + } blkio; + + struct { unsigned long max_balloon; unsigned long cur_balloon; unsigned long hugepage_backed; diff --git a/src/qemu/qemu_cgroup.c b/src/qemu/qemu_cgroup.c index e5536c0..f664c17 100644 --- a/src/qemu/qemu_cgroup.c +++ b/src/qemu/qemu_cgroup.c @@ -54,7 +54,6 @@ int qemuCgroupControllerActive(struct qemud_driver *driver, return 0; } - int qemuSetupDiskPathAllow(virDomainDiskDefPtr disk ATTRIBUTE_UNUSED, const char *path, size_t depth ATTRIBUTE_UNUSED, @@ -270,6 +269,21 @@ int qemuSetupCgroup(struct qemud_driver *driver, } } + if (qemuCgroupControllerActive(driver, VIR_CGROUP_CONTROLLER_BLKIO)) { + if (vm->def->blkio.weight != 0) { + rc = virCgroupSetWeight(cgroup, vm->def->blkio.weight); + if(rc != 0) { + virReportSystemError(-rc, + _("Unable to set io weight for domain %s"), + vm->def->name); + goto cleanup; + } + } + } else { + qemuReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("Block I/O tuning is not available on this host")); + } + if ((rc = qemuCgroupControllerActive(driver, VIR_CGROUP_CONTROLLER_MEMORY))) { if (vm->def->mem.hard_limit != 0) { rc = virCgroupSetMemoryHardLimit(cgroup, vm->def->mem.hard_limit); diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index e1502dc..121080f 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -299,7 +299,8 @@ int qemudLoadDriverConfig(struct qemud_driver *driver, driver->cgroupControllers = (1 << VIR_CGROUP_CONTROLLER_CPU) | (1 << VIR_CGROUP_CONTROLLER_DEVICES) | - (1 << VIR_CGROUP_CONTROLLER_MEMORY); + (1 << VIR_CGROUP_CONTROLLER_MEMORY) | + (1 << VIR_CGROUP_CONTROLLER_BLKIO); } for (i = 0 ; i < VIR_CGROUP_CONTROLLER_LAST ; i++) { if (driver->cgroupControllers & (1 << i)) { -- 1.7.1

2 1

[libvirt] [PATCH] Report error more accurate if failes on attaching device.
by Hu Tao 28 Jan '11

28 Jan '11

When attaching device from a xml file and the device is mis-configured, virsh gives mis-leading message "out of memory". This patch fixes this. --- src/qemu/qemu_command.c | 2 ++ src/qemu/qemu_hotplug.c | 1 - 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 6dc586f..303063a 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -1496,6 +1496,8 @@ qemuBuildControllerDevStr(virDomainControllerDefPtr def) /* We always get an IDE controller, whether we want it or not. */ case VIR_DOMAIN_CONTROLLER_TYPE_IDE: default: + qemuReportError(VIR_ERR_INTERNAL_ERROR, "Unknown controller type: %s\n", + virDomainControllerTypeToString(def->type)); goto error; } diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 8be993b..ca81a3d 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -260,7 +260,6 @@ int qemuDomainAttachPciControllerDevice(struct qemud_driver *driver, goto cleanup; if (!(devstr = qemuBuildControllerDevStr(controller))) { - virReportOOMError(); goto cleanup; } } -- 1.7.3.1

2 4

[libvirt] [PATCH 0/3 v2] qemu: Allow serving VNC over a unix domain socket
by Cole Robinson 28 Jan '11

28 Jan '11

This series enables use of qemu's -vnc unix:/some/socket/path functionality. A qemu.conf option is provided to make this the default for VNC devices without an explicit listen or socket value. Serving VNC over a unix socket prevents unprivileged local users from accessing a guest's console. The downside is that no clients currently support it (though virt-manager support is ready), and certain common usage scenarios cannot handle the tighter permissions (like a regular user connecting to qemu:///system with policykit). v2: schema: Make listen vs. socket a <choice> Add qemu.conf option for auto allocating a socket Cole Robinson (3): qemu: Set domain def transient at beginning of startup process qemu: Allow serving VNC over a unix domain socket qemu: Add conf option to auto setup VNC unix sockets docs/formatdomain.html.in | 6 ++- docs/schemas/domain.rng | 47 ++++++++++------ src/conf/domain_conf.c | 41 +++++++++----- src/conf/domain_conf.h | 4 +- src/lxc/lxc_driver.c | 2 +- src/qemu/qemu.conf | 8 +++ src/qemu/qemu_command.c | 60 ++++++++++++++------ src/qemu/qemu_conf.c | 4 + src/qemu/qemu_conf.h | 1 + src/qemu/qemu_driver.c | 14 +++-- src/test/test_driver.c | 2 +- src/uml/uml_driver.c | 2 +- tests/qemuargv2xmltest.c | 1 + .../qemuxml2argv-graphics-vnc-socket.args | 1 + .../qemuxml2argv-graphics-vnc-socket.xml | 30 ++++++++++ tests/qemuxml2argvtest.c | 1 + 16 files changed, 164 insertions(+), 60 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-socket.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-socket.xml -- 1.7.3.2

3 9

[libvirt] [PATCH 0/3] Add some new features into migration
by Wen Congyang 27 Jan '11

27 Jan '11

This patch set adds three new features into migration: 1. Cancel migration if user presses Ctrl-C when migration is in progress 2. show migration's progress 3. auto-suspend the guest OS at timeout, where the migration will complete offline Hu Tao (1): Cancel migration if user presses Ctrl-C when migration is in progress Wen Congyang (2): show mig progress force guest suspend at timeout tools/virsh.c | 211 ++++++++++++++++++++++++++++++++++++++++++++++++++++--- tools/virsh.pod | 7 ++- 2 files changed, 206 insertions(+), 12 deletions(-)

4 13

[libvirt] [RFC PATCHv2 0/5] Smartcard support
by Eric Blake 27 Jan '11

27 Jan '11

Posting now, even though the patch series is not quite polished (still lacking a final test), in order to start the review cycle. Eric Blake (5): domain_conf: split source data out from ChrDef qemu: move monitor device out of domain_conf common code smartcard: add XML support for <smartcard> device smartcard: add domain conf support WIP: smartcard: turn on qemu support cfg.mk | 2 + docs/formatdomain.html.in | 72 +++ docs/schemas/domain.rng | 37 ++ src/conf/domain_conf.c | 567 +++++++++++++++----- src/conf/domain_conf.h | 82 +++- src/libvirt_private.syms | 5 + src/lxc/lxc_driver.c | 12 +- src/qemu/qemu_cgroup.c | 10 +- src/qemu/qemu_command.c | 181 ++++--- src/qemu/qemu_command.h | 9 +- src/qemu/qemu_domain.c | 11 +- src/qemu/qemu_domain.h | 4 +- src/qemu/qemu_driver.c | 50 +- src/qemu/qemu_hotplug.c | 2 +- src/qemu/qemu_monitor.c | 4 +- src/qemu/qemu_monitor.h | 4 +- src/security/security_dac.c | 8 +- src/security/security_selinux.c | 10 +- src/security/virt-aa-helper.c | 42 +- src/uml/uml_conf.c | 16 +- src/uml/uml_driver.c | 14 +- src/vbox/vbox_tmpl.c | 49 +- src/vmx/vmx.c | 84 ++-- src/xen/xen_driver.c | 6 +- src/xen/xend_internal.c | 87 ++-- .../qemuxml2argv-smartcard-host-certificates.xml | 20 + .../qemuxml2argv-smartcard-host.xml | 16 + .../qemuxml2argv-smartcard-passthrough-tcp.xml | 19 + tests/qemuxml2argvtest.c | 5 +- 29 files changed, 997 insertions(+), 431 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-smartcard-host-certificates.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-smartcard-host.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-smartcard-passthrough-tcp.xml -- 1.7.3.4

3 32

[libvirt] [PATCH v2] qemu: Warning prompt if invalid dump image format specified
by Osier Yang 27 Jan '11

27 Jan '11

"getCompressionType" trys to throw error when invalid dump image format is specified, or the compression program for the specified image format is not available, but at the same time, it returns enum qemud_save_formats, as a result, upper function will think it was successful, and disgard to check the error. Change "qemuReportError" into "VIR_WARN" instead to let the user known what happened. v1 patch is here: http://www.redhat.com/archives/libvir-list/2011-January/msg00715.html As it reverted b6f13bb7002da76db15242e1d996e8a6222a754, and it was intentionally to chose the behavior of falling back to raw if the compression type is invalid, so simply use "VIR_WARN" to fix the problem. * src/qemu/qemu_driver.c --- src/qemu/qemu_driver.c | 13 ++++++------- 1 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 34cc29f..dac71fa 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -4806,16 +4806,15 @@ getCompressionType(struct qemud_driver *driver) if (driver->dumpImageFormat) { compress = qemudSaveCompressionTypeFromString(driver->dumpImageFormat); if (compress < 0) { - qemuReportError(VIR_ERR_OPERATION_FAILED, "%s", - _("Invalid dump image format specified in " - "configuration file, using raw")); + VIR_WARN("Invalid dump image format '%s' specified in " + "configuration file, using raw", + driver->dumpImageFormat); return QEMUD_SAVE_FORMAT_RAW; } if (!qemudCompressProgramAvailable(compress)) { - qemuReportError(VIR_ERR_OPERATION_FAILED, - "%s", _("Compression program for dump image format " - "in configuration file isn't available, " - "using raw")); + VIR_WARN("Compression program for dump image format '%s' " + "in configuration file isn't available, using raw", + driver->dumpImageFormat); return QEMUD_SAVE_FORMAT_RAW; } } -- 1.7.3.2

2 3

[libvirt] Domain callback, the new way
by arnaud.champion＠devatom.fr 27 Jan '11

27 Jan '11

?Hi, I'm working on c# bindings, on domain callback. I have successfully binded the old way to manage callbacks via the old virConnectDomainEventRegister function. Now I'm trying to work with the new API contract with virConnectDomainEventRegisterAny... I'm looking for a sample (in C for exemple) to see how using these functions, can anyone can explain me how this work ? Regards, Arnaud

1 1

[libvirt] [PATCH 1/1] Do not use virtio-serial port 0 for generic ports
by David Allan 27 Jan '11

27 Jan '11

Per the discussion in: https://bugzilla.redhat.com/show_bug.cgi?id=670394 The port numbering should start from 1, not 0. We assign maxport + 1, so start maxport at 0. --- src/conf/domain_conf.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index d5445a4..08c21e5 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -5328,7 +5328,7 @@ static virDomainDefPtr virDomainDefParseXML(virCapsPtr caps, if (chr->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_SERIAL && chr->info.addr.vioserial.port == 0) { - int maxport = -1; + int maxport = 0; int j; for (j = 0 ; j < i ; j++) { virDomainChrDefPtr thischr = def->channels[j]; -- 1.7.3.4

4 6

[libvirt] [PATCH] Imprint all logs with version + package build information
by Daniel P. Berrange 27 Jan '11

27 Jan '11

The logging functions are enhanced so that immediately prior to the first log message being printed to any output channel, the libvirt package version will be printed. eg $ LIBVIRT_DEBUG=1 virsh 18:13:28.013: 17536: info : libvirt version: 0.8.7 18:13:28.013: 17536: debug : virInitialize:361 : register drivers ... The 'configure' script gains a '--with-package-string' argument to allow distros to append a custom string with package specific data. The RPM specfile is modified so that it appends the RPM version, the build host, the build date and the packager name. eg $ LIBVIRT_DEBUG=1 virsh 18:14:52.086: 17551: info : libvirt version: 0.8.7, package: 1.fc13 (Fedora Project, x86-01.phx2.fedoraproject.org, 01-27-2011-18:00:10) 18:14:52.086: 17551: debug : virInitialize:361 : register drivers Thus when distro packagers receive bug reports they can clearly see what version was in use, even if the bug reporter mistakenly or intentionally lies about version/builds * src/util/logging.c: Output version data prior to first log message * libvirt.spec.in: Include RPM release, date, hostname & packager * configure.ac: Add --with-package-string arg --- configure.ac | 10 ++++++ libvirt.spec.in | 7 ++++ src/util/logging.c | 86 +++++++++++++++++++++++++++++++++++++++++++--------- 3 files changed, 88 insertions(+), 15 deletions(-) diff --git a/configure.ac b/configure.ac index f310a5e..92d77e4 100644 --- a/configure.ac +++ b/configure.ac @@ -29,6 +29,16 @@ AC_SUBST([LIBVIRT_VERSION]) AC_SUBST([LIBVIRT_VERSION_INFO]) AC_SUBST([LIBVIRT_VERSION_NUMBER]) +AC_ARG_WITH([package-string], + [AS_HELP_STRING([--with-package-string], + [Extra package name/version string])], + [],[]) +if test "x$with_package_string" != "xno" +then + AC_DEFINE_UNQUOTED([PACKAGE_STRING], ["$with_package_string"], + [Extra package name/version string]) +fi + dnl Required minimum versions of all libs we depend on LIBXML_REQUIRED="2.6.0" GNUTLS_REQUIRED="1.0.25" diff --git a/libvirt.spec.in b/libvirt.spec.in index 0a2d10e..43c9067 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -592,6 +592,12 @@ of recent versions of Linux (and other OSes). %define _without_dtrace --without-dtrace %endif +%define when %(date +"%%m-%%d-%%Y-%%H:%%M:%%S") +%define where %(hostname) +%define who %{?packager}%{!?packager:Unknown} +%define with_package_string --with-package-string="%{release} (%{who}, %{when}, %{where})" + + %configure %{?_without_xen} \ %{?_without_qemu} \ %{?_without_openvz} \ @@ -626,6 +632,7 @@ of recent versions of Linux (and other OSes). %{?_without_macvtap} \ %{?_without_audit} \ %{?_without_dtrace} \ + %{with_package_string} \ --with-qemu-user=%{qemu_user} \ --with-qemu-group=%{qemu_group} \ --with-init-script=redhat \ diff --git a/src/util/logging.c b/src/util/logging.c index a80c3e3..5102e06 100644 --- a/src/util/logging.c +++ b/src/util/logging.c @@ -108,6 +108,7 @@ static int virLogNbFilters = 0; * after filtering, multiple output can be used simultaneously */ struct _virLogOutput { + bool logVersion; void *data; virLogOutputFunc f; virLogCloseFunc c; @@ -490,6 +491,7 @@ int virLogDefineOutput(virLogOutputFunc f, virLogCloseFunc c, void *data, goto cleanup; } ret = virLogNbOutputs++; + virLogOutputs[ret].logVersion = true; virLogOutputs[ret].f = f; virLogOutputs[ret].c = c; virLogOutputs[ret].data = data; @@ -501,6 +503,50 @@ cleanup: return ret; } +static int +virLogFormatString(char **msg, + const char *funcname, + long long linenr, + struct tm *time_info, + struct timeval *cur_time, + int priority, + const char *str) +{ + int ret; + if ((funcname != NULL)) { + ret = virAsprintf(msg, "%02d:%02d:%02d.%03d: %d: %s : %s:%lld : %s\n", + time_info->tm_hour, time_info->tm_min, + time_info->tm_sec, (int) cur_time->tv_usec / 1000, + virThreadSelfID(), + virLogPriorityString(priority), funcname, linenr, str); + } else { + ret = virAsprintf(msg, "%02d:%02d:%02d.%03d: %d: %s : %s\n", + time_info->tm_hour, time_info->tm_min, + time_info->tm_sec, (int) cur_time->tv_usec / 1000, + virThreadSelfID(), + virLogPriorityString(priority), str); + } + return ret; +} + +static int +virLogVersionString(char **msg, + struct tm *time_info, + struct timeval *cur_time) +{ +#ifdef PACKAGE_STRING +# define LOG_VERSION_STRING \ + "libvirt version: " VERSION ", package: " PACKAGE_STRING +#else +# define LOG_VERSION_STRING \ + "libvirt version: " VERSION +#endif + + return virLogFormatString(msg, NULL, 0, + time_info, cur_time, + VIR_LOG_INFO, LOG_VERSION_STRING); +} + /** * virLogMessage: * @category: where is that message coming from @@ -516,6 +562,7 @@ cleanup: */ void virLogMessage(const char *category, int priority, const char *funcname, long long linenr, int flags, const char *fmt, ...) { + static bool logVersionStderr = true; char *str = NULL; char *msg; struct timeval cur_time; @@ -547,19 +594,9 @@ void virLogMessage(const char *category, int priority, const char *funcname, gettimeofday(&cur_time, NULL); localtime_r(&cur_time.tv_sec, &time_info); - if ((funcname != NULL)) { - ret = virAsprintf(&msg, "%02d:%02d:%02d.%03d: %d: %s : %s:%lld : %s\n", - time_info.tm_hour, time_info.tm_min, - time_info.tm_sec, (int) cur_time.tv_usec / 1000, - virThreadSelfID(), - virLogPriorityString(priority), funcname, linenr, str); - } else { - ret = virAsprintf(&msg, "%02d:%02d:%02d.%03d: %d: %s : %s\n", - time_info.tm_hour, time_info.tm_min, - time_info.tm_sec, (int) cur_time.tv_usec / 1000, - virThreadSelfID(), - virLogPriorityString(priority), str); - } + ret = virLogFormatString(&msg, funcname, linenr, + &time_info, &cur_time, + priority, str); VIR_FREE(str); if (ret < 0) { /* apparently we're running out of memory */ @@ -578,12 +615,31 @@ void virLogMessage(const char *category, int priority, const char *funcname, virLogStr(msg, len); virLogLock(); for (i = 0; i < virLogNbOutputs;i++) { - if (priority >= virLogOutputs[i].priority) + if (priority >= virLogOutputs[i].priority) { + if (virLogOutputs[i].logVersion) { + char *ver = NULL; + if (virLogVersionString(&ver, &time_info, &cur_time) >= 0) + virLogOutputs[i].f(category, priority, __func__, __LINE__, + ver, strlen(ver), + virLogOutputs[i].data); + VIR_FREE(ver); + virLogOutputs[i].logVersion = false; + } virLogOutputs[i].f(category, priority, funcname, linenr, msg, len, virLogOutputs[i].data); + } } - if ((virLogNbOutputs == 0) && (flags != 1)) + if ((virLogNbOutputs == 0) && (flags != 1)) { + if (logVersionStderr) { + char *ver = NULL; + if (virLogVersionString(&ver, &time_info, &cur_time) >= 0) + ignore_value (safewrite(STDERR_FILENO, + ver, strlen(ver))); + VIR_FREE(ver); + logVersionStderr = false; + } ignore_value (safewrite(STDERR_FILENO, msg, len)); + } virLogUnlock(); VIR_FREE(msg); -- 1.7.3.4

2 1

[libvirt] [PATCH] Remove bogus log warning lines when launching QEMU
by Daniel P. Berrange 27 Jan '11

27 Jan '11

The refactoring of QEMU command startup was comitted with a couple of VIR_WARN lines left in from debugging. * src/qemu/qemu_driver.c: Remove log warning lines --- src/qemu/qemu_driver.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 98eb91f..2e8f4f9 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -2865,7 +2865,6 @@ static int qemudStartVMDaemon(virConnectPtr conn, if (driver->clearEmulatorCapabilities) virCommandClearCaps(cmd); - VIR_WARN("Executing %s", vm->def->emulator); virCommandSetPreExecHook(cmd, qemudSecurityHook, &hookData); virCommandSetOutputFD(cmd, &logfile); @@ -2875,7 +2874,6 @@ static int qemudStartVMDaemon(virConnectPtr conn, virCommandDaemonize(cmd); ret = virCommandRun(cmd, NULL); - VIR_WARN("Executing done %s", vm->def->emulator); VIR_FREE(pidfile); /* wait for qemu process to to show up */ -- 1.7.3.4

2 1

[libvirt] [PATCH] Remove double close of qemu monitor
by Daniel P. Berrange 27 Jan '11

27 Jan '11

When qemuMonitorSetCapabilities() fails, there is no need to call qemuMonitorClose(), because the caller will already see the error code and tear down the entire VM. The extra call to qemuMonitorClose resulted in a double-free due to it removing a ref count prematurely. * src/qemu/qemu_driver.c: Remove premature close of monitor --- src/qemu/qemu_driver.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 3b937e4..2e8f4f9 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -900,8 +900,6 @@ qemuConnectMonitor(struct qemud_driver *driver, virDomainObjPtr vm) qemuDomainObjExitMonitorWithDriver(driver, vm); error: - if (ret < 0) - qemuMonitorClose(priv->mon); return ret; } -- 1.7.3.4

2 1

[libvirt] [PATCH] Remove bogus log warning lines when launching QEMU
by Daniel P. Berrange 27 Jan '11

27 Jan '11

The refactoring of QEMU command startup was comitted with a couple of VIR_WARN lines left in from debugging. * src/qemu/qemu_driver.c: Remove log warning lines --- src/qemu/qemu_driver.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 98eb91f..2e8f4f9 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -2865,7 +2865,6 @@ static int qemudStartVMDaemon(virConnectPtr conn, if (driver->clearEmulatorCapabilities) virCommandClearCaps(cmd); - VIR_WARN("Executing %s", vm->def->emulator); virCommandSetPreExecHook(cmd, qemudSecurityHook, &hookData); virCommandSetOutputFD(cmd, &logfile); @@ -2875,7 +2874,6 @@ static int qemudStartVMDaemon(virConnectPtr conn, virCommandDaemonize(cmd); ret = virCommandRun(cmd, NULL); - VIR_WARN("Executing done %s", vm->def->emulator); VIR_FREE(pidfile); /* wait for qemu process to to show up */ -- 1.7.3.4

1 0

[libvirt] beginner's project
by Eric Blake 27 Jan '11

27 Jan '11

This idea sprang from an IRC conversation, but I don't have time to do it myself at the moment. If you're looking for a great way to help development, it would be nice to teach tests/testutils.c:virtTestLoadFile how to read a file with backslash-newline pairs and flatten those into a single line. Then rewrite all the tests/*data/*.args files to use line continuations, rather than being monstrous 1000-character lines. That way, git send-email will quit griping about the inability to send patches to those files. -- Eric Blake eblake(a)redhat.com +1-801-349-2682 Libvirt virtualization library http://libvirt.org

1 0

[libvirt] [PATCH] docs: expand the man page text for virsh setmaxmem
by Justin Clift 27 Jan '11

27 Jan '11

Addresses BZ # 622534: https://bugzilla.redhat.com/show_bug.cgi?id=622534 --- tools/virsh.pod | 17 ++++++++++++++--- 1 files changed, 14 insertions(+), 3 deletions(-) diff --git a/tools/virsh.pod b/tools/virsh.pod index 4e8b295..0d37512 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -584,9 +584,20 @@ update the XML <currentMemory> element. =item B<setmaxmem> I<domain-id> B<kilobytes> -Change the maximum memory allocation limit in the guest domain. This should -not change the current memory use. The memory limit is specified in -kilobytes. +Change the maximum memory allocation limit for an inactive guest domain. + +This command works for at least the Xen and vSphere/ESX hypervisors, +but not for QEMU/KVM. + +Some hypervisors require a larger granularity than kilobytes, rounding down +or rejecting requests that are not an even multiple of the desired amount. +vSphere/ESX is one of these, requiring the parameter to be evenly divisible +by 4MB. For example with vSphere/ESX, 262144 (256MB) is valid as it's a +multiple of 4MB; 263168 (257MB) is not valid as it's not a multiple of 4MB; +266240 (260MB) is also valid, as it's a multiple of 4MB. + +Note, to change the maximum memory allocation for a QEMU/KVM guest domain, +use the virsh B<edit> command instead to update its XML <memory> element. =item B<memtune> I<domain-id> optional I<--hard-limit> B<kilobytes> optional I<--soft-limit> B<kilobytes> optional I<--swap-hard-limit> -- 1.7.3.5

3 6

[libvirt] [PATCH] event: fix two event-handling bugs
by Eric Blake 27 Jan '11

27 Jan '11

Regression introduced in commit e6b68d7. Prior to that point, handlesAlloc was always a multiple of EVENT_ALLOC_EXTENT, and was an integer (so even if the subtraction wrapped, a negative value was less than the count and did not try to free the handles array). But after that point, VIR_RESIZE_N made handlesAlloc grow geometrically, so handlesAlloc could be 49 when handlesCount was 47, while still freeing off only 10 at a time, and eventually reach handlesAlloc 7 and handlesCount 1. Since (size_t)(7 - 10) is indeed greater than 1, this then tried to free 10 elements, which had the awful effect of nuking the handles array while there were still live handles. Which leads to crashes like this: https://bugzilla.redhat.com/show_bug.cgi?id=670848 * daemon/event.c (virEventDispatchHandles): Cache watch while the lock is still held, as eventLoop.handles might be relocated outside the lock. (virEventCleanupHandles): Avoid integer wrap-around causing us to delete the entire handles array while handles are still active. --- Thanks to Dave Allan for letting me use his faqemu setup for testing this. Basically, starting 60 faqemu followed by stopping them all was a reliable way to trigger the handle cleanup integer wraparound. daemon/event.c | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/daemon/event.c b/daemon/event.c index 89ca9f0..9cad466 100644 --- a/daemon/event.c +++ b/daemon/event.c @@ -1,7 +1,7 @@ /* * event.c: event loop for monitoring file handles * - * Copyright (C) 2007, 2010 Red Hat, Inc. + * Copyright (C) 2007, 2010-2011 Red Hat, Inc. * Copyright (C) 2007 Daniel P. Berrange * * This library is free software; you can redistribute it and/or @@ -435,6 +435,7 @@ static int virEventDispatchTimeouts(void) { */ static int virEventDispatchHandles(int nfds, struct pollfd *fds) { int i, n; + int watch; DEBUG("Dispatch %d", nfds); /* NB, use nfds not eventLoop.handlesCount, because new @@ -463,9 +464,9 @@ static int virEventDispatchHandles(int nfds, struct pollfd *fds) { EVENT_DEBUG("Dispatch n=%d f=%d w=%d e=%d %p", i, fds[n].fd, eventLoop.handles[i].watch, fds[n].revents, eventLoop.handles[i].opaque); + watch = eventLoop.handles[i].watch; virMutexUnlock(&eventLoop.lock); - (cb)(eventLoop.handles[i].watch, - fds[n].fd, hEvents, opaque); + (cb)(watch, fds[n].fd, hEvents, opaque); virMutexLock(&eventLoop.lock); } } @@ -542,9 +543,10 @@ static int virEventCleanupHandles(void) { } /* Release some memory if we've got a big chunk free */ - if ((eventLoop.handlesAlloc - EVENT_ALLOC_EXTENT) > eventLoop.handlesCount) { + if (eventLoop.handlesAlloc - eventLoop.handlesCount > EVENT_ALLOC_EXTENT) { EVENT_DEBUG("Releasing %zu out of %zu handles slots used, releasing %d", - eventLoop.handlesCount, eventLoop.handlesAlloc, EVENT_ALLOC_EXTENT); + eventLoop.handlesCount, eventLoop.handlesAlloc, + EVENT_ALLOC_EXTENT); VIR_SHRINK_N(eventLoop.handles, eventLoop.handlesAlloc, EVENT_ALLOC_EXTENT); } -- 1.7.3.4

3 8