- Devel - libvirt List Archives

[libvirt] REG: JAVA API for physical host addition
by srivatsan jagannathan 04 Aug '11

04 Aug '11

Hi Team, I working on performance measurement of various cloud management software. I am working on code such that it will calculate (cpu usage, memory usage, disk io, time of operation & network bandwidth usage) for various cloud management operation. once such operation is adding 2 or 3 physical host and obtain the above measurement. Is there is any java api that support this function. what I need is for creating instance there is method Create() in class Domain, I need same operation for physical host. Regards, Srivatsan J.

1 0

[libvirt] ANNOUNCE: libvirt Perl bindings Sys::Virt 0.9.4 release
by Daniel P. Berrange 04 Aug '11

04 Aug '11

I am happy to announce a new release[1] of the libvirt Perl bindings, Sys::Virt 0.9.4 is available for download: http://search.cpan.org/CPAN/authors/id/D/DA/DANBERR/Sys-Virt-0.9.4.tar.gz Changes in this release - Add all new APIs in libvirt 0.9.4 - Requires libvirt >= 0.9.4 - Add missing VIR_DUMP_* and VIR_MIGRATE_* constants from previous releases The permanent link for the Sys::Virt package, where all historic releases can be found, is http://search.cpan.org/dist/Sys-Virt/ Thanks to everyone who contributed to this release through testing, bug reporting, patch submission, etc. Regards, Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|

1 0

[libvirt] [PATCH v3] daemon: Unlink unix socket paths on shutdown
by Osier Yang 04 Aug '11

04 Aug '11

This patch introduces a internal RPC API "virNetServerClose", which is standalone with "virNetServerFree". it closes all the socket fds, and unlinks the unix socket paths, regardless of whether the socket is still referenced or not. This is to address regression bug: https://bugzilla.redhat.com/show_bug.cgi?id=725702 --- daemon/libvirtd.c | 1 + src/rpc/virnetserver.c | 16 ++++++++++++++++ src/rpc/virnetserver.h | 1 + src/rpc/virnetserverservice.c | 12 ++++++++++++ src/rpc/virnetserverservice.h | 2 ++ src/rpc/virnetsocket.c | 22 ++++++++++++++++++++++ src/rpc/virnetsocket.h | 1 + 7 files changed, 55 insertions(+), 0 deletions(-) diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c index 9e044e2..53f1002 100644 --- a/daemon/libvirtd.c +++ b/daemon/libvirtd.c @@ -1558,6 +1558,7 @@ int main(int argc, char **argv) { cleanup: virNetServerProgramFree(remoteProgram); virNetServerProgramFree(qemuProgram); + virNetServerClose(srv); virNetServerFree(srv); if (statuswrite != -1) { if (ret != 0) { diff --git a/src/rpc/virnetserver.c b/src/rpc/virnetserver.c index 5e4826b..1a49dbb 100644 --- a/src/rpc/virnetserver.c +++ b/src/rpc/virnetserver.c @@ -798,3 +798,19 @@ void virNetServerFree(virNetServerPtr srv) virMutexDestroy(&srv->lock); VIR_FREE(srv); } + +void virNetServerClose(virNetServerPtr srv) +{ + int i; + + if (!srv) + return; + + virNetServerLock(srv); + + for (i = 0; i < srv->nservices; i++) { + virNetServerServiceClose(srv->services[i]); + } + + virNetServerUnlock(srv); +} diff --git a/src/rpc/virnetserver.h b/src/rpc/virnetserver.h index 810d8a3..324cfb7 100644 --- a/src/rpc/virnetserver.h +++ b/src/rpc/virnetserver.h @@ -85,5 +85,6 @@ void virNetServerQuit(virNetServerPtr srv); void virNetServerFree(virNetServerPtr srv); +void virNetServerClose(virNetServerPtr srv); #endif diff --git a/src/rpc/virnetserverservice.c b/src/rpc/virnetserverservice.c index d5648dc..8c9ed1e 100644 --- a/src/rpc/virnetserverservice.c +++ b/src/rpc/virnetserverservice.c @@ -280,3 +280,15 @@ void virNetServerServiceToggle(virNetServerServicePtr svc, VIR_EVENT_HANDLE_READABLE : 0); } + +void virNetServerServiceClose(virNetServerServicePtr svc) +{ + int i; + + if (!svc) + return; + + for (i = 0; i < svc->nsocks; i++) { + virNetSocketClose(svc->socks[i]); + } +} diff --git a/src/rpc/virnetserverservice.h b/src/rpc/virnetserverservice.h index 9357598..8540bd9 100644 --- a/src/rpc/virnetserverservice.h +++ b/src/rpc/virnetserverservice.h @@ -66,4 +66,6 @@ void virNetServerServiceFree(virNetServerServicePtr svc); void virNetServerServiceToggle(virNetServerServicePtr svc, bool enabled); +void virNetServerServiceClose(virNetServerServicePtr svc); + #endif diff --git a/src/rpc/virnetsocket.c b/src/rpc/virnetsocket.c index 41b691a..992e33a 100644 --- a/src/rpc/virnetsocket.c +++ b/src/rpc/virnetsocket.c @@ -1222,3 +1222,25 @@ void virNetSocketRemoveIOCallback(virNetSocketPtr sock) virMutexUnlock(&sock->lock); } + +void virNetSocketClose(virNetSocketPtr sock) +{ + if (!sock) + return; + + virMutexLock(&sock->lock); + + VIR_FORCE_CLOSE(sock->fd); + +#ifdef HAVE_SYS_UN_H + /* If a server socket, then unlink UNIX path */ + if (!sock->client && + sock->localAddr.data.sa.sa_family == AF_UNIX && + sock->localAddr.data.un.sun_path[0] != '\0') { + if (unlink(sock->localAddr.data.un.sun_path) == 0) + sock->localAddr.data.un.sun_path[0] = '\0'; + } +#endif + + virMutexUnlock(&sock->lock); +} diff --git a/src/rpc/virnetsocket.h b/src/rpc/virnetsocket.h index dfb3c5d..1e1c63c 100644 --- a/src/rpc/virnetsocket.h +++ b/src/rpc/virnetsocket.h @@ -118,6 +118,7 @@ void virNetSocketUpdateIOCallback(virNetSocketPtr sock, void virNetSocketRemoveIOCallback(virNetSocketPtr sock); +void virNetSocketClose(virNetSocketPtr sock); #endif /* __VIR_NET_SOCKET_H__ */ -- 1.7.6

3 4

[libvirt] speeding up qemu core dumps
by Jim Fehlig 04 Aug '11

04 Aug '11

Hi All, I've had user reports of "libvirt limiting KVM core dumps". This isn't quite true since libvirt just uses the default migration speed defined in qemu's migration.c /* Migration speed throttling */ static int64_t max_throttle = (32 << 20); AFAIK, there's not much interest in changing the qemu default http://lists.nongnu.org/archive/html/qemu-devel/2011-02/msg01156.html I thought there were more discussions on the topic but can only find the above thread ATM. Do folks here have objections to increasing the migration speed prior to core dump? If not, any suggestions for a value? I set the migration speed to 1G in doCoreDump() prior to calling qemuMigrationToFile() with following improvement dumping a 4G guest 32MiB/s migration speed (qemu default): # time virsh dump --live test /tmp/dump Domain test dumped to /tmp/dump real 0m10.121s user 0m0.004s sys 0m0.004s 1GiB/s migration speed: # time virsh dump --live test /tmp/dump Domain test dumped to /tmp/dump real 0m3.745s user 0m0.004s sys 0m0.004s I suppose the same applies for save. Regards, Jim

3 3

[libvirt] Release of libvirt-0.9.4
by Daniel Veillard 03 Aug '11

03 Aug '11

With an extra day of delay but allowing to pick all coverity checks related patches from Eric, the release is out, I hope it's solid :-) available as usual at: ftp://libvirt.org/libvirt/libvirt-0.9.4.tar.gz along with signed RPMs This is again a fairly big release with more than 400 commits included, both new API, improvement and a large amount of fixes: Features: - bandwidth QoS control (Michal Privoznik) - Add new API virDomainBlockPull* (Adam Litke) - save: new API to manipulate save file images (Eric Blake) - CPU bandwidth limits support (Wen Congyang) - allow to send NMI and key event to guests (Lai Jiangshan) - new API virDomainUndefineFlags (Osier Yang) - Implement code to attach to external QEMU instances. (Daniel P. Berrange) - various missing python binding (Hu Tao and Lai Jiangshan) - bios: Add support for SGA (Michal Privoznik) Documentation: - doc: fix confusing statement about required privileges (Eric Blake) - doc: fix incorrect option in blockjob (Alex Jia) - Correct the default value of lock_manager in qemu.conf (Guannan Ren) - libvirt.c: Update outdated description of flags (Michal Privoznik) - qemu: Improve docs for virsh dump format (Osier Yang) - qemu: improve thread documentation (Eric Blake) - doc: Add doc for blockpull and blockjob commands (Osier Yang) - Fix incorrect implication about list options (Dave Allan) - Fix typos in virsh.pod file (Daniel P. Berrange) - network: Fix typo (Osier Yang) - Break up 'Basic Resources' XML section (Cole Robinson) - driver.h: Fix two driver documentation mistakes (Wieland Hoffmann) - doc: Add documentation for new cputune elements period and quota (Wen Congyang) - doc: Correct documents for iface commands (Osier Yang) - improve virsh man page synopses (Eric Blake) - Fix spice documentation typo (Michal Privoznik) - document dxml argument to migrate2 (Eric Blake) - website: Point main page links to libvirt driver pages (Dave Allan) - maint: fix typos (Eric Blake) - mention EMOTIVE as a libvirt-using app (Eric Blake) - virsh: Update virsh man page (Supriya Kannery) - Fix virsh inject-nmi man page (KAMEZAWA Hiroyuki) - virsh: make destroy sound less scary (Eric Blake) - minor whitespace cleanups (Eric Blake) - Add documentation for the seclabel XML element (Daniel P. Berrange) Portability: - build: fix include path for cygwin (Eric Blake) - build: avoid non-portable shell in test setup (Eric Blake) - tests: Don't use bash if we don't have to (Matthias Bolte) - freebsd: Fix build problem due to picking up the wrong libvirt.h (Matthias Bolte) - freebsd: Avoid /bin/true in commandtest (Matthias Bolte) - freebsd: Add gnulib environ module for the commandtest (Matthias Bolte) - build: support warnings on RHEL 5 (Eric Blake) - Build: fix build if HAVE_AVAHI is not defined (Stefan Berger) - sysinfo: Don't try to run dmidecode on archs missing it (Michal Privoznik) - udev: Don't try to dump DMI on non-intel archs (Michal Privoznik) - Fix build when using polkit0 (Jim Fehlig) - Fix rpm build with sanlock and without QEmu (Daniel Veillard) - Skip some xen tests if xend is not running (Jim Fehlig) - build: fix virBufferVasprintf on mingw (Eric Blake) - Fix compilation of statstest.c during make check (Jim Fehlig) - Fix compilation error when SASL support is disabled (Jean-Baptiste Rouault) - tests: Disable networkxml2argvtest when configured without network (Matthias Bolte) Bug Fixes: - util: plug memory leak (Eric Blake) - rpc: avoid null deref (Eric Blake) - qemu: avoid memory leaks (Eric Blake) - qemu: plug child process leak on domain core dump (Eric Blake) - conf: avoid memory leak on disk operations (Eric Blake) - rpc: avoid crash on error (Eric Blake) - qemu: avoid null deref on block pull error (Eric Blake) - rpc: correctly process sasl whitelist globs (Eric Blake) - screenshot: don't unlink bogus file (Eric Blake) - python: avoid unlikely sign extension bug (Eric Blake) - rpc: avoid uninitialized memory use (Eric Blake) - rpc: avoid double close on error (Eric Blake) - qemu: Unlink temporary file on failure (Michal Privoznik) - rpc: avoid libvirtd crash on unexpected client close (Eric Blake) - virsh: fix memory leak in cmdNetworkInfo (Alex Jia) - openvz: detect when a domain was shut down from the inside (Jean-Baptiste Rouault) - qemu: fix crash when mixing sync and async monitor jobs (Eric Blake) - qemu: fix return value issue (Alex Jia) - qemu: fix return value issue in qemuDomainSetMemoryParameters (Alex Jia) - virsh: Fix vol-name and vol-pool commands (Matthias Bolte) - qemu: Fix a regression of domjobabort (Osier Yang) - conf: Don't leak the virtual port profile in virNetworkDefFree (Matthias Bolte) - network: don't forward DNS requests from isolated networks (Laine Stump) - virsh: avoid missing zero value judgement in cmdBlkiotune (Alex Jia) - qemu: fix nested job with driver lock held (Eric Blake) - qemu: Fix memory leak on metadata fetching (Michal Privoznik) - virsh: fix memory leak in cmdVolPath code (Alex Jia) - rpc: Fix memory leak in remoteDomainSet*Parameters functions (Matthias Bolte) - qemu: Recover from interrupted migration (Jiri Denemark) - python: Properly report errors if virStreamRecv fails (Cole Robinson) - Fix race in ref counting when handling RPC jobs (Daniel P. Berrange) - Fix build with gnutls 1.0.x branch (Daniel P. Berrange) - Add libtasn1-devel as a BuildRequires for libvirt.spec (Daniel P. Berrange) - Add mutex protection to SASL and TLS modules (Daniel P. Berrange) - Report error if unable to bind to any socket (Daniel P. Berrange) - Fix leak of mDNS object in virNetServer (Daniel P. Berrange) - Fix memory leaks in MDNS code (Daniel P. Berrange) - python: Handle embedded NUL in stream.send data (Cole Robinson) - Catch dnsmasq start failures (Guido Günther) - Fix import of private key with older gnutls (Daniel P. Berrange) - Fix TLS context tests with expired certs (Daniel P. Berrange) - Honour filesystem readonly flag & make special FS readonly (Daniel P. Berrange) - xenapi: Fix double-freeing the session in xenapiClose (Matthias Bolte) - remote: Fix forgotten comma (Michal Privoznik) - qemu: fix error message with migrate2 xml (Eric Blake) - command: avoid leaking fds across fork (Eric Blake) - error: preserve errno when saving last error (Eric Blake) - Fix uninitialized variable in QEMU CPU bandwidth code (Daniel P. Berrange) - fix make syntax-check error (Wen Congyang) - rpc: Pass through DISPLAY so ssh can launch askpass (Cole Robinson) - Don't try to close a NULL virNetClientPtr (Guannan Ren) - Honour key usage/purpose criticality flag (Daniel P. Berrange) - Fix reporting of errors for p2p migration (Daniel P. Berrange) - Use a virFreeCallback on virNetSocket to ensure safe release (Daniel P. Berrange) - Add mutex locking and reference counting to virNetSocket (Daniel P. Berrange) - util: avoid fds leak when virEventPollAddHandle fail (Alex Jia) - virsh: avoid double free of domain (Alex Jia) - build: Fix protocol-structs check in VPATH build (Jiri Denemark) - Fix now dead cleanup of VMs on libvirtd restart (Daniel P. Berrange) - qemu: Fix a regression of attaching device (Osier Yang) - storage: Avoid memory leak on metadata fetching (Michal Privoznik) - qemu: Don't overwrite errors by closefd in error paths (Jiri Denemark) - qemu: Save domain status ASAP after creating qemu process (Jiri Denemark) - util: Avoid duplicating virFileOpenAsNoFork in virFileOpenAs (Jiri Denemark) - virsh: fix missing prompt message for 'snapshot-delete' command (Nan Zhang) - Ensure signal handler propagates fatal signals to default handler (Daniel P. Berrange) - qemu: Fix monitor unlocking in some error paths (Jiri Denemark) - esx: Initialize all instances of esxVMX_Data to zero (Matthias Bolte) - qemu: avoid fd leak on core dump failure (Eric Blake) - domain_conf: Free temporary variable (Michal Privoznik) - esx: Fix a potential crash (Osier Yang) - remote: Fix memory leak (Alex Jia) - kill vm if saving config failed in v3 protocol (Wen Congyang) - Don't exit if the libvirtd config does not exist (Daniel P. Berrange) - Fix sending of reply to final RPC message (Daniel P. Berrange) - Fix leak of remote driver if final 'CLOSE' RPC call fails (Daniel P. Berrange) - Fix release of outgoing stream confirmation/abort message (Daniel P. Berrange) - Fix leak of 'msg' object in client stream code (Daniel P. Berrange) - Fix potential crash in libvirtd with active streams (Daniel P. Berrange) - Fix mistaken order of server cert/key parameters in constructor (Daniel P. Berrange) - util: Don't try to fchown files opened as non-root (Jiri Denemark) - qemu: Don't chown files on NFS share if dynamic_ownership is off (Michal Privoznik) - python: Fix bogus label placement (Matthias Bolte) - util: close the ioctl socket at the end of if(Get|Set)MacAddress (Laine Stump) - pci: initialize state values on reattach (Guannan Ren) - qemu: Fix virFileMakePath error handling in snapshot creation (Matthias Bolte) - storage: Do not override the exact error of createRawFile (Osier Yang) Improvements: - build: allow caching the input to STATIC_ANALYSIS (Eric Blake) - fdstream: drop delete argument (Eric Blake) - save: generate idempotent inactive xml for running domain (Eric Blake) - conf: make 'vnet' prefix a macro (Eric Blake) - utils: More useful error message for hook script failure (Osier Yang) - tests: Unify style of test skipping code (Matthias Bolte) - save: let qemu driver manipulate save files (Eric Blake) - save: support qemu modifying xml on domain save/restore (Eric Blake) - xen: make direct call when there is only one subdriver (Eric Blake) - xen: reduce callback special cases (Eric Blake) - xen: cleanup callback struct (Eric Blake) - libxl: fix build failure due to change in virDomainGraphicsDef (Laine Stump) - qemu: support type=network in domain graphics <listen> (Laine Stump) - conf: add <listen> subelement to domain <graphics> element (Laine Stump) - python: add python binding for virDomainSetMemoryParameters (Hu Tao) - python: add python binding for virDomainGetMemoryParameters (Hu Tao) - python: add python binding for virDomainSetBlkioParameters (Hu Tao) - python: add python binding for virDomainGetBlkioParameters (Hu Tao) - virsh: expose change-protection during migration (Eric Blake) - send-key: Implement Python API (Lai Jiangshan) - qemu: Remove special case for virDomainAbortJob (Jiri Denemark) - qemu: Remove special case for virDomainSuspend (Jiri Denemark) - qemu: Remove special case for virDomainMigrateSetMaxDowntime (Jiri Denemark) - qemu: Remove special case for virDomainMigrateSetMaxSpeed (Jiri Denemark) - qemu: Remove special case for virDomainBlockStats (Jiri Denemark) - qemu: Remove special case for virDomainGetBlockInfo (Jiri Denemark) - qemu: Migration job on source daemon (Jiri Denemark) - qemu: Migration job on destination daemon (Jiri Denemark) - qemu: Implement migration job phases (Jiri Denemark) - bandwidth: Integrate bandwidth into portgroups (Michal Privoznik) - tools: format percent strings of nodecpustats (Alex Jia) - set cpu bandwidth for the vm (Wen Congyang) - virsh: use faster bit search (Eric Blake) - virsh: make vcpucount use --current consistently (Eric Blake) - vcpu: teach getVcpusFlags about current (Eric Blake) - util: change virFile*Pid functions to return < 0 on failure (Laine Stump) - rename cfs_* to vcpu_* (Wen Congyang) - python: add Python binding for virDomainGetVcpuPinInfo API (Taku Izumi) - python: add Python binding for virDomainPinVcpusFlags API (Taku Izumi) - python: add Python binding for virDomainGetSchedulerParametersFlags API (Taku Izumi) - python: add Python binding for virDomainGetSchedulerParametersFlags API (Taku Izumi) - tests: detect gnutls errors (Eric Blake) - bandwidth: Add domain schema and xml2xml tests (Michal Privoznik) - bandwidth: Add test cases for network (Michal Privoznik) - bandwidth: Implement functions to enable and disable QoS (Michal Privoznik) - bandwidth: Create format functions (Michal Privoznik) - bandwidth: Add parsing and free functions (Michal Privoznik) - bandwidth: Declare internal structures (Michal Privoznik) - bandwidth: Define schema and create documentation (Michal Privoznik) - network: provide internal API to return IP of a network (Laine Stump) - util: add an ifaceGetIPAddress to the interface utilities (Laine Stump) - Pre-create /var/lib/libvirt/sanlock directory (Daniel P. Berrange) - Refactor mounting of special filesystems (Daniel P. Berrange) - Pull code for doing a bind mount into separate method (Daniel P. Berrange) - Fix typos in daemon config file from previous commit (Daniel P. Berrange) - Add a test case for certificate validation (Daniel P. Berrange) - Allow certificate sanity checking to be disabled (Daniel P. Berrange) - remote/ssh: optional "keyfile" parameter. (Oskari Saarenmaa) - util: make interface.c functions consistently return < 0 on error (Laine Stump) - Refactor the certification validation code (Daniel P. Berrange) - Remove call to deprecated gnutls_certificate_type_set_priority (again) (Daniel P. Berrange) - Ensure that libvirtd shuts down if initialization fails (Daniel P. Berrange) - Asynchronous event for BlockJob completion (Adam Litke) - Enable virDomainBlockPull in the python API (Adam Litke) - Enable the virDomainBlockPull API in virsh (Adam Litke) - Implement virDomainBlockPull for the qemu driver (Adam Litke) - Add virDomainBlockPull support to the remote driver (Adam Litke) - virDomainBlockPull: Implement the main entry points (Adam Litke) - save: add virsh commands for manipulating save files (Eric Blake) - save: wire up remote protocol (Eric Blake) - save: support bypass-cache flag in libvirt-guests init script (Eric Blake) - save: support bypass-cache flag in qemu.conf (Eric Blake) - save: support BYPASS_CACHE during qemu save/restore (Eric Blake) - save: add virFileDirectFd wrapper type (Eric Blake) - save: let iohelper work on O_DIRECT fds (Eric Blake) - save: let iohelper handle inherited fd (Eric Blake) - save: support --xml to virsh save/restore (Eric Blake) - save: add --bypass-cache flag to virsh save/restore operations (Eric Blake) - save: wire up trivial save/restore flags implementations (Eric Blake) - error: add new error type for reflecting partial API support (Eric Blake) - network: internal API functions to manage assignment of physdev to guest (Laine Stump) - qemu: use virDomainNetGetActual*() in qemuDomainXMLToNative (Laine Stump) - qemu: use virDomainNetGetActual*() functions where appropriate (Laine Stump) - network: separate Start/Shutdown functions for new network types (Laine Stump) - conf: support abstracted interface info in network XML (Laine Stump) - conf: support abstracted interface info in domain interface XML (Laine Stump) - conf: virDomainNetDef points to (rather than contains) virtPortProfile (Laine Stump) - conf: put virtPortProfile struct / functions in a common location (Laine Stump) - destroy: Implement internal API for xenapi driver (Michal Privoznik) - destroy: Implement internal API for xen driver (Michal Privoznik) - destroy: Implement internal API for vmware driver (Michal Privoznik) - destroy: Implement internal API for vbox driver (Michal Privoznik) - destroy: Implement internal API for uml driver (Michal Privoznik) - destroy: Implement internal API for phyp driver (Michal Privoznik) - destroy: Implement internal API for openvz driver (Michal Privoznik) - destroy: Implement internal API for lxc driver (Michal Privoznik) - destroy: Implement internal API for libxl driver (Michal Privoznik) - destroy: Implement internal API for ESX driver (Michal Privoznik) - destroy: Implement internal API for qemu driver (Michal Privoznik) - destroy: Wire up the remote protocol (Michal Privoznik) - destroy: Define new public API virDomainDestroyFlags (Michal Privoznik) - save: wire up remote protocol (Eric Blake) - save: new public API to bypass file system cache on save/restore (Eric Blake) - build: rename files.h to virfile.h (Eric Blake) - command: move all docs into .c file (Eric Blake) - rpc: Make the dispatch generator handle 'void name(void)' style procedures (Matthias Bolte) - python: Fix makefile rule for code generation (Matthias Bolte) - qemu: Implement cfs_period and cfs_quota's modification (Wen Congyang) - qemu: Implement period and quota tunable XML configuration and parsing (Wen Congyang) - Update XML Schema for new entries (Wen Congyang) - cgroup: Implement cpu.cfs_period_us and cpu.cfs_quota_us tuning API (Wen Congyang) - Introduce the function virCgroupForVcpu (Wen Congyang) - qemu: send-key: Implement the driver methods (Lai Jiangshan) - send-key: Expose the new API in virsh (Lai Jiangshan) - util: add virtkeycode module (Lai Jiangshan) - util: Add keymaps.csv (Lai Jiangshan) - Fix checking of key usage/purpose data (Daniel P. Berrange) - Fix mixed up error messages when reporting TLS certificate problems (Daniel P. Berrange) - undefine: Extend virsh undefine to support the new flag (Osier Yang) - undefine: Implement undefineFlags for all other drivers (Osier Yang) - undefine: Implement internal API for libxl driver (Osier Yang) - undefine: Implement internal API for qemu driver (Osier Yang) - undefine: Wire up the remote protocol (Osier Yang) - undefine: Define the new API (Osier Yang) - Add sanity checking of basic constraints, key purpose & key usage (Daniel P. Berrange) - Add some basic sanity checking of certificates before use (Daniel P. Berrange) - Add an explicit virNetClientClose method (Daniel P. Berrange) - Add some debugging for virNetClient reference counting (Daniel P. Berrange) - build: detect doc generation failure (Eric Blake) - Unregister event callback if a fatal error occurs during dispatch (Daniel P. Berrange) - Quieten build & ensure API build scripts exit with non-zero status (Daniel P. Berrange) - virsh: Extend virsh dominfo to display if managed save image exists (Osier Yang) - libvirt: do not mix internal flags into public API (Eric Blake) - rpc: Fix typos in rpc generator scripts (Osier Yang) - build: also track RPC on-wire enum values (Eric Blake) - build: add syntax check for proper flags use (Eric Blake) - xen: reject unknown flags (Eric Blake) - esx: reject unknown flags (Eric Blake) - virsh: improve option handling (Eric Blake) - flags: fix domain_conf migration regression (Eric Blake) - flags: fix qemu migration regression (Eric Blake) - flags: use common dumpxml flags check (Eric Blake) - add --cache, --serial, --shareable and --address to attach-disk (Hu Tao) - Fix error message for missing TLS write function (Daniel P. Berrange) - Fix reporting of cert validation failures (Daniel P. Berrange) - Fix error code for storage operations (Dave Allan) - setvcpus: add "--current" option to "virsh setvcpus" (Taku Izumi) - setvcpus: extend qemuDomainSetVcpusFlags() to support current flag (Taku Izumi) - setvcpus: extend virDomainSetVcpusFlags API to support current flag (Taku Izumi) - Add domain events support to UML driver (Daniel P. Berrange) - virnetsocket: use new API for uniform child cleanup (Eric Blake) - fdstream: avoid child process leak on error (Eric Blake) - command: introduce virPidWait, virPidAbort (Eric Blake) - update apparmor security driver for new udev paths (Jamie Strandboge) - xenapi: Improve error reporting in xenapiOpen (Matthias Bolte) - build: fix VPATH build of todo (Eric Blake) - build: check for virnetprotocol on-the-wire stability (Eric Blake) - build: disable some drivers when building without libvirt daemon (Wen Congyang) - build: avoid ATTRIBUTE_UNUSED in headers (Eric Blake) - remote: prefer unsigned flags (Eric Blake) - conf: delete unused flags arguments (Eric Blake) - virsh: fix previous patch (Jiri Denemark) - virsh: Make "DEBUG" loglevel the superset (Supriya Kannery) - virsh: Avoid using magic numbers for logging (Supriya Kannery) - build: don't hand-roll cloexec code (Eric Blake) - conf: prefer unsigned flags (Eric Blake) - python: prefer unsigned flags (Eric Blake) - node_device: avoid implicit int (Eric Blake) - virsh, daemon: prefer unsigned flags (Eric Blake) - xenapi: reject unknown flags (Eric Blake) - vmware: reject unknown flags (Eric Blake) - vbox: reject unknown flags (Eric Blake) - uml: reject unknown flags (Eric Blake) - test: reject unknown flags (Eric Blake) - qemu: reject unknown flags (Eric Blake) - phyp: reject unknown flags (Eric Blake) - openvz: reject unknown flags (Eric Blake) - lxc: reject unknown flags (Eric Blake) - libxl: reject unknown flags (Eric Blake) - qemu: build failed due to unused variables (Peter Krempa) - storage: reject unknown flags (Eric Blake) - node_device: reject unknown flags (Eric Blake) - util: reject unknown flags, and prefer unsigned flags (Eric Blake) - libvirt-qemu: use unsigned flags (Eric Blake) - maint: print flags in hex during debug (Eric Blake) - maint: exclude more files from syntax check (Eric Blake) - util: honor anchored names when searching for executables (Eric Blake) - Remove unused virNetServerProgramErrorHander typedef (Daniel P. Berrange) - qemu: Consolidate qemuMigrationPrepare{Direct,Tunnel} (Jiri Denemark) - qemu: Add support for job phase (Jiri Denemark) - qemu: Recover from interrupted jobs (Jiri Denemark) - qemu: Save job type in domain status XML (Jiri Denemark) - qemu: Allow all query commands to be run during long jobs (Jiri Denemark) - qemu: Consolidate {Enter,Exit}Monitor{,WithDriver} (Jiri Denemark) - qemu: Consolidate BeginJob{,WithDriver} into a single method (Jiri Denemark) - qemu: Separate job related data into a new object (Jiri Denemark) - maint: avoid incremental 'make syntax-check' failure (Eric Blake) - Skip bugs which are CLOSED in todo list (Daniel P. Berrange) - Add missing cleanup for transient guests in UML driver (Daniel P. Berrange) - Add auditing to the UML driver (Daniel P. Berrange) - Add auditing to the LXC driver (Daniel P. Berrange) - Add virtualization type in audit messages (Daniel P. Berrange) - Add auditing of filesystems (Daniel P. Berrange) - Move qemu_audit.h helpers into shared code (Daniel P. Berrange) - rpc: Fix compile error due to potentially unused parameter (Matthias Bolte) - Add monitor API for checking whether KVM is enabled (Daniel P. Berrange) - Add a method for extracting QEMU argv from /proc (Daniel P. Berrange) - Change extract pidfile & monitor config from QEMU command line (Daniel P. Berrange) - Keep pidfile path in qemuDomainObjPrivate struct (Daniel P. Berrange) - Add a new 'virsh qemu-attach' command. (Daniel P. Berrange) - Define remote wire protocol & impls for virDomainQemuAttach (Daniel P. Berrange) - Define a QEMU specific API to attach to a running QEMU process (Daniel P. Berrange) - qemu: update configuration file (Alex Jia) - maint: rename virtaudit to match file contents (Eric Blake) - remote/ssh: support for no_verify. (Oskari Saarenmaa) - build: also check qemu_protocol for on-the-wire stability (Eric Blake) - build: avoid requiring -lm (Eric Blake) - Remove code no longer used after commit df0b57a9 (Jim Fehlig) - Add domain type checking (Matthias Bolte) - tests: simplify formatting (Eric Blake) - Do not drop kernel cmdline for xen pv domains (Jim Fehlig) - RPC: fix argument's name (Wen Congyang) - fix typo error (Wen Congyang) - vbox: Fix logic in storage driver open function (Matthias Bolte) - tests: Improve output of tests that decide to skip at runtime (Matthias Bolte) - tests: Fix compressed test output padding logic (Matthias Bolte) - tests: Use EXIT_AM_SKIP instead of 77 directly (Matthias Bolte) - rpc: Fix whitespace problem in generated code (Matthias Bolte) - sanlock: avoid lockspace setup when auto_disk_lease is off (Federico Simoncelli) - libvirtd: diagnose explicitly requested but missing conf file (Eric Blake) - qemu: clean up OOM checks (Michael Santos) - graphics: add support for action_if_connected in qemu (Michal Privoznik) - microblaze: Add architecture support (John Williams) - util: drop unused safezero argument (Eric Blake) - conf: prefer unsigned int for flags (Eric Blake) - drivers: prefer unsigned int for flags (Eric Blake) - public API: prefer unsigned int for flags (Eric Blake) - maint: print flags in hex during debug (Eric Blake) - build: use gnulib pthread_sigmask (Eric Blake) - util: rename err_exit to cleanup in interface.c (Laine Stump) - sysinfo: delete unnecessary white space of sysinfo. (Minoru Usui) - util: add virTrimSpaces (Eric Blake) - util: fix virSkipSpaces (Eric Blake) - Reduce code duplication in virFileMakePath(Helper) (Matthias Bolte) - apparmor: Finish incomplete renaming of relabel to norelabel (Matthias Bolte) - Fix default value of security label 'relabel' attribute (Daniel P. Berrange) - Fix return value semantic of virFileMakePath (Matthias Bolte) - nodedev: Let check_fc_host_linux report errors to the caller (Matthias Bolte) - xml: create an RNG file for common types and move some definitions there (Laine Stump) - docs: sort the file list in the schemas Makefile (Laine Stump) - qemu: check flags in qemuDomainGetXMLDesc (Laine Stump) - conf: fix domain parse flags (Laine Stump) - conf: Fix declaration of virNetworkDNS(Hosts)Def struct (Matthias Bolte) - Allow for resource relabelling with static labels (Daniel P. Berrange) - Allow a base label to be specified in dynamic labelling mode (Daniel P. Berrange) Cleanups: - qemu: silence coverity false positives (Eric Blake) - interface: drop dead code (Eric Blake) - rpc: silence coverity false positives (Eric Blake) - build: silence coverity false positives (Eric Blake) - qemu: remove dead code (Eric Blake) - maint: add missing copyright notices (Eric Blake) - xen: drop unused callbacks (Eric Blake) - build: avoid type-punning compiler warning (Eric Blake) - tests: fix compilation failures (Eric Blake) - build: Use $(PYTHON) instead of python for the keycode map generator (Matthias Bolte) - build: fix bugs with destroyFlags patches (Eric Blake) - util: define MAX (Laine Stump) - maint: fix typos on guaranteed (Eric Blake) - build: fix broken build (Eric Blake) - maint: fix spelling of Red Hat (Eric Blake) - tests: Fix virshtest failure after dominfo changed (Osier Yang) Thanks everybody for the work done for this release, be it documentation, ideas, patches or bug reports ! Daniel -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel(a)veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/

3 2

[libvirt] [PATCH] build: update to latest gnulib
by Eric Blake 03 Aug '11

03 Aug '11

I noticed that with 0.9.4, gnulib ended up replacing pthread_sigmask on glibc, even though glibc's works perfectly fine. It turns out to have been an upstream gnulib bug. * .gnulib: Update to latest, for pthread_sigmask fix. --- This missed the 0.9.4 release; oh well. * .gnulib 41a7841...7f494c7 (18): > pthread_sigmask: Actually use results of gl_THREADLIB. > autoupdate > maint.mk: relax the default _gl_TS_function_match regexp > git-version-gen: document that EXTRA_DIST must include .version > wctype-h: Fix last change. > frexpl: Update autoconf test. > sys_utsname: Add support for Minix. > strings: Add support for Minix. > wctype-h: Add support for Minix. > * lib/xalloc.h (DEFAULT_MXFAST): Track 64-bit glibc. > stdioext: Add support for Minix. > errno: Port to Minix. > Work around declaration collisions on Minix. > Add support for Minix with ACK compiler. > Documentation about Minix. > snippet/warn-on-use: Fix indentation. > tests: test-update-copyright.sh: remove unnecessary "rm" commands > maint.mk: avoid sc_prohibit_always-defined_macros failure in coreutils .gnulib | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/.gnulib b/.gnulib index 41a7841..7f494c7 160000 --- a/.gnulib +++ b/.gnulib @@ -1 +1 @@ -Subproject commit 41a7841a82351f9df3e13b6199a134004d694131 +Subproject commit 7f494c7d725db4a7f3abdef09d4070725487da67 -- 1.7.4.4

2 2

[libvirt] [PATCH] Fix detection of GnuTLS 1.x.y
by Matthias Bolte 03 Aug '11

03 Aug '11

Detection based on gnutls_session doesn't work because GnuTLS 2.x.y comes with a compat.h that defines gnutls_session to gnutls_session_t. Instead detect this based on LIBGNUTLS_VERSION_MAJOR. --- configure.ac | 22 +++++++++++++++------- 1 files changed, 15 insertions(+), 7 deletions(-) diff --git a/configure.ac b/configure.ac index c8d291b..6a20366 100644 --- a/configure.ac +++ b/configure.ac @@ -834,17 +834,25 @@ fi AC_SUBST([GNUTLS_CFLAGS]) AC_SUBST([GNUTLS_LIBS]) -dnl Old versions of GnuTLS uses types like 'gnutls_session' instead -dnl of 'gnutls_session_t'. Try to detect this type if defined so -dnl that we can offer backwards compatibility. +dnl Detect GnuTLS 1.x.y and enable backwards compatibility macros if found. old_cflags="$CFLAGS" old_libs="$LIBS" CFLAGS="$CFLAGS $GNUTLS_CFLAGS" LIBS="$LIBS $GNUTLS_LIBS" -AC_CHECK_TYPE([gnutls_session], - AC_DEFINE([GNUTLS_1_0_COMPAT],[], - [enable GnuTLS 1.0 compatibility macros]),, - [#include <gnutls/gnutls.h>]) +AC_MSG_CHECKING([whether GnuTLS 1.0 compatibility macros are required]) +AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <gnutls/gnutls.h>]], + [[ + #if LIBGNUTLS_VERSION_MAJOR < 2 + # error gnutls 1.x.y detected + #endif + ]])], + [have_gnutlsv1=no], + [have_gnutlsv1=yes]) +if test "x$have_gnutlsv1" = xyes; then + AC_DEFINE_UNQUOTED([GNUTLS_1_0_COMPAT], 1, + [enable GnuTLS 1.0 compatibility macros]) +fi +AC_MSG_RESULT([$have_gnutlsv1]) CFLAGS="$old_cflags" LIBS="$old_libs" -- 1.7.4.1

2 4

[libvirt] [PATCH 0/n] Coverity run
by Eric Blake 03 Aug '11

03 Aug '11

I'm doing another coverity cleanup run; Coverity reported as many as 75 errors this time around, but that definitely includes some false positives. I'll add to this thread as I sort through more reports to see which ones are real, but to get things started: Eric Blake (3): rpc: avoid double close on error rpc: avoid uninitialized memory use python: avoid unlikely sign extension bug python/libvirt-override.c | 2 +- src/rpc/virnetserver.c | 2 +- src/rpc/virnettlscontext.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) -- 1.7.4.4

4 48

[libvirt] [PATCH v2] qemu: Unlink temporary file on failure
by Michal Privoznik 02 Aug '11

02 Aug '11

Although virFDStreamOpenFile will unlink it once opened, when we hit error path, we must unlink it by hand. --- src/qemu/qemu_driver.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 09b2791..c78cdb7 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -2931,7 +2931,10 @@ qemuDomainScreenshot(virDomainPtr dom, endjob: VIR_FORCE_CLOSE(tmp_fd); - VIR_FREE(tmp); + if (tmp) { + unlink(tmp); + VIR_FREE(tmp); + } if (qemuDomainObjEndJob(driver, vm) == 0) vm = NULL; -- 1.7.3.4

3 8

[libvirt] [PATCH] doc: Fix confusing statement about required privileges.
by Peter Krempa 02 Aug '11

02 Aug '11

src/libvirt.c: Statement of required hypervisor privileges was probably edited after writing and word "may" was left in a confusing place. --- src/libvirt.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/libvirt.c b/src/libvirt.c index 941cb47..78f303d 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -3269,7 +3269,7 @@ error: * Dynamically change the target amount of physical memory allocated to a * domain. If domain is NULL, then this change the amount of memory reserved * to Domain0 i.e. the domain where the application runs. - * This function may requires privileged access to the hypervisor. + * This function requires privileged access to the hypervisor. * * @flags may include VIR_DOMAIN_AFFECT_LIVE or VIR_DOMAIN_AFFECT_CONFIG. * Both flags may be set. If VIR_DOMAIN_AFFECT_LIVE is set, the change affects -- 1.7.6

3 4

[libvirt] [PATCH 0/3 RFC] macvtap: Implement getPhysfn to support sending a port profile message for a VF to its PF
by Roopa Prabhu 02 Aug '11

02 Aug '11

This patch tries to fix getPhysFn in macvtap.c to get the physical function(PF) of the direct attach interface, if the interface is a SR-IOV VF. It derives the PF/VF relationship from sysfs. There is some code to do this in node device driver. But it is local to the node device driver . I did not see a clean way to use some of the node device stuff here. The node device driver looks at PCI capabilities to get the same information. This implementation tries to not get into PCI capability details and just looks at sysfs paths to derive the PF-VF relationship This patch series implements the following 01/3 - Add function to get the network interface name of a pci device 02/3 - Add functions to get sriov PF/VF relationship of a network interface 03/3 - macvtap: Fix getPhysfn to get the PF of a direct attach network interface Signed-off-by: Roopa Prabhu <roprabhu(a)cisco.com> Signed-off-by: Christian Benvenuti <benve(a)cisco.com> Signed-off-by: David Wang <dwang2(a)cisco.com>

4 13

[libvirt] [PATCH] qemu: Unlink temporary file on failure
by Michal Privoznik 02 Aug '11

02 Aug '11

Although virFDStreamOpenFile will unlink it once opened, when we hit error path, we must unlink it by hand. --- src/qemu/qemu_driver.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 09b2791..d860cd2 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -2930,6 +2930,7 @@ qemuDomainScreenshot(virDomainPtr dom, ret = strdup("image/x-portable-pixmap"); endjob: + unlink(tmp); VIR_FORCE_CLOSE(tmp_fd); VIR_FREE(tmp); -- 1.7.3.4

2 1

[libvirt] Start of freeze for libvirt-0.9.4 and availability of rc1
by Daniel Veillard 02 Aug '11

02 Aug '11

As plannned we are entering the freeze for libvirt-0.9.4 . I have made a release candidate 1 tarball (and associated rpms) at ftp://libvirt.org/libvirt/libvirt-0.9.4-rc1.tar.gz This seems to pass my minimal tests without problems, but please give it a try too and report problems, I will probably make an rc2 on Thursday or Friday, and then the final release next Monday or Tuesday, thanks ! Daniel -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel(a)veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/

13 39

[libvirt] ANNOUNCE: virt-manager 0.9.0 and virtinst 0.600.0 released
by Cole Robinson 02 Aug '11

02 Aug '11

I'm happy to announce two new releases: virt-manager 0.9.0: virt-manager is a desktop application for managing KVM and Xen virtual machines via libvirt. virtinst 0.600.0: virtinst is a collection of command line tools for provisioning libvirt virtual machines, including virt-install and virt-clone. The releases can be downloaded from: http://virt-manager.org/download.html The direct download links are: http://virt-manager.org/download/sources/virt-manager/virt-manager-0.9.0.ta… http://virt-manager.org/download/sources/virtinst/virtinst-0.600.0.tar.gz The virt-manager release includes: - Use a hiding toolbar for fullscreen mode - Use libguestfs to show guest packagelist and more (Richard W.M. Jones) - Basic 'New VM' wizard support for LXC guests - Remote serial console access (with latest libvirt) - Remote URL guest installs (with latest libvirt) - Add Hardware: Support <filesystem> devices - Add Hardware: Support <smartcard> devices (Marc-André Lureau) - Enable direct interface selection for qemu/kvm (Gerhard Stenzel) - Allow viewing and changing disk serial number The virtinst release includes: - virt-install: Various improvements to enable LXC/container guests: - New --filesystem option for <filesystem> devices - New --init option for container <init> path - New --container option (similar to --paravirt or --hvm) - virt-install: Make --location remotely (with latest libvirt) - virt-install: New --smartcard option for <smartcard> devices (Marc-André Lureau) - virt-install: New --numatune option for building guest <numatune> XML - virt-install: option to set --disk error_policy= - virt-install: option to set --disk serial= Thanks to everyone who has contributed to this release through testing, bug reporting, submitting patches, and otherwise sending in feedback! Thanks, Cole

5 7

[libvirt] [PATCH] freebsd: Add gnulib environ module for the commandtest
by Matthias Bolte 02 Aug '11

02 Aug '11

--- bootstrap.conf | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/bootstrap.conf b/bootstrap.conf index f006a47..3b105b1 100644 --- a/bootstrap.conf +++ b/bootstrap.conf @@ -36,6 +36,7 @@ configmake count-one-bits crypto/md5 dirname-lgpl +environ fclose fcntl-h ffs -- 1.7.4.1

3 5

[libvirt] [Libvirt] [PATCH v3] Fix bug #611823 prohibit pools with duplicate storage
by Lei Li 02 Aug '11

02 Aug '11

Make sure the unique storage pool defined and create from different directory to avoid inconsistent version of volume pool created. Signed-off-by: Lei Li <lilei(a)linux.vnet.ibm.com> --- src/conf/storage_conf.c | 25 +++++++++++++++++++++++++ src/conf/storage_conf.h | 2 ++ src/libvirt_private.syms | 1 + 3 files changed, 28 insertions(+), 0 deletions(-) diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c index 995f9a6..1d9fe25 100644 --- a/src/conf/storage_conf.c +++ b/src/conf/storage_conf.c @@ -1317,6 +1317,21 @@ virStoragePoolObjFindByName(virStoragePoolObjListPtr pools, return NULL; } +virStoragePoolObjPtr +virStoragePoolObjFindByPath(virStoragePoolObjListPtr pools, + const char *path) { + unsigned int i; + + for (i = 0 ; i < pools->count ; i++) { + virStoragePoolObjLock(pools->objs[i]); + if (STREQ(pools->objs[i]->def->target.path, path)) + return pools->objs[i]; + virStoragePoolObjUnlock(pools->objs[i]); + } + + return NULL; +} + void virStoragePoolObjClearVols(virStoragePoolObjPtr pool) { @@ -1700,6 +1715,16 @@ int virStoragePoolObjIsDuplicate(virStoragePoolObjListPtr pools, } } + /* Check the pool list if defined target path already exist */ + pool = virStoragePoolObjFindByPath(pools, def->target.path); + if (pool) { + virStorageReportError(VIR_ERR_OPERATION_FAILED, + _("target path '%s' is already in use"), + pool->def->target.path); + dupPool = -1; + goto cleanup; + } + ret = dupPool; cleanup: if (pool) diff --git a/src/conf/storage_conf.h b/src/conf/storage_conf.h index 271441a..9239977 100644 --- a/src/conf/storage_conf.h +++ b/src/conf/storage_conf.h @@ -335,6 +335,8 @@ virStoragePoolObjPtr virStoragePoolObjFindByUUID(virStoragePoolObjListPtr pools, const unsigned char *uuid); virStoragePoolObjPtr virStoragePoolObjFindByName(virStoragePoolObjListPtr pools, const char *name); +virStoragePoolObjPtr virStoragePoolObjFindByPath(virStoragePoolObjListPtr pools, + const char *path); virStorageVolDefPtr virStorageVolDefFindByKey(virStoragePoolObjPtr pool, const char *key); diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 830222b..19f5f92 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -937,6 +937,7 @@ virStoragePoolObjClearVols; virStoragePoolObjDeleteDef; virStoragePoolObjFindByName; virStoragePoolObjFindByUUID; +virStoragePoolObjFindByPath; virStoragePoolObjIsDuplicate; virStoragePoolObjListFree; virStoragePoolObjLock; -- 1.7.1

2 1

[libvirt] [PATCH] Fix bug #611823 prohibit pools with duplicate storage
by Lei Li 02 Aug '11

02 Aug '11

To make sure the unique storage pool defined and created from different directory to avoid inconsistent version of volume pool created, I add two API be called by storage driver to check for the probable duplicate pools and refused the duplicate pool. virStoragePoolObjFindByPath() provide a method to find pool object by target path in pool list. virStoragePoolTargetDuplicate() implement the function to check if there is duplicate pool. Add judgement for storagePoolCreate&storagePoolDefine by calling virStoragePoolTargetDuplicate() to avoid both transient storage pool and persistent storage pool be created repeatedly in storage driver. Signed-off-by: Lei Li<lilei(a)linux.vnet.ibm.com> --- src/conf/storage_conf.c | 39 +++++++++++++++++++++++++++++++++++++++ src/conf/storage_conf.h | 4 ++++ src/libvirt_private.syms | 2 ++ src/storage/storage_driver.c | 6 ++++++ 4 files changed, 51 insertions(+), 0 deletions(-) diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c index 995f9a6..a499e82 100644 --- a/src/conf/storage_conf.c +++ b/src/conf/storage_conf.c @@ -1317,6 +1317,22 @@ virStoragePoolObjFindByName(virStoragePoolObjListPtr pools, return NULL; } +virStoragePoolObjPtr +virStoragePoolObjFindByPath(virStoragePoolObjListPtr pools, + const char *path) +{ + unsigned int i; + + for (i = 0 ; i< pools->count ; i++) { + virStoragePoolObjLock(pools->objs[i]); + if (STREQ(pools->objs[i]->def->target.path, path)) + return pools->objs[i]; + virStoragePoolObjUnlock(pools->objs[i]); + } + + return NULL; +} + void virStoragePoolObjClearVols(virStoragePoolObjPtr pool) { @@ -1707,6 +1723,29 @@ cleanup: return ret; } +int virStoragePoolTargetDuplicate(virStoragePoolObjListPtr pools, + virStoragePoolDefPtr def) +{ + int ret = 1; + virStoragePoolObjPtr pool = NULL; + + /*check pool list if defined target path already exist*/ + pool = virStoragePoolObjFindByPath(pools, def->target.path); + + if (pool) { + virStorageReportError(VIR_ERR_OPERATION_FAILED, + _("target path '%s' is already in use"), + pool->def->target.path); + ret = -1; + goto cleanup; + } + + +cleanup: + if (pool) + virStoragePoolObjUnlock(pool); + return ret; +} void virStoragePoolObjLock(virStoragePoolObjPtr obj) { diff --git a/src/conf/storage_conf.h b/src/conf/storage_conf.h index 271441a..454c43d 100644 --- a/src/conf/storage_conf.h +++ b/src/conf/storage_conf.h @@ -335,6 +335,8 @@ virStoragePoolObjPtr virStoragePoolObjFindByUUID(virStoragePoolObjListPtr pools, const unsigned char *uuid); virStoragePoolObjPtr virStoragePoolObjFindByName(virStoragePoolObjListPtr pools, const char *name); +virStoragePoolObjPtr virStoragePoolObjFindByPath(virStoragePoolObjListPtr pools, + const char *path); virStorageVolDefPtr virStorageVolDefFindByKey(virStoragePoolObjPtr pool, const char *key); @@ -387,6 +389,8 @@ char *virStoragePoolSourceListFormat(virStoragePoolSourceListPtr def); int virStoragePoolObjIsDuplicate(virStoragePoolObjListPtr pools, virStoragePoolDefPtr def, unsigned int check_active); +int virStoragePoolTargetDuplicate(virStoragePoolObjListPtr pools, + virStoragePoolDefPtr def); void virStoragePoolObjLock(virStoragePoolObjPtr obj); void virStoragePoolObjUnlock(virStoragePoolObjPtr obj); diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 853ee62..ef323f5 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -930,7 +930,9 @@ virStoragePoolObjClearVols; virStoragePoolObjDeleteDef; virStoragePoolObjFindByName; virStoragePoolObjFindByUUID; +virStoragePoolObjFindByPath; virStoragePoolObjIsDuplicate; +virStoragePoolTargetDuplicate; virStoragePoolObjListFree; virStoragePoolObjLock; virStoragePoolObjRemove; diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c index 9c353e3..8ee63f6 100644 --- a/src/storage/storage_driver.c +++ b/src/storage/storage_driver.c @@ -536,6 +536,9 @@ storagePoolCreate(virConnectPtr conn, if (virStoragePoolObjIsDuplicate(&driver->pools, def, 1)< 0) goto cleanup; + if (virStoragePoolTargetDuplicate(&driver->pools, def)< 0) + goto cleanup; + if ((backend = virStorageBackendForType(def->type)) == NULL) goto cleanup; @@ -589,6 +592,9 @@ storagePoolDefine(virConnectPtr conn, if (virStoragePoolObjIsDuplicate(&driver->pools, def, 0)< 0) goto cleanup; + if (virStoragePoolTargetDuplicate(&driver->pools, def)< 0) + goto cleanup; + if (virStorageBackendForType(def->type) == NULL) goto cleanup; -- 1.7.1

3 2

[libvirt] [PATCHv4 0/2] vnc/spice listen address as a network name
by Laine Stump 02 Aug '11

02 Aug '11

This is the latest reincarnation of this patch series: https://www.redhat.com/archives/libvir-list/2011-July/msg01717.html In the previous version, I had created a new subelement of <graphics>, called <listen>, and placed all listen address and port attributes there. After discussion on the list and in IRC with Dan Berrange and Eric Blake, I became convinced that was overdoing things, and that really only the address or network name should be in the <listen> element, but that port/tlsPort/autoport should stay put. This version removes all changes to port-related attributes, paring it down to just the listen address (and the new listen network) attribute. This greatly simplifies the patch, so new review of it should be easier. Based on Eric's review, the nwe version tries to be more concise about what is accepted, what is ignored, and what is rejected in the XML, both by the parser and by the RNG. (since there is less to deal with, this is also easier.) Having a single port value but multiple addresses does create some potential future restrictions, which we can deal with an eliminate later if they become problematic. In particular, each graphics device will have only a single port, but could have multiple listen addresses; in this case, all the listen addresses would have to listen on the same port. (This isn't a problem right now, because all of our drivers can only listen on a single address anyway). (Note to Eric: I did consider putting the switch to helper functions into its own patch, but after removing all the ports from <listen>, the number of helper functions (and thus the number of changes created by switching to using them, has been reduced considerably, so the gain wouldn't be as much. (also, it's very late, and I'd like to get some sleep tonight :-)

3 10

[libvirt] [PATCH] virsh: fix memory leak in cmdNetworkInfo
by ajia＠redhat.com 02 Aug '11

02 Aug '11

I have ever discussed this issue with Matthias, and he has fixed this leak in cmdNetworkInfo codes, but he hasn't committed a patch to upstream so that bug 722806 is always assigned status, so commit it to avoid this patch missing. * tools/virsh.c: avoid memory leak in cmdNetworkInfo. * how to reproduce? % valgrind -v --leak-check=yes virsh net-info default https://bugzilla.redhat.com/show_bug.cgi?id=722806 Signed-off-by: Alex Jia <ajia(a)redhat.com> --- tools/virsh.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 23e71d7..cf8e2a5 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -5597,6 +5597,7 @@ cmdNetworkInfo(vshControl *ctl, const vshCmd *cmd) if (bridge) vshPrint(ctl, "%-15s %s\n", _("Bridge:"), bridge); + VIR_FREE(bridge); virNetworkFree(network); return true; } -- 1.7.1

2 1

[libvirt] [PATCH] doc: fix incorrect option in blockjob
by ajia＠redhat.com 02 Aug '11

02 Aug '11

* tools/virsh.pod: change 'live' to 'abort' based on actual option. Signed-off-by: Alex Jia <ajia(a)redhat.com> --- tools/virsh.pod | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/virsh.pod b/tools/virsh.pod index f6f9908..01b8fd6 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -445,7 +445,7 @@ I<bandwidth> specifies copying bandwidth limit in Mbps. Manage active block operations. I<path> specifies fully-qualified path of the disk. -If I<--live> is specified, the active job on the specified disk will +If I<--abort> is specified, the active job on the specified disk will be aborted. If I<--info> is specified, the active job information on the specified disk will be printed. -- 1.7.1

2 1

[libvirt] [PATCH] openvz: detect when a domain was shut down from the inside
by Jean-Baptiste Rouault 01 Aug '11

01 Aug '11

This patch adds an internal function openvzGetVEStatus to get the real state of the domain. This function is used in various places in the driver, in particular to detect when the domain has been shut down by the user with the "halt" command. --- src/openvz/openvz_driver.c | 76 +++++++++++++++++++++++++++++++++++++++----- 1 files changed, 68 insertions(+), 8 deletions(-) diff --git a/src/openvz/openvz_driver.c b/src/openvz/openvz_driver.c index 4e7cb03..3b3b079 100644 --- a/src/openvz/openvz_driver.c +++ b/src/openvz/openvz_driver.c @@ -72,6 +72,7 @@ static int openvzDomainSetVcpusInternal(virDomainObjPtr vm, unsigned int nvcpus); static int openvzDomainSetMemoryInternal(virDomainObjPtr vm, unsigned long memory); +static int openvzGetVEStatus(virDomainObjPtr vm, int *status, int *reason); static void openvzDriverLock(struct openvz_driver *driver) { @@ -340,6 +341,7 @@ static int openvzDomainGetInfo(virDomainPtr dom, virDomainInfoPtr info) { struct openvz_driver *driver = dom->conn->privateData; virDomainObjPtr vm; + int state; int ret = -1; openvzDriverLock(driver); @@ -352,9 +354,11 @@ static int openvzDomainGetInfo(virDomainPtr dom, goto cleanup; } - info->state = virDomainObjGetState(vm, NULL); + if (openvzGetVEStatus(vm, &state, NULL) == -1) + goto cleanup; + info->state = state; - if (!virDomainObjIsActive(vm)) { + if (info->state != VIR_DOMAIN_RUNNING) { info->cpuTime = 0; } else { if (openvzGetProcessInfo(&(info->cpuTime), dom->id) < 0) { @@ -398,8 +402,7 @@ openvzDomainGetState(virDomainPtr dom, goto cleanup; } - *state = virDomainObjGetState(vm, reason); - ret = 0; + ret = openvzGetVEStatus(vm, state, reason); cleanup: if (vm) @@ -584,6 +587,7 @@ openvzDomainShutdownFlags(virDomainPtr dom, virDomainObjPtr vm; const char *prog[] = {VZCTL, "--quiet", "stop", PROGRAM_SENTINAL, NULL}; int ret = -1; + int status; virCheckFlags(0, -1); @@ -596,9 +600,12 @@ openvzDomainShutdownFlags(virDomainPtr dom, _("no domain with matching uuid")); goto cleanup; } + + if (openvzGetVEStatus(vm, &status, NULL) == -1) + goto cleanup; openvzSetProgramSentinal(prog, vm->def->name); - if (virDomainObjGetState(vm, NULL) != VIR_DOMAIN_RUNNING) { + if (status != VIR_DOMAIN_RUNNING) { openvzError(VIR_ERR_INTERNAL_ERROR, "%s", _("domain is not in running state")); goto cleanup; @@ -631,6 +638,7 @@ static int openvzDomainReboot(virDomainPtr dom, virDomainObjPtr vm; const char *prog[] = {VZCTL, "--quiet", "restart", PROGRAM_SENTINAL, NULL}; int ret = -1; + int status; virCheckFlags(0, -1); @@ -644,8 +652,11 @@ static int openvzDomainReboot(virDomainPtr dom, goto cleanup; } + if (openvzGetVEStatus(vm, &status, NULL) == -1) + goto cleanup; + openvzSetProgramSentinal(prog, vm->def->name); - if (virDomainObjGetState(vm, NULL) != VIR_DOMAIN_RUNNING) { + if (status != VIR_DOMAIN_RUNNING) { openvzError(VIR_ERR_INTERNAL_ERROR, "%s", _("domain is not in running state")); goto cleanup; @@ -1052,6 +1063,7 @@ openvzDomainCreateWithFlags(virDomainPtr dom, unsigned int flags) virDomainObjPtr vm; const char *prog[] = {VZCTL, "--quiet", "start", PROGRAM_SENTINAL, NULL }; int ret = -1; + int status; virCheckFlags(0, -1); @@ -1064,8 +1076,11 @@ openvzDomainCreateWithFlags(virDomainPtr dom, unsigned int flags) _("no domain with matching id")); goto cleanup; } + + if (openvzGetVEStatus(vm, &status, NULL) == -1) + goto cleanup; - if (virDomainObjGetState(vm, NULL) != VIR_DOMAIN_SHUTOFF) { + if (status != VIR_DOMAIN_SHUTOFF) { openvzError(VIR_ERR_OPERATION_DENIED, "%s", _("domain is not in shutoff state")); goto cleanup; @@ -1102,6 +1117,7 @@ openvzDomainUndefineFlags(virDomainPtr dom, virDomainObjPtr vm; const char *prog[] = { VZCTL, "--quiet", "destroy", PROGRAM_SENTINAL, NULL }; int ret = -1; + int status; virCheckFlags(0, -1); @@ -1113,7 +1129,10 @@ openvzDomainUndefineFlags(virDomainPtr dom, goto cleanup; } - if (virDomainObjIsActive(vm)) { + if (openvzGetVEStatus(vm, &status, NULL) == -1) + goto cleanup; + + if (status != VIR_DOMAIN_SHUTOFF) { openvzError(VIR_ERR_OPERATION_INVALID, "%s", _("cannot delete active domain")); goto cleanup; @@ -1610,6 +1629,47 @@ cleanup: return -1; } +static int +openvzGetVEStatus(virDomainObjPtr vm, int *status, int *reason) +{ + virCommandPtr cmd; + char *outbuf; + char *line; + int state; + int ret = -1; + + cmd = virCommandNewArgList(VZLIST, vm->def->name, "-ostatus", "-H", NULL); + virCommandSetOutputBuffer(cmd, &outbuf); + if (virCommandRun(cmd, NULL) < 0) + goto cleanup; + + if ((line = strchr(outbuf, '\n')) == NULL) { + openvzError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Failed to parse vzlist output")); + goto cleanup; + } + *line++ = '\0'; + + state = virDomainObjGetState(vm, reason); + + if (STREQ(outbuf, "running")) { + // There is no way to detect whether a domain is paused or not with vzlist + if (state == VIR_DOMAIN_PAUSED) + *status = state; + else + *status = VIR_DOMAIN_RUNNING; + } else { + *status = VIR_DOMAIN_SHUTOFF; + } + + ret = 0; + +cleanup: + virCommandFree(cmd); + VIR_FREE(outbuf); + return ret; +} + static virDriver openvzDriver = { .no = VIR_DRV_OPENVZ, .name = "OPENVZ", -- 1.7.5.4

2 1

[libvirt] [PATCH RFC] virsh: Add option to undefine storage with domains
by Peter Krempa 01 Aug '11

01 Aug '11

Adds an option to virsh undefine command to undefine managed storage volumes along with (inactive) domains. Storage volumes are enumerated and the user may interactivly choose volumes to delete. Unmanaged volumes are listed and the user shall delete them manualy. --- I marked this as a RFC because I am concerned about my "naming scheme" of the added parameters. I couldn't decide which of the following "volumes/storage/disks/..." to use. I'd appreciate your comments on this. This is my second approach to this problem after I got some really good critique from Eric, Daniel and Dave. The user has the choice to activate an interactive mode, that allows to select on a per-device basis which volumes/disks to remove along with the domain. To avoid possible problems, I only allowed to remove storage for inactive domains and unmanaged images (which sidetracked me a lot on my previous attempt) are left to a action of the user. (the user is notified about any unmanaged image for the domain). My next concern is about interactive of the user. I tried to implement a boolean query function, but I'd like to know if I took the right path, as I couldn't find any example in virsh from which I could learn. Thanks for your comments (and time) :) Peter Krempa tools/virsh.c | 265 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 259 insertions(+), 6 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 61f69f0..3795d2b 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -295,6 +295,9 @@ static int vshCommandOptULongLong(const vshCmd *cmd, const char *name, static bool vshCommandOptBool(const vshCmd *cmd, const char *name); static const vshCmdOpt *vshCommandOptArgv(const vshCmd *cmd, const vshCmdOpt *opt); +static int vshInteractiveBoolPrompt(vshControl *ctl, + const char *prompt, + bool *confirm); #define VSH_BYID (1 << 1) #define VSH_BYUUID (1 << 2) @@ -1422,6 +1425,8 @@ static const vshCmdInfo info_undefine[] = { static const vshCmdOptDef opts_undefine[] = { {"domain", VSH_OT_DATA, VSH_OFLAG_REQ, N_("domain name or uuid")}, {"managed-save", VSH_OT_BOOL, 0, N_("remove domain managed state file")}, + {"disks", VSH_OT_BOOL, 0, N_("remove associated disk images managed in storage pools (interactive)")}, + {"disks-all", VSH_OT_BOOL, 0, N_("remove all associated disk images managed in storage pools")}, {NULL, 0, 0, NULL} }; @@ -1434,9 +1439,25 @@ cmdUndefine(vshControl *ctl, const vshCmd *cmd) int id; int flags = 0; int managed_save = vshCommandOptBool(cmd, "managed-save"); + int remove_disks = vshCommandOptBool(cmd, "disks"); + int remove_all_disks = vshCommandOptBool(cmd, "disks-all"); int has_managed_save = 0; int rc = -1; + char *domxml; + xmlDocPtr xml = NULL; + xmlXPathContextPtr ctxt = NULL; + xmlXPathObjectPtr obj = NULL; + xmlNodePtr cur = NULL; + int i = 0; + char *source = NULL; + char *target = NULL; + char *type = NULL; + xmlBufferPtr xml_buf = NULL; + virStorageVolPtr volume = NULL; + int state; + bool confirm = false; + if (managed_save) flags |= VIR_DOMAIN_UNDEFINE_MANAGED_SAVE; @@ -1475,15 +1496,172 @@ cmdUndefine(vshControl *ctl, const vshCmd *cmd) } } - if (flags == -1) { - if (has_managed_save == 1) { + + if (flags == -1 && has_managed_save == 1) { + vshError(ctl, + _("Refusing to undefine while domain managed save " + "image exists")); + virDomainFree(dom); + return false; + } + + if (remove_disks || remove_all_disks) { + if ((state = vshDomainState(ctl, dom, NULL)) < 0) { + vshError(ctl, _("Failed to get domain state")); + goto disk_error; + } + + /* removal of storage is possible only for inactive domains */ + if (!((state == VIR_DOMAIN_SHUTOFF) || + (state == VIR_DOMAIN_CRASHED))) { vshError(ctl, - _("Refusing to undefine while domain managed save " - "image exists")); - virDomainFree(dom); - return false; + _("Domain needs to be inactive to delete it with associated storage")); + goto disk_error; + } + + if (remove_disks && !ctl->imode) { + vshError(ctl, "%s\n", _("Option --disks is available only in interactive mode")); + goto disk_error; + } + + domxml = virDomainGetXMLDesc(dom, 0); + if (!domxml) { + vshError(ctl, "%s", _("Failed to get disk information")); + goto disk_error; + } + + xml = xmlReadDoc((const xmlChar *) domxml, "domain.xml", NULL, + XML_PARSE_NOENT | + XML_PARSE_NONET | + XML_PARSE_NOWARNING); + VIR_FREE(domxml); + + if (!xml) { + vshError(ctl, "%s", _("Failed to get disk information")); + goto disk_error; + } + + ctxt = xmlXPathNewContext(xml); + if (!ctxt) { + vshError(ctl, "%s", _("Failed to get disk information")); + goto disk_error; + } + + obj = xmlXPathEval(BAD_CAST "/domain/devices/disk", ctxt); + if ((obj == NULL) || (obj->type != XPATH_NODESET) || + (obj->nodesetval == NULL)) { + vshError(ctl, "%s", _("Failed to get disk information")); + goto disk_error; + } + + for (i = 0; i < obj->nodesetval->nodeNr; i++) { + cur = obj->nodesetval->nodeTab[i]->children; + + type = virXMLPropString(cur, "device"); + + while (cur != NULL) { + if (cur->type == XML_ELEMENT_NODE) { + if (xmlStrEqual(cur->name, BAD_CAST "target")) + target = virXMLPropString(cur, "dev"); + else if (xmlStrEqual(cur->name, BAD_CAST "source")) + source = virXMLPropString(cur, "file"); + } + cur = cur->next; + } + + if (!source) { + VIR_FREE(target); + VIR_FREE(type); + } + + volume = virStorageVolLookupByPath(ctl->conn, (const char *) source); + if (!volume) { + vshPrint(ctl, "%s %s %s %s\n", + _("Volume: Source:"), (const char *)source, + _("Target:"), (const char *) target); + vshPrint(ctl, _("This volume isn't managed by any storage pool, " + "please delete it manualy\n\n")); + /* remove error indication */ + virFreeError(last_error); + last_error = NULL; + } else { + vshPrint(ctl, "%s %s %s %s\n", + _("Volume: Source:"), (const char *)source, + _("Target:"), (const char *) target); + + if (remove_all_disks) { + confirm = true; + } else { + if (vshInteractiveBoolPrompt(ctl, + _("Do you want to undefine this volume?"), + &confirm) < 0) { + vshError(ctl, _("\nError while geting response from user")); + virStorageVolFree(volume); + goto disk_error; + } + } + + /* removal of volume */ + if (confirm) { + if (virStorageVolDelete(volume, 0) == 0) { + virStorageVolFree(volume); + + vshPrint(ctl, _("Volume deleted\n\n")); + + /* remove definition of volume from xml */ + xml_buf = xmlBufferCreate(); + if (!xml_buf) { + vshPrint(ctl, _("Failed to create XML buffer. " + "If domain undefinition fails, domain will be left in inconsistent state.\n\n")); + goto disk_next; + } + + if (xmlNodeDump(xml_buf, xml, obj->nodesetval->nodeTab[i], 0, 0) < 0) { + vshPrint(ctl, _("Failed to extract XML volume description. " + "If domain undefinition fails, domain will be left in inconsistent state.\n\n")); + + xmlBufferFree(xml_buf); + xml_buf = NULL; + goto disk_next; + } + + if (virDomainDetachDeviceFlags(dom, + (char *) xmlBufferContent(xml_buf), + VIR_DOMAIN_AFFECT_CONFIG) < 0) { + vshPrint(ctl, + _("Failed to remove volume \"%s\" from configuration. " + "If domain undefinition fails, domain will be left in inconsistent state.\n\n"), + source); + + xmlBufferFree(xml_buf); + xml_buf = NULL; + goto disk_next; + } + + xmlBufferFree(xml_buf); + xml_buf = NULL; + + } else { + virStorageVolFree(volume); + + vshError(ctl, _("Failed to delete volume.")); + goto disk_error; + } + } + } + +disk_next: + VIR_FREE(source); + VIR_FREE(target); + VIR_FREE(type); } + xmlXPathFreeObject(obj); + xmlXPathFreeContext(ctxt); + xmlFreeDoc(xml); + } /* end of disk undefine stuff */ + + if (flags == -1) { rc = virDomainUndefine(dom); } else { rc = virDomainUndefineFlags(dom, flags); @@ -1520,6 +1698,21 @@ end: virDomainFree(dom); return ret; + +disk_error: + VIR_FREE(source); + VIR_FREE(target); + VIR_FREE(type); + + xmlXPathFreeObject(obj); + xmlXPathFreeContext(ctxt); + xmlFreeDoc(xml); + xmlBufferFree(xml_buf); + + virDomainFree(dom); + + vshError(ctl, _("\nFailed to undefine domain %s"), name); + return false; } @@ -14736,6 +14929,66 @@ vshReadline (vshControl *ctl, const char *prompt) #endif /* !USE_READLINE */ + +/* + * Propmpt for boolean question (yes/no) + * + * Returns "true" on positive answer, "false" on negative + * -1 on error. + */ +static int +vshInteractiveBoolPrompt(vshControl *ctl, + const char *prompt, + bool *confirm) { + const char *positive = _("yes"); + const char *negative = _("no"); + char *r; + char buff[100]; + int ret = -1; + int len; + int c; + + if (confirm == NULL) + return ret; + + if (!ctl->imode) + return ret; + + while (ret == -1) { + vshPrint(ctl, "%s (%s/%s)? ", prompt, positive, negative); + + r = fgets(buff, sizeof(buff), stdin); + if (r == NULL) + break; + len = strlen(buff); + if (len > 0 && buff[len-1] == '\n') + buff[len-1] = '\0'; + else + /* eat rest of line */ + while ((c = fgetc(stdin) != EOF)) + if (c == '\n') + break; + + /* compare */ + if (STRCASEEQLEN(buff, positive, strlen(positive))) { + ret = 0; + *confirm = true; + break; + } + + if (STRCASEEQLEN(buff, negative, strlen(negative))) { + ret = 0; + *confirm = false; + break; + } + + /* errorneus response - warn and ask again*/ + vshPrint(ctl, "\"%s\" %s\n", buff, _("Response not understood")); + + } + return ret; +} + /* * Deinitialize virsh */ -- 1.7.6

3 3

[libvirt] [PATCH] support qemuMonitorSend() to be called at the same time
by Wen Congyang 01 Aug '11

01 Aug '11

Current, we support run sync job and async job at the same time. It means that the monitor commands for two jobs can be run in any order. In the function qemuDomainObjEnterMonitorInternal(): if (priv->job.active == QEMU_JOB_NONE && priv->job.asyncJob) { if (qemuDomainObjBeginNestedJob(driver, obj) < 0) We check whether the caller is an async job by priv->job.active and priv->job.asynJob. But when an async job is running, priv->job.active is QEMU_JOB_NONE if no sync job is running, or priv->job.active is not QEMU_JOB_NONE if a sync job is running. So we cannot check whether the caller is an async job in the function qemuDomainObjEnterMonitorInternal(). Unfortunately, if sync job and async job are running at the same time, we may try to send monitor command at the same time in two threads. It's very dangerous, and it will cause libvirtd crashed. We should enhance the function qemuMonitorSend() to support it to be called at the same time. If the last monitor command does not finish, the other monitor commands should wait it to finish. --- src/qemu/qemu_monitor.c | 22 +++++++++++++++++++++- 1 files changed, 21 insertions(+), 1 deletions(-) diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index db6107c..a10f53f 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -46,6 +46,8 @@ struct _qemuMonitor { virMutex lock; /* also used to protect fd */ virCond notify; + virCond send_notify; + int refs; int fd; @@ -675,7 +677,8 @@ qemuMonitorOpen(virDomainObjPtr vm, VIR_FREE(mon); return NULL; } - if (virCondInit(&mon->notify) < 0) { + if ((virCondInit(&mon->notify) < 0) || + (virCondInit(&mon->send_notify) < 0)) { qemuReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("cannot initialize monitor condition")); virMutexDestroy(&mon->lock); @@ -795,6 +798,22 @@ int qemuMonitorSend(qemuMonitorPtr mon, return -1; } + while (mon->msg) { + if (virCondWait(&mon->send_notify, &mon->lock) < 0) { + qemuReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Unable to wait on monitor condition")); + goto cleanup; + } + } + + /* Check whether qemu quited unexpectedly again */ + if (mon->lastError.code != VIR_ERR_OK) { + VIR_DEBUG("Attempt to send command while error is set %s", + NULLSTR(mon->lastError.message)); + virSetError(&mon->lastError); + return -1; + } + mon->msg = msg; qemuMonitorUpdateWatch(mon); @@ -818,6 +837,7 @@ int qemuMonitorSend(qemuMonitorPtr mon, cleanup: mon->msg = NULL; qemuMonitorUpdateWatch(mon); + virCondBroadcast(&mon->send_notify); return ret; } -- 1.7.1

3 11

[libvirt] [PATCH] daemon: Unlink unix socket paths on shutdown
by Osier Yang 01 Aug '11

01 Aug '11

This patch introduces a internal RPC API "virNetServerClose", which is standalone with "virNetServerFree". it closes all the socket fds, and unlinks the unix socket paths, regardless of whether the socket is still referenced or not. This is to address regression bug: https://bugzilla.redhat.com/show_bug.cgi?id=725702 --- daemon/libvirtd.c | 1 + src/rpc/virnetserver.c | 12 ++++++++++++ src/rpc/virnetserver.h | 1 + src/rpc/virnetserverservice.c | 12 ++++++++++++ src/rpc/virnetserverservice.h | 2 ++ src/rpc/virnetsocket.c | 16 ++++++++++++++++ src/rpc/virnetsocket.h | 2 ++ 7 files changed, 46 insertions(+), 0 deletions(-) diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c index 9e044e2..53f1002 100644 --- a/daemon/libvirtd.c +++ b/daemon/libvirtd.c @@ -1558,6 +1558,7 @@ int main(int argc, char **argv) { cleanup: virNetServerProgramFree(remoteProgram); virNetServerProgramFree(qemuProgram); + virNetServerClose(srv); virNetServerFree(srv); if (statuswrite != -1) { if (ret != 0) { diff --git a/src/rpc/virnetserver.c b/src/rpc/virnetserver.c index 2dae2ff..d2a6fef 100644 --- a/src/rpc/virnetserver.c +++ b/src/rpc/virnetserver.c @@ -794,3 +794,15 @@ void virNetServerFree(virNetServerPtr srv) virMutexDestroy(&srv->lock); VIR_FREE(srv); } + +void virNetServerClose(virNetServerPtr srv) +{ + int i; + + if (!srv) + return; + + for (i = 0; i < srv->nservices; i++) { + virNetServerServiceClose(srv->services[i]); + } +} diff --git a/src/rpc/virnetserver.h b/src/rpc/virnetserver.h index 810d8a3..324cfb7 100644 --- a/src/rpc/virnetserver.h +++ b/src/rpc/virnetserver.h @@ -85,5 +85,6 @@ void virNetServerQuit(virNetServerPtr srv); void virNetServerFree(virNetServerPtr srv); +void virNetServerClose(virNetServerPtr srv); #endif diff --git a/src/rpc/virnetserverservice.c b/src/rpc/virnetserverservice.c index d5648dc..8c9ed1e 100644 --- a/src/rpc/virnetserverservice.c +++ b/src/rpc/virnetserverservice.c @@ -280,3 +280,15 @@ void virNetServerServiceToggle(virNetServerServicePtr svc, VIR_EVENT_HANDLE_READABLE : 0); } + +void virNetServerServiceClose(virNetServerServicePtr svc) +{ + int i; + + if (!svc) + return; + + for (i = 0; i < svc->nsocks; i++) { + virNetSocketClose(svc->socks[i]); + } +} diff --git a/src/rpc/virnetserverservice.h b/src/rpc/virnetserverservice.h index 9357598..8540bd9 100644 --- a/src/rpc/virnetserverservice.h +++ b/src/rpc/virnetserverservice.h @@ -66,4 +66,6 @@ void virNetServerServiceFree(virNetServerServicePtr svc); void virNetServerServiceToggle(virNetServerServicePtr svc, bool enabled); +void virNetServerServiceClose(virNetServerServicePtr svc); + #endif diff --git a/src/rpc/virnetsocket.c b/src/rpc/virnetsocket.c index 41b691a..b94b629 100644 --- a/src/rpc/virnetsocket.c +++ b/src/rpc/virnetsocket.c @@ -1222,3 +1222,19 @@ void virNetSocketRemoveIOCallback(virNetSocketPtr sock) virMutexUnlock(&sock->lock); } + +void virNetSocketClose(virNetSocketPtr sock) +{ + if (!sock) + return; + + VIR_FORCE_CLOSE(sock->fd); + +#ifdef HAVE_SYS_UN_H + /* If a server socket, then unlink UNIX path */ + if (!sock->client && + sock->localAddr.data.sa.sa_family == AF_UNIX && + sock->localAddr.data.un.sun_path[0] != '\0') + unlink(sock->localAddr.data.un.sun_path); +#endif +} diff --git a/src/rpc/virnetsocket.h b/src/rpc/virnetsocket.h index dfb3c5d..3735a88 100644 --- a/src/rpc/virnetsocket.h +++ b/src/rpc/virnetsocket.h @@ -118,6 +118,8 @@ void virNetSocketUpdateIOCallback(virNetSocketPtr sock, void virNetSocketRemoveIOCallback(virNetSocketPtr sock); +void virNetSocketClose(virNetSocketPtr sock); + #endif /* __VIR_NET_SOCKET_H__ */ -- 1.7.6

2 5

[libvirt] [PATCH v2] qemu: fix return value issue
by ajia＠redhat.com 01 Aug '11

01 Aug '11

whether or not previous return value is -1, the following codes will be executed for a inactive guest in src/qemu/qemu_driver.c: ret = virDomainSaveConfig(driver->configDir, persistentDef); and if everything is okay, 'ret' is assigned to 0, the previous 'ret' will be overwritten, this patch will fix this issue. * src/qemu/qemu_driver.c: avoid return value is overwritten when give a argument in out of blkio weight range for a inactive guest. * how to reproduce? % virsh blkiotune ${guestname} --weight 10 % echo $? Note: guest must be inactive, argument 10 in out of blkio weight range, and can get a error information by checking libvirtd.log, however, virsh hasn't raised any error information, and return value is 0. https://bugzilla.redhat.com/show_bug.cgi?id=726304 Signed-off-by: Alex Jia <ajia(a)redhat.com> --- src/qemu/qemu_driver.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index b673fd5..aaccddf 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -5688,7 +5688,9 @@ static int qemuDomainSetBlkioParameters(virDomainPtr dom, ret = -1; } } - ret = virDomainSaveConfig(driver->configDir, persistentDef); + + if (virDomainSaveConfig(driver->configDir, persistentDef) < 0) + ret = -1; } cleanup: -- 1.7.1

2 1