- Devel - libvirt List Archives

[libvirt] Release of libvirt-1.2.3
by Daniel Veillard 01 Apr '14

01 Apr '14

So as scheduled, libvirt-1.2.3 release is ready, it is tagged in git and the tarball and rpms are available at the usual place: ftp://libvirt.org/libvirt/ This release is rather large in the number of commits (more than 400) but includes a lot of changes made to clean up the code base. there is still a fair amount of improvements and a few notable features, and as usual a number of bug fixes :) . To be noted the large improvements on the Xen driver and the bhyve driver for BSD ! Features: - add new virDomainCoreDumpWithFormat API (Qiao Nuohan) - conf: Introduce virDomainDeviceGetInfo API (Jiri Denemark) - more features and fixes on bhyve driver (Roman Bogorodskiy) - lot of cleanups and improvement on the Xen driver (Chunyan Liu, Jim Fehlig) Documentation: - virsh: man: Fix spelling of parameters for --memspec in snapshot-create-as (Shanzhi Yu) - util: fix a typo in virprocess.c and d (Hongwei Bi) - cgroups: fix typo about LXC cgroups (Jean-Baptiste Rouault) - daemon: Enhance documentation for changing NOFILE limit (Jiri Denemark) - domiftune: Reword bandwidth clearing paragraph (Michal Privoznik) - conf: consistent comments about disk enum usage (Eric Blake) - qemu.conf: Mention virtlockd in @lock_manager description (Michal Privoznik) - add VMmanager to web apps (Martin Kletzander) - storage: Explicitly state that it's possible to have non-unique key (Peter Krempa) - typo fix (Roman Bogorodskiy) Portability: - Prohibit Windows special chars in filenames (Matthias Bolte) - tests: Fix SCSI test data filenames for Windows (Matthias Bolte) - apparmor: Fix build after split of disk source metadata (Peter Krempa) - Fix build on mingw32 (Ján Tomko) - build: Fix build with old automake (Jiri Denemark) - Fix build with qemu driver disabled (Roman Bogorodskiy) - Fix type mismatch of virNetDev*NetConfig on non-Linux (Ján Tomko) - virIdentityGetSystem: don't fail if SELinux is disabled (Michael Chapman) Bug Fixes: - build: fix syntax-check for storage_backend (Martin Kletzander) - gluster: Fix "key" attribute for gluster volumes (Peter Krempa) - Fix Memory Leak in testMessageArrayRef() (Nehal J Wani) - virsh: fix 'help event' (Eric Blake) - bhyve: don't leak tap devices on failures (Roman Bogorodskiy) - storage: gluster: Fix crash when initialization of storage backend fails (Peter Krempa) - Fix virNodeDeviceListCaps always returns empty (Jincheng Miao) - Create hostdevmgr in UserRuntimeDirectory for session libvirt (Ján Tomko) - Remove double free in virHostdevManagerDispose (Ján Tomko) - Fix apparmor profile to make vfio pci passthrough work (Cédric Bosdonnat) - Fixed regression in apparmor profiles for qemu brought by 43c030f (Cédric Bosdonnat) - Fix Memory Leak in virQEMUCapsInitGuestFromBinary() (Nehal J Wani) - Fix memory leak in testGetCaps() (Nehal J Wani) - network: fix problems with SRV records (Laine Stump) - Free groups in case of a partial match (Ján Tomko) - qemuDomainAttachDeviceFlags: Parse device xml as inactive (Michal Privoznik) - Coverity: Resolve a RESOURCE_LEAK (John Ferlan) - Coverity: Resolve a FORWARD_NULL (John Ferlan) - Coverity: Resolve a CHECKED_RETURN message (John Ferlan) - bhyve: don't fail on busy tap devices (Roman Bogorodskiy) - libxl: Create log directory earlier (Stefan Bader) - sanlock: Forbid VIR_DOMAIN_LOCK_FAILURE_RESTART (Jiri Denemark) - sanlock: Forbid VIR_DOMAIN_LOCK_FAILURE_IGNORE (Jiri Denemark) - vmware: fix parse of disk source (Eric Blake) - qemuDomainGetImageIds: Skip <seclabel/> without label (Michal Privoznik) - cgroup: Fix start VMs coincidently failed (Wang Yufei) - Remove bogus call to dbus_set_error_from_message (Daniel P. Berrange) - Remove bogus unref in virDBusMessageRead (Daniel P. Berrange) - Check boot order on device attach (Jiri Denemark) - qemu: Return meaningful error when qemu dies early (Jiri Denemark) - Ignore missing files on pool refresh (Ján Tomko) - Ignore char devices in storage pools by default (Ján Tomko) - is_selinux_enabled() returns -1 on error, account for this. (Scott Sullivan) - Fix unitialized data in virSocketAddrMask (Daniel P. Berrange) - Fix virQEMUCapsLoadCache leaks (Ján Tomko) - virNetClientSetTLSSession: Restore original signal mask (Michal Privoznik) - nwfilter: Fix double free of pointer (Stefan Berger) - build: Make sure src/util/virprobe.h is distributed (Jiri Denemark) - qemuhotplugtest: Fix mem-leaking testcases (Nehal J Wani) - build: Fix make distcheck (Martin Kletzander) - virNetServerNewPostExecRestart: Initialize @max_anonymous_clients (Michal Privoznik) - Fix memory leak in virDomainChrSourceDefClear() (Nehal J Wani) - Fix memory leak in virDomainSnapshotDiskDefClear() (Nehal J Wani) - bhyve: allow to destroy only active domains (Roman Bogorodskiy) - Fix leak on OOM when creating nwfilter rule instances (Daniel P. Berrange) - Avoid warning message from libxl driver on non-Xen kernels (Daniel P. Berrange) - Fix mistakes in checking return values (Daniel P. Berrange) - Fix issue found by coverity and cleanup (Pavel Hrdina) - XMLToNative: Parse XML as INACTIVE (Cole Robinson) - qemu: XMLToNative: Don't open vhostfd (Cole Robinson) - qemu: XMLToNative: Don't show -S (Cole Robinson) - qemu: cleanup tap devices on FreeBSD (Roman Bogorodskiy) - openvzRegister: Check for error return (John Ferlan) - nwfilter: Fix rule priority problem (Stefan Berger) - hotplug:Fix log mistake in qemuMonitorAddNetdev (Wang Rui) - libxl: Check for control_d string to decide about dom0 (Stefan Bader) - vircrypto: fix Invalid write in virCryptoHashString() (Nehal J Wani) - Load CPU map from builddir when run uninstalled (Jiri Denemark) - nwfilter: Add missing goto err_exit in error path (Stefan Berger) - Fix sec label setup when attaching to QEMU processes (Daniel P. Berrange) - storage: Fix bugs in VIR_APPEND_ELEMENT series (John Ferlan) - Remove broken error reporting in QEMU mac filtering (Daniel P. Berrange) - BZ1072677: Avoid freeing of 0 file descriptor (Stefan Berger) - Add a mutex to serialize updates to firewall (Daniel P. Berrange) - Fix locking in virsh console (Roman Bogorodskiy) - qemu: Reject unsupported tuning in session mode (Martin Kletzander) - virt-login-shell: silence coverity warning (Eric Blake) - Fix missing char dev lock path case in configure (Roman Bogorodskiy) - storage: Error out when attempting to vol-upload into a remote pool (Peter Krempa) - build: fix cppi warning (Eric Blake) - nwfilter: Increase buffer size for libpcap (Stefan Berger) Improvements: - storage: Rename VolOpenCheckMode to VolOpen (Cole Robinson) - storage: move block format lookup to shared UpdateVolInfo (Cole Robinson) - storage: Rename UpdateVolInfoFlags to UpdateVolInfo (Cole Robinson) - util: storagefile: Don't pursue backing chain of NULL image (Peter Krempa) - storage: pool: Fix XML indentation in pool source lookup (Peter Krempa) - ESX: Add support for virtualHW version 10 (Dawid Zamirski) - Modify help information of virsh list command (Li Yang) - bhyve: add domainLookupByID (Wojciech Macek) - bhyve: add xml2args unittest (Roman Bogorodskiy) - Move virBhyveTapGetRealDeviceName to virnetdevtap (Roman Bogorodskiy) - Shift the for loop over matched vars by one (Ján Tomko) - Use VIR_STRNDUP instead of modifying the matched string (Ján Tomko) - Simplify the loop in virCommandRunRegex (Ján Tomko) - Remove useless 'maxReg' variable (Ján Tomko) - qemu: add unit tests for the capabilities xml (Francesco Romani) - qemu: extract guest capabilities initialization (Francesco Romani) - qemu: export disk snapshot support in capabilities (Francesco Romani) - Show the real cpu shares value in live XML (Ján Tomko) - Treat zero cpu shares as a valid value (Ján Tomko) - qemu: remove redundant virQEMUDriverGetConfig (Tomoki Sekiyama) - Add a rule for indenting labels (Ján Tomko) - Indent top-level labels by one space in tools/ (Ján Tomko) - Indent top-level labels by one space in tests/ (Ján Tomko) - Indent top-level labels by one space in the rest of src/ (Ján Tomko) - Indent top-level labels by one space in src/xen/ (Ján Tomko) - Indent top-level labels by one space in src/vbox/ (Ján Tomko) - Indent top-level labels by one space in src/util/ (Ján Tomko) - Indent top-level labels by one space in src/test/ (Ján Tomko) - Indent top-level labels by one space in src/storage/ (Ján Tomko) - Indent top-level labels by one space in src/rpc/ (Ján Tomko) - Indent top-level labels by one space in src/remote/ (Ján Tomko) - Indent top-level labels by one space in src/qemu/ (Ján Tomko) - Indent top-level labels by one space in src/parallels/ (Ján Tomko) - Indent top-level labels by one space in src/nwfilter/ (Ján Tomko) - Indent top-level labels by one space in src/network/ (Ján Tomko) - Indent top-level labels by one space in src/lxc/ (Ján Tomko) - Indent top-level labels by one space in src/locking/ (Ján Tomko) - Indent top-level labels by one space in libvirt.c (Ján Tomko) - Indent top-level labels by one space in src/libxl/ (Ján Tomko) - Indent top-level labels by one space in src/esx/ (Ján Tomko) - Indent top-level labels by one space in src/cpu/ (Ján Tomko) - Indent top-level labels by one space in src/conf/ (Ján Tomko) - Indent top-level labels by one space in examples/ (Ján Tomko) - Indent top-level labels by one space in daemon/ (Ján Tomko) - util: Sanitize ATTRIBUTE_NONNULL use in viriscsi.h (Peter Krempa) - maint: update to latest gnulib (Eric Blake) - allow "virsh dump --memory-only" specify dump format (Qiao Nuohan) - qemu: add support for virDomainCoreDumpWithFormat API (Qiao Nuohan) - qemu: add qemuMonitorGetDumpGuestMemoryCapability (Qiao Nuohan) - conf: prepare to track multiple host source files per <disk> (Eric Blake) - conf: use disk source accessors in xenxs/ (Eric Blake) - conf: use disk source accessors in xen/ (Eric Blake) - conf: use disk source accessors in vmx/ (Eric Blake) - conf: use disk source accessors in vmware/ (Eric Blake) - conf: use disk source accessors in vbox/ (Eric Blake) - conf: use disk source accessors in uml/ (Eric Blake) - conf: use disk source accessors in security/ (Eric Blake) - conf: use disk source accessors in qemu/ (Eric Blake) - conf: use disk source accessors in phyp/ (Eric Blake) - conf: use disk source accessors in parallels/ (Eric Blake) - conf: use disk source accessors in lxc/ (Eric Blake) - conf: use disk source accessors in locking/ (Eric Blake) - conf: use disk source accessors in libxl/ (Eric Blake) - conf: use disk source accessors in esx/ (Eric Blake) - conf: use disk source accessors in bhyve/ (Eric Blake) - conf: use disk source accessors in conf/ (Eric Blake) - conf: accessors for common source information (Eric Blake) - bhyve: add domainCreateWithFlags support (Roman Bogorodskiy) - bhyve: MAC address configuration (Wojciech Macek) - libxl_driver.c: cleanup code (Chunyan Liu) - Introduce virFDStreamOpenPTY (Roman Bogorodskiy) - Add stubs for virDBusCreateReply{,V} (Ján Tomko) - libvirt support to force convergence of live guest migration (Chegu Vinod) - Allow caller to handle DBus error messages (Daniel P. Berrange) - Introduce alternate way to encode/decode arrays in DBus messages (Daniel P. Berrange) - Add DBus helper methods for creating reply messages (Daniel P. Berrange) - Refactor dbus helper methods for method calls (Daniel P. Berrange) - virlog: Modify virLogParseDefaultPriority's comment of return value (Zhou Yimin) - Fix typo in configure.ac (Ján Tomko) - Define ISCSIADM unconditionally (Ján Tomko) - Pass action to virDomainDefCompatibleDevice (Jiri Denemark) - Fix usage of virDomainDefCompatibleDevice (Jiri Denemark) - tests: Set abs_*dir in a consistent way (Jiri Denemark) - qemu: allow filtering events by regex (Eric Blake) - qemu: enable monitor event filtering by name (Eric Blake) - qemu: enable monitor event reporting (Eric Blake) - qemu: wire up RPC for qemu monitor events (Eric Blake) - qemu: create object for qemu monitor events (Eric Blake) - qemu: virsh wrapper for qemu events (Eric Blake) - qemu: new API for tracking arbitrary monitor events (Eric Blake) - Fix indentation in iscsi storage backend (Ján Tomko) - Add test for virISCSIScanTargets (Ján Tomko) - Add test for virISCSIGetSession (Ján Tomko) - Move functions using iscsiadm to viriscsi.c (Ján Tomko) - Remove storage pool from the arguments of a few functions (Ján Tomko) - Don't create iscsiadm command line in ISCSIPool{Start,Stop} (Ján Tomko) - Switch virCommandRunRegex to use virStringSplit (Ján Tomko) - Move virStorageBackendRun to vircommand (Ján Tomko) - Sort includes in storage_backend_iscsi.c (Ján Tomko) - Require K&R styled curly braces around function bodies (Martin Kletzander) - Use K&R style for curly braces in remaining files (Martin Kletzander) - Use K&R style for curly braces in src/vbox/ (Martin Kletzander) - Use K&R style for curly braces in src/network/bridge_driver.c (Martin Kletzander) - Use K&R style for curly braces in src/lxc/lxc_driver.c (Martin Kletzander) - Use K&R style for curly braces in src/uml/ (Martin Kletzander) - Use K&R style for curly braces in src/test/test_driver.c (Martin Kletzander) - Use K&R style for curly braces in src/nwfilter/ (Martin Kletzander) - Use K&R style for curly braces in src/openvz/ (Martin Kletzander) - Use K&R style for curly braces in src/storage/ (Martin Kletzander) - Use K&R style for curly braces in src/qemu/ (Martin Kletzander) - Use K&R style for curly braces in src/conf/ (Martin Kletzander) - Use K&R style for curly braces in src/rpc/ (Martin Kletzander) - Use K&R style for curly braces in src/util/ (Martin Kletzander) - Use K&R style for curly braces in src/xen*/ (Martin Kletzander) - Use K&R style for curly braces in tests/ (Martin Kletzander) - bhyve: host API support (Wojciech Macek) - libxl: move domain event handler to libxl_domain (Jim Fehlig) - libxl: include a pointer to the driver in libxlDomainObjPrivate (Jim Fehlig) - libxl: move libxlVmStart to libxl_domain (Jim Fehlig) - libxl: move libxlFreeMem to libxl_domain (Jim Fehlig) - libxl: move libxlDomainSetVcpuAffinities to libxl_domain (Jim Fehlig) - libxl: move libxlDoNodeGetInfo to libxl_conf (Jim Fehlig) - libxl: move libxlDomainAutoCoreDump to libxl_domain (Jim Fehlig) - libxl: move libxlDomEventsRegister to libxl_domain (Jim Fehlig) - libxl: move libxlVmCleanup{,Job} to libxl_domain (Jim Fehlig) - libxl: move libxlSaveImageOpen to libxl_domain (Jim Fehlig) - libxl: move libxlDomainManagedSavePath to libxl_domain (Jim Fehlig) - libxl: move libxlDomainEventQueue to libxl_domain (Jim Fehlig) - Add ability to register callback for virCommand dry run (Daniel P. Berrange) - Change CMD_STOPONERR(1) to use true (Daniel P. Berrange) - Change 'int isTempChain' to bool in nwfilter (Daniel P. Berrange) - Remove pointless return values in nwfilter methods (Daniel P. Berrange) - Remove 'int stopOnError' parameters in nwfilter methods (Daniel P. Berrange) - Remove pointless brackets around boolean (Daniel P. Berrange) - Change 'int incoming' to 'bool incoming' in nwfilter code (Daniel P. Berrange) - virhostdev.h: remove ATTRIBUTE_NONNULL from oldStateDir (Chunyan Liu) - libxl: fix framebuffer port setting for HVM domains (Jim Fehlig) - maint: avoid unbalanced {} across vbox #ifdef (Eric Blake) - Remove global log buffer feature entirely (Daniel P. Berrange) - Switch to filtering based on log source name instead of filename (Daniel P. Berrange) - Add virLogSource variables to all source files (Daniel P. Berrange) - Turn virLogSource into a struct instead of an enum (Daniel P. Berrange) - Move dtrace probe macros into separate header file (Daniel P. Berrange) - Refactor code that skips logging of error messages (Daniel P. Berrange) - Reduce performance overhead of the global log buffer (Daniel P. Berrange) - qemuDomainSetInterfaceParameters: Allow bandwidth clear out (Michal Privoznik) - cfg.mk: Fix whitespaces (Martin Kletzander) - Remove double space in file name comment check (Ján Tomko) - Explicitly cast some switch parameters to enum (Martin Kletzander) - Require spaces around equality comparisons (Martin Kletzander) - Remove duplicate network model characters (Martin Kletzander) - tests: cleanup object-locking test (Martin Kletzander) - qemu: agent availability cleanup (Martin Kletzander) - virsh: Prohibit virConnectOpen* functions in virsh (Martin Kletzander) - virsh: Add keepalive in new vshConnect function (Martin Kletzander) - virt-aa-helper: handle 9pfs (Felix Geyer) - Give virNWFilterVarCombIterNext saner semantics (Daniel P. Berrange) - bhyve: fix hostbridge device command generation (Roman Bogorodskiy) - bhyve: add support for virtio block devices (Roman Bogorodskiy) - Enforce attribute check of the virRegister functions (Pavel Hrdina) - daemon: Introduce max_anonymous_clients (Michal Privoznik) - virNetServer: Introduce unauth clients counter (Michal Privoznik) - datatypes: Fix comments (Michael Chapman) - bhyve: implement nodeGetInfo() (Roman Bogorodskiy) - Add parameter to wait for lock in file locking APIs (Nehal J Wani) - spec: move some dirs into appropriate subpackages (Michael Chapman) - build: detect/prohibit hardcoded XML indent in syntax-check (Laine Stump) - conf: eliminate hardcoded indentation in all remaining xml (Laine Stump) - qemu: elminate hardcoded indent in capabilities cache XML (Laine Stump) - util: eliminate hardcoded indent in virConnectSysInfo formatting (Laine Stump) - qemu: eliminate hardcoded indent from migration cookie xml (Laine Stump) - virsh: eliminate hardcoded indentation in xml generated for commands (Laine Stump) - conf: eliminate hardcoded indent in volume/pool xml (Laine Stump) - conf: eliminate hardcoded indentation in node device xml (Laine Stump) - conf: eliminate hardcoded indentation in capabilities xml (Laine Stump) - conf: eliminate hardcoded indentation in nwfilter xml (Laine Stump) - conf: eliminate outmoded/odd indent method from interface xml (Laine Stump) - conf: eliminate hardcoded indent from network xml (Laine Stump) - conf: eliminate hardcoded indent from domain snapshot xml (Laine Stump) - conf: eliminate hardcoded indent from domain xml (Laine Stump) - nwfilter: Add ARP src/dst IP mask for ebtables ARP (Stefan Berger) - hostdev: add virObject field to virHostdevManager struct (Jim Fehlig) - Make ABI stability issue easier to debug (Jiri Denemark) - qemu: Forbid "sgio" support for SCSI generic host device (Osier Yang) - add pci passthrough to libxl driver (Chunyan Liu) - add hostdev pci backend type for xen (Chunyan Liu) - change lxc_hostdev.c to use virhostdev common library APIs (Chunyan Liu) - add unit test for new virhostdev common library (Chunyan Liu) - Add parameter checks/annotations to hostdev APIs (Chunyan Liu) - add 3 wrapper functions for prepare/reattach/update domain hostdevs (Chunyan Liu) - improve virHostdevUpdate* parameters to make it more widely used (Chunyan Liu) - Capitalize USB, PCI and SCSI in hostdev variables (Daniel P. Berrange) - Remove redundant duplicated 'Hostdev' string method names (Daniel P. Berrange) - Capitalize USB, PCI and SCSI in hostdev methods (Chunyan Liu) - Fixed const-ness of parameters in netdev/hostdev code (Daniel P. Berrange) - improve parameter name to let it more meaningful (Chunyan Liu) - move virHostdevNodeDevice* to virhostdev.c (Chunyan Liu) - extract general code of NodeDeviceReset (Chunyan Liu) - extract general code of NodeDeviceReAttach (Chunyan Liu) - extract general code of NodeDeviceDetach (Chunyan Liu) - move virHostdevReAttachHostScsiDevices to virhostdev.c (Chunyan Liu) - pass driver name as parameter to virHostdevReAttachScciHostdevs (Chunyan Liu) - extract general code from qemuDomainReAttachHostScsiDevices (Chunyan Liu) - move virHostdevReAttachUsbHostdevs to virhostdev.c (Chunyan Liu) - pass driver name as paramter to virHostdevReAttachUsbHostdevs (Chunyan Liu) - extract general code from qemuDomainReAttachHostUsbDevices (Chunyan Liu) - move virHostdevPrepareHostSCSIDevices to virhostdev.c (Chunyan Liu) - pass driver name as parameter to virHostdevPrepareSCSIDevices (Chunyan Liu) - extract general code from qemuPrepareHostSCSIDevices (Chunyan Liu) - move virHostdevPrepareHostUSBDevices to virhostdev.c (Chunyan Liu) - pass driver name to virHostdevPrepareUSBDevices (Chunyan Liu) - rename qemu*USBDevices to virHostdev*USBDevices (Chunyan Liu) - extract general code from qemuPrepareHostUSBDevices (Chunyan Liu) - move virHostdevUpdate* functions to virhostdev.c (Chunyan Liu) - pass driver_name as parameter of virHostdevUpdate*Hostdevs functions (Chunyan Liu) - extract general code from qemuUpdateActiveScsiHostdevs (Chunyan Liu) - extract general code from qemuUpdateActiveUsbHostdevs (Chunyan Liu) - extract general code from qemuUpdateActivePciHostdevs (Chunyan Liu) - move virHostdevPrepare(ReAttach)PCIDevices to virhostdev.c (Chunyan Liu) - rename qemuReAttachPciDevice to virHostdevReAttachPciDevice (Daniel P. Berrange) - Conditionally wait for kvm_assigned_device cleanup (Chunyan Liu) - pass driver name as a parameter to virHostdevReAttachPCIDevices (Chunyan Liu) - extract general code from qemuDomainReAttachHostdevDevices (Chunyan Liu) - pass driver name as a parameter to virHostdevPrepareHostdevPCIDevices (Chunyan Liu) - rename qemuGet*PciHostDeviceList to virHostdevGet*PciHostDeviceList (Chunyan Liu) - rename qemu*NetConfigRestore/Replace to virHostdevNetConfigRestore/Replace (Chunyan Liu) - extract general code from qemuPrepareHostdevPCIDevices (Chunyan Liu) - qemu_hostdev: move netconfig file location to virhostdev stateDir (Chunyan Liu) - qemu_hostdev: move ColdBoot as a flag (Chunyan Liu) - qemu_hostdev: move cfg->relaxedACS as a flag (Chunyan Liu) - lxc: use general virhostdev lists instead of its own (Chunyan Liu) - qemu: use general virhostdev lists instead of its own (Chunyan Liu) - qemu: remove functions used internally only from qemu_hostdev.h (Chunyan Liu) - qemu: reuse hostdev interfaces to avoid duplicate (Chunyan Liu) - update qemuPrepareHostUSBDevices parameters to keep consistency (Chunyan Liu) - virhostdev: use virObject to virHostdevManager to keep reference (Chunyan Liu) - Introduce vircommandpriv.h for functions used by tests (Ján Tomko) - Use size_t for ndevice in pool source definition (Ján Tomko) - Introduce virStoragePoolSourceDeviceClear (Ján Tomko) - Change virStorageBackendISCSISession 'probe' arg to bool (Ján Tomko) - qemu: don't munge user input during block commit (Eric Blake) - iptables: don't log command probe failures (Eric Blake) - libxl: support sexpr in native to XML conversion (Jim Fehlig) - Remove unused ebtablesRemoveForwardPolicyReject method (Daniel P. Berrange) - Remove worthless ebtRules data structure (Daniel P. Berrange) - Remove data structure holding list of ebtables rules (Daniel P. Berrange) - Remove unused variables from ebtablesContext (Daniel P. Berrange) - Make ebtablesForwardPolicyReject static (Daniel P. Berrange) - Remove decl of method which doesn't exist in virebtables.h (Daniel P. Berrange) - Remove many decls from bridge driver platform header (Daniel P. Berrange) - Cache result of QEMU capabilities extraction (Daniel P. Berrange) - Change QEMU capabilities cache to check ctime instead of mtime (Daniel P. Berrange) - Add helper APIs to track if libvirtd or loadable modules have changed (Daniel P. Berrange) - virSecurityDACSetSecurityImageLabel: Unmark @def as unused (Michal Privoznik) - tests: Distribute securityselinuxhelperdata (Jiri Denemark) - Convert lock driver plugins to use new crypto APIs (Daniel P. Berrange) - Add helper APIs for generating cryptographic hashes (Daniel P. Berrange) - Change file names in comments to match the files they are in (Ján Tomko) - Wildcard ignore tests/*test instead of listing every one (Daniel P. Berrange) - src/xenxs: Utilize more of VIR_(APPEND|INSERT|DELETE)_ELEMENT (Michal Privoznik) - src/xen: Utilize more of VIR_(APPEND|INSERT|DELETE)_ELEMENT (Michal Privoznik) - src/util: Utilize more of VIR_(APPEND|INSERT|DELETE)_ELEMENT (Michal Privoznik) - src/test: Utilize more of VIR_(APPEND|INSERT|DELETE)_ELEMENT (Michal Privoznik) - src/storage: Utilize more of VIR_(APPEND|INSERT|DELETE)_ELEMENT (Michal Privoznik) - src/rpc: Utilize more of VIR_(APPEND|INSERT|DELETE)_ELEMENT (Michal Privoznik) - src/qemu: Utilize more of VIR_(APPEND|INSERT|DELETE)_ELEMENT (Michal Privoznik) - src/phyp: Utilize more of VIR_(APPEND|INSERT|DELETE)_ELEMENT (Michal Privoznik) - src/parallels: Utilize more of VIR_(APPEND|INSERT|DELETE)_ELEMENT (Michal Privoznik) - src/openvz: Utilize more of VIR_(APPEND|INSERT|DELETE)_ELEMENT (Michal Privoznik) - src/nwfilter: Utilize more of VIR_(APPEND|INSERT|DELETE)_ELEMENT (Michal Privoznik) - src/lxc/: Utilize more of VIR_(APPEND|INSERT|DELETE)_ELEMENT (Michal Privoznik) - conf: Utilize more of VIR_(APPEND|INSERT|DELETE)_ELEMENT (Michal Privoznik) - virsh: Sort options alphabetically (Martin Kletzander) - tests: Fix SELinux tests in VPATH build (Jiri Denemark) - virscsi: Introduce virSCSIDeviceUsedByInfoFree (John Ferlan) - tests: Test virIdentityGetSystem (Michael Chapman) - tests: SELinux tests do not need to be skipped (Michael Chapman) - tests: Flesh out securityselinuxhelper (Michael Chapman) - spec: Let translations be properly updated (Jiri Denemark) - datatypes: update comments of Dispose functions (Michael Chapman) - qemu: monitor: Provide more information in generic block job error (Peter Krempa) - storage: Don't lie about path used to look up in error message (Peter Krempa) - storage: Avoid mangling paths of non-local filesystems when looking up (Peter Krempa) - storage: Use cleanup label instead of out (Peter Krempa) - virsh: volume: Fix lookup of volumes to provide better error messages (Peter Krempa) - add virhostdev files to maintain global state of host devices (Chunyan Liu) - add 'driver' info to used_by (Chunyan Liu) - apparmor: handle "none" type (Cédric Bosdonnat) - add support for apparmor in lxc-enter-namespace (Cédric Bosdonnat) - apparmor: add debug traces when changing profile. (Cédric Bosdonnat) - Make sure apparmor is started before libvirtd (Cédric Bosdonnat) - LXC driver: generate apparmor profiles for guests (Cédric Bosdonnat) - qemu: monitor: Fix error message and comment when getting cpu info (Peter Krempa) - qemu: snapshot: Use better check when reverting external snapshots (Peter Krempa) - qemuBuildNicDevStr: Adapt to new advisory on multiqueue (Michal Privoznik) - Check if systemd is running before creating machines (Ján Tomko) - Split out most of virDBusIsServiceEnabled (Ján Tomko) - Don't always skip virportallocatortest (Ján Tomko) - tests: Create privileged driver config in qemuxml2argvtest (Martin Kletzander) - build: Include sys/wait.h in commandtest.c (Ján Tomko) - nwfilter: Display the pcap errror message (Stefan Berger) - nwfilter: Cap the poll timeout in the DHCP Snooping code (Stefan Berger) - virsh: report exit status of failed lxc-enter-namespace (Eric Blake) - virt-login-shell: saner exit value (Eric Blake) - virt-login-shell: use single instead of double fork (Eric Blake) - virFork: simplify semantics (Eric Blake) - util: make it easier to grab only regular command exit (Eric Blake) - util: make it easier to grab only regular process exit (Eric Blake) - util: preserve exit status from mount namespace callback (Eric Blake) - util: make it easier to reflect child exit status (Eric Blake) - virFork: give specific status on failure prior to exec (Eric Blake) - nwfilter: make ignoring non-zero status easier to follow (Eric Blake) - qemu: Implement a stub cpuArchDriver.baseline() handler for arm (Oleg Strikov) - Fix indentation in virsystemdmock (Ján Tomko) - Replace space with a tab in the Makefile (Ján Tomko) - Add a test for virUSBDeviceList functions (Ján Tomko) - Add tests for virUSBDeviceFind functions (Ján Tomko) - Generate a unique journald log for QEMU capabilities failure (Daniel P. Berrange) - Bump version to 1.2.3 for new dev cycle (Michal Privoznik) Cleanups: - util: remove useless comment for virCgroupMoveTask in vircgroup.c (Hongwei Bi) - Don't leave empty first line in C source files (Martin Kletzander) Thanks everybody for contributing to this release, be it with bug reports, patches, ideas, code reviews and help on localization ! Enjoy ! Daniel P.S.: for those looking for the April Fool part, don't worry that corner of the internet is still sane even today :) -- Daniel Veillard | Open Source and Standards, Red Hat veillard(a)redhat.com | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | virtualization library http://libvirt.org/

1 0

[libvirt] [PATCH] Introduce virConnectCrashDaemon API
by Ján Tomko 01 Apr '14

01 Apr '14

This reduces the affect of an unexpected DoS vulnerablity in libvirtd. --- include/libvirt/libvirt.h.in | 13 +++++++++++++ src/driver.h | 5 +++++ src/libvirt.c | 32 +++++++++++++++++++++++++++++++ src/libvirt_private.syms | 1 + src/libvirt_public.syms | 4 ++++ src/qemu/qemu_driver.c | 16 ++++++++++++++++ src/remote/remote_driver.c | 1 + src/remote/remote_protocol.x | 15 ++++++++++++++- src/util/virutil.c | 23 ++++++++++++++++++++++ src/util/virutil.h | 1 + tools/virsh-host.c | 45 ++++++++++++++++++++++++++++++++++++++++++++ 11 files changed, 155 insertions(+), 1 deletion(-) diff --git a/include/libvirt/libvirt.h.in b/include/libvirt/libvirt.h.in index 930b7e8..d0db483 100644 --- a/include/libvirt/libvirt.h.in +++ b/include/libvirt/libvirt.h.in @@ -1540,6 +1540,19 @@ char * virConnectGetURI (virConnectPtr conn); char * virConnectGetSysinfo (virConnectPtr conn, unsigned int flags); +typedef enum { + VIR_CONNECT_CRASH_RANDOM = 0, /* Randomly choose one crash method */ + VIR_CONNECT_CRASH_NULL_PTR = 1, /* Null pointer access */ + VIR_CONNECT_CRASH_DOUBLE_FREE = 2, /* Double free */ + +# ifdef VIR_ENUM_SENTINELS + VIR_CONNECT_CRASH_LAST +# endif +} virConnectCrashFlags; + +int virConnectCrashDaemon (virConnectPtr conn, + unsigned int flags); + int virConnectSetKeepAlive(virConnectPtr conn, int interval, unsigned int count); diff --git a/src/driver.h b/src/driver.h index e66fc7a..b899a4f 100644 --- a/src/driver.h +++ b/src/driver.h @@ -1149,6 +1149,10 @@ typedef int unsigned int flags, int cancelled); +typedef int +(*virDrvConnectCrashDaemon)(virConnectPtr conn, + unsigned int flags); + typedef struct _virDriver virDriver; typedef virDriver *virDriverPtr; @@ -1363,6 +1367,7 @@ struct _virDriver { virDrvDomainMigrateFinish3Params domainMigrateFinish3Params; virDrvDomainMigrateConfirm3Params domainMigrateConfirm3Params; virDrvConnectGetCPUModelNames connectGetCPUModelNames; + virDrvConnectCrashDaemon connectCrashDaemon; }; diff --git a/src/libvirt.c b/src/libvirt.c index 4454829..739c747 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -1717,6 +1717,38 @@ virConnectGetSysinfo(virConnectPtr conn, unsigned int flags) /** + * virConnectCrashDaemon: + * @conn: pointer to a hypervisor connection + * @flags: one of virConnectCrashDaemonFlags + * + * Crashes the daemon by the method selected via @flags. + * + * Returns -1 on error or doesn't return at all in case of success. + */ +int +virConnectCrashDaemon(virConnectPtr conn, unsigned int flags) +{ + VIR_DEBUG("conn=%p, flags=%x", conn, flags); + + virResetLastError(); + + virCheckConnectReturn(conn, -1); + + if (conn->driver->connectCrashDaemon) { + if (conn->driver->connectCrashDaemon(conn, flags) < 0) + goto error; + return 0; + } + + virReportUnsupportedError(); + +error: + virDispatchError(conn); + return -1; +} + + +/** * virConnectGetMaxVcpus: * @conn: pointer to the hypervisor connection * @type: value of the 'type' attribute in the <domain> element diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 38fbf63..18f91b2 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1983,6 +1983,7 @@ virUSBDeviceSetUsedBy; # util/virutil.h virCompareLimitUlong; +virCrashDaemon; virDoubleToStr; virEnumFromString; virEnumToString; diff --git a/src/libvirt_public.syms b/src/libvirt_public.syms index 9ab0c92..378d256 100644 --- a/src/libvirt_public.syms +++ b/src/libvirt_public.syms @@ -650,5 +650,9 @@ LIBVIRT_1.2.3 { virDomainCoreDumpWithFormat; } LIBVIRT_1.2.1; +LIBVIRT_1.2.4 { + global: + virConnectCrashDaemon; +} LIBVIRT_1.2.3; # .... define new API here using predicted next version number .... diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index b032441..cd258b7 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -16661,6 +16661,21 @@ qemuConnectGetCPUModelNames(virConnectPtr conn, } +static int +qemuConnectCrashDaemon(virConnectPtr conn ATTRIBUTE_UNUSED, + unsigned int flags) +{ + if (flags >= VIR_CONNECT_CRASH_LAST) { + virReportError(VIR_ERR_INVALID_ARG, + _("Unsupported crash method %u"), + flags); + return -1; + } + + return virCrashDaemon(flags); +} + + static virDriver qemuDriver = { .no = VIR_DRV_QEMU, .name = QEMU_DRIVER_NAME, @@ -16851,6 +16866,7 @@ static virDriver qemuDriver = { .domainMigrateFinish3Params = qemuDomainMigrateFinish3Params, /* 1.1.0 */ .domainMigrateConfirm3Params = qemuDomainMigrateConfirm3Params, /* 1.1.0 */ .connectGetCPUModelNames = qemuConnectGetCPUModelNames, /* 1.1.3 */ + .connectCrashDaemon = qemuConnectCrashDaemon, /* 1.2.4 */ }; diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index ed7dde6..b01dd5b 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -7800,6 +7800,7 @@ static virDriver remote_driver = { .domainMigrateFinish3Params = remoteDomainMigrateFinish3Params, /* 1.1.0 */ .domainMigrateConfirm3Params = remoteDomainMigrateConfirm3Params, /* 1.1.0 */ .connectGetCPUModelNames = remoteConnectGetCPUModelNames, /* 1.1.3 */ + .connectCrashDaemon = remoteConnectCrashDaemon, /* 1.2.4 */ }; static virNetworkDriver network_driver = { diff --git a/src/remote/remote_protocol.x b/src/remote/remote_protocol.x index 6c445cc..7eb7f83 100644 --- a/src/remote/remote_protocol.x +++ b/src/remote/remote_protocol.x @@ -442,6 +442,13 @@ struct remote_connect_get_sysinfo_ret { remote_nonnull_string sysinfo; }; +struct remote_connect_crash_daemon_args { + unsigned int flags; +}; + +struct remote_connect_crash_daemon_ret { + int retval; +}; struct remote_connect_get_uri_ret { remote_nonnull_string uri; }; @@ -5275,5 +5282,11 @@ enum remote_procedure { * @generate: both * @acl: domain:core_dump */ - REMOTE_PROC_DOMAIN_CORE_DUMP_WITH_FORMAT = 334 + REMOTE_PROC_DOMAIN_CORE_DUMP_WITH_FORMAT = 334, + + /** + * @generate: both + * @acl: none + */ + REMOTE_PROC_CONNECT_CRASH_DAEMON = 335 }; diff --git a/src/util/virutil.c b/src/util/virutil.c index 9be1590..97215d0 100644 --- a/src/util/virutil.c +++ b/src/util/virutil.c @@ -78,6 +78,7 @@ #include "vircommand.h" #include "nonblocking.h" #include "virprocess.h" +#include "virrandom.h" #include "virstring.h" #include "virutil.h" @@ -2204,3 +2205,25 @@ void virUpdateSelfLastChanged(const char *path) selfLastChanged = sb.st_ctime; } } + +int virCrashDaemon(unsigned int flags) +{ + char **bla = NULL; + char **tmp; + + if (flags == VIR_CONNECT_CRASH_RANDOM) + flags = virRandomInt(VIR_CONNECT_CRASH_LAST) + 1; + + switch (flags) { + case VIR_CONNECT_CRASH_NULL_PTR: + bla[1] = bla[0]; + /* fallthrough */ + case VIR_CONNECT_CRASH_DOUBLE_FREE: + if (VIR_ALLOC_N(bla, 2) < 0) + return -1; + tmp = bla; + VIR_FREE(tmp); + VIR_FREE(bla); + } + return -1; +} diff --git a/src/util/virutil.h b/src/util/virutil.h index 1f2efd5..aaf1bef 100644 --- a/src/util/virutil.h +++ b/src/util/virutil.h @@ -202,4 +202,5 @@ bool virIsSUID(void); time_t virGetSelfLastChanged(void); void virUpdateSelfLastChanged(const char *path); +int virCrashDaemon(unsigned int flags); #endif /* __VIR_UTIL_H__ */ diff --git a/tools/virsh-host.c b/tools/virsh-host.c index cac6086..28e5e3b 100644 --- a/tools/virsh-host.c +++ b/tools/virsh-host.c @@ -939,6 +939,45 @@ cmdNodeMemoryTune(vshControl *ctl, const vshCmd *cmd) goto cleanup; } +/* + * "crash" command + */ +static const vshCmdInfo info_crash[] = { + {.name = "help", + .data = N_("crash the daemon") + }, + {.name = "desc", + .data = N_("Crash the libvirt daemon using the selected method.") + }, + {.name = NULL} +}; + +static const vshCmdOptDef opts_crash[] = { + {.name = "null", + .type = VSH_OT_BOOL, + .help = N_("Crash by null pointer access") + }, + {.name = "doublefree", + .type = VSH_OT_BOOL, + .help = N_("Crash by double free") + }, + {.name = NULL} +}; + +static bool +cmdCrash(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) +{ + unsigned int flags = VIR_CONNECT_CRASH_RANDOM; + + if (vshCommandOptBool(cmd, "null")) + flags = VIR_CONNECT_CRASH_NULL_PTR; + if (vshCommandOptBool(cmd, "doublefree")) + flags = VIR_CONNECT_CRASH_DOUBLE_FREE; + + virConnectCrashDaemon(ctl->conn, flags); + return true; +} + const vshCmdDef hostAndHypervisorCmds[] = { {.name = "capabilities", .handler = cmdCapabilities, @@ -1024,5 +1063,11 @@ const vshCmdDef hostAndHypervisorCmds[] = { .info = info_version, .flags = 0 }, + {.name = "crash", + .handler = cmdCrash, + .opts = opts_crash, + .info = info_crash, + .flags = 0 + }, {.name = NULL} }; -- 1.8.3.2

3 2

[libvirt] [PATCH] Bump version to 1.2.4 for new dev cycle
by Michal Privoznik 01 Apr '14

01 Apr '14

Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- Pushed already, just sending a note. configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 73efffa..7b9e38a 100644 --- a/configure.ac +++ b/configure.ac @@ -16,7 +16,7 @@ dnl You should have received a copy of the GNU Lesser General Public dnl License along with this library. If not, see dnl <http://www.gnu.org/licenses/>. -AC_INIT([libvirt], [1.2.3], [libvir-list(a)redhat.com] [], [http://libvirt.org] +AC_INIT([libvirt], [1.2.4], [libvir-list(a)redhat.com] [], [http://libvirt.org] AC_CONFIG_SRCDIR([src/libvirt.c]) AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_HEADERS([config.h]) -- 1.9.0

1 0

[libvirt] [PATCH] build: fix syntax-check for storage_backend
by Martin Kletzander 01 Apr '14

01 Apr '14

Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- Notes: Pushed as a build-breaker. src/storage/storage_backend.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/storage/storage_backend.c b/src/storage/storage_backend.c index 42bd445..adf0311 100644 --- a/src/storage/storage_backend.c +++ b/src/storage/storage_backend.c @@ -1,7 +1,7 @@ /* * storage_backend.c: internal storage driver backend contract * - * Copyright (C) 2007-2013 Red Hat, Inc. + * Copyright (C) 2007-2014 Red Hat, Inc. * Copyright (C) 2007-2008 Daniel P. Berrange * * This library is free software; you can redistribute it and/or @@ -1405,7 +1405,7 @@ virStorageBackendUpdateVolTargetInfo(virStorageVolTargetPtr target, goto cleanup; } - cleanup: + cleanup: VIR_FORCE_CLOSE(fd); return ret; -- 1.9.1

1 0

[libvirt] [for-1.2.3 PATCHv3] gluster: Fix "key" attribute for gluster volumes
by Peter Krempa 01 Apr '14

01 Apr '14

According to our documentation the "key" value has the following meaning: "Providing an identifier for the volume which identifies a single volume." The currently used keys for gluster volumes consist of the gluster volume name and file path. This can't be considered unique as a different storage server can serve a volume with the same name. Unfortunately I wasn't able to figure out a way to retrieve the gluster volume UUID which would avoid the possibility of having two distinct keys identifying a single volume. Use the full URI as the key for the volume to avoid the more critical ambiguity problem and document the possible change to UUID. --- Notes: Version 3: - fix the example too, also state that UUID might be used - repost so we don't have yet another release containing this docs/storage.html.in | 8 +++++--- src/storage/storage_backend_gluster.c | 10 ++++++++-- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/docs/storage.html.in b/docs/storage.html.in index 2706bc5..4bbf378 100644 --- a/docs/storage.html.in +++ b/docs/storage.html.in @@ -711,12 +711,14 @@ correspond to the files that can be found when mounting the gluster volume. The <code>name</code> is the path relative to the effective mount specified for the pool; and - the <code>key</code> is a path including the gluster volume - name and any subdirectory specified by the pool. + the <code>key</code> is a string that identifies a single volume + uniquely. Currently the <code>key</code> attribute consists of the + URI of the volume but it may be changed to an UUID of the volume + in the future. <pre> <volume> <name>myfile</name> - <key>volname/myfile</key> + <key>gluster://localhost/volname/myfile</key> <source> </source> <capacity unit='bytes'>53687091200</capacity> diff --git a/src/storage/storage_backend_gluster.c b/src/storage/storage_backend_gluster.c index fe92f15..337ddf4 100644 --- a/src/storage/storage_backend_gluster.c +++ b/src/storage/storage_backend_gluster.c @@ -187,6 +187,7 @@ virStorageBackendGlusterSetMetadata(virStorageBackendGlusterStatePtr state, const char *name) { int ret = -1; + char *path = NULL; char *tmp; VIR_FREE(vol->key); @@ -201,12 +202,12 @@ virStorageBackendGlusterSetMetadata(virStorageBackendGlusterStatePtr state, goto cleanup; } - if (virAsprintf(&vol->key, "%s%s%s", state->volname, state->dir, + if (virAsprintf(&path, "%s%s%s", state->volname, state->dir, vol->name) < 0) goto cleanup; tmp = state->uri->path; - if (virAsprintf(&state->uri->path, "/%s", vol->key) < 0) { + if (virAsprintf(&state->uri->path, "/%s", path) < 0) { state->uri->path = tmp; goto cleanup; } @@ -218,9 +219,14 @@ virStorageBackendGlusterSetMetadata(virStorageBackendGlusterStatePtr state, VIR_FREE(state->uri->path); state->uri->path = tmp; + /* the path is unique enough to serve as a volume key */ + if (VIR_STRDUP(vol->key, vol->target.path) < 0) + goto cleanup; + ret = 0; cleanup: + VIR_FREE(path); return ret; } -- 1.9.1

2 2

[libvirt] [PATCH] Fix Memory Leak in testMessageArrayRef()
by Nehal J Wani 31 Mar '14

31 Mar '14

While running virdbustest, it was found that valgrind pointed out the following memory leaks: ==9996== 17 (8 direct, 9 indirect) bytes in 1 blocks are definitely lost in loss record 9 of 36 ==9996== at 0x4A069EE: malloc (vg_replace_malloc.c:270) ==9996== by 0x4A06B62: realloc (vg_replace_malloc.c:662) ==9996== by 0x4C6B587: virReallocN (viralloc.c:245) ==9996== by 0x4C6B6AE: virExpandN (viralloc.c:294) ==9996== by 0x4C82B54: virDBusMessageDecodeArgs (virdbus.c:907) ==9996== by 0x4C83463: virDBusMessageDecode (virdbus.c:1141) ==9996== by 0x402C45: testMessageArrayRef (virdbustest.c:273) ==9996== by 0x404E71: virtTestRun (testutils.c:201) ==9996== by 0x401C2D: mymain (virdbustest.c:479) ==9996== by 0x4055ED: virtTestMain (testutils.c:789) ==9996== by 0x3E6CE1ED1C: (below main) (libc-start.c:226) ==9996== ==9996== 28 (16 direct, 12 indirect) bytes in 1 blocks are definitely lost in loss record 12 of 36 ==9996== at 0x4A06BE0: realloc (vg_replace_malloc.c:662) ==9996== by 0x4C6B587: virReallocN (viralloc.c:245) ==9996== by 0x4C6B6AE: virExpandN (viralloc.c:294) ==9996== by 0x4C82B54: virDBusMessageDecodeArgs (virdbus.c:907) ==9996== by 0x4C83463: virDBusMessageDecode (virdbus.c:1141) ==9996== by 0x402C45: testMessageArrayRef (virdbustest.c:273) ==9996== by 0x404E71: virtTestRun (testutils.c:201) ==9996== by 0x401C2D: mymain (virdbustest.c:479) ==9996== by 0x4055ED: virtTestMain (testutils.c:789) ==9996== by 0x3E6CE1ED1C: (below main) (libc-start.c:226) ==9996== --- tests/virdbustest.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/tests/virdbustest.c b/tests/virdbustest.c index 1870f35..bdb1c24 100644 --- a/tests/virdbustest.c +++ b/tests/virdbustest.c @@ -250,6 +250,7 @@ static int testMessageArrayRef(const void *args ATTRIBUTE_UNUSED) size_t out_nstrv2 = 0; const char *in_str2 = "World"; char *out_str1 = NULL, *out_str2 = NULL; + size_t i = 0; if (!(msg = dbus_message_new_method_call("org.libvirt.test", "/org/libvirt/test", @@ -315,6 +316,12 @@ static int testMessageArrayRef(const void *args ATTRIBUTE_UNUSED) VIR_FREE(out_int32); VIR_FREE(out_str1); VIR_FREE(out_str2); + for (i = 0; i < out_nstrv1; i++) + VIR_FREE(out_strv1[i]); + VIR_FREE(out_strv1); + for (i = 0; i < out_nstrv2; i++) + VIR_FREE(out_strv2[i]); + VIR_FREE(out_strv2); dbus_message_unref(msg); return ret; } -- 1.7.1

2 1

[libvirt] [PATCH 0/4] storage: Fix VolOpen error reporting
by Cole Robinson 31 Mar '14

31 Mar '14

In https://bugzilla.redhat.com/show_bug.cgi?id=1080613 , something is causing StorageVolGetXML to fail, but it's not raising any error message. Code inspection found that most users of VolOpen are susceptible to error reporting issues. The first 3 patches are some code reorganization and cleanups that make it easier to identify the VolOpen callers. Patch 4 fixes up the reporting issue. Cole Robinson (4): storage: Rename UpdateVolInfoFlags to UpdateVolInfo storage: move block format lookup to shared UpdateVolInfo storage: Rename VolOpenCheckMode to VolOpen storage: Always report an error from VolOpen src/storage/storage_backend.c | 234 +++++++++++++++++----------------- src/storage/storage_backend.h | 18 +-- src/storage/storage_backend_disk.c | 3 +- src/storage/storage_backend_fs.c | 28 ++-- src/storage/storage_backend_logical.c | 11 +- src/storage/storage_backend_mpath.c | 36 +----- src/storage/storage_backend_scsi.c | 43 +------ 7 files changed, 159 insertions(+), 214 deletions(-) -- 1.8.5.3

3 7

[libvirt] [PATCH tck 0/6] Fix tests which need a full OS image
by Daniel P. Berrange 31 Mar '14

31 Mar '14

A bunch of tests currently attempt to kickstart a full Fedora OS image install. Everytime I try to update this kickstart to a new version of Fedora it causes no end of pain. Switch the tests over to use Richard Jones' virt-builder command which is part of libguestfs. This makes it trivial to deploy and customize full OS images from pre-built templates. Mike - does Suse include a new enough version of libguestfs to get access to the 'virt-builder' tool yet ? Daniel P. Berrange (6): Add ability to provision full OS using virt-builder Fix path to dnsmasq leases file Add ability to setup NIC when creating guest XML Force destroy guests if graceful shutdown fails Convert nwfilter and domain balloon tests to virtbuilder images Remove obsolete kickstart provisioning helper methods Build.PL | 1 - conf/default.cfg | 25 +++ conf/ks.cfg | 30 ---- lib/Sys/Virt/TCK.pm | 280 +++++++++++++++++++++++++----- lib/Sys/Virt/TCK/DomainBuilder.pm | 20 ++- lib/Sys/Virt/TCK/NetworkHelpers.pm | 140 +-------------- perl-Sys-Virt-TCK.spec.PL | 1 - scripts/domain/110-memory-balloon.t | 10 +- scripts/nwfilter/090-install-image.t | 55 ------ scripts/nwfilter/100-ping-still-working.t | 54 +++--- scripts/nwfilter/210-no-mac-spoofing.t | 81 +++++---- scripts/nwfilter/220-no-ip-spoofing.t | 78 +++++---- scripts/nwfilter/230-no-mac-broadcast.t | 53 +++--- scripts/nwfilter/240-no-arp-spoofing.t | 60 ++++--- scripts/nwfilter/300-vsitype.t | 40 +++-- scripts/nwfilter/nwfilter_concurrent.sh | 4 +- 16 files changed, 493 insertions(+), 439 deletions(-) delete mode 100644 conf/ks.cfg delete mode 100644 scripts/nwfilter/090-install-image.t -- 1.8.5.3

4 24

[libvirt] [PATCH tck] Find ebtables in /sbin or /usr/sbin
by Mike Latimer 31 Mar '14

31 Mar '14

If ebtables binary is not found in /sbin, use /usr/sbin. --- scripts/nwfilter/100-ping-still-working.t | 3 ++- scripts/nwfilter/210-no-mac-spoofing.t | 3 ++- scripts/nwfilter/220-no-ip-spoofing.t | 3 ++- scripts/nwfilter/230-no-mac-broadcast.t | 3 ++- scripts/nwfilter/240-no-arp-spoofing.t | 3 ++- 5 files changed, 10 insertions(+), 5 deletions(-) diff --git a/scripts/nwfilter/100-ping-still-working.t b/scripts/nwfilter/100-ping-still-working.t index 0bfdc00..1105d70 100644 --- a/scripts/nwfilter/100-ping-still-working.t +++ b/scripts/nwfilter/100-ping-still-working.t @@ -64,7 +64,8 @@ my $guestip = get_ip_from_leases($mac); diag "ip is $guestip"; # check ebtables entry -my $ebtable = `/sbin/ebtables -L;/sbin/ebtables -t nat -L`; +my $ebtables = (-e '/sbin/ebtables') ? '/sbin/ebtables' : '/usr/sbin/ebtables'; +my $ebtable = `$ebtables -L;$ebtables -t nat -L`; diag $ebtable; # fixme to include mac adress ok($ebtable =~ "vnet0", "check ebtables entry"); diff --git a/scripts/nwfilter/210-no-mac-spoofing.t b/scripts/nwfilter/210-no-mac-spoofing.t index fb20351..d7c57e6 100644 --- a/scripts/nwfilter/210-no-mac-spoofing.t +++ b/scripts/nwfilter/210-no-mac-spoofing.t @@ -64,7 +64,8 @@ my $guestip = get_ip_from_leases($mac); diag "ip is $guestip"; # check ebtables entry -my $ebtable = `/sbin/ebtables -L;/sbin/ebtables -t nat -L`; +my $ebtables = (-e '/sbin/ebtables') ? '/sbin/ebtables' : '/usr/sbin/ebtables'; +my $ebtable = `$ebtables -L;$ebtables -t nat -L`; diag $ebtable; # ebtables shortens :00: to :0: so we need to do that too $_ = $mac; diff --git a/scripts/nwfilter/220-no-ip-spoofing.t b/scripts/nwfilter/220-no-ip-spoofing.t index 063bb5b..5e8e0d7 100644 --- a/scripts/nwfilter/220-no-ip-spoofing.t +++ b/scripts/nwfilter/220-no-ip-spoofing.t @@ -64,7 +64,8 @@ my $guestip = get_ip_from_leases($mac); diag "ip is $guestip"; # check ebtables entry -my $ebtable = `/sbin/ebtables -L;/sbin/ebtables -t nat -L`; +my $ebtables = (-e '/sbin/ebtables') ? '/sbin/ebtables' : '/usr/sbin/ebtables'; +my $ebtable = `$ebtables -L;$ebtables -t nat -L`; diag $ebtable; # check if IP address is listed ok($ebtable =~ "$guestip", "check ebtables entry"); diff --git a/scripts/nwfilter/230-no-mac-broadcast.t b/scripts/nwfilter/230-no-mac-broadcast.t index 09a758b..a7d3b8e 100644 --- a/scripts/nwfilter/230-no-mac-broadcast.t +++ b/scripts/nwfilter/230-no-mac-broadcast.t @@ -63,7 +63,8 @@ my $guestip = get_ip_from_leases($mac); diag "ip is $guestip"; # check ebtables entry -my $ebtable = `/sbin/ebtables -L;/sbin/ebtables -t nat -L`; +my $ebtables = (-e '/sbin/ebtables') ? '/sbin/ebtables' : '/usr/sbin/ebtables'; +my $ebtable = `$ebtables -L;$ebtables -t nat -L`; diag $ebtable; # ebtables shortens :00: to :0: so we need to do that too $_ = $mac; diff --git a/scripts/nwfilter/240-no-arp-spoofing.t b/scripts/nwfilter/240-no-arp-spoofing.t index c31ea48..596a0ce 100644 --- a/scripts/nwfilter/240-no-arp-spoofing.t +++ b/scripts/nwfilter/240-no-arp-spoofing.t @@ -65,7 +65,8 @@ my $guestip = get_ip_from_leases($mac); diag "ip is $guestip"; # check ebtables entry -my $ebtable = `/sbin/ebtables -L;/sbin/ebtables -t nat -L`; +my $ebtables = (-e '/sbin/ebtables') ? '/sbin/ebtables' : '/usr/sbin/ebtables'; +my $ebtable = `$ebtables -L;$ebtables -t nat -L`; diag $ebtable; # check if IP address is listed ok($ebtable =~ "$guestip", "check ebtables entry"); -- 1.8.4.5

2 2

[libvirt] [PATCH tck] 100-ping-still-working.t: Replace vnet0 with mac address
by Mike Latimer 31 Mar '14

31 Mar '14

Using a statically defined vnet0 may fail if multiple VMs are running on the test machine. Switch to mac address, but replace '00' with '0' to match the output of ebtables. --- scripts/nwfilter/100-ping-still-working.t | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/nwfilter/100-ping-still-working.t b/scripts/nwfilter/100-ping-still-working.t index 1105d70..6c931ff 100644 --- a/scripts/nwfilter/100-ping-still-working.t +++ b/scripts/nwfilter/100-ping-still-working.t @@ -67,8 +67,8 @@ diag "ip is $guestip"; my $ebtables = (-e '/sbin/ebtables') ? '/sbin/ebtables' : '/usr/sbin/ebtables'; my $ebtable = `$ebtables -L;$ebtables -t nat -L`; diag $ebtable; -# fixme to include mac adress -ok($ebtable =~ "vnet0", "check ebtables entry"); +$mac =~ s/00/0/g; +ok($ebtable =~ "$mac", "check ebtables entry"); # ping guest1 my $ping = `ping -c 10 $guestip`; -- 1.8.4.5

1 1

[libvirt] guest band width setting
by Pradeep Kiruvale 31 Mar '14

31 Mar '14

Hi All, I am new to QEMU/libvirt I was starting to learn the libvirt code,I was browsing the code how the guest network bandwidth to be set like we mention <inbound> <outbound> tags in the xml,but where in code exactly these values set to the guest interface. I browsed the code a lot could not find it.Please help to understand how this works. Thanks in advance Pradeep

2 2

[libvirt] [PATCH] virsh: fix 'help event'
by Eric Blake 31 Mar '14

31 Mar '14

'virsh help event' included a summary line "event - (null)" due to a misnamed info field. * tools/virsh-domain.c (info_event): Use correct name. * tools/virsh-network.c (info_network_event): Likewise. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Deserves to be in 1.2.3 tools/virsh-domain.c | 2 +- tools/virsh-network.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index d9aa4fa..73414f8 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -11030,7 +11030,7 @@ static vshEventCallback vshEventCallbacks[] = { verify(VIR_DOMAIN_EVENT_ID_LAST == ARRAY_CARDINALITY(vshEventCallbacks)); static const vshCmdInfo info_event[] = { - {.name = "event", + {.name = "help", .data = N_("Domain Events") }, {.name = "desc", diff --git a/tools/virsh-network.c b/tools/virsh-network.c index 078a3cf..4b0df62 100644 --- a/tools/virsh-network.c +++ b/tools/virsh-network.c @@ -1180,7 +1180,7 @@ vshEventLifecyclePrint(virConnectPtr conn ATTRIBUTE_UNUSED, } static const vshCmdInfo info_network_event[] = { - {.name = "net-event", + {.name = "help", .data = N_("Network Events") }, {.name = "desc", -- 1.9.0

3 3

[libvirt] [PATCH] Drop dependency on pm-is-supported
by Cédric Bosdonnat 31 Mar '14

31 Mar '14

From: Cédric Bosdonnat <cedric.bosdonnat(a)free.fr> pm-is-supported is the only thing needed in pm-utils, better get rid of it since systemd is heavily used for libvirt. --- src/util/virnodesuspend.c | 34 ++++++++++++++++++++-------------- 1 file changed, 20 insertions(+), 14 deletions(-) diff --git a/src/util/virnodesuspend.c b/src/util/virnodesuspend.c index 8088931..9839de2 100644 --- a/src/util/virnodesuspend.c +++ b/src/util/virnodesuspend.c @@ -29,6 +29,8 @@ #include "viralloc.h" #include "virlog.h" #include "virerror.h" +#include "virfile.h" +#include "virstring.h" #define VIR_FROM_THIS VIR_FROM_NONE @@ -263,41 +265,45 @@ int nodeSuspendForDuration(unsigned int target, static int virNodeSuspendSupportsTarget(unsigned int target, bool *supported) { - virCommandPtr cmd; - int status; int ret = -1; + char *buf = NULL; + char **states = NULL; + bool canSuspend = false; + bool canHibernate = false; if (virNodeSuspendInitialize() < 0) return -1; *supported = false; + if (virFileReadAll("/sys/power/state", 1024, &buf) < 0) + goto cleanup; + + states = virStringSplit(buf, " ", 0); + + canSuspend = (virStringArrayHasString(states, "mem") || + virStringArrayHasString(states, "standby")); + canHibernate = virStringArrayHasString(states, "disk"); + switch (target) { case VIR_NODE_SUSPEND_TARGET_MEM: - cmd = virCommandNewArgList("pm-is-supported", "--suspend", NULL); + *supported = canSuspend; break; case VIR_NODE_SUSPEND_TARGET_DISK: - cmd = virCommandNewArgList("pm-is-supported", "--hibernate", NULL); + *supported = canHibernate; break; case VIR_NODE_SUSPEND_TARGET_HYBRID: - cmd = virCommandNewArgList("pm-is-supported", "--suspend-hybrid", NULL); + *supported = canSuspend && canHibernate; break; default: return ret; } - if (virCommandRun(cmd, &status) < 0) - goto cleanup; - - /* - * Check return code of command == 0 for success - * (i.e., the PM capability is supported) - */ - *supported = (status == 0); ret = 0; cleanup: - virCommandFree(cmd); + VIR_FREE(buf); + virStringFreeList(states); return ret; } -- 1.8.4.5

6 6

[libvirt] [PATCH] bhyve: don't leak tap devices on failures
by Roman Bogorodskiy 31 Mar '14

31 Mar '14

On failures, virBhyveProcessStart() does not cleanup network interfaces that could be created by virBhyveProcessBuildBhyveCmd(), which results in a leaked tap device. To fix that, extract network cleanup code to bhyveNetCleanup() and use it in cleanup stage of virBhyveProcessStart(). --- src/bhyve/bhyve_process.c | 34 ++++++++++++++++++++++------------ 1 file changed, 22 insertions(+), 12 deletions(-) diff --git a/src/bhyve/bhyve_process.c b/src/bhyve/bhyve_process.c index b37855e..a557bc5 100644 --- a/src/bhyve/bhyve_process.c +++ b/src/bhyve/bhyve_process.c @@ -63,6 +63,24 @@ bhyveProcessAutoDestroy(virDomainObjPtr vm, return vm; } +static void +bhyveNetCleanup(virDomainObjPtr vm) +{ + size_t i; + + for (i = 0; i < vm->def->nnets; i++) { + virDomainNetDefPtr net = vm->def->nets[i]; + int actualType = virDomainNetGetActualType(net); + + if (actualType == VIR_DOMAIN_NET_TYPE_BRIDGE) { + ignore_value(virNetDevBridgeRemovePort( + virDomainNetGetActualBridgeName(net), + net->ifname)); + ignore_value(virNetDevTapDelete(net->ifname)); + } + } +} + int virBhyveProcessStart(virConnectPtr conn, bhyveConnPtr driver, @@ -167,6 +185,8 @@ virBhyveProcessStart(virConnectPtr conn, ignore_value(virCommandRun(destroy_cmd, NULL)); virCommandFree(destroy_cmd); } + + bhyveNetCleanup(vm); } virCommandFree(load_cmd); @@ -181,7 +201,6 @@ virBhyveProcessStop(bhyveConnPtr driver, virDomainObjPtr vm, virDomainShutoffReason reason ATTRIBUTE_UNUSED) { - size_t i; int ret = -1; virCommandPtr cmd = NULL; @@ -203,17 +222,8 @@ virBhyveProcessStop(bhyveConnPtr driver, vm->def->name, (int)vm->pid); - for (i = 0; i < vm->def->nnets; i++) { - virDomainNetDefPtr net = vm->def->nets[i]; - int actualType = virDomainNetGetActualType(net); - - if (actualType == VIR_DOMAIN_NET_TYPE_BRIDGE) { - ignore_value(virNetDevBridgeRemovePort( - virDomainNetGetActualBridgeName(net), - net->ifname)); - ignore_value(virNetDevTapDelete(net->ifname)); - } - } + /* Cleanup network interfaces */ + bhyveNetCleanup(vm); /* No matter if shutdown was successful or not, we * need to unload the VM */ -- 1.8.4.2

2 2

[libvirt] [PATCH] util: remove useless comment for virCgroupMoveTask in vircgroup.c
by Hongwei Bi 31 Mar '14

31 Mar '14

Signed-off-by: Hongwei Bi <hwbi2008(a)gmail.com> --- src/util/vircgroup.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c index a0904d6..b881c8c 100644 --- a/src/util/vircgroup.c +++ b/src/util/vircgroup.c @@ -1148,7 +1148,6 @@ virCgroupAddTaskStrController(virCgroupPtr group, * * @src_group: The source cgroup where all tasks are removed from * @dest_group: The destination where all tasks are added to - * @controller: The cgroup controller to be operated on * * Returns: 0 on success or -1 on failure */ -- 1.7.9.5

2 1

[libvirt] [PATCH] Fix potential crash when setting partial cpu/memory/numa/interface limits on domains
by Brian Rak 31 Mar '14

31 Mar '14

The number of parameters in new_params is not guaranteed to be the same as the number of parameters in params. Use the correct count when freeing new_params to avoid crashes --- libvirt-override.c | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/libvirt-override.c b/libvirt-override.c index 9dc6ad4..3fa9b9b 100644 --- a/libvirt-override.c +++ b/libvirt-override.c @@ -914,7 +914,7 @@ libvirt_virDomainSetSchedulerParameters(PyObject *self ATTRIBUTE_UNUSED, int i_retval; int nparams = 0; Py_ssize_t size = 0; - virTypedParameterPtr params, new_params = NULL; + virTypedParameterPtr params = NULL, new_params = NULL; if (!PyArg_ParseTuple(args, (char *)"OO:virDomainSetScedulerParameters", &pyobj_domain, &info)) @@ -973,7 +973,7 @@ libvirt_virDomainSetSchedulerParameters(PyObject *self ATTRIBUTE_UNUSED, cleanup: virTypedParamsFree(params, nparams); - virTypedParamsFree(new_params, nparams); + virTypedParamsFree(new_params, size); return ret; } @@ -1064,7 +1064,7 @@ libvirt_virDomainSetBlkioParameters(PyObject *self ATTRIBUTE_UNUSED, int nparams = 0; Py_ssize_t size = 0; unsigned int flags; - virTypedParameterPtr params, new_params = NULL; + virTypedParameterPtr params = NULL, new_params = NULL; if (!PyArg_ParseTuple(args, (char *)"OOi:virDomainSetBlkioParameters", @@ -1123,7 +1123,7 @@ libvirt_virDomainSetBlkioParameters(PyObject *self ATTRIBUTE_UNUSED, cleanup: virTypedParamsFree(params, nparams); - virTypedParamsFree(new_params, nparams); + virTypedParamsFree(new_params, size); return ret; } @@ -1184,7 +1184,7 @@ libvirt_virDomainSetMemoryParameters(PyObject *self ATTRIBUTE_UNUSED, int nparams = 0; Py_ssize_t size = 0; unsigned int flags; - virTypedParameterPtr params, new_params = NULL; + virTypedParameterPtr params = NULL, new_params = NULL; if (!PyArg_ParseTuple(args, (char *)"OOi:virDomainSetMemoryParameters", @@ -1243,7 +1243,7 @@ libvirt_virDomainSetMemoryParameters(PyObject *self ATTRIBUTE_UNUSED, cleanup: virTypedParamsFree(params, nparams); - virTypedParamsFree(new_params, nparams); + virTypedParamsFree(new_params, size); return ret; } @@ -1304,7 +1304,7 @@ libvirt_virDomainSetNumaParameters(PyObject *self ATTRIBUTE_UNUSED, int nparams = 0; Py_ssize_t size = 0; unsigned int flags; - virTypedParameterPtr params, new_params = NULL; + virTypedParameterPtr params = NULL, new_params = NULL; if (!PyArg_ParseTuple(args, (char *)"OOi:virDomainSetNumaParameters", @@ -1363,7 +1363,7 @@ libvirt_virDomainSetNumaParameters(PyObject *self ATTRIBUTE_UNUSED, cleanup: virTypedParamsFree(params, nparams); - virTypedParamsFree(new_params, nparams); + virTypedParamsFree(new_params, size); return ret; } @@ -1425,7 +1425,7 @@ libvirt_virDomainSetInterfaceParameters(PyObject *self ATTRIBUTE_UNUSED, Py_ssize_t size = 0; unsigned int flags; const char *device = NULL; - virTypedParameterPtr params, new_params = NULL; + virTypedParameterPtr params = NULL, new_params = NULL; if (!PyArg_ParseTuple(args, (char *)"OzOi:virDomainSetInterfaceParameters", @@ -1484,7 +1484,7 @@ libvirt_virDomainSetInterfaceParameters(PyObject *self ATTRIBUTE_UNUSED, cleanup: virTypedParamsFree(params, nparams); - virTypedParamsFree(new_params, nparams); + virTypedParamsFree(new_params, size); return ret; } @@ -4782,7 +4782,7 @@ libvirt_virDomainSetBlockIoTune(PyObject *self ATTRIBUTE_UNUSED, Py_ssize_t size = 0; const char *disk; unsigned int flags; - virTypedParameterPtr params, new_params = NULL; + virTypedParameterPtr params = NULL, new_params = NULL; if (!PyArg_ParseTuple(args, (char *)"OzOi:virDomainSetBlockIoTune", &pyobj_domain, &disk, &info, &flags)) @@ -4840,7 +4840,7 @@ libvirt_virDomainSetBlockIoTune(PyObject *self ATTRIBUTE_UNUSED, cleanup: virTypedParamsFree(params, nparams); - virTypedParamsFree(new_params, nparams); + virTypedParamsFree(new_params, size); return ret; } -- 1.7.1

2 1

[libvirt] [PATCH] Fix snapshot-create-as in man page
by shyu 31 Mar '14

31 Mar '14

Fix bug https://bugzilla.redhat.com/show_bug.cgi?id=1080859 about snapshot type in man page. Snapshot type should be no, internal, or external --- tools/virsh.pod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/virsh.pod b/tools/virsh.pod index 20352cb..ba2da20 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -3070,7 +3070,7 @@ is specified, the snapshot will not include vm state. The I<--memspec> option can be used to control whether a checkpoint is internal or external. The I<--memspec> flag is mandatory, followed by a B<memspec> of the form B<[file=]name[,snapshot=type]>, where -type can be B<none>, B<internal>, or B<external>. To include a literal +type can be B<no>, B<internal>, or B<external>. To include a literal comma in B<file=name>, escape it with a second comma. I<--memspec> cannot be used together with I<--disk-only>. -- 1.8.5.3

2 1

[libvirt] [PATCH 0/2] ESX: Implement virDomainScreenshot
by Dawid Zamirski 30 Mar '14

30 Mar '14

Hello, The following patches implement virDomainScreenshot for the ESX driver. The screenshot VI API call was added in version 4.0, therefore, I had to make changes to esx_vi_generator.py in order to allow VI method calls for versions newer than 2.5. This was done by adding an optional "apiVersion" token to the method header definition in the .input file. If it is not specified, "2.5" will be used so existing VI calls will work "as is" without any code updates. Regards, Dawid Zamirski (2): ESX: Allow method calls for VI version > 2.5 ESX: Implement virDomainScreenshot src/esx/esx_driver.c | 173 +++++++++++++++++++++++++++++++++++++++++ src/esx/esx_vi.c | 26 ++++++- src/esx/esx_vi.h | 2 +- src/esx/esx_vi_generator.input | 19 ++++- src/esx/esx_vi_generator.py | 20 +++-- src/esx/esx_vi_methods.c | 12 +-- 6 files changed, 238 insertions(+), 14 deletions(-) -- 1.9.0

2 4

[libvirt] Entering freeze for libvirt-1.2.3
by Daniel Veillard 30 Mar '14

30 Mar '14

I'm one day late but i have tagged the tree and pushed a release candidate 1 tarball and associated rpms to the usual place: ftp://libvirt.org/libvirt/ Being optimistic maybe we can push it on April 1st but maybe it will be safer to wait for Wed for more feedback. I gave it a bit of testing, it looks fine with my limited check, but please give it a try :-) ! thanks, Daniel -- Daniel Veillard | Open Source and Standards, Red Hat veillard(a)redhat.com | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | virtualization library http://libvirt.org/

1 1

[libvirt] [PATCH] ESX: Add support for virtualHW version 10
by Dawid Zamirski 30 Mar '14

30 Mar '14

This follows the same pattern when v8 and v9 were added. I've tested this with my ESX 5.5 and seems to work fine. --- src/vmx/vmx.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c index 32ddd05..5dc9925 100644 --- a/src/vmx/vmx.c +++ b/src/vmx/vmx.c @@ -49,6 +49,7 @@ domain-xml <=> vmx virtualHW.version = "7" # essential for ESX 4.0 virtualHW.version = "8" # essential for ESX 5.0 virtualHW.version = "9" # essential for ESX 5.1 + virtualHW.version = "10" # essential for ESX 5.5 ??? <=> guestOS = "<value>" # essential, FIXME: not representable @@ -1316,10 +1317,11 @@ virVMXParseConfig(virVMXContext *ctx, } if (virtualHW_version != 4 && virtualHW_version != 7 && - virtualHW_version != 8 && virtualHW_version != 9) { + virtualHW_version != 8 && virtualHW_version != 9 && + virtualHW_version != 10) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Expecting VMX entry 'virtualHW.version' to be " - "4, 7, 8 or 9 but found %lld"), + "4, 7, 8, 9 or 10 but found %lld"), virtualHW_version); goto cleanup; } -- 1.9.0

2 1

[libvirt] [PATCH 0/5] Another attempt at improving virsh autocompletion
by Solly Ross 30 Mar '14

30 Mar '14

This patch set represents yet another attempt to improve the virsh autocompletion. When writing this patch, I tried to take into account the comments on the previous attempt at autocompletion by Tomas Meszaros. Specifically, it was reccomended that any completion use the existing methods that virsh has in place to parse the partial line being completed. When doing so, I found that I was duplicating a significant portion of the code in vshCommandParse. Since the comments on Tomas's code suggested refactoring common code into a separate function, I attempted to do so with vshCommandParse. One of the primary issues with simply just moving the parsing logic from vshCommandParse into a separate function was that vshCommandParse throws errors when it encounters unknown or invalid information. While this is the correct behavior for parsing a command to be executed, it is not appropriate for autocompletion. Essentially, the new function represents one iteration of the main loop from vshCommandParse. However, instead of constructing a parsed option or command object at the end, or returning errors, it returns a "state" value and sets pointers. Then, a calling function may choose to deal with the state values (like vshCommandParse) or ignore most of the state values (like the completion code, which ignores most state and errors, as it is just interested in which flags have already been used). This is perhaps the most "dangerous" and controversial part of the patch set, so I figured I'd get some feedback before progressing any further. The other significant changes in the patch set (besides richer completion support) are as follows: - completion no longer automatically falls back to readline's default filename completion. Instead, if filename completion is desired, an option may be explicitly marked as requiring filename completion. - when readline support is enable, a global vshControl object is made available by way of a macro/function. When readline support is disabled, the global is not included and the macro simply returns NULL. This global is required for smart completers. - the code which is used by the "list" command has been moved from virsh-domain-monitor to virsh-completer. This way, it is accessible to both the "list" command code and the domain completer. Note that none of the options which use the domain completer currently have flags set to indicate whether active or inactive domains should be completed. If this completion patch-set is OKed, then I will go back and add these flags. Currently, the commit is there simply to make testing out the new completion easier. Solly Ross (5): Improve virsh autocompletion (extract parser) Improve virsh autocompletion (base framework) Improve virsh autocompletion (global ctl object) Improve virsh autocompletion (domain completer) Improve virsh autocompletion (enum completer macro) outgoing/0000-cover-letter.patch | 68 + ...prove-virsh-autocompletion-extract-parser.patch | 428 ++++++ ...prove-virsh-autocompletion-base-framework.patch | 278 ++++ ...ve-virsh-autocompletion-global-ctl-object.patch | 116 ++ ...ove-virsh-autocompletion-domain-completer.patch | 1479 ++++++++++++++++++++ ...virsh-autocompletion-enum-completer-macro.patch | 131 ++ tools/Makefile.am | 3 +- tools/virsh-completer.c | 353 +++++ tools/virsh-completer.h | 86 ++ tools/virsh-domain-monitor.c | 287 +--- tools/virsh-domain.c | 72 + tools/virsh-snapshot.c | 11 + tools/virsh.c | 517 +++++-- tools/virsh.h | 13 + 14 files changed, 3447 insertions(+), 395 deletions(-) create mode 100644 outgoing/0000-cover-letter.patch create mode 100644 outgoing/0001-Improve-virsh-autocompletion-extract-parser.patch create mode 100644 outgoing/0002-Improve-virsh-autocompletion-base-framework.patch create mode 100644 outgoing/0003-Improve-virsh-autocompletion-global-ctl-object.patch create mode 100644 outgoing/0004-Improve-virsh-autocompletion-domain-completer.patch create mode 100644 outgoing/0005-Improve-virsh-autocompletion-enum-completer-macro.patch create mode 100644 tools/virsh-completer.c create mode 100644 tools/virsh-completer.h -- 1.8.3.2

2 7

[libvirt] [PATCH 0/2] Remove and prohibit Windows special chars in filenames
by Matthias Bolte 29 Mar '14

29 Mar '14

After I fixed the first problem with a : in a filename a second instance occured shortly afterwards. The first patch fixes this problem and the second patch adds a syntax-check rule to prohibit such Windows special chars in filenames. Matthias

2 4

[libvirt] [PATCH]execute netdev_del after receive DEVICE_DELETED event
by x00221466 29 Mar '14

29 Mar '14

Hi, When live detaching the virtual net device, such as virtio nic、 RTL8139、E1000, there are some problems: (1)If the Guest OS don't support the hot plugging pci device, detach the virtual network device by Libvirt, the "net device" in Qemu will still exist, but "hostnet"(tap) in Qemu will be removed. so the net device in Guest OS will be of no effect. (2)If reject the nic in Guest OS, Qemu will remove the "net device", then Qemu send DEVICE_DELETED to Libvirt, Libvirt receive the event in event-loop thread and release info of the net device in qemuDomainRemoveNetDevice func. but "hostnet" in Qemu still exist. So next live attaching virtual net device will be failed because of "Duplicate ID". #virsh attach-device win2008_st_r2_64 net.xml --live error: Failed to attach device from net.xml error: internal error: unable to execute QEMU command 'netdev_add': Duplicate ID 'hostnet0' for netdev (3)In addition, in qemuDomainDetachNetDevice, detach net device func, "netdev_del" command will be sent after sending "device_del" command at once. So it is violent to remove the tap device before the net device is completely removed. So I think it's more logical that doing the work of sending Qemu command "netdev_del" after receive the DEVICE_DELETED event. It can avoid the conflict of device info between Libvirt side and Qemu side. I create a thread in qemuDomainRemoveDevice,the handle of DEVICE_DELETED event, to execute QEMU command "netdev_del". Regards, -xie Signed-off-by: xiexiangyou <xiexiangyou(a)huawei.com> --- src/qemu/qemu_hotplug.c | 154 +++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 137 insertions(+), 17 deletions(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index bf4f160..81f6a56 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -2699,6 +2699,124 @@ qemuDomainRemoveChrDevice(virQEMUDriverPtr driver, virDomainChrDefFree(chr); } +typedef struct privVmDevDriver { + virQEMUDriverPtr driver; + virDomainObjPtr vm; + virDomainDeviceDefPtr dev; +}privVmDevDriver, *privVmDevDriverPtr; + +static void +qemuProcessRemoveNetDevice(void *opaque) +{ + privVmDevDriverPtr privData = opaque; + virQEMUDriverPtr driver = privData->driver; + virDomainObjPtr vm = privData->vm; + virDomainDeviceDefPtr dev = privData->dev; + + qemuDomainObjPrivatePtr priv = vm->privateData; + char mac[VIR_MAC_STRING_BUFLEN]; + int detachidx; + virDomainNetDefPtr detach = NULL; + char *hostnet_name = NULL; + int vlan; + + virObjectLock(vm); + + if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_MODIFY) < 0) + goto cleanup; + + detachidx = virDomainNetFindIdx(vm->def, dev->data.net) + if (detachidx == -2) { + virReportError(VIR_ERR_OPERATION_FAILED, + _("multiple devices matching mac address %s found"), + virMacAddrFormat(&dev->data.net->mac, mac)); + goto endjob; + } + else if (detachidx < 0) { + virReportError(VIR_ERR_OPERATION_FAILED, + _("network device %s not found"), + virMacAddrFormat(&dev->data.net->mac, mac)); + goto endjob; + } + detach = vm->def->nets[detachidx]; + if (virAsprintf(&hostnet_name, "host%s", detach->info.alias) < 0) { + virReportOOMError(); + goto endjob; + } + if ((vlan = qemuDomainNetVLAN(detach)) < 0) { + virReportError(VIR_ERR_OPERATION_FAILED, + "%s", _("unable to determine original VLAN")); + goto endjob; + } + + qemuDomainObjEnterMonitor(driver, vm); + if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_NETDEV) && + virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_DEVICE)) { + if (qemuMonitorRemoveNetdev(priv->mon, hostnet_name) < 0) { + qemuDomainObjExitMonitor(driver, vm); + virDomainAuditNet(vm, detach, NULL, "detach", false); + goto endjob; + } + } else { + if (qemuMonitorRemoveHostNetwork(priv->mon, vlan, hostnet_name) < 0) { + qemuDomainObjExitMonitor(driver, vm); + virDomainAuditNet(vm, detach, NULL, "detach", false); + goto endjob; + } + } + qemuDomainObjExitMonitor(driver, vm); + + qemuDomainRemoveNetDevice(driver, vm, dev->data.net) + +endjob: + if (!qemuDomainObjEndJob(driver, vm)) + vm = NULL; + +cleanup: + VIR_FREE(hostnet_name); + VIR_FREE(privData->dev); + VIR_FREE(privData); + + if (vm && virObjectUnref(vm)) + virObjectUnlock(vm); +} + +static void +qemuRemoveNetDeviceJob(virQEMUDriverPtr driver, + virDomainObjPtr vm, + virDomainDeviceDefPtr dev) +{ + virThread th; + privVmDevDriverPtr data = NULL; + virDomainDeviceDefPtr device = NULL; + + if (VIR_ALLOC(data) < 0) { + VIR_ERROR(_("Failed to alloc VmDevDriver")); + return; + } + + if (VIR_ALLOC(device) < 0) { + VIR_ERROR(_("Failed to alloc virDomainDeviceDefPtr")); + VIR_FREE(data); + return; + } + memcpy(device, dev, sizeof(*device)); + + data->dev = device; + data->driver = driver; + data->vm = vm; + virObjectRef(vm); + if (virThreadCreate(&th, + false, + qemuProcessRemoveNetDevice, + data) < 0) { + VIR_ERROR(_("Failed to create remove net device thread")); + VIR_FREE(device); + VIR_FREE(data); + virObjectUnref(vm); + } + +} void qemuDomainRemoveDevice(virQEMUDriverPtr driver, @@ -2713,7 +2831,7 @@ qemuDomainRemoveDevice(virQEMUDriverPtr driver, qemuDomainRemoveControllerDevice(driver, vm, dev->data.controller); break; case VIR_DOMAIN_DEVICE_NET: - qemuDomainRemoveNetDevice(driver, vm, dev->data.net) + qemuRemoveNetDeviceJob(driver, vm, dev); break; case VIR_DOMAIN_DEVICE_HOSTDEV: qemuDomainRemoveHostDevice(driver, vm, dev->data.hostdev); @@ -3419,26 +3537,28 @@ qemuDomainDetachNetDevice(virQEMUDriverPtr driver, goto cleanup; } } + qemuDomainObjExitMonitor(driver, vm); - if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_NETDEV) && - virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_DEVICE)) { - if (qemuMonitorRemoveNetdev(priv->mon, hostnet_name) < 0) { - qemuDomainObjExitMonitor(driver, vm); - virDomainAuditNet(vm, detach, NULL, "detach", false); - goto cleanup; - } - } else { - if (qemuMonitorRemoveHostNetwork(priv->mon, vlan, hostnet_name) < 0) { - qemuDomainObjExitMonitor(driver, vm); - virDomainAuditNet(vm, detach, NULL, "detach", false); - goto cleanup; + if (!qemuDomainWaitForDeviceRemoval(vm)) { + qemuDomainObjEnterMonitor(driver, vm); + if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_NETDEV) && + virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_DEVICE)) { + if (qemuMonitorRemoveNetdev(priv->mon, hostnet_name) < 0) { + qemuDomainObjExitMonitor(driver, vm); + virDomainAuditNet(vm, detach, NULL, "detach", false); + goto cleanup; + } + } else { + if (qemuMonitorRemoveHostNetwork(priv->mon, vlan, hostnet_name) < 0) { + qemuDomainObjExitMonitor(driver, vm); + virDomainAuditNet(vm, detach, NULL, "detach", false); + goto cleanup; + } } - } - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(driver, vm); - if (!qemuDomainWaitForDeviceRemoval(vm)) qemuDomainRemoveNetDevice(driver, vm, detach); - + } ret = 0; cleanup: -- 1.6.0.2

5 6

[libvirt] [PATCH] Fix virNodeDeviceListCaps always returns empty
by Jincheng Miao 29 Mar '14

29 Mar '14

virNodeDeviceListCaps will always return empty for a pci nodedevice, actually it should return 'pci'. It is because the loop variable ncaps isn't increased. https://bugzilla.redhat.com/show_bug.cgi?id=1081932 Signed-off-by: Jincheng Miao <jmiao(a)redhat.com> --- src/node_device/node_device_driver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/node_device/node_device_driver.c b/src/node_device/node_device_driver.c index 1f3a083..6906463 100644 --- a/src/node_device/node_device_driver.c +++ b/src/node_device/node_device_driver.c @@ -420,7 +420,7 @@ nodeDeviceListCaps(virNodeDevicePtr dev, char **const names, int maxnames) goto cleanup; for (caps = obj->def->caps; caps && ncaps < maxnames; caps = caps->next) { - if (VIR_STRDUP(names[ncaps], virNodeDevCapTypeToString(caps->type)) < 0) + if (VIR_STRDUP(names[ncaps++], virNodeDevCapTypeToString(caps->type)) < 0) goto cleanup; } ret = ncaps; -- 1.8.2.1

2 1

[libvirt] [PATCH v5 for 2.0 0/3] ABI change: change group name of option table to match with option name
by Amos Kong 28 Mar '14

28 Mar '14

This patchset changes group names of option tables to match with option name, this breakes ABI, release note was updated. V4: fix tpmdev, add name matching test (markus) V5: adjust patch order (paolo) Amos Kong (3): only add qemu_tpmdev_opts when CONFIG_TPM is defined update names in option tables to match with actual command-line spelling abort QEMU if group name in option table doesn't match with defined option name hw/acpi/core.c | 8 ++++---- hw/nvram/fw_cfg.c | 4 ++-- include/qemu/option.h | 2 +- qemu-options.h | 12 ++++++++++++ util/qemu-config.c | 28 ++++++++++++++++++++++++++++ vl.c | 37 +++++++++++++------------------------ 6 files changed, 60 insertions(+), 31 deletions(-) -- 1.8.5.3

4 10

[libvirt] [PATCH 0/3] Improve support for mocking APIs in tests
by Daniel P. Berrange 28 Mar '14

28 Mar '14

This short series introduces some helpers for mocking tests, provides a generic DBus mock helper using them and switches the systemd test to use these helpers. This will remove much code duplication in a later firewall test. Daniel P. Berrange (3): Introduce a new set of helper macros for mocking symbols Create a re-usable DBus LD_PRELOAD mock library Switch systemd test to use generic dbus mock tests/Makefile.am | 23 +++-- tests/virmock.h | 264 +++++++++++++++++++++++++++++++++++++++++++++++++ tests/virmockdbus.c | 64 ++++++++++++ tests/virsystemdmock.c | 132 ------------------------- tests/virsystemdtest.c | 86 +++++++++++++++- 5 files changed, 422 insertions(+), 147 deletions(-) create mode 100644 tests/virmock.h create mode 100644 tests/virmockdbus.c delete mode 100644 tests/virsystemdmock.c -- 1.8.5.3

2 4

[libvirt] [PATCH tck] 300-vsitype.t: skip earlier if lldptool is not available
by Mike Latimer 28 Mar '14

28 Mar '14

Move the test for /usr/sbin/lldptool up so libvirt-tck will report the skip and reason, rather than passing the test as 'ok'. --- scripts/nwfilter/300-vsitype.t | 48 ++++++++++++++++++++++-------------------- 1 file changed, 25 insertions(+), 23 deletions(-) diff --git a/scripts/nwfilter/300-vsitype.t b/scripts/nwfilter/300-vsitype.t index 3d06803..58e8469 100644 --- a/scripts/nwfilter/300-vsitype.t +++ b/scripts/nwfilter/300-vsitype.t @@ -26,7 +26,14 @@ The test case validates that the corrrect VSI is set in the adjacent switch use strict; use warnings; -use Test::More tests => 3; +use Test::More; + +if ( ! -e '/usr/sbin/lldptool' ) { + eval "use Test::More skip_all => \"lldptool is not available\";"; +} else { + eval "use Test::More tests => 3"; +} + use Sys::Virt::TCK; use Sys::Virt::TCK::NetworkHelpers; @@ -41,34 +48,29 @@ END { $tck->cleanup if $tck; } -SKIP: { - skip "lldptool not present", 3 unless -e "/usr/sbin/lldptool"; - # creating domain - my $dom1; - my $dom_name ="tck8021Qbgtest"; +my $dom1; +my $dom_name ="tck8021Qbgtest"; # speficy mode="vepa" for a direct interface - $dom1 = prepare_test_disk_and_vm($tck, $conn, $dom_name, "vepa"); - $dom1->create(); +$dom1 = prepare_test_disk_and_vm($tck, $conn, $dom_name, "vepa"); +$dom1->create(); - ok($dom1->get_id() > 0, "running domain has an ID > 0"); - my $xml = $dom1->get_xml_description; - diag $xml; - my $mac1 = get_first_macaddress($dom1); - diag "mac is $mac1"; +ok($dom1->get_id() > 0, "running domain has an ID > 0"); +my $xml = $dom1->get_xml_description; +diag $xml; +my $mac1 = get_first_macaddress($dom1); +diag "mac is $mac1"; - sleep(30); +sleep(30); # check vsi information - diag "Verifying VSI information using lldptool"; - my $lldptool = `/usr/sbin/lldptool -t -i eth2 -V vdp mode`; - diag $lldptool; +diag "Verifying VSI information using lldptool"; +my $lldptool = `/usr/sbin/lldptool -t -i eth2 -V vdp mode`; +diag $lldptool; # check if instance is listed - ok($lldptool =~ "instance", "check instance"); - ok($lldptool =~ $mac1, "check mac as well"); - - shutdown_vm_gracefully($dom1); - exit 0; +ok($lldptool =~ "instance", "check instance"); +ok($lldptool =~ $mac1, "check mac as well"); -}; +shutdown_vm_gracefully($dom1); +exit 0; -- 1.8.4.5

2 3

[libvirt] [PATCH 0/2] Fix virHostdev with session libvirt
by Ján Tomko 28 Mar '14

28 Mar '14

Reported by Richard W.M. Jones: https://www.redhat.com/archives/libvir-list/2014-March/msg01780.html Ján Tomko (2): Remove double free in virHostdevManagerDispose Create hostdevmgr in UserRuntimeDirectory for session libvirt src/util/virhostdev.c | 42 +++++++++++++++++++++++++++++++++--------- 1 file changed, 33 insertions(+), 9 deletions(-) -- 1.8.3.2

2 4

[libvirt] [PATCH] Expose SLIRP attributes
by Michal Privoznik 28 Mar '14

28 Mar '14

We allow users to use SLIRP stack. However, there are some knobs which are not exposed to users, such as host network address, DNS server, smb, and others. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- docs/formatdomain.html.in | 7 +- docs/schemas/domaincommon.rng | 23 +++++- src/conf/domain_conf.c | 88 ++++++++++++++++++++++ src/conf/domain_conf.h | 6 ++ src/qemu/qemu_command.c | 19 +++++ .../qemuxml2argvdata/qemuxml2argv-net-user-ip.args | 7 ++ .../qemuxml2argvdata/qemuxml2argv-net-user-ip.xml | 33 ++++++++ tests/qemuxml2argvtest.c | 1 + 8 files changed, 180 insertions(+), 4 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-net-user-ip.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-net-user-ip.xml diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 7f90455..0a353ca 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -3225,7 +3225,11 @@ starting from <code>10.0.2.15</code>. The default router will be <code>10.0.2.2</code> and the DNS server will be <code>10.0.2.3</code>. This networking is the only option for unprivileged users who need their - VMs to have outgoing access. + VMs to have outgoing access. Since 1.2.3 the + user network can have the <ip/> element to override the default + network of <code>10.0.2.0/24</code>. For example it can be set to + <code>192.168.2.0/24</code>. The whole element and its attributes are + optional. <pre> @@ -3235,6 +3239,7 @@ ... <interface type='user'> <mac address="00:11:22:33:44:55"/> + <ip address="192.168.2.0" prefix="24" dns="192.168.2.3" dhcpstart="192.168.2.9"/> </interface> </devices> ...</pre> diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index bcd8142..5745ce7 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -2152,9 +2152,26 @@ </optional> <optional> <element name="ip"> - <attribute name="address"> - <ref name="ipv4Addr"/> - </attribute> + <optional> + <attribute name="address"> + <ref name="ipv4Addr"/> + </attribute> + </optional> + <optional> + <attribute name="prefix"> + <data type="integer"/> + </attribute> + </optional> + <optional> + <attribute name="dns"> + <ref name="ipv4Addr"/> + </attribute> + </optional> + <optional> + <attribute name="dhcpstart"> + <ref name="ipv4Addr"/> + </attribute> + </optional> <empty/> </element> </optional> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 6fb216e..aec14ed 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -1539,6 +1539,11 @@ void virDomainNetDefFree(virDomainNetDefPtr def) break; case VIR_DOMAIN_NET_TYPE_USER: + VIR_FREE(def->data.user.ipaddr); + VIR_FREE(def->data.user.dns); + VIR_FREE(def->data.user.dhcpstart); + break; + case VIR_DOMAIN_NET_TYPE_LAST: break; } @@ -6669,6 +6674,9 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xmlopt, char *mode = NULL; char *linkstate = NULL; char *addrtype = NULL; + char *prefix = NULL; + char *dns = NULL; + char *dhcpstart = NULL; virNWFilterHashTablePtr filterparams = NULL; virDomainActualNetDefPtr actual = NULL; xmlNodePtr oldnode = ctxt->node; @@ -6750,6 +6758,13 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xmlopt, def->type == VIR_DOMAIN_NET_TYPE_BRIDGE) && xmlStrEqual(cur->name, BAD_CAST "ip")) { address = virXMLPropString(cur, "address"); + } else if (!address && + def->type == VIR_DOMAIN_NET_TYPE_USER && + xmlStrEqual(cur->name, BAD_CAST "ip")) { + address = virXMLPropString(cur, "address"); + prefix = virXMLPropString(cur, "prefix"); + dns = virXMLPropString(cur, "dns"); + dhcpstart = virXMLPropString(cur, "dhcpstart"); } else if (!ifname && xmlStrEqual(cur->name, BAD_CAST "target")) { ifname = virXMLPropString(cur, "dev"); @@ -6988,6 +7003,59 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xmlopt, break; case VIR_DOMAIN_NET_TYPE_USER: + if (prefix) { + if (!address) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("can't use prefix without an address")); + goto error; + } + + if (virStrToLong_i(prefix, NULL, 10, &def->data.user.prefix) < 0 || + def->data.user.prefix < 0) { + virReportError(VIR_ERR_XML_ERROR, + _("Invalid prefix: '%s'"), prefix); + goto error; + } + } else { + def->data.user.prefix = -1; + } + + if (address) { + if (virSocketAddrParse(NULL, address, AF_UNSPEC) < 0) { + virReportError(VIR_ERR_XML_ERROR, + _("Invalid address: '%s'"), address); + goto error; + } + + def->data.user.ipaddr = address; + address = NULL; + } + + if (dns) { + if (virSocketAddrParse(NULL, dns, AF_UNSPEC) < 0) { + virReportError(VIR_ERR_XML_ERROR, + _("Invalid dns address: '%s'"), dns); + goto error; + } + + def->data.user.dns = dns; + dns = NULL; + } + + if (dhcpstart) { + if (virSocketAddrParse(NULL, dhcpstart, AF_UNSPEC) < 0) { + virReportError(VIR_ERR_XML_ERROR, + _("Invalid dhcpstart address: '%s'"), + dhcpstart); + goto error; + } + + def->data.user.dhcpstart = dhcpstart; + dhcpstart = NULL; + } + + break; + case VIR_DOMAIN_NET_TYPE_LAST: break; } @@ -7134,6 +7202,9 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xmlopt, VIR_FREE(mode); VIR_FREE(linkstate); VIR_FREE(addrtype); + VIR_FREE(prefix); + VIR_FREE(dns); + VIR_FREE(dhcpstart); virNWFilterHashTableFree(filterparams); return def; @@ -15766,6 +15837,23 @@ virDomainNetDefFormat(virBufferPtr buf, break; case VIR_DOMAIN_NET_TYPE_USER: + if (def->data.user.ipaddr || + def->data.user.dns || + def->data.user.dhcpstart) { + virBufferAddLit(buf, "<ip"); + + if (def->data.user.ipaddr) { + virBufferAsprintf(buf, " address='%s'", def->data.user.ipaddr); + if (def->data.user.prefix >= 0) + virBufferAsprintf(buf, " prefix='%d'", def->data.user.prefix); + } + + virBufferEscapeString(buf, " dns='%s'", def->data.user.dns); + virBufferEscapeString(buf, " dhcpstart='%s'", def->data.user.dhcpstart); + virBufferAddLit(buf, "/>\n"); + } + break; + case VIR_DOMAIN_NET_TYPE_LAST: break; } diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index f3f24c4..b5d52e9 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -1046,6 +1046,12 @@ struct _virDomainNetDef { struct { virDomainHostdevDef def; } hostdev; + struct { + char *ipaddr; + int prefix; + char *dns; + char *dhcpstart; + } user; } data; /* virtPortProfile is used by network/bridge/direct/hostdev */ virNetDevVPortProfilePtr virtPortProfile; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 9a314bf..f17061e 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -5156,6 +5156,25 @@ qemuBuildHostNetStr(virDomainNetDefPtr net, break; case VIR_DOMAIN_NET_TYPE_USER: + virBufferAddLit(&buf, "user"); + if (net->data.user.ipaddr) { + virBufferAsprintf(&buf, "%cnet=%s", type_sep, + net->data.user.ipaddr); + type_sep = ','; + if (net->data.user.prefix >= 0) + virBufferAsprintf(&buf, "/%d", net->data.user.prefix); + } + if (net->data.user.dns) { + virBufferAsprintf(&buf, "%cdns=%s", type_sep, net->data.user.dns); + type_sep = ','; + } + if (net->data.user.dhcpstart) { + virBufferAsprintf(&buf, "%cdhcpstart=%s", type_sep, + net->data.user.dhcpstart); + type_sep = ','; + } + break; + default: virBufferAddLit(&buf, "user"); break; diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-user-ip.args b/tests/qemuxml2argvdata/qemuxml2argv-net-user-ip.args new file mode 100644 index 0000000..3e355f3 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-net-user-ip.args @@ -0,0 +1,7 @@ +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ +/usr/bin/qemu -S -M pc -m 214 -smp 1 -nographic \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi -boot c -usb -hda /dev/HostVG/QEMUGuest1 \ +-net nic,macaddr=00:11:22:33:44:55,vlan=0,model=rtl8139 \ +-net user,net=192.168.2.0/24,dns=192.168.2.3,dhcpstart=192.168.2.9,vlan=0 \ +-serial none -parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-user-ip.xml b/tests/qemuxml2argvdata/qemuxml2argv-net-user-ip.xml new file mode 100644 index 0000000..5c36c77 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-net-user-ip.xml @@ -0,0 +1,33 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> + <vcpu placement='static'>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'> + <driver name='qemu' type='raw'/> + <source dev='/dev/HostVG/QEMUGuest1'/> + <target dev='hda' bus='ide'/> + <address type='drive' controller='0' bus='0' target='0' unit='0'/> + </disk> + <controller type='usb' index='0'/> + <controller type='ide' index='0'/> + <controller type='pci' index='0' model='pci-root'/> + <interface type='user'> + <ip address='192.168.2.0' prefix='24' dns='192.168.2.3' dhcpstart='192.168.2.9'/> + <mac address='00:11:22:33:44:55'/> + <model type='rtl8139'/> + </interface> + <memballoon model='virtio'/> + </devices> +</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 56854dc..02ed4ba 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -923,6 +923,7 @@ mymain(void) DO_TEST("misc-no-reboot", NONE); DO_TEST("misc-uuid", QEMU_CAPS_NAME, QEMU_CAPS_UUID); DO_TEST("net-user", NONE); + DO_TEST("net-user-ip", NONE); DO_TEST("net-virtio", NONE); DO_TEST("net-virtio-device", QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_VIRTIO_TX_ALG); -- 1.9.0

5 14

Re: [libvirt] [PATCH] migration: Fix possible bug for migrate cancel
by Eric Blake 28 Mar '14

28 Mar '14

[adding libvirt] On 03/24/2014 09:47 AM, Paolo Bonzini wrote: > Il 24/03/2014 14:04, arei.gonglei(a)huawei.com ha scritto: >> From: zengjunliang <zengjunliang(a)huawei.com> >> >> Return error for migrate cancel, when migration status is not >> MIG_STATE_SETUP or MIG_STATE_ACTIVE. Thus, libvirt can can >> perceive the operation fails. >> >> Signed-off-by: zengjunliang <zengjunliang(a)huawei.com> >> Signed-off-by: Gonglei <arei.gonglei(a)huawei.com> > > I think this is done on purpose, because canceling migration is racy. > Instead, libvirt should do "query-migrate" and check if the migration > was completed or canceled. Can you please give more details at how you are triggering the problem with libvirt? I think Paolo is probably right - the bug is more likely to be in libvirt not expecting the race and not recovering correctly when the race occurs, than it is to be in changing qemu's state algorithm. -- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org

4 5

[libvirt] [PATCH tck] Remove /128 from ip6tables output
by Mike Latimer 28 Mar '14

28 Mar '14

Due to iptables commit 945353a2 (in iptables v1.4.20 and higher), ip6tables no longer prints out /128. This patch removes /128 from output files, and replaces '/128' in command output with ' ' to remain compatible with older versions of ip6tables. --- scripts/nwfilter/nwfilterxml2fwallout/ah-ipv6-test.fwall | 24 +++++++++++----------- scripts/nwfilter/nwfilterxml2fwallout/all-ipv6-test.fwall | 24 +++++++++++----------- scripts/nwfilter/nwfilterxml2fwallout/comment-test.fwall | 12 +++++------ scripts/nwfilter/nwfilterxml2fwallout/esp-ipv6-test.fwall | 24 +++++++++++----------- scripts/nwfilter/nwfilterxml2fwallout/hex-data-test.fwall | 12 +++++------ scripts/nwfilter/nwfilterxml2fwallout/icmpv6-test.fwall | 14 ++++++------- scripts/nwfilter/nwfilterxml2fwallout/sctp-ipv6-test.fwall | 24 +++++++++++----------- scripts/nwfilter/nwfilterxml2fwallout/tcp-ipv6-test.fwall | 24 +++++++++++----------- scripts/nwfilter/nwfilterxml2fwallout/udp-ipv6-test.fwall | 24 +++++++++++----------- scripts/nwfilter/nwfilterxml2fwallout/udplite-ipv6-test.fwall | 24 +++++++++++----------- 10 files changed, 103 insertions(+), 103 deletions(-) diff --git a/scripts/nwfilter/nwfilterxml2fwallout/ah-ipv6-test.fwall b/scripts/nwfilter/nwfilterxml2fwallout/ah-ipv6-test.fwall index 8c10b04..64db89d 100644 --- a/scripts/nwfilter/nwfilterxml2fwallout/ah-ipv6-test.fwall +++ b/scripts/nwfilter/nwfilterxml2fwallout/ah-ipv6-test.fwall @@ -1,21 +1,21 @@ -#ip6tables -L FI-vnet0 -n +#ip6tables -L FI-vnet0 -n | sed 's/\/128/ /' Chain FI-vnet0 (1 references) target prot opt source destination -RETURN ah f:e:d::c:b:a/127 a:b:c::d:e:f/128 MAC 01:02:03:04:05:06 DSCP match 0x02state NEW,ESTABLISHED ctdir REPLY -RETURN ah ::/0 a:b:c::/128 DSCP match 0x21state ESTABLISHED ctdir ORIGINAL -RETURN ah ::/0 ::10.1.2.3/128 DSCP match 0x21state ESTABLISHED ctdir ORIGINAL -#ip6tables -L FO-vnet0 -n +RETURN ah f:e:d::c:b:a/127 a:b:c::d:e:f MAC 01:02:03:04:05:06 DSCP match 0x02state NEW,ESTABLISHED ctdir REPLY +RETURN ah ::/0 a:b:c:: DSCP match 0x21state ESTABLISHED ctdir ORIGINAL +RETURN ah ::/0 ::10.1.2.3 DSCP match 0x21state ESTABLISHED ctdir ORIGINAL +#ip6tables -L FO-vnet0 -n | sed 's/\/128/ /' Chain FO-vnet0 (1 references) target prot opt source destination -ACCEPT ah a:b:c::d:e:f/128 f:e:d::c:b:a/127 DSCP match 0x02state ESTABLISHED ctdir ORIGINAL -ACCEPT ah a:b:c::/128 ::/0 MAC 01:02:03:04:05:06 DSCP match 0x21state NEW,ESTABLISHED ctdir REPLY -ACCEPT ah ::10.1.2.3/128 ::/0 MAC 01:02:03:04:05:06 DSCP match 0x21state NEW,ESTABLISHED ctdir REPLY -#ip6tables -L HI-vnet0 -n +ACCEPT ah a:b:c::d:e:f f:e:d::c:b:a/127 DSCP match 0x02state ESTABLISHED ctdir ORIGINAL +ACCEPT ah a:b:c:: ::/0 MAC 01:02:03:04:05:06 DSCP match 0x21state NEW,ESTABLISHED ctdir REPLY +ACCEPT ah ::10.1.2.3 ::/0 MAC 01:02:03:04:05:06 DSCP match 0x21state NEW,ESTABLISHED ctdir REPLY +#ip6tables -L HI-vnet0 -n | sed 's/\/128/ /' Chain HI-vnet0 (1 references) target prot opt source destination -RETURN ah f:e:d::c:b:a/127 a:b:c::d:e:f/128 MAC 01:02:03:04:05:06 DSCP match 0x02state NEW,ESTABLISHED ctdir REPLY -RETURN ah ::/0 a:b:c::/128 DSCP match 0x21state ESTABLISHED ctdir ORIGINAL -RETURN ah ::/0 ::10.1.2.3/128 DSCP match 0x21state ESTABLISHED ctdir ORIGINAL +RETURN ah f:e:d::c:b:a/127 a:b:c::d:e:f MAC 01:02:03:04:05:06 DSCP match 0x02state NEW,ESTABLISHED ctdir REPLY +RETURN ah ::/0 a:b:c:: DSCP match 0x21state ESTABLISHED ctdir ORIGINAL +RETURN ah ::/0 ::10.1.2.3 DSCP match 0x21state ESTABLISHED ctdir ORIGINAL #ip6tables -L INPUT -n --line-numbers | grep libvirt 1 libvirt-host-in all ::/0 ::/0 #ip6tables -L libvirt-host-in -n | grep vnet0 | tr -s " " diff --git a/scripts/nwfilter/nwfilterxml2fwallout/all-ipv6-test.fwall b/scripts/nwfilter/nwfilterxml2fwallout/all-ipv6-test.fwall index f053b39..c56b85a 100644 --- a/scripts/nwfilter/nwfilterxml2fwallout/all-ipv6-test.fwall +++ b/scripts/nwfilter/nwfilterxml2fwallout/all-ipv6-test.fwall @@ -1,21 +1,21 @@ -#ip6tables -L FI-vnet0 -n +#ip6tables -L FI-vnet0 -n | sed 's/\/128/ /' Chain FI-vnet0 (1 references) target prot opt source destination -RETURN all f:e:d::c:b:a/127 a:b:c::d:e:f/128 MAC 01:02:03:04:05:06 DSCP match 0x02state NEW,ESTABLISHED ctdir REPLY -RETURN all ::/0 a:b:c::/128 DSCP match 0x21state ESTABLISHED ctdir ORIGINAL -RETURN all ::/0 ::10.1.2.3/128 DSCP match 0x21state ESTABLISHED ctdir ORIGINAL -#ip6tables -L FO-vnet0 -n +RETURN all f:e:d::c:b:a/127 a:b:c::d:e:f MAC 01:02:03:04:05:06 DSCP match 0x02state NEW,ESTABLISHED ctdir REPLY +RETURN all ::/0 a:b:c:: DSCP match 0x21state ESTABLISHED ctdir ORIGINAL +RETURN all ::/0 ::10.1.2.3 DSCP match 0x21state ESTABLISHED ctdir ORIGINAL +#ip6tables -L FO-vnet0 -n | sed 's/\/128/ /' Chain FO-vnet0 (1 references) target prot opt source destination -ACCEPT all a:b:c::d:e:f/128 f:e:d::c:b:a/127 DSCP match 0x02state ESTABLISHED ctdir ORIGINAL -ACCEPT all a:b:c::/128 ::/0 MAC 01:02:03:04:05:06 DSCP match 0x21state NEW,ESTABLISHED ctdir REPLY -ACCEPT all ::10.1.2.3/128 ::/0 MAC 01:02:03:04:05:06 DSCP match 0x21state NEW,ESTABLISHED ctdir REPLY -#ip6tables -L HI-vnet0 -n +ACCEPT all a:b:c::d:e:f f:e:d::c:b:a/127 DSCP match 0x02state ESTABLISHED ctdir ORIGINAL +ACCEPT all a:b:c:: ::/0 MAC 01:02:03:04:05:06 DSCP match 0x21state NEW,ESTABLISHED ctdir REPLY +ACCEPT all ::10.1.2.3 ::/0 MAC 01:02:03:04:05:06 DSCP match 0x21state NEW,ESTABLISHED ctdir REPLY +#ip6tables -L HI-vnet0 -n | sed 's/\/128/ /' Chain HI-vnet0 (1 references) target prot opt source destination -RETURN all f:e:d::c:b:a/127 a:b:c::d:e:f/128 MAC 01:02:03:04:05:06 DSCP match 0x02state NEW,ESTABLISHED ctdir REPLY -RETURN all ::/0 a:b:c::/128 DSCP match 0x21state ESTABLISHED ctdir ORIGINAL -RETURN all ::/0 ::10.1.2.3/128 DSCP match 0x21state ESTABLISHED ctdir ORIGINAL +RETURN all f:e:d::c:b:a/127 a:b:c::d:e:f MAC 01:02:03:04:05:06 DSCP match 0x02state NEW,ESTABLISHED ctdir REPLY +RETURN all ::/0 a:b:c:: DSCP match 0x21state ESTABLISHED ctdir ORIGINAL +RETURN all ::/0 ::10.1.2.3 DSCP match 0x21state ESTABLISHED ctdir ORIGINAL #ip6tables -L INPUT -n --line-numbers | grep libvirt 1 libvirt-host-in all ::/0 ::/0 #ip6tables -L libvirt-host-in -n | grep vnet0 | tr -s " " diff --git a/scripts/nwfilter/nwfilterxml2fwallout/comment-test.fwall b/scripts/nwfilter/nwfilterxml2fwallout/comment-test.fwall index 038d2cb..32c5078 100644 --- a/scripts/nwfilter/nwfilterxml2fwallout/comment-test.fwall +++ b/scripts/nwfilter/nwfilterxml2fwallout/comment-test.fwall @@ -28,24 +28,24 @@ FI-vnet0 all -- 0.0.0.0/0 0.0.0.0/0 [goto] PHYSDEV match --physdev-in vnet0 ACCEPT all -- 0.0.0.0/0 0.0.0.0/0 PHYSDEV match --physdev-in vnet0 #iptables -L libvirt-out -n | grep vnet0 | tr -s " " FO-vnet0 all -- 0.0.0.0/0 0.0.0.0/0 [goto] PHYSDEV match --physdev-out vnet0 --physdev-is-bridged -#ip6tables -L FI-vnet0 -n +#ip6tables -L FI-vnet0 -n | sed 's/\/128/ /' Chain FI-vnet0 (1 references) target prot opt source destination -RETURN tcp ::/0 a:b:c::/128 DSCP match 0x39 tcp spts:256:4369 dpts:32:33 state ESTABLISHED ctdir ORIGINAL/* tcp/ipv6 rule */ +RETURN tcp ::/0 a:b:c:: DSCP match 0x39 tcp spts:256:4369 dpts:32:33 state ESTABLISHED ctdir ORIGINAL/* tcp/ipv6 rule */ RETURN udp ::/0 ::/0 state ESTABLISHED ctdir ORIGINAL/* `ls`;${COLUMNS};$(ls);"test";&'3 spaces' */ RETURN sctp ::/0 ::/0 state ESTABLISHED ctdir ORIGINAL/* comment with lone ', `, ", `, \, $x, and two spaces */ RETURN ah ::/0 ::/0 state ESTABLISHED ctdir ORIGINAL/* tmp=`mktemp`; echo ${RANDOM} > ${tmp} ; cat < ${tmp}; rm -f ${tmp} */ -#ip6tables -L FO-vnet0 -n +#ip6tables -L FO-vnet0 -n | sed 's/\/128/ /' Chain FO-vnet0 (1 references) target prot opt source destination -ACCEPT tcp a:b:c::/128 ::/0 MAC 01:02:03:04:05:06 DSCP match 0x39 tcp spts:32:33 dpts:256:4369 state NEW,ESTABLISHED ctdir REPLY/* tcp/ipv6 rule */ +ACCEPT tcp a:b:c:: ::/0 MAC 01:02:03:04:05:06 DSCP match 0x39 tcp spts:32:33 dpts:256:4369 state NEW,ESTABLISHED ctdir REPLY/* tcp/ipv6 rule */ ACCEPT udp ::/0 ::/0 state NEW,ESTABLISHED ctdir REPLY/* `ls`;${COLUMNS};$(ls);"test";&'3 spaces' */ ACCEPT sctp ::/0 ::/0 state NEW,ESTABLISHED ctdir REPLY/* comment with lone ', `, ", `, \, $x, and two spaces */ ACCEPT ah ::/0 ::/0 state NEW,ESTABLISHED ctdir REPLY/* tmp=`mktemp`; echo ${RANDOM} > ${tmp} ; cat < ${tmp}; rm -f ${tmp} */ -#ip6tables -L HI-vnet0 -n +#ip6tables -L HI-vnet0 -n | sed 's/\/128/ /' Chain HI-vnet0 (1 references) target prot opt source destination -RETURN tcp ::/0 a:b:c::/128 DSCP match 0x39 tcp spts:256:4369 dpts:32:33 state ESTABLISHED ctdir ORIGINAL/* tcp/ipv6 rule */ +RETURN tcp ::/0 a:b:c:: DSCP match 0x39 tcp spts:256:4369 dpts:32:33 state ESTABLISHED ctdir ORIGINAL/* tcp/ipv6 rule */ RETURN udp ::/0 ::/0 state ESTABLISHED ctdir ORIGINAL/* `ls`;${COLUMNS};$(ls);"test";&'3 spaces' */ RETURN sctp ::/0 ::/0 state ESTABLISHED ctdir ORIGINAL/* comment with lone ', `, ", `, \, $x, and two spaces */ RETURN ah ::/0 ::/0 state ESTABLISHED ctdir ORIGINAL/* tmp=`mktemp`; echo ${RANDOM} > ${tmp} ; cat < ${tmp}; rm -f ${tmp} */ diff --git a/scripts/nwfilter/nwfilterxml2fwallout/esp-ipv6-test.fwall b/scripts/nwfilter/nwfilterxml2fwallout/esp-ipv6-test.fwall index dbdaa36..cf3faaa 100644 --- a/scripts/nwfilter/nwfilterxml2fwallout/esp-ipv6-test.fwall +++ b/scripts/nwfilter/nwfilterxml2fwallout/esp-ipv6-test.fwall @@ -1,21 +1,21 @@ -#ip6tables -L FI-vnet0 -n +#ip6tables -L FI-vnet0 -n | sed 's/\/128/ /' Chain FI-vnet0 (1 references) target prot opt source destination -RETURN esp f:e:d::c:b:a/127 a:b:c::d:e:f/128 MAC 01:02:03:04:05:06 DSCP match 0x02state NEW,ESTABLISHED ctdir REPLY -RETURN esp ::/0 a:b:c::/128 DSCP match 0x21state ESTABLISHED ctdir ORIGINAL -RETURN esp ::/0 ::10.1.2.3/128 DSCP match 0x21state ESTABLISHED ctdir ORIGINAL -#ip6tables -L FO-vnet0 -n +RETURN esp f:e:d::c:b:a/127 a:b:c::d:e:f MAC 01:02:03:04:05:06 DSCP match 0x02state NEW,ESTABLISHED ctdir REPLY +RETURN esp ::/0 a:b:c:: DSCP match 0x21state ESTABLISHED ctdir ORIGINAL +RETURN esp ::/0 ::10.1.2.3 DSCP match 0x21state ESTABLISHED ctdir ORIGINAL +#ip6tables -L FO-vnet0 -n | sed 's/\/128/ /' Chain FO-vnet0 (1 references) target prot opt source destination -ACCEPT esp a:b:c::d:e:f/128 f:e:d::c:b:a/127 DSCP match 0x02state ESTABLISHED ctdir ORIGINAL -ACCEPT esp a:b:c::/128 ::/0 MAC 01:02:03:04:05:06 DSCP match 0x21state NEW,ESTABLISHED ctdir REPLY -ACCEPT esp ::10.1.2.3/128 ::/0 MAC 01:02:03:04:05:06 DSCP match 0x21state NEW,ESTABLISHED ctdir REPLY -#ip6tables -L HI-vnet0 -n +ACCEPT esp a:b:c::d:e:f f:e:d::c:b:a/127 DSCP match 0x02state ESTABLISHED ctdir ORIGINAL +ACCEPT esp a:b:c:: ::/0 MAC 01:02:03:04:05:06 DSCP match 0x21state NEW,ESTABLISHED ctdir REPLY +ACCEPT esp ::10.1.2.3 ::/0 MAC 01:02:03:04:05:06 DSCP match 0x21state NEW,ESTABLISHED ctdir REPLY +#ip6tables -L HI-vnet0 -n | sed 's/\/128/ /' Chain HI-vnet0 (1 references) target prot opt source destination -RETURN esp f:e:d::c:b:a/127 a:b:c::d:e:f/128 MAC 01:02:03:04:05:06 DSCP match 0x02state NEW,ESTABLISHED ctdir REPLY -RETURN esp ::/0 a:b:c::/128 DSCP match 0x21state ESTABLISHED ctdir ORIGINAL -RETURN esp ::/0 ::10.1.2.3/128 DSCP match 0x21state ESTABLISHED ctdir ORIGINAL +RETURN esp f:e:d::c:b:a/127 a:b:c::d:e:f MAC 01:02:03:04:05:06 DSCP match 0x02state NEW,ESTABLISHED ctdir REPLY +RETURN esp ::/0 a:b:c:: DSCP match 0x21state ESTABLISHED ctdir ORIGINAL +RETURN esp ::/0 ::10.1.2.3 DSCP match 0x21state ESTABLISHED ctdir ORIGINAL #ip6tables -L INPUT -n --line-numbers | grep libvirt 1 libvirt-host-in all ::/0 ::/0 #ip6tables -L libvirt-host-in -n | grep vnet0 |tr -s " " diff --git a/scripts/nwfilter/nwfilterxml2fwallout/hex-data-test.fwall b/scripts/nwfilter/nwfilterxml2fwallout/hex-data-test.fwall index 2ed979e..0aaa50c 100644 --- a/scripts/nwfilter/nwfilterxml2fwallout/hex-data-test.fwall +++ b/scripts/nwfilter/nwfilterxml2fwallout/hex-data-test.fwall @@ -28,18 +28,18 @@ FI-vnet0 all -- 0.0.0.0/0 0.0.0.0/0 [goto] PHYSDEV match --physdev-in vnet0 ACCEPT all -- 0.0.0.0/0 0.0.0.0/0 PHYSDEV match --physdev-in vnet0 #iptables -L libvirt-out -n | grep vnet0 | tr -s " " FO-vnet0 all -- 0.0.0.0/0 0.0.0.0/0 [goto] PHYSDEV match --physdev-out vnet0 --physdev-is-bridged -#ip6tables -L FI-vnet0 -n +#ip6tables -L FI-vnet0 -n | sed 's/\/128/ /' Chain FI-vnet0 (1 references) target prot opt source destination -RETURN tcp ::/0 a:b:c::/128 DSCP match 0x39 tcp spts:256:4369 dpts:32:33 state ESTABLISHED ctdir ORIGINAL -#ip6tables -L FO-vnet0 -n +RETURN tcp ::/0 a:b:c:: DSCP match 0x39 tcp spts:256:4369 dpts:32:33 state ESTABLISHED ctdir ORIGINAL +#ip6tables -L FO-vnet0 -n | sed 's/\/128/ /' Chain FO-vnet0 (1 references) target prot opt source destination -ACCEPT tcp a:b:c::/128 ::/0 MAC 01:02:03:04:05:06 DSCP match 0x39 tcp spts:32:33 dpts:256:4369 state NEW,ESTABLISHED ctdir REPLY -#ip6tables -L HI-vnet0 -n +ACCEPT tcp a:b:c:: ::/0 MAC 01:02:03:04:05:06 DSCP match 0x39 tcp spts:32:33 dpts:256:4369 state NEW,ESTABLISHED ctdir REPLY +#ip6tables -L HI-vnet0 -n | sed 's/\/128/ /' Chain HI-vnet0 (1 references) target prot opt source destination -RETURN tcp ::/0 a:b:c::/128 DSCP match 0x39 tcp spts:256:4369 dpts:32:33 state ESTABLISHED ctdir ORIGINAL +RETURN tcp ::/0 a:b:c:: DSCP match 0x39 tcp spts:256:4369 dpts:32:33 state ESTABLISHED ctdir ORIGINAL #ip6tables -L libvirt-host-in -n | grep vnet0 | tr -s " " HI-vnet0 all ::/0 ::/0 [goto] PHYSDEV match --physdev-in vnet0 #ip6tables -L libvirt-in -n | grep vnet0 | tr -s " " diff --git a/scripts/nwfilter/nwfilterxml2fwallout/icmpv6-test.fwall b/scripts/nwfilter/nwfilterxml2fwallout/icmpv6-test.fwall index 4749f84..b25a0e7 100644 --- a/scripts/nwfilter/nwfilterxml2fwallout/icmpv6-test.fwall +++ b/scripts/nwfilter/nwfilterxml2fwallout/icmpv6-test.fwall @@ -1,16 +1,16 @@ -#ip6tables -L FI-vnet0 -n +#ip6tables -L FI-vnet0 -n | sed 's/\/128/ /' Chain FI-vnet0 (1 references) target prot opt source destination -RETURN icmpv6 f:e:d::c:b:a/127 a:b:c::d:e:f/128 MAC 01:02:03:04:05:06 DSCP match 0x02ipv6-icmp type 12 code 11 state NEW,ESTABLISHED -#ip6tables -L FO-vnet0 -n +RETURN icmpv6 f:e:d::c:b:a/127 a:b:c::d:e:f MAC 01:02:03:04:05:06 DSCP match 0x02ipv6-icmp type 12 code 11 state NEW,ESTABLISHED +#ip6tables -L FO-vnet0 -n | sed 's/\/128/ /' Chain FO-vnet0 (1 references) target prot opt source destination -ACCEPT icmpv6 a:b:c::/128 ::/0 MAC 01:02:03:04:05:06 DSCP match 0x21ipv6-icmp type 255 code 255 state NEW,ESTABLISHED -ACCEPT icmpv6 ::10.1.2.3/128 ::/0 MAC 01:02:03:04:05:06 DSCP match 0x21ipv6-icmp type 255 code 255 state NEW,ESTABLISHED -#ip6tables -L HI-vnet0 -n +ACCEPT icmpv6 a:b:c:: ::/0 MAC 01:02:03:04:05:06 DSCP match 0x21ipv6-icmp type 255 code 255 state NEW,ESTABLISHED +ACCEPT icmpv6 ::10.1.2.3 ::/0 MAC 01:02:03:04:05:06 DSCP match 0x21ipv6-icmp type 255 code 255 state NEW,ESTABLISHED +#ip6tables -L HI-vnet0 -n | sed 's/\/128/ /' Chain HI-vnet0 (1 references) target prot opt source destination -RETURN icmpv6 f:e:d::c:b:a/127 a:b:c::d:e:f/128 MAC 01:02:03:04:05:06 DSCP match 0x02ipv6-icmp type 12 code 11 state NEW,ESTABLISHED +RETURN icmpv6 f:e:d::c:b:a/127 a:b:c::d:e:f MAC 01:02:03:04:05:06 DSCP match 0x02ipv6-icmp type 12 code 11 state NEW,ESTABLISHED #ip6tables -L INPUT -n --line-numbers | grep libvirt 1 libvirt-host-in all ::/0 ::/0 #ip6tables -L libvirt-host-in -n | grep vnet0 | tr -s " " diff --git a/scripts/nwfilter/nwfilterxml2fwallout/sctp-ipv6-test.fwall b/scripts/nwfilter/nwfilterxml2fwallout/sctp-ipv6-test.fwall index 40d51f7..90c2284 100644 --- a/scripts/nwfilter/nwfilterxml2fwallout/sctp-ipv6-test.fwall +++ b/scripts/nwfilter/nwfilterxml2fwallout/sctp-ipv6-test.fwall @@ -1,21 +1,21 @@ -#ip6tables -L FI-vnet0 -n +#ip6tables -L FI-vnet0 -n | sed 's/\/128/ /' Chain FI-vnet0 (1 references) target prot opt source destination -RETURN sctp ::/0 a:b:c::d:e:f/128 MAC 01:02:03:04:05:06 DSCP match 0x02state NEW,ESTABLISHED ctdir REPLY -RETURN sctp ::/0 a:b:c::/128 DSCP match 0x21sctp spts:100:1111 dpts:20:21 state ESTABLISHED ctdir ORIGINAL -RETURN sctp ::/0 ::10.1.2.3/128 DSCP match 0x3fsctp spt:65535 dpts:255:256 state ESTABLISHED ctdir ORIGINAL -#ip6tables -L FO-vnet0 -n +RETURN sctp ::/0 a:b:c::d:e:f MAC 01:02:03:04:05:06 DSCP match 0x02state NEW,ESTABLISHED ctdir REPLY +RETURN sctp ::/0 a:b:c:: DSCP match 0x21sctp spts:100:1111 dpts:20:21 state ESTABLISHED ctdir ORIGINAL +RETURN sctp ::/0 ::10.1.2.3 DSCP match 0x3fsctp spt:65535 dpts:255:256 state ESTABLISHED ctdir ORIGINAL +#ip6tables -L FO-vnet0 -n | sed 's/\/128/ /' Chain FO-vnet0 (1 references) target prot opt source destination -ACCEPT sctp a:b:c::d:e:f/128 ::/0 DSCP match 0x02state ESTABLISHED ctdir ORIGINAL -ACCEPT sctp a:b:c::/128 ::/0 MAC 01:02:03:04:05:06 DSCP match 0x21sctp spts:20:21 dpts:100:1111 state NEW,ESTABLISHED ctdir REPLY -ACCEPT sctp ::10.1.2.3/128 ::/0 MAC 01:02:03:04:05:06 DSCP match 0x3fsctp spts:255:256 dpt:65535 state NEW,ESTABLISHED ctdir REPLY -#ip6tables -L HI-vnet0 -n +ACCEPT sctp a:b:c::d:e:f ::/0 DSCP match 0x02state ESTABLISHED ctdir ORIGINAL +ACCEPT sctp a:b:c:: ::/0 MAC 01:02:03:04:05:06 DSCP match 0x21sctp spts:20:21 dpts:100:1111 state NEW,ESTABLISHED ctdir REPLY +ACCEPT sctp ::10.1.2.3 ::/0 MAC 01:02:03:04:05:06 DSCP match 0x3fsctp spts:255:256 dpt:65535 state NEW,ESTABLISHED ctdir REPLY +#ip6tables -L HI-vnet0 -n | sed 's/\/128/ /' Chain HI-vnet0 (1 references) target prot opt source destination -RETURN sctp ::/0 a:b:c::d:e:f/128 MAC 01:02:03:04:05:06 DSCP match 0x02state NEW,ESTABLISHED ctdir REPLY -RETURN sctp ::/0 a:b:c::/128 DSCP match 0x21sctp spts:100:1111 dpts:20:21 state ESTABLISHED ctdir ORIGINAL -RETURN sctp ::/0 ::10.1.2.3/128 DSCP match 0x3fsctp spt:65535 dpts:255:256 state ESTABLISHED ctdir ORIGINAL +RETURN sctp ::/0 a:b:c::d:e:f MAC 01:02:03:04:05:06 DSCP match 0x02state NEW,ESTABLISHED ctdir REPLY +RETURN sctp ::/0 a:b:c:: DSCP match 0x21sctp spts:100:1111 dpts:20:21 state ESTABLISHED ctdir ORIGINAL +RETURN sctp ::/0 ::10.1.2.3 DSCP match 0x3fsctp spt:65535 dpts:255:256 state ESTABLISHED ctdir ORIGINAL #ip6tables -L INPUT -n --line-numbers | grep libvirt 1 libvirt-host-in all ::/0 ::/0 #ip6tables -L libvirt-host-in -n | grep vnet0 | tr -s " " diff --git a/scripts/nwfilter/nwfilterxml2fwallout/tcp-ipv6-test.fwall b/scripts/nwfilter/nwfilterxml2fwallout/tcp-ipv6-test.fwall index 2a794b8..a294a26 100644 --- a/scripts/nwfilter/nwfilterxml2fwallout/tcp-ipv6-test.fwall +++ b/scripts/nwfilter/nwfilterxml2fwallout/tcp-ipv6-test.fwall @@ -1,21 +1,21 @@ -#ip6tables -L FI-vnet0 -n +#ip6tables -L FI-vnet0 -n | sed 's/\/128/ /' Chain FI-vnet0 (1 references) target prot opt source destination -RETURN tcp ::/0 a:b:c::d:e:f/128 MAC 01:02:03:04:05:06 DSCP match 0x02state NEW,ESTABLISHED ctdir REPLY -RETURN tcp ::/0 a:b:c::/128 DSCP match 0x21tcp spts:100:1111 dpts:20:21 state ESTABLISHED ctdir ORIGINAL -RETURN tcp ::/0 ::10.1.2.3/128 DSCP match 0x3ftcp spt:65535 dpts:255:256 state ESTABLISHED ctdir ORIGINAL -#ip6tables -L FO-vnet0 -n +RETURN tcp ::/0 a:b:c::d:e:f MAC 01:02:03:04:05:06 DSCP match 0x02state NEW,ESTABLISHED ctdir REPLY +RETURN tcp ::/0 a:b:c:: DSCP match 0x21tcp spts:100:1111 dpts:20:21 state ESTABLISHED ctdir ORIGINAL +RETURN tcp ::/0 ::10.1.2.3 DSCP match 0x3ftcp spt:65535 dpts:255:256 state ESTABLISHED ctdir ORIGINAL +#ip6tables -L FO-vnet0 -n | sed 's/\/128/ /' Chain FO-vnet0 (1 references) target prot opt source destination -ACCEPT tcp a:b:c::d:e:f/128 ::/0 DSCP match 0x02state ESTABLISHED ctdir ORIGINAL -ACCEPT tcp a:b:c::/128 ::/0 MAC 01:02:03:04:05:06 DSCP match 0x21tcp spts:20:21 dpts:100:1111 state NEW,ESTABLISHED ctdir REPLY -ACCEPT tcp ::10.1.2.3/128 ::/0 MAC 01:02:03:04:05:06 DSCP match 0x3ftcp spts:255:256 dpt:65535 state NEW,ESTABLISHED ctdir REPLY -#ip6tables -L HI-vnet0 -n +ACCEPT tcp a:b:c::d:e:f ::/0 DSCP match 0x02state ESTABLISHED ctdir ORIGINAL +ACCEPT tcp a:b:c:: ::/0 MAC 01:02:03:04:05:06 DSCP match 0x21tcp spts:20:21 dpts:100:1111 state NEW,ESTABLISHED ctdir REPLY +ACCEPT tcp ::10.1.2.3 ::/0 MAC 01:02:03:04:05:06 DSCP match 0x3ftcp spts:255:256 dpt:65535 state NEW,ESTABLISHED ctdir REPLY +#ip6tables -L HI-vnet0 -n | sed 's/\/128/ /' Chain HI-vnet0 (1 references) target prot opt source destination -RETURN tcp ::/0 a:b:c::d:e:f/128 MAC 01:02:03:04:05:06 DSCP match 0x02state NEW,ESTABLISHED ctdir REPLY -RETURN tcp ::/0 a:b:c::/128 DSCP match 0x21tcp spts:100:1111 dpts:20:21 state ESTABLISHED ctdir ORIGINAL -RETURN tcp ::/0 ::10.1.2.3/128 DSCP match 0x3ftcp spt:65535 dpts:255:256 state ESTABLISHED ctdir ORIGINAL +RETURN tcp ::/0 a:b:c::d:e:f MAC 01:02:03:04:05:06 DSCP match 0x02state NEW,ESTABLISHED ctdir REPLY +RETURN tcp ::/0 a:b:c:: DSCP match 0x21tcp spts:100:1111 dpts:20:21 state ESTABLISHED ctdir ORIGINAL +RETURN tcp ::/0 ::10.1.2.3 DSCP match 0x3ftcp spt:65535 dpts:255:256 state ESTABLISHED ctdir ORIGINAL #ip6tables -L INPUT -n --line-numbers | grep libvirt 1 libvirt-host-in all ::/0 ::/0 #ip6tables -L libvirt-host-in -n | grep vnet0 | tr -s " " diff --git a/scripts/nwfilter/nwfilterxml2fwallout/udp-ipv6-test.fwall b/scripts/nwfilter/nwfilterxml2fwallout/udp-ipv6-test.fwall index 0a75421..dafaea5 100644 --- a/scripts/nwfilter/nwfilterxml2fwallout/udp-ipv6-test.fwall +++ b/scripts/nwfilter/nwfilterxml2fwallout/udp-ipv6-test.fwall @@ -1,21 +1,21 @@ -#ip6tables -L FI-vnet0 -n +#ip6tables -L FI-vnet0 -n | sed 's/\/128/ /' Chain FI-vnet0 (1 references) target prot opt source destination -RETURN udp ::/0 a:b:c::d:e:f/128 MAC 01:02:03:04:05:06 DSCP match 0x02state NEW,ESTABLISHED ctdir REPLY -RETURN udp ::/0 ::a:b:c/128 DSCP match 0x21udp spts:100:1111 dpts:20:21 state ESTABLISHED ctdir ORIGINAL -RETURN udp ::/0 ::10.1.2.3/128 DSCP match 0x3fudp spt:65535 dpts:255:256 state ESTABLISHED ctdir ORIGINAL -#ip6tables -L FO-vnet0 -n +RETURN udp ::/0 a:b:c::d:e:f MAC 01:02:03:04:05:06 DSCP match 0x02state NEW,ESTABLISHED ctdir REPLY +RETURN udp ::/0 ::a:b:c DSCP match 0x21udp spts:100:1111 dpts:20:21 state ESTABLISHED ctdir ORIGINAL +RETURN udp ::/0 ::10.1.2.3 DSCP match 0x3fudp spt:65535 dpts:255:256 state ESTABLISHED ctdir ORIGINAL +#ip6tables -L FO-vnet0 -n | sed 's/\/128/ /' Chain FO-vnet0 (1 references) target prot opt source destination -ACCEPT udp a:b:c::d:e:f/128 ::/0 DSCP match 0x02state ESTABLISHED ctdir ORIGINAL -ACCEPT udp ::a:b:c/128 ::/0 MAC 01:02:03:04:05:06 DSCP match 0x21udp spts:20:21 dpts:100:1111 state NEW,ESTABLISHED ctdir REPLY -ACCEPT udp ::10.1.2.3/128 ::/0 MAC 01:02:03:04:05:06 DSCP match 0x3fudp spts:255:256 dpt:65535 state NEW,ESTABLISHED ctdir REPLY -#ip6tables -L HI-vnet0 -n +ACCEPT udp a:b:c::d:e:f ::/0 DSCP match 0x02state ESTABLISHED ctdir ORIGINAL +ACCEPT udp ::a:b:c ::/0 MAC 01:02:03:04:05:06 DSCP match 0x21udp spts:20:21 dpts:100:1111 state NEW,ESTABLISHED ctdir REPLY +ACCEPT udp ::10.1.2.3 ::/0 MAC 01:02:03:04:05:06 DSCP match 0x3fudp spts:255:256 dpt:65535 state NEW,ESTABLISHED ctdir REPLY +#ip6tables -L HI-vnet0 -n | sed 's/\/128/ /' Chain HI-vnet0 (1 references) target prot opt source destination -RETURN udp ::/0 a:b:c::d:e:f/128 MAC 01:02:03:04:05:06 DSCP match 0x02state NEW,ESTABLISHED ctdir REPLY -RETURN udp ::/0 ::a:b:c/128 DSCP match 0x21udp spts:100:1111 dpts:20:21 state ESTABLISHED ctdir ORIGINAL -RETURN udp ::/0 ::10.1.2.3/128 DSCP match 0x3fudp spt:65535 dpts:255:256 state ESTABLISHED ctdir ORIGINAL +RETURN udp ::/0 a:b:c::d:e:f MAC 01:02:03:04:05:06 DSCP match 0x02state NEW,ESTABLISHED ctdir REPLY +RETURN udp ::/0 ::a:b:c DSCP match 0x21udp spts:100:1111 dpts:20:21 state ESTABLISHED ctdir ORIGINAL +RETURN udp ::/0 ::10.1.2.3 DSCP match 0x3fudp spt:65535 dpts:255:256 state ESTABLISHED ctdir ORIGINAL #ip6tables -L INPUT -n --line-numbers | grep libvirt 1 libvirt-host-in all ::/0 ::/0 #ip6tables -L libvirt-host-in -n | grep vnet0 | tr -s " " diff --git a/scripts/nwfilter/nwfilterxml2fwallout/udplite-ipv6-test.fwall b/scripts/nwfilter/nwfilterxml2fwallout/udplite-ipv6-test.fwall index 9173222..815a8c0 100644 --- a/scripts/nwfilter/nwfilterxml2fwallout/udplite-ipv6-test.fwall +++ b/scripts/nwfilter/nwfilterxml2fwallout/udplite-ipv6-test.fwall @@ -1,21 +1,21 @@ -#ip6tables -L FI-vnet0 -n +#ip6tables -L FI-vnet0 -n | sed 's/\/128/ /' Chain FI-vnet0 (1 references) target prot opt source destination -RETURN udplite f:e:d::c:b:a/127 a:b:c::d:e:f/128 MAC 01:02:03:04:05:06 DSCP match 0x02state NEW,ESTABLISHED ctdir REPLY -RETURN udplite ::/0 a:b:c::/128 DSCP match 0x21state ESTABLISHED ctdir ORIGINAL -RETURN udplite ::/0 ::10.1.2.3/128 DSCP match 0x21state ESTABLISHED ctdir ORIGINAL -#ip6tables -L FO-vnet0 -n +RETURN udplite f:e:d::c:b:a/127 a:b:c::d:e:f MAC 01:02:03:04:05:06 DSCP match 0x02state NEW,ESTABLISHED ctdir REPLY +RETURN udplite ::/0 a:b:c:: DSCP match 0x21state ESTABLISHED ctdir ORIGINAL +RETURN udplite ::/0 ::10.1.2.3 DSCP match 0x21state ESTABLISHED ctdir ORIGINAL +#ip6tables -L FO-vnet0 -n | sed 's/\/128/ /' Chain FO-vnet0 (1 references) target prot opt source destination -ACCEPT udplite a:b:c::d:e:f/128 f:e:d::c:b:a/127 DSCP match 0x02state ESTABLISHED ctdir ORIGINAL -ACCEPT udplite a:b:c::/128 ::/0 MAC 01:02:03:04:05:06 DSCP match 0x21state NEW,ESTABLISHED ctdir REPLY -ACCEPT udplite ::10.1.2.3/128 ::/0 MAC 01:02:03:04:05:06 DSCP match 0x21state NEW,ESTABLISHED ctdir REPLY -#ip6tables -L HI-vnet0 -n +ACCEPT udplite a:b:c::d:e:f f:e:d::c:b:a/127 DSCP match 0x02state ESTABLISHED ctdir ORIGINAL +ACCEPT udplite a:b:c:: ::/0 MAC 01:02:03:04:05:06 DSCP match 0x21state NEW,ESTABLISHED ctdir REPLY +ACCEPT udplite ::10.1.2.3 ::/0 MAC 01:02:03:04:05:06 DSCP match 0x21state NEW,ESTABLISHED ctdir REPLY +#ip6tables -L HI-vnet0 -n | sed 's/\/128/ /' Chain HI-vnet0 (1 references) target prot opt source destination -RETURN udplite f:e:d::c:b:a/127 a:b:c::d:e:f/128 MAC 01:02:03:04:05:06 DSCP match 0x02state NEW,ESTABLISHED ctdir REPLY -RETURN udplite ::/0 a:b:c::/128 DSCP match 0x21state ESTABLISHED ctdir ORIGINAL -RETURN udplite ::/0 ::10.1.2.3/128 DSCP match 0x21state ESTABLISHED ctdir ORIGINAL +RETURN udplite f:e:d::c:b:a/127 a:b:c::d:e:f MAC 01:02:03:04:05:06 DSCP match 0x02state NEW,ESTABLISHED ctdir REPLY +RETURN udplite ::/0 a:b:c:: DSCP match 0x21state ESTABLISHED ctdir ORIGINAL +RETURN udplite ::/0 ::10.1.2.3 DSCP match 0x21state ESTABLISHED ctdir ORIGINAL #ip6tables -L INPUT -n --line-numbers | grep libvirt 1 libvirt-host-in all ::/0 ::/0 #ip6tables -L libvirt-host-in -n | grep vnet0 | tr -s " " -- 1.8.4.5

2 1

[libvirt] [PATCH tck] Adapt network tests to changed cli tool formats
by Daniel P. Berrange 28 Mar '14

28 Mar '14

The network tests invoke various ifconfig and route commands to test network setup, and also grep for dnsmasq/radvd args. Switch to use 'ip' since ifconfig and route commands are not installed by default on recent distros any more and their output formats have also changed. Remove grepping for dnsmasq args since libvirt uses a config file now too. Also avoid looking for radvd, since we let dnsmasq handle IPv6 too now. --- .../networks/networkxml2hostout/tck-testnet-1.dat | 20 ++++----- .../networks/networkxml2hostout/tck-testnet-2.dat | 16 +++---- .../networks/networkxml2hostout/tck-testnet-3.dat | 51 +++++++--------------- 3 files changed, 33 insertions(+), 54 deletions(-) diff --git a/scripts/networks/networkxml2hostout/tck-testnet-1.dat b/scripts/networks/networkxml2hostout/tck-testnet-1.dat index da1a51e..977489f 100644 --- a/scripts/networks/networkxml2hostout/tck-testnet-1.dat +++ b/scripts/networks/networkxml2hostout/tck-testnet-1.dat @@ -1,19 +1,19 @@ #iptables -t nat -L -n | grep ' 10\.1\.2\.' +RETURN all -- 10.1.2.0/24 224.0.0.0/24 +RETURN all -- 10.1.2.0/24 255.255.255.255 MASQUERADE tcp -- 10.1.2.0/24 !10.1.2.0/24 masq ports: 1024-65535 MASQUERADE udp -- 10.1.2.0/24 !10.1.2.0/24 masq ports: 1024-65535 MASQUERADE all -- 10.1.2.0/24 !10.1.2.0/24 -#iptables -n -L FORWARD | grep ' 10\.1\.2\.' +#iptables -n -L FORWARD | grep ' 10\.1\.2\.' | sed -e 's/ctstate/state/' ACCEPT all -- 0.0.0.0/0 10.1.2.0/24 state RELATED,ESTABLISHED ACCEPT all -- 10.1.2.0/24 0.0.0.0/0 -#ps aux | sed -n '/dnsmasq .*tck-testnet/ s|.*$listen-address 10\.1\.2\.1*$.*|\1|p' -listen-address 10.1.2.1 -#ps aux | sed -n '/dnsmasq .*tck-testnet/ s|.*$dhcp-range 10\.1\.2\.2\,10\.1\.2\.254*$.*|\1|p' -dhcp-range 10.1.2.2,10.1.2.254 -#route -n | grep '10\.1\.2\.' -10.1.2.0 0.0.0.0 255.255.255.0 U 0 0 0 tck-testbr +#ip -o route show dev tck-testbr | gawk '{print $1" "$7}' +10.1.2.0/24 10.1.2.1 +#ps aux | sed -n '/dnsmasq .*tck-testnet/ s|.*$\/dnsmasq\/tck-testnet.conf$.*|\1|p' +/dnsmasq/tck-testnet.conf #brctl show | grep tck-testbr | gawk '{print $1" "$3}' tck-testbr yes -#ifconfig tck-testbr | grep ':10\.1\.2\.' - inet addr:10.1.2.1 Bcast:10.1.2.255 Mask:255.255.255.0 +#ip -o addr show dev tck-testbr | gawk '{print $4" "$6}' +10.1.2.1/24 10.1.2.255 #virsh net-list | grep tck-testnet -tck-testnet active no + tck-testnet active no no diff --git a/scripts/networks/networkxml2hostout/tck-testnet-2.dat b/scripts/networks/networkxml2hostout/tck-testnet-2.dat index b2f4315..72ba48b 100644 --- a/scripts/networks/networkxml2hostout/tck-testnet-2.dat +++ b/scripts/networks/networkxml2hostout/tck-testnet-2.dat @@ -2,15 +2,13 @@ ACCEPT all -- 0.0.0.0/0 10.1.2.0/24 ACCEPT all -- 10.1.2.0/24 0.0.0.0/0 #iptables -t nat -L -n | grep ' 10\.1\.2\.' -#ps aux | sed -n '/dnsmasq .*tck-testnet/ s|.*$listen-address 10\.1\.2\.1$.*|\1|p' -listen-address 10.1.2.1 -#ps aux | sed -n '/dnsmasq .*tck-testnet/ s|.*$dhcp-range 10\.1\.2\.2,10\.1\.2\.254$.*|\1|p' -dhcp-range 10.1.2.2,10.1.2.254 -#route -n | grep '10\.1\.2\.' -10.1.2.0 0.0.0.0 255.255.255.0 U 0 0 0 tck-testbr +#ip -o route show dev tck-testbr | gawk '{print $1" "$7}' +10.1.2.0/24 10.1.2.1 +#ps aux | sed -n '/dnsmasq .*tck-testnet/ s|.*$\/dnsmasq\/tck-testnet.conf$.*|\1|p' +/dnsmasq/tck-testnet.conf #brctl show | grep tck-testbr | gawk '{print $1" "$3}' tck-testbr yes -#ifconfig tck-testbr | grep ':10\.1\.2\.' - inet addr:10.1.2.1 Bcast:10.1.2.255 Mask:255.255.255.0 +#ip -o addr show dev tck-testbr | gawk '{print $4" "$6}' +10.1.2.1/24 10.1.2.255 #virsh net-list | grep tck-testnet -tck-testnet active no + tck-testnet active no no diff --git a/scripts/networks/networkxml2hostout/tck-testnet-3.dat b/scripts/networks/networkxml2hostout/tck-testnet-3.dat index 36c7b32..f9417fc 100644 --- a/scripts/networks/networkxml2hostout/tck-testnet-3.dat +++ b/scripts/networks/networkxml2hostout/tck-testnet-3.dat @@ -1,8 +1,10 @@ #iptables -t nat -L -n | grep ' 10\.1\.2\.' +RETURN all -- 10.1.2.0/24 224.0.0.0/24 +RETURN all -- 10.1.2.0/24 255.255.255.255 MASQUERADE tcp -- 10.1.2.0/24 !10.1.2.0/24 masq ports: 1024-65535 MASQUERADE udp -- 10.1.2.0/24 !10.1.2.0/24 masq ports: 1024-65535 MASQUERADE all -- 10.1.2.0/24 !10.1.2.0/24 -#iptables -n -L FORWARD | grep ' 10\.1\.2\.' +#iptables -n -L FORWARD | grep ' 10\.1\.2\.' | sed -e 's/ctstate/state/' ACCEPT all -- 0.0.0.0/0 10.1.2.0/24 state RELATED,ESTABLISHED ACCEPT all -- 10.1.2.0/24 0.0.0.0/0 #ip6tables -n -L FORWARD | grep ' 2001:db8:ac10' @@ -10,40 +12,19 @@ ACCEPT all ::/0 2001:db8:ac10:fd01::/64 ACCEPT all 2001:db8:ac10:fd01::/64 ::/0 ACCEPT all ::/0 2001:db8:ac10:fe01::/64 ACCEPT all 2001:db8:ac10:fe01::/64 ::/0 -#ps aux | sed -n '/dnsmasq .*tck-testnet/ s|.*$listen-address 10\.1\.2\.1$.*|\1|p' -listen-address 10.1.2.1 -#ps aux | sed -n '/dnsmasq .*tck-testnet/ s|.*$listen-address 192\.168\.123\.1$.*|\1|p' -listen-address 192.168.123.1 -#ps aux | sed -n '/dnsmasq .*tck-testnet/ s|.*$listen-address 172\.28\.255\.241$.*|\1|p' -listen-address 172.28.255.241 -#ps aux | sed -n '/dnsmasq .*tck-testnet/ s|.*$dhcp-range 10\.1\.2\.2,10\.1\.2\.254$.*|\1|p' -dhcp-range 10.1.2.2,10.1.2.254 -#ps aux | sed -n '/dnsmasq .*tck-testnet/ s|.*$listen-address 2001\:db8\:ac10\:fe01\:\:1$.*|\1|p' -listen-address 2001:db8:ac10:fe01::1 -#ps aux | sed -n '/dnsmasq .*tck-testnet/ s|.*$listen-address 2001\:db8\:ac10\:fd01\:\:1$.*|\1|p' -listen-address 2001:db8:ac10:fd01::1 -#ps aux | sed -n '/radvd --.*tck-testnet-/ s|.*$\/radvd\/tck-testnet-radvd.conf$.*|\1|p' -/radvd/tck-testnet-radvd.conf -#route -n | grep '10\.1\.2\.' -10.1.2.0 0.0.0.0 255.255.255.0 U 0 0 0 tck-testbr -#route -n | grep '192\.168\.123\.' -192.168.123.0 0.0.0.0 255.255.255.0 U 0 0 0 tck-testbr -#route -n | grep '172\.28\.255\.240' -172.28.255.240 0.0.0.0 255.255.255.240 U 0 0 0 tck-testbr +#ps aux | sed -n '/dnsmasq .*tck-testnet/ s|.*$\/dnsmasq\/tck-testnet.conf$.*|\1|p' +/dnsmasq/tck-testnet.conf #brctl show | grep tck-testbr | gawk '{print $1" "$3}' tck-testbr yes -#ifconfig tck-testbr | grep ':10\.1\.2\.' - inet addr:10.1.2.1 Bcast:10.1.2.255 Mask:255.255.255.0 -#ifconfig tck-testbr | grep 'inet6 addr: 2001' - inet6 addr: 2001:db8:ac10:fd01::1/64 Scope:Global - inet6 addr: 2001:db8:ac10:fe01::1/64 Scope:Global -#ip addr show tck-testbr | grep "inet " - inet 10.1.2.1/24 brd 10.1.2.255 scope global tck-testbr - inet 192.168.123.1/24 brd 192.168.123.255 scope global tck-testbr - inet 172.28.255.241/28 brd 172.28.255.255 scope global tck-testbr -#ip route show dev tck-testbr -172.28.255.240/28 proto kernel scope link src 172.28.255.241 -10.1.2.0/24 proto kernel scope link src 10.1.2.1 -192.168.123.0/24 proto kernel scope link src 192.168.123.1 +#ip -o addr show dev tck-testbr | gawk '{print $4" "$6}' +10.1.2.1/24 10.1.2.255 +192.168.123.1/24 192.168.123.255 +172.28.255.241/28 172.28.255.255 +2001:db8:ac10:fd01::1/64 global +2001:db8:ac10:fe01::1/64 global +#ip -o route show dev tck-testbr | gawk '{print $1" "$7}' +10.1.2.0/24 10.1.2.1 +172.28.255.240/28 172.28.255.241 +192.168.123.0/24 192.168.123.1 #virsh net-list | grep tck-testnet -tck-testnet active no + tck-testnet active no no -- 1.8.5.3

2 2

[libvirt] Device attach / detach problem for passthrough/SR-IOV in libvirt
by Mohsen Ghaemi 28 Mar '14

28 Mar '14

Hi all I just encountered a problem in libvirt while was trying to attach and detach a sr-iov vf to my VM The version of my libvirt is 1.1.1-0ubuntu8.5 I tried to attach the device using following xml <interface type='hostdev' managed='yes'> <mac address='5c:01:fd:12:34:58'/> <source> <address type='pci' domain='0x0000' bus='0x04' slot='0x01' function='0x1'/> </source> </interface> When i attached device it worked properly and i managed to ping another host. virsh # attach-device t5 1.xml Device attached successfully But when i detached it still i had network traffic in my VM but libvirt (virsh) said that virsh # detach-device t5 1.xml Device detached successfully The next time i tried to attach it libvirt said that virsh # attach-device t5 1.xml error: Failed to attach device from 1.xml error: Requested operation is not valid: PCI device 0000:04:01.1 is in use by domain t5 and when i continue this action after the 'domain' i receive some strange characters which might come from the memory space (memory content) like some addresses, links or some characters I tried it with different VMs and different guest OSs that the same happend. The same action was done with another host running libvirt version Installed: 1.0.2-0ubuntu11.13.04.5~cloud1 Candidate: 1.0.2-0ubuntu11.13.04.5~cloud1 and it worked pretty OK. No problem. Do you have any idea what is wrong? More information: Kernel : 3.8.0-37-generic /etc/libvirt/qemu.conf : security_driver = "none" root@compute01:~# ethtool -i eth5 driver: bnx2x version: 1.78.58 firmware-version: bc 7.4.22 phy 1.34 bus-info: 0000:04:00.1 supports-statistics: yes supports-test: yes supports-eeprom-access: yes supports-register-dump: yes

3 3

[libvirt] Segfault in libvirt.git virHostdevManagerOnceInit
by Richard W.M. Jones 27 Mar '14

27 Mar '14

Current libvirt.git: $ ~/d/libvirt/run gdb --args ~/d/libvirt/daemon/libvirtd --timeout=30 [...] 2014-03-27 18:44:21.816+0000: 11868: info : libvirt version: 1.2.3 2014-03-27 18:44:21.816+0000: 11868: error : virHostdevManagerNew:116 : operation failed: Failed to create state dir '/var/run/libvirt/hostdevmgr' Program received signal SIGSEGV, Segmentation fault. [Switching to Thread 0x7fffdabc6700 (LWP 11868)] virObjectUnref (anyobj=anyobj@entry=0x7fffd412cc70) at util/virobject.c:270 270 memset(obj, 0, obj->klass->objectSize); Missing separate debuginfos, use: debuginfo-install audit-libs-2.3.3-1.fc20.x86_64 augeas-libs-1.1.0-2.fc20.x86_64 avahi-libs-0.6.31-21.fc20.x86_64 boost-system-1.54.0-9.fc20.x86_64 boost-thread-1.54.0-9.fc20.x86_64 bzip2-libs-1.0.6-9.fc20.x86_64 ceph-libs-0.67.3-2.fc20.x86_64 cryptopp-5.6.2-3.fc20.x86_64 cyrus-sasl-gssapi-2.1.26-14.fc20.x86_64 cyrus-sasl-lib-2.1.26-14.fc20.x86_64 cyrus-sasl-md5-2.1.26-14.fc20.x86_64 cyrus-sasl-plain-2.1.26-14.fc20.x86_64 cyrus-sasl-scram-2.1.26-14.fc20.x86_64 dbus-libs-1.6.12-8.fc20.x86_64 device-mapper-libs-1.02.82-5.fc20.x86_64 fuse-libs-2.9.3-2.fc20.x86_64 glibc-2.18-12.fc20.x86_64 glusterfs-api-3.4.2-1.fc20.x86_64 glusterfs-libs-3.4.2-1.fc20.x86_64 gmp-5.1.2-2.fc20.x86_64 gnome-keyring-3.10.1-1.fc20.x86_64 gnutls-3.1.20-3.fc20.x86_64 keyutils-libs-1.5.8-1.fc20.x86_64 krb5-libs-1.11.5-2.fc20.x86_64 leveldb-1.12.0-5.fc20.x86_64 libblkid-2.24.1-1.fc20.x86_64 libcap-ng-0.7.3-6.fc20.x86_64 libcom_err-1.42.8-3.fc20.x86_64 libcurl-7.32.0-4.fc20.x86_64 libdb-5.3.28-1.fc20.x86_64 libffi-3.0.13-5.fc20.x86_64 libgcc-4.8.2-7.fc20.x86_64 libgcrypt-1.5.3-2.fc20.x86_64 libgpg-error-1.12-1.fc20.x86_64 libidn-1.28-2.fc20.x86_64 libnl3-3.2.24-1.fc20.x86_64 libpcap-1.5.3-1.fc20.x86_64 libpciaccess-0.13.2-1.fc20.x86_64 libselinux-2.2.1-6.fc20.x86_64 libsepol-2.1.9-2.fc20.x86_64 libssh2-1.4.3-8.fc20.x86_64 libstdc++-4.8.2-7.fc20.x86_64 libtasn1-3.3-2.fc20.x86_64 libuuid-2.24.1-1.fc20.x86_64 libwsman1-2.4.3-1.fc20.x86_64 libxml2-2.9.1-2.fc20.x86_64 libxslt-1.1.28-5.fc20.x86_64 netcf-libs-0.2.3-5.fc20.x86_64 nettle-2.7.1-3.fc20.x86_64 nspr-4.10.2-1.fc20.x86_64 nss-3.15.4-1.fc20.x86_64 nss-softokn-freebl-3.15.4-1.fc20.x86_64 nss-util-3.15.4-1.fc20.x86_64 numactl-libs-2.0.9-1.fc20.x86_64 openldap-2.4.39-2.fc20.x86_64 openssl-libs-1.0.1e-37.fc20.x86_64 p11-kit-0.20.2-1.fc20.x86_64 p11-kit-trust-0.20.2-1.fc20.x86_64 pcre-8.33-4.fc20.x86_64 snappy-1.1.0-2.fc20.x86_64 systemd-libs-208-14.fc20.x86_64 trousers-0.3.11.2-1.fc20.x86_64 xen-libs-4.3.1-9.fc20.x86_64 xz-libs-5.1.2-6alpha.fc20.x86_64 yajl-2.0.4-3.fc20.x86_64 zlib-1.2.8-3.fc20.x86_64 (gdb) bt #0 virObjectUnref (anyobj=anyobj@entry=0x7fffd412cc70) at util/virobject.c:270 #1 0x00007ffff747eeb0 in virHostdevManagerNew () at util/virhostdev.c:123 #2 virHostdevManagerOnceInit () at util/virhostdev.c:65 #3 virHostdevManagerOnce () at util/virhostdev.c:71 #4 0x00007ffff44e9200 in pthread_once () from /lib64/libpthread.so.0 #5 0x00007ffff74aeabd in virOnce (once=<optimized out>, init=<optimized out>) at util/virthread.c:47 #6 0x00007ffff747ef07 in virHostdevManagerInitialize () at util/virhostdev.c:71 #7 virHostdevManagerGetDefault () at util/virhostdev.c:130 #8 0x00007fffdca2285d in qemuStateInitialize (privileged=<optimized out>, callback=<optimized out>, opaque=<optimized out>) at qemu/qemu_driver.c:698 #9 0x00007ffff753f83f in virStateInitialize (privileged=false, callback=callback@entry=0x55555556bf20 <daemonInhibitCallback>, opaque=opaque@entry=0x55555584a100) at libvirt.c:743 #10 0x000055555556bfcb in daemonRunStateInit ( opaque=opaque@entry=0x55555584a100) at libvirtd.c:919 #11 0x00007ffff74aea0e in virThreadHelper (data=<optimized out>) at util/virthread.c:197 #12 0x00007ffff44e3f33 in start_thread () from /lib64/libpthread.so.0 #13 0x00007ffff3e0aded in clone () from /lib64/libc.so.6 Rich. -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones libguestfs lets you edit virtual machines. Supports shell scripting, bindings from many languages. http://libguestfs.org

1 0

[libvirt] [PATCH tck] Fix 202-numa-set-parameters.t test querying numa params
by Daniel P. Berrange 27 Mar '14

27 Mar '14

The 202-numa-set-parameters.t test would attempt to fetch NUMA parameters while the guest is shutoff using the VIR_DOMAIN_AFFECT_LIVE parameter. Change it to use the param AFFECT_CONFIG instead, and add a separate test for AFFECT_LIVE after the guest has been started again. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- scripts/domain/202-numa-set-parameters.t | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/scripts/domain/202-numa-set-parameters.t b/scripts/domain/202-numa-set-parameters.t index c0baf0b..886a979 100644 --- a/scripts/domain/202-numa-set-parameters.t +++ b/scripts/domain/202-numa-set-parameters.t @@ -28,7 +28,7 @@ after the API call to set NUMA parameters for a domain. use strict; use warnings; -use Test::More tests => 10; +use Test::More tests => 12; use Sys::Virt::TCK; use Test::Exception; @@ -80,7 +80,7 @@ diag "Set numa parameters, affects next boot"; lives_ok(sub {$dom->set_numa_parameters(\%params, Sys::Virt::Domain::AFFECT_CONFIG)}, "set_numa_parameters"); diag "Get numa parameters"; -my $params = $dom->get_numa_parameters(Sys::Virt::Domain::AFFECT_LIVE); +$params = $dom->get_numa_parameters(Sys::Virt::Domain::AFFECT_CONFIG); ok($params->{Sys::Virt::Domain::NUMA_MODE} == Sys::Virt::Domain::NUMATUNE_MEM_STRICT, 'Check mode'); ok($params->{Sys::Virt::Domain::NUMA_NODESET} eq '0', 'Check nodeset'); @@ -88,6 +88,11 @@ diag "Make sure the domain can be started after setting numa parameters"; $dom->create; ok($dom->get_id > 0, "running domain with ID > 0"); +diag "Get numa parameters"; +$params = $dom->get_numa_parameters(Sys::Virt::Domain::AFFECT_LIVE); +ok($params->{Sys::Virt::Domain::NUMA_MODE} == Sys::Virt::Domain::NUMATUNE_MEM_STRICT, 'Check mode'); +ok($params->{Sys::Virt::Domain::NUMA_NODESET} eq '0', 'Check nodeset'); + diag "Destroying the persistent domain"; $dom->destroy; $dom->undefine; -- 1.8.5.3

2 1

[libvirt] [PATCH tck] Change 'Sys::Virt::TCK::generic_domain' to take named params
by Daniel P. Berrange 27 Mar '14

27 Mar '14

To make it easier to add more optional parameters to the Sys::Virt::TCK::generic_domain method, change it to take named parameters instead of positional parameters. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- docs/writing-tests.pod | 6 ++--- lib/Sys/Virt/TCK.pm | 37 +++++++++++++++----------- lib/Sys/Virt/TCK/NetworkHelpers.pm | 2 +- scripts/domain/050-transient-lifecycle.t | 2 +- scripts/domain/051-transient-autostart.t | 2 +- scripts/domain/060-persistent-lifecycle.t | 2 +- scripts/domain/061-persistent-autostart.t | 2 +- scripts/domain/065-persistent-redefine.t | 2 +- scripts/domain/070-transient-to-persistent.t | 2 +- scripts/domain/080-unique-id-define.t | 8 +++--- scripts/domain/081-unique-id-create.t | 8 +++--- scripts/domain/082-unique-id-caching.t | 4 +-- scripts/domain/090-invalid-ops-when-inactive.t | 2 +- scripts/domain/100-transient-save-restore.t | 2 +- scripts/domain/101-persistent-save-restore.t | 2 +- scripts/domain/102-broken-save-restore.t | 2 +- scripts/domain/103-blockdev-save-restore.t | 2 +- scripts/domain/120-disks-stats.t | 2 +- scripts/domain/121-block-info.t | 2 +- scripts/domain/130-cpu-hotplug.t | 2 +- scripts/domain/180-interface-parameters.t | 2 +- scripts/domain/200-disk-hotplug.t | 2 +- scripts/domain/202-numa-set-parameters.t | 2 +- scripts/domain/205-disk-hotplug-ordering.t | 2 +- scripts/domain/207-disk-media-change.t | 2 +- scripts/domain/210-nic-hotplug.t | 2 +- scripts/domain/215-nic-hotplug-many.t | 2 +- scripts/domain/240-usb-host-hotplug.t | 2 +- scripts/domain/250-pci-host-hotplug.t | 2 +- scripts/domain/300-migration.t | 2 +- scripts/domain/301-migration-max-speed.t | 2 +- scripts/hooks/052-domain-hook.t | 2 +- scripts/qemu/100-disk-encryption.t | 2 +- scripts/qemu/200-qcow2-single-backing-file.t | 2 +- scripts/qemu/205-qcow2-double-backing-file.t | 2 +- scripts/qemu/210-qcow2-auto-probing.t | 2 +- scripts/qemu/400-save-image-xml.t | 2 +- scripts/selinux/050-dynamic-relabel-yes.t | 2 +- scripts/selinux/055-dynamic-base-label.t | 2 +- scripts/selinux/100-static-relabel-no.t | 2 +- scripts/selinux/105-static-relabel-fail.t | 2 +- scripts/selinux/110-static-relabel-yes.t | 2 +- 42 files changed, 71 insertions(+), 66 deletions(-) diff --git a/docs/writing-tests.pod b/docs/writing-tests.pod index 3bc70b0..171166c 100644 --- a/docs/writing-tests.pod +++ b/docs/writing-tests.pod @@ -159,7 +159,7 @@ the exact config, just wanting a minimal generic domain config that is highly likely to work without error. For such cases, a nice simple API is provided: - my $xml = $tck->generic_domain("test")->as_xml; + my $xml = $tck->generic_domain(name => "test")->as_xml; This creates an XML document for a guest that is of the correct OS and domain type to be able to run on the current hypervisor, with a name @@ -167,7 +167,7 @@ of 'test', and a single disk. It is possible to set further parameters if required. For example, to set an explicit UUID, give 3 virtual CPUs and turn on ACPI: - my $xml = $tck->generic_domain("test")->vcpus(3) + my $xml = $tck->generic_domain(name => "test")->vcpus(3) ->uuid("11111111-1111-2222-3333-444444444444") ->with_acpi()->as_xml() @@ -357,7 +357,7 @@ Taking this into account, the complete example script looks like END { $tck->cleanup if $tck; } - my $xml = $tck->generic_domain("test")->as_xml; + my $xml = $tck->generic_domain(name => "test")->as_xml; my $dom; diag "Defining inactive domain config again"; diff --git a/lib/Sys/Virt/TCK.pm b/lib/Sys/Virt/TCK.pm index a3a2732..57eb08c 100644 --- a/lib/Sys/Virt/TCK.pm +++ b/lib/Sys/Virt/TCK.pm @@ -607,14 +607,14 @@ sub get_kernel { sub generic_machine_domain { my $self = shift; - my $name = shift; - my $caps = shift; - my $ostype = shift; - my $conn = @_ ? shift : $self->conn; + my %params = @_; + my $name = exists $params{name} ? $params{name} : "tck"; + my $ostype = exists $params{ostype} ? $params{ostype} : "hvm"; + my $caps = exists $params{caps} ? $params{caps} : die "caps parameter is required"; my %config = $self->get_kernel($caps, $ostype); - my $b = Sys::Virt::TCK::DomainBuilder->new(conn => $conn, + my $b = Sys::Virt::TCK::DomainBuilder->new(conn => $self->conn, name => $name, domain => $config{domain}, ostype => $config{ostype}); @@ -652,14 +652,14 @@ sub best_container_domain { sub generic_container_domain { my $self = shift; - my $name = shift; - my $caps = shift; - my $domain = shift; - my $conn = @_ ? shift : $self->conn; + my %params = @_; + my $name = exists $params{name} ? $params{name} : "tck"; + my $caps = exists $params{caps} ? $params{caps} : die "caps parameter is required"; + my $domain = exists $params{domain} ? $params{domain} : die "domain parameter is required"; my $bucket = "os-exe"; - my $b = Sys::Virt::TCK::DomainBuilder->new(conn => $conn, + my $b = Sys::Virt::TCK::DomainBuilder->new(conn => $self->conn, name => $name, domain => $domain, ostype => "exe"); @@ -679,11 +679,12 @@ sub generic_container_domain { sub generic_domain { my $self = shift; - my $name = @_ ? shift : "tck"; - my $ostype = @_ ? shift : undef; - my $conn = shift || $self->conn; + my %params = @_; + + my $name = exists $params{name} ? $params{name} : "tck"; + my $ostype = exists $params{ostype} ? $params{ostype} : "hvm"; - my $caps = Sys::Virt::TCK::Capabilities->new(xml => $conn->get_capabilities); + my $caps = Sys::Virt::TCK::Capabilities->new(xml => $self->conn->get_capabilities); my $container; @@ -691,9 +692,13 @@ sub generic_domain { unless $ostype && $ostype ne "exe"; if ($container) { - return $self->generic_container_domain($name, $caps, $container); + return $self->generic_container_domain(name => $name, + caps => $caps, + domain => $container); } else { - return $self->generic_machine_domain($name, $caps, $ostype); + return $self->generic_machine_domain(name => $name, + caps => $caps, + ostype => $ostype); } } diff --git a/lib/Sys/Virt/TCK/NetworkHelpers.pm b/lib/Sys/Virt/TCK/NetworkHelpers.pm index 5e1bac1..a2a8251 100644 --- a/lib/Sys/Virt/TCK/NetworkHelpers.pm +++ b/lib/Sys/Virt/TCK/NetworkHelpers.pm @@ -58,7 +58,7 @@ sub build_domain{ my ($cdrom, $ksurl) = build_cdrom_ks_image($tck); - my $guest = $tck->generic_domain($domain_name); + my $guest = $tck->generic_domain(name => $domain_name); # change the type of network connection for 802.1Qbg tests if ($mode eq "vepa") { diff --git a/scripts/domain/050-transient-lifecycle.t b/scripts/domain/050-transient-lifecycle.t index 94c6bea..d9e9ecb 100644 --- a/scripts/domain/050-transient-lifecycle.t +++ b/scripts/domain/050-transient-lifecycle.t @@ -40,7 +40,7 @@ BAIL_OUT "failed to setup test harness: $@" if $@; END { $tck->cleanup if $tck; } -my $xml = $tck->generic_domain("tck")->as_xml; +my $xml = $tck->generic_domain(name => "tck")->as_xml; diag "Creating a new transient domain"; my $dom; diff --git a/scripts/domain/051-transient-autostart.t b/scripts/domain/051-transient-autostart.t index 26ca82b..0368365 100644 --- a/scripts/domain/051-transient-autostart.t +++ b/scripts/domain/051-transient-autostart.t @@ -38,7 +38,7 @@ BAIL_OUT "failed to setup test harness: $@" if $@; END { $tck->cleanup if $tck; } -my $xml = $tck->generic_domain("tck")->as_xml; +my $xml = $tck->generic_domain(name => "tck")->as_xml; diag "Creating a new transient domain"; my $dom; diff --git a/scripts/domain/060-persistent-lifecycle.t b/scripts/domain/060-persistent-lifecycle.t index ffcb7c9..01867f9 100644 --- a/scripts/domain/060-persistent-lifecycle.t +++ b/scripts/domain/060-persistent-lifecycle.t @@ -39,7 +39,7 @@ BAIL_OUT "failed to setup test harness: $@" if $@; END { $tck->cleanup if $tck; } -my $xml = $tck->generic_domain("tck")->as_xml; +my $xml = $tck->generic_domain(name => "tck")->as_xml; diag "Defining an inactive domain config"; my $dom; diff --git a/scripts/domain/061-persistent-autostart.t b/scripts/domain/061-persistent-autostart.t index 030515c..5f63270 100644 --- a/scripts/domain/061-persistent-autostart.t +++ b/scripts/domain/061-persistent-autostart.t @@ -39,7 +39,7 @@ BAIL_OUT "failed to setup test harness: $@" if $@; END { $tck->cleanup if $tck; } -my $xml = $tck->generic_domain("tck")->as_xml; +my $xml = $tck->generic_domain(name => "tck")->as_xml; diag "Defining an inactive domain config"; my $dom; diff --git a/scripts/domain/065-persistent-redefine.t b/scripts/domain/065-persistent-redefine.t index af13af2..c743c6a 100644 --- a/scripts/domain/065-persistent-redefine.t +++ b/scripts/domain/065-persistent-redefine.t @@ -38,7 +38,7 @@ BAIL_OUT "failed to setup test harness: $@" if $@; END { $tck->cleanup if $tck; } -my $cfg = $tck->generic_domain("tck")->uuid("11111111-1111-1111-1111-111111111111"); +my $cfg = $tck->generic_domain(name => "tck")->uuid("11111111-1111-1111-1111-111111111111"); $cfg->on_reboot("restart"); my $xml1 = $cfg->as_xml; $cfg->on_reboot("destroy"); diff --git a/scripts/domain/070-transient-to-persistent.t b/scripts/domain/070-transient-to-persistent.t index 6fea959..4ce98b9 100644 --- a/scripts/domain/070-transient-to-persistent.t +++ b/scripts/domain/070-transient-to-persistent.t @@ -39,7 +39,7 @@ BAIL_OUT "failed to setup test harness: $@" if $@; END { $tck->cleanup if $tck; } -my $xml = $tck->generic_domain("tck")->as_xml; +my $xml = $tck->generic_domain(name => "tck")->as_xml; diag "Creating a new transient domain"; my $dom; diff --git a/scripts/domain/080-unique-id-define.t b/scripts/domain/080-unique-id-define.t index 7bf23c3..7b5f2a1 100644 --- a/scripts/domain/080-unique-id-define.t +++ b/scripts/domain/080-unique-id-define.t @@ -54,13 +54,13 @@ my $uuid1 = "11111111-1111-1111-1111-111111111111"; my $uuid2 = "22222222-1111-1111-1111-111111111111"; # The initial config -my $xml = $tck->generic_domain($name1)->uuid($uuid1)->as_xml; +my $xml = $tck->generic_domain(name => $name1)->uuid($uuid1)->as_xml; # One with a different UUID, matching name -my $xml_diffuuid = $tck->generic_domain($name1)->uuid($uuid2)->as_xml; +my $xml_diffuuid = $tck->generic_domain(name => $name1)->uuid($uuid2)->as_xml; # One with a matching UUID, different name -my $xml_diffname = $tck->generic_domain($name2)->uuid($uuid1)->as_xml; +my $xml_diffname = $tck->generic_domain(name => $name2)->uuid($uuid1)->as_xml; # One with a different UUID, different name -my $xml_diffboth = $tck->generic_domain($name2)->uuid($uuid2)->as_xml; +my $xml_diffboth = $tck->generic_domain(name => $name2)->uuid($uuid2)->as_xml; diag "Defining persistent domain config"; diff --git a/scripts/domain/081-unique-id-create.t b/scripts/domain/081-unique-id-create.t index 68f29c7..07143a5 100644 --- a/scripts/domain/081-unique-id-create.t +++ b/scripts/domain/081-unique-id-create.t @@ -54,13 +54,13 @@ my $uuid1 = "11111111-1111-1111-1111-111111111111"; my $uuid2 = "22222222-1111-1111-1111-111111111111"; # The initial config -my $xml = $tck->generic_domain($name1)->uuid($uuid1)->as_xml; +my $xml = $tck->generic_domain(name => $name1)->uuid($uuid1)->as_xml; # One with a different UUID, matching name -my $xml_diffuuid = $tck->generic_domain($name1)->uuid($uuid2)->as_xml; +my $xml_diffuuid = $tck->generic_domain(name => $name1)->uuid($uuid2)->as_xml; # One with a matching UUID, different name -my $xml_diffname = $tck->generic_domain($name2)->uuid($uuid1)->as_xml; +my $xml_diffname = $tck->generic_domain(name => $name2)->uuid($uuid1)->as_xml; # One with a different UUID, different name -my $xml_diffboth = $tck->generic_domain($name2)->uuid($uuid2)->as_xml; +my $xml_diffboth = $tck->generic_domain(name => $name2)->uuid($uuid2)->as_xml; diag "Defining persistent domain config"; my ($dom, $dom1); diff --git a/scripts/domain/082-unique-id-caching.t b/scripts/domain/082-unique-id-caching.t index 5ea13ed..7e0096d 100644 --- a/scripts/domain/082-unique-id-caching.t +++ b/scripts/domain/082-unique-id-caching.t @@ -64,9 +64,9 @@ my $uuid1 = "11111111-1111-1111-1111-111111111111"; my $uuid2 = "22222222-1111-1111-1111-111111111111"; # The initial config -my $xml1 = $tck->generic_domain($name)->uuid($uuid1)->as_xml; +my $xml1 = $tck->generic_domain(name => $name)->uuid($uuid1)->as_xml; # One with a different UUID, matching name -my $xml2 = $tck->generic_domain($name)->uuid($uuid2)->as_xml; +my $xml2 = $tck->generic_domain(name => $name)->uuid($uuid2)->as_xml; diag "Creating & destroying initial guest with $name, $uuid1"; my $dom1; diff --git a/scripts/domain/090-invalid-ops-when-inactive.t b/scripts/domain/090-invalid-ops-when-inactive.t index 38dd744..2daeee5 100644 --- a/scripts/domain/090-invalid-ops-when-inactive.t +++ b/scripts/domain/090-invalid-ops-when-inactive.t @@ -40,7 +40,7 @@ BAIL_OUT "failed to setup test harness: $@" if $@; END { $tck->cleanup if $tck; } -my $xml = $tck->generic_domain("tck")->as_xml; +my $xml = $tck->generic_domain(name => "tck")->as_xml; diag "Creating a new persistent domain"; my $dom; diff --git a/scripts/domain/100-transient-save-restore.t b/scripts/domain/100-transient-save-restore.t index 9860fee..6ab6752 100644 --- a/scripts/domain/100-transient-save-restore.t +++ b/scripts/domain/100-transient-save-restore.t @@ -42,7 +42,7 @@ END { } -my $xml = $tck->generic_domain("tck")->as_xml; +my $xml = $tck->generic_domain(name => "tck")->as_xml; diag "Creating a new transient domain"; my $dom; diff --git a/scripts/domain/101-persistent-save-restore.t b/scripts/domain/101-persistent-save-restore.t index 5423edd..9384c23 100644 --- a/scripts/domain/101-persistent-save-restore.t +++ b/scripts/domain/101-persistent-save-restore.t @@ -42,7 +42,7 @@ END { } -my $xml = $tck->generic_domain("tck")->as_xml; +my $xml = $tck->generic_domain(name => "tck")->as_xml; diag "Creating a new transient domain"; my $dom; diff --git a/scripts/domain/102-broken-save-restore.t b/scripts/domain/102-broken-save-restore.t index a8c5d48..4a05705 100644 --- a/scripts/domain/102-broken-save-restore.t +++ b/scripts/domain/102-broken-save-restore.t @@ -43,7 +43,7 @@ END { } -my $xml = $tck->generic_domain("tck")->as_xml; +my $xml = $tck->generic_domain(name => "tck")->as_xml; diag "Creating a new transient domain"; my $dom; diff --git a/scripts/domain/103-blockdev-save-restore.t b/scripts/domain/103-blockdev-save-restore.t index 70d680c..db73e32 100644 --- a/scripts/domain/103-blockdev-save-restore.t +++ b/scripts/domain/103-blockdev-save-restore.t @@ -42,7 +42,7 @@ END { } -my $xml = $tck->generic_domain("tck")->as_xml; +my $xml = $tck->generic_domain(name => "tck")->as_xml; my $dev = $tck->get_host_block_device(); diff --git a/scripts/domain/120-disks-stats.t b/scripts/domain/120-disks-stats.t index fc18c29..b9d7be1 100644 --- a/scripts/domain/120-disks-stats.t +++ b/scripts/domain/120-disks-stats.t @@ -39,7 +39,7 @@ BAIL_OUT "failed to setup test harness: $@" if $@; END { $tck->cleanup if $tck; } -my $xml = $tck->generic_domain("tck")->as_xml; +my $xml = $tck->generic_domain(name => "tck")->as_xml; diag "Defining an inactive domain config"; my $dom; diff --git a/scripts/domain/121-block-info.t b/scripts/domain/121-block-info.t index 0cf6500..6fa7780 100644 --- a/scripts/domain/121-block-info.t +++ b/scripts/domain/121-block-info.t @@ -85,7 +85,7 @@ my $disktype = "raw"; my $dst = "vda"; my $dst2 = "vdb"; my $dst3 = "vdc"; -my $guest = $tck->generic_domain("tck"); +my $guest = $tck->generic_domain(name => "tck"); $guest->rmdisk(); $guest->disk(format => { name => "qemu", type => $disktype }, type => "file", src => $path, dst => $dst); diff --git a/scripts/domain/130-cpu-hotplug.t b/scripts/domain/130-cpu-hotplug.t index 0ff1fc5..f735e73 100644 --- a/scripts/domain/130-cpu-hotplug.t +++ b/scripts/domain/130-cpu-hotplug.t @@ -41,7 +41,7 @@ BAIL_OUT "failed to setup test harness: $@" if $@; END { $tck->cleanup if $tck; } -my $xml = $tck->generic_domain("tck")->as_xml; +my $xml = $tck->generic_domain(name => "tck")->as_xml; diag "Creating a new transient domain"; diff --git a/scripts/domain/180-interface-parameters.t b/scripts/domain/180-interface-parameters.t index cfe6cdb..d7866c0 100644 --- a/scripts/domain/180-interface-parameters.t +++ b/scripts/domain/180-interface-parameters.t @@ -47,7 +47,7 @@ END { my $live = $conn->is_alive(); ok($live > 0, "Connection is alive"); -my $xml = $tck->generic_domain("tck") +my $xml = $tck->generic_domain(name => "tck") ->interface(type => "network", source => "default", model => "virtio", mac => "52:54:00:22:22:22") ->as_xml; diff --git a/scripts/domain/200-disk-hotplug.t b/scripts/domain/200-disk-hotplug.t index fe12d72..4c54b6b 100644 --- a/scripts/domain/200-disk-hotplug.t +++ b/scripts/domain/200-disk-hotplug.t @@ -41,7 +41,7 @@ END { } -my $xml = $tck->generic_domain("tck")->as_xml; +my $xml = $tck->generic_domain(name => "tck")->as_xml; diag "Creating a new transient domain"; my $dom; diff --git a/scripts/domain/202-numa-set-parameters.t b/scripts/domain/202-numa-set-parameters.t index fd96866..c0baf0b 100644 --- a/scripts/domain/202-numa-set-parameters.t +++ b/scripts/domain/202-numa-set-parameters.t @@ -42,7 +42,7 @@ END { } -my $xml = $tck->generic_domain("tck")->as_xml; +my $xml = $tck->generic_domain(name => "tck")->as_xml; diag "Creating a new persistent domain"; my $dom; diff --git a/scripts/domain/205-disk-hotplug-ordering.t b/scripts/domain/205-disk-hotplug-ordering.t index be0487a..bc4990f 100644 --- a/scripts/domain/205-disk-hotplug-ordering.t +++ b/scripts/domain/205-disk-hotplug-ordering.t @@ -41,7 +41,7 @@ END { } -my $xml = $tck->generic_domain("tck")->as_xml; +my $xml = $tck->generic_domain(name => "tck")->as_xml; diag "Creating a new transient domain"; my $dom; diff --git a/scripts/domain/207-disk-media-change.t b/scripts/domain/207-disk-media-change.t index ad1756d..dfef7c9 100644 --- a/scripts/domain/207-disk-media-change.t +++ b/scripts/domain/207-disk-media-change.t @@ -46,7 +46,7 @@ my $path2 = $tck->create_sparse_disk("207-disk-media-change", "extra2.img", 100) my $xml; eval { - $xml = $tck->generic_domain("tck", "hvm") + $xml = $tck->generic_domain(name => "tck", ostype => "hvm") ->disk(src => $path1, dst => "hdc", type => "file", device => "cdrom") ->as_xml; }; diff --git a/scripts/domain/210-nic-hotplug.t b/scripts/domain/210-nic-hotplug.t index 593a92d..ac9048e 100644 --- a/scripts/domain/210-nic-hotplug.t +++ b/scripts/domain/210-nic-hotplug.t @@ -41,7 +41,7 @@ END { } -my $xml = $tck->generic_domain("tck")->as_xml; +my $xml = $tck->generic_domain(name => "tck")->as_xml; diag "Creating a new transient domain"; my $dom; diff --git a/scripts/domain/215-nic-hotplug-many.t b/scripts/domain/215-nic-hotplug-many.t index 5b935cc..0270054 100644 --- a/scripts/domain/215-nic-hotplug-many.t +++ b/scripts/domain/215-nic-hotplug-many.t @@ -41,7 +41,7 @@ END { } -my $xml = $tck->generic_domain("tck")->as_xml; +my $xml = $tck->generic_domain(name => "tck")->as_xml; diag "Creating a new transient domain"; my $dom; diff --git a/scripts/domain/240-usb-host-hotplug.t b/scripts/domain/240-usb-host-hotplug.t index 6e74434..a840298 100644 --- a/scripts/domain/240-usb-host-hotplug.t +++ b/scripts/domain/240-usb-host-hotplug.t @@ -43,7 +43,7 @@ END { } -my $xml = $tck->generic_domain("tck")->as_xml; +my $xml = $tck->generic_domain(name => "tck")->as_xml; diag "Creating a new transient domain"; my $dom; diff --git a/scripts/domain/250-pci-host-hotplug.t b/scripts/domain/250-pci-host-hotplug.t index a9fe422..4579477 100644 --- a/scripts/domain/250-pci-host-hotplug.t +++ b/scripts/domain/250-pci-host-hotplug.t @@ -47,7 +47,7 @@ END { } -my $xml = $tck->generic_domain("tck")->as_xml; +my $xml = $tck->generic_domain(name => "tck")->as_xml; diag "Creating a new transient domain"; my $dom; diff --git a/scripts/domain/300-migration.t b/scripts/domain/300-migration.t index 9cbdd8f..4e91668 100644 --- a/scripts/domain/300-migration.t +++ b/scripts/domain/300-migration.t @@ -100,7 +100,7 @@ my ($conn, $otherconn) = eval { $tck->setup(dualhost => 1); }; BAIL_OUT "failed to setup test harness: $@" if $@; END { $tck->cleanup if $tck; } -my $xml = $tck->generic_domain("tck")->uuid("050072e8-7bce-3515-992a-8431d74f371f")->as_xml; +my $xml = $tck->generic_domain(name => "tck")->uuid("050072e8-7bce-3515-992a-8431d74f371f")->as_xml; use Sys::Virt::Domain; use IO::File; diff --git a/scripts/domain/301-migration-max-speed.t b/scripts/domain/301-migration-max-speed.t index cd029c2..6aac931 100644 --- a/scripts/domain/301-migration-max-speed.t +++ b/scripts/domain/301-migration-max-speed.t @@ -42,7 +42,7 @@ END { $tck->cleanup if $tck; } -my $xml = $tck->generic_domain("tck")->as_xml; +my $xml = $tck->generic_domain(name => "tck")->as_xml; my $dom; ok_domain(sub { $dom = $conn->create_domain($xml) }, "Create domain"); diff --git a/scripts/hooks/052-domain-hook.t b/scripts/hooks/052-domain-hook.t index 90b8a48..294b30d 100644 --- a/scripts/hooks/052-domain-hook.t +++ b/scripts/hooks/052-domain-hook.t @@ -49,7 +49,7 @@ SKIP: { skip 12, "Not using QEMU/LXC driver" unless $uri eq "qemu:///system" or $uri eq "lxc:///"; - my $xml = $tck->generic_domain("tck")->as_xml; + my $xml = $tck->generic_domain(name => "tck")->as_xml; diag "Creating a new persistent domain"; my $dom; diff --git a/scripts/qemu/100-disk-encryption.t b/scripts/qemu/100-disk-encryption.t index 5fb6fc8..8a0fd5e 100644 --- a/scripts/qemu/100-disk-encryption.t +++ b/scripts/qemu/100-disk-encryption.t @@ -84,7 +84,7 @@ my $vol; diag "Creating volume $volXML"; lives_ok(sub { $vol = $pool->create_volume($volXML) }, "volume created"); -my $xml = $tck->generic_domain("tck") +my $xml = $tck->generic_domain(name => "tck") ->disk(format => { name => "qemu", type => "qcow2" }, secret => $secretUUID, type => "file", diff --git a/scripts/qemu/200-qcow2-single-backing-file.t b/scripts/qemu/200-qcow2-single-backing-file.t index 1cc665f..28d27c2 100644 --- a/scripts/qemu/200-qcow2-single-backing-file.t +++ b/scripts/qemu/200-qcow2-single-backing-file.t @@ -107,7 +107,7 @@ SKIP: { # We point the guest at a qcow2 image, but tell it that is # is raw. Thus *nothing* should ever try to open the backing # store in this qcow2 image. - $xml = $tck->generic_domain("tck") + $xml = $tck->generic_domain(name => "tck") ->disk(format => { name => "qemu", type => "raw" }, type => "file", src => $pathmain, diff --git a/scripts/qemu/205-qcow2-double-backing-file.t b/scripts/qemu/205-qcow2-double-backing-file.t index ad54c7c..485b6f7 100644 --- a/scripts/qemu/205-qcow2-double-backing-file.t +++ b/scripts/qemu/205-qcow2-double-backing-file.t @@ -132,7 +132,7 @@ SKIP: { # We point the guest at a qcow2 image, but tell it that is # is raw. Thus *nothing* should ever try to open the backing # store in this qcow2 image. - $xml = $tck->generic_domain("tck") + $xml = $tck->generic_domain(name => "tck") ->disk(format => { name => "qemu", type => "qcow2" }, type => "file", src => $pathmain, diff --git a/scripts/qemu/210-qcow2-auto-probing.t b/scripts/qemu/210-qcow2-auto-probing.t index bf3de32..5ed4761 100644 --- a/scripts/qemu/210-qcow2-auto-probing.t +++ b/scripts/qemu/210-qcow2-auto-probing.t @@ -129,7 +129,7 @@ SKIP: { # We point the guest at a qcow2 image, but tell it that is # is raw. Thus *nothing* should ever try to open the backing # store in this qcow2 image. - $xml = $tck->generic_domain("tck") + $xml = $tck->generic_domain(name => "tck") ->disk(type => "file", src => $pathmain, dst => "vdb") diff --git a/scripts/qemu/400-save-image-xml.t b/scripts/qemu/400-save-image-xml.t index df87666..e7b96b7 100644 --- a/scripts/qemu/400-save-image-xml.t +++ b/scripts/qemu/400-save-image-xml.t @@ -47,7 +47,7 @@ SKIP:{ skip "Only relevant to QEMU driver", 10 unless $conn->get_type() eq "QEMU"; # scenario 1 - get/define xml from transient domain save image - my $xml = $tck->generic_domain("tck")->as_xml; + my $xml = $tck->generic_domain(name => "tck")->as_xml; diag "Creating a new transient domain"; my $dom; ok_domain(sub { $dom = $conn->create_domain($xml) }, "created transient domain object"); diff --git a/scripts/selinux/050-dynamic-relabel-yes.t b/scripts/selinux/050-dynamic-relabel-yes.t index 6a75f92..2fb6866 100644 --- a/scripts/selinux/050-dynamic-relabel-yes.t +++ b/scripts/selinux/050-dynamic-relabel-yes.t @@ -51,7 +51,7 @@ SKIP: { my $origlabel = selinux_restore_file_context($disk); diag "Original $origlabel"; - my $xml = $tck->generic_domain("tck") + my $xml = $tck->generic_domain(name => "tck") ->seclabel(model => "selinux", type => "dynamic", relabel => "yes") ->disk(src => $disk, dst => "vdb", type => "file") ->as_xml; diff --git a/scripts/selinux/055-dynamic-base-label.t b/scripts/selinux/055-dynamic-base-label.t index 271c2e9..ba07c09 100644 --- a/scripts/selinux/055-dynamic-base-label.t +++ b/scripts/selinux/055-dynamic-base-label.t @@ -51,7 +51,7 @@ SKIP: { my $origlabel = selinux_restore_file_context($disk); - my $xml = $tck->generic_domain("tck") + my $xml = $tck->generic_domain(name => "tck") ->seclabel(model => "selinux", type => "dynamic", relabel => "yes", baselabel => $SELINUX_OTHER_CONTEXT) ->disk(src => $disk, dst => "vdb", type => "file") ->as_xml; diff --git a/scripts/selinux/100-static-relabel-no.t b/scripts/selinux/100-static-relabel-no.t index 30db172..36eae47 100644 --- a/scripts/selinux/100-static-relabel-no.t +++ b/scripts/selinux/100-static-relabel-no.t @@ -53,7 +53,7 @@ SKIP: { selinux_set_file_context($disk, $origimagelabel); - my $xml = $tck->generic_domain("tck") + my $xml = $tck->generic_domain(name => "tck") ->seclabel(model => "selinux", type => "static", relabel => "no", label => $origdomainlabel) ->disk(src => $disk, dst => "vdb", type => "file") ->as_xml; diff --git a/scripts/selinux/105-static-relabel-fail.t b/scripts/selinux/105-static-relabel-fail.t index 08ef429..20b576e 100644 --- a/scripts/selinux/105-static-relabel-fail.t +++ b/scripts/selinux/105-static-relabel-fail.t @@ -53,7 +53,7 @@ SKIP: { my $origdomainlabel = $SELINUX_DOMAIN_CONTEXT . $origmcs; my $origimagelabel = selinux_restore_file_context($disk); - my $xml = $tck->generic_domain("tck") + my $xml = $tck->generic_domain(name => "tck") ->seclabel(model => "selinux", type => "static", relabel => "no", label => $origdomainlabel) ->disk(src => $disk, dst => "vdb", type => "file") ->as_xml; diff --git a/scripts/selinux/110-static-relabel-yes.t b/scripts/selinux/110-static-relabel-yes.t index deba314..dc4e1ec 100644 --- a/scripts/selinux/110-static-relabel-yes.t +++ b/scripts/selinux/110-static-relabel-yes.t @@ -52,7 +52,7 @@ SKIP: { my $origdomainlabel = $SELINUX_DOMAIN_CONTEXT . $origmcs; my $origimagelabel = selinux_restore_file_context($disk); - my $xml = $tck->generic_domain("tck") + my $xml = $tck->generic_domain(name => "tck") ->seclabel(model => "selinux", type => "static", relabel => "yes", label => $origdomainlabel) ->disk(src => $disk, dst => "vdb", type => "file") ->as_xml; -- 1.8.5.3

2 1

[libvirt] [PATCH] Do not truncate output of nwfilter2vmtest.sh
by Daniel P. Berrange 27 Mar '14

27 Mar '14

When printing test results, nwfilter2vmtest.sh, truncates the output at 66 or 70 characters. This is very unhelpful when debugging problems where you want to see the full output Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- scripts/nwfilter/nwfilter2vmtest.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/nwfilter/nwfilter2vmtest.sh b/scripts/nwfilter/nwfilter2vmtest.sh index f44f299..a68c771 100644 --- a/scripts/nwfilter/nwfilter2vmtest.sh +++ b/scripts/nwfilter/nwfilter2vmtest.sh @@ -68,7 +68,7 @@ EOF tap_fail() { - txt=$(echo "$2" | gawk '{print substr($0,1,66)}') + txt=$(echo "$2") echo "not ok $1 - ${txt}" TAP_FAIL_LIST="$TAP_FAIL_LIST $1 " TAP_FAIL_CTR=$(($TAP_FAIL_CTR + 1)) @@ -76,7 +76,7 @@ tap_fail() { } tap_pass() { - txt=$(echo "$2" | gawk '{print substr($0,1,70)}') + txt=$(echo "$2") echo "ok $1 - ${txt}" TAP_TOT_CTR=$(($TAP_TOT_CTR + 1)) } -- 1.8.5.3

3 4

[libvirt] [PATCH] Added example script on how to convert LXC container config
by Cédric Bosdonnat 27 Mar '14

27 Mar '14

--- Makefile.am | 2 +- configure.ac | 1 + examples/lxcconvert/Makefile.am | 19 ++++++++++ examples/lxcconvert/virt-lxc-convert | 67 ++++++++++++++++++++++++++++++++++++ 4 files changed, 88 insertions(+), 1 deletion(-) create mode 100644 examples/lxcconvert/Makefile.am create mode 100644 examples/lxcconvert/virt-lxc-convert diff --git a/Makefile.am b/Makefile.am index 9847ff0..0ef983f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -23,7 +23,7 @@ SUBDIRS = . gnulib/lib include src daemon tools docs gnulib/tests \ tests po examples/object-events examples/hellolibvirt \ examples/dominfo examples/domsuspend examples/apparmor \ examples/xml/nwfilter examples/openauth examples/systemtap \ - tools/wireshark + examples/lxcconvert tools/wireshark ACLOCAL_AMFLAGS = -I m4 diff --git a/configure.ac b/configure.ac index 62b74c5..f970de0 100644 --- a/configure.ac +++ b/configure.ac @@ -2695,6 +2695,7 @@ AC_CONFIG_FILES([\ examples/hellolibvirt/Makefile \ examples/systemtap/Makefile \ examples/xml/nwfilter/Makefile \ + examples/lxcconvert/Makefile \ tools/wireshark/Makefile \ tools/wireshark/src/Makefile]) AC_OUTPUT diff --git a/examples/lxcconvert/Makefile.am b/examples/lxcconvert/Makefile.am new file mode 100644 index 0000000..c5ae537 --- /dev/null +++ b/examples/lxcconvert/Makefile.am @@ -0,0 +1,19 @@ +## Copyright (C) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +## +## 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, see +## <http://www.gnu.org/licenses/>. + +EXTRA_DIST= \ + virt-lxc-convert + diff --git a/examples/lxcconvert/virt-lxc-convert b/examples/lxcconvert/virt-lxc-convert new file mode 100644 index 0000000..ea32ff4 --- /dev/null +++ b/examples/lxcconvert/virt-lxc-convert @@ -0,0 +1,67 @@ +#!/usr/bin/env sh + +function show_help() +{ + cat << EOF +$0 /path/to/lxc/config/file + +Wrapper around virsh domxml-from-native to ease conversion of LXC +containers configuration to libvirt domain XML. +EOF +} + +if test "$#" != 1; then + show_help + exit 1 +fi + +conf=$1 + + +conf_new=/tmp/config-$$ +domain_new=/tmp/config-$$.xml + +cp $conf $conf_new + +# Do we have lxc.mount, and is it pointing to a readable file? +fstab=`grep 'lxc.mount[[:space:]]*=' $conf_new | sed -e 's/[[:space:]]\+=[[:space:]]\+/=/' | cut -f 2 -d '='` +if test $ -n "$fstab" $ -a $ -r "$fstab" $; then + sed -i -e 's/^lxc.mount[[:space:]]*=.*$//' $conf_new + sed -e 's/^$[^#]$/lxc.mount.entry = \1/' $fstab | cat $conf_new - >${conf_new}.tmp + mv ${conf_new}.tmp $conf_new +fi + +memory=`free | grep 'Mem:' | sed -e 's: \+: :g' | cut -f 2 -d ' '` +default_tmpfs="size=$((memory/2))" + +# Do we have tmpfs without size param? +grep -e 'lxc.mount.entry[[:space:]]*=[[:space:]]*tmpfs[[:space:]]' $conf_new | while read line; do + has_size=`echo $line | grep -v -e 'size='` + # Add the default size here (50%) if no size is given + if test -n "$has_size"; then + sed -i -e "\;$line;s/$[[:space:]]\+[0-9][[:space:]]\+[0-9][::space::]*$$/,$default_tmpfs\1/" $conf_new + fi + # Convert relative sizes + has_rel_size=`echo $line | grep -e 'size=[0-9]\+%'` + if test -n "$has_rel_size"; then + percent=`echo "$line" | sed -e 's:size=$[0-9]\+$%:\n\1%\n:' | grep '\%' | sed -e 's/%//'` + size="$((memory*percent/100))" + sed -i -e "\;$line;s/size=[0-9]\+%/size=${size}/" $conf_new + fi +done + +# Do we have any memory limit set? +mem_limit=`grep 'lxc.cgroup.memory.limit_in_bytes[[:space:]]*=' $conf_new` +if test -z "$mem_limit"; then + sed -i -e "1s:^:lxc.cgroup.memory.limit_in_bytes = $memory\n:" $conf_new +fi + +virsh -c lxc:/// domxml-from-native lxc-tools $conf_new >$domain_new + +cat $domain_new + +# Remove the temporary config +rm $conf_new +rm $domain_new + +exit 0 -- 1.9.0

3 2

[libvirt] [PATCH tck] Avoid assumptions about selinux contexts
by Daniel P. Berrange 27 Mar '14

27 Mar '14

The current SELinux tests assume a context system_u:system_r or system_u:object_r, which is not true if running against a libvirtd from the source tree. --- lib/Sys/Virt/TCK/SELinux.pm | 30 +++++++++++++++++++++++++++--- scripts/selinux/050-dynamic-relabel-yes.t | 10 ++++++---- scripts/selinux/055-dynamic-base-label.t | 10 ++++++---- scripts/selinux/100-static-relabel-no.t | 2 +- scripts/selinux/110-static-relabel-yes.t | 11 +++++++---- 5 files changed, 47 insertions(+), 16 deletions(-) diff --git a/lib/Sys/Virt/TCK/SELinux.pm b/lib/Sys/Virt/TCK/SELinux.pm index 9f7c0c1..c117fca 100644 --- a/lib/Sys/Virt/TCK/SELinux.pm +++ b/lib/Sys/Virt/TCK/SELinux.pm @@ -18,19 +18,43 @@ use warnings; use base qw(Exporter); use vars qw($SELINUX_GENERIC_CONTEXT $SELINUX_DOMAIN_CONTEXT - $SELINUX_IMAGE_CONTEXT $SELINUX_OTHER_CONTEXT); + $SELINUX_IMAGE_CONTEXT $SELINUX_OTHER_CONTEXT + $SELINUX_GENERIC_TYPE $SELINUX_DOMAIN_TYPE + $SELINUX_IMAGE_TYPE $SELINUX_OTHER_TYPE); our @EXPORT = qw(selinux_get_file_context selinux_set_file_context selinux_restore_file_context + selinux_get_type + selinux_get_mcs $SELINUX_GENERIC_CONTEXT $SELINUX_DOMAIN_CONTEXT - $SELINUX_IMAGE_CONTEXT $SELINUX_OTHER_CONTEXT); + $SELINUX_IMAGE_CONTEXT $SELINUX_OTHER_CONTEXT + $SELINUX_GENERIC_TYPE $SELINUX_DOMAIN_TYPE + $SELINUX_IMAGE_TYPE $SELINUX_OTHER_TYPE); -$SELINUX_OTHER_CONTEXT = "system_u:object_r:virt_t:s0"; +$SELINUX_OTHER_TYPE = "svirt_tcg_t"; +$SELINUX_GENERIC_TYPE = "virt_image_t"; +$SELINUX_DOMAIN_TYPE = "svirt_t"; +$SELINUX_IMAGE_TYPE = "svirt_image_t"; + +$SELINUX_OTHER_CONTEXT = "system_u:system_r:svirt_tcg_t:s0"; $SELINUX_GENERIC_CONTEXT = "system_u:object_r:virt_image_t:s0"; $SELINUX_DOMAIN_CONTEXT = "system_u:system_r:svirt_t:s0"; $SELINUX_IMAGE_CONTEXT = "system_u:object_r:svirt_image_t:s0"; +sub selinux_get_type { + my $context = shift; + + my @bits = split /:/, $context; + return $bits[2]; +} + +sub selinux_get_mcs { + my $context = shift; + + my @bits = split /:/, $context; + return $bits[4]; +} sub selinux_get_file_context { my $path = shift; diff --git a/scripts/selinux/050-dynamic-relabel-yes.t b/scripts/selinux/050-dynamic-relabel-yes.t index 2fb6866..5a53b9d 100644 --- a/scripts/selinux/050-dynamic-relabel-yes.t +++ b/scripts/selinux/050-dynamic-relabel-yes.t @@ -64,12 +64,14 @@ SKIP: { diag "domainlabel $domainlabel"; my $imagelabel = xpath($dom, "string(/domain/seclabel/imagelabel)"); diag "imagelabel $imagelabel"; + my $domaintype = selinux_get_type($domainlabel); + my $imagetype = selinux_get_type($imagelabel); - is(index($domainlabel, $SELINUX_DOMAIN_CONTEXT), 0, "dynamic domain label prefix is $SELINUX_DOMAIN_CONTEXT"); - is(index($imagelabel, $SELINUX_IMAGE_CONTEXT), 0, "dynamic image label prefix is $SELINUX_IMAGE_CONTEXT"); + is($domaintype, $SELINUX_DOMAIN_TYPE, "dynamic domain label type is $SELINUX_DOMAIN_TYPE"); + is($imagetype, $SELINUX_IMAGE_TYPE, "dynamic image label type is $SELINUX_IMAGE_TYPE"); - my $domainmcs = substr $domainlabel, length($SELINUX_DOMAIN_CONTEXT); - my $imagemcs = substr $imagelabel, length($SELINUX_IMAGE_CONTEXT); + my $domainmcs = selinux_get_mcs($domainlabel); + my $imagemcs = selinux_get_mcs($imagelabel); is($domainmcs, $imagemcs, "Domain MCS $domainmcs == Image MCS $imagemcs"); diff --git a/scripts/selinux/055-dynamic-base-label.t b/scripts/selinux/055-dynamic-base-label.t index ba07c09..646c50d 100644 --- a/scripts/selinux/055-dynamic-base-label.t +++ b/scripts/selinux/055-dynamic-base-label.t @@ -64,12 +64,14 @@ SKIP: { diag "domainlabel $domainlabel"; my $imagelabel = xpath($dom, "string(/domain/seclabel/imagelabel)"); diag "imagelabel $imagelabel"; + my $domaintype = selinux_get_type($domainlabel); + my $imagetype = selinux_get_type($imagelabel); - is(index($domainlabel, $SELINUX_OTHER_CONTEXT), 0, "dynamic domain label prefix is $SELINUX_OTHER_CONTEXT"); - is(index($imagelabel, $SELINUX_IMAGE_CONTEXT), 0, "dynamic image label prefix is $SELINUX_IMAGE_CONTEXT"); + is($domaintype, $SELINUX_OTHER_TYPE, "dynamic domain label type is $SELINUX_OTHER_TYPE"); + is($imagetype, $SELINUX_IMAGE_TYPE, "dynamic image label type is $SELINUX_IMAGE_TYPE"); - my $domainmcs = substr $domainlabel, length($SELINUX_OTHER_CONTEXT); - my $imagemcs = substr $imagelabel, length($SELINUX_IMAGE_CONTEXT); + my $domainmcs = selinux_get_mcs($domainlabel); + my $imagemcs = selinux_get_mcs($imagelabel); is($domainmcs, $imagemcs, "Domain MCS $domainmcs == Image MCS $imagemcs"); diff --git a/scripts/selinux/100-static-relabel-no.t b/scripts/selinux/100-static-relabel-no.t index 36eae47..8d9fda8 100644 --- a/scripts/selinux/100-static-relabel-no.t +++ b/scripts/selinux/100-static-relabel-no.t @@ -51,8 +51,8 @@ SKIP: { my $origdomainlabel = $SELINUX_DOMAIN_CONTEXT . $origmcs; my $origimagelabel = $SELINUX_IMAGE_CONTEXT . $origmcs; + diag "Setting image '$disk' to '$origimagelabel'"; selinux_set_file_context($disk, $origimagelabel); - my $xml = $tck->generic_domain(name => "tck") ->seclabel(model => "selinux", type => "static", relabel => "no", label => $origdomainlabel) ->disk(src => $disk, dst => "vdb", type => "file") diff --git a/scripts/selinux/110-static-relabel-yes.t b/scripts/selinux/110-static-relabel-yes.t index dc4e1ec..f558cc9 100644 --- a/scripts/selinux/110-static-relabel-yes.t +++ b/scripts/selinux/110-static-relabel-yes.t @@ -28,7 +28,7 @@ and files can be relabelled use strict; use warnings; -use Test::More tests => 5; +use Test::More tests => 6; use Sys::Virt::TCK; use Sys::Virt::TCK::SELinux; @@ -48,8 +48,8 @@ SKIP: { my $disk = $tck->create_sparse_disk("selinux", "tck", 50); - my $origmcs = ":c1,c2"; - my $origdomainlabel = $SELINUX_DOMAIN_CONTEXT . $origmcs; + my $origmcs = "c1,c2"; + my $origdomainlabel = $SELINUX_DOMAIN_CONTEXT . ":" . $origmcs; my $origimagelabel = selinux_restore_file_context($disk); my $xml = $tck->generic_domain(name => "tck") @@ -66,9 +66,12 @@ SKIP: { diag "domainlabel $domainlabel"; my $imagelabel = xpath($dom, "string(/domain/seclabel/imagelabel)"); diag "imagelabel $imagelabel"; + my $imagetype = selinux_get_type($imagelabel); + my $imagemcs = selinux_get_mcs($imagelabel); is($origdomainlabel, $domainlabel, "static label is $domainlabel"); - is($imagelabel, $SELINUX_IMAGE_CONTEXT . $origmcs, "image label is $SELINUX_DOMAIN_CONTEXT$origmcs"); + is($imagetype, $SELINUX_IMAGE_TYPE, "image label type is $SELINUX_DOMAIN_TYPE"); + is($imagemcs, $origmcs, "image label mcs is $origmcs"); is(selinux_get_file_context($disk), $imagelabel, "$disk label is $imagelabel"); -- 1.8.5.3

1 0

[libvirt] Crash when using python-libvirt setSchedulerParameters
by Brian Rak 27 Mar '14

27 Mar '14

I'm seeing a very weird (and somewhat reproducable) crash in setSchedulerParameters. The backtrace looks like this: *** glibc detected *** python2.7: free(): invalid pointer: 0x000000000152bc48 *** ======= Backtrace: ========= /lib64/libc.so.6(+0x76166)[0x7faa9e991166] /usr/lib64/python2.7/site-packages/libvirtmod.so(virFree+0x29)[0x7faa9887bfe9] /lib/libvirt.so.0(virTypedParamsClear+0x54)[0x7faa98342fe4] /lib/libvirt.so.0(virTypedParamsFree+0x1e)[0x7faa9834302e] /usr/lib64/python2.7/site-packages/libvirtmod.so(+0x1b4dc)[0x7faa9886c4dc] /usr/lib64/libpython2.7.so.1.0(PyEval_EvalFrameEx+0x5629)[0x7faa9f63a129] /usr/lib64/libpython2.7.so.1.0(PyEval_EvalFrameEx+0x68e8)[0x7faa9f63b3e8] /usr/lib64/libpython2.7.so.1.0(PyEval_EvalCodeEx+0x8ae)[0x7faa9f63bd5e] /usr/lib64/libpython2.7.so.1.0(PyEval_EvalCode+0x32)[0x7faa9f63be72] /usr/lib64/libpython2.7.so.1.0(+0xff25c)[0x7faa9f65625c] /usr/lib64/libpython2.7.so.1.0(PyRun_FileExFlags+0x90)[0x7faa9f656330] /usr/lib64/libpython2.7.so.1.0(PyRun_SimpleFileExFlags+0xef)[0x7faa9f6578cf] /usr/lib64/libpython2.7.so.1.0(Py_Main+0xc56)[0x7faa9f6693f6] /lib64/libc.so.6(__libc_start_main+0xfd)[0x7faa9e939d1d] python2.7[0x400649] I am using: Python2.7 Python-Libvirt 1.2.2 with the "[PATCH libvirt-python 1/2] setPyVirTypedParameter: Copy full field name" patch. Libvirt 1.2.1 A quick example: import libvirt for i in range(0,40): conn = libvirt.open(None) for domid in conn.listDomainsID(): dom = conn.lookupByID(domid) print dom.name() params = {} params['vcpu_period'] = 50000 params['vcpu_quota'] = 100000 dom.setSchedulerParameters(params) This will crash frequently (over 80% of the time), but not all the time. Interestingly, if I add 'dom = None' before 'conn = libvirt.open(None)', the crashes seem to stop. This is just a simple test case from my actual application though, so applying that workaround may be tough (and it seems like it shouldn't crash, even without that.

2 5

[libvirt] [PATCH v2] Fix apparmor profile to make vfio pci passthrough work
by Cédric Bosdonnat 27 Mar '14

27 Mar '14

See lp#1276719 for the bug description. As virt-aa-helper doesn't know the VFIO groups to use for the guest, allow access to all /dev/vfio/[0-9]* and /dev/vfio/vfio files if there is a potential need for vfio --- examples/apparmor/libvirt-qemu | 1 + examples/apparmor/usr.sbin.libvirtd | 3 +++ src/security/virt-aa-helper.c | 12 ++++++++++++ 3 files changed, 16 insertions(+) diff --git a/examples/apparmor/libvirt-qemu b/examples/apparmor/libvirt-qemu index e1980b7..83814ec 100644 --- a/examples/apparmor/libvirt-qemu +++ b/examples/apparmor/libvirt-qemu @@ -110,6 +110,7 @@ /usr/bin/qemu-sparc32plus rmix, /usr/bin/qemu-sparc64 rmix, /usr/bin/qemu-x86_64 rmix, + /usr/lib/qemu/block-curl.so mr, # for save and resume /bin/dash rmix, diff --git a/examples/apparmor/usr.sbin.libvirtd b/examples/apparmor/usr.sbin.libvirtd index fd6def1..3011eff 100644 --- a/examples/apparmor/usr.sbin.libvirtd +++ b/examples/apparmor/usr.sbin.libvirtd @@ -25,6 +25,9 @@ capability fsetid, capability audit_write, + # Needed for vfio + capability sys_resource, + network inet stream, network inet dgram, network inet6 stream, diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c index 59de517..998dc53 100644 --- a/src/security/virt-aa-helper.c +++ b/src/security/virt-aa-helper.c @@ -927,6 +927,7 @@ get_files(vahControl * ctl) size_t i; char *uuid; char uuidstr[VIR_UUID_STRING_BUFLEN]; + bool needsVfio = false; /* verify uuid is same as what we were given on the command line */ virUUIDFormat(ctl->def->uuid, uuidstr); @@ -1068,6 +1069,12 @@ get_files(vahControl * ctl) dev->source.subsys.u.pci.addr.slot, dev->source.subsys.u.pci.addr.function); + virDomainHostdevSubsysPciBackendType backend = dev->source.subsys.u.pci.backend; + if (backend == VIR_DOMAIN_HOSTDEV_PCI_BACKEND_VFIO || + backend == VIR_DOMAIN_HOSTDEV_PCI_BACKEND_DEFAULT) { + needsVfio = true; + } + if (pci == NULL) continue; @@ -1096,6 +1103,11 @@ get_files(vahControl * ctl) } } + if (needsVfio) { + virBufferAsprintf(&buf, " /dev/vfio/vfio rw,\n"); + virBufferAsprintf(&buf, " /dev/vfio/[0-9]* rw,\n"); + } + if (ctl->newfile) if (vah_add_file(&buf, ctl->newfile, "rw") != 0) goto cleanup; -- 1.9.0

4 4

[libvirt] [PATCH 0/2] apparmor fixes
by Cédric Bosdonnat 27 Mar '14

27 Mar '14

Fixes a regression I brough in virt-aa-helper with the lxc apparmor profiles. And makes vfio work even with apparmor enforced on libvirtd Cédric Bosdonnat (2): Fixed regression in apparmor profiles for qemu brought by 43c030f Fix apparmor profile to make vfio pci passthrough work examples/apparmor/libvirt-qemu | 5 +++++ examples/apparmor/usr.sbin.libvirtd | 3 +++ src/security/virt-aa-helper.c | 4 +++- 3 files changed, 11 insertions(+), 1 deletion(-) -- 1.9.0

4 5

[libvirt] is there a way to convert vm's filter into comandline
by bigclouds 27 Mar '14

27 Mar '14

hi,all is there a way to convert vm's filter into comandline, i think it is useful. if there is the functionality, so you think it is worthy to be done. thanks

5 8

[libvirt] VM host name
by Vikas Kokare 27 Mar '14

27 Mar '14

Is there a way using LibVirt (java) API to find out the DNS host name of a virtual machine, if already configured? -Vikas

1 0

[libvirt] [PATCH 0/3] ABI change: change group name of option table to match with option name
by Amos Kong 27 Mar '14

27 Mar '14

This patchset changes group names of option tables to match with option name, this breakes ABI, release note was updated. Amos Kong (3): only add qemu_tpmdev_opts when CONFIG_TPM is defined abort QEMU if group name in option table doesn't match with defined option name update names in option tables to match with actual command-line spelling hw/acpi/core.c | 8 ++++---- hw/nvram/fw_cfg.c | 4 ++-- include/qemu/option.h | 2 +- qemu-options.h | 12 ++++++++++++ util/qemu-config.c | 28 ++++++++++++++++++++++++++++ vl.c | 37 +++++++++++++------------------------ 6 files changed, 60 insertions(+), 31 deletions(-) -- 1.8.5.3

2 5

[libvirt] [PATCHv3] Fix Memory Leak in virQEMUCapsInitGuestFromBinary()
by Nehal J Wani 27 Mar '14

27 Mar '14

While running qemucaps2xmltest, it was found that valgrind pointed out the following memory leaks: ==29896== 0 bytes in 1 blocks are definitely lost in loss record 1 of 65 ==29896== at 0x4A0577B: calloc (vg_replace_malloc.c:593) ==29896== by 0x4C6B45E: virAllocN (viralloc.c:191) ==29896== by 0x4232A9: virQEMUCapsGetMachineTypesCaps (qemu_capabilities.c:1999) ==29896== by 0x4234E7: virQEMUCapsInitGuestFromBinary (qemu_capabilities.c:789) ==29896== by 0x41F10B: testQemuCapsXML (qemucaps2xmltest.c:118) ==29896== by 0x41FFD1: virtTestRun (testutils.c:201) ==29896== by 0x41EE7A: mymain (qemucaps2xmltest.c:203) ==29896== by 0x42074D: virtTestMain (testutils.c:789) ==29896== by 0x3E6CE1ED1C: (below main) (libc-start.c:226) ==29896== ==29896== 0 bytes in 1 blocks are definitely lost in loss record 2 of 65 ==29896== at 0x4A0577B: calloc (vg_replace_malloc.c:593) ==29896== by 0x4C6B45E: virAllocN (viralloc.c:191) ==29896== by 0x4232A9: virQEMUCapsGetMachineTypesCaps (qemu_capabilities.c:1999) ==29896== by 0x4234E7: virQEMUCapsInitGuestFromBinary (qemu_capabilities.c:789) ==29896== by 0x41F10B: testQemuCapsXML (qemucaps2xmltest.c:118) ==29896== by 0x41FFD1: virtTestRun (testutils.c:201) ==29896== by 0x41EEA3: mymain (qemucaps2xmltest.c:204) ==29896== by 0x42074D: virtTestMain (testutils.c:789) ==29896== by 0x3E6CE1ED1C: (below main) (libc-start.c:226) --- Based on Daniel's comments. v2: https://www.redhat.com/archives/libvir-list/2014-March/msg01672.html v1: https://www.redhat.com/archives/libvir-list/2014-March/msg01667.html src/qemu/qemu_capabilities.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 7673592..e4c1cbd 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -1996,10 +1996,12 @@ int virQEMUCapsGetMachineTypesCaps(virQEMUCapsPtr qemuCaps, *nmachines = 0; *machines = NULL; - if (VIR_ALLOC_N(*machines, qemuCaps->nmachineTypes) < 0) - goto error; *nmachines = qemuCaps->nmachineTypes; + if (*nmachines && + VIR_ALLOC_N(*machines, qemuCaps->nmachineTypes) < 0) + goto error; + for (i = 0; i < qemuCaps->nmachineTypes; i++) { virCapsGuestMachinePtr mach; if (VIR_ALLOC(mach) < 0) -- 1.7.1

2 2

[libvirt] [PATCH] util: fix a typo in virprocess.c
by Hongwei Bi 27 Mar '14

27 Mar '14

s/forcably/forcibly Signed-off-by: Hongwei Bi <hwbi2008(a)gmail.com> --- src/util/virprocess.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/virprocess.c b/src/util/virprocess.c index 405ad06..9179d73 100644 --- a/src/util/virprocess.c +++ b/src/util/virprocess.c @@ -283,7 +283,7 @@ int virProcessKill(pid_t pid, int sig) * Try to kill the process and verify it has exited * * Returns 0 if it was killed gracefully, 1 if it - * was killed forcably, -1 if it is still alive, + * was killed forcibly, -1 if it is still alive, * or another error occurred. */ int -- 1.7.9.5

2 1

[libvirt] [PATCH] Modify help information of virsh list command
by Li Yang 27 Mar '14

27 Mar '14

Use 'virsh list domain --title' option can get domain's title, not description, the original help information 'show short domain description' will confuse users, so modify it to 'show domain title' Signed-off-by: Li Yang <liyang.fnst(a)cn.fujitsu.com> --- tools/virsh-domain-monitor.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/virsh-domain-monitor.c b/tools/virsh-domain-monitor.c index de4afbb..5d19388 100644 --- a/tools/virsh-domain-monitor.c +++ b/tools/virsh-domain-monitor.c @@ -1753,7 +1753,7 @@ static const vshCmdOptDef opts_list[] = { }, {.name = "title", .type = VSH_OT_BOOL, - .help = N_("show short domain description") + .help = N_("show domain title") }, {.name = NULL} }; -- 1.7.1

2 1

[libvirt] [PATCH] docs: cgroups: fix typo about LXC cgroups
by Jean-Baptiste Rouault 27 Mar '14

27 Mar '14

--- docs/cgroups.html.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/cgroups.html.in b/docs/cgroups.html.in index f7c2450..33de453 100644 --- a/docs/cgroups.html.in +++ b/docs/cgroups.html.in @@ -33,9 +33,9 @@ The LXC driver is capable of using the <code>cpuset</code>, - <code>cpu</code>, <code>cpuset</code>, <code>freezer</code>, + <code>cpu</code>, <code>cpuacct</code>, <code>freezer</code>, <code>memory</code>, <code>blkio</code> and <code>devices</code> - controllers. The <code>cpuset</code>, <code>devices</code> + controllers. The <code>cpuacct</code>, <code>devices</code> and <code>memory</code> controllers are compulsory. Without them mounted, no containers can be started. If any of the other controllers are not mounted, the resource management APIs -- 1.8.5.3

2 1

[libvirt] [PATCH] libvirt-tck: 052-domain-hook.t - reload after hook cleanup
by Mike Latimer 27 Mar '14

27 Mar '14

Reload libvirtd after hook testing has completed. Otherwise, libvirtd is still expecting hook test scripts to exist. --- scripts/hooks/052-domain-hook.t | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/scripts/hooks/052-domain-hook.t b/scripts/hooks/052-domain-hook.t index 90b8a48..d1070b5 100644 --- a/scripts/hooks/052-domain-hook.t +++ b/scripts/hooks/052-domain-hook.t @@ -180,4 +180,8 @@ SKIP: { Sys::Virt::Error::ERR_NO_DOMAIN); $hook->cleanup(); + + diag "reload libvirtd after hook cleanup"; + $hook->action('reload'); + $hook->service_libvirtd(); }; -- 1.8.4.5

3 3

[libvirt] question for qemu migrate fail by virDomainMigrate API
by Wangrui (K) 27 Mar '14

27 Mar '14

Hi everyone， when I use the API virDomainMigrate to do migration operation in KVM environment(libvirt1.1.0 qemu1.5.1), I encountered with some problems. I found that If the connection to source side is disconnected in the BEGIN phase of a migration, the migration job would fail. Further more, the following-up migration of the same VM would not be successful until restart libvirtd. The error log: libvirtd : 8406: error : virQEMUCloseCallbacksSet:781 : internal error Close callback for domain myvm1 already registered with another connection 0x7f023801a900 libvirt: Domain Config error : Requested operation is not valid: domain is already active as 'myvm1' I got the above error by following steps： step 1 : migrate VM. step 2 : disconnect the client connection to source libvirtd at once ,such as ctrl+c. step 3 : the migrate API returns fail. step 4 : migrate this VM again , fails and reports above error. The reason causing this problem may be: In the BEGIN phase of a migraion, it registers a close callback through virQEMUCloseCallbacksSet function. In the normal flow of migration, the registered callback is cleanup in the PERFORM and CONFIRM phase. But if the connection to source side is disconnected before PERFORM phase or between PERFORM phase and CONFIRM phase, the close callback will not be cleanup, and the problem mentioned above occurs. I have test it on libvirt1.2.2, it also happens. I tried, but could not find a good way to solve this problem. Does anyone have any good ideas? Thanks!

1 0

[libvirt] libvirt Wiki account creation request
by Sophoklis Goumas 27 Mar '14

27 Mar '14

> ... > > We still welcome contributions from anyone interested in updating > content. Simply send an email to the main libvirt development list > asking for an account and one will be created for you with as little > delay as practical. > > ... Hence, Sophoklis

2 1

[libvirt] [PATCH] Remove illegal values in nwfilter test XML/firewall files
by Daniel P. Berrange 27 Mar '14

27 Mar '14

A number of the nwfilter XML files have attribute values which are out of range. Previously the libvirt nwfilter XML parser would silently ignore illegal values, causing them to default to 0. This resulted in creating incorrect iptables rules, which the TCK suite then validated as correct. Current libvirt returns a hard error for illegal XML values. To address this we either change the attribute values to be valid, or delete the bogus rules entirely if they are duplicates of other existing valid rules. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- scripts/nwfilter/nwfilterxml2fwallout/arp-test.fwall | 1 - scripts/nwfilter/nwfilterxml2fwallout/comment-test.fwall | 6 +++--- scripts/nwfilter/nwfilterxml2fwallout/hex-data-test.fwall | 6 +++--- scripts/nwfilter/nwfilterxml2fwallout/icmp-test.fwall | 3 --- scripts/nwfilter/nwfilterxml2fwallout/icmpv6-test.fwall | 4 +--- scripts/nwfilter/nwfilterxml2fwallout/ip-test.fwall | 4 +--- scripts/nwfilter/nwfilterxml2fwallout/mac-test.fwall | 1 - scripts/nwfilter/nwfilterxml2fwallout/rarp-test.fwall | 1 - scripts/nwfilter/nwfilterxml2fwallout/udp-ipv6-test.fwall | 6 +++--- scripts/nwfilter/nwfilterxml2fwallout/vlan-test.fwall | 1 - scripts/nwfilter/nwfilterxml2xmlin/ah-ipv6-test.xml | 2 +- scripts/nwfilter/nwfilterxml2xmlin/all-ipv6-test.xml | 2 +- scripts/nwfilter/nwfilterxml2xmlin/arp-test.xml | 5 ----- scripts/nwfilter/nwfilterxml2xmlin/comment-test.xml | 2 +- scripts/nwfilter/nwfilterxml2xmlin/esp-ipv6-test.xml | 2 +- scripts/nwfilter/nwfilterxml2xmlin/hex-data-test.xml | 2 +- scripts/nwfilter/nwfilterxml2xmlin/icmp-test.xml | 5 ----- scripts/nwfilter/nwfilterxml2xmlin/icmpv6-test.xml | 4 ++-- scripts/nwfilter/nwfilterxml2xmlin/ip-test.xml | 8 +------- scripts/nwfilter/nwfilterxml2xmlin/ipv6-test.xml | 2 +- scripts/nwfilter/nwfilterxml2xmlin/mac-test.xml | 4 ---- scripts/nwfilter/nwfilterxml2xmlin/rarp-test.xml | 5 ----- scripts/nwfilter/nwfilterxml2xmlin/sctp-ipv6-test.xml | 4 ++-- scripts/nwfilter/nwfilterxml2xmlin/sctp-test.xml | 2 +- scripts/nwfilter/nwfilterxml2xmlin/tcp-ipv6-test.xml | 4 ++-- scripts/nwfilter/nwfilterxml2xmlin/tcp-test.xml | 2 +- scripts/nwfilter/nwfilterxml2xmlin/udp-ipv6-test.xml | 6 +++--- scripts/nwfilter/nwfilterxml2xmlin/udp-test.xml | 2 +- scripts/nwfilter/nwfilterxml2xmlin/udplite-ipv6-test.xml | 2 +- scripts/nwfilter/nwfilterxml2xmlin/vlan-test.xml | 7 ------- 30 files changed, 31 insertions(+), 74 deletions(-) diff --git a/scripts/nwfilter/nwfilterxml2fwallout/arp-test.fwall b/scripts/nwfilter/nwfilterxml2fwallout/arp-test.fwall index 6ff4eb9..34174a0 100644 --- a/scripts/nwfilter/nwfilterxml2fwallout/arp-test.fwall +++ b/scripts/nwfilter/nwfilterxml2fwallout/arp-test.fwall @@ -3,7 +3,6 @@ -p ARP -s 1:2:3:4:5:6 --arp-op Request --arp-htype 255 --arp-ptype 0xff -j ACCEPT -p ARP -s 1:2:3:4:5:6 --arp-op 11 --arp-htype 256 --arp-ptype 0x100 -j ACCEPT -p ARP -s 1:2:3:4:5:6 --arp-op 65535 --arp-htype 65535 --arp-ptype 0xffff -j ACCEPT --p ARP -s 1:2:3:4:5:6 -j ACCEPT #ebtables -t nat -L libvirt-O-vnet0 | grep -v "^Bridge" | grep -v "^$" -p ARP --arp-gratuitous -j ACCEPT #ebtables -t nat -L PREROUTING | grep vnet0 diff --git a/scripts/nwfilter/nwfilterxml2fwallout/comment-test.fwall b/scripts/nwfilter/nwfilterxml2fwallout/comment-test.fwall index 6ef30a5..842f3bb 100644 --- a/scripts/nwfilter/nwfilterxml2fwallout/comment-test.fwall +++ b/scripts/nwfilter/nwfilterxml2fwallout/comment-test.fwall @@ -31,21 +31,21 @@ FO-vnet0 all -- 0.0.0.0/0 0.0.0.0/0 [goto] PHYSDEV match --physdev-out vnet0 --p #ip6tables -L FI-vnet0 -n Chain FI-vnet0 (1 references) target prot opt source destination -RETURN tcp ::/0 a:b:c::/128 tcp spts:256:4369 dpts:32:33 state ESTABLISHED ctdir ORIGINAL/* tcp/ipv6 rule */ +RETURN tcp ::/0 a:b:c::/128 DSCP match 0x39 tcp spts:256:4369 dpts:32:33 state ESTABLISHED ctdir ORIGINAL/* tcp/ipv6 rule */ RETURN udp ::/0 ::/0 state ESTABLISHED ctdir ORIGINAL/* `ls`;${COLUMNS};$(ls);"test";&'3 spaces' */ RETURN sctp ::/0 ::/0 state ESTABLISHED ctdir ORIGINAL/* comment with lone ', `, ", `, \, $x, and two spaces */ RETURN ah ::/0 ::/0 state ESTABLISHED ctdir ORIGINAL/* tmp=`mktemp`; echo ${RANDOM} > ${tmp} ; cat < ${tmp}; rm -f ${tmp} */ #ip6tables -L FO-vnet0 -n Chain FO-vnet0 (1 references) target prot opt source destination -ACCEPT tcp a:b:c::/128 ::/0 MAC 01:02:03:04:05:06 tcp spts:32:33 dpts:256:4369 state NEW,ESTABLISHED ctdir REPLY/* tcp/ipv6 rule */ +ACCEPT tcp a:b:c::/128 ::/0 MAC 01:02:03:04:05:06 DSCP match 0x39 tcp spts:32:33 dpts:256:4369 state NEW,ESTABLISHED ctdir REPLY/* tcp/ipv6 rule */ ACCEPT udp ::/0 ::/0 state NEW,ESTABLISHED ctdir REPLY/* `ls`;${COLUMNS};$(ls);"test";&'3 spaces' */ ACCEPT sctp ::/0 ::/0 state NEW,ESTABLISHED ctdir REPLY/* comment with lone ', `, ", `, \, $x, and two spaces */ ACCEPT ah ::/0 ::/0 state NEW,ESTABLISHED ctdir REPLY/* tmp=`mktemp`; echo ${RANDOM} > ${tmp} ; cat < ${tmp}; rm -f ${tmp} */ #ip6tables -L HI-vnet0 -n Chain HI-vnet0 (1 references) target prot opt source destination -RETURN tcp ::/0 a:b:c::/128 tcp spts:256:4369 dpts:32:33 state ESTABLISHED ctdir ORIGINAL/* tcp/ipv6 rule */ +RETURN tcp ::/0 a:b:c::/128 DSCP match 0x39 tcp spts:256:4369 dpts:32:33 state ESTABLISHED ctdir ORIGINAL/* tcp/ipv6 rule */ RETURN udp ::/0 ::/0 state ESTABLISHED ctdir ORIGINAL/* `ls`;${COLUMNS};$(ls);"test";&'3 spaces' */ RETURN sctp ::/0 ::/0 state ESTABLISHED ctdir ORIGINAL/* comment with lone ', `, ", `, \, $x, and two spaces */ RETURN ah ::/0 ::/0 state ESTABLISHED ctdir ORIGINAL/* tmp=`mktemp`; echo ${RANDOM} > ${tmp} ; cat < ${tmp}; rm -f ${tmp} */ diff --git a/scripts/nwfilter/nwfilterxml2fwallout/hex-data-test.fwall b/scripts/nwfilter/nwfilterxml2fwallout/hex-data-test.fwall index 66b0b71..2ed979e 100644 --- a/scripts/nwfilter/nwfilterxml2fwallout/hex-data-test.fwall +++ b/scripts/nwfilter/nwfilterxml2fwallout/hex-data-test.fwall @@ -31,15 +31,15 @@ FO-vnet0 all -- 0.0.0.0/0 0.0.0.0/0 [goto] PHYSDEV match --physdev-out vnet0 --p #ip6tables -L FI-vnet0 -n Chain FI-vnet0 (1 references) target prot opt source destination -RETURN tcp ::/0 a:b:c::/128 tcp spts:256:4369 dpts:32:33 state ESTABLISHED ctdir ORIGINAL +RETURN tcp ::/0 a:b:c::/128 DSCP match 0x39 tcp spts:256:4369 dpts:32:33 state ESTABLISHED ctdir ORIGINAL #ip6tables -L FO-vnet0 -n Chain FO-vnet0 (1 references) target prot opt source destination -ACCEPT tcp a:b:c::/128 ::/0 MAC 01:02:03:04:05:06 tcp spts:32:33 dpts:256:4369 state NEW,ESTABLISHED ctdir REPLY +ACCEPT tcp a:b:c::/128 ::/0 MAC 01:02:03:04:05:06 DSCP match 0x39 tcp spts:32:33 dpts:256:4369 state NEW,ESTABLISHED ctdir REPLY #ip6tables -L HI-vnet0 -n Chain HI-vnet0 (1 references) target prot opt source destination -RETURN tcp ::/0 a:b:c::/128 tcp spts:256:4369 dpts:32:33 state ESTABLISHED ctdir ORIGINAL +RETURN tcp ::/0 a:b:c::/128 DSCP match 0x39 tcp spts:256:4369 dpts:32:33 state ESTABLISHED ctdir ORIGINAL #ip6tables -L libvirt-host-in -n | grep vnet0 | tr -s " " HI-vnet0 all ::/0 ::/0 [goto] PHYSDEV match --physdev-in vnet0 #ip6tables -L libvirt-in -n | grep vnet0 | tr -s " " diff --git a/scripts/nwfilter/nwfilterxml2fwallout/icmp-test.fwall b/scripts/nwfilter/nwfilterxml2fwallout/icmp-test.fwall index e5f84e5..afdd95b 100644 --- a/scripts/nwfilter/nwfilterxml2fwallout/icmp-test.fwall +++ b/scripts/nwfilter/nwfilterxml2fwallout/icmp-test.fwall @@ -2,17 +2,14 @@ Chain FI-vnet0 (1 references) target prot opt source destination RETURN icmp -- 0.0.0.0/0 10.1.2.3 MAC 01:02:03:04:05:06 DSCP match 0x02icmp type 12 code 11 state NEW,ESTABLISHED -RETURN icmp -- 0.0.0.0/0 10.1.0.0/22 DSCP match 0x21state ESTABLISHED ctdir ORIGINAL #iptables -L FO-vnet0 -n Chain FO-vnet0 (1 references) target prot opt source destination ACCEPT icmp -- 10.1.0.0/22 0.0.0.0/0 MAC 01:02:03:04:05:06 DSCP match 0x21icmp type 255 code 255 state NEW,ESTABLISHED -ACCEPT icmp -- 10.1.0.0/22 0.0.0.0/0 MAC 01:02:03:04:05:06 DSCP match 0x21state NEW,ESTABLISHED ctdir REPLY #iptables -L HI-vnet0 -n Chain HI-vnet0 (1 references) target prot opt source destination RETURN icmp -- 0.0.0.0/0 10.1.2.3 MAC 01:02:03:04:05:06 DSCP match 0x02icmp type 12 code 11 state NEW,ESTABLISHED -RETURN icmp -- 0.0.0.0/0 10.1.0.0/22 DSCP match 0x21state ESTABLISHED ctdir ORIGINAL #iptables -L libvirt-host-in -n | grep vnet0 | tr -s " " HI-vnet0 all -- 0.0.0.0/0 0.0.0.0/0 [goto] PHYSDEV match --physdev-in vnet0 #iptables -L libvirt-in -n | grep vnet0 | tr -s " " diff --git a/scripts/nwfilter/nwfilterxml2fwallout/icmpv6-test.fwall b/scripts/nwfilter/nwfilterxml2fwallout/icmpv6-test.fwall index ed8eee0..4749f84 100644 --- a/scripts/nwfilter/nwfilterxml2fwallout/icmpv6-test.fwall +++ b/scripts/nwfilter/nwfilterxml2fwallout/icmpv6-test.fwall @@ -2,17 +2,15 @@ Chain FI-vnet0 (1 references) target prot opt source destination RETURN icmpv6 f:e:d::c:b:a/127 a:b:c::d:e:f/128 MAC 01:02:03:04:05:06 DSCP match 0x02ipv6-icmp type 12 code 11 state NEW,ESTABLISHED -RETURN icmpv6 ::/0 ::10.1.2.3/128 DSCP match 0x21state ESTABLISHED ctdir ORIGINAL #ip6tables -L FO-vnet0 -n Chain FO-vnet0 (1 references) target prot opt source destination ACCEPT icmpv6 a:b:c::/128 ::/0 MAC 01:02:03:04:05:06 DSCP match 0x21ipv6-icmp type 255 code 255 state NEW,ESTABLISHED -ACCEPT icmpv6 ::10.1.2.3/128 ::/0 MAC 01:02:03:04:05:06 DSCP match 0x21state NEW,ESTABLISHED ctdir REPLY +ACCEPT icmpv6 ::10.1.2.3/128 ::/0 MAC 01:02:03:04:05:06 DSCP match 0x21ipv6-icmp type 255 code 255 state NEW,ESTABLISHED #ip6tables -L HI-vnet0 -n Chain HI-vnet0 (1 references) target prot opt source destination RETURN icmpv6 f:e:d::c:b:a/127 a:b:c::d:e:f/128 MAC 01:02:03:04:05:06 DSCP match 0x02ipv6-icmp type 12 code 11 state NEW,ESTABLISHED -RETURN icmpv6 ::/0 ::10.1.2.3/128 DSCP match 0x21state ESTABLISHED ctdir ORIGINAL #ip6tables -L INPUT -n --line-numbers | grep libvirt 1 libvirt-host-in all ::/0 ::/0 #ip6tables -L libvirt-host-in -n | grep vnet0 | tr -s " " diff --git a/scripts/nwfilter/nwfilterxml2fwallout/ip-test.fwall b/scripts/nwfilter/nwfilterxml2fwallout/ip-test.fwall index f3cd49b..dbd6497 100644 --- a/scripts/nwfilter/nwfilterxml2fwallout/ip-test.fwall +++ b/scripts/nwfilter/nwfilterxml2fwallout/ip-test.fwall @@ -5,8 +5,6 @@ #ebtables -t nat -L libvirt-I-vnet0 | grep -v "^Bridge" | grep -v "^$" -p IPv4 -s 1:2:3:4:5:6 -d aa:bb:cc:dd:ee:ff --ip-src 10.1.2.3 --ip-dst 10.1.2.3 --ip-proto udp --ip-sport 20:22 --ip-dport 100:101 -j ACCEPT -p IPv4 --ip-src 10.1.0.0/17 --ip-dst 10.1.2.0/24 --ip-tos 0x3F --ip-proto udp -j ACCEPT --p IPv4 --ip-src 10.1.2.2/31 --ip-dst 10.1.2.3 -j ACCEPT #ebtables -t nat -L libvirt-O-vnet0 | grep -v "^Bridge" | grep -v "^$" --p IPv4 --ip-src 10.1.2.2/31 --ip-dst 10.1.2.0/25 --ip-proto 255 -j ACCEPT --p IPv4 --ip-src 10.1.2.3 --ip-dst 10.1.2.2/31 -j ACCEPT +-p IPv4 --ip-src 10.1.2.2/31 --ip-dst 10.1.2.0/25 --ip-tos 0x3F --ip-proto 255 -j ACCEPT diff --git a/scripts/nwfilter/nwfilterxml2fwallout/mac-test.fwall b/scripts/nwfilter/nwfilterxml2fwallout/mac-test.fwall index 2dd7952..bb00629 100644 --- a/scripts/nwfilter/nwfilterxml2fwallout/mac-test.fwall +++ b/scripts/nwfilter/nwfilterxml2fwallout/mac-test.fwall @@ -7,6 +7,5 @@ #ebtables -t nat -L libvirt-O-vnet0 | grep -v "^Bridge" | grep -v "^$" -p IPv4 -d aa:bb:cc:dd:ee:ff -j ACCEPT -p 0x600 -d aa:bb:cc:dd:ee:ff -j ACCEPT --d aa:bb:cc:dd:ee:ff -j ACCEPT -p 0xffff -d aa:bb:cc:dd:ee:ff -j ACCEPT diff --git a/scripts/nwfilter/nwfilterxml2fwallout/rarp-test.fwall b/scripts/nwfilter/nwfilterxml2fwallout/rarp-test.fwall index 77d9806..e0d9c8c 100644 --- a/scripts/nwfilter/nwfilterxml2fwallout/rarp-test.fwall +++ b/scripts/nwfilter/nwfilterxml2fwallout/rarp-test.fwall @@ -3,7 +3,6 @@ -p RARP -s 1:2:3:4:5:6 --arp-op Request --arp-htype 255 --arp-ptype 0xff -j ACCEPT -p RARP -s 1:2:3:4:5:6 --arp-op 11 --arp-htype 256 --arp-ptype 0x100 -j ACCEPT -p RARP -s 1:2:3:4:5:6 --arp-op 65535 --arp-htype 65535 --arp-ptype 0xffff -j ACCEPT --p RARP -s 1:2:3:4:5:6 -j ACCEPT #ebtables -t nat -L PREROUTING | grep vnet0 -i vnet0 -j libvirt-I-vnet0 diff --git a/scripts/nwfilter/nwfilterxml2fwallout/udp-ipv6-test.fwall b/scripts/nwfilter/nwfilterxml2fwallout/udp-ipv6-test.fwall index dd7b19c..0a75421 100644 --- a/scripts/nwfilter/nwfilterxml2fwallout/udp-ipv6-test.fwall +++ b/scripts/nwfilter/nwfilterxml2fwallout/udp-ipv6-test.fwall @@ -2,19 +2,19 @@ Chain FI-vnet0 (1 references) target prot opt source destination RETURN udp ::/0 a:b:c::d:e:f/128 MAC 01:02:03:04:05:06 DSCP match 0x02state NEW,ESTABLISHED ctdir REPLY -RETURN udp ::/0 ::/0 DSCP match 0x21udp spts:100:1111 dpts:20:21 state ESTABLISHED ctdir ORIGINAL +RETURN udp ::/0 ::a:b:c/128 DSCP match 0x21udp spts:100:1111 dpts:20:21 state ESTABLISHED ctdir ORIGINAL RETURN udp ::/0 ::10.1.2.3/128 DSCP match 0x3fudp spt:65535 dpts:255:256 state ESTABLISHED ctdir ORIGINAL #ip6tables -L FO-vnet0 -n Chain FO-vnet0 (1 references) target prot opt source destination ACCEPT udp a:b:c::d:e:f/128 ::/0 DSCP match 0x02state ESTABLISHED ctdir ORIGINAL -ACCEPT udp ::/0 ::/0 MAC 01:02:03:04:05:06 DSCP match 0x21udp spts:20:21 dpts:100:1111 state NEW,ESTABLISHED ctdir REPLY +ACCEPT udp ::a:b:c/128 ::/0 MAC 01:02:03:04:05:06 DSCP match 0x21udp spts:20:21 dpts:100:1111 state NEW,ESTABLISHED ctdir REPLY ACCEPT udp ::10.1.2.3/128 ::/0 MAC 01:02:03:04:05:06 DSCP match 0x3fudp spts:255:256 dpt:65535 state NEW,ESTABLISHED ctdir REPLY #ip6tables -L HI-vnet0 -n Chain HI-vnet0 (1 references) target prot opt source destination RETURN udp ::/0 a:b:c::d:e:f/128 MAC 01:02:03:04:05:06 DSCP match 0x02state NEW,ESTABLISHED ctdir REPLY -RETURN udp ::/0 ::/0 DSCP match 0x21udp spts:100:1111 dpts:20:21 state ESTABLISHED ctdir ORIGINAL +RETURN udp ::/0 ::a:b:c/128 DSCP match 0x21udp spts:100:1111 dpts:20:21 state ESTABLISHED ctdir ORIGINAL RETURN udp ::/0 ::10.1.2.3/128 DSCP match 0x3fudp spt:65535 dpts:255:256 state ESTABLISHED ctdir ORIGINAL #ip6tables -L INPUT -n --line-numbers | grep libvirt 1 libvirt-host-in all ::/0 ::/0 diff --git a/scripts/nwfilter/nwfilterxml2fwallout/vlan-test.fwall b/scripts/nwfilter/nwfilterxml2fwallout/vlan-test.fwall index 603f470..a2fbfd3 100644 --- a/scripts/nwfilter/nwfilterxml2fwallout/vlan-test.fwall +++ b/scripts/nwfilter/nwfilterxml2fwallout/vlan-test.fwall @@ -7,7 +7,6 @@ -p 802_1Q -s 1:2:3:4:5:6 -d aa:bb:cc:dd:ee:ff --vlan-id 291 -j CONTINUE -p 802_1Q -s 1:2:3:4:5:6 -d aa:bb:cc:dd:ee:ff --vlan-id 1234 -j RETURN -p 802_1Q -s 1:2:3:4:5:6 -d aa:bb:cc:dd:ee:ff --vlan-id 291 -j DROP --p 802_1Q -s 1:2:3:4:5:6 -d aa:bb:cc:dd:ee:ff -j ACCEPT #ebtables -t nat -L PREROUTING | grep vnet0 -i vnet0 -j libvirt-I-vnet0 #ebtables -t nat -L POSTROUTING | grep vnet0 diff --git a/scripts/nwfilter/nwfilterxml2xmlin/ah-ipv6-test.xml b/scripts/nwfilter/nwfilterxml2xmlin/ah-ipv6-test.xml index 07d1ffe..95ebbc9 100644 --- a/scripts/nwfilter/nwfilterxml2xmlin/ah-ipv6-test.xml +++ b/scripts/nwfilter/nwfilterxml2xmlin/ah-ipv6-test.xml @@ -13,7 +13,7 @@ </rule> <rule action='accept' direction='in'> <ah-ipv6 srcmacaddr='1:2:3:4:5:6' - srcipaddr='::10.1.2.3' srcipmask='129' + srcipaddr='::10.1.2.3' srcipmask='128' dscp='33'/> </rule> </filter> diff --git a/scripts/nwfilter/nwfilterxml2xmlin/all-ipv6-test.xml b/scripts/nwfilter/nwfilterxml2xmlin/all-ipv6-test.xml index eb39bc3..5cf3519 100644 --- a/scripts/nwfilter/nwfilterxml2xmlin/all-ipv6-test.xml +++ b/scripts/nwfilter/nwfilterxml2xmlin/all-ipv6-test.xml @@ -13,7 +13,7 @@ </rule> <rule action='accept' direction='in'> <all-ipv6 srcmacaddr='1:2:3:4:5:6' - srcipaddr='::10.1.2.3' srcipmask='129' + srcipaddr='::10.1.2.3' srcipmask='128' dscp='33'/> </rule> </filter> diff --git a/scripts/nwfilter/nwfilterxml2xmlin/arp-test.xml b/scripts/nwfilter/nwfilterxml2xmlin/arp-test.xml index 2e08b32..d0abf94 100644 --- a/scripts/nwfilter/nwfilterxml2xmlin/arp-test.xml +++ b/scripts/nwfilter/nwfilterxml2xmlin/arp-test.xml @@ -26,11 +26,6 @@ opcode='65535' hwtype='65535' protocoltype='65535' /> </rule> - <rule action='accept' direction='out'> - <arp srcmacaddr='1:2:3:4:5:6' srcmacmask='ff:ff:ff:ff:ff:ff' - opcode='65536' hwtype='65536' protocoltype='65536' /> - </rule> - <rule action='accept' direction='in'> <arp gratuitous='true'/> </rule> diff --git a/scripts/nwfilter/nwfilterxml2xmlin/comment-test.xml b/scripts/nwfilter/nwfilterxml2xmlin/comment-test.xml index af5c5cc..a154a17 100644 --- a/scripts/nwfilter/nwfilterxml2xmlin/comment-test.xml +++ b/scripts/nwfilter/nwfilterxml2xmlin/comment-test.xml @@ -50,7 +50,7 @@ <rule action='accept' direction='in'> <tcp-ipv6 srcmacaddr='1:2:3:4:5:6' srcipaddr='a:b:c::' srcipmask='128' - dscp='0x40' + dscp='0x39' srcportstart='0x20' srcportend='0x21' dstportstart='0x100' dstportend='0x1111' comment='tcp/ipv6 rule'/> diff --git a/scripts/nwfilter/nwfilterxml2xmlin/esp-ipv6-test.xml b/scripts/nwfilter/nwfilterxml2xmlin/esp-ipv6-test.xml index 4dd9b98..295d0f9 100644 --- a/scripts/nwfilter/nwfilterxml2xmlin/esp-ipv6-test.xml +++ b/scripts/nwfilter/nwfilterxml2xmlin/esp-ipv6-test.xml @@ -13,7 +13,7 @@ </rule> <rule action='accept' direction='in'> <esp-ipv6 srcmacaddr='1:2:3:4:5:6' - srcipaddr='::10.1.2.3' srcipmask='129' + srcipaddr='::10.1.2.3' srcipmask='128' dscp='33'/> </rule> </filter> diff --git a/scripts/nwfilter/nwfilterxml2xmlin/hex-data-test.xml b/scripts/nwfilter/nwfilterxml2xmlin/hex-data-test.xml index d2da079..45df451 100644 --- a/scripts/nwfilter/nwfilterxml2xmlin/hex-data-test.xml +++ b/scripts/nwfilter/nwfilterxml2xmlin/hex-data-test.xml @@ -48,7 +48,7 @@ <rule action='accept' direction='in'> <tcp-ipv6 srcmacaddr='1:2:3:4:5:6' srcipaddr='a:b:c::' srcipmask='128' - dscp='0x40' + dscp='0x39' srcportstart='0x20' srcportend='0x21' dstportstart='0x100' dstportend='0x1111'/> </rule> diff --git a/scripts/nwfilter/nwfilterxml2xmlin/icmp-test.xml b/scripts/nwfilter/nwfilterxml2xmlin/icmp-test.xml index 90f852b..fff5d42 100644 --- a/scripts/nwfilter/nwfilterxml2xmlin/icmp-test.xml +++ b/scripts/nwfilter/nwfilterxml2xmlin/icmp-test.xml @@ -10,9 +10,4 @@ srcipaddr='10.1.2.3' srcipmask='22' dscp='33' type='255' code='255'/> </rule> - <rule action='accept' direction='in'> - <icmp srcmacaddr='1:2:3:4:5:6' - srcipaddr='10.1.2.3' srcipmask='22' - dscp='33' type='256' code='256'/> - </rule> </filter> diff --git a/scripts/nwfilter/nwfilterxml2xmlin/icmpv6-test.xml b/scripts/nwfilter/nwfilterxml2xmlin/icmpv6-test.xml index 01dc6e2..9d24826 100644 --- a/scripts/nwfilter/nwfilterxml2xmlin/icmpv6-test.xml +++ b/scripts/nwfilter/nwfilterxml2xmlin/icmpv6-test.xml @@ -13,7 +13,7 @@ </rule> <rule action='accept' direction='in'> <icmpv6 srcmacaddr='1:2:3:4:5:6' - srcipaddr='::10.1.2.3' srcipmask='129' - dscp='33' type='256' code='256'/> + srcipaddr='::10.1.2.3' srcipmask='128' + dscp='33' type='255' code='255'/> </rule> </filter> diff --git a/scripts/nwfilter/nwfilterxml2xmlin/ip-test.xml b/scripts/nwfilter/nwfilterxml2xmlin/ip-test.xml index 0a744a2..da362a1 100644 --- a/scripts/nwfilter/nwfilterxml2xmlin/ip-test.xml +++ b/scripts/nwfilter/nwfilterxml2xmlin/ip-test.xml @@ -21,14 +21,8 @@ <rule action='accept' direction='in'> <ip srcipaddr='10.1.2.3' srcipmask='255.255.255.254' dstipaddr='10.1.2.3' dstipmask='255.255.255.128' - protocol='255' dscp='64' + protocol='255' dscp='63' /> </rule> - <rule action='accept' direction='inout'> - <ip srcipaddr='10.1.2.3' srcipmask='255.255.255.127' - dstipaddr='10.1.2.3' dstipmask='255.255.255.254' - protocol='256' dscp='64' - /> - </rule> </filter> diff --git a/scripts/nwfilter/nwfilterxml2xmlin/ipv6-test.xml b/scripts/nwfilter/nwfilterxml2xmlin/ipv6-test.xml index 7fa7181..9f67bea 100644 --- a/scripts/nwfilter/nwfilterxml2xmlin/ipv6-test.xml +++ b/scripts/nwfilter/nwfilterxml2xmlin/ipv6-test.xml @@ -28,7 +28,7 @@ dstipmask='ffff:ffff:ffff:ffff:8000::' protocol='6' srcportstart='255' srcportend='256' - dstportstart='65535' dstportend='65536' + dstportstart='65535' dstportend='65535' /> </rule> diff --git a/scripts/nwfilter/nwfilterxml2xmlin/mac-test.xml b/scripts/nwfilter/nwfilterxml2xmlin/mac-test.xml index 8f9565c..2aec935 100644 --- a/scripts/nwfilter/nwfilterxml2xmlin/mac-test.xml +++ b/scripts/nwfilter/nwfilterxml2xmlin/mac-test.xml @@ -14,10 +14,6 @@ </rule> <rule action='accept' direction='in'> <mac dstmacaddr='aa:bb:cc:dd:ee:ff' dstmacmask='ff:ff:ff:ff:ff:ff' - protocolid='15'/> - </rule> - <rule action='accept' direction='in'> - <mac dstmacaddr='aa:bb:cc:dd:ee:ff' dstmacmask='ff:ff:ff:ff:ff:ff' protocolid='65535'/> </rule> </filter> diff --git a/scripts/nwfilter/nwfilterxml2xmlin/rarp-test.xml b/scripts/nwfilter/nwfilterxml2xmlin/rarp-test.xml index 7b99df0..77c1127 100644 --- a/scripts/nwfilter/nwfilterxml2xmlin/rarp-test.xml +++ b/scripts/nwfilter/nwfilterxml2xmlin/rarp-test.xml @@ -25,9 +25,4 @@ <rarp srcmacaddr='1:2:3:4:5:6' srcmacmask='ff:ff:ff:ff:ff:ff' opcode='65535' hwtype='65535' protocoltype='65535' /> </rule> - - <rule action='accept' direction='out'> - <rarp srcmacaddr='1:2:3:4:5:6' srcmacmask='ff:ff:ff:ff:ff:ff' - opcode='65536' hwtype='65536' protocoltype='65536' /> - </rule> </filter> diff --git a/scripts/nwfilter/nwfilterxml2xmlin/sctp-ipv6-test.xml b/scripts/nwfilter/nwfilterxml2xmlin/sctp-ipv6-test.xml index 99bf349..d1a57b8 100644 --- a/scripts/nwfilter/nwfilterxml2xmlin/sctp-ipv6-test.xml +++ b/scripts/nwfilter/nwfilterxml2xmlin/sctp-ipv6-test.xml @@ -14,9 +14,9 @@ </rule> <rule action='accept' direction='in'> <sctp-ipv6 srcmacaddr='1:2:3:4:5:6' - srcipaddr='::10.1.2.3' srcipmask='129' + srcipaddr='::10.1.2.3' srcipmask='128' dscp='63' srcportstart='255' srcportend='256' - dstportstart='65535' dstportend='65536'/> + dstportstart='65535' dstportend='65535'/> </rule> </filter> diff --git a/scripts/nwfilter/nwfilterxml2xmlin/sctp-test.xml b/scripts/nwfilter/nwfilterxml2xmlin/sctp-test.xml index c2f635b..c3c1000 100644 --- a/scripts/nwfilter/nwfilterxml2xmlin/sctp-test.xml +++ b/scripts/nwfilter/nwfilterxml2xmlin/sctp-test.xml @@ -17,6 +17,6 @@ srcipaddr='10.1.2.3' srcipmask='32' dscp='63' srcportstart='255' srcportend='256' - dstportstart='65535' dstportend='65536'/> + dstportstart='65535' dstportend='65535'/> </rule> </filter> diff --git a/scripts/nwfilter/nwfilterxml2xmlin/tcp-ipv6-test.xml b/scripts/nwfilter/nwfilterxml2xmlin/tcp-ipv6-test.xml index ecc1d30..d4f24f4 100644 --- a/scripts/nwfilter/nwfilterxml2xmlin/tcp-ipv6-test.xml +++ b/scripts/nwfilter/nwfilterxml2xmlin/tcp-ipv6-test.xml @@ -14,9 +14,9 @@ </rule> <rule action='accept' direction='in'> <tcp-ipv6 srcmacaddr='1:2:3:4:5:6' - srcipaddr='::10.1.2.3' srcipmask='129' + srcipaddr='::10.1.2.3' srcipmask='128' dscp='63' srcportstart='255' srcportend='256' - dstportstart='65535' dstportend='65536'/> + dstportstart='65535' dstportend='65535'/> </rule> </filter> diff --git a/scripts/nwfilter/nwfilterxml2xmlin/tcp-test.xml b/scripts/nwfilter/nwfilterxml2xmlin/tcp-test.xml index fc77683..14ebd35 100644 --- a/scripts/nwfilter/nwfilterxml2xmlin/tcp-test.xml +++ b/scripts/nwfilter/nwfilterxml2xmlin/tcp-test.xml @@ -17,7 +17,7 @@ srcipaddr='10.1.2.3' srcipmask='32' dscp='63' srcportstart='255' srcportend='256' - dstportstart='65535' dstportend='65536'/> + dstportstart='65535' dstportend='65535'/> </rule> <rule action='accept' direction='in'> <tcp state='NONE' flags='SYN/ALL'/> diff --git a/scripts/nwfilter/nwfilterxml2xmlin/udp-ipv6-test.xml b/scripts/nwfilter/nwfilterxml2xmlin/udp-ipv6-test.xml index e8c6ba6..fd4f135 100644 --- a/scripts/nwfilter/nwfilterxml2xmlin/udp-ipv6-test.xml +++ b/scripts/nwfilter/nwfilterxml2xmlin/udp-ipv6-test.xml @@ -7,16 +7,16 @@ </rule> <rule action='accept' direction='in'> <udp-ipv6 srcmacaddr='1:2:3:4:5:6' - srcipaddr='a:b:c' srcipmask='128' + srcipaddr='::a:b:c' srcipmask='128' dscp='33' srcportstart='20' srcportend='21' dstportstart='100' dstportend='1111'/> </rule> <rule action='accept' direction='in'> <udp-ipv6 srcmacaddr='1:2:3:4:5:6' - srcipaddr='::10.1.2.3' srcipmask='129' + srcipaddr='::10.1.2.3' srcipmask='128' dscp='63' srcportstart='255' srcportend='256' - dstportstart='65535' dstportend='65536'/> + dstportstart='65535' dstportend='65535'/> </rule> </filter> diff --git a/scripts/nwfilter/nwfilterxml2xmlin/udp-test.xml b/scripts/nwfilter/nwfilterxml2xmlin/udp-test.xml index 10ce53d..359dfa2 100644 --- a/scripts/nwfilter/nwfilterxml2xmlin/udp-test.xml +++ b/scripts/nwfilter/nwfilterxml2xmlin/udp-test.xml @@ -17,6 +17,6 @@ srcipaddr='10.1.2.3' srcipmask='32' dscp='63' srcportstart='255' srcportend='256' - dstportstart='65535' dstportend='65536'/> + dstportstart='65535' dstportend='65535'/> </rule> </filter> diff --git a/scripts/nwfilter/nwfilterxml2xmlin/udplite-ipv6-test.xml b/scripts/nwfilter/nwfilterxml2xmlin/udplite-ipv6-test.xml index 0763a7d..5b941a2 100644 --- a/scripts/nwfilter/nwfilterxml2xmlin/udplite-ipv6-test.xml +++ b/scripts/nwfilter/nwfilterxml2xmlin/udplite-ipv6-test.xml @@ -13,7 +13,7 @@ </rule> <rule action='accept' direction='in'> <udplite-ipv6 srcmacaddr='1:2:3:4:5:6' - srcipaddr='::10.1.2.3' srcipmask='129' + srcipaddr='::10.1.2.3' srcipmask='128' dscp='33'/> </rule> </filter> diff --git a/scripts/nwfilter/nwfilterxml2xmlin/vlan-test.xml b/scripts/nwfilter/nwfilterxml2xmlin/vlan-test.xml index 65ee04b..a5e7b38 100644 --- a/scripts/nwfilter/nwfilterxml2xmlin/vlan-test.xml +++ b/scripts/nwfilter/nwfilterxml2xmlin/vlan-test.xml @@ -21,13 +21,6 @@ /> </rule> - <rule action='accept' direction='in'> - <vlan srcmacaddr='1:2:3:4:5:6' srcmacmask='ff:ff:ff:ff:ff:ff' - dstmacaddr='aa:bb:cc:dd:ee:ff' dstmacmask='ff:ff:ff:ff:ff:ff' - vlanid='0xffff' - /> - </rule> - <rule action='drop' direction='out'> <vlan srcmacaddr='1:2:3:4:5:6' srcmacmask='ff:ff:ff:ff:ff:ff' dstmacaddr='aa:bb:cc:dd:ee:ff' dstmacmask='ff:ff:ff:ff:ff:ff' -- 1.8.5.3

2 2

[libvirt] [PATCH] Cope with newer ebtables tools in testvm.fwall.dat
by Daniel P. Berrange 27 Mar '14

27 Mar '14

Newer ebtables tools turn 0x8035 into RARP, so our test file must expect this. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- scripts/nwfilter/nwfilterxml2fwallout/testvm.fwall.dat | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/nwfilter/nwfilterxml2fwallout/testvm.fwall.dat b/scripts/nwfilter/nwfilterxml2fwallout/testvm.fwall.dat index b540509..1b5f3ce 100644 --- a/scripts/nwfilter/nwfilterxml2fwallout/testvm.fwall.dat +++ b/scripts/nwfilter/nwfilterxml2fwallout/testvm.fwall.dat @@ -2,20 +2,20 @@ -i vnet0 -j libvirt-I-vnet0 #ebtables -t nat -L POSTROUTING | grep vnet0 | grep -v "^Bridge" | grep -v "^$" -o vnet0 -j libvirt-O-vnet0 -#ebtables -t nat -L libvirt-I-vnet0 | grep -v "^Bridge" | grep -v "^$" +#ebtables -t nat -L libvirt-I-vnet0 | sed s/0x8035/RARP/g | grep -v "^Bridge" | grep -v "^$" -j I-vnet0-mac -p IPv4 -j I-vnet0-ipv4-ip -p IPv4 -j ACCEPT -p ARP -j I-vnet0-arp-mac -p ARP -j I-vnet0-arp-ip -p ARP -j ACCEPT --p 0x8035 -j I-vnet0-rarp +-p RARP -j I-vnet0-rarp -p 0x835 -j ACCEPT -j DROP -#ebtables -t nat -L libvirt-O-vnet0 | grep -v "^Bridge" | grep -v "^$" +#ebtables -t nat -L libvirt-O-vnet0 | sed s/0x8035/RARP/g | grep -v "^Bridge" | grep -v "^$" -p IPv4 -j O-vnet0-ipv4 -p ARP -j ACCEPT --p 0x8035 -j O-vnet0-rarp +-p RARP -j O-vnet0-rarp -j DROP #ebtables -t nat -L I-vnet0-ipv4-ip | grep -v "^Bridge" | grep -v "^$" -p IPv4 --ip-src 0.0.0.0 --ip-proto udp -j RETURN -- 1.8.5.3

2 1

[libvirt] [PATCH v2] libvirt-tck: prefer kvm domains if multiple domain types exist
by Mike Latimer 27 Mar '14

27 Mar '14

When matching capabilities of a guest, if multiple domain types exist (for example, 'qemu' and 'kvm') the order in which they are returned can change. To avoid unpredictable test results, this patch prefers kvm if that domain type exists. If not, the behavior matches what existed before, and the first domain type is returned. --- lib/Sys/Virt/TCK.pm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/lib/Sys/Virt/TCK.pm b/lib/Sys/Virt/TCK.pm index b2c16e7..a3a2732 100644 --- a/lib/Sys/Virt/TCK.pm +++ b/lib/Sys/Virt/TCK.pm @@ -502,9 +502,12 @@ sub match_kernel { my @domains = $caps->guest_domain_types($i); next unless int(@domains); - return ($domains[0], - $caps->guest_domain_emulator($i, $domains[0]), - $caps->guest_domain_loader($i, $domains[0])); + # Prefer kvm if multiple domain types are returned + my $domain = (grep /^kvm$/, @domains) ? "kvm" : $domains[0]; + + return ($domain, + $caps->guest_domain_emulator($i, $domain), + $caps->guest_domain_loader($i, $domain)); } } -- 1.8.4.5

2 2

[libvirt] [PATCH v2] Fix Memory Leak in virQEMUCapsInitGuestFromBinary()
by Nehal J Wani 27 Mar '14

27 Mar '14

While running qemucaps2xmltest, it was found that valgrind pointed out the following memory leaks: ==29896== 0 bytes in 1 blocks are definitely lost in loss record 1 of 65 ==29896== at 0x4A0577B: calloc (vg_replace_malloc.c:593) ==29896== by 0x4C6B45E: virAllocN (viralloc.c:191) ==29896== by 0x4232A9: virQEMUCapsGetMachineTypesCaps (qemu_capabilities.c:1999) ==29896== by 0x4234E7: virQEMUCapsInitGuestFromBinary (qemu_capabilities.c:789) ==29896== by 0x41F10B: testQemuCapsXML (qemucaps2xmltest.c:118) ==29896== by 0x41FFD1: virtTestRun (testutils.c:201) ==29896== by 0x41EE7A: mymain (qemucaps2xmltest.c:203) ==29896== by 0x42074D: virtTestMain (testutils.c:789) ==29896== by 0x3E6CE1ED1C: (below main) (libc-start.c:226) ==29896== ==29896== 0 bytes in 1 blocks are definitely lost in loss record 2 of 65 ==29896== at 0x4A0577B: calloc (vg_replace_malloc.c:593) ==29896== by 0x4C6B45E: virAllocN (viralloc.c:191) ==29896== by 0x4232A9: virQEMUCapsGetMachineTypesCaps (qemu_capabilities.c:1999) ==29896== by 0x4234E7: virQEMUCapsInitGuestFromBinary (qemu_capabilities.c:789) ==29896== by 0x41F10B: testQemuCapsXML (qemucaps2xmltest.c:118) ==29896== by 0x41FFD1: virtTestRun (testutils.c:201) ==29896== by 0x41EEA3: mymain (qemucaps2xmltest.c:204) ==29896== by 0x42074D: virtTestMain (testutils.c:789) ==29896== by 0x3E6CE1ED1C: (below main) (libc-start.c:226) --- src/qemu/qemu_capabilities.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 7673592..aef8bc1 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -789,6 +789,10 @@ virQEMUCapsInitGuestFromBinary(virCapsPtr caps, if (virQEMUCapsGetMachineTypesCaps(qemubinCaps, &nmachines, &machines) < 0) goto cleanup; + /* Free unneeded memory given by malloc(0) */ + if (!nmachines) + VIR_FREE(machines); + /* We register kvm as the base emulator too, since we can * just give -no-kvm to disable acceleration if required */ if ((guest = virCapabilitiesAddGuest(caps, -- 1.7.1

2 3

[libvirt] [TCK] nwfilter tests and libvirt commit 4f209434
by Mike Latimer 27 Mar '14

27 Mar '14

Hi, As I've been looking through libvirt-tck tests, I found that commit 4f209434 (in libvirt) changes a condition that the nwfilter/050-apply-verify-host.t relies on. Specifically, the 050-apply-verify-host.t test creates a number of filters with invalid values (such as dscp='64', and protocol='256'). Without commit 4f209434, these invalid values are silently dropped off the end of the rule, as in the following example: #virsh nwfilter-define <xml with illegal value:> <filter name='tck-testcase'> <uuid>5c6d49af-b071-6127-b4ec-6f8ed4b55335</uuid> <rule action='accept' direction='in'> <ip srcipaddr='10.1.2.3' srcipmask='255.255.255.254' dstipaddr='10.1.2.3' dstipmask='255.255.255.128' protocol='255' dscp='64' /> </rule> #virsh nwfilter-dumpxml tck-testcase <rule action='accept' direction='in' priority='500'> <ip srcipaddr='10.1.2.3' srcipmask='31' dstipaddr='10.1.2.3' dstipmask='25' protocol='255'/> </rule> With commit 4f209434 in place, the entire filter is rejected with the following error: 'internal error: dscp has illegal value 64'. As the filter is not created, the testing of that filter by the 050-apply-verify-host test fails. I agree that the change is the right thing to do, but I'm wondering how best to handle the now failing tests. This test (050-apply-verify-host.t) runs ~1200 subtests, and about 10% of those tests fail due to the change. I'm thinking that the illegal options (and only those illegal options) should be removed from the now broken tests, and a few new tests added to specifically test for the failure to add the entire rule when illegal data is passed. Thoughts? BTW - Is anyone else running the full libvirt-tck suite against recent versions of libvirt? There are quite a few issues (such as this one) which should be easily seen... Thanks, Mike

3 2

[libvirt] [PATCH v4 0/2] fix query-command-line-options
by Amos Kong 27 Mar '14

27 Mar '14

This patchset fixed some issues of query-command-line-options: * some new options that haven't argument can't be queried. (eg: -enable-fips) * some legacy options that have argument can't be queried. (eg: -vnc display) More discussion: http://marc.info/?l=qemu-devel&m=139081830416684&w=2 V2: remove duplicate option tables, update schema (eric) V3: fix typo in commitlog and export qemu_options talbe (eric) V4: avoid the duplicate static table (eric) Amos Kong (2): qmp: rename query_option_descs() to get_param_infolist() query-command-line-options: query all the options in qemu-options.hx qapi-schema.json | 8 ++++++-- qemu-options.h | 10 ++++++++++ util/qemu-config.c | 50 +++++++++++++++++++++++++++++++++++++++++--------- vl.c | 15 --------------- 4 files changed, 57 insertions(+), 26 deletions(-) -- 1.8.5.3

3 17

[libvirt] [PATCH] bhyve: add domainLookupByID
by Wojciech Macek 27 Mar '14

27 Mar '14

Implement domainLookupByID as required by OpenStack stuff. Wojciech Macek (1): bhyve: add domainLookupByID src/bhyve/bhyve_driver.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) -- 1.9.0

2 2

[libvirt] [RFC PATCH] Behaviour of topology, vcpus and maxcpus
by Nikunj A Dadhania 27 Mar '14

27 Mar '14

I have observed the following with libvirt xml: <vcpu>6</vcpu> <cpu> <topology sockets='1' cores='4' threads='2'/> </cpu> So according to the topology maximum supported is 8 vcpus, while the libvirt sets that to 6 - specified in <vcpu> tag. Shouldn't libvirt error this out as the mismatch between the topology definition and the vcpu count? There is an upper bound check already in place where if we have maxcpu > topology-supported cpus, that errors out. For eg. <vcpu>12</vcpu> <cpu> <topology sockets='1' cores='4' threads='2'/> </cpu> The below patch make sures that libvirt does the lower bound check as well. Regards Nikunj diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index f96110b..aa25940 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -12933,6 +12933,14 @@ virDomainDefParseXML(xmlDocPtr xml, goto error; } + if (def->cpu->sockets && + def->maxvcpus < + def->cpu->sockets * def->cpu->cores * def->cpu->threads) { + virReportError(VIR_ERR_XML_DETAIL, "%s", + _("CPUs provided is less than topology")); + goto error; + } + if (def->cpu->cells_cpus > def->maxvcpus) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Number of CPUs in <numa> exceeds the"

1 1

[libvirt] [PATCH v6 0/3] fix query-command-line-options
by Amos Kong 27 Mar '14

27 Mar '14

This patchset fixed some issues of query-command-line-options: * some new options that haven't argument can't be queried. (eg: -enable-fips) * some legacy options that have argument can't be queried. (eg: -vnc display) More discussion: http://marc.info/?l=qemu-devel&m=139081830416684&w=2 https://www.redhat.com/archives/libvir-list/2014-March/msg00318.html V2: remove duplicate option tables, update schema (eric) V3: fix typo in commitlog and export qemu_options talbe (eric) V4: avoid the duplicate static table (eric) V5: rename new field, other fix (markus) V6: add implied-name (eric, markus) Thanks for your review! Amos Kong (3): qmp: rename query_option_descs() to get_param_info() query-command-line-options: expose implicit parameter name query-command-line-options: query all the options in qemu-options.hx qapi-schema.json | 16 +++++++++++++--- qemu-options.h | 12 ++++++++++++ util/qemu-config.c | 52 ++++++++++++++++++++++++++++++++++++++-------------- vl.c | 19 ++----------------- 4 files changed, 65 insertions(+), 34 deletions(-) -- 1.8.5.3

1 4

[libvirt] [PATCH] Fix Memory Leak in testGetCaps()
by Nehal J Wani 27 Mar '14

27 Mar '14

While running qemucaps2xmltest, it was found that valgrind pointed out the following memory leaks: ==27045== 160 (112 direct, 48 indirect) bytes in 1 blocks are definitely lost in loss record 51 of 65 ==27045== at 0x4A0577B: calloc (vg_replace_malloc.c:593) ==27045== by 0x4C6BACD: virAllocVar (viralloc.c:560) ==27045== by 0x4CAF095: virObjectNew (virobject.c:193) ==27045== by 0x421453: virQEMUCapsNew (qemu_capabilities.c:1805) ==27045== by 0x41F04F: testQemuCapsXML (qemucaps2xmltest.c:72) ==27045== by 0x41FFD1: virtTestRun (testutils.c:201) ==27045== by 0x41EE7A: mymain (qemucaps2xmltest.c:203) ==27045== by 0x42074D: virtTestMain (testutils.c:789) ==27045== by 0x3E6CE1ED1C: (below main) (libc-start.c:226) ==27045== ==27045== 160 (112 direct, 48 indirect) bytes in 1 blocks are definitely lost in loss record 52 of 65 ==27045== at 0x4A0577B: calloc (vg_replace_malloc.c:593) ==27045== by 0x4C6BACD: virAllocVar (viralloc.c:560) ==27045== by 0x4CAF095: virObjectNew (virobject.c:193) ==27045== by 0x421453: virQEMUCapsNew (qemu_capabilities.c:1805) ==27045== by 0x41F04F: testQemuCapsXML (qemucaps2xmltest.c:72) ==27045== by 0x41FFD1: virtTestRun (testutils.c:201) ==27045== by 0x41EEA3: mymain (qemucaps2xmltest.c:204) ==27045== by 0x42074D: virtTestMain (testutils.c:789) ==27045== by 0x3E6CE1ED1C: (below main) (libc-start.c:226) --- tests/qemucaps2xmltest.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tests/qemucaps2xmltest.c b/tests/qemucaps2xmltest.c index 8bf6738..cef5735 100644 --- a/tests/qemucaps2xmltest.c +++ b/tests/qemucaps2xmltest.c @@ -125,6 +125,7 @@ testGetCaps(char *capsData, const testQemuData *data) goto error; } + virObjectUnref(qemuCaps); return caps; error: -- 1.7.1

2 1

[libvirt] [PATCH v3 0/2] bhyve: add xml2args unittest
by Roman Bogorodskiy 27 Mar '14

27 Mar '14

Changes from v2: - Make virBhyveTapGetRealDeviceName a stub on non-FreeBSD - Add bhyvexml2argvdata and bhyvexml2argvmock.c to EXTRA_DIST - Include bhyve headers in tests only if WITH_BHYVE is defined - Don't use 'util/' for #include when not needed Changes from v1: - Chase MAC address support by adding virMacAddrGenerate() mock, so we can get a constant MAC address - Add a test for the case when MAC address is specified in the domain xml Roman Bogorodskiy (2): Move virBhyveTapGetRealDeviceName to virnetdevtap bhyve: add xml2args unittest src/bhyve/bhyve_command.c | 74 +--------- src/libvirt_private.syms | 1 + src/util/virnetdevtap.c | 87 ++++++++++++ src/util/virnetdevtap.h | 3 + tests/Makefile.am | 26 ++++ .../bhyvexml2argvdata/bhyvexml2argv-acpiapic.args | 3 + tests/bhyvexml2argvdata/bhyvexml2argv-acpiapic.xml | 24 ++++ tests/bhyvexml2argvdata/bhyvexml2argv-base.args | 3 + tests/bhyvexml2argvdata/bhyvexml2argv-base.xml | 20 +++ .../bhyvexml2argv-disk-virtio.args | 3 + .../bhyvexml2argv-disk-virtio.xml | 20 +++ tests/bhyvexml2argvdata/bhyvexml2argv-macaddr.args | 3 + tests/bhyvexml2argvdata/bhyvexml2argv-macaddr.xml | 21 +++ tests/bhyvexml2argvmock.c | 49 +++++++ tests/bhyvexml2argvtest.c | 153 +++++++++++++++++++++ 15 files changed, 417 insertions(+), 73 deletions(-) create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-acpiapic.args create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-acpiapic.xml create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-base.args create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-base.xml create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-disk-virtio.args create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-disk-virtio.xml create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-macaddr.args create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-macaddr.xml create mode 100644 tests/bhyvexml2argvmock.c create mode 100644 tests/bhyvexml2argvtest.c -- 1.8.4.2

2 6

[libvirt] [PATCH v3 for 2.0] update names in option tables to match with actual command-line spelling
by Amos Kong 27 Mar '14

27 Mar '14

We want to establish a mapping between option name and option table, then we can search related option table by option name. This patch makes all the member name of QemuOptsList to match with actual command-line spelling(option name). [ Important Note ] The QemuOptsList member name values are ABI, changing them can break existing -readconfig configuration files. This patch changes: from to introduced in acpi acpitable 0c764a9 v1.5.0 boot-opts boot 3d3b830 v1.0 smp-opts smp 12b7f57 v1.6.0 All three have calcified into ABI already. I have updated the release note of 2.0 http://wiki.qemu.org/ChangeLog/2.0#ABI_breaking Signed-off-by: Amos Kong <akong(a)redhat.com> --- V2: fix name in acpi option table V3: mention ABI break in commitlog (Markus) --- hw/acpi/core.c | 8 ++++---- hw/nvram/fw_cfg.c | 4 ++-- include/qemu/option.h | 2 +- vl.c | 14 +++++++------- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/hw/acpi/core.c b/hw/acpi/core.c index 79414b4..12e9ae8 100644 --- a/hw/acpi/core.c +++ b/hw/acpi/core.c @@ -54,16 +54,16 @@ static const char unsigned dfl_hdr[ACPI_TABLE_HDR_SIZE - ACPI_TABLE_PFX_SIZE] = char unsigned *acpi_tables; size_t acpi_tables_len; -static QemuOptsList qemu_acpi_opts = { - .name = "acpi", +static QemuOptsList qemu_acpitable_opts = { + .name = "acpitable", .implied_opt_name = "data", - .head = QTAILQ_HEAD_INITIALIZER(qemu_acpi_opts.head), + .head = QTAILQ_HEAD_INITIALIZER(qemu_acpitable_opts.head), .desc = { { 0 } } /* validated with OptsVisitor */ }; static void acpi_register_config(void) { - qemu_add_opts(&qemu_acpi_opts); + qemu_add_opts(&qemu_acpitable_opts); } machine_init(acpi_register_config); diff --git a/hw/nvram/fw_cfg.c b/hw/nvram/fw_cfg.c index 282341a..3e6b048 100644 --- a/hw/nvram/fw_cfg.c +++ b/hw/nvram/fw_cfg.c @@ -125,7 +125,7 @@ static void fw_cfg_bootsplash(FWCfgState *s) const char *temp; /* get user configuration */ - QemuOptsList *plist = qemu_find_opts("boot-opts"); + QemuOptsList *plist = qemu_find_opts("boot"); QemuOpts *opts = QTAILQ_FIRST(&plist->head); if (opts != NULL) { temp = qemu_opt_get(opts, "splash"); @@ -191,7 +191,7 @@ static void fw_cfg_reboot(FWCfgState *s) const char *temp; /* get user configuration */ - QemuOptsList *plist = qemu_find_opts("boot-opts"); + QemuOptsList *plist = qemu_find_opts("boot"); QemuOpts *opts = QTAILQ_FIRST(&plist->head); if (opts != NULL) { temp = qemu_opt_get(opts, "reboot-timeout"); diff --git a/include/qemu/option.h b/include/qemu/option.h index 8c0ac34..96b7c29 100644 --- a/include/qemu/option.h +++ b/include/qemu/option.h @@ -102,7 +102,7 @@ typedef struct QemuOptDesc { } QemuOptDesc; struct QemuOptsList { - const char *name; + const char *name; /* option name */ const char *implied_opt_name; bool merge_lists; /* Merge multiple uses of option into a single list? */ QTAILQ_HEAD(, QemuOpts) head; diff --git a/vl.c b/vl.c index 02bf8ec..c8002ea 100644 --- a/vl.c +++ b/vl.c @@ -388,7 +388,7 @@ static QemuOptsList qemu_machine_opts = { }; static QemuOptsList qemu_boot_opts = { - .name = "boot-opts", + .name = "boot", .implied_opt_name = "order", .merge_lists = true, .head = QTAILQ_HEAD_INITIALIZER(qemu_boot_opts.head), @@ -1357,7 +1357,7 @@ static void numa_add(const char *optarg) } static QemuOptsList qemu_smp_opts = { - .name = "smp-opts", + .name = "smp", .implied_opt_name = "cpus", .merge_lists = true, .head = QTAILQ_HEAD_INITIALIZER(qemu_smp_opts.head), @@ -3245,7 +3245,7 @@ int main(int argc, char **argv, char **envp) drive_add(IF_DEFAULT, 2, optarg, CDROM_OPTS); break; case QEMU_OPTION_boot: - opts = qemu_opts_parse(qemu_find_opts("boot-opts"), optarg, 1); + opts = qemu_opts_parse(qemu_find_opts("boot"), optarg, 1); if (!opts) { exit(1); } @@ -3614,7 +3614,7 @@ int main(int argc, char **argv, char **envp) break; } case QEMU_OPTION_acpitable: - opts = qemu_opts_parse(qemu_find_opts("acpi"), optarg, 1); + opts = qemu_opts_parse(qemu_find_opts("acpitable"), optarg, 1); if (!opts) { exit(1); } @@ -3681,7 +3681,7 @@ int main(int argc, char **argv, char **envp) } break; case QEMU_OPTION_smp: - if (!qemu_opts_parse(qemu_find_opts("smp-opts"), optarg, 1)) { + if (!qemu_opts_parse(qemu_find_opts("smp"), optarg, 1)) { exit(1); } break; @@ -4006,7 +4006,7 @@ int main(int argc, char **argv, char **envp) data_dir[data_dir_idx++] = CONFIG_QEMU_DATADIR; } - smp_parse(qemu_opts_find(qemu_find_opts("smp-opts"), NULL)); + smp_parse(qemu_opts_find(qemu_find_opts("smp"), NULL)); machine->max_cpus = machine->max_cpus ?: 1; /* Default to UP */ if (smp_cpus > machine->max_cpus) { @@ -4190,7 +4190,7 @@ int main(int argc, char **argv, char **envp) bios_name = qemu_opt_get(machine_opts, "firmware"); boot_order = machine->default_boot_order; - opts = qemu_opts_find(qemu_find_opts("boot-opts"), NULL); + opts = qemu_opts_find(qemu_find_opts("boot"), NULL); if (opts) { char *normal_boot_order; const char *order, *once; -- 1.8.5.3

3 4

[libvirt] how libvirt know the hostname of vm
by bigclouds 27 Mar '14

27 Mar '14

hi,all i recently notice that virt-manager show the hostname of vm, i am curious about that, that is the implementation? thanks

2 1

[libvirt] [PATCH] Fix Memory Leak in virQEMUCapsInitGuestFromBinary()
by Nehal J Wani 26 Mar '14

26 Mar '14

While running qemucaps2xmltest, it was found that valgrind pointed out the following memory leaks: ==29896== 0 bytes in 1 blocks are definitely lost in loss record 1 of 65 ==29896== at 0x4A0577B: calloc (vg_replace_malloc.c:593) ==29896== by 0x4C6B45E: virAllocN (viralloc.c:191) ==29896== by 0x4232A9: virQEMUCapsGetMachineTypesCaps (qemu_capabilities.c:1999) ==29896== by 0x4234E7: virQEMUCapsInitGuestFromBinary (qemu_capabilities.c:789) ==29896== by 0x41F10B: testQemuCapsXML (qemucaps2xmltest.c:118) ==29896== by 0x41FFD1: virtTestRun (testutils.c:201) ==29896== by 0x41EE7A: mymain (qemucaps2xmltest.c:203) ==29896== by 0x42074D: virtTestMain (testutils.c:789) ==29896== by 0x3E6CE1ED1C: (below main) (libc-start.c:226) ==29896== ==29896== 0 bytes in 1 blocks are definitely lost in loss record 2 of 65 ==29896== at 0x4A0577B: calloc (vg_replace_malloc.c:593) ==29896== by 0x4C6B45E: virAllocN (viralloc.c:191) ==29896== by 0x4232A9: virQEMUCapsGetMachineTypesCaps (qemu_capabilities.c:1999) ==29896== by 0x4234E7: virQEMUCapsInitGuestFromBinary (qemu_capabilities.c:789) ==29896== by 0x41F10B: testQemuCapsXML (qemucaps2xmltest.c:118) ==29896== by 0x41FFD1: virtTestRun (testutils.c:201) ==29896== by 0x41EEA3: mymain (qemucaps2xmltest.c:204) ==29896== by 0x42074D: virtTestMain (testutils.c:789) ==29896== by 0x3E6CE1ED1C: (below main) (libc-start.c:226) --- src/qemu/qemu_capabilities.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 7673592..a28816d 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -800,6 +800,7 @@ virQEMUCapsInitGuestFromBinary(virCapsPtr caps, machines)) == NULL) goto cleanup; + virCapabilitiesFreeMachines(machines, nmachines); machines = NULL; nmachines = 0; @@ -852,6 +853,7 @@ virQEMUCapsInitGuestFromBinary(virCapsPtr caps, goto cleanup; } + virCapabilitiesFreeMachines(machines, nmachines); machines = NULL; nmachines = 0; -- 1.7.1

2 1

[libvirt] [PATCH] security_dac: Honor norelabel attribute
by Michal Privoznik 26 Mar '14

26 Mar '14

The inspiration for this patch comes from a question on the list asking if there's a way to not label some disks. Well, in DAC driver there's not. Even if user have requested norelabel: <disk type='file' device='disk'> <driver name='qemu' type='raw'/> <source file='/some/dummy/path/test.bin'> <seclabel model='dac' relabel='no'/> </source> <target dev='vdb' bus='virtio'/> <readonly/> <address type='pci' domain='0x0000' bus='0x00' slot='0x07' function='0x0'/> </disk> the DAC driver ignores this completely. When adjusting the code, I realized it's a ragbag with plenty of things that we try to avoid. >From the variety just a few things: callback data were passed as: void params[2]; params[0] = mgr; params[1] = def; Or my favorite - checking for passed pointer being non NULL on each level of the stack, in each callee. As a pattern of readable code the selinux driver was used. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/security/security_dac.c | 244 ++++++++++++++++++++++++-------------------- 1 file changed, 131 insertions(+), 113 deletions(-) diff --git a/src/security/security_dac.c b/src/security/security_dac.c index 9f45063..3b8fe04 100644 --- a/src/security/security_dac.c +++ b/src/security/security_dac.c @@ -53,6 +53,15 @@ struct _virSecurityDACData { char *baselabel; }; +typedef struct _virSecurityDACCallbackData virSecurityDACCallbackData; +typedef virSecurityDACCallbackData *virSecurityDACCallbackDataPtr; + +struct _virSecurityDACCallbackData { + virSecurityManagerPtr manager; + virSecurityLabelDefPtr secdef; +}; + + /* returns -1 on error, 0 on success */ int virSecurityDACSetUserAndGroup(virSecurityManagerPtr mgr, @@ -81,65 +90,42 @@ virSecurityDACSetDynamicOwnership(virSecurityManagerPtr mgr, /* returns 1 if label isn't found, 0 on success, -1 on error */ static int -virSecurityDACParseIds(virDomainDefPtr def, uid_t *uidPtr, gid_t *gidPtr) +virSecurityDACParseIds(virSecurityLabelDefPtr seclabel, + uid_t *uidPtr, gid_t *gidPtr) { - uid_t uid; - gid_t gid; - virSecurityLabelDefPtr seclabel; - - if (def == NULL) - return 1; - - seclabel = virDomainDefGetSecurityLabelDef(def, SECURITY_DAC_NAME); - if (seclabel == NULL || seclabel->label == NULL) { - VIR_DEBUG("DAC seclabel for domain '%s' wasn't found", def->name); + if (!seclabel || !seclabel->label) return 1; - } - if (virParseOwnershipIds(seclabel->label, &uid, &gid) < 0) + if (virParseOwnershipIds(seclabel->label, uidPtr, gidPtr) < 0) return -1; - if (uidPtr) - *uidPtr = uid; - if (gidPtr) - *gidPtr = gid; - return 0; } static int -virSecurityDACGetIds(virDomainDefPtr def, virSecurityDACDataPtr priv, +virSecurityDACGetIds(virSecurityLabelDefPtr seclabel, + virSecurityDACDataPtr priv, uid_t *uidPtr, gid_t *gidPtr, gid_t **groups, int *ngroups) { int ret; - if (!def && !priv) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Failed to determine default DAC seclabel " - "for an unknown object")); - return -1; - } - if (groups) *groups = priv ? priv->groups : NULL; if (ngroups) *ngroups = priv ? priv->ngroups : 0; - if ((ret = virSecurityDACParseIds(def, uidPtr, gidPtr)) <= 0) + if ((ret = virSecurityDACParseIds(seclabel, uidPtr, gidPtr)) <= 0) return ret; if (!priv) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("DAC seclabel couldn't be determined " - "for domain '%s'"), def->name); + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("DAC seclabel couldn't be determined")); return -1; } - if (uidPtr) - *uidPtr = priv->user; - if (gidPtr) - *gidPtr = priv->group; + *uidPtr = priv->user; + *gidPtr = priv->group; return 0; } @@ -147,60 +133,36 @@ virSecurityDACGetIds(virDomainDefPtr def, virSecurityDACDataPtr priv, /* returns 1 if label isn't found, 0 on success, -1 on error */ static int -virSecurityDACParseImageIds(virDomainDefPtr def, +virSecurityDACParseImageIds(virSecurityLabelDefPtr seclabel, uid_t *uidPtr, gid_t *gidPtr) { - uid_t uid; - gid_t gid; - virSecurityLabelDefPtr seclabel; - - if (def == NULL) - return 1; - - seclabel = virDomainDefGetSecurityLabelDef(def, SECURITY_DAC_NAME); - if (seclabel == NULL || seclabel->imagelabel == NULL) { - VIR_DEBUG("DAC imagelabel for domain '%s' wasn't found", def->name); + if (!seclabel || !seclabel->imagelabel) return 1; - } - if (virParseOwnershipIds(seclabel->imagelabel, &uid, &gid) < 0) + if (virParseOwnershipIds(seclabel->imagelabel, uidPtr, gidPtr) < 0) return -1; - if (uidPtr) - *uidPtr = uid; - if (gidPtr) - *gidPtr = gid; - return 0; } static int -virSecurityDACGetImageIds(virDomainDefPtr def, virSecurityDACDataPtr priv, +virSecurityDACGetImageIds(virSecurityLabelDefPtr seclabel, + virSecurityDACDataPtr priv, uid_t *uidPtr, gid_t *gidPtr) { int ret; - if (!def && !priv) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Failed to determine default DAC imagelabel " - "for an unknown object")); - return -1; - } - - if ((ret = virSecurityDACParseImageIds(def, uidPtr, gidPtr)) <= 0) + if ((ret = virSecurityDACParseImageIds(seclabel, uidPtr, gidPtr)) <= 0) return ret; if (!priv) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("DAC imagelabel couldn't be determined " - "for domain '%s'"), def->name); + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("DAC imagelabel couldn't be determined")); return -1; } - if (uidPtr) - *uidPtr = priv->user; - if (gidPtr) - *gidPtr = priv->group; + *uidPtr = priv->user; + *gidPtr = priv->group; return 0; } @@ -324,20 +286,32 @@ err: static int -virSecurityDACSetSecurityFileLabel(virDomainDiskDefPtr disk ATTRIBUTE_UNUSED, +virSecurityDACSetSecurityFileLabel(virDomainDiskDefPtr disk, const char *path, size_t depth ATTRIBUTE_UNUSED, void *opaque) { - void **params = opaque; - virSecurityManagerPtr mgr = params[0]; - virDomainDefPtr def = params[1]; + virSecurityDACCallbackDataPtr cbdata = opaque; + virSecurityManagerPtr mgr = cbdata->manager; + virSecurityLabelDefPtr secdef = cbdata->secdef; virSecurityDACDataPtr priv = virSecurityManagerGetPrivateData(mgr); + virSecurityDeviceLabelDefPtr disk_seclabel; uid_t user; gid_t group; - if (virSecurityDACGetImageIds(def, priv, &user, &group)) - return -1; + disk_seclabel = virDomainDiskDefGetSecurityLabelDef(disk, + SECURITY_DAC_NAME); + + if (disk_seclabel && disk_seclabel->norelabel) + return 0; + + if (disk_seclabel && disk_seclabel->label) { + if (virParseOwnershipIds(disk_seclabel->label, &user, &group) < 0) + return -1; + } else { + if (virSecurityDACGetImageIds(secdef, priv, &user, &group)) + return -1; + } return virSecurityDACSetOwnership(path, user, group); } @@ -349,8 +323,9 @@ virSecurityDACSetSecurityImageLabel(virSecurityManagerPtr mgr, virDomainDiskDefPtr disk) { - void *params[2]; + virSecurityDACCallbackData cbdata; virSecurityDACDataPtr priv = virSecurityManagerGetPrivateData(mgr); + virSecurityLabelDefPtr secdef; if (!priv->dynamicOwnership) return 0; @@ -358,12 +333,16 @@ virSecurityDACSetSecurityImageLabel(virSecurityManagerPtr mgr, if (disk->type == VIR_DOMAIN_DISK_TYPE_NETWORK) return 0; - params[0] = mgr; - params[1] = def; + secdef = virDomainDefGetSecurityLabelDef(def, SECURITY_DAC_NAME); + if (secdef && secdef->norelabel) + return 0; + + cbdata.manager = mgr; + cbdata.secdef = secdef; return virDomainDiskDefForeachPath(disk, false, virSecurityDACSetSecurityFileLabel, - params); + &cbdata); } @@ -428,14 +407,14 @@ static int virSecurityDACSetSecurityHostdevLabelHelper(const char *file, void *opaque) { - void **params = opaque; - virSecurityManagerPtr mgr = params[0]; - virDomainDefPtr def = params[1]; + virSecurityDACCallbackDataPtr cbdata = opaque; + virSecurityManagerPtr mgr = cbdata->manager; + virSecurityLabelDefPtr secdef = cbdata->secdef; virSecurityDACDataPtr priv = virSecurityManagerGetPrivateData(mgr); uid_t user; gid_t group; - if (virSecurityDACGetIds(def, priv, &user, &group, NULL, NULL)) + if (virSecurityDACGetIds(secdef, priv, &user, &group, NULL, NULL)) return -1; return virSecurityDACSetOwnership(file, user, group); @@ -475,8 +454,8 @@ virSecurityDACSetSecurityHostdevLabel(virSecurityManagerPtr mgr, virDomainHostdevDefPtr dev, const char *vroot) { - void *params[] = {mgr, def}; virSecurityDACDataPtr priv = virSecurityManagerGetPrivateData(mgr); + virSecurityDACCallbackData cbdata; int ret = -1; if (!priv->dynamicOwnership) @@ -485,7 +464,13 @@ virSecurityDACSetSecurityHostdevLabel(virSecurityManagerPtr mgr, if (dev->mode != VIR_DOMAIN_HOSTDEV_MODE_SUBSYS) return 0; - switch (dev->source.subsys.type) { + cbdata.manager = mgr; + cbdata.secdef = virDomainDefGetSecurityLabelDef(def, SECURITY_DAC_NAME); + + if (cbdata.secdef && cbdata.secdef->norelabel) + return 0; + + switch ((enum virDomainHostdevSubsysType) dev->source.subsys.type) { case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_USB: { virUSBDevicePtr usb; @@ -498,8 +483,9 @@ virSecurityDACSetSecurityHostdevLabel(virSecurityManagerPtr mgr, if (!usb) goto done; - ret = virUSBDeviceFileIterate(usb, virSecurityDACSetSecurityUSBLabel, - params); + ret = virUSBDeviceFileIterate(usb, + virSecurityDACSetSecurityUSBLabel, + &cbdata); virUSBDeviceFree(usb); break; } @@ -522,11 +508,12 @@ virSecurityDACSetSecurityHostdevLabel(virSecurityManagerPtr mgr, virPCIDeviceFree(pci); goto done; } - ret = virSecurityDACSetSecurityPCILabel(pci, vfioGroupDev, params); + ret = virSecurityDACSetSecurityPCILabel(pci, vfioGroupDev, &cbdata); VIR_FREE(vfioGroupDev); } else { - ret = virPCIDeviceFileIterate(pci, virSecurityDACSetSecurityPCILabel, - params); + ret = virPCIDeviceFileIterate(pci, + virSecurityDACSetSecurityPCILabel, + &cbdata); } virPCIDeviceFree(pci); @@ -546,15 +533,15 @@ virSecurityDACSetSecurityHostdevLabel(virSecurityManagerPtr mgr, if (!scsi) goto done; - ret = virSCSIDeviceFileIterate(scsi, virSecurityDACSetSecuritySCSILabel, - params); + ret = virSCSIDeviceFileIterate(scsi, + virSecurityDACSetSecuritySCSILabel, + &cbdata); virSCSIDeviceFree(scsi); break; } - default: - ret = 0; + case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_LAST: break; } @@ -606,7 +593,7 @@ virSecurityDACRestoreSecurityHostdevLabel(virSecurityManagerPtr mgr, if (dev->mode != VIR_DOMAIN_HOSTDEV_MODE_SUBSYS) return 0; - switch (dev->source.subsys.type) { + switch ((enum virDomainHostdevSubsysType) dev->source.subsys.type) { case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_USB: { virUSBDevicePtr usb; @@ -684,34 +671,52 @@ done: static int virSecurityDACSetChardevLabel(virSecurityManagerPtr mgr, virDomainDefPtr def, - virDomainChrSourceDefPtr dev) + virDomainChrDefPtr dev, + virDomainChrSourceDefPtr dev_source) { virSecurityDACDataPtr priv = virSecurityManagerGetPrivateData(mgr); + virSecurityLabelDefPtr seclabel; + virSecurityDeviceLabelDefPtr chr_seclabel = NULL; char *in = NULL, *out = NULL; int ret = -1; uid_t user; gid_t group; - if (virSecurityDACGetIds(def, priv, &user, &group, NULL, NULL)) - return -1; + seclabel = virDomainDefGetSecurityLabelDef(def, SECURITY_DAC_NAME); - switch (dev->type) { + if (dev) + chr_seclabel = virDomainChrDefGetSecurityLabelDef(dev, + SECURITY_DAC_NAME); + + if (seclabel->norelabel || (chr_seclabel && chr_seclabel->norelabel)) + return 0; + + if (chr_seclabel && chr_seclabel->label) { + if (virParseOwnershipIds(chr_seclabel->label, &user, &group) < 0) + return -1; + } else { + if (virSecurityDACGetIds(seclabel, priv, &user, &group, NULL, NULL)) + return -1; + } + + switch ((enum virDomainChrType) dev_source->type) { case VIR_DOMAIN_CHR_TYPE_DEV: case VIR_DOMAIN_CHR_TYPE_FILE: - ret = virSecurityDACSetOwnership(dev->data.file.path, user, group); + ret = virSecurityDACSetOwnership(dev_source->data.file.path, + user, group); break; case VIR_DOMAIN_CHR_TYPE_PIPE: - if ((virAsprintf(&in, "%s.in", dev->data.file.path) < 0) || - (virAsprintf(&out, "%s.out", dev->data.file.path) < 0)) + if ((virAsprintf(&in, "%s.in", dev_source->data.file.path) < 0) || + (virAsprintf(&out, "%s.out", dev_source->data.file.path) < 0)) goto done; if (virFileExists(in) && virFileExists(out)) { if ((virSecurityDACSetOwnership(in, user, group) < 0) || (virSecurityDACSetOwnership(out, user, group) < 0)) { goto done; } - } else if (virSecurityDACSetOwnership(dev->data.file.path, + } else if (virSecurityDACSetOwnership(dev_source->data.file.path, user, group) < 0) { goto done; } @@ -736,7 +741,7 @@ virSecurityDACRestoreChardevLabel(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, char *in = NULL, *out = NULL; int ret = -1; - switch (dev->type) { + switch ((enum virDomainChrType) dev->type) { case VIR_DOMAIN_CHR_TYPE_DEV: case VIR_DOMAIN_CHR_TYPE_FILE: ret = virSecurityDACRestoreSecurityFileLabel(dev->data.file.path); @@ -789,7 +794,7 @@ virSecurityDACSetSecurityTPMFileLabel(virSecurityManagerPtr mgr, switch (tpm->type) { case VIR_DOMAIN_TPM_TYPE_PASSTHROUGH: - ret = virSecurityDACSetChardevLabel(mgr, def, + ret = virSecurityDACSetChardevLabel(mgr, def, NULL, &tpm->data.passthrough.source); break; case VIR_DOMAIN_TPM_TYPE_LAST: @@ -885,7 +890,7 @@ virSecurityDACSetChardevCallback(virDomainDefPtr def ATTRIBUTE_UNUSED, { virSecurityManagerPtr mgr = opaque; - return virSecurityDACSetChardevLabel(mgr, def, &dev->source); + return virSecurityDACSetChardevLabel(mgr, def, dev, &dev->source); } @@ -895,13 +900,17 @@ virSecurityDACSetSecurityAllLabel(virSecurityManagerPtr mgr, const char *stdin_path ATTRIBUTE_UNUSED) { virSecurityDACDataPtr priv = virSecurityManagerGetPrivateData(mgr); + virSecurityLabelDefPtr secdef; size_t i; uid_t user; gid_t group; - if (!priv->dynamicOwnership) + secdef = virDomainDefGetSecurityLabelDef(def, SECURITY_DAC_NAME); + + if (!priv->dynamicOwnership || (secdef && secdef->norelabel)) return 0; + for (i = 0; i < def->ndisks; i++) { /* XXX fixme - we need to recursively label the entire tree :-( */ if (def->disks[i]->type == VIR_DOMAIN_DISK_TYPE_DIR) @@ -932,7 +941,7 @@ virSecurityDACSetSecurityAllLabel(virSecurityManagerPtr mgr, return -1; } - if (virSecurityDACGetImageIds(def, priv, &user, &group)) + if (virSecurityDACGetImageIds(secdef, priv, &user, &group)) return -1; if (def->os.kernel && @@ -956,11 +965,14 @@ virSecurityDACSetSavedStateLabel(virSecurityManagerPtr mgr, virDomainDefPtr def, const char *savefile) { + virSecurityDACDataPtr priv = virSecurityManagerGetPrivateData(mgr); + virSecurityLabelDefPtr secdef; uid_t user; gid_t group; - virSecurityDACDataPtr priv = virSecurityManagerGetPrivateData(mgr); - if (virSecurityDACGetImageIds(def, priv, &user, &group)) + secdef = virDomainDefGetSecurityLabelDef(def, SECURITY_DAC_NAME); + + if (virSecurityDACGetImageIds(secdef, priv, &user, &group)) return -1; return virSecurityDACSetOwnership(savefile, user, group); @@ -985,13 +997,16 @@ static int virSecurityDACSetProcessLabel(virSecurityManagerPtr mgr, virDomainDefPtr def ATTRIBUTE_UNUSED) { + virSecurityDACDataPtr priv = virSecurityManagerGetPrivateData(mgr); + virSecurityLabelDefPtr secdef; uid_t user; gid_t group; gid_t *groups; int ngroups; - virSecurityDACDataPtr priv = virSecurityManagerGetPrivateData(mgr); - if (virSecurityDACGetIds(def, priv, &user, &group, &groups, &ngroups)) + secdef = virDomainDefGetSecurityLabelDef(def, SECURITY_DAC_NAME); + + if (virSecurityDACGetIds(secdef, priv, &user, &group, &groups, &ngroups)) return -1; VIR_DEBUG("Dropping privileges of DEF to %u:%u, %d supplemental groups", @@ -1009,11 +1024,14 @@ virSecurityDACSetChildProcessLabel(virSecurityManagerPtr mgr, virDomainDefPtr def ATTRIBUTE_UNUSED, virCommandPtr cmd) { + virSecurityDACDataPtr priv = virSecurityManagerGetPrivateData(mgr); + virSecurityLabelDefPtr secdef; uid_t user; gid_t group; - virSecurityDACDataPtr priv = virSecurityManagerGetPrivateData(mgr); - if (virSecurityDACGetIds(def, priv, &user, &group, NULL, NULL)) + secdef = virDomainDefGetSecurityLabelDef(def, SECURITY_DAC_NAME); + + if (virSecurityDACGetIds(secdef, priv, &user, &group, NULL, NULL)) return -1; VIR_DEBUG("Setting child to drop privileges of DEF to %u:%u", -- 1.9.0

2 1

[libvirt] [PATCH v2] dnsmasq: allowing RFC 2782 compliant SRV records
by Steven Malin 26 Mar '14

26 Mar '14

This patch allows RFC 2782 compliant SRV records in the network config and corrects the documentation. --- docs/formatnetwork.html.in | 6 +++--- src/conf/network_conf.c | 6 ++++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/docs/formatnetwork.html.in b/docs/formatnetwork.html.in index fc56b42..9d3e525 100644 --- a/docs/formatnetwork.html.in +++ b/docs/formatnetwork.html.in @@ -721,7 +721,7 @@ <txt name="example" value="example value" /> <forwarder addr="8.8.8.8"/> <forwarder addr="8.8.4.4"/> - <srv service='name' protocol='tcp' domain='test-domain-name' target='.' port='1024' priority='10' weight='10'/> + <srv service='_name' protocol='_tcp' domain='test-domain-name' target='.' port='1024' priority='10' weight='10'/> <host ip='192.168.122.2'> <hostname>myhost</hostname> <hostname>myhostalias</hostname> @@ -805,8 +805,8 @@ <dd>The <code>dns</code> element can have also 0 or more <code>srv</code> record elements. Each <code>srv</code> record element defines a DNS SRV record and has 2 mandatory and 5 optional attributes. The mandatory attributes - are service name and protocol (tcp, udp) and the optional attributes are - target, port, priority, weight and domain as defined in DNS server SRV + are service name (_name) and protocol (_tcp, _udp) and the optional attributes + are target, port, priority, weight and domain as defined in DNS server SRV RFC (RFC 2782). Since 0.9.9 </dd> diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index bac0465..c7d55c8 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -961,9 +961,11 @@ virNetworkDNSSrvDefParseXML(const char *networkName, goto error; } - /* Check whether protocol value is the supported one */ + /* Check whether protocol value is supported (allows RFC 2782 compliance) */ if (def->protocol && STRNEQ(def->protocol, "tcp") && - (STRNEQ(def->protocol, "udp"))) { + STRNEQ(def->protocol, "udp") && + STRNEQ(def->protocol, "_tcp") && + STRNEQ(def->protocol, "_udp")) { virReportError(VIR_ERR_XML_DETAIL, _("Invalid protocol attribute value '%s' " "in DNS SRV record of network %s"), -- 1.7.1

2 1

[libvirt] [PATCH 0/5] virCommandRunRegex cleanups
by Ján Tomko 26 Mar '14

26 Mar '14

Simplify the code. This should have no functional change (except for the impossible leak fix in 3/5). Most of this functionality is tested in viriscsitest. Ján Tomko (5): Remove useless 'maxReg' variable Simplify the loop in virCommandRunRegex Free groups in case of a partial match Use VIR_STRNDUP instead of modifying the matched string Shift the for loop over matched vars by one src/util/vircommand.c | 46 +++++++++++++++++++--------------------------- 1 file changed, 19 insertions(+), 27 deletions(-) -- 1.8.3.2

2 7

[libvirt] [RFC] VM which uses macvtap will not respond ping request when being migrated
by Wangrui (K) 26 Mar '14

26 Mar '14

A vm which uses macvtap will not respond ping request, when the vm is being migrated. I found that on the destination side the macvtap will send a IPv6 packet at the begin of migration to update the route table in switch, however VM is still on the src. In this case , what can I do to avoid VM's network disconnection Regards, Wangrui

3 3

[libvirt] [PATCH 0/3] v2: qemu: export disk snapshot capability
by Francesco Romani 26 Mar '14

26 Mar '14

This patch series extend the QEMU capabilities XML to report if the underlying QEMU binary supports, or not, the live disk snapshotting. Without this patch series, the only way to know if QEMU has this support is to actually request a disk snapshot and to see what happens. The change is split in three patches: * patch #1 actually adds the new element in the QEMU capabilities XML. formatcaps.html.in wasn't very detailed about the actual XML format, so I've not updated it. Anyone feel free to point out what should be added, and I'll comply. The new element has the form <disksnapshot default='value' toggle='off'> because I'd like to convey two informations: - disk snapshot is supposed to be here, and it is (default='on') - disk snapshot is supposed to be here, and is NOT (default='off') Put in a different way, I tried to help the client as much as possible. This patch was alread reviewed in the first version of this changeset and it is unchanged. * patch #2 Extracts the actual QMEU guest capability inizialitation from the binary probe/capabilities code, in order to isolate the actual initialization from the probing part. I added a new function for the real initialization and left the interface unchanged. Existing code will still call the old code which do the probing and after that calls the new initialization function. The main purpose of this patch is to * allow to write an unit test for this change * make the unit test more robust (with respect the first version of this change) and make it independent from the filesystem layout/qemu availability * patch #3 add a new unit test, aiming to test not only this new feature but also the whole output XML capabilities. Francesco Romani (3): qemu: export disk snapshot support in capabilities qemu: extract guest capabilities initialization qemu: add unit tests for the capabilities xml docs/schemas/capability.rng | 6 + src/qemu/qemu_capabilities.c | 50 +++-- src/qemu/qemu_capabilities.h | 7 + tests/Makefile.am | 10 +- tests/qemucaps2xmldata/all_1.6.0-1.caps | 142 ++++++++++++++ tests/qemucaps2xmldata/all_1.6.0-1.xml | 31 ++++ tests/qemucaps2xmldata/nodisksnapshot_1.6.0-1.caps | 141 ++++++++++++++ tests/qemucaps2xmldata/nodisksnapshot_1.6.0-1.xml | 31 ++++ tests/qemucaps2xmltest.c | 206 +++++++++++++++++++++ 9 files changed, 609 insertions(+), 15 deletions(-) create mode 100644 tests/qemucaps2xmldata/all_1.6.0-1.caps create mode 100644 tests/qemucaps2xmldata/all_1.6.0-1.xml create mode 100644 tests/qemucaps2xmldata/nodisksnapshot_1.6.0-1.caps create mode 100644 tests/qemucaps2xmldata/nodisksnapshot_1.6.0-1.xml create mode 100644 tests/qemucaps2xmltest.c -- 1.8.5.3

2 7

[libvirt] [PATCH v2 0/2] bhyve: add xml2args unittest
by Roman Bogorodskiy 26 Mar '14

26 Mar '14

Changes from v1: - Chase MAC address support by adding virMacAddrGenerate() mock, so we can get a constant MAC address - Add a test for the case when MAC address is specified in the domain xml Roman Bogorodskiy (2): Move virBhyveTapGetRealDeviceName to virnetdevtap bhyve: add xml2args unittest src/bhyve/bhyve_command.c | 70 +--------- src/libvirt_private.syms | 1 + src/util/virnetdevtap.c | 78 +++++++++++ src/util/virnetdevtap.h | 3 + tests/Makefile.am | 25 ++++ .../bhyvexml2argvdata/bhyvexml2argv-acpiapic.args | 3 + tests/bhyvexml2argvdata/bhyvexml2argv-acpiapic.xml | 24 ++++ tests/bhyvexml2argvdata/bhyvexml2argv-base.args | 3 + tests/bhyvexml2argvdata/bhyvexml2argv-base.xml | 20 +++ .../bhyvexml2argv-disk-virtio.args | 3 + .../bhyvexml2argv-disk-virtio.xml | 20 +++ tests/bhyvexml2argvdata/bhyvexml2argv-macaddr.args | 3 + tests/bhyvexml2argvdata/bhyvexml2argv-macaddr.xml | 21 +++ tests/bhyvexml2argvmock.c | 49 +++++++ tests/bhyvexml2argvtest.c | 155 +++++++++++++++++++++ 15 files changed, 409 insertions(+), 69 deletions(-) create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-acpiapic.args create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-acpiapic.xml create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-base.args create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-base.xml create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-disk-virtio.args create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-disk-virtio.xml create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-macaddr.args create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-macaddr.xml create mode 100644 tests/bhyvexml2argvmock.c create mode 100644 tests/bhyvexml2argvtest.c -- 1.8.4.2

2 5

[libvirt] [PATCH] qemuDomainAttachDeviceFlags: Parse device xml as inactive
by Michal Privoznik 26 Mar '14

26 Mar '14

In all other drivers we are doing so. Moreover, we don't want to parse runtime information in attach (even if the attach is meant as live) because we are generating the runtime info ourselves. We can't trust users they supply sane values anyway. ==1140== 9 bytes in 1 blocks are definitely lost in loss record 72 of 1,151 ==1140== at 0x4A06C2B: malloc (in /usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so) ==1140== by 0x623C758: xmlStrndup (in /usr/lib64/libxml2.so.2.9.1) ==1140== by 0x50FD763: virXMLPropString (virxml.c:483) ==1140== by 0x510F8B7: virDomainDeviceInfoParseXML (domain_conf.c:3685) ==1140== by 0x511ACFD: virDomainChrDefParseXML (domain_conf.c:7535) ==1140== by 0x5121D13: virDomainDeviceDefParse (domain_conf.c:9918) ==1140== by 0x13AE6313: qemuDomainAttachDeviceFlags (qemu_driver.c:6926) ==1140== by 0x13AE65FA: qemuDomainAttachDevice (qemu_driver.c:7005) ==1140== by 0x51C77DA: virDomainAttachDevice (libvirt.c:10231) ==1140== by 0x127FDD: remoteDispatchDomainAttachDevice (remote_dispatch.h:2404) ==1140== by 0x127EC5: remoteDispatchDomainAttachDeviceHelper (remote_dispatch.h:2382) ==1140== by 0x5241F81: virNetServerProgramDispatchCall (virnetserverprogram.c:437) When doing live attach, we are passing the inactive definition anyway since we are passing the result of virDomainDeviceDefCopy() which does inactive copy by default. Moreover, we are doing the same mistake in qemuhotplugtest. Just a side note - it makes perfect sense to parse the runtime info like alias in qemuDomainDetachDevice and qemuDomainUpdateDeviceFlags() as in some cases the only difference to distinguish two devices can be just their alias. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_driver.c | 6 +----- tests/qemuhotplugtest.c | 7 ++++++- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 2707bec..8678d24 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -6871,7 +6871,7 @@ static int qemuDomainAttachDeviceFlags(virDomainPtr dom, const char *xml, virDomainDefPtr vmdef = NULL; virDomainDeviceDefPtr dev = NULL, dev_copy = NULL; int ret = -1; - unsigned int affect, parse_flags = 0; + unsigned int affect, parse_flags = VIR_DOMAIN_XML_INACTIVE; virQEMUCapsPtr qemuCaps = NULL; qemuDomainObjPrivatePtr priv; virQEMUDriverConfigPtr cfg = NULL; @@ -6919,10 +6919,6 @@ static int qemuDomainAttachDeviceFlags(virDomainPtr dom, const char *xml, goto endjob; } - if ((flags & VIR_DOMAIN_AFFECT_CONFIG) && - !(flags & VIR_DOMAIN_AFFECT_LIVE)) - parse_flags |= VIR_DOMAIN_XML_INACTIVE; - dev = dev_copy = virDomainDeviceDefParse(xml, vm->def, caps, driver->xmlopt, parse_flags); diff --git a/tests/qemuhotplugtest.c b/tests/qemuhotplugtest.c index 4ef81e0..a7a4065 100644 --- a/tests/qemuhotplugtest.c +++ b/tests/qemuhotplugtest.c @@ -209,6 +209,7 @@ testQemuHotplug(const void *data) const char *const *tmp; bool fail = test->fail; bool keep = test->keep; + unsigned int device_parse_flags = 0; virDomainObjPtr vm = NULL; virDomainDeviceDefPtr dev = NULL; virCapsPtr caps = NULL; @@ -244,8 +245,12 @@ testQemuHotplug(const void *data) goto cleanup; } + if (test->action == ATTACH) + device_parse_flags = VIR_DOMAIN_XML_INACTIVE; + if (!(dev = virDomainDeviceDefParse(device_xml, vm->def, - caps, driver.xmlopt, 0))) + caps, driver.xmlopt, + device_parse_flags))) goto cleanup; /* Now is the best time to feed the spoofed monitor with predefined -- 1.9.0

2 1

[libvirt] [PATCH v5 0/2] fix query-command-line-options
by Amos Kong 26 Mar '14

26 Mar '14

This patchset fixed some issues of query-command-line-options: * some new options that haven't argument can't be queried. (eg: -enable-fips) * some legacy options that have argument can't be queried. (eg: -vnc display) More discussion: http://marc.info/?l=qemu-devel&m=139081830416684&w=2 V2: remove duplicate option tables, update schema (eric) V3: fix typo in commitlog and export qemu_options talbe (eric) V4: avoid the duplicate static table (eric) V5: rename new field, other fix (markus) Thanks for your review! Amos Kong (2): qmp: rename query_option_descs() to get_param_infolist() query-command-line-options: query all the options in qemu-options.hx qapi-schema.json | 9 +++++++-- qemu-options.h | 12 ++++++++++++ util/qemu-config.c | 49 +++++++++++++++++++++++++++++++++++++++---------- vl.c | 19 ++----------------- 4 files changed, 60 insertions(+), 29 deletions(-) -- 1.8.5.3

2 4

[libvirt] [libvirt-java] [PATCH 0/2] Ensure JNA callbacks cannot be GCed
by Chris Ellis 26 Mar '14

26 Mar '14

Hi. This is a small patch set to fix a few issues I've discovered while testing Claudio's patch set. The first patch is trivial, it adds the ConnectionCloseListener interface and corresponding enum, which were missing. The second patch ensures that the JNA callbacks cannot be garbage collected whilst still registered with the libvirt C library. Durring testing, I was finding that events would stop working. Wireshark showed the remote daemon sending the event and some time spent tracing through the libvirt calls led me to discover that the JNA callback objects were being GCed. The JNA documentation states that a reference to the Callback object must be held whilst it is in use by the C layer. This patch updates the map of event listeners to also hold a reference to the callback object. Regards, Chris Chris Ellis (2): Add close listener types Ensure JNA callbacks cannot get GCed src/main/java/org/libvirt/Connect.java | 37 ++++++++++++++-------- .../org/libvirt/event/ConnectionCloseListener.java | 9 ++++++ .../org/libvirt/event/ConnectionCloseReason.java | 8 +++++ 3 files changed, 41 insertions(+), 13 deletions(-) create mode 100644 src/main/java/org/libvirt/event/ConnectionCloseListener.java create mode 100644 src/main/java/org/libvirt/event/ConnectionCloseReason.java -- 1.8.4.5

2 5

[libvirt] question for <interface> in ethernet type and multiple queues in KVM (start VM failed)
by Wangrui (K) 26 Mar '14

26 Mar '14

Hi, I use ethernet vif for VM (libvirt 1.1.0 qemu 1.5.1). xml as such <interface type='ethernet'> <script path='' /> <target dev='tap_mq'/> <mac address='52:54:00:19:9e:4e'/> <model type='virtio' /> <driver name='vhost' queues='2'/> </interface> tap_mq is a tap device with multi_queue property which was created on host by ip command, such as follows #ip tuntap add tap_mq mode tap multi_queue I want to use multiple queue feature for this vif so I set queues='2' in xml. When start VM , an error occurs "error: unsupported configuration: Multiqueue network is not supported for: ethernet". This error is reported from function qemuBuildInterfaceCommandLine /* Currently nothing besides TAP devices supports multiqueue. */ if (net->driver.virtio.queues > 0 && !(actualType == VIR_DOMAIN_NET_TYPE_NETWORK || actualType == VIR_DOMAIN_NET_TYPE_BRIDGE)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Multiqueue network is not supported for: %s"), virDomainNetTypeToString(actualType)); return -1; } The comment specifies that only TAP device supports multiqueue. But VIR_DOMAIN_NET_TYPE_ETHERNET is also TAP device I think. IMHO, libvirt can build qemu commandline as "-device virtio-net,netdev=net1,mq=on,vectors=5,mac=52:54:00:19:9e:4e" "-netdev type=tap,ifname=tap0,id=net1,vhost=on,vhostforce=on,queues=2". Qemu can open tapfds and vhostfds by itself other than libvirt opens and transfers them to qemu in this case. Or there's other way to use multiqueue feature in ethernet tpye ? Regards, Rui

4 4

[libvirt] [PATCH] maint: use $(SED) instead of sed for syntax-check
by Roman Bogorodskiy 26 Mar '14

26 Mar '14

Some syntax-check rules use GNU sed specific regexps, so allow to override which sed would be used to fix 'syntax-check' for non GNU-userland systems. --- cfg.mk | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/cfg.mk b/cfg.mk index 207dfeb..bd984bd 100644 --- a/cfg.mk +++ b/cfg.mk @@ -614,7 +614,7 @@ sc_libvirt_unmarked_diagnostics: $(_sc_search_regexp) @{ grep -nE '\<$(func_re) *$.*;$$' $$($(VC_LIST_EXCEPT)); \ grep -A1 -nE '\<$(func_re) *\(.*,$$' $$($(VC_LIST_EXCEPT)); } \ - | sed 's/_("\([^\"]\|\\.$\+"//;s/[ ]"%s"//' \ + | $(SED) 's/_("$[^\"]\|\\.$\+"//;s/[ ]"%s"//' \ | grep '[ ]"' && \ { echo '$(ME): found unmarked diagnostic(s)' 1>&2; \ exit 1; } || : @@ -639,7 +639,7 @@ sc_prohibit_newline_at_end_of_diagnostic: sc_prohibit_diagnostic_without_format: @{ grep -nE '\<$(func_re) *$.*;$$' $$($(VC_LIST_EXCEPT)); \ grep -A2 -nE '\<$(func_re) *\(.*,$$' $$($(VC_LIST_EXCEPT)); } \ - | sed -rn -e ':l; /[,"]$$/ {N;b l;}' \ + | $(SED) -rn -e ':l; /[,"]$$/ {N;b l;}' \ -e '/(xenapiSessionErrorHandler|vah_(error|warning))/d' \ -e '/\<$(func_re) *\([^"]*"([^%"]|"\n[^"]*")*"[,)]/p' \ | grep -vE 'VIR_ERROR' && \ @@ -661,7 +661,7 @@ sc_prohibit_useless_translation: # or \n on one side of the split. sc_require_whitespace_in_translation: @grep -n -A1 '"$$' $$($(VC_LIST_EXCEPT)) \ - | sed -ne ':l; /"$$/ {N;b l;}; s/"\n[^"]*"/""/g; s/\\n/ /g' \ + | $(SED) -ne ':l; /"$$/ {N;b l;}; s/"\n[^"]*"/""/g; s/\\n/ /g' \ -e '/_(.*[^\ ]""[^\ ]/p' | grep . && \ { echo '$(ME): missing whitespace at line split' 1>&2; \ exit 1; } || : @@ -681,11 +681,11 @@ sc_preprocessor_indentation: sc_spec_indentation: @if cppi --version >/dev/null 2>&1; then \ for f in $$($(VC_LIST_EXCEPT) | grep '\.spec\.in$$'); do \ - sed -e 's|#|// #|; s|%ifn*\(arch$* |#if a // |' \ + $(SED) -e 's|#|// #|; s|%ifn*$arch$* |#if a // |' \ -e 's/%$else\|endif\|define$/#\1/' \ -e 's/^$ *$\1\1\1#/#\1/' \ -e 's|^$ *[^#/ ]$|// \1|; s|^$ */[^/]$|// \1|' $$f \ - | cppi -a -c 2>&1 | sed "s|standard input|$$f|"; \ + | cppi -a -c 2>&1 | $(SED) "s|standard input|$$f|"; \ done | { if grep . >&2; then false; else :; fi; } \ || { echo '$(ME): incorrect preprocessor indentation' 1>&2; \ exit 1; }; \ @@ -777,7 +777,7 @@ sc_prohibit_cross_inclusion: # elements added to the enum by using a _LAST marker. sc_require_enum_last_marker: @grep -A1 -nE '^[^#]*VIR_ENUM_IMPL *\(' $$($(VC_LIST_EXCEPT)) \ - | sed -ne '/VIR_ENUM_IMPL[^,]*,$$/N' \ + | $(SED) -ne '/VIR_ENUM_IMPL[^,]*,$$/N' \ -e '/VIR_ENUM_IMPL[^,]*,[^,]*[^_,][^L,][^A,][^S,][^T,],/p' \ -e '/VIR_ENUM_IMPL[^,]*,[^,]\{0,4\},/p' \ | grep . && \ @@ -878,7 +878,7 @@ ifeq (0,$(MAKELEVEL)) # b653eda3ac4864de205419d9f41eec267cb89eeb # # Keep this logic in sync with autogen.sh. - _submodule_hash = sed 's/^[ +-]//;s/ .*//' + _submodule_hash = $(SED) 's/^[ +-]//;s/ .*//' _update_required := $(shell \ cd '$(srcdir)'; \ test -d .git || { echo 0; exit; }; \ -- 1.8.4.3

3 4

[libvirt] [PATCH] qemu: remove redundant virQEMUDriverGetConfig
by Tomoki Sekiyama 26 Mar '14

26 Mar '14

qemuDomainSetSchedulerParametersFlags() calls virQEMUDriverGetConfig() twice and makes the reference counter leak. This removes redundant call. --- src/qemu/qemu_driver.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 76f789e..ca971f3 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -9050,7 +9050,6 @@ qemuDomainSetSchedulerParametersFlags(virDomainPtr dom, if (virDomainSetSchedulerParametersFlagsEnsureACL(dom->conn, vm->def, flags) < 0) goto cleanup; - cfg = virQEMUDriverGetConfig(driver); if (!cfg->privileged) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("CPU tuning is not available in session mode"));

4 3

[libvirt] [PATCH 0/3] Resolve recent/new Coverity warnings
by John Ferlan 26 Mar '14

26 Mar '14

For virlog.c and commandtest.c - it seems recent changes within the modules have allowed Coverity to dig deeper and find different issues. Not sure why Coverity has that "ability"... Since I was making changes, figured I'd clean up the lxc_controller fd leak as well - these should clean the Jenkins build environment. John Ferlan (3): Coverity: Resolve a CHECKED_RETURN message Coverity: Resolve a FORWARD_NULL Coverity: Resolve a RESOURCE_LEAK src/lxc/lxc_controller.c | 14 ++++++++++---- src/util/virlog.c | 2 +- tests/commandtest.c | 1 + 3 files changed, 12 insertions(+), 5 deletions(-) -- 1.8.5.3

3 8

[libvirt] [libvirt-java] [PATCH] Set Java source level in pom
by Chris Ellis 26 Mar '14

26 Mar '14

Hi Simple patch to set the Java source level within the pom, this makes it easier to import the project into Eclipse. I've also added an ignore for a local pom file. I've added plugins to publish the sources and javadocs into Maven. This allows Maven (and IDE integration) to automatically use the javadocs and source. This should make life easier for users of libvirt-java. Regards, Chris Chris Ellis (1): Update pom to include Java source level .gitignore | 1 + pom.xml.in | 41 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+) -- 1.8.4.5

3 6

[libvirt] [PATCHv2 0/2] Fix zero cpu shares handling
by Ján Tomko 26 Mar '14

26 Mar '14

Treat 0 as a valid value for cputune shares. v1: https://www.redhat.com/archives/libvir-list/2014-March/msg00215.html v2: squashed the fixup that was sent as a separate patch to the first commit and fixed two more occurences (one of them pointed out by Martin) Ján Tomko (2): Treat zero cpu shares as a valid value Show the real cpu shares value in live xml src/conf/domain_conf.c | 12 ++++---- src/conf/domain_conf.h | 1 + src/lxc/lxc_cgroup.c | 13 ++++++-- src/lxc/lxc_driver.c | 8 ++++- src/lxc/lxc_native.c | 8 +++-- src/parallels/parallels_driver.c | 1 + src/qemu/qemu_cgroup.c | 14 ++++++--- src/qemu/qemu_command.c | 2 +- src/qemu/qemu_driver.c | 13 ++++++-- src/vmx/vmx.c | 3 +- .../qemuxml2argv-cputune-zero-shares.args | 5 ++++ .../qemuxml2argv-cputune-zero-shares.xml | 35 ++++++++++++++++++++++ tests/qemuxml2argvtest.c | 1 + tests/qemuxml2xmltest.c | 1 + 14 files changed, 97 insertions(+), 20 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-cputune-zero-shares.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-cputune-zero-shares.xml -- 1.8.3.2

2 5

[libvirt] [libivrt][RFC]Send "netdev_del" command after receive the DEVICE_DELETED event
by x00221466 26 Mar '14

26 Mar '14

Hi all: There maybe a bug about detaching virtual net device（such as virtio nic、 RTL8138、E1000）。 When live detaching the net device, there are some problems: (1)If the Guest OS don't support the hot plugging pci device, detach the virtual network device by Libvirt, the "net device" in Qemu will still exist, but "hostnet"(tap) in Qemu will be removed. so the net device in Guest OS will be of no effect. (2)If reject the nic in Guest OS, Qemu will remove the "net device", then Qemu send DEVICE_DELETED to Libvirt, Libvirt receive the event in event-loop thread and release info of the net device in qemuDomainRemoveNetDevice func. but "hostnet" in Qemu still exist. So next live attaching virtual net device will be failed because of "Duplicate ID". #virsh attach-device win2008_st_r2_64 net.xml --live error: Failed to attach device from net.xml error: internal error: unable to execute QEMU command 'netdev_add': Duplicate ID 'hostnet0' for netdev (3)In addition, in qemuDomainDetachNetDevice, detach net device func, "netdev_del" command will be sent after sending "device_del" command at once. So it is violent to remove the tap device before the net device is completely removed. So I think it's more logical that doing the work of sending Qemu command "netdev_del" after receive the DEVICE_DELETED event. It can avoid the conflict of device info between Libvirt side and Qemu side. I create a thread in qemuDomainRemoveDevice,the handle of DEVICE_DELETED event, to execute QEMU command "netdev_del". But I find there is another problem when sending monitor msg in multiply threads. in "qemuMonitorSend", monitor lock maybe unlocked and locked, so another thread has the opportunity to get the monitor lock, and use the same monitor. It will occur error. I wonder if it is workable that sending "netdev_del" command after receive the DEVICE_DELETED event. Thanks. -xie

1 0

[libvirt] [PATCH python 0/4] setup.py: Don't unconditionally run pkg-config
by Cole Robinson 25 Mar '14

25 Mar '14

This series reorganizes setup.py to not unconditionally call pkg-config. This will allow 'setup.py clean' and 'setup.py --help' to work correctly even if pkg-config or libvirt-devel aren't installed. https://bugzilla.redhat.com/show_bug.cgi?id=1074170 Cole Robinson (4): setup.py: Remove unused import setup.py: Move module list building to its own function setup.py: Make have_libvirt_lxc a function setup.py: Allow running --help or clean without pkg-config setup.py | 144 +++++++++++++++++++++++++++++++++++++-------------------------- 1 file changed, 85 insertions(+), 59 deletions(-) -- 1.8.5.3

2 6

[libvirt] [PATCH] bhyve: don't fail on busy tap devices
by Roman Bogorodskiy 25 Mar '14

25 Mar '14

We use virBhyveTapGetRealDeviceName() to map network interface name to a real device path, trying to open possible devices and getting names by ioctl. Make it skip devices that fail to open with EBUSY because they're most likely already used by other VMs. --- src/bhyve/bhyve_command.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/bhyve/bhyve_command.c b/src/bhyve/bhyve_command.c index 6d64c27..e569aab 100644 --- a/src/bhyve/bhyve_command.c +++ b/src/bhyve/bhyve_command.c @@ -69,6 +69,8 @@ virBhyveTapGetRealDeviceName(char *name) goto cleanup; } if ((fd = open(devpath, O_RDWR)) < 0) { + if (errno == EBUSY) + continue; virReportSystemError(errno, _("Unable to open '%s'"), devpath); goto cleanup; } -- 1.8.4.2

2 2

[libvirt] [PATCH] libxl: Create log directory earlier
by Stefan Bader 25 Mar '14

25 Mar '14

Commit d9f19c30d054c86b15a304f4118baa4fa75af9d2 moved a lot of the configuration setup into libxlDriverConfigNew(). However that tries to create the libxl/libxl-driver.log before the libxl directory gets created in libxlStateInitialize(). This causes the daemon to fail on systems that have not had the directory created before. Move the code to create the libxl directory into libxlDriverConfigNew(). Signed-off-by: Stefan Bader <stefan.bader(a)canonical.com> --- src/libxl/libxl_conf.c | 8 ++++++++ src/libxl/libxl_driver.c | 7 ------- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c index a6bf1cf..56bb84a 100644 --- a/src/libxl/libxl_conf.c +++ b/src/libxl/libxl_conf.c @@ -1108,6 +1108,14 @@ libxlDriverConfigNew(void) if (virAsprintf(&log_file, "%s/libxl-driver.log", cfg->logDir) < 0) goto error; + if (virFileMakePath(cfg->logDir) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("failed to create log dir '%s': %s"), + cfg->logDir, + virStrerror(errno, ebuf, sizeof(ebuf))); + goto error; + } + if ((cfg->logger_file = fopen(log_file, "a")) == NULL) { VIR_ERROR(_("Failed to create log file '%s': %s"), log_file, virStrerror(errno, ebuf, sizeof(ebuf))); diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index 0c6672b..e6316a7 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -306,13 +306,6 @@ libxlStateInitialize(bool privileged, goto error; libxl_driver->config = cfg; - if (virFileMakePath(cfg->logDir) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("failed to create log dir '%s': %s"), - cfg->logDir, - virStrerror(errno, ebuf, sizeof(ebuf))); - goto error; - } if (virFileMakePath(cfg->stateDir) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("failed to create state dir '%s': %s"), -- 1.7.9.5

2 1

[libvirt] [PATCHv2] network: fix problems with SRV records
by Laine Stump 25 Mar '14

25 Mar '14

A patch submitted by Steven Malin last week pointed out a problem with libvirt's DNS SRV record configuration: https://www.redhat.com/archives/libvir-list/2014-March/msg00536.html When searching for that message later, I found another series that had been posted by Guannan Ren back in 2012 that somehow slipped between the cracks: https://www.redhat.com/archives/libvir-list/2012-July/msg00236.html That patch was very much out of date, but also pointed out some real problems. This patch fixes all the noted problems by refactoring virNetworkDNSSrvDefParseXML() and networkDnsmasqConfContents(), then verifies those fixes by added several new records to the test case. Problems fixed: * both service and protocol now have an underscore ("_") prepended on the commandline, as required by RFC2782. <srv service='sip' protocol='udp' domain='example.com' target='tests.example.com' port='5060' priority='10' weight='150'/> before: srv-host=sip.udp.example.com,tests.example.com,5060,10,150 after: srv-host=_sip._udp.example.com,tests.example.com,5060,10,150 * if "domain" wasn't specified in the <srv> element, the extra trailing "." will no longer be added to the dnsmasq commandline. <srv service='sip' protocol='udp' target='tests.example.com' port='5060' priority='10' weight='150'/> before: srv-host=sip.udp.,tests.example.com,5060,10,150 after: srv-host=_sip._udp,tests.example.com,5060,10,150 * when optional attributes aren't specified, the separating comma is also now not placed on the dnsmasq commandline. If optional attributes in the middle of the line are not specified, they are replaced with a default value in the commandline (1 for port, 0 for priority and weight). <srv service='sip' protocol='udp' target='tests.example.com' port='5060'/> before: srv-host=sip.udp.,tests.example.com,5060,, after: srv-host=_sip._udp,tests.example.com,5060 (actually the would have generated an error, because "optional" attributes weren't really optional.) * The allowed characters for both service and protocol are now limited to alphanumerics, plus a few special characters that are found in existing names in /etc/services and /etc/protocols. (One exception is that both of these files contain names with an embedded ".", but "." can't be used in these fields of an SRV record because it is used as a field separator and there is no method to escape a "." into a field.) (Previously only the strings "tcp" and "udp" were allowed for protocol, but this restriction has been removed, since RFC2782 specifically says that it isn't limited to those, and that anyway it is case insensitive.) * the "domain" attribute is no longer required in order to recognize the port, priority, and weight attributes during parsing. Only "target" is required for this. * if "target" isn't specified, port, priority, and weight are not allowed (since they are meaningless - an empty target means "this service is *not available* for this domain"). * port, priority, and weight are now truly optional, as the comments originally suggested, but which was not actually true. --- Changes from V1: https://www.redhat.com/archives/libvir-list/2014-March/msg01172.html src/conf/network_conf.c | 129 ++++++++++++++------- src/network/bridge_driver.c | 80 ++++++++----- .../nat-network-dns-srv-record-minimal.conf | 2 +- .../nat-network-dns-srv-record.conf | 8 +- .../nat-network-dns-srv-record.xml | 8 +- 5 files changed, 149 insertions(+), 78 deletions(-) diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index 9be06d3..f1e6243 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -924,6 +924,21 @@ error: return -1; } +/* This includes all characters used in the names of current + * /etc/services and /etc/protocols files (on Fedora 20), except ".", + * which we can't allow because it would conflict with the use of "." + * as a field separator in the SRV record, there appears to be no way + * to escape it in, and the protocols/services that use "." in the + * name are obscure and unlikely to be used anyway. + */ +#define PROTOCOL_CHARS \ + "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789" \ + "-+/" + +#define SERVICE_CHARS \ + "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789" \ + "_-+/*" + static int virNetworkDNSSrvDefParseXML(const char *networkName, xmlNodePtr node, @@ -931,80 +946,108 @@ virNetworkDNSSrvDefParseXML(const char *networkName, virNetworkDNSSrvDefPtr def, bool partialOkay) { + int ret; + xmlNodePtr save_ctxt = ctxt->node; + + ctxt->node = node; + if (!(def->service = virXMLPropString(node, "service")) && !partialOkay) { virReportError(VIR_ERR_XML_DETAIL, _("Missing required service attribute in DNS SRV record " "of network %s"), networkName); goto error; } - if (def->service && strlen(def->service) > DNS_RECORD_LENGTH_SRV) { - virReportError(VIR_ERR_XML_DETAIL, - _("Service name '%s' in network %s is too long, limit is %d bytes"), - def->service, networkName, DNS_RECORD_LENGTH_SRV); - goto error; + if (def->service) { + if (strlen(def->service) > DNS_RECORD_LENGTH_SRV) { + virReportError(VIR_ERR_XML_DETAIL, + _("service attribute '%s' in network %s is too long, " + "limit is %d bytes"), + def->service, networkName, DNS_RECORD_LENGTH_SRV); + goto error; + } + if (strspn(def->service, SERVICE_CHARS) < strlen(def->service)) { + virReportError(VIR_ERR_XML_DETAIL, + _("invalid character in service attribute '%s' " + "in network %s DNS SRV record"), + def->service, networkName); + goto error; + } } if (!(def->protocol = virXMLPropString(node, "protocol")) && !partialOkay) { virReportError(VIR_ERR_XML_DETAIL, _("Missing required protocol attribute " - "in dns srv record '%s' of network %s"), + "in DNS SRV record '%s' of network %s"), def->service, networkName); goto error; } - - /* Check whether protocol value is the supported one */ - if (def->protocol && STRNEQ(def->protocol, "tcp") && - (STRNEQ(def->protocol, "udp"))) { + if (def->protocol && + strspn(def->protocol, PROTOCOL_CHARS) < strlen(def->protocol)) { virReportError(VIR_ERR_XML_DETAIL, - _("Invalid protocol attribute value '%s' " - "in DNS SRV record of network %s"), + _("invalid character in protocol attribute '%s' " + "in network %s DNS SRV record"), def->protocol, networkName); goto error; } /* Following attributes are optional */ - if ((def->target = virXMLPropString(node, "target")) && - (def->domain = virXMLPropString(node, "domain"))) { - xmlNodePtr save_ctxt = ctxt->node; - - ctxt->node = node; - if (virXPathUInt("string(./@port)", ctxt, &def->port) < 0 || - def->port > 65535) { - virReportError(VIR_ERR_XML_DETAIL, - _("Missing or invalid port attribute " - "in network %s"), networkName); - goto error; - } - - if (virXPathUInt("string(./@priority)", ctxt, &def->priority) < 0 || - def->priority > 65535) { - virReportError(VIR_ERR_XML_DETAIL, - _("Missing or invalid priority attribute " - "in network %s"), networkName); - goto error; - } + def->domain = virXMLPropString(node, "domain"); + def->target = virXMLPropString(node, "target"); - if (virXPathUInt("string(./@weight)", ctxt, &def->weight) < 0 || - def->weight > 65535) { - virReportError(VIR_ERR_XML_DETAIL, - _("Missing or invalid weight attribute " - "in network %s"), networkName); - goto error; - } + ret = virXPathUInt("string(./@port)", ctxt, &def->port); + if (ret >= 0 && !def->target) { + virReportError(VIR_ERR_XML_DETAIL, + _("DNS SRV port attribute not permitted without " + "target for service %s in network %s"), + def->service, networkName); + goto error; + } + if (ret == -2 || (ret >= 0 && (def->port < 1 || def->port > 65535))) { + virReportError(VIR_ERR_XML_DETAIL, + _("Invalid DNS SRV port attribute " + "for service %s in network %s"), + def->service, networkName); + goto error; + } - ctxt->node = save_ctxt; + ret = virXPathUInt("string(./@priority)", ctxt, &def->priority); + if (ret >= 0 && !def->target) { + virReportError(VIR_ERR_XML_DETAIL, + _("DNS SRV priority attribute not permitted without " + "target for service %s in network %s"), + def->service, networkName); + goto error; + } + if (ret == -2 || (ret >= 0 && def->priority > 65535)) { + virReportError(VIR_ERR_XML_DETAIL, + _("Invalid DNS SRV priority attribute " + "for service %s in network %s"), + def->service, networkName); + goto error; } - if (!(def->service || def->protocol)) { + ret = virXPathUInt("string(./@weight)", ctxt, &def->weight); + if (ret >= 0 && !def->target) { virReportError(VIR_ERR_XML_DETAIL, - _("Missing required service attribute or protocol " - "in DNS SRV record of network %s"), networkName); + _("DNS SRV weight attribute not permitted without " + "target for service %s in network %s"), + def->service, networkName); + goto error; + } + if (ret == -2 || (ret >= 0 && def->weight > 65535)) { + virReportError(VIR_ERR_XML_DETAIL, + _("Invalid DNS SRV weight attribute " + "for service %s in network %s"), + def->service, networkName); goto error; } + + ctxt->node = save_ctxt; return 0; error: virNetworkDNSSrvDefClear(def); + ctxt->node = save_ctxt; return -1; } diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 59b6c09..e256dba 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -736,10 +736,6 @@ networkDnsmasqConfContents(virNetworkObjPtr network, int r, ret = -1; int nbleases = 0; size_t i; - char *record = NULL; - char *recordPort = NULL; - char *recordWeight = NULL; - char *recordPriority = NULL; virNetworkDNSDefPtr dns = &network->def->dns; virNetworkIpDefPtr tmpipdef, ipdef, ipv4def, ipv6def; bool ipv6SLAAC; @@ -880,33 +876,57 @@ networkDnsmasqConfContents(virNetworkObjPtr network, } for (i = 0; i < dns->nsrvs; i++) { - if (dns->srvs[i].service && dns->srvs[i].protocol) { - if (dns->srvs[i].port && - virAsprintf(&recordPort, "%d", dns->srvs[i].port) < 0) - goto cleanup; - if (dns->srvs[i].priority && - virAsprintf(&recordPriority, "%d", dns->srvs[i].priority) < 0) - goto cleanup; - if (dns->srvs[i].weight && - virAsprintf(&recordWeight, "%d", dns->srvs[i].weight) < 0) - goto cleanup; + /* service/protocol are required, and should have been validated + * by the parser. + */ + if (!dns->srvs[i].service) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Missing required 'service' " + "attribute in SRV record of network '%s'"), + network->def->name); + goto cleanup; + } + if (!dns->srvs[i].protocol) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Missing required 'service' " + "attribute in SRV record of network '%s'"), + network->def->name); + goto cleanup; + } + /* RFC2782 requires that service and protocol be preceded by + * an underscore. + */ + virBufferAsprintf(&configbuf, "srv-host=_%s._%s", + dns->srvs[i].service, dns->srvs[i].protocol); - if (virAsprintf(&record, "%s.%s.%s,%s,%s,%s,%s", - dns->srvs[i].service, - dns->srvs[i].protocol, - dns->srvs[i].domain ? dns->srvs[i].domain : "", - dns->srvs[i].target ? dns->srvs[i].target : "", - recordPort ? recordPort : "", - recordPriority ? recordPriority : "", - recordWeight ? recordWeight : "") < 0) - goto cleanup; + /* domain is optional - it defaults to the domain of this network */ + if (dns->srvs[i].domain) + virBufferAsprintf(&configbuf, ".%s", dns->srvs[i].domain); - virBufferAsprintf(&configbuf, "srv-host=%s\n", record); - VIR_FREE(record); - VIR_FREE(recordPort); - VIR_FREE(recordWeight); - VIR_FREE(recordPriority); + /* If target is empty or ".", that means "the service is + * decidedly not available at this domain" (RFC2782). In that + * case, any port, priority, or weight is irrelevant. + */ + if (dns->srvs[i].target && STRNEQ(dns->srvs[i].target, ".")) { + + virBufferAsprintf(&configbuf, ",%s", dns->srvs[i].target); + /* port, priority, and weight are optional, but are + * identified by their position in the line. If an item is + * unspecified, but something later in the line *is* + * specified, we need to give the default value for the + * unspecified item. (According to the dnsmasq manpage, + * the default for port is 1). + */ + if (dns->srvs[i].port || + dns->srvs[i].priority || dns->srvs[i].weight) + virBufferAsprintf(&configbuf, ",%d", + dns->srvs[i].port ? dns->srvs[i].port : 1); + if (dns->srvs[i].priority || dns->srvs[i].weight) + virBufferAsprintf(&configbuf, ",%d", dns->srvs[i].priority); + if (dns->srvs[i].weight) + virBufferAsprintf(&configbuf, ",%d", dns->srvs[i].weight); } + virBufferAddLit(&configbuf, "\n"); } /* Find the first dhcp for both IPv4 and IPv6 */ @@ -1082,10 +1102,6 @@ networkDnsmasqConfContents(virNetworkObjPtr network, cleanup: virBufferFreeAndReset(&configbuf); - VIR_FREE(record); - VIR_FREE(recordPort); - VIR_FREE(recordWeight); - VIR_FREE(recordPriority); return ret; } diff --git a/tests/networkxml2confdata/nat-network-dns-srv-record-minimal.conf b/tests/networkxml2confdata/nat-network-dns-srv-record-minimal.conf index ce4dd6f..e60411b 100644 --- a/tests/networkxml2confdata/nat-network-dns-srv-record-minimal.conf +++ b/tests/networkxml2confdata/nat-network-dns-srv-record-minimal.conf @@ -12,7 +12,7 @@ listen-address=192.168.123.1 listen-address=fc00:db8:ac10:fe01::1 listen-address=fc00:db8:ac10:fd01::1 listen-address=10.24.10.1 -srv-host=name.tcp.,,,, +srv-host=_name._tcp dhcp-range=192.168.122.2,192.168.122.254 dhcp-no-override dhcp-leasefile=/var/lib/libvirt/dnsmasq/default.leases diff --git a/tests/networkxml2confdata/nat-network-dns-srv-record.conf b/tests/networkxml2confdata/nat-network-dns-srv-record.conf index b47cbe7..16e7dca 100644 --- a/tests/networkxml2confdata/nat-network-dns-srv-record.conf +++ b/tests/networkxml2confdata/nat-network-dns-srv-record.conf @@ -8,7 +8,13 @@ strict-order except-interface=lo bind-dynamic interface=virbr0 -srv-host=name.tcp.test-domain-name,.,1024,10,10 +srv-host=_name._tcp.test-domain-name.com,test.example.com,1111,11,111 +srv-host=_name2._udp,test2.example.com,2222,22,222 +srv-host=_name3._tcp.test3.com,test3.example.com,3333,33 +srv-host=_name4._tcp.test4.com,test4.example.com,4444 +srv-host=_name5._udp,test5.example.com,1,55,555 +srv-host=_name6._tcp.test6.com,test6.example.com,6666,0,666 +srv-host=_name7._tcp.test7.com,test7.example.com,1,0,777 dhcp-range=192.168.122.2,192.168.122.254 dhcp-no-override dhcp-leasefile=/var/lib/libvirt/dnsmasq/default.leases diff --git a/tests/networkxml2confdata/nat-network-dns-srv-record.xml b/tests/networkxml2confdata/nat-network-dns-srv-record.xml index 3dd19e6..d01b331 100644 --- a/tests/networkxml2confdata/nat-network-dns-srv-record.xml +++ b/tests/networkxml2confdata/nat-network-dns-srv-record.xml @@ -6,7 +6,13 @@ </forward> <bridge name='virbr0' stp='on' delay='0'/> <dns> - <srv service='name' protocol='tcp' domain='test-domain-name' target='.' port='1024' priority='10' weight='10'/> + <srv service='name' protocol='tcp' domain='test-domain-name.com' target='test.example.com' port='1111' priority='11' weight='111'/> + <srv service='name2' protocol='udp' target='test2.example.com' port='2222' priority='22' weight='222'/> + <srv service='name3' protocol='tcp' domain='test3.com' target='test3.example.com' port='3333' priority='33'/> + <srv service='name4' protocol='tcp' domain='test4.com' target='test4.example.com' port='4444'/> + <srv service='name5' protocol='udp' target='test5.example.com' priority='55' weight='555'/> + <srv service='name6' protocol='tcp' domain='test6.com' target='test6.example.com' port='6666' weight='666'/> + <srv service='name7' protocol='tcp' domain='test7.com' target='test7.example.com' weight='777'/> </dns> <ip address='192.168.122.1' netmask='255.255.255.0'> <dhcp> -- 1.8.5.3

2 1

[libvirt] [PATCH 00/24] Indent top-level labels by one space
by Ján Tomko 25 Mar '14

25 Mar '14

3 28

[libvirt] [python PATCHv2 0/2] arbitrary qemu events
by Eric Blake 25 Mar '14

25 Mar '14

Changes since v1: rebase to latest code base, address review comments regarding a leak of dom, add prereq patch to fix bugs that I had been copying and pasting Eric Blake (2): event: fix domain reference bugs qemu: support arbitrary monitor events generator.py | 20 +-- libvirt-override.c | 319 +++++++++++++++++++++++++++++------------------ libvirt-qemu-override.c | 223 ++++++++++++++++++++++++++++++++- libvirt-qemu-override.py | 35 ++++++ 4 files changed, 469 insertions(+), 128 deletions(-) create mode 100644 libvirt-qemu-override.py -- 1.8.5.3

2 4

[libvirt] [libvirt-python PATCH] generator: Add virConnectDomainQemuMonitorEventCallback to skipped_types
by Martin Kletzander 25 Mar '14

25 Mar '14

Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- Notes: pushed as a build-breaker generator.py | 1 + 1 file changed, 1 insertion(+) diff --git a/generator.py b/generator.py index 0e9600f..e409921 100755 --- a/generator.py +++ b/generator.py @@ -273,6 +273,7 @@ skipped_types = { 'virConnectDomainEventWatchdogCallback': "No function types in python", 'virConnectDomainEventIOErrorCallback': "No function types in python", 'virConnectDomainEventGraphicsCallback': "No function types in python", + 'virConnectDomainQemuMonitorEventCallback': "No function types in python", 'virStreamEventCallback': "No function types in python", 'virEventHandleCallback': "No function types in python", 'virEventTimeoutCallback': "No function types in python", -- 1.9.1

1 0

[libvirt] [PATCH 0/2] sanlock: Forbid unsupported lock failure actions
by Jiri Denemark 25 Mar '14

25 Mar '14

Some lock failure actions do not make any sense in combination with sanlock driver. Let's just report an error if someone tries to use them instead of causing unexpected and possibly quite bad thing to happen. Jiri Denemark (2): sanlock: Forbid VIR_DOMAIN_LOCK_FAILURE_IGNORE sanlock: Forbid VIR_DOMAIN_LOCK_FAILURE_RESTART src/locking/lock_driver_sanlock.c | 12 +++++++++++- src/locking/sanlock_helper.c | 28 +++------------------------- 2 files changed, 14 insertions(+), 26 deletions(-) -- 1.9.1

2 4

[libvirt] [PATCH 0/4] bhyve integration: pie, blk, MAC, host API
by Wojciech Macek 25 Mar '14

25 Mar '14

Hi, I'm working on enabling OpenStack/libvirt support for FreeBSD hosts. Please look into some patches I'd like to submit for rewiev. 1. PIE-flag: on some FreeBSD-10 the clang toolchain is broken and cannot build executables with PIE option, so I added the flag to let the user choose. 2. bhyve MAC: add MAC address configuration for bhyve virtio network adapter 3. bhyve blk: add support for up to 8 blk devices, atapi/sata/virtio bus with file/block backend 4. bhyve host API: initial support for "host" functions on FreeBSD Regards, Wojtek Wojciech Macek (4): pie: add Position-Independent-Executable flag bhyve: MAC address configuration bhyve: multiple virtio-blk devices support bhyve: host API support configure.ac | 14 +++++++- src/bhyve/bhyve_command.c | 92 ++++++++++++++++++++++++++++++----------------- src/bhyve/bhyve_command.h | 8 +++++ src/bhyve/bhyve_driver.c | 66 ++++++++++++++++++++++++++++++++++ src/nodeinfo.c | 19 ++++++++++ 5 files changed, 165 insertions(+), 34 deletions(-) -- 1.9.0

4 13

[libvirt] [PATCHv2] gluster: Fix "key" attribute for gluster volumes
by Peter Krempa 25 Mar '14

25 Mar '14

According to our documentation the "key" value has the following meaning: "Providing an identifier for the volume which identifies a single volume." The currently used keys for gluster volumes consist of the gluster volume name and file path. This can't be considered unique as a different storage server can serve a volume with the same name. Unfortunately I wasn't able to figure out a way to retrieve the gluster volume UUID which would avoid the possibility of having two distinct keys identifying a single volume. Use the full URI as the key for the volume to avoid the more critical ambiguity problem and document the possible change to UUID. --- docs/storage.html.in | 6 ++++-- src/storage/storage_backend_gluster.c | 10 ++++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/docs/storage.html.in b/docs/storage.html.in index 2706bc5..f75996a 100644 --- a/docs/storage.html.in +++ b/docs/storage.html.in @@ -711,8 +711,10 @@ correspond to the files that can be found when mounting the gluster volume. The <code>name</code> is the path relative to the effective mount specified for the pool; and - the <code>key</code> is a path including the gluster volume - name and any subdirectory specified by the pool. + the <code>key</code> is a string that identifies a single volume + uniquely. Currently the <code>key</code> attribute consists of the + URI of the volume but it may be changed to an UUID of the volume + in the future. <pre> <volume> <name>myfile</name> diff --git a/src/storage/storage_backend_gluster.c b/src/storage/storage_backend_gluster.c index a22b23a..06292fa 100644 --- a/src/storage/storage_backend_gluster.c +++ b/src/storage/storage_backend_gluster.c @@ -187,6 +187,7 @@ virStorageBackendGlusterSetMetadata(virStorageBackendGlusterStatePtr state, const char *name) { int ret = -1; + char *path = NULL; char *tmp; VIR_FREE(vol->key); @@ -201,12 +202,12 @@ virStorageBackendGlusterSetMetadata(virStorageBackendGlusterStatePtr state, goto cleanup; } - if (virAsprintf(&vol->key, "%s%s%s", state->volname, state->dir, + if (virAsprintf(&path, "%s%s%s", state->volname, state->dir, vol->name) < 0) goto cleanup; tmp = state->uri->path; - if (virAsprintf(&state->uri->path, "/%s", vol->key) < 0) { + if (virAsprintf(&state->uri->path, "/%s", path) < 0) { state->uri->path = tmp; goto cleanup; } @@ -218,9 +219,14 @@ virStorageBackendGlusterSetMetadata(virStorageBackendGlusterStatePtr state, VIR_FREE(state->uri->path); state->uri->path = tmp; + /* the path is unique enough to serve as a volume key */ + if (VIR_STRDUP(vol->key, vol->target.path) < 0) + goto cleanup; + ret = 0; cleanup: + VIR_FREE(path); return ret; } -- 1.9.0

1 1

[libvirt] [PATCH] util: Sanitize ATTRIBUTE_NONNULL use in viriscsi.h
by Peter Krempa 25 Mar '14

25 Mar '14

Some of the function attributes marked as nonnull actually explicitly handle the arguments for NULL. All changed functions handle missing "initiatoriqn" argument well and virISCSIScanTargets also handles well if the return pointers are missing. Remove some of the liberaly used ATTRIBUTE_NONNULLs as coverity and possibly other compilers that honor the attribute fail to compile the code. Flaw introduced in commit 5e1d5dde --- src/util/viriscsi.h | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/util/viriscsi.h b/src/util/viriscsi.h index b2dd3f1..f4093f7 100644 --- a/src/util/viriscsi.h +++ b/src/util/viriscsi.h @@ -33,14 +33,14 @@ int virISCSIConnectionLogin(const char *portal, const char *initiatoriqn, const char *target) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3) + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(3) ATTRIBUTE_RETURN_CHECK; int virISCSIConnectionLogout(const char *portal, const char *initiatoriqn, const char *target) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3) + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(3) ATTRIBUTE_RETURN_CHECK; int @@ -52,8 +52,7 @@ virISCSIScanTargets(const char *portal, const char *initiatoriqn, size_t *ntargetsret, char ***targetsret) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3) - ATTRIBUTE_NONNULL(4) ATTRIBUTE_RETURN_CHECK; + ATTRIBUTE_NONNULL(1) ATTRIBUTE_RETURN_CHECK; int virISCSINodeUpdate(const char *portal, -- 1.9.0

2 2

[libvirt] [RFC PATCH] Behaviour of topology, vcpus and maxcpus
by Nikunj Dadhania 25 Mar '14

25 Mar '14

I have observed the following with libvirt xml: <vcpu>6</vcpu> <cpu> <topology sockets='1' cores='4' threads='2'/> </cpu> So according to the topology maximum supported is 8 vcpus, while the libvirt sets that to 6 - specified in <vcpu> tag. Shouldn't libvirt error this out as the mismatch between the topology definition and the vcpu count? There is an upper bound check already in place where if we have maxcpu > topology-supported cpus, that errors out. For eg. <vcpu>12</vcpu> <cpu> <topology sockets='1' cores='4' threads='2'/> </cpu> The below patch make sures that libvirt does the lower bound check as well. Regards Nikunj diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index f96110b..aa25940 100644 [ 0001-Behaviour-of-topology-vcpus-and-maxcpus.patch: inline patch (as text/x-diff) ] --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -12933,6 +12933,14 @@ virDomainDefParseXML(xmlDocPtr xml, goto error; } + if (def->cpu->sockets && + def->maxvcpus < + def->cpu->sockets * def->cpu->cores * def->cpu->threads) { + virReportError(VIR_ERR_XML_DETAIL, "%s", + _("CPUs provided is less than topology")); + goto error; + } + if (def->cpu->cells_cpus > def->maxvcpus) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Number of CPUs in <numa> exceeds the"

1 0

[libvirt] [PATCH v3 0/5] Expose FSFreeze/FSThaw within the guest as API
by Tomoki Sekiyama 25 Mar '14

25 Mar '14

This is patchset v3 to add FSFreeze/FSThaw API for custom disk snapshotting. Changes to v2: * use "@acl: domain:fs_freeze" in remote driver (also applied to VIR_DOMAIN_SNAPSHOT_CREATE_QUIESCE flag) * added 'quiesced' attribute in live XML to preserve domains' quiesced state across libvirtd restarts * rebased to latest tree (v2: https://www.redhat.com/archives/libvir-list/2014-March/msg00306.html ) === Description === Currently FSFreeze and FSThaw are supported by qemu guest agent and they are used internally in snapshot-create command with --quiesce option. However, when users want to utilize the native snapshot feature of storage devices (such as LVM over iSCSI, enterprise storage appliances, etc.), they need to issue fsfreeze command separately from libvirt-driven snapshots. (OpenStack cinder provides these storages' snapshot feature, but it cannot quiesce the guest filesystems automatically for now.) Although virDomainQemuGuestAgent() API could be used for this purpose, it is only for debugging and is not supported officially. This patchset adds virDomainFSFreeze()/virDomainFSThaw() APIs and virsh domfsfreeze/domfsthaw commands to enable the users to freeze and thaw domain's filesystems cleanly. The APIs have flags option currently unsupported for future extension. --- Tomoki Sekiyama (5): Introduce virDomainFSFreeze() and virDomainFSThaw() public API remote: Implement virDomainFSFreeze and virDomainFSThaw qemu: Track domain quiesced status qemu: Implement virDomainFSFreeze and virDomainFSThaw virsh: Expose new virDomainFSFreeze and virDomainFSThaw API include/libvirt/libvirt.h.in | 6 ++ src/access/viraccessperm.c | 2 - src/access/viraccessperm.h | 6 ++ src/driver.h | 10 +++ src/libvirt.c | 70 ++++++++++++++++++++ src/libvirt_public.syms | 5 + src/qemu/qemu_domain.c | 5 + src/qemu/qemu_domain.h | 2 + src/qemu/qemu_driver.c | 144 ++++++++++++++++++++++++++++++++++++++---- src/remote/remote_driver.c | 2 + src/remote/remote_protocol.x | 25 +++++++ src/remote_protocol-structs | 9 +++ src/rpc/gendispatch.pl | 2 + tools/virsh-domain.c | 92 +++++++++++++++++++++++++++ tools/virsh.pod | 15 ++++ 15 files changed, 379 insertions(+), 16 deletions(-)

2 6

[libvirt] [PATCH] Add utility functions for storing uninstalled location
by Nehal J Wani 25 Mar '14

25 Mar '14

When libvirtd is run from a build directory without being installed, it should not depend on files from a libvirt package installed in the system. Currently, APIs defined in src/ don't know whether libvirtd is being run from the build dir or the installed dir. The following additions provide the functionality to do so: src/util/virutil.c *virSetUninstalledDir *virGetUninstalledDir Example usage (utility = lxc|iohelper): char *path_tmp = virGetUninstalledDir(); if (path_tmp) /* do stuff with ("%s/../../src/libvirt_<utility>", path_tmp) */ else /* do stuff with (LIBEXECDIR "/libvirt_<utility>") */ --- daemon/libvirtd.c | 1 + src/libvirt_private.syms | 2 ++ src/util/virutil.c | 25 +++++++++++++++++++++++++ src/util/virutil.h | 3 +++ 4 files changed, 31 insertions(+), 0 deletions(-) diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c index 4179147..dc3da2a 100644 --- a/daemon/libvirtd.c +++ b/daemon/libvirtd.c @@ -1165,6 +1165,7 @@ int main(int argc, char **argv) { exit(EXIT_FAILURE); } *tmp = '\0'; + virSetUninstalledDir(argv[0]); char *driverdir; if (virAsprintfQuiet(&driverdir, "%s/../../src/.libs", argv[0]) < 0 || virAsprintfQuiet(&cpumap, "%s/../../src/cpu/cpu_map.xml", diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 5904036..a112e6e 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1989,6 +1989,7 @@ virGetGroupList; virGetGroupName; virGetHostname; virGetSelfLastChanged; +virGetUninstalledDir; virGetUnprivSGIOSysfsPath; virGetUserCacheDirectory; virGetUserConfigDirectory; @@ -2017,6 +2018,7 @@ virSetInherit; virSetNonBlock; virSetUIDGID; virSetUIDGIDWithCaps; +virSetUninstalledDir; virStrIsPrint; virUpdateSelfLastChanged; virValidateWWN; diff --git a/src/util/virutil.c b/src/util/virutil.c index 733cdff..46f6c75 100644 --- a/src/util/virutil.c +++ b/src/util/virutil.c @@ -2204,3 +2204,28 @@ void virUpdateSelfLastChanged(const char *path) selfLastChanged = sb.st_ctime; } } + +static char *uninstalledDir = NULL; +/** + * virSetUninstalledDir: + * @path: location from which libvirtd is running without + * installation + * + * Set a pointer to the path which can be accessed by all + * other APIs using virGetUninstalledDir(). + */ +void virSetUninstalledDir(char *path) +{ + uninstalledDir = path; +} + +/** + * virGetUninstalledDir: + * + * If libvirtd is running without installation, return the + * path from which it was invoked, otherwise, return NULL + */ +char *virGetUninstalledDir(void) +{ + return uninstalledDir; +} diff --git a/src/util/virutil.h b/src/util/virutil.h index 1f2efd5..3e6ba47 100644 --- a/src/util/virutil.h +++ b/src/util/virutil.h @@ -202,4 +202,7 @@ bool virIsSUID(void); time_t virGetSelfLastChanged(void); void virUpdateSelfLastChanged(const char *path); +void virSetUninstalledDir(char *path); +char *virGetUninstalledDir(void); + #endif /* __VIR_UTIL_H__ */ -- 1.7.1

2 3

[libvirt] [TCK][PATCH] Remove whitespace differences in network tmp files
by Mike Latimer 25 Mar '14

25 Mar '14

The network/100-apply-verify-host.t test compares the results of various network commands (route, iptables, ebtables, etc...) against known, valid results. Depending on the versions of these tools, minor whitespace differences in command output can result in the failure of the test. This patch resolves the problem by removing trailing spaces and replacing three or more concurrent spaces with just two. These changes are only made to the temporary files involved with the tests. --- scripts/networks/networkApplyTest.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/scripts/networks/networkApplyTest.sh b/scripts/networks/networkApplyTest.sh index 3e93c0a..924130f 100644 --- a/scripts/networks/networkApplyTest.sh +++ b/scripts/networks/networkApplyTest.sh @@ -142,6 +142,11 @@ checkExpectedOutput() { break fi + # Remove trailing whitespace, replace multiple spaces with just two + for file in ${tmpfile} ${tmpfile2}; do + sed -i -e 's/ *$//' -e 's/ */ /g' $file + done + diff "${tmpfile}" "${tmpfile2}" >/dev/null if [ $? -ne 0 ]; then -- 1.8.4.5

2 2

[libvirt] [PATCH] maint: update to latest gnulib
by Eric Blake 24 Mar '14

24 Mar '14

While we aren't impacted by most of upstream's changes this month, at least the regex improvement looks useful. * gnulib: Synchronize to upstream. --- Pushing under trivial rule before we go into freeze. * .gnulib 72fb907...ce457d6 (16): > gitlog-to-changelog: include a dummy git-log-fix file > autoupdate > update from texinfo > gitlog-to-changelog: also include the file, git-log-fix > autoupdate > regex: port to OS X 10.8.5 en_US.UTF-8 locale > maint: fix ChangeLog to match commit record > stdint, read-file: fix missing SIZE_MAX on Android (tiny change) > parse-datetime: fix crash or infloop in TZ="" parsing > * NEWS: Recent changes are not that important. > savedir: new symbol for fast-read version > unistd: port readlink to Mac OS X 10.3.9 > * NEWS: Document recent change to diffseq. > diffseq: remove TOO_EXPENSIVE heuristic > savedir: simplify by using stpcpy > spawn: fix link error on uclibc .gnulib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gnulib b/.gnulib index 72fb907..ce457d6 160000 --- a/.gnulib +++ b/.gnulib @@ -1 +1 @@ -Subproject commit 72fb9075b2812765d2ce55a1a26c3764392377cb +Subproject commit ce457d622d947d8aa3e325d98a2818d097e7fec9 -- 1.8.5.3

1 0

[libvirt] [TCK][PATCH] Rename .pl tests to .t
by Mike Latimer 24 Mar '14

24 Mar '14

Commit 97c6a506 added several storage tests with a .pl extension. Rather than enable .pl tests, this patch simply renames these tests to .t. --- scripts/storage/{400-vol-download.pl => 400-vol-download.t} | 0 scripts/storage/{405-vol-download-all.pl => 405-vol-download-all.t} | 0 .../storage/{410-vol-download-nonblock.pl => 410-vol-download-nonblock.t} | 0 scripts/storage/{415-vol-upload.pl => 415-vol-upload.t} | 0 scripts/storage/{420-vol-upload-all.pl => 420-vol-upload-all.t} | 0 scripts/storage/{425-vol-upload-nonblock.pl => 425-vol-upload-nonblock.t} | 0 6 files changed, 0 insertions(+), 0 deletions(-) rename scripts/storage/{400-vol-download.pl => 400-vol-download.t} (100%) rename scripts/storage/{405-vol-download-all.pl => 405-vol-download-all.t} (100%) rename scripts/storage/{410-vol-download-nonblock.pl => 410-vol-download-nonblock.t} (100%) rename scripts/storage/{415-vol-upload.pl => 415-vol-upload.t} (100%) rename scripts/storage/{420-vol-upload-all.pl => 420-vol-upload-all.t} (100%) rename scripts/storage/{425-vol-upload-nonblock.pl => 425-vol-upload-nonblock.t} (100%) diff --git a/scripts/storage/400-vol-download.pl b/scripts/storage/400-vol-download.t similarity index 100% rename from scripts/storage/400-vol-download.pl rename to scripts/storage/400-vol-download.t diff --git a/scripts/storage/405-vol-download-all.pl b/scripts/storage/405-vol-download-all.t similarity index 100% rename from scripts/storage/405-vol-download-all.pl rename to scripts/storage/405-vol-download-all.t diff --git a/scripts/storage/410-vol-download-nonblock.pl b/scripts/storage/410-vol-download-nonblock.t similarity index 100% rename from scripts/storage/410-vol-download-nonblock.pl rename to scripts/storage/410-vol-download-nonblock.t diff --git a/scripts/storage/415-vol-upload.pl b/scripts/storage/415-vol-upload.t similarity index 100% rename from scripts/storage/415-vol-upload.pl rename to scripts/storage/415-vol-upload.t diff --git a/scripts/storage/420-vol-upload-all.pl b/scripts/storage/420-vol-upload-all.t similarity index 100% rename from scripts/storage/420-vol-upload-all.pl rename to scripts/storage/420-vol-upload-all.t diff --git a/scripts/storage/425-vol-upload-nonblock.pl b/scripts/storage/425-vol-upload-nonblock.t similarity index 100% rename from scripts/storage/425-vol-upload-nonblock.pl rename to scripts/storage/425-vol-upload-nonblock.t -- 1.8.4.5

2 1

[libvirt] [python PATCH 1/2] qemu: support arbitrary monitor events
by Eric Blake 24 Mar '14

24 Mar '14

Wrap the new virConnectDomainQemuMonitorEventRegister function being added in libvirt 1.2.2. This patch copies heavily from network events (commit 6ea5be0) and from event loop callbacks in libvirt-override.c, since in the libvirt_qemu module, we must expose top-level functions rather than class members. * generator.py (qemu_skip_function): Don't generate event code. (qemuBuildWrappers): Delay manual portion until after imports. * libvirt-qemu-override.py (qemuMonitorEventRegister) (qemuMonitorEventDeregister): New file. * libvirt-qemu-override.c (libvirt_qemu_virConnectDomainQemuMonitorEventFreeFunc) (libvirt_qemu_virConnectDomainQemuMonitorEventCallback) (libvirt_qemu_virConnectDomainQemuMonitorEventRegister) (libvirt_qemu_virConnectDomainQemuMonitorEventDeregister) (libvirt_qemu_lookupPythonFunc, getLibvirtQemuDictObject) (getLibvirtQemuModuleObject): New functions. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- generator.py | 20 +++-- libvirt-qemu-override.c | 221 ++++++++++++++++++++++++++++++++++++++++++++++- libvirt-qemu-override.py | 36 ++++++++ 3 files changed, 268 insertions(+), 9 deletions(-) create mode 100644 libvirt-qemu-override.py diff --git a/generator.py b/generator.py index 42f3913..e2325b0 100755 --- a/generator.py +++ b/generator.py @@ -570,6 +570,8 @@ lxc_skip_function = ( ) qemu_skip_function = ( #"virDomainQemuAttach", + 'virConnectDomainQemuMonitorEventRegister', # overridden in -qemu.py + 'virConnectDomainQemuMonitorEventDeregister', # overridden in -qemu.py ) # Generate C code, but skip python impl @@ -1803,16 +1805,8 @@ def qemuBuildWrappers(module): fd.write("#\n") fd.write("# WARNING WARNING WARNING WARNING\n") fd.write("#\n") - if extra is not None: - fd.writelines(extra.readlines()) - fd.write("#\n") - fd.write("# WARNING WARNING WARNING WARNING\n") - fd.write("#\n") fd.write("# Automatically written part of python bindings for libvirt\n") fd.write("#\n") - fd.write("# WARNING WARNING WARNING WARNING\n") - if extra is not None: - extra.close() fd.write("try:\n") fd.write(" import libvirtmod_qemu\n") @@ -1826,6 +1820,16 @@ def qemuBuildWrappers(module): fd.write(" raise lib_e\n\n") fd.write("import libvirt\n\n") + fd.write("# WARNING WARNING WARNING WARNING\n") + fd.write("#\n") + if extra is not None: + fd.writelines(extra.readlines()) + fd.write("#\n") + if extra is not None: + extra.close() + + fd.write("# WARNING WARNING WARNING WARNING\n") + fd.write("#\n") fd.write("#\n# Functions from module %s\n#\n\n" % module) # # Generate functions directly, no classes diff --git a/libvirt-qemu-override.c b/libvirt-qemu-override.c index 480a7d3..0abcd3f 100644 --- a/libvirt-qemu-override.c +++ b/libvirt-qemu-override.c @@ -4,7 +4,7 @@ * entry points where an automatically generated stub is * unpractical * - * Copyright (C) 2011-2012 Red Hat, Inc. + * Copyright (C) 2011-2014 Red Hat, Inc. * * Daniel Veillard <veillard(a)redhat.com> */ @@ -54,6 +54,76 @@ extern void initcygvirtmod_qemu(void); #define VIR_PY_INT_FAIL (libvirt_intWrap(-1)) #define VIR_PY_INT_SUCCESS (libvirt_intWrap(0)) +/******************************************* + * Helper functions to avoid importing modules + * for every callback + *******************************************/ +#if LIBVIR_CHECK_VERSION(1, 2, 2) +static PyObject *libvirt_qemu_module; +static PyObject *libvirt_qemu_dict; + +static PyObject * +getLibvirtQemuModuleObject(void) +{ + if (libvirt_qemu_module) + return libvirt_qemu_module; + + // PyImport_ImportModule returns a new reference + /* Bogus (char *) cast for RHEL-5 python API brokenness */ + libvirt_qemu_module = PyImport_ImportModule((char *)"libvirt_qemu"); + if (!libvirt_qemu_module) { + DEBUG("%s Error importing libvirt_qemu module\n", __FUNCTION__); + PyErr_Print(); + return NULL; + } + + return libvirt_qemu_module; +} + +static PyObject * +getLibvirtQemuDictObject(void) +{ + if (libvirt_qemu_dict) + return libvirt_qemu_dict; + + // PyModule_GetDict returns a borrowed reference + libvirt_qemu_dict = PyModule_GetDict(getLibvirtQemuModuleObject()); + if (!libvirt_qemu_dict) { + DEBUG("%s Error importing libvirt_qemu dictionary\n", __FUNCTION__); + PyErr_Print(); + return NULL; + } + + Py_INCREF(libvirt_qemu_dict); + return libvirt_qemu_dict; +} + + +static PyObject * +libvirt_qemu_lookupPythonFunc(const char *funcname) +{ + PyObject *python_cb; + + /* Lookup the python callback */ + python_cb = PyDict_GetItemString(getLibvirtQemuDictObject(), funcname); + + if (!python_cb) { + DEBUG("%s: Error finding %s\n", __FUNCTION__, funcname); + PyErr_Print(); + PyErr_Clear(); + return NULL; + } + + if (!PyCallable_Check(python_cb)) { + DEBUG("%s: %s is not callable\n", __FUNCTION__, funcname); + return NULL; + } + + return python_cb; +} +#endif /* LIBVIR_CHECK_VERSION(1, 2, 2) */ + + /************************************************************************ * * * Statistics * @@ -122,6 +192,151 @@ libvirt_qemu_virDomainQemuAgentCommand(PyObject *self ATTRIBUTE_UNUSED, PyObject } #endif /* LIBVIR_CHECK_VERSION(0, 10, 0) */ + +#if LIBVIR_CHECK_VERSION(1, 2, 2) +static void +libvirt_qemu_virConnectDomainQemuMonitorEventFreeFunc(void *opaque) +{ + PyObject *pyobj_conn = (PyObject*)opaque; + LIBVIRT_ENSURE_THREAD_STATE; + Py_DECREF(pyobj_conn); + LIBVIRT_RELEASE_THREAD_STATE; +} + +static void +libvirt_qemu_virConnectDomainQemuMonitorEventCallback(virConnectPtr conn ATTRIBUTE_UNUSED, + virDomainPtr dom, + const char *event, + long long seconds, + unsigned int micros, + const char *details, + void *opaque) +{ + PyObject *pyobj_cbData = (PyObject*)opaque; + PyObject *pyobj_dom; + PyObject *pyobj_ret; + PyObject *pyobj_conn; + PyObject *dictKey; + PyObject *pyobj_cb; + + LIBVIRT_ENSURE_THREAD_STATE; + + pyobj_cb = libvirt_qemu_lookupPythonFunc("_dispatchQemuMonitorEventCallback"); + if (!pyobj_cb) { + goto cleanup; + } + + dictKey = libvirt_constcharPtrWrap("conn"); + if (!dictKey) + return; + pyobj_conn = PyDict_GetItem(pyobj_cbData, dictKey); + Py_DECREF(dictKey); + + /* Create a python instance of this virDomainPtr */ + virDomainRef(dom); + pyobj_dom = libvirt_virDomainPtrWrap(dom); + Py_INCREF(pyobj_cbData); + + /* Call the Callback Dispatcher */ + pyobj_ret = PyObject_CallFunction(pyobj_cb, + (char *)"OOsLIsO", + pyobj_conn, pyobj_dom, event, seconds, + micros, details, pyobj_cbData); + + Py_DECREF(pyobj_cbData); + Py_DECREF(pyobj_dom); + + if (!pyobj_ret) { + DEBUG("%s - ret:%p\n", __FUNCTION__, pyobj_ret); + PyErr_Print(); + } else { + Py_DECREF(pyobj_ret); + } + +cleanup: + LIBVIRT_RELEASE_THREAD_STATE; +} + + +static PyObject * +libvirt_qemu_virConnectDomainQemuMonitorEventRegister(PyObject *self ATTRIBUTE_UNUSED, + PyObject *args) +{ + PyObject *py_retval; + PyObject *pyobj_conn; + PyObject *pyobj_dom; + PyObject *pyobj_cbData; + const char *event; + virConnectPtr conn; + int ret = 0; + virConnectDomainQemuMonitorEventCallback cb = NULL; + virDomainPtr dom; + unsigned int flags; + + if (!PyArg_ParseTuple + (args, (char *) "OOzOI", + &pyobj_conn, &pyobj_dom, &event, &pyobj_cbData, &flags)) { + DEBUG("%s failed parsing tuple\n", __FUNCTION__); + return VIR_PY_INT_FAIL; + } + + DEBUG("libvirt_qemu_virConnectDomainQemuMonitorEventRegister(%p %p %s %p %x) called\n", + pyobj_conn, pyobj_dom, NULLSTR(event), pyobj_cbData, flags); + conn = PyvirConnect_Get(pyobj_conn); + if (pyobj_dom == Py_None) + dom = NULL; + else + dom = PyvirDomain_Get(pyobj_dom); + + cb = libvirt_qemu_virConnectDomainQemuMonitorEventCallback; + + Py_INCREF(pyobj_cbData); + + LIBVIRT_BEGIN_ALLOW_THREADS; + ret = virConnectDomainQemuMonitorEventRegister(conn, dom, event, + cb, pyobj_cbData, + libvirt_qemu_virConnectDomainQemuMonitorEventFreeFunc, + flags); + LIBVIRT_END_ALLOW_THREADS; + + if (ret < 0) + Py_DECREF(pyobj_cbData); + + py_retval = libvirt_intWrap(ret); + return py_retval; +} + + +static PyObject * +libvirt_qemu_virConnectDomainQemuMonitorEventDeregister(PyObject *self ATTRIBUTE_UNUSED, + PyObject *args) +{ + PyObject *py_retval; + PyObject *pyobj_conn; + int callbackID; + virConnectPtr conn; + int ret = 0; + + if (!PyArg_ParseTuple + (args, (char *) "Oi:virConnectDomainQemuMonitorEventDeregister", + &pyobj_conn, &callbackID)) + return NULL; + + DEBUG("libvirt_qemu_virConnectDomainQemuMonitorEventDeregister(%p) called\n", + pyobj_conn); + + conn = PyvirConnect_Get(pyobj_conn); + + LIBVIRT_BEGIN_ALLOW_THREADS; + + ret = virConnectDomainQemuMonitorEventDeregister(conn, callbackID); + + LIBVIRT_END_ALLOW_THREADS; + py_retval = libvirt_intWrap(ret); + return py_retval; +} +#endif /* LIBVIR_CHECK_VERSION(1, 2, 2) */ + /************************************************************************ * * * The registration stuff * @@ -133,6 +348,10 @@ static PyMethodDef libvirtQemuMethods[] = { #if LIBVIR_CHECK_VERSION(0, 10, 0) {(char *) "virDomainQemuAgentCommand", libvirt_qemu_virDomainQemuAgentCommand, METH_VARARGS, NULL}, #endif /* LIBVIR_CHECK_VERSION(0, 10, 0) */ +#if LIBVIR_CHECK_VERSION(1, 2, 2) + {(char *) "virConnectDomainQemuMonitorEventRegister", libvirt_qemu_virConnectDomainQemuMonitorEventRegister, METH_VARARGS, NULL}, + {(char *) "virConnectDomainQemuMonitorEventDeregister", libvirt_qemu_virConnectDomainQemuMonitorEventDeregister, METH_VARARGS, NULL}, +#endif /* LIBVIR_CHECK_VERSION(1, 2, 2) */ {NULL, NULL, 0, NULL} }; diff --git a/libvirt-qemu-override.py b/libvirt-qemu-override.py new file mode 100644 index 0000000..ab48bec --- /dev/null +++ b/libvirt-qemu-override.py @@ -0,0 +1,36 @@ +# Manually written part of python bindings for libvirt-qemu + +def _dispatchQemuMonitorEventCallback(conn, dom, event, seconds, micros, details, cbData): + """Dispatches events to python user qemu monitor event callbacks + """ + cb = cbData["cb"] + opaque = cbData["opaque"] + + cb(conn, libvirt.virDomain(conn, _obj=dom), event, seconds, micros, details, opaque) + return 0 + +def qemuMonitorEventDeregister(conn, callbackID): + """Removes a qemu monitor event callback. De-registering for a callback + will disable delivery of this event type""" + try: + ret = libvirtmod_qemu.virConnectDomainQemuMonitorEventDeregister(conn._o, callbackID) + if ret == -1: raise libvirt.libvirtError ('virConnectDomainQemuMonitorEventDeregister() failed') + del conn.qemuMonitorEventCallbackID[callbackID] + except AttributeError: + pass + +def qemuMonitorEventRegister(conn, dom, event, cb, opaque, flags=0): + """Adds a qemu monitor event callback. Registering for a monitor + callback will enable delivery of the events""" + if not hasattr(conn, 'qemuMonitorEventCallbackID'): + conn.qemuMonitorEventCallbackID = {} + cbData = { "cb": cb, "conn": conn, "opaque": opaque } + if dom is None: + ret = libvirtmod_qemu.virConnectDomainQemuMonitorEventRegister(conn._o, None, event, cbData, flags) + else: + ret = libvirtmod_qemu.virConnectDomainQemuMonitorEventRegister(conn._o, dom._o, event, cbData, flags) + if ret == -1: + raise libvirt.libvirtError ('virConnectDomainQemuMonitorEventRegister() failed') + conn.qemuMonitorEventCallbackID[ret] = opaque + return ret + -- 1.8.5.3

3 6