- Devel - libvirt List Archives

[libvirt] [PATCH] docs: move the apps page to the top level as its good promo
by Justin Clift 20 Jan '11

20 Jan '11

--- docs/sitemap.html.in | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-) diff --git a/docs/sitemap.html.in b/docs/sitemap.html.in index 7077038..bcce62f 100644 --- a/docs/sitemap.html.in +++ b/docs/sitemap.html.in @@ -19,6 +19,10 @@ </ul> </li> <li> + <a href="apps.html">Applications</a> + <span>Applications known to use libvirt</span> + </li> + <li> <a href="downloads.html">Downloads</a> <span>Get the latest source releases, binary builds and get access to the source repository</span> <ul> @@ -313,12 +317,6 @@ <li> <a href="relatedlinks.html">Related Links</a> <span>Miscellaneous links of interest related to libvirt</span> - <ul> - <li> - <a href="apps.html">Applications</a> - <span>Overview of applications using the libvirt APIs</span> - </li> - </ul> </li> <li> <a href="sitemap.html">Sitemap</a> -- 1.7.3.5

3 4

[libvirt] [PATCH] Re: Minor php errors in the libvirt search script?
by Daniel Veillard 20 Jan '11

20 Jan '11

[ Cc'ing back the list ] On Sun, Jan 09, 2011 at 03:11:29AM +1100, Justin Clift wrote: > Hi Daniel, > > Noticing these php warning's showing up in the apache libvirt.org error log: > > [Sat Jan 08 17:09:24 2011] [error] [client 64.217.19.104] PHP Notice: Undefined variable: HTTP_GET_VARS in /data/www/libvirt.org/search.php on line 21, referer: http://libvirt.org/formatdomain.html > [Sat Jan 08 17:09:24 2011] [error] [client 64.217.19.104] PHP Notice: Undefined variable: HTTP_GET_VARS in /data/www/libvirt.org/search.php on line 22, referer: http://libvirt.org/formatdomain.html > [Sat Jan 08 17:09:24 2011] [error] [client 64.217.19.104] PHP Notice: Undefined variable: PHP_SELF in /data/www/libvirt.org/search.php on line 37, referer: http://libvirt.org/formatdomain.html > > Any idea if they're something we need to care about? Yup, the search php was designed in php4 time frame and those global variables are not turned off by default for security reasons http://fr.php.net/manual/en/security.registerglobals.php The following patch should fix those, thanks for raising the issue, Daniel -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel(a)veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/

2 3

[libvirt] [RFC/PATCH v1] Adding entry for cpu tunable shares in xml
by Nikunj A. Dadhania 20 Jan '11

20 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;

1 0

[libvirt] virsh fails to define a domain
by Nikunj A. Dadhania 20 Jan '11

20 Jan '11

I am using the git version of libvirt. The domain file was working previously. [nikunj@dhruv ~]$ rpm -q qemu-kvm qemu-kvm-0.12.3-8.fc13.x86_64 Some more debugging suggested that qemuCapsExtractDeviceStr is returning an error. The output of the "pci-assign,?" is not returning any useful information on my system. [nikunj@dhruv ~]$ qemu-kvm -device "pci-assign,?" property "pci-assign.?" not found can't set property "?" to "on" for "pci-assign" [nikunj@dhruv ~]$ This is supposedly related to f892f5a562cbb6e5b914adced1000df20c3174d6 commit. Don't know what could be a valid fix for this tough. Regards Nikunj

2 2

[libvirt] [PATCH] docs: added new entries to apps page, plus adjusted a few existing
by Justin Clift 20 Jan '11

20 Jan '11

Added new entries for Hudson, LCFG, Tivoli Provisioning Manager, virt-what, and Zenoss. Adjusted the existing entries for BuildBot and vmware2libvirt. --- docs/apps.html.in | 94 ++++++++++++++++++++++++++++++++++++++++++---------- 1 files changed, 76 insertions(+), 18 deletions(-) diff --git a/docs/apps.html.in b/docs/apps.html.in index 054e8c2..09a1a7f 100644 --- a/docs/apps.html.in +++ b/docs/apps.html.in @@ -23,18 +23,6 @@ <img src="madeWith.png" alt="Made with libvirt"/> </p> - <h2><a name="automatedtesting">Automated compile/testing</a></h2> - - <dl> - <dt><a href="http://buildbot.net">BuildBot</a></dt> - <dd> - BuildBot is a system to automate the compile/test cycle required - by most software projects. CVS commits trigger new builds, run on - a variety of client machines. Build status (pass/fail/etc) are - displayed on a web page or through other protocols. - </dd> - </dl> - <h2><a name="clientserver">Client/Server applications</a></h2> <dl> @@ -103,6 +91,56 @@ Watch the CPU, memory, network and disk utilization of all virtual machines running on a host. </dd> + <dt> + <a href="http://people.redhat.com/~rjones/virt-what/">virt-what</a> + </dt> + <dd> + virt-what is a shell script for detecting if the program is running + in a virtual machine. It prints out a list of facts about the + virtual machine, derived from heuristics. + </dd> + </dl> + + <h2><a name="configmgmt">Configuration Management</a></h2> + + <dl> + <dt><a href="https://wiki.lcfg.org/bin/view/LCFG/LcfgLibvirt">LCFG</a></dt> + <dd> + LCFG is a system for automatically installing and managing the + configuration of large numbers of Unix systems. It is particularly + suitable for sites with very diverse and rapidly changing + configurations. + </dd> + <dd> + The lcfg-libvirt package adds support for virtualized systems to + LCFG, with both Xen and KVM known to work. Cloning guests is + supported, as are the bridged, routed, and isolated modes for + Virtual Networking. + </dd> + </dl> + + <h2><a name="continuousintegration">Continuous Integration</a></h2> + + <dl> + <dt><a href="http://buildbot.net/buildbot/docs/current/Libvirt.html">BuildBot</a></dt> + <dd> + BuildBot is a system to automate the compile/test cycle required + by most software projects. CVS commits trigger new builds, run on + a variety of client machines. Build status (pass/fail/etc) are + displayed on a web page or through other protocols. + </dd> + </dl> + + <dl> + <dt><a href="http://wiki.hudson-ci.org/display/HUDSON/Libvirt+Slaves+Plugin">Hudson</a></dt> + <dd> + This plugin for Hudson adds a way to control guest domains hosted + on Xen or QEMU/KVM. You configure a Hudson Slave, + selecting the guest domain and hypervisor. When you need to build a + job on a specific Slave, its guest domain is started, then the job is + run. When the build process is finished, the guest domain is shut + down, ready to be used again as required. + </dd> </dl> <h2><a name="conversion">Conversion</a></h2> @@ -133,9 +171,10 @@ possible. This conversion requires some Microsoft signed pieces, that Red Hat can provide. </dd> - <dt><a href="http://bazaar.launchpad.net/~ubuntu-virt/virt-goodies/trunk/annotate/head:/…">vmware2libvirt</a></dt> + <dt><a href="https://launchpad.net/virt-goodies">vmware2libvirt</a></dt> <dd> - A Python script for migrating a vmware image to libvirt. + Part of the <i>virt-goodies</i> package, vmware2libvirt is a python + script for migrating a vmware image to libvirt. </dd> </dl> @@ -188,9 +227,9 @@ </dd> </dl> - <h2><a name="monitoring">Monitoring plugins</a></h2> + <h2><a name="monitoring">Monitoring</a></h2> <dl> - <dt><a href="http://collectd.org/plugins/libvirt.shtml">for collectd</a></dt> + <dt><a href="http://collectd.org/plugins/libvirt.shtml">collectd</a></dt> <dd> The libvirt-plugin is part of <a href="http://collectd.org/">collectd</a> and gathers statistics about virtualized guests on a system. This @@ -199,13 +238,13 @@ For a full description, please refer to the libvirt section in the collectd.conf(5) manual page. </dd> - <dt><a href="http://honk.sigxcpu.org/projects/libvirt/#munin">for munin</a></dt> + <dt><a href="http://honk.sigxcpu.org/projects/libvirt/#munin">Munin</a></dt> <dd> The plugins provided by Guido Günther allow to monitor various things like network and block I/O with <a href="http://munin.projects.linpro.no/">Munin</a>. </dd> - <dt><a href="http://et.redhat.com/~rjones/nagios-virt/">nagios-virt</a></dt> + <dt><a href="http://et.redhat.com/~rjones/nagios-virt/">Nagios-virt</a></dt> <dd> Nagios-virt is a configuration tool to add monitoring of your virtualised domains to <a href="http://www.nagios.org/">Nagios</a>. @@ -213,8 +252,27 @@ your Xen or QEMU/KVM guests, or to integrate with your existing Nagios installation. </dd> + <dt><a href="http://community.zenoss.org/docs/DOC-4687">Zenoss</a></dt> + <dd> + The Zenoss libvirt Zenpack adds support for monitoring virtualization + servers. It has been tested with KVM, QEMU, VMware ESX, and VMware + GSX. + </dd> </dl> + <h2><a name="provisioning">Provisioning</a></h2> + + <dl> + <dt><a href="http://www.ibm.com/software/tivoli/products/prov-mgr/">Tivoli Provisioning Manager</a></dt> + <dd> + Part of the IBM Tivoli family, Tivoli Provisioning Manager (TPM) is + an IT lifecycle automation product. It + <a href="http://publib.boulder.ibm.com/infocenter/tivihelp/v38r1/index.jsp?topic=/co…">uses libvirt</a> + for communication with virtualization hosts and guest domains. + </dd> + </dl> + + <h2><a name="web">Web applications</a></h2> <dl> -- 1.7.3.5

2 2

[libvirt] [PATCH] docs: document <sysinfo> and <symbios> elements
by Eric Blake 20 Jan '11

20 Jan '11

* docs/formatdomain.html.in: Talk about <sysinfo> throughout. --- More in the vein of adding missing documentation. docs/formatdomain.html.in | 79 ++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 78 insertions(+), 1 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 8d6b69e..9719346 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -48,7 +48,10 @@ a globally unique identifier for the virtual machine. The format must be RFC 4122 compliant, eg <code>3e3fce45-4f53-4fa7-bb32-11f34168b82b</code>. If omitted when defining/creating a new machine, a random - UUID is generated. <span class="since">Since 0.0.1</span></dd> + UUID is generated. It is also possible to provide the UUID + via a <a href="#elementsSysinfo"><code>sysinfo</code></a> + specification. <span class="since">Since 0.0.1, sysinfo + since 0.8.7</span></dd> <dt><code>description</code></dt> <dd>The content of the <code>description</code> element provides a @@ -81,6 +84,7 @@ <boot dev='hd'/> <boot dev='cdrom'/> <bootmenu enable='yes'/> + <smbios mode='sysinfo'/> </os> ...</pre> @@ -115,6 +119,16 @@ If not specified, the hypervisor default is used. <span class="since"> Since 0.8.3</span> </dd> + <dt><code>smbios</code></dt> + <dd>How to populate SMBIOS information visible in the guest. + The <code>mode</code> attribute must be specified, and is either + "emulate" (let the hypervisor generate all values), "host" (copy + all of Block 0 and Block 1, except for the UUID, from the host's + SMBIOS values), or "sysinfo" (use the values in + the <a href="#elementsSysinfo">sysinfo</a> element). If not + specified, the hypervisor default is used. <span class="since"> + Since 0.8.7</span> + </dd> </dl> <h4><a name="elementsOSBootloader">Host bootloader</a></h4> @@ -188,6 +202,69 @@ installation media source / kickstart file</dd> </dl> + <h3><a name="elementsSysinfo">SMBIOS System Information</a></h3> + + <p> + Some hypervisors allow control over what system information is + presented to the guest (for example, SMBIOS fields can be + populated by a hypervisor and inspected via + the <code>dmidecode</code> command in the guest). The + optional <code>sysinfo</code> element covers all such categories + of information. <span class="since">Since 0.8.7</span> + </p> + +<pre> + ... + <os> + <smbios mode='sysinfo'/> + ... + </os> + <sysinfo type='smbios'> + <bios> + <entry name='vendor'>LENOVO</entry> + </bios> + <system> + <entry name='manufacturer'>Fedora</entry> + <entry name='vendor'>Virt-Manager</entry> + </system> + </sysinfo> + ...</pre> + + <p> + The <code>sysinfo</code> element has a mandatory + attribute <code>type</code> that determine the layout of + sub-elements, with supported values of: + </p> + + <dl> + <dt><code>smbios</code></dt> + <dd>Sub-elements call out specific SMBIOS values, which will + affect the guest if used in conjunction with + the <code>smbios</code> sub-element of + the <a href="#elementsOS"><code>os</code></a> element. Each + sub-element of <code>sysinfo</code> names a SMBIOS block, and + within those elements can be a list of <code>entry</code> + elements that describe a field within the block. The following + blocks and entries are recognized: + <dl> + <dt><code>bios</code></dt> + <dd> + This is block 0 of SMBIOS, with entry names drawn from + "vendor", "version", "date", and "release". + </dd> + <dt><code>system</code></dt> + <dd> + This is block 1 of SMBIOS, with entry names drawn from + "manufacturer", "product", "version", "serial", "uuid", + "sku", and "family". If a "uuid" entry is provided + alongside a + top-level <a href="#elementsMetadata"><code>uuid</code> + element</a>, the two values must match. + </dd> + </dl> + </dd> + </dl> + <h3><a name="elementsResources">Basic resources</a></h3> <pre> -- 1.7.3.4

3 3

[libvirt] [PATCH] qemu: Avoid sending STOPPED event twice
by Jiri Denemark 19 Jan '11

19 Jan '11

In some circumstances, libvirtd would issue two STOPPED events after it stopped a domain. This was because an EOF event can arrive after a qemu process is killed but before qemuMonitorClose() is called. qemuHandleMonitorEOF() should ignore EOF when the domain is not running. I wasn't able to reproduce this bug directly, only after adding an artificial sleep() into qemudShutdownVMDaemon(). --- src/qemu/qemu_driver.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 22dc272..cff7a43 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -356,6 +356,12 @@ qemuHandleMonitorEOF(qemuMonitorPtr mon ATTRIBUTE_UNUSED, virDomainObjLock(vm); + if (!virDomainObjIsActive(vm)) { + VIR_DEBUG("Domain %p is not active, ignoring EOF", vm); + virDomainObjUnlock(vm); + return; + } + priv = vm->privateData; if (!hasError && priv->monJSON && !priv->gotShutdown) { VIR_DEBUG("Monitor connection to '%s' closed without SHUTDOWN event; " -- 1.7.4.rc2

2 2

[libvirt] [PATCH] qemu: Fail if per-device boot is used but deviceboot is not supported
by Jiri Denemark 19 Jan '11

19 Jan '11

--- src/qemu/qemu_command.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 24acc10..537e537 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -2949,6 +2949,13 @@ qemuBuildCommandLine(virConnectPtr conn, } virCommandAddArgBuffer(cmd, &boot_buf); + } else if (!(qemuCmdFlags & QEMUD_CMD_FLAG_BOOTINDEX)) { + /* def->os.nBootDevs is guaranteed to be > 0 unless per-device boot + * configuration is used + */ + qemuReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("hypervisor lacks deviceboot feature")); + goto error; } if (def->os.kernel) -- 1.7.4.rc2

2 2

[libvirt] [PATCH] spec: Start libvirt-guests only if it's on in current runlevel
by Jiri Denemark 19 Jan '11

19 Jan '11

--- libvirt.spec.in | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index d673cf6..0a2d10e 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -775,7 +775,8 @@ fi /sbin/ldconfig /sbin/chkconfig --add libvirt-guests if [ $1 -ge 1 ]; then - if /sbin/chkconfig --list libvirt-guests | /bin/grep -q :on ; then + level=$(/sbin/runlevel | /bin/cut -d ' ' -f 2) + if /sbin/chkconfig --list libvirt-guests | /bin/grep -q $level:on ; then # this doesn't do anything but allowing for libvirt-guests to be # stopped on the first shutdown /sbin/service libvirt-guests start > /dev/null 2>&1 || true -- 1.7.4.rc2

2 2

[libvirt] [PATCH 0/3] qemu: improve device capability detection
by Eric Blake 19 Jan '11

19 Jan '11

As promised in https://www.redhat.com/archives/libvir-list/2011-January/msg00562.html Patch 1 is complete, patch 2 can be pushed as-is, but if anyone has qemu-0.12.1 or qemu-kvm-0.12.3 handy (Fedora12 has 0.11.x, and Fedora13 has 0.12.5), then we can enhance it by filling in the contents of a couple more files. Patch 3 does not need to be pushed until the rest of my smartcard series is complete, but I'm including it now to show how to rewrite things in order to parse more device characteristics from a single qemu run, so it can be reused by the boot order patch series (add "-device","virtio-blk-pci,?" to extract; add strstr(str,"virtio-blk-pci.bootindex") to parse; and possibly update the qemuhelpdata/*-device files to include appropriate new lines to trigger the new flag detection). Eric Blake (3): qemu: convert capabilities to use virCommand qemu: improve device flag parsing smartcard: check for qemu capability src/qemu/qemu_capabilities.c | 229 +++++++------------- src/qemu/qemu_capabilities.h | 5 +- tests/qemuhelpdata/qemu-kvm-0.12.1.2-rhel60-device | 57 +++++ tests/qemuhelpdata/qemu-kvm-0.13.0-device | 70 ++++++ tests/qemuhelptest.c | 48 +++- 5 files changed, 244 insertions(+), 165 deletions(-) create mode 100644 tests/qemuhelpdata/qemu-0.12.1-device create mode 100644 tests/qemuhelpdata/qemu-kvm-0.12.1.2-rhel60-device create mode 100644 tests/qemuhelpdata/qemu-kvm-0.12.3-device create mode 100644 tests/qemuhelpdata/qemu-kvm-0.13.0-device -- 1.7.3.4

6 19

[libvirt] [PATCH] Basic support for VDE networking
by Renzo Davoli 19 Jan '11

19 Jan '11

I have seen several messages asking for VDE networking support. There is an item also in your todo web page. http://libvirt.org/todo.html I have developed a patch to provide a basic support for VDE. It defines and manages the syntax: <domain ....> <device> <interface type='vde'> ... <switch path='/tmp/vde.ctl'/> </interface> </device> </domain> the switch tag can be omitted: vde uses the default switch. I have tested the qemu/kvm support. user-mode linux support is included but not tested yet. libvirt vde support for virtualbox has not been coded yet (virtualbox itself supports vde). The patch is against libvirt-0.8.7. renzo (designer/developer of VDE, university of bologna, wiki.virtualsquare.org) Signed-off-by: Renzo Davoli <renzo(a)cs.unibo.it> --- --- a/src/lxc/lxc_driver.c 2011-01-10 11:49:49.000000000 +0100 +++ b/src/lxc/lxc_driver.c 2011-01-10 11:50:03.000000000 +0100 @@ -1083,6 +1083,7 @@ case VIR_DOMAIN_NET_TYPE_INTERNAL: case VIR_DOMAIN_NET_TYPE_DIRECT: case VIR_DOMAIN_NET_TYPE_LAST: + case VIR_DOMAIN_NET_TYPE_VDE: break; } --- a/src/uml/uml_conf.c 2011-01-10 12:03:54.000000000 +0100 +++ b/src/uml/uml_conf.c 2011-01-10 13:26:08.000000000 +0100 @@ -269,6 +269,14 @@ virBufferVSprintf(&buf, "tuntap,%s", def->ifname); break; + case VIR_DOMAIN_NET_TYPE_VDE: + /* ethNNN=vde,vde_switch,macaddr,port,group,mode,description */ + if (def->data.vde.vdeswitch) { + virBufferVSprintf(&buf, "vde,%s", def->data.vde.vdeswitch); + } else + virBufferAddLit(&buf, "vde"); + break; + case VIR_DOMAIN_NET_TYPE_INTERNAL: umlReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("internal networking type not supported")); --- a/src/conf/domain_conf.h 2011-01-10 11:41:07.000000000 +0100 +++ b/src/conf/domain_conf.h 2011-01-10 13:21:08.000000000 +0100 @@ -288,6 +288,7 @@ VIR_DOMAIN_NET_TYPE_BRIDGE, VIR_DOMAIN_NET_TYPE_INTERNAL, VIR_DOMAIN_NET_TYPE_DIRECT, + VIR_DOMAIN_NET_TYPE_VDE, VIR_DOMAIN_NET_TYPE_LAST, }; @@ -336,6 +337,9 @@ int mode; virVirtualPortProfileParams virtPortProfile; } direct; + struct { + char *vdeswitch; + } vde; } data; char *ifname; virDomainDeviceInfo info; --- a/src/conf/domain_conf.c 2011-01-10 11:42:04.000000000 +0100 +++ b/src/conf/domain_conf.c 2011-01-10 14:49:46.000000000 +0100 @@ -182,7 +182,8 @@ "network", "bridge", "internal", - "direct") + "direct", + "vde") VIR_ENUM_IMPL(virDomainChrChannelTarget, VIR_DOMAIN_CHR_CHANNEL_TARGET_TYPE_LAST, @@ -598,6 +599,10 @@ VIR_FREE(def->data.direct.linkdev); break; + case VIR_DOMAIN_NET_TYPE_VDE: + VIR_FREE(def->data.vde.vdeswitch); + break; + case VIR_DOMAIN_NET_TYPE_USER: case VIR_DOMAIN_NET_TYPE_LAST: break; @@ -2293,6 +2298,7 @@ char *internal = NULL; char *devaddr = NULL; char *mode = NULL; + char *vdeswitch = NULL; virNWFilterHashTablePtr filterparams = NULL; virVirtualPortProfileParams virtPort; bool virtPortParsed = false; @@ -2379,7 +2385,11 @@ xmlStrEqual(cur->name, BAD_CAST "state")) { /* Legacy back-compat. Don't add any more attributes here */ devaddr = virXMLPropString(cur, "devaddr"); - } + } else if ((vdeswitch == NULL) && + def->type == VIR_DOMAIN_NET_TYPE_VDE && + xmlStrEqual(cur->name, BAD_CAST "switch")) { + vdeswitch = virXMLPropString(cur, "path"); + } } cur = cur->next; } @@ -2529,6 +2539,11 @@ break; + case VIR_DOMAIN_NET_TYPE_VDE: + def->data.vde.vdeswitch = vdeswitch; + vdeswitch = NULL; + break; + case VIR_DOMAIN_NET_TYPE_USER: case VIR_DOMAIN_NET_TYPE_LAST: break; @@ -6263,6 +6278,12 @@ " "); break; + case VIR_DOMAIN_NET_TYPE_VDE: + if (def->data.vde.vdeswitch) + virBufferEscapeString(buf, " <switch path='%s'/>\n", + def->data.vde.vdeswitch); + break; + case VIR_DOMAIN_NET_TYPE_USER: case VIR_DOMAIN_NET_TYPE_LAST: break; --- a/src/qemu/qemu_command.c 2011-01-10 13:11:17.000000000 +0100 +++ b/src/qemu/qemu_command.c 2011-01-10 13:26:28.000000000 +0100 @@ -1602,12 +1602,21 @@ case VIR_DOMAIN_NET_TYPE_BRIDGE: case VIR_DOMAIN_NET_TYPE_INTERNAL: case VIR_DOMAIN_NET_TYPE_DIRECT: + case VIR_DOMAIN_NET_TYPE_VDE: case VIR_DOMAIN_NET_TYPE_LAST: break; } type_sep = ','; break; + case VIR_DOMAIN_NET_TYPE_VDE: + virBufferAddLit(&buf, "vde"); + if (net->data.vde.vdeswitch) + virBufferVSprintf(&buf, "%csock=%s", + type_sep, + net->data.vde.vdeswitch); + break; + case VIR_DOMAIN_NET_TYPE_USER: default: virBufferAddLit(&buf, "user");

3 4

[libvirt] Installing libvirt 0.8.7 Ubuntu 9.10
by Marcela Castro León 19 Jan '11

19 Jan '11

Hello: I'm installing libvirt 0.8.7 on Ubuntu 9.10 to work at a project at Autonomous University. But when make ./configure, I've got: checking pkg-config is at least version 0.9.0... yes checking for XMLRPC... no checking for LIBXML... no checking libxml2 xml2-config >= 2.6.0 ... configure: error: Could not find libxml2 anywhere (see config.log for details). But I've libxml2 installed on mu system marcela@santacruz:~/libvirt/libvirt-0.8.7$ dpkg -l | grep libxml2 ii libxml2 2.7.5.dfsg-1ubuntu1.2 GNOME XML library ii libxml2-utils 2.7.5.dfsg-1ubuntu1.2 XML utilities ii python-libxml2 2.7.5.dfsg-1ubuntu1.2 Python bindings for the GNOME XML library The config.log mention No package 'libxml-2.0', but this libary doesn't exit. I've attach this log to further information. Can you tell me how to follow? Thank you.

3 3

[libvirt] Spice in libvirt 0.8.x?
by Justin Clift 18 Jan '11

18 Jan '11

Hi us, Does anyone know if Spice in libvirt 0.8.7 works ok? Noticed two BZ's (still open) by Amador Pahim (CC'd), where he tested with 0.8.6 and noticed problems with our XML vs reality (for him): https://bugzilla.redhat.com/show_bug.cgi?id=664190 https://bugzilla.redhat.com/show_bug.cgi?id=664192 He was able to get it working by commenting out two pieces of qemu_command.c, so I'm just wondering if this is useful info to us or if it's already dated? /* if ((def->videos[0]->type == VIR_DOMAIN_VIDEO_TYPE_QXL) && * !(qemuCmdFlags & QEMUD_CMD_FLAG_VGA_QXL)) { * qemuReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", * _("This QEMU does not support QXL graphics adapters")); * goto error; * } */ /* * if (def->graphics[0]->data.spice.listenAddr) * virBufferVSprintf(&opt, ",addr=%s", def->graphics[0]>data.spice.listenAddr); * else if (driver->spiceListen) * virBufferVSprintf(&opt, ",addr=%s", driver->spiceListen); */ + Justin

1 0

[libvirt] [PATCH] build: use more gnulib modules for simpler code
by Eric Blake 18 Jan '11

18 Jan '11

* .gnulib: Update to latest, for sigpipe and sigaction modules. * bootstrap.conf (gnulib_modules): Add siaction, sigpipe, strerror_r. * tools/virsh.c (vshSetupSignals) [!SIGPIPE]: Delete, now that gnulib guarantees it. (SA_SIGINFO): Define for mingw fallback. * src/util/virterror.c (virStrerror): Simplify, now that gnulib guarantees the POSIX interface. * configure.ac (AC_CHECK_FUNCS_ONCE): Drop redundant check. (AM_PROG_CC_STDC): Move earlier, to keep autoconf happy. --- Gnulib makes it possible to prefer the POSIX strerror_r signature everywhere, even on Linux. And even though mingw lacks SA_SIGINFO (even with gnulib), the virsh signal handler still works for mingw with gnulib's implementation of SIGPIPE with minimal effort. * .gnulib 9779055...e7853fe (3): > sigaction: relax license from LGPLv3+ to LGPLv2+ > update from texinfo > autoupdate .gnulib | 2 +- bootstrap.conf | 3 +++ configure.ac | 13 ++++++------- src/util/virterror.c | 18 +----------------- tools/virsh.c | 17 +++++++++-------- 5 files changed, 20 insertions(+), 33 deletions(-) diff --git a/.gnulib b/.gnulib index 9779055..e7853fe 160000 --- a/.gnulib +++ b/.gnulib @@ -1 +1 @@ -Subproject commit 9779055889c2715b593930e39ead552759b5ddc2 +Subproject commit e7853fee14b339b6d5327c3b5d5de59b13c4e39e diff --git a/bootstrap.conf b/bootstrap.conf index a55fca2..88832d1 100644 --- a/bootstrap.conf +++ b/bootstrap.conf @@ -58,12 +58,15 @@ random_r sched send setsockopt +sigaction +sigpipe snprintf socket stpcpy strchrnul strndup strerror +strerror_r-posix strptime strsep strtok_r diff --git a/configure.ac b/configure.ac index 337ce17..574e952 100644 --- a/configure.ac +++ b/configure.ac @@ -49,11 +49,11 @@ dnl Checks for C compiler. AC_PROG_CC AC_PROG_INSTALL AC_PROG_CPP +AM_PROG_CC_STDC gl_EARLY gl_INIT -AM_PROG_CC_STDC AC_TYPE_UID_T dnl Make sure we have an ANSI compiler @@ -93,12 +93,11 @@ fi AC_MSG_RESULT([$have_cpuid]) -dnl Availability of various common functions (non-fatal if missing). -AC_CHECK_FUNCS_ONCE([cfmakeraw regexec sched_getaffinity getuid getgid initgroups \ - posix_fallocate mmap]) - -dnl Availability of various not common threadsafe functions -AC_CHECK_FUNCS_ONCE([strerror_r getmntent_r getgrnam_r getpwuid_r]) +dnl Availability of various common functions (non-fatal if missing), +dnl and various less common threadsafe functions +AC_CHECK_FUNCS_ONCE([cfmakeraw regexec sched_getaffinity getuid getgid \ + initgroups posix_fallocate mmap \ + getmntent_r getgrnam_r getpwuid_r]) dnl Availability of pthread functions (if missing, win32 threading is dnl assumed). Because of $LIB_PTHREAD, we cannot use AC_CHECK_FUNCS_ONCE. diff --git a/src/util/virterror.c b/src/util/virterror.c index 7543603..3dd6256 100644 --- a/src/util/virterror.c +++ b/src/util/virterror.c @@ -1250,7 +1250,7 @@ void virReportErrorHelper(virConnectPtr conn, * @errBuf: the buffer to save the error to * @errBufLen: the buffer length * - * Generate an erro string for the given errno + * Generate an error string for the given errno * * Returns a pointer to the error string, possibly indicating that the * error is unknown @@ -1260,24 +1260,8 @@ const char *virStrerror(int theerrno, char *errBuf, size_t errBufLen) int save_errno = errno; const char *ret; -#ifdef HAVE_STRERROR_R -# ifdef __USE_GNU - /* Annoying linux specific API contract */ - ret = strerror_r(theerrno, errBuf, errBufLen); -# else strerror_r(theerrno, errBuf, errBufLen); ret = errBuf; -# endif -#else - /* Mingw lacks strerror_r and its strerror is definitely not - * threadsafe, so safest option is to just print the raw errno - * value - we can at least reliably & safely look it up in the - * header files for debug purposes - */ - int n = snprintf(errBuf, errBufLen, "errno=%d", theerrno); - ret = (0 < n && n < errBufLen - ? errBuf : _("internal error: buffer too small")); -#endif errno = save_errno; return ret; } diff --git a/tools/virsh.c b/tools/virsh.c index 5b26c78..aba7945 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -497,16 +497,21 @@ out: */ static int disconnected = 0; /* we may have been disconnected */ -#ifdef SIGPIPE +/* Gnulib doesn't guarantee SA_SIGINFO support. */ +#ifndef SA_SIGINFO +# define SA_SIGINFO 0 +#endif + /* * vshCatchDisconnect: * * We get here when a SIGPIPE is being raised, we can't do much in the * handler, just save the fact it was raised */ -static void vshCatchDisconnect(int sig, siginfo_t * siginfo, - void* context ATTRIBUTE_UNUSED) { - if ((sig == SIGPIPE) || (siginfo->si_signo == SIGPIPE)) +static void vshCatchDisconnect(int sig, siginfo_t *siginfo, + void *context ATTRIBUTE_UNUSED) { + if ((sig == SIGPIPE) || + (SA_SIGINFO && siginfo->si_signo == SIGPIPE)) disconnected++; } @@ -526,10 +531,6 @@ vshSetupSignals(void) { sigaction(SIGPIPE, &sig_action, NULL); } -#else -static void -vshSetupSignals(void) {} -#endif /* * vshReconnect: -- 1.7.3.4

2 2

[libvirt] [PATCH] Remove two unused PATH_MAX-sized char arrays from the stack
by Matthias Bolte 18 Jan '11

18 Jan '11

--- src/storage/storage_driver.c | 16 ++-------------- src/uml/uml_driver.c | 8 ++------ 2 files changed, 4 insertions(+), 20 deletions(-) diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c index 67d043b..5373025 100644 --- a/src/storage/storage_driver.c +++ b/src/storage/storage_driver.c @@ -127,9 +127,9 @@ storageDriverAutostart(virStorageDriverStatePtr driver) { * Initialization function for the QEmu daemon */ static int -storageDriverStartup(int privileged) { +storageDriverStartup(int privileged) +{ char *base = NULL; - char driverConf[PATH_MAX]; if (VIR_ALLOC(driverState) < 0) return -1; @@ -160,11 +160,6 @@ storageDriverStartup(int privileged) { /* Configuration paths are either ~/.libvirt/storage/... (session) or * /etc/libvirt/storage/... (system). */ - if (snprintf (driverConf, sizeof(driverConf), - "%s/storage.conf", base) == -1) - goto out_of_memory; - driverConf[sizeof(driverConf)-1] = '\0'; - if (virAsprintf(&driverState->configDir, "%s/storage", base) == -1) goto out_of_memory; @@ -175,13 +170,6 @@ storageDriverStartup(int privileged) { VIR_FREE(base); - /* - if (virStorageLoadDriverConfig(driver, driverConf) < 0) { - virStorageDriverShutdown(); - return -1; - } - */ - if (virStoragePoolLoadAllConfigs(&driverState->pools, driverState->configDir, driverState->autostartDir) < 0) diff --git a/src/uml/uml_driver.c b/src/uml/uml_driver.c index 57f50f6..ef2a5b6 100644 --- a/src/uml/uml_driver.c +++ b/src/uml/uml_driver.c @@ -342,10 +342,10 @@ cleanup: * Initialization function for the Uml daemon */ static int -umlStartup(int privileged) { +umlStartup(int privileged) +{ uid_t uid = geteuid(); char *base = NULL; - char driverConf[PATH_MAX]; char *userdir = NULL; if (VIR_ALLOC(uml_driver) < 0) @@ -398,10 +398,6 @@ umlStartup(int privileged) { /* Configuration paths are either ~/.libvirt/uml/... (session) or * /etc/libvirt/uml/... (system). */ - if (snprintf (driverConf, sizeof(driverConf), "%s/uml.conf", base) == -1) - goto out_of_memory; - driverConf[sizeof(driverConf)-1] = '\0'; - if (virAsprintf(&uml_driver->configDir, "%s/uml", base) == -1) goto out_of_memory; -- 1.7.0.4

2 2

[libvirt] [PATCH] docs: add buildbot to the apps page
by Justin Clift 18 Jan '11

18 Jan '11

--- Should have probably included this in the previous commit, but didn't notice this BuildBot project until closing other browser windows. :/ docs/apps.html.in | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/docs/apps.html.in b/docs/apps.html.in index 153584c..054e8c2 100644 --- a/docs/apps.html.in +++ b/docs/apps.html.in @@ -23,6 +23,18 @@ <img src="madeWith.png" alt="Made with libvirt"/> </p> + <h2><a name="automatedtesting">Automated compile/testing</a></h2> + + <dl> + <dt><a href="http://buildbot.net">BuildBot</a></dt> + <dd> + BuildBot is a system to automate the compile/test cycle required + by most software projects. CVS commits trigger new builds, run on + a variety of client machines. Build status (pass/fail/etc) are + displayed on a web page or through other protocols. + </dd> + </dl> + <h2><a name="clientserver">Client/Server applications</a></h2> <dl> -- 1.7.3.5

2 2

[libvirt] [PATCH] docs: add new conversion heading to the apps listing
by Justin Clift 18 Jan '11

18 Jan '11

--- docs/apps.html.in | 43 +++++++++++++++++++++++++++++++++++++++---- 1 files changed, 39 insertions(+), 4 deletions(-) diff --git a/docs/apps.html.in b/docs/apps.html.in index 9a8ffc0..153584c 100644 --- a/docs/apps.html.in +++ b/docs/apps.html.in @@ -93,6 +93,40 @@ </dd> </dl> + <h2><a name="conversion">Conversion</a></h2> + + <dl> + <dt><a href="https://rwmj.wordpress.com/2009/10/13/poor-mans-p2v/">Poor mans p2v</a></dt> + <dd> + A simple approach for converting a physical machine to a virtual + machine, using a rescue CD. + </dd> + <dt><a href="http://et.redhat.com/~rjones/virt-p2v/">virt-p2v</a></dt> + <dd> + An older tool for converting a physical machine into a virtual + machine. It is a LiveCD which is booted on the machine to be + converted. It collects a little information from the user, then + copies the disks over to a remote machine and defines the XML for a + domain to run the guest. + </dd> + <dt><a href="http://git.fedorahosted.org/git/?p=virt-v2v.git;a=summary">virt-v2v</a></dt> + <dd> + virt-v2v converts guests from a foreign hypervisor to run on KVM, + managed by libvirt. It can currently convert Red Hat Enterprise + Linux (RHEL) and Fedora guests running on Xen and VMware ESX. It + will enable VirtIO drivers in the converted guest if possible. + </dd> + <dd> + For RHEL customers of Red Hat, conversion of Windows guests is also + possible. This conversion requires some Microsoft signed pieces, + that Red Hat can provide. + </dd> + <dt><a href="http://bazaar.launchpad.net/~ubuntu-virt/virt-goodies/trunk/annotate/head:/…">vmware2libvirt</a></dt> + <dd> + A Python script for migrating a vmware image to libvirt. + </dd> + </dl> + <h2><a name="desktop">Desktop applications</a></h2> <dl> @@ -134,10 +168,11 @@ <dl> <dt><a href="http://et.redhat.com/~rjones/virt-p2v/">virt-p2v</a></dt> <dd> - A tool for converting a physical machine into a virtual machine. It - is a LiveCD which is booted on the machine to be converted. It collects - a little information from the user, then copies the disks over to - a remote machine and defines the XML for a domain to run the guest. + An older tool for converting a physical machine into a virtual + machine. It is a LiveCD which is booted on the machine to be + converted. It collects a little information from the user, then + copies the disks over to a remote machine and defines the XML for a + domain to run the guest. </dd> </dl> -- 1.7.3.5

2 2

[libvirt] [PATCH] Fix startup with VNC password expiry on old QEMU
by Daniel P. Berrange 18 Jan '11

18 Jan '11

The code which set VNC passwords correctly had fallback for the set_password command, but was lacking it for the expire_password command. This made it impossible to start a guest. It also failed to check whether QEMU was still running after the initial 'set_password' command completed * src/qemu/qemu_hotplug.c: Fix error handling when password expiry fails * src/qemu/qemu_monitor_json.c, src/qemu/qemu_monitor_text.c: Fix return code for missing expire_password command --- src/qemu/qemu_hotplug.c | 12 ++++++++++++ src/qemu/qemu_monitor_json.c | 10 +++++++++- src/qemu/qemu_monitor_text.c | 4 ++-- 3 files changed, 23 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 7abdd0f..125d9b5 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -1869,6 +1869,15 @@ qemuDomainChangeGraphicsPasswords(struct qemud_driver *driver, auth->passwd ? auth->passwd : defaultPasswd); } } + if (ret != 0) + goto cleanup; + + if (!virDomainObjIsActive(vm)) { + ret = -1; + qemuReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("guest unexpectedly quit")); + goto cleanup; + } if (auth->expires) { time_t lifetime = auth->validTo - now; @@ -1888,9 +1897,12 @@ qemuDomainChangeGraphicsPasswords(struct qemud_driver *driver, qemuReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Expiry of passwords is not supported")); ret = -1; + } else { + ret = 0; } } +cleanup: qemuDomainObjExitMonitorWithDriver(driver, vm); return ret; diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 7387089..2e159c7 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -1298,6 +1298,7 @@ cleanup: return ret; } +/* Returns -1 on error, -2 if not supported */ int qemuMonitorJSONExpirePassword(qemuMonitorPtr mon, const char *protocol, const char *expire_time) @@ -1313,9 +1314,16 @@ int qemuMonitorJSONExpirePassword(qemuMonitorPtr mon, ret = qemuMonitorJSONCommand(mon, cmd, &reply); - if (ret == 0) + if (ret == 0) { + if (qemuMonitorJSONHasError(reply, "CommandNotFound")) { + ret = -2; + goto cleanup; + } + ret = qemuMonitorJSONCheckError(cmd, reply); + } +cleanup: virJSONValueFree(cmd); virJSONValueFree(reply); return ret; diff --git a/src/qemu/qemu_monitor_text.c b/src/qemu/qemu_monitor_text.c index 291d958..4cf87fe 100644 --- a/src/qemu/qemu_monitor_text.c +++ b/src/qemu/qemu_monitor_text.c @@ -803,6 +803,7 @@ cleanup: return ret; } +/* Returns -1 on error, -2 if not supported */ int qemuMonitorTextExpirePassword(qemuMonitorPtr mon, const char *protocol, const char *expire_time) @@ -824,8 +825,7 @@ int qemuMonitorTextExpirePassword(qemuMonitorPtr mon, } if (strstr(reply, "unknown command:")) { - qemuReportError(VIR_ERR_NO_SUPPORT, - _("expiring password not supported by this qemu: %s"), reply); + ret = -2; goto cleanup; } -- 1.7.3.4

2 1

[libvirt] Libvirt Windows 0.8.7 installer available
by Justin Clift 18 Jan '11

18 Jan '11

Hi all, The Libvirt 0.8.7 installer for Windows is now available online: http://libvirt.org/sources/win32_experimental/Libvirt-0.8.7-2.exe Changes for this release include: + VirtualBox support on Windows, as added to the main Libvirt 0.8.7 release. I haven't personally tested this yet, so if someone has the time to test and report/confirm it's working, that would be really helpful. + There is now an option to update the system PATH with the libvirt binaries location, so they don't have to be copied around if you're using the .dlls elsewhere. + The README text has been tweaked to be less confusing for vSphere ESX users reading about TLS certificates All thoughts and feedback are welcome. :) Regards and best wishes, Justin Clift

1 0

[libvirt] [PATCH] docs: updated windows page for new 0.8.7 installer
by Justin Clift 18 Jan '11

18 Jan '11

--- docs/windows.html.in | 31 +++++++++++++++---------------- 1 files changed, 15 insertions(+), 16 deletions(-) diff --git a/docs/windows.html.in b/docs/windows.html.in index 9acf67d..4850a54 100644 --- a/docs/windows.html.in +++ b/docs/windows.html.in @@ -18,7 +18,7 @@ version is available here: </p> - <a href="http://libvirt.org/sources/win32_experimental/Libvirt-0.8.6-2.exe">http://libvirt.org/sources/win32_experimental/Libvirt-0.8.6-2.exe</a> + <a href="http://libvirt.org/sources/win32_experimental/Libvirt-0.8.7-2.exe">http://libvirt.org/sources/win32_experimental/Libvirt-0.8.7-2.exe</a> <p> <b>It is not production ready.</b> @@ -77,15 +77,6 @@ <br /><br /> </li> - <li> - Libvirt dll files should be added to path - <br /><br /> - At the moment, anything that needs to use the libvirt dll files - (i.e. the C# bindings) won't automatically find them. This can be - worked around by copying the dll files into the same directory as - whatever needs them, but is probably not an optimal approach. - There might be a better way and needs to be investigated. - </li> </ul> <h2><a name="conntypes">Connection types</h2> @@ -119,6 +110,12 @@ </p> <p> + <b>Special note</b> - Support for VirtualBox *on windows* was added in + libvirt 0.8.7, so reports on success and failure if you're using that + would be really helpful and appreciated. + </p> + + <p> <b>WARNING - The qemu+tcp:// connection type passes all traffic without encryption. This is a security hazard, and should <i>not</i> be used in security sensitive environments.</b> @@ -127,8 +124,9 @@ <h2><a name="esx">Connecting to VMware ESX/vSphere</h2> <p> - Details on the capabilities and connection string syntax used for - connecting to VMware ESX and vSphere can be found online here:<br /> + Details on the capabilities, certificates, and connection string + syntax used for connecting to VMware ESX and vSphere can be found + online here:<br /> </p> <a href="http://libvirt.org/drvesx.html">http://libvirt.org/drvesx.html</a> @@ -136,8 +134,9 @@ <h2><a name="tlscerts">TLS Certificates</h2> <p> - TLS certificates are needed prior to connecting to either QEMU - instances with TLS, or connecting to VMware ESX/vSphere. + TLS certificates need to have been created and placed in the correct + locations, before you will be able to connect to QEMU servers over + TLS. </p> <p> @@ -154,8 +153,8 @@ </p> <p> - The locations of the TLS certificates and key file are hard coded, - rather than being configurable. + The locations of the TLS certificates and key file on Windows are hard + coded, rather than being configurable. </p> <p> -- 1.7.3.5

2 2

[libvirt] [PATCH] Fix error reporting when machine type probe fails
by Daniel P. Berrange 18 Jan '11

18 Jan '11

Avoid overwriting the real error message with a generic OOM failure message, when machine type probe fails * src/qemu/qemu_driver.c: Don't overwrite error --- src/qemu/qemu_driver.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index a1b9d2a..90429e5 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -6322,10 +6322,8 @@ qemudCanonicalizeMachineDirect(virDomainDefPtr def, char **canonical) virCapsGuestMachinePtr *machines = NULL; int i, nmachines = 0; - if (qemuCapsProbeMachineTypes(def->emulator, &machines, &nmachines) < 0) { - virReportOOMError(); + if (qemuCapsProbeMachineTypes(def->emulator, &machines, &nmachines) < 0) return -1; - } for (i = 0; i < nmachines; i++) { if (!machines[i]->canonical) -- 1.7.3.4

2 1

[libvirt] Libvirt 0.8.7 installer ready for testing
by Justin Clift 18 Jan '11

18 Jan '11

Hi guys, Created the windows libvirt 0.8.7 installer using Matthias's updated scripting: http://libvirt.org/sources/win32_experimental/Libvirt-0.8.7-0.exe Does someone have time to test and confirm it's ok, before we point to it from the website? Arnaud, this version of the installer adds the virsh bin directory to the system PATH variable. So I'm thinking don't need to copy the libvirt dll's around, when using your C# bindings. If you've have time to test that, it would be great. Could then update the web page with that info. :) Regards and best wishes, Justin Clift

3 4

[libvirt] [PATCH] Avoid crash in security driver if model is NULL
by Daniel P. Berrange 18 Jan '11

18 Jan '11

If the XML security model is NULL, it is assumed that the current model will be used with dynamic labelling. The verify step is meaningless and potentially crashes if dereferencing NULL * src/security/security_manager.c: Skip NULL model on verify --- src/security/security_manager.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/src/security/security_manager.c b/src/security/security_manager.c index 66cffb5..1bc0ebb 100644 --- a/src/security/security_manager.c +++ b/src/security/security_manager.c @@ -309,6 +309,13 @@ int virSecurityManagerSetProcessLabel(virSecurityManagerPtr mgr, int virSecurityManagerVerify(virSecurityManagerPtr mgr, virDomainDefPtr def) { + /* NULL model == dynamic labelling, with whatever drive + * is active, so we can short circuit verify check to + * avoid drivers dereferencing NULLs by accident + */ + if (!secdef->model) + return 0; + if (mgr->drv->domainSecurityVerify) return mgr->drv->domainSecurityVerify(mgr, def); -- 1.7.3.4

2 1

[libvirt] [PATCH 0/3] Misc fixes/cleanups to libvirt API entry points
by Daniel P. Berrange 18 Jan '11

18 Jan '11

Just some misc fixes/cleanups i have queued against src/libvirt.c

2 6

[libvirt] [PATCH] handle DNS over IPv6
by Paweł Krześniak 18 Jan '11

18 Jan '11

Firstly: Add ip6tables rules to allow DNS over IPv6 in network. Secondly: start dnsmasq with --interface option instead of --listen-address. Dnsmasq currently uses "--listen-address IPv4_address" option, which restricts DNS service to one IPv4 address only. We could append --listen-address for every IPv[46] address defined on interface, but it's cleaner to use "--interface brname". There were some problems in the past with --interface option. Dnsmasq version 2.46 and earlier exited with error when tired to bind() to IPv6 addresses on just brought up interfaces, because DAD (Duplicate Address Detection) takes some time to finish and bind() returns EADDRNOTAVAIL which caused dnsmasq to exit. Dnsmasq version 2.47 (released on 05-Feb-2009) fixed this issue by retrying bind() after getting EADDRNOTAVAIL error (as described in http://www.thekelleys.org.uk/dnsmasq/CHANGELOG; loop itself is defined in dnsmasq-2.47/src/network.c:404) * Using --interface option causes longer network startup: $ time virsh -c qemu:///system net-start isolated1 Network isolated1 started real 0m0.112s user 0m0.013s sys 0m0.009s $ time virsh -c qemu:///system net-start isolated1 Network isolated1 started real 0m2.101s user 0m0.011s sys 0m0.011s * Dnsmasq exits after DAD complets which guarantees that radvd will no more produces following warnings: Dec 28 19:42:11 nemo radvd[14652]: sendmsg: Invalid argument --- src/network/bridge_driver.c | 32 +++++++++++++++++++++++++------- 1 files changed, 25 insertions(+), 7 deletions(-) diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 7d43ef5..a689c9f 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -469,16 +469,13 @@ networkBuildDnsmasqArgv(virNetworkObjPtr network, virCommandAddArgList(cmd, "--conf-file=", "", NULL); /* - * XXX does not actually work, due to some kind of - * race condition setting up ipv6 addresses on the - * interface. A sleep(10) makes it work, but that's - * clearly not practical + * It's safe to use --interface option for dnsmasq 2.47 and later. + * With earlier versions we had to use --listen-address option. * - * virCommandAddArg(cmd, "--interface"); - * virCommandAddArg(cmd, ipdef->bridge); + * virCommandAddArgList(cmd, "--listen-address", bridgeaddr); */ virCommandAddArgList(cmd, - "--listen-address", bridgeaddr, + "--interface", network->def->bridge, "--except-interface", "lo", NULL); @@ -1157,9 +1154,30 @@ networkAddGeneralIptablesRules(struct network_driver *driver, goto err9; } + /* allow DNS over IPv6 requests through to dnsmasq */ + if (iptablesAddTcpInput(driver->iptables, AF_INET6, + network->def->bridge, 53) < 0) { + networkReportError(VIR_ERR_SYSTEM_ERROR, + _("failed to add ip6tables rule to allow DNS requests from '%s'"), + network->def->bridge); + goto err10; + } + + if (iptablesAddUdpInput(driver->iptables, AF_INET6, + network->def->bridge, 53) < 0) { + networkReportError(VIR_ERR_SYSTEM_ERROR, + _("failed to add ip6tables rule to allow DNS requests from '%s'"), + network->def->bridge); + goto err11; + } + return 0; /* unwind in reverse order from the point of failure */ +err11: + iptablesRemoveTcpInput(driver->iptables, AF_INET6, network->def->bridge, 53); +err10: + networkRemoveGeneralIp6tablesRules(driver, network); err9: iptablesRemoveForwardAllowCross(driver->iptables, AF_INET, network->def->bridge); err8:

4 9

[libvirt] [PATCH 0/7] patch queue cleanup
by Eric Blake 17 Jan '11

17 Jan '11

I've been building up several (unrelated) patches that haven't been reviewed yet; here they are in no particular order except that 6 depends on 5, and that 4 depends on 3. Eric Blake (6): datatypes: avoid redundant __FUNCTION__ maint: improve sc_prohibit_strncmp syntax check build: let xgettext see strings in libvirt-guests qemu: use -incoming fd:n to avoid qemu holding fd indefinitely qemu: use lighter-weight fd:n on incoming tunneled migration qemu: improve efficiency of dd during snapshots Laurent Léonard (1): libvirt-guests: remove bashisms .gnulib | 2 +- .x-sc_prohibit_strcmp | 1 - .x-sc_prohibit_strncmp | 1 - Makefile.am | 2 - cfg.mk | 7 +- po/POTFILES.in | 1 + src/datatypes.c | 129 +++++++++++++++----- src/qemu/qemu_command.c | 82 ++++++++----- src/qemu/qemu_command.h | 1 + src/qemu/qemu_driver.c | 56 +++------ src/qemu/qemu_monitor_json.c | 5 +- src/qemu/qemu_monitor_text.c | 5 +- .../qemuxml2argv-restore-v2-fd.args | 1 + .../qemuxml2argv-restore-v2-fd.xml | 25 ++++ tests/qemuxml2argvtest.c | 30 +++-- tools/Makefile.am | 13 ++- ...bvirt-guests.init.in => libvirt-guests.init.sh} | 72 +++++++----- 17 files changed, 279 insertions(+), 154 deletions(-) delete mode 100644 .x-sc_prohibit_strcmp delete mode 100644 .x-sc_prohibit_strncmp create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-restore-v2-fd.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-restore-v2-fd.xml rename tools/{libvirt-guests.init.in => libvirt-guests.init.sh} (76%) -- 1.7.3.4

3 17

[libvirt] [PATCH v2 0/4] Explicit boot device ordering
by Jiri Denemark 17 Jan '11

17 Jan '11

Currently, boot order can be specified per device class but there is no way to specify exact disk/NIC device to boot from. This patchset fixes that. There were two options suggested for how this should be modeled in domain XML: 1) <os> <boot target='net1'/> <boot target='net0'/> <boot target='hdc'/> <boot target='hdb'/> <os> Where target attributes would match /domain/devices/*/target@dev 2) Adding <boot order='n'/> elements into appropriate device elements. In addition to the two options Rich suggested a more compact variant of option 1. Per former discussion this patchset implements the second option. Version 2: - "qemu: Refactor qemuCapsParsePCIDeviceStrs using virCommand" dropped the rest was rebased on top of Eric's capabilities patches - added support for floppy devices which was forgotten in v1 Jiri Denemark (4): conf: Move boot parsing into a separate function Introduce per-device boot element qemu: Support per-device boot ordering tests: Add tests for per-device boot elements docs/formatcaps.html.in | 1 + docs/formatdomain.html.in | 41 +++++- docs/schemas/domain.rng | 20 +++- src/conf/capabilities.c | 3 +- src/conf/domain_conf.c | 148 ++++++++++++++------ src/conf/domain_conf.h | 2 + src/qemu/qemu_capabilities.c | 9 ++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 24 +++- src/qemu/qemu_command.h | 6 +- src/qemu/qemu_driver.c | 2 + src/qemu/qemu_hotplug.c | 8 +- .../qemuxml2argvdata/qemuxml2argv-boot-order.args | 1 + tests/qemuxml2argvdata/qemuxml2argv-boot-order.xml | 52 +++++++ tests/qemuxml2argvtest.c | 2 + tests/qemuxml2xmltest.c | 1 + 16 files changed, 265 insertions(+), 56 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-boot-order.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-boot-order.xml -- 1.7.4.rc1

3 17

[libvirt] [PATCH] qemu: Error prompt if invalid dump image format specified
by Osier Yang 17 Jan '11

17 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, this fix makes changes so that it returns -1 on FAILURE, And to be consistent with "save", won't use "raw" as the default dump format anymore. * src/qemu/qemu_driver.c - rename "getCompressionType" to "getDumpType" - return -1 on FAILURE --- src/qemu/qemu_driver.c | 40 +++++++++++++++++++++++++--------------- 1 files changed, 25 insertions(+), 15 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 395f72f..f8c2aae 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -4787,8 +4787,12 @@ cleanup: return ret; } -static enum qemud_save_formats -getCompressionType(struct qemud_driver *driver) +/* Returns enum qemud_save_formats on SUCCESS, or returns -1 if + * specified dump image format is invalid or compression program + * for the format specified is not available on FAILURE. + */ +static int +getDumpType(struct qemud_driver *driver) { int compress = QEMUD_SAVE_FORMAT_RAW; @@ -4801,15 +4805,14 @@ getCompressionType(struct qemud_driver *driver) if (compress < 0) { qemuReportError(VIR_ERR_OPERATION_FAILED, "%s", _("Invalid dump image format specified in " - "configuration file, using raw")); - return QEMUD_SAVE_FORMAT_RAW; + "configuration file.")); + return -1; } if (!qemudCompressProgramAvailable(compress)) { qemuReportError(VIR_ERR_OPERATION_FAILED, "%s", _("Compression program for dump image format " - "in configuration file isn't available, " - "using raw")); - return QEMUD_SAVE_FORMAT_RAW; + "in configuration file isn't available.")); + return -1; } } return compress; @@ -4865,7 +4868,11 @@ static int qemudDomainCoreDump(virDomainPtr dom, } } - ret = doCoreDump(driver, vm, path, getCompressionType(driver)); + int compress = getDumpType(driver); + if (compress < 0) + goto endjob; + + ret = doCoreDump(driver, vm, path, compress); if (ret < 0) goto endjob; @@ -4937,13 +4944,16 @@ static void processWatchdogEvent(void *data, void *opaque) break; } - ret = doCoreDump(driver, - wdEvent->vm, - dumpfile, - getCompressionType(driver)); - if (ret < 0) - qemuReportError(VIR_ERR_OPERATION_FAILED, - "%s", _("Dump failed")); + int compress = getDumpType(driver); + if (compress >= 0) { + ret = doCoreDump(driver, + wdEvent->vm, + dumpfile, + compress); + if (ret < 0) + qemuReportError(VIR_ERR_OPERATION_FAILED, + "%s", _("Dump failed")); + } ret = doStartCPUs(driver, wdEvent->vm, NULL); -- 1.7.3.2

3 3

[libvirt] [PATCH] Use VIR_ERR_OPERATION_INVALID when appropriated
by Matthias Bolte 17 Jan '11

17 Jan '11

VIR_ERR_OPERATION_INVALID means that the operation is not valid for the current state of the involved object. --- src/esx/esx_driver.c | 1 - src/lxc/lxc_driver.c | 2 +- src/network/bridge_driver.c | 2 +- src/opennebula/one_driver.c | 2 +- src/openvz/openvz_driver.c | 2 +- src/qemu/qemu_driver.c | 4 ++-- src/test/test_driver.c | 34 +++++++++++++++++----------------- src/uml/uml_driver.c | 10 +++++----- src/vmware/vmware_driver.c | 2 +- 9 files changed, 29 insertions(+), 30 deletions(-) diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c index de3e49f..26f029c 100644 --- a/src/esx/esx_driver.c +++ b/src/esx/esx_driver.c @@ -1660,7 +1660,6 @@ esxDomainLookupByName(virConnectPtr conn, const char *name) goto cleanup; } - if (esxVI_GetVirtualMachineIdentity(virtualMachine, &id, NULL, uuid) < 0 || esxVI_GetVirtualMachinePowerState(virtualMachine, &powerState) < 0) { goto cleanup; diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index c4fe936..df693ec 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -2491,7 +2491,7 @@ static int lxcDomainSetAutostart(virDomainPtr dom, } if (!vm->persistent) { - lxcError(VIR_ERR_INTERNAL_ERROR, + lxcError(VIR_ERR_OPERATION_INVALID, "%s", _("Cannot set autostart for transient domain")); goto cleanup; } diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 3f63afd..c098ab5 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -1537,7 +1537,7 @@ networkStartNetworkDaemon(struct network_driver *driver, virNetworkIpDefPtr ipdef; if (virNetworkObjIsActive(network)) { - networkReportError(VIR_ERR_INTERNAL_ERROR, + networkReportError(VIR_ERR_OPERATION_INVALID, "%s", _("network is already active")); return -1; } diff --git a/src/opennebula/one_driver.c b/src/opennebula/one_driver.c index b88f44f..4febb46 100644 --- a/src/opennebula/one_driver.c +++ b/src/opennebula/one_driver.c @@ -291,7 +291,7 @@ static int oneDomainUndefine(virDomainPtr dom) } if (!vm->persistent) { - oneError(VIR_ERR_INTERNAL_ERROR, "%s", + oneError(VIR_ERR_OPERATION_INVALID, "%s", _("cannot undefine transient domain")); goto return_point; } diff --git a/src/openvz/openvz_driver.c b/src/openvz/openvz_driver.c index 7728981..fc6ae29 100644 --- a/src/openvz/openvz_driver.c +++ b/src/openvz/openvz_driver.c @@ -1079,7 +1079,7 @@ openvzDomainUndefine(virDomainPtr dom) } if (virDomainObjIsActive(vm)) { - openvzError(VIR_ERR_INTERNAL_ERROR, "%s", + openvzError(VIR_ERR_OPERATION_INVALID, "%s", _("cannot delete active domain")); goto cleanup; } diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index be0c231..b2c99a1 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -6402,7 +6402,7 @@ static int qemudDomainUndefine(virDomainPtr dom) { } if (!vm->persistent) { - qemuReportError(VIR_ERR_INTERNAL_ERROR, + qemuReportError(VIR_ERR_OPERATION_INVALID, "%s", _("cannot undefine transient domain")); goto cleanup; } @@ -6849,7 +6849,7 @@ static int qemudDomainSetAutostart(virDomainPtr dom, } if (!vm->persistent) { - qemuReportError(VIR_ERR_INTERNAL_ERROR, + qemuReportError(VIR_ERR_OPERATION_INVALID, "%s", _("cannot set autostart for transient domain")); goto cleanup; } diff --git a/src/test/test_driver.c b/src/test/test_driver.c index 601ecf8..7b07780 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -3061,7 +3061,7 @@ static int testNetworkUndefine(virNetworkPtr network) { } if (virNetworkObjIsActive(privnet)) { - testError(VIR_ERR_INTERNAL_ERROR, + testError(VIR_ERR_OPERATION_INVALID, _("Network '%s' is still running"), network->name); goto cleanup; } @@ -3094,7 +3094,7 @@ static int testNetworkStart(virNetworkPtr network) { } if (virNetworkObjIsActive(privnet)) { - testError(VIR_ERR_INTERNAL_ERROR, + testError(VIR_ERR_OPERATION_INVALID, _("Network '%s' is already running"), network->name); goto cleanup; } @@ -3817,7 +3817,7 @@ testStoragePoolStart(virStoragePoolPtr pool, } if (virStoragePoolObjIsActive(privpool)) { - testError(VIR_ERR_INTERNAL_ERROR, + testError(VIR_ERR_OPERATION_INVALID, _("storage pool '%s' is already active"), pool->name); goto cleanup; } @@ -3982,7 +3982,7 @@ testStoragePoolUndefine(virStoragePoolPtr pool) { } if (virStoragePoolObjIsActive(privpool)) { - testError(VIR_ERR_INTERNAL_ERROR, + testError(VIR_ERR_OPERATION_INVALID, _("storage pool '%s' is already active"), pool->name); goto cleanup; } @@ -4015,7 +4015,7 @@ testStoragePoolBuild(virStoragePoolPtr pool, } if (virStoragePoolObjIsActive(privpool)) { - testError(VIR_ERR_INTERNAL_ERROR, + testError(VIR_ERR_OPERATION_INVALID, _("storage pool '%s' is already active"), pool->name); goto cleanup; } @@ -4044,7 +4044,7 @@ testStoragePoolDestroy(virStoragePoolPtr pool) { } if (!virStoragePoolObjIsActive(privpool)) { - testError(VIR_ERR_INTERNAL_ERROR, + testError(VIR_ERR_OPERATION_INVALID, _("storage pool '%s' is not active"), pool->name); goto cleanup; } @@ -4083,7 +4083,7 @@ testStoragePoolDelete(virStoragePoolPtr pool, } if (virStoragePoolObjIsActive(privpool)) { - testError(VIR_ERR_INTERNAL_ERROR, + testError(VIR_ERR_OPERATION_INVALID, _("storage pool '%s' is already active"), pool->name); goto cleanup; } @@ -4115,7 +4115,7 @@ testStoragePoolRefresh(virStoragePoolPtr pool, } if (!virStoragePoolObjIsActive(privpool)) { - testError(VIR_ERR_INTERNAL_ERROR, + testError(VIR_ERR_OPERATION_INVALID, _("storage pool '%s' is not active"), pool->name); goto cleanup; } @@ -4267,7 +4267,7 @@ testStoragePoolNumVolumes(virStoragePoolPtr pool) { } if (!virStoragePoolObjIsActive(privpool)) { - testError(VIR_ERR_INTERNAL_ERROR, + testError(VIR_ERR_OPERATION_INVALID, _("storage pool '%s' is not active"), pool->name); goto cleanup; } @@ -4302,7 +4302,7 @@ testStoragePoolListVolumes(virStoragePoolPtr pool, if (!virStoragePoolObjIsActive(privpool)) { - testError(VIR_ERR_INTERNAL_ERROR, + testError(VIR_ERR_OPERATION_INVALID, _("storage pool '%s' is not active"), pool->name); goto cleanup; } @@ -4348,7 +4348,7 @@ testStorageVolumeLookupByName(virStoragePoolPtr pool, if (!virStoragePoolObjIsActive(privpool)) { - testError(VIR_ERR_INTERNAL_ERROR, + testError(VIR_ERR_OPERATION_INVALID, _("storage pool '%s' is not active"), pool->name); goto cleanup; } @@ -4459,7 +4459,7 @@ testStorageVolumeCreateXML(virStoragePoolPtr pool, } if (!virStoragePoolObjIsActive(privpool)) { - testError(VIR_ERR_INTERNAL_ERROR, + testError(VIR_ERR_OPERATION_INVALID, _("storage pool '%s' is not active"), pool->name); goto cleanup; } @@ -4540,7 +4540,7 @@ testStorageVolumeCreateXMLFrom(virStoragePoolPtr pool, } if (!virStoragePoolObjIsActive(privpool)) { - testError(VIR_ERR_INTERNAL_ERROR, + testError(VIR_ERR_OPERATION_INVALID, _("storage pool '%s' is not active"), pool->name); goto cleanup; } @@ -4640,7 +4640,7 @@ testStorageVolumeDelete(virStorageVolPtr vol, } if (!virStoragePoolObjIsActive(privpool)) { - testError(VIR_ERR_INTERNAL_ERROR, + testError(VIR_ERR_OPERATION_INVALID, _("storage pool '%s' is not active"), vol->pool); goto cleanup; } @@ -4718,7 +4718,7 @@ testStorageVolumeGetInfo(virStorageVolPtr vol, } if (!virStoragePoolObjIsActive(privpool)) { - testError(VIR_ERR_INTERNAL_ERROR, + testError(VIR_ERR_OPERATION_INVALID, _("storage pool '%s' is not active"), vol->pool); goto cleanup; } @@ -4763,7 +4763,7 @@ testStorageVolumeGetXMLDesc(virStorageVolPtr vol, } if (!virStoragePoolObjIsActive(privpool)) { - testError(VIR_ERR_INTERNAL_ERROR, + testError(VIR_ERR_OPERATION_INVALID, _("storage pool '%s' is not active"), vol->pool); goto cleanup; } @@ -4803,7 +4803,7 @@ testStorageVolumeGetPath(virStorageVolPtr vol) { } if (!virStoragePoolObjIsActive(privpool)) { - testError(VIR_ERR_INTERNAL_ERROR, + testError(VIR_ERR_OPERATION_INVALID, _("storage pool '%s' is not active"), vol->pool); goto cleanup; } diff --git a/src/uml/uml_driver.c b/src/uml/uml_driver.c index c6df0a1..57f50f6 100644 --- a/src/uml/uml_driver.c +++ b/src/uml/uml_driver.c @@ -819,7 +819,7 @@ static int umlStartVMDaemon(virConnectPtr conn, virCommandPtr cmd = NULL; if (virDomainObjIsActive(vm)) { - umlReportError(VIR_ERR_INTERNAL_ERROR, "%s", + umlReportError(VIR_ERR_OPERATION_INVALID, "%s", _("VM is already active")); return -1; } @@ -1462,7 +1462,7 @@ static int umlDomainSetMemory(virDomainPtr dom, unsigned long newmem) { } if (virDomainObjIsActive(vm)) { - umlReportError(VIR_ERR_NO_SUPPORT, "%s", + umlReportError(VIR_ERR_OPERATION_INVALID, "%s", _("cannot set memory of an active domain")); goto cleanup; } @@ -1656,13 +1656,13 @@ static int umlDomainUndefine(virDomainPtr dom) { } if (virDomainObjIsActive(vm)) { - umlReportError(VIR_ERR_INTERNAL_ERROR, "%s", + umlReportError(VIR_ERR_OPERATION_INVALID, "%s", _("cannot delete active domain")); goto cleanup; } if (!vm->persistent) { - umlReportError(VIR_ERR_INTERNAL_ERROR, "%s", + umlReportError(VIR_ERR_OPERATION_INVALID, "%s", _("cannot undefine transient domain")); goto cleanup; } @@ -1954,7 +1954,7 @@ static int umlDomainSetAutostart(virDomainPtr dom, } if (!vm->persistent) { - umlReportError(VIR_ERR_INTERNAL_ERROR, "%s", + umlReportError(VIR_ERR_OPERATION_INVALID, "%s", _("cannot set autostart for transient domain")); goto cleanup; } diff --git a/src/vmware/vmware_driver.c b/src/vmware/vmware_driver.c index 47314f8..f176c2f 100644 --- a/src/vmware/vmware_driver.c +++ b/src/vmware/vmware_driver.c @@ -622,7 +622,7 @@ vmwareDomainUndefine(virDomainPtr dom) } if (!vm->persistent) { - vmwareError(VIR_ERR_INTERNAL_ERROR, + vmwareError(VIR_ERR_OPERATION_INVALID, "%s", _("cannot undefine transient domain")); goto cleanup; } -- 1.7.0.4

2 1

[libvirt] [PATCH] Fix misuse of VIR_ERR_INVALID_* error code
by Matthias Bolte 17 Jan '11

17 Jan '11

VIR_ERR_INVALID_* is meant for invalid pointers only. --- src/conf/nwfilter_conf.c | 6 +++--- src/conf/storage_conf.c | 2 +- src/network/bridge_driver.c | 20 ++++++++++---------- src/nwfilter/nwfilter_driver.c | 6 +++--- src/nwfilter/nwfilter_ebiptables_driver.c | 20 ++++++++++---------- src/qemu/qemu_driver.c | 4 ++-- src/storage/storage_backend.c | 2 +- src/test/test_driver.c | 20 ++++++++++---------- 8 files changed, 40 insertions(+), 40 deletions(-) diff --git a/src/conf/nwfilter_conf.c b/src/conf/nwfilter_conf.c index 0346471..dbb72b2 100644 --- a/src/conf/nwfilter_conf.c +++ b/src/conf/nwfilter_conf.c @@ -2366,7 +2366,7 @@ virNWFilterObjAssignDef(virConnectPtr conn, if (nwfilter) { if (!STREQ(def->name, nwfilter->def->name)) { - virNWFilterReportError(VIR_ERR_INVALID_NWFILTER, + virNWFilterReportError(VIR_ERR_OPERATION_FAILED, _("filter with same UUID but different name " "('%s') already exists"), nwfilter->def->name); @@ -2377,7 +2377,7 @@ virNWFilterObjAssignDef(virConnectPtr conn, } if (virNWFilterDefLoopDetect(conn, nwfilters, def)) { - virNWFilterReportError(VIR_ERR_INVALID_NWFILTER, + virNWFilterReportError(VIR_ERR_OPERATION_FAILED, "%s", _("filter would introduce a loop")); return NULL; } @@ -2442,7 +2442,7 @@ virNWFilterObjLoad(virConnectPtr conn, } if (!virFileMatchesNameSuffix(file, def->name, ".xml")) { - virNWFilterReportError(VIR_ERR_INVALID_NWFILTER, + virNWFilterReportError(VIR_ERR_XML_ERROR, _("network filter config filename '%s' does not match name '%s'"), path, def->name); virNWFilterDefFree(def); diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c index f7f471e..0c37dc6 100644 --- a/src/conf/storage_conf.c +++ b/src/conf/storage_conf.c @@ -1423,7 +1423,7 @@ virStoragePoolObjLoad(virStoragePoolObjListPtr pools, } if (!virFileMatchesNameSuffix(file, def->name, ".xml")) { - virStorageReportError(VIR_ERR_INVALID_STORAGE_POOL, + virStorageReportError(VIR_ERR_XML_ERROR, _("Storage pool config filename '%s' does not match pool name '%s'"), path, def->name); virStoragePoolDefFree(def); diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 4c64a74..3f63afd 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -2059,13 +2059,13 @@ static int networkUndefine(virNetworkPtr net) { network = virNetworkFindByUUID(&driver->networks, net->uuid); if (!network) { - networkReportError(VIR_ERR_INVALID_NETWORK, + networkReportError(VIR_ERR_NO_NETWORK, "%s", _("no network with matching uuid")); goto cleanup; } if (virNetworkObjIsActive(network)) { - networkReportError(VIR_ERR_INTERNAL_ERROR, + networkReportError(VIR_ERR_OPERATION_INVALID, "%s", _("network is still active")); goto cleanup; } @@ -2138,7 +2138,7 @@ static int networkStart(virNetworkPtr net) { network = virNetworkFindByUUID(&driver->networks, net->uuid); if (!network) { - networkReportError(VIR_ERR_INVALID_NETWORK, + networkReportError(VIR_ERR_NO_NETWORK, "%s", _("no network with matching uuid")); goto cleanup; } @@ -2161,13 +2161,13 @@ static int networkDestroy(virNetworkPtr net) { network = virNetworkFindByUUID(&driver->networks, net->uuid); if (!network) { - networkReportError(VIR_ERR_INVALID_NETWORK, + networkReportError(VIR_ERR_NO_NETWORK, "%s", _("no network with matching uuid")); goto cleanup; } if (!virNetworkObjIsActive(network)) { - networkReportError(VIR_ERR_INTERNAL_ERROR, + networkReportError(VIR_ERR_OPERATION_INVALID, "%s", _("network is not active")); goto cleanup; } @@ -2196,7 +2196,7 @@ static char *networkDumpXML(virNetworkPtr net, int flags ATTRIBUTE_UNUSED) { networkDriverUnlock(driver); if (!network) { - networkReportError(VIR_ERR_INVALID_NETWORK, + networkReportError(VIR_ERR_NO_NETWORK, "%s", _("no network with matching uuid")); goto cleanup; } @@ -2219,7 +2219,7 @@ static char *networkGetBridgeName(virNetworkPtr net) { networkDriverUnlock(driver); if (!network) { - networkReportError(VIR_ERR_INVALID_NETWORK, + networkReportError(VIR_ERR_NO_NETWORK, "%s", _("no network with matching id")); goto cleanup; } @@ -2251,7 +2251,7 @@ static int networkGetAutostart(virNetworkPtr net, network = virNetworkFindByUUID(&driver->networks, net->uuid); networkDriverUnlock(driver); if (!network) { - networkReportError(VIR_ERR_INVALID_NETWORK, + networkReportError(VIR_ERR_NO_NETWORK, "%s", _("no network with matching uuid")); goto cleanup; } @@ -2276,13 +2276,13 @@ static int networkSetAutostart(virNetworkPtr net, network = virNetworkFindByUUID(&driver->networks, net->uuid); if (!network) { - networkReportError(VIR_ERR_INVALID_NETWORK, + networkReportError(VIR_ERR_NO_NETWORK, "%s", _("no network with matching uuid")); goto cleanup; } if (!network->persistent) { - networkReportError(VIR_ERR_INTERNAL_ERROR, + networkReportError(VIR_ERR_OPERATION_INVALID, "%s", _("cannot set autostart for transient network")); goto cleanup; } diff --git a/src/nwfilter/nwfilter_driver.c b/src/nwfilter/nwfilter_driver.c index fa72a5f..f903311 100644 --- a/src/nwfilter/nwfilter_driver.c +++ b/src/nwfilter/nwfilter_driver.c @@ -372,13 +372,13 @@ nwfilterUndefine(virNWFilterPtr obj) { nwfilter = virNWFilterObjFindByUUID(&driver->nwfilters, obj->uuid); if (!nwfilter) { - virNWFilterReportError(VIR_ERR_INVALID_NWFILTER, + virNWFilterReportError(VIR_ERR_NO_NWFILTER, "%s", _("no nwfilter with matching uuid")); goto cleanup; } if (virNWFilterTestUnassignDef(obj->conn, nwfilter)) { - virNWFilterReportError(VIR_ERR_INVALID_NWFILTER, + virNWFilterReportError(VIR_ERR_OPERATION_INVALID, "%s", _("nwfilter is in use")); goto cleanup; @@ -417,7 +417,7 @@ nwfilterDumpXML(virNWFilterPtr obj, nwfilterDriverUnlock(driver); if (!nwfilter) { - virNWFilterReportError(VIR_ERR_INVALID_NWFILTER, + virNWFilterReportError(VIR_ERR_NO_NWFILTER, "%s", _("no nwfilter with matching uuid")); goto cleanup; } diff --git a/src/nwfilter/nwfilter_ebiptables_driver.c b/src/nwfilter/nwfilter_ebiptables_driver.c index 9b7a7c8..91a9159 100644 --- a/src/nwfilter/nwfilter_ebiptables_driver.c +++ b/src/nwfilter/nwfilter_ebiptables_driver.c @@ -157,14 +157,14 @@ printVar(virNWFilterHashTablePtr vars, if ((item->flags & NWFILTER_ENTRY_ITEM_FLAG_HAS_VAR)) { char *val = (char *)virHashLookup(vars->hashTable, item->var); if (!val) { - virNWFilterReportError(VIR_ERR_INVALID_NWFILTER, + virNWFilterReportError(VIR_ERR_INTERNAL_ERROR, _("cannot find value for '%s'"), item->var); return 1; } if (!virStrcpy(buf, val, bufsize)) { - virNWFilterReportError(VIR_ERR_INVALID_NWFILTER, + virNWFilterReportError(VIR_ERR_INTERNAL_ERROR, _("Buffer to small to print MAC address " "'%s' into"), item->var); @@ -223,7 +223,7 @@ _printDataType(virNWFilterHashTablePtr vars, case DATATYPE_MACADDR: case DATATYPE_MACMASK: if (bufsize < VIR_MAC_STRING_BUFLEN) { - virNWFilterReportError(VIR_ERR_INVALID_NWFILTER, "%s", + virNWFilterReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Buffer too small for MAC address")); return 1; } @@ -235,7 +235,7 @@ _printDataType(virNWFilterHashTablePtr vars, case DATATYPE_IPMASK: if (snprintf(buf, bufsize, "%d", item->u.u8) >= bufsize) { - virNWFilterReportError(VIR_ERR_INVALID_NWFILTER, "%s", + virNWFilterReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Buffer too small for uint8 type")); return 1; } @@ -245,7 +245,7 @@ _printDataType(virNWFilterHashTablePtr vars, case DATATYPE_UINT16_HEX: if (snprintf(buf, bufsize, asHex ? "0x%x" : "%d", item->u.u16) >= bufsize) { - virNWFilterReportError(VIR_ERR_INVALID_NWFILTER, "%s", + virNWFilterReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Buffer too small for uint16 type")); return 1; } @@ -255,14 +255,14 @@ _printDataType(virNWFilterHashTablePtr vars, case DATATYPE_UINT8_HEX: if (snprintf(buf, bufsize, asHex ? "0x%x" : "%d", item->u.u8) >= bufsize) { - virNWFilterReportError(VIR_ERR_INVALID_NWFILTER, "%s", + virNWFilterReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Buffer too small for uint8 type")); return 1; } break; default: - virNWFilterReportError(VIR_ERR_INVALID_NWFILTER, + virNWFilterReportError(VIR_ERR_INTERNAL_ERROR, _("Unhandled datatype %x"), item->datatype); return 1; break; @@ -2356,7 +2356,7 @@ ebiptablesCreateRuleInstance(virConnectPtr conn ATTRIBUTE_UNUSED, case VIR_NWFILTER_RULE_PROTOCOL_IGMP: case VIR_NWFILTER_RULE_PROTOCOL_ALL: if (nettype == VIR_DOMAIN_NET_TYPE_DIRECT) { - virNWFilterReportError(VIR_ERR_INVALID_NWFILTER, + virNWFilterReportError(VIR_ERR_INTERNAL_ERROR, _("'%s' protocol not support for net type '%s'"), virNWFilterRuleProtocolTypeToString(rule->prtclType), virDomainNetTypeToString(nettype)); @@ -2380,7 +2380,7 @@ ebiptablesCreateRuleInstance(virConnectPtr conn ATTRIBUTE_UNUSED, case VIR_NWFILTER_RULE_PROTOCOL_ICMPV6: case VIR_NWFILTER_RULE_PROTOCOL_ALLoIPV6: if (nettype == VIR_DOMAIN_NET_TYPE_DIRECT) { - virNWFilterReportError(VIR_ERR_INVALID_NWFILTER, + virNWFilterReportError(VIR_ERR_OPERATION_FAILED, _("'%s' protocol not support for net type '%s'"), virNWFilterRuleProtocolTypeToString(rule->prtclType), virDomainNetTypeToString(nettype)); @@ -2396,7 +2396,7 @@ ebiptablesCreateRuleInstance(virConnectPtr conn ATTRIBUTE_UNUSED, break; case VIR_NWFILTER_RULE_PROTOCOL_LAST: - virNWFilterReportError(VIR_ERR_INVALID_NWFILTER, + virNWFilterReportError(VIR_ERR_OPERATION_FAILED, "%s", _("illegal protocol type")); rc = 1; break; diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 395f72f..be0c231 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -467,7 +467,7 @@ getVolumeQcowPassphrase(virConnectPtr conn, enc->nsecrets != 1 || enc->secrets[0]->type != VIR_STORAGE_ENCRYPTION_SECRET_TYPE_PASSPHRASE) { - qemuReportError(VIR_ERR_INVALID_DOMAIN, + qemuReportError(VIR_ERR_XML_ERROR, _("invalid <encryption> for volume %s"), disk->src); goto cleanup; } @@ -485,7 +485,7 @@ getVolumeQcowPassphrase(virConnectPtr conn, if (memchr(data, '\0', size) != NULL) { memset(data, 0, size); VIR_FREE(data); - qemuReportError(VIR_ERR_INVALID_SECRET, + qemuReportError(VIR_ERR_XML_ERROR, _("format='qcow' passphrase for %s must not contain a " "'\\0'"), disk->src); goto cleanup; diff --git a/src/storage/storage_backend.c b/src/storage/storage_backend.c index ee08a4a..bfe1172 100644 --- a/src/storage/storage_backend.c +++ b/src/storage/storage_backend.c @@ -713,7 +713,7 @@ virStorageBackendCreateQemuImg(virConnectPtr conn, return -1; } if (enc->nsecrets > 1) { - virStorageReportError(VIR_ERR_INVALID_STORAGE_VOL, "%s", + virStorageReportError(VIR_ERR_XML_ERROR, "%s", _("too many secrets for qcow encryption")); return -1; } diff --git a/src/test/test_driver.c b/src/test/test_driver.c index ddff160..601ecf8 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -4356,7 +4356,7 @@ testStorageVolumeLookupByName(virStoragePoolPtr pool, privvol = virStorageVolDefFindByName(privpool, name); if (!privvol) { - testError(VIR_ERR_INVALID_STORAGE_VOL, + testError(VIR_ERR_NO_STORAGE_VOL, _("no storage vol with matching name '%s'"), name); goto cleanup; } @@ -4399,7 +4399,7 @@ testStorageVolumeLookupByKey(virConnectPtr conn, testDriverUnlock(privconn); if (!ret) - testError(VIR_ERR_INVALID_STORAGE_VOL, + testError(VIR_ERR_NO_STORAGE_VOL, _("no storage vol with matching key '%s'"), key); return ret; @@ -4433,7 +4433,7 @@ testStorageVolumeLookupByPath(virConnectPtr conn, testDriverUnlock(privconn); if (!ret) - testError(VIR_ERR_INVALID_STORAGE_VOL, + testError(VIR_ERR_NO_STORAGE_VOL, _("no storage vol with matching path '%s'"), path); return ret; @@ -4469,7 +4469,7 @@ testStorageVolumeCreateXML(virStoragePoolPtr pool, goto cleanup; if (virStorageVolDefFindByName(privpool, privvol->name)) { - testError(VIR_ERR_INVALID_STORAGE_VOL, + testError(VIR_ERR_OPERATION_FAILED, "%s", _("storage vol already exists")); goto cleanup; } @@ -4550,14 +4550,14 @@ testStorageVolumeCreateXMLFrom(virStoragePoolPtr pool, goto cleanup; if (virStorageVolDefFindByName(privpool, privvol->name)) { - testError(VIR_ERR_INVALID_STORAGE_VOL, + testError(VIR_ERR_OPERATION_FAILED, "%s", _("storage vol already exists")); goto cleanup; } origvol = virStorageVolDefFindByName(privpool, clonevol->name); if (!origvol) { - testError(VIR_ERR_INVALID_STORAGE_VOL, + testError(VIR_ERR_NO_STORAGE_VOL, _("no storage vol with matching name '%s'"), clonevol->name); goto cleanup; @@ -4633,7 +4633,7 @@ testStorageVolumeDelete(virStorageVolPtr vol, privvol = virStorageVolDefFindByName(privpool, vol->name); if (privvol == NULL) { - testError(VIR_ERR_INVALID_STORAGE_VOL, + testError(VIR_ERR_NO_STORAGE_VOL, _("no storage vol with matching name '%s'"), vol->name); goto cleanup; @@ -4711,7 +4711,7 @@ testStorageVolumeGetInfo(virStorageVolPtr vol, privvol = virStorageVolDefFindByName(privpool, vol->name); if (privvol == NULL) { - testError(VIR_ERR_INVALID_STORAGE_VOL, + testError(VIR_ERR_NO_STORAGE_VOL, _("no storage vol with matching name '%s'"), vol->name); goto cleanup; @@ -4756,7 +4756,7 @@ testStorageVolumeGetXMLDesc(virStorageVolPtr vol, privvol = virStorageVolDefFindByName(privpool, vol->name); if (privvol == NULL) { - testError(VIR_ERR_INVALID_STORAGE_VOL, + testError(VIR_ERR_NO_STORAGE_VOL, _("no storage vol with matching name '%s'"), vol->name); goto cleanup; @@ -4796,7 +4796,7 @@ testStorageVolumeGetPath(virStorageVolPtr vol) { privvol = virStorageVolDefFindByName(privpool, vol->name); if (privvol == NULL) { - testError(VIR_ERR_INVALID_STORAGE_VOL, + testError(VIR_ERR_NO_STORAGE_VOL, _("no storage vol with matching name '%s'"), vol->name); goto cleanup; -- 1.7.0.4

2 1

[libvirt] [PATCH] Simplify "NWFilterPool" to "NWFilter"
by Matthias Bolte 17 Jan '11

17 Jan '11

The public object is called NWFilter but the corresponding private object is called NWFilterPool. I don't see compelling reasons for this Pool suffix. One might argue that an NWFilter is a "pool" of rules, etc. Remove the Pool suffix from NWFilterPool. No functional change included. --- cfg.mk | 8 +- src/conf/nwfilter_conf.c | 237 ++++++++++++++++---------------- src/conf/nwfilter_conf.h | 60 ++++---- src/datatypes.c | 72 +++++----- src/datatypes.h | 8 +- src/driver.h | 4 +- src/libvirt.c | 4 +- src/libvirt_private.syms | 20 ++-- src/nwfilter/nwfilter_driver.c | 112 ++++++++-------- src/nwfilter/nwfilter_gentech_driver.c | 30 ++-- 10 files changed, 276 insertions(+), 279 deletions(-) diff --git a/cfg.mk b/cfg.mk index d4c593f..066fa3d 100644 --- a/cfg.mk +++ b/cfg.mk @@ -116,7 +116,7 @@ useless_free_options = \ --name=virNWFilterHashTableFree \ --name=virNWFilterIPAddrLearnReqFree \ --name=virNWFilterIncludeDefFree \ - --name=virNWFilterPoolObjFree \ + --name=virNWFilterObjFree \ --name=virNWFilterRuleDefFree \ --name=virNWFilterRuleInstFree \ --name=virNetworkDefFree \ @@ -194,9 +194,9 @@ useless_free_options = \ # y virNWFilterHashTableFree # y virNWFilterIPAddrLearnReqFree # y virNWFilterIncludeDefFree -# n virNWFilterPoolFreeName (returns int) -# y virNWFilterPoolObjFree -# n virNWFilterPoolObjListFree FIXME +# n virNWFilterFreeName (returns int) +# y virNWFilterObjFree +# n virNWFilterObjListFree FIXME # y virNWFilterRuleDefFree # n virNWFilterRuleFreeInstanceData (typedef) # y virNWFilterRuleInstFree diff --git a/src/conf/nwfilter_conf.c b/src/conf/nwfilter_conf.c index 6fd07d4..0346471 100644 --- a/src/conf/nwfilter_conf.c +++ b/src/conf/nwfilter_conf.c @@ -299,7 +299,8 @@ virNWFilterDefFree(virNWFilterDefPtr def) { void -virNWFilterPoolObjFree(virNWFilterPoolObjPtr obj) { +virNWFilterObjFree(virNWFilterObjPtr obj) +{ if (!obj) return; @@ -315,13 +316,13 @@ virNWFilterPoolObjFree(virNWFilterPoolObjPtr obj) { void -virNWFilterPoolObjListFree(virNWFilterPoolObjListPtr pools) +virNWFilterObjListFree(virNWFilterObjListPtr nwfilters) { unsigned int i; - for (i = 0 ; i < pools->count ; i++) - virNWFilterPoolObjFree(pools->objs[i]); - VIR_FREE(pools->objs); - pools->count = 0; + for (i = 0 ; i < nwfilters->count ; i++) + virNWFilterObjFree(nwfilters->objs[i]); + VIR_FREE(nwfilters->objs); + nwfilters->count = 0; } @@ -382,31 +383,31 @@ virNWFilterRuleDefAddString(virNWFilterRuleDefPtr nwf, void -virNWFilterPoolObjRemove(virNWFilterPoolObjListPtr pools, - virNWFilterPoolObjPtr pool) +virNWFilterObjRemove(virNWFilterObjListPtr nwfilters, + virNWFilterObjPtr nwfilter) { unsigned int i; - virNWFilterPoolObjUnlock(pool); + virNWFilterObjUnlock(nwfilter); - for (i = 0 ; i < pools->count ; i++) { - virNWFilterPoolObjLock(pools->objs[i]); - if (pools->objs[i] == pool) { - virNWFilterPoolObjUnlock(pools->objs[i]); - virNWFilterPoolObjFree(pools->objs[i]); + for (i = 0 ; i < nwfilters->count ; i++) { + virNWFilterObjLock(nwfilters->objs[i]); + if (nwfilters->objs[i] == nwfilter) { + virNWFilterObjUnlock(nwfilters->objs[i]); + virNWFilterObjFree(nwfilters->objs[i]); - if (i < (pools->count - 1)) - memmove(pools->objs + i, pools->objs + i + 1, - sizeof(*(pools->objs)) * (pools->count - (i + 1))); + if (i < (nwfilters->count - 1)) + memmove(nwfilters->objs + i, nwfilters->objs + i + 1, + sizeof(*(nwfilters->objs)) * (nwfilters->count - (i + 1))); - if (VIR_REALLOC_N(pools->objs, pools->count - 1) < 0) { + if (VIR_REALLOC_N(nwfilters->objs, nwfilters->count - 1) < 0) { ; /* Failure to reduce memory allocation isn't fatal */ } - pools->count--; + nwfilters->count--; break; } - virNWFilterPoolObjUnlock(pools->objs[i]); + virNWFilterObjUnlock(nwfilters->objs[i]); } } @@ -1998,7 +1999,7 @@ virNWFilterDefParseNode(xmlDocPtr xml, if (STRNEQ((const char *)root->name, "filter")) { virNWFilterReportError(VIR_ERR_XML_ERROR, "%s", - _("unknown root element for nw filter pool")); + _("unknown root element for nw filter")); goto cleanup; } @@ -2089,34 +2090,33 @@ virNWFilterDefParseFile(virConnectPtr conn, } -virNWFilterPoolObjPtr -virNWFilterPoolObjFindByUUID(virNWFilterPoolObjListPtr pools, - const unsigned char *uuid) +virNWFilterObjPtr +virNWFilterObjFindByUUID(virNWFilterObjListPtr nwfilters, + const unsigned char *uuid) { unsigned int i; - for (i = 0 ; i < pools->count ; i++) { - virNWFilterPoolObjLock(pools->objs[i]); - if (!memcmp(pools->objs[i]->def->uuid, uuid, VIR_UUID_BUFLEN)) - return pools->objs[i]; - virNWFilterPoolObjUnlock(pools->objs[i]); + for (i = 0 ; i < nwfilters->count ; i++) { + virNWFilterObjLock(nwfilters->objs[i]); + if (!memcmp(nwfilters->objs[i]->def->uuid, uuid, VIR_UUID_BUFLEN)) + return nwfilters->objs[i]; + virNWFilterObjUnlock(nwfilters->objs[i]); } return NULL; } -virNWFilterPoolObjPtr -virNWFilterPoolObjFindByName(virNWFilterPoolObjListPtr pools, - const char *name) +virNWFilterObjPtr +virNWFilterObjFindByName(virNWFilterObjListPtr nwfilters, const char *name) { unsigned int i; - for (i = 0 ; i < pools->count ; i++) { - virNWFilterPoolObjLock(pools->objs[i]); - if (STREQ(pools->objs[i]->def->name, name)) - return pools->objs[i]; - virNWFilterPoolObjUnlock(pools->objs[i]); + for (i = 0 ; i < nwfilters->count ; i++) { + virNWFilterObjLock(nwfilters->objs[i]); + if (STREQ(nwfilters->objs[i]->def->name, name)) + return nwfilters->objs[i]; + virNWFilterObjUnlock(nwfilters->objs[i]); } return NULL; @@ -2197,14 +2197,14 @@ cleanup: static int _virNWFilterDefLoopDetect(virConnectPtr conn, - virNWFilterPoolObjListPtr pools, + virNWFilterObjListPtr nwfilters, virNWFilterDefPtr def, const char *filtername) { int rc = 0; int i; virNWFilterEntryPtr entry; - virNWFilterPoolObjPtr obj; + virNWFilterObjPtr obj; if (!def) return 0; @@ -2218,14 +2218,13 @@ _virNWFilterDefLoopDetect(virConnectPtr conn, break; } - obj = virNWFilterPoolObjFindByName(pools, - entry->include->filterref); + obj = virNWFilterObjFindByName(nwfilters, + entry->include->filterref); if (obj) { - rc = _virNWFilterDefLoopDetect(conn, - pools, + rc = _virNWFilterDefLoopDetect(conn, nwfilters, obj->def, filtername); - virNWFilterPoolObjUnlock(obj); + virNWFilterObjUnlock(obj); if (rc) break; } @@ -2239,7 +2238,7 @@ _virNWFilterDefLoopDetect(virConnectPtr conn, /* * virNWFilterDefLoopDetect: * @conn: pointer to virConnect object - * @pools : the pools to search + * @nwfilters : the nwfilters to search * @def : the filter definiton that may add a loop and is to be tested * * Detect a loop introduced through the filters being able to @@ -2249,10 +2248,10 @@ _virNWFilterDefLoopDetect(virConnectPtr conn, */ static int virNWFilterDefLoopDetect(virConnectPtr conn, - virNWFilterPoolObjListPtr pools, + virNWFilterObjListPtr nwfilters, virNWFilterDefPtr def) { - return _virNWFilterDefLoopDetect(conn, pools, def, def->name); + return _virNWFilterDefLoopDetect(conn, nwfilters, def, def->name); } int nCallbackDriver; @@ -2339,104 +2338,104 @@ virNWFilterTriggerVMFilterRebuild(virConnectPtr conn) int virNWFilterTestUnassignDef(virConnectPtr conn, - virNWFilterPoolObjPtr pool) + virNWFilterObjPtr nwfilter) { int rc = 0; virNWFilterLockFilterUpdates(); - pool->wantRemoved = 1; + nwfilter->wantRemoved = 1; // trigger the update on VMs referencing the filter if (virNWFilterTriggerVMFilterRebuild(conn)) rc = 1; - pool->wantRemoved = 0; + nwfilter->wantRemoved = 0; virNWFilterUnlockFilterUpdates(); return rc; } -virNWFilterPoolObjPtr -virNWFilterPoolObjAssignDef(virConnectPtr conn, - virNWFilterPoolObjListPtr pools, - virNWFilterDefPtr def) +virNWFilterObjPtr +virNWFilterObjAssignDef(virConnectPtr conn, + virNWFilterObjListPtr nwfilters, + virNWFilterDefPtr def) { - virNWFilterPoolObjPtr pool; + virNWFilterObjPtr nwfilter; - pool = virNWFilterPoolObjFindByUUID(pools, def->uuid); + nwfilter = virNWFilterObjFindByUUID(nwfilters, def->uuid); - if (pool) { - if (!STREQ(def->name, pool->def->name)) { + if (nwfilter) { + if (!STREQ(def->name, nwfilter->def->name)) { virNWFilterReportError(VIR_ERR_INVALID_NWFILTER, - _("filter with same UUID but different name " - "('%s') already exists"), - pool->def->name); - virNWFilterPoolObjUnlock(pool); + _("filter with same UUID but different name " + "('%s') already exists"), + nwfilter->def->name); + virNWFilterObjUnlock(nwfilter); return NULL; } - virNWFilterPoolObjUnlock(pool); + virNWFilterObjUnlock(nwfilter); } - if (virNWFilterDefLoopDetect(conn, pools, def)) { + if (virNWFilterDefLoopDetect(conn, nwfilters, def)) { virNWFilterReportError(VIR_ERR_INVALID_NWFILTER, "%s", _("filter would introduce a loop")); return NULL; } - if ((pool = virNWFilterPoolObjFindByName(pools, def->name))) { + if ((nwfilter = virNWFilterObjFindByName(nwfilters, def->name))) { virNWFilterLockFilterUpdates(); - pool->newDef = def; + nwfilter->newDef = def; // trigger the update on VMs referencing the filter if (virNWFilterTriggerVMFilterRebuild(conn)) { - pool->newDef = NULL; + nwfilter->newDef = NULL; virNWFilterUnlockFilterUpdates(); - virNWFilterPoolObjUnlock(pool); + virNWFilterObjUnlock(nwfilter); return NULL; } - virNWFilterDefFree(pool->def); - pool->def = def; - pool->newDef = NULL; + virNWFilterDefFree(nwfilter->def); + nwfilter->def = def; + nwfilter->newDef = NULL; virNWFilterUnlockFilterUpdates(); - return pool; + return nwfilter; } - if (VIR_ALLOC(pool) < 0) { + if (VIR_ALLOC(nwfilter) < 0) { virReportOOMError(); return NULL; } - if (virMutexInitRecursive(&pool->lock) < 0) { + if (virMutexInitRecursive(&nwfilter->lock) < 0) { virNWFilterReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("cannot initialize mutex")); - VIR_FREE(pool); + VIR_FREE(nwfilter); return NULL; } - virNWFilterPoolObjLock(pool); - pool->active = 0; - pool->def = def; + virNWFilterObjLock(nwfilter); + nwfilter->active = 0; + nwfilter->def = def; - if (VIR_REALLOC_N(pools->objs, pools->count+1) < 0) { - pool->def = NULL; - virNWFilterPoolObjUnlock(pool); - virNWFilterPoolObjFree(pool); + if (VIR_REALLOC_N(nwfilters->objs, nwfilters->count + 1) < 0) { + nwfilter->def = NULL; + virNWFilterObjUnlock(nwfilter); + virNWFilterObjFree(nwfilter); virReportOOMError(); return NULL; } - pools->objs[pools->count++] = pool; + nwfilters->objs[nwfilters->count++] = nwfilter; - return pool; + return nwfilter; } -static virNWFilterPoolObjPtr -virNWFilterPoolObjLoad(virConnectPtr conn, - virNWFilterPoolObjListPtr pools, - const char *file, - const char *path) +static virNWFilterObjPtr +virNWFilterObjLoad(virConnectPtr conn, + virNWFilterObjListPtr nwfilters, + const char *file, + const char *path) { virNWFilterDefPtr def; - virNWFilterPoolObjPtr pool; + virNWFilterObjPtr nwfilter; if (!(def = virNWFilterDefParseFile(conn, path))) { return NULL; @@ -2444,33 +2443,33 @@ virNWFilterPoolObjLoad(virConnectPtr conn, if (!virFileMatchesNameSuffix(file, def->name, ".xml")) { virNWFilterReportError(VIR_ERR_INVALID_NWFILTER, - _("network filter pool config filename '%s' does not match pool name '%s'"), + _("network filter config filename '%s' does not match name '%s'"), path, def->name); virNWFilterDefFree(def); return NULL; } - if (!(pool = virNWFilterPoolObjAssignDef(conn, pools, def))) { + if (!(nwfilter = virNWFilterObjAssignDef(conn, nwfilters, def))) { virNWFilterDefFree(def); return NULL; } - VIR_FREE(pool->configFile); // for driver reload - pool->configFile = strdup(path); - if (pool->configFile == NULL) { + VIR_FREE(nwfilter->configFile); // for driver reload + nwfilter->configFile = strdup(path); + if (nwfilter->configFile == NULL) { virReportOOMError(); virNWFilterDefFree(def); return NULL; } - return pool; + return nwfilter; } int -virNWFilterPoolLoadAllConfigs(virConnectPtr conn, - virNWFilterPoolObjListPtr pools, - const char *configDir) +virNWFilterLoadAllConfigs(virConnectPtr conn, + virNWFilterObjListPtr nwfilters, + const char *configDir) { DIR *dir; struct dirent *entry; @@ -2486,7 +2485,7 @@ virNWFilterPoolLoadAllConfigs(virConnectPtr conn, while ((entry = readdir(dir))) { char path[PATH_MAX]; - virNWFilterPoolObjPtr pool; + virNWFilterObjPtr nwfilter; if (entry->d_name[0] == '.') continue; @@ -2502,9 +2501,9 @@ virNWFilterPoolLoadAllConfigs(virConnectPtr conn, continue; } - pool = virNWFilterPoolObjLoad(conn, pools, entry->d_name, path); - if (pool) - virNWFilterPoolObjUnlock(pool); + nwfilter = virNWFilterObjLoad(conn, nwfilters, entry->d_name, path); + if (nwfilter) + virNWFilterObjUnlock(nwfilter); } closedir(dir); @@ -2514,15 +2513,15 @@ virNWFilterPoolLoadAllConfigs(virConnectPtr conn, int -virNWFilterPoolObjSaveDef(virNWFilterDriverStatePtr driver, - virNWFilterPoolObjPtr pool, - virNWFilterDefPtr def) +virNWFilterObjSaveDef(virNWFilterDriverStatePtr driver, + virNWFilterObjPtr nwfilter, + virNWFilterDefPtr def) { char *xml; int fd = -1, ret = -1; ssize_t towrite; - if (!pool->configFile) { + if (!nwfilter->configFile) { int err; char path[PATH_MAX]; @@ -2539,7 +2538,7 @@ virNWFilterPoolObjSaveDef(virNWFilterDriverStatePtr driver, "%s", _("cannot construct config file path")); return -1; } - if (!(pool->configFile = strdup(path))) { + if (!(nwfilter->configFile = strdup(path))) { virReportOOMError(); return -1; } @@ -2551,12 +2550,12 @@ virNWFilterPoolObjSaveDef(virNWFilterDriverStatePtr driver, return -1; } - if ((fd = open(pool->configFile, + if ((fd = open(nwfilter->configFile, O_WRONLY | O_CREAT | O_TRUNC, S_IRUSR | S_IWUSR )) < 0) { virReportSystemError(errno, _("cannot create config file %s"), - pool->configFile); + nwfilter->configFile); goto cleanup; } @@ -2564,14 +2563,14 @@ virNWFilterPoolObjSaveDef(virNWFilterDriverStatePtr driver, if (safewrite(fd, xml, towrite) != towrite) { virReportSystemError(errno, _("cannot write config file %s"), - pool->configFile); + nwfilter->configFile); goto cleanup; } if (VIR_CLOSE(fd) < 0) { virReportSystemError(errno, _("cannot save config file %s"), - pool->configFile); + nwfilter->configFile); goto cleanup; } @@ -2587,18 +2586,18 @@ virNWFilterPoolObjSaveDef(virNWFilterDriverStatePtr driver, int -virNWFilterPoolObjDeleteDef(virNWFilterPoolObjPtr pool) +virNWFilterObjDeleteDef(virNWFilterObjPtr nwfilter) { - if (!pool->configFile) { + if (!nwfilter->configFile) { virNWFilterReportError(VIR_ERR_INTERNAL_ERROR, - _("no config file for %s"), pool->def->name); + _("no config file for %s"), nwfilter->def->name); return -1; } - if (unlink(pool->configFile) < 0) { + if (unlink(nwfilter->configFile) < 0) { virNWFilterReportError(VIR_ERR_INTERNAL_ERROR, _("cannot remove config for %s"), - pool->def->name); + nwfilter->def->name); return -1; } @@ -2900,12 +2899,12 @@ void virNWFilterConfLayerShutdown(void) } -void virNWFilterPoolObjLock(virNWFilterPoolObjPtr obj) +void virNWFilterObjLock(virNWFilterObjPtr obj) { virMutexLock(&obj->lock); } -void virNWFilterPoolObjUnlock(virNWFilterPoolObjPtr obj) +void virNWFilterObjUnlock(virNWFilterObjPtr obj) { virMutexUnlock(&obj->lock); } diff --git a/src/conf/nwfilter_conf.h b/src/conf/nwfilter_conf.h index 4d76c4c..b21f5b9 100644 --- a/src/conf/nwfilter_conf.h +++ b/src/conf/nwfilter_conf.h @@ -441,10 +441,10 @@ struct _virNWFilterDef { }; -typedef struct _virNWFilterPoolObj virNWFilterPoolObj; -typedef virNWFilterPoolObj *virNWFilterPoolObjPtr; +typedef struct _virNWFilterObj virNWFilterObj; +typedef virNWFilterObj *virNWFilterObjPtr; -struct _virNWFilterPoolObj { +struct _virNWFilterObj { virMutex lock; char *configFile; @@ -456,11 +456,11 @@ struct _virNWFilterPoolObj { }; -typedef struct _virNWFilterPoolObjList virNWFilterPoolObjList; -typedef virNWFilterPoolObjList *virNWFilterPoolObjListPtr; -struct _virNWFilterPoolObjList { +typedef struct _virNWFilterObjList virNWFilterObjList; +typedef virNWFilterObjList *virNWFilterObjListPtr; +struct _virNWFilterObjList { unsigned int count; - virNWFilterPoolObjPtr *objs; + virNWFilterObjPtr *objs; }; @@ -469,7 +469,7 @@ typedef virNWFilterDriverState *virNWFilterDriverStatePtr; struct _virNWFilterDriverState { virMutex lock; - virNWFilterPoolObjList pools; + virNWFilterObjList nwfilters; char *configDir; }; @@ -583,33 +583,31 @@ struct _virNWFilterTechDriver { void virNWFilterRuleDefFree(virNWFilterRuleDefPtr def); void virNWFilterDefFree(virNWFilterDefPtr def); -void virNWFilterPoolObjListFree(virNWFilterPoolObjListPtr pools); -void virNWFilterPoolObjRemove(virNWFilterPoolObjListPtr pools, - virNWFilterPoolObjPtr pool); +void virNWFilterObjListFree(virNWFilterObjListPtr nwfilters); +void virNWFilterObjRemove(virNWFilterObjListPtr nwfilters, + virNWFilterObjPtr nwfilter); -void virNWFilterPoolObjFree(virNWFilterPoolObjPtr obj); +void virNWFilterObjFree(virNWFilterObjPtr obj); -virNWFilterPoolObjPtr - virNWFilterPoolObjFindByUUID(virNWFilterPoolObjListPtr pools, - const unsigned char *uuid); +virNWFilterObjPtr virNWFilterObjFindByUUID(virNWFilterObjListPtr nwfilters, + const unsigned char *uuid); -virNWFilterPoolObjPtr - virNWFilterPoolObjFindByName(virNWFilterPoolObjListPtr pools, - const char *name); +virNWFilterObjPtr virNWFilterObjFindByName(virNWFilterObjListPtr nwfilters, + const char *name); -int virNWFilterPoolObjSaveDef(virNWFilterDriverStatePtr driver, - virNWFilterPoolObjPtr pool, - virNWFilterDefPtr def); +int virNWFilterObjSaveDef(virNWFilterDriverStatePtr driver, + virNWFilterObjPtr nwfilter, + virNWFilterDefPtr def); -int virNWFilterPoolObjDeleteDef(virNWFilterPoolObjPtr pool); +int virNWFilterObjDeleteDef(virNWFilterObjPtr nwfilter); -virNWFilterPoolObjPtr virNWFilterPoolObjAssignDef(virConnectPtr conn, - virNWFilterPoolObjListPtr pools, - virNWFilterDefPtr def); +virNWFilterObjPtr virNWFilterObjAssignDef(virConnectPtr conn, + virNWFilterObjListPtr nwfilters, + virNWFilterDefPtr def); int virNWFilterTestUnassignDef(virConnectPtr conn, - virNWFilterPoolObjPtr pool); + virNWFilterObjPtr nwfilter); virNWFilterDefPtr virNWFilterDefParseNode(xmlDocPtr xml, xmlNodePtr root); @@ -623,9 +621,9 @@ int virNWFilterSaveXML(const char *configDir, int virNWFilterSaveConfig(const char *configDir, virNWFilterDefPtr def); -int virNWFilterPoolLoadAllConfigs(virConnectPtr conn, - virNWFilterPoolObjListPtr pools, - const char *configDir); +int virNWFilterLoadAllConfigs(virConnectPtr conn, + virNWFilterObjListPtr nwfilters, + const char *configDir); char *virNWFilterConfigFile(const char *dir, const char *name); @@ -635,8 +633,8 @@ virNWFilterDefPtr virNWFilterDefParseString(virConnectPtr conn, virNWFilterDefPtr virNWFilterDefParseFile(virConnectPtr conn, const char *filename); -void virNWFilterPoolObjLock(virNWFilterPoolObjPtr obj); -void virNWFilterPoolObjUnlock(virNWFilterPoolObjPtr obj); +void virNWFilterObjLock(virNWFilterObjPtr obj); +void virNWFilterObjUnlock(virNWFilterObjPtr obj); void virNWFilterLockFilterUpdates(void); void virNWFilterUnlockFilterUpdates(void); diff --git a/src/datatypes.c b/src/datatypes.c index 5197863..7f2d0c5 100644 --- a/src/datatypes.c +++ b/src/datatypes.c @@ -126,17 +126,17 @@ virSecretFreeName(virSecretPtr secret, const char *name ATTRIBUTE_UNUSED) } /** - * virNWFilterPoolFreeName: - * @pool: a nwfilter pool object + * virNWFilterFreeName: + * @nwfilter: a nwfilter object * - * Destroy the nwfilter pool object, this is just used by the nwfilter pool hash callback. + * Destroy the nwfilter object, this is just used by the nwfilter hash callback. * * Returns 0 in case of success and -1 in case of failure. */ static int -virNWFilterPoolFreeName(virNWFilterPtr pool, const char *name ATTRIBUTE_UNUSED) +virNWFilterFreeName(virNWFilterPtr nwfilter, const char *name ATTRIBUTE_UNUSED) { - return (virUnrefNWFilter(pool)); + return virUnrefNWFilter(nwfilter); } /** @@ -200,8 +200,8 @@ virGetConnect(void) { ret->secrets = virHashCreate(20); if (ret->secrets == NULL) goto failed; - ret->nwfilterPools = virHashCreate(20); - if (ret->nwfilterPools == NULL) + ret->nwfilters = virHashCreate(20); + if (ret->nwfilters == NULL) goto failed; ret->refs = 1; @@ -223,8 +223,8 @@ failed: virHashFree(ret->nodeDevices, (virHashDeallocator) virNodeDeviceFree); if (ret->secrets != NULL) virHashFree(ret->secrets, (virHashDeallocator) virSecretFreeName); - if (ret->nwfilterPools != NULL) - virHashFree(ret->nwfilterPools, (virHashDeallocator) virNWFilterPoolFreeName); + if (ret->nwfilters != NULL) + virHashFree(ret->nwfilters, (virHashDeallocator) virNWFilterFreeName); virMutexDestroy(&ret->lock); VIR_FREE(ret); @@ -281,8 +281,8 @@ virReleaseConnect(virConnectPtr conn) { virHashFree(conn->nodeDevices, (virHashDeallocator) virNodeDeviceFree); if (conn->secrets != NULL) virHashFree(conn->secrets, (virHashDeallocator) virSecretFreeName); - if (conn->nwfilterPools != NULL) - virHashFree(conn->nwfilterPools, (virHashDeallocator) virNWFilterPoolFreeName); + if (conn->nwfilters != NULL) + virHashFree(conn->nwfilters, (virHashDeallocator) virNWFilterFreeName); virResetError(&conn->err); @@ -1466,7 +1466,7 @@ int virUnrefStream(virStreamPtr st) { * Lookup if the network filter is already registered for that connection, * if yes return a new pointer to it, if no allocate a new structure, * and register it in the table. In any case a corresponding call to - * virFreeNWFilterPool() is needed to not leak data. + * virUnrefNWFilter() is needed to not leak data. * * Returns a pointer to the network, or NULL in case of failure */ @@ -1491,7 +1491,7 @@ virGetNWFilter(virConnectPtr conn, const char *name, const unsigned char *uuid) virUUIDFormat(uuid, uuidstr); - ret = (virNWFilterPtr) virHashLookup(conn->nwfilterPools, uuidstr); + ret = (virNWFilterPtr) virHashLookup(conn->nwfilters, uuidstr); if (ret == NULL) { if (VIR_ALLOC(ret) < 0) { virMutexUnlock(&conn->lock); @@ -1508,10 +1508,10 @@ virGetNWFilter(virConnectPtr conn, const char *name, const unsigned char *uuid) ret->conn = conn; memcpy(&(ret->uuid[0]), uuid, VIR_UUID_BUFLEN); - if (virHashAddEntry(conn->nwfilterPools, uuidstr, ret) < 0) { + if (virHashAddEntry(conn->nwfilters, uuidstr, ret) < 0) { virMutexUnlock(&conn->lock); virLibConnError(VIR_ERR_INTERNAL_ERROR, "%s", - _("failed to add network filter pool to connection hash table")); + _("failed to add network filter to connection hash table")); goto error; } conn->refs++; @@ -1530,35 +1530,36 @@ error: /** - * virReleaseNWFilterPool: - * @pool: the pool to release + * virReleaseNWFilter: + * @nwfilter: the nwfilter to release * - * Unconditionally release all memory associated with a pool. + * Unconditionally release all memory associated with a nwfilter. * The conn.lock mutex must be held prior to calling this, and will - * be released prior to this returning. The pool obj must not + * be released prior to this returning. The nwfilter obj must not * be used once this method returns. * * It will also unreference the associated connection object, * which may also be released if its ref count hits zero. */ static void -virReleaseNWFilterPool(virNWFilterPtr pool) { - virConnectPtr conn = pool->conn; +virReleaseNWFilter(virNWFilterPtr nwfilter) +{ + virConnectPtr conn = nwfilter->conn; char uuidstr[VIR_UUID_STRING_BUFLEN]; - virUUIDFormat(pool->uuid, uuidstr); - DEBUG("release pool %p %s %s", pool, pool->name, uuidstr); + virUUIDFormat(nwfilter->uuid, uuidstr); + DEBUG("release nwfilter %p %s %s", nwfilter, nwfilter->name, uuidstr); - if (virHashRemoveEntry(conn->nwfilterPools, uuidstr, NULL) < 0) { + if (virHashRemoveEntry(conn->nwfilters, uuidstr, NULL) < 0) { virMutexUnlock(&conn->lock); virLibConnError(VIR_ERR_INTERNAL_ERROR, "%s", _("pool missing from connection hash table")); conn = NULL; } - pool->magic = -1; - VIR_FREE(pool->name); - VIR_FREE(pool); + nwfilter->magic = -1; + VIR_FREE(nwfilter->name); + VIR_FREE(nwfilter); if (conn) { DEBUG("unref connection %p %d", conn, conn->refs); @@ -1583,25 +1584,26 @@ virReleaseNWFilterPool(virNWFilterPtr pool) { * Returns the reference count or -1 in case of failure. */ int -virUnrefNWFilter(virNWFilterPtr pool) { +virUnrefNWFilter(virNWFilterPtr nwfilter) +{ int refs; - if (!VIR_IS_CONNECTED_NWFILTER(pool)) { + if (!VIR_IS_CONNECTED_NWFILTER(nwfilter)) { virLibConnError(VIR_ERR_INVALID_ARG, _("bad nwfilter or no connection")); return -1; } - virMutexLock(&pool->conn->lock); - DEBUG("unref pool %p %s %d", pool, pool->name, pool->refs); - pool->refs--; - refs = pool->refs; + virMutexLock(&nwfilter->conn->lock); + DEBUG("unref pool %p %s %d", nwfilter, nwfilter->name, nwfilter->refs); + nwfilter->refs--; + refs = nwfilter->refs; if (refs == 0) { - virReleaseNWFilterPool(pool); + virReleaseNWFilter(nwfilter); /* Already unlocked mutex */ return (0); } - virMutexUnlock(&pool->conn->lock); + virMutexUnlock(&nwfilter->conn->lock); return (refs); } diff --git a/src/datatypes.h b/src/datatypes.h index 07fa582..38f76a7 100644 --- a/src/datatypes.h +++ b/src/datatypes.h @@ -194,8 +194,8 @@ struct _virConnect { virHashTablePtr storagePools;/* hash table for known storage pools */ virHashTablePtr storageVols;/* hash table for known storage vols */ virHashTablePtr nodeDevices; /* hash table for known node devices */ - virHashTablePtr secrets; /* hash taboe for known secrets */ - virHashTablePtr nwfilterPools; /* hash tables ofr known nw filter pools */ + virHashTablePtr secrets; /* hash table for known secrets */ + virHashTablePtr nwfilters; /* hash table for known nw filters */ int refs; /* reference count */ }; @@ -387,10 +387,10 @@ struct _virNWFilter { virNWFilterPtr virGetNWFilter(virConnectPtr conn, const char *name, const unsigned char *uuid); -int virUnrefNWFilter(virNWFilterPtr pool); +int virUnrefNWFilter(virNWFilterPtr nwfilter); virDomainSnapshotPtr virGetDomainSnapshot(virDomainPtr domain, const char *name); -int virUnrefDomainSnapshot(virDomainSnapshotPtr pool); +int virUnrefDomainSnapshot(virDomainSnapshotPtr snapshot); #endif diff --git a/src/driver.h b/src/driver.h index 03a388a..114002d 100644 --- a/src/driver.h +++ b/src/driver.h @@ -1138,10 +1138,10 @@ typedef virNWFilterPtr const char *xmlDesc, unsigned int flags); typedef int - (*virDrvNWFilterUndefine) (virNWFilterPtr pool); + (*virDrvNWFilterUndefine) (virNWFilterPtr nwfilter); typedef char * - (*virDrvNWFilterGetXMLDesc) (virNWFilterPtr pool, + (*virDrvNWFilterGetXMLDesc) (virNWFilterPtr nwfilter, unsigned int flags); diff --git a/src/libvirt.c b/src/libvirt.c index 52d3278..757d76e 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -705,7 +705,7 @@ virLibSecretError(virSecretPtr secret, virErrorNumber error, const char *info) * Handle an error at the connection level */ static void -virLibNWFilterError(virNWFilterPtr pool, virErrorNumber error, +virLibNWFilterError(virNWFilterPtr nwfilter, virErrorNumber error, const char *info) { virConnectPtr conn = NULL; @@ -716,7 +716,7 @@ virLibNWFilterError(virNWFilterPtr pool, virErrorNumber error, errmsg = virErrorMsg(error, info); if (error != VIR_ERR_INVALID_NWFILTER) - conn = pool->conn; + conn = nwfilter->conn; virRaiseError(conn, NULL, NULL, VIR_FROM_NWFILTER, error, VIR_ERR_ERROR, errmsg, info, NULL, 0, 0, errmsg, info); diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 2ce4bed..f60489c 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -637,17 +637,17 @@ virNWFilterDefFormat; virNWFilterDefFree; virNWFilterDefParseString; virNWFilterJumpTargetTypeToString; +virNWFilterLoadAllConfigs; virNWFilterLockFilterUpdates; -virNWFilterPoolLoadAllConfigs; -virNWFilterPoolObjAssignDef; -virNWFilterPoolObjDeleteDef; -virNWFilterPoolObjFindByName; -virNWFilterPoolObjFindByUUID; -virNWFilterPoolObjListFree; -virNWFilterPoolObjLock; -virNWFilterPoolObjRemove; -virNWFilterPoolObjSaveDef; -virNWFilterPoolObjUnlock; +virNWFilterObjAssignDef; +virNWFilterObjDeleteDef; +virNWFilterObjFindByName; +virNWFilterObjFindByUUID; +virNWFilterObjListFree; +virNWFilterObjLock; +virNWFilterObjRemove; +virNWFilterObjSaveDef; +virNWFilterObjUnlock; virNWFilterPrintStateMatchFlags; virNWFilterRegisterCallbackDriver; virNWFilterRuleActionTypeToString; diff --git a/src/nwfilter/nwfilter_driver.c b/src/nwfilter/nwfilter_driver.c index a305de6..fa72a5f 100644 --- a/src/nwfilter/nwfilter_driver.c +++ b/src/nwfilter/nwfilter_driver.c @@ -105,9 +105,9 @@ nwfilterDriverStartup(int privileged) { VIR_FREE(base); - if (virNWFilterPoolLoadAllConfigs(NULL, - &driverState->pools, - driverState->configDir) < 0) + if (virNWFilterLoadAllConfigs(NULL, + &driverState->nwfilters, + driverState->configDir) < 0) goto error; nwfilterDriverUnlock(driverState); @@ -155,9 +155,9 @@ nwfilterDriverReload(void) { nwfilterDriverLock(driverState); virNWFilterCallbackDriversLock(); - virNWFilterPoolLoadAllConfigs(conn, - &driverState->pools, - driverState->configDir); + virNWFilterLoadAllConfigs(conn, + &driverState->nwfilters, + driverState->configDir); virNWFilterCallbackDriversUnlock(); nwfilterDriverUnlock(driverState); @@ -171,7 +171,7 @@ nwfilterDriverReload(void) { /** * virNWFilterActive: * - * Checks if the nwfilter driver is active, i.e. has an active pool + * Checks if the nwfilter driver is active, i.e. has an active nwfilter * * Returns 1 if active, 0 otherwise */ @@ -183,7 +183,7 @@ nwfilterDriverActive(void) { return 0; nwfilterDriverLock(driverState); - ret = driverState->pools.count ? 1 : 0; + ret = driverState->nwfilters.count ? 1 : 0; nwfilterDriverUnlock(driverState); return ret; @@ -192,7 +192,7 @@ nwfilterDriverActive(void) { /** * virNWFilterShutdown: * - * Shutdown the nwfilter driver, it will stop all active nwfilter pools + * Shutdown the nwfilter driver, it will stop all active nwfilters */ static int nwfilterDriverShutdown(void) { @@ -203,8 +203,8 @@ nwfilterDriverShutdown(void) { nwfilterDriverLock(driverState); - /* free inactive pools */ - virNWFilterPoolObjListFree(&driverState->pools); + /* free inactive nwfilters */ + virNWFilterObjListFree(&driverState->nwfilters); VIR_FREE(driverState->configDir); nwfilterDriverUnlock(driverState); @@ -219,24 +219,24 @@ static virNWFilterPtr nwfilterLookupByUUID(virConnectPtr conn, const unsigned char *uuid) { virNWFilterDriverStatePtr driver = conn->nwfilterPrivateData; - virNWFilterPoolObjPtr pool; + virNWFilterObjPtr nwfilter; virNWFilterPtr ret = NULL; nwfilterDriverLock(driver); - pool = virNWFilterPoolObjFindByUUID(&driver->pools, uuid); + nwfilter = virNWFilterObjFindByUUID(&driver->nwfilters, uuid); nwfilterDriverUnlock(driver); - if (!pool) { + if (!nwfilter) { virNWFilterReportError(VIR_ERR_NO_NWFILTER, - "%s", _("no pool with matching uuid")); + "%s", _("no nwfilter with matching uuid")); goto cleanup; } - ret = virGetNWFilter(conn, pool->def->name, pool->def->uuid); + ret = virGetNWFilter(conn, nwfilter->def->name, nwfilter->def->uuid); cleanup: - if (pool) - virNWFilterPoolObjUnlock(pool); + if (nwfilter) + virNWFilterObjUnlock(nwfilter); return ret; } @@ -245,24 +245,24 @@ static virNWFilterPtr nwfilterLookupByName(virConnectPtr conn, const char *name) { virNWFilterDriverStatePtr driver = conn->nwfilterPrivateData; - virNWFilterPoolObjPtr pool; + virNWFilterObjPtr nwfilter; virNWFilterPtr ret = NULL; nwfilterDriverLock(driver); - pool = virNWFilterPoolObjFindByName(&driver->pools, name); + nwfilter = virNWFilterObjFindByName(&driver->nwfilters, name); nwfilterDriverUnlock(driver); - if (!pool) { + if (!nwfilter) { virNWFilterReportError(VIR_ERR_NO_NWFILTER, - _("no pool with matching name '%s'"), name); + _("no nwfilter with matching name '%s'"), name); goto cleanup; } - ret = virGetNWFilter(conn, pool->def->name, pool->def->uuid); + ret = virGetNWFilter(conn, nwfilter->def->name, nwfilter->def->uuid); cleanup: - if (pool) - virNWFilterPoolObjUnlock(pool); + if (nwfilter) + virNWFilterObjUnlock(nwfilter); return ret; } @@ -289,7 +289,7 @@ nwfilterClose(virConnectPtr conn) { static int nwfilterNumNWFilters(virConnectPtr conn) { virNWFilterDriverStatePtr driver = conn->nwfilterPrivateData; - return driver->pools.count; + return driver->nwfilters.count; } @@ -301,15 +301,15 @@ nwfilterListNWFilters(virConnectPtr conn, int got = 0, i; nwfilterDriverLock(driver); - for (i = 0 ; i < driver->pools.count && got < nnames ; i++) { - virNWFilterPoolObjLock(driver->pools.objs[i]); - if (!(names[got] = strdup(driver->pools.objs[i]->def->name))) { - virNWFilterPoolObjUnlock(driver->pools.objs[i]); + for (i = 0 ; i < driver->nwfilters.count && got < nnames ; i++) { + virNWFilterObjLock(driver->nwfilters.objs[i]); + if (!(names[got] = strdup(driver->nwfilters.objs[i]->def->name))) { + virNWFilterObjUnlock(driver->nwfilters.objs[i]); virReportOOMError(); goto cleanup; } got++; - virNWFilterPoolObjUnlock(driver->pools.objs[i]); + virNWFilterObjUnlock(driver->nwfilters.objs[i]); } nwfilterDriverUnlock(driver); return got; @@ -329,7 +329,7 @@ nwfilterDefine(virConnectPtr conn, unsigned int flags ATTRIBUTE_UNUSED) { virNWFilterDriverStatePtr driver = conn->nwfilterPrivateData; virNWFilterDefPtr def; - virNWFilterPoolObjPtr pool = NULL; + virNWFilterObjPtr nwfilter = NULL; virNWFilterPtr ret = NULL; nwfilterDriverLock(driver); @@ -338,22 +338,22 @@ nwfilterDefine(virConnectPtr conn, if (!(def = virNWFilterDefParseString(conn, xml))) goto cleanup; - if (!(pool = virNWFilterPoolObjAssignDef(conn, &driver->pools, def))) + if (!(nwfilter = virNWFilterObjAssignDef(conn, &driver->nwfilters, def))) goto cleanup; - if (virNWFilterPoolObjSaveDef(driver, pool, def) < 0) { - virNWFilterPoolObjRemove(&driver->pools, pool); + if (virNWFilterObjSaveDef(driver, nwfilter, def) < 0) { + virNWFilterObjRemove(&driver->nwfilters, nwfilter); def = NULL; goto cleanup; } def = NULL; - ret = virGetNWFilter(conn, pool->def->name, pool->def->uuid); + ret = virGetNWFilter(conn, nwfilter->def->name, nwfilter->def->uuid); cleanup: virNWFilterDefFree(def); - if (pool) - virNWFilterPoolObjUnlock(pool); + if (nwfilter) + virNWFilterObjUnlock(nwfilter); virNWFilterCallbackDriversUnlock(); nwfilterDriverUnlock(driver); @@ -364,38 +364,38 @@ cleanup: static int nwfilterUndefine(virNWFilterPtr obj) { virNWFilterDriverStatePtr driver = obj->conn->nwfilterPrivateData; - virNWFilterPoolObjPtr pool; + virNWFilterObjPtr nwfilter; int ret = -1; nwfilterDriverLock(driver); virNWFilterCallbackDriversLock(); - pool = virNWFilterPoolObjFindByUUID(&driver->pools, obj->uuid); - if (!pool) { + nwfilter = virNWFilterObjFindByUUID(&driver->nwfilters, obj->uuid); + if (!nwfilter) { virNWFilterReportError(VIR_ERR_INVALID_NWFILTER, - "%s", _("no nwfilter pool with matching uuid")); + "%s", _("no nwfilter with matching uuid")); goto cleanup; } - if (virNWFilterTestUnassignDef(obj->conn, pool)) { + if (virNWFilterTestUnassignDef(obj->conn, nwfilter)) { virNWFilterReportError(VIR_ERR_INVALID_NWFILTER, "%s", _("nwfilter is in use")); goto cleanup; } - if (virNWFilterPoolObjDeleteDef(pool) < 0) + if (virNWFilterObjDeleteDef(nwfilter) < 0) goto cleanup; - VIR_FREE(pool->configFile); + VIR_FREE(nwfilter->configFile); - virNWFilterPoolObjRemove(&driver->pools, pool); - pool = NULL; + virNWFilterObjRemove(&driver->nwfilters, nwfilter); + nwfilter = NULL; ret = 0; cleanup: - if (pool) - virNWFilterPoolObjUnlock(pool); + if (nwfilter) + virNWFilterObjUnlock(nwfilter); virNWFilterCallbackDriversUnlock(); nwfilterDriverUnlock(driver); @@ -407,26 +407,26 @@ static char * nwfilterDumpXML(virNWFilterPtr obj, unsigned int flags) { virNWFilterDriverStatePtr driver = obj->conn->nwfilterPrivateData; - virNWFilterPoolObjPtr pool; + virNWFilterObjPtr nwfilter; char *ret = NULL; virCheckFlags(0, NULL); nwfilterDriverLock(driver); - pool = virNWFilterPoolObjFindByUUID(&driver->pools, obj->uuid); + nwfilter = virNWFilterObjFindByUUID(&driver->nwfilters, obj->uuid); nwfilterDriverUnlock(driver); - if (!pool) { + if (!nwfilter) { virNWFilterReportError(VIR_ERR_INVALID_NWFILTER, - "%s", _("no nwfilter pool with matching uuid")); + "%s", _("no nwfilter with matching uuid")); goto cleanup; } - ret = virNWFilterDefFormat(pool->def); + ret = virNWFilterDefFormat(nwfilter->def); cleanup: - if (pool) - virNWFilterPoolObjUnlock(pool); + if (nwfilter) + virNWFilterObjUnlock(nwfilter); return ret; } diff --git a/src/nwfilter/nwfilter_gentech_driver.c b/src/nwfilter/nwfilter_gentech_driver.c index fcd479c..4361c8a 100644 --- a/src/nwfilter/nwfilter_gentech_driver.c +++ b/src/nwfilter/nwfilter_gentech_driver.c @@ -284,7 +284,7 @@ err_exit: /** - * _virNWFilterPoolInstantiateRec: + * _virNWFilterInstantiateRec: * @conn: pointer to virConnect object * @techdriver: The driver to use for instantiation * @filter: The filter to instantiate @@ -319,7 +319,7 @@ _virNWFilterInstantiateRec(virConnectPtr conn, enum instCase useNewFilter, bool *foundNewFilter, virNWFilterDriverStatePtr driver) { - virNWFilterPoolObjPtr obj; + virNWFilterObjPtr obj; int rc = 0; int i; virNWFilterRuleInstPtr inst; @@ -351,8 +351,7 @@ _virNWFilterInstantiateRec(virConnectPtr conn, } else if (inc) { VIR_DEBUG("Instantiating filter %s", inc->filterref); - obj = virNWFilterPoolObjFindByName(&driver->pools, - inc->filterref); + obj = virNWFilterObjFindByName(&driver->nwfilters, inc->filterref); if (obj) { if (obj->wantRemoved) { @@ -360,7 +359,7 @@ _virNWFilterInstantiateRec(virConnectPtr conn, _("Filter '%s' is in use."), inc->filterref); rc = 1; - virNWFilterPoolObjUnlock(obj); + virNWFilterObjUnlock(obj); break; } @@ -371,7 +370,7 @@ _virNWFilterInstantiateRec(virConnectPtr conn, if (!tmpvars) { virReportOOMError(); rc = 1; - virNWFilterPoolObjUnlock(obj); + virNWFilterObjUnlock(obj); break; } @@ -401,7 +400,7 @@ _virNWFilterInstantiateRec(virConnectPtr conn, virNWFilterHashTableFree(tmpvars); - virNWFilterPoolObjUnlock(obj); + virNWFilterObjUnlock(obj); if (rc) break; } else { @@ -425,7 +424,7 @@ virNWFilterDetermineMissingVarsRec(virConnectPtr conn, int useNewFilter, virNWFilterDriverStatePtr driver) { - virNWFilterPoolObjPtr obj; + virNWFilterObjPtr obj; int rc = 0; int i, j; virNWFilterDefPtr next_filter; @@ -443,8 +442,7 @@ virNWFilterDetermineMissingVarsRec(virConnectPtr conn, } } else if (inc) { VIR_DEBUG("Following filter %s\n", inc->filterref); - obj = virNWFilterPoolObjFindByName(&driver->pools, - inc->filterref); + obj = virNWFilterObjFindByName(&driver->nwfilters, inc->filterref); if (obj) { if (obj->wantRemoved) { @@ -452,7 +450,7 @@ virNWFilterDetermineMissingVarsRec(virConnectPtr conn, _("Filter '%s' is in use."), inc->filterref); rc = 1; - virNWFilterPoolObjUnlock(obj); + virNWFilterObjUnlock(obj); break; } @@ -463,7 +461,7 @@ virNWFilterDetermineMissingVarsRec(virConnectPtr conn, if (!tmpvars) { virReportOOMError(); rc = 1; - virNWFilterPoolObjUnlock(obj); + virNWFilterObjUnlock(obj); break; } @@ -488,7 +486,7 @@ virNWFilterDetermineMissingVarsRec(virConnectPtr conn, virNWFilterHashTableFree(tmpvars); - virNWFilterPoolObjUnlock(obj); + virNWFilterObjUnlock(obj); if (rc) break; } else { @@ -700,7 +698,7 @@ __virNWFilterInstantiateFilter(virConnectPtr conn, int rc; const char *drvname = EBIPTABLES_DRIVER_ID; virNWFilterTechDriverPtr techdriver; - virNWFilterPoolObjPtr obj; + virNWFilterObjPtr obj; virNWFilterHashTablePtr vars, vars1; virNWFilterDefPtr filter; char vmmacaddr[VIR_MAC_STRING_BUFLEN] = {0}; @@ -720,7 +718,7 @@ __virNWFilterInstantiateFilter(virConnectPtr conn, VIR_DEBUG("filter name: %s", filtername); - obj = virNWFilterPoolObjFindByName(&driver->pools, filtername); + obj = virNWFilterObjFindByName(&driver->nwfilters, filtername); if (!obj) { virNWFilterReportError(VIR_ERR_NO_NWFILTER, _("Could not find filter '%s'"), @@ -804,7 +802,7 @@ err_exit_vars1: virNWFilterHashTableFree(vars1); err_exit: - virNWFilterPoolObjUnlock(obj); + virNWFilterObjUnlock(obj); VIR_FREE(str_ipaddr); VIR_FREE(str_macaddr); -- 1.7.0.4

2 1

[libvirt] [PATCH] datatypes: Fix outdated function names in the documentation
by Matthias Bolte 17 Jan '11

17 Jan '11

--- src/datatypes.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/datatypes.c b/src/datatypes.c index b43a571..5197863 100644 --- a/src/datatypes.c +++ b/src/datatypes.c @@ -821,7 +821,7 @@ virUnrefInterface(virInterfacePtr iface) { * Lookup if the storage pool is already registered for that connection, * if yes return a new pointer to it, if no allocate a new structure, * and register it in the table. In any case a corresponding call to - * virFreeStoragePool() is needed to not leak data. + * virUnrefStoragePool() is needed to not leak data. * * Returns a pointer to the network, or NULL in case of failure */ @@ -972,7 +972,7 @@ virUnrefStoragePool(virStoragePoolPtr pool) { * Lookup if the storage vol is already registered for that connection, * if yes return a new pointer to it, if no allocate a new structure, * and register it in the table. In any case a corresponding call to - * virFreeStorageVol() is needed to not leak data. + * virUnrefStorageVol() is needed to not leak data. * * Returns a pointer to the storage vol, or NULL in case of failure */ @@ -1128,7 +1128,7 @@ virUnrefStorageVol(virStorageVolPtr vol) { * Lookup if the device is already registered for that connection, * if yes return a new pointer to it, if no allocate a new structure, * and register it in the table. In any case a corresponding call to - * virFreeNodeDevice() is needed to not leak data. + * virUnrefNodeDevice() is needed to not leak data. * * Returns a pointer to the node device, or NULL in case of failure */ @@ -1261,7 +1261,7 @@ virUnrefNodeDevice(virNodeDevicePtr dev) { * * Lookup if the secret is already registered for that connection, if so return * a pointer to it, otherwise allocate a new structure, and register it in the - * table. In any case a corresponding call to virFreeSecret() is needed to not + * table. In any case a corresponding call to virUnrefSecret() is needed to not * leak data. * * Returns a pointer to the secret, or NULL in case of failure -- 1.7.0.4

2 1

[libvirt] [PATCH] Add documentation for VIR_DOMAIN_MEMORY_PARAM_UNLIMITED
by Matthias Bolte 17 Jan '11

17 Jan '11

Otherwise apibuild.py complains about it. --- include/libvirt/libvirt.h.in | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/include/libvirt/libvirt.h.in b/include/libvirt/libvirt.h.in index 055eb2e..7ecbeb6 100644 --- a/include/libvirt/libvirt.h.in +++ b/include/libvirt/libvirt.h.in @@ -696,6 +696,13 @@ typedef enum { */ #define VIR_DOMAIN_MEMORY_FIELD_LENGTH 80 + +/** + * VIR_DOMAIN_MEMORY_PARAM_UNLIMITED: + * + * Macro providing the virMemoryParameter value that indicates "unlimited" + */ + #define VIR_DOMAIN_MEMORY_PARAM_UNLIMITED (INT64_MAX >> 10) /** -- 1.7.0.4

2 1

[libvirt] [PATCH] datatypes: Get virSecretFreeName in sync with the other free functions
by Matthias Bolte 17 Jan '11

17 Jan '11

--- src/datatypes.c | 15 ++++++--------- 1 files changed, 6 insertions(+), 9 deletions(-) diff --git a/src/datatypes.c b/src/datatypes.c index c549c74..b43a571 100644 --- a/src/datatypes.c +++ b/src/datatypes.c @@ -113,19 +113,16 @@ virStorageVolFreeName(virStorageVolPtr vol, const char *name ATTRIBUTE_UNUSED) /** * virSecretFreeName: - * @secret_: a secret object + * @secret: a secret object * * Destroy the secret object, this is just used by the secret hash callback. * * Returns 0 in case of success and -1 in case of failure. */ -static void -virSecretFreeName(void *secret_, const char *name ATTRIBUTE_UNUSED) +static int +virSecretFreeName(virSecretPtr secret, const char *name ATTRIBUTE_UNUSED) { - virSecretPtr secret; - - secret = secret_; - virUnrefSecret(secret); + return virUnrefSecret(secret); } /** @@ -225,7 +222,7 @@ failed: if (ret->nodeDevices != NULL) virHashFree(ret->nodeDevices, (virHashDeallocator) virNodeDeviceFree); if (ret->secrets != NULL) - virHashFree(ret->secrets, virSecretFreeName); + virHashFree(ret->secrets, (virHashDeallocator) virSecretFreeName); if (ret->nwfilterPools != NULL) virHashFree(ret->nwfilterPools, (virHashDeallocator) virNWFilterPoolFreeName); @@ -283,7 +280,7 @@ virReleaseConnect(virConnectPtr conn) { if (conn->nodeDevices != NULL) virHashFree(conn->nodeDevices, (virHashDeallocator) virNodeDeviceFree); if (conn->secrets != NULL) - virHashFree(conn->secrets, virSecretFreeName); + virHashFree(conn->secrets, (virHashDeallocator) virSecretFreeName); if (conn->nwfilterPools != NULL) virHashFree(conn->nwfilterPools, (virHashDeallocator) virNWFilterPoolFreeName); -- 1.7.0.4

2 1

[libvirt] [PATCH] docs: Move the "Network Filtering" page one level up in the hierarchy
by Matthias Bolte 17 Jan '11

17 Jan '11

"Network Filtering" is not directly related to "Networks". Suggested by Daniel P. Berrange. --- docs/sitemap.html.in | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-) diff --git a/docs/sitemap.html.in b/docs/sitemap.html.in index 490450e..7077038 100644 --- a/docs/sitemap.html.in +++ b/docs/sitemap.html.in @@ -111,12 +111,10 @@ <li> <a href="formatnetwork.html">Networks</a> <span>The virtual network XML format</span> - <ul> - <li> - <a href="formatnwfilter.html">Network Filtering</a> - <span>Network filter XML format</span> - </li> - </ul> + </li> + <li> + <a href="formatnwfilter.html">Network Filtering</a> + <span>Network filter XML format</span> </li> <li> <a href="formatstorage.html">Storage</a> -- 1.7.0.4

2 1

[libvirt] website: API reference for virterror contains libvirt API also
by Matthias Bolte 17 Jan '11

17 Jan '11

The API reference website [1] for virterror contains the API reference for virterror as expected. But the complete libvirt API reference, that is already found at [2], is appended too. I looked into the XSLT process that generates those two HTML files from the libvirt-api.xml to understand why this happens, but I couldn't locate the problem. [1] http://www.libvirt.org/html/libvirt-virterror.html [2] http://www.libvirt.org/html/libvirt-libvirt.html Matthias

1 1

[libvirt] [PATCH] tests: Remove obsolete secaatest
by Matthias Bolte 15 Jan '11

15 Jan '11

Before the security driver was refactored in d6623003 seclabeltest and secaatest were basically the same. seclabeltest was meant for SELinux and secaatest for AppArmor. Both tests exited early when the specific security driver backend wasn't enabled. With the new security manager trying to initialize a disabled security driver backend is an error that can't be distinguished from other errors anymore. Therefore, the updated seclabeltest just asks for the first available backend as this will always work even with SELinux and AppArmor backend being disabled due to the new Nop backend. Remove the obsolete secaatest and compile and run the seclabeltest unconditional. This fixes make check on systems that support AppArmor. --- tests/Makefile.am | 24 ------------------------ tests/secaatest.c | 45 --------------------------------------------- 2 files changed, 0 insertions(+), 69 deletions(-) delete mode 100644 tests/secaatest.c diff --git a/tests/Makefile.am b/tests/Makefile.am index 345cf46..72beb23 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -98,13 +98,7 @@ if WITH_VMX check_PROGRAMS += vmx2xmltest xml2vmxtest endif -if WITH_SECDRIVER_SELINUX check_PROGRAMS += seclabeltest -endif - -if WITH_SECDRIVER_APPARMOR -check_PROGRAMS += secaatest -endif if WITH_CIL check_PROGRAMS += object-locking @@ -191,13 +185,7 @@ if WITH_VMX TESTS += vmx2xmltest xml2vmxtest endif -if WITH_SECDRIVER_SELINUX TESTS += seclabeltest -endif - -if WITH_SECDRIVER_APPARMOR -TESTS += secaatest -endif if WITH_LIBVIRTD check_PROGRAMS += eventtest @@ -376,21 +364,9 @@ commandhelper_SOURCES = \ commandhelper_CFLAGS = -Dabs_builddir="\"`pwd`\"" commandhelper_LDADD = $(LDADDS) -if WITH_SECDRIVER_SELINUX seclabeltest_SOURCES = \ seclabeltest.c seclabeltest_LDADD = ../src/libvirt_driver_security.la $(LDADDS) -else -EXTRA_DIST += seclabeltest.c -endif - -if WITH_SECDRIVER_APPARMOR -secaatest_SOURCES = \ - secaatest.c -secaatest_LDADD = ../src/libvirt_driver_security.la $(LDADDS) -else -EXTRA_DIST += secaatest.c -endif qparamtest_SOURCES = \ qparamtest.c testutils.h testutils.c diff --git a/tests/secaatest.c b/tests/secaatest.c deleted file mode 100644 index d9d6b4a..0000000 --- a/tests/secaatest.c +++ /dev/null @@ -1,45 +0,0 @@ -#include <config.h> - -#include <unistd.h> -#include <stdlib.h> -#include <stdio.h> -#include <string.h> -#include <errno.h> -#include "security/security_driver.h" - -int -main (int argc ATTRIBUTE_UNUSED, char **argv ATTRIBUTE_UNUSED) -{ - int ret; - - const char *doi, *model; - virSecurityDriverPtr security_drv; - - ret = virSecurityDriverStartup (&security_drv, "apparmor", false); - if (ret == -1) - { - fprintf (stderr, "Failed to start security driver"); - exit (-1); - } - /* No security driver wanted to be enabled: just return */ - if (ret == -2) - return 0; - - model = virSecurityDriverGetModel (security_drv); - if (!model) - { - fprintf (stderr, "Failed to copy secModel model: %s", - strerror (errno)); - exit (-1); - } - - doi = virSecurityDriverGetDOI (security_drv); - if (!doi) - { - fprintf (stderr, "Failed to copy secModel DOI: %s", - strerror (errno)); - exit (-1); - } - - return 0; -} -- 1.7.0.4

2 2

[libvirt] [PATCH] virsh: Use WITH_SECDRIVER_APPARMOR to detect AppArmor support
by Matthias Bolte 15 Jan '11

15 Jan '11

There is no ENABLE_SECDRIVER_APPARMOR. --- tools/virsh.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 4f103ae..b86d92f 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -11847,7 +11847,7 @@ vshShowVersion(vshControl *ctl ATTRIBUTE_UNUSED) vshPrint(ctl, "\n"); vshPrint(ctl, "%s", _(" Miscellaneous:")); -#ifdef ENABLE_SECDRIVER_APPARMOR +#ifdef WITH_SECDRIVER_APPARMOR vshPrint(ctl, " AppArmor"); #endif #ifdef WITH_SECDRIVER_SELINUX -- 1.7.0.4

2 2

[libvirt] Bug in virsh memtune on RHEL6?
by Justin Clift 15 Jan '11

15 Jan '11

Hi all, Getting strange numbers from the virsh memtune command on RHEL 6. (git head compiled, rather than RHEL 6 packages) virsh # list Id Name State ---------------------------------- 4 Fedora_14_x64 running virsh # memtune Fedora_14_x64 hard_limit : 9007199254740991 soft_limit : 9007199254740991 swap_hard_limit: 9007199254740991 Those numbers are supposed to be kilobytes, but the host box itself only has 12GB ram. Bug? Regards and best wishes, Justin Clift

4 16

[libvirt] OpenVZ and Libvirt
by Nathan Stratton 14 Jan '11

14 Jan '11

I have been working to get libvirt to work with openvz and kvm. I have had no issues with KVM but libvirt is hit or miss. Sometimes I get it to work, but most of the time I get back "out of memory". I have tried all recent versions of libvirt and vzctl from openvz. Any pointers? 17:52:31.974: debug : virConnectOpen:1425 : name=openvz:///system 17:52:31.974: debug : virEventRunOnce:593 : Poll on 12 handles 0x7f6394001420 timeout -1 17:52:31.974: debug : do_open:1204 : name "openvz:///system" to URI components: scheme openvz opaque (null) authority (null) server (null) user (null) port 0 path /system 17:52:31.974: debug : do_open:1242 : trying driver 0 (Test) ... 17:52:31.974: debug : do_open:1248 : driver 0 Test returned DECLINED 17:52:31.974: debug : do_open:1242 : trying driver 1 (Xen) ... 17:52:31.974: debug : do_open:1248 : driver 1 Xen returned DECLINED 17:52:31.974: debug : do_open:1242 : trying driver 2 (OPENVZ) ... 17:52:32.003: debug : virEventRunOnce:595 : Poll got 1 event 17:52:32.003: debug : virEventDispatchTimeouts:405 : Dispatch 3 17:52:32.003: debug : virEventDispatchHandles:450 : Dispatch 12 17:52:32.003: debug : virEventDispatchHandles:464 : i=0 w=1 17:52:32.003: debug : virEventDispatchHandles:464 : i=1 w=2 17:52:32.003: debug : virEventDispatchHandles:477 : Dispatch n=1 f=5 w=2 e=1 0x1cfa820 17:52:32.003: info : qemudDispatchSignalEvent:401 : Received unexpected signal 17 17:52:32.003: debug : virEventDispatchHandles:464 : i=2 w=3 17:52:32.003: debug : virEventDispatchHandles:464 : i=3 w=4 17:52:32.003: debug : virEventDispatchHandles:464 : i=4 w=5 17:52:32.003: debug : virEventDispatchHandles:464 : i=5 w=6 17:52:32.003: debug : virEventDispatchHandles:464 : i=6 w=7 17:52:32.003: debug : virEventDispatchHandles:464 : i=7 w=8 17:52:32.003: debug : virEventDispatchHandles:464 : i=8 w=9 17:52:32.003: debug : virEventDispatchHandles:464 : i=9 w=10 17:52:32.003: debug : virEventDispatchHandles:464 : i=10 w=11 17:52:32.003: debug : virEventDispatchHandles:464 : i=11 w=12 17:52:32.003: debug : virEventCleanupTimeouts:495 : Cleanup 3 17:52:32.003: debug : virEventCleanupHandles:536 : Cleanupo 12 17:52:32.006: error : openvzReadNetworkConf:318 : out of memory 17:52:32.009: error : openvzReadNetworkConf:318 : out of memory 17:52:32.013: error : openvzReadNetworkConf:318 : out of memory 17:52:32.016: error : openvzReadNetworkConf:318 : out of memory 17:52:32.020: error : openvzReadNetworkConf:318 : out of memory 17:52:32.023: error : openvzReadNetworkConf:318 : out of memory 17:52:32.027: error : openvzReadNetworkConf:318 : out of memory 17:52:32.030: error : openvzReadNetworkConf:318 : out of memory 17:52:32.034: error : openvzReadNetworkConf:318 : out of memory 17:52:32.037: error : openvzReadNetworkConf:318 : out of memory 17:52:32.041: error : openvzReadNetworkConf:318 : out of memory 17:52:32.044: error : openvzReadNetworkConf:318 : out of memory 17:52:32.048: error : openvzReadNetworkConf:318 : out of memory 17:52:32.051: error : openvzReadNetworkConf:318 : out of memory 17:52:32.055: error : openvzReadNetworkConf:318 : out of memory 17:52:32.058: error : openvzReadNetworkConf:318 : out of memory 17:52:32.062: error : openvzReadNetworkConf:318 : out of memory 17:52:32.062: error : openvzLoadDomains:534 : out of memory 17:52:32.062: debug : virDomainObjUnref:777 : obj=0x7f6384009340 refs=0 17:52:32.062: debug : virDomainObjFree:753 : obj=0x7f6384009340 17:52:32.062: debug : virDomainObjUnref:777 : obj=0x7f6384007780 refs=0 17:52:32.062: debug : virDomainObjFree:753 : obj=0x7f6384007780 17:52:32.062: debug : virDomainObjUnref:777 : obj=0x7f6384005be0 refs=0 17:52:32.062: debug : virDomainObjFree:753 : obj=0x7f6384005be0 17:52:32.062: debug : virDomainObjUnref:777 : obj=0x7f63840080d0 refs=0 17:52:32.062: debug : virDomainObjFree:753 : obj=0x7f63840080d0 17:52:32.062: debug : virDomainObjUnref:777 : obj=0x7f63840089f0 refs=0 17:52:32.062: debug : virDomainObjFree:753 : obj=0x7f63840089f0 17:52:32.062: debug : virDomainObjUnref:777 : obj=0x7f6384006500 refs=0 17:52:32.062: debug : virDomainObjFree:753 : obj=0x7f6384006500 17:52:32.062: debug : virDomainObjUnref:777 : obj=0x7f63840049b0 refs=0 17:52:32.062: debug : virDomainObjFree:753 : obj=0x7f63840049b0 17:52:32.062: debug : virDomainObjUnref:777 : obj=0x7f6384004ef0 refs=0 17:52:32.062: debug : virDomainObjFree:753 : obj=0x7f6384004ef0 17:52:32.062: debug : virDomainObjUnref:777 : obj=0x7f6384008e80 refs=0 17:52:32.062: debug : virDomainObjFree:753 : obj=0x7f6384008e80 17:52:32.062: debug : virDomainObjUnref:777 : obj=0x7f6384006070 refs=0 17:52:32.062: debug : virDomainObjFree:753 : obj=0x7f6384006070 17:52:32.062: debug : virDomainObjUnref:777 : obj=0x7f6384007c10 refs=0 17:52:32.062: debug : virDomainObjFree:753 : obj=0x7f6384007c10 17:52:32.062: debug : virDomainObjUnref:777 : obj=0x7f6384006990 refs=0 17:52:32.062: debug : virDomainObjFree:753 : obj=0x7f6384006990 17:52:32.062: debug : virDomainObjUnref:777 : obj=0x7f6384006e20 refs=0 17:52:32.062: debug : virDomainObjFree:753 : obj=0x7f6384006e20 17:52:32.062: debug : virDomainObjUnref:777 : obj=0x7f6384005330 refs=0 17:52:32.062: debug : virDomainObjFree:753 : obj=0x7f6384005330 17:52:32.062: debug : virDomainObjUnref:777 : obj=0x7f63840072e0 refs=0 17:52:32.062: debug : virDomainObjFree:753 : obj=0x7f63840072e0 17:52:32.062: debug : virDomainObjUnref:777 : obj=0x7f6384005750 refs=0 17:52:32.062: debug : virDomainObjFree:753 : obj=0x7f6384005750 17:52:32.062: debug : virDomainObjUnref:777 : obj=0x7f63840085f0 refs=0 17:52:32.062: debug : virDomainObjFree:753 : obj=0x7f63840085f0 17:52:32.062: debug : do_open:1248 : driver 2 OPENVZ returned ERROR 17:52:32.062: debug : virUnrefConnect:294 : unref connection 0x7f6384000bd0 1 17:52:32.062: debug : virReleaseConnect:249 : release connection 0x7f6384000bd0 libvir: OpenVZ error : out of memory ><> Nathan Stratton CTO, BlinkMind, Inc. nathan at robotics.net nathan at blinkmind.com http://www.robotics.net http://www.blinkmind.com

2 1

[libvirt] [PATCHv2] Enable tuning of qemu network tap device "sndbuf" size
by Laine Stump 14 Jan '11

14 Jan '11

This is in response to a request in: https://bugzilla.redhat.com/show_bug.cgi?id=665293 In short, under heavy load, it's possible for qemu's networking to lock up due to the tap device's default 1MB sndbuf being inadequate. adding "sndbuf=0" to the qemu commandline -netdevice option will alleviate this problem (sndbuf=0 actually sets it to 0xffffffff). Because we must be able to explicitly specify "0" as a value, the standard practice of "0 means not specified" won't work here. Instead, virDomainNetDef also has a sndbuf_specified, which defaults to 0, but is set to 1 if some value was given. The sndbuf value is put inside a <tune> element of each <interface> in the domain. The intent is that further tunable settings will also be placed inside this element. <interface type='network'> ... <tune> <sndbuf>0</sndbuf> ... </tune> </interface> --- Changes from V1: sndbuf_specified is now a bool rather than an int bitfield. sndbuf is now unsigned long. Made possible by eblake's patch adding new virXPath* and virStrToLong_* functions. docs/schemas/domain.rng | 10 ++++++++++ src/conf/domain_conf.c | 29 +++++++++++++++++++++++++++-- src/conf/domain_conf.h | 4 ++++ src/qemu/qemu_command.c | 19 +++++++++++++++++-- 4 files changed, 58 insertions(+), 4 deletions(-) diff --git a/docs/schemas/domain.rng b/docs/schemas/domain.rng index 5e140fb..a79ca6a 100644 --- a/docs/schemas/domain.rng +++ b/docs/schemas/domain.rng @@ -1025,6 +1025,16 @@ <ref name="filterref-node-attributes"/> </element> </optional> + <optional> + <element name="tune"> + <optional> +  + <element name="sndbuf"> + <ref name="unsignedInt"/> + </element> + </optional> + </element> + </optional> </interleave> </define> <define name="virtualPortProfile"> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 1cef112..396574e 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -2282,6 +2282,7 @@ err_exit: static virDomainNetDefPtr virDomainNetDefParseXML(virCapsPtr caps, xmlNodePtr node, + xmlXPathContextPtr ctxt, int flags ATTRIBUTE_UNUSED) { virDomainNetDefPtr def; xmlNodePtr cur; @@ -2303,12 +2304,15 @@ virDomainNetDefParseXML(virCapsPtr caps, virNWFilterHashTablePtr filterparams = NULL; virVirtualPortProfileParams virtPort; bool virtPortParsed = false; + xmlNodePtr oldnode = ctxt->node; if (VIR_ALLOC(def) < 0) { virReportOOMError(); return NULL; } + ctxt->node = node; + type = virXMLPropString(node, "type"); if (type != NULL) { if ((int)(def->type = virDomainNetTypeFromString(type)) < 0) { @@ -2596,7 +2600,12 @@ virDomainNetDefParseXML(virCapsPtr caps, } } + if (virXPathULong("string(./tune/sndbuf)", ctxt, &def->tune.sndbuf) >= 0) { + def->tune.sndbuf_specified = true; + } + cleanup: + ctxt->node = oldnode; VIR_FREE(macaddr); VIR_FREE(network); VIR_FREE(address); @@ -4306,6 +4315,7 @@ virDomainDeviceDefPtr virDomainDeviceDefParse(virCapsPtr caps, { xmlDocPtr xml; xmlNodePtr node; + xmlXPathContextPtr ctxt = NULL; virDomainDeviceDefPtr dev = NULL; if (!(xml = xmlReadDoc(BAD_CAST xmlStr, "device.xml", NULL, @@ -4322,6 +4332,13 @@ virDomainDeviceDefPtr virDomainDeviceDefParse(virCapsPtr caps, goto error; } + ctxt = xmlXPathNewContext(xml); + if (ctxt == NULL) { + virReportOOMError(); + goto error; + } + ctxt->node = node; + if (VIR_ALLOC(dev) < 0) { virReportOOMError(); goto error; @@ -4337,7 +4354,7 @@ virDomainDeviceDefPtr virDomainDeviceDefParse(virCapsPtr caps, goto error; } else if (xmlStrEqual(node->name, BAD_CAST "interface")) { dev->type = VIR_DOMAIN_DEVICE_NET; - if (!(dev->data.net = virDomainNetDefParseXML(caps, node, flags))) + if (!(dev->data.net = virDomainNetDefParseXML(caps, node, ctxt, flags))) goto error; } else if (xmlStrEqual(node->name, BAD_CAST "input")) { dev->type = VIR_DOMAIN_DEVICE_INPUT; @@ -4375,11 +4392,12 @@ virDomainDeviceDefPtr virDomainDeviceDefParse(virCapsPtr caps, } xmlFreeDoc(xml); - + xmlXPathFreeContext(ctxt); return dev; error: xmlFreeDoc(xml); + xmlXPathFreeContext(ctxt); VIR_FREE(dev); return NULL; } @@ -5050,6 +5068,7 @@ static virDomainDefPtr virDomainDefParseXML(virCapsPtr caps, for (i = 0 ; i < n ; i++) { virDomainNetDefPtr net = virDomainNetDefParseXML(caps, nodes[i], + ctxt, flags); if (!net) goto error; @@ -6318,6 +6337,12 @@ virDomainNetDefFormat(virBufferPtr buf, VIR_FREE(attrs); } + if (def->tune.sndbuf_specified) { + virBufferAddLit(buf, " <tune>\n"); + virBufferVSprintf(buf, " <sndbuf>%lu</sndbuf>\n", def->tune.sndbuf); + virBufferAddLit(buf, " </tune>\n"); + } + if (virDomainDeviceInfoFormat(buf, &def->info, flags) < 0) return -1; diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index a73fd14..1269ed6 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -346,6 +346,10 @@ struct _virDomainNetDef { virVirtualPortProfileParams virtPortProfile; } direct; } data; + struct { + bool sndbuf_specified; + unsigned long sndbuf; + } tune; char *ifname; virDomainDeviceInfo info; char *filter; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index a3b5ff3..c37fdb2 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -1584,6 +1584,7 @@ qemuBuildHostNetStr(virDomainNetDefPtr net, const char *tapfd, const char *vhostfd) { + bool is_tap = false; virBuffer buf = VIR_BUFFER_INITIALIZER; switch (net->type) { @@ -1593,6 +1594,7 @@ qemuBuildHostNetStr(virDomainNetDefPtr net, virBufferAddLit(&buf, "tap"); virBufferVSprintf(&buf, "%cfd=%s", type_sep, tapfd); type_sep = ','; + is_tap = true; break; case VIR_DOMAIN_NET_TYPE_ETHERNET: @@ -1606,6 +1608,7 @@ qemuBuildHostNetStr(virDomainNetDefPtr net, net->data.ethernet.script); type_sep = ','; } + is_tap = true; break; case VIR_DOMAIN_NET_TYPE_CLIENT: @@ -1659,8 +1662,11 @@ qemuBuildHostNetStr(virDomainNetDefPtr net, type_sep, net->info.alias); } - if (vhostfd && *vhostfd) { - virBufferVSprintf(&buf, ",vhost=on,vhostfd=%s", vhostfd); + if (is_tap) { + if (vhostfd && *vhostfd) + virBufferVSprintf(&buf, ",vhost=on,vhostfd=%s", vhostfd); + if (net->tune.sndbuf_specified) + virBufferVSprintf(&buf, ",sndbuf=%lu", net->tune.sndbuf); } if (virBufferError(&buf)) { @@ -4661,6 +4667,15 @@ qemuParseCommandLineNet(virCapsPtr caps, } else if (STREQ(keywords[i], "off")) { def->backend = VIR_DOMAIN_NET_BACKEND_TYPE_QEMU; } + } else if (STREQ(keywords[i], "sndbuf") && values[i]) { + if (virStrToLong_ul(values[i], NULL, 10, &def->tune.sndbuf) < 0) { + qemuReportError(VIR_ERR_INTERNAL_ERROR, + _("cannot parse sndbuf size in '%s'"), val); + virDomainNetDefFree(def); + def = NULL; + goto cleanup; + } + def->tune.sndbuf_specified = true; } } -- 1.7.3.4

2 2

[libvirt] [PATCH 0/2] Update qemu password support (v2)
by Marc-André Lureau 14 Jan '11

14 Jan '11

Recently, QEMU learned set_password and expire_password monitor commands. http://qemu.com/qemu.git/commit/?id=7572150c189c6553c2448334116ab717680de66d The following patches make use of these new commands if available, and fallback on VNC-only password support. Change since v1: - moved qemuInitGraphicsPasswords to qemu_hotplug, renamed to qemuDomainChangeGraphicsPasswords. - updated what looks like a typo (that appears to work anyway) in initial patch from Daniel: - ret = qemuInitGraphicsPasswords(driver, vm, - VIR_DOMAIN_GRAPHICS_TYPE_SPICE, - &vm->def->graphics[0]->data.vnc.auth, - driver->vncPassword); + ret = qemuInitGraphicsPasswords(driver, vm, + VIR_DOMAIN_GRAPHICS_TYPE_SPICE, + &vm->def->graphics[0]->data.spice.auth, + driver->spicePassword); Marc-André Lureau (2): qemu: add set_password and expire_password monitor commands Use the new set_password monitor command to set password. src/qemu/qemu_driver.c | 22 ++++---- src/qemu/qemu_hotplug.c | 114 +++++++++++++++++++++++++++++++++++++++--- src/qemu/qemu_hotplug.h | 5 ++ src/qemu/qemu_monitor.c | 77 ++++++++++++++++++++++++++++ src/qemu/qemu_monitor.h | 7 +++ src/qemu/qemu_monitor_json.c | 56 ++++++++++++++++++++ src/qemu/qemu_monitor_json.h | 7 +++ src/qemu/qemu_monitor_text.c | 69 +++++++++++++++++++++++++ src/qemu/qemu_monitor_text.h | 7 +++ 9 files changed, 346 insertions(+), 18 deletions(-) -- 1.7.3.4

3 5

[libvirt] [PATCHv2] Add XML config switch to enable/disable vhost-net support
by Laine Stump 14 Jan '11

14 Jan '11

This patch is in response to https://bugzilla.redhat.com/show_bug.cgi?id=643050 The existing libvirt support for the vhost-net backend to the virtio network driver happens automatically - if the vhost-net device is available, it is always enabled, otherwise the standard userland virtio backend is used. This patch makes it possible to force whether or not vhost-net is used with a bit of XML. Adding a <driver> element to the interface XML, eg: <interface type="network"> <model type="virtio"/> <driver name="vhost"/> will force use of vhost-net (if it's not available, the domain will fail to start). if driver name="qemu", vhost-net will not be used even if it is available. If there is no <driver name='xxx'/> in the config, libvirt will revert to the pre-existing automatic behavior - use vhost-net if it's available, and userland backend if vhost-net isn't available. --- Changes from V1: enum now starts at 0 instead of -1. I just disallow "default" when parsing. This eliminates the need for vhost_specified. Removed superfluous 3rd arg to open(). docs/schemas/domain.rng | 13 +++++++++ src/conf/domain_conf.c | 29 +++++++++++++++++++- src/conf/domain_conf.h | 10 +++++++ src/qemu/qemu_command.c | 67 ++++++++++++++++++++++++++++++++++++++-------- src/qemu/qemu_command.h | 3 -- 5 files changed, 106 insertions(+), 16 deletions(-) diff --git a/docs/schemas/domain.rng b/docs/schemas/domain.rng index 6de85fd..5e140fb 100644 --- a/docs/schemas/domain.rng +++ b/docs/schemas/domain.rng @@ -1005,6 +1005,19 @@ </element> </optional> <optional> + <element name="driver"> + <optional> + <attribute name="name"> + <choice> + <value>qemu</value> + <value>vhost</value> + </choice> + </attribute> + </optional> + <empty/> + </element> + </optional> + <optional> <ref name="address"/> </optional> <optional> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 2c54683..1cef112 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -185,6 +185,11 @@ VIR_ENUM_IMPL(virDomainNet, VIR_DOMAIN_NET_TYPE_LAST, "internal", "direct") +VIR_ENUM_IMPL(virDomainNetBackend, VIR_DOMAIN_NET_BACKEND_TYPE_LAST, + "default", + "qemu", + "vhost") + VIR_ENUM_IMPL(virDomainChrChannelTarget, VIR_DOMAIN_CHR_CHANNEL_TARGET_TYPE_LAST, "guestfwd", @@ -2290,6 +2295,7 @@ virDomainNetDefParseXML(virCapsPtr caps, char *address = NULL; char *port = NULL; char *model = NULL; + char *backend = NULL; char *filter = NULL; char *internal = NULL; char *devaddr = NULL; @@ -2372,6 +2378,8 @@ virDomainNetDefParseXML(virCapsPtr caps, script = virXMLPropString(cur, "path"); } else if (xmlStrEqual (cur->name, BAD_CAST "model")) { model = virXMLPropString(cur, "type"); + } else if (xmlStrEqual (cur->name, BAD_CAST "driver")) { + backend = virXMLPropString(cur, "name"); } else if (xmlStrEqual (cur->name, BAD_CAST "filterref")) { filter = virXMLPropString(cur, "filter"); VIR_FREE(filterparams); @@ -2559,6 +2567,19 @@ virDomainNetDefParseXML(virCapsPtr caps, model = NULL; } + if ((backend != NULL) && + (def->model && STREQ(def->model, "virtio"))) { + int b; + if (((b = virDomainNetBackendTypeFromString(backend)) < 0) || + (b == 0)) { + virDomainReportError(VIR_ERR_INTERNAL_ERROR, + _("Unknown interface <driver name='%s'> " + "has been specified"), + backend); + goto error; + } + def->backend = b; + } if (filter != NULL) { switch (def->type) { case VIR_DOMAIN_NET_TYPE_ETHERNET: @@ -2585,6 +2606,7 @@ cleanup: VIR_FREE(script); VIR_FREE(bridge); VIR_FREE(model); + VIR_FREE(backend); VIR_FREE(filter); VIR_FREE(type); VIR_FREE(internal); @@ -6276,9 +6298,14 @@ virDomainNetDefFormat(virBufferPtr buf, if (def->ifname) virBufferEscapeString(buf, " <target dev='%s'/>\n", def->ifname); - if (def->model) + if (def->model) { virBufferEscapeString(buf, " <model type='%s'/>\n", def->model); + if (STREQ(def->model, "virtio") && def->backend) { + virBufferVSprintf(buf, " <driver name='%s'/>\n", + virDomainNetBackendTypeToString(def->backend)); + } + } if (def->filter) { virBufferEscapeString(buf, " <filterref filter='%s'", def->filter); diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 6a8ec64..a73fd14 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -292,6 +292,14 @@ enum virDomainNetType { VIR_DOMAIN_NET_TYPE_LAST, }; +/* the backend driver used for virtio interfaces */ +enum virDomainNetBackendType { + VIR_DOMAIN_NET_BACKEND_TYPE_DEFAULT, /* prefer kernel, fall back to user */ + VIR_DOMAIN_NET_BACKEND_TYPE_QEMU, /* userland */ + VIR_DOMAIN_NET_BACKEND_TYPE_VHOST, /* kernel */ + + VIR_DOMAIN_NET_BACKEND_TYPE_LAST, +}; /* the mode type for macvtap devices */ enum virDomainNetdevMacvtapType { @@ -310,6 +318,7 @@ struct _virDomainNetDef { enum virDomainNetType type; unsigned char mac[VIR_MAC_BUFLEN]; char *model; + enum virDomainNetBackendType backend; union { struct { char *dev; @@ -1265,6 +1274,7 @@ VIR_ENUM_DECL(virDomainControllerModel) VIR_ENUM_DECL(virDomainFS) VIR_ENUM_DECL(virDomainFSAccessMode) VIR_ENUM_DECL(virDomainNet) +VIR_ENUM_DECL(virDomainNetBackend) VIR_ENUM_DECL(virDomainChrDevice) VIR_ENUM_DECL(virDomainChrChannelTarget) VIR_ENUM_DECL(virDomainChrConsoleTarget) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 86c5bb5..a3b5ff3 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -302,24 +302,58 @@ cleanup: } -int +static int qemuOpenVhostNet(virDomainNetDefPtr net, - unsigned long long qemuCmdFlags) + unsigned long long qemuCmdFlags, + int *vhostfd) { - /* If qemu supports vhost-net mode (including the -netdev command - * option), the nic model is virtio, and we can open - * /dev/vhost_net, assume that vhost-net mode is available and - * return the fd to /dev/vhost_net. Otherwise, return -1. - */ + *vhostfd = -1; /* assume we won't use vhost */ + /* If the config says explicitly to not use vhost, return now */ + if (net->backend == VIR_DOMAIN_NET_BACKEND_TYPE_QEMU) { + return 0; + } + + /* If qemu doesn't support vhost-net mode (including the -netdev command + * option), don't try to open the device. + */ if (!(qemuCmdFlags & QEMUD_CMD_FLAG_VNET_HOST && qemuCmdFlags & QEMUD_CMD_FLAG_NETDEV && - qemuCmdFlags & QEMUD_CMD_FLAG_DEVICE && - net->model && STREQ(net->model, "virtio"))) - return -1; + qemuCmdFlags & QEMUD_CMD_FLAG_DEVICE)) { + if (net->backend == VIR_DOMAIN_NET_BACKEND_TYPE_VHOST) { + qemuReportError(VIR_ERR_CONFIG_UNSUPPORTED, + "%s", _("vhost-net is not supported with " + "this QEMU binary")); + return -1; + } + return 0; + } - return open("/dev/vhost-net", O_RDWR, 0); + /* If the nic model isn't virtio, don't try to open. */ + if (!(net->model && STREQ(net->model, "virtio"))) { + if (net->backend == VIR_DOMAIN_NET_BACKEND_TYPE_VHOST) { + qemuReportError(VIR_ERR_CONFIG_UNSUPPORTED, + "%s", _("vhost-net is only supported for " + "virtio network interfaces")); + return -1; + } + return 0; + } + + *vhostfd = open("/dev/vhost-net", O_RDWR); + + /* If the config says explicitly to use vhost and we couldn't open it, + * report an error. + */ + if ((*vhostfd < 0) && + (net->backend == VIR_DOMAIN_NET_BACKEND_TYPE_VHOST)) { + qemuReportError(VIR_ERR_CONFIG_UNSUPPORTED, + "%s", _("vhost-net was requested for an interface, " + "but is unavailable")); + return -1; + } + return 0; } @@ -3278,7 +3312,10 @@ qemuBuildCommandLine(virConnectPtr conn, net->type == VIR_DOMAIN_NET_TYPE_DIRECT) { /* Attempt to use vhost-net mode for these types of network device */ - int vhostfd = qemuOpenVhostNet(net, qemuCmdFlags); + int vhostfd; + + if (qemuOpenVhostNet(net, qemuCmdFlags, &vhostfd) < 0) + goto error; if (vhostfd >= 0) { virCommandTransferFD(cmd, vhostfd); @@ -4618,6 +4655,12 @@ qemuParseCommandLineNet(virCapsPtr caps, } else if (STREQ(keywords[i], "model")) { def->model = values[i]; values[i] = NULL; + } else if (STREQ(keywords[i], "vhost")) { + if ((values[i] == NULL) || STREQ(values[i], "on")) { + def->backend = VIR_DOMAIN_NET_BACKEND_TYPE_VHOST; + } else if (STREQ(keywords[i], "off")) { + def->backend = VIR_DOMAIN_NET_BACKEND_TYPE_QEMU; + } } } diff --git a/src/qemu/qemu_command.h b/src/qemu/qemu_command.h index 4c42a10..5439184 100644 --- a/src/qemu/qemu_command.h +++ b/src/qemu/qemu_command.h @@ -116,9 +116,6 @@ int qemuNetworkIfaceConnect(virConnectPtr conn, unsigned long long qemCmdFlags) ATTRIBUTE_NONNULL(1); -int qemuOpenVhostNet(virDomainNetDefPtr net, - unsigned long long qemuCmdFlags); - int qemuPhysIfaceConnect(virConnectPtr conn, struct qemud_driver *driver, virDomainNetDefPtr net, -- 1.7.3.4

2 2

[libvirt] [PATCH] Fix 'make check' after commit 04197350
by Jim Fehlig 14 Jan '11

14 Jan '11

I broke 'make check' with commit 04197350 by unconditionally emitting 'hap=' in xen xm driver. Only emit 'hap=' if xendConfigVersion >= 3. I've tested sending 'hap=' to a Xen 3.2 machine without support for hap setting and verified that xend silently drops the unrecognized setting. --- src/xen/xm_internal.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/xen/xm_internal.c b/src/xen/xm_internal.c index ec618aa..bfb6698 100644 --- a/src/xen/xm_internal.c +++ b/src/xen/xm_internal.c @@ -2413,10 +2413,11 @@ virConfPtr xenXMDomainConfigFormat(virConnectPtr conn, (1 << VIR_DOMAIN_FEATURE_APIC)) ? 1 : 0) < 0) goto no_memory; - if (xenXMConfigSetInt(conf, "hap", - (def->features & - (1 << VIR_DOMAIN_FEATURE_HAP)) ? 1 : 0) < 0) - goto no_memory; + if (priv->xendConfigVersion >= 3) + if (xenXMConfigSetInt(conf, "hap", + (def->features & + (1 << VIR_DOMAIN_FEATURE_HAP)) ? 1 : 0) < 0) + goto no_memory; if (def->clock.offset == VIR_DOMAIN_CLOCK_OFFSET_LOCALTIME) { if (def->clock.data.timezone) { -- 1.7.3.1

2 2

[libvirt] [PATCH] Enable tuning of qemu network tap device "sndbuf" size
by Laine Stump 14 Jan '11

14 Jan '11

This is in response to a request in: https://bugzilla.redhat.com/show_bug.cgi?id=665293 In short, under heavy load, it's possible for qemu's networking to lock up due to the tap device's default 1MB sndbuf being inadequate. adding "sndbuf=0" to the qemu commandline -netdevice option will alleviate this problem (sndbuf=0 actually sets it to 0xffffffff). Because we must be able to explicitly specify "0" as a value, the standard practice of "0 means not specified" won't work here. Instead, virDomainNetDef also has a sndbuf_specified, which defaults to 0, but is set to 1 if some value was given. The sndbuf value is put inside a <tune> element of each <interface> in the domain. The intent is that further tunable settings will also be placed inside this elemnent. <interface type='network'> ... <tune> <sndbuf>0</sndbuf> ... </tune> </interface> --- Note that in qemuBuildHostNetStr() I have moved if (vhostfd && *vhostfd) { virBufferVSprintf(&buf, ",vhost=on,vhostfd=%s", vhostfd); into a newly created "if (is_tap) { ... }" block. This always should have been inside such a conditional, but none existed until now. (I can make this a separate patch if anyone wants, but it seemed so simple and obvious that I took the slothenly way out :-) Also, as with the vhost patch, I didn't get the html docs updated for this addition either. I will add both in a single followup patch next week. docs/schemas/domain.rng | 10 ++++++++++ src/conf/domain_conf.c | 31 +++++++++++++++++++++++++++++-- src/conf/domain_conf.h | 4 ++++ src/qemu/qemu_command.c | 19 +++++++++++++++++-- 4 files changed, 60 insertions(+), 4 deletions(-) diff --git a/docs/schemas/domain.rng b/docs/schemas/domain.rng index 6d0654d..e2883aa 100644 --- a/docs/schemas/domain.rng +++ b/docs/schemas/domain.rng @@ -1025,6 +1025,16 @@ <ref name="filterref-node-attributes"/> </element> </optional> + <optional> + <element name="tune"> + <optional> +  + <element name="sndbuf"> + <ref name="unsignedInt"/> + </element> + </optional> + </element> + </optional> </interleave> </define> <define name="virtualPortProfile"> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 04ed502..5d1b8cf 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -2280,6 +2280,7 @@ err_exit: static virDomainNetDefPtr virDomainNetDefParseXML(virCapsPtr caps, xmlNodePtr node, + xmlXPathContextPtr ctxt, int flags ATTRIBUTE_UNUSED) { virDomainNetDefPtr def; xmlNodePtr cur; @@ -2298,15 +2299,19 @@ virDomainNetDefParseXML(virCapsPtr caps, char *internal = NULL; char *devaddr = NULL; char *mode = NULL; + unsigned long sndbuf; virNWFilterHashTablePtr filterparams = NULL; virVirtualPortProfileParams virtPort; bool virtPortParsed = false; + xmlNodePtr oldnode = ctxt->node; if (VIR_ALLOC(def) < 0) { virReportOOMError(); return NULL; } + ctxt->node = node; + type = virXMLPropString(node, "type"); if (type != NULL) { if ((int)(def->type = virDomainNetTypeFromString(type)) < 0) { @@ -2593,7 +2598,13 @@ virDomainNetDefParseXML(virCapsPtr caps, } } + if (virXPathULong("string(./tune/sndbuf)", ctxt, &sndbuf) >= 0) { + def->tune.sndbuf = sndbuf; + def->tune.sndbuf_specified = 1; + } + cleanup: + ctxt->node = oldnode; VIR_FREE(macaddr); VIR_FREE(network); VIR_FREE(address); @@ -4303,6 +4314,7 @@ virDomainDeviceDefPtr virDomainDeviceDefParse(virCapsPtr caps, { xmlDocPtr xml; xmlNodePtr node; + xmlXPathContextPtr ctxt = NULL; virDomainDeviceDefPtr dev = NULL; if (!(xml = xmlReadDoc(BAD_CAST xmlStr, "device.xml", NULL, @@ -4319,6 +4331,13 @@ virDomainDeviceDefPtr virDomainDeviceDefParse(virCapsPtr caps, goto error; } + ctxt = xmlXPathNewContext(xml); + if (ctxt == NULL) { + virReportOOMError(); + goto error; + } + ctxt->node = node; + if (VIR_ALLOC(dev) < 0) { virReportOOMError(); goto error; @@ -4334,7 +4353,7 @@ virDomainDeviceDefPtr virDomainDeviceDefParse(virCapsPtr caps, goto error; } else if (xmlStrEqual(node->name, BAD_CAST "interface")) { dev->type = VIR_DOMAIN_DEVICE_NET; - if (!(dev->data.net = virDomainNetDefParseXML(caps, node, flags))) + if (!(dev->data.net = virDomainNetDefParseXML(caps, node, ctxt, flags))) goto error; } else if (xmlStrEqual(node->name, BAD_CAST "input")) { dev->type = VIR_DOMAIN_DEVICE_INPUT; @@ -4372,11 +4391,12 @@ virDomainDeviceDefPtr virDomainDeviceDefParse(virCapsPtr caps, } xmlFreeDoc(xml); - + xmlXPathFreeContext(ctxt); return dev; error: xmlFreeDoc(xml); + xmlXPathFreeContext(ctxt); VIR_FREE(dev); return NULL; } @@ -5047,6 +5067,7 @@ static virDomainDefPtr virDomainDefParseXML(virCapsPtr caps, for (i = 0 ; i < n ; i++) { virDomainNetDefPtr net = virDomainNetDefParseXML(caps, nodes[i], + ctxt, flags); if (!net) goto error; @@ -6315,6 +6336,12 @@ virDomainNetDefFormat(virBufferPtr buf, VIR_FREE(attrs); } + if (def->tune.sndbuf_specified) { + virBufferAddLit(buf, " <tune>\n"); + virBufferVSprintf(buf, " <sndbuf>%d</sndbuf>\n", def->tune.sndbuf); + virBufferAddLit(buf, " </tune>\n"); + } + if (virDomainDeviceInfoFormat(buf, &def->info, flags) < 0) return -1; diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 451ccad..2d35d68 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -346,6 +346,10 @@ struct _virDomainNetDef { virVirtualPortProfileParams virtPortProfile; } direct; } data; + struct { + int sndbuf_specified : 1; + int sndbuf; + } tune; char *ifname; virDomainDeviceInfo info; char *filter; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 9eb54a1..add66cb 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -1587,6 +1587,7 @@ qemuBuildHostNetStr(virDomainNetDefPtr net, const char *tapfd, const char *vhostfd) { + bool is_tap = false; virBuffer buf = VIR_BUFFER_INITIALIZER; switch (net->type) { @@ -1596,6 +1597,7 @@ qemuBuildHostNetStr(virDomainNetDefPtr net, virBufferAddLit(&buf, "tap"); virBufferVSprintf(&buf, "%cfd=%s", type_sep, tapfd); type_sep = ','; + is_tap = true; break; case VIR_DOMAIN_NET_TYPE_ETHERNET: @@ -1609,6 +1611,7 @@ qemuBuildHostNetStr(virDomainNetDefPtr net, net->data.ethernet.script); type_sep = ','; } + is_tap = true; break; case VIR_DOMAIN_NET_TYPE_CLIENT: @@ -1662,8 +1665,11 @@ qemuBuildHostNetStr(virDomainNetDefPtr net, type_sep, net->info.alias); } - if (vhostfd && *vhostfd) { - virBufferVSprintf(&buf, ",vhost=on,vhostfd=%s", vhostfd); + if (is_tap) { + if (vhostfd && *vhostfd) + virBufferVSprintf(&buf, ",vhost=on,vhostfd=%s", vhostfd); + if (net->tune.sndbuf_specified) + virBufferVSprintf(&buf, ",sndbuf=%d", net->tune.sndbuf); } if (virBufferError(&buf)) { @@ -4665,6 +4671,15 @@ qemuParseCommandLineNet(virCapsPtr caps, def->backend = VIR_DOMAIN_NET_BACKEND_TYPE_QEMU; } def->backend_specified = 1; + } else if (STREQ(keywords[i], "sndbuf") && values[i]) { + if (virStrToLong_i(values[i], NULL, 10, &def->tune.sndbuf) < 0) { + qemuReportError(VIR_ERR_INTERNAL_ERROR, + _("cannot parse sndbuf size in '%s'"), val); + virDomainNetDefFree(def); + def = NULL; + goto cleanup; + } + def->tune.sndbuf_specified = 1; } } -- 1.7.3.4

3 4

[libvirt] [PATCH] cpu: Add support for Westmere CPU model
by Jiri Denemark 14 Jan '11

14 Jan '11

--- src/cpu/cpu_map.xml | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/src/cpu/cpu_map.xml b/src/cpu/cpu_map.xml index 75c6522..35dca20 100644 --- a/src/cpu/cpu_map.xml +++ b/src/cpu/cpu_map.xml @@ -142,6 +142,9 @@ <feature name='popcnt'>  <cpuid function='0x00000001' ecx='0x00800000'/> </feature> + <feature name='aes'> + <cpuid function='0x00000001' ecx='0x02000000'/> + </feature> <feature name='hypervisor'>  <cpuid function='0x00000001' ecx='0x80000000'/> </feature> @@ -453,6 +456,12 @@ <feature name='lahf_lm'/> </model> + <model name='Westmere'> + <vendor name='Intel'/> + <model name='Nehalem'/> + <feature name='aes'/> + </model> + <model name='Opteron_G1'> <vendor name='AMD'/> <feature name='sse2'/> -- 1.7.4.rc1

2 2

[libvirt] build failure on ubuntu
by Eric Blake 14 Jan '11

14 Jan '11

I haven't looked into this closely yet, but Daniel's security refactoring broke the Ubuntu 'make check' build when apparmor is enabled: CC secaatest.o secaatest.c: In function 'main': secaatest.c:18: error: implicit declaration of function 'virSecurityDriverStartup' [-Wimplicit-function-declaration] -- Eric Blake eblake(a)redhat.com +1-801-349-2682 Libvirt virtualization library http://libvirt.org

2 2

[libvirt] [PATCH 0/4] Add HAP to domain features
by Jim Fehlig 14 Jan '11

14 Jan '11

Hardware features such as Extended Page Table and Nested Page Table augment hypervisor software techniques such as shadow page table. Adding HAP (hardware assisted paging) to the virDomainFeature enumeration allows users to select between hardware and software memory management mechanisms for their guests. I've seen reports [1] of users asking for this capability in the past. Patch 3 is an attempt to advertise the feature in hvm guest capabilities for the Xen hypervisor. I have not found a way to discover the presence of HAP support through the xen tools. Instead, the feature is only advertised on Xen >= 3.3, which sadly won't accommodate distro backports to older Xen versions. Thanks for your comments, Jim [1] http://www.mail-archive.com/fedora-xen@redhat.com/msg02680.html Jim Fehlig (4): Add HAP to virDomainFeature enum Add support for HAP feature to xen drivers Add HAP to xen hypervisor capabilities Document HAP domain feature docs/formatdomain.html.in | 5 +++++ docs/schemas/domain.rng | 7 ++++++- src/conf/domain_conf.c | 3 ++- src/conf/domain_conf.h | 1 + src/xen/xen_hypervisor.c | 10 ++++++++++ src/xen/xend_internal.c | 4 ++++ src/xen/xm_internal.c | 8 ++++++++ src/xenapi/xenapi_driver.c | 2 ++ src/xenapi/xenapi_utils.c | 2 ++ 9 files changed, 40 insertions(+), 2 deletions(-) -- 1.7.3.1

3 13

[libvirt] virsh setmem and setmaxmem: which XML do they match?
by Justin Clift 14 Jan '11

14 Jan '11

Hi all, Updating the man pages for the virsh setmem and setmaxmem commands at the moment. These two commands only run on active guest domains. So, as a helpful pointer on how to make the change with an inactive domain, I'm going to mention what the equivalent XML tag is for use with virsh edit. Like this: Note, this command only works on active guest domains. To change the memory allocation for an inactive guest domain, use the virsh B<edit> command to update the XML <memory> element. I'm just not sure which XML element the setmem and setmaxmem commands map to. Does "setmaxmem" map to <memory>, and "setmem" map to <currentMemory>? The description in our XML format domain doc is less than clear. :/ Regards and best wishes, Justin Clift

1 0

[libvirt] [PATCH] util: add missing string->integer conversion functions
by Eric Blake 14 Jan '11

14 Jan '11

It was awkward having only int conversion in the virStrToLong family, but only long conversion in the virXPath family. Make both families support both types. * src/util/util.h (virStrToLong_l, virStrToLong_ul): New prototypes. * src/util/xml.h (virXPathInt, virXPathUInt): Likewise. * src/util/util.c (virStrToLong_l, virStrToLong_ul): New functions. * src/util/xml.c (virXPathInt, virXPathUInt): Likewise. * src/libvirt_private.syms (util.h, xml.h): Export them. --- src/libvirt_private.syms | 4 +++ src/util/util.c | 40 +++++++++++++++++++++++++++++- src/util/util.h | 8 ++++++ src/util/xml.c | 60 +++++++++++++++++++++++++++++++++++++++++++++- src/util/xml.h | 12 +++++++-- 5 files changed, 119 insertions(+), 5 deletions(-) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index a166bd9..d95ef31 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -886,8 +886,10 @@ virSetUIDGID; virSkipSpaces; virStrToDouble; virStrToLong_i; +virStrToLong_l; virStrToLong_ll; virStrToLong_ui; +virStrToLong_ul; virStrToLong_ull; virStrcpy; virStrncpy; @@ -926,6 +928,7 @@ virStrerror; # xml.h virXMLPropString; virXPathBoolean; +virXPathInt; virXPathLong; virXPathLongHex; virXPathLongLong; @@ -934,6 +937,7 @@ virXPathNodeSet; virXPathNumber; virXPathString; virXPathStringLimit; +virXPathUInt; virXPathULong; virXPathULongHex; virXPathULongLong; diff --git a/src/util/util.c b/src/util/util.c index 18b38f4..f412a83 100644 --- a/src/util/util.c +++ b/src/util/util.c @@ -2081,7 +2081,45 @@ virStrToLong_ui(char const *s, char **end_ptr, int base, unsigned int *result) return 0; } -/* Just like virStrToLong_i, above, but produce an "long long" value. */ +/* Just like virStrToLong_i, above, but produce a "long" value. */ +int +virStrToLong_l(char const *s, char **end_ptr, int base, long *result) +{ + long int val; + char *p; + int err; + + errno = 0; + val = strtol(s, &p, base); + err = (errno || (!end_ptr && *p) || p == s); + if (end_ptr) + *end_ptr = p; + if (err) + return -1; + *result = val; + return 0; +} + +/* Just like virStrToLong_i, above, but produce an "unsigned long" value. */ +int +virStrToLong_ul(char const *s, char **end_ptr, int base, unsigned long *result) +{ + unsigned long int val; + char *p; + int err; + + errno = 0; + val = strtoul(s, &p, base); + err = (errno || (!end_ptr && *p) || p == s); + if (end_ptr) + *end_ptr = p; + if (err) + return -1; + *result = val; + return 0; +} + +/* Just like virStrToLong_i, above, but produce a "long long" value. */ int virStrToLong_ll(char const *s, char **end_ptr, int base, long long *result) { diff --git a/src/util/util.h b/src/util/util.h index 932db03..8373038 100644 --- a/src/util/util.h +++ b/src/util/util.h @@ -188,6 +188,14 @@ int virStrToLong_ui(char const *s, char **end_ptr, int base, unsigned int *result); +int virStrToLong_l(char const *s, + char **end_ptr, + int base, + long *result); +int virStrToLong_ul(char const *s, + char **end_ptr, + int base, + unsigned long *result); int virStrToLong_ll(char const *s, char **end_ptr, int base, diff --git a/src/util/xml.c b/src/util/xml.c index e2c2c6c..de5e9de 100644 --- a/src/util/xml.c +++ b/src/util/xml.c @@ -1,7 +1,7 @@ /* * xml.c: XML based interfaces for the libvir library * - * Copyright (C) 2005, 2007-2010 Red Hat, Inc. + * Copyright (C) 2005, 2007-2011 Red Hat, Inc. * * See COPYING.LIB for the License of this software * @@ -195,6 +195,35 @@ virXPathLongBase(const char *xpath, } /** + * virXPathInt: + * @xpath: the XPath string to evaluate + * @ctxt: an XPath context + * @value: the returned int value + * + * Convenience function to evaluate an XPath number + * + * Returns 0 in case of success in which case @value is set, + * or -1 if the XPath evaluation failed or -2 if the + * value doesn't have an int format. + */ +int +virXPathInt(const char *xpath, + xmlXPathContextPtr ctxt, + int *value) +{ + long tmp; + int ret; + + ret = virXPathLongBase(xpath, ctxt, 10, &tmp); + if (ret < 0) + return ret; + if ((int) tmp != tmp) + return -2; + *value = tmp; + return 0; +} + +/** * virXPathLong: * @xpath: the XPath string to evaluate * @ctxt: an XPath context @@ -279,6 +308,35 @@ virXPathULongBase(const char *xpath, } /** + * virXPathUInt: + * @xpath: the XPath string to evaluate + * @ctxt: an XPath context + * @value: the returned int value + * + * Convenience function to evaluate an XPath number + * + * Returns 0 in case of success in which case @value is set, + * or -1 if the XPath evaluation failed or -2 if the + * value doesn't have an int format. + */ +int +virXPathUInt(const char *xpath, + xmlXPathContextPtr ctxt, + unsigned int *value) +{ + unsigned long tmp; + int ret; + + ret = virXPathULongBase(xpath, ctxt, 10, &tmp); + if (ret < 0) + return ret; + if ((unsigned int) tmp != tmp) + return -2; + *value = tmp; + return 0; +} + +/** * virXPathULong: * @xpath: the XPath string to evaluate * @ctxt: an XPath context diff --git a/src/util/xml.h b/src/util/xml.h index b1da741..b342e83 100644 --- a/src/util/xml.h +++ b/src/util/xml.h @@ -21,19 +21,25 @@ char * virXPathStringLimit(const char *xpath, int virXPathNumber(const char *xpath, xmlXPathContextPtr ctxt, double *value); +int virXPathInt(const char *xpath, + xmlXPathContextPtr ctxt, + int *value); +int virXPathUInt(const char *xpath, + xmlXPathContextPtr ctxt, + unsigned int *value); int virXPathLong(const char *xpath, xmlXPathContextPtr ctxt, long *value); -int virXPathULong(const char *xpath, +int virXPathULong(const char *xpath, xmlXPathContextPtr ctxt, unsigned long *value); int virXPathULongLong(const char *xpath, xmlXPathContextPtr ctxt, unsigned long long *value); -int virXPathLongLong(const char *xpath, +int virXPathLongLong(const char *xpath, xmlXPathContextPtr ctxt, long long *value); -int virXPathLongHex (const char *xpath, +int virXPathLongHex(const char *xpath, xmlXPathContextPtr ctxt, long *value); int virXPathULongHex(const char *xpath, -- 1.7.3.4

2 2