- Devel - libvirt List Archives

[libvirt] [PATCH] virsh: report error if vcpu number exceed the guest maxvcpu number
by Luyao Huang 03 Jul '15

03 Jul '15

If usr pass a vcpu which exceed guest maxvcpu number, virsh client will only output an header like this: # virsh vcpupin test3 1000 VCPU: CPU Affinity ---------------------------------- After this patch: # virsh vcpupin test3 1000 error: vcpu 1000 is out of range of cpu count 2 Signed-off-by: Luyao Huang <lhuang(a)redhat.com> --- tools/virsh-domain.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 27d62e9..681fc1a 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -6497,6 +6497,11 @@ cmdVcpuPin(vshControl *ctl, const vshCmd *cmd) goto cleanup; } + if (got_vcpu && vcpu >= ncpus) { + vshError(ctl, _("vcpu %d is out of range of cpu count %d"), vcpu, ncpus); + goto cleanup; + } + cpumaplen = VIR_CPU_MAPLEN(maxcpu); cpumap = vshMalloc(ctl, ncpus * cpumaplen); if ((ncpus = virDomainGetVcpuPinInfo(dom, ncpus, cpumap, -- 1.8.3.1

4 5

[libvirt] Request for libvirt wiki account creation
by Prerna 03 Jul '15

03 Jul '15

Hi, I am interested in contributing some content to the libvirt wiki; and so I need a libvirt wiki account. Could you pls create an account with following credentials: username : prerna Thanks, Prerna Saxena

2 2

[libvirt] Which symbols can be used in file paths in libvirt's XMLs?
by Dmitry Guryanov 02 Jul '15

02 Jul '15

Hello, There is an absFilePatch type in docs/schemas/basictypes.rng rng schema: <define name="absFilePath"> <data type="string"> <param name="pattern">/[a-zA-Z0-9_\.\+\-\\&"'<>/%,:]+</param> </data> </define> There are quite few symbols in this set of the ones, which linux allows to have in file paths. For example spaces or curly braces are not allowed. There are a lot of elements of this type in other rng schems, for example: <define name="diskSourceFile"> <optional> <attribute name="type"> <value>file</value> </attribute> </optional> <interleave> <optional> <element name="source"> <optional> <attribute name="file"> <ref name="absFilePath"/> </attribute> There is no checks in libvirt if the the xml, given to, for example, virDomainDefineXML function conforms to this schema. I've added a disk to the domain with curly braces in path and there were no errors: <disk type='file' device='disk'> <driver name='qemu' type='qcow2'/> <source file='/home/libvirt/{123}.qcow2'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> </disk> The domain was successfully defined and virsh dumpxml shows this path in output. So the question is, where did this path pattern come from? Is it possible to use file paths with another symbols or there will be some problems? -- Dmitry Guryanov

2 2

[libvirt] [PATCHv3] virt-aa-helper: Fix permissions for vhost-user socket files
by Michal Dubiel 02 Jul '15

02 Jul '15

QEMU working in vhost-user mode communicates with the other end (i.e. some virtual router application) via unix domain sockets. This requires that permissions for the socket files are correctly written into /etc/apparmor.d/libvirt/libvirt-UUID.files. Signed-off-by: Michal Dubiel <md(a)semihalf.com> --- Changes since v2: - Removed curly braces from one line 'if' block (syntax-check claims) src/security/virt-aa-helper.c | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c index 35423b5..13f8a6a 100644 --- a/src/security/virt-aa-helper.c +++ b/src/security/virt-aa-helper.c @@ -32,7 +32,6 @@ #include <unistd.h> #include <errno.h> #include <sys/types.h> -#include <sys/stat.h> #include <fcntl.h> #include <getopt.h> #include <sys/utsname.h> @@ -542,7 +541,6 @@ array_starts_with(const char *str, const char * const *arr, const long size) static int valid_path(const char *path, const bool readonly) { - struct stat sb; int npaths, opaths; const char * const restricted[] = { "/bin/", @@ -590,20 +588,8 @@ valid_path(const char *path, const bool readonly) if (STRNEQLEN(path, "/", 1)) return 1; - if (!virFileExists(path)) { + if (!virFileExists(path)) vah_warning(_("path does not exist, skipping file type checks")); - } else { - if (stat(path, &sb) == -1) - return -1; - - switch (sb.st_mode & S_IFMT) { - case S_IFSOCK: - return 1; - break; - default: - break; - } - } opaths = sizeof(override)/sizeof(*(override)); @@ -1101,6 +1087,18 @@ get_files(vahControl * ctl) } } + for (i = 0; i < ctl->def->nnets; i++) { + if (ctl->def->nets[i] && + ctl->def->nets[i]->type == VIR_DOMAIN_NET_TYPE_VHOSTUSER && + ctl->def->nets[i]->data.vhostuser) { + virDomainChrSourceDefPtr vhu = ctl->def->nets[i]->data.vhostuser; + + if (vah_add_file_chardev(&buf, vhu->data.nix.path, "rw", + vhu->type) != 0) + goto cleanup; + } + } + if (ctl->def->virtType == VIR_DOMAIN_VIRT_KVM) { for (i = 0; i < ctl->def->nnets; i++) { virDomainNetDefPtr net = ctl->def->nets[i]; -- 1.9.1

3 2

[libvirt] [PATCH 00/20] cpu_map.xml: Make CPU definitions easier to review
by Jiri Denemark 02 Jul '15

02 Jul '15

Inheritance among CPU model is cool but it makes reviewing CPU model definitions and comparing them to CPU models from QEMU rather hard and unpleasant. Let's define all CPU models from scratch with a sorted list of features. Jiri Denemark (20): cpu_map.xml: Sort features in x86 CPU models cpu_map.xml: Expand 486 CPU model cpu_map.xml: Expand pentium CPU model cpu_map.xml: Expand pentium2 CPU model cpu_map.xml: Expand pentiumpro CPU model cpu_map.xml: Expand coreduo CPU model cpu_map.xml: Expand n270 CPU model cpu_map.xml: Expand qemu32 CPU model cpu_map.xml: Expand kvm32 CPU model cpu_map.xml: Expand cpu64-rhel5 CPU model cpu_map.xml: Expand kvm64 CPU model cpu_map.xml: Expand Conroe CPU model cpu_map.xml: Expand Penryn CPU model cpu_map.xml: Expand Nehalem CPU model cpu_map.xml: Expand Westmere CPU model cpu_map.xml: Expand SandyBridge CPU model cpu_map.xml: Expand Haswell-noTSX CPU model cpu_map.xml: Expand Opteron_G1 CPU model cpu_map.xml: Expand Opteron_G2 CPU model cpu_map.xml: Expand Opteron_G4 CPU model src/cpu/cpu_map.xml | 829 +++++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 729 insertions(+), 100 deletions(-) -- 2.4.4

3 49

[libvirt] How to define QEMU/SMBIOS Attributes in virsh
by Holger Schranz 02 Jul '15

02 Jul '15

Hello, I have a "request for Help" please. Myself: I'm a native german language speaker and I' work with qemu/virsh since 6 months now. At the moment I try to define/configure qemu/smbios attributes in a virsh xml-file. My current problem: I need to configure two on-board lan elements. Thanks to Gerd Hoffmann (Qemu group). He gave me the hint for smbios/acpi configuration. For this configuration I need a type 41 record. I found on http://libvirt.org some descriptions for smbios but only for type 0 and 1. In qemu the solution is available: [Qemu-devel] [PATCH 2/2] smbios: Allow device ID instead of PCI address http://lists.gnu.org/archive/html/qemu-devel/2013-11/msg02350.html @@ -1336,9 +1338,10 @@ Specify SMBIOS type 0 fields Specify SMBIOS type 1 fields @item -smbios type=41,address@hidden,address@hidden,address@hidden,status=on|off][,address@hidden|n}] address@hidden -smbios type=41,address@hidden,address@hidden,address@hidden,status=on|off][,address@hidden|n}] Add SMBIOS type 41 fields (Onboard Devices Extended Information). Could be specified multiple times for different devices. Mandatory options are address@hidden in form "[[<domain>:]<bus>:]<slot>.<func>" and address@hidden in form "[[<domain>:]<bus>:]<slot>.<func>" or @option{id}, and @option{instance} number. @option{instance} shoud be in range [1, 255] and should be unique within specified @option{device-type}. @option{designation} is an optional string that somehow designates device. @option{status} is a device @@ -1365,6 +1368,9 @@ qemu-i386 \ -netdev user,id=hostnet0 \ -device e1000,netdev=hostnet0,id=net0,bus=pci.0,addr=0x1f \ -smbios type=41,address=00:1f.0,instance=1,designation="NIC 1",device-type=ethernet \ +-netdev user,id=hostnet1 \ +-device e1000,netdev=hostnet1,id=net1 \ +-smbios type=41,id=net1,instance=2,designation="NIC 2",device-type=ethernet \ < ... other qemu options ... > @end example So my question: How can I configure such record in a virsh xml-file please. Any help is appreciated. Holger --- Diese E-Mail wurde von Avast Antivirus-Software auf Viren geprüft. https://www.avast.com/antivirus

2 3

[libvirt] [PATCH] lxc: Don't pass a local variable address randomly
by Michal Privoznik 02 Jul '15

02 Jul '15

So, recently I was testing the LXC driver. You know, startup some domains. But to my surprise, I was not able to start a single one: virsh # start --console test error: Reconnected to the hypervisor error: Failed to start domain test error: internal error: guest failed to start: unexpected exit status 125 So I've start digging. It turns out, that in virExec(), when I printed out the @cmd, I got strange values: *(cmd->outfdptr) was certainly not valid FD number: it has random value of several millions. This obviously made prepareStdFd(childout, STDOUT_FILENO) fail (line 611). But outfdptr is set in virCommandSetOutputFD(). The only place within LXC driver where the function is called is in virLXCProcessBuildControllerCmd(). If you take a closer look at the function it looks like this: static virCommandPtr virLXCProcessBuildControllerCmd(virLXCDriverPtr driver, .. int logfd, const char *pidfile) { ... virCommandSetOutputFD(cmd, &logfd); virCommandSetErrorFD(cmd, &logfd); ... } Yes, you guessed it. @logfd is passed into the function by value. However, in the function we try to get its address (an address of a local variable) which is no longer valid once function is finished and stack is cleaned. Therefore when cmd->outfdptr is evaluated at any point after this function, we may get a random number, depending on what's currently on the stack. Of course, this may work sometimes too - it depends on the compiler how it arranges the code, when the stack is wiped out. In order to fix this, lets pass a pointer to @logfd instead of figuring out (wrong) its value in a function. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- I'd love to target this into the current release - in my case LXC driver is unusable without this patch. There might be other users affected too. src/lxc/lxc_process.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/lxc/lxc_process.c b/src/lxc/lxc_process.c index 6c23a0b..2bdce3b 100644 --- a/src/lxc/lxc_process.c +++ b/src/lxc/lxc_process.c @@ -750,7 +750,7 @@ virLXCProcessBuildControllerCmd(virLXCDriverPtr driver, int *files, size_t nfiles, int handshakefd, - int logfd, + int * const logfd, const char *pidfile) { size_t i; @@ -820,8 +820,8 @@ virLXCProcessBuildControllerCmd(virLXCDriverPtr driver, virCommandPassFD(cmd, handshakefd, 0); virCommandDaemonize(cmd); virCommandSetPidFile(cmd, pidfile); - virCommandSetOutputFD(cmd, &logfd); - virCommandSetErrorFD(cmd, &logfd); + virCommandSetOutputFD(cmd, logfd); + virCommandSetErrorFD(cmd, logfd); /* So we can pause before exec'ing the controller to * write the live domain status XML with the PID */ virCommandRequireHandshake(cmd); @@ -1208,7 +1208,7 @@ int virLXCProcessStart(virConnectPtr conn, ttyFDs, nttyFDs, files, nfiles, handshakefds[1], - logfd, + &logfd, pidfile))) goto cleanup; -- 2.3.6

4 4

[libvirt] Release of libvirt-1.2.17
by Daniel Veillard 02 Jul '15

02 Jul '15

So as planned I tagged it in git, development is open again, I signed tarballs and rpms, they are at the usual place: ftp://libvirt.org/libvirt/ I also made a libvirt-python-1.2.17 release which you can find at ftp://libvirt.org/libvirt/python/ this is a rather large release, even if the Admin APIs didn't fully made it there is 375 commits, lot of refactoring and code hardening, and a fair amount of pure bug fixes: Features: - numerous improvements and refactoring of the parallels driver(Maxim Nestratov) - hardening of vcpu code (Peter Krempa) - hardening of migration code (Jiri Denemark) Documentation: - Fix typo incomaptible -> incompatible (Andrea Bolognani) - docs: Clarification for when allowed to use 'lun' for "volume" (John Ferlan) - docs: document when pcie-root/dmi-to-pci-bridge support was added (Laine Stump) - docs: Fix trivial copy-paste error (Martin Kletzander) - docs: Properly mark acl.html dependencies (Michal Privoznik) - docs: Correct typos in scsi hostdev and address elements (Eric Farman) - docs: Fix XML schema handling of LUN address in hostdev tag (Eric Farman) - virNetSocketRemoveIOCallback: Be explicit about unref (Michal Privoznik) - man: clarify usage of virsh blockcopy with --xml (Ján Tomko) - docs: Clarify that attribute name is not used for vhostuser (Maxime Leroy) - maint: document use of zanata for translations (Eric Blake) - qemu: Capitalize "storage" in qemuDomainAttachUSBMassStorageDevice() (Andrea Bolognani) - docs: php: remove reference to Red Hat (Ján Tomko) - monitor: Move documentation for qemuMonitorGetBalloonInfo (Peter Krempa) Portability: - admin: Fix mingw build by reordering includes (Martin Kletzander) - util: process: fix build on FreeBSD (Roman Bogorodskiy) - util: Properly return error from virGetUserID and virGetGroupID stubs (Peter Krempa) - build: silence ar warnings on rawhide (Eric Blake) - util: process: @pid in virProcessSetAffinity's BSD impl is not unused (Peter Krempa) - libxl: load on FreeBSD (Roman Bogorodskiy) Bug Fixes: - phyp: Resolve Coverity FORWARD_NULL (John Ferlan) - util: Resolve Coverity FORWARD_NULL (John Ferlan) - util: Resolve Coverity FORWARD_NULL (John Ferlan) - util: Resolve Coverity FORWARD_NULL (John Ferlan) - lxc: Don't pass a local variable address randomly (Michal Privoznik) - qemu: Resolve Coverity DEADCODE (John Ferlan) - qemu: Audit memory size with memory hotplug operations (Peter Krempa) - qemu: Avoid using ".(null)" in UNIX socket path (Jiri Denemark) - qemu: agent: Don't automatically disable CPU0 via guest agent (Peter Krempa) - qemu: End job even if exiting monitor after OpenGraphics(FD) fails (Luyao Huang) - qemu: properly free addresses on non-serial chardev unplug (Ján Tomko) - qemu: fix address allocation on chardev attach (Luyao Huang) - libxl: Set def->vcpus after successfully modifying live vcpu count (Jim Fehlig) - libxl: don't remove persistent domain on start failure (Jim Fehlig) - libxl: don't overwrite domain state from statedir config (Jim Fehlig) - qemu: Add missing on_crash lifecycle type (John Ferlan) - Use the correct symbol for 'onCrash' (John Ferlan) - mpath: Don't allow more than one mpath pool at a time (John Ferlan) - mpath: Update path in CheckPool function (John Ferlan) - conf: Validate disk lun using correct types (John Ferlan) - Storage: Introduce shadow vol for refresh while the main vol builds. (Prerna Saxena) - conf: storage: Fix duplicate check for gluster pools (Peter Krempa) - qemu: event: Properly handle spice events (Peter Krempa) - Revert "Introduce QEMU_CAPS_ARM_VIRT_PCI" (Peter Krempa) - qemu: Close the agent connection only on agent channel events (Peter Krempa) - storage: Set correct vol->type at VolCreate (John Ferlan) - qemu: Fix assignment of the default spicevmc channel name (Jiri Denemark) - qemu: Resolve Coverity RESOURCE_LEAK (John Ferlan) - test: qemu: Make sure that wr_highest_offset_valid gets set properly (Peter Krempa) - vz: Fix build after recent commit (Peter Krempa) - qemuBuildMemoryBackendStr: Honour passed @pagesize (Michal Privoznik) - qemuBuildMemoryBackendStr: Fix hugepages lookup process (Michal Privoznik) - conf: Format scheduler priority when it is zero (Luyao Huang) - qemu: Avoid removing persistent config if migration fails (Luyao Huang) - scsi: Force error for SCSI pools on virStorageBackendSCSIFindLUs failure (John Ferlan) - conf: Enforce scheduler name when parsing XML (Peter Krempa) - qemu: caps: Fix syntax-check failure in version based capabilities (Peter Krempa) - libxl: avoid freeing an uninitialised bitmap (Ian Campbell) - virNetServerServiceClose: Don't leak sockets (Michal Privoznik) - virNetSocket: Fix @watch corner case (Michal Privoznik) - daemonSetupNetworking: Don't leak services (Michal Privoznik) - scsi: Adjust return status from getBlockDevice (John Ferlan) - qemuMigrationDriveMirror: Force raw format for NBD (Michal Privoznik) - qemu: Jump to correct label in qemuDomainPinIOThread (Peter Krempa) - conf: Fix virDomainObjGetDefs when getting persistent config on a live vm (Peter Krempa) - rpc: Actually increase reference count on @srv in virNetDaemonAddServer (Peter Krempa) - parallels: Fix false error messages in libvirt log (Mikhail Feoktistov) - parallels: Fix initialization of buflen variable in each loop iteration (Mikhail Feoktistov) - nodedev: update netdev feature bits before each dumpxml (Laine Stump) - tests: Follow virnetserver to virnetdaemon transition (Michal Privoznik) - daemon: Distribute admin_server.h (Michal Privoznik) - daemon/Makefile: Add forgotten dependency (Michal Privoznik) - util: virfile: Fix 'unknown cause' error if NFS mount point creation fails (Erik Skultety) - util: Fix Coverity RESOURCE_LEAK (John Ferlan) - storage: Generate correct parameters for CIFS (John Ferlan) - rpc: Fix possible crash when MDNSAddEntry fails (Martin Kletzander) - qemu: emulatorpin: Don't reset pinning when pinning to all cpus (Peter Krempa) - storage: Disallow wiping an extended disk partition (John Ferlan) - storage: Need to set secrettype for direct iscsi disk volume (John Ferlan) - scsi: Need to translate disk source pool in config attach path (John Ferlan) - network: escape quotes for dsmasq conf contents (Shivaprasad G Bhat) - virsh: change-media: Fix behavior with --update without a source (Peter Krempa) - rpc: Fix reference counting around virNetSocketAddIOCallback (Daniel P. Berrange) - rpc: Don't use unrelated value as privateData of client (Daniel P. Berrange) - mdns: Set error when failing due to missing avahi (Martin Kletzander) - qemu: Update balloon info only if job is allowed (Peter Krempa) - conf: Fix mistakes in pointer usage in virDomainObjGetDefs (Peter Krempa) - check if console/channel PTY is null before attempting to open (Shivaprasad G Bhat) - virnetdev: fix moving of 802.11 phys (Lubomir Rintel) - util: process: Refactor and fix virProcessSetAffinity (Peter Krempa) - util: Clear output broadcast address before filling it in (Martin Kletzander) - virsh: Fix Ctrl-C behavior when watching a job (Jiri Denemark) - libxl: Unbreak vcpu pinning (Peter Krempa) - qemu: Fix possible crash in qemuProcessSetVcpuAffinities (Peter Krempa) - qemu: Do not release device address on successful RNG attach (Luyao Huang) - qemu: Need to return status of RNG device removal (Luyao Huang) - test: fix IP address range failure test (Laine Stump) - storage: RBD: do not return error when deleting non-existent volume (Erik Skultety) - storage: Don't update volume objs list before we successfully create one (Erik Skultety) - nwfilter: Fix sscanf off-by-one error in virNWFilterSnoopLeaseFileLoad (Erik Skultety) - virsh: Fix printing of XML for pool-create-as (John Ferlan) Improvements: - conf: qemu: Taint VMs using custom device tree blob (Peter Krempa) - conf: audit: Audit physical memory size rather than balloon request (Peter Krempa) - libxl: honor domainGetXMLDesc() --inactive flag (Jim Fehlig) - qemu: event: Clean up VNC monitor handling (Peter Krempa) - qemuxml2argv: Remove Haswell CPU from unrelated tests (Jiri Denemark) - Revert "Change livbirt version to 1.3.0 for the next release" (Martin Kletzander) - Temporarily disable admin API (Martin Kletzander) - spec: Remove admin package specification (Martin Kletzander) - qemu: ignore assumptions about hotplug requirement when address is from config (Laine Stump) - qemu: always permit PCI devices to be manually assigned to a PCIe bus (Laine Stump) - qemu: refactor qemuBuildControllerDevStr to eliminate future duplicate code (Laine Stump) - qemu: monitor: Remove qemuMonitorGetBlockExtent (Peter Krempa) - qemu: Refactor qemuDomainGetBlockInfo (Peter Krempa) - qemu: monitor: Open-code retrieval of wr_highest_offset (Peter Krempa) - internal: Introduce virCheckNonEmptyStringArgGoto and reuse it (Peter Krempa) - vz: add memory statistics (Nikolay Shirokovskiy) - vz: add vcpu statistics (Nikolay Shirokovskiy) - vz: cleanup, make in par net device lookup functions (Nikolay Shirokovskiy) - vz: add net dev statistiscs (Nikolay Shirokovskiy) - docs: Don't keep temporary files around (Michal Privoznik) - test: Refactor testNodeGetCPUMap (Peter Krempa) - test: Refactor vcpu pinning and vcpu info retrieval (Peter Krempa) - test: Refactor testDomainSetVcpusFlags (Peter Krempa) - test: Refactor test driver domain object retrieval (Peter Krempa) - test: Drop locked access to testDriver->domains (Peter Krempa) - test: Finalize removal of locking from driver->eventState (Peter Krempa) - test: Refactor test driver event sending (Peter Krempa) - test: Use atomic access to @nextDomID in struct virTestDriver (Peter Krempa) - test: Annotate few fields of testDriver structure (Peter Krempa) - test: Extract common parts of test driver data allocation (Peter Krempa) - test: Extract code to free testDriver into testDriverFree (Peter Krempa) - test: turn 'defaultConn' into a pointer (Peter Krempa) - test: Rename testConn to testDriver (Peter Krempa) - vz: Adapt to driver rename (Michal Privoznik) - json: enhance parser test (Eric Blake) - json: even stricter trailing garbage detection (Eric Blake) - json: reject trailing garbage (Eric Blake) - json: reject javascript comments (Eric Blake) - json: cope with older yajl semantics (Eric Blake) - vz: implementation of attach/detach network devices (Mikhail Feoktistov) - Test for the new watchdog model diag288 (Boris Fiuczynski) - Support for the new watchdog model diag288 (Boris Fiuczynski) - Test for the new watchdog action inject-nmi (Boris Fiuczynski) - Support for a new watchdog action inject-nmi (Boris Fiuczynski) - vircapstest: Properly report error for failed tests (Michal Privoznik) - conf: Adjust invalid secrettype setting during parse (John Ferlan) - conf: improve the way we format blkiotune and cputune (Luyao Huang) - Improve some errors for openconsole/channel (Luyao Huang) - storage: Force setting of disk format type (John Ferlan) - docs: Adjust Disk storage rng (John Ferlan) - Convert SCSI logical unit from unsigned int to unsigned long long (Eric Farman) - Print SCSI address attributes bus, target, unit as unsigned integer (Eric Farman) - Read SCSI address attributes bus, target, unit as positive integer (Eric Farman) - qemu: simplify json parsing (Eric Blake) - json: make it easier to type-check when getting from object (Eric Blake) - json: fully parse input string (Eric Blake) - test: Switch to reference counting with testDomObjFromDomain (Peter Krempa) - test: Reuse virDomainObjGetOneDef in testDomainGetVcpusFlags (Peter Krempa) - virsh: blockcopy: Report error if the copy job fails (Peter Krempa) - Introduce QEMU_CAPS_ARM_VIRT_PCI (Pavel Fedin) - update sheepdog client] update sheepdog client path (Vasiliy Tolstov) - qemu: cancel drive mirrors when p2p connection breaks (Jiri Denemark) - qemu: Refactor qemuMigrationWaitForCompletion (Jiri Denemark) - qemu: Don't pass redundant job name around (Jiri Denemark) - qemu: Refactor qemuMigrationUpdateJobStatus (Jiri Denemark) - qemu: Refactor qemuDomainGetJob{Info,Stats} (Jiri Denemark) - qemu: Do not poll for spice migration status (Jiri Denemark) - qemu_monitor: Wire up SPICE_MIGRATE_COMPLETED event (Jiri Denemark) - qemu: Use domain condition for asyncAbort (Jiri Denemark) - qemu: Cancel disk mirrors after libvirtd restart (Jiri Denemark) - qemu: Refactor qemuMonitorBlockJobInfo (Jiri Denemark) - qemu: Make qemuMigrationCancelDriveMirror usable without async job (Jiri Denemark) - Pass domain object to private data formatter/parser (Jiri Denemark) - qemu: Don't mess with disk->mirrorState (Jiri Denemark) - qemu: Abort migration early if disk mirror failed (Jiri Denemark) - qemu: Cancel storage migration in parallel (Jiri Denemark) - qemu: Use domain condition for synchronous block jobs (Jiri Denemark) - qemu: Properly report failed migration (Jiri Denemark) - qemu: Introduce qemuBlockJobUpdate (Jiri Denemark) - conf: Introduce per-domain condition variable (Jiri Denemark) - lib: setvcpus: Remove bogus flag check (Peter Krempa) - virsh: selective block device migration (Pavel Boldin) - qemu: migration: selective block device migration (Pavel Boldin) - util: add virTypedParamsAddStringList (Pavel Boldin) - util: virTypedParams{Filter,GetStringList} (Pavel Boldin) - util: multi-value parameters in virTypedParamsAdd* (Pavel Boldin) - util: multi-value virTypedParameter (Pavel Boldin) - virDomainDiskGetSource: Mark passed disk as 'const' (Michal Privoznik) - conf: Move vcpu info parsing code into a separate function (Peter Krempa) - qemu: 'privileged' flag is not really configuration (Peter Krempa) - qemu: Reuse virDomainObjGetDefs in qemuDomainGetMemoryParameters (Peter Krempa) - qemu: Refactor qemuDomainGetMemoryParameters (Peter Krempa) - qemu: Refactor qemuDomainSetNumaParameters (Peter Krempa) - qemu: Simplify qemuDomainSetInterfaceParameters by using virDomainObjGetDefs (Peter Krempa) - qemu: Simplify qemuDomainGetVcpusFlags by using virDomainObjGetOneDef (Peter Krempa) - qemu: Simplify qemuDomainGetEmulatorPinInfo by using virDomainObjGetOneDef (Peter Krempa) - qemu: Simplify qemuDomainGetVcpuPinInfo by using virDomainObjGetOneDef (Peter Krempa) - qemu: Simplify qemuDomainGetNumaParameters by using virDomainObjGetOneDef (Peter Krempa) - qemu: Simplify qemuDomainGetInterfaceParameters by using virDomainObjGetOneDef (Peter Krempa) - conf: Introduce helper to help getting correct def for getter functions (Peter Krempa) - qemu: implement address for isa-serial (James Cowgill) - qemu: Add a check for slot and base dimm address conflicts (Luyao Huang) - daemon: Add the admin service to the admin server only if it was allocated (Peter Krempa) - remove redundant condition (Ján Tomko) - virSysinfo: Introduce SMBIOS type 2 support (Michal Privoznik) - qemu: Report all supported machine types in capabilities (Jiri Denemark) - tests: Sort EXTRA_DIST in the Makefile (Michal Privoznik) - daemon: Don't just include admin RPC (Michal Privoznik) - parallels: substitute parallels with vz spec file and Makefile (Maxim Nestratov) - parallels: rename all parallels files and driver directory to vz (Maxim Nestratov) - parallels: substitute parallels with vz in strings (Maxim Nestratov) - parallels: change parallels prefixes to vz (Maxim Nestratov) - virfile: virDirCreate: Insert blank lines to assure slightly better readability (Erik Skultety) - util: virDirCreate: Child now exits with positive errno-code (Erik Skultety) - lxc: set nosuid+nodev+noexec flags on /proc/sys mount (Eric W. Biederman) - lxc: Rename daemon to dmn (Martin Kletzander) - Revert "rpc: Add virNetServerGetNClients" (Martin Kletzander) - Revert "admin: Add virAdmHello function" (Martin Kletzander) - Change livbirt version to 1.3.0 for the next release (Martin Kletzander) - Example virt-admin (Martin Kletzander) - admin: Add virAdmHello function (Martin Kletzander) - rpc: Add virNetServerGetNClients (Martin Kletzander) - Add support for admin API in libvirt daemon (Martin Kletzander) - Add configuration options for permissions on daemon's admin socket (Martin Kletzander) - Add XML files with admin API specification (Martin Kletzander) - Add libvirt-admin library (Martin Kletzander) - Add admin error domain (Martin Kletzander) - Build client headers for admin protocol (Martin Kletzander) - Add admin protocol (Martin Kletzander) - Teach gendispatch how to handle admin dispatching files (Martin Kletzander) - tests: Adapt virnetservertest to daemon refactor (Martin Kletzander) - Move daemon-related parts of virNetServer to virNetDaemon (Martin Kletzander) - lxc: properly clean up qemu-nbd (Cédric Bosdonnat) - Add virProcessGetPids to get all tasks of a process (Cédric Bosdonnat) - storage: Adjust command arglist for gluster (John Ferlan) - storage: Fix the schema and add tests for cifs pool (John Ferlan) - configure: Remove check for pkcheck_supports_uid (Guido Günther) - tests: Use libvirt properly with initialization and error dispatching (Martin Kletzander) - Generate JSON with mDNS entries only when built --with-avahi (Martin Kletzander) - build: Remove unnecessarily repeated rules for syms -> def (Martin Kletzander) - qemu: monitor: Add memory balloon support for virtio-ccw (Boris Fiuczynski) - getOldStyleBlockDevice: Adjust formatting (Michal Privoznik) - getNewStyleBlockDevice: Adjust formatting (Michal Privoznik) - qemu caps: spell queue (Ján Tomko) - qemu: Do not support 'serial' scsi-block 'lun' devices (John Ferlan) - virCapabilitiesDomainDataLookup: Produce saner error message (Michal Privoznik) - libxl: Add timestamp to the libxl driver log. (Anthony PERARD) - qemu: update netdevs of the same mac addrs correctly (zhang bo) - virsysinfo: s/system/sysdef/ (Michal Privoznik) - cmdNetworkList: Introduce --name, --uuid, --table (Michal Privoznik) - cmdNetworkList: switch to FILTER (Michal Privoznik) - qemuBuildDriveStr: s/virBufferEscapeString/virBufferAsprintf/ (Michal Privoznik) - virQEMUCapsArch: openrisc vs or32 (Michal Privoznik) - virSysinfoDef: Exempt SYSTEM variables (Michal Privoznik) - virSysinfoDef: Exempt BIOS variables (Michal Privoznik) - tests: Distribute virnetserverdata (Michal Privoznik) - schema: use arch list from basictypes for os arch attribute (James Cowgill) - util: add virJSONValueCopy (Martin Kletzander) - qemu: add multiqueue vhost-user support (Maxime Leroy) - qemu: Add capability for vhost-user multiqueue (Martin Kletzander) - conf: Ignore multiqueue with one queue. (Martin Kletzander) - util: Make virProcessGetAffinity more readable and fix coverity warning (Peter Krempa) - apibuild: Generate macro/@string attribute (Jiri Denemark) - rpc: add testing of RPC JSON (de)serialization (Daniel P. Berrange) - rpc: add API for checking IPv4/6 availability (Daniel P. Berrange) - rpc: allow selection of TCP address family (Daniel P. Berrange) - virNumaSetPagePoolSize: Produce friendlier error message (Michal Privoznik) - logical: Fix typo in error message (John Ferlan) - conf: fix domaincommon.rng to accept network name with quotes (Shivaprasad G Bhat) - parallels: treat block devices as disks for containers (Maxim Nestratov) - parallels: report SATA bus type for container block devices disks (Maxim Nestratov) - parallels: process '/' mount point correctly for containers (Maxim Nestratov) - parallels: add isCt parameter to prlsdkGetDiskInfo and prlsdkAddDisk (Maxim Nestratov) - parallels: add block device statistics to driver (Nikolay Shirokovskiy) - qemu: caps: Advertise arm 32-on-64 KVM option (Cole Robinson) - qemu: caps: qemu-system-aarch64 supports armv7l (Cole Robinson) - qemu: command: Support arm 32-on-64 KVM with -cpu aarch64=off (Cole Robinson) - parallels: return only success from PCS event handler (Nikolay Shirokovskiy) - parallels: simplify event types discrimination (Nikolay Shirokovskiy) - utiltest: Use int8_t instead of char. (Michal Privoznik) - Turn qemuMonitorFindBalloonObjectPath into a void function (Ján Tomko) - Do not access the domain definition in qemuMonitorFindBalloonObjectPath (Ján Tomko) - Only call SetMemoryStatsPeriod for virtio memballoon (Ján Tomko) - Check for balloon model in qemuDomainSetMemoryStatsPeriod (Ján Tomko) - Only call qemuMonitorGetMemoryStats for virtio memballoon (Ján Tomko) - Invert the condition in qemuDomainMemoryStats (Ján Tomko) - Add endjob label to qemuDomainMemoryStats (Ján Tomko) - Remove path argument from qemuMonitorJSONFindLinkPath (Ján Tomko) - Introduce qemuMonitorJSONFindLinkPath (Ján Tomko) - Move qemuMonitorFindObjectPath to qemu_monitor_json (Ján Tomko) - rpc: Make virNetServerAddClient function dynamic (Daniel P. Berrange) - storage: Add check for valid FS types in checkPool callback (John Ferlan) - storage: FS backend adjust error message on error path (John Ferlan) - storage: Refactor storage pool type checks (John Ferlan) - qemu: Check for qemu capability when calling virDomainGetBlockIoTune() (Martin Kletzander) - qemu: Refactor qemuDomainSetVcpusFlags by reusing virDomainObjGetDefs (Peter Krempa) - qemu: Refactor qemuDomainGetEmulatorPinInfo by reusing virDomainObjGetDefs (Peter Krempa) - qemu: Refactor qemuDomainPinEmulator by reusing virDomainObjGetDefs (Peter Krempa) - qemu: Refactor qemuDomainGetVcpuPinInfo by reusing virDomainObjGetDefs (Peter Krempa) - qemu: Refactor qemuDomainPinVcpuFlags by reusing virDomainObjGetDefs (Peter Krempa) - qemu: Refactor qemuDomainSetBlkioParameters by reusing virDomainObjGetDefs (Peter Krempa) - qemu: Refactor qemuDomainChgIOThread by reusing virDomainObjGetDefs (Peter Krempa) - qemu: Refactor qemuDomainPinIOThread by reusing virDomainObjGetDefs (Peter Krempa) - qemu: Refactor qemuDomainGetIOThreadInfo by reusing virDomainObjGetDefs (Peter Krempa) - qemu: Refactor qemuDomainGetVcpusFlags by reusing virDomainObjGetDefs (Peter Krempa) - qemu: Refactor qemuDomainSetMemoryStatsPeriod by reusing virDomainObjGetDefs (Peter Krempa) - qemu: Refactor qemuDomainSetMemoryFlags by reusing virDomainObjGetDefs (Peter Krempa) - conf: Add new helpers to resolve virDomainModificationImpact to domain defs (Peter Krempa) - libxl: Don't remove vcpu pin definition in libxlDomainCleanup (Peter Krempa) - Revert "cputune: Support cputune for xend driver" (Peter Krempa) - qemu: libxl: vcpupin: Don't reset pinning when pinning to all pcpus (Peter Krempa) - lib: virDomainPinIOThread: Remove spurious overflow check (Peter Krempa) - conf: Store cpu count as unsigned int (Peter Krempa) - qemu: Refactor qemuDomainGetInfo (Peter Krempa) - qemu: Add helper to update domain balloon size and refactor usage places (Peter Krempa) - qemu: process: Update current balloon state to maximum on vm startup (Peter Krempa) - Always add 'console' matching the 'serial' device (Ján Tomko) - qemu: process: Refactor setup of memory ballooning (Peter Krempa) - qemu: monitor: Make qemuMonitorSetBalloon operate on unsinged long long (Peter Krempa) - util: Add macro to overflow check integer assignments (Peter Krempa) - libxl: Refactor libxlDomainGetVcpuPinInfo (Peter Krempa) - libxl: Reuse virBitmapToData in libxlDomainSetVcpuAffinities (Peter Krempa) - qemu: Refactor qemuDomainHelperGetVcpus by reusing virBitmapToDataBuf (Peter Krempa) - qemu: Reuse virBitmapToDataBuf in qemuDomainGetEmulatorPinInfo (Peter Krempa) - qemu: Use virBitmapToDataBuf in qemuDomainGetVcpuPinInfo (Peter Krempa) - util: bitmap: Add virBitmapToDataBuf that does not allocate the buffer (Peter Krempa) - conf: Move pinning information definition closer to the usage place (Peter Krempa) - conf: Refactor emulatorpin handling (Peter Krempa) - parallels: set virtType depending on driver name (Maxim Nestratov) - parallels: recommend to connect to vz:///system when connection fails (Maxim Nestratov) - parallels: increment the number of connection drivers (Maxim Nestratov) - parallels: add a new vz connection driver and hypervisor structures (Maxim Nestratov) - parallels: accept vz as a driver uri and name (Maxim Nestratov) - parallels: add new guest capabilities assigned to vz driver (Maxim Nestratov) - parallels: use newly introduced VIR_DOMAIN_VIRT_VZ (Maxim Nestratov) - parallels: introduce vz driver constant and string (Maxim Nestratov) - audit: Audit number of iothreads at domain startup (Luyao Huang) - util: report all address range errors in virSocketAddrGetRange() (Laine Stump) - network: cleanup range loop in networkDnsmasqConfContents (Laine Stump) - network: validate DHCP ranges are completely within defined network (Laine Stump) - Simplify virNodeCountThreadSiblings (Ján Tomko) - Report errors in virNodeCountThreadSiblings (Ján Tomko) - virsh: Move error messages inside vshCommandOpt*() functions (Andrea Bolognani) - virsh: Pass vshControl to all vshCommandOpt*() calls (Andrea Bolognani) - virsh: Make vshCommandOptScaledInt() use vshCommandOpt() (Andrea Bolognani) - virsh: Improve vshCommandOptTimeoutToMs() (Andrea Bolognani) - virsh: Use standard error messages in vshCommandOptTimeoutToMs() (Andrea Bolognani) - tests: Add a bunch of new tests to virsh-optparse (Andrea Bolognani) - maint: update to latest gnulib (Eric Blake) - spec: fixes for recently introduced libxl conf files (Jim Fehlig) - virsh: make negative values with vol-resize more convenient (Ján Tomko) - qemu: Automatically add <panic> element for pSeries guests. (Andrea Bolognani) - qemu: Allow panic device for pSeries guests (Andrea Bolognani) - qemu: Improve error message for missing QEMU_CAPS_DEVICE_PANIC. (Andrea Bolognani) - Post-release version bump to 1.2.17 (Daniel P. Berrange) Cleanups: - qemu: monitor: Fix indentation in qemuMonitorJSONGetOneBlockStatsInfo (Peter Krempa) - vz_utils: Reformat (Michal Privoznik) - vz_storage: Reformat (Michal Privoznik) - vz_sdk: Reformat (Michal Privoznik) - vz_network: Reformat (Michal Privoznik) - vz_driver: Reformat (Michal Privoznik) - test: Drop unused attribute @path from testDriver struct (Peter Krempa) - test: Drop useless forward declaration (Peter Krempa) - vz: fix syntax-check errors (Dmitry Guryanov) - virQEMUCapsComputeCmdFlags: Indent correctly (Michal Privoznik) - qemuMigrationBeginPhase: Fix function header indentation (Michal Privoznik) - qemu: Fix double space in error message in qemuDomainGetVcpusFlags (Peter Krempa) - libvirt.spec: Don't expect virt-admin in libvirt-admin yet (Michal Privoznik) - netserver: Remove duplicate forward declaration (Martin Kletzander) - Revert "Example virt-admin" (Martin Kletzander) - apibuild: Fix indentation (Jiri Denemark) - parallels: fix formatting errors in parallels driver (Dmitry Guryanov) - storage: Remove extraneous @conn from function comments (John Ferlan) - remote: fix odd comma operator (Eric Blake) - maint: remove incorrect apostrophes from 'its' (Ján Tomko) Thanks everybody for the help bringing those releases, be it with ideas bug report, patches, doc, reviews, etc... Enjoy ! 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] [PATCH] Revert "Introduce QEMU_CAPS_ARM_VIRT_PCI"
by Peter Krempa 02 Jul '15

02 Jul '15

The capability was not used up to the feature freeze. This reverts commit 7f3515b4bb677d0ead1887547efc844e4761268a. --- src/qemu/qemu_capabilities.c | 4 ---- src/qemu/qemu_capabilities.h | 1 - 2 files changed, 5 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index e7002a3..27686c3 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -287,7 +287,6 @@ VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST, "aarch64-off", "vhost-user-multiqueue", /* 190 */ - "arm-virt-pci", ); @@ -1337,9 +1336,6 @@ virQEMUCapsComputeCmdFlags(const char *help, virQEMUCapsSet(qemuCaps, QEMU_CAPS_VNC_SHARE_POLICY); } - if (version >= 2003000) - virQEMUCapsSet(qemuCaps, QEMU_CAPS_ARM_VIRT_PCI); - return 0; } diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index f4180a8..30aa504 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -230,7 +230,6 @@ typedef enum { QEMU_CAPS_DEVICE_PCI_SERIAL = 188, /* -device pci-serial */ QEMU_CAPS_CPU_AARCH64_OFF = 189, /* -cpu ...,aarch64=off */ QEMU_CAPS_VHOSTUSER_MULTIQUEUE = 190, /* vhost-user with -netdev queues= */ - QEMU_CAPS_ARM_VIRT_PCI = 191, /* ARM 'virt' machine has PCI bus */ QEMU_CAPS_LAST, /* this must always be the last item */ } virQEMUCapsFlags; -- 2.4.1

5 6

[libvirt] [libvirt-glib PATCHv3 1/7] gobject: Simplify gvir_connection_list*() implementations
by Zeeshan Ali (Khattak) 02 Jul '15

02 Jul '15

Make use of virConnectListAll* functions to avoid making 4 calls and hence avoid race conditions and complicated code. --- libvirt-gobject/libvirt-gobject-connection.c | 203 ++++----------------------- 1 file changed, 28 insertions(+), 175 deletions(-) diff --git a/libvirt-gobject/libvirt-gobject-connection.c b/libvirt-gobject/libvirt-gobject-connection.c index cf073a5..1576906 100644 --- a/libvirt-gobject/libvirt-gobject-connection.c +++ b/libvirt-gobject/libvirt-gobject-connection.c @@ -680,48 +680,6 @@ void gvir_connection_close(GVirConnection *conn) g_signal_emit(conn, signals[VIR_CONNECTION_CLOSED], 0); } -typedef gint (* CountFunction) (virConnectPtr vconn); -typedef gint (* ListFunction) (virConnectPtr vconn, gchar **lst, gint max); - -static gchar ** fetch_list(virConnectPtr vconn, - const char *name, - CountFunction count_func, - ListFunction list_func, - GCancellable *cancellable, - gint *length, - GError **err) -{ - gchar **lst = NULL; - gint n = 0; - - if ((n = count_func(vconn)) < 0) { - gvir_set_error(err, GVIR_CONNECTION_ERROR, - 0, - _("Unable to count %s"), name); - goto error; - } - - if (n) { - if (g_cancellable_set_error_if_cancelled(cancellable, err)) - goto error; - - lst = g_new0(gchar *, n); - if ((n = list_func(vconn, lst, n)) < 0) { - gvir_set_error(err, GVIR_CONNECTION_ERROR, - 0, - _("Unable to list %s %d"), name, n); - goto error; - } - } - - *length = n; - return lst; - -error: - g_free(lst); - return NULL; -} - /** * gvir_connection_fetch_domains: * @conn: a #GVirConnection @@ -733,14 +691,11 @@ gboolean gvir_connection_fetch_domains(GVirConnection *conn, { GVirConnectionPrivate *priv; GHashTable *doms; - gchar **inactive = NULL; - gint ninactive = 0; - gint *active = NULL; - gint nactive = 0; + virDomainPtr *domains = NULL; + gint ndomains = 0; gboolean ret = FALSE; gint i; virConnectPtr vconn = NULL; - GError *lerr = NULL; g_return_val_if_fail(GVIR_IS_CONNECTION(conn), FALSE); g_return_val_if_fail((cancellable == NULL) || G_IS_CANCELLABLE(cancellable), @@ -761,81 +716,28 @@ gboolean gvir_connection_fetch_domains(GVirConnection *conn, virConnectRef(vconn); g_mutex_unlock(priv->lock); - if (g_cancellable_set_error_if_cancelled(cancellable, err)) - goto cleanup; - - if ((nactive = virConnectNumOfDomains(vconn)) < 0) { - gvir_set_error_literal(err, GVIR_CONNECTION_ERROR, - 0, - _("Unable to count domains")); + ndomains = virConnectListAllDomains(vconn, &domains, 0); + if (ndomains < 0) { + gvir_set_error(err, GVIR_CONNECTION_ERROR, + 0, + _("Failed to fetch list of domains")); goto cleanup; } - if (nactive) { - if (g_cancellable_set_error_if_cancelled(cancellable, err)) - goto cleanup; - - active = g_new(gint, nactive); - if ((nactive = virConnectListDomains(vconn, active, nactive)) < 0) { - gvir_set_error_literal(err, GVIR_CONNECTION_ERROR, - 0, - _("Unable to list domains")); - goto cleanup; - } - } if (g_cancellable_set_error_if_cancelled(cancellable, err)) goto cleanup; - inactive = fetch_list(vconn, - "Domains", - virConnectNumOfDefinedDomains, - virConnectListDefinedDomains, - cancellable, - &ninactive, - &lerr); - if (lerr) { - g_propagate_error(err, lerr); - lerr = NULL; - goto cleanup; - } - doms = g_hash_table_new_full(g_str_hash, g_str_equal, NULL, g_object_unref); - for (i = 0 ; i < nactive ; i++) { - if (g_cancellable_set_error_if_cancelled(cancellable, err)) - goto cleanup; - - virDomainPtr vdom = virDomainLookupByID(vconn, active[i]); + for (i = 0 ; i < ndomains; i++) { GVirDomain *dom; - if (!vdom) - continue; dom = GVIR_DOMAIN(g_object_new(GVIR_TYPE_DOMAIN, - "handle", vdom, + "handle", domains[i], NULL)); - virDomainFree(vdom); - - g_hash_table_insert(doms, - (gpointer)gvir_domain_get_uuid(dom), - dom); - } - - for (i = 0 ; i < ninactive ; i++) { - if (g_cancellable_set_error_if_cancelled(cancellable, err)) - goto cleanup; - - virDomainPtr vdom = virDomainLookupByName(vconn, inactive[i]); - GVirDomain *dom; - if (!vdom) - continue; - - dom = GVIR_DOMAIN(g_object_new(GVIR_TYPE_DOMAIN, - "handle", vdom, - NULL)); - virDomainFree(vdom); g_hash_table_insert(doms, (gpointer)gvir_domain_get_uuid(dom), @@ -852,10 +754,11 @@ gboolean gvir_connection_fetch_domains(GVirConnection *conn, ret = TRUE; cleanup: - g_free(active); - for (i = 0 ; i < ninactive ; i++) - g_free(inactive[i]); - g_free(inactive); + if (ndomains > 0) { + for (i = 0 ; i < ndomains; i++) + virDomainFree(domains[i]); + free(domains); + } return ret; } @@ -870,14 +773,11 @@ gboolean gvir_connection_fetch_storage_pools(GVirConnection *conn, { GVirConnectionPrivate *priv; GHashTable *pools; - gchar **inactive = NULL; - gint ninactive = 0; - gchar **active = NULL; - gint nactive = 0; + virStoragePoolPtr *vpools = NULL; + gint npools = 0; gboolean ret = FALSE; gint i; virConnectPtr vconn = NULL; - GError *lerr = NULL; g_return_val_if_fail(GVIR_IS_CONNECTION(conn), FALSE); g_return_val_if_fail((cancellable == NULL) || G_IS_CANCELLABLE(cancellable), @@ -901,77 +801,31 @@ gboolean gvir_connection_fetch_storage_pools(GVirConnection *conn, if (g_cancellable_set_error_if_cancelled(cancellable, err)) goto cleanup; - active = fetch_list(vconn, - "Storage Pools", - virConnectNumOfStoragePools, - virConnectListStoragePools, - cancellable, - &nactive, - &lerr); - if (lerr) { - g_propagate_error(err, lerr); - lerr = NULL; + npools = virConnectListAllStoragePools(vconn, &vpools, 0); + if (npools < 0) { + gvir_set_error(err, GVIR_CONNECTION_ERROR, + 0, + _("Failed to fetch list of pools")); goto cleanup; } if (g_cancellable_set_error_if_cancelled(cancellable, err)) goto cleanup; - inactive = fetch_list(vconn, - "Storage Pools", - virConnectNumOfDefinedStoragePools, - virConnectListDefinedStoragePools, - cancellable, - &ninactive, - &lerr); - if (lerr) { - g_propagate_error(err, lerr); - lerr = NULL; - goto cleanup; - } - pools = g_hash_table_new_full(g_str_hash, g_str_equal, NULL, g_object_unref); - for (i = 0 ; i < nactive ; i++) { + for (i = 0 ; i < npools; i++) { if (g_cancellable_set_error_if_cancelled(cancellable, err)) goto cleanup; - virStoragePoolPtr vpool; GVirStoragePool *pool; - vpool = virStoragePoolLookupByName(vconn, active[i]); - if (!vpool) - continue; - - pool = GVIR_STORAGE_POOL(g_object_new(GVIR_TYPE_STORAGE_POOL, - "handle", vpool, - NULL)); - virStoragePoolFree(vpool); - - g_hash_table_insert(pools, - (gpointer)gvir_storage_pool_get_uuid(pool), - pool); - } - - for (i = 0 ; i < ninactive ; i++) { - if (g_cancellable_set_error_if_cancelled(cancellable, err)) - goto cleanup; - - virStoragePoolPtr vpool; - GVirStoragePool *pool; - - vpool = virStoragePoolLookupByName(vconn, inactive[i]); - if (!vpool) - continue; - pool = GVIR_STORAGE_POOL(g_object_new(GVIR_TYPE_STORAGE_POOL, - "handle", vpool, + "handle", vpools[i], NULL)); - virStoragePoolFree(vpool); - g_hash_table_insert(pools, (gpointer)gvir_storage_pool_get_uuid(pool), pool); @@ -987,12 +841,11 @@ gboolean gvir_connection_fetch_storage_pools(GVirConnection *conn, ret = TRUE; cleanup: - for (i = 0 ; i < nactive ; i++) - g_free(active[i]); - g_free(active); - for (i = 0 ; i < ninactive ; i++) - g_free(inactive[i]); - g_free(inactive); + if (npools > 0) { + for (i = 0 ; i < npools; i++) + virStoragePoolFree(vpools[i]); + free(vpools); + } return ret; } -- 2.4.3

1 6

[libvirt] ANNOUNCE: libvirt-sandbox "Dashti Margo" release 0.6.0
by Daniel P. Berrange 01 Jul '15

01 Jul '15

I pleased to announce the a new public release of libvirt-sandbox, version 0.6.0, is now available for download ftp://libvirt.org/libvirt/sandbox/ The packages are GPG signed with Key fingerprint: DAF3 A6FD B26B 6291 2D0E 8E3F BE86 EBB4 1510 4FDF (4096R) The libvirt-sandbox package provides an API layer on top of libvirt-gobject which facilitates the cration of application sandboxes using virtualization technology. An application sandbox is a virtual machine or container that runs a single application binary, directly from the host OS filesystem. In other words there is no separate guest operating system install to build or manager. At this point in time libvirt-sandbox can create sandboxes using either LXC or KVM, and should in theory be extendable to any libvirt driver. This release contains a mixture of new features and bug fixes - API/ABI in-compatible change, soname increased - Prevent use of virt-sandbox-service as non-root upfront - Fix misc memory leaks - Block SIGHUP from the dhclient binary to prevent accidental death if the controlling terminal is closed & reopened - Add support for re-creating libvirt XML from sandbox config to facilitate upgrades - Switch to standard gobject introspection autoconf macros - Add ability to set filters on network interfaces - Search /usr/lib instead of /lib for systemd unit files, as the former is the canonical location even when / and /usr are merged - Only set SELinux labels on hosts that support SELinux - Explicitly link to selinux, instead of relying on indirect linkage - Update compiler warning flags - Fix misc docs comments - Don't assume use of SELinux in virt-sandbox-service - Fix path checks for SUSUE in virt-sandbox-service - Add support for AppArmour profiles - Mount /var after other FS to ensure host image is available - Ensure state/config dirs can be accessed when QEMU is running non-root for qemu:///system - Fix mounting of host images in QEMU sandboxes - Mount images as ext4 instead of ext3 - Allow use of non-raw disk images as filesystem mounts - Check if required static libs are available at configure time to prevent silent fallback to shared linking - Require libvirt-glib >= 0.2.1 - Add support for loading lzma and gzip compressed kmods - Check for support libvirt URIs when starting guests to ensure clear error message upfront - Add LIBVIRT_SANDBOX_INIT_DEBUG env variable to allow debugging of kernel boot messages and sandbox init process setup - Add support for exposing block devices to sandboxes with a predictable name under /dev/disk/by-tag/TAGNAME - Use devtmpfs instead of tmpfs for auto-populating /dev in QEMU sandboxes - Allow setup of sandbox with custom root filesystem instead of inheriting from host's root. - Allow execution of apps from non-matched ld-linux.so / libc.so, eg executing F19 binaries on F22 host - Use passthrough mode for all QEMU filesystems Thanks to everyone who contributed to this release Regards, Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|

1 0

[libvirt] [PATCH v2 1/2] Fix nodeinfo output on PPC64 KVM hosts
by Shivaprasad G Bhat 01 Jul '15

01 Jul '15

The nodeinfo is reporting incorrect number of cpus and incorrect host topology on PPC64 KVM hosts. The KVM hypervisor on PPC64 needs only the primary thread in a core to be online, and the secondaries offlined. While scheduling a guest in, the kvm scheduler wakes up the secondaries to run in guest context. The host scheduling of the guests happen at the core level(as only primary thread is online). The kvm scheduler exploits as many threads of the core as needed by guest. Further, starting POWER8, the processor allows splitting a physical core into multiple subcores with 2 or 4 threads each. Again, only the primary thread in a subcore is online in the host. The KVM-PPC scheduler allows guests to exploit all the offline threads in the subcore, by bringing them online when needed. (Kernel patches on split-core http://www.spinics.net/lists/kvm-ppc/msg09121.html) Recently with dynamic micro-threading changes in ppc-kvm, makes sure to utilize all the offline cpus across guests, and across guests with different cpu topologies. (https://www.mail-archive.com/kvm@vger.kernel.org/msg115978.html) Since the offline cpus are brought online in the guest context, it is safe to count them as online. Nodeinfo today discounts these offline cpus from cpu count/topology calclulation, and the nodeinfo output is not of any help and the host appears overcommited when it is actually not. The patch carefully counts those offline threads whose primary threads are online. The host topology displayed by the nodeinfo is also fixed when the host is in valid kvm state. Test results with and without fix: http://ur1.ca/mx25y Signed-off-by: Shivaprasad G Bhat <sbhat(a)linux.vnet.ibm.com> --- src/libvirt_private.syms | 1 + src/nodeinfo.c | 87 ++++++++++++++++++++++++++++++++++++++++------ src/util/virarch.c | 35 +++++++++++++++++++ src/util/virarch.h | 2 + 4 files changed, 114 insertions(+), 11 deletions(-) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 1566d11..071fe6e 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1075,6 +1075,7 @@ virArchFromHost; virArchFromString; virArchGetEndian; virArchGetWordSize; +virArchPPCGetKvmHostCoreMode; virArchToString; diff --git a/src/nodeinfo.c b/src/nodeinfo.c index 2fafe2d..9d1dc84 100644 --- a/src/nodeinfo.c +++ b/src/nodeinfo.c @@ -428,25 +428,77 @@ virNodeParseNode(const char *node, unsigned int cpu; int online; int direrr; + int lastonline; + virBitmapPtr nodecpus = NULL; + int threads_per_subcore = 1; + bool valid_ppc64_kvmhost_mode = false; *threads = 0; *cores = 0; *sockets = 0; + if (ARCH_IS_PPC64(arch)) { + /* PPC-KVM needs the secondary threads of a core to be offline on the + * host. The kvm scheduler brings the secondary threads online in the + * guest context. Moreover, P8 processor has split-core capability + * where, there can be 1,2 or 4 subcores per core. The primaries of the + * subcores alone will be online on the host for a subcore in the + * host. Even though the actual threads per core for P8 processor is 8, + * depending on the subcores_per_core = 1, 2 or 4, the threads per + * subcore will vary accordingly to 8, 4 and 2 repectively. + * So, On host threads_per_core what is arrived at from sysfs in the + * current logic is actually the subcores_per_core. Threads per subcore + * can only be obtained from the kvm device. For example, on P8 wih 1 + * core having 8 threads, sub_cores_percore=4, the threads 0,2,4 & 6 + * will be online. The sysfs reflects this and in the current logic + * variable 'threads' will be 4 which is nothing but subcores_per_core. + * If the user tampers the cpu online/offline states using chcpu or other + * means, then it is an unsupported configuration for kvm. + * The code below tries to keep in mind + * - when the libvirtd is run inside a KVM guest or Phyp based guest. + * - Or on the kvm host where user manually tampers the cpu states to + * offline/online randomly. + */ + valid_ppc64_kvmhost_mode = virArchPPCGetKvmHostCoreMode(&threads_per_subcore); + } + + nodecpus = virBitmapNew(VIR_DOMAIN_CPUMASK_LEN); + if (!(cpudir = opendir(node))) { virReportSystemError(errno, _("cannot opendir %s"), node); goto cleanup; } - /* enumerate sockets in the node */ - CPU_ZERO(&sock_map); while ((direrr = virDirRead(cpudir, &cpudirent, node)) > 0) { if (sscanf(cpudirent->d_name, "cpu%u", &cpu) != 1) continue; + if (virBitmapSetBit(nodecpus, cpu)) + goto cleanup; + } + + if (direrr < 0) + goto cleanup; + + /* enumerate sockets in the node */ + CPU_ZERO(&sock_map); + lastonline = -1; + for (cpu = 0; cpu < virBitmapSize(nodecpus); cpu++) { + if (!virBitmapIsBitSet(nodecpus, cpu)) + continue; + if ((online = virNodeGetCpuValue(node, cpu, "online", 1)) < 0) goto cleanup; + if (online && valid_ppc64_kvmhost_mode) { + if (lastonline != -1 && + (cpu - lastonline) < threads_per_subcore) { + /* if any of secondaries online */ + valid_ppc64_kvmhost_mode = false; + } + lastonline = cpu; + } + if (!online) continue; @@ -459,9 +511,6 @@ virNodeParseNode(const char *node, sock_max = sock; } - if (direrr < 0) - goto cleanup; - sock_max++; /* allocate cpu maps for each socket */ @@ -472,14 +521,25 @@ virNodeParseNode(const char *node, CPU_ZERO(&core_maps[i]); /* iterate over all CPU's in the node */ - rewinddir(cpudir); - while ((direrr = virDirRead(cpudir, &cpudirent, node)) > 0) { - if (sscanf(cpudirent->d_name, "cpu%u", &cpu) != 1) + lastonline = -1; + for (cpu = 0; cpu < virBitmapSize(nodecpus); cpu++) { + if (!virBitmapIsBitSet(nodecpus, cpu)) continue; if ((online = virNodeGetCpuValue(node, cpu, "online", 1)) < 0) goto cleanup; + if (valid_ppc64_kvmhost_mode) { + if (online) { + lastonline = cpu; + } else if (lastonline != -1 && + (cpu-lastonline) < threads_per_subcore) { + processors++; /* Count only those secondaries whose primary + subcore is online */ + continue; + } + } + if (!online) { (*offline)++; continue; @@ -513,9 +573,6 @@ virNodeParseNode(const char *node, *threads = siblings; } - if (direrr < 0) - goto cleanup; - /* finalize the returned data */ *sockets = CPU_COUNT(&sock_map); @@ -528,6 +585,13 @@ virNodeParseNode(const char *node, *cores = core; } + if (valid_ppc64_kvmhost_mode) { + /* The actual host threads per core is + * multiple of the subcores_per_core(i.e variable *threads in this case) + * and threads_per_subcore. + */ + *threads = *threads * threads_per_subcore; + } ret = processors; cleanup: @@ -537,6 +601,7 @@ virNodeParseNode(const char *node, ret = -1; } VIR_FREE(core_maps); + virBitmapFree(nodecpus); return ret; } diff --git a/src/util/virarch.c b/src/util/virarch.c index be48bcf..3717de0 100644 --- a/src/util/virarch.c +++ b/src/util/virarch.c @@ -25,8 +25,16 @@ #include "virlog.h" #include "virarch.h" +#include "virfile.h" #include "verify.h" +#include <fcntl.h> +#include <sys/ioctl.h> + +#if HAVE_LINUX_KVM_H +# include <linux/kvm.h> +#endif + VIR_LOG_INIT("util.arch"); /* The canonical names are used in XML documents. ie ABI sensitive */ @@ -182,3 +190,30 @@ virArch virArchFromHost(void) return arch; } + +bool virArchPPCGetKvmHostCoreMode(int *threads_per_subcore) +{ + int kvmfd; + bool valid_ppc64_kvmhost_mode = false; + +#if HAVE_LINUX_KVM_H + kvmfd = open("/dev/kvm", O_RDONLY); + if (kvmfd >= 0) { +# ifdef KVM_CAP_PPC_SMT + + valid_ppc64_kvmhost_mode = true; + /* For Phyp and KVM based guests the ioctl for KVM_CAP_PPC_SMT + * returns zero and both primary and secondary threads will be + * online. + */ + *threads_per_subcore = ioctl(kvmfd, KVM_CHECK_EXTENSION, KVM_CAP_PPC_SMT); + if (*threads_per_subcore == 0) + valid_ppc64_kvmhost_mode = false; + +# endif + } + VIR_FORCE_CLOSE(kvmfd); +#endif + + return valid_ppc64_kvmhost_mode; +} diff --git a/src/util/virarch.h b/src/util/virarch.h index 3206ce2..6e196ff 100644 --- a/src/util/virarch.h +++ b/src/util/virarch.h @@ -102,4 +102,6 @@ virArch virArchFromString(const char *name); virArch virArchFromHost(void); +bool virArchPPCGetKvmHostCoreMode(int *threads_per_subcore); + #endif /* __VIR_ARCH_H__ */

1 1

[libvirt] [sandbox] Get gvir_sandbox_util_guess_image_format search for the last '.'
by Cédric Bosdonnat 01 Jul '15

01 Jul '15

gvir_sandbox_util_guess_image_format is failing to find the extension in paths like /tmp/tmp.mg0tQ1JLFl/mine.img --- libvirt-sandbox/libvirt-sandbox-util.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libvirt-sandbox/libvirt-sandbox-util.c b/libvirt-sandbox/libvirt-sandbox-util.c index 6385291..d73fc8b 100644 --- a/libvirt-sandbox/libvirt-sandbox-util.c +++ b/libvirt-sandbox/libvirt-sandbox-util.c @@ -40,7 +40,7 @@ gint gvir_sandbox_util_guess_image_format(const gchar *path, { gchar *tmp; - if ((tmp = strchr(path, '.')) == NULL) { + if ((tmp = g_strrstr(path, ".")) == NULL) { g_set_error(error, GVIR_SANDBOX_UTIL_ERROR, 0, _("Cannot identify file extension in '%s'"), path); return -1; -- 2.1.4

2 1

[libvirt] [PATCH] storage: add RBD support to disk source pool translation
by Thibault VINCENT 01 Jul '15

01 Jul '15

Hello, We needed this to avoid redundancies when defining domains with RBD backends, because monitor list and authentication secret could not be pulled from the storage pool. I didn't find any bit of documentation to update, actually it already implies that disks with source type 'volume' would work with all kinds of backing pools. But mpath, sheepdog, and gluster would still require an implementation if it's possible. Using RBD volumes this way still has a limitation, we cannot list snapshots in libvirt pools. Whereas they could be accessed read-only if the domain is using a network source explicitely with a 'snapshot' attribute. How could we implement this so that snapshots are seen as pool volumes? There are real use-cases for this like attaching to a VM a backup from it's own disks. Also it would work the same way with ZFS snapshots, but AFAIK not for LVM pools. Cheers Thibault VINCENT (1): storage: add RBD support to generic disk source pool translation src/storage/storage_driver.c | 49 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 48 insertions(+), 1 deletion(-) -- 2.1.4

3 9

[libvirt] [PATCH] qemu: Resolve Coverity DEADCODE
by John Ferlan 01 Jul '15

01 Jul '15

Commit id 'f967e7a6' didn't place the closing parentheses quite right causing DEADCODE errors since the rc setting/comparison was wrong. Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- src/qemu/qemu_hotplug.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 391190d..79338cf 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -1586,7 +1586,7 @@ int qemuDomainAttachChrDevice(virQEMUDriverPtr driver, if (qemuAssignDeviceChrAlias(vmdef, chr, -1) < 0) goto cleanup; - if ((rc = qemuDomainAttachChrDeviceAssignAddr(priv, chr) < 0)) + if ((rc = qemuDomainAttachChrDeviceAssignAddr(priv, chr)) < 0) goto cleanup; if (rc == 1) need_release = true; -- 2.1.0

2 1

[libvirt] [PATCH 0/2][1.2.17] qemu: fix address allocation on chardev hotplug
by Ján Tomko 01 Jul '15

01 Jul '15

For bug https://bugzilla.redhat.com/show_bug.cgi?id=1230039 Patch 1/2 fixes a regression in channel device hotplug which was introduced in the last release and I would like to get it fixed before the next one. Patch 2/2 is not that important, but still a bugfix. Luyao Huang (1): qemu: fix address allocation on chardev attach Ján Tomko (1): qemu: properly free addresses on non-serial chardev unplug src/qemu/qemu_command.c | 4 +++ src/qemu/qemu_hotplug.c | 78 +++++++++++++++++++++++++++---------------------- 2 files changed, 47 insertions(+), 35 deletions(-) -- 2.3.6

3 4

[libvirt] [PATCH] conf: qemu: Taint VMs using custom device tree blob
by Peter Krempa 01 Jul '15

01 Jul '15

Using a custom device tree image may cause unexpected behavior in architectures that use this approach to detect platform devices. Since usually the device tree is generated by qemu and thus it's not normally used let's taint VMs using it to make it obvious as a possible source of problems. --- src/conf/domain_conf.c | 3 ++- src/conf/domain_conf.h | 1 + src/qemu/qemu_domain.c | 3 +++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 2c3b96b..9280a76 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -102,7 +102,8 @@ VIR_ENUM_IMPL(virDomainTaint, VIR_DOMAIN_TAINT_LAST, "external-launch", "host-cpu", "hook-script", - "cdrom-passthrough"); + "cdrom-passthrough", + "custom-dtb"); VIR_ENUM_IMPL(virDomainVirt, VIR_DOMAIN_VIRT_LAST, "qemu", diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index aeba5a5..2bdbff1 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -2305,6 +2305,7 @@ typedef enum { VIR_DOMAIN_TAINT_HOST_CPU, /* Host CPU passthrough in use */ VIR_DOMAIN_TAINT_HOOK, /* Domain (possibly) changed via hook script */ VIR_DOMAIN_TAINT_CDROM_PASSTHROUGH,/* CDROM passthrough */ + VIR_DOMAIN_TAINT_CUSTOM_DTB, /* Custom device tree blob was specifed */ VIR_DOMAIN_TAINT_LAST } virDomainTaintFlags; diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 6213fd9..22ffa83 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -2105,6 +2105,9 @@ void qemuDomainObjCheckTaint(virQEMUDriverPtr driver, for (i = 0; i < obj->def->nnets; i++) qemuDomainObjCheckNetTaint(driver, obj, obj->def->nets[i], logFD); + if (obj->def->os.dtb) + qemuDomainObjTaint(driver, obj, VIR_DOMAIN_TAINT_CUSTOM_DTB, logFD); + virObjectUnref(cfg); } -- 2.4.1

2 2

[libvirt] add optional redundancy element to storage
by Vasiliy Tolstov 01 Jul '15

01 Jul '15

some storages have ability to provide redundancy, for example sheepdog via full copies or erasure Signed-off-by: Vasiliy Tolstov <v.tolstov(a)selfip.ru> --- docs/schemas/storagevol.rng | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/docs/schemas/storagevol.rng b/docs/schemas/storagevol.rng index 7450547..bd3b698 100644 --- a/docs/schemas/storagevol.rng +++ b/docs/schemas/storagevol.rng @@ -105,6 +105,9 @@ </choice> </element> </optional> + <optional> + <ref name='redundancy'/> + </optional> <ref name='format'/> <ref name='permissions'/> <ref name='timestamps'/> @@ -138,6 +141,27 @@ </element> </define> + <define name='redundancy'> + <optional> + <element name='replica'> + <element name='copies'> + <ref name='scaledInteger'/> + </element> + </element> + </optional> + <optional> + <element name='erasure'> + <element name='strips'> + <attribute name='data'> + <ref name='scaledInteger'/> + </attribute> + <attribute name='parity'> + <ref name='scaledInteger'/> + </attribute> + </element> + </element> + </optional> + </define> <define name='source'> <element name='source'> -- 2.3.3

1 1

[libvirt] [sandbox] Cleanup the disks.cfg file
by Cédric Bosdonnat 01 Jul '15

01 Jul '15

The newly introduced disks.cfg file is still remaining in the configuration folder after the sandbox is stopped. Let's remove it like the other things there. --- libvirt-sandbox/libvirt-sandbox-builder.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libvirt-sandbox/libvirt-sandbox-builder.c b/libvirt-sandbox/libvirt-sandbox-builder.c index e615606..ea7d064 100644 --- a/libvirt-sandbox/libvirt-sandbox-builder.c +++ b/libvirt-sandbox/libvirt-sandbox-builder.c @@ -22,6 +22,7 @@ #include <config.h> #include <string.h> +#include <errno.h> #include "libvirt-sandbox/libvirt-sandbox.h" #include "libvirt-sandbox/libvirt-sandbox-builder-private.h" @@ -717,10 +718,15 @@ gboolean gvir_sandbox_builder_clean_post_stop(GVirSandboxBuilder *builder, GFileEnumerator *enumerator = NULL; GFileInfo *info = NULL; GFile *child = NULL; + gchar *dskfile = g_build_filename(statedir, "config", "disks.cfg", NULL); gboolean ret = TRUE; ret = klass->clean_post_stop(builder, config, statedir, error); + if (unlink(dskfile) < 0 && + errno != ENOENT) + ret = FALSE; + if (!(enumerator = g_file_enumerate_children(libsFile, "*", G_FILE_QUERY_INFO_NONE, NULL, error)) && (*error)->code != G_IO_ERROR_NOT_FOUND) { -- 2.1.4

2 1

[libvirt] [PATCH] qemu: fix not end the job after use OpenGraphics(FD) and get fail when exit monitor
by Luyao Huang 01 Jul '15

01 Jul '15

If guest unexpect exit(qemu process be killed) and get failed when exit the monitor, guest job still handled by old function, this will make guest cannot start later. Need call qemuDomainObjEndJob to release job status before unref vm. Signed-off-by: Luyao Huang <lhuang(a)redhat.com> --- src/qemu/qemu_driver.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 2b530c8..b1c9f08 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -17255,10 +17255,8 @@ qemuDomainOpenGraphics(virDomainPtr dom, qemuDomainObjEnterMonitor(driver, vm); ret = qemuMonitorOpenGraphics(priv->mon, protocol, fd, "graphicsfd", (flags & VIR_DOMAIN_OPEN_GRAPHICS_SKIPAUTH) != 0); - if (qemuDomainObjExitMonitor(driver, vm) < 0) { + if (qemuDomainObjExitMonitor(driver, vm) < 0) ret = -1; - goto cleanup; - } qemuDomainObjEndJob(driver, vm); cleanup: @@ -17327,10 +17325,8 @@ qemuDomainOpenGraphicsFD(virDomainPtr dom, qemuDomainObjEnterMonitor(driver, vm); ret = qemuMonitorOpenGraphics(priv->mon, protocol, pair[1], "graphicsfd", (flags & VIR_DOMAIN_OPEN_GRAPHICS_SKIPAUTH)); - if (qemuDomainObjExitMonitor(driver, vm) < 0) { + if (qemuDomainObjExitMonitor(driver, vm) < 0) ret = -1; - goto cleanup; - } qemuDomainObjEndJob(driver, vm); if (ret < 0) goto cleanup; -- 1.8.3.1

3 2

[libvirt] [PATCH 0/2] conf: qemu: Fix memory auditing
by Peter Krempa 01 Jul '15

01 Jul '15

Peter Krempa (2): conf: audit: Audit physical memory size rather than balloon request qemu: Audit memory size with memory hotplug operations src/conf/domain_audit.c | 3 ++- src/qemu/qemu_driver.c | 6 +----- src/qemu/qemu_hotplug.c | 20 ++++++++++++++------ 3 files changed, 17 insertions(+), 12 deletions(-) -- 2.4.1

2 4

[libvirt] sheepdog volume and number of copies
by Vasiliy Tolstov 01 Jul '15

01 Jul '15

Hi libvirt devs! Sheepdog have ability to specify number of copies (full replica or erasure) for each vdi when it created, Now xml looks like: <volume> <name>{VDI_NAME}</name> <key>sheep/{VDI_NAME}</key> <source></source> <allocation unit="G">{VDI_SIZE}</allocation> <capacity unit="G">{VDI_SIZE}</capacity> <target> <path>sheepdog:{VDI_NAME}</path> <format type='unknown'/> <permissions> <mode>00</mode> <owner>0</owner> <group>0</group> </permissions> </target> </volume> in case of erasure we need to specify number of strips and number of parity strips. In case of copies - number of copies. How the best encode this in xml? P.S. I van to create patch for libvirt to allow this, but stuck at xml definition. -- Vasiliy Tolstov, e-mail: v.tolstov(a)selfip.ru

1 0

[libvirt] [PATCHv2] virt-aa-helper: Fix permissions for vhost-user socket files
by Michal Dubiel 01 Jul '15

01 Jul '15

QEMU working in vhost-user mode communicates with the other end (i.e. some virtual router application) via unix domain sockets. This requires that permissions for the socket files are correctly written into /etc/apparmor.d/libvirt/libvirt-UUID.files. Signed-off-by: Michal Dubiel <md(a)semihalf.com> --- Changes since v1: - Removed unnecessary stat() call and dead 'else' block src/security/virt-aa-helper.c | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c index 35423b5..f39932e 100644 --- a/src/security/virt-aa-helper.c +++ b/src/security/virt-aa-helper.c @@ -32,7 +32,6 @@ #include <unistd.h> #include <errno.h> #include <sys/types.h> -#include <sys/stat.h> #include <fcntl.h> #include <getopt.h> #include <sys/utsname.h> @@ -542,7 +541,6 @@ array_starts_with(const char *str, const char * const *arr, const long size) static int valid_path(const char *path, const bool readonly) { - struct stat sb; int npaths, opaths; const char * const restricted[] = { "/bin/", @@ -592,17 +590,6 @@ valid_path(const char *path, const bool readonly) if (!virFileExists(path)) { vah_warning(_("path does not exist, skipping file type checks")); - } else { - if (stat(path, &sb) == -1) - return -1; - - switch (sb.st_mode & S_IFMT) { - case S_IFSOCK: - return 1; - break; - default: - break; - } } opaths = sizeof(override)/sizeof(*(override)); @@ -1101,6 +1088,18 @@ get_files(vahControl * ctl) } } + for (i = 0; i < ctl->def->nnets; i++) { + if (ctl->def->nets[i] && + ctl->def->nets[i]->type == VIR_DOMAIN_NET_TYPE_VHOSTUSER && + ctl->def->nets[i]->data.vhostuser) { + virDomainChrSourceDefPtr vhu = ctl->def->nets[i]->data.vhostuser; + + if (vah_add_file_chardev(&buf, vhu->data.nix.path, "rw", + vhu->type) != 0) + goto cleanup; + } + } + if (ctl->def->virtType == VIR_DOMAIN_VIRT_KVM) { for (i = 0; i < ctl->def->nnets; i++) { virDomainNetDefPtr net = ctl->def->nets[i]; -- 1.9.1

3 2

[libvirt] [PATCH sandbox] Ensure libvirt-sandbox-init-common uses correct ld-linux
by Daniel P. Berrange 01 Jul '15

01 Jul '15

The libc.so library requires certainly functionality to be provided by the ld-linux.so library. The ld-linux.so is loaded by the kernel based on the PT_INTERP ELF section, and as such LD_LIBRARY_PATH has no effect. So, although libvirt-sandbox-init-{qemu,lxc} set LD_LIBRARY_PATH to force use of the libs from the host OS image, the common init program was stil using the ld-linux.so from the guest OS image. Sometimes this works, sometimes it breaks. When trying to run Fedora 19 as the root filesystem from a Fedora 22 host, it would break thus: /etc/libvirt-sandbox/scratch/.libs/libvirt-sandbox-init-common: relocation error: /etc/libvirt-sandbox/scratch/.libs/libc.so.6: symbol _dl_find_dso_for_object, version GLIBC_PRIVATE not defined in file ld-linux-x86-64.so.2 with link time reference To deal with this we must ensure that we always invoke the libvirt-sandbox-init-common program using the ld-linux that was provided by the host OS image. The sandbox builder is tweaked so that it always copies the host ld-linux.so into the libs scratch directory, and gives it a predictable name 'ld.so', since every architecture seems to have a different name. The libvirt-sandbox-init-{lxc,qemu} files are changed so that instead of exec'ing libvirt-sandbox-init-common directly, they will load it via the ld.so file. --- libvirt-sandbox/libvirt-sandbox-builder.c | 28 +++++++++++++++++++++++----- libvirt-sandbox/libvirt-sandbox-init-lxc.c | 1 + libvirt-sandbox/libvirt-sandbox-init-qemu.c | 1 + 3 files changed, 25 insertions(+), 5 deletions(-) diff --git a/libvirt-sandbox/libvirt-sandbox-builder.c b/libvirt-sandbox/libvirt-sandbox-builder.c index 2726868..e615606 100644 --- a/libvirt-sandbox/libvirt-sandbox-builder.c +++ b/libvirt-sandbox/libvirt-sandbox-builder.c @@ -252,10 +252,11 @@ GVirConnection *gvir_sandbox_builder_get_connection(GVirSandboxBuilder *builder) static gboolean gvir_sandbox_builder_copy_file(const char *path, const char *libsdir, + const char *newname, GError **error) { gchar *name = g_path_get_basename(path); - gchar *target = g_build_filename(libsdir, name, NULL); + gchar *target = g_build_filename(libsdir, newname ? newname : name, NULL); GFile *srcFile = g_file_new_for_path(path); GFile *tgtFile = g_file_new_for_path(target); gboolean result = FALSE; @@ -285,7 +286,7 @@ static gboolean gvir_sandbox_builder_copy_program(const char *program, const gchar *argv[] = {LDD_PATH, program, NULL}; gboolean result = FALSE; - if (!gvir_sandbox_builder_copy_file(program, dest, error)) + if (!gvir_sandbox_builder_copy_file(program, dest, NULL, error)) goto cleanup; @@ -301,14 +302,31 @@ static gboolean gvir_sandbox_builder_copy_program(const char *program, *tmp = '\0'; /* Search the line for the library path */ - start = strstr(line, " => "); + start = strstr(line, "/"); end = strstr(line, " ("); if (start && end) { - start = start + 4; + const gchar *newname = NULL; *end = '\0'; - if (!gvir_sandbox_builder_copy_file(start, dest, error)) + /* There are countless different naming schemes for + * the ld-linux.so library across architectures. Pretty + * much the only thing in common is they start with + * the two letters 'ld'. The LDD program prints it + * out differently too - it doesn't include " => " + * as this library is special - its actually a static + * linked executable not a library. + * + * To make life easier for libvirt-sandbox-init-{qemu,lxc} + * we just call the file 'ld.so' when we copy it into our + * scratch dir, no matter what it was called on the host. + */ + if (!strstr(line, " => ") && + strstr(start, "/ld")) { + newname = "ld.so"; + } + + if (!gvir_sandbox_builder_copy_file(start, dest, newname, error)) goto cleanup; } diff --git a/libvirt-sandbox/libvirt-sandbox-init-lxc.c b/libvirt-sandbox/libvirt-sandbox-init-lxc.c index e2fe7f0..d1e4a79 100644 --- a/libvirt-sandbox/libvirt-sandbox-init-lxc.c +++ b/libvirt-sandbox/libvirt-sandbox-init-lxc.c @@ -77,6 +77,7 @@ main(int argc, char **argv) args[narg++] = "1000"; } + args[narg++] = SANDBOXCONFIGDIR "/.libs/ld.so"; args[narg++] = SANDBOXCONFIGDIR "/.libs/libvirt-sandbox-init-common"; if (debug) args[narg++] = "-d"; diff --git a/libvirt-sandbox/libvirt-sandbox-init-qemu.c b/libvirt-sandbox/libvirt-sandbox-init-qemu.c index 09580da..cd6055a 100644 --- a/libvirt-sandbox/libvirt-sandbox-init-qemu.c +++ b/libvirt-sandbox/libvirt-sandbox-init-qemu.c @@ -422,6 +422,7 @@ main(int argc ATTR_UNUSED, char **argv ATTR_UNUSED) args[narg++] = "1000"; } + args[narg++] = SANDBOXCONFIGDIR "/.libs/ld.so"; args[narg++] = SANDBOXCONFIGDIR "/.libs/libvirt-sandbox-init-common"; if (debug) args[narg++] = "-d"; -- 2.4.3

2 1

[libvirt] [PATCH] qemu: Avoid using ".(null)" in UNIX socket path
by Jiri Denemark 01 Jul '15

01 Jul '15

The code which generates paths for UNIX socket blindly used target name without checking if it was set. Thus for the following device XML <channel type='unix'> <source mode='bind'/> <target type='virtio'/> </channel> we would generate "/var/lib/libvirt/qemu/channel/target/NAME.(null)" path which works but is not really correct. Let's not use the ".target_name" suffix at all if target name is not set. https://bugzilla.redhat.com/show_bug.cgi?id=1226854 Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/qemu/qemu_domain.c | 20 +++++++++--- .../qemuxml2argv-channel-virtio-unix.args | 19 +++++++++++ .../qemuxml2argv-channel-virtio-unix.xml | 37 ++++++++++++++++++++++ tests/qemuxml2argvtest.c | 5 +++ 4 files changed, 77 insertions(+), 4 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-unix.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-unix.xml diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 6213fd9..404489c 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -1249,11 +1249,23 @@ qemuDomainDeviceDefPostParse(virDomainDeviceDefPtr dev, dev->data.chr->deviceType == VIR_DOMAIN_CHR_DEVICE_TYPE_CHANNEL && dev->data.chr->targetType == VIR_DOMAIN_CHR_CHANNEL_TARGET_TYPE_VIRTIO && dev->data.chr->source.type == VIR_DOMAIN_CHR_TYPE_UNIX && - !dev->data.chr->source.data.nix.path && cfg) { - if (virAsprintf(&dev->data.chr->source.data.nix.path, "%s/%s.%s", - cfg->channelTargetDir, - def->name, dev->data.chr->target.name) < 0) + !dev->data.chr->source.data.nix.path) { + if (!cfg) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("cannot generate UNIX socket path")); goto cleanup; + } + + if (dev->data.chr->target.name) { + if (virAsprintf(&dev->data.chr->source.data.nix.path, "%s/%s.%s", + cfg->channelTargetDir, + def->name, dev->data.chr->target.name) < 0) + goto cleanup; + } else { + if (virAsprintf(&dev->data.chr->source.data.nix.path, "%s/%s", + cfg->channelTargetDir, def->name) < 0) + goto cleanup; + } dev->data.chr->source.data.nix.listen = true; } diff --git a/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-unix.args b/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-unix.args new file mode 100644 index 0000000..43a34ce --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-unix.args @@ -0,0 +1,19 @@ +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ +/usr/bin/qemu -S -M pc -m 214 -smp 1 -nographic -nodefconfig -nodefaults \ +-chardev socket,id=charmonitor,path=/tmp/test-monitor,server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ +-no-acpi \ +-boot c \ +-device virtio-serial-pci,id=virtio-serial1,bus=pci.0,addr=0xa \ +-device virtio-serial-pci,id=virtio-serial0,bus=pci.0,addr=0x3 \ +-usb \ +-hda /dev/HostVG/QEMUGuest1 \ +-chardev socket,id=charchannel0,path=\ +/tmp/QEMUGuest1.org.qemu.guest_agent.0,server,nowait \ +-device virtserialport,bus=virtio-serial0.0,nr=1,chardev=charchannel0,id=channel0,\ +name=org.qemu.guest_agent.0 \ +-chardev socket,id=charchannel1,path=/tmp/QEMUGuest1,server,nowait \ +-device virtserialport,bus=virtio-serial0.0,nr=2,chardev=charchannel1,id=channel1 \ +-chardev socket,id=charchannel2,path=/tmp/QEMUGuest1.ble,server,nowait \ +-device virtserialport,bus=virtio-serial0.0,nr=3,chardev=charchannel2,id=channel2,\ +name=ble diff --git a/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-unix.xml b/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-unix.xml new file mode 100644 index 0000000..7fac943 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-unix.xml @@ -0,0 +1,37 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219136</memory> + <vcpu placement='static' cpuset='1-4,8-20,525'>1</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu</emulator> + <disk type='block' device='disk'> + <source dev='/dev/HostVG/QEMUGuest1'/> + <target dev='hda' bus='ide'/> + <address type='drive' controller='0' bus='0' target='0' unit='0'/> + </disk> + <controller type='usb' index='0'/> + <controller type='ide' index='0'/> + <controller type='virtio-serial' index='1'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x0a' function='0x0'/> + </controller> + <channel type='unix'> + <target type='virtio' name='org.qemu.guest_agent.0'/> + </channel> + <channel type='unix'> + <target type='virtio'/> + </channel> + <channel type='unix'> + <target type='virtio' name='ble'/> + </channel> + <memballoon model='none'/> + </devices> +</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 4154601..6f8332d 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -519,6 +519,9 @@ mymain(void) driver.config->spiceTLS = 1; if (VIR_STRDUP_QUIET(driver.config->spicePassword, "123456") < 0) return EXIT_FAILURE; + VIR_FREE(driver.config->channelTargetDir); + if (VIR_STRDUP_QUIET(driver.config->channelTargetDir, "/tmp") < 0) + return EXIT_FAILURE; # define DO_TEST_FULL(name, migrateFrom, migrateFd, flags, ...) \ do { \ @@ -1113,6 +1116,8 @@ mymain(void) DO_TEST("channel-virtio-default", QEMU_CAPS_DEVICE, QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_SPICE, QEMU_CAPS_CHARDEV_SPICEVMC); + DO_TEST("channel-virtio-unix", + QEMU_CAPS_DEVICE, QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG); DO_TEST("smartcard-host", QEMU_CAPS_CHARDEV, QEMU_CAPS_DEVICE, -- 2.4.5

2 2

[libvirt] [PATCH] qemu: agent: Don't automatically disable CPU0 via guest agent
by Peter Krempa 01 Jul '15

01 Jul '15

While CPU0 was made unpluggable in Linux a while ago it's not desirable to unplug it since some parts of the kernel (suspend-to-ram) still depend on it. This patch fixes the vCPU selection code in libvirt so that it will not be disabled. --- src/qemu/qemu_agent.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/qemu/qemu_agent.c b/src/qemu/qemu_agent.c index 043695b..7021a7a 100644 --- a/src/qemu/qemu_agent.c +++ b/src/qemu/qemu_agent.c @@ -1601,9 +1601,13 @@ qemuAgentUpdateCPUInfo(unsigned int nvcpus, size_t i; int nonline = 0; int nofflinable = 0; + ssize_t cpu0 = -1; /* count the active and offlinable cpus */ for (i = 0; i < ncpuinfo; i++) { + if (cpuinfo[i].id == 0) + cpu0 = i; + if (cpuinfo[i].online) nonline++; @@ -1618,6 +1622,15 @@ qemuAgentUpdateCPUInfo(unsigned int nvcpus, } } + /* CPU0 was made offlinable in linux a while ago, but certain parts (suspend + * to ram) of the kernel still don't cope well with that. Make sure that if + * all remaining vCPUs are offlinable, vCPU0 will not be selected to be + * offlined automatically */ + if (nofflinable == nonline && cpu0 >= 0 && cpuinfo[cpu0].online) { + cpuinfo[cpu0].offlinable = false; + nofflinable--; + } + /* the guest agent reported less cpus than requested */ if (nvcpus > ncpuinfo) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", -- 2.4.1

2 2

[libvirt] [PATCH 0/4] Some small libxl bug fixes
by Jim Fehlig 01 Jul '15

01 Jul '15

While working on a patch to add dom0 support to the libxl driver, I noticed a few existing bugs which are fixed by this small series. IMO 1 and 2 are safe even during the freeze as they fix quite annoying bugs. 3 and 4 are probably safe bug fixes too, unless I'm confused about the use of domainObj->{def,newDef,persistentDef} Jim Fehlig (4): libxl: don't overwrite domain state from statedir config libxl: don't remove persistent domain on start failure libxl: honor domainGetXMLDesc() --inactive flag libxl: Set def->vcpus after successfully modifying live vcpu count src/libxl/libxl_driver.c | 33 ++++++++++++++++++++++++++------- 1 file changed, 26 insertions(+), 7 deletions(-) -- 2.3.7

3 7

[libvirt] [libvirt-glib] More coverage for networking API v2
by Zeeshan Ali (Khattak) 01 Jul '15

01 Jul '15

Fixed the compiler warnings introduced by one of the patches.

3 18

[libvirt] [sandbox v2 00/11] Actually use host-image mounts on /
by Cédric Bosdonnat 01 Jul '15

01 Jul '15

Hi all, In the virt-sandbox documentation we had examples with host-image mounts targetting /. However the / in the sandbox was still the host one. The main goal of this patch series is to fix that problem. This will also be needed to run docker container with libvirt-sandbox. I also added some configure flags to disable lzma or zlib support at build time. At least opensuse 13.2 doesn't have static lzma. Diff to v1: * Fixed Dan's comments * Fixed the container case: * Made init-lxc all-static * Moved the init copy code to libvirt-sandbox-builder.c * Use setenv to set the LD_LIBRARY_PATH rather than reset the whole environment using execve Cédric Bosdonnat (11): Allow disabling build with lzma. Allow disabling zlib support. Enable strcmp checks in libvirt-sandbox-init-qemu.c Make init-lxc all static Copy all needed init programs and all its deps to config subdir Remove init-common dependency on libvirt-sandbox.so init-qemu: extract the mounts.cfg ntry mounting code qemu: use mounts targeting / as root Add function to check if there is a mount with / target Don't add sandbox:root device if we have a mount targetting / container builder: don't expose host rootfs if unneeded cfg.mk | 2 - configure.ac | 37 ++++- libvirt-sandbox/Makefile.am | 45 +++--- .../libvirt-sandbox-builder-container.c | 37 +++-- libvirt-sandbox/libvirt-sandbox-builder-machine.c | 22 +-- libvirt-sandbox/libvirt-sandbox-builder.c | 159 ++++++++++++++++++- libvirt-sandbox/libvirt-sandbox-builder.h | 2 + libvirt-sandbox/libvirt-sandbox-config-all.h | 62 ++++++++ libvirt-sandbox/libvirt-sandbox-config-disk.c | 2 +- libvirt-sandbox/libvirt-sandbox-config-initrd.c | 2 +- .../libvirt-sandbox-config-interactive.c | 2 +- .../libvirt-sandbox-config-mount-file.c | 2 +- .../libvirt-sandbox-config-mount-guest-bind.c | 2 +- .../libvirt-sandbox-config-mount-host-bind.c | 2 +- .../libvirt-sandbox-config-mount-host-image.c | 2 +- libvirt-sandbox/libvirt-sandbox-config-mount-ram.c | 2 +- libvirt-sandbox/libvirt-sandbox-config-mount.c | 2 +- .../libvirt-sandbox-config-network-address.c | 2 +- ...rt-sandbox-config-network-filterref-parameter.c | 2 +- .../libvirt-sandbox-config-network-filterref.c | 2 +- .../libvirt-sandbox-config-network-route.c | 2 +- libvirt-sandbox/libvirt-sandbox-config-network.c | 2 +- .../libvirt-sandbox-config-service-generic.c | 2 +- .../libvirt-sandbox-config-service-systemd.c | 2 +- libvirt-sandbox/libvirt-sandbox-config-service.c | 2 +- libvirt-sandbox/libvirt-sandbox-config.c | 23 ++- libvirt-sandbox/libvirt-sandbox-config.h | 1 + libvirt-sandbox/libvirt-sandbox-init-common.c | 5 +- libvirt-sandbox/libvirt-sandbox-init-lxc.c | 16 +- libvirt-sandbox/libvirt-sandbox-init-qemu.c | 175 +++++++++++++++++---- libvirt-sandbox/libvirt-sandbox-util.c | 2 +- libvirt-sandbox/libvirt-sandbox.sym | 1 + 32 files changed, 519 insertions(+), 104 deletions(-) create mode 100644 libvirt-sandbox/libvirt-sandbox-config-all.h -- 2.1.4

2 15

[libvirt] [PATCH] qemu: process: Improve update of maximum baloon state at startup
by Peter Krempa 30 Jun '15

30 Jun '15

In commit 641a145d73fdc3dd9350fd57b3d3247abf101c05 I've added code that resets the ballon memory value to full size prior to resuming the vCPUs since the size certainly was not reduced at that point. Since qemuProcess start is used also in code paths with already booted up guests (migration, save/restore) the assumption is not entirely true since the guest might already been running before. This patch adds a function that queries the monitor rather than using the full size since a balloon event would not be reissued in case we are recovering a saved migration state. Additionally the new function is used also when reconnecting to a VM after libvirtd restart since we might have missed a few ballon events while libvirtd was not running. --- src/qemu/qemu_process.c | 35 ++++++++++++++++++++++++++++++++++- 1 file changed, 34 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index ba84182..5698404 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -2065,6 +2065,35 @@ qemuProcessReconnectRefreshChannelVirtioState(virQEMUDriverPtr driver, static int +qemuProcessRefreshBallonState(virQEMUDriverPtr driver, + virDomainObjPtr vm) +{ + unsigned long long balloon; + int rc; + + /* if no balloning is available, the current size equals to the current + * full memory size */ + if (!vm->def->memballoon || + vm->def->memballoon->model == VIR_DOMAIN_MEMBALLOON_MODEL_NONE) { + vm->def->mem.cur_balloon = virDomainDefGetMemoryActual(vm->def); + return 0; + } + + qemuDomainObjEnterMonitor(driver, vm); + rc = qemuMonitorGetBalloonInfo(qemuDomainGetMonitor(vm), &balloon); + if (qemuDomainObjExitMonitor(driver, vm) < 0) + rc = -1; + + if (rc < 0) + return -1; + + vm->def->mem.cur_balloon = balloon; + + return 0; +} + + +static int qemuProcessWaitForMonitor(virQEMUDriverPtr driver, virDomainObjPtr vm, int asyncJob, @@ -3779,6 +3808,9 @@ qemuProcessReconnect(void *opaque) if (qemuProcessReconnectRefreshChannelVirtioState(driver, obj) < 0) goto error; + if (qemuProcessRefreshBallonState(driver, obj) < 0) + goto error; + if (qemuProcessRecoverJob(driver, obj, conn, &oldjob) < 0) goto error; @@ -4922,7 +4954,8 @@ int qemuProcessStart(virConnectPtr conn, /* Since CPUs were not started yet, the ballon could not return the memory * to the host and thus cur_balloon needs to be updated so that GetXMLdesc * and friends return the correct size in case they can't grab the job */ - vm->def->mem.cur_balloon = virDomainDefGetMemoryActual(vm->def); + if (qemuProcessRefreshBallonState(driver, vm) < 0) + goto cleanup; VIR_DEBUG("Detecting actual memory size for video device"); if (qemuProcessUpdateVideoRamSize(driver, vm, asyncJob) < 0) -- 2.4.1

2 1

[libvirt] [PATCH 0/3] Address a couple of mpath/Multipath storage pool issues
by John Ferlan 30 Jun '15

30 Jun '15

My thought was to combine patch 2 and 3 unless it was felt that disallowing more than one Multipath pool to defined at one time (patch 3) was unnecessary For patch 1, I did some searching and came across the following to describe why /dev/mpath is no longer valid: http://comments.gmane.org/gmane.linux.kernel.device-mapper.devel/13864 I kept /dev/mpath as a valid option only just in case there's some strange back-compat issue or some platform where /dev/mpath is preferred/used instead of /dev/mapper. John Ferlan (3): mpath: Update path in CheckPool function docs: Clarify the Multipath target path value usage mpath: Don't allow more than one mpath pool at a time docs/formatstorage.html.in | 2 ++ docs/storage.html.in | 3 ++- src/conf/storage_conf.c | 3 +++ src/storage/storage_backend_mpath.c | 3 ++- 4 files changed, 9 insertions(+), 2 deletions(-) -- 2.1.0

2 5

[libvirt] [PATCH 0/2] Domain lifecycle onCrash adjustments
by John Ferlan 30 Jun '15

30 Jun '15

First patch uses the right symbols, second patch adds an extra check to qemu backend for the coredump-destroy action John Ferlan (2): Use the correct symbol for 'onCrash' qemu: Add missing on_crash lifecycle type src/lxc/lxc_native.c | 2 +- src/qemu/qemu_command.c | 5 +++-- src/vmx/vmx.c | 2 +- src/xenconfig/xen_sxpr.c | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) -- 2.1.0

2 3

[libvirt] [RFC] qemu: Redesigning guest CPU configuration
by Jiri Denemark 30 Jun '15

30 Jun '15

Hi all (and sorry for the long email), The current way QEMU driver handles guest CPU configuration is not ideal. We detect host CPU capabilities only by querying the CPU and we don't check with QEMU what features it supports. We don't check QEMU's definitions of CPU models, which may be different from libvirt's definitions. All this results in several issues: - guest CPU may change druing migration, save/restore - libvirt may ask for a CPU which QEMU cannot provide; the guest will see a slightly different CPU but libvirt client won't know about it - libvirt may come up with a CPU that doesn't make sense and which won't work for a guest (the guest may even crash) Although usually everything just works, it is very fragile. Since we want to fix all these issues, we need to: - guarantee stable guest ABI (a single domain XML should always results in the same guest ABI). Once a domain is started, its CPU definition should never change (unless someone changes the XML, of course, similar to, e.g. PCI addresses). However, there are a few exceptions: - host-passthrough CPU mode will always result in "-cpu host" - host-model CPU mode should recompute the CPU model on every start, but the CPU must not change during migration - always make sure QEMU provides the CPU we asked for. Starting a domain should fail in case QEMU cannot provide exactly the CPU we asked for. - provide usable host-model mode and custom mode with minimum match. We need to generate CPU configurations that actually work, i.e., we need to ask QEMU what CPU it can provide on current host rather than requesting a bunch of features on top of a CPU model which does not always match the host CPU. QEMU already provides or will soon provide everything we need to meet these requirements: - we can cover every configurable part of a CPU in our cpu_map.xml and instead of asking QEMU for a specific CPU model we can use "-cpu custom" with a fully specified CPU - we can use the additional data about CPU models to choose the right one for a host CPU - when starting a domain we can check whether QEMU filtered out any of the features we asked for and refuse to start the domain - we can ask QEMU what would "-cpu host" look like and use that for host-model and minimum match CPUs (it won't work for TCG mode, though, but we can keep using the current CPUID detection code for TCG) Once we start maintaining CPU models with all the details, we will likely meet the same issues QEMU folks meet, i.e., we will need to fix bugs in existing CPU models. And it's not just about adding removing CPU features but also fixing other parameters, such as wrong level, etc. It's clear every change will require a new CPU model to be defined. But I think we should do it in a way that applications or users should not need (if they don't want to) to care about it. I'm thinking about doing something similar to machine types. Each CPU model could be defined in several versions and a CPU specs without a version would be an alias to the latest version. The problem is, we need to maintain backward compatibility and we should avoid breaking existing domains (shouldn't we?) which just work even though their guest CPUs do not exactly match the domain XML definitions. So either we need to define all existing CPU models in all their variants used for various machine types and have a mapping between (model without a version, machine type) to a specific version of the model (which may be quite hard) or we need to be able to distinguish between an existing domain and a new domain with no CPU model version. While host-model and host-passthrough CPU modes are easy because they are designed to change everytime a domain starts (which means we don't need to be able to distinguish between existing and new domains), custom CPU mode are tricky. Currently, the only at least a bit reasonable thing which came to my mind is to have a new CPU mode, but it still seems awkward so please share your ideas if you have any. BTW, I don't think we should try to expose every part of the CPU model definitions in domain XML, they should remain hidden behind the CPU model name. It would be hard to explain what each of the extra parameters mean, each model would have to include them anyway since we can't expect users to provide all the details correctly, and once visible in domain XML it could encourage users to play with the values. I'm looking forward to any comments or ideas. Jirka

4 14

[libvirt] [PATCH 0/7] Restore code to allow unpriv_sgio for hostdev SCSI generic
by John Ferlan 30 Jun '15

30 Jun '15

https://bugzilla.redhat.com/show_bug.cgi?id=1072736 This series of patches unreverts the functionality from commit id 'ce346623' which reverted the original functionality. Since pure revert caused too many conflicts and because the code has undergone a few changes since the prior reversion, I had to restore the code by rote method. The reversion includes some refactorings to make the final check much easier to handle. Of note patch 3 covers much of what was adjusted in the reverted patch 'qemuCheckSharedDevice'. Patch 4 expands the driver lock to cover the same space as the similar disk code - I can take the other as well and shorten the time the disk code has the lock. Keeping them similar is mostly a sanity thing. John Ferlan (7): qemu: Introduce qemuIsSharedHostdev qemu: Introduce qemuGetHostdevPath qemu: Refactor qemuCheckSharedDisk to create virCheckUnprivSGIO qemu: Refactor qemuAddSharedHostdev and qemuRemoveSharedHostdev qemu: Extract qemuGetHostdevPath from qemuGetSharedHostdevKey qemu: Add ability to set sgio values for hostdev qemu: Add check for unpriv sgio for SCSI generic host device src/qemu/qemu_conf.c | 205 ++++++++++++++++++++++++++++++++++----------------- 1 file changed, 138 insertions(+), 67 deletions(-) -- 2.1.0

2 12

[libvirt] [PATCH] Added support for portable-rpcgen from portablexdr library
by Pavel Fedin 30 Jun '15

30 Jun '15

This patch allows to build libvirt natively under MinGW/MSYS using portablexdr library. An updated version of portablexdr with fixed bugs is available as part of MSYS2 project. Signed-off-by: Pavel Fedin <p.fedin(a)samsung.com> --- configure.ac | 2 +- src/lxc/lxc_monitor_protocol.x | 2 +- src/rpc/genprotocol.pl | 5 ++++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index aed0934..547a405 100644 --- a/configure.ac +++ b/configure.ac @@ -397,7 +397,7 @@ AM_CONDITIONAL([HAVE_LIBTASN1], [test "x$ac_cv_header_libtasn1_h" = "xyes"]) AC_CHECK_LIB([intl],[gettext],[]) dnl Do we have rpcgen? -AC_PATH_PROG([RPCGEN], [rpcgen], [no]) +AC_PATH_PROGS([RPCGEN], [rpcgen portable-rpcgen], [no]) AM_CONDITIONAL([HAVE_RPCGEN], [test "x$ac_cv_path_RPCGEN" != "xno"]) dnl Is this GLIBC's buggy rpcgen? AM_CONDITIONAL([HAVE_GLIBC_RPCGEN], diff --git a/src/lxc/lxc_monitor_protocol.x b/src/lxc/lxc_monitor_protocol.x index 3b66af5..205d7c2 100644 --- a/src/lxc/lxc_monitor_protocol.x +++ b/src/lxc/lxc_monitor_protocol.x @@ -30,7 +30,7 @@ enum virLXCMonitorExitStatus { }; struct virLXCMonitorExitEventMsg { - enum virLXCMonitorExitStatus status; + virLXCMonitorExitStatus status; }; struct virLXCMonitorInitEventMsg { diff --git a/src/rpc/genprotocol.pl b/src/rpc/genprotocol.pl index 6e6d6d4..1ac2507 100755 --- a/src/rpc/genprotocol.pl +++ b/src/rpc/genprotocol.pl @@ -38,7 +38,10 @@ my $target = shift; unlink $target; -open RPCGEN, "-|", $rpcgen, $mode, $xdrdef +if ($rpcgen =~ /portable-rpcgen/) { + $rpcgen = "$rpcgen -o -"; +} +open RPCGEN, "-|", "$rpcgen $mode $xdrdef" or die "cannot run $rpcgen $mode $xdrdef: $!"; open TARGET, ">$target" or die "cannot create $target: $!"; -- 1.9.5.msysgit.0

1 1

[libvirt] [PATCH] conf: storage: Fix duplicate check for gluster pools
by Peter Krempa 30 Jun '15

30 Jun '15

The pool name has to be the same too to warrant rejecting a pool definition as duplicate. This regression was introduced in commit 2184ade3a0546b915252cb3b6a5dc88e9a8d2ccf. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1236438 --- src/conf/storage_conf.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c index 4bbed4f..4fa065d 100644 --- a/src/conf/storage_conf.c +++ b/src/conf/storage_conf.c @@ -2471,13 +2471,22 @@ virStoragePoolSourceFindDuplicate(virConnectPtr conn, if (STREQ(pool->def->target.path, def->target.path)) matchpool = pool; break; - case VIR_STORAGE_POOL_NETFS: + case VIR_STORAGE_POOL_GLUSTER: + if (STREQ(pool->def->source.name, def->source.name) && + STREQ(pool->def->source.dir, def->source.dir) && + virStoragePoolSourceMatchSingleHost(&pool->def->source, + &def->source)) + matchpool = pool; + break; + + case VIR_STORAGE_POOL_NETFS: if (STREQ(pool->def->source.dir, def->source.dir) && virStoragePoolSourceMatchSingleHost(&pool->def->source, &def->source)) matchpool = pool; break; + case VIR_STORAGE_POOL_SCSI: if (pool->def->source.adapter.type == VIR_STORAGE_POOL_SOURCE_ADAPTER_TYPE_FC_HOST && -- 2.4.1

2 2

[libvirt] [PATCH 0/2] qemu: Properly report port numbers in spice events
by Peter Krempa 30 Jun '15

30 Jun '15

Peter Krempa (2): qemu: event: Properly handle spice events qemu: event: Clean up VNC monitor handling src/qemu/qemu_monitor_json.c | 110 ++++++++++++++++++++++++++++++++++--------- 1 file changed, 87 insertions(+), 23 deletions(-) -- 2.4.1

2 5

[libvirt] [PATCH] qemu: Close the agent connection only on agent channel events
by Peter Krempa 30 Jun '15

30 Jun '15

processSerialChangedEvent processes events for all channels. Commit 2af51483 broke all agent interaction if a channel other than the agent closes since it did not check that the event actually originated from the guest agent channel. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1236924 Fixes up: https://bugzilla.redhat.com/show_bug.cgi?id=890648 --- src/qemu/qemu_driver.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 2b530c8..353be31 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -4448,10 +4448,20 @@ processSerialChangedEvent(virQEMUDriverPtr driver, if (newstate == VIR_DOMAIN_CHR_DEVICE_STATE_DISCONNECTED && virDomainObjIsActive(vm) && priv->agent) { - /* Close agent monitor early, so that other threads - * waiting for the agent to reply can finish and our - * job we acquire below can succeed. */ - qemuAgentNotifyClose(priv->agent); + /* peek into the domain definition to find the channel */ + if (virDomainDefFindDevice(vm->def, devAlias, &dev, true) == 0 && + dev.type == VIR_DOMAIN_DEVICE_CHR && + dev.data.chr->deviceType == VIR_DOMAIN_CHR_DEVICE_TYPE_CHANNEL && + dev.data.chr->targetType == VIR_DOMAIN_CHR_CHANNEL_TARGET_TYPE_VIRTIO && + STREQ_NULLABLE(dev.data.chr->target.name, "org.qemu.guest_agent.0")) + /* Close agent monitor early, so that other threads + * waiting for the agent to reply can finish and our + * job we acquire below can succeed. */ + qemuAgentNotifyClose(priv->agent); + + /* now discard the data, since it may possibly change once we unlock + * while entering the job */ + memset(&dev, 0, sizeof(dev)); } if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_MODIFY) < 0) -- 2.4.1

2 2

[libvirt] [PATCH] vz: fix SDK event dispatching
by nshirokovskiy＠virtuozzo.com 30 Jun '15

30 Jun '15

From: Nikolay Shirokovskiy <nshirokovskiy(a)virtuozzo.com> Current version of SDK event dispatcing is incorrect. For most VM events (add, delete etc) issuer type is PIE_DISPATCHER. Actually analyzing issuer type doesn't have any benifints so this patch get rid of it. All dispatching is done only on event type. Signed-off-by: Nikolay Shirokovskiy <nshirokovskiy(a)virtuozzo.com> --- src/vz/vz_sdk.c | 58 +++++++++++++++--------------------------------------- 1 files changed, 16 insertions(+), 42 deletions(-) diff --git a/src/vz/vz_sdk.c b/src/vz/vz_sdk.c index 98f7a57..2ca74c4 100644 --- a/src/vz/vz_sdk.c +++ b/src/vz/vz_sdk.c @@ -1697,21 +1697,33 @@ prlsdkHandlePerfEvent(vzConnPtr privconn, return PRL_ERR_SUCCESS; } -static void -prlsdkHandleVmEvent(vzConnPtr privconn, PRL_HANDLE prlEvent) +static PRL_RESULT +prlsdkEventsHandler(PRL_HANDLE prlEvent, PRL_VOID_PTR opaque) { + vzConnPtr privconn = opaque; PRL_RESULT pret = PRL_ERR_FAILURE; + PRL_HANDLE_TYPE handleType; char uuidstr[VIR_UUID_STRING_BUFLEN + 2]; unsigned char uuid[VIR_UUID_BUFLEN]; PRL_UINT32 bufsize = ARRAY_CARDINALITY(uuidstr); PRL_EVENT_TYPE prlEventType; - pret = PrlEvent_GetType(prlEvent, &prlEventType); + pret = PrlHandle_GetType(prlEvent, &handleType); prlsdkCheckRetGoto(pret, cleanup); + /* Currently, there is no need to handle anything but events */ + if (handleType != PHT_EVENT) + goto cleanup; + + if (privconn == NULL) + goto cleanup; + pret = PrlEvent_GetIssuerId(prlEvent, uuidstr, &bufsize); prlsdkCheckRetGoto(pret, cleanup); + pret = PrlEvent_GetType(prlEvent, &prlEventType); + prlsdkCheckRetGoto(pret, cleanup); + if (prlsdkUUIDParse(uuidstr, uuid) < 0) goto cleanup; @@ -1736,44 +1748,7 @@ prlsdkHandleVmEvent(vzConnPtr privconn, PRL_HANDLE prlEvent) prlEvent = PRL_INVALID_HANDLE; break; default: - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Can't handle event of type %d"), prlEventType); - } - - cleanup: - PrlHandle_Free(prlEvent); - return; -} - -static PRL_RESULT -prlsdkEventsHandler(PRL_HANDLE prlEvent, PRL_VOID_PTR opaque) -{ - vzConnPtr privconn = opaque; - PRL_RESULT pret = PRL_ERR_FAILURE; - PRL_HANDLE_TYPE handleType; - PRL_EVENT_ISSUER_TYPE prlIssuerType = PIE_UNKNOWN; - - pret = PrlHandle_GetType(prlEvent, &handleType); - prlsdkCheckRetGoto(pret, cleanup); - - /* Currently, there is no need to handle anything but events */ - if (handleType != PHT_EVENT) - goto cleanup; - - if (privconn == NULL) - goto cleanup; - - PrlEvent_GetIssuerType(prlEvent, &prlIssuerType); - prlsdkCheckRetGoto(pret, cleanup); - - switch (prlIssuerType) { - case PIE_VIRTUAL_MACHINE: - prlsdkHandleVmEvent(privconn, prlEvent); - // above function takes own of event - prlEvent = PRL_INVALID_HANDLE; - break; - default: - VIR_DEBUG("Skipping event of issuer type %d", prlIssuerType); + VIR_DEBUG("Skipping event of type %d", prlEventType); } cleanup: @@ -1781,7 +1756,6 @@ prlsdkEventsHandler(PRL_HANDLE prlEvent, PRL_VOID_PTR opaque) return PRL_ERR_SUCCESS; } - int prlsdkSubscribeToPCSEvents(vzConnPtr privconn) { PRL_RESULT pret = PRL_ERR_UNINITIALIZED; -- 1.7.1

2 2

[libvirt] [PATCH] Fix typo incomaptible -> incompatible
by Andrea Bolognani 30 Jun '15

30 Jun '15

--- src/cpu/cpu_x86.c | 4 ++-- src/libvirt-domain-snapshot.c | 2 +- src/qemu/qemu_driver.c | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c index 2a14705..f5f7697 100644 --- a/src/cpu/cpu_x86.c +++ b/src/cpu/cpu_x86.c @@ -1507,14 +1507,14 @@ x86Compute(virCPUDefPtr host, static virCPUCompareResult x86Compare(virCPUDefPtr host, virCPUDefPtr cpu, - bool failIncomaptible) + bool failIncompatible) { virCPUCompareResult ret; char *message = NULL; ret = x86Compute(host, cpu, NULL, &message); - if (failIncomaptible && ret == VIR_CPU_COMPARE_INCOMPATIBLE) { + if (failIncompatible && ret == VIR_CPU_COMPARE_INCOMPATIBLE) { ret = VIR_CPU_COMPARE_ERROR; if (message) { virReportError(VIR_ERR_CPU_INCOMPATIBLE, "%s", message); diff --git a/src/libvirt-domain-snapshot.c b/src/libvirt-domain-snapshot.c index 4625e03..b7c566f 100644 --- a/src/libvirt-domain-snapshot.c +++ b/src/libvirt-domain-snapshot.c @@ -1048,7 +1048,7 @@ virDomainSnapshotHasMetadata(virDomainSnapshotPtr snapshot, * new hypervisor instance rather than reusing the existing hypervisor * (since this would terminate all connections to the domain, such as * such as VNC or Spice graphics) - this condition arises from active - * snapshots that are provably ABI incomaptible, as well as from + * snapshots that are provably ABI incompatible, as well as from * inactive snapshots with a @flags request to start the domain after * the revert. * diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 2b530c8..bdf9b15 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -12948,7 +12948,7 @@ qemuConnectCompareCPU(virConnectPtr conn, virQEMUDriverPtr driver = conn->privateData; int ret = VIR_CPU_COMPARE_ERROR; virCapsPtr caps = NULL; - bool failIncomaptible; + bool failIncompatible; virCheckFlags(VIR_CONNECT_COMPARE_CPU_FAIL_INCOMPATIBLE, VIR_CPU_COMPARE_ERROR); @@ -12956,14 +12956,14 @@ qemuConnectCompareCPU(virConnectPtr conn, if (virConnectCompareCPUEnsureACL(conn) < 0) goto cleanup; - failIncomaptible = !!(flags & VIR_CONNECT_COMPARE_CPU_FAIL_INCOMPATIBLE); + failIncompatible = !!(flags & VIR_CONNECT_COMPARE_CPU_FAIL_INCOMPATIBLE); if (!(caps = virQEMUDriverGetCapabilities(driver, false))) goto cleanup; if (!caps->host.cpu || !caps->host.cpu->model) { - if (failIncomaptible) { + if (failIncompatible) { virReportError(VIR_ERR_CPU_INCOMPATIBLE, "%s", _("cannot get host CPU capabilities")); } else { @@ -12971,7 +12971,7 @@ qemuConnectCompareCPU(virConnectPtr conn, ret = VIR_CPU_COMPARE_INCOMPATIBLE; } } else { - ret = cpuCompareXML(caps->host.cpu, xmlDesc, failIncomaptible); + ret = cpuCompareXML(caps->host.cpu, xmlDesc, failIncompatible); } cleanup: -- 2.4.3

2 1

[libvirt] [PATCH] qemu: Fix assignment of the default spicevmc channel name
by Jiri Denemark 30 Jun '15

30 Jun '15

Make sure we only assign the default spicevmc channel name to spicevmc virtio channels. Caused by commits 3269ee65 and 1133ee2b, which moved the assignment from XML parsing code to QEMU but failed to keep the logic. https://bugzilla.redhat.com/show_bug.cgi?id=1179680 Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/qemu/qemu_command.c | 4 ++- .../qemuxml2argv-channel-virtio-default.args | 16 ++++++++++ .../qemuxml2argv-channel-virtio-default.xml | 36 ++++++++++++++++++++++ tests/qemuxml2argvtest.c | 3 ++ 4 files changed, 58 insertions(+), 1 deletion(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-default.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-default.xml diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 2209cf6..9b06a49 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -6427,7 +6427,9 @@ qemuBuildVirtioSerialPortDevStr(virDomainDefPtr def, virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_SPICEVMC))) { virBufferAsprintf(&buf, ",chardev=char%s,id=%s", dev->info.alias, dev->info.alias); - if (dev->deviceType == VIR_DOMAIN_CHR_DEVICE_TYPE_CHANNEL) { + if (dev->deviceType == VIR_DOMAIN_CHR_DEVICE_TYPE_CHANNEL && + (dev->source.type == VIR_DOMAIN_CHR_TYPE_SPICEVMC || + dev->target.name)) { virBufferAsprintf(&buf, ",name=%s", dev->target.name ? dev->target.name : "com.redhat.spice.0"); } diff --git a/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-default.args b/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-default.args new file mode 100644 index 0000000..7908445 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-default.args @@ -0,0 +1,16 @@ +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ +/usr/bin/qemu -S -M pc -m 214 -smp 1 -nographic -nodefconfig -nodefaults \ +-chardev socket,id=charmonitor,path=/tmp/test-monitor,server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ +-no-acpi \ +-boot c \ +-device virtio-serial-pci,id=virtio-serial1,bus=pci.0,addr=0xa \ +-device virtio-serial-pci,id=virtio-serial0,bus=pci.0,addr=0x3 \ +-usb \ +-hda /dev/HostVG/QEMUGuest1 \ +-chardev pty,id=charchannel0 \ +-device virtserialport,bus=virtio-serial0.0,nr=1,chardev=charchannel0,id=channel0 \ +-chardev spicevmc,id=charchannel1,name=vdagent \ +-device virtserialport,bus=virtio-serial0.0,nr=2,chardev=charchannel1,id=channel1,\ +name=com.redhat.spice.0 \ +-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-default.xml b/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-default.xml new file mode 100644 index 0000000..74baded --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-default.xml @@ -0,0 +1,36 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> + <vcpu placement='static' cpuset='1-4,8-20,525'>1</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu</emulator> + <disk type='block' device='disk'> + <source dev='/dev/HostVG/QEMUGuest1'/> + <target dev='hda' bus='ide'/> + <address type='drive' controller='0' bus='0' target='0' unit='0'/> + </disk> + <controller type='usb' index='0'/> + <controller type='ide' index='0'/> + <controller type='virtio-serial' index='1'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x0a' function='0x0'/> + </controller> + <controller type='pci' index='0' model='pci-root'/> + <channel type='pty'> + <target type='virtio'/> + </channel> + <channel type="spicevmc"> + <target type="virtio"/> + </channel> + <memballoon model='virtio'/> + </devices> +</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index a212d30..4154601 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1110,6 +1110,9 @@ mymain(void) DO_TEST("channel-spicevmc-old", QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_SPICE, QEMU_CAPS_DEVICE_SPICEVMC); + DO_TEST("channel-virtio-default", + QEMU_CAPS_DEVICE, QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG, + QEMU_CAPS_SPICE, QEMU_CAPS_CHARDEV_SPICEVMC); DO_TEST("smartcard-host", QEMU_CAPS_CHARDEV, QEMU_CAPS_DEVICE, -- 2.4.5

2 2

[libvirt] [PATCH] qemuxml2argv: Remove CPU models from unrelated tests
by Jiri Denemark 30 Jun '15

30 Jun '15

Proper Haswell CPU model handling is tested in several qemuxml2argv-cpu-* which are run in a special environment. Let's remove the CPU model from other tests to make them less fragile. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- .../qemuxml2argv-hugepages-numa.args | 1 - .../qemuxml2argv-hugepages-numa.xml | 3 +-- .../qemuxml2argv-interface-server.xml | 25 +--------------------- 3 files changed, 2 insertions(+), 27 deletions(-) diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hugepages-numa.args b/tests/qemuxml2argvdata/qemuxml2argv-hugepages-numa.args index b697942..37511b1 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-hugepages-numa.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-hugepages-numa.args @@ -2,7 +2,6 @@ LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=spice \ /usr/bin/qemu-system-x86_64 \ -S \ -M pc-i440fx-2.3 \ --cpu Haswell \ -m size=1048576k,slots=16,maxmem=1099511627776k \ -smp 2 \ -object memory-backend-file,id=ram-node0,prealloc=yes,\ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hugepages-numa.xml b/tests/qemuxml2argvdata/qemuxml2argv-hugepages-numa.xml index 8c1f19c..8cda5c6 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-hugepages-numa.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-hugepages-numa.xml @@ -17,8 +17,7 @@ <apic/> <pae/> </features> - <cpu mode='custom' match='exact'> - <model fallback='allow'>Haswell</model> + <cpu> <numa> <cell id='0' cpus='0-1' memory='1048576' unit='KiB'/> </numa> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-interface-server.xml b/tests/qemuxml2argvdata/qemuxml2argv-interface-server.xml index 9edf773..a92aff4 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-interface-server.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-interface-server.xml @@ -19,30 +19,7 @@ <apic/> <pae/> </features> - <cpu mode='custom' match='exact'> - <model fallback='allow'>Haswell</model> - <vendor>Intel</vendor> - <feature policy='require' name='tm2'/> - <feature policy='require' name='est'/> - <feature policy='require' name='vmx'/> - <feature policy='require' name='osxsave'/> - <feature policy='require' name='smx'/> - <feature policy='require' name='ss'/> - <feature policy='require' name='ds'/> - <feature policy='require' name='vme'/> - <feature policy='require' name='dtes64'/> - <feature policy='require' name='abm'/> - <feature policy='require' name='ht'/> - <feature policy='require' name='acpi'/> - <feature policy='require' name='pbe'/> - <feature policy='require' name='tm'/> - <feature policy='require' name='pdcm'/> - <feature policy='require' name='pdpe1gb'/> - <feature policy='require' name='ds_cpl'/> - <feature policy='require' name='rdrand'/> - <feature policy='require' name='f16c'/> - <feature policy='require' name='xtpr'/> - <feature policy='require' name='monitor'/> + <cpu> <numa> <cell id='0' cpus='0' memory='1048576' unit='KiB'/> <cell id='1' cpus='1' memory='1048576' unit='KiB'/> -- 2.4.5

2 2

[libvirt] Libvirt - updates backing file permission of qcow2 image on launching instance
by Agrawal, Ankit 30 Jun '15

30 Jun '15

Hi All, I am trying to fix a race condition between imagebackend and imagecache in nova (openstack) while creating an instance using qcow2 image backend. On creating a qcow2 image libvirt stores the base/backing file path reference while copying the image at instance disk info. While spawning the instance nova usage this base file reference as a backing file to launch instance. When base file is created in nova image cache directory its owner is set to openstack (a nova user) but on launching the instance from guest.launch, libvirt updates the base/backing file owner from openstack to libvirt-qemu which causes permission error if we try to use that base file later. Can someone please help me to understand why libvirt is updating the owner of base file stored in image cache directory, is it a bug in libvirt or the expected behaviour? Thanks & Regards, Ankit Agrawal ______________________________________________________________________ Disclaimer: This email and any attachments are sent in strictest confidence for the sole use of the addressee and may contain legally privileged, confidential, and proprietary data. If you are not the intended recipient, please advise the sender by replying promptly to this email and then delete and destroy this email and any attachments without any further use, copying or forwarding.

1 0

[libvirt] [PATCH] storage: Set correct vol->type at VolCreate
by John Ferlan 30 Jun '15

30 Jun '15

https://bugzilla.redhat.com/show_bug.cgi?id=1227664 If the requested format type for the new entry in the file system pool is a 'dir', then be sure to set the vol->type correctly as would be done when the pool is refreshed. Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- src/storage/storage_backend_fs.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/storage/storage_backend_fs.c b/src/storage/storage_backend_fs.c index b751687..0eebac3 100644 --- a/src/storage/storage_backend_fs.c +++ b/src/storage/storage_backend_fs.c @@ -1051,7 +1051,10 @@ virStorageBackendFileSystemVolCreate(virConnectPtr conn ATTRIBUTE_UNUSED, virStorageVolDefPtr vol) { - vol->type = VIR_STORAGE_VOL_FILE; + if (vol->target.format == VIR_STORAGE_FILE_DIR) + vol->type = VIR_STORAGE_VOL_DIR; + else + vol->type = VIR_STORAGE_VOL_FILE; VIR_FREE(vol->target.path); if (virAsprintf(&vol->target.path, "%s/%s", -- 2.1.0

2 1

[libvirt] [PATCH] libvirt/hooks: Static and dynamic hugepage hooks
by Alex Williamson 30 Jun '15

30 Jun '15

This patch provides scripts for hugepage allocation, as well as a bit of infrastructure and common hook config file that I hope may some day be enabled by default in libvirt. For now, we place the files in /usr/share and ask users to install the config file and copy or link the scripts, more like "contrib" scripts for now. Two methods of hugepage allocation are provided, static and dynamic. The static mechanism allocates pages at libvirt daemon startup and releases them at shutdown. It allows full size, locality, and policy configuration. For instance, if I want to allocate a set of 2M pages exclusively on host NUMA node 1, it can do that, along with plenty more. This is especially useful for 1G hugepages on x86, since they can now be allocated dynamically, but become impractical to allocate due to memory fragmentation as the host runs. Systems dedicated to hosting VMs are also likely to prefer static allocation. Static allocation requires explicit XML entries in the hook config file to be activated. The dynamic method allocates hugepages only around the instantiation of the VM. This is enabled by adding an entry for the domain in the config file and configuring the domain normally for hugepages. The dynamic hugepage script is activated via the QEMU domain prepare hook, reads the domain XML and allocates hugepages as necessary. On domain shutdown, hugepages are freed via the release hook. This model is more appropriate for systems that are not dedicated VM hosts and guests that use hugepage sizes and quantities are are likely to be dynamically allocated as the VM is started. In addition to the documentation provided within each script, a README file is provided with overal instructions and summaries of the individual scripts. Signed-off-by: Alex Williamson <alex.williamson(a)redhat.com> --- Makefile.am | 2 configure.ac | 3 hooks/Makefile.am | 27 ++++ hooks/README | 47 +++++++ hooks/daemon | 33 +++++ hooks/daemon.d/Makefile.am | 21 +++ hooks/daemon.d/static-hugepages.sh | 100 +++++++++++++++ hooks/functions.sh | 180 +++++++++++++++++++++++++++ hooks/libvirt-hook-config.xml | 38 ++++++ hooks/qemu | 40 ++++++ hooks/qemu.d/Makefile.am | 21 +++ hooks/qemu.d/dynamic-hugepages.sh | 238 ++++++++++++++++++++++++++++++++++++ libvirt.spec.in | 13 ++ 13 files changed, 761 insertions(+), 2 deletions(-) create mode 100644 hooks/Makefile.am create mode 100644 hooks/README create mode 100755 hooks/daemon create mode 100644 hooks/daemon.d/Makefile.am create mode 100755 hooks/daemon.d/static-hugepages.sh create mode 100755 hooks/functions.sh create mode 100644 hooks/libvirt-hook-config.xml create mode 100755 hooks/qemu create mode 100644 hooks/qemu.d/Makefile.am create mode 100755 hooks/qemu.d/dynamic-hugepages.sh diff --git a/Makefile.am b/Makefile.am index 9796069..e4a709a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -24,7 +24,7 @@ SUBDIRS = . gnulib/lib include src daemon tools docs gnulib/tests \ examples/dominfo examples/domsuspend examples/apparmor \ examples/xml/nwfilter examples/openauth examples/systemtap \ tools/wireshark examples/dommigrate \ - examples/lxcconvert examples/domtop + examples/lxcconvert examples/domtop hooks ACLOCAL_AMFLAGS = -I m4 diff --git a/configure.ac b/configure.ac index 93f9e38..b0dc035 100644 --- a/configure.ac +++ b/configure.ac @@ -2812,7 +2812,8 @@ AC_CONFIG_FILES([\ examples/xml/nwfilter/Makefile \ examples/lxcconvert/Makefile \ tools/wireshark/Makefile \ - tools/wireshark/src/Makefile]) + tools/wireshark/src/Makefile \ + hooks/Makefile hooks/daemon.d/Makefile hooks/qemu.d/Makefile]) AC_OUTPUT AC_MSG_NOTICE([]) diff --git a/hooks/Makefile.am b/hooks/Makefile.am new file mode 100644 index 0000000..1fe6076 --- /dev/null +++ b/hooks/Makefile.am @@ -0,0 +1,27 @@ +## Copyright (C) 2015 Red Hat, Inc. +## +## This library is free software; you can redistribute it and/or +## modify it under the terms of the GNU Lesser General Public +## License as published by the Free Software Foundation; either +## version 2.1 of the License, or (at your option) any later version. +## +## This library is distributed in the hope that it will be useful, +## but WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +## Lesser General Public License for more details. +## +## You should have received a copy of the GNU Lesser General Public +## License along with this library. If not, see +## <http://www.gnu.org/licenses/>. + +SUBDIRS = daemon.d qemu.d + +hooksdir = $(pkgdatadir)/hooks +hooks_DATA = \ + daemon \ + functions.sh \ + libvirt-hook-config.xml \ + qemu \ + README + +EXTRA_DIST = $(hooks_DATA) diff --git a/hooks/README b/hooks/README new file mode 100644 index 0000000..8114c16 --- /dev/null +++ b/hooks/README @@ -0,0 +1,47 @@ +libivrt contributed and example hook scripts + +libvirt provides several static hooks for use around daemon startup and +shutdown as well as various points around domain and network lifecycle. +See https://www.libvirt.org/hooks.html for formal documentation. + +Summary of scripts available here: + +- daemon: + Supports sub-scripts in daemon.d directory +- qemu: + Supports sub-scripts in qemu.d directory +- daemon.d/static-hugepages.sh: + Supports hugepage allocations around libvirt daemon init + (Requires: xmllint numactl) +- qemu.d/dynamic-hugepages.sh: + Supports hugepage allocations around QEMU domain instantiation + (Requires: xmllint numactl) +- functions.sh: + Shared utility functions for scripts +- libvirt-hook-config.xml: + Base config file for scripts + +Please consult each script for further details. + +To use: + +1) Copy libvirt-hook-config.xml to /etc/sysconfig/ and modify as desired + +2) If only a single sub-script per hook type is needed, it may be copied + directly to /etc/libvirt/hooks, Ex: + cp qemu.d/dynamic-hugepages.sh /etc/libvirt/hooks/qemu + + If multiple sub-scripts per hook type are needed, or to support additional + sub-scripts later, use the stub qemu and daemon scripts here, create + qemu.d and daemon.d sub-directories under /etc/libvirt/hooks/ and copy + the desired scripts to the sub-directories, Ex: + cp qemu /etc/libvirt/hooks/ + mkdir /etc/libvirt/hooks/qemu.d + cp qemu.d/dynamic-hugepages.sh /etc/libvirt/hooks/qemu.d/ + + To easily get all of the scripts, it's possible to simply soft link + the entire directory, Ex: + ln -s /usr/share/libvirt/hooks /etc/libvirt/hooks + +3) Restart the libvirt daemon to re-read hook scripts: + systemctl restart libvirtd.service diff --git a/hooks/daemon b/hooks/daemon new file mode 100755 index 0000000..7b8947d --- /dev/null +++ b/hooks/daemon @@ -0,0 +1,33 @@ +#!/bin/sh + +# Copyright (C) 2015 Red Hat, Inc. +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library. If not, see +# <http://www.gnu.org/licenses/>. + +# This script is intended to implement a libvirt /etc/libvirt/hooks/daemon +# script and extend daemon execution out to all executable scripts in the +# daemon.d subdirectory. To use, copy to /etc/libvirt/hooks/ and place +# any sub-scripts in a daemon.d subdirectory. + +DIR="/etc/libvirt/hooks/daemon.d/" + +if [ -d $DIR ]; then + for SCRIPT in $(find $DIR -type f -executable); do + $SCRIPT $@ + if [ $? -ne 0 ]; then + exit 1 + fi + done +fi diff --git a/hooks/daemon.d/Makefile.am b/hooks/daemon.d/Makefile.am new file mode 100644 index 0000000..ad9d6cb --- /dev/null +++ b/hooks/daemon.d/Makefile.am @@ -0,0 +1,21 @@ +## Copyright (C) 2015 Red Hat, Inc. +## +## This library is free software; you can redistribute it and/or +## modify it under the terms of the GNU Lesser General Public +## License as published by the Free Software Foundation; either +## version 2.1 of the License, or (at your option) any later version. +## +## This library is distributed in the hope that it will be useful, +## but WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +## Lesser General Public License for more details. +## +## You should have received a copy of the GNU Lesser General Public +## License along with this library. If not, see +## <http://www.gnu.org/licenses/>. + +daemonddir = $(pkgdatadir)/hooks/daemon.d +daemond_DATA = \ + static-hugepages.sh + +EXTRA_DIST = $(daemond_DATA) diff --git a/hooks/daemon.d/static-hugepages.sh b/hooks/daemon.d/static-hugepages.sh new file mode 100755 index 0000000..081209d --- /dev/null +++ b/hooks/daemon.d/static-hugepages.sh @@ -0,0 +1,100 @@ +#!/bin/sh + +# Copyright (C) 2015 Red Hat, Inc. +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library. If not, see +# <http://www.gnu.org/licenses/>. + +# This script makes use of the libvirt hook interface for the libvirt daemon +# to allocate hugepages for domains during libvirt startup, releasing pages +# at libvirt shutdown. Hugepages are allocated statically, so long as the +# libvirt daemon is running. This mechanism is predominantly useful for +# hosts where the domains use very large hugepages or the majority of host +# memory, making dynamic allocation unreliable. The config file entry to +# enable this hook includes some number of hugepages elements of the form: +# +# <config> +# <daemon> +# <static-hugepages> +# <hugepages size="2048" unit="k" mode="strict" nodeset="0-1">1024</hugepages> +# <hugepages size="1" unit="G" mode="preferred" nodeset="2">4</hugepages> +# </static-hugepages> +# </daemon> +# </config> +# +# The above example allocates 1024, 2M pages (2G total), strictly across nodes +# 0-1 and 4, 1G pages (4G) total with a preferred node policy of node 2. Like +# the numatune elements in libvirt, the @mode may be one of "strict", +# "interleave", or "preferred", matching the libnuma policy. The default mode +# is strict. @size and @unit specify the size of hugepage, using the standard +# libvirt unit values. 1KiB is the default unit size. @nodeset makes use of +# the standard libvirt range support, allowing sets, ranges, and exclusions. +# NB, mode="preferred" requires a singleton nodeset. + +CONFIG="/etc/sysconfig/libvirt-hook-config.xml" + +source /usr/share/libvirt/hooks/functions.sh + +# Utilities required to parse our config file and set NUMA policy +which xmllint > /dev/null 2>&1 +if [ $? -ne 0 ]; then + exit 0 +fi + +which numactl > /dev/null 2>&1 +if [ $? -ne 0 ]; then + exit 0 +fi + +if [ ! -e $CONFIG ]; then + exit 0 +fi + +case "$2" in + start | shutdown) + ;; + *) + exit 0 + ;; +esac + +XMLLINT="xmllint --xpath" + +BASE="/config/daemon/static-hugepages/hugepages" + +for i in $(seq 1 $($XMLLINT "count($BASE)" $CONFIG 2>/dev/null)); do + SIZE=$($XMLLINT "string($BASE[$i]/@size)" $CONFIG 2>/dev/null) + UNIT=$($XMLLINT "string($BASE[$i]/@unit)" $CONFIG 2>/dev/null) + if [ -z "$UNIT" ]; then + UNIT=KiB + fi + COUNT=$($XMLLINT "$BASE[$i]/text()" $CONFIG 2>/dev/null) + + POLICY=$($XMLLINT "string($BASE[$i]/@mode)" $CONFIG 2>/dev/null) + NODESET=$($XMLLINT "string($BASE[$i]/@nodeset)" $CONFIG 2>/dev/null) + if [ -n "$NODESET" ] && [ -z "$POLICY" ]; then + POLICY=strict + fi + + case "$2" in + start) + addhugepages $SIZE $UNIT $COUNT $NODESET $POLICY + ;; + shutdown) + addhugepages $SIZE $UNIT -$COUNT $NODESET $POLICY + ;; + esac +done + +exit 0 diff --git a/hooks/functions.sh b/hooks/functions.sh new file mode 100755 index 0000000..07f52db --- /dev/null +++ b/hooks/functions.sh @@ -0,0 +1,180 @@ +#!/bin/sh + +# Copyright (C) 2015 Red Hat, Inc. +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library. If not, see +# <http://www.gnu.org/licenses/>. + +# parserange($RANGE) +# +# This takes a libvirt defined range, of the form "1-7,^4,15-17" and +# parses it into an explicit list "1 2 3 5 6 7 15 16 17". The negations +# are only allowed for single numbers, not ranges because that's what +# libvirt does. Ordering is also important, "1-7,^4" is not the same as +# "^4,1-7". We assume a well formed range since we get it from libvirt. +function parserange { + declare -a BITMAP=() + CUR=0 + + while [ $CUR -lt ${#1} ]; do + unset NEGATE + START=0 + END=0 + + if [ ${1:$CUR:1} == ',' ]; then + CUR=$(( $CUR + 1 )) + continue + fi + + if [ ${1:$CUR:1} == '^' ]; then + CUR=$(( $CUR + 1 )) + NEGATE=1 + fi + + while [ $CUR -lt ${#1} ]; do + case ${1:$CUR:1} in + [0-9]) + START=$(( ( $START * 10 ) + ${1:$CUR:1} )) + CUR=$(( $CUR + 1 )) + ;; + *) + break + ;; + esac + done + + if [ $CUR -eq ${#1} ] || [ ${1:$CUR:1} == ',' ]; then + if [ -n "$NEGATE" ]; then + unset BITMAP[$START] + else + BITMAP[$START]=$START + fi + elif [ ${1:$CUR:1} == '-' ]; then + CUR=$(( $CUR + 1 )) + while [ $CUR -lt ${#1} ]; do + case ${1:$CUR:1} in + [0-9]) + END=$(( ( $END * 10 ) + ${1:$CUR:1} )) + CUR=$(( $CUR + 1 )) + ;; + *) + break + ;; + esac + done + + for i in $(seq $START $END); do + BITMAP[$i]=$i + done + fi + done + + echo ${BITMAP[@]} +} + +# parsesize($SIZE [$UNIT]) +# +# This takes a $SIZE and optional $UNIT and returns bytes. If a unit is not +# provided, 1KiB is assumed. +function parsesize { + MULTIPLIER=1024 + if [ -n "$2" ]; then + case "$2" in + b) + MULTIPLIER=1 + ;; + KB) + MULTIPLIER=1000 + ;; + KiB | k | kB) + MULTIPLIER=1024 + ;; + MB) + MULTIPLIER=1000000 + ;; + MiB | M) + MULTIPLIER=$(( 1024 * 1024 )) + ;; + GB) + MULTIPLIER=1000000000 + ;; + GiB | G) + MULTIPLIER=$(( 1024 * 1024 * 1024 )) + ;; + *) + echo "$0: Invalid hugepage unit: $2" >&2 + exit 1 + esac + fi + + echo $(( ( $1 * $MULTIPLIER ) )) +} + +# addhugepages($SIZE $UNIT $COUNT [$NODES [$POLICY]]) +# +# Given a hugepage size, as defined by $SIZE and $UNIT, attempt to allocate +# $COUNT, with an optional $NODES NUMA node range and $POLICY. This uses +# the raw sysfs hugepages interface rather than `virsh allocpages` in order +# to avoid issues with calling libvirt from within a hook function. +function addhugepages { + SYSFSNODE="/sys/kernel/mm/hugepages/hugepages-" + + HUGE=$(parsesize $1 $2) + SYSFSNODE+=$(( $HUGE / 1024 )) + SYSFSNODE+="kB" + + if [ ! -d $SYSFSNODE ]; then + echo "$0: Hugepage size $(( $HUGE / 1024 ))kB not supported by kernel" >&2 + exit 1 + fi + + NR="nr_hugepages" + PREFIX="" + if [ -n "$4" ]; then + NR+="_mempolicy" + + NODES=$(parserange "$4") + NODES=$(echo $NODES | sed -e 's/ /,/g') + + if [ -z "$5" ]; then + PREFIX="numactl -m $NODES" + else + case "$5" in + strict) + PREFIX="numactl -m $NODES" + ;; + interleave) + PREFIX="numactl -i $NODES" + ;; + preferred) + if [ $(expr index "$NODES" ",") -ne 0 ]; then + echo "$0: \"preferred\" memory policy only supports single node" >&2 + exit 1 + fi + PREFIX="numactl --preferred $NODES" + ;; + esac + fi + fi + + # NB: count ($3) can be negative! + NEW=$(( $(cat $SYSFSNODE/$NR) + $3 )) + if [ $NEW -lt 0 ]; then + NEW=0 + fi + $PREFIX echo $NEW > $SYSFSNODE/$NR + + # TBD: should we check for sufficient free pages or go on blindly? + # For now, the latter. +} diff --git a/hooks/libvirt-hook-config.xml b/hooks/libvirt-hook-config.xml new file mode 100644 index 0000000..1d8bdce --- /dev/null +++ b/hooks/libvirt-hook-config.xml @@ -0,0 +1,38 @@ + + +<config> + <daemon> + <static-hugepages> +  + </static-hugepages> + </daemon> + <qemu> + <dynamic-hugepages> +  + </dynamic-hugepages> + </qemu> +</config> diff --git a/hooks/qemu b/hooks/qemu new file mode 100755 index 0000000..2652831 --- /dev/null +++ b/hooks/qemu @@ -0,0 +1,40 @@ +#!/bin/sh + +# Copyright (C) 2015 Red Hat, Inc. +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library. If not, see +# <http://www.gnu.org/licenses/>. + +# This script is intended to implement a libvirt /etc/libvirt/hooks/qemu +# script and extend qemu execution out to all executable scripts in the +# qemu.d subdirectory. To use, copy to /etc/libvirt/hooks/ and place +# any sub-scripts in a qemu.d subdirectory. + +DIR="/etc/libvirt/hooks/qemu.d/" + +# Domain xml is passed as stdin to the script, supply the same for sub-scripts +XML=$(mktemp) +cat - > $XML + +if [ -d $DIR ]; then + for SCRIPT in $(find $DIR -type f -executable); do + $SCRIPT $@ < $XML + if [ $? -ne 0 ]; then + rm $XML + exit 1 + fi + done +fi + +rm $XML diff --git a/hooks/qemu.d/Makefile.am b/hooks/qemu.d/Makefile.am new file mode 100644 index 0000000..64fe64d --- /dev/null +++ b/hooks/qemu.d/Makefile.am @@ -0,0 +1,21 @@ +## Copyright (C) 2015 Red Hat, Inc. +## +## This library is free software; you can redistribute it and/or +## modify it under the terms of the GNU Lesser General Public +## License as published by the Free Software Foundation; either +## version 2.1 of the License, or (at your option) any later version. +## +## This library is distributed in the hope that it will be useful, +## but WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +## Lesser General Public License for more details. +## +## You should have received a copy of the GNU Lesser General Public +## License along with this library. If not, see +## <http://www.gnu.org/licenses/>. + +qemuddir = $(pkgdatadir)/hooks/qemu.d +qemud_DATA = \ + dynamic-hugepages.sh + +EXTRA_DIST = $(qemud_DATA) diff --git a/hooks/qemu.d/dynamic-hugepages.sh b/hooks/qemu.d/dynamic-hugepages.sh new file mode 100755 index 0000000..438c0c9 --- /dev/null +++ b/hooks/qemu.d/dynamic-hugepages.sh @@ -0,0 +1,238 @@ +#!/bin/sh + +# Copyright (C) 2015 Red Hat, Inc. +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library. If not, see +# <http://www.gnu.org/licenses/>. + +# This script makes use of the libvirt hook interface for qemu in order to +# attempt to allocate hugepages for a domain around instantiation. We will +# only try to allocate hugepages for VMs both configured for hugepages and +# listed in our config file as enabled for dynamic hugepages. The config file +# entry is simply a list of domain names enabled for dynamic hugepages, ex: +# +# <config> +# <qemu> +# <dynamic-hugepages> +# <domain name="domain1"/> +# <domain name="domain2"/> +# </dynamic-hugepages> +# </qemu> +# </config> +# +# The host system will often be able to accomodate hugepage requests so long +# memory isn't too fragmented. Domains making use of a significant portion of +# host memory or very large hugepages may be better served using static +# hugepage hooks. + +CONFIG="/etc/sysconfig/libvirt-hook-config.xml" + +source /usr/share/libvirt/hooks/functions.sh + +# Utilities required to parse our config file and set NUMA policy +which xmllint > /dev/null 2>&1 +if [ $? -ne 0 ]; then + exit 0 +fi + +which numactl > /dev/null 2>&1 +if [ $? -ne 0 ]; then + exit 0 +fi + +if [ ! -e $CONFIG ]; then + exit 0 +fi + +case "$2" in + prepare | release) + ;; + *) + exit 0 + ;; +esac + +XMLLINT="xmllint --xpath" + +BASE="/config/qemu/dynamic-hugepages/domain" + +# Is this domain enabled in the config file? +$XMLLINT "$BASE[@name=\"$1\"]/@name" $CONFIG > /dev/null 2>&1 +if [ $? -ne 0 ]; then + exit 0 +fi + +# Domain XML is provided via stdin, save it somewhere +XML=$(mktemp) +cat - > $XML + +# Abort if the domain isn't configure for hugepages +$XMLLINT "/domain/memoryBacking/hugepages" $XML > /dev/null 2>&1 +if [ $? -ne 0 ]; then + rm $XML + exit 0 +fi + +# The easy non-NUMA guest case first. If no page size is specified, read the +# default hugepage size from /proc/meminfo. NB, our size parsing needs to +# handle "kB" in addition to the libvirt defined units for this. If page size +# is specified, there can be only one, so parse @size, @unit, and @nodeset and +# do the allocation/deallocation. + +$XMLLINT "/domain/cpu/numa" $XML > /dev/null 2>&1 +if [ $? -ne 0 ]; then + BASE="/domain/memoryBacking/hugepages/page" + $XMLLINT "$BASE/@size" $XML > /dev/null 2>&1 + if [ $? -ne 0 ]; then + # grep Hugepagesize /proc/meminfo + # Hugepagesize: 2048 kB + HPAGESIZE=$(grep Hugepagesize /proc/meminfo | awk '{print $2}') + HPAGEUNIT=$(grep Hugepagesize /proc/meminfo | awk '{print $3}') + else + HPAGESIZE=$($XMLLINT "string($BASE/@size)" $XML 2>/dev/null) + HPAGEUNIT=$($XMLLINT "string($BASE/@unit)" $XML 2>/dev/null) + HPAGENODE=$($XMLLINT "string($BASE/@nodeset)" $XML 2>/dev/null) + fi + + + MEMORY=$($XMLLINT "/domain/memory/text()" $XML 2>/dev/null) + UNIT=$($XMLLINT "string(/domain/memory/@unit)" $XML 2> /dev/null) + MEMORY=$(parsesize $MEMORY $UNIT) + HSIZE=$(parsesize $HPAGESIZE $HPAGEUNIT) + COUNT=$(( $MEMORY / $HSIZE )) + case "$2" in + prepare) + addhugepages $HPAGESIZE $HPAGEUNIT $COUNT $HPAGENODE + ;; + release) + addhugepages $HPAGESIZE $HPAGEUNIT -$COUNT $HPAGENODE + ;; + esac + + rm $XML + exit 0 +fi + +# The harder case, get the guest NUMA id and node memory size from the cpu/numa +# tags. Cross reference this to numatune options to get the host nodeset for +# the memory. Then, figure out which page sizes are allowed on which host +# nodes. The libvirt xml is not well specified here, a numatune nodeset can +# span host nodes, which are not required to use the same page size. We can +# also still have hugepages that are not associated with a node. This code +# assumes that lack of a nodeset matches anything; we don't look for the "best" +# match and that the numatune nodeset must be fully contained within a host +# hugepages size set, or else we skip it. +for ID in $($XMLLINT "/domain/cpu/numa/cell/@id" $XML 2>/dev/null); do + BASE="/domain/cpu/numa/cell" + MEMORY=$($XMLLINT "string($BASE[@$ID]/@memory)" $XML 2>/dev/null) + UNIT=$($XMLLINT "string($BASE[@$ID]/@unit)" $XML 2>/dev/null) + if [ -z "$UNIT" ]; then + UNIT=KiB + fi + CELLID=$($XMLLINT "string($BASE[@$ID]/@id)" $XML 2>/dev/null) + CELLID=$(echo cellid=\"$CELLID\") + + unset POLICY + unset CELLNODE + + # First choice, use a memnode matching this cellid + BASE="/domain/numatune/memnode" + $XMLLINT "$BASE" $XML > /dev/null 2>&1 + if [ $? -eq 0 ]; then + $XMLLINT "$BASE[@$CELLID]" $XML > /dev/null 2>&1 + if [ $? -eq 0 ]; then + POLICY=$($XMLLINT "string($BASE[@$CELLID]/@mode)" $XML 2>/dev/null) + CELLNODE=$($XMLLINT "string($BASE[@$CELLID]/@nodeset)" $XML 2>/dev/null) + if [ -n "$CELLNODE" ] && [ -z "$POLICY" ]; then + POLICY=strict + fi + fi + fi + + # Second choice, use the memory element as the default (if exists) + if [ -z "$POLICY" ]; then + BASE="/domain/numatune/memory" + $XMLLINT "$BASE" $XML > /dev/null 2>&1 + if [ $? -eq 0 ]; then + POLICY=$($XMLLINT "string($BASE/@mode)" $XML 2>/dev/null) + CELLNODE=$($XMLLINT "string($BASE/@nodeset)" $XML 2>/dev/null) + if [ -n "$CELLNODE" ] && [ -z "$POLICY" ]; then + POLICY=strict + fi + fi + fi + + FOUND=0 + BASE="/domain/memoryBacking/hugepages/page" + $XMLLINT "$BASE/@size" $XML > /dev/null 2>&1 + if [ $? -ne 0 ]; then + HPAGESIZE=$(grep Hugepagesize /proc/meminfo | awk '{print $2}') + HPAGEUNIT=$(grep Hugepagesize /proc/meminfo | awk '{print $3}') + FOUND=1 + else + for SIZE in $($XMLLINT "$BASE/@size" $XML 2>/dev/null); do + HPAGESIZE=$($XMLLINT "string($BASE[@$SIZE]/@size)" $XML 2>/dev/null) + HPAGEUNIT=$($XMLLINT "string($BASE[@$SIZE]/@unit)" $XML 2>/dev/null) + HPAGENODE=$($XMLLINT "string($BASE[@$SIZE]/@nodeset)" $XML 2>/dev/null) + + # If the host hugepage size has no node association, we assume it's + # global. If the guest node has no hostnode association take the first + # available hugepage entry. + if [ -z "$HPAGENODE" ] || [ -z "$CELLNODE" ]; then + FOUND=1 + break + fi + + # Create an arry for the nodeset for the hugepages + declare -a NODEMAP=() + for i in $(parserange $HPAGENODE); do + NODEMAP[$i]=$i + done + + FAIL=0 + # Verify that each node of the numatune nodeset is accounted for + for i in $(parserange $CELLNODE); do + if [ -z "${NODEMAP[$i]}" ]; then + FAIL=1 + break + fi + done + if [ $FAIL -ne 0 ]; then + continue + fi + + FOUND=1 + break + done + fi + + if [ $FOUND -eq 0 ]; then + continue + fi + + MEMORY=$(parsesize $MEMORY $UNIT) + HSIZE=$(parsesize $HPAGESIZE $HPAGEUNIT) + COUNT=$(( $MEMORY / $HSIZE )) + case "$2" in + prepare) + addhugepages $HPAGESIZE $HPAGEUNIT $COUNT $CELLNODE $POLICY + ;; + release) + addhugepages $HPAGESIZE $HPAGEUNIT -$COUNT $CELLNODE $POLICY + ;; + esac +done + +rm $XML +exit 0 diff --git a/libvirt.spec.in b/libvirt.spec.in index dcd174a..ac9f07b 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -2248,6 +2248,9 @@ exit 0 %dir %{_datadir}/libvirt/ %dir %{_datadir}/libvirt/schemas/ +%dir %{_datadir}/libvirt/hooks/ +%dir %{_datadir}/libvirt/hooks/daemon.d/ +%dir %{_datadir}/libvirt/hooks/qemu.d/ %{_datadir}/libvirt/schemas/basictypes.rng %{_datadir}/libvirt/schemas/capability.rng @@ -2268,6 +2271,16 @@ exit 0 %{_datadir}/libvirt/cpu_map.xml %{_datadir}/libvirt/libvirtLogo.png +%{_datadir}/libvirt/hooks/README +%{_datadir}/libvirt/hooks/libvirt-hook-config.xml +%{_datadir}/libvirt/hooks/functions.sh +%attr(0755, root, root) %{_datadir}/libvirt/hooks/daemon +%attr(0755, root, root) %{_datadir}/libvirt/hooks/qemu + +%attr(0755, root, root) %{_datadir}/libvirt/hooks/daemon.d/static-hugepages.sh + +%attr(0755, root, root) %{_datadir}/libvirt/hooks/qemu.d/dynamic-hugepages.sh + %if %{with_systemd} %{_unitdir}/libvirt-guests.service %else

1 1

[libvirt] RFC: add Intel CMT feature support
by Ren, Qiaowei 29 Jun '15

29 Jun '15

Hi All, Some Intel processor families (e.g. the Intel Xeon processor E5 v3 family) introduced some PQos (Platform Qos) features to monitor or control shared resource. - CMT (Cache Monitoring Technology): measure the usage of cache by applications running on the platform. - CAT (Cache Allocation Technology): enable an OS or Hypervisor/VMM to specify the amount of cache space into which an application can fill. - MBM (Memory Bandwidth Monitoring): build on the CMT infrastructure to allow monitoring of bandwidth from one level of the cache hierarchy to the next - in this case focusing on the L3 cache, which is typically backed directly by system memory. As a result of this implementation, memory bandwidth can be monitored. For more information, see "Intel 64 and IA-32 Architectures Software Developer's Manual". Among these PQos features, currently CMT patches has been merged into Linux kernel mainline. So this patch series proposed in this mail will focus on CMT feature support in libvirt. At the library API layer, I plan on adding cache related field into virDomainInfo and virNodeInfo: Add "cache" member into virNodeInfo to get total size of cache in one node. struct virNodeInfo { ... unsigned int cores; /* number of cores per socket, total number of processors in case of unusual NUMA topology*/ unsigned int threads; /* number of threads per core, 1 in case of unusual numa topology */ + unsigned int cache; /* cache size in bytes */ }; Add "cacheOcc" member into virDomainInfo to get cache occupancy for one VM. struct virDomainInfo { ... unsigned short nrVirtCpu; /* the number of virtual CPUs for the domain */ unsigned long long cpuTime; /* the CPU time used in nanoseconds */ + unsigned long long cacheOcc; /* the cache occupancy in Bytes */ }; With this change, those applications like OpenStack based on libvirt can collect cache usage for metering and monitoring (e.g. any VM using more than X% of cache). Because CMT implementation in Linux kernel is based on perf mechanism and there is no nice and public API library for perf, I have to wrapper system call for perf in libvirt to use CMT feature, and enable/disable perf event for CMT when VM is created/destroyed. Any thoughts on this plan before I start submitting code patches? Do you think whether I need add several new APIs and XML element for CMT feature (or more PQos features)? Thanks, Qiaowei

2 2

[libvirt] [PATCH] qemu: event: Fix retrieval of the "service" field from graphics events
by Peter Krempa 29 Jun '15

29 Jun '15

qemu's event has following format: { "timestamp": { "seconds": 1435580974, "microseconds": 82226 }, "event": "SPICE_INITIALIZED", "data": { "server": { "auth": "none", "port": "5900", "family": "ipv4", "host": "127.0.0.1" }, "client": { "port": "53224", "family": "ipv4", "channel-type": 3, "connection-id": 1113096064, "host": "127.0.0.1", "channel-id": 0, "tls": false } } } Our code tried to extract the "service" field but qemu reports it as "port". --- src/qemu/qemu_monitor_json.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index d3e98d4..bd73b05 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -652,7 +652,7 @@ static void qemuMonitorJSONHandleGraphics(qemuMonitorPtr mon, virJSONValuePtr da VIR_WARN("missing local hostname in graphics event"); return; } - localService = virJSONValueObjectGetString(server, "service"); + localService = virJSONValueObjectGetString(server, "port"); if (!localService) localService = ""; /* Spice has multiple ports, so this isn't provided */ @@ -666,7 +666,7 @@ static void qemuMonitorJSONHandleGraphics(qemuMonitorPtr mon, virJSONValuePtr da VIR_WARN("missing remote hostname in graphics event"); return; } - remoteService = virJSONValueObjectGetString(client, "service"); + remoteService = virJSONValueObjectGetString(client, "port"); if (!remoteService) remoteService = ""; /* Spice has multiple ports, so this isn't provided */ -- 2.4.1

3 7

[libvirt] [PATCH libvirt-python] virPyDictToTypedParams: packing lists of values
by Pavel Boldin 29 Jun '15

29 Jun '15

Pack a list or a tuple of values passed to a Python method to the multi-value parameter. --- libvirt-override.c | 228 ++++++++++++++++++++++++++++++----------------------- 1 file changed, 129 insertions(+), 99 deletions(-) diff --git a/libvirt-override.c b/libvirt-override.c index 588dac1..45c8afc 100644 --- a/libvirt-override.c +++ b/libvirt-override.c @@ -278,6 +278,126 @@ typedef virPyTypedParamsHint *virPyTypedParamsHintPtr; # define libvirt_PyString_Check PyString_Check # endif +static int +virPyDictToTypedParamOne(virTypedParameterPtr *params, + int *n, + int *max, + virPyTypedParamsHintPtr hints, + int nhints, + const char *keystr, + PyObject *value) +{ + int rv = -1, type = -1; + size_t i; + + for (i = 0; i < nhints; i++) { + if (STREQ(hints[i].name, keystr)) { + type = hints[i].type; + break; + } + } + + if (type == -1) { + if (libvirt_PyString_Check(value)) { + type = VIR_TYPED_PARAM_STRING; + } else if (PyBool_Check(value)) { + type = VIR_TYPED_PARAM_BOOLEAN; + } else if (PyLong_Check(value)) { + unsigned long long ull = PyLong_AsUnsignedLongLong(value); + if (ull == (unsigned long long) -1 && PyErr_Occurred()) + type = VIR_TYPED_PARAM_LLONG; + else + type = VIR_TYPED_PARAM_ULLONG; +#if PY_MAJOR_VERSION < 3 + } else if (PyInt_Check(value)) { + if (PyInt_AS_LONG(value) < 0) + type = VIR_TYPED_PARAM_LLONG; + else + type = VIR_TYPED_PARAM_ULLONG; +#endif + } else if (PyFloat_Check(value)) { + type = VIR_TYPED_PARAM_DOUBLE; + } + } + + if (type == -1) { + PyErr_Format(PyExc_TypeError, + "Unknown type of \"%s\" field", keystr); + goto cleanup; + } + + switch ((virTypedParameterType) type) { + case VIR_TYPED_PARAM_INT: + { + int val; + if (libvirt_intUnwrap(value, &val) < 0 || + virTypedParamsAddInt(params, n, max, keystr, val) < 0) + goto cleanup; + break; + } + case VIR_TYPED_PARAM_UINT: + { + unsigned int val; + if (libvirt_uintUnwrap(value, &val) < 0 || + virTypedParamsAddUInt(params, n, max, keystr, val) < 0) + goto cleanup; + break; + } + case VIR_TYPED_PARAM_LLONG: + { + long long val; + if (libvirt_longlongUnwrap(value, &val) < 0 || + virTypedParamsAddLLong(params, n, max, keystr, val) < 0) + goto cleanup; + break; + } + case VIR_TYPED_PARAM_ULLONG: + { + unsigned long long val; + if (libvirt_ulonglongUnwrap(value, &val) < 0 || + virTypedParamsAddULLong(params, n, max, keystr, val) < 0) + goto cleanup; + break; + } + case VIR_TYPED_PARAM_DOUBLE: + { + double val; + if (libvirt_doubleUnwrap(value, &val) < 0 || + virTypedParamsAddDouble(params, n, max, keystr, val) < 0) + goto cleanup; + break; + } + case VIR_TYPED_PARAM_BOOLEAN: + { + bool val; + if (libvirt_boolUnwrap(value, &val) < 0 || + virTypedParamsAddBoolean(params, n, max, keystr, val) < 0) + goto cleanup; + break; + } + case VIR_TYPED_PARAM_STRING: + { + char *val;; + if (libvirt_charPtrUnwrap(value, &val) < 0 || + !val || + virTypedParamsAddString(params, n, max, keystr, val) < 0) { + VIR_FREE(val); + goto cleanup; + } + VIR_FREE(val); + break; + } + case VIR_TYPED_PARAM_LAST: + break; /* unreachable */ + } + + rv = 0; + + cleanup: + return rv; +} + + /* Automatically convert dict into type parameters based on types reported * by python. All integer types are converted into LLONG (in case of a negative * value) or ULLONG (in case of a positive value). If you need different @@ -300,7 +420,6 @@ virPyDictToTypedParams(PyObject *dict, Py_ssize_t pos = 0; #endif virTypedParameterPtr params = NULL; - size_t i; int n = 0; int max = 0; int ret = -1; @@ -313,112 +432,23 @@ virPyDictToTypedParams(PyObject *dict, return -1; while (PyDict_Next(dict, &pos, &key, &value)) { - int type = -1; - if (libvirt_charPtrUnwrap(key, &keystr) < 0 || !keystr) goto cleanup; - for (i = 0; i < nhints; i++) { - if (STREQ(hints[i].name, keystr)) { - type = hints[i].type; - break; - } - } + if (PyList_Check(value) || PyTuple_Check(value)) { + Py_ssize_t i, size = PySequence_Size(value); - if (type == -1) { - if (libvirt_PyString_Check(value)) { - type = VIR_TYPED_PARAM_STRING; - } else if (PyBool_Check(value)) { - type = VIR_TYPED_PARAM_BOOLEAN; - } else if (PyLong_Check(value)) { - unsigned long long ull = PyLong_AsUnsignedLongLong(value); - if (ull == (unsigned long long) -1 && PyErr_Occurred()) - type = VIR_TYPED_PARAM_LLONG; - else - type = VIR_TYPED_PARAM_ULLONG; -#if PY_MAJOR_VERSION < 3 - } else if (PyInt_Check(value)) { - if (PyInt_AS_LONG(value) < 0) - type = VIR_TYPED_PARAM_LLONG; - else - type = VIR_TYPED_PARAM_ULLONG; -#endif - } else if (PyFloat_Check(value)) { - type = VIR_TYPED_PARAM_DOUBLE; + for (i = 0; i < size; i++) { + PyObject *v = PySequence_ITEM(value, i); + if (virPyDictToTypedParamOne(&params, &n, &max, + hints, nhints, keystr, v) < 0) + goto cleanup; } - } - - if (type == -1) { - PyErr_Format(PyExc_TypeError, - "Unknown type of \"%s\" field", keystr); + } else if (virPyDictToTypedParamOne(&params, &n, &max, + hints, nhints, keystr, value) < 0) goto cleanup; - } - switch ((virTypedParameterType) type) { - case VIR_TYPED_PARAM_INT: - { - int val; - if (libvirt_intUnwrap(value, &val) < 0 || - virTypedParamsAddInt(&params, &n, &max, keystr, val) < 0) - goto cleanup; - break; - } - case VIR_TYPED_PARAM_UINT: - { - unsigned int val; - if (libvirt_uintUnwrap(value, &val) < 0 || - virTypedParamsAddUInt(&params, &n, &max, keystr, val) < 0) - goto cleanup; - break; - } - case VIR_TYPED_PARAM_LLONG: - { - long long val; - if (libvirt_longlongUnwrap(value, &val) < 0 || - virTypedParamsAddLLong(&params, &n, &max, keystr, val) < 0) - goto cleanup; - break; - } - case VIR_TYPED_PARAM_ULLONG: - { - unsigned long long val; - if (libvirt_ulonglongUnwrap(value, &val) < 0 || - virTypedParamsAddULLong(&params, &n, &max, keystr, val) < 0) - goto cleanup; - break; - } - case VIR_TYPED_PARAM_DOUBLE: - { - double val; - if (libvirt_doubleUnwrap(value, &val) < 0 || - virTypedParamsAddDouble(&params, &n, &max, keystr, val) < 0) - goto cleanup; - break; - } - case VIR_TYPED_PARAM_BOOLEAN: - { - bool val; - if (libvirt_boolUnwrap(value, &val) < 0 || - virTypedParamsAddBoolean(&params, &n, &max, keystr, val) < 0) - goto cleanup; - break; - } - case VIR_TYPED_PARAM_STRING: - { - char *val;; - if (libvirt_charPtrUnwrap(value, &val) < 0 || - !val || - virTypedParamsAddString(&params, &n, &max, keystr, val) < 0) { - VIR_FREE(val); - goto cleanup; - } - VIR_FREE(val); - break; - } - case VIR_TYPED_PARAM_LAST: - break; /* unreachable */ - } VIR_FREE(keystr); } -- 1.9.1

2 1

[libvirt] [[libvirt-php][PATCH v4] qemu-agent-command] add libvirt_domain_qemu_agent_command
by Vasiliy Tolstov 29 Jun '15

29 Jun '15

add another missing libvirt command Signed-off-by: Vasiliy Tolstov <v.tolstov(a)selfip.ru> --- configure.ac | 3 +++ src/Makefile.am | 5 +++-- src/libvirt-php.c | 29 +++++++++++++++++++++++++++++ src/libvirt-php.h | 2 ++ 4 files changed, 37 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 04ebbdc..b6ef27a 100644 --- a/configure.ac +++ b/configure.ac @@ -34,6 +34,9 @@ fi LIBVIRT_REQUIRED=1.2.8 PKG_CHECK_MODULES(LIBVIRT, libvirt >= $LIBVIRT_REQUIRED) +PKG_CHECK_MODULES(QEMU, libvirt-qemu) +AC_SUBST([QEMU_CFLAGS]) +AC_SUBST([QEMU_LIBS]) dnl ========================================================================== dnl required minimum version of libxml2 diff --git a/src/Makefile.am b/src/Makefile.am index 8e6a800..f270ec2 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -27,13 +27,14 @@ uninstall-local: AM_CFLAGS = \ $(PHPINC) $(LIBXML_CFLAGS) \ - $(LIBVIRT_CFLAGS) $(DEFINES) \ + $(LIBVIRT_CFLAGS) $(QEMU_CFLAGS) $(DEFINES) \ -I$(top_srcdir)/winsrc AM_LDFLAGS = \ $(SHLIB_LDFLAGS) \ $(LIBXML_LIBS) \ - $(LIBVIRT_LIBS) + $(LIBVIRT_LIBS) \ + $(QEMU_LIBS) lib_LTLIBRARIES = libvirt-php.la diff --git a/src/libvirt-php.c b/src/libvirt-php.c index d13e5b4..b018cb0 100644 --- a/src/libvirt-php.c +++ b/src/libvirt-php.c @@ -242,6 +242,8 @@ static zend_function_entry libvirt_functions[] = { /* Debugging functions */ PHP_FE(libvirt_logfile_set, NULL) PHP_FE(libvirt_print_binding_resources, NULL) + /* Agent functions */ + PHP_FE(libvirt_domain_qemu_agent_command, NULL) {NULL, NULL, NULL} }; @@ -3611,6 +3613,33 @@ PHP_FUNCTION(libvirt_domain_lookup_by_uuid) } /* + * Function name: libvirt_domain_qemu_agent_command + * Since version: 0.5.2(-1) + * Description: Function is used to send qemu-ga command + * Arguments: @res [resource]: libvirt domain resource, e.g. from libvirt_domain_lookup_by_*() + * @timeout [int] timeout for waiting (-2 block, -1 default, 0 no wait, >0 wait specific time + * @flags [int]: unknown + * Returns: String on success and FALSE on error + */ +PHP_FUNCTION(libvirt_domain_qemu_agent_command) +{ + php_libvirt_domain *domain=NULL; + zval *zdomain; + const char *cmd; + int cmd_len; + char *ret; + long timeout = -1; + long flags = 0; + + GET_DOMAIN_FROM_ARGS("rs|ll", &zdomain, &cmd, &cmd_len, &timeout, &flags); + + ret = virDomainQemuAgentCommand(domain->domain, cmd, timeout, flags); + if (ret == NULL) RETURN_FALSE; + + RETURN_STRING(ret, 1); +} + +/* * Function name: libvirt_domain_lookup_by_uuid_string * Since version: 0.4.1(-1) * Description: Function is used to get the domain by it's UUID that's accepted in string format diff --git a/src/libvirt-php.h b/src/libvirt-php.h index 8dc5927..eb4b7f4 100644 --- a/src/libvirt-php.h +++ b/src/libvirt-php.h @@ -80,6 +80,7 @@ #include <libvirt/libvirt.h> #include <libvirt/virterror.h> +#include <libvirt/libvirt-qemu.h> #include <libxml/parser.h> #include <libxml/xpath.h> #include <fcntl.h> @@ -423,6 +424,7 @@ PHP_FUNCTION(libvirt_domain_send_keys); PHP_FUNCTION(libvirt_domain_send_pointer_event); PHP_FUNCTION(libvirt_domain_get_metadata); PHP_FUNCTION(libvirt_domain_set_metadata); +PHP_FUNCTION(libvirt_domain_qemu_agent_command); /* Domain snapshot functions */ PHP_FUNCTION(libvirt_domain_has_current_snapshot); PHP_FUNCTION(libvirt_domain_snapshot_create); -- 2.3.3

2 1

[libvirt] [PATCH] util:qemu: fix IOThreadinfo always get failed when get running vm status
by Luyao Huang 29 Jun '15

29 Jun '15

When we use iothreadinfo to get iothread information, we will get error like this: # virsh iothreadinfo rhel7.0 --live error: Unable to get domain IOThreads information error: Unable to encode message payload This is because virProcessGetAffinity() return a bitmap which map_len is too big to send via rpc: (gdb) p *map $7 = {max_bit = 262144, map_len = 4096, map = 0x7f9b6c2c0a20} To fix this issue add a new parameter &maxcpu to virProcessGetAffinity() to let callers specify the maxcpu (also in most machine, no need loop 262144 times to check if cpu is set), if set &maxcpu to zero, virProcessGetAffinity() will use default value (262144 or 1024) to create bitmap. This issue was introduced in commit 825df8c. Signed-off-by: Luyao Huang <lhuang(a)redhat.com> --- src/qemu/qemu_driver.c | 4 ++-- src/util/virprocess.c | 7 ++++--- src/util/virprocess.h | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 2b530c8..e1ad696 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -1459,7 +1459,7 @@ qemuDomainHelperGetVcpus(virDomainObjPtr vm, virVcpuInfoPtr info, int maxinfo, unsigned char *cpumap = VIR_GET_CPUMAP(cpumaps, maplen, v); virBitmapPtr map = NULL; - if (!(map = virProcessGetAffinity(priv->vcpupids[v]))) + if (!(map = virProcessGetAffinity(priv->vcpupids[v], hostcpus))) return -1; virBitmapToDataBuf(map, cpumap, maplen); @@ -5619,7 +5619,7 @@ qemuDomainGetIOThreadsLive(virQEMUDriverPtr driver, goto endjob; info_ret[i]->iothread_id = iothreads[i]->iothread_id; - if (!(map = virProcessGetAffinity(iothreads[i]->thread_id))) + if (!(map = virProcessGetAffinity(iothreads[i]->thread_id, hostcpus))) goto endjob; if (virBitmapToData(map, &info_ret[i]->cpumap, diff --git a/src/util/virprocess.c b/src/util/virprocess.c index 8fa7a9b..8800623 100644 --- a/src/util/virprocess.c +++ b/src/util/virprocess.c @@ -469,7 +469,8 @@ int virProcessSetAffinity(pid_t pid, virBitmapPtr map) } virBitmapPtr -virProcessGetAffinity(pid_t pid) +virProcessGetAffinity(pid_t pid, + int maxcpu) { size_t i; cpu_set_t *mask; @@ -504,10 +505,10 @@ virProcessGetAffinity(pid_t pid) goto cleanup; } - if (!(ret = virBitmapNew(ncpus))) + if (!(ret = virBitmapNew(maxcpu ? maxcpu : ncpus))) goto cleanup; - for (i = 0; i < ncpus; i++) { + for (i = 0; i < (maxcpu ? maxcpu : ncpus); i++) { # ifdef CPU_ALLOC /* coverity[overrun-local] */ if (CPU_ISSET_S(i, masklen, mask)) diff --git a/src/util/virprocess.h b/src/util/virprocess.h index 1768009..cc903ac 100644 --- a/src/util/virprocess.h +++ b/src/util/virprocess.h @@ -58,7 +58,7 @@ int virProcessKillPainfully(pid_t pid, bool force); int virProcessSetAffinity(pid_t pid, virBitmapPtr map); -virBitmapPtr virProcessGetAffinity(pid_t pid); +virBitmapPtr virProcessGetAffinity(pid_t pid, int maxcpu); int virProcessGetPids(pid_t pid, size_t *npids, pid_t **pids); -- 1.8.3.1

3 2