- Devel - libvirt List Archives

[libvirt] [PATCH v2 0/2] qemu: support new HyperV-related features
by Ján Tomko 02 May '13

02 May '13

1/2 prevents memory leaks and hair loss in qemuParseCommandLineCPU 2/2 adds support for the new cpu flags v1: https://www.redhat.com/archives/libvir-list/2013-May/msg00173.html v2: uses virStringSplit instead of strsep added a missing break to virDomainDefParseXML Ján Tomko (2): qemu: simplify CPU command line parsing qemu: add hv_vapic and hv_spinlocks support docs/formatdomain.html.in | 17 ++- docs/schemas/domaincommon.rng | 12 ++ src/conf/domain_conf.c | 40 +++++- src/conf/domain_conf.h | 3 + src/qemu/qemu_command.c | 168 +++++++++++++----------- tests/qemuxml2argvdata/qemuxml2argv-hyperv.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-hyperv.xml | 2 + 7 files changed, 164 insertions(+), 80 deletions(-) -- 1.8.1.5

1 2

[libvirt] Release of libvirt-1.0.5
by Daniel Veillard 02 May '13

02 May '13

I forgot to make the rc2 release on tuesday, but looking at the git state it was looking like the problem reported on rc1 had been fixed, so I decided to go ahead and roll the release as scheduled today. It is tagged in git and the tarball is available as usual at: ftp://libvirt.org/libvirt/ along with rpms. This release contains an homogenous set of features, bug fixes and improvements with some refactoring done in various places. It also includes more localization updates now coming from the Fedora localization project, with around 6 languages fully localized and 3 more over the 70% threshold: Features: - Add NVRAM device (Li Zhang) - Add XML config for resource partitions (Daniel P. Berrange) - Add support for TPM (Stefan Berger) - NPIV storage migration support (Osier Yang) Documentation: - Fix closing tag in snapshot documentation (Christophe Fergeau) - Fix typo in augeas comment (Martin Kletzander) - Fix VIR_DOMAIN_EVENT_ID_PMSUSPEND capitalization in API doc (Christophe Fergeau) - Improve /domainsnapshot/disks/disk@snapshot doc (Christophe Fergeau) - fix memballoon examples (Ján Tomko) - Clarify usage of SELinux baselabel (Peter Krempa) - fix usage of 'onto' (Eric Blake) - Update HACKING (Osier Yang) - conf: fix comment about parsing graphics listen address (Ján Tomko) - lib: Fix docs about return value of virDomainGetVcpusFlags() (Peter Krempa) - virsh: Document that using incomplete XML files may have unexpected results (Peter Krempa) - fix typo when using Kerberos principals (Eric Blake) - use MiB/s instead of Mbps for migration speed (Ján Tomko) - Add the missed <pre> tag (Osier Yang) - virsh: Fix typo in docs (Peter Krempa) - manual: Fix copy-paste errors (Martin Kletzander) - manual: Add info about migrateuri in virsh manual (Martin Kletzander) Portability: - virInitctlRequest: Don't hardcode 384 bytes size (Guido Günther) - S390: Do not generate a default USB controller (Viktor Mihajlovski) - S390: Mention changed USB behavior (Viktor Mihajlovski) - build: fix cygwin build in virnetdev (Eric Blake) - portability: handle ifreq differences in virnetdev (Roman Bogorodskiy) - qemu: fix build error with older platforms (Eric Blake) - Fix compilation error in util/vircgroup.c (Stefan Berger) - Conditionally compile storagevolxml2argvtest (Daniel P. Berrange) - Fix signature of dummy virNetlinkCommand stub (Daniel P. Berrange) - Add empty stub for virThreadCancel on Win32 (Daniel P. Berrange) - Don't enable -fPIE on Win32 platforms (Daniel P. Berrange) - spec: Require pod2man when running autoreconf (Jiri Denemark) - Avoid cast alignment warnings in port allocator test (Daniel P. Berrange) Bug Fixes: - pci: autolearn name of stub driver, remove from arglist (Laine Stump) - ESX: Fix DISPATCH_FREE generation code to free all extended objects (Ata E Husain Bohra) - qemu: fix failure to start with spice graphics and no tls (Laine Stump) - Need to call virFreeError after virSaveLastError (John Ferlan) - libvirt-guests: status: return non-zero when stopped (Ján Tomko) - security driver: eliminate memory leaks in failure paths (Laine Stump) - libxl: Fix double-dispose of libxl domain config (Jim Fehlig) - virsh: fix incorrect argument errors for long options (Ján Tomko) - network: Don't remove transient network if creating of config file fails (Peter Krempa) - qemu: prevent invalid reads in qemuAssignDevicePCISlots (Ján Tomko) - qemu: don't assign a PCI address to 'none' USB controller (Ján Tomko) - fix segfault during virsh save in pv guest (Bamvor Jian Zhang) - conf: reject controllers with duplicate indexes (Ján Tomko) - fix typo introduced by 90430791 (Bamvor Jian Zhang) - Fix usb master startport parsing (Martin Kletzander) - qemu_conf: Don't discard strdup OOM error (Michal Privoznik) - util: Error out if the numa nodeset is out of range (Osier Yang) - selinux: Don't mask errors of virSecuritySELinuxGenNewContext (Peter Krempa) - qemu: Fix the wrong expression (Osier Yang) - audit: properly encode device path in cgroup audit (Eric Blake) - network: bridge_driver: don't lose transient networks on daemon restart (Peter Krempa) - qemu: fix default spice password setting (Ján Tomko) - Fix build breaker with ATTRIBUTE_NONNULL defs (John Ferlan) - Resolve valgrind error (John Ferlan) - Do more complete initialization of libgcrypt (Daniel P. Berrange) - qemu: Set correct migrate host in client_migrate_info (Michal Privoznik) - qemu: fix crash in qemuOpen (Ján Tomko) - conf: fix error for parallel port mismatch (Ján Tomko) - conf: fix a memory leak when parsing nat port XML nodes (Guannan Ren) - conf: Fix race between looking up a domain object and freeing it (Peter Krempa) - Fix crash in virNetDevGetVirtualFunctions (Laine Stump) - schemas: Move PortNumber and sourceinfoadapter to basictypes.rng (Han Cheng) - virsh: Unregister the connection close notifier upon termination (Viktor Mihajlovski) - libvirt: Increase connection reference count for callbacks (Viktor Mihajlovski) - storage: Fix volume cloning for logical volume. (Atsushi Kumagai) - security_manager: fix comparison (Guido Günther) - qemu: fix memory leak on -machine usage error (Eric Blake) - qemu-blockjob: Fix limit of bandwidth for block jobs to supported value (Peter Krempa) - sec_manager: Refuse to start domain with unsupported seclabel (Michal Privoznik) - qemu: Fix crash when updating media with shared device (Peter Krempa) - virsh: Call virDomainFree in cmdDomFSTrim (Michal Privoznik) - smartcard: spell ccid-card-emulated qemu property correctly (Eric Blake) - Resolve valgrind failure (John Ferlan) Improvements: - spec: collect all BuildRequires into one area (Eric Blake) - Resolve valgrind error (John Ferlan) - esx: Support virtualHW version 9 (Martin Kletzander) - build: mark conditionally unused variables (Eric Blake) - virsh: clarify vol-{down,up}load description (Ján Tomko) - qemu: report an error if memballoon has wrong address type (Ján Tomko) - qemu: assign addresses when converting xml to native (Ján Tomko) - qemu: Error out if spice port autoallocation is requested, but disabled (Peter Krempa) - qemu: put usb cgroup setup in common function (Laine Stump) - qemu: add vfio devices to cgroup ACL when appropriate (Laine Stump) - qemu: honor allowDiskFormatProbing when parsing command line (Ján Tomko) - conf: add missing error on OOM (Ján Tomko) - qemu: don't always reserve PCI addresses for implicit controllers (Ján Tomko) - conf: remove extraneous _TYPE from driver backend enums (Laine Stump) - network: support <driver name='vfio'/> in network definitions (Laine Stump) - qemu: launch bridge helper from libvirtd (Paolo Bonzini) - virnetdevtap: add virNetDevTapGetName (Paolo Bonzini) - qemu: set qemu process' RLIMIT_MEMLOCK when VFIO is used (Laine Stump) - qemu: use new virCommandSetMax(Processes|Files) (Laine Stump) - util: new virCommandSetMax(MemLock|Processes|Files) (Laine Stump) - Do proper escaping of cgroup resource partitions (Daniel P. Berrange) - Ensure all cgroup partitions have a suffix of ".partition" (Daniel P. Berrange) - Change VM cgroup suffix from '{lxc,qemu}.libvirt' to 'libvirt-{lxc,qemu}' (Daniel P. Berrange) - test: Add JSON test for query-tpm-types (Stefan Berger) - virsh: suppress aliases in group help (Eric Blake) - security: update hostdev labelling functions for VFIO (Laine Stump) - util: new function virPCIDeviceGetVFIOGroupDev (Laine Stump) - virsh: use new virNodeDeviceDetachFlags (Laine Stump) - xen: implement virNodeDeviceDetachFlags backend (Laine Stump) - qemu: implement virNodeDeviceDetachFlags backend (Laine Stump) - hypervisor api: implement RPC calls for virNodeDeviceDetachFlags (Laine Stump) - hypervisor api: new virNodeDeviceDetachFlags (Laine Stump) - qemu: bind/unbind stub driver according to config <driver name='x'/> (Laine Stump) - pci: keep a stubDriver in each virPCIDevice (Laine Stump) - qemu: use vfio-pci on commandline when appropriate (Laine Stump) - conf: formatter/parser/RNG/docs for hostdev <driver name='kvm|vfio'/> (Laine Stump) - conf: put hostdev pci address in a struct (Laine Stump) - qemu: detect vfio-pci device and its bootindex parameter (Laine Stump) - build: avoid unsafe functions in libgen.h (Eric Blake) - qemu: auto-add pci-root to 'pc-i440*' machines too (Ján Tomko) - qemu: auto-add bridges and allow using them (Ján Tomko) - qemu: auto-add pci-root controller for pc machine types (Ján Tomko) - qemu: build command line for pci-bridge device (liguang) - conf: add PCI controllers (Ján Tomko) - qemu: call post-parse callbacks when parsing command line too (Ján Tomko) - qemu: Add command line builder and parser for NVRAM. (Li Zhang) - qemuBuildCommandLine: Don't overwrite errors with NWFilter's one (Michal Privoznik) - Introduce a sub-element <driver> for controller (Osier Yang) - qemu: Don't require a block or file when looking for an alias (Wido den Hollander) - Change the tag name "num_queues" into "queues" (Osier Yang) - qemu: Improve handling of channels when generating SPICE command line (Peter Krempa) - qemu: Do sensible auto allocation of SPICE port numbers (Peter Krempa) - Make driver method names consistent with public APIs (Daniel P. Berrange) - Dedicated name for sub-driver open/close methods (Daniel P. Berrange) - Rename 'DeviceMonitor' to 'NodeDeviceDriver' (Daniel P. Berrange) - Extend previous check to validate driver struct field names (Daniel P. Berrange) - Ensure driver method names match public API names (Daniel P. Berrange) - Make naming of remote procedures match API names exactly (Daniel P. Berrange) - Cleanup command line options in gendispatch.pl (Daniel P. Berrange) - qemu: Split out SPICE port allocation into a separate function (Peter Krempa) - qemu: Use switch instead of ifs in qemuBuildGraphicsCommandLine (Peter Krempa) - qemu: Split out code to generate VNC command line (Peter Krempa) - qemu: Split out code to generate SPICE command line (Peter Krempa) - qemu: Use -machine accel=tcg|kvm when available (Jiri Denemark) - qemu: Move -enable-kvm and friends earlier in the command line (Jiri Denemark) - Switch to a more extensible annotation system for RPC protocols (Daniel P. Berrange) - qemu: Fix setting of memory tunables (Peter Krempa) - logging: Make log regexp more compact (and readable) (Jiri Denemark) - qemu: Ignore libvirt logs when reading QEMU error output (Jiri Denemark) - qemu: Move QEMU log reading into a separate function (Jiri Denemark) - update input ip processing (Gene Czarcinski) - create virSocketAddrGetIpPrefix utility function (Gene Czarcinski) - Replace more cases of /system with /machine (Daniel P. Berrange) - Change default resource partition to /machine (Daniel P. Berrange) - qemu: rename CheckSlot to SlotInUse (Ján Tomko) - qemu: switch PCI address set from hash table to an array (Ján Tomko) - conf: add model attribute to virDomainDefMaybeAddController (Ján Tomko) - qemu: move PCI address check out of qemuPCIAddressAsString (Ján Tomko) - qemu: QEMU_PCI constant consistency (Ján Tomko) - qemu: print PCI address hexadecimally in errors (Ján Tomko) - qemu: make qemuComparePCIDevice aware of multiple buses (Ján Tomko) - conf: Reword error message to be more universal (Peter Krempa) - cpu: Rename PowerPCUpdate and PowerPCDataFree functions (Jiri Denemark) - cpu: Remove hardcoded list of PowerPC models (Jiri Denemark) - cpu: Reimplement PowerPCDecode (Jiri Denemark) - cpu: Reimplement PowerPCBaseline (Jiri Denemark) - cpu: Fix loading PowerPC vendor from cpu_map.xml (Jiri Denemark) - cpu: Fix PowerPCNodeData (Jiri Denemark) - cpu: Make comparing PowerPC CPUs easier to read (Jiri Denemark) - cpu: Introduce cpuModelIsAllowed internal API (Jiri Denemark) - virsh-domain: Refactor cmdVcpucount and fix output on inactive domains (Peter Krempa) - Set legacy USB option with default for ppc64. (Li Zhang) - qemu_conf: add new configuration key bridge_helper (Paolo Bonzini) - util: allow using virCommandAllowCap with setuid helpers (Paolo Bonzini) - util: simplify virSetUIDGIDWithCaps (Paolo Bonzini) - virsh-domain: Report errors on invalid --holdtime value for cmdSendKey (Peter Krempa) - virsh-domain: Clean up cmdSendKey (Peter Krempa) - qemu: simplify use of virArchFromHost (Tal Kain) - rng: tighten up domain <controller> schema (Laine Stump) - network: remove autostart flag from network when undefining it (Peter Krempa) - syntax-check: Only allows to include public headers in external tools (Osier Yang) - syntax-check: Don't include public headers in internal source (Osier Yang) - syntax-check: Don't include duplicate header (Osier Yang) - qemu: Allow the disk wwn to have "0x" prefix (Osier Yang) - cleanup: Don't include libvirt/virterror.h (Osier Yang) - cleanup: Don't include libvirt/libvirt.h (Osier Yang) - cleanup: Remove the duplicate header (Osier Yang) - cleanup: Only include testutils.h once (Osier Yang) - Check for unsupported QMP command (Stefan Berger) - qemu_agent: Add support for appending arrays to commands (Peter Krempa) - Add support for perf_event and net_cls cgroup controllers (Daniel P. Berrange) - Replace LXC cgroup mount code with call to virCgroupIsolateMount (Daniel P. Berrange) - Add an API for re-mounting cgroups, to isolate the process location (Daniel P. Berrange) - Track symlinks for co-mounted cgroup controllers (Daniel P. Berrange) - Remove non-functional code for setting up non-root cgroups (Daniel P. Berrange) - Change default cgroup layout for QEMU/LXC and honour XML config (Daniel P. Berrange) - Add a new virCgroupNewPartition for setting up resource partitions (Daniel P. Berrange) - Cleanup if creating cgroup directories fails (Daniel P. Berrange) - Add misc extra debugging into cgroups code (Daniel P. Berrange) - Refactor cgroups internal data structures (Daniel P. Berrange) - Add a test suite for cgroups functionality (Daniel P. Berrange) - Rename virCgroupForXXX to virCgroupNewXXX (Daniel P. Berrange) - Pull definition of structs out of vircgroup.c to vircgrouppriv.h (Daniel P. Berrange) - Store a virCgroupPtr instance in virLXCDomainObjPrivatePtr (Daniel P. Berrange) - Store a virCgroupPtr instance in qemuDomainObjPrivatePtr (Daniel P. Berrange) - Add missing param to virCgroupForDriver stub (Daniel P. Berrange) - Introduce a virFileDeleteTree method (Daniel P. Berrange) - Conditionalize use of symlink() function in test suite (Daniel P. Berrange) - maint: update to latest gnulib (Eric Blake) - Use unsigned int instead of unsigned (Osier Yang) - qemu: Report also domain name in error message when domain object wasn't found (Peter Krempa) - qemu: Refactor lookup of domain object (Peter Krempa) - cleanup: Change datatype of net->stp to boolean (Osier Yang) - cleanup: Change datatype of usbdev->allow to boolean (Osier Yang) - cleanup: Change datatype of graphic's members to boolean (Osier Yang) - cleanup: Change datatype of accel's members to boolean (Osier Yang) - Add test case for TPM passthrough (Stefan Berger) - TPM support for QEMU command line (Stefan Berger) - QEMU Cgroup support for TPM passthrough (Stefan Berger) - Audit the starting of a guest using TPM passthrough (Stefan Berger) - Add SELinux and DAC labeling support for TPM passthrough (Stefan Berger) - Convert QMP strings into QEMU capability bits (Stefan Berger) - Parse TPM passthrough XML in the domain XML (Stefan Berger) - Helper functions for host TPM support (Stefan Berger) - Add documentation and schema for TPM passthrough (Stefan Berger) - Add function to find a needle in a string array (Stefan Berger) - Add QMP probing for TPM (Stefan Berger) - conf: Allow for non-contiguous device boot orders (Peter Krempa) - Tweak EOF handling of streams (Daniel P. Berrange) - Add USB option capability (Li Zhang) - Add error handling to optional arguments in cmdCPUStats (John Ferlan) - qemu: Do not report unsafe migration for local files (Jiri Denemark) - qemu: Try to use QMP for send-key if supported (Peter Krempa) - virsh: Update list of shutdown/reboot modes (Michal Privoznik) - cleanup: Change datatype of secret->private to boolean (Osier Yang) - cleanup: Change datatype of secret->ephemeral to boolean (Osier Yang) - cleanup: Change datatype of fs->readonly to boolean (Osier Yang) - cleanup: Change datatype of disk->readonly to boolean (Osier Yang) - cleanup: Change datatype of disk->transient to boolean (Osier Yang) - cleanup: Change datatype of disk->shared to boolean (Osier Yang) - cleanup: Change datatype of auth->expires to boolean (Osier Yang) - cleanup: Change datatype of hostdev->missing to boolean (Osier Yang) - Cleanup: Change datatype of origstate's members to boolean (Osier Yang) - Cleanup: Change datatype of hostdev->managed to boolean (Osier Yang) - conf: Change help function (Han Cheng) - qemu: Remove now obsolete assignment of default network card model for s390 hosts (Peter Krempa) - qemu: Clean up network device CLI generator (Peter Krempa) - qemu: Use correct default model on s390 (Viktor Mihajlovski) - sanlock: add missing test command in virt-sanlock-cleanup.in (Alex Jia) - Generate RFC4122 compliant UUIDs (Milos Vyletel) - Unmount existing filesystems under user specified mounts in LXC (Daniel P. Berrange) - Move lxcContainerUnmountSubtree further up in file (Daniel P. Berrange) - Implement support for <hostdev caps=net> (Bogdan Purcareata) - Update structure & XML definitions to support <hostdev caps=net> (Bogdan Purcareata) - Rename virCgroupMounted to virCgroupHasController & make it more robust (Daniel P. Berrange) - qemu: Allow volume type disk for device 'lun' (Osier Yang) - qemu: Support sgio setting for volume type disk (Osier Yang) - qemu: Support shareable volume type disk (Osier Yang) - qemu: Translate the pool disk source earlier (Osier Yang) - Support seclabels for volume type disk (Osier Yang) - Support startupPolicy for 'volume' disk (Osier Yang) - qemu: Translate the pool disk source when building drive string (Osier Yang) - Introduce new XMLs to specify disk source using libvirt storage (Osier Yang) - conf: New helper virDomainDiskSourceDefFormat to format the disk source (Osier Yang) - storage: Guess the parent if it's not specified for vHBA (Osier Yang) - storage: Add startPool and stopPool for scsi backend (Osier Yang) - util: Add helper to get the scsi host name by iterating over sysfs (Osier Yang) - phyp: Prohibit fc_host adapter for phyp driver (Osier Yang) - storage: Move virStorageBackendSCSIGetHostNumber into iscsi backend (Osier Yang) - storage: Make the adapter name be consistent with node device driver (Osier Yang) - New XML attributes for storage pool source adapter (Osier Yang) - Disable cast-align warnings in various places (Daniel P. Berrange) - Copy struct inotify_event entries to avoid alignment problems (Daniel P. Berrange) - Use VIR_ALLOC_VAR instead of VIR_ALLOC_N for creating virObject (Daniel P. Berrange) - Avoid casts between unsigned char * and struct nlmsghdr (Daniel P. Berrange) - Rewrite keycode map to avoid a struct (Daniel P. Berrange) - Add a test suite for keycode mapping functions (Daniel P. Berrange) - qemu: Error out if the bitmap for pinning is all clear (Osier Yang) - util: Add a helper to check if all bits of a bitmap are clear (Osier Yang) - qemu: Support multiple queue virtio-scsi (Osier Yang) - build: check correct protocol.o file (Eric Blake) - build: use proper pod for nested bulleted VIRSH_DEBUG list (Eric Blake) - qemu: Remove maximum cpu limit when setting processor count using the API (Peter Krempa) - Don't create dirs in cgroup controllers we don't want to use (Daniel P. Berrange) - Rename virCgroupGetAppRoot to virCgroupForSelf (Daniel P. Berrange) - Ensure LD_PRELOAD exists before running test case (Daniel P. Berrange) - Refactor RNG schema for resource tuning (Daniel P. Berrange) - rpc: Fix connection close callback race condition and memory corruption/crash (Peter Krempa) - virsh: Register and unregister the close callback also in cmdConnect (Peter Krempa) - virsh: Move cmdConnect from virsh-host.c to virsh.c (Peter Krempa) - virCaps: get rid of defaultConsoleTargetType callback (Peter Krempa) - virCaps: get rid of macPrefix field (Peter Krempa) - virCaps: get rid of hasWideScsiBus (Peter Krempa) - virCaps: get rid of defaultDiskDriverType (Peter Krempa) - virCaps: get rid of emulatorRequired (Peter Krempa) - virCaps: get rid of defaultDiskDriverName (Peter Krempa) - virCaps: get rid of "defaultInitPath" value in the virCaps struct (Peter Krempa) - qemu: Record the default NIC model in the domain XML (Peter Krempa) - conf callback: Rearrange function parameters (Peter Krempa) - conf: Add post XML parse callbacks and prepare for cleaning of virCaps (Peter Krempa) - maint: Rename xmlconf to xmlopt and virDomainXMLConfig to virDomainXMLOption (Peter Krempa) - Create fake NUMA info if libnuma isn't available (Daniel P. Berrange) - Cope with missing /sys/devices/system/cpu/cpu0/topology files (Daniel P. Berrange) - Add armv6l architecture to list of valid arches (Daniel P. Berrange) - Implement minimal sysinfo for ARM platforms (Daniel P. Berrange) - Disable of unused sysinfotest functions (Daniel P. Berrange) - Wire up sysinfo for LXC driver (Daniel P. Berrange) - Add support for SD cards in nodedev driver (Daniel P. Berrange) - Auto-add a root <filesystem> element to LXC containers on startup (Daniel P. Berrange) - Remove support for old kernels lacking private devpts (Daniel P. Berrange) - Enable full RELRO mode (Daniel P. Berrange) - Build all binaries with PIE (Daniel P. Berrange) - rng: Add definition for network disk source (Osier Yang) - Disable static libraries by default (Daniel P. Berrange) - Allow multiple parameters for schedinfo (Martin Kletzander) - virsh-domain: Add --live, --config, --current logic to cmdDetachDisk (Peter Krempa) - virsh-domain: Add --live, --config, --current logic to cmdDetachDevice (Peter Krempa) - virsh-domain: Add --live, --config, --current logic to cmdDetachInterface (Peter Krempa) - virsh: Fix semantics of --config for "update-device" command (Peter Krempa) - virsh-domain: Fix declarations of flag variables in cmdChangeMedia (Peter Krempa) - virsh-domain: Simplify usage of --current, --live and --config flags (Peter Krempa) - virsh-domain-monitor: Refactor cmdDomIfGetLink (Peter Krempa) - Use virMacAddrFormat instead of manual mac address formatting (Peter Krempa) - util: Change virMacAddrFormat to lowercase hex characters (Peter Krempa) - Optimize machine option to set more options with it (Li Zhang) - conf: Enforce ranges on cputune variables (Peter Krempa) - test: Return Libvirt logo as domain screenshot (Michal Privoznik) - qemu: Allow migration over IPv6 (Ján Tomko) - virsh: Add a helper to parse cpulist (Osier Yang) Cleanups: - qemu_command.c: Fix whitespacing within for() (Michal Privoznik) - qemu: Fix the indention (Osier Yang) - Sanitize whitespace in driver.h (Daniel P. Berrange) - sheepdog: Omit braces with a single-line body (Harry Wei) - storage: Fix the indention (Osier Yang) - Remove extraneous comma in info_cpu_stats and opts_cpu_stats (John Ferlan) Thanks to everybody who helped one way or another in producing this release ! Daniel -- Daniel Veillard | Open Source and Standards, Red Hat veillard(a)redhat.com | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | virtualization library http://libvirt.org/

5 7

[libvirt] [PATCH] util: fix compile errors caused by moving string functions
by Laine Stump 02 May '13

02 May '13

commit 7c9a2d8 missed adding in a few #include "virstring.h"s, causing builds to fail. --- Pushed under the build-breaker rule. src/locking/lock_driver_sanlock.c | 1 + src/storage/storage_backend_rbd.c | 1 + src/storage/storage_backend_sheepdog.c | 1 + tests/storagebackendsheepdogtest.c | 1 + 4 files changed, 4 insertions(+) diff --git a/src/locking/lock_driver_sanlock.c b/src/locking/lock_driver_sanlock.c index 48c6d56..4b48868 100644 --- a/src/locking/lock_driver_sanlock.c +++ b/src/locking/lock_driver_sanlock.c @@ -43,6 +43,7 @@ #include "virfile.h" #include "md5.h" #include "virconf.h" +#include "virstring.h" #include "configmake.h" diff --git a/src/storage/storage_backend_rbd.c b/src/storage/storage_backend_rbd.c index ca23d4b..99024e3 100644 --- a/src/storage/storage_backend_rbd.c +++ b/src/storage/storage_backend_rbd.c @@ -30,6 +30,7 @@ #include "virlog.h" #include "base64.h" #include "viruuid.h" +#include "virstring.h" #include "rados/librados.h" #include "rbd/librbd.h" diff --git a/src/storage/storage_backend_sheepdog.c b/src/storage/storage_backend_sheepdog.c index dfa5673..a9ee7d3 100644 --- a/src/storage/storage_backend_sheepdog.c +++ b/src/storage/storage_backend_sheepdog.c @@ -32,6 +32,7 @@ #include "vircommand.h" #include "viralloc.h" #include "virlog.h" +#include "virstring.h" #define VIR_FROM_THIS VIR_FROM_STORAGE diff --git a/tests/storagebackendsheepdogtest.c b/tests/storagebackendsheepdogtest.c index 8800acb..9b43a6d 100644 --- a/tests/storagebackendsheepdogtest.c +++ b/tests/storagebackendsheepdogtest.c @@ -32,6 +32,7 @@ #include "internal.h" #include "testutils.h" #include "storage/storage_backend_sheepdog.h" +#include "virstring.h" typedef struct { -- 1.7.11.7

1 0

[libvirt] [PATCH 0/2] qemu: support new HyperV-related features
by Ján Tomko 02 May '13

02 May '13

1/2 prevents memory leaks and hair loss in qemuParseCommandLineCPU 2/2 adds support for the new cpu flags https://bugzilla.redhat.com/show_bug.cgi?id=784836 Ján Tomko (2): qemu: use strsep for CPU command line parsing qemu: add hv_vapic and hv_spinlocks support docs/formatdomain.html.in | 17 ++- docs/schemas/domaincommon.rng | 12 ++ src/conf/domain_conf.c | 39 ++++++- src/conf/domain_conf.h | 3 + src/qemu/qemu_command.c | 145 +++++++++++++----------- tests/qemuxml2argvdata/qemuxml2argv-hyperv.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-hyperv.xml | 2 + 7 files changed, 148 insertions(+), 72 deletions(-) -- 1.8.1.5

2 3

[libvirt] [PATCH 0/2] Fix forgetting of transient networks on daemon restart
by Peter Krempa 02 May '13

02 May '13

Peter Krempa (2): network: remove autostart flag from network when undefining it network: bridge_driver: don't lose transient networks on daemon restart src/conf/network_conf.c | 220 +++++++++++++++++++++++++++++--------------- src/conf/network_conf.h | 10 +- src/libvirt_private.syms | 2 +- src/network/bridge_driver.c | 52 +++++++---- 4 files changed, 185 insertions(+), 99 deletions(-) -- 1.8.1.5

3 9

[libvirt] [libvirt-glib] object: Add "transfer none" annotation to argv parameter
by Christophe Fergeau 02 May '13

02 May '13

This makes the parameter to be passed "unowned" in Vala. This was previously done using a vala metadata file, but it's better to do it directly through a gtk-doc annotation, as this means the gir file will know about this, and thus any gir-based binding can make use of this info. This also makes libvirt-gobject consistent with what was done for gconfig and glib in commit 431720. --- libvirt-gobject/libvirt-gobject-main.c | 4 ++-- vapi/LibvirtGObject-1.0.metadata | 2 -- vapi/Makefile.am | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) delete mode 100644 vapi/LibvirtGObject-1.0.metadata diff --git a/libvirt-gobject/libvirt-gobject-main.c b/libvirt-gobject/libvirt-gobject-main.c index 31d2514..11ea24a 100644 --- a/libvirt-gobject/libvirt-gobject-main.c +++ b/libvirt-gobject/libvirt-gobject-main.c @@ -33,7 +33,7 @@ /** * gvir_init_object: * @argc: (inout): pointer to application's argc - * @argv: (inout) (array length=argc) (allow-none): pointer to application's argv + * @argv: (inout) (array length=argc) (allow-none) (transfer none): pointer to application's argv */ void gvir_init_object(int *argc, char ***argv) @@ -58,7 +58,7 @@ static void gvir_log_handler(const gchar *log_domain G_GNUC_UNUSED, /** * gvir_init_object_check: * @argc: (inout): pointer to application's argc - * @argv: (inout) (array length=argc) (allow-none): pointer to application's argv + * @argv: (inout) (array length=argc) (allow-none) (transfer none): pointer to application's argv * @err: pointer to a #GError to which a message will be posted on error */ gboolean gvir_init_object_check(int *argc, diff --git a/vapi/LibvirtGObject-1.0.metadata b/vapi/LibvirtGObject-1.0.metadata deleted file mode 100644 index 90e5197..0000000 --- a/vapi/LibvirtGObject-1.0.metadata +++ /dev/null @@ -1,2 +0,0 @@ -init_object.argv unowned -init_object_check.argv unowned diff --git a/vapi/Makefile.am b/vapi/Makefile.am index 2ecc3e3..0154104 100644 --- a/vapi/Makefile.am +++ b/vapi/Makefile.am @@ -44,4 +44,4 @@ CLEANFILES = \ libvirt-gobject-1.0.vapi \ $(NULL) -EXTRA_DIST = LibvirtGObject-1.0.metadata libvirt-gobject-1.0.deps +EXTRA_DIST = libvirt-gobject-1.0.deps -- 1.8.1.4

3 2

[libvirt] [PATCH] Fix potential use of undefined variable in remote dispatch code
by Daniel P. Berrange 02 May '13

02 May '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> If an early dispatch check caused a jump to the 'cleanup' branch then virTypeParamsFree() would be called with an uninitialized 'nparams' variable. Fortunately 'params' is initialized to NULL, so the uninitialized 'nparams' variable would not be used. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/rpc/gendispatch.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/rpc/gendispatch.pl b/src/rpc/gendispatch.pl index 7b93062..8d3b013 100755 --- a/src/rpc/gendispatch.pl +++ b/src/rpc/gendispatch.pl @@ -495,7 +495,7 @@ elsif ($mode eq "server") { push(@args_list, "args->$1.$1_len"); } elsif ($args_member =~ m/^remote_typed_param (\S+)<(\S+)>;/) { push(@vars_list, "virTypedParameterPtr $1 = NULL"); - push(@vars_list, "int n$1"); + push(@vars_list, "int n$1 = 0;"); if ($call->{ProcName} eq "NodeSetMemoryParameters") { push(@args_list, "priv->conn"); } -- 1.8.2.1

2 1

[libvirt] [PATCH] More paranoid initialization of 'nparams' variable in dispatch code
by Daniel P. Berrange 02 May '13

02 May '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> Since the 'nparams' variable passed to virTypedParametersFree is supposed to represent the size of the 'params' array, it is bad practice to initialize it to a non-zero value, until the array has been allocated. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- daemon/remote.c | 78 ++++++++++++++++++++++++++++++++------------------------- 1 file changed, 44 insertions(+), 34 deletions(-) diff --git a/daemon/remote.c b/daemon/remote.c index e5e3f2c..c5567f4 100644 --- a/daemon/remote.c +++ b/daemon/remote.c @@ -1001,7 +1001,7 @@ remoteDispatchDomainGetSchedulerParameters(virNetServerPtr server ATTRIBUTE_UNUS { virDomainPtr dom = NULL; virTypedParameterPtr params = NULL; - int nparams = args->nparams; + int nparams = 0; int rv = -1; struct daemonClientPrivate *priv = virNetServerClientGetPrivateData(client); @@ -1011,12 +1011,13 @@ remoteDispatchDomainGetSchedulerParameters(virNetServerPtr server ATTRIBUTE_UNUS goto cleanup; } - if (nparams > REMOTE_DOMAIN_SCHEDULER_PARAMETERS_MAX) { + if (args->nparams > REMOTE_DOMAIN_SCHEDULER_PARAMETERS_MAX) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("nparams too large")); goto cleanup; } - if (nparams && VIR_ALLOC_N(params, nparams) < 0) + if (args->nparams && VIR_ALLOC_N(params, args->nparams) < 0) goto no_memory; + nparams = args->nparams; if (!(dom = get_nonnull_domain(priv->conn, args->dom))) goto cleanup; @@ -1109,7 +1110,7 @@ remoteDispatchDomainGetSchedulerParametersFlags(virNetServerPtr server ATTRIBUTE { virDomainPtr dom = NULL; virTypedParameterPtr params = NULL; - int nparams = args->nparams; + int nparams = 0; int rv = -1; struct daemonClientPrivate *priv = virNetServerClientGetPrivateData(client); @@ -1119,12 +1120,13 @@ remoteDispatchDomainGetSchedulerParametersFlags(virNetServerPtr server ATTRIBUTE goto cleanup; } - if (nparams > REMOTE_DOMAIN_SCHEDULER_PARAMETERS_MAX) { + if (args->nparams > REMOTE_DOMAIN_SCHEDULER_PARAMETERS_MAX) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("nparams too large")); goto cleanup; } - if (nparams && VIR_ALLOC_N(params, nparams) < 0) + if (args->nparams && VIR_ALLOC_N(params, args->nparams) < 0) goto no_memory; + nparams = args->nparams; if (!(dom = get_nonnull_domain(priv->conn, args->dom))) goto cleanup; @@ -1284,7 +1286,7 @@ remoteDispatchDomainBlockStatsFlags(virNetServerPtr server ATTRIBUTE_UNUSED, virTypedParameterPtr params = NULL; virDomainPtr dom = NULL; const char *path = args->path; - int nparams = args->nparams; + int nparams = 0; unsigned int flags; int rv = -1; struct daemonClientPrivate *priv = @@ -1299,14 +1301,15 @@ remoteDispatchDomainBlockStatsFlags(virNetServerPtr server ATTRIBUTE_UNUSED, goto cleanup; flags = args->flags; - if (nparams > REMOTE_DOMAIN_BLOCK_STATS_PARAMETERS_MAX) { + if (args->nparams > REMOTE_DOMAIN_BLOCK_STATS_PARAMETERS_MAX) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("nparams too large")); goto cleanup; } - if (nparams && VIR_ALLOC_N(params, nparams) < 0) { + if (args->nparams && VIR_ALLOC_N(params, args->nparams) < 0) { virReportOOMError(); goto cleanup; } + nparams = args->nparams; if (virDomainBlockStatsFlags(dom, path, params, &nparams, flags) < 0) goto cleanup; @@ -1913,7 +1916,7 @@ remoteDispatchDomainGetMemoryParameters(virNetServerPtr server ATTRIBUTE_UNUSED, { virDomainPtr dom = NULL; virTypedParameterPtr params = NULL; - int nparams = args->nparams; + int nparams = 0; unsigned int flags; int rv = -1; struct daemonClientPrivate *priv = @@ -1926,14 +1929,15 @@ remoteDispatchDomainGetMemoryParameters(virNetServerPtr server ATTRIBUTE_UNUSED, flags = args->flags; - if (nparams > REMOTE_DOMAIN_MEMORY_PARAMETERS_MAX) { + if (args->nparams > REMOTE_DOMAIN_MEMORY_PARAMETERS_MAX) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("nparams too large")); goto cleanup; } - if (nparams && VIR_ALLOC_N(params, nparams) < 0) { + if (args->nparams && VIR_ALLOC_N(params, args->nparams) < 0) { virReportOOMError(); goto cleanup; } + nparams = args->nparams; if (!(dom = get_nonnull_domain(priv->conn, args->dom))) goto cleanup; @@ -1977,7 +1981,7 @@ remoteDispatchDomainGetNumaParameters(virNetServerPtr server ATTRIBUTE_UNUSED, { virDomainPtr dom = NULL; virTypedParameterPtr params = NULL; - int nparams = args->nparams; + int nparams = 0; unsigned int flags; int rv = -1; struct daemonClientPrivate *priv = @@ -1990,14 +1994,15 @@ remoteDispatchDomainGetNumaParameters(virNetServerPtr server ATTRIBUTE_UNUSED, flags = args->flags; - if (nparams > REMOTE_DOMAIN_NUMA_PARAMETERS_MAX) { + if (args->nparams > REMOTE_DOMAIN_NUMA_PARAMETERS_MAX) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("nparams too large")); goto cleanup; } - if (nparams && VIR_ALLOC_N(params, nparams) < 0) { + if (args->nparams && VIR_ALLOC_N(params, args->nparams) < 0) { virReportOOMError(); goto cleanup; } + nparams = args->nparams; if (!(dom = get_nonnull_domain(priv->conn, args->dom))) goto cleanup; @@ -2041,7 +2046,7 @@ remoteDispatchDomainGetBlkioParameters(virNetServerPtr server ATTRIBUTE_UNUSED, { virDomainPtr dom = NULL; virTypedParameterPtr params = NULL; - int nparams = args->nparams; + int nparams = 0; unsigned int flags; int rv = -1; struct daemonClientPrivate *priv = @@ -2054,14 +2059,15 @@ remoteDispatchDomainGetBlkioParameters(virNetServerPtr server ATTRIBUTE_UNUSED, flags = args->flags; - if (nparams > REMOTE_DOMAIN_BLKIO_PARAMETERS_MAX) { + if (args->nparams > REMOTE_DOMAIN_BLKIO_PARAMETERS_MAX) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("nparams too large")); goto cleanup; } - if (nparams && VIR_ALLOC_N(params, nparams) < 0) { + if (args->nparams && VIR_ALLOC_N(params, args->nparams) < 0) { virReportOOMError(); goto cleanup; } + nparams = args->nparams; if (!(dom = get_nonnull_domain(priv->conn, args->dom))) goto cleanup; @@ -2106,7 +2112,7 @@ remoteDispatchNodeGetCPUStats(virNetServerPtr server ATTRIBUTE_UNUSED, virNodeCPUStatsPtr params = NULL; int i; int cpuNum = args->cpuNum; - int nparams = args->nparams; + int nparams = 0; unsigned int flags; int rv = -1; struct daemonClientPrivate *priv = @@ -2119,14 +2125,15 @@ remoteDispatchNodeGetCPUStats(virNetServerPtr server ATTRIBUTE_UNUSED, flags = args->flags; - if (nparams > REMOTE_NODE_CPU_STATS_MAX) { + if (args->nparams > REMOTE_NODE_CPU_STATS_MAX) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("nparams too large")); goto cleanup; } - if (VIR_ALLOC_N(params, nparams) < 0) { + if (args->nparams && VIR_ALLOC_N(params, args->nparams) < 0) { virReportOOMError(); goto cleanup; } + nparams = args->nparams; if (virNodeGetCPUStats(priv->conn, cpuNum, params, &nparams, flags) < 0) goto cleanup; @@ -2184,7 +2191,7 @@ remoteDispatchNodeGetMemoryStats(virNetServerPtr server ATTRIBUTE_UNUSED, virNodeMemoryStatsPtr params = NULL; int i; int cellNum = args->cellNum; - int nparams = args->nparams; + int nparams = 0; unsigned int flags; int rv = -1; struct daemonClientPrivate *priv = @@ -2197,14 +2204,15 @@ remoteDispatchNodeGetMemoryStats(virNetServerPtr server ATTRIBUTE_UNUSED, flags = args->flags; - if (nparams > REMOTE_NODE_MEMORY_STATS_MAX) { + if (args->nparams > REMOTE_NODE_MEMORY_STATS_MAX) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("nparams too large")); goto cleanup; } - if (VIR_ALLOC_N(params, nparams) < 0) { + if (args->nparams && VIR_ALLOC_N(params, args->nparams) < 0) { virReportOOMError(); goto cleanup; } + nparams = args->nparams; if (virNodeGetMemoryStats(priv->conn, cellNum, params, &nparams, flags) < 0) goto cleanup; @@ -2303,7 +2311,7 @@ remoteDispatchDomainGetBlockIoTune(virNetServerPtr server ATTRIBUTE_UNUSED, virDomainPtr dom = NULL; int rv = -1; virTypedParameterPtr params = NULL; - int nparams = args->nparams; + int nparams = 0; struct daemonClientPrivate *priv = virNetServerClientGetPrivateData(client); @@ -2312,15 +2320,16 @@ remoteDispatchDomainGetBlockIoTune(virNetServerPtr server ATTRIBUTE_UNUSED, goto cleanup; } - if (nparams > REMOTE_DOMAIN_BLOCK_IO_TUNE_PARAMETERS_MAX) { + if (args->nparams > REMOTE_DOMAIN_BLOCK_IO_TUNE_PARAMETERS_MAX) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("nparams too large")); goto cleanup; } - if (nparams && VIR_ALLOC_N(params, nparams) < 0) { + if (args->nparams && VIR_ALLOC_N(params, args->nparams) < 0) { virReportOOMError(); goto cleanup; } + nparams = args->nparams; if (!(dom = get_nonnull_domain(priv->conn, args->dom))) goto cleanup; @@ -3800,7 +3809,7 @@ remoteDispatchDomainGetInterfaceParameters(virNetServerPtr server ATTRIBUTE_UNUS virDomainPtr dom = NULL; virTypedParameterPtr params = NULL; const char *device = args->device; - int nparams = args->nparams; + int nparams = 0; unsigned int flags; int rv = -1; struct daemonClientPrivate *priv = @@ -3813,14 +3822,15 @@ remoteDispatchDomainGetInterfaceParameters(virNetServerPtr server ATTRIBUTE_UNUS flags = args->flags; - if (nparams > REMOTE_DOMAIN_INTERFACE_PARAMETERS_MAX) { + if (args->nparams > REMOTE_DOMAIN_INTERFACE_PARAMETERS_MAX) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("nparams too large")); goto cleanup; } - if (nparams && VIR_ALLOC_N(params, nparams) < 0) { + if (args->nparams && VIR_ALLOC_N(params, args->nparams) < 0) { virReportOOMError(); goto cleanup; } + nparams = args->nparams; if (!(dom = get_nonnull_domain(priv->conn, args->dom))) goto cleanup; @@ -4508,7 +4518,7 @@ remoteDispatchNodeGetMemoryParameters(virNetServerPtr server ATTRIBUTE_UNUSED, remote_node_get_memory_parameters_ret *ret) { virTypedParameterPtr params = NULL; - int nparams = args->nparams; + int nparams = 0; unsigned int flags; int rv = -1; struct daemonClientPrivate *priv = @@ -4521,15 +4531,15 @@ remoteDispatchNodeGetMemoryParameters(virNetServerPtr server ATTRIBUTE_UNUSED, flags = args->flags; - if (nparams > REMOTE_NODE_MEMORY_PARAMETERS_MAX) { + if (args->nparams > REMOTE_NODE_MEMORY_PARAMETERS_MAX) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("nparams too large")); goto cleanup; } - if (nparams && VIR_ALLOC_N(params, nparams) < 0) { + if (args->nparams && VIR_ALLOC_N(params, args->nparams) < 0) { virReportOOMError(); goto cleanup; } - + nparams = args->nparams; if (virNodeGetMemoryParameters(priv->conn, params, &nparams, flags) < 0) goto cleanup; -- 1.8.2.1

2 1

[libvirt] [RFC] New API to retrieve node CPU map
by Viktor Mihajlovski 02 May '13

02 May '13

Hi, in order to use the APIs listed below it is necessary for a client to know the maximum number of node CPUs which is passed via the maplen argument. virDomainGetEmulatorPinInfo virDomainGetVcpuPinInfo virDomainGetVcpus virDomainPinEmulator virDomainPinVcpu virDomainPinVcpuFlags The current approach uses virNodeGetInfo to determine the maximum CPU number. This can lead to incorrect results if not all node CPUs are online. The maximum CPU number should always be the number of CPUs present on the host, regardless of their online/offline state. The following example illustrates the issue: Host has 3 logical CPUs, 1 socket, 3 cores, 1 thread. Guest has 1 virtual CPU and is started while all 3 host CPUs are online. $ virsh vcpuinfo guest VCPU: 0 CPU: 0 State: running CPU time: 35.4s CPU Affinity: yyy $ echo 0 > /sys/devices/system/cpu/cpu1/online $ virsh vcpuinfo guest VCPU: 0 CPU: 0 State: running CPU time: 35.5s CPU Affinity: y- The correct display for CPU affinity would have been y-y, as the guest continues to use CPUs 0 and 2. This is not a display problem only, because it is also not possible to explicitly pin the virtual CPU to host CPUs 0 and 2, due to the truncated CPU mask. PROPOSAL: To help solve the issue above I suggest two new public API functions: int virNodeGetCpuNum(virConnectPtr conn); returning the number of present CPUs on the host or -1 upon failure and int virNodeGetCpuMap(virConnectPtr conn, unsigned char * cpumap, int maplen); returning the number of present CPUs or -1 on failure and storing a bit map of real CPUs as described in virDomainPinVcpu in cpumap. The bits in the bit map are set to 1 for online CPUs and set to 0 for offline CPUs. Implementation is facilitated by the function nodeGetCPUmap in nodeinfo.c. Clients can use virNodeGetCpuNum to properly determine the maximum number of node CPUs and the online/offline information. Thanks for your comments. -- Mit freundlichen Grüßen/Kind Regards Viktor Mihajlovski IBM Deutschland Research & Development GmbH Vorsitzender des Aufsichtsrats: Martin Jetter Geschäftsführung: Dirk Wittkopp Sitz der Gesellschaft: Böblingen Registergericht: Amtsgericht Stuttgart, HRB 243294

4 10

[libvirt] [PATCH] portability: handle ifreq differences in virnetdev
by Roman Bogorodskiy 02 May '13

02 May '13

FreeBSD (and maybe other BSDs) have different member names in struct ifreq when compared to Linux, such as: - uses ifr_data instead of ifr_newname for setting interface names - uses ifr_index instead of ifr_ifindex for interface index Also, add a check for SIOCGIFHWADDR for virNetDevValidateConfig(). Use AF_LOCAL if AF_PACKET is not available. --- configure.ac | 8 ++++++++ src/util/virnetdev.c | 23 +++++++++++++++++------ 2 files changed, 25 insertions(+), 6 deletions(-) diff --git a/configure.ac b/configure.ac index 23c24d2..4a32f8c 100644 --- a/configure.ac +++ b/configure.ac @@ -2363,6 +2363,14 @@ AM_CONDITIONAL([HAVE_LIBNL], [test "$have_libnl" = "yes"]) AC_SUBST([LIBNL_CFLAGS]) AC_SUBST([LIBNL_LIBS]) +AC_CHECK_MEMBERS([struct ifreq.ifr_newname, + struct ifreq.ifr_ifindex, + struct ifreq.ifr_index], + [], [], + [#include <sys/ioctl.h> + #include <net/if.h> + ]) + # Only COPYING.LIB is under version control, yet COPYING # is included as part of the distribution tarball. # Copy one to the other, but only if this is a srcdir-build. diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c index 7ffaac1..02c1716 100644 --- a/src/util/virnetdev.c +++ b/src/util/virnetdev.c @@ -38,7 +38,10 @@ #ifdef __linux__ # include <linux/sockios.h> # include <linux/if_vlan.h> -#elif !defined(AF_PACKET) +# define VIR_NETDEV_FAMILY AF_PACKET +#elif defined(HAVE_STRUCT_IFREQ) && defined(AF_LOCAL) +# define VIR_NETDEV_FAMILY AF_LOCAL +#else # undef HAVE_STRUCT_IFREQ #endif @@ -81,7 +84,7 @@ static int virNetDevSetupControlFull(const char *ifname, static int virNetDevSetupControl(const char *ifname, struct ifreq *ifr) { - return virNetDevSetupControlFull(ifname, ifr, AF_PACKET, SOCK_DGRAM); + return virNetDevSetupControlFull(ifname, ifr, VIR_NETDEV_FAMILY, SOCK_DGRAM); } #endif @@ -478,12 +481,16 @@ int virNetDevSetName(const char* ifname, const char *newifname) if ((fd = virNetDevSetupControl(ifname, &ifr)) < 0) return -1; +#if !defined(HAVE_STRUCT_IFREQ_IFR_NEWNAME) + ifr.ifr_data = (caddr_t)newifname; +#else if (virStrcpyStatic(ifr.ifr_newname, newifname) == NULL) { virReportSystemError(ERANGE, _("Network interface name '%s' is too long"), newifname); goto cleanup; } +#endif if (ioctl(fd, SIOCSIFNAME, &ifr)) { virReportSystemError(errno, @@ -630,7 +637,7 @@ int virNetDevGetIndex(const char *ifname, int *ifindex) { int ret = -1; struct ifreq ifreq; - int fd = socket(PF_PACKET, SOCK_DGRAM, 0); + int fd = socket(VIR_NETDEV_FAMILY, SOCK_DGRAM, 0); if (fd < 0) { virReportSystemError(errno, "%s", @@ -654,7 +661,11 @@ int virNetDevGetIndex(const char *ifname, int *ifindex) goto cleanup; } +#if defined(HAVE_STRUCT_IFREQ_IFR_INDEX) + *ifindex = ifreq.ifr_index; +#else *ifindex = ifreq.ifr_ifindex; +#endif ret = 0; cleanup: @@ -870,7 +881,7 @@ int virNetDevGetIPv4Address(const char *ifname ATTRIBUTE_UNUSED, * * Returns 1 if the config matches, 0 if the config does not match, or interface does not exist, -1 on error */ -#if defined(HAVE_STRUCT_IFREQ) +#if defined(SIOCGIFHWADDR) && defined(HAVE_STRUCT_IFREQ) int virNetDevValidateConfig(const char *ifname, const virMacAddrPtr macaddr, int ifindex) { @@ -924,7 +935,7 @@ int virNetDevValidateConfig(const char *ifname, VIR_FORCE_CLOSE(fd); return ret; } -#else /* ! HAVE_STRUCT_IFREQ */ +#else int virNetDevValidateConfig(const char *ifname ATTRIBUTE_UNUSED, const virMacAddrPtr macaddr ATTRIBUTE_UNUSED, int ifindex ATTRIBUTE_UNUSED) @@ -933,7 +944,7 @@ int virNetDevValidateConfig(const char *ifname ATTRIBUTE_UNUSED, _("Unable to check interface config on this platform")); return -1; } -#endif /* ! HAVE_STRUCT_IFREQ */ +#endif #ifdef __linux__ -- 1.8.0

2 4