- Devel - libvirt List Archives

[libvirt] [PATCHv2 0/2] Really fix the crash on qemu crash on chardev hotplug
by Ján Tomko 28 Jan '15

28 Jan '15

An alternative solution that only adds the chardev to the definition after the command succeeded. Ján Tomko (2): Split qemuDomainChrInsert into two parts hotplug: only add a chardev to vmdef after monitor call src/conf/domain_conf.c | 18 ++++++++-- src/conf/domain_conf.h | 7 ++-- src/libvirt_private.syms | 3 +- src/qemu/qemu_hotplug.c | 88 +++++++++++++++++++++++++++++++----------------- 4 files changed, 79 insertions(+), 37 deletions(-) -- 2.0.5

2 4

[libvirt] [PATCHv2 0/2] add support for btrfs COW copy
by Chen Hanxiao 28 Jan '15

28 Jan '15

If VIR_STORAGE_VOL_CREATE_REFLINK is specified, try to use btrfs COW copy; v2: check BTRFS_IOC_CLONE in configure.ac error out if COW copy is not supported Chen Hanxiao (2): storage: introduce btrfsCloneFile() for COW copy storage: try to perform btrfs clone if possible configure.ac | 12 +++++++ include/libvirt/libvirt-storage.h | 1 + src/storage/storage_backend.c | 67 +++++++++++++++++++++++++++++++++++---- src/storage/storage_backend_fs.c | 8 +++-- src/storage/storage_driver.c | 4 ++- 5 files changed, 82 insertions(+), 10 deletions(-) -- 2.1.0

3 6

[libvirt] [PATCH 0/2] Really fix the crash on qemu crash in chardev hotplug
by Ján Tomko 27 Jan '15

27 Jan '15

Ján Tomko (2): Always free the device in AttachChrDevice Unify cleanup path in AttachChrDevice src/qemu/qemu_driver.c | 3 +-- src/qemu/qemu_hotplug.c | 40 +++++++++++++++++++++------------------- tests/qemuhotplugtest.c | 1 + 3 files changed, 23 insertions(+), 21 deletions(-) -- 2.0.5

2 4

[libvirt] [PATCH] Fix shadowed variable warning
by Ján Tomko 27 Jan '15

27 Jan '15

libvirtd.c: In function 'daemonSetupAccessManager': libvirtd.c:730:18: error: declaration of 'driver' shadows a global declaration [-Werror=shadow] const char **driver = (const char **)config->access_drivers; ^ In file included from libvirtd.c:95:0: ../src/node_device/node_device_driver.h:43:36: error: shadowed declaration is here [-Werror=shadow] extern virNodeDeviceDriverStatePtr driver; ^ --- daemon/libvirtd.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) Pushed as a build breaker fix. diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c index 5ccfcdd..86accaa 100644 --- a/daemon/libvirtd.c +++ b/daemon/libvirtd.c @@ -727,13 +727,13 @@ daemonSetupAccessManager(struct daemonConfig *config) { virAccessManagerPtr mgr; const char *none[] = { "none", NULL }; - const char **driver = (const char **)config->access_drivers; + const char **drv = (const char **)config->access_drivers; - if (!driver || - !driver[0]) - driver = none; + if (!drv || + !drv[0]) + drv = none; - if (!(mgr = virAccessManagerNewStack(driver))) + if (!(mgr = virAccessManagerNewStack(drv))) return -1; virAccessManagerSetDefault(mgr); -- 2.0.5

1 0

[libvirt] [PATCH tck 0/5] Misc. TCK cleanups
by Mike Latimer 27 Jan '15

27 Jan '15

While running TCK on qemu, lxc and xen, I've ran into a few issues worth fixing upstream. The patches in this series are mainly focused on fixing minor typos, or safeguarding against failures in non-qemu environments. Depending on how interested people are in running TCK with xen, I can provide a few additional patches. Mike Latimer (5): hooks_051-return0 nwfilter_050-handle-failures hooks_qemu-only_skip TCK-check_uri TCK-eval-snapshots-list lib/Sys/Virt/TCK.pm | 3 ++- lib/Sys/Virt/TCK/Capabilities.pm | 6 ++++-- scripts/hooks/051-daemon-hook.t | 6 +++++- scripts/hooks/052-domain-hook.t | 2 +- scripts/nwfilter/nwfilter2vmtest.sh | 4 +++- 5 files changed, 15 insertions(+), 6 deletions(-) -- 1.8.4.5

2 6

[libvirt] [PATCH 0/7] qemu: Job handling fixes
by Peter Krempa 27 Jan '15

27 Jan '15

While reviewing Martin's reference counting series I've noticed a few qemu API impls that don't properly handle jobs. Peter Krempa (7): qemu: Fix job handling in qemuDomainPinVcpuFlags qemu: Fix job handling in qemuDomainPinEmulator qemu: Fix job handling in qemuDomainSetAutostart qemu: Fix job handling in qemuDomainSetMemoryParameters qemu: Fix job handling in qemuDomainSetSchedulerParametersFlags qemu: Fix job type in qemuDomainGetBlockIoTune qemu: Fix job handling in qemuDomainSetMetadata src/qemu/qemu_driver.c | 135 +++++++++++++++++++++++++++++++------------------ 1 file changed, 87 insertions(+), 48 deletions(-) -- 2.2.1

2 12

[libvirt] [PATCH] Post-release version bump for new dev cycle
by Peter Krempa 27 Jan '15

27 Jan '15

--- Pushed as trivial. configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index f370475..ddbdba5 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.12], [libvir-list(a)redhat.com] [], [http://libvirt.org] +AC_INIT([libvirt], [1.2.13], [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]) -- 2.2.1

1 0

[libvirt] Release of libvirt-1.2.12
by Daniel Veillard 27 Jan '15

27 Jan '15

As planned I pushed the libvirt-1.2.12 release as well as the corresponding python bindings to the server, they are also tagged in git(s): ftp://libvirt.org/libvirt [/python] This is a mixed release, not really a huge feature addition though there should be user noticeable improvement for networking and users of Parallels. 2 secutity fixes, a large set of bug fixes and lot of improvements: Security: - CVE-2015-0236: qemu: Check ACLs when dumping security info from snapshots (Peter Krempa) - CVE-2015-0236: qemu: Check ACLs when dumping security info from save image (Peter Krempa) Documentation: - Fix docs about python bindings package (Martin Kletzander) - Document some -boot option limitations on UEFI (Michal Privoznik) - virsh.pod: Update description (John Ferlan) - Fix typo s/interpetation/interpretation/ (Claudio Bley) - split typedef and struct definition for apibuild.py (Claudio Bley) Portability: - Fix build with older gcc (Ján Tomko) - Fix virCgroupNewMachine prototype on non-Linux (Ján Tomko) - Conditionalize use of -Wno-suggest-attribute=format pragma (Daniel P. Berrange) - virnetlink: fix build on non-Linux (Eric Blake) - util: Fix fallocate stubs for mingw build (Martin Kletzander) - avoid using deprecated udev logging functions (Daniel P. Berrange) Bug Fixes: - Fix a memory leak in virCgroupGetPercpuStats (Ján Tomko) - Use correct location for qcow1 encryption header (Ján Tomko) - systemd: fix build without dbus (Daniel P. Berrange) - Fix apparmor issues for tck (Mike Latimer) - Fix apparmor issues for Xen (Mike Latimer) - esx_vi: fix possible segfault (Pavel Hrdina) - xenapi_driver: fix copy-paste typo (Pavel Hrdina) - Fix virCgroupGetPercpuStats with non-continuous present CPUs (Ján Tomko) - qemu: output error when try to hotplug unsupported console type (Luyao Huang) - qemu: format server interface without a listen address (Ján Tomko) - tests: fix xlconfigtest build failure (Jim Fehlig) - qemu_conf: check for duplicate security drivers (Ján Tomko) - Always check return value of qemuDomainObjExitMonitor (Ján Tomko) - Fix vmdef usage after domain crash in monitor on device attach (Ján Tomko) - Fix vmdef usage after domain crash in monitor on device detach (Ján Tomko) - libxl: Set path to console on domain startup. (Anthony PERARD) - Coverity fix: properly check for 0 ipv6 address. (Cédric Bosdonnat) - network: Resolve Coverity FORWARD_NULL (John Ferlan) - qemu: Tweak auto adding PCI bridge controller when extending default PCI bus (Erik Skultety) - domain_conf: Check errors from virSocketAddrFormat (John Ferlan) - domain_conf: Resolve Coverity RESOURCE_LEAK (John Ferlan) - Fix ipv6 regex in RNG schemas to match '::' (Cédric Bosdonnat) - virNetworkDefUpdateIPDHCPHost: Don't crash when updating network (Michal Privoznik) - qemu: free priv->origname when qemuMigrationPrepareAny fails (Luyao Huang) - Fix vmdef usage while in monitor in qemu process (Ján Tomko) - Fix vmdef usage while in monitor in BlockStat* APIs (Ján Tomko) - Fix vmdef usage while in monitor in qemuDomainHotplugVcpus (Ján Tomko) - qemu_driver: fix setting vcpus for offline domain (Pavel Hrdina) - qemu: snapshot: inactive external snapshot can't work after libvirtd restart (Shanzhi Yu) - qemu: forbid second blockcommit during active commit (Eric Blake) - parallels: don't override error message when XML parsing fails (Daniel P. Berrange) - Don't use VIR_DOMAIN_XML_SECURE when parsing XML (Daniel P. Berrange) - conf: fix crash when hotplug a channel chr device with no target (Luyao Huang) - qemuxml2argvtest: Fix test after change of qxl vgamem_mb default (Michal Privoznik) - cpu: Bugfix for s390 CPU driver to return a host CPU model (Daniel Hansel) - virconf: Resolve a possible memory leak in virConfSetValue (John Ferlan) - openvz: Resolve Coverity RESOURCE_LEAK (John Ferlan) - lxc: Don't crash on NULL ifname_guest_actual (Guido Günther) - conf: Correctly format controller's driver (Luyao Huang) - vmx: Fix a VMX parsing problem (Geoff Hickey) - qemu: Fix system pages handling in <memoryBacking/> (Michal Privoznik) - qemu: Don't unref domain after exit from nested async job (Peter Krempa) - conf: Don't format actual network definition in migratable XML (Luyao Huang) - qemu: Restore old bandwidth rules when setting new fails (Luyao Huang) - Fix error when starting a container after an error (Cédric Bosdonnat) - qemu: Fix coverity issues after refcount refactoring (Martin Kletzander) - util: Fix possible NULL dereference (Martin Kletzander) - disable vCPU pinning with TCG mode (Daniel P. Berrange) - Don't setup fake CPU pids for old QEMU (Daniel P. Berrange) - Fix hotplugging of block device-backed usb disks (Ján Tomko) - Buffer size too small when reading sysinfo (Boris Fiuczynski) - qemu: fix memory leak in blockinfo (Eric Blake) - conf: fix cannot start a guest have a shareable network iscsi hostdev (Luyao Huang) - qemu: fix bugs in blockstats (Eric Blake) - qemu: Free saved error in qemuDomainSetVcpusFlags (Martin Kletzander) - qemu: Add missing goto error in qemuRestoreCgroupState (Martin Kletzander) - conf: Fix invalid condition when parsing storage owner (Martin Kletzander) - qemu: Fix hotplugging cpus with strict memory pinning (Martin Kletzander) - parallels: fix usage of disk->info.addr.drive structure (Dmitry Guryanov) - qemu: Auto generate a controller when attach hostdev and chr device (Luyao Huang) - xenconfig: fix boot device parsing (Wei Liu) - conf: fix virDomainLeaseIndex logic (Luyao Huang) - conf: Fix libvirtd crash matching hostdev XML (Luyao Huang) - fix typo in sanlock driver s/VIR_CONF_UONG/VIR_CONF_ULONG/ (Daniel P. Berrange) - qemu: avoid rare race when undefining domain (Martin Kletzander) Improvement: - tests: Check for virQEMUDriverConfigNew return value (Michal Privoznik) - systemd: avoid string comparisons on dbus error messages (Daniel P. Berrange) - aarch64: Support versioned machine types. (Richard W.M. Jones) - qemu: Add check for PCI bridge placement if there are too many PCI devices (Erik Skultety) - qemu: Fix auto-adding PCI bridge when all slots are reserved (Erik Skultety) - qemu: move PCI slot assignment for PIIX3, Q35 into a separate function (Erik Skultety) - qemu: reorder PCI slot assignment functions (Erik Skultety) - schemas: Move definition of 'hexuint' to basictypes (Peter Krempa) - util: json: Make argument of virJSONValueArraySize const (Peter Krempa) - qemu: command: Honor const-correctnes in qemuBuildNumaArgStr (Peter Krempa) - conf: Fix comment mentioning actual type of @multi member of virDevicePCIAddress (Peter Krempa) - Grant access to helpers (Mike Latimer) - conf: virDomainDefMaybeAddController tweak return code (Erik Skultety) - qemu: Remove dead code in qemuDomainAssignPCIAddresses revert patch (Erik Skultety) - network: Let domains be restricted to local DNS (Josh Stone) - Make ZFS storage pool XML tests optional (Gary R Hook) - Simplify condition for formatting CPU features (Ján Tomko) - Add an XML test for host-model CPU with features (Ján Tomko) - parallels: create container from existing image (Dmitry Guryanov) - parallels: allow to add filesystems to container (Dmitry Guryanov) - parallels: commit with PVCF_DETACH_HDD_BUNDLE flag (Dmitry Guryanov) - parallels: dump info about container filesystems (Dmitry Guryanov) - add ploop fs driver type (Dmitry Guryanov) - qemu: Add support for enabling/disabling PMU (Martin Kletzander) - docs, schema, conf: Add support for PMU feature (Martin Kletzander) - virsh: add support for domain XML validation (Daniel P. Berrange) - Add XML test for too many PCI devices on default PCI bus (Erik Skultety) - Remove dead code in qemuDomainAssignPCIAddresses (Erik Skultety) - virSocketAddrGetIpPrefix 0.0.0.0 and :: special cases (Cédric Bosdonnat) - Use the network route definitions for domains (Cédric Bosdonnat) - Move code related to network routes to networkcommon_conf.[ch] (Cédric Bosdonnat) - Move network route definition to networkcommon.rng (Cédric Bosdonnat) - Add support for schema validation when passing in XML (Daniel P. Berrange) - Add virXMLValidateAgainstSchema helper method (Daniel P. Berrange) - Change int to size_t in size var for tap/vhost FDs (Daniel P. Berrange) - Log dtrace/systemd probes at INFO level instead of DEBUG (Daniel P. Berrange) - Add systemd/dtrace probes for DBus APIs (Daniel P. Berrange) - Add support for systemd-machined CreateMachineWithNetwork (Daniel P. Berrange) - Mark the domain as active in qemuhotplugtest (Ján Tomko) - Check for domain liveness in qemuDomainObjExitMonitor (Ján Tomko) - check IOMMU group devices usage when preparing device for vfio passthrough (Shivaprasad G Bhat) - virpci: Implement virPCIDeviceGetAddress function (Shivaprasad G Bhat) - libxl: Add support for parsing/formating Xen XL config (Kiarie Kahurani) - tests: Tests for the xen-xl parser (Kiarie Kahurani) - Introduce support for parsing/formatting Xen xl config format (Jim Fehlig) - qemu_process: detect updated video ram size values from QEMU (Pavel Hrdina) - qemu_monitor: introduce new function to get QOM path (Pavel Hrdina) - qemu, lxc: Warn if setting QoS on unsupported vNIC types (Michal Privoznik) - conf: Increase virNetDevBandwidthParse intelligence (Michal Privoznik) - Give virDomainDef parser & formatter their own flags (Daniel P. Berrange) - Decouple CPU XML formatting from domain XML public API flags (Daniel P. Berrange) - formatdomaincaps: Correctly format API reference (Michal Privoznik) - Fix flags passed to virDomainDefParseString by XenAPI driver (Daniel P. Berrange) - Add stub virDomainDefineXMLFlags impls (Daniel P. Berrange) - Add new virDomainDefineXMLFlags public API (Daniel P. Berrange) - qemu: Allow enabling/disabling features with host-passthrough (Martin Kletzander) - lxc: Move setting ifname_guest_actual to virLXCSetupInterfaces (Guido Günther) - openvz: Check errors from virSocketAddrFormat (John Ferlan) - qxl: change the default value for vgamem_mb to 16 MiB (Pavel Hrdina) - virsh: Emit error for VSH_OT_DATA without VSH_OFLAG_REQ (Hao Liu) - safezero: fall back to writing zeroes even when resizing (Ján Tomko) - maint: in src/Makefile.am, $(top_srcdir)/src is verbose (Eric Blake) - nwfilter: Add support for icmpv6 filtering (Stefan Berger) - Parallels: Add VNC hostname setup (Alexander Burluka) - qemu: fix miss goto cleanup in qemuDomainAttachNetDevice (Luyao Huang) - networkGetDHCPLeases: Remove unnecessary error reporting (Nehal J Wani) - qemu: use a wrong name for guest panic status (Luyao Huang) - maint: update to latest gnulib (Eric Blake) - Report error if a driver can't handle multiple IP addresses (Cédric Bosdonnat) - Openvz --ipadd can be provided multiple times (Cédric Bosdonnat) - LXC: honour network devices link state (Cédric Bosdonnat) - LXC: use the new net devices routes definition (Cédric Bosdonnat) - lxc conf2xml: convert lxc.network.ipv[46].gateway (Cédric Bosdonnat) - Domain network devices can now have a <route> element (Cédric Bosdonnat) - lxc conf2xml: convert ip addresses for hostdev NICs (Cédric Bosdonnat) - Allow network capabilities hostdev to configure IP addresses (Cédric Bosdonnat) - lxc conf2xml: convert IP addresses (Cédric Bosdonnat) - LXC: set IP addresses to veth devices in the container (Cédric Bosdonnat) - Domain conf: allow more than one IP address for net devices (Cédric Bosdonnat) - Renamed virNetDevClearIPv4Address to virNetDevClearIPAddress (Cédric Bosdonnat) - virNetDevClearIPv4Address: netlink implementation (Cédric Bosdonnat) - virNetDevAddRoute: implementation using netlink (Cédric Bosdonnat) - Renamed virNetDevSetIPv4Address to virNetDevSetIPAddress (Cédric Bosdonnat) - virNetDevSetIPv4Address: libnl implementation (Cédric Bosdonnat) - Forgot to cleanup ifname_guest* in domain network def parsing (Cédric Bosdonnat) - maint: fix date in local gnulib patch (Daniel P. Berrange) - maint: update to latest gnulib (Daniel P. Berrange) - Teach AppArmor, that /usr/lib64 may exist. (Cedric Bosdonnat) - Add tests to xmconfigtest (Chunyan Liu) - xenconfig: set HVM pae/apic/acpi/ default to 1 (Chunyan Liu) - src/xenconfig: Export helper functions (Kiarie Kahurani) - capabilities: Format <domain/> properly (Michal Privoznik) - parallels: report, that cdrom image is raw (Dmitry Guryanov) - tests: Set up two more overrides for root builders (Martin Kletzander) - test: fix nwfilter tests following changes in virfirewall.c (Stefan Berger) - qemu: completely rework reference counting (Martin Kletzander) - maint: update .mailmap (Claudio Bley) - qemu: Create memory-backend-{ram,file} iff needed (Michal Privoznik) - Remove redundant cleanup in qemuDomainAttachVirtioDiskDevice (Ján Tomko) - Fix error message on redirdev caps detection (Ján Tomko) - logical: Add "--type snapshot" to lvcreate command (John Ferlan) - getstats: crawl backing chain for qemu (Eric Blake) - getstats: split block stats reporting for easier recursion (Eric Blake) - getstats: add new flag for block backing chain (Eric Blake) - getstats: prepare for dynamic block.count stat (Eric Blake) - getstats: report block sizes for offline domains (Eric Blake) - qemu: refactor blockinfo data gathering (Eric Blake) - getstats: rearrange blockinfo gathering (Eric Blake) - getstats: perform recursion in monitor collection (Eric Blake) - getstats: prepare monitor collection for recursion (Eric Blake) - qemu: let blockinfo reuse virStorageSource (Eric Blake) - qemu: refactor blockinfo job handling (Eric Blake) - build: fix typo in previous patch (Eric Blake) - virstoragefile: Have virStorageFileResize use safezero (John Ferlan) - virfile: Refactor safezero (John Ferlan) - conf: Rework virDomainObjListFindByUUID to allow more concurrent APIs (Martin Kletzander) - storage: unify permission formatting (Martin Kletzander) - qemu: Leave cpuset.mems in parent cgroup alone (Martin Kletzander) - qemu: Save numad advice into qemuDomainObjPrivate (Martin Kletzander) - qemu: Remove unnecessary qemuSetupCgroupPostInit function (Martin Kletzander) - util: Add virNumaGetHostNodeset (Martin Kletzander) - util: Add function virCgroupHasEmptyTasks (Martin Kletzander) - spec: Fix syntax (Jiri Denemark) - spec: Disable -Werror in Fedora RPM builds (Daniel P. Berrange) - parallels: set format for real disk devices (Dmitry Guryanov) - parallels: support NULL virDomainVideoAccelDefPtr (Dmitry Guryanov) - qemu: add/remove bridge fdb entries as guest CPUs are started/stopped (Laine Stump) - qemu: make persistent update of graphics device supported (Wang Rui) - qemu: fix alignment of qemuDomainFindGraphics (Wang Rui) - qemu: report properer error number when change graphics failed (Wang Rui) - qemu: Allow system pages to <memoryBacking/> (Michal Privoznik) - virconf: Introduce VIR_CONF_ULONG (Michal Privoznik) - virConfType: switch to VIR_ENUM_{DECL,IMPL} (Michal Privoznik) - virConfSetValue: Simplify condition (Michal Privoznik) - conf: move the check for secondary consoles of targetType serial (Erik Skultety) - qemu: add a qemuInterfaceStopDevices(), called when guest CPUs stop (Laine Stump) - qemu: always call qemuInterfaceStartDevices() when starting CPUs (Laine Stump) - conf: Ignore device address for model=none usb controller and memballon (Luyao Huang) Cleanup: - Indentation (Ján Tomko) Thanks everybody for helping with this release, 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 0

[libvirt] Submit your Google Summer of Code project ideas and volunteer to mentor
by Stefan Hajnoczi 27 Jan '15

27 Jan '15

Dear libvirt, KVM, and QEMU contributors, The Google Summer of Code season begins soon and it's time to collect our thoughts for mentoring students this summer working full-time on libvirt, KVM, and QEMU. What is GSoC? Google Summer of Code 2015 (GSoC) funds students to work on open source projects for 12 weeks over the summer. Open source organizations apply to participate and those accepted receive funding for one or more students. We now need to collect a list of project ideas on our wiki. We also need mentors to volunteer. http://qemu-project.org/Google_Summer_of_Code_2015 Project ideas Please post project ideas on the wiki page below. Project ideas should be suitable as a 12-week project that a student fluent in C/Python/etc can complete. No prior knowledge of QEMU/KVM/libvirt internals can be assumed. http://qemu-project.org/Google_Summer_of_Code_2015 Mentors Please add your name to project ideas you are willing to mentor. In order to mentor you must be an established contributor (regularly contribute patches). You must be willing to spend about 5 hours per week from May 25 to August 21. I have CCed the 8 most active committers since QEMU 2.1.0 as well as the previous libvirt and KVM mentors but everyone is invited. Official timeline: https://www.google-melange.com/gsoc/events/google/gsoc20145 Stefan

2 1

[libvirt] [PATCH] tests: Check for virQEMUDriverConfigNew return value
by Michal Privoznik 26 Jan '15

26 Jan '15

The function may return NULL if something went wrong. In some places in the tests we are not checking the return value rather than accessing the pointer directly resulting in SIGSEGV. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- tests/domaincapstest.c | 3 +++ tests/qemuhotplugtest.c | 3 ++- tests/qemuxmlnstest.c | 3 ++- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/tests/domaincapstest.c b/tests/domaincapstest.c index 70d2ef3..fa931f6 100644 --- a/tests/domaincapstest.c +++ b/tests/domaincapstest.c @@ -212,46 +212,49 @@ static int mymain(void) { int ret = 0; #define DO_TEST(Filename, Emulatorbin, Machine, Arch, Type, ...) \ do { \ struct test_virDomainCapsFormatData data = {.filename = Filename, \ .emulatorbin = Emulatorbin, .machine = Machine, .arch = Arch, \ .type = Type, __VA_ARGS__}; \ if (virtTestRun(Filename, test_virDomainCapsFormat, &data) < 0) \ ret = -1; \ } while (0) DO_TEST("basic", "/bin/emulatorbin", "my-machine-type", VIR_ARCH_X86_64, VIR_DOMAIN_VIRT_UML); DO_TEST("full", "/bin/emulatorbin", "my-machine-type", VIR_ARCH_X86_64, VIR_DOMAIN_VIRT_KVM, .fillFunc = fillAll); #ifdef WITH_QEMU virQEMUDriverConfigPtr cfg = virQEMUDriverConfigNew(false); + if (!cfg) + return EXIT_FAILURE; + # define DO_TEST_QEMU(Filename, QemuCapsFile, Emulatorbin, Machine, Arch, Type, ...) \ do { \ const char *capsPath = abs_srcdir "/qemucapabilitiesdata/" QemuCapsFile ".caps"; \ virQEMUCapsPtr qemuCaps = qemuTestParseCapabilities(capsPath); \ struct fillQemuCapsData fillData = {.qemuCaps = qemuCaps, .cfg = cfg}; \ struct test_virDomainCapsFormatData data = {.filename = Filename, \ .emulatorbin = Emulatorbin, .machine = Machine, .arch = Arch, \ .type = Type, .fillFunc = fillQemuCaps, .opaque = &fillData}; \ if (!qemuCaps) { \ fprintf(stderr, "Unable to build qemu caps from %s\n", capsPath); \ ret = -1; \ } else if (virtTestRun(Filename, test_virDomainCapsFormat, &data) < 0) \ ret = -1; \ } while (0) DO_TEST_QEMU("qemu_1.6.50-1", "caps_1.6.50-1", "/usr/bin/qemu-system-x86_64", "pc-1.2", VIR_ARCH_X86_64, VIR_DOMAIN_VIRT_KVM); virObjectUnref(cfg); #endif /* WITH_QEMU */ return ret; } diff --git a/tests/qemuhotplugtest.c b/tests/qemuhotplugtest.c index 1c18dbb..12a7f71 100644 --- a/tests/qemuhotplugtest.c +++ b/tests/qemuhotplugtest.c @@ -333,165 +333,166 @@ static int mymain(void) { int ret = 0; struct qemuHotplugTestData data = {0}; virSecurityManagerPtr mgr; #if !WITH_YAJL fputs("libvirt not compiled with yajl, skipping this test\n", stderr); return EXIT_AM_SKIP; #endif if (virThreadInitialize() < 0 || !(driver.caps = testQemuCapsInit()) || !(driver.xmlopt = virQEMUDriverCreateXMLConf(&driver))) return EXIT_FAILURE; virEventRegisterDefaultImpl(); - driver.config = virQEMUDriverConfigNew(false); + if (!(driver.config = virQEMUDriverConfigNew(false))) + return EXIT_FAILURE; VIR_FREE(driver.config->spiceListen); VIR_FREE(driver.config->vncListen); /* some dummy values from 'config file' */ if (VIR_STRDUP_QUIET(driver.config->spicePassword, "123456") < 0) return EXIT_FAILURE; if (!(driver.domainEventState = virObjectEventStateNew())) return EXIT_FAILURE; driver.lockManager = virLockManagerPluginNew("nop", "qemu", driver.config->configBaseDir, 0); if (!driver.lockManager) return EXIT_FAILURE; if (!(mgr = virSecurityManagerNew("none", "qemu", false, false, false))) return EXIT_FAILURE; if (!(driver.securityManager = virSecurityManagerNewStack(mgr))) return EXIT_FAILURE; /* wait only 100ms for DEVICE_DELETED event */ qemuDomainRemoveDeviceWaitTime = 100; #define DO_TEST(file, ACTION, dev, event, fial, kep, ...) \ do { \ const char *my_mon[] = { __VA_ARGS__, NULL}; \ const char *name = file " " #ACTION " " dev; \ data.action = ACTION; \ data.domain_filename = file; \ data.device_filename = dev; \ data.fail = fial; \ data.mon = my_mon; \ data.keep = kep; \ data.deviceDeletedEvent = event; \ if (virtTestRun(name, testQemuHotplug, &data) < 0) \ ret = -1; \ } while (0) #define DO_TEST_ATTACH(file, dev, fial, kep, ...) \ DO_TEST(file, ATTACH, dev, false, fial, kep, __VA_ARGS__) #define DO_TEST_DETACH(file, dev, fial, kep, ...) \ DO_TEST(file, DETACH, dev, false, fial, kep, __VA_ARGS__) #define DO_TEST_ATTACH_EVENT(file, dev, fial, kep, ...) \ DO_TEST(file, ATTACH, dev, true, fial, kep, __VA_ARGS__) #define DO_TEST_DETACH_EVENT(file, dev, fial, kep, ...) \ DO_TEST(file, DETACH, dev, true, fial, kep, __VA_ARGS__) #define DO_TEST_UPDATE(file, dev, fial, kep, ...) \ DO_TEST(file, UPDATE, dev, false, fial, kep, __VA_ARGS__) #define QMP_OK "{\"return\": {}}" #define HMP(msg) "{\"return\": \"" msg "\"}" #define QMP_DEVICE_DELETED(dev) \ "{" \ " \"timestamp\": {" \ " \"seconds\": 1374137171," \ " \"microseconds\": 2659" \ " }," \ " \"event\": \"DEVICE_DELETED\"," \ " \"data\": {" \ " \"device\": \"" dev "\"," \ " \"path\": \"/machine/peripheral/" dev "\"" \ " }" \ "}\r\n" DO_TEST_UPDATE("graphics-spice", "graphics-spice-nochange", false, false, NULL); DO_TEST_UPDATE("graphics-spice-timeout", "graphics-spice-timeout-nochange", false, false, "set_password", QMP_OK, "expire_password", QMP_OK); DO_TEST_UPDATE("graphics-spice-timeout", "graphics-spice-timeout-password", false, false, "set_password", QMP_OK, "expire_password", QMP_OK); DO_TEST_UPDATE("graphics-spice", "graphics-spice-listen", true, false, NULL); DO_TEST_UPDATE("graphics-spice-listen-network", "graphics-spice-listen-network", false, false, "set_password", QMP_OK, "expire_password", QMP_OK); /* Strange huh? Currently, only graphics can be updated :-P */ DO_TEST_UPDATE("disk-cdrom", "disk-cdrom-nochange", true, false, NULL); DO_TEST_ATTACH("console-compat-2", "console-virtio", false, true, "chardev-add", "{\"return\": {\"pty\": \"/dev/pts/26\"}}", "device_add", QMP_OK); DO_TEST_DETACH("console-compat-2", "console-virtio", false, false, "device_del", QMP_OK, "chardev-remove", QMP_OK); DO_TEST_ATTACH("hotplug-base", "disk-virtio", false, true, "human-monitor-command", HMP("OK\\r\\n"), "device_add", QMP_OK); DO_TEST_DETACH("hotplug-base", "disk-virtio", false, false, "device_del", QMP_OK, "human-monitor-command", HMP("")); DO_TEST_ATTACH_EVENT("hotplug-base", "disk-virtio", false, true, "human-monitor-command", HMP("OK\\r\\n"), "device_add", QMP_OK); DO_TEST_DETACH("hotplug-base", "disk-virtio", true, true, "device_del", QMP_OK, "human-monitor-command", HMP("")); DO_TEST_DETACH("hotplug-base", "disk-virtio", false, false, "device_del", QMP_DEVICE_DELETED("virtio-disk4") QMP_OK, "human-monitor-command", HMP("")); DO_TEST_ATTACH("hotplug-base", "disk-usb", false, true, "human-monitor-command", HMP("OK\\r\\n"), "device_add", QMP_OK); DO_TEST_DETACH("hotplug-base", "disk-usb", false, false, "device_del", QMP_OK, "human-monitor-command", HMP("")); DO_TEST_ATTACH_EVENT("hotplug-base", "disk-usb", false, true, "human-monitor-command", HMP("OK\\r\\n"), "device_add", QMP_OK); DO_TEST_DETACH("hotplug-base", "disk-usb", true, true, "device_del", QMP_OK, "human-monitor-command", HMP("")); DO_TEST_DETACH("hotplug-base", "disk-usb", false, false, "device_del", QMP_DEVICE_DELETED("usb-disk16") QMP_OK, "human-monitor-command", HMP("")); DO_TEST_ATTACH("hotplug-base", "disk-scsi", false, true, "human-monitor-command", HMP("OK\\r\\n"), "device_add", QMP_OK); DO_TEST_DETACH("hotplug-base", "disk-scsi", false, false, "device_del", QMP_OK, "human-monitor-command", HMP("")); DO_TEST_ATTACH_EVENT("hotplug-base", "disk-scsi", false, true, "human-monitor-command", HMP("OK\\r\\n"), "device_add", QMP_OK); DO_TEST_DETACH("hotplug-base", "disk-scsi", true, true, "device_del", QMP_OK, "human-monitor-command", HMP("")); DO_TEST_DETACH("hotplug-base", "disk-scsi", false, false, "device_del", QMP_DEVICE_DELETED("scsi0-0-0-5") QMP_OK, "human-monitor-command", HMP("")); virObjectUnref(driver.caps); virObjectUnref(driver.xmlopt); virObjectUnref(driver.config); return (ret == 0) ? EXIT_SUCCESS : EXIT_FAILURE; } diff --git a/tests/qemuxmlnstest.c b/tests/qemuxmlnstest.c index 947aa9c..4d665da 100644 --- a/tests/qemuxmlnstest.c +++ b/tests/qemuxmlnstest.c @@ -205,62 +205,63 @@ static int mymain(void) { int ret = 0; bool json = false; abs_top_srcdir = getenv("abs_top_srcdir"); if (!abs_top_srcdir) abs_top_srcdir = abs_srcdir "/.."; - driver.config = virQEMUDriverConfigNew(false); + if (!(driver.config = virQEMUDriverConfigNew(false))) + return EXIT_FAILURE; if ((driver.caps = testQemuCapsInit()) == NULL) return EXIT_FAILURE; if (!(driver.xmlopt = virQEMUDriverCreateXMLConf(&driver))) return EXIT_FAILURE; # define DO_TEST_FULL(name, migrateFrom, migrateFd, expectError, ...) \ do { \ struct testInfo info = { \ name, NULL, migrateFrom, migrateFd, json, expectError \ }; \ if (!(info.extraFlags = virQEMUCapsNew())) \ return EXIT_FAILURE; \ virQEMUCapsSetList(info.extraFlags, __VA_ARGS__, QEMU_CAPS_LAST);\ if (virtTestRun("QEMU XML-2-ARGV " name, \ testCompareXMLToArgvHelper, &info) < 0) \ ret = -1; \ virObjectUnref(info.extraFlags); \ } while (0) # define DO_TEST(name, expectError, ...) \ DO_TEST_FULL(name, NULL, -1, expectError, __VA_ARGS__) # define NONE QEMU_CAPS_LAST /* Unset or set all envvars here that are copied in qemudBuildCommandLine * using ADD_ENV_COPY, otherwise these tests may fail due to unexpected * values for these envvars */ setenv("PATH", "/bin", 1); setenv("USER", "test", 1); setenv("LOGNAME", "test", 1); setenv("HOME", "/home/test", 1); unsetenv("TMPDIR"); unsetenv("LD_PRELOAD"); unsetenv("LD_LIBRARY_PATH"); unsetenv("QEMU_AUDIO_DRV"); unsetenv("SDL_AUDIODRIVER"); DO_TEST("qemu-ns-domain", false, NONE); DO_TEST("qemu-ns-domain-ns0", false, NONE); DO_TEST("qemu-ns-domain-commandline", false, NONE); DO_TEST("qemu-ns-domain-commandline-ns0", false, NONE); DO_TEST("qemu-ns-commandline", false, NONE); DO_TEST("qemu-ns-commandline-ns0", false, NONE); DO_TEST("qemu-ns-commandline-ns1", false, NONE); virObjectUnref(driver.config); virObjectUnref(driver.caps); virObjectUnref(driver.xmlopt); return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; } -- 2.0.5

2 2