- Devel - libvirt List Archives

[libvirt] [PATCHv2] docs: added compiling page and significantly expanded windows page
by Justin Clift 21 Dec '10

21 Dec '10

Also added an additional menu placement for the windows page, in order to attract further potential testers. --- This version of the patch includes information on TLS certificate files, connection types, and ESX/vSphere. docs/compiling.html.in | 48 ++++++++++ docs/downloads.html.in | 41 +-------- docs/sitemap.html.in | 10 ++ docs/windows.html.in | 235 +++++++++++++++++++++++++++++++++++++++++++++--- 4 files changed, 282 insertions(+), 52 deletions(-) create mode 100644 docs/compiling.html.in diff --git a/docs/compiling.html.in b/docs/compiling.html.in new file mode 100644 index 0000000..471f52d --- /dev/null +++ b/docs/compiling.html.in @@ -0,0 +1,48 @@ +<?xml version="1.0"?> +<html> + <body> + <h1><a name="installation">libvirt Installation</a></h1> + + <ul id="toc"></ul> + + <h2><a name="Compilatio">Compiling a release tarball</a></h2> + + <p> + libvirt uses the standard configure/make/install steps: + </p> + + <pre> + gunzip -c libvirt-xxx.tar.gz | tar xvf - + cd libvirt-xxxx + ./configure --help</pre> + + <p> + To see the options, then the compilation/installation proper: + </p> + + <pre> + ./configure [possible options] + make + make install</pre> + + <p> + At that point you may have to rerun ldconfig or a similar utility to + update your list of installed shared libs. + </p> + + <h2><a name="build">Building from a GIT checkout</a></h2> + + <p> + The libvirt build process uses GNU autotools, so after obtaining a + checkout it is necessary to generate the configure script and Makefile.in + templates using the <code>autogen.sh</code> command, passing the extra + arguments as for configure. As an example, to do a complete build and + install it into your home directory run: + </p> + + <pre> + ./autogen.sh --prefix=$HOME/usr --enable-compile-warnings=error + make + make install</pre> + </body> +</html> diff --git a/docs/downloads.html.in b/docs/downloads.html.in index 709bee8..64a16c9 100644 --- a/docs/downloads.html.in +++ b/docs/downloads.html.in @@ -91,46 +91,9 @@ <br /> - <h1><a name="installation">libvirt Installation</a></h1> - - <h2><a name="Compilatio">Compiling a release tarball</a></h2> - - <p> - libvirt uses the standard configure/make/install steps: - </p> - - <pre> - gunzip -c libvirt-xxx.tar.gz | tar xvf - - cd libvirt-xxxx - ./configure --help</pre> - - <p> - To see the options, then the compilation/installation proper: - </p> - - <pre> - ./configure [possible options] - make - make install</pre> - <p> - At that point you may have to rerun ldconfig or a similar utility to - update your list of installed shared libs. + Once you've have obtained the libvirt source code, you can compile it + using the <a href="compiling.html">instructions here</a>. </p> - - <h2><a name="build">Building from a GIT checkout</a></h2> - - <p> - The libvirt build process uses GNU autotools, so after obtaining a - checkout it is necessary to generate the configure script and Makefile.in - templates using the <code>autogen.sh</code> command, passing the extra - arguments as for configure. As an example, to do a complete build and - install it into your home directory run: - </p> - - <pre> - ./autogen.sh --prefix=$HOME/usr --enable-compile-warnings=error - make - make install</pre> </body> </html> diff --git a/docs/sitemap.html.in b/docs/sitemap.html.in index 7db59a1..63e420f 100644 --- a/docs/sitemap.html.in +++ b/docs/sitemap.html.in @@ -21,12 +21,22 @@ <li> <a href="downloads.html">Downloads</a> <span>Get the latest source releases, binary builds and get access to the source repository</span> + <ul> + <li> + <a href="windows.html">Windows</a> + <span>Downloads for Windows</span> + </li> + </ul> </li> <li> <a href="docs.html">Documentation</a> <span>Information for users, administrators and developers</span> <ul> <li> + <a href="compiling.html">Compiling</a> + <span>How to compile libvirt</span> + </li> + <li> <a href="deployment.html">Deployment</a> <span>Information about deploying and using libvirt</span> <ul> diff --git a/docs/windows.html.in b/docs/windows.html.in index 8ca6b0d..e28595d 100644 --- a/docs/windows.html.in +++ b/docs/windows.html.in @@ -3,20 +3,233 @@ <body> <h1 >Windows support</h1> + <ul id="toc"></ul> + + <p> + Libvirt is known to work as a client (not server) on Windows XP + (32-bit), and Windows 7 (64-bit). Other Windows variants likely work + as well but we either haven't tested or received reports for them. + </p> + + <h2><a name="installer">Experimental installation package</a></h2> + + <p> + A windows installation package is in development. An experimental + 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> + + <p> + <b>It is not production ready.</b> + </p> + + <p> + This version includes the libvirt development headers and libraries + for compiling against, the virsh shell with its needed dependencies, + and untested Python bindings. + </p> + + <h3><a name="caveats">Caveats</h3> + + <ul> + <li> + This installer just repackages the files compiled using Matthias + Bolte's msys_setup scripting (described below). + </li> + <li> + This is a .exe installer, created using NSIS. We're looking into + something to create .msi installers as well. + </li> + <li> + The script for the NSIS installer is available online + <a href="https://github.com/justinclift/nsis_libvirt_installer">here</a>. + </li> + </ul> + + <h3><a name="knowninstallerprobs">Existing problems with this installer we know about</a> + + <p> + These are problems we know about, and need to be fixed in subsequent + versions of the installer (assistance welcomed): + </p> + + <ul> + <li> + New versions install over other libvirt versions + <br /><br /> + If a version of this installer has installed libvirt on the system + already, this installer will automatically suggest the same + installation location, then overwrite the version already there + without checking. + <br /><br /> + This is fairly non-optimal, and should be fixed. What should + probably happen, is for this installer to detect an existing + installation then offer to either uninstall it first or ask for a + new installation location. + <br /><br /> + </li> + + <li> + Start menu shortcuts aren't being removed at uninstall time + <br /><br /> + Not sure why yet. Needs to be investigated. + <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 + (ie 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> + + <p> + These connection types are known to work: + </p> + + <ul> + <li>QEMU with TLS (qemu+tls://)</li> + <li>QEMU with direct TCP (qemu+tcp://)</li> + <li>VMware ESX (esx://)</li> + <li>VMware VPX (vpx://)</li> + </ul> + + <p> + These connection types are known not to work: + </p> + + <ul> + <li>QEMU with SSH (qemu+ssh://)</li> + </ul> + + <p> + All other connection types may or may not work, and haven't been + tested. + </p> + + <p> + Please let us know either the results (either way) if you do. + </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> + </p> + + <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 /> + </p> + + <a href="http://libvirt.org/drvesx.html">http://libvirt.org/drvesx.html</a> + + <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. + </p> + + <p> + Information on generating TLS certificates can be found here: + </p> + + <a href="http://wiki.libvirt.org/page/TLSSetup">http://wiki.libvirt.org/page/TLSSetup</a> + + <p> + These instructions are for *nix, and have not yet been adapted for + Windows. You'll need to figure out the Windows equivalents until + that's done (sorry). If you can help us out with this, that would be + really welcome. + </p> + + <p> + The locations of the TLS certificates and key file are hard coded, + rather than being configurable. + </p> + + <p> + The Certificate Authority (CA) certificate file must be placed in: + </p> + + <ul> + <li>%APPDATA%\libvirt\pki\CA\cacert.pem</li> + </ul> + <p> - Libvirt can be compiled on Windows - using the free <a href="http://www.mingw.org/">MinGW compiler</a>. - You can also cross-compile to a Windows target - from a Fedora machine using the packages available - <a href="http://hg.et.redhat.com/misc/fedora-mingw--devel/">from - the Fedora MinGW project</a> + The Client certificate file must be placed in: + </p> + + <ul> + <li>%APPDATA%\libvirt\pki\libvirt\clientcert.pem</li> + </ul> + + <p> + The Client key file must be placed in: + </p> + + <ul> + <li>%APPDATA%\libvirt\pki\libvirt\private\clientkey.pem</li> + </ul> + + <p> + On an example Windows 7 x64 system here, this resolves to these paths: + </p> + + <ul> + <li>C:\Users\someuser\AppData\Roaming\libvirt\pki\CA\cacert.pem</li> + <li>C:\Users\someuser\AppData\Roaming\libvirt\pki\libvirt\clientcert.pem</li> + <li>C:\Users\someuser\AppData\Roaming\libvirt\pki\libvirt\private\clientkey.pem</li> + </ul> + + <h2><a name="feedback">Feedback</h2> + + <p> + Feedback and suggestions on changes to make and what else to include + <a href="contact.html">are desired</a>. + </p> + + <h2><a name="compiling">Compiling yourself</a></h2> + + <p> + Libvirt can be compiled on Windows using the free + <a href="http://www.mingw.org/">MinGW compiler</a>. + </p> + + <h3><a name="msys_setup">MSYS Build script</a></h3> + + <p> + The easiest way is to use the <b>msys_setup</b> script, developed by + Matthias Bolte. This is actively developed and kept current with + libvirt releases: + </p> + + <a href="https://github.com/photron/msys_setup">https://github.com/photron/msys_setup</a> + + <h3><a name="cross-compile">Cross compiling</a></h3> + + <p> + You can also cross-compile to a Windows target from a Fedora machine + using the packages available + <a href="http://hg.et.redhat.com/misc/fedora-mingw--devel/">from the Fedora MinGW project</a> (which includes a working libvirt specfile). </p> + <h3><a name="configure">By hand</a></h3> + <p> - Libvirt can only be built as a client on Windows - allowing remote access to systems libvirt servers. - Configure libvirt like this: + Use these options when following the instructions on the + <a href="compiling.html">Compiling</a> page. </p> <pre> @@ -32,9 +245,5 @@ --without-libvirtd </pre> - <p> - We intend to supply Windows binaries on this page - later, but at the moment you have to compile from source. - </p> </body> </html> -- 1.7.3.2

2 2

[libvirt] [PATCHv2 0/7] resend: various cleanups
by Eric Blake 21 Dec '10

21 Dec '10

I've been sitting on several unreviewed cleanups. Some of them needed tweaks given recent changes in the tree, so I've rebased them and am posting them in one group to make review easier. Eric Blake (7): build: allow autoconf 2.59 again build: allow older libselinux again build: improve testsuite results with older automake tests: avoid data race tests: avoid spurious failure of nodeinfotest qemu: use virAsprintf instead of PATH_MAX build: find xdr headers on cygwin .gnulib | 2 +- configure.ac | 37 +++++++++++++++++++++++--- src/Makefile.am | 2 +- src/nodeinfo.c | 11 ++++++-- src/qemu/qemu_driver.c | 53 ++++++++++++++++++++------------------- src/security/security_selinux.c | 29 +++++++++++++++++---- tests/Makefile.am | 8 +++--- tests/commandhelper.c | 2 +- tests/nodeinfotest.c | 5 ++- 9 files changed, 100 insertions(+), 49 deletions(-) -- 1.7.3.3

3 20

[libvirt] [PATCH] xen: Prevent updating device when attaching a device
by Osier Yang 21 Dec '10

21 Dec '10

When attaching a device that already exists, xend driver updates the device with "device_configure", it causes problems (e.g. for disk device, it only can be used to update device like CDROM), and actually we provide additional API (virDomainUpdateDevice) to update device, this fix is to raise up errors instead of updating the existed device. * src/xen/xend_internal.c --- src/xen/xend_internal.c | 36 +++++++++++++++++++++++++----------- 1 files changed, 25 insertions(+), 11 deletions(-) diff --git a/src/xen/xend_internal.c b/src/xen/xend_internal.c index 6ce0c3f..c71aeb3 100644 --- a/src/xen/xend_internal.c +++ b/src/xen/xend_internal.c @@ -3956,6 +3956,7 @@ xenDaemonAttachDeviceFlags(virDomainPtr domain, const char *xml, virDomainDefPtr def = NULL; virBuffer buf = VIR_BUFFER_INITIALIZER; char class[8], ref[80]; + char *target; if ((domain == NULL) || (domain->conn == NULL) || (domain->name == NULL)) { virXendError(VIR_ERR_INVALID_ARG, __FUNCTION__); @@ -4020,6 +4021,8 @@ xenDaemonAttachDeviceFlags(virDomainPtr domain, const char *xml, STREQ(def->os.type, "hvm") ? 1 : 0, priv->xendConfigVersion, 1) < 0) goto cleanup; + + target = dev->data.disk->dst; break; case VIR_DOMAIN_DEVICE_NET: @@ -4029,6 +4032,12 @@ xenDaemonAttachDeviceFlags(virDomainPtr domain, const char *xml, STREQ(def->os.type, "hvm") ? 1 : 0, priv->xendConfigVersion, 1) < 0) goto cleanup; + + if (virParseMacAddr(target, dev->data.net->mac) < 0) { + virXendError(VIR_ERR_INTERNAL_ERROR, + _("malformed mac address '%s'"), target); + goto cleanup; + } break; case VIR_DOMAIN_DEVICE_HOSTDEV: @@ -4037,13 +4046,18 @@ xenDaemonAttachDeviceFlags(virDomainPtr domain, const char *xml, if (xenDaemonFormatSxprOnePCI(dev->data.hostdev, &buf, 0) < 0) goto cleanup; - } else { - virXendError(VIR_ERR_NO_SUPPORT, "%s", - _("unsupported device type")); - goto cleanup; - } - break; + virDomainDevicePCIAddress PCIAddr; + + PCIAddr = dev->data.hostdev->source.subsys.u.pci; + virAsprintf(&target, "PCI device: %.4x:%.2x:%.2x", PCIAddr.domain, + PCIAddr.bus, PCIAddr.slot); + + if (target == NULL) { + virReportOOMError(); + goto cleanup; + } + } default: virXendError(VIR_ERR_NO_SUPPORT, "%s", _("unsupported device type")); @@ -4056,17 +4070,17 @@ xenDaemonAttachDeviceFlags(virDomainPtr domain, const char *xml, /* device doesn't exist, define it */ ret = xend_op(domain->conn, domain->name, "op", "device_create", "config", sexpr, NULL); - } - else { - /* device exists, attempt to modify it */ - ret = xend_op(domain->conn, domain->name, "op", "device_configure", - "config", sexpr, "dev", ref, NULL); + } else { + virXendError(VIR_ERR_OPERATION_INVALID, + _("target '%s' already exists"), target); } cleanup: VIR_FREE(sexpr); virDomainDefFree(def); virDomainDeviceDefFree(dev); + if (dev->type == VIR_DOMAIN_DEVICE_HOSTDEV) + VIR_FREE(target); return ret; } -- 1.7.3.2

1 0

[libvirt] [PATCH] bridge: avoid double free
by Paweł Krześniak 20 Dec '10

20 Dec '10

--- src/network/bridge_driver.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index c3f32d7..b0834ae 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -557,7 +557,6 @@ dhcpStartDhcpDaemon(virNetworkObjPtr network) cmd = virCommandNew(DNSMASQ); if (networkBuildDnsmasqArgv(network, pidfile, cmd) < 0) { - VIR_FREE(pidfile); goto cleanup; }

2 2

[libvirt] vmware, vcenter, clusterComputeResource error.
by guillaume LE LOUËT 20 Dec '10

20 Dec '10

Hello dear libvirt users. I am trying to make some migration from a VMWare esx to another. I am using ubuntu, and the last version found (my install script is http://dl.dropbox.com/u/7494462/libvirt/install.sh ) The configuration is the following: 192.168.18.5 is the first esx 172.28.2.7 is the vcenter. The vcenter has been added the esx and manages it. The DRS is activated on that vcenter. The esx is running one VM, created from the vcenter. Using libvirt, I can connect to the esx # /opt/libvirt/bin/virsh -c "esx://192.168.18.5?no_verify=1" Enter username for 192.168.18.5 [root]: Enter root's password for 192.168.18.5: Welcome to virsh, the virtualization interactive terminal. I cannot however connect to the esx, specifying to use the vcenter : # /opt/libvirt/bin/virsh -c "esx://192.168.18.5?vcenter=*&no_verify=1" Enter username for 192.168.18.5 [root]: Enter root's password for 192.168.18.5: Enter username for 172.28.2.7 [administrator]: administrateur Enter administrateur's password for 172.28.2.7: error: internal error Invalid lookup from 'ClusterComputeResource' error: failed to connect to the hypervisor I have the same error for the following commands: # /opt/libvirt/bin/virsh -c "vpx:// 172.28.2.7/Entropy-VMW/Demo/192.168.18.5?no_verify=1" # /opt/libvirt/bin/virsh -c "esx:// 192.168.18.5?vcenter=172.28.2.7&no_verify=1" I have a different error when I use bad resource names for datacenter, cluster : # /opt/libvirt/bin/virsh -c "vpx:// 172.28.2.7/badDatacenter/Demo/dsl_18.120?no_verify=1" error: internal error Could not find datacenter 'badDatacenter' # /opt/libvirt/bin/virsh -c "vpx:// 172.28.2.7/Entropy-VMW/badCluster/dsl_18.120?no_verify=1" error: internal error Could not find compute resource 'badCluster' My questions are : what am I missing ? What is a ClusterComputeResource ? Do I need to activate or configurate some tools on the vcenter ?

2 1

[libvirt] [PATCH 0/6] vbox: Add Windows support
by Matthias Bolte 20 Dec '10

20 Dec '10

This series makes the VirtualBox driver work on Windows. On non-Windows systems VirtualBox uses XPCOM, on Windows it uses MSCOM (Microsoft COM). XPCOM and MSCOM are slightly different. This series adds a new glue layer for MSCOM. The main difference is the representation of arrays. A new vboxArray type hides the differences from the general driver code. I've tested this with the 3.x series of VirtualBox. Testing with 2.x revealed that 2.x and 3.x represent IIDs differently. This problem is not fixed by this series and will need some additional work. Therefore, the VirtualBox driver only works with the 3.x series on Windows for now. VirtualBox 4.x seems to stay in line with the 3.x COM API. I expect it to work properly on Windows once we've added general support for it. Matthias

4 24

[libvirt] [PATCH] build: fix typo that broke 'make dist'
by Wen Congyang 20 Dec '10

20 Dec '10

* src/Makefile.am (VMWARE_DRIVER_SOURCES): Fix vmware_driver.h. Signed-off-by: Wen Congyang <wency(a)cn.fujitsu.com> --- src/Makefile.am | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 6749786..07ec528 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -255,7 +255,7 @@ OPENVZ_DRIVER_SOURCES = \ openvz/openvz_driver.c openvz/openvz_driver.h VMWARE_DRIVER_SOURCES = \ - vmware/vmware_driver.c vmware/vmware.h \ + vmware/vmware_driver.c vmware/vmware_driver.h \ vmware/vmware_conf.c vmware/vmware_conf.h VBOX_DRIVER_SOURCES = \ -- 1.7.1

3 2

[libvirt] Remove functions library inclusion from libvirt-guests
by Laurent Léonard 20 Dec '10

20 Dec '10

Hi, The attached patch removes functions library inclusion from libvirt-guests. No function from this library is used by the script so there is no need to include it. Thank you, -- Laurent Léonard

3 6

[libvirt] Got time to try out the libvirt 0.8.6 win32 package?
by Justin Clift 20 Dec '10

20 Dec '10

Hi Matthias (and anyone else interested), Just added a win32 installation package to the website, for libvirt 0.8.6. http://libvirt.org/sources/win32_experimental/Libvirt-0.8.6-0.exe This has the libcurl stuff in it you put together, so (in theory) it should connect to remote vSphere/ESX servers. Do you (or anyone) have time to try it out against vSphere/ESX/similar? Going to update the Windows page on the website pointing to it, when we know it's working ok. :) Regards and best wishes, Justin Clift

4 19

[libvirt] [Patch v3 0/2] Add new feature into live migration
by Wen Congyang 20 Dec '10

20 Dec '10

If the memory of guest OS is changed constantly, the live migration can not be ended ever for ever. We can use the command 'virsh migrate-setmaxdowntime' to control the live migration. But the value of maxdowntime is diffcult to calculate because it depends on the transfer speed of network and constantly changing memroy size. We need a easy way to control the live migration. This patch set add the support of auto cold migration fallback on timeout. With this patch set, when we migrate the guest OS, we can specify a timeout. If the live migration timeouts, the migration will fallback to cold migration. Test of this patchset on Linux: Env: a. The size of guest OS's memory: 1GB b. The transfer speed of network: about 100Mb/s c. The size of constantly changing memory: more than 900MB 1. migrate without timeout # virsh migrate --live RHEL6RC qemu+ssh://<dest IP>/system tcp://<dest IP>:49152 The migration does not end after 12 hours. 2. migrate with timeout(30 minutes): # date Fri Dec 17 15:35:24 CST 2010 # virsh migrate --live --timeout 1800 RHEL6RC qemu+ssh://<dest IP>/system tcp:<dest IP>:49152 # date Fri Dec 17 16:05:51 CST 2010 v3: - use the existing virEventXXXTimeout() APT to implement timer v2: - implement timer for Windows - implement dynamic timers Wen Congyang (2): timer impl auto cold migration fallback at timeout tools/Makefile.am | 1 + tools/timer.c | 170 +++++++++++++++++++++++++++++++++++++++++++++++++++++ tools/timer.h | 38 ++++++++++++ tools/virsh.c | 69 +++++++++++++++++++++ 4 files changed, 278 insertions(+), 0 deletions(-) create mode 100644 tools/timer.c create mode 100644 tools/timer.h

3 8

[libvirt] Java Bindings Memory Leak
by Jason K Yellick 18 Dec '10

18 Dec '10

1 0

[libvirt] [C# bindings] [PATCH]
by arnaud.champion＠devatom.fr 18 Dec '10

18 Dec '10

?Hi there, a long time since some update for C# bindings, sorry, I'm a little busy. Anyway here are some patches that correct marshaling around network functions, and as usual a new sample code related to network functions. Regards, Arnaud

2 3

[libvirt] [PATCH] maint: improve tests distribution
by Eric Blake 17 Dec '10

17 Dec '10

* tests/Makefile.am (EXTRA_DIST): Sort, and add directories. (SUBDIRS): Drop automake recursion into subdirs. * tests/commanddata/Makefile.am: Delete. * tests/confdata/Makefile.am: Likewise. * tests/sexpr2xmldata/Makefile.am: Likewise. * tests/xencapsdata/Makefile.am: Likewise. * tests/xmconfigdata/Makefile.am: Likewise. * tests/xml2sexprdata/Makefile.am: Likewise. --- This deletes more than it adds; the worst part of the diff is that I mixed sorting with addition. Let me know if you want those actions split into two pieces for easier review. configure.ac | 6 ---- tests/Makefile.am | 57 ++++++++++++++++++++------------------ tests/commanddata/Makefile.am | 2 - tests/confdata/Makefile.am | 2 - tests/sexpr2xmldata/Makefile.am | 2 - tests/xencapsdata/Makefile.am | 3 -- tests/xmconfigdata/Makefile.am | 2 - tests/xml2sexprdata/Makefile.am | 2 - 8 files changed, 30 insertions(+), 46 deletions(-) delete mode 100644 tests/commanddata/Makefile.am delete mode 100644 tests/confdata/Makefile.am delete mode 100644 tests/sexpr2xmldata/Makefile.am delete mode 100644 tests/xencapsdata/Makefile.am delete mode 100644 tests/xmconfigdata/Makefile.am delete mode 100644 tests/xml2sexprdata/Makefile.am diff --git a/configure.ac b/configure.ac index 64e76dc..a52a03c 100644 --- a/configure.ac +++ b/configure.ac @@ -2251,12 +2251,6 @@ AC_OUTPUT(Makefile src/Makefile include/Makefile docs/Makefile \ daemon/Makefile \ tools/Makefile \ tests/Makefile \ - tests/xml2sexprdata/Makefile \ - tests/sexpr2xmldata/Makefile \ - tests/xmconfigdata/Makefile \ - tests/xencapsdata/Makefile \ - tests/confdata/Makefile \ - tests/commanddata/Makefile \ examples/apparmor/Makefile \ examples/domain-events/events-c/Makefile \ examples/domsuspend/Makefile \ diff --git a/tests/Makefile.am b/tests/Makefile.am index 0a235cf..de2ff91 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -2,9 +2,6 @@ SHELL = $(PREFERABLY_POSIX_SHELL) -SUBDIRS = commanddata confdata sexpr2xmldata \ - xml2sexprdata xmconfigdata xencapsdata - INCLUDES = \ -I$(top_srcdir)/gnulib/lib -I../gnulib/lib \ -I$(top_builddir)/include \ @@ -39,38 +36,44 @@ LDADDS = \ $(COVERAGE_LDFLAGS) EXTRA_DIST = \ - oomtrace.pl \ - test-lib.sh \ - qemuxml2argvdata \ - qemuxml2xmloutdata \ - nodeinfodata \ - schematestutils.sh \ - capabilityschematest \ capabilityschemadata \ - networkschematest \ - networkxml2xmlout \ - networkxml2xmlin \ - domainschematest \ + capabilityschematest \ + commanddata \ + confdata \ + cputestdata \ domainschemadata \ + domainschematest \ + domainsnapshotschematest \ + domainsnapshotxml2xmlin \ + domainsnapshotxml2xmlout \ interfaceschemadata \ + networkschematest \ + networkxml2xmlin \ + networkxml2xmlout \ + nodedevschemadata \ + nodedevschematest \ + nodeinfodata \ + nwfilterschematest \ + nwfilterxml2xmlin \ + nwfilterxml2xmlout \ + oomtrace.pl \ + qemuhelpdata \ + qemuxml2argvdata \ + qemuxml2xmloutdata \ + schematestutils.sh \ + sexpr2xmldata \ storagepoolschematest \ - storagepoolxml2xmlout \ storagepoolxml2xmlin \ + storagepoolxml2xmlout \ storagevolschematest \ - storagevolxml2xmlout \ storagevolxml2xmlin \ - nodedevschematest \ - nodedevschemadata \ + storagevolxml2xmlout \ + test-lib.sh \ vmx2xmldata \ - xml2vmxdata \ - nwfilterxml2xmlout \ - nwfilterxml2xmlin \ - nwfilterschematest \ - domainsnapshotschematest \ - domainsnapshotxml2xmlout \ - domainsnapshotxml2xmlin \ - qemuhelpdata \ - cputestdata + xencapsdata \ + xmconfigdata \ + xml2sexprdata \ + xml2vmxdata check_PROGRAMS = virshtest conftest sockettest \ nodeinfotest qparamtest virbuftest \ diff --git a/tests/commanddata/Makefile.am b/tests/commanddata/Makefile.am deleted file mode 100644 index ea0f8e1..0000000 --- a/tests/commanddata/Makefile.am +++ /dev/null @@ -1,2 +0,0 @@ -EXTRA_DIST = \ - $(patsubst $(srcdir)/%,%,$(wildcard $(srcdir)/*.log)) diff --git a/tests/confdata/Makefile.am b/tests/confdata/Makefile.am deleted file mode 100644 index eaaadbc..0000000 --- a/tests/confdata/Makefile.am +++ /dev/null @@ -1,2 +0,0 @@ -EXTRA_DIST = \ - $(patsubst $(srcdir)/%,%,$(wildcard $(srcdir)/*.out $(srcdir)/*.conf)) diff --git a/tests/sexpr2xmldata/Makefile.am b/tests/sexpr2xmldata/Makefile.am deleted file mode 100644 index db43109..0000000 --- a/tests/sexpr2xmldata/Makefile.am +++ /dev/null @@ -1,2 +0,0 @@ -EXTRA_DIST = \ - $(patsubst $(srcdir)/%,%,$(wildcard $(srcdir)/*.xml $(srcdir)/*.sexpr)) diff --git a/tests/xencapsdata/Makefile.am b/tests/xencapsdata/Makefile.am deleted file mode 100644 index ed08bc4..0000000 --- a/tests/xencapsdata/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -EXTRA_DIST = \ - $(patsubst $(srcdir)/%,%,$(wildcard \ - $(srcdir)/*.xml $(srcdir)/*.cpuinfo $(srcdir)/*.caps)) diff --git a/tests/xmconfigdata/Makefile.am b/tests/xmconfigdata/Makefile.am deleted file mode 100644 index af0cb09..0000000 --- a/tests/xmconfigdata/Makefile.am +++ /dev/null @@ -1,2 +0,0 @@ -EXTRA_DIST = \ - $(patsubst $(srcdir)/%,%,$(wildcard $(srcdir)/*.xml $(srcdir)/*.cfg)) diff --git a/tests/xml2sexprdata/Makefile.am b/tests/xml2sexprdata/Makefile.am deleted file mode 100644 index 20028bb..0000000 --- a/tests/xml2sexprdata/Makefile.am +++ /dev/null @@ -1,2 +0,0 @@ -EXTRA_DIST = \ - $(patsubst $(srcdir)/%,%,$(wildcard $(srcdir)/*.xml $(srcdir)/*.sexpr)) -- 1.7.3.3

2 2

[libvirt] [PATCH] build: fix typo that broke 'make dist'
by Eric Blake 17 Dec '10

17 Dec '10

* src/Makefile.am (QEMU_DRIVER_SOURCES): Ship qemu_cgroup.h. --- Pushing this under the build-breaker rule, to fix 'make distcheck'. src/Makefile.am | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 64e890f..55d96df 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -271,7 +271,7 @@ QEMU_DRIVER_SOURCES = \ qemu/qemu_command.c qemu/qemu_command.h \ qemu/qemu_domain.c qemu/qemu_domain.h \ qemu/qemu_audit.c qemu/qemu_audit.h \ - qemu/qemu_cgroup.c qemu/qemu_cgroup.c \ + qemu/qemu_cgroup.c qemu/qemu_cgroup.h \ qemu/qemu_hostdev.c qemu/qemu_hostdev.h \ qemu/qemu_hotplug.c qemu/qemu_hotplug.h \ qemu/qemu_conf.c qemu/qemu_conf.h \ -- 1.7.3.3

1 0

[libvirt] [PATCH] Adapt test suite to code movement in the QEMU driver
by Matthias Bolte 17 Dec '10

17 Dec '10

--- tests/qemuargv2xmltest.c | 1 + tests/qemuhelptest.c | 5 +++-- tests/qemuxml2argvtest.c | 8 +++++--- tests/testutilsqemu.c | 6 ++---- 4 files changed, 11 insertions(+), 9 deletions(-) diff --git a/tests/qemuargv2xmltest.c b/tests/qemuargv2xmltest.c index adff05a..dfb9d99 100644 --- a/tests/qemuargv2xmltest.c +++ b/tests/qemuargv2xmltest.c @@ -14,6 +14,7 @@ # include "internal.h" # include "testutils.h" # include "qemu/qemu_conf.h" +# include "qemu/qemu_command.h" # include "testutilsqemu.h" diff --git a/tests/qemuhelptest.c b/tests/qemuhelptest.c index 6ff1feb..3f82692 100644 --- a/tests/qemuhelptest.c +++ b/tests/qemuhelptest.c @@ -7,6 +7,7 @@ # include "testutils.h" # include "qemu/qemu_conf.h" +# include "qemu/qemu_capabilities.h" # define MAX_HELP_OUTPUT_SIZE 1024*64 @@ -50,8 +51,8 @@ static int testHelpStrParsing(const void *data) if (virtTestLoadFile(path, &help, MAX_HELP_OUTPUT_SIZE) < 0) return -1; - if (qemudParseHelpStr("QEMU", help, &flags, - &version, &is_kvm, &kvm_version) == -1) + if (qemuCapsParseHelpStr("QEMU", help, &flags, + &version, &is_kvm, &kvm_version) == -1) return -1; if (flags != info->flags) { diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 5387432..158204d 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -14,6 +14,8 @@ # include "internal.h" # include "testutils.h" # include "qemu/qemu_conf.h" +# include "qemu/qemu_command.h" +# include "qemu/qemu_capabilities.h" # include "datatypes.h" # include "cpu/cpu_map.h" @@ -110,9 +112,9 @@ static int testCompareXMLToArgvFiles(const char *xml, free(virtTestLogContentAndReset()); virResetLastError(); - if (!(cmd = qemudBuildCommandLine(conn, &driver, - vmdef, &monitor_chr, false, flags, - migrateFrom, NULL, VIR_VM_OP_CREATE))) + if (!(cmd = qemuBuildCommandLine(conn, &driver, + vmdef, &monitor_chr, false, flags, + migrateFrom, NULL, VIR_VM_OP_CREATE))) goto fail; if (!!virGetLastError() != expectError) { diff --git a/tests/testutilsqemu.c b/tests/testutilsqemu.c index 72fc8aa..bfac307 100644 --- a/tests/testutilsqemu.c +++ b/tests/testutilsqemu.c @@ -8,6 +8,7 @@ # include "memory.h" # include "cpu_conf.h" # include "qemu/qemu_driver.h" +# include "qemu/qemu_domain.h" static virCapsGuestMachinePtr *testQemuAllocMachines(int *nmachines) { @@ -102,10 +103,7 @@ virCapsPtr testQemuCapsInit(void) { (machines = testQemuAllocMachines(&nmachines)) == NULL) goto cleanup; - caps->ns.parse = qemuDomainDefNamespaceParse; - caps->ns.free = qemuDomainDefNamespaceFree; - caps->ns.format = qemuDomainDefNamespaceFormatXML; - caps->ns.href = qemuDomainDefNamespaceHref; + qemuDomainSetNamespaceHooks(caps); if ((guest = virCapabilitiesAddGuest(caps, "hvm", "i686", 32, "/usr/bin/qemu", NULL, -- 1.7.0.4

2 2

[libvirt] Require Python library source code
by Sridhar Ravindran 17 Dec '10

17 Dec '10

Hi, I require python library source code. Currently , "C" source code alone is available and Python API support is given as package. Thanks Sridhar.R

2 1

[libvirt] [PATCH v2 1/2] timer impl
by Wen Congyang 17 Dec '10

17 Dec '10

* src/util/timer.c src/util/timer.h src/util/timer_linux.c src/util/timer_win32.c: timer implementation * src/Makefile.am: build timer * src/libvirt_private.syms: Export public functions * src/libvirt.c: Initialize timer * configure.ac: check the functions in librt used by timer Signed-off-by: Wen Congyang <wency(a)cn.fujitsu.com> --- configure.ac | 4 + src/Makefile.am | 6 +- src/libvirt.c | 2 + src/libvirt_private.syms | 6 ++ src/util/timer.c | 166 ++++++++++++++++++++++++++++++++++++++++++++++ src/util/timer.h | 37 ++++++++++ src/util/timer_linux.c | 130 ++++++++++++++++++++++++++++++++++++ src/util/timer_win32.c | 128 +++++++++++++++++++++++++++++++++++ 8 files changed, 477 insertions(+), 2 deletions(-) create mode 100644 src/util/timer.c create mode 100644 src/util/timer.h create mode 100644 src/util/timer_linux.c create mode 100644 src/util/timer_win32.c diff --git a/configure.ac b/configure.ac index 64e76dc..49b77c5 100644 --- a/configure.ac +++ b/configure.ac @@ -107,6 +107,10 @@ LIBS="$LIBS $LIB_PTHREAD" AC_CHECK_FUNCS([pthread_sigmask pthread_mutexattr_init]) LIBS=$old_libs +dnl Availability of rt functions +AC_CHECK_LIB([rt],[timer_gettime],[]) +AC_CHECK_FUNCS([clock_gettime timer_create timer_settime timer_delete]) + dnl Availability of various common headers (non-fatal if missing). AC_CHECK_HEADERS([pwd.h paths.h regex.h sys/syslimits.h sys/un.h \ sys/poll.h syslog.h mntent.h net/ethernet.h linux/magic.h \ diff --git a/src/Makefile.am b/src/Makefile.am index 196d8af..13a66be 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -79,9 +79,11 @@ UTIL_SOURCES = \ util/util.c util/util.h \ util/xml.c util/xml.h \ util/virtaudit.c util/virtaudit.h \ - util/virterror.c util/virterror_internal.h + util/virterror.c util/virterror_internal.h \ + util/timer.c util/timer.h -EXTRA_DIST += util/threads-pthread.c util/threads-win32.c +EXTRA_DIST += util/threads-pthread.c util/threads-win32.c \ + util/timer_linux.c # Internal generic driver infrastructure NODE_INFO_SOURCES = nodeinfo.h nodeinfo.c diff --git a/src/libvirt.c b/src/libvirt.c index 4188b45..a5578c0 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -40,6 +40,7 @@ #include "util.h" #include "memory.h" #include "configmake.h" +#include "timer.h" #ifndef WITH_DRIVER_MODULES # ifdef WITH_TEST @@ -329,6 +330,7 @@ virInitialize(void) if (virThreadInitialize() < 0 || virErrorInitialize() < 0 || + virTimerInitialize() < 0 || virRandomInitialize(time(NULL) ^ getpid())) return -1; diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 0e3033d..928316a 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -787,6 +787,12 @@ virThreadJoin; virThreadSelf; virThreadSelfID; +# timer.h +get_clock; +virNewTimer; +virFreeTimer; +virModTimer; +virDelTimer; # usb.h usbDeviceFileIterate; diff --git a/src/util/timer.c b/src/util/timer.c new file mode 100644 index 0000000..2a62a39 --- /dev/null +++ b/src/util/timer.c @@ -0,0 +1,166 @@ +/* + * timer.c: timer functions + * + * Copyright (C) 2010 Fujitsu Limited + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * Author: Wen Congyang <wency(a)cn.fujitsu.com> + */ + +#include <config.h> + +#include <unistd.h> + +#include "timer.h" +#include "virterror_internal.h" +#include "memory.h" + +#define VIR_FROM_THIS VIR_FROM_NONE + +struct virTimer { + uint64_t expire_time; + virTimerCB function; + void *data; + virTimerPtr next; +}; + +static virTimerPtr timer_list = NULL; +static void realarm_timer(void); +static void __realarm_timer(uint64_t); +static int timer_fd[2] = {-1, -1}; + +virTimerPtr virNewTimer(virTimerCB callback, void *data) +{ + virTimerPtr timer = NULL; + + if (VIR_ALLOC(timer) < 0) { + virReportOOMError(); + return NULL; + } + + timer->function = callback; + timer->data = data; + + return timer; +} + +void virFreeTimer(virTimerPtr timer) +{ + VIR_FREE(timer); +} + +void virDelTimer(virTimerPtr timer) +{ + virTimerPtr *pt, t; + + pt = &timer_list; + for (t = *pt; t; t = t->next) { + if (t == timer) { + *pt = t->next; + break; + } + pt = &t->next; + } + + realarm_timer(); +} + +void virModTimer(virTimerPtr timer, uint64_t expire_time) +{ + virTimerPtr *pt, t; + + virDelTimer(timer); + + pt = &timer_list; + for (t = *pt; t; t = t->next) { + if (t->expire_time > expire_time) + break; + pt = &t->next; + } + timer->expire_time = expire_time; + timer->next = *pt; + *pt = timer; + + realarm_timer(); +} + +static void realarm_timer() +{ + if (!timer_list) + return; + + __realarm_timer(timer_list->expire_time); +} + +static void timer_handler(void) +{ + uint64_t current_time = 0; + virTimerPtr *timer_list_head = &timer_list; + virTimerPtr timer = NULL; + + if (!timer_list) + return; + + current_time = get_clock(); + for (timer = timer_list; timer; timer = timer->next) { + if (current_time < timer->expire_time) + break; + + /* remove timer from the list before calling the callback */ + *timer_list_head = timer->next; + timer->next = NULL; + timer->function(timer->data); + + /* timer->function may take a while, so we should update cuttent_time */ + current_time = get_clock(); + } + + realarm_timer(); +} + +static void timer_loop(void *arg ATTRIBUTE_UNUSED) +{ + fd_set readfds; + int ret; + int readinfo = 0; + + while(1) { + FD_ZERO(&readfds); + FD_SET(timer_fd[0], &readfds); + + reselect: + ret = select(timer_fd[0] + 1, &readfds, NULL, NULL, NULL); + if (ret < 0) { + if (errno == EAGAIN || errno == EINTR) + goto reselect; + else + continue; + } + + ret = read(timer_fd[0], &readinfo, sizeof(int)); + timer_handler(); + } + + return; +} + +#if defined HAVE_TIMER_CREATE +#include "timer_linux.c" +#elif defined WIN32 +#include "timer_win32.c" +#else +# error "gnu timer is required" +#endif diff --git a/src/util/timer.h b/src/util/timer.h new file mode 100644 index 0000000..f521c1b --- /dev/null +++ b/src/util/timer.h @@ -0,0 +1,37 @@ +/* + * timer.h: structure and entry points for timer support + * + * Copyright (C) 2010 Fujitsu Limited + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * Author: Wen Congyang <wency(a)cn.fujitsu.com> + */ + +#ifndef __VIR_TIMER_H__ +# define __VIR_TIMER_H__ + +#include <stdint.h> +typedef struct virTimer virTimer; +typedef virTimer *virTimerPtr; +typedef void (*virTimerCB)(void *); + +extern uint64_t get_clock(void); +extern virTimerPtr virNewTimer(virTimerCB, void *); +extern void virFreeTimer(virTimerPtr); +extern void virModTimer(virTimerPtr, uint64_t); +extern void virDelTimer(virTimerPtr); +extern int virTimerInitialize(void); +#endif /* __VIR_TIMER_H__ */ diff --git a/src/util/timer_linux.c b/src/util/timer_linux.c new file mode 100644 index 0000000..be483cf --- /dev/null +++ b/src/util/timer_linux.c @@ -0,0 +1,130 @@ +/* + * timer.c: timer functions + * + * Copyright (C) 2010 Fujitsu Limited + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * Author: Wen Congyang <wency(a)cn.fujitsu.com> + */ + +#include <unistd.h> +#include <sys/syscall.h> +#include <sys/types.h> +#include <stddef.h> +#include <time.h> +#include <sys/time.h> +#include <signal.h> +#include <sys/select.h> +#include <pthread.h> + +#include "timer.h" +#include "threads.h" + +static int timer_initialized = 0; +static pthread_attr_t timer_thread_attr; +static timer_t timer_id; + +uint64_t get_clock(void) +{ + struct timespec ts; + + clock_gettime(CLOCK_MONOTONIC, &ts); + return ts.tv_sec * 1000000000ULL + ts.tv_nsec; +} + +static void __realarm_timer(uint64_t next_time) +{ + uint64_t current_time = 0; + uint64_t timeout = 0; + struct itimerspec its; + + current_time = get_clock(); + if (current_time < next_time) { + timeout = next_time - current_time; + } else { + timeout = 1; + } + + its.it_interval.tv_sec = 0; + its.it_interval.tv_nsec = 0; + its.it_value.tv_sec = timeout / 1000000000ULL; + its.it_value.tv_nsec = timeout % 1000000000ULL; + + timer_settime(timer_id, 0, &its, NULL); +} + +static void timer_nofity_thread(sigval_t sigev_value ATTRIBUTE_UNUSED) +{ + int write_info = 1; + int ret; + + ret = write(timer_fd[1], &write_info, sizeof(int)); +} + +int virTimerInitialize(void) +{ + struct sigevent timer_event; + struct itimerspec its; + struct virThread timer_thread; + struct timespec ts; + int ret; + + if (timer_initialized) + return 0; + + /* Make sure we can use system call clock_gettime(), so we can ignore the + * return value of clock_gettime() in the function get_clock(). + */ + ret = clock_gettime(CLOCK_MONOTONIC, &ts); + if (ret != 0) + return -1; + + ret = pipe(timer_fd); + if (ret < 0) + return -1; + + pthread_attr_init(&timer_thread_attr); + pthread_attr_setdetachstate(&timer_thread_attr, 1); + + timer_event.sigev_notify = SIGEV_THREAD; + timer_event.sigev_notify_function = timer_nofity_thread; + timer_event.sigev_notify_attributes = &timer_thread_attr; + timer_event.sigev_value.sival_ptr = NULL; + ret = timer_create(CLOCK_MONOTONIC, &timer_event, &timer_id); + if (ret != 0) + return -1; + + its.it_interval.tv_sec = 0; + its.it_interval.tv_nsec = 0; + its.it_value.tv_sec = 0; + its.it_value.tv_nsec = 0; + + /* Make sure we can use system call timer_settime(), so we can ignore the + * return value of timer_settime() in the function __realarm_timer(). + */ + ret = timer_settime(timer_id, 0, &its, NULL); + if (ret != 0) { + timer_delete(timer_id); + return -1; + } + + if (virThreadCreate(&timer_thread, 0, timer_loop, NULL) < 0) { + timer_delete(timer_id); + return -1; + } + + return 0; +} diff --git a/src/util/timer_win32.c b/src/util/timer_win32.c new file mode 100644 index 0000000..98248f7 --- /dev/null +++ b/src/util/timer_win32.c @@ -0,0 +1,128 @@ +/* + * timer.c: timer functions + * + * Copyright (C) 2010 Fujitsu Limited + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * Author: Wen Congyang <wency(a)cn.fujitsu.com> + */ + +#include <windows.h> +#include <mmsystem.h> +#include <stdint.h> + +#include "threads.h" + +uint64_t clock_frequency = 0; +uint64_t ticks_per_second = 1000000000; +uint period = 0; +MMRESULT timer_id; + +uint64_t get_clock(void) +{ + LARGE_INTEGER time; + LARGE_INTEGER result; + uint64_t result_low, result_high; + + QueryPerformanceCounter(&time); + + /* calculate time * ticks_per_second / clock_frequency */ + result_high = (uint64_t)time.HighPart * ticks_per_second; + result_low = (uint64_t)time.LowPart * ticks_per_second; + result_high += result_low >> 32; + result_low = ((result_high % clock_frequency) << 32) + + result_low & 0xFFFFFFFF; + result.HighPart = result_high / clock_frequency; + result.LowPart = result_low / clock_frequency; + + return result.QuadPart; +} + +static void CALLBACK wakeup_timer(UINT uTimerID, UINT uMsg, + DWORD_PTR dwUser, DWORD_PTR dw1, + DWORD_PTR dw2) +{ + int write_info = 1; + int ret; + + ret = write(timer_fd[1], &write_info, sizeof(int)); +} + +static void __realarm_timer(uint64_t next_time) +{ + uint64_t current_time = 0; + UINT timeout = 0; + UINT flags; + + current_time = get_clock(); + if (current_time + 100000ULL < next_time) { + timeout = (next_time - current_time) / 1000000ULL; + } else { + timeout = 1; + } + + flags = TIME_CALLBACK_FUNCTION | TIME_ONESHOT; + timer_id = timeSetEvent(timeout, period, wakeup_timer, + (DWORD_PTR)NULL, flags); +} + +int virTimerInitialize(void) +{ + LARGE_INTEGER frequency; + int ret; + TIMECAPS timecaps; + MMRESULT mmresult; + UINT flags; + struct virThread timer_thread; + + ret = pipe(timer_fd); + if (ret < 0) + return -1; + + ret = QueryPerformanceFrequency(&frequency); + if (ret != 0) { + return -1; + } + clock_frequency = frequency.QuadPart; + + memset(&timecaps, 0, sizeof(TIMECAPS)); + mmresult = timeGetDevCaps(&timecaps, sizeof(TIMECAPS)); + if (mmresult != MMSYSERR_NOERROR) + return -1; + period = timecaps.wPeriodMin; + + mmresult = timeBeginPeriod(period); + if (mmresult != TIMERR_NOERROR) + return -1; + + /* Make sure we can use timeSetEvent(), so we can ignore the return value + * of timeSetEvent() in the function __realarm_timer(). + */ + flags = TIME_CALLBACK_FUNCTION | TIME_ONESHOT; + mmresult = timeSetEvent(1000, period, wakeup_timer, (DWORD_PTR)NULL, flags); + if (!mmresult) { + timeEndPeriod(period); + return -1; + } + timeKillEvent(mmresult); + + if (virThreadCreate(&timer_thread, 0, timer_loop, NULL) < 0) { + timeEndPeriod(period); + return -1; + } + + return 0; +} -- 1.7.1

4 9

[libvirt] [PATCH 00/10] Re-arrange the QEMU driver code
by Daniel P. Berrange 17 Dec '10

17 Dec '10

The QEMU driver is getting horribly large & I constantly find myself getting lost in it. This series re-arranges the code, pulling out the following areas of functionality into new files - capabilities construction - command line arg generation/parsing - domain private data / namespace handling - audit reporting - cgroup management - host device management - device hotplug There is no functional change in any of these patches. A handful of methods have been renamed if they started with the obsolete 'qemud' prefix. Since these patches will massively conflict with any further patches to the QEMU driver, the sooner they're applied the better... There is more to be pulled out later which is slightly more entangled / difficult - Events - Process startup/shutdown - Migration Daniel

2 27

[libvirt] VolumeCreateXML "XML" description for ESX
by Sherif Nagy 16 Dec '10

16 Dec '10

Hello, I am using libvirt 0.8.6 "python bindings " can someone point me to where i find the XML description of creating volumes using storagecolumecreateXML function ? i am getting libvir: ESX error : internal error Volume name 'nameXXXX.vmdk' doesn't have expected format '<directory>/<file>' thank you regards, Sherif

3 9

[libvirt] [PATCH] maint: doc fix
by Eric Blake 16 Dec '10

16 Dec '10

* src/libvirt.c: Avoid duplicate word. --- I'm pushing this under the trivial rule. src/libvirt.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/libvirt.c b/src/libvirt.c index 4188b45..ff2ac93 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -3297,7 +3297,7 @@ error: * @flags: currently unused, pass 0 * * Reads a domain XML configuration document, and generates - * generates a native configuration file describing the domain. + * a native configuration file describing the domain. * The format of the native data is hypervisor dependant. * * Returns a 0 terminated UTF-8 encoded native config datafile, or NULL in case of error. -- 1.7.3.3

1 0

[libvirt] [Patch v4] Add VMware Workstation and Player driver
by Jean-Baptiste Rouault 16 Dec '10

16 Dec '10

* Changes since v3: Fix x86_64 guests support checking Use UNIX PID for the VM ID Use virDomainObjIsDuplicate() where applicable Remove the (normally) last duplicated errors Various minor fixes

2 2

[libvirt] [PATCH 0/8] Early preview: Re-factoring XDR RPC code
by Daniel P. Berrange 16 Dec '10

16 Dec '10

NB: This patch series isn't intended to be applied yet. The current remote driver and libvirtd daemon have a horrible mix of network I/O, RPC dispatch and RPC handling functionality. It it neccessary to introduce a new daemon to provide a lock manager for VM disks. Doing so would effectively require cut+paste of a large part of libvirtd code since there are no reusable APis in it. Likewise for the client side. To address this problem, this series is an attempt to produce a reusable set of APIs for building RPC servers and clients. The new APIs will handle all the networking/sockets functionality and all the RPC dispatch/serialization/deserialization code. This will enable libvirtd and the remote driver to be gutted, so that they only contain the code for actually implementing the RPC handlers. Thus a lock daemon + lock plugin can be provided without any code duplication. This will also make it far easier for us to introduce new RPC programs, eg an administrative program to allow libvirtd itself to be manipulated, say, to changing logging levels on the fly, kill mis-behaving network client, etc, etc. It would also make it practical to experiment with splitting libvirtd up into smaller daemons each handling one area of functionality. This would in turn make it practical to write useful SELinux policy for confining libvirt daemons This series is *far* from complete. The streams stuff is completely missing in the new APis. I have also not yet gutted libvirtd, only the remote driver. It is also not fully tested for ABI wire compatibility with existing libvirtd, though I believe it is correctly preserving ABI. The diffstat is slightly mis-leading because lots of code remains to be deleted from daemon/libvirtd.c and daemon/dispatch.c. None the less, it is expected that the total lines will increase, but this wll be offset by the improved code clarity and separation of functionality. Daniel daemon/event.c | 3 src/Makefile.am | 90 + src/remote/remote_driver.c | 2530 ++++++-------------------------------- src/rpc/virnetclient.c | 1237 ++++++++++++++++++ src/rpc/virnetclient.h | 60 src/rpc/virnetclientprogram.c | 258 +++ src/rpc/virnetclientprogram.h | 71 + src/rpc/virnetclientsaslcontext.c | 246 +++ src/rpc/virnetclientsaslcontext.h | 66 src/rpc/virnetmessage.c | 215 +++ src/rpc/virnetmessage.h | 31 src/rpc/virnetprotocol.c | 108 + src/rpc/virnetprotocol.h | 81 + src/rpc/virnetprotocol.x | 162 ++ src/rpc/virnetserver.c | 654 +++++++++ src/rpc/virnetserver.h | 74 + src/rpc/virnetserverclient.c | 974 ++++++++++++++ src/rpc/virnetserverclient.h | 40 src/rpc/virnetservermessage.h | 20 src/rpc/virnetserverprogram.c | 437 ++++++ src/rpc/virnetserverprogram.h | 76 + src/rpc/virnetserverservice.c | 208 +++ src/rpc/virnetserverservice.h | 32 src/rpc/virnetsocket.c | 715 ++++++++++ src/rpc/virnetsocket.h | 97 + src/rpc/virnettlscontext.c | 611 +++++++++ src/rpc/virnettlscontext.h | 63 src/util/logging.c | 4 src/util/threadpool.c | 178 ++ src/util/threadpool.h | 23 src/virtlockd.c | 620 +++++++++ 31 files changed, 7866 insertions(+), 2118 deletions(-)

3 27

[libvirt] contribution: qemu hook script to manage guests network bandwidth
by Dominik Klein 16 Dec '10

16 Dec '10

Hi we had the need to manage guests bandwidth. Therefore I wrote a qemu hook script that achieves this and, if there is any interest in that, would like to contribute it to the project. This script will only work on linux hosts. It effectively limits the bandwidth a guest can _send_. It only somewhat effectively limits the bandwidth a guest can _receive_. While well behaving tcp connections slow down when packets are being delayed/dropped, with udp, we are facing a different situation. During my tests, udp was always way slower (factor 10) than actually configured (using iperf -u). Since only tcp matters to us in this situation, we consider it "good enough". Also: This mechanism does by no means protect you from ddos or the like. So what does the script do? The script uses iptables to mark packets from- and to a virtual machine. Depending on these marks, packets will be filtered into tc classes which limit bandwidth to a configurable amount. The configuration allows for groups of vms which share an amount of bandwidth while each machine has its guaranteed bandwidth in high network usage situations. Documentation is part of the script. If you like, feel free to include it. If you have any comments or questions, talk! :) Regards Dominik

1 0

[libvirt] [C# bindings][PATCH]
by arnaud.champion＠devatom.fr 16 Dec '10

16 Dec '10

?Hi, here is another patch for C# bindings. I have update our project DAVIM with latest C# bindings and it show some naming errors. This patch correct it. Arnaud

2 1

[libvirt] "virsh setvcpus" does not work.
by Ken'ichi Ohmichi 16 Dec '10

16 Dec '10

Hi, I tested "virsh setvcpus" command and it did not work like the following: # virsh setvcpus RHEL5.5GA_Guest.img 2 error: internal error unable to execute QEMU command 'cpu_set': The command cpu_set has not been ound # Has this problem been fixed already on upstream ? o Test environment Host OS: RHEL6.0 (x86_64) qemu-kvm: 0.12.1.2-2.113.el6 libvirt : 0.8.1-27.el6 Guetst OS: RHEL5.5 o GDB output (gdb) b qerror_report_internal Breakpoint 1 at 0x497a50: file qerror.c, line 412. (gdb) c Continuing. [New Thread 0x7f726a9fc710 (LWP 23964)] Breakpoint 1, qerror_report_internal ( file=0x57e9d0 "/builddir/build/BUILD/qemu-kvm-0.12.1.2/monitor.c", linenr=4427, func=0x582af0 "handle_qmp_command", fmt=0x57ee90 "{ 'class': 'CommandNotFound', 'data': { 'name': %s } }") at qerror.c:412 412 { (gdb) bt #0 qerror_report_internal ( file=0x57e9d0 "/builddir/build/BUILD/qemu-kvm-0.12.1.2/monitor.c", linenr=4427, func=0x582af0 "handle_qmp_command", fmt=0x57ee90 "{ 'class': 'CommandNotFound', 'data': { 'name': %s } }") at qerror.c:412 #1 0x00000000004133ae in handle_qmp_command (parser=<value optimized out>, tokens=<value optimized out>) at /usr/src/debug/qemu-kvm-0.12.1.2/monitor.c:4427 #2 0x0000000000495d52 in json_message_process_token (lexer=0x1ab5d70, token=0x22037b0, type=JSON_OPERATOR, x=61, y=9170) at json-streamer.c:56 #3 0x0000000000495ab3 in json_lexer_feed_char (lexer=0x1ab5d70, ch=125 '}') at json-lexer.c:299 #4 0x0000000000495be7 in json_lexer_feed (lexer=0x1ab5d70, buffer=0x7ffff19b4510 "}F\232\001", size=1) at json-lexer.c:322 #5 0x00000000004124d2 in monitor_control_read (opaque=<value optimized out>, buf=<value optimized out>, size=<value optimized out>) at /usr/src/debug/qemu-kvm-0.12.1.2/monitor.c:4478 #6 0x00000000004b6b8a in qemu_chr_read (opaque=0x19a43a0) at qemu-char.c:154 #7 tcp_chr_read (opaque=0x19a43a0) at qemu-char.c:2072 #8 0x000000000040b4af in main_loop_wait (timeout=1000) at /usr/src/debug/qemu-kvm-0.12.1.2/vl.c:4234 #9 0x0000000000428a2a in kvm_main_loop () at /usr/src/debug/qemu-kvm-0.12.1.2/qemu-kvm.c:2133 #10 0x000000000040e5cb in main_loop (argc=<value optimized out>, argv=<value optimized out>, envp=<value optimized out>) at /usr/src/debug/qemu-kvm-0.12.1.2/vl.c:4444 #11 main (argc=<value optimized out>, argv=<value optimized out>, envp=<value optimized out>) at /usr/src/debug/qemu-kvm-0.12.1.2/vl.c:6601 (gdb) Thanks Ken'ichi Ohmichi

2 2

Re: [libvirt] system / session URI
by arnaud.champion＠devatom.fr 15 Dec '10

15 Dec '10

Okay, thanks for the explaination. This explain why I can't do some network thing with session URI ;) Thanks a lot Regards, Arnaud ---------------------------------------- De: "Eric Blake" <eblake(a)redhat.com> Envoyé: mercredi 15 décembre 2010 23:09 A: arnaud.champion(a)devatom.fr Objet: Re: [libvirt] system / session URI On 12/15/2010 02:19 PM, arnaud.champion(a)devatom.fr wrote: > ?Hi, > > Can someone explain (or point me to a document that explain) what are the differences between these two URI : > > qemu+tcp://xxx.xxx.xxx.xxx/system > qemu+tcp://xxx.xxx.xxx.xxx/session http://libvirt.org/uri.html#URI_qemu System URIs connect to the system libvirtd daemon (started by system init scripts), which is shared among all users on the machine, and which allows access to anything that requires superuser capabilities (such as creating tun devices for networking). Session URIs connect to a per-user daemon (which will be started automatically if needed), and which cannot access anything that the user cannot access (and unfortunately, given that no one has yet figured out how to make Linux share tun devices with ordinary users, that means that session guests are currently rather limited because they will not have networking support). The goal is to make things support full virtualization under session URIs, once the kernel adds the support we need for networking. -- Eric Blake eblake(a)redhat.com +1-801-349-2682 Libvirt virtualization library http://libvirt.org

1 0

[libvirt] system / session URI
by arnaud.champion＠devatom.fr 15 Dec '10

15 Dec '10

?Hi, Can someone explain (or point me to a document that explain) what are the differences between these two URI : qemu+tcp://xxx.xxx.xxx.xxx/system qemu+tcp://xxx.xxx.xxx.xxx/session Regards, Arnaud

2 1

[libvirt] [PATCH] Introduce yet another migration version in API.
by Daniel P. Berrange 15 Dec '10

15 Dec '10

Migration just seems togo from bad to worse. We already had to introduce a second migration protocol when adding the QEMU driver, since the one from Xen was insufficiently flexible to cope with passing the data the QEMU driver required. It turns out that this protocol still has some flaws that we need to address. The current sequence is * Src: DumpXML - Generate XML to pass to dst * Dst: Prepare - Get ready to accept incoming VM - Generate optional cookie to pass to src * Src: Perform - Start migration and wait for send completion - Kill off VM if successful, resume if failed * Dst: Finish - Wait for recv completion and check status - Kill off VM if unsuccessful The problems with this are: - Since the first step is a generic 'DumpXML' call, we can't add in other migration specific data. eg, we can't include any VM lease data from lock manager plugins - Since the first step is a generic 'DumpXML' call, we can't emit any 'migration begin' event on the source, or have any hook that runs right at the start of the process - Since there is no final step on the source, if the Finish method fails to receive all migration data & has to kill the VM, then there's no way to resume the original VM on the source This patch attempts to introduce a version 3 that uses the improved 5 step sequence * Src: Begin - Generate XML to pass to dst - Generate optional cookie to pass to dst * Dst: Prepare - Get ready to accept incoming VM - Generate optional cookie to pass to src * Src: Perform - Start migration and wait for send completion - Generate optional cookie to pass to dst * Dst: Finish - Wait for recv completion and check status - Kill off VM if failed, resume if success - Generate optional cookie to pass to src * Src: Confirm - Kill off VM if success, resume if failed The API is designed to allow both input and output cookies in all methods where applicable. This lets us pass around arbitrary extra driver specific data between src & dst during migration. Combined with the extra 'Begin' method this lets us pass lease information from source to dst at the start of migration Moving the killing of the source VM out of Perform and into Confirm, means we can now recover if the dst host can't successfully Finish receiving migration data. --- src/driver.h | 64 +++++++++++++++++++ src/libvirt.c | 164 ++++++++++++++++++++++++++++++++++++++++++++++++ src/libvirt_internal.h | 7 ++ 3 files changed, 235 insertions(+), 0 deletions(-) diff --git a/src/driver.h b/src/driver.h index e3a232d..b2514ed 100644 --- a/src/driver.h +++ b/src/driver.h @@ -486,6 +486,65 @@ typedef int virStreamPtr st, unsigned int flags); +typedef char * + (*virDrvDomainMigrateBegin3) + (virConnectPtr dconn, + char **cookiesrc, + int *cookiesrclen, + const char *uri, + unsigned long flags, + const char *dname, + unsigned long resource); + +typedef int + (*virDrvDomainMigratePrepare3) + (virConnectPtr dconn, + const char *cookiesrc, + int cookiesrclen, + char **cookiedst, + int *cookiedstlen, + const char *uri_in, + char **uri_out, + unsigned long flags, + const char *dname, + unsigned long resource, + const char *dom_xml); + +typedef int + (*virDrvDomainMigratePerform3) + (virDomainPtr domain, + char **cookiesrc, + int *cookiesrclen, + const char *cookiedst, + int cookiedstlen, + const char *uri, + unsigned long flags, + const char *dname, + unsigned long resource); + +typedef virDomainPtr + (*virDrvDomainMigrateFinish3) + (virConnectPtr dconn, + const char *dname, + const char *cookiesrc, + int cookiesrclen, + char **cookiedst, + int *cookiedstlen, + const char *uri, + unsigned long flags, + int retcode); + +typedef int + (*virDrvDomainMigrateConfirm3) + (virConnectPtr dconn, + const char *dname, + const char *cookiesrc, + int cookiesrclen, + const char *cookiedst, + int cookiedstlen, + const char *uri, + unsigned long flags, + int retcode); /** * _virDriver: @@ -604,6 +663,11 @@ struct _virDriver { virDrvDomainSetMemoryParameters domainSetMemoryParameters; virDrvDomainGetMemoryParameters domainGetMemoryParameters; virDrvDomainOpenConsole domainOpenConsole; + virDrvDomainMigrateBegin3 domainMigrateBegin3; + virDrvDomainMigratePrepare3 domainMigratePrepare3; + virDrvDomainMigratePerform3 domainMigratePerform3; + virDrvDomainMigrateFinish3 domainMigrateFinish3; + virDrvDomainMigrateConfirm3 domainMigrateConfirm3; }; typedef int diff --git a/src/libvirt.c b/src/libvirt.c index e24fb9e..04a7cd0 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -3342,6 +3342,22 @@ error: } +/* + * Sequence v1: + * + * Dst: Prepare + * - Get ready to accept incoming VM + * - Generate optional cookie to pass to src + * + * Src: Perform + * - Start migration and wait for send completion + * - Kill off VM if successful, resume if failed + * + * Dst: Finish + * - Wait for recv completion and check status + * - Kill off VM if unsuccessful + * + */ static virDomainPtr virDomainMigrateVersion1 (virDomainPtr domain, virConnectPtr dconn, @@ -3411,6 +3427,25 @@ virDomainMigrateVersion1 (virDomainPtr domain, return ddomain; } +/* + * Sequence v2: + * + * Src: DumpXML + * - Generate XML to pass to dst + * + * Dst: Prepare + * - Get ready to accept incoming VM + * - Generate optional cookie to pass to src + * + * Src: Perform + * - Start migration and wait for send completion + * - Kill off VM if successful, resume if failed + * + * Dst: Finish + * - Wait for recv completion and check status + * - Kill off VM if unsuccessful + * + */ static virDomainPtr virDomainMigrateVersion2 (virDomainPtr domain, virConnectPtr dconn, @@ -3505,6 +3540,130 @@ virDomainMigrateVersion2 (virDomainPtr domain, } +/* + * Sequence v3: + * + * Src: Begin + * - Generate XML to pass to dst + * - Generate optional cookie to pass to dst + * + * Dst: Prepare + * - Get ready to accept incoming VM + * - Generate optional cookie to pass to src + * + * Src: Perform + * - Start migration and wait for send completion + * - Generate optional cookie to pass to dst + * + * Dst: Finish + * - Wait for recv completion and check status + * - Kill off VM if failed, resume if success + * - Generate optional cookie to pass to src + * + * Src: Confirm + * - Kill off VM if success, resume if failed + * + */ +static virDomainPtr +virDomainMigrateVersion3 (virDomainPtr domain, + virConnectPtr dconn, + unsigned long flags, + const char *dname, + const char *uri, + unsigned long bandwidth) +{ + virDomainPtr ddomain = NULL; + char *uri_out = NULL; + char *cookiesrc = NULL; + char *cookiedst = NULL; + char *dom_xml = NULL; + int cookiesrclen = 0; + int cookiedstlen = 0; + int ret; + virDomainInfo info; + virErrorPtr orig_err = NULL; + + if (!domain->conn->driver->domainMigrateBegin3) { + virLibConnError (domain->conn, VIR_ERR_INTERNAL_ERROR, __FUNCTION__); + virDispatchError(domain->conn); + return NULL; + } + dom_xml = domain->conn->driver->domainMigrateBegin3 + (domain->conn, &cookiesrc, &cookiesrclen, uri, flags, dname, + bandwidth); + if (!dom_xml) + goto done; + + ret = virDomainGetInfo (domain, &info); + if (ret == 0 && info.state == VIR_DOMAIN_PAUSED) { + flags |= VIR_MIGRATE_PAUSED; + } + + ret = dconn->driver->domainMigratePrepare3 + (dconn, cookiesrc, cookiesrclen, &cookiedst, &cookiedstlen, + uri, &uri_out, flags, dname, bandwidth, dom_xml); + VIR_FREE (dom_xml); + if (ret == -1) + goto done; + + if (uri == NULL && uri_out == NULL) { + virLibConnError (domain->conn, VIR_ERR_INTERNAL_ERROR, + _("domainMigratePrepare2 did not set uri")); + virDispatchError(domain->conn); + goto done; + } + if (uri_out) + uri = uri_out; /* Did domainMigratePrepare2 change URI? */ + assert (uri != NULL); + + /* Perform the migration. The driver isn't supposed to return + * until the migration is complete. The src VM should remain + * running, but in paused state until the destination can + * confirm migration completion. + */ + ret = domain->conn->driver->domainMigratePerform3 + (domain, &cookiesrc, &cookiesrclen, cookiedst, cookiedstlen, + uri, flags, dname, bandwidth); + + /* Perform failed. Make sure Finish doesn't overwrite the error */ + if (ret < 0) + orig_err = virSaveLastError(); + + /* + * The status code from the source is passed to the destination. + * The dest can cleanup in the source indicated it failed to + * send all migration data. Returns NULL for ddomain if + * the dest was unable to complete migration. + */ + dname = dname ? dname : domain->name; + ddomain = dconn->driver->domainMigrateFinish3 + (dconn, dname, cookiesrc, cookiesrclen, &cookiedst, &cookiedstlen, + uri, flags, ret); + + /* + * If Perform3 indicated an error, or if NULL was returned + * from Finish3, then the status code tells the source + * to resume CPUs on the original VM. + */ + ret = domain->conn->driver->domainMigrateConfirm3 + (domain->conn, dname, cookiesrc, cookiesrclen, cookiedst, cookiedstlen, + uri, flags, ret >= 0 && domain ? 0 : -1); + /* XXX is there anything we can do if Confirm3 returns -1. + * Probably nothing beyond praying + */ + + done: + if (orig_err) { + virSetError(orig_err); + virFreeError(orig_err); + } + VIR_FREE(uri_out); + VIR_FREE(cookiesrc); + VIR_FREE(cookiedst); + return ddomain; +} + + /* * This is sort of a migration v3 * @@ -3716,6 +3875,11 @@ virDomainMigrate (virDomainPtr domain, VIR_DRV_SUPPORTS_FEATURE(dconn->driver, dconn, VIR_DRV_FEATURE_MIGRATION_V2)) ddomain = virDomainMigrateVersion2(domain, dconn, flags, dname, uri, bandwidth); + else if (VIR_DRV_SUPPORTS_FEATURE(domain->conn->driver, domain->conn, + VIR_DRV_FEATURE_MIGRATION_V3) && + VIR_DRV_SUPPORTS_FEATURE(dconn->driver, dconn, + VIR_DRV_FEATURE_MIGRATION_V3)) + ddomain = virDomainMigrateVersion3(domain, dconn, flags, dname, uri, bandwidth); else { /* This driver does not support any migration method */ virLibConnError(domain->conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); diff --git a/src/libvirt_internal.h b/src/libvirt_internal.h index 1c4fa4f..d781d6b 100644 --- a/src/libvirt_internal.h +++ b/src/libvirt_internal.h @@ -66,6 +66,13 @@ enum { * perform step is used. */ VIR_DRV_FEATURE_MIGRATION_DIRECT = 5, + + /* + * Driver supports V3-style virDomainMigrate, ie domainMigrateBegin3/ + * domainMigratePrepare3/domainMigratePerform3/domainMigrateFinish3/ + * domainMigrateConfirm3. + */ + VIR_DRV_FEATURE_MIGRATION_V3 = 6, }; -- 1.7.2.3

5 8

[libvirt] [PATCH] tests: avoid spurious failure of nodeinfotest
by Eric Blake 15 Dec '10

15 Dec '10

When running 'make check' under a multi-cpu Dom0 xen machine, nodeinfotest had a spurious failure it was reading from /sys/devices/system/cpu, but xen has no notion of topology. The test was intended to be isolated from reading any real system files; the regression was introduced in Mar 2010 with commit aa2f6f96dd. Fix things by allowing an early exit for the testsuite. * src/nodeinfo.c (linuxNodeInfoCPUPopulate): Add parameter. (nodeGetInfo): Adjust caller. * tests/nodeinfotest.c (linuxTestCompareFiles): Likewise. --- src/nodeinfo.c | 11 ++++++++--- tests/nodeinfotest.c | 5 +++-- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/src/nodeinfo.c b/src/nodeinfo.c index acd3188..22d53e5 100644 --- a/src/nodeinfo.c +++ b/src/nodeinfo.c @@ -61,7 +61,8 @@ /* NB, this is not static as we need to call it from the testsuite */ int linuxNodeInfoCPUPopulate(FILE *cpuinfo, - virNodeInfoPtr nodeinfo); + virNodeInfoPtr nodeinfo, + bool need_hyperthreads); /* Return the positive decimal contents of the given * CPU_SYS_PATH/cpu%u/FILE, or -1 on error. If MISSING_OK and the @@ -167,7 +168,8 @@ static int parse_socket(unsigned int cpu) } int linuxNodeInfoCPUPopulate(FILE *cpuinfo, - virNodeInfoPtr nodeinfo) + virNodeInfoPtr nodeinfo, + bool need_hyperthreads) { char line[1024]; DIR *cpudir = NULL; @@ -244,6 +246,9 @@ int linuxNodeInfoCPUPopulate(FILE *cpuinfo, return -1; } + if (!need_hyperthreads) + return 0; + /* OK, we've parsed what we can out of /proc/cpuinfo. Get the socket * and thread information from /sys */ @@ -338,7 +343,7 @@ int nodeGetInfo(virConnectPtr conn ATTRIBUTE_UNUSED, virNodeInfoPtr nodeinfo) { _("cannot open %s"), CPUINFO_PATH); return -1; } - ret = linuxNodeInfoCPUPopulate(cpuinfo, nodeinfo); + ret = linuxNodeInfoCPUPopulate(cpuinfo, nodeinfo, true); VIR_FORCE_FCLOSE(cpuinfo); if (ret < 0) return -1; diff --git a/tests/nodeinfotest.c b/tests/nodeinfotest.c index f56247b..c690403 100644 --- a/tests/nodeinfotest.c +++ b/tests/nodeinfotest.c @@ -26,7 +26,8 @@ static char *abs_srcdir; # define MAX_FILE 4096 -extern int linuxNodeInfoCPUPopulate(FILE *cpuinfo, virNodeInfoPtr nodeinfo); +extern int linuxNodeInfoCPUPopulate(FILE *cpuinfo, virNodeInfoPtr nodeinfo, + bool need_hyperthreads); static int linuxTestCompareFiles(const char *cpuinfofile, const char *outputfile) { char actualData[MAX_FILE]; @@ -43,7 +44,7 @@ static int linuxTestCompareFiles(const char *cpuinfofile, const char *outputfile return -1; memset(&nodeinfo, 0, sizeof(nodeinfo)); - if (linuxNodeInfoCPUPopulate(cpuinfo, &nodeinfo) < 0) { + if (linuxNodeInfoCPUPopulate(cpuinfo, &nodeinfo, false) < 0) { if (virTestGetDebug()) { virErrorPtr error = virSaveLastError(); if (error && error->code != VIR_ERR_OK) -- 1.7.3.3

1 0

[libvirt] [PATCH] tests: avoid data race
by Eric Blake 15 Dec '10

15 Dec '10

I got some spurious failures when commandhelper won the race and ran to the point of parent detection prior to the intermediate daemonizing process getting a chance to exit. This fixes it. * tests/commandhelper.c (main): Checking for re-parenting to init(1) is racy; instead check that we belong to a new session. --- tests/commandhelper.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tests/commandhelper.c b/tests/commandhelper.c index 5b2f301..f400e8d 100644 --- a/tests/commandhelper.c +++ b/tests/commandhelper.c @@ -95,7 +95,7 @@ int main(int argc, char **argv) { fprintf(log, "FD:%d\n", i); } - fprintf(log, "DAEMON:%s\n", getppid() == 1 ? "yes" : "no"); + fprintf(log, "DAEMON:%s\n", getpgrp() == getsid(0) ? "yes" : "no"); char cwd[1024]; if (!getcwd(cwd, sizeof(cwd))) return EXIT_FAILURE; -- 1.7.3.3

1 0

[libvirt] How to detect if a PCI device is in use?
by Osier Yang 15 Dec '10

15 Dec '10

Hi, all As the $subject says, currently we don't check whether the PCI device is in use or not by guest when reattaching it to host, it causes problems, should we prevent reattaching if the device is in use? if yes, how to detect whether the device is in use or not? The easiest way in my mind is to check if the device is bound to some driver by check if symbol link "driver" (e.g. /sys/bus/pci/devices/0000\:00\:1f.2/) exists, but it's not reasonable, as even if the device is bound to some driver, it probly is not in use by guest, e.g. 1) attach PCI device to guest (non-managed) 2) destroy the guest without detaching the device first 3) reattach the PCI device to host It will be success, and should be success, as it's not used by any stuff, though it's bound to driver ("pci-stub" for qemu, "pciback" for xen). And it seems we can't do any futher lookup to see if the device is in use or not via sysfs. Any idea? Thanks Osier

1 0

[libvirt] [PATCH v2 2/2] auto cold migration fallback at timeout
by Wen Congyang 15 Dec '10

15 Dec '10

implement auto cold migration fallback at timeout Signed-off-by: Wen Congyang <wency(a)cn.fujitsu.com> --- tools/virsh.c | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 53 insertions(+), 0 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 4e37f2d..794b97a 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -54,6 +54,7 @@ #include "files.h" #include "../daemon/event.h" #include "configmake.h" +#include "timer.h" static char *progname; @@ -3378,9 +3379,32 @@ static const vshCmdOptDef opts_migrate[] = { {"desturi", VSH_OT_DATA, VSH_OFLAG_REQ, N_("connection URI of the destination host")}, {"migrateuri", VSH_OT_DATA, 0, N_("migration URI, usually can be omitted")}, {"dname", VSH_OT_DATA, 0, N_("rename to new name during migration (if supported)")}, + {"timeout", VSH_OT_INT, 0, N_("auto cold migration fallback when live migration timeouts(in seconds)")}, {NULL, 0, 0, NULL} }; +static void migrateTimeoutHandler(void *data) +{ + virDomainPtr dom = (virDomainPtr)data; + virDomainInfo info; + unsigned int id; + + id = virDomainGetID(dom); + if (id == ((unsigned int)-1)) + return; + + /* The error reason has been reported in virDomainGetInfo() and + * virDomainSuspend() when it fails. So we do not check the return value. + */ + if (virDomainGetInfo(dom, &info) == 0) { + if (info.state == VIR_DOMAIN_SHUTOFF) + return; + + /* suspend the domain when migration timeouts. */ + virDomainSuspend(dom); + } +} + static int cmdMigrate (vshControl *ctl, const vshCmd *cmd) { @@ -3388,6 +3412,8 @@ cmdMigrate (vshControl *ctl, const vshCmd *cmd) const char *desturi; const char *migrateuri; const char *dname; + long long timeout; + virTimerPtr migratetimer = NULL; int flags = 0, found, ret = FALSE; if (!vshConnectionUsability (ctl, ctl->conn)) @@ -3425,6 +3451,23 @@ cmdMigrate (vshControl *ctl, const vshCmd *cmd) if (vshCommandOptBool (cmd, "copy-storage-inc")) flags |= VIR_MIGRATE_NON_SHARED_INC; + timeout = vshCommandOptLongLong(cmd, "timeout", &found); + if (found) { + if (! flags & VIR_MIGRATE_LIVE) { + vshError(ctl, "%s", _("migrate: Unexpected timeout for cold migration")); + goto done; + } + + if (timeout < 1) { + vshError(ctl, "%s", _("migrate: Invalid timeout")); + goto done; + } + + migratetimer = virNewTimer(migrateTimeoutHandler, (void *)dom); + if (!migratetimer) + goto done; + } + if ((flags & VIR_MIGRATE_PEER2PEER) || vshCommandOptBool (cmd, "direct")) { /* For peer2peer migration or direct migration we only expect one URI @@ -3435,6 +3478,9 @@ cmdMigrate (vshControl *ctl, const vshCmd *cmd) goto done; } + if (migratetimer) + virModTimer(migratetimer, get_clock() + timeout * 1000000000ULL); + if (virDomainMigrateToURI (dom, desturi, flags, dname, 0) == 0) ret = TRUE; } else { @@ -3445,6 +3491,9 @@ cmdMigrate (vshControl *ctl, const vshCmd *cmd) dconn = virConnectOpenAuth (desturi, virConnectAuthPtrDefault, 0); if (!dconn) goto done; + if (migratetimer) + virModTimer(migratetimer, get_clock() + timeout * 1000000000ULL); + ddom = virDomainMigrate (dom, dconn, flags, dname, migrateuri, 0); if (ddom) { virDomainFree(ddom); @@ -3454,6 +3503,10 @@ cmdMigrate (vshControl *ctl, const vshCmd *cmd) } done: + if (migratetimer) { + virDelTimer(migratetimer); + virFreeTimer(migratetimer); + } if (dom) virDomainFree (dom); return ret; } -- 1.7.1

1 0

[libvirt] [Patch v2 0/2] Add new feature into live migration
by Wen Congyang 15 Dec '10

15 Dec '10

If the memory of guest OS is changed constantly, the live migration can not be ended ever for ever. We can use the command 'virsh migrate-setmaxdowntime' to control the live migration. But the value of maxdowntime is diffcult to calculate because it depends on the transfer speed of network and constantly changing memroy size. We need a easy way to control the live migration. This patch set add the support of auto cold migration fallback on timeout. With this patch set, when we migrate the guest OS, we can specify a timeout. If the live migration timeouts, the migration will fallback to cold migration. Test of this patchset on Linux: Env: a. The size of guest OS's memory: 1GB b. The transfer speed of network: about 100Mb/s c. The size of constantly changing memory: more than 900MB 1. migrate without timeout # virsh migrate --live RHEL6RC qemu+ssh://<dest IP>/system tcp://<dest IP>:49152 The migration does not end after 12 hours. 2. migrate with timeout(30 minutes): # date Wed Dec 15 09:39:23 CST 2010 # virsh migrate --live --timeout 1800 RHEL6RC qemu+ssh://<dest IP>/system tcp:<dest IP>:49152 # date Wed Dec 15 10:09:52 CST 2010 This patchset is not tested on Windows(I have no such environment). v2: - implemente timer for Windows - implemente dynamic timers Wen Congyang (2): timer impl auto cold migration fallback at timeout configure.ac | 4 + src/Makefile.am | 6 +- src/libvirt.c | 2 + src/libvirt_private.syms | 6 ++ src/util/timer.c | 166 ++++++++++++++++++++++++++++++++++++++++++++++ src/util/timer.h | 37 ++++++++++ src/util/timer_linux.c | 130 ++++++++++++++++++++++++++++++++++++ src/util/timer_win32.c | 128 +++++++++++++++++++++++++++++++++++ tools/virsh.c | 53 +++++++++++++++ 9 files changed, 530 insertions(+), 2 deletions(-) create mode 100644 src/util/timer.c create mode 100644 src/util/timer.h create mode 100644 src/util/timer_linux.c create mode 100644 src/util/timer_win32.c

1 0

[libvirt] [PATCH] build: improve testsuite results with older automake
by Eric Blake 15 Dec '10

15 Dec '10

* tests/Makefile.am (TESTS_ENVIRONMENT, commandtest_CFLAGS) (commandhelper_CFLAGS): Avoid $(builddir) and $(abs_builddir) in automake 1.9.6; fixes spurious failures of commandtest. --- tests/Makefile.am | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index 0a235cf..07df5a1 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -206,12 +206,12 @@ TESTS += cputest path_add = $$abs_top_builddir/src$(PATH_SEPARATOR)$$abs_top_builddir/daemon$(PATH_SEPARATOR)$$abs_top_builddir/tools # NB, automake < 1.10 does not provide the real -# abs_top_{src/build}dir variables, so don't rely +# abs_top_{src/build}dir or builddir variables, so don't rely # on them here. Fake them with 'pwd' TESTS_ENVIRONMENT = \ abs_top_builddir=`cd '$(top_builddir)'; pwd` \ abs_top_srcdir=`cd '$(top_srcdir)'; pwd` \ - abs_builddir=`cd '$(builddir)'; pwd` \ + abs_builddir=`pwd` \ abs_srcdir=`cd '$(srcdir)'; pwd` \ CONFIG_HEADER="`cd '$(top_builddir)'; pwd`/config.h" \ PATH="$(path_add)$(PATH_SEPARATOR)$$PATH" \ @@ -353,12 +353,12 @@ nodeinfotest_LDADD = $(LDADDS) commandtest_SOURCES = \ commandtest.c testutils.h testutils.c -commandtest_CFLAGS = -Dabs_builddir="\"$(abs_builddir)\"" +commandtest_CFLAGS = -Dabs_builddir="\"`pwd`\"" commandtest_LDADD = $(LDADDS) commandhelper_SOURCES = \ commandhelper.c -commandhelper_CFLAGS = -Dabs_builddir="\"$(abs_builddir)\"" +commandhelper_CFLAGS = -Dabs_builddir="\"`pwd`\"" commandhelper_LDADD = $(LDADDS) if WITH_SECDRIVER_SELINUX -- 1.7.3.3

1 0

[libvirt] [PATCH] qemu: plug memory leak
by Eric Blake 15 Dec '10

15 Dec '10

https://bugzilla.redhat.com/show_bug.cgi?id=656795 * src/qemu/qemu_monitor.c (qemuMonitorFree): Also free the buffer. --- src/qemu/qemu_monitor.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index 86ed82f..85d0d0f 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -199,6 +199,7 @@ static void qemuMonitorFree(qemuMonitorPtr mon) if (virCondDestroy(&mon->notify) < 0) {} virMutexDestroy(&mon->lock); + VIR_FREE(mon->buffer); VIR_FREE(mon); } -- 1.7.3.2

2 22

[libvirt] [PATCH 1/2] build: properly handle ./configure --with-libpcap
by Diego Elio Pettenò 15 Dec '10

15 Dec '10

Without this fix, ./configure --with-libpcap will cause --with-libpcap=yes to be implicitly passed down, which cause yes/bin/pcap-config to be searched for rather than /usr/bin/pcap-config. Also output pcap: no when pcap is not found or disabled. --- configure.ac | 30 ++++++++++++++++-------------- 1 files changed, 16 insertions(+), 14 deletions(-) diff --git a/configure.ac b/configure.ac index d8be160..b5c995f 100644 --- a/configure.ac +++ b/configure.ac @@ -1194,20 +1194,22 @@ LIBPCAP_FOUND="no" AC_ARG_WITH([libpcap], AC_HELP_STRING([--with-libpcap=@<:@PFX@:>@], [libpcap location])) if test "$with_qemu" = "yes"; then - if test "x$with_libpcap" != "xno" ; then - if test "x$with_libpcap" != "x" ; then - LIBPCAP_CONFIG=$with_libpcap/bin/$LIBPCAP_CONFIG - fi - AC_MSG_CHECKING(libpcap $LIBPCAP_CONFIG >= $LIBPCAP_REQUIRED ) - if ! $LIBPCAP_CONFIG --libs > /dev/null 2>&1 ; then - AC_MSG_RESULT(no) - else - LIBPCAP_LIBS="`$LIBPCAP_CONFIG --libs`" - LIBPCAP_CFLAGS="`$LIBPCAP_CONFIG --cflags`" - LIBPCAP_FOUND="yes" - AC_MSG_RESULT(yes) - fi + AS_CASE(["x$with_libpcap"], + [xno], [LIBPCAP_CONFIG=""], + [x|xyes], [LIBPCAP_CONFIG="pcap-config"], + [LIBPCAP_CONFIG="$with_libpcap/bin/pcap-config"] + ) + AS_IF([test "x$LIBPCAP_CONFIG" != "x"], [ + AC_MSG_CHECKING(libpcap $LIBPCAP_CONFIG >= $LIBPCAP_REQUIRED ) + if ! $LIBPCAP_CONFIG --libs > /dev/null 2>&1 ; then + AC_MSG_RESULT(no) + else + LIBPCAP_LIBS="`$LIBPCAP_CONFIG --libs`" + LIBPCAP_CFLAGS="`$LIBPCAP_CONFIG --cflags`" + LIBPCAP_FOUND="yes" + AC_MSG_RESULT(yes) fi + ]) fi if test "x$LIBPCAP_FOUND" = "xyes"; then @@ -2406,7 +2408,7 @@ AC_MSG_NOTICE([ xmlrpc: $XMLRPC_CFLAGS $XMLRPC_LIBS]) else AC_MSG_NOTICE([ xmlrpc: no]) fi -if test "$with_qemu" = "yes" ; then +if test "$with_qemu" = "yes" -a "$LIBPCAP_FOUND" != "no"; then AC_MSG_NOTICE([ pcap: $LIBPCAP_CFLAGS $LIBPCAP_LIBS]) else AC_MSG_NOTICE([ pcap: no]) -- 1.7.3.3

2 6

[libvirt] libvirt-guests output
by Laurent Léonard 14 Dec '10

14 Dec '10

Hi, Here is an example of libvirt-guest output: $Running guests on default URI: test-vm $Suspending guests on default URI... $Suspending test-vm: $done Why all the lines begin with "$" ? Thank you, -- Laurent Léonard

2 5

[libvirt] [PATCH 0/3] Makes the code more compact
by Hu Tao 14 Dec '10

14 Dec '10

These three patches introduce two new functions and one macro respectively, which make the code clean and compact. Hu Tao (3): Add a macro timeval_to_ms to compute micro seconds from timeval Add a new function doStopCPUs Add a new function doStartCPUs src/qemu/qemu_driver.c | 151 ++++++++++++++++++------------------------------ 1 files changed, 57 insertions(+), 94 deletions(-) -- 1.7.3 -- Thanks, Hu Tao

2 6

[libvirt] [libvirt PATCH] 802.1Qbh: Add support for IFLA_VF_MAC
by Roopa Prabhu 14 Dec '10

14 Dec '10

From: Roopa Prabhu <roprabhu(a)cisco.com> Current code does not pass VM mac address to a 802.1Qbh direct attach interface using IFLA_VF_MAC. This patch adds support in macvtap code to send IFLA_VF_MAC netlink request during port profile association on a 802.1Qbh interface. Stefan Cc'ed for comments because this patch changes a condition for 802.1Qbg 802.1Qbh support for IFLA_VF_MAC in enic driver has been posted and is pending acceptance at http://marc.info/?l=linux-netdev&m=129185244410557&w=2 Signed-off-by: Roopa Prabhu <roprabhu(a)cisco.com> Signed-off-by: David Wang <dwang2(a)cisco.com> Signed-off-by: Christian Benvenuti <benve(a)cisco.com> --- src/util/macvtap.c | 59 ++++++++++++++++++++++++++++------------------------ 1 files changed, 32 insertions(+), 27 deletions(-) diff --git a/src/util/macvtap.c b/src/util/macvtap.c index 4345d97..96df301 100644 --- a/src/util/macvtap.c +++ b/src/util/macvtap.c @@ -1031,19 +1031,8 @@ doPortProfileOpSetLink(bool nltarget_kernel, nla_put(nl_msg, IFLA_IFNAME, strlen(ifname)+1, ifname) < 0) goto buffer_too_small; - if (macaddr && vlanid >= 0) { + if (macaddr || vlanid >= 0) { struct nlattr *vfinfolist, *vfinfo; - struct ifla_vf_mac ifla_vf_mac = { - .vf = vf, - .mac = { 0, }, - }; - struct ifla_vf_vlan ifla_vf_vlan = { - .vf = vf, - .vlan = vlanid, - .qos = 0, - }; - - memcpy(ifla_vf_mac.mac, macaddr, 6); if (!(vfinfolist = nla_nest_start(nl_msg, IFLA_VFINFO_LIST))) goto buffer_too_small; @@ -1051,13 +1040,30 @@ doPortProfileOpSetLink(bool nltarget_kernel, if (!(vfinfo = nla_nest_start(nl_msg, IFLA_VF_INFO))) goto buffer_too_small; - if (!nla_put(nl_msg, IFLA_VF_MAC, sizeof(ifla_vf_mac), - &ifla_vf_mac) < 0) - goto buffer_too_small; + if (macaddr) { + struct ifla_vf_mac ifla_vf_mac = { + .vf = vf, + .mac = { 0, }, + }; - if (!nla_put(nl_msg, IFLA_VF_VLAN, sizeof(ifla_vf_vlan), - &ifla_vf_vlan) < 0) - goto buffer_too_small; + memcpy(ifla_vf_mac.mac, macaddr, 6); + + if (!nla_put(nl_msg, IFLA_VF_MAC, sizeof(ifla_vf_mac), + &ifla_vf_mac) < 0) + goto buffer_too_small; + } + + if (vlanid >= 0) { + struct ifla_vf_vlan ifla_vf_vlan = { + .vf = vf, + .vlan = vlanid, + .qos = 0, + }; + + if (!nla_put(nl_msg, IFLA_VF_VLAN, sizeof(ifla_vf_vlan), + &ifla_vf_vlan) < 0) + goto buffer_too_small; + } nla_nest_end(nl_msg, vfinfo); nla_nest_end(nl_msg, vfinfolist); @@ -1402,6 +1408,7 @@ getPhysfn(const char *linkdev, static int doPortProfileOp8021Qbh(const char *ifname, + const unsigned char *macaddr, const virVirtualPortProfileParamsPtr virtPort, const unsigned char *vm_uuid, enum virVirtualPortOp virtPortOp) @@ -1411,6 +1418,7 @@ doPortProfileOp8021Qbh(const char *ifname, # ifndef IFLA_VF_PORT_MAX (void)ifname; + (void)macaddr; (void)virtPort; (void)vm_uuid; (void)virtPortOp; @@ -1426,7 +1434,6 @@ doPortProfileOp8021Qbh(const char *ifname, bool nltarget_kernel = true; int ifindex; int vlanid = -1; - const unsigned char *macaddr = NULL; rc = getPhysfn(ifname, &vf, &physfndev); if (rc) @@ -1456,7 +1463,7 @@ doPortProfileOp8021Qbh(const char *ifname, /* Association timed out, disassociate */ doPortProfileOpCommon(nltarget_kernel, NULL, ifindex, NULL, - 0, + vlanid, NULL, NULL, NULL, @@ -1470,7 +1477,7 @@ doPortProfileOp8021Qbh(const char *ifname, case DISASSOCIATE: rc = doPortProfileOpCommon(nltarget_kernel, NULL, ifindex, NULL, - 0, + vlanid, NULL, NULL, NULL, @@ -1545,9 +1552,8 @@ vpAssociatePortProfileId(const char *macvtap_ifname, /* avoid associating twice */ if (vmOp == VIR_VM_OP_MIGRATE_IN_FINISH) break; - rc = doPortProfileOp8021Qbh(linkdev, virtPort, - vmuuid, - ASSOCIATE); + rc = doPortProfileOp8021Qbh(linkdev, macvtap_macaddr, + virtPort, vmuuid, ASSOCIATE); break; } @@ -1594,9 +1600,8 @@ vpDisassociatePortProfileId(const char *macvtap_ifname, /* avoid disassociating twice */ if (vmOp == VIR_VM_OP_MIGRATE_IN_FINISH) break; - rc = doPortProfileOp8021Qbh(linkdev, virtPort, - NULL, - DISASSOCIATE); + rc = doPortProfileOp8021Qbh(linkdev, macvtap_macaddr, + virtPort, NULL, DISASSOCIATE); break; }

3 3

[libvirt] [PATCH] daemon: plug a memory leak
by Eric Blake 14 Dec '10

14 Dec '10

* daemon/libvirtd.c (qemudStartWorker, qemudStartEventLoop): Avoid leaking pthread_attr resources. --- daemon/libvirtd.c | 36 ++++++++++++++++++++++++++---------- 1 files changed, 26 insertions(+), 10 deletions(-) diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c index 2914f2f..14777dd 100644 --- a/daemon/libvirtd.c +++ b/daemon/libvirtd.c @@ -1600,15 +1600,20 @@ static void *qemudWorker(void *data) } } -static int qemudStartWorker(struct qemud_server *server, - struct qemud_worker *worker) { +static int +qemudStartWorker(struct qemud_server *server, + struct qemud_worker *worker) +{ pthread_attr_t attr; - pthread_attr_init(&attr); + int ret = -1; + + if (pthread_attr_init(&attr) != 0) + return -1; /* We want to join workers, so don't detach them */ /*pthread_attr_setdetachstate(&attr, 1);*/ if (worker->hasThread) - return -1; + goto cleanup; worker->server = server; worker->hasThread = 1; @@ -1621,10 +1626,13 @@ static int qemudStartWorker(struct qemud_server *server, worker) != 0) { worker->hasThread = 0; worker->server = NULL; - return -1; + goto cleanup; } - return 0; + ret = 0; +cleanup: + pthread_attr_destroy(&attr); + return ret; } @@ -2414,9 +2422,14 @@ cleanup: } -static int qemudStartEventLoop(struct qemud_server *server) { +static int +qemudStartEventLoop(struct qemud_server *server) +{ pthread_attr_t attr; - pthread_attr_init(&attr); + int ret = -1; + + if (pthread_attr_init(&attr) != 0) + return -1; /* We want to join the eventloop, so don't detach it */ /*pthread_attr_setdetachstate(&attr, 1);*/ @@ -2424,11 +2437,14 @@ static int qemudStartEventLoop(struct qemud_server *server) { &attr, qemudRunLoop, server) != 0) - return -1; + goto cleanup; server->hasEventThread = 1; - return 0; + ret = 0; +cleanup: + pthread_attr_destroy(&attr); + return ret; } -- 1.7.3.3

3 3

[libvirt] [PATCH] util: Fix logical error in virReportSystemErrorFull
by Jiri Denemark 14 Dec '10

14 Dec '10

--- src/util/virterror.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/util/virterror.c b/src/util/virterror.c index 6e49fa2..b912737 100644 --- a/src/util/virterror.c +++ b/src/util/virterror.c @@ -1301,7 +1301,7 @@ void virReportSystemErrorFull(int domcode, n = vsnprintf(msgDetailBuf, sizeof(msgDetailBuf), fmt, args); va_end(args); - size_t len = strlen (msgDetailBuf); + size_t len = strlen(errnoDetail); if (0 <= n && n + 2 + len < sizeof (msgDetailBuf)) { char *p = msgDetailBuf + n; stpcpy (stpcpy (p, ": "), errnoDetail); -- 1.7.3.3

2 2

[libvirt] [PATCH] util: Fix error message in __virExec
by Jiri Denemark 14 Dec '10

14 Dec '10

Remove superfluous ": %s" suffix from the error message. --- src/util/util.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/util/util.c b/src/util/util.c index 1b5bc68..e24facb 100644 --- a/src/util/util.c +++ b/src/util/util.c @@ -617,7 +617,7 @@ __virExec(const char *const*argv, if (chdir("/") < 0) { virReportSystemError(errno, - "%s", _("cannot change to root directory: %s")); + "%s", _("cannot change to root directory")); goto fork_error; } -- 1.7.3.3

2 2

[libvirt] [PATCH] daemon: Change CWD to / before daemonizing
by Jiri Denemark 14 Dec '10

14 Dec '10

We were doing so for child processes but not for libvirtd itself. --- daemon/libvirtd.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c index 791b3dc..58fc492 100644 --- a/daemon/libvirtd.c +++ b/daemon/libvirtd.c @@ -3158,6 +3158,13 @@ int main(int argc, char **argv) { if (godaemon) { char ebuf[1024]; + + if (chdir("/") < 0) { + VIR_ERROR(_("cannot change to root directory: %s"), + virStrerror(errno, ebuf, sizeof(ebuf))); + goto error; + } + if ((statuswrite = daemonForkIntoBackground()) < 0) { VIR_ERROR(_("Failed to fork as daemon: %s"), virStrerror(errno, ebuf, sizeof ebuf)); -- 1.7.3.3

2 2

[libvirt] [PATCH] cpu: Unify CPUID data structures
by Jiri Denemark 14 Dec '10

14 Dec '10

So far, CPUID data were stored in two different data structures. First of them was a structure allowing direct access for CPUID data according to function number and the second was a plain array of struct cpuX86cpuid. This was a silly design which resulted in converting data from one type to the other and back again or implementing similar functionality for both data structures. The patch leaves only the direct access structure. This makes the code both smaller and more maintainable since operations on different objects can use common low-level operations. All 57 tests for cpu subsystem still pass after this rewrite. --- src/cpu/cpu_x86.c | 576 +++++++++++++++++++++-------------------------- src/cpu/cpu_x86_data.h | 4 +- 2 files changed, 259 insertions(+), 321 deletions(-) diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c index 425a8eb..df1e431 100644 --- a/src/cpu/cpu_x86.c +++ b/src/cpu/cpu_x86.c @@ -37,6 +37,7 @@ #define VENDOR_STRING_LENGTH 12 +static const struct cpuX86cpuid cpuidNull = { 0, 0, 0, 0, 0 }; static const char *archs[] = { "i686", "x86_64" }; @@ -49,8 +50,7 @@ struct x86_vendor { struct x86_feature { char *name; - unsigned int ncpuid; - struct cpuX86cpuid *cpuid; + union cpuData *data; struct x86_feature *next; }; @@ -58,8 +58,7 @@ struct x86_feature { struct x86_model { char *name; const struct x86_vendor *vendor; - unsigned int ncpuid; - struct cpuX86cpuid *cpuid; + union cpuData *data; struct x86_model *next; }; @@ -79,23 +78,28 @@ enum compare_result { }; -static struct cpuX86cpuid * -x86cpuidFind(struct cpuX86cpuid *cpuids, - unsigned int ncpuids, - uint32_t function) -{ - unsigned int i; +struct data_iterator { + union cpuData *data; + int pos; + bool extended; +}; - for (i = 0; i < ncpuids; i++) { - if (cpuids[i].function == function) - return cpuids + i; - } - return NULL; +#define DATA_ITERATOR_INIT(data) \ + { data, -1, false } + + +static void +x86DataIteratorInit(struct data_iterator *iter, + union cpuData *data) +{ + struct data_iterator init = DATA_ITERATOR_INIT(data); + + *iter = init; } -static inline int +static int x86cpuidMatch(const struct cpuX86cpuid *cpuid1, const struct cpuX86cpuid *cpuid2) { @@ -106,7 +110,7 @@ x86cpuidMatch(const struct cpuX86cpuid *cpuid1, } -static inline int +static int x86cpuidMatchMasked(const struct cpuX86cpuid *cpuid, const struct cpuX86cpuid *mask) { @@ -117,7 +121,7 @@ x86cpuidMatchMasked(const struct cpuX86cpuid *cpuid, } -static inline int +static int x86cpuidMatchAny(const struct cpuX86cpuid *cpuid, const struct cpuX86cpuid *mask) { @@ -128,7 +132,7 @@ x86cpuidMatchAny(const struct cpuX86cpuid *cpuid, } -static inline void +static void x86cpuidSetBits(struct cpuX86cpuid *cpuid, const struct cpuX86cpuid *mask) { @@ -139,7 +143,7 @@ x86cpuidSetBits(struct cpuX86cpuid *cpuid, } -static inline void +static void x86cpuidClearBits(struct cpuX86cpuid *cpuid, const struct cpuX86cpuid *mask) { @@ -150,7 +154,7 @@ x86cpuidClearBits(struct cpuX86cpuid *cpuid, } -static inline void +static void x86cpuidAndBits(struct cpuX86cpuid *cpuid, const struct cpuX86cpuid *mask) { @@ -161,6 +165,40 @@ x86cpuidAndBits(struct cpuX86cpuid *cpuid, } +/* skips all zero CPUID leafs */ +static struct cpuX86cpuid * +x86DataCpuidNext(struct data_iterator *iterator) +{ + struct cpuX86cpuid *ret; + struct cpuX86Data *data; + + if (!iterator->data) + return NULL; + + data = &iterator->data->x86; + + do { + ret = NULL; + iterator->pos++; + + if (!iterator->extended) { + if (iterator->pos < data->basic_len) + ret = data->basic + iterator->pos; + else { + iterator->extended = true; + iterator->pos = 0; + } + } + + if (iterator->extended && iterator->pos < data->extended_len) { + ret = data->extended + iterator->pos; + } + } while (ret && x86cpuidMatch(ret, &cpuidNull)); + + return ret; +} + + static struct cpuX86cpuid * x86DataCpuid(const union cpuData *data, uint32_t function) @@ -180,7 +218,7 @@ x86DataCpuid(const union cpuData *data, i = function - CPUX86_EXTENDED; } - if (i < len) + if (i < len && !x86cpuidMatch(cpuids + i, &cpuidNull)) return cpuids + i; else return NULL; @@ -225,38 +263,86 @@ x86DataCopy(const union cpuData *data) static int +x86DataExpand(union cpuData *data, + int basic_by, + int extended_by) +{ + size_t i; + + if (basic_by > 0) { + size_t len = data->x86.basic_len; + if (VIR_EXPAND_N(data->x86.basic, data->x86.basic_len, basic_by) < 0) + goto no_memory; + + for (i = 0; i < basic_by; i++) + data->x86.basic[len + i].function = len + i; + } + + if (extended_by > 0) { + size_t len = data->x86.extended_len; + if (VIR_EXPAND_N(data->x86.extended, data->x86.extended_len, extended_by) < 0) + goto no_memory; + + for (i = 0; i < extended_by; i++) + data->x86.extended[len + i].function = len + i + CPUX86_EXTENDED; + } + + return 0; + +no_memory: + virReportOOMError(); + return -1; +} + + +static int x86DataAddCpuid(union cpuData *data, const struct cpuX86cpuid *cpuid) { + unsigned int basic_by = 0; + unsigned int extended_by = 0; struct cpuX86cpuid **cpuids; - int *len; unsigned int pos; - unsigned int ext; if (cpuid->function < CPUX86_EXTENDED) { pos = cpuid->function; - ext = 0; - len = &data->x86.basic_len; + basic_by = pos + 1 - data->x86.basic_len; cpuids = &data->x86.basic; } else { pos = cpuid->function - CPUX86_EXTENDED; - ext = CPUX86_EXTENDED; - len = &data->x86.extended_len; + extended_by = pos + 1 - data->x86.extended_len; cpuids = &data->x86.extended; } - if (pos >= *len) { - unsigned int i; + if (x86DataExpand(data, basic_by, extended_by) < 0) + return -1; + + x86cpuidSetBits((*cpuids) + pos, cpuid); - if (VIR_ALLOC_N(*cpuids, pos + 1) < 0) - return -1; + return 0; +} + + +static int +x86DataAdd(union cpuData *data1, + const union cpuData *data2) +{ + unsigned int i; + + if (x86DataExpand(data1, + data2->x86.basic_len - data1->x86.basic_len, + data2->x86.extended_len - data1->x86.extended_len) < 0) + return -1; - for (i = *len; i <= pos; i++) - (*cpuids)[i].function = i + ext; - *len = pos + 1; + for (i = 0; i < data2->x86.basic_len; i++) { + x86cpuidSetBits(data1->x86.basic + i, + data2->x86.basic + i); } - x86cpuidSetBits((*cpuids) + pos, cpuid); + for (i = 0; i < data2->x86.extended_len; i++) { + x86cpuidSetBits(data1->x86.extended + i, + data2->x86.extended + i); + } return 0; } @@ -283,61 +369,49 @@ x86DataSubtract(union cpuData *data1, } -static bool -x86DataIsEmpty(union cpuData *data) +static void +x86DataIntersect(union cpuData *data1, + const union cpuData *data2) { - struct cpuX86cpuid zero = { 0, 0, 0, 0, 0 }; - unsigned int i; - - for (i = 0; i < data->x86.basic_len; i++) { - if (!x86cpuidMatch(data->x86.basic + i, &zero)) - return false; - } + struct data_iterator iter = DATA_ITERATOR_INIT(data1); + struct cpuX86cpuid *cpuid1; + struct cpuX86cpuid *cpuid2; - for (i = 0; i < data->x86.extended_len; i++) { - if (!x86cpuidMatch(data->x86.extended + i, &zero)) - return false; + while ((cpuid1 = x86DataCpuidNext(&iter))) { + cpuid2 = x86DataCpuid(data2, cpuid1->function); + if (cpuid2) + x86cpuidAndBits(cpuid1, cpuid2); + else + x86cpuidClearBits(cpuid1, cpuid1); } - - return true; } -static union cpuData * -x86DataFromModel(const struct x86_model *model) +static bool +x86DataIsEmpty(union cpuData *data) { - union cpuData *data = NULL; - uint32_t basic_len = 0; - uint32_t extended_len = 0; - struct cpuX86cpuid *cpuid; - int i; + struct data_iterator iter = DATA_ITERATOR_INIT(data); - for (i = 0; i < model->ncpuid; i++) { - cpuid = model->cpuid + i; - if (cpuid->function < CPUX86_EXTENDED) { - if (cpuid->function >= basic_len) - basic_len = cpuid->function + 1; - } - else if (cpuid->function - CPUX86_EXTENDED >= extended_len) - extended_len = cpuid->function - CPUX86_EXTENDED + 1; - } + return (x86DataCpuidNext(&iter) == NULL); +} - if (VIR_ALLOC(data) < 0 - || VIR_ALLOC_N(data->x86.basic, basic_len) < 0 - || VIR_ALLOC_N(data->x86.extended, extended_len) < 0) { - x86DataFree(data); - return NULL; - } - data->x86.basic_len = basic_len; - data->x86.extended_len = extended_len; +static bool +x86DataIsSubset(const union cpuData *data, + const union cpuData *subset) +{ + + struct data_iterator iter = DATA_ITERATOR_INIT((union cpuData *) subset); + const struct cpuX86cpuid *cpuid; + const struct cpuX86cpuid *cpuidSubset; - for (i = 0; i < model->ncpuid; i++) { - cpuid = x86DataCpuid(data, model->cpuid[i].function); - *cpuid = model->cpuid[i]; + while ((cpuidSubset = x86DataCpuidNext(&iter))) { + if (!(cpuid = x86DataCpuid(data, cpuidSubset->function)) || + !x86cpuidMatchMasked(cpuid, cpuidSubset)) + return false; } - return data; + return true; } @@ -349,17 +423,12 @@ x86DataToCPUFeatures(virCPUDefPtr cpu, const struct x86_map *map) { const struct x86_feature *feature = map->features; - struct cpuX86cpuid *cpuid; - unsigned int i; while (feature != NULL) { - for (i = 0; i < feature->ncpuid; i++) { - if ((cpuid = x86DataCpuid(data, feature->cpuid[i].function)) - && x86cpuidMatchMasked(cpuid, feature->cpuid + i)) { - x86cpuidClearBits(cpuid, feature->cpuid + i); - if (virCPUDefAddFeature(cpu, feature->name, policy) < 0) - return -1; - } + if (x86DataIsSubset(data, feature->data)) { + x86DataSubtract(data, feature->data); + if (virCPUDefAddFeature(cpu, feature->name, policy) < 0) + return -1; } feature = feature->next; } @@ -402,7 +471,7 @@ x86DataToCPU(const union cpuData *data, if (VIR_ALLOC(cpu) < 0 || !(cpu->model = strdup(model->name)) || !(copy = x86DataCopy(data)) || - !(modelData = x86DataFromModel(model))) + !(modelData = x86DataCopy(model->data))) goto no_memory; if ((vendor = x86DataToVendor(copy, map)) && @@ -441,7 +510,7 @@ x86VendorFree(struct x86_vendor *vendor) VIR_FREE(vendor->name); VIR_FREE(vendor); -}; +} static struct x86_vendor * @@ -533,6 +602,23 @@ ignore: } +static struct x86_feature * +x86FeatureNew(void) +{ + struct x86_feature *feature; + + if (VIR_ALLOC(feature) < 0) + return NULL; + + if (VIR_ALLOC(feature->data) < 0) { + VIR_FREE(feature); + return NULL; + } + + return feature; +} + + static void x86FeatureFree(struct x86_feature *feature) { @@ -540,7 +626,7 @@ x86FeatureFree(struct x86_feature *feature) return; VIR_FREE(feature->name); - VIR_FREE(feature->cpuid); + x86DataFree(feature->data); VIR_FREE(feature); } @@ -569,12 +655,12 @@ x86FeatureLoad(xmlXPathContextPtr ctxt, { xmlNodePtr *nodes = NULL; xmlNodePtr ctxt_node = ctxt->node; - struct x86_feature *feature = NULL; + struct x86_feature *feature; int ret = 0; int i; int n; - if (VIR_ALLOC(feature) < 0) + if (!(feature = x86FeatureNew())) goto no_memory; feature->name = virXPathString("string(@name)", ctxt); @@ -594,14 +680,8 @@ x86FeatureLoad(xmlXPathContextPtr ctxt, if (n < 0) goto ignore; - if (n > 0) { - if (VIR_ALLOC_N(feature->cpuid, n) < 0) - goto no_memory; - feature->ncpuid = n; - } - for (i = 0; i < n; i++) { - struct cpuX86cpuid *cpuid = feature->cpuid + i; + struct cpuX86cpuid cpuid; unsigned long fun, eax, ebx, ecx, edx; int ret_fun, ret_eax, ret_ebx, ret_ecx, ret_edx; @@ -620,11 +700,14 @@ x86FeatureLoad(xmlXPathContextPtr ctxt, goto ignore; } - cpuid->function = fun; - cpuid->eax = eax; - cpuid->ebx = ebx; - cpuid->ecx = ecx; - cpuid->edx = edx; + cpuid.function = fun; + cpuid.eax = eax; + cpuid.ebx = ebx; + cpuid.ecx = ecx; + cpuid.edx = edx; + + if (x86DataAddCpuid(feature->data, &cpuid)) + goto no_memory; } if (map->features == NULL) @@ -650,6 +733,23 @@ ignore: } +static struct x86_model * +x86ModelNew(void) +{ + struct x86_model *model; + + if (VIR_ALLOC(model) < 0) + return NULL; + + if (VIR_ALLOC(model->data) < 0) { + VIR_FREE(model); + return NULL; + } + + return model; +} + + static void x86ModelFree(struct x86_model *model) { @@ -657,7 +757,7 @@ x86ModelFree(struct x86_model *model) return; VIR_FREE(model->name); - VIR_FREE(model->cpuid); + x86DataFree(model->data); VIR_FREE(model); } @@ -666,99 +766,20 @@ static struct x86_model * x86ModelCopy(const struct x86_model *model) { struct x86_model *copy; - int i; if (VIR_ALLOC(copy) < 0 - || (copy->name = strdup(model->name)) == NULL - || VIR_ALLOC_N(copy->cpuid, model->ncpuid) < 0) { + || !(copy->name = strdup(model->name)) + || !(copy->data = x86DataCopy(model->data))) { x86ModelFree(copy); return NULL; } copy->vendor = model->vendor; - copy->ncpuid = model->ncpuid; - for (i = 0; i < model->ncpuid; i++) - copy->cpuid[i] = model->cpuid[i]; return copy; } -static int -x86ModelAddCpuid(struct x86_model *model, - const struct cpuX86cpuid *cpuid) -{ - struct cpuX86cpuid *model_cpuid; - - model_cpuid = x86cpuidFind(model->cpuid, model->ncpuid, cpuid->function); - - if (model_cpuid != NULL) - x86cpuidSetBits(model_cpuid, cpuid); - else { - if (VIR_REALLOC_N(model->cpuid, model->ncpuid + 1) < 0) - return -1; - - model->cpuid[model->ncpuid] = *cpuid; - model->ncpuid++; - } - - return 0; -} - - -static void -x86ModelSubtract(struct x86_model *model1, - const struct x86_model *model2) -{ - int i; - struct cpuX86cpuid *cpuid; - - for (i = 0; i < model2->ncpuid; i++) { - cpuid = x86cpuidFind(model1->cpuid, - model1->ncpuid, - model2->cpuid[i].function); - if (cpuid != NULL) - x86cpuidClearBits(cpuid, model2->cpuid + i); - } -} - - -static void -x86ModelIntersect(struct x86_model *model1, - const struct x86_model *model2) -{ - int i; - struct cpuX86cpuid *cpuid; - - for (i = 0; i < model1->ncpuid; i++) { - struct cpuX86cpuid *intersection = model1->cpuid + i; - - cpuid = x86cpuidFind(model2->cpuid, - model2->ncpuid, - intersection->function); - if (cpuid != NULL) - x86cpuidAndBits(intersection, cpuid); - else - x86cpuidClearBits(intersection, intersection); - } -} - - -static int -x86ModelAdd(struct x86_model *model1, - const struct x86_model *model2) -{ - int i; - - for (i = 0; i < model2->ncpuid; i++) { - if (x86ModelAddCpuid(model1, model2->cpuid + i)) - return -1; - } - - return 0; -} - - static struct x86_model * x86ModelFind(const struct x86_map *map, const char *name) @@ -777,47 +798,6 @@ x86ModelFind(const struct x86_map *map, } -static int -x86ModelMergeFeature(struct x86_model *model, - const struct x86_feature *feature) -{ - int i; - - if (feature == NULL) - return 0; - - for (i = 0; i < feature->ncpuid; i++) { - if (x86ModelAddCpuid(model, feature->cpuid + i)) - return -1; - } - - return 0; -} - - -static bool -x86ModelHasFeature(struct x86_model *model, - const struct x86_feature *feature) -{ - unsigned int i; - struct cpuX86cpuid *cpuid; - struct cpuX86cpuid *model_cpuid; - - if (feature == NULL) - return false; - - for (i = 0; i < feature->ncpuid; i++) { - cpuid = feature->cpuid + i; - model_cpuid = x86cpuidFind(model->cpuid, model->ncpuid, - cpuid->function); - if (!model_cpuid || !x86cpuidMatchMasked(model_cpuid, cpuid)) - return false; - } - - return true; -} - - static struct x86_model * x86ModelFromCPU(const virCPUDefPtr cpu, const struct x86_map *map, @@ -835,11 +815,11 @@ x86ModelFromCPU(const virCPUDefPtr cpu, if ((model = x86ModelCopy(model)) == NULL) goto no_memory; - } - else if (VIR_ALLOC(model) < 0) + } else if (!(model = x86ModelNew())) { goto no_memory; - else if (cpu->type == VIR_CPU_TYPE_HOST) + } else if (cpu->type == VIR_CPU_TYPE_HOST) { return model; + } for (i = 0; i < cpu->nfeatures; i++) { const struct x86_feature *feature; @@ -854,7 +834,7 @@ x86ModelFromCPU(const virCPUDefPtr cpu, goto error; } - if (x86ModelMergeFeature(model, feature)) + if (x86DataAdd(model->data, feature->data)) goto no_memory; } @@ -884,11 +864,10 @@ x86ModelSubtractCPU(struct x86_model *model, return -1; } - x86ModelSubtract(model, cpu_model); + x86DataSubtract(model->data, cpu_model->data); for (i = 0; i < cpu->nfeatures; i++) { const struct x86_feature *feature; - unsigned int j; if (!(feature = x86FeatureFind(map, cpu->features[i].name))) { virCPUReportError(VIR_ERR_INTERNAL_ERROR, @@ -897,13 +876,7 @@ x86ModelSubtractCPU(struct x86_model *model, return -1; } - for (j = 0; j < feature->ncpuid; j++) { - struct cpuX86cpuid *cpuid; - cpuid = x86cpuidFind(model->cpuid, model->ncpuid, - feature->cpuid[j].function); - if (cpuid) - x86cpuidClearBits(cpuid, feature->cpuid + j); - } + x86DataSubtract(model->data, feature->data); } return 0; @@ -915,18 +888,15 @@ x86ModelCompare(const struct x86_model *model1, const struct x86_model *model2) { enum compare_result result = EQUAL; + struct data_iterator iter1 = DATA_ITERATOR_INIT(model1->data); + struct data_iterator iter2 = DATA_ITERATOR_INIT(model2->data); struct cpuX86cpuid *cpuid1; struct cpuX86cpuid *cpuid2; - int i; - for (i = 0; i < model1->ncpuid; i++) { + while ((cpuid1 = x86DataCpuidNext(&iter1))) { enum compare_result match = SUPERSET; - cpuid1 = model1->cpuid + i; - cpuid2 = x86cpuidFind(model2->cpuid, - model2->ncpuid, - cpuid1->function); - if (cpuid2 != NULL) { + if ((cpuid2 = x86DataCpuid(model2->data, cpuid1->function))) { if (x86cpuidMatch(cpuid1, cpuid2)) continue; else if (!x86cpuidMatchMasked(cpuid1, cpuid2)) @@ -939,14 +909,10 @@ x86ModelCompare(const struct x86_model *model1, return UNRELATED; } - for (i = 0; i < model2->ncpuid; i++) { + while ((cpuid2 = x86DataCpuidNext(&iter2))) { enum compare_result match = SUBSET; - cpuid2 = model2->cpuid + i; - cpuid1 = x86cpuidFind(model1->cpuid, - model1->ncpuid, - cpuid2->function); - if (cpuid1 != NULL) { + if ((cpuid1 = x86DataCpuid(model1->data, cpuid2->function))) { if (x86cpuidMatch(cpuid2, cpuid1)) continue; else if (!x86cpuidMatchMasked(cpuid2, cpuid1)) @@ -968,13 +934,13 @@ x86ModelLoad(xmlXPathContextPtr ctxt, struct x86_map *map) { xmlNodePtr *nodes = NULL; - struct x86_model *model = NULL; + struct x86_model *model; char *vendor = NULL; int ret = 0; int i; int n; - if (VIR_ALLOC(model) < 0) + if (!(model = x86ModelNew())) goto no_memory; model->name = virXPathString("string(@name)", ctxt); @@ -1006,13 +972,9 @@ x86ModelLoad(xmlXPathContextPtr ctxt, VIR_FREE(name); - if (VIR_ALLOC_N(model->cpuid, ancestor->ncpuid) < 0) - goto no_memory; - model->vendor = ancestor->vendor; - model->ncpuid = ancestor->ncpuid; - memcpy(model->cpuid, ancestor->cpuid, - sizeof(*model->cpuid) * model->ncpuid); + if (!(model->data = x86DataCopy(ancestor->data))) + goto no_memory; } if (virXPathBoolean("boolean(./vendor)", ctxt)) { @@ -1055,7 +1017,7 @@ x86ModelLoad(xmlXPathContextPtr ctxt, } VIR_FREE(name); - if (x86ModelMergeFeature(model, feature)) + if (x86DataAdd(model->data, feature->data)) goto no_memory; } @@ -1157,7 +1119,6 @@ x86Compute(virCPUDefPtr host, virCPUDefPtr cpu, union cpuData **guest) { - struct cpuX86cpuid cpuid_zero = { 0, 0, 0, 0, 0 }; struct x86_map *map = NULL; struct x86_model *host_model = NULL; struct x86_model *cpu_force = NULL; @@ -1167,6 +1128,8 @@ x86Compute(virCPUDefPtr host, struct x86_model *cpu_forbid = NULL; struct x86_model *diff = NULL; struct x86_model *guest_model = NULL; + struct data_iterator iter; + const struct cpuX86cpuid *cpuid; virCPUCompareResult ret; enum compare_result result; unsigned int i; @@ -1203,24 +1166,20 @@ x86Compute(virCPUDefPtr host, !(cpu_forbid = x86ModelFromCPU(cpu, map, VIR_CPU_FEATURE_FORBID))) goto error; - for (i = 0; i < cpu_forbid->ncpuid; i++) { - const struct cpuX86cpuid *cpuid1; + x86DataIteratorInit(&iter, cpu_forbid->data); + while ((cpuid = x86DataCpuidNext(&iter))) { const struct cpuX86cpuid *cpuid2; - cpuid1 = cpu_forbid->cpuid + i; - cpuid2 = x86cpuidFind(host_model->cpuid, - host_model->ncpuid, - cpuid1->function); - - if (cpuid2 != NULL && x86cpuidMatchAny(cpuid2, cpuid1)) { + cpuid2 = x86DataCpuid(host_model->data, cpuid->function); + if (cpuid2 != NULL && x86cpuidMatchAny(cpuid2, cpuid)) { VIR_DEBUG("Host CPU provides forbidden features in CPUID function 0x%x", - cpuid1->function); + cpuid->function); ret = VIR_CPU_COMPARE_INCOMPATIBLE; goto out; } } - x86ModelSubtract(cpu_require, cpu_disable); + x86DataSubtract(cpu_require->data, cpu_disable->data); result = x86ModelCompare(host_model, cpu_require); if (result == SUBSET || result == UNRELATED) { VIR_DEBUG0("Host CPU does not provide all required features"); @@ -1233,17 +1192,13 @@ x86Compute(virCPUDefPtr host, if ((diff = x86ModelCopy(host_model)) == NULL) goto no_memory; - x86ModelSubtract(diff, cpu_optional); - x86ModelSubtract(diff, cpu_require); - x86ModelSubtract(diff, cpu_disable); - x86ModelSubtract(diff, cpu_force); + x86DataSubtract(diff->data, cpu_optional->data); + x86DataSubtract(diff->data, cpu_require->data); + x86DataSubtract(diff->data, cpu_disable->data); + x86DataSubtract(diff->data, cpu_force->data); - for (i = 0; i < diff->ncpuid; i++) { - if (!x86cpuidMatch(diff->cpuid + i, &cpuid_zero)) { - ret = VIR_CPU_COMPARE_SUPERSET; - break; - } - } + if (!x86DataIsEmpty(diff->data)) + ret = VIR_CPU_COMPARE_SUPERSET; if (ret == VIR_CPU_COMPARE_SUPERSET && cpu->type == VIR_CPU_TYPE_GUEST @@ -1259,14 +1214,14 @@ x86Compute(virCPUDefPtr host, if (cpu->type == VIR_CPU_TYPE_GUEST && cpu->match == VIR_CPU_MATCH_EXACT) - x86ModelSubtract(guest_model, diff); + x86DataSubtract(guest_model->data, diff->data); - if (x86ModelAdd(guest_model, cpu_force)) + if (x86DataAdd(guest_model->data, cpu_force->data)) goto no_memory; - x86ModelSubtract(guest_model, cpu_disable); + x86DataSubtract(guest_model->data, cpu_disable->data); - if ((*guest = x86DataFromModel(guest_model)) == NULL) + if ((*guest = x86DataCopy(guest_model->data)) == NULL) goto no_memory; } @@ -1418,9 +1373,8 @@ x86EncodePolicy(const virCPUDefPtr cpu, if (!(model = x86ModelFromCPU(cpu, map, policy))) return NULL; - if (!(data = x86DataFromModel(model))) - virReportOOMError(); - + data = model->data; + model->data = NULL; x86ModelFree(model); return data; @@ -1584,19 +1538,20 @@ static union cpuData * x86NodeData(void) { union cpuData *data; + int ret; if (VIR_ALLOC(data) < 0) { virReportOOMError(); return NULL; } - data->x86.basic_len = cpuidSet(CPUX86_BASIC, &data->x86.basic); - if (data->x86.basic_len < 0) + if ((ret = cpuidSet(CPUX86_BASIC, &data->x86.basic)) < 0) goto error; + data->x86.basic_len = ret; - data->x86.extended_len = cpuidSet(CPUX86_EXTENDED, &data->x86.extended); - if (data->x86.extended_len < 0) + if ((ret = cpuidSet(CPUX86_EXTENDED, &data->x86.extended)) < 0) goto error; + data->x86.extended_len = ret; return data; @@ -1616,7 +1571,6 @@ x86Baseline(virCPUDefPtr *cpus, { struct x86_map *map = NULL; struct x86_model *base_model = NULL; - union cpuData *data = NULL; virCPUDefPtr cpu = NULL; unsigned int i; const struct x86_vendor *vendor = NULL; @@ -1679,24 +1633,21 @@ x86Baseline(virCPUDefPtr *cpus, } } - x86ModelIntersect(base_model, model); + x86DataIntersect(base_model->data, model->data); x86ModelFree(model); model = NULL; } - if (!(data = x86DataFromModel(base_model))) - goto no_memory; - - if (x86DataIsEmpty(data)) { + if (x86DataIsEmpty(base_model->data)) { virCPUReportError(VIR_ERR_OPERATION_FAILED, "%s", _("CPUs are incompatible")); goto error; } - if (vendor && x86DataAddCpuid(data, &vendor->cpuid) < 0) + if (vendor && x86DataAddCpuid(base_model->data, &vendor->cpuid) < 0) goto no_memory; - if (x86Decode(cpu, data, models, nmodels, NULL) < 0) + if (x86Decode(cpu, base_model->data, models, nmodels, NULL) < 0) goto error; if (!outputVendor) @@ -1705,7 +1656,6 @@ x86Baseline(virCPUDefPtr *cpus, VIR_FREE(cpu->arch); cleanup: - x86DataFree(data); x86ModelFree(base_model); x86MapFree(map); @@ -1729,7 +1679,6 @@ x86Update(virCPUDefPtr guest, unsigned int i; struct x86_map *map; struct x86_model *host_model = NULL; - union cpuData *data = NULL; if (!(map = x86LoadMap()) || !(host_model = x86ModelFromCPU(host, map, VIR_CPU_FEATURE_REQUIRE))) @@ -1745,7 +1694,7 @@ x86Update(virCPUDefPtr guest, goto cleanup; } - if (x86ModelHasFeature(host_model, feature)) + if (x86DataIsSubset(host_model->data, feature->data)) guest->features[i].policy = VIR_CPU_FEATURE_REQUIRE; else guest->features[i].policy = VIR_CPU_FEATURE_DISABLE; @@ -1755,8 +1704,8 @@ x86Update(virCPUDefPtr guest, if (guest->match == VIR_CPU_MATCH_MINIMUM) { guest->match = VIR_CPU_MATCH_EXACT; if (x86ModelSubtractCPU(host_model, guest, map) - || !(data = x86DataFromModel(host_model)) - || x86DataToCPUFeatures(guest, VIR_CPU_FEATURE_REQUIRE, data, map)) + || x86DataToCPUFeatures(guest, VIR_CPU_FEATURE_REQUIRE, + host_model->data, map)) goto cleanup; } @@ -1765,7 +1714,6 @@ x86Update(virCPUDefPtr guest, cleanup: x86MapFree(map); x86ModelFree(host_model); - x86DataFree(data); return ret; } @@ -1775,7 +1723,6 @@ static int x86HasFeature(const union cpuData *data, struct x86_map *map; struct x86_feature *feature; int ret = -1; - int i; if (!(map = x86LoadMap())) return -1; @@ -1783,16 +1730,7 @@ static int x86HasFeature(const union cpuData *data, if (!(feature = x86FeatureFind(map, name))) goto cleanup; - for (i = 0 ; i < feature->ncpuid ; i++) { - struct cpuX86cpuid *cpuid; - - cpuid = x86DataCpuid(data, feature->cpuid[i].function); - if (cpuid && x86cpuidMatchMasked(cpuid, feature->cpuid + i)) { - ret = 1; - goto cleanup; - } - } - ret = 0; + ret = x86DataIsSubset(data, feature->data) ? 1 : 0; cleanup: x86MapFree(map); diff --git a/src/cpu/cpu_x86_data.h b/src/cpu/cpu_x86_data.h index 46d2517..34a5b06 100644 --- a/src/cpu/cpu_x86_data.h +++ b/src/cpu/cpu_x86_data.h @@ -38,9 +38,9 @@ struct cpuX86cpuid { # define CPUX86_EXTENDED 0x80000000 struct cpuX86Data { - int basic_len; + size_t basic_len; struct cpuX86cpuid *basic; - int extended_len; + size_t extended_len; struct cpuX86cpuid *extended; }; -- 1.7.3.3

2 2

[libvirt] [PATCH] esx: Add support for storage volume cloning
by Matthias Bolte 14 Dec '10

14 Dec '10

--- src/esx/esx_storage_driver.c | 198 +++++++++++++++++++++++++++++++++++++++- src/esx/esx_vi_generator.input | 11 ++ 2 files changed, 208 insertions(+), 1 deletions(-) diff --git a/src/esx/esx_storage_driver.c b/src/esx/esx_storage_driver.c index 9165f7a..e6803c2 100644 --- a/src/esx/esx_storage_driver.c +++ b/src/esx/esx_storage_driver.c @@ -1180,6 +1180,202 @@ esxStorageVolumeCreateXML(virStoragePoolPtr pool, const char *xmldesc, +static virStorageVolPtr +esxStorageVolumeCreateXMLFrom(virStoragePoolPtr pool, const char *xmldesc, + virStorageVolPtr sourceVolume, unsigned int flags) +{ + virStorageVolPtr volume = NULL; + esxPrivate *priv = pool->conn->storagePrivateData; + virStoragePoolDef poolDef; + char *sourceDatastorePath = NULL; + virStorageVolDefPtr def = NULL; + char *tmp; + char *unescapedDatastorePath = NULL; + char *unescapedDirectoryName = NULL; + char *unescapedDirectoryAndFileName = NULL; + char *directoryName = NULL; + char *fileName = NULL; + char *datastorePathWithoutFileName = NULL; + char *datastorePath = NULL; + esxVI_FileInfo *fileInfo = NULL; + esxVI_ManagedObjectReference *task = NULL; + esxVI_TaskInfoState taskInfoState; + char *taskInfoErrorMessage = NULL; + char *uuid_string = NULL; + char *key = NULL; + + virCheckFlags(0, NULL); + + memset(&poolDef, 0, sizeof (poolDef)); + + if (esxVI_EnsureSession(priv->primary) < 0) { + return NULL; + } + + if (esxStoragePoolLookupType(priv->primary, pool->name, &poolDef.type) < 0) { + return NULL; + } + + if (virAsprintf(&sourceDatastorePath, "[%s] %s", sourceVolume->pool, + sourceVolume->name) < 0) { + virReportOOMError(); + goto cleanup; + } + + /* Parse config */ + def = virStorageVolDefParseString(&poolDef, xmldesc); + + if (def == NULL) { + goto cleanup; + } + + if (def->type != VIR_STORAGE_VOL_FILE) { + ESX_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", + _("Creating non-file volumes is not supported")); + goto cleanup; + } + + /* Validate config */ + tmp = strrchr(def->name, '/'); + + if (tmp == NULL || *def->name == '/' || tmp[1] == '\0') { + ESX_ERROR(VIR_ERR_INTERNAL_ERROR, + _("Volume name '%s' doesn't have expected format " + "'<directory>/<file>'"), def->name); + goto cleanup; + } + + if (! virFileHasSuffix(def->name, ".vmdk")) { + ESX_ERROR(VIR_ERR_INTERNAL_ERROR, + _("Volume name '%s' has unsupported suffix, expecting '.vmdk'"), + def->name); + goto cleanup; + } + + if (virAsprintf(&unescapedDatastorePath, "[%s] %s", pool->name, + def->name) < 0) { + virReportOOMError(); + goto cleanup; + } + + if (def->target.format == VIR_STORAGE_FILE_VMDK) { + /* Parse and escape datastore path */ + if (esxUtil_ParseDatastorePath(unescapedDatastorePath, NULL, + &unescapedDirectoryName, + &unescapedDirectoryAndFileName) < 0) { + goto cleanup; + } + + directoryName = esxUtil_EscapeDatastoreItem(unescapedDirectoryName); + + if (directoryName == NULL) { + goto cleanup; + } + + fileName = esxUtil_EscapeDatastoreItem(unescapedDirectoryAndFileName + + strlen(unescapedDirectoryName) + 1); + + if (fileName == NULL) { + goto cleanup; + } + + if (virAsprintf(&datastorePathWithoutFileName, "[%s] %s", pool->name, + directoryName) < 0) { + virReportOOMError(); + goto cleanup; + } + + if (virAsprintf(&datastorePath, "[%s] %s/%s", pool->name, directoryName, + fileName) < 0) { + virReportOOMError(); + goto cleanup; + } + + /* Create directory, if it doesn't exist yet */ + if (esxVI_LookupFileInfoByDatastorePath + (priv->primary, datastorePathWithoutFileName, true, &fileInfo, + esxVI_Occurrence_OptionalItem) < 0) { + goto cleanup; + } + + if (fileInfo == NULL) { + if (esxVI_MakeDirectory(priv->primary, datastorePathWithoutFileName, + priv->primary->datacenter->_reference, + esxVI_Boolean_True) < 0) { + goto cleanup; + } + } + + /* Copy VirtualDisk */ + if (esxVI_CopyVirtualDisk_Task(priv->primary, sourceDatastorePath, + priv->primary->datacenter->_reference, + datastorePath, + priv->primary->datacenter->_reference, + NULL, esxVI_Boolean_False, &task) < 0 || + esxVI_WaitForTaskCompletion(priv->primary, task, NULL, + esxVI_Occurrence_None, + priv->autoAnswer, &taskInfoState, + &taskInfoErrorMessage) < 0) { + goto cleanup; + } + + if (taskInfoState != esxVI_TaskInfoState_Success) { + ESX_ERROR(VIR_ERR_INTERNAL_ERROR, _("Could not copy volume: %s"), + taskInfoErrorMessage); + goto cleanup; + } + + if (priv->primary->hasQueryVirtualDiskUuid) { + if (VIR_ALLOC_N(key, VIR_UUID_STRING_BUFLEN) < 0) { + virReportOOMError(); + goto cleanup; + } + + if (esxVI_QueryVirtualDiskUuid(priv->primary, datastorePath, + priv->primary->datacenter->_reference, + &uuid_string) < 0) { + goto cleanup; + } + + if (esxUtil_ReformatUuid(uuid_string, key) < 0) { + goto cleanup; + } + } else { + /* Fall back to the path as key */ + if (esxVI_String_DeepCopyValue(&key, datastorePath) < 0) { + goto cleanup; + } + } + } else { + ESX_ERROR(VIR_ERR_INTERNAL_ERROR, + _("Creation of %s volumes is not supported"), + virStorageFileFormatTypeToString(def->target.format)); + goto cleanup; + } + + volume = virGetStorageVol(pool->conn, pool->name, def->name, key); + + cleanup: + VIR_FREE(sourceDatastorePath); + virStorageVolDefFree(def); + VIR_FREE(unescapedDatastorePath); + VIR_FREE(unescapedDirectoryName); + VIR_FREE(unescapedDirectoryAndFileName); + VIR_FREE(directoryName); + VIR_FREE(fileName); + VIR_FREE(datastorePathWithoutFileName); + VIR_FREE(datastorePath); + esxVI_FileInfo_Free(&fileInfo); + esxVI_ManagedObjectReference_Free(&task); + VIR_FREE(taskInfoErrorMessage); + VIR_FREE(uuid_string); + VIR_FREE(key); + + return volume; +} + + + static int esxStorageVolumeGetInfo(virStorageVolPtr volume, virStorageVolInfoPtr info) { @@ -1377,7 +1573,7 @@ static virStorageDriver esxStorageDriver = { esxStorageVolumeLookupByKey, /* volLookupByKey */ esxStorageVolumeLookupByPath, /* volLookupByPath */ esxStorageVolumeCreateXML, /* volCreateXML */ - NULL, /* volCreateXMLFrom */ + esxStorageVolumeCreateXMLFrom, /* volCreateXMLFrom */ NULL, /* volDelete */ NULL, /* volWipe */ esxStorageVolumeGetInfo, /* volGetInfo */ diff --git a/src/esx/esx_vi_generator.input b/src/esx/esx_vi_generator.input index 991ce8a..4018c6e 100644 --- a/src/esx/esx_vi_generator.input +++ b/src/esx/esx_vi_generator.input @@ -700,6 +700,17 @@ method CancelTask end +method CopyVirtualDisk_Task returns ManagedObjectReference r + ManagedObjectReference _this:VirtualDiskManager r + String sourceName r + ManagedObjectReference sourceDatacenter o + String destName r + ManagedObjectReference destDatacenter o + VirtualDiskSpec destSpec o + Boolean force o +end + + method CreateFilter returns ManagedObjectReference r ManagedObjectReference _this:PropertyCollector r PropertyFilterSpec spec r -- 1.7.0.4

2 2

[libvirt] [PATCH] qemu: Use -vga none only if it is supported
by Jiri Denemark 14 Dec '10

14 Dec '10

Commit febc591683cf51e4551f8bcf3ce279a776056e1c introduced -vga none in case no video card is included in domain XML. However, old qemu versions do not support this and such domain cannot be successfully started. --- src/qemu/qemu_conf.c | 10 ++++++- src/qemu/qemu_conf.h | 1 + tests/qemuhelptest.c | 18 +++++++++---- .../qemuxml2argvdata/qemuxml2argv-nographics.args | 1 + tests/qemuxml2argvdata/qemuxml2argv-nographics.xml | 25 ++++++++++++++++++++ tests/qemuxml2argvtest.c | 4 ++- 6 files changed, 50 insertions(+), 9 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-nographics.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-nographics.xml diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index e5d0206..d5e72cd 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -1220,6 +1220,7 @@ static unsigned long long qemudComputeCmdFlags(const char *help, unsigned int kvm_version) { unsigned long long flags = 0; + const char *p; if (strstr(help, "-no-kqemu")) flags |= QEMUD_CMD_FLAG_KQEMU; @@ -1252,11 +1253,15 @@ static unsigned long long qemudComputeCmdFlags(const char *help, if (strstr(help, "readonly=")) flags |= QEMUD_CMD_FLAG_DRIVE_READONLY; } - if (strstr(help, "-vga") && !strstr(help, "-std-vga")) { + if ((p = strstr(help, "-vga")) && !strstr(help, "-std-vga")) { + const char *nl = strstr(p, "\n"); + flags |= QEMUD_CMD_FLAG_VGA; if (strstr(help, "|qxl")) flags |= QEMUD_CMD_FLAG_VGA_QXL; + if ((p = strstr(p, "|none")) && p < nl) + flags |= QEMUD_CMD_FLAG_VGA_NONE; } if (strstr(help, "-spice")) flags |= QEMUD_CMD_FLAG_SPICE; @@ -5192,7 +5197,8 @@ qemudBuildCommandLine(virConnectPtr conn, } else { /* If we have -device, then we set -nodefault already */ if (!(qemuCmdFlags & QEMUD_CMD_FLAG_DEVICE) && - (qemuCmdFlags & QEMUD_CMD_FLAG_VGA)) + (qemuCmdFlags & QEMUD_CMD_FLAG_VGA) && + (qemuCmdFlags & QEMUD_CMD_FLAG_VGA_NONE)) virCommandAddArgList(cmd, "-vga", "none", NULL); } diff --git a/src/qemu/qemu_conf.h b/src/qemu/qemu_conf.h index 71318bf..2d0314c 100644 --- a/src/qemu/qemu_conf.h +++ b/src/qemu/qemu_conf.h @@ -101,6 +101,7 @@ enum qemud_cmd_flags { QEMUD_CMD_FLAG_SMBIOS_TYPE = (1LL << 44), /* Is -smbios type= available */ QEMUD_CMD_FLAG_VGA_QXL = (1LL << 45), /* The 'qxl' arg for '-vga' */ QEMUD_CMD_FLAG_SPICE = (1LL << 46), /* Is -spice avail */ + QEMUD_CMD_FLAG_VGA_NONE = (1LL << 47), /* The 'none' arg for '-vga' */ }; /* Main driver state */ diff --git a/tests/qemuhelptest.c b/tests/qemuhelptest.c index 5339ec8..f3b6537 100644 --- a/tests/qemuhelptest.c +++ b/tests/qemuhelptest.c @@ -173,7 +173,8 @@ mymain(int argc, char **argv) QEMUD_CMD_FLAG_ENABLE_KVM | QEMUD_CMD_FLAG_SDL | QEMUD_CMD_FLAG_RTC_TD_HACK | - QEMUD_CMD_FLAG_NO_HPET, + QEMUD_CMD_FLAG_NO_HPET | + QEMUD_CMD_FLAG_VGA_NONE, 10005, 0, 0); DO_TEST("qemu-kvm-0.10.5", QEMUD_CMD_FLAG_VNC_COLON | @@ -198,7 +199,8 @@ mymain(int argc, char **argv) QEMUD_CMD_FLAG_NO_HPET | QEMUD_CMD_FLAG_NO_KVM_PIT | QEMUD_CMD_FLAG_TDF | - QEMUD_CMD_FLAG_NESTING, + QEMUD_CMD_FLAG_NESTING | + QEMUD_CMD_FLAG_VGA_NONE, 10005, 1, 0); DO_TEST("kvm-86", QEMUD_CMD_FLAG_VNC_COLON | @@ -223,7 +225,8 @@ mymain(int argc, char **argv) QEMUD_CMD_FLAG_NO_KVM_PIT | QEMUD_CMD_FLAG_TDF | QEMUD_CMD_FLAG_NESTING | - QEMUD_CMD_FLAG_SMBIOS_TYPE, + QEMUD_CMD_FLAG_SMBIOS_TYPE | + QEMUD_CMD_FLAG_VGA_NONE, 10050, 1, 0); DO_TEST("qemu-kvm-0.11.0-rc2", QEMUD_CMD_FLAG_VNC_COLON | @@ -253,7 +256,8 @@ mymain(int argc, char **argv) QEMUD_CMD_FLAG_BOOT_MENU | QEMUD_CMD_FLAG_NESTING | QEMUD_CMD_FLAG_NAME_PROCESS | - QEMUD_CMD_FLAG_SMBIOS_TYPE, + QEMUD_CMD_FLAG_SMBIOS_TYPE | + QEMUD_CMD_FLAG_VGA_NONE, 10092, 1, 0); DO_TEST("qemu-0.12.1", QEMUD_CMD_FLAG_VNC_COLON | @@ -281,7 +285,8 @@ mymain(int argc, char **argv) QEMUD_CMD_FLAG_NO_HPET | QEMUD_CMD_FLAG_BOOT_MENU | QEMUD_CMD_FLAG_NAME_PROCESS | - QEMUD_CMD_FLAG_SMBIOS_TYPE, + QEMUD_CMD_FLAG_SMBIOS_TYPE | + QEMUD_CMD_FLAG_VGA_NONE, 12001, 0, 0); DO_TEST("qemu-kvm-0.12.3", QEMUD_CMD_FLAG_VNC_COLON | @@ -316,7 +321,8 @@ mymain(int argc, char **argv) QEMUD_CMD_FLAG_BOOT_MENU | QEMUD_CMD_FLAG_NESTING | QEMUD_CMD_FLAG_NAME_PROCESS | - QEMUD_CMD_FLAG_SMBIOS_TYPE, + QEMUD_CMD_FLAG_SMBIOS_TYPE | + QEMUD_CMD_FLAG_VGA_NONE, 12003, 1, 0); return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; diff --git a/tests/qemuxml2argvdata/qemuxml2argv-nographics.args b/tests/qemuxml2argvdata/qemuxml2argv-nographics.args new file mode 100644 index 0000000..0d3ef6f --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-nographics.args @@ -0,0 +1 @@ +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M pc -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -net none -serial none -parallel none -usb diff --git a/tests/qemuxml2argvdata/qemuxml2argv-nographics.xml b/tests/qemuxml2argvdata/qemuxml2argv-nographics.xml new file mode 100644 index 0000000..ed91e37 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-nographics.xml @@ -0,0 +1,25 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory>219200</memory> + <currentMemory>219200</currentMemory> + <vcpu>1</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu</emulator> + <disk type='block' device='disk'> + <source dev='/dev/HostVG/QEMUGuest1'/> + <target dev='hda' bus='ide'/> + <address type='drive' controller='0' bus='0' unit='0'/> + </disk> + <controller type='ide' index='0'/> + <memballoon model='virtio'/> + </devices> +</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 5fe91f1..662f7bb 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -325,7 +325,9 @@ mymain(int argc, char **argv) DO_TEST("graphics-sdl", 0, false); DO_TEST("graphics-sdl-fullscreen", 0, false); - DO_TEST("nographics-vga", QEMUD_CMD_FLAG_VGA, false); + DO_TEST("nographics", QEMUD_CMD_FLAG_VGA, false); + DO_TEST("nographics-vga", QEMUD_CMD_FLAG_VGA | + QEMUD_CMD_FLAG_VGA_NONE, false); DO_TEST("graphics-spice", QEMUD_CMD_FLAG_VGA | QEMUD_CMD_FLAG_VGA_QXL | QEMUD_CMD_FLAG_DEVICE | QEMUD_CMD_FLAG_SPICE, false); -- 1.7.3.3

4 8

[libvirt] [PATCHv2 0/5] smbios cleanups
by Eric Blake 14 Dec '10

14 Dec '10

No change to the first three patches (but reposting so they'll all be in the same thread). The last two patches are new. Eric Blake (5): qemu: avoid adding "" in smbios arguments smbios: support system family smbios: allow () in smbios strings uuid: require smbios uuid and domain uuid to match sysinfo: convert to virCommand docs/schemas/domain.rng | 3 +- src/conf/domain_conf.c | 31 ++++++++++++- src/qemu/qemu_conf.c | 40 ++++++++++------ src/util/sysinfo.c | 57 +++++++---------------- src/util/sysinfo.h | 1 + tests/qemuxml2argvdata/qemuxml2argv-smbios.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-smbios.xml | 20 ++++---- 7 files changed, 85 insertions(+), 69 deletions(-) -- 1.7.3.2

3 16

[libvirt] [PATCH] build: update gnulib for pipe on mingw
by Eric Blake 14 Dec '10

14 Dec '10

* .gnulib: Update to latest. * bootstrap.conf (gnulib_modules): Import pipe-posix for mingw. * src/remote/remote_driver.c (pipe): Drop dead macro. --- Matthias complianed on IRC that mingw builds are broken since they unconditionally build virCommand, which unconditionally uses pipe() and waitpid() even though those are missing on mingw. I've fixed pipe() in gnulib. waitpid() will need a bit more invasive fix; I'm thinking of creating: struct virPid { #ifdef WIN32 HANDLE pid; #else pid_t pid; #endif }; /* Wait for a child process to complete. */ int virPidWait(virPid pid, int *status) { #ifdef WIN32 whatever windows provides #else return waitpid(pid.pid, status, 0); #endif } or something like that. * .gnulib 6491120...e2f1471 (3): > pipe-posix: new module > * build-aux/gendocs.sh: restore x bit > autoupdate .gnulib | 2 +- bootstrap.conf | 1 + src/remote/remote_driver.c | 5 ----- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/.gnulib b/.gnulib index 6491120..e2f1471 160000 --- a/.gnulib +++ b/.gnulib @@ -1 +1 @@ -Subproject commit 64911207854610668b480939469282fdaeb96f74 +Subproject commit e2f1471b021a285916339a73bc12c6b44dbf9a76 diff --git a/bootstrap.conf b/bootstrap.conf index 2ad1957..dbed752 100644 --- a/bootstrap.conf +++ b/bootstrap.conf @@ -48,6 +48,7 @@ mktempd netdb perror physmem +pipe-posix poll posix-shell pthread diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index e6eb9b5..fae191c 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -86,11 +86,6 @@ #define VIR_FROM_THIS VIR_FROM_REMOTE -#ifdef WIN32 -# define pipe(fds) _pipe(fds,4096, _O_BINARY) -#endif - - static int inside_daemon = 0; struct remote_thread_call; -- 1.7.3.2

2 10

[libvirt] [PATCH] test: fix commantest under autobuild.sh
by Eric Blake 14 Dec '10

14 Dec '10

* tests/commandtest.c (mymain): Kill off any leaked-in fds. * autobuild.sh: Don't leak fds. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Autobuild failed because it triggered a commandtest failure where commandtest was too sensitive to the environment. Fix the problem at both ends - autobuild shouldn't leak, and commandtest should work even when somebody else leaked. autobuild.sh | 2 +- tests/commandtest.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/autobuild.sh b/autobuild.sh index 8248a59..91e2ab2 100755 --- a/autobuild.sh +++ b/autobuild.sh @@ -38,7 +38,7 @@ make install exec 3>&1 st=$( exec 4>&1 >&3 - { make check syntax-check 2>&1; echo $? >&4; } | tee "$RESULTS" + { make check syntax-check 2>&1 3>&- 4>&-; echo $? >&4; } | tee "$RESULTS" ) exec 3>&- test "$st" = 0 diff --git a/tests/commandtest.c b/tests/commandtest.c index a1bcf68..333dd4d 100644 --- a/tests/commandtest.c +++ b/tests/commandtest.c @@ -688,6 +688,12 @@ mymain(int argc, char **argv) if (chdir("/tmp") < 0) return(EXIT_FAILURE); + /* Kill off any inherited fds that might interfere with our + * testing. */ + close(3); + close(4); + close(5); + virInitialize(); const char *const newenv[] = { -- 1.7.3.2

2 2

[libvirt] [v2] qemu: Introduce two new job types
by Osier Yang 13 Dec '10

13 Dec '10

Currently, all of domain "save/dump/managed save/migration" use the same function "qemudDomainWaitForMigrationComplete" to wait the job finished, but the error messages are all about "migration", e.g. when a domain saving job is canceled by user, "migration was cancled by client" will be throwed as an error message, which will be confused for user. As a solution, intoduce two new job types(QEMU_JOB_SAVE, QEMU_JOB_DUMP), and set "priv->jobActive" to "QEMU_JOB_SAVE" before saving, to "QEMU_JOB_DUMP" before dumping, so that we could get the real job type in "qemudDomainWaitForMigrationComplete", and give more clear message further. And as It's not important to figure out what's the exact job is in the DEBUG and WARN log, also we don't need translated string in logs, simply repace "migration" with "job" in some statements. * src/qemu/qemu_driver.c --- src/qemu/qemu_driver.c | 40 +++++++++++++++++++++++++++++++--------- 1 files changed, 31 insertions(+), 9 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 19ce9a6..d5af0df 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -104,6 +104,8 @@ enum qemuDomainJob { QEMU_JOB_UNSPECIFIED, QEMU_JOB_MIGRATION_OUT, QEMU_JOB_MIGRATION_IN, + QEMU_JOB_SAVE, + QEMU_JOB_DUMP, }; enum qemuDomainJobSignals { @@ -5389,21 +5391,37 @@ qemuDomainWaitForMigrationComplete(struct qemud_driver *driver, virDomainObjPtr struct timespec ts = { .tv_sec = 0, .tv_nsec = 50 * 1000 * 1000ull }; struct timeval now; int rc; + const char *job; + + switch (priv->jobActive) { + case QEMU_JOB_MIGRATION_OUT: + job = _("migration job"); + break; + case QEMU_JOB_SAVE: + job = _("domain save job"); + break; + case QEMU_JOB_DUMP: + job = _("domain core dump job"); + break; + default: + job = _("job"); + } + if (!virDomainObjIsActive(vm)) { - qemuReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("guest unexpectedly quit during migration")); + qemuReportError(VIR_ERR_INTERNAL_ERROR, "%s: %s", + job, _("guest unexpectedly quit")); goto cleanup; } if (priv->jobSignals & QEMU_JOB_SIGNAL_CANCEL) { priv->jobSignals ^= QEMU_JOB_SIGNAL_CANCEL; - VIR_DEBUG0("Cancelling migration at client request"); + VIR_DEBUG0("Cancelling job at client request"); qemuDomainObjEnterMonitorWithDriver(driver, vm); rc = qemuMonitorMigrateCancel(priv->mon); qemuDomainObjExitMonitorWithDriver(driver, vm); if (rc < 0) { - VIR_WARN0("Unable to cancel migration"); + VIR_WARN0("Unable to cancel job"); } } else if (priv->jobSignals & QEMU_JOB_SIGNAL_SUSPEND) { priv->jobSignals ^= QEMU_JOB_SIGNAL_SUSPEND; @@ -5427,8 +5445,8 @@ qemuDomainWaitForMigrationComplete(struct qemud_driver *driver, virDomainObjPtr * guest to die */ if (!virDomainObjIsActive(vm)) { - qemuReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("guest unexpectedly quit during migration")); + qemuReportError(VIR_ERR_INTERNAL_ERROR, "%s: %s", + job, _("guest unexpectedly quit")); goto cleanup; } @@ -5459,7 +5477,7 @@ qemuDomainWaitForMigrationComplete(struct qemud_driver *driver, virDomainObjPtr case QEMU_MONITOR_MIGRATION_STATUS_INACTIVE: priv->jobInfo.type = VIR_DOMAIN_JOB_NONE; qemuReportError(VIR_ERR_OPERATION_FAILED, - "%s", _("Migration is not active")); + "%s: %s", job, _("is not active")); break; case QEMU_MONITOR_MIGRATION_STATUS_ACTIVE: @@ -5480,13 +5498,13 @@ qemuDomainWaitForMigrationComplete(struct qemud_driver *driver, virDomainObjPtr case QEMU_MONITOR_MIGRATION_STATUS_ERROR: priv->jobInfo.type = VIR_DOMAIN_JOB_FAILED; qemuReportError(VIR_ERR_OPERATION_FAILED, - "%s", _("Migration unexpectedly failed")); + "%s: %s", job, _("unexpectedly failed")); break; case QEMU_MONITOR_MIGRATION_STATUS_CANCELLED: priv->jobInfo.type = VIR_DOMAIN_JOB_CANCELLED; qemuReportError(VIR_ERR_OPERATION_FAILED, - "%s", _("Migration was cancelled by client")); + "%s: %s", job, _("canceled by client")); break; } @@ -5606,6 +5624,8 @@ static int qemudDomainSaveFlag(struct qemud_driver *driver, virDomainPtr dom, goto endjob; } + priv->jobActive = QEMU_JOB_SAVE; + memset(&priv->jobInfo, 0, sizeof(priv->jobInfo)); priv->jobInfo.type = VIR_DOMAIN_JOB_UNBOUNDED; @@ -6198,6 +6218,8 @@ static int qemudDomainCoreDump(virDomainPtr dom, goto endjob; } + priv->jobActive = QEMU_JOB_DUMP; + /* Migrate will always stop the VM, so the resume condition is independent of whether the stop command is issued. */ resume = (vm->state == VIR_DOMAIN_RUNNING); -- 1.7.3.2

2 1