- Devel - libvirt List Archives

[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 27 Jan '15

27 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

[libvirt] [PATCH v4 0/2] Allow UEFI paths to be specified at compile time
by Michal Privoznik 26 Jan '15

26 Jan '15

diff to v3: - basically the patch is split into two patches - dropped shell script in to configure.ac Michal Privoznik (2): qemu: Allow UEFI paths to be specified at compile time qemu: Add AAVMF to the list of known UEFIs configure.ac | 12 ++++ src/qemu/qemu.conf | 12 +++- src/qemu/qemu_conf.c | 68 +++++++++++++++++++--- src/qemu/test_libvirtd_qemu.aug.in | 1 + .../domaincaps-qemu_1.6.50-1.xml | 1 + tests/domaincapstest.c | 16 ++--- 6 files changed, 93 insertions(+), 17 deletions(-) -- 2.0.5

2 5

[libvirt] [PATCH] Fix a memory leak in virCgroupGetPercpuStats
by Ján Tomko 26 Jan '15

26 Jan '15

Coverity reports that my commit af1c98e introduced two memory leaks: the cpumap if ncpus == 0 in virCgroupGetPercpuStats and the params array in the test of the function. --- src/util/vircgroup.c | 6 ++++-- tests/vircgrouptest.c | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c index e65617a..6957e81 100644 --- a/src/util/vircgroup.c +++ b/src/util/vircgroup.c @@ -3061,8 +3061,10 @@ virCgroupGetPercpuStats(virCgroupPtr group, total_cpus = virBitmapSize(cpumap); - if (ncpus == 0) - return total_cpus; + if (ncpus == 0) { + rv = total_cpus; + goto cleanup; + } if (start_cpu >= total_cpus) { virReportError(VIR_ERR_INVALID_ARG, diff --git a/tests/vircgrouptest.c b/tests/vircgrouptest.c index a455a81..cc1825b 100644 --- a/tests/vircgrouptest.c +++ b/tests/vircgrouptest.c @@ -614,6 +614,7 @@ static int testCgroupGetPercpuStats(const void *args ATTRIBUTE_UNUSED) cleanup: virCgroupFree(&cgroup); + VIR_FREE(params); return ret; } -- 2.0.5

2 1

[libvirt] [PATCH] [Build-breaker : 1.2.12] Suppress compilation without dbus headers
by Prerna Saxena 26 Jan '15

26 Jan '15

Hi, While testing 1.2.12 rc2 on Powerpc, Fedora 21, I hit a bunch of build failures in absence of dbus-devel : src/util/virsystemd.c:284:17: note: in expansion of macro 'STREQ_NULLABLE' if (STREQ_NULLABLE("org.freedesktop.DBus.Error.UnknownMethod", ^ .... src/util/virsystemd.c:288:17: error: implicit declaration of function 'dbus_error_free' [-Werror=implicit-function-declaration] dbus_error_free(&error); Found that this was because commit 318df5a05 needs Dbus libraries for compilation, and configure didnt mark "with_dbus" to be mandatory. In this case, the compilation itself failed in a much uglier fashion on my system where dbus-devel was absent. The following patch introduces a compile error when dbus-devel is absent, so that the build itself proceeds later without cryptic errors. This has also been reported on the list : https://www.redhat.com/archives/libvir-list/2015-January/msg00641.html >From 8c4f583b6bb47ca41866ff884af0cd55487f047d Mon Sep 17 00:00:00 2001 From: Prerna Saxena <prerna(a)linux.vnet.ibm.com> Date: Sun, 25 Jan 2015 05:35:23 -0600 Subject: [PATCH] Build: Fix dbus m4 macro to correctly flag it as a required dependency. Commit 318df5a needs dbus headers to compile. However, this package is listed as optional, and so this breaks libvirt compilation on systems that lack the relevant devel files. This patch does not allow ./configure to proceed if dbus-devel is absent. It also tweaks the libvirt spec file to reflect this relationship. --- libvirt.spec.in | 3 --- m4/virt-dbus.m4 | 1 + 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index ba1cf41..4dfda13 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -627,10 +627,7 @@ BuildRequires: util-linux BuildRequires: nfs-utils %endif -%if %{with_firewalld} -# Communication with the firewall daemon uses DBus BuildRequires: dbus-devel -%endif # Fedora build root suckage BuildRequires: gawk diff --git a/m4/virt-dbus.m4 b/m4/virt-dbus.m4 index 3f9b306..42359cf 100644 --- a/m4/virt-dbus.m4 +++ b/m4/virt-dbus.m4 @@ -19,6 +19,7 @@ dnl AC_DEFUN([LIBVIRT_CHECK_DBUS],[ LIBVIRT_CHECK_PKG([DBUS], [dbus-1], [1.0.0]) + m4_divert_text([DEFAULTS], [with_dbus=yes]) if test "$with_dbus" = "yes" ; then old_CFLAGS="$CFLAGS" -- 1.8.3.1 -- Prerna Saxena Linux Technology Centre, IBM Systems and Technology Lab, Bangalore, India

2 2

[libvirt] [libvirt-test-API][PATCH] Add IPv6 section into network case
by jiahu 26 Jan '15

26 Jan '15

Add IPv6 family related scenarios to virtual network case --- cases/basic_network.conf | 8 ++++++++ repos/network/define.py | 7 ++++++- repos/network/xmls/network.xml | 5 +++++ 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/cases/basic_network.conf b/cases/basic_network.conf index e9abd57..5d1438e 100644 --- a/cases/basic_network.conf +++ b/cases/basic_network.conf @@ -13,6 +13,14 @@ network:define $defaultnetend netmode nat + netip6addr + $netip6addr + netip6prefix + $netip6prefix + netip6start + $netip6start + netip6end + $netip6end network:network_list flags diff --git a/repos/network/define.py b/repos/network/define.py index dd054f7..6e50eb7 100644 --- a/repos/network/define.py +++ b/repos/network/define.py @@ -17,7 +17,12 @@ required_params = ('networkname', 'bridgenetmask', 'netstart', 'netend', - 'netmode',) + 'netmode', + 'netip6addr', + 'netip6prefix', + 'netip6start', + 'netip6end', + ) optional_params = {'xml' : 'xmls/network.xml', } diff --git a/repos/network/xmls/network.xml b/repos/network/xmls/network.xml index 220169b..97e3517 100644 --- a/repos/network/xmls/network.xml +++ b/repos/network/xmls/network.xml @@ -7,4 +7,9 @@ <range start="NETSTART" end="NETEND"/> </dhcp> </ip> + <ip family="ipv6" address="NETIP6ADDR" prefix="NETIP6PREFIX" > + <dhcp> + <range start="NETIP6START" end="NETIP6END" /> + </dhcp> + </ip> </network> -- 1.8.1.4

2 1

[libvirt] [PATCH] conf: Disallow emulatorpin when numatune's in effect
by Michal Privoznik 26 Jan '15

26 Jan '15

https://bugzilla.redhat.com/show_bug.cgi?id=1170492 In one of our previous commits (dc8b7ce7) we've obsoleted <cputune/> in favor of <numatune/> and others. If old element was passed it was basically ignored and interesting settings were copied from the new one. Well with one exception we'd forgotten about: emulatorpin. Imagine that domain is configured as follows: <vcpu placement='static' current='2'>6</vcpu> <cputune> <emulatorpin cpuset='1-3'/> </cputune> This is perfectly valid as only old style elements are used. However, adding new style elements messes up the XML: <vcpu placement='auto' current='2'>6</vcpu> <cputune> <emulatorpin cpuset='1-3'/> </cputune> <numatune> <memory mode='strict' placement='auto'/> </numatune> Since <numatune/> is auto, <vcpu/> becomes auto as well. However in that case we can't guarantee that emulator will be pinned onto selected nodes. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/conf/domain_conf.c | 12 +++++++- .../qemuxml2argv-cputune-numatune.xml | 35 ++++++++++++++++++++++ .../qemuxml2xmlout-cputune-numatune.xml | 32 ++++++++++++++++++++ tests/qemuxml2xmltest.c | 1 + 4 files changed, 79 insertions(+), 1 deletion(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-cputune-numatune.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-cputune-numatune.xml diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 8792f5e..0b8af6d 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -13173,8 +13173,18 @@ virDomainDefParseXML(xmlDocPtr xml, ctxt) < 0) goto error; - if (virDomainNumatuneHasPlacementAuto(def->numatune) && !def->cpumask) + if (virDomainNumatuneHasPlacementAuto(def->numatune) && !def->cpumask) { + /* If numatune is used, it obsoletes some older settings + * like /domain/vcpu/@placement or + * /domain/cputune/emulatorpin. For more info see comment + * a few lines above where emulatorpin is parsed. */ def->placement_mode = VIR_DOMAIN_CPU_PLACEMENT_MODE_AUTO; + if (def->cputune.emulatorpin) { + VIR_WARN("Ignore emulatorpin for <numatune> placement is 'auto'"); + virDomainVcpuPinDefFree(def->cputune.emulatorpin); + def->cputune.emulatorpin = NULL; + } + } if ((n = virXPathNodeSet("./resource", ctxt, &nodes)) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cputune-numatune.xml b/tests/qemuxml2argvdata/qemuxml2argv-cputune-numatune.xml new file mode 100644 index 0000000..9759b48 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-cputune-numatune.xml @@ -0,0 +1,35 @@ +<domain type='kvm'> + <name>dummy2</name> + <uuid>4d92ec27-9ebf-400b-ae91-20c71c647c19</uuid> + <memory unit='KiB'>131072</memory> + <currentMemory unit='KiB'>65536</currentMemory> + <vcpu placement='auto' current='2'>6</vcpu> + <cputune> + <emulatorpin cpuset='1-3'/> + </cputune> + <numatune> + <memory mode='strict' placement='auto'/> + </numatune> + <os> + <type arch='x86_64' machine='pc-q35-2.3'>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-system-x86_64</emulator> + <controller type='sata' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x1f' function='0x2'/> + </controller> + <controller type='pci' index='0' model='pcie-root'/> + <controller type='pci' index='1' model='dmi-to-pci-bridge'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x1e' function='0x0'/> + </controller> + <controller type='pci' index='2' model='pci-bridge'> + <address type='pci' domain='0x0000' bus='0x01' slot='0x01' function='0x0'/> + </controller> + <memballoon model='none'/> + </devices> +</domain> diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-cputune-numatune.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-cputune-numatune.xml new file mode 100644 index 0000000..b33f57f --- /dev/null +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-cputune-numatune.xml @@ -0,0 +1,32 @@ +<domain type='kvm'> + <name>dummy2</name> + <uuid>4d92ec27-9ebf-400b-ae91-20c71c647c19</uuid> + <memory unit='KiB'>131072</memory> + <currentMemory unit='KiB'>65536</currentMemory> + <vcpu placement='auto' current='2'>6</vcpu> + <numatune> + <memory mode='strict' placement='auto'/> + </numatune> + <os> + <type arch='x86_64' machine='pc-q35-2.3'>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-system-x86_64</emulator> + <controller type='sata' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x1f' function='0x2'/> + </controller> + <controller type='pci' index='0' model='pcie-root'/> + <controller type='pci' index='1' model='dmi-to-pci-bridge'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x1e' function='0x0'/> + </controller> + <controller type='pci' index='2' model='pci-bridge'> + <address type='pci' domain='0x0000' bus='0x01' slot='0x01' function='0x0'/> + </controller> + <memballoon model='none'/> + </devices> +</domain> diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 4abb303..9ceda58 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -310,6 +310,7 @@ mymain(void) DO_TEST("blkiotune-device"); DO_TEST("cputune"); DO_TEST("cputune-zero-shares"); + DO_TEST_DIFFERENT("cputune-numatune"); DO_TEST("smp"); DO_TEST("iothreads"); -- 2.0.5

2 1

[libvirt] [libvirt-test-API][PATCH] Add global IPv6 default values to network part
by jiahu 26 Jan '15

26 Jan '15

Added below variables into global.cfg. netip6addr/netip6prefix/netip6start/netip6end --- global.cfg | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/global.cfg b/global.cfg index db8f71e..56677a5 100644 --- a/global.cfg +++ b/global.cfg @@ -195,6 +195,15 @@ defaultnetstart = 192.168.111.2 # default the ending address ip defaultnetend = 192.168.111.254 +# default bridge ipv6 addr +netip6addr = 2001:db8:ca2:99::1 +# default bridge ipv6 prefix +netip6prefix = 64 +# default the starting ipv6 address +netip6start = 2001:db8:ca2:99::11 +# default the ending ipv6 address +netip6end = 2001:db8:ca2:99::ff + ################################################################ # # host interface -- 1.8.1.4

1 0

[libvirt] Missing libxl_device_nic settings
by Kim Larry 26 Jan '15

26 Jan '15

Hi, I was trying to pass ip address to scripts/vif-bridge by putting <ip address=""/> in guest config xml file, however, I found that libxlMakeNic(which located in libxl/libxl_conf.c:956) doesn't set x_nic->ip. So I patched myself but I'm not so sure about VIR_DOMAIN_NET_TYPE_ETHERNET. It seems like vif-route, correct? Here is my patch: diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c index 0555b91..0effc59 100644 --- a/src/libxl/libxl_conf.c +++ b/src/libxl/libxl_conf.c @@ -1047,10 +1047,18 @@ libxlMakeNic(virDomainDefPtr def, if (VIR_STRDUP(x_nic->bridge, virDomainNetGetActualBridgeName(l_nic)) < 0) return -1; - /* fallthrough */ + if (VIR_STRDUP(x_nic->script, l_nic->script) < 0) + return -1; + if (VIR_STRDUP(x_nic->ip, l_nic->data.bridge.ipaddr) < 0) + return -1; + break; case VIR_DOMAIN_NET_TYPE_ETHERNET: if (VIR_STRDUP(x_nic->script, l_nic->script) < 0) return -1; + if (VIR_STRDUP(x_nic->ip, l_nic->data.ethernet.ipaddr) < 0) + return -1; + if (VIR_STRDUP(x_nic->gatewaydev, l_nic->data.ethernet.dev) < 0) + return -1; break; case VIR_DOMAIN_NET_TYPE_NETWORK: { Regards, Jihoon

1 0

[libvirt] Entering freeze for libvirt-1.2.12
by Daniel Veillard 25 Jan '15

25 Jan '15

As planned I tagged the release candidate 1 in git and pushed signed tarballs and rpms to the usual place: ftp://libvirt.org/libvirt/ Seems to work fine for me, but my testing is limited. Give it a try especially on other architectures or OSes. Plan is to release an rc2 by the dn of the week and the final next Tuesday assuming everythings goes smoothly ! 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/

2 2

[libvirt] libvirt domXML -> libxl_domain_config conversion testing
by Jim Fehlig 24 Jan '15

24 Jan '15

Hi All, I've been attempting to revive the libvirt domXML -> libxl_domain_config tests originally started by Daniel all the way back in May! https://www.redhat.com/archives/libvir-list/2014-May/msg01102.html In a reply to patch5 of the series, Ian Campbell noted that the doc produced by libxl_domain_config_to_json() may change as new config is added, defaults changed, etc. Some suggestions for coping with this included 1. json template files per libxl version 2. a new API in libvirt's json toolbox to compare json docs (with ability to control the comparison, e.g. ignore certain content) 3. make use of new functionality in Xen 4.5 such as libxl_domain_config_from_json() and libxl_domain_config_compare() Option 1 is simple-minded. Option 2 is an improvement, but a growing list of content must be ignored as additions/changes are made to the libxl_domain_config object. (Example of ignored content in this discussion - https://www.redhat.com/archives/libvir-list/2014-September/msg00627.html) In some cases, we might actually want to test some of the new content instead of ignoring it. Option 3 is promising, but doesn't help with Xen versions 4.2-4.4. Also, 4.5 is missing libxl_domain_config_compare(). After a bit of hacking on a combination of 2 and 3, I'm reconsidering 1 :-). At least for Xen 4.2-4.5. It's a simple solution that doesn't prevent testing new content in the libxl_domain_config object. Going forward, I could work on libxl_domain_config_compare() for xen-unstable/4.6, and then use option 3 to stop the template bloom. Any thoughts on this approach? Smarter options? Regards, Jim

1 0

[libvirt] [PATCH] aarch64: Support versioned machine types.
by Richard W.M. Jones 23 Jan '15

23 Jan '15

From: "Richard W.M. Jones" <rjones(a)redhat.com> For distros that want to add versioned machine types, they will add (downstream) machine types like "virt-foo-1.2.3". Detect these as MMIO too. Signed-off-by: Richard W.M. Jones <rjones(a)redhat.com> --- src/qemu/qemu_command.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 434ac7c..3c75de5 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -1158,7 +1158,8 @@ qemuDomainAssignARMVirtioMMIOAddresses(virDomainDefPtr def, if (((def->os.arch == VIR_ARCH_ARMV7L) || (def->os.arch == VIR_ARCH_AARCH64)) && (STRPREFIX(def->os.machine, "vexpress-") || - STREQ(def->os.machine, "virt")) && + STREQ(def->os.machine, "virt") || + STRPREFIX(def->os.machine, "virt-")) && virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_VIRTIO_MMIO)) { qemuDomainPrimeVirtioDeviceAddresses( def, VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_MMIO); -- 1.8.3.1

2 1

[libvirt] [PATCH] Use correct location for qcow1 encryption header
by Ján Tomko 23 Jan '15

23 Jan '15

After the 8-byte size header, there are two one-byte headers and two bytes of padding before the crypt_header field. Our QCOW1_HDR_CRYPT constant did not skip the padding. http://git.qemu.org/?p=qemu.git;a=blob;f=block/qcow.c;h=ece22697#l41 https://bugzilla.redhat.com/show_bug.cgi?id=1185165 --- src/util/virstoragefile.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c index 7a4f9a0..8568ebb 100644 --- a/src/util/virstoragefile.c +++ b/src/util/virstoragefile.c @@ -161,7 +161,7 @@ qedGetBackingStore(char **, int *, const char *, size_t); #define QCOWX_HDR_BACKING_FILE_SIZE (QCOWX_HDR_BACKING_FILE_OFFSET+8) #define QCOWX_HDR_IMAGE_SIZE (QCOWX_HDR_BACKING_FILE_SIZE+4+4) -#define QCOW1_HDR_CRYPT (QCOWX_HDR_IMAGE_SIZE+8+1+1) +#define QCOW1_HDR_CRYPT (QCOWX_HDR_IMAGE_SIZE+8+1+1+2) #define QCOW2_HDR_CRYPT (QCOWX_HDR_IMAGE_SIZE+8) #define QCOW1_HDR_TOTAL_SIZE (QCOW1_HDR_CRYPT+4+8) -- 2.0.4

2 1

[libvirt] [PATCH v2 0/4] qemu: fix PCI bridge auto-add to extend default bus
by Erik Skultety 23 Jan '15

23 Jan '15

Erik Skultety (4): qemu: reorder PCI slot assignment functions qemu: move PCI slot assignment for PIIX3, Q35 into a separate function qemu: Fix auto-adding PCI bridge when all slots are reserved qemu: Add check for PCI bridge placement if there are too many PCI devices src/qemu/qemu_command.c | 265 ++++++++++++++++++++++++++++-------------------- 1 file changed, 154 insertions(+), 111 deletions(-) -- 1.9.3

2 10

[libvirt] [PATCH 0/5] Const correctnes/random fixes
by Peter Krempa 23 Jan '15

23 Jan '15

Few fixes/tweaks that have accumulated in my memory hotplug branch. They should be trivial enough and semantically inert. Peter Krempa (5): conf: Fix comment mentioning actual type of @multi member of virDevicePCIAddress qemu: command: Honor const-correctnes in qemuBuildNumaArgStr util: json: Make argument of virJSONValueArraySize const schemas: Move definition of 'hexuint' to basictypes util: bitmap: Tolerate NULL bitmaps in virBitmapEqual docs/schemas/basictypes.rng | 6 ++++++ docs/schemas/nodedev.rng | 6 ------ src/conf/device_conf.h | 2 +- src/qemu/qemu_command.c | 2 +- src/util/virbitmap.c | 6 ++++++ src/util/virbitmap.h | 3 +-- src/util/virjson.c | 2 +- src/util/virjson.h | 2 +- 8 files changed, 17 insertions(+), 12 deletions(-) -- 2.2.1

2 8

[libvirt] [PATCH 0/5] Revert and fix PCI bridge auto-add to extend default bus
by Erik Skultety 23 Jan '15

23 Jan '15

Erik Skultety (5): qemu: Remove dead code in qemuDomainAssignPCIAddresses revert patch conf: virDomainDefMaybeAddController tweak return code qemu: Fix auto-adding PCI bridge when all slots are reserved qemu: move PCI slot assignment for PIIX3, Q35 into a separate function qemu: reorder PCI slot assignment functions src/conf/domain_conf.c | 2 +- src/qemu/qemu_command.c | 264 ++++++++++++++++++++++++++++-------------------- 2 files changed, 154 insertions(+), 112 deletions(-) -- 1.9.3

2 11

[libvirt] [PATCH 0/3] Update example apparmor profile
by Mike Latimer 23 Jan '15

23 Jan '15

The apparmor profile example for libvirtd is rather outdated. The changes in this patch series are intended to bring this sample up to date with the latest working configuration. This series addresses issues applicable to general libvirt, Xen and libvirt-TCK operations - each in their own patch. Mike Latimer (3): Fix apparmor issues for Xen Grant access to helpers Fix apparmor issues for tck examples/apparmor/usr.sbin.libvirtd | 6 ++++++ 1 file changed, 6 insertions(+) -- 1.8.4.5

2 10

[libvirt] [PATCH] Fix build with older gcc
by Ján Tomko 23 Jan '15

23 Jan '15

My commit af1c98e4 broke the build on RHEL-6: vircgrouptest.c: In function 'testCgroupGetPercpuStats': vircgrouptest.c:566: error: nested extern declaration of '_gl_verify_function2' [-Wnested-externs] The only thing that needs checking is that the array size is at least EXPECTED_NCPUS, to prevent access beyond the array. We can ensure the minimum size also by specifying the array size upfront. --- tests/vircgrouptest.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) Pushed as a build fix. diff --git a/tests/vircgrouptest.c b/tests/vircgrouptest.c index b65ea3f..a455a81 100644 --- a/tests/vircgrouptest.c +++ b/tests/vircgrouptest.c @@ -541,7 +541,7 @@ static int testCgroupGetPercpuStats(const void *args ATTRIBUTE_UNUSED) virTypedParameterPtr params = NULL; # define EXPECTED_NCPUS 160 - unsigned long long expected[] = { + unsigned long long expected[EXPECTED_NCPUS] = { 0, 0, 0, 0, 0, 0, 0, 0, 7059492996, 0, 0, 0, 0, 0, 0, 0, 4180532496, 0, 0, 0, 0, 0, 0, 0, @@ -563,7 +563,6 @@ static int testCgroupGetPercpuStats(const void *args ATTRIBUTE_UNUSED) 5683512916, 0, 0, 0, 0, 0, 0, 0, 635751356, 0, 0, 0, 0, 0, 0, 0, }; - verify(ARRAY_CARDINALITY(expected) == EXPECTED_NCPUS); if (VIR_ALLOC_N(params, EXPECTED_NCPUS) < 0) goto cleanup; -- 2.0.4

1 0

[libvirt] [PATCH v3 1/2] systemd: fix build without dbus
by Daniel P. Berrange 23 Jan '15

23 Jan '15

The virDBusMethodCall method has a DBusError as one of its parameters. If the caller wants to pass a non-NULL value for this, it immediately makes the calling code require DBus at build time. This has led to breakage of non-DBus builds several times. It is desirable that only the virdbus.c file should need WITH_DBUS conditionals, so we must ideally remove the DBusError parameter from the method. We can't simply raise a libvirt error, since the whole point of this parameter is to give the callers a way to check if the error is one they want to ignore, without having the logs polluted with an error message. So, we add a virErrorPtr parameter which the caller can then either ignore or raise using the new virReportErrorObject method. This new method is distinct from virSetError in that it ensures the logging hooks are run. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- po/POTFILES.in | 1 - src/libvirt_private.syms | 1 + src/util/virdbus.c | 31 ++++++++------ src/util/virdbus.h | 4 +- src/util/virerror.c | 104 +++++++++++++++++++++++++++++++++++++---------- src/util/virerror.h | 8 ++++ src/util/virfirewall.c | 29 +++---------- src/util/virsystemd.c | 15 ++++--- 8 files changed, 125 insertions(+), 68 deletions(-) diff --git a/po/POTFILES.in b/po/POTFILES.in index 26c098f..3064037 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -217,7 +217,6 @@ src/util/virstorageencryption.c src/util/virstoragefile.c src/util/virstring.c src/util/virsysinfo.c -src/util/virsystemd.c src/util/virerror.c src/util/virerror.h src/util/virtime.c diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index a2eec83..528e93c 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1284,6 +1284,7 @@ virErrorInitialize; virErrorSetErrnoFromLastError; virLastErrorIsSystemErrno; virRaiseErrorFull; +virRaiseErrorObject; virReportErrorHelper; virReportOOMErrorFull; virReportSystemErrorFull; diff --git a/src/util/virdbus.c b/src/util/virdbus.c index d9665c1..3522ae0 100644 --- a/src/util/virdbus.c +++ b/src/util/virdbus.c @@ -1522,7 +1522,7 @@ static int virDBusCall(DBusConnection *conn, DBusMessage *call, DBusMessage **replyout, - DBusError *error) + virErrorPtr error) { DBusMessage *reply = NULL; @@ -1530,8 +1530,9 @@ virDBusCall(DBusConnection *conn, int ret = -1; const char *iface, *member, *path, *dest; - if (!error) - dbus_error_init(&localerror); + dbus_error_init(&localerror); + if (error) + memset(error, 0, sizeof(*error)); iface = dbus_message_get_interface(call); member = dbus_message_get_member(call); @@ -1545,13 +1546,20 @@ virDBusCall(DBusConnection *conn, if (!(reply = dbus_connection_send_with_reply_and_block(conn, call, VIR_DBUS_METHOD_CALL_TIMEOUT_MILLIS, - error ? error : &localerror))) { + &localerror))) { PROBE(DBUS_METHOD_ERROR, "'%s.%s' on '%s' at '%s' error %s: %s", iface, member, path, dest, - error ? error->name : localerror.name, - error ? error->message : localerror.message); + localerror.name, + localerror.message); if (error) { + error->level = VIR_ERR_ERROR; + error->code = VIR_ERR_DBUS_SERVICE; + error->domain = VIR_FROM_DBUS; + if (VIR_STRDUP(error->message, localerror.message) < 0) + goto cleanup; + if (VIR_STRDUP(error->str1, localerror.name) < 0) + goto cleanup; ret = 0; } else { virReportError(VIR_ERR_DBUS_SERVICE, _("%s: %s"), member, @@ -1567,8 +1575,9 @@ virDBusCall(DBusConnection *conn, ret = 0; cleanup: - if (!error) - dbus_error_free(&localerror); + if (ret < 0 && error) + virResetError(error); + dbus_error_free(&localerror); if (reply) { if (ret == 0 && replyout) *replyout = reply; @@ -1616,7 +1625,7 @@ virDBusCall(DBusConnection *conn, */ int virDBusCallMethod(DBusConnection *conn, DBusMessage **replyout, - DBusError *error, + virErrorPtr error, const char *destination, const char *path, const char *iface, @@ -1634,8 +1643,6 @@ int virDBusCallMethod(DBusConnection *conn, if (ret < 0) goto cleanup; - ret = -1; - ret = virDBusCall(conn, call, replyout, error); cleanup: @@ -1832,7 +1839,7 @@ int virDBusCreateReply(DBusMessage **reply ATTRIBUTE_UNUSED, int virDBusCallMethod(DBusConnection *conn ATTRIBUTE_UNUSED, DBusMessage **reply ATTRIBUTE_UNUSED, - DBusError *error ATTRIBUTE_UNUSED, + virErrorPtr error ATTRIBUTE_UNUSED, const char *destination ATTRIBUTE_UNUSED, const char *path ATTRIBUTE_UNUSED, const char *iface ATTRIBUTE_UNUSED, diff --git a/src/util/virdbus.h b/src/util/virdbus.h index d0c7de2..e2b8d2b 100644 --- a/src/util/virdbus.h +++ b/src/util/virdbus.h @@ -28,7 +28,7 @@ # else # define DBusConnection void # define DBusMessage void -# define DBusError void +# define dbus_message_unref(m) do {} while (0) # endif # include "internal.h" @@ -62,7 +62,7 @@ int virDBusCreateReplyV(DBusMessage **reply, int virDBusCallMethod(DBusConnection *conn, DBusMessage **reply, - DBusError *error, + virErrorPtr error, const char *destination, const char *path, const char *iface, diff --git a/src/util/virerror.c b/src/util/virerror.c index f5d7f54..9635c82 100644 --- a/src/util/virerror.c +++ b/src/util/virerror.c @@ -618,6 +618,39 @@ virDispatchError(virConnectPtr conn) } +/* + * Reports an error through the logging subsystem + */ +static +void virRaiseErrorLog(const char *filename, + const char *funcname, + size_t linenr, + virErrorPtr err, + virLogMetadata *meta) +{ + int priority; + + /* + * Hook up the error or warning to the logging facility + */ + priority = virErrorLevelPriority(err->level); + if (virErrorLogPriorityFilter) + priority = virErrorLogPriorityFilter(err, priority); + + /* We don't want to pollute stderr if no logging outputs + * are explicitly requested by the user, since the default + * error function already pollutes stderr and most apps + * hate & thus disable that too. If the daemon has set + * a priority filter though, we should always forward + * all errors to the logging code. + */ + if (virLogGetNbOutputs() > 0 || + virErrorLogPriorityFilter) + virLogMessage(&virLogSelf, + priority, + filename, linenr, funcname, + meta, "%s", err->message); +} /** * virRaiseErrorFull: @@ -639,7 +672,7 @@ virDispatchError(virConnectPtr conn) * immediately if a callback is found and store it for later handling. */ void -virRaiseErrorFull(const char *filename ATTRIBUTE_UNUSED, +virRaiseErrorFull(const char *filename, const char *funcname, size_t linenr, int domain, @@ -655,7 +688,6 @@ virRaiseErrorFull(const char *filename ATTRIBUTE_UNUSED, int save_errno = errno; virErrorPtr to; char *str; - int priority; virLogMetadata meta[] = { { .key = "LIBVIRT_DOMAIN", .s = NULL, .iv = domain }, { .key = "LIBVIRT_CODE", .s = NULL, .iv = code }, @@ -709,30 +741,58 @@ virRaiseErrorFull(const char *filename ATTRIBUTE_UNUSED, to->int1 = int1; to->int2 = int2; - /* - * Hook up the error or warning to the logging facility - */ - priority = virErrorLevelPriority(level); - if (virErrorLogPriorityFilter) - priority = virErrorLogPriorityFilter(to, priority); - - /* We don't want to pollute stderr if no logging outputs - * are explicitly requested by the user, since the default - * error function already pollutes stderr and most apps - * hate & thus disable that too. If the daemon has set - * a priority filter though, we should always forward - * all errors to the logging code. - */ - if (virLogGetNbOutputs() > 0 || - virErrorLogPriorityFilter) - virLogMessage(&virLogSelf, - priority, - filename, linenr, funcname, - meta, "%s", str); + virRaiseErrorLog(filename, funcname, linenr, + to, meta); errno = save_errno; } + +/** + * virRaiseErrorObject: + * @filename: filename where error was raised + * @funcname: function name where error was raised + * @linenr: line number where error was raised + * @newerr: the error object to report + * + * Sets the thread local error object to be a copy of + * @newerr and logs the error + * + * This is like virRaiseErrorFull, except that it accepts the + * error information via a pre-filled virErrorPtr object + * + * This is like virSetError, except that it will trigger the + * logging callbacks. + * + * The caller must clear the @newerr instance afterwards, since + * it will be copied into the thread local error. + */ +void virRaiseErrorObject(const char *filename, + const char *funcname, + size_t linenr, + virErrorPtr newerr) +{ + int saved_errno = errno; + virErrorPtr err; + virLogMetadata meta[] = { + { .key = "LIBVIRT_DOMAIN", .s = NULL, .iv = newerr->domain }, + { .key = "LIBVIRT_CODE", .s = NULL, .iv = newerr->code }, + { .key = NULL }, + }; + + err = virLastErrorObject(); + if (!err) + goto cleanup; + + virResetError(err); + virCopyError(newerr, err); + virRaiseErrorLog(filename, funcname, linenr, + err, meta); + cleanup: + errno = saved_errno; +} + + /** * virErrorMsg: * @error: the virErrorNumber diff --git a/src/util/virerror.h b/src/util/virerror.h index 5c8578f..ad3a946 100644 --- a/src/util/virerror.h +++ b/src/util/virerror.h @@ -47,6 +47,11 @@ void virRaiseErrorFull(const char *filename, const char *fmt, ...) ATTRIBUTE_FMT_PRINTF(12, 13); +void virRaiseErrorObject(const char *filename, + const char *funcname, + size_t linenr, + virErrorPtr err); + void virReportErrorHelper(int domcode, int errcode, const char *filename, const char *funcname, @@ -165,6 +170,9 @@ void virReportOOMErrorFull(int domcode, virReportErrorHelper(VIR_FROM_THIS, code, __FILE__, \ __FUNCTION__, __LINE__, __VA_ARGS__) +# define virReportErrorObject(obj) \ + virRaiseErrorObject(__FILE__, __FUNCTION__, __LINE__, obj) + int virSetError(virErrorPtr newerr); void virDispatchError(virConnectPtr conn); const char *virStrerror(int theerrno, char *errBuf, size_t errBufLen); diff --git a/src/util/virfirewall.c b/src/util/virfirewall.c index b536912..cd7afa5 100644 --- a/src/util/virfirewall.c +++ b/src/util/virfirewall.c @@ -156,7 +156,6 @@ static int virFirewallValidateBackend(virFirewallBackend backend) { VIR_DEBUG("Validating backend %d", backend); -#if WITH_DBUS if (backend == VIR_FIREWALL_BACKEND_AUTOMATIC || backend == VIR_FIREWALL_BACKEND_FIREWALLD) { int rv = virDBusIsServiceRegistered(VIR_FIREWALL_FIREWALLD_SERVICE); @@ -180,16 +179,6 @@ virFirewallValidateBackend(virFirewallBackend backend) backend = VIR_FIREWALL_BACKEND_FIREWALLD; } } -#else - if (backend == VIR_FIREWALL_BACKEND_AUTOMATIC) { - VIR_DEBUG("DBus support disabled, trying direct backend"); - backend = VIR_FIREWALL_BACKEND_DIRECT; - } else if (backend == VIR_FIREWALL_BACKEND_FIREWALLD) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("firewalld firewall backend requested, but DBus support disabled")); - return -1; - } -#endif if (backend == VIR_FIREWALL_BACKEND_DIRECT) { const char *commands[] = { @@ -755,7 +744,6 @@ virFirewallApplyRuleDirect(virFirewallRulePtr rule, } -#ifdef WITH_DBUS static int virFirewallApplyRuleFirewallD(virFirewallRulePtr rule, bool ignoreErrors, @@ -764,13 +752,13 @@ virFirewallApplyRuleFirewallD(virFirewallRulePtr rule, const char *ipv = virFirewallLayerFirewallDTypeToString(rule->layer); DBusConnection *sysbus = virDBusGetSystemBus(); DBusMessage *reply = NULL; - DBusError error; + virError error; int ret = -1; if (!sysbus) return -1; - dbus_error_init(&error); + memset(&error, 0, sizeof(error)); if (!ipv) { virReportError(VIR_ERR_INTERNAL_ERROR, @@ -792,7 +780,7 @@ virFirewallApplyRuleFirewallD(virFirewallRulePtr rule, rule->args) < 0) goto cleanup; - if (dbus_error_is_set(&error)) { + if (error.level == VIR_ERR_ERROR) { /* * As of firewalld-0.3.9.3-1.fc20.noarch the name and * message fields in the error look like @@ -820,11 +808,9 @@ virFirewallApplyRuleFirewallD(virFirewallRulePtr rule, */ if (ignoreErrors) { VIR_DEBUG("Ignoring error '%s': '%s'", - error.name, error.message); + error.str1, error.message); } else { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unable to apply rule '%s'"), - error.message); + virReportErrorObject(&error); goto cleanup; } } else { @@ -835,12 +821,11 @@ virFirewallApplyRuleFirewallD(virFirewallRulePtr rule, ret = 0; cleanup: - dbus_error_free(&error); + virResetError(&error); if (reply) dbus_message_unref(reply); return ret; } -#endif static int virFirewallApplyRule(virFirewallPtr firewall, @@ -862,12 +847,10 @@ virFirewallApplyRule(virFirewallPtr firewall, if (virFirewallApplyRuleDirect(rule, ignoreErrors, &output) < 0) return -1; break; -#if WITH_DBUS case VIR_FIREWALL_BACKEND_FIREWALLD: if (virFirewallApplyRuleFirewallD(rule, ignoreErrors, &output) < 0) return -1; break; -#endif default: virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Unexpected firewall engine backend")); diff --git a/src/util/virsystemd.c b/src/util/virsystemd.c index 3eea5c2..6de265b 100644 --- a/src/util/virsystemd.c +++ b/src/util/virsystemd.c @@ -252,8 +252,8 @@ int virSystemdCreateMachine(const char *name, VIR_DEBUG("Attempting to create machine via systemd"); if (virAtomicIntGet(&hasCreateWithNetwork)) { - DBusError error; - dbus_error_init(&error); + virError error; + memset(&error, 0, sizeof(error)); if (virDBusCallMethod(conn, NULL, @@ -280,21 +280,20 @@ int virSystemdCreateMachine(const char *name, "Before", "as", 1, "libvirt-guests.service") < 0) goto cleanup; - if (dbus_error_is_set(&error)) { + if (error.level == VIR_ERR_ERROR) { if (STREQ_NULLABLE("org.freedesktop.DBus.Error.UnknownMethod", - error.name)) { + error.str1)) { VIR_INFO("CreateMachineWithNetwork isn't supported, switching " "to legacy CreateMachine method for systemd-machined"); - dbus_error_free(&error); + virResetError(&error); virAtomicIntSet(&hasCreateWithNetwork, 0); /* Could re-structure without Using goto, but this * avoids another atomic read which would trigger * another memory barrier */ goto fallback; } - virReportError(VIR_ERR_DBUS_SERVICE, - _("CreateMachineWithNetwork: %s"), - error.message ? error.message : _("unknown error")); + virReportErrorObject(&error); + virResetError(&error); goto cleanup; } } else { -- 2.1.0

2 2

Re: [libvirt] Live Migration with Pass-through Devices proposal
by Izumi, Taku 23 Jan '15

23 Jan '15

Hi Chen-san, > Hi all, > > backgrond: > Live migration is one of the most important features of virtualization > technology. > With regard to recent virtualization techniques, performance of network > I/O is critical. > Current network I/O virtualization (e.g. Para-virtualized I/O, VMDq) has > a significant > performance gap with native network I/O. Pass-through network devices > have near > native performance, however, they have thus far prevented live > migration. No existing > methods solve the problem of live migration with pass-through devices > perfectly. > > There was an idea to solve the problem in website: > https://www.kernel.org/doc/ols/2008/ols2008v2-pages-261-267.pdf > Please refer to above document for detailed information. > > So I think this problem maybe could be solved by using the combination > of existing > technology. the attached was the architecture of migration with > passthrough device > we proposed. and the following steps are we considering to implement: > > - before boot VM, we anticipate to specify two NICs for creating > bonding device > (one plugged and one virtual NIC) in XML. here we can specify > the NIC's mac addresses > in XML, which could facilitate qemu-guest-agent to find the > network interfaces in guest. > > - when boot VM, we monitor the qemu-guest-agent process in guest > OS that > when qemu-guest-agent is available, sending command to > qemu-guest-agent to > let it create the bonding device at once according to the XML > configuration. > here netcf maybe a good tool to create bonding device easily. If I understand correctly, in your scenario, bonding device (bondX) is created by qemu-guest agent dynamicaly at every boot time. Is that right ? If so, I think it's hard for a guest administrator to configure bonding device (such as IP address). How about creating configuration file like /etc/sysconfig/network-scripts/ifcfg-bond0 (in Red Hat environment) to persistent boinding device ? > - if need to do migration, checking the bonding's virtual NIC > whether able to > access the plugged NIC's LAN. otherwise, when the passthroughed > NIC is unplugged, > the network would be broken. I think this check should be done before enslaving each NIC. By the way, how do you check whether both NICs are connected to the same network segment? I wonder if it's difficult ... > - during migration, unplug the passthroughed NIC. then do native > magration. > > - on destination side, check whether need to hotplug new NIC > according to XML. > then hotplug the deivce according the source node in XML, tell > qemu-guest-agent > to switch the hotplugged NIC activities. > > Thanks, > Chen Sincrely, Taku Izumi

1 0

[libvirt] [RFC PATCH 00/12] qemu: add support to hot-plug/unplug cpu device
by Zhu Guihua 23 Jan '15

23 Jan '15

If you apply the folowing patchset [PATCH v3 0/7] cpu: add device_add foo-x86_64-cpu support https://lists.nongnu.org/archive/html/qemu-devel/2015-01/msg01552.html, and [PATCH v2 00/11] cpu: add i386 cpu hot remove support https://lists.nongnu.org/archive/html/qemu-devel/2015-01/msg01557.html, qemu can support hotplug and hot-unplug cpu device. So this patch series will make libvirt support hotplug and hot-unplug cpu device for qemu driver, and now only supports one cpu driver which is 'qemu64-x86_64-cpu'. The cpu device's xml like this: <cpu driver='qemu64-x86_64-cpu' apic_id='3'> Zhu Guihua (12): domain_conf: allocate cpu's apic id dynamically domain_conf: add support for cpu device configuration in XML domain_conf: introduce cpu def helpers domain_conf: introduce cpu device hotplug helpers qemu_driver: implement cpu device hotplug on config level qemu_command: introduce a func for cpu device alias assignment qemu: implement support for qemu64-x86_64-cpu qemu: introduce qemuBuildCPUDeviceStr qemu: implement cpu device hotplug on live level qemu: implement cpu device hotunplug on live level qemu_monitor_json: sort JSON array of cpu info qemu_driver: detect threads corresponding to Vcpus src/conf/domain_conf.c | 188 +++++++++++++++++++++++++++ src/conf/domain_conf.h | 35 +++++ src/libvirt_private.syms | 6 + src/qemu/qemu_capabilities.c | 3 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 83 +++++++++++- src/qemu/qemu_command.h | 8 ++ src/qemu/qemu_driver.c | 296 ++++++++++++++++++++++++------------------- src/qemu/qemu_driver.h | 8 ++ src/qemu/qemu_hotplug.c | 129 +++++++++++++++++++ src/qemu/qemu_hotplug.h | 11 ++ src/qemu/qemu_monitor_json.c | 31 ++++- src/util/virbitmap.c | 2 +- src/util/virbitmap.h | 2 + 14 files changed, 668 insertions(+), 135 deletions(-) -- 1.9.3

3 37

[libvirt] LSN-2015-0001: CVE-2015-0236 snapshots and save images leak VNC passwords
by Eric Blake 23 Jan '15

23 Jan '15

Libvirt Security Notice: LSN-2015-0001 ====================================== Summary: snapshots and save images leak VNC passwords Reported on: 20150120 Published on: 20150122 Fixed on: 20150122 Reported by: Luyao Huang <lhuang(a)redhat.com> Patched by: Peter Krempa <pkrempa(a)redhat.com> See also: CVE-2015-0236 Description ----------- The two interfaces virDomainSnapshotGetXMLDesc and virDomainSaveImageGetXMLDesc would accept the VIR_DOMAIN_XML_SECURE flag in situations where virDomainGetXMLDesc did not, when fine-grained access control lists (ACL) are in use. As a result, a client can use a snapshot or save image to bypass restrictions and gain access to the secured information. Impact ------ A client using a read-write connection, and which has the 'domain:read' ACL privilege while lacking 'domain:secure_read', can trigger an information leak of data by using VIR_DOMAIN_XML_SECURE with the affected interfaces. Fortunately, the only data in this category is the value of an optional VNC password. Workaround ---------- VNC passwords are notoriously weak (they are capped at an 8 byte maximum length; the VNC protocol sends them in plaintext over the network; and FIPS mode execution prohibits the use of a VNC password), so it is recommended that users not create domains with a VNC password in the first place. Domains that do not use VNC passwords do not suffer from information leaks; the use of SPICE connections is recommended not only because it avoids the leak, but also because SPICE provides better features than VNC for a guest graphics device. Furthermore, the leak is only possible when fine-grained ACLs are in use; read-only clients cannot trigger the issue. Therefore, the problem is avoided if no user is granted the 'read' ACL privilege without also having the 'read_secure' privilege. Another mitigation is that the information leak can only occur if a snapshot or save image exists; a user that is denied 'read_secure' is typically also unable to create such an image, so the leak depends on a more privileged user making use of that feature. Affected product ---------------- Name: libvirt Repository: git://libvirt.org/git/libvirt.git http://libvirt.org/git/?p=libvirt.git Branch: master Broken in: v1.1.0 Broken in: v1.1.1 Broken in: v1.1.2 Broken in: v1.1.3 Broken in: v1.1.4 Broken in: v1.2.0 Broken in: v1.2.1 Broken in: v1.2.2 Broken in: v1.2.3 Broken in: v1.2.4 Broken in: v1.2.5 Broken in: v1.2.6 Broken in: v1.2.7 Broken in: v1.2.8 Broken in: v1.2.9 Broken in: v1.2.10 Broken in: v1.2.11 Fixed in: v1.2.12 Broken by: e341435e5090677c67a0d3d4ca0393102054841f Fixed by: 03c3c0c874c84dfa51ef17556062b095c6e1c0a3 Fixed by: b1674ad5a97441b7e1bd5f5ebaff498ef2fbb11b Branch: v1.1.0-maint Broken by: e341435e5090677c67a0d3d4ca0393102054841f Fixed by: a976724f9a10730e1339628482a283653efdb72c Fixed by: c4c824ec818ce85de049ed5546fa8ce3c8b76e32 Branch: v1.1.1-maint Broken by: e341435e5090677c67a0d3d4ca0393102054841f Fixed by: 9a2728e1b28b67a682e55d8dd3c0d79e21f0ad37 Fixed by: 2c6fc46d987911e310d30621cd6fc195af102fee Branch: v1.1.2-maint Broken by: e341435e5090677c67a0d3d4ca0393102054841f Fixed by: 6eec2b830a752c95fc2d971d3daf7626f9701290 Fixed by: 947c969fc248c2324e565b5e4f80a3d11733f12b Branch: v1.1.3-maint Broken in: v1.1.3.1 Broken in: v1.1.3.2 Broken in: v1.1.3.3 Broken in: v1.1.3.4 Broken in: v1.1.3.5 Broken in: v1.1.3.6 Broken in: v1.1.3.7 Broken in: v1.1.3.8 Broken by: e341435e5090677c67a0d3d4ca0393102054841f Fixed by: ca840e9c827fefadae2e00875b4a552b990b959f Fixed by: 76d6cc3f24ab545694e77e2eafa981d861b965a4 Branch: v1.1.4-maint Broken by: e341435e5090677c67a0d3d4ca0393102054841f Fixed by: 43d16684c2018c20db1fba35542eb1d52ecb8d7a Fixed by: 17defce9159c5111e7011e575ba72803a9418086 Branch: v1.2.0-maint Broken by: e341435e5090677c67a0d3d4ca0393102054841f Fixed by: 9475a25c86f3748e2069af67db69d79864b707b9 Fixed by: 8abca887b19600b6652654a01a78455afd4d8294 Branch: v1.2.1-maint Broken by: e341435e5090677c67a0d3d4ca0393102054841f Fixed by: f7c70c20530954c2c1a2ce0d192d01a8f71c0093 Fixed by: 1f348188e0698ef2535c81d5a779189531c5df99 Branch: v1.2.2-maint Broken by: e341435e5090677c67a0d3d4ca0393102054841f Fixed by: e99c25ca63c695a63b4c9b91ee956be4fb660772 Fixed by: 8107c1e3694ba4685960ec09868076379718f037 Branch: v1.2.3-maint Broken by: e341435e5090677c67a0d3d4ca0393102054841f Fixed by: 4edae3cb9600132e875a5b97cf31089a6c8f4cb2 Fixed by: 94d18e8f6dbe3afdc72b6df13e3eaa8861874a14 Branch: v1.2.4-maint Broken by: e341435e5090677c67a0d3d4ca0393102054841f Fixed by: d406f0858e7e3a6199788d3c64217c69d7702032 Fixed by: 4700507a484aec43b02724893cbed931e52f86e0 Branch: v1.2.5-maint Broken by: e341435e5090677c67a0d3d4ca0393102054841f Fixed by: b0b5e885f05a80d63e8a457031ea884e867244ad Fixed by: 6b78ba5a15fb1077cee88cc30f1e5ba16485cd83 Branch: v1.2.6-maint Broken by: e341435e5090677c67a0d3d4ca0393102054841f Fixed by: 9b056d8daf68b6357ca05adbfddb53a85d077a1d Fixed by: b87f3f835a5c88625d9514aae9a2ddf30bc64319 Branch: v1.2.7-maint Broken by: e341435e5090677c67a0d3d4ca0393102054841f Fixed by: cc0cc987a53f5e3825c7d972e219e08688d4480b Fixed by: aeb505814531d505f4d7718a10a96dd6dea14457 Branch: v1.2.8-maint Broken by: e341435e5090677c67a0d3d4ca0393102054841f Fixed by: c0f3e664a68509a3d842bdc3fd126257da46d0c0 Fixed by: cef411296b2513ffd80dbf9cab1f54bd0c68fe6a Branch: v1.2.9-maint Broken in: v1.2.9.1 Broken by: e341435e5090677c67a0d3d4ca0393102054841f Fixed by: 19f8fec02d9b0a8de877d872c5b59597bd878a8d Fixed by: 295f3c88ce71b8e83a489cb0d48431e124c12081 Branch: v1.2.10-maint Broken by: e341435e5090677c67a0d3d4ca0393102054841f Fixed by: c379b17e259db4f07843c2a7a883fda1a1bd043f Fixed by: d6e10847e0cd2bd7fc1824ad65fe859987715881 Branch: v1.2.11-maint Broken by: e341435e5090677c67a0d3d4ca0393102054841f Fixed by: 41358b7e91a20c9a89b03202b8c4139f92dd1953 Fixed by: 7195a5fa4718d915b28bb6e3380255eb1fbf994a -- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org

1 0

[libvirt] nodeinfo test cases for x86_64 AMD CPUs
by Steffen Persvold 23 Jan '15

23 Jan '15

Hi, Lately we’ve been puzzled by the nodeinfo returned for AMD 63xx based platforms so I checked out libvirt from Git and checked out the testcases in test/nodeinfodata. Currently you have 3 AMD test cases there : linux-x86_64-test3 : AMD 6172 2.1 GHz (MCM, 12 cores per package/socket, 2 numa nodes per package/socket, 1 thread/core) 4 Sockets, 8 NUMA nodes, 48 CPU cores total. linux-x86_64-test7 : AMD 6174 2.2 GHz (MCM, 12 cores per package/socket, 2 numa nodes per package/socket, 1 thread/core) 2 Sockets, 4 NUMA nodes, 24 CPU cores total. linux-x86_64-test8 : AMD 6282 SE 2.6 GHz (MCM, 8 CU(core) per package/socket, 2 numa nodes per package/socket, 2 threads/CU(core)) 4 Sockets, 8 NUMA nodes, 64 CPU cores total. However, the “expected” output from each of these are wrong I believe : % ~/libvirt/tests/nodeinfodata$ cat linux-x86_64-test{3,7,8}.expected CPUs: 48/48, MHz: 2100, Nodes: 8, Sockets: 1, Cores: 6, Threads: 1 CPUs: 24/24, MHz: 2200, Nodes: 1, Sockets: 1, Cores: 24, Threads: 1 CPUs: 64/64, MHz: 2593, Nodes: 1, Sockets: 1, Cores: 64, Threads: 1 In my opinion it should have been : CPUs: 48/48, MHz: 2100, Nodes: 8, Sockets: 4, Cores: 12, Threads: 1 CPUs: 24/24, MHz: 2200, Nodes: 4, Sockets: 2, Cores: 12, Threads: 1 CPUs: 64/64, MHz: 2593, Nodes: 8, Sockets: 4, Cores: 8, Threads: 2 Atleast that’s more in line with what tools like “lscpu” and “lstopo” would report. For example, I have a dual-socket AMD 6376 based system. lscpu reports : $ lscpu Architecture: x86_64 CPU op-mode(s): 32-bit, 64-bit Byte Order: Little Endian CPU(s): 32 On-line CPU(s) list: 0-31 Thread(s) per core: 2 Core(s) per socket: 8 Socket(s): 2 NUMA node(s): 4 Vendor ID: AuthenticAMD CPU family: 21 Model: 2 Stepping: 0 CPU MHz: 2299.820 BogoMIPS: 4600.03 Virtualization: AMD-V L1d cache: 16K L1i cache: 64K L2 cache: 2048K L3 cache: 6144K NUMA node0 CPU(s): 0-7 NUMA node1 CPU(s): 8-15 NUMA node2 CPU(s): 16-23 NUMA node3 CPU(s): 24-31 virsh nodeinfo however : CPU model: x86_64 CPU(s): 32 CPU frequency: 2299 MHz CPU socket(s): 1 Core(s) per socket: 32 Thread(s) per core: 1 NUMA cell(s): 1 Memory size: 49448656 KiB Looking more closely at the code in src/nodeinfo.c:linuxNodeInfoCPUPopulate() I believe it makes some false assumptions. When iterating over the NUMA nodes, it expects that NUMA nodes can contain more than one socket, whereas on AMD systems atleast it’s the other way around (Sockets can contain more than 1 socket). Hence, the topology check at the end goes all wrong and libvirt uses just a flat topology : if ((nodeinfo->nodes * nodeinfo->sockets * nodeinfo->cores * nodeinfo->threads) != (nodeinfo->cpus + offline)) { nodeinfo->nodes = 1; nodeinfo->sockets = 1; nodeinfo->cores = nodeinfo->cpus + offline; nodeinfo->threads = 1; } If instead the “fallback” mechanism is used, which iterates over /sys/devices/system/cpu/cpu%d and finds sockets/cores/threads is used, *and* you leave nodeinfo->nodes out of the equation then it all makes sense. Iterating over entries in /sys/devices/system/node/node%d would then only be used to find nodeinfo->nodes. I have limited insight into how this would work on say an S390 system, so if my assumptions here are completely wrong please do tell :) Cheers, -- Steffen Persvold Chief Architect NumaChip, Numascale AS Tel: +47 23 16 71 88 Fax: +47 23 16 71 80 Skype: spersvold

1 1

[libvirt] (no subject)
by akrowiak＠linux.vnet.ibm.com 23 Jan '15

23 Jan '15

From: Tony Krowiak <akrowiak(a)linux.vnet.ibm.com> This patch set provides the code to synchonize some macvtap device modes when the values are changed on the guest's network device. The following modes will by synchronized: * PROMISC * MULTICAST * ALLMULTI I noticed something while testing this patch set that did not occur prior to installing more recent kernel and Qemu distributions. It seems that the VLAN table always has an entry for VLAN ID 0 when the rxfilter is queried during processing of the NIC_RX_FILTER_CHANGED event. That means that the PROMISC flag for macvtap0 will be set. I don't know if this will cause problems, but I thought I'd make note of it in case anybody wants to comment on that. Tony Krowiak (2): util: Functions for getting/setting device options qemu: change macvtap device options in response to NIC_RX_FILTER_CHANGED

1 4

[libvirt] [PATCH 0/2] fix two issues found by clang
by Pavel Hrdina 23 Jan '15

23 Jan '15

Pavel Hrdina (2): xenapi_driver: fix copy-paste typo esx_vi: fix possible segfault src/esx/esx_vi.c | 3 ++- src/xenapi/xenapi_driver.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) -- 2.0.5

2 6

[libvirt] [PATCH 0/8] Enable NIC reporting to systemd
by Daniel P. Berrange 22 Jan '15

22 Jan '15

This series enables the QEMU and LXC drivers to report the network interface backends they use to systemd. This gets then shown to the user in # machinectl status lxc-shell lxc-shell(95449419f969d649d9962566ec42af7d) Since: Fri 2015-01-16 16:53:37 GMT; 3s ago Leader: 28085 (sh) Service: libvirt-lxc; class container Iface: vnet0 Address: fe80::216:3eff:fe00:c317%124 OS: Fedora 21 (Twenty One) Unit: machine-lxc\x2dshell.scope └─28085 /bin/sh but most fun is that if you add nss-mymachines to the /etc/nsswitch.conf, the machine names can now be used as hostnames. eg if your guest is 'lxc-shell' this lets you just do 'ssh lxc-shell' and it'll use the detected link local address to connect. Daniel P. Berrange (8): qemu: report TAP device indexes to systemd systemd: don't report an error if the guest is already terminated lxc: don't build pidfile string multiple times lxc: re-arrange startup synchronization sequence with controller lxc: only write XML once for lxc controller lxc: delay setup of cgroup until we have the init pid lxc: more logging during startup paths lxc: report veth device indexes to systemd src/conf/domain_conf.c | 2 +- src/conf/domain_conf.h | 5 ++ src/lxc/lxc_cgroup.c | 15 +++--- src/lxc/lxc_cgroup.h | 5 +- src/lxc/lxc_container.c | 8 +++ src/lxc/lxc_controller.c | 116 ++++++++++++++++++++++++++++++++++++---- src/lxc/lxc_process.c | 134 +++++++++++++++++++++++++++-------------------- src/qemu/qemu_cgroup.c | 13 +++-- src/qemu/qemu_cgroup.h | 4 +- src/qemu/qemu_command.c | 27 ++++++++-- src/qemu/qemu_command.h | 7 ++- src/qemu/qemu_driver.c | 7 ++- src/qemu/qemu_hotplug.c | 4 +- src/qemu/qemu_process.c | 9 +++- src/util/virsystemd.c | 25 +++++++-- tests/qemuxml2argvtest.c | 5 +- tests/qemuxmlnstest.c | 6 ++- 17 files changed, 288 insertions(+), 104 deletions(-) -- 2.1.0

2 11

[libvirt] [PATCH] network: verify proper address family in updates to <host> and <range>
by Laine Stump 22 Jan '15

22 Jan '15

By specifying parentIndex in a call to virNetworkUpdate(), it was possible to direct libvirt to add a dhcp range or static host of a non-matching address family to the <dhcp> element of an <ip>. For example, given: <ip address='192.168.122.1' netmask='255.255.255.0'/> <ip family='ipv6' address='2001:db6:ca3:45::1' prefix='64'/> you could provide a static host entry with an IPv4 address, and specify that it be added to the 2nd <ip> element (index 1): virsh net-update default add ip-dhcp-host --parent-index 1 \ '<host mac="52:54:00:00:00:01" ip="192.168.122.45"/>' This would be happily added with no error (and no concern of any possible future consequences). This patch checks that any dhcp range or host element being added to a network ip's <dhcp> subelement has addresses of the same family as the ip element they are being added to. This problem was noticed when looking at the reproduction case for https://bugzilla.redhat.com/show_bug.cgi?id=1182486 (but is not a solution to that bug). --- src/conf/network_conf.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index 23ec369..15501ec 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -1,7 +1,7 @@ /* * network_conf.c: network XML handling * - * Copyright (C) 2006-2014 Red Hat, Inc. + * Copyright (C) 2006-2015 Red Hat, Inc. * Copyright (C) 2006-2008 Daniel P. Berrange * * This library is free software; you can redistribute it and/or @@ -3285,6 +3285,14 @@ virNetworkDefUpdateIPDHCPHost(virNetworkDefPtr def, &host, partialOkay) < 0) goto cleanup; + if (VIR_SOCKET_ADDR_FAMILY(&ipdef->address) + != VIR_SOCKET_ADDR_FAMILY(&host.ip)) { + virReportError(VIR_ERR_OPERATION_INVALID, "%s", + _("the address family of a host entry IP must match " + "the address family of the dhcp element's parent")); + goto cleanup; + } + if (command == VIR_NETWORK_UPDATE_COMMAND_MODIFY) { /* search for the entry with this (ip|mac|name), @@ -3422,6 +3430,14 @@ virNetworkDefUpdateIPDHCPRange(virNetworkDefPtr def, if (virSocketAddrRangeParseXML(def->name, ctxt->node, &range) < 0) goto cleanup; + if (VIR_SOCKET_ADDR_FAMILY(&ipdef->address) + != VIR_SOCKET_ADDR_FAMILY(&range.start)) { + virReportError(VIR_ERR_OPERATION_INVALID, "%s", + _("the address family of a dhcp range must match " + "the address family of the dhcp element's parent")); + goto cleanup; + } + /* check if an entry with same name/address/ip already exists */ for (i = 0; i < ipdef->nranges; i++) { if (virSocketAddrEqual(&range.start, &ipdef->ranges[i].start) && -- 1.9.3

2 2

[libvirt] [PATCH v3 1/2] qemu: output error when try to hotplug unsupport console
by Luyao Huang 22 Jan '15

22 Jan '15

https://bugzilla.redhat.com/show_bug.cgi?id=1164627 When using 'virsh attach-device' to hotplug an unsupported console type into a qemu guest, the attachment will erroneously allows the attachment. This patch will check to ensure that only the support target types are used for a running guest. NB, Although a guest can be defined with an improper target, startup will cause failure. Signed-off-by: Luyao Huang <lhuang(a)redhat.com> --- src/qemu/qemu_command.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index c041ee7..df87e1e 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -10067,13 +10067,17 @@ qemuBuildConsoleChrDeviceStr(char **deviceStr, break; case VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_SERIAL: + break; case VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_NONE: case VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_XEN: case VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_UML: case VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_LXC: case VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_OPENVZ: case VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_LAST: - break; + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("unsupported console target type %s"), + NULLSTR(virDomainChrConsoleTargetTypeToString(chr->targetType))); + goto cleanup; } ret = 0; -- 1.8.3.1

3 7

[libvirt] [PATCH 0/2] CVE-2015-0236: Check ACLs for the VIR_DOMAIN_XML_SECURE flag for snapshots and save images
by Peter Krempa 22 Jan '15

22 Jan '15

Patches are pushed according to Eric's ACK on the security list. Peter Krempa (2): CVE-2015-0236: qemu: Check ACLs when dumping security info from save image CVE-2015-0236: qemu: Check ACLs when dumping security info from snapshots src/qemu/qemu_driver.c | 4 ++-- src/remote/remote_protocol.x | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) -- 2.2.1

1 2

[libvirt] [RFC PATCH 00/11] qemu: add support to hotplug memory device
by Zhu Guihua 22 Jan '15

22 Jan '15

Now qemu has already supported memory hotplug, so this patchset will make libvirt support hotplug memory device for qemu driver. First, add two parameters slots and maxmem for memory hotplug, and the xml format can be like this. <memory slot='10'>102400</memory> <maxMemory>1024000</maxMemory> Second, memory device's xml format can be like this. <dimm driver='pc-dimm' addr='0' node='0' slot='1'> <backend type='ram' size='131072'/> </dimm> Zhu Guihua (11): domain_conf: support slots and maxmem properties in memory xml domain_conf: introduce virDomainDimmGetFreeSlot domain_conf: add support for memory device configuration in XML domain_conf: introduce dimm def helpers domain_conf: introduce dimm device hotplug helpers qemu: implement dimm device hotplug on config level qemu_monitor: introduce qemuMonitorAddMemoryBackend qemu_command: introduce a func for memory device alias qemu: implement support for pc-dimm qemu: introduce qemuBuildDimmDeviceStr qemu: implement dimm device hotplug on live level src/conf/domain_conf.c | 306 ++++++++++++++++++++++++++++++++++++++++++- src/conf/domain_conf.h | 54 ++++++++ src/libvirt_private.syms | 6 + src/qemu/qemu_capabilities.c | 3 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 110 +++++++++++++++- src/qemu/qemu_command.h | 7 + src/qemu/qemu_driver.c | 26 ++++ src/qemu/qemu_hotplug.c | 71 ++++++++++ src/qemu/qemu_hotplug.h | 5 + src/qemu/qemu_monitor.c | 54 ++++++++ src/qemu/qemu_monitor.h | 4 + 12 files changed, 644 insertions(+), 3 deletions(-) -- 1.9.3

2 14

[libvirt] RFC: Building a virtlogd daemon
by Daniel P. Berrange 22 Jan '15

22 Jan '15

With QEMU there are a couple of areas where QEMU ends up logging data to a file on the host. - stdout/err - connected to /var/log/libvirt/qemu/$GUEST.log - serial/parallel/console when used with type=file The stdout/err is typically very small, typically only getting data when an error occurs in QEMU resulting in it existing. In the past there was the chance of it getting lots of data - eg spice used to write tonnes of data on stderr during normal operation, so a guest OS could cause large data to be saved to the host log file. This is harder todo now, but still theoretically possible. The serial/parallel/console log files can be arbitrarily sized and under complete control of the guest OS - it can write whatever it wants with no limits. In both these cases we would prefer to be able to limit the amount of data a guest can write to the host file, so we have a finite cap on disk usage. You might suggest using logrotate, but that only runs periodically so between invocations of logrotate the log files can still grow to arbitrary size. This is inherant problem in doing the log rotation out of band / asynchronously OpenStack has a further problem it would like to solve. It wants to record all guest serial port data to a log file, as it has an API for a client user to read historically captured data from the serial port. This is done using type=file chardev At the same time it wants to expose an interactive console for client users to interact with the guest. This is done using type=unix or type=pty chardevs. The obvious problem is that a single serial/parallel/console device can only be connected to one chardev backend at a time. A very long time ago (5-6 years?) I submitted patches to allow multiple chardev backends in QEMU but they were rejected. Downstream projects like OpenStack have considered setting up console log handling service themselves, but my view is that this is a problem that all users of libvirt face, so libvirt should provide a standard solution to it. This avoids each downstream app reinventing the wheel. So I'm intending to create a standalone virtlogd daemon to address this problem. Similarly to virtlockd, it will be able to re-exec itelf so that upgrades can be done with no interruption to logging, and libvirtd will talk to it over a simple RPC protocol. - For stdout/stderr - libvirtd will ask virtlogd will provide a pipe FD that can be connected to the guest stdout/err, in the sme way libvirtd provides a file FD today. - virtlogd will read from this pipe and write the data to /var/log/libvirt/qemu/$GUEST.log - virtlogd will either truncate or rotate the $GUEST.log file when it reaches a declared certain size limit. - For serial/parallel/console - libvirtd will ask virtlogd to setup a pair of UNIX domain sockets listening on /var/run/virtlogd/qemu/$GUEST.guest /var/run/virtlogd/qemu/$GUEST.client - libvirtd will ask virtlogd to (optionally) write the data to a file /var/log/virtlogd/qemu/$GUEST.log (Or /var/log/libvirt/qemu/$GUEST-$DEVICE.log perhaps, where $DEVICE is the <alias> string from the console, serial or parallel device ?) - QEMU will be told to connect to this $GUEST.guest socket with the type=unix chardev backend - The virDomainOpenConsole API will connect to the $GUEST.client socket - virtlogd will read data from $GUEST.guest socket and write it to $GUEST.client and optionally $GUEST.log too - virtlogd will read data from $GUEST.client socket and write it to $GUEST.guest socket - virtlogd will either truncate or rotate the $GUEST.log file when it reaches a declared certain size limit. So at the end of this we will have strictly size limited log files which can rotated at the size threshold, and the ability to have interactive console sessions and file logging at the same time. Regards, Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|

3 2

[libvirt] [libvirt-test-API][PATCH] Add connection_cpu_models test case
by jiahu 22 Jan '15

22 Jan '15

The connection_cpu_models.py uses getCPUModelNames() to validate new API virConnectGetCPUModelNames of libvirt. --- cases/test_connection.conf | 12 +++++ repos/virconn/connection_cpu_models.py | 82 ++++++++++++++++++++++++++++++++++ 2 files changed, 94 insertions(+) create mode 100644 repos/virconn/connection_cpu_models.py diff --git a/cases/test_connection.conf b/cases/test_connection.conf index ccde119..e916886 100644 --- a/cases/test_connection.conf +++ b/cases/test_connection.conf @@ -29,3 +29,15 @@ virconn:connection_nodeinfo virconn:connection_version conn lxc:/// + +virconn:connection_cpu_models + arch + x86_64 + +virconn:connection_cpu_models + arch + i686 + +virconn:connection_cpu_models + arch + ppc64 diff --git a/repos/virconn/connection_cpu_models.py b/repos/virconn/connection_cpu_models.py new file mode 100644 index 0000000..4588188 --- /dev/null +++ b/repos/virconn/connection_cpu_models.py @@ -0,0 +1,82 @@ +#!/usr/bin/env python +# test getCPUModelNames() API for libvirt + +import os +import libvirt + +from xml.dom import minidom +from libvirt import libvirtError +from src import sharedmod +from utils import utils + +required_params = ('arch',) +optional_params = {} + +CPU_MAP_FILE = "/usr/share/libvirt/cpu_map.xml" + +def get_cpu_archs_from_xml(logger): + """ + return supported cpu archs from cpu_map.xml + """ + cpu_archs_from_xml = [] + xml = minidom.parse(CPU_MAP_FILE) + for arch in xml.getElementsByTagName('arch'): + cpu_archs_from_xml.append(str(arch.getAttribute('name'))) + return cpu_archs_from_xml + +def get_cpu_models_from_xml(arch, logger): + """ + return supported cpu models from cpu_map.xml + """ + cpu_models_from_xml = [] + if arch == 'x86_64' or arch == 'i686': + real_arch = 'x86' + else: + real_arch = arch + + xml = minidom.parse(CPU_MAP_FILE) + for model in xml.getElementsByTagName('model'): + if model.parentNode.getAttribute('name') == real_arch: + cpu_models_from_xml.append(str(model.getAttribute('name'))) + return cpu_models_from_xml + +def connection_cpu_models(params): + """ + test API for getCPUModelNames in class virConnect + """ + logger = params['logger'] + arch_value = params['arch'] + try: + logger.info("get cpu archs from cpu_map.xml") + if not os.path.exists(CPU_MAP_FILE): + logger.error("%s is not exist" % CPU_MAP_FILE) + return 1 + cpu_archs_from_xml = get_cpu_archs_from_xml(logger) + logger.info("The supported cpu archs in xml are %s" \ + % cpu_archs_from_xml) + cpu_models_from_xml = get_cpu_models_from_xml(arch_value, logger) + logger.info("The supported cpu models in xml are %s" \ + % cpu_models_from_xml) + + conn = sharedmod.libvirtobj['conn'] + + cpu_models_from_libvirt = conn.getCPUModelNames(arch_value ,0) + logger.info("The specified architecture is %s" \ + % arch_value) + logger.info("The supported cpu models is %s" \ + % cpu_models_from_libvirt) + + #compare with cpu_map.xml + for cpu_model in cpu_models_from_libvirt: + if cpu_model in cpu_models_from_xml: + logger.debug("'%s' model: PASS" % cpu_model) + else: + logger.debug("'%s' model: FAIL, not in libvirt"\ + % cpu_model) + return 1 + logger.debug("check all cpu models: PASS") + except libvirtError, e: + logger.error("API error message: %s" % e.message) + return 1 + + return 0 -- 1.8.1.4

2 1

[libvirt] [PATCH 0/2]qemu: output error when try to hotplug/coldplug a unsupported device
by Luyao Huang 22 Jan '15

22 Jan '15

When use attach-device to hotplug a qemu unsupported console, command will success and add a XML to the running guest, but donnot do anything in qemu side. Add a check in qemuBuildConsoleChrDeviceStr, and output a error when try to attach a qemu unsupport console. About report error for qemu unsupported Chr device when cold-plug, I think this maybe unnessary in this place, because we will check it when we start the guest and it will report a clear error.But if we use qemu* header func add a qemu unsupported things to qemu guest, it seems strange. Luyao Huang (2): qemu: output error when try to hotplug unsupport console qemu: add a check when cold-plug a Chr device src/qemu/qemu_command.c | 6 ++++- src/qemu/qemu_hotplug.c | 64 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 69 insertions(+), 1 deletion(-) -- 1.8.3.1

4 10

[libvirt] 右键列表订阅
by Liuwanzhi 22 Jan '15

22 Jan '15

1 0

[libvirt] [PATCH 1/2] util: Functions for getting/setting device options
by akrowiak＠linux.vnet.ibm.com 22 Jan '15

22 Jan '15

From: Tony Krowiak <akrowiak(a)linux.vnet.ibm.com> This patch provides the utility functions needed to synchronize the rxfilter changes made to a guest domain with the corresponding macvtap devices on the host: * Get/set PROMISC flag * Get/set ALLMULTI, MULTICAST Signed-off-by: Tony Krowiak <akrowiak(a)linux.vnet.ibm.com> --- src/libvirt_private.syms | 6 + src/util/virnetdev.c | 346 ++++++++++++++++++++++++++++++++++++++++++++++ src/util/virnetdev.h | 14 ++ 3 files changed, 366 insertions(+), 0 deletions(-) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index a2eec83..6b49b08 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1646,6 +1646,9 @@ virNetDevGetVirtualFunctionInfo; virNetDevGetVirtualFunctions; virNetDevGetVLanID; virNetDevIsOnline; +virNetDevIsPromiscuous; +virNetDevIsRcvAllMulti; +virNetDevIsRcvMulti; virNetDevIsVirtualFunction; virNetDevLinkDump; virNetDevReplaceMacAddress; @@ -1663,6 +1666,9 @@ virNetDevSetMTUFromDevice; virNetDevSetName; virNetDevSetNamespace; virNetDevSetOnline; +virNetDevSetPromiscuous; +virNetDevSetRcvAllMulti; +virNetDevSetRcvMulti; virNetDevSetupControl; virNetDevValidateConfig; diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c index ef96b2b..c610f5b 100644 --- a/src/util/virnetdev.c +++ b/src/util/virnetdev.c @@ -2337,6 +2337,333 @@ int virNetDevDelMulti(const char *ifname ATTRIBUTE_UNUSED, } #endif +#if defined(SIOCSIFFLAGS) && defined(HAVE_STRUCT_IFREQ) +/** + * virNetDevSetPromiscuous: + * @ifname: the interface name + * @promiscuous: true for receive all packets, false for do not receive + * all packets + * + * Function to control if an interface is to receive all + * packets (receive all, true) or not (do not receive all, false) + * + * Returns 0 in case of success or -1 on error. + */ +int virNetDevSetPromiscuous(const char *ifname, + bool promiscuous) +{ + int fd = -1; + int ret = -1; + struct ifreq ifr; + int ifflags; + + if ((fd = virNetDevSetupControl(ifname, &ifr)) < 0) + return -1; + + if (ioctl(fd, SIOCGIFFLAGS, &ifr) < 0) { + virReportSystemError(errno, + _("Cannot get interface flags on '%s'"), + ifname); + goto cleanup; + } + + if (promiscuous) + ifflags = ifr.ifr_flags | IFF_PROMISC; + else + ifflags = ifr.ifr_flags & ~IFF_PROMISC; + + if (ifr.ifr_flags != ifflags) { + ifr.ifr_flags = ifflags; + if (ioctl(fd, SIOCSIFFLAGS, &ifr) < 0) { + virReportSystemError(errno, + _("Cannot set interface flags on '%s'"), + ifname); + goto cleanup; + } + } + + ret = 0; + + cleanup: + VIR_FORCE_CLOSE(fd); + return ret; +} +#else +int virNetDevSetPromiscuous(const char *ifname, + bool promiscuous ATTRIBUTE_UNUSED) +{ + virReportSystemError(ENOSYS, "%s", + _("Unable to set device flags for interfaces " + "on this platform")); + return -1; +} +#endif + +#if defined(SIOCGIFFLAGS) && defined(HAVE_STRUCT_IFREQ) +/** + * virNetDevIsPromiscuous: + * @ifname: the interface name + * @promiscuous: where to store the status + * + * Function to query if an interface is receiving all packets (true) or + * not (false) + * + * Returns 0 in case of success or an errno code in case of failure. + */ +int virNetDevIsPromiscuous(const char *ifname, + bool *promiscuous) +{ + int fd = -1; + int ret = -1; + struct ifreq ifr; + + if ((fd = virNetDevSetupControl(ifname, &ifr)) < 0) + return -1; + + if (ioctl(fd, SIOCGIFFLAGS, &ifr) < 0) { + virReportSystemError(errno, + _("Cannot get interface flags on '%s'"), + ifname); + goto cleanup; + } + + *promiscuous = (ifr.ifr_flags & IFF_PROMISC) ? true : false; + ret = 0; + + cleanup: + VIR_FORCE_CLOSE(fd); + return ret; +} +#else +int virNetDevIsPromiscuous(const char *ifname ATTRIBUTE_UNUSED, + bool *promiscuous ATTRIBUTE_UNUSED) +{ + virReportSystemError(ENOSYS, "%s", + _("Unable to retrieve device flags for interfaces " + "on this platform")); + return -1; +} +#endif + +#if defined(SIOCSIFFLAGS) && defined(HAVE_STRUCT_IFREQ) +/** + * virNetDevSetRcvMulti: + * @ifname: the interface name + * @:receive true for receive multicast packets, false for do not receive + * multicast packets + * + * Function to control if an interface is to receive multicast + * packets in which it is interested (receive, true) + * or not (do not receive, false) + * + * Returns 0 in case of success or -1 on error. + */ +int virNetDevSetRcvMulti(const char *ifname, + bool receive) +{ + int fd = -1; + int ret = -1; + struct ifreq ifr; + int ifflags; + + if ((fd = virNetDevSetupControl(ifname, &ifr)) < 0) + return -1; + + if (ioctl(fd, SIOCGIFFLAGS, &ifr) < 0) { + virReportSystemError(errno, + _("Cannot get interface flags on '%s'"), + ifname); + goto cleanup; + } + + if (receive) + ifflags = ifr.ifr_flags | IFF_MULTICAST; + else + ifflags = ifr.ifr_flags & ~IFF_MULTICAST; + + if (ifr.ifr_flags != ifflags) { + ifr.ifr_flags = ifflags; + if (ioctl(fd, SIOCSIFFLAGS, &ifr) < 0) { + virReportSystemError(errno, + _("Cannot set interface flags on '%s'"), + ifname); + goto cleanup; + } + } + + ret = 0; + + cleanup: + VIR_FORCE_CLOSE(fd); + return ret; +} +#else +int virNetDevSetRcvMulti(const char *ifname, + bool receive ATTRIBUTE_UNUSED) +{ + virReportSystemError(ENOSYS, "%s", + _("Unable to set device flags for interfaces " + "on this platform")); + return -1; +} +#endif /* defined(SIOCSIFFLAGS) && defined(HAVE_STRUCT_IFREQ) */ + +#if defined(SIOCGIFFLAGS) && defined(HAVE_STRUCT_IFREQ) +/** + * virNetDevIsRcvMulti: + * @ifname: the interface name + * @receive where to store the status + * + * Function to query whether an interface is receiving multicast packets (true) + * in which it is interested, or not (false) + * + * Returns 0 in case of success or -1 on error. + */ +int virNetDevIsRcvMulti(const char *ifname, + bool *receive) +{ + int fd = -1; + int ret = -1; + struct ifreq ifr; + + if ((fd = virNetDevSetupControl(ifname, &ifr)) < 0) + return -1; + + if (ioctl(fd, SIOCGIFFLAGS, &ifr) < 0) { + virReportSystemError(errno, + _("Cannot get interface flags on '%s'"), + ifname); + goto cleanup; + } + + *receive = (ifr.ifr_flags & IFF_MULTICAST) ? true : false; + ret = 0; + + cleanup: + VIR_FORCE_CLOSE(fd); + return ret; +} +#else +int virNetDevIsRcvMulti(const char *ifname, + bool *receive ATTRIBUTE_UNUSED) +{ + virReportSystemError(ENOSYS, "%s", + _("Unable to retrieve device flags for interfaces " + "on this platform")); + return -1; +} +#endif /* defined(SIOCGIFFLAGS) && defined(HAVE_STRUCT_IFREQ) */ + +#if defined(SIOCSIFFLAGS) && defined(HAVE_STRUCT_IFREQ) +/** + * virNetDevSetRcvAllMulti: + * @ifname: the interface name + * @:receive true for receive all packets, false for do not receive all packets + * + * Function to control if an interface is to receive all multicast + * packets (receive, true) or not (do not receive, false) + * + * Returns 0 in case of success or -1 on error. + */ +int virNetDevSetRcvAllMulti(const char *ifname, + bool receive) +{ + int fd = -1; + int ret = -1; + struct ifreq ifr; + int ifflags; + + if ((fd = virNetDevSetupControl(ifname, &ifr)) < 0) + return -1; + + if (ioctl(fd, SIOCGIFFLAGS, &ifr) < 0) { + virReportSystemError(errno, + _("Cannot get interface flags on '%s'"), + ifname); + goto cleanup; + } + + if (receive) + ifflags = ifr.ifr_flags | IFF_ALLMULTI; + else + ifflags = ifr.ifr_flags & ~IFF_ALLMULTI; + + if (ifr.ifr_flags != ifflags) { + ifr.ifr_flags = ifflags; + if (ioctl(fd, SIOCSIFFLAGS, &ifr) < 0) { + virReportSystemError(errno, + _("Cannot set interface flags on '%s'"), + ifname); + goto cleanup; + } + } + + ret = 0; + + cleanup: + VIR_FORCE_CLOSE(fd); + return ret; +} + +#else + +int virNetDevSetRcvAllMulti(const char *ifname, + bool receive ATTRIBUTE_UNUSED) +{ + virReportSystemError(ENOSYS, "%s", + _("Unable to set device flags for interfaces " + "on this platform")); + return -1; +} +#endif /*defined(SIOCSIFFLAGS) && defined(HAVE_STRUCT_IFREQ)*/ + +#if defined(SIOCGIFFLAGS) && defined(HAVE_STRUCT_IFREQ) +/** + * virNetDevIsRcvAllMulti: + * @ifname: the interface name + * @:receive where to store the status + * + * Function to query whether an interface is receiving all multicast + * packets (receiving, true) or not (is not receiving, false) + * + * Returns 0 in case of success or -1 on error. + */ +int virNetDevIsRcvAllMulti(const char *ifname, + bool *receive) +{ + int fd = -1; + int ret = -1; + struct ifreq ifr; + + if ((fd = virNetDevSetupControl(ifname, &ifr)) < 0) + return -1; + + if (ioctl(fd, SIOCGIFFLAGS, &ifr) < 0) { + virReportSystemError(errno, + _("Cannot get interface flags on '%s'"), + ifname); + goto cleanup; + } + + *receive = (ifr.ifr_flags & IFF_ALLMULTI) ? true : false; + ret = 0; + + cleanup: + VIR_FORCE_CLOSE(fd); + return ret; +} +#else + +int virNetDevIsRcvAllMulti(const char *ifname, + bool *receive ATTRIBUTE_UNUSED) +{ + virReportSystemError(ENOSYS, "%s", + _("Unable to retrieve device flags for interfaces " + "on this platform")); + return -1; +} +#endif + static int virNetDevParseMcast(char *buf, virNetDevMcastEntryPtr mcast) { int ifindex; @@ -2549,6 +2876,7 @@ int virNetDevGetRxFilter(const char *ifname, virNetDevRxFilterPtr *filter) { int ret = -1; + bool receive; virNetDevRxFilterPtr fil = virNetDevRxFilterNew(); if (!fil) @@ -2560,6 +2888,24 @@ int virNetDevGetRxFilter(const char *ifname, if (virNetDevGetMulticastTable(ifname, fil)) goto cleanup; + if (virNetDevIsPromiscuous(ifname, &fil->promiscuous)) + goto cleanup; + + if (virNetDevIsRcvAllMulti(ifname, &receive)) + goto cleanup; + + if (receive) + fil->multicast.mode = VIR_NETDEV_RX_FILTER_MODE_ALL; + else { + if (virNetDevIsRcvMulti(ifname, &receive)) + goto cleanup; + + if (receive) + fil->multicast.mode = VIR_NETDEV_RX_FILTER_MODE_NORMAL; + else + fil->multicast.mode = VIR_NETDEV_RX_FILTER_MODE_NONE; + } + ret = 0; cleanup: if (ret < 0) { diff --git a/src/util/virnetdev.h b/src/util/virnetdev.h index fb7988f..4216957 100644 --- a/src/util/virnetdev.h +++ b/src/util/virnetdev.h @@ -200,4 +200,18 @@ int virNetDevDelMulti(const char *ifname, virMacAddrPtr macaddr) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK; +int virNetDevSetPromiscuous(const char *ifname, bool promiscuous) + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK; +int virNetDevIsPromiscuous(const char *ifname, bool *promiscuous) + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK; + +int virNetDevSetRcvMulti(const char *ifname, bool receive) + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK; +int virNetDevIsRcvMulti(const char *ifname, bool *receive) + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK; + +int virNetDevSetRcvAllMulti(const char *ifname, bool receive) + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK; +int virNetDevIsRcvAllMulti(const char *ifname, bool *receive) + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK; #endif /* __VIR_NETDEV_H__ */ -- 1.7.1

3 6

[libvirt] [PATCH v3] qemu: Allow UEFI paths to be specified at compile time
by Michal Privoznik 22 Jan '15

22 Jan '15

Up until now there are just two ways how to specify UEFI paths to libvirt. The first one is editing qemu.conf, the other is editing qemu_conf.c and recompile which is not that fancy. So, new configure option is introduced: --with-loader-nvram which takes a list of pairs of UEFI firmware and NVRAM store. This way, the compiled in defaults can be passed during compile time without need to change the code itself. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- configure.ac | 32 +++++++++++++++++ src/qemu/qemu.conf | 12 +++++-- src/qemu/qemu_conf.c | 41 ++++++++++++++++++---- src/qemu/test_libvirtd_qemu.aug.in | 1 + .../domaincaps-qemu_1.6.50-1.xml | 1 + tests/domaincapstest.c | 15 ++++---- 6 files changed, 85 insertions(+), 17 deletions(-) diff --git a/configure.ac b/configure.ac index 9d12079..164cfad 100644 --- a/configure.ac +++ b/configure.ac @@ -2786,6 +2786,38 @@ AC_ARG_WITH([default-editor], [DEFAULT_EDITOR=vi]) AC_DEFINE_UNQUOTED([DEFAULT_EDITOR], ["$DEFAULT_EDITOR"], [Default editor to use]) +AC_ARG_WITH([loader-nvram], + [AS_HELP_STRING([--with-loader-nvram], + [Pass list of pairs of <loader>:<nvram> paths. Both + pairs and list items are separated by a colon. + @<:default=paths to OVMF and its clones@:>@])], + [with_loader_nvram=${withval}], + [with_loader_nvram=no]) + +if test "$with_loader_nvram" != "no"; then + IFS=':' read -a loader_arr <<< "${with_loader_nvram}" + + loader_str_c="{" + nvram_str_c="{" + for ((indx=0; indx<${#loader_arr[@]}; indx+=2)); do + loader=${loader_arr[[indx]]} + nvram=${loader_arr[[indx+1]]} + + if test -z "$loader" || test -z "$nvram"; then + AC_MSG_ERROR([Malformed loader-nvram list]) + fi + + loader_str_c="$loader_str_c \"$loader\"," + nvram_str_c="$nvram_str_c \"$nvram\"," + done + + loader_str_c="$loader_str_c }" + nvram_str_c="$nvram_str_c }" + + AC_DEFINE_UNQUOTED([DEFAULT_LOADER], [$loader_str_c], [Array of loader paths]) + AC_DEFINE_UNQUOTED([DEFAULT_NVRAM], [$nvram_str_c], [Array of nvram paths]) +fi + # Some GNULIB base64 symbols clash with a kerberos library AC_DEFINE_UNQUOTED([isbase64],[libvirt_gl_isbase64],[Hack to avoid symbol clash]) AC_DEFINE_UNQUOTED([base64_encode],[libvirt_gl_base64_encode],[Hack to avoid symbol clash]) diff --git a/src/qemu/qemu.conf b/src/qemu/qemu.conf index c6db568..1c589a2 100644 --- a/src/qemu/qemu.conf +++ b/src/qemu/qemu.conf @@ -506,6 +506,12 @@ # however, have different variables store. Therefore the nvram is # a list of strings when a single item is in form of: # ${PATH_TO_UEFI_FW}:${PATH_TO_UEFI_VARS}. -# Later, when libvirt creates per domain variable store, this -# list is searched for the master image. -#nvram = [ "/usr/share/OVMF/OVMF_CODE.fd:/usr/share/OVMF/OVMF_VARS.fd" ] +# Later, when libvirt creates per domain variable store, this list is +# searched for the master image. The UEFI firmware can be called +# differently for different guest architectures. For instance, it's OVMF +# for x86_64 and i686, but it's AAVMF for aarch64. The libvirt default +# follows this scheme. +#nvram = [ +# "/usr/share/OVMF/OVMF_CODE.fd:/usr/share/OVMF/OVMF_VARS.fd", +# "/usr/share/AAVMF/AAVMF_CODE.fd:/usr/share/AAVMF/AAVMF_VARS.fd" +#] diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index 9539231..728d01e 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -107,13 +107,21 @@ void qemuDomainCmdlineDefFree(qemuDomainCmdlineDefPtr def) VIR_FREE(def); } -#define VIR_QEMU_LOADER_FILE_PATH "/usr/share/OVMF/OVMF_CODE.fd" -#define VIR_QEMU_NVRAM_FILE_PATH "/usr/share/OVMF/OVMF_VARS.fd" +#define VIR_QEMU_OVMF_LOADER_PATH "/usr/share/AAVMF/AAVMF_CODE.fd" +#define VIR_QEMU_OVMF_NVRAM_PATH "/usr/share/AAVMF/AAVMF_VARS.fd" +#define VIR_QEMU_AAVMF_LOADER_PATH "/usr/share/OVMF/OVMF_CODE.fd" +#define VIR_QEMU_AAVMF_NVRAM_PATH "/usr/share/OVMF/OVMF_VARS.fd" virQEMUDriverConfigPtr virQEMUDriverConfigNew(bool privileged) { virQEMUDriverConfigPtr cfg; +#if defined(DEFAULT_LOADER) && defined(DEFAULT_NVRAM) + const char *loader[] = DEFAULT_LOADER; + const char *nvram[] = DEFAULT_NVRAM; + size_t i; +#endif + if (virQEMUConfigInitialize() < 0) return NULL; @@ -258,14 +266,33 @@ virQEMUDriverConfigPtr virQEMUDriverConfigNew(bool privileged) cfg->logTimestamp = true; - if (VIR_ALLOC_N(cfg->loader, 1) < 0 || - VIR_ALLOC_N(cfg->nvram, 1) < 0) +#if defined(DEFAULT_LOADER) && defined(DEFAULT_NVRAM) + verify(ARRAY_CARDINALITY(loader) == ARRAY_CARDINALITY(nvram)); + + if (VIR_ALLOC_N(cfg->loader, ARRAY_CARDINALITY(loader)) < 0 || + VIR_ALLOC_N(cfg->nvram, ARRAY_CARDINALITY(loader)) < 0) + goto error; + cfg->nloader = ARRAY_CARDINALITY(loader); + + for (i = 0; i < ARRAY_CARDINALITY(loader); i++) { + if (VIR_STRDUP(cfg->loader[i], loader[i]) < 0 || + VIR_STRDUP(cfg->nvram[i], nvram[i]) < 0) + goto error; + } + +#else /* !defined(DEFAULT_LOADER) || !defined(DEFAULT_NVRAM) */ + + if (VIR_ALLOC_N(cfg->loader, 2) < 0 || + VIR_ALLOC_N(cfg->nvram, 2) < 0) goto error; - cfg->nloader = 1; + cfg->nloader = 2; - if (VIR_STRDUP(cfg->loader[0], VIR_QEMU_LOADER_FILE_PATH) < 0 || - VIR_STRDUP(cfg->nvram[0], VIR_QEMU_NVRAM_FILE_PATH) < 0) + if (VIR_STRDUP(cfg->loader[0], VIR_QEMU_OVMF_LOADER_PATH) < 0 || + VIR_STRDUP(cfg->nvram[0], VIR_QEMU_OVMF_NVRAM_PATH) < 0 || + VIR_STRDUP(cfg->loader[1], VIR_QEMU_AAVMF_LOADER_PATH) < 0 || + VIR_STRDUP(cfg->nvram[1], VIR_QEMU_AAVMF_NVRAM_PATH) < 0) goto error; +#endif /* !defined(DEFAULT_LOADER) || !defined(DEFAULT_NVRAM) */ return cfg; diff --git a/src/qemu/test_libvirtd_qemu.aug.in b/src/qemu/test_libvirtd_qemu.aug.in index 30fd27e..fc4935b 100644 --- a/src/qemu/test_libvirtd_qemu.aug.in +++ b/src/qemu/test_libvirtd_qemu.aug.in @@ -76,4 +76,5 @@ module Test_libvirtd_qemu = { "log_timestamp" = "0" } { "nvram" { "1" = "/usr/share/OVMF/OVMF_CODE.fd:/usr/share/OVMF/OVMF_VARS.fd" } + { "2" = "/usr/share/AAVMF/AAVMF_CODE.fd:/usr/share/AAVMF/AAVMF_VARS.fd" } } diff --git a/tests/domaincapsschemadata/domaincaps-qemu_1.6.50-1.xml b/tests/domaincapsschemadata/domaincaps-qemu_1.6.50-1.xml index 346ef65..37d2102 100644 --- a/tests/domaincapsschemadata/domaincaps-qemu_1.6.50-1.xml +++ b/tests/domaincapsschemadata/domaincaps-qemu_1.6.50-1.xml @@ -5,6 +5,7 @@ <arch>x86_64</arch> <os supported='yes'> <loader supported='yes'> + <value>/usr/share/AAVMF/AAVMF_CODE.fd</value> <value>/usr/share/OVMF/OVMF_CODE.fd</value> <enum name='type'> <value>rom</value> diff --git a/tests/domaincapstest.c b/tests/domaincapstest.c index 70d2ef3..5ca8928 100644 --- a/tests/domaincapstest.c +++ b/tests/domaincapstest.c @@ -105,6 +105,7 @@ fillQemuCaps(virDomainCapsPtr domCaps, struct fillQemuCapsData *data = (struct fillQemuCapsData *) opaque; virQEMUCapsPtr qemuCaps = data->qemuCaps; virQEMUDriverConfigPtr cfg = data->cfg; + virDomainCapsLoaderPtr loader = &domCaps->os.loader; if (virQEMUCapsFillDomainCaps(domCaps, qemuCaps, cfg->loader, cfg->nloader) < 0) @@ -122,14 +123,14 @@ fillQemuCaps(virDomainCapsPtr domCaps, /* Moreover, as of f05b6a918e28 we are expecting to see * OVMF_CODE.fd file which may not exists everywhere. */ - if (!domCaps->os.loader.values.nvalues) { - virDomainCapsLoaderPtr loader = &domCaps->os.loader; + while (loader->values.nvalues) + VIR_FREE(loader->values.values[--loader->values.nvalues]); - if (fillStringValues(&loader->values, - "/usr/share/OVMF/OVMF_CODE.fd", - NULL) < 0) - return -1; - } + if (fillStringValues(&loader->values, + "/usr/share/AAVMF/AAVMF_CODE.fd", + "/usr/share/OVMF/OVMF_CODE.fd", + NULL) < 0) + return -1; return 0; } #endif /* WITH_QEMU */ -- 2.0.5

2 2

[libvirt] [PATCH v2] systemd: fix build without dbus
by Daniel P. Berrange 21 Jan '15

21 Jan '15

The virDBusMethodCall method has a DBusError as one of its parameters. If the caller wants to pass a non-NULL value for this, it immediately makes the calling code require DBus at build time. This has led to breakage of non-DBus builds several times. It is desirable that only the virdbus.c file should need WITH_DBUS conditionals, so we must ideally remove the DBusError parameter from the method. We can't simply raise a libvirt error, since the whole point of this parameter is to give the callers a way to check if the error is one they want to ignore, without having the logs polluted with an error message. So, we add a virErrorPtr parameter which the caller can then either ignore or raise using virSetError. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/util/virdbus.c | 31 +++++++++++++++++++------------ src/util/virdbus.h | 4 ++-- src/util/virfirewall.c | 29 ++++++----------------------- src/util/virsystemd.c | 15 +++++++-------- 4 files changed, 34 insertions(+), 45 deletions(-) In v2: - Removed left over debug statements diff --git a/src/util/virdbus.c b/src/util/virdbus.c index d9665c1..3522ae0 100644 --- a/src/util/virdbus.c +++ b/src/util/virdbus.c @@ -1522,7 +1522,7 @@ static int virDBusCall(DBusConnection *conn, DBusMessage *call, DBusMessage **replyout, - DBusError *error) + virErrorPtr error) { DBusMessage *reply = NULL; @@ -1530,8 +1530,9 @@ virDBusCall(DBusConnection *conn, int ret = -1; const char *iface, *member, *path, *dest; - if (!error) - dbus_error_init(&localerror); + dbus_error_init(&localerror); + if (error) + memset(error, 0, sizeof(*error)); iface = dbus_message_get_interface(call); member = dbus_message_get_member(call); @@ -1545,13 +1546,20 @@ virDBusCall(DBusConnection *conn, if (!(reply = dbus_connection_send_with_reply_and_block(conn, call, VIR_DBUS_METHOD_CALL_TIMEOUT_MILLIS, - error ? error : &localerror))) { + &localerror))) { PROBE(DBUS_METHOD_ERROR, "'%s.%s' on '%s' at '%s' error %s: %s", iface, member, path, dest, - error ? error->name : localerror.name, - error ? error->message : localerror.message); + localerror.name, + localerror.message); if (error) { + error->level = VIR_ERR_ERROR; + error->code = VIR_ERR_DBUS_SERVICE; + error->domain = VIR_FROM_DBUS; + if (VIR_STRDUP(error->message, localerror.message) < 0) + goto cleanup; + if (VIR_STRDUP(error->str1, localerror.name) < 0) + goto cleanup; ret = 0; } else { virReportError(VIR_ERR_DBUS_SERVICE, _("%s: %s"), member, @@ -1567,8 +1575,9 @@ virDBusCall(DBusConnection *conn, ret = 0; cleanup: - if (!error) - dbus_error_free(&localerror); + if (ret < 0 && error) + virResetError(error); + dbus_error_free(&localerror); if (reply) { if (ret == 0 && replyout) *replyout = reply; @@ -1616,7 +1625,7 @@ virDBusCall(DBusConnection *conn, */ int virDBusCallMethod(DBusConnection *conn, DBusMessage **replyout, - DBusError *error, + virErrorPtr error, const char *destination, const char *path, const char *iface, @@ -1634,8 +1643,6 @@ int virDBusCallMethod(DBusConnection *conn, if (ret < 0) goto cleanup; - ret = -1; - ret = virDBusCall(conn, call, replyout, error); cleanup: @@ -1832,7 +1839,7 @@ int virDBusCreateReply(DBusMessage **reply ATTRIBUTE_UNUSED, int virDBusCallMethod(DBusConnection *conn ATTRIBUTE_UNUSED, DBusMessage **reply ATTRIBUTE_UNUSED, - DBusError *error ATTRIBUTE_UNUSED, + virErrorPtr error ATTRIBUTE_UNUSED, const char *destination ATTRIBUTE_UNUSED, const char *path ATTRIBUTE_UNUSED, const char *iface ATTRIBUTE_UNUSED, diff --git a/src/util/virdbus.h b/src/util/virdbus.h index d0c7de2..e2b8d2b 100644 --- a/src/util/virdbus.h +++ b/src/util/virdbus.h @@ -28,7 +28,7 @@ # else # define DBusConnection void # define DBusMessage void -# define DBusError void +# define dbus_message_unref(m) do {} while (0) # endif # include "internal.h" @@ -62,7 +62,7 @@ int virDBusCreateReplyV(DBusMessage **reply, int virDBusCallMethod(DBusConnection *conn, DBusMessage **reply, - DBusError *error, + virErrorPtr error, const char *destination, const char *path, const char *iface, diff --git a/src/util/virfirewall.c b/src/util/virfirewall.c index b536912..2fa7f65 100644 --- a/src/util/virfirewall.c +++ b/src/util/virfirewall.c @@ -156,7 +156,6 @@ static int virFirewallValidateBackend(virFirewallBackend backend) { VIR_DEBUG("Validating backend %d", backend); -#if WITH_DBUS if (backend == VIR_FIREWALL_BACKEND_AUTOMATIC || backend == VIR_FIREWALL_BACKEND_FIREWALLD) { int rv = virDBusIsServiceRegistered(VIR_FIREWALL_FIREWALLD_SERVICE); @@ -180,16 +179,6 @@ virFirewallValidateBackend(virFirewallBackend backend) backend = VIR_FIREWALL_BACKEND_FIREWALLD; } } -#else - if (backend == VIR_FIREWALL_BACKEND_AUTOMATIC) { - VIR_DEBUG("DBus support disabled, trying direct backend"); - backend = VIR_FIREWALL_BACKEND_DIRECT; - } else if (backend == VIR_FIREWALL_BACKEND_FIREWALLD) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("firewalld firewall backend requested, but DBus support disabled")); - return -1; - } -#endif if (backend == VIR_FIREWALL_BACKEND_DIRECT) { const char *commands[] = { @@ -755,7 +744,6 @@ virFirewallApplyRuleDirect(virFirewallRulePtr rule, } -#ifdef WITH_DBUS static int virFirewallApplyRuleFirewallD(virFirewallRulePtr rule, bool ignoreErrors, @@ -764,13 +752,13 @@ virFirewallApplyRuleFirewallD(virFirewallRulePtr rule, const char *ipv = virFirewallLayerFirewallDTypeToString(rule->layer); DBusConnection *sysbus = virDBusGetSystemBus(); DBusMessage *reply = NULL; - DBusError error; + virError error; int ret = -1; if (!sysbus) return -1; - dbus_error_init(&error); + memset(&error, 0, sizeof(error)); if (!ipv) { virReportError(VIR_ERR_INTERNAL_ERROR, @@ -792,7 +780,7 @@ virFirewallApplyRuleFirewallD(virFirewallRulePtr rule, rule->args) < 0) goto cleanup; - if (dbus_error_is_set(&error)) { + if (error.level == VIR_ERR_ERROR) { /* * As of firewalld-0.3.9.3-1.fc20.noarch the name and * message fields in the error look like @@ -820,11 +808,9 @@ virFirewallApplyRuleFirewallD(virFirewallRulePtr rule, */ if (ignoreErrors) { VIR_DEBUG("Ignoring error '%s': '%s'", - error.name, error.message); + error.str1, error.message); } else { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unable to apply rule '%s'"), - error.message); + virSetError(&error); goto cleanup; } } else { @@ -835,12 +821,11 @@ virFirewallApplyRuleFirewallD(virFirewallRulePtr rule, ret = 0; cleanup: - dbus_error_free(&error); + virResetError(&error); if (reply) dbus_message_unref(reply); return ret; } -#endif static int virFirewallApplyRule(virFirewallPtr firewall, @@ -862,12 +847,10 @@ virFirewallApplyRule(virFirewallPtr firewall, if (virFirewallApplyRuleDirect(rule, ignoreErrors, &output) < 0) return -1; break; -#if WITH_DBUS case VIR_FIREWALL_BACKEND_FIREWALLD: if (virFirewallApplyRuleFirewallD(rule, ignoreErrors, &output) < 0) return -1; break; -#endif default: virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Unexpected firewall engine backend")); diff --git a/src/util/virsystemd.c b/src/util/virsystemd.c index 3eea5c2..0b71b26 100644 --- a/src/util/virsystemd.c +++ b/src/util/virsystemd.c @@ -252,8 +252,8 @@ int virSystemdCreateMachine(const char *name, VIR_DEBUG("Attempting to create machine via systemd"); if (virAtomicIntGet(&hasCreateWithNetwork)) { - DBusError error; - dbus_error_init(&error); + virError error; + memset(&error, 0, sizeof(error)); if (virDBusCallMethod(conn, NULL, @@ -280,21 +280,20 @@ int virSystemdCreateMachine(const char *name, "Before", "as", 1, "libvirt-guests.service") < 0) goto cleanup; - if (dbus_error_is_set(&error)) { + if (error.level == VIR_ERR_ERROR) { if (STREQ_NULLABLE("org.freedesktop.DBus.Error.UnknownMethod", - error.name)) { + error.str1)) { VIR_INFO("CreateMachineWithNetwork isn't supported, switching " "to legacy CreateMachine method for systemd-machined"); - dbus_error_free(&error); + virResetError(&error); virAtomicIntSet(&hasCreateWithNetwork, 0); /* Could re-structure without Using goto, but this * avoids another atomic read which would trigger * another memory barrier */ goto fallback; } - virReportError(VIR_ERR_DBUS_SERVICE, - _("CreateMachineWithNetwork: %s"), - error.message ? error.message : _("unknown error")); + virSetError(&error); + virResetError(&error); goto cleanup; } } else { -- 2.1.0

3 3

[libvirt] [libvirt-test-API][PATCH] Add network_dhcp_leases test case to conf
by jiahu 21 Jan '15

21 Jan '15

For running the case, should setup testing environment before the case, and clean up the environment after the case. --- cases/basic_network.conf | 55 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/cases/basic_network.conf b/cases/basic_network.conf index e9abd57..3ab9cb1 100644 --- a/cases/basic_network.conf +++ b/cases/basic_network.conf @@ -216,3 +216,58 @@ network:destroy networkname $defaultnetname +network:update + networkname + default + command + add-first + section + ip-dhcp-host + xml + xmls/ip-dhcp-host.xml + +domain:install_linux_cdrom + guestname + dhcplease + guestos + rhel6 + guestarch + $defaultarch + vcpu + $defaultvcpu + memory + $defaultmem + hddriver + $defaulthd + nicdriver + $defaultnic + macaddr + 00:16:3e:77:e2:ed + +network:network_dhcp_leases + networkname + default + +network:network_dhcp_leases + networkname + default + macaddr + 00:16:3e:77:e2:ed + +network:update + networkname + default + command + delete + section + ip-dhcp-host + xml + xmls/ip-dhcp-host.xml + +domain:destroy + guestname + dhcplease + +domain:undefine + guestname + dhcplease -- 1.8.3.1

1 0

[libvirt] [libvirt-test-API][PATCH] Add network_dhcp_leases test case
by jiahu 21 Jan '15

21 Jan '15

The network_dhcp_leases.py uses DHCPLeases() to validate new API virNetworkGetDHCPLeases of libvirt. --- repos/network/network_dhcp_leases.py | 277 +++++++++++++++++++++++++++++++++++ 1 file changed, 277 insertions(+) create mode 100644 repos/network/network_dhcp_leases.py diff --git a/repos/network/network_dhcp_leases.py b/repos/network/network_dhcp_leases.py new file mode 100644 index 0000000..29ee529 --- /dev/null +++ b/repos/network/network_dhcp_leases.py @@ -0,0 +1,277 @@ +#!/usr/bin/env python +#test DHCPLeases() API for libvirt + +import os +import time +import libvirt +from libvirt import libvirtError +from utils import utils +from src import sharedmod + +required_params = ('networkname',) +optional_params = {'macaddr': ''} + +LEASE_FILE = "/var/lib/libvirt/dnsmasq/" + +def check_ip(ipaddr, logger): + """ + return a string according to ip address type, return 'ipv4' for ipv4, + return 'ipv6' for ipv6, return False for others + """ + addr4 = ipaddr.strip().split('.') + addr6 = ipaddr.strip().split(':') + if len(addr4) == 4: + iptype = "ipv4" + elif len(addr6) == 6: + iptype = "ipv6" + else: + return False + return iptype + +def get_network_type(ipaddr,logger): + """ + return 0 or 1 for ipv4/ipv6, this function will be used in + check_ipv4_values()/check_ipv6_values() + """ + if check_ip(ipaddr, logger) == "ipv4": + return 0 + elif check_ip(ipaddr, logger) == "ipv6": + return 1 + +def get_bridge_name(network,logger): + """ + get bridge name under specified network from specified network conf + """ + CONF_NETWORK = LEASE_FILE + network + ".conf" + GREP_BRIDGE = "grep \"^interface=\" %s | awk -F\"=\" '{print $2}'" + status, output = utils.exec_cmd(GREP_BRIDGE % CONF_NETWORK, shell=True) + if not status: + pass + else: + logger.error("\"" + GREP_BRIDGE + "\"" + "error") + logger.error(output) + return False + return output[0] + +def get_ip_prefix(network, iptype, logger): + """ + get ip prefix according to IP type + """ + br = get_bridge_name(network, logger) + PREFIX = "ip -4 -o ad show %s | awk '{print $4}'|awk -F\"/\" '{print $2}'" + PREFIX_6 = "ip -6 -o ad show %s|awk '{print $4}'|awk -F\"/\" '{print $2}'" + if iptype == "ipv4": + status, output = utils.exec_cmd(PREFIX % br, shell=True) + elif iptype == "ipv6": + status, output = utils.exec_cmd(PREFIX_6 % br, shell=True) + if not status: + pass + else: + logger.error("\"" + GREP_BRIDGE + "\"" + "error") + logger.error(output) + return False + return output[0] + +def get_info_from_dnsmasq(network,macaddr,logger): + """ + generate dict for lease info from virtual network's lease file + """ + title = ['expirytime','mac','ipaddr','hostname','clientid'] + output_list = [] + lease_dnsmasq = [] + temp = [] + remove_list = [] + GREP_MAC = "grep -w %s" + " " + LEASE_FILE_DNSMASQ + CAT_FILE = "cat" + " " + LEASE_FILE_DNSMASQ + + status, output = utils.exec_cmd(CAT_FILE, shell=True) + if not status: + for i in range(0, len(output)): + output_list = [] + output_str = output[i] + for item in output_str.split(" "): + output_list.append(item) + lease_dnsmasq.append(dict(zip(title,output_list))) + + #due to no mac field in IPv6 line, so do nothing here temporarily. + if macaddr != None: + pass + + #remove bridge duid line + for i in range(0, len(lease_dnsmasq)): + if lease_dnsmasq[i]['expirytime'] == 'duid': + remove_list.append(lease_dnsmasq[i]) + + for i in range(0, len(remove_list)): + lease_dnsmasq.remove(remove_list[i]) + + #remove expiry leases + for i in range(0, len(lease_dnsmasq)): + temp = int(lease_dnsmasq[i]['expirytime']) + lease_dnsmasq[i]['expirytime'] = temp + + remove_list = [] + for i in range(0, len(lease_dnsmasq)): + if time.time() >= int(lease_dnsmasq[i]['expirytime']): + remove_list.append(lease_dnsmasq[i]) + + for i in range(0, len(remove_list)): + lease_dnsmasq.remove(remove_list[i]) + + #replace * to None + for i in range(0, len(lease_dnsmasq)): + if lease_dnsmasq[i]['hostname'] == "*": + lease_dnsmasq[i]['hostname'] = None + if lease_dnsmasq[i]['clientid'] == "*": + lease_dnsmasq[i]['clientid'] = None + + return lease_dnsmasq + else: + logger.error("\"" + CAT_FILE + "\"" + "error") + logger.error(output) + return False + +def compare_values(op1, op2, network, iptype, logger): + """ + check all printed values from API + """ + dnsmasq = op1 + api = op2 + temp = int(api['expirytime']) + api['expirytime'] = temp + + for j in range(0,len(dnsmasq)): + if dnsmasq[j]['hostname'] == api['hostname'] and \ + dnsmasq[j]['expirytime'] == api['expirytime']: + if dnsmasq[j]['ipaddr'] == api['ipaddr'] and \ + dnsmasq[j]['clientid'] == api['clientid']: + + if iptype == "ipv4": + logger.debug("PASS: hostname: %s expirytime: %s ipaddr: %s" \ + % (api['hostname'],api['expirytime'],api['ipaddr'])) + logger.debug("Unsupported: clientid: %s in IPv4" \ + % (api['clientid'])) + elif iptype == "ipv6": + logger.debug("PASS: hostname: %s expirytime: %s ipaddr: %s \ +clientid: %s" % (api['hostname'],api['expirytime'],api['ipaddr'],\ +api['clientid'])) + + if iptype == "ipv4" and api['mac'] == dnsmasq[j]['mac']: + logger.debug("PASS: mac: %s" % api['mac']) + elif iptype == "ipv6" and api['iaid'] == dnsmasq[j]['mac']: + logger.debug("PASS: iaid: %s" % api['iaid']) + else: + logger.error("Fail: mac/iaid: %s/%s" % (api['mac'], \ + api['iaid'])) + return False + + break + else: + if j == len(dnsmasq) - 1: + logger.debug("Last loop %d, FAIL: %s" % (j,api)) + logger.debug("failed on ipaddr or clientid") + return False + else: + logger.debug("Skipped loop %d,Warning: ipaddr: %s \ +clientid: %s" % (j,api['ipaddr'],api['clientid'])) + continue + else: + if j == len(dnsmasq) - 1: + logger.error("Fail: hostname: %s expirytime: %s ipaddr: %s \ +clientid: %s" % (api['hostname'],api['expirytime'],api['ipaddr'], \ +api['clientid'])) + logger.error("Last loop %d, FAIL: %s" % (j,api)) + return False + else: + logger.debug("Skipped loop %d,Warning: hostname: \ +%s expirytime: %s" % (j,api['hostname'],api['expirytime'])) + continue + if not api['iface'] == get_bridge_name(network,logger): + logger.error("FAIL: iface: %s" % api['iface']) + return False + else: + logger.debug("PASS: iface: %s" % api['iface']) + if not api['type'] == get_network_type(api['ipaddr'],logger): + logger.error("FAIL: type: %s" % api['type']) + return False + else: + logger.debug("PASS: type: %s" % api['type']) + + if not api['prefix'] == int(get_ip_prefix(network, iptype ,logger)): + logger.error("FAIL: prefix: %s" % api['prefix']) + logger.error("FAIL: %s" % api) + return False + else: + logger.debug("PASS: prefix: %s" % api['prefix']) + if iptype == "ipv4": + if not api['iaid'] == None: + logger.error("FAIL: iaid: %s" % api['iaid']) + return False + else: + logger.debug("Unsupported: iaid: %s in IPv4" % api['iaid']) + logger.debug("PASS: %s" % api) + elif iptype == "ipv6": + logger.debug("Ignoring mac checking on IPv6 line %s" % api['mac']) + logger.debug("PASS: %s" % api) + + return True + +def check_values(op1, op2, network, logger): + """ + check each line accorting to ip type, if ipv4 go to check_ipv4_values + if ipv6, go to check_ipv6_values. + """ + networkname = network + dnsmasq = op1 + api = op2 + + for i in range(0, len(api)): + if check_ip(api[i]['ipaddr'],logger) == "ipv4": + if not compare_values(dnsmasq,api[i],networkname,"ipv4",logger): + return False + elif check_ip(api[i]['ipaddr'],logger) == "ipv6": + if not compare_values(dnsmasq,api[i],networkname,"ipv6",logger): + return False + else: + logger.error("invalid list element for ipv4 and ipv6") + return False + return True + +def network_dhcp_leases(params): + """ + test API for DHCPLeases in class virNetwork + """ + global LEASE_FILE_DNSMASQ + logger = params['logger'] + networkname = params['networkname'] + LEASE_FILE_DNSMASQ = "/var/lib/libvirt/dnsmasq/" + networkname + ".leases" + mac_value = params.get('macaddr', None) + conn = sharedmod.libvirtobj['conn'] + logger.info("The given mac is %s" % (mac_value)) + + if not os.path.exists(LEASE_FILE_DNSMASQ): + logger.error("leases file for %s is not exist" % networkname) + logger.error("%s" % LEASE_FILE_DNSMASQ) + return 1 + dhcp_lease_dns = get_info_from_dnsmasq(networkname, mac_value, logger) + logger.info("From dnsmasq: %s" % (dhcp_lease_dns)) + if not dhcp_lease_dns: + return 1 + + netobj = conn.networkLookupByName(networkname) + + try: + dhcp_lease_api = netobj.DHCPLeases(mac_value,0) + if not dhcp_lease_api and dhcp_lease_dns: + logger.info("From API: %s" % (dhcp_lease_api)) + return 1 + logger.info("From API: %s" % (dhcp_lease_api)) + if not check_values(dhcp_lease_dns,dhcp_lease_api,networkname,logger): + return 1 + + except libvirtError, e: + logger.error("API error message: %s, error code is %s" \ + % (e.message, e.get_error_code())) + return 1 + + return 0 -- 1.8.3.1

1 0

[libvirt] [PATCH 0/2] try to use btrfs COW copy
by Chen Hanxiao 21 Jan '15

21 Jan '15

If VIR_STORAGE_VOL_CREATE_REFLINK is specified, try to use btrfs COW copy; If btrfs COW copy is not supported, fall back to normal copy. Chen Hanxiao (2): introduce btrfsCloneFile for COW copy storage: try to perform btrfs clone if possible include/libvirt/libvirt-storage.h | 1 + src/storage/storage_backend.c | 65 ++++++++++++++++++++++++++++++++++----- src/storage/storage_backend_fs.c | 8 +++-- src/storage/storage_driver.c | 4 ++- 4 files changed, 68 insertions(+), 10 deletions(-) -- 1.9.3

3 9

[libvirt] [PATCH 0/8] Refactoring driver registration
by Daniel P. Berrange 21 Jan '15

21 Jan '15

This series continues on my previous work to refactor the driver registration process. With this patch series applied, there is no probing of secondary drivers any more. Once the hypervisor driver is chosen, the correct secondary drivers are immediately known. This enables a bunch of hacks to be removed from the ESX, HyperV and VirtualBox drivers. The final remaining problem will be to address the circular dependancy problems wrt to the secrets and storage drivers. Daniel P. Berrange (8): Remove use of secretPrivateData from secret driver Remove use of nwfilterPrivateData from nwfilter driver Remove use of storagePrivateData/networkPrivateData from vbox Remove use of nodeDevicePrivateData from nodeDev driver Remove use of interfacePrivateData from udev driver Remove all secondary driver private data fields don't disable state driver when libvirtd is not built Removing probing of secondary drivers daemon/libvirtd.c | 19 +- src/Makefile.am | 69 +------ src/bhyve/bhyve_driver.c | 14 +- src/check-driverimpls.pl | 3 +- src/conf/domain_nwfilter.c | 5 +- src/conf/domain_nwfilter.h | 6 +- src/datatypes.c | 12 -- src/datatypes.h | 6 - src/driver-hypervisor.h | 3 - src/driver-interface.h | 9 - src/driver-network.h | 11 +- src/driver-nodedev.h | 8 +- src/driver-nwfilter.h | 13 +- src/driver-secret.h | 12 +- src/driver-storage.h | 12 +- src/driver.h | 60 +++--- src/esx/esx_device_monitor.c | 74 -------- src/esx/esx_device_monitor.h | 28 --- src/esx/esx_driver.c | 25 +-- src/esx/esx_interface_driver.c | 37 +--- src/esx/esx_interface_driver.h | 4 +- src/esx/esx_network_driver.c | 37 +--- src/esx/esx_network_driver.h | 4 +- src/esx/esx_nwfilter_driver.c | 74 -------- src/esx/esx_nwfilter_driver.h | 28 --- src/esx/esx_secret_driver.c | 72 ------- src/esx/esx_secret_driver.h | 27 --- src/esx/esx_storage_driver.c | 37 +--- src/esx/esx_storage_driver.h | 4 +- src/hyperv/hyperv_device_monitor.c | 71 ------- src/hyperv/hyperv_device_monitor.h | 28 --- src/hyperv/hyperv_driver.c | 25 +-- src/hyperv/hyperv_interface_driver.c | 71 ------- src/hyperv/hyperv_interface_driver.h | 28 --- src/hyperv/hyperv_network_driver.c | 71 ------- src/hyperv/hyperv_network_driver.h | 28 --- src/hyperv/hyperv_nwfilter_driver.c | 71 ------- src/hyperv/hyperv_nwfilter_driver.h | 28 --- src/hyperv/hyperv_secret_driver.c | 71 ------- src/hyperv/hyperv_secret_driver.h | 28 --- src/hyperv/hyperv_storage_driver.c | 71 ------- src/hyperv/hyperv_storage_driver.h | 28 --- src/interface/interface_backend_netcf.c | 26 +-- src/interface/interface_backend_udev.c | 120 ++++++------ src/libvirt.c | 327 ++++++++++++++------------------ src/libvirt_daemon.syms | 15 -- src/libvirt_internal.h | 2 - src/libvirt_private.syms | 19 +- src/libxl/libxl_driver.c | 10 +- src/lxc/lxc_driver.c | 13 +- src/lxc/lxc_process.c | 8 +- src/lxc/lxc_process.h | 3 +- src/network/bridge_driver.c | 25 +-- src/node_device/node_device_driver.c | 78 +++----- src/node_device/node_device_driver.h | 6 +- src/node_device/node_device_hal.c | 106 ++++------- src/node_device/node_device_udev.c | 78 +++----- src/nwfilter/nwfilter_driver.c | 132 +++++-------- src/openvz/openvz_driver.c | 12 +- src/phyp/phyp_driver.c | 64 +------ src/qemu/qemu_command.c | 8 +- src/qemu/qemu_command.h | 1 - src/qemu/qemu_driver.c | 12 +- src/qemu/qemu_hotplug.c | 12 +- src/qemu/qemu_hotplug.h | 1 - src/qemu/qemu_process.c | 10 +- src/remote/remote_driver.c | 158 ++------------- src/secret/secret_driver.c | 215 +++++++++------------ src/storage/storage_driver.c | 25 +-- src/test/test_driver.c | 156 ++------------- src/uml/uml_conf.c | 9 +- src/uml/uml_driver.c | 10 +- src/vbox/vbox_common.c | 1 - src/vbox/vbox_driver.c | 47 ++--- src/vbox/vbox_network.c | 32 ---- src/vbox/vbox_storage.c | 30 --- src/vmware/vmware_driver.c | 12 +- src/xen/xen_driver.c | 11 +- src/xenapi/xenapi_driver.c | 10 +- tests/qemuxml2argvtest.c | 17 -- tests/virdrivermoduletest.c | 18 +- 81 files changed, 648 insertions(+), 2523 deletions(-) delete mode 100644 src/esx/esx_device_monitor.c delete mode 100644 src/esx/esx_device_monitor.h delete mode 100644 src/esx/esx_nwfilter_driver.c delete mode 100644 src/esx/esx_nwfilter_driver.h delete mode 100644 src/esx/esx_secret_driver.c delete mode 100644 src/esx/esx_secret_driver.h delete mode 100644 src/hyperv/hyperv_device_monitor.c delete mode 100644 src/hyperv/hyperv_device_monitor.h delete mode 100644 src/hyperv/hyperv_interface_driver.c delete mode 100644 src/hyperv/hyperv_interface_driver.h delete mode 100644 src/hyperv/hyperv_network_driver.c delete mode 100644 src/hyperv/hyperv_network_driver.h delete mode 100644 src/hyperv/hyperv_nwfilter_driver.c delete mode 100644 src/hyperv/hyperv_nwfilter_driver.h delete mode 100644 src/hyperv/hyperv_secret_driver.c delete mode 100644 src/hyperv/hyperv_secret_driver.h delete mode 100644 src/hyperv/hyperv_storage_driver.c delete mode 100644 src/hyperv/hyperv_storage_driver.h delete mode 100644 src/libvirt_daemon.syms -- 2.1.0

2 12

[libvirt] [RFC PATCH 0/3] qemu: add support to hot-unplug memory device
by Zhu Guihua 21 Jan '15

21 Jan '15

If you apply the patchset on your qemu [RESEND PATCH v1 00/13] QEmu memory hot unplug support. https://lists.nongnu.org/archive/html/qemu-devel/2015-01/msg00583.html, qemu can support memory hot-unplug. So this patchset will make libvirt support hot-unplug memory device for qemu driver. This series is based on the following patchset [RFC PATCH 00/11] qemu: add support to hotplug memory device. https://www.redhat.com/archives/libvir-list/2015-January/msg00728.html Zhu Guihua (3): qemu_monitor: introduce qemuMonitorDelMemoryBackend qemu: introduce qemuDomainRemoveDimmDevice qemu: implement dimm device hot-unplug on live level src/qemu/qemu_driver.c | 2 ++ src/qemu/qemu_hotplug.c | 95 +++++++++++++++++++++++++++++++++++++++++++++++++ src/qemu/qemu_hotplug.h | 3 ++ src/qemu/qemu_monitor.c | 20 +++++++++++ src/qemu/qemu_monitor.h | 2 ++ 5 files changed, 122 insertions(+) -- 1.9.3

2 4

[libvirt] [PATCH] qemu: format server interface without a listen address
by Ján Tomko 21 Jan '15

21 Jan '15

https://bugzilla.redhat.com/show_bug.cgi?id=1130390 The listen address is not mandatory for <interface type='server'> but when it's not specified, we've been formatting it as: -netdev socket,listen=(null):5558,id=hostnet0 which failed with: Device 'socket' could not be initialized Omit the address completely and only format the port in the listen attribute. --- docs/schemas/domaincommon.rng | 10 ++++++++++ src/qemu/qemu_command.c | 3 ++- tests/qemuxml2argvdata/qemuxml2argv-net-vhostuser.args | 4 +++- tests/qemuxml2argvdata/qemuxml2argv-net-vhostuser.xml | 5 +++++ 4 files changed, 20 insertions(+), 2 deletions(-) diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index c428ddf..9d6c1ee 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -2207,6 +2207,16 @@ <empty/> </element> </optional> + <optional> + <element name="model"> + <attribute name="type"> + <data type="string"> + <param name='pattern'>[a-zA-Z0-9\-_]+</param> + </data> + </attribute> + <empty/> + </element> + </optional> </interleave> </group> <group> diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index c041ee7..7e1f3d0 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -4576,7 +4576,8 @@ qemuBuildHostNetStr(virDomainNetDefPtr net, case VIR_DOMAIN_NET_TYPE_SERVER: virBufferAsprintf(&buf, "socket%clisten=%s:%d", type_sep, - net->data.socket.address, + net->data.socket.address ? net->data.socket.address + : "", net->data.socket.port); type_sep = ','; break; diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-vhostuser.args b/tests/qemuxml2argvdata/qemuxml2argv-net-vhostuser.args index 26daac3..ac43630 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-net-vhostuser.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-net-vhostuser.args @@ -7,4 +7,6 @@ pc -m 214 -smp 1 -nographic -nodefaults -monitor unix:/tmp/test-monitor,server,n -device virtio-net-pci,netdev=hostnet0,id=net0,mac=52:54:00:ee:96:6b,bus=pci.0,addr=0x3 \ -chardev socket,id=charnet1,path=/tmp/vhost1.sock \ -netdev type=vhost-user,id=hostnet1,chardev=charnet1 \ --device virtio-net-pci,netdev=hostnet1,id=net1,mac=52:54:00:ee:96:6c,bus=pci.0,addr=0x4 +-device virtio-net-pci,netdev=hostnet1,id=net1,mac=52:54:00:ee:96:6c,bus=pci.0,addr=0x4 \ +-netdev socket,listen=:2015,id=hostnet2 \ +-device rtl8139,netdev=hostnet2,id=net2,mac=52:54:00:95:db:c0,bus=pci.0,addr=0x5 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-vhostuser.xml b/tests/qemuxml2argvdata/qemuxml2argv-net-vhostuser.xml index e5b6242..fa09157 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-net-vhostuser.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-net-vhostuser.xml @@ -33,6 +33,11 @@ <source type='unix' path='/tmp/vhost1.sock' mode='client'/> <model type='virtio'/> </interface> + <interface type='server'> + <mac address='52:54:00:95:db:c0'/> + <source port='2015'/> + <model type='rtl8139'/> + </interface> <memballoon model='none'/> </devices> </domain> -- 2.0.4

2 1

[libvirt] [PATCH] tests: fix xlconfigtest build failure
by Jim Fehlig 21 Jan '15

21 Jan '15

When libvirt is configured --without-xen, building the xlconfigtest fails with CCLD xlconfigtest /usr/lib/gcc/x86_64-linux-gnu/4.7/../../../x86_64-linux-gnu/crt1.o In function `_start': (.text+0x20): undefined reference to `main' collect2: error: ld returned 1 exit status Introduced in commit 4ed5fb91 by too much copy and paste from xmconfigtest. Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- tests/Makefile.am | 17 ++++++++++++----- tests/xlconfigtest.c | 4 ++-- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index b16d3d5..1d838a5 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -483,11 +483,6 @@ sexpr2xmltest_SOURCES = \ testutils.c testutils.h sexpr2xmltest_LDADD = $(xen_LDADDS) -xlconfigtest_SOURCES = \ - xlconfigtest.c testutilsxen.c testutilsxen.h \ - testutils.c testutils.h -xlconfigtest_LDADD =$(xen_LDADDS) - xmconfigtest_SOURCES = \ xmconfigtest.c testutilsxen.c testutilsxen.h \ testutils.c testutils.h @@ -511,6 +506,18 @@ EXTRA_DIST += xml2sexprtest.c sexpr2xmltest.c xmconfigtest.c \ testutilsxen.c testutilsxen.h endif ! WITH_XEN +if WITH_LIBXL +libxl_LDADDS = ../src/libvirt_driver_libxl_impl.la +libxl_LDADDS += $(LDADDS) + +xlconfigtest_SOURCES = \ + xlconfigtest.c testutilsxen.c testutilsxen.h \ + testutils.c testutils.h +xlconfigtest_LDADD =$(libxl_LDADDS) +else ! WITH_LIBXL +EXTRA_DIST += xlconfigtest.c +endif ! WITH_LIBXL + QEMUMONITORTESTUTILS_SOURCES = \ qemumonitortestutils.c \ qemumonitortestutils.h \ diff --git a/tests/xlconfigtest.c b/tests/xlconfigtest.c index c2763c0..8c4c82c 100644 --- a/tests/xlconfigtest.c +++ b/tests/xlconfigtest.c @@ -36,7 +36,7 @@ #include "virstring.h" #include "testutils.h" #include "testutilsxen.h" -#include "xen/xen_driver.h" +#include "libxl/libxl_conf.h" #define VIR_FROM_THIS VIR_FROM_NONE @@ -198,7 +198,7 @@ mymain(void) if (!(caps = testXLInitCaps())) return EXIT_FAILURE; - if (!(xmlopt = xenDomainXMLConfInit())) + if (!(xmlopt = libxlCreateXMLConf())) return EXIT_FAILURE; #define DO_TEST(name, version) \ -- 1.8.4.5

2 2

Re: [libvirt] [Xen-devel] [libvirt bisection] complete build-armhf-libvirt
by Ian Campbell 21 Jan '15

21 Jan '15

On Mon, 2015-01-19 at 09:37 +0000, Ian Campbell wrote: > On Mon, 2015-01-19 at 04:48 +0000, xen.org wrote: > > branch xen-unstable > > xen branch xen-unstable > > job build-armhf-libvirt > > test libvirt-build > > > > Tree: libvirt git://libvirt.org/libvirt.git > > Tree: qemuu git://xenbits.xen.org/staging/qemu-upstream-unstable.git > > Tree: xen git://xenbits.xen.org/xen.git > > > > *** Found and reproduced problem changeset *** > > > > Bug is in tree: libvirt git://libvirt.org/libvirt.git > > Bug introduced: 2c78051a14acfb7aba078d569b1632dfe0ca0853 > > Bug not present: 7ad117b2e33039737126ce9df7a267a6f939988d > > > > > > commit 2c78051a14acfb7aba078d569b1632dfe0ca0853 > > Author: Kiarie Kahurani <davidkiarie4(a)gmail.com> > > Date: Thu Sep 11 07:10:33 2014 +0300 > > > > src/xenconfig: Xen-xl parser > > This has since been reverted and done again differently, so nothing to > worry about I think. That said the latest failure is http://www.chiark.greenend.org.uk/~xensrcts/logs/33553/build-amd64-libvirt/… CC virdbustest-testutils.o CC virsystemdtest-virsystemdtest.o CC virsystemdtest-testutils.o CC virdrivermoduletest.o CCLD xlconfigtest CC qemuxml2argvtest.o /usr/lib/gcc/x86_64-linux-gnu/4.7/../../../x86_64-linux-gnu/crt1.o: In function `_start': (.text+0x20): undefined reference to `main' collect2: error: ld returned 1 exit status (from http://www.chiark.greenend.org.uk/~xensrcts/logs/33553/ ) The bisector is working on it, partial result at: http://www.chiark.greenend.org.uk/~xensrcts/results/bisect.libvirt.build-am… I'll mail the result when it arrives. Ian.

2 1

[libvirt] [PATCH 0/3] Support for per-thread scheduling settings
by Martin Kletzander 21 Jan '15

21 Jan '15

Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1178986 Martin Kletzander (3): util: Add virProcessSetScheduler() function for scheduler settings docs, schema, conf: Add support for setting scheduler parameters of guest threads qemu: Add support for setting vCPU and I/O thread scheduler setting docs/formatdomain.html.in | 13 +++ docs/schemas/domaincommon.rng | 33 ++++++ src/conf/domain_conf.c | 137 +++++++++++++++++++++++- src/conf/domain_conf.h | 24 +++++ src/libvirt_private.syms | 1 + src/qemu/qemu_driver.c | 7 +- src/qemu/qemu_process.c | 76 ++++++++++++- src/qemu/qemu_process.h | 5 +- src/util/virprocess.c | 46 +++++++- src/util/virprocess.h | 6 +- tests/qemuxml2argvdata/qemuxml2argv-cputune.xml | 4 + 11 files changed, 345 insertions(+), 7 deletions(-) -- 2.2.1

2 11