- Devel - libvirt List Archives

[libvirt] [PATCH REPOST 0/5] admin: Introduce APIs to get/set client processing
by Erik Skultety 11 May '16

11 May '16

This is just a rebased version of https://www.redhat.com/archives/libvir-list/2016-April/msg00466.html. Patches 1/7 and 2/7 of the original series were already pushed with another series. Erik Skultety (5): virnetserver: Introduce client processing controls getters admin: Introduce some public constants related to client processing controls admin: Introduce virAdmServerGetClientProcessingControls admin: Introduce virAdmServerSetClientProcessingControls virt-admin: Introduce commands srv-clients-info and srv-clients-set daemon/admin.c | 86 +++++++++++++++++++ daemon/admin_server.c | 76 +++++++++++++++++ daemon/admin_server.h | 10 +++ include/libvirt/libvirt-admin.h | 52 ++++++++++++ src/admin/admin_protocol.x | 30 ++++++- src/admin/admin_remote.c | 74 +++++++++++++++++ src/admin_protocol-structs | 20 +++++ src/libvirt-admin.c | 89 ++++++++++++++++++++ src/libvirt_admin_private.syms | 3 + src/libvirt_admin_public.syms | 2 + src/rpc/virnetserver.c | 83 +++++++++++++++++++ src/rpc/virnetserver.h | 9 ++ tools/virt-admin.c | 177 ++++++++++++++++++++++++++++++++++++++++ 13 files changed, 710 insertions(+), 1 deletion(-) -- 2.5.5

2 15

[libvirt] [PATCH 0/5] domaincaps: Report spice GL capabilities
by Cole Robinson 11 May '16

11 May '16

This extends domain capabilities to report some bits apps will want to determine if spice GL is supported: <domainCapabilities> <devices> <video supported='yes'> <enum name='modelType'/> <enum name='virtioAccel3D'/> </video> <graphics supported='yes'> <enum name='type'/> <enum name='spiceGL'/> </graphics> </devices> </domainCapabilities> Cole Robinson (5): domaincaps: Report graphics type enum domaincaps: Report video modelType domaincaps: Report graphics spiceGL qemu: command: unconditionally allow accel3d='no' domaincaps: Report graphics spiceGL docs/formatdomaincaps.html.in | 76 +++++++++++++++++++++- docs/schemas/domaincaps.rng | 16 +++++ src/conf/domain_capabilities.c | 28 ++++++++ src/conf/domain_capabilities.h | 21 ++++++ src/qemu/qemu_capabilities.c | 53 ++++++++++++++- src/qemu/qemu_command.c | 2 +- tests/domaincapsschemadata/domaincaps-basic.xml | 2 + tests/domaincapsschemadata/domaincaps-full.xml | 31 +++++++++ .../domaincaps-qemu_1.6.50-1.xml | 21 ++++++ .../domaincaps-qemu_2.6.0-1.xml | 24 +++++++ .../domaincaps-qemu_2.6.0-2.xml | 19 ++++++ .../domaincaps-qemu_2.6.0-3.xml | 19 ++++++ .../domaincaps-qemu_2.6.0-4.xml | 19 ++++++ .../domaincaps-qemu_2.6.0-5.xml | 19 ++++++ tests/domaincapstest.c | 10 +++ 15 files changed, 357 insertions(+), 3 deletions(-) -- 2.7.4

5 25

[libvirt] [PATCH 0/2] *** use virGetLastErrorMessage ***
by Jovanka Gulicoska 11 May '16

11 May '16

*** BLURB HERE *** Jovanka Gulicoska (2): tests: use virGetLastErrorMessage() Use virGetLastErrorMessage()

3 9

[libvirt] [PATCH 0/3] Patches for some device mapper multipath issues
by John Ferlan 11 May '16

11 May '16

Patch 1 just makes sure that prior to calling refreshPool we make sure to clear the objects; otherwise, the refresh code will duplicate. Text within patch 3 seems to indicate that entries were showing up more than once - although those may be bug related. In any case, although perhaps not necessary here - better safe than sorry. Patch 2 is a rework of changes that went into 1.3.2 related to how libvirt_parthelper generates the volume target path name that didn't quite get the algorithm right when the device source path ended with a non numeric value. As it turns out it seems the naming algorithm is much "simpler"; however, rather than just remove the attribute, I figured it should be kept "just in case" something *needed* to add that "p" it would be possible. It seems from output described here: https://access.redhat.com/documentation/en-US/Red_Hat_Enterprise_Linux/7/ht… That it would be possible. Patch 3 was probably seen because Patch 2 testing occurs, so the same "sequence" used in other disk backend based testing was attempted. As it turns out, I don't believe the deletion for a multipath device ever really worked. The original patch could have been reverted except that it intermingled changes to support linking device-mapper with parthelper. John Ferlan (3): storage: Need to clear pool prior to calling the refreshPool storage: Fix algorithm generating path names for devmapper storage: Fix virStorageBackendDiskDeleteVol for device mapper configure.ac | 15 ++---- docs/formatstorage.html.in | 18 ++----- src/storage/parthelper.c | 13 +++-- src/storage/storage_backend_disk.c | 108 ++++++++++++++++++++++++------------- src/storage/storage_driver.c | 3 ++ 5 files changed, 89 insertions(+), 68 deletions(-) -- 2.5.5

2 6

[libvirt] [PATCH] libxl: fix vm lock overwritten bug
by Wang Yufei 11 May '16

11 May '16

In libxl driver we do virObjectRef in libxlDomainObjBeginJob, If virCondWaitUntil failed, it goes to error, do virObjectUnref, There's a chance that someone undefine the vm at the same time, and refs unref to zero, vm is freed in libxlDomainObjBeginJob. But the vm outside function is not Null, we do virObjectUnlock(vm). That's how we overwrite the vm memory after it's freed. Because the coding amount is much, I fix it partly in libxlDomainCreateWithFlags. If my opinion is right and there're no problems, I'll fix them all later. Signed-off-by: Wang Yufei <james.wangyufei(a)huawei.com> --- .gnulib | 1 - src/libxl/libxl_domain.c | 6 +----- src/libxl/libxl_domain.h | 2 +- src/libxl/libxl_driver.c | 5 ++--- 4 files changed, 4 insertions(+), 10 deletions(-) delete mode 160000 .gnulib diff --git a/.gnulib b/.gnulib deleted file mode 160000 index 6cc32c6..0000000 --- a/.gnulib +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 6cc32c63e80bc1a30c521b2f07f2b54909b59892 diff --git a/src/libxl/libxl_domain.c b/src/libxl/libxl_domain.c index 14a900c..a90ce53 100644 --- a/src/libxl/libxl_domain.c +++ b/src/libxl/libxl_domain.c @@ -123,7 +123,6 @@ libxlDomainObjBeginJob(libxlDriverPrivatePtr driver ATTRIBUTE_UNUSED, return -1; then = now + LIBXL_JOB_WAIT_TIME; - virObjectRef(obj); while (priv->job.active) { VIR_DEBUG("Wait normal job condition for starting job: %s", @@ -157,7 +156,6 @@ libxlDomainObjBeginJob(libxlDriverPrivatePtr driver ATTRIBUTE_UNUSED, virReportSystemError(errno, "%s", _("cannot acquire job mutex")); - virObjectUnref(obj); return -1; } @@ -171,7 +169,7 @@ libxlDomainObjBeginJob(libxlDriverPrivatePtr driver ATTRIBUTE_UNUSED, * non-zero, false if the reference count has dropped to zero * and obj is disposed. */ -bool +void libxlDomainObjEndJob(libxlDriverPrivatePtr driver ATTRIBUTE_UNUSED, virDomainObjPtr obj) { @@ -183,8 +181,6 @@ libxlDomainObjEndJob(libxlDriverPrivatePtr driver ATTRIBUTE_UNUSED, libxlDomainObjResetJob(priv); virCondSignal(&priv->job.cond); - - return virObjectUnref(obj); } int diff --git a/src/libxl/libxl_domain.h b/src/libxl/libxl_domain.h index 1c1eba3..ce28944 100644 --- a/src/libxl/libxl_domain.h +++ b/src/libxl/libxl_domain.h @@ -85,7 +85,7 @@ libxlDomainObjBeginJob(libxlDriverPrivatePtr driver, enum libxlDomainJob job) ATTRIBUTE_RETURN_CHECK; -bool +void libxlDomainObjEndJob(libxlDriverPrivatePtr driver, virDomainObjPtr obj) ATTRIBUTE_RETURN_CHECK; diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index bf97c9c..a46994a 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -294,7 +294,7 @@ libxlDomObjFromDomain(virDomainPtr dom) libxlDriverPrivatePtr driver = dom->conn->privateData; char uuidstr[VIR_UUID_STRING_BUFLEN]; - vm = virDomainObjListFindByUUID(driver->domains, dom->uuid); + vm = virDomainObjListFindByUUIDRef(driver->domains, dom->uuid); if (!vm) { virUUIDFormat(dom->uuid, uuidstr); virReportError(VIR_ERR_NO_DOMAIN, @@ -2691,8 +2691,7 @@ libxlDomainCreateWithFlags(virDomainPtr dom, vm = NULL; cleanup: - if (vm) - virObjectUnlock(vm); + virDomainObjEndAPI(&vm); return ret; } -- 1.9.5.msysgit.1

3 3

[libvirt] [PATCH v2] storage: Fix regression cloning volume into a logical pool
by John Ferlan 11 May '16

11 May '16

https://bugzilla.redhat.com/show_bug.cgi?id=1318993 Commit id 'dd519a294' caused a regression cloning a volume into a logical pool by removing just the 'allocation' adjustment during storageVolCreateXMLFrom. Combined with the change to not require the new volume input XML to have a capacity listed (commit id 'e3f1d2a8') left the possibility that a copy from a larger volume into a smaller volume would create a thin/sparse logical volume. If a thin lv becomes fully populated, then LVM will set the partition 'inactive' and the subsequent fdatasync() would fail. In order to fix this in a backend agnostic manner, only adjust the new capacity if not provided. Likewise, if the new allocation is not provided, then use the capacity value as we document that if omitted, the volume will be fully allocated at time of creation. In order to ascertain that <allocation> == 0 was because it was not provided and not because it was provided as a 0 value, add a has_allocation flag which will be checked during in order to honor the possibility that <capacity> was provided as some value and <allocation> was provided as 0. For a logical backend, that creation time is 'createVol', while for a file backend, creation doesn't set the size, but the 'createRaw' called during buildVolFrom will decide whether the file is sparse or not based on the provided capacity and allocation value. For volume clones that provide different allocation and capacity values to allow for sparse files, there is no change. Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- v1: http://www.redhat.com/archives/libvir-list/2016-April/msg01994.html src/conf/storage_conf.c | 1 + src/storage/storage_driver.c | 18 +++++++++++++++--- src/util/virstoragefile.c | 1 + src/util/virstoragefile.h | 2 ++ 4 files changed, 19 insertions(+), 3 deletions(-) diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c index 0b91956..6932195 100644 --- a/src/conf/storage_conf.c +++ b/src/conf/storage_conf.c @@ -1370,6 +1370,7 @@ virStorageVolDefParseXML(virStoragePoolDefPtr pool, unit = virXPathString("string(./allocation/@unit)", ctxt); if (virStorageSize(unit, allocation, &ret->target.allocation) < 0) goto error; + ret->target.has_allocation = true; } else { ret->target.allocation = ret->target.capacity; } diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c index 1d42f24..0afe522 100644 --- a/src/storage/storage_driver.c +++ b/src/storage/storage_driver.c @@ -2034,11 +2034,23 @@ storageVolCreateXMLFrom(virStoragePoolPtr obj, goto cleanup; } - /* Use the original volume's capacity in case the new capacity - * is less than that, or it was omitted */ - if (newvol->target.capacity < origvol->target.capacity) + /* Use the original volume's capacity if the new capacity was omitted. + * If the provided newvol capacity is less than original, we cannot just + * use the original since the subsequent createVol has "competing needs" + * for backends. A logical volume backend could then create a thin lv + * that has different characteristics when copying from the original + * volume than perhaps a raw disk file. */ + if (newvol->target.capacity == 0) newvol->target.capacity = origvol->target.capacity; + /* If the new allocation is 0 and the allocation was not provided in + * the XML, then use capacity as it's specifically documented "If + * omitted when creating a volume, the volume will be fully allocated + * at time of creation.". This is especially important for logical + * volume creation. */ + if (newvol->target.allocation == 0 && !newvol->target.has_allocation) + newvol->target.allocation = newvol->target.capacity; + if (!backend->buildVolFrom) { virReportError(VIR_ERR_NO_SUPPORT, "%s", _("storage pool does not support" diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c index 4f44e05..d4e61ca 100644 --- a/src/util/virstoragefile.c +++ b/src/util/virstoragefile.c @@ -1835,6 +1835,7 @@ virStorageSourceCopy(const virStorageSource *src, ret->format = src->format; ret->capacity = src->capacity; ret->allocation = src->allocation; + ret->has_allocation = src->has_allocation; ret->physical = src->physical; ret->readonly = src->readonly; ret->shared = src->shared; diff --git a/src/util/virstoragefile.h b/src/util/virstoragefile.h index 17e1277..b88e715 100644 --- a/src/util/virstoragefile.h +++ b/src/util/virstoragefile.h @@ -260,6 +260,8 @@ struct _virStorageSource { unsigned long long capacity; /* in bytes, 0 if unknown */ unsigned long long allocation; /* in bytes, 0 if unknown */ unsigned long long physical; /* in bytes, 0 if unknown */ + bool has_allocation; /* Set to true when provided in XML */ + size_t nseclabels; virSecurityDeviceLabelDefPtr *seclabels; -- 2.5.5

2 2

[libvirt] [PATCH] virt-aa-helper: fix clang build
by Pavel Hrdina 11 May '16

11 May '16

Clang complains about wrong argument type: libvirt/src/security/virt-aa-helper.c:174:11: error: absolute value function 'abs' given an argument of type 'long' but has parameter of type 'int' which may cause truncation of value [-Werror,-Wabsolute-value] idx = abs(pos - orig); ^ Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- src/security/virt-aa-helper.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c index 7eeb4ef..14f8afb 100644 --- a/src/security/virt-aa-helper.c +++ b/src/security/virt-aa-helper.c @@ -171,7 +171,7 @@ replace_string(char *orig, const size_t len, const char *oldstr, } tmp[0] = '\0'; - idx = abs(pos - orig); + idx = abs((int)(pos - orig)); /* copy everything up to oldstr */ strncat(tmp, orig, idx); -- 2.8.2

3 4

[libvirt] [PATCH 1/1] perf: add support to perf event for MBM
by Qiaowei Ren 11 May '16

11 May '16

MBM (Memory Bandwidth Monitoring) is a new feature introduced in some Intel processor families. MBM is build on the CMT (Cache Monitoring Technology) infrastructure to allow monitoring of bandwidth from one level of the cache hierarchy to the next. With current perf framework, this patch adds support to perf event for MBM. Signed-off-by: Qiaowei Ren <qiaowei.ren(a)intel.com> --- include/libvirt/libvirt-domain.h | 14 +++++++++++ src/qemu/qemu_driver.c | 50 ++++++++++++++++++++++++++++++++++++++++ src/util/virperf.c | 40 +++++++++++++++++++++----------- src/util/virperf.h | 2 ++ 4 files changed, 92 insertions(+), 14 deletions(-) diff --git a/include/libvirt/libvirt-domain.h b/include/libvirt/libvirt-domain.h index 160f20f..9c3795c 100644 --- a/include/libvirt/libvirt-domain.h +++ b/include/libvirt/libvirt-domain.h @@ -1904,6 +1904,20 @@ void virDomainStatsRecordListFree(virDomainStatsRecordPtr *stats); */ # define VIR_PERF_PARAM_CMT "cmt" +/** + * VIR_PERF_PARAM_MBMT: + * + * Macro for typed parameter name that represents MBMT perf event. + */ +# define VIR_PERF_PARAM_MBMT "mbmt" + +/** + * VIR_PERF_PARAM_MBML: + * + * Macro for typed parameter name that represents MBML perf event. + */ +# define VIR_PERF_PARAM_MBML "mbml" + int virDomainGetPerfEvents(virDomainPtr dom, virTypedParameterPtr *params, int *nparams, diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index c4c4968..8c79e49 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -10051,6 +10051,8 @@ qemuDomainSetPerfEvents(virDomainPtr dom, if (virTypedParamsValidate(params, nparams, VIR_PERF_PARAM_CMT, VIR_TYPED_PARAM_BOOLEAN, + VIR_PERF_PARAM_MBMT, VIR_TYPED_PARAM_BOOLEAN, + VIR_PERF_PARAM_MBML, VIR_TYPED_PARAM_BOOLEAN, NULL) < 0) return -1; @@ -19515,6 +19517,46 @@ qemuDomainGetStatsPerfCmt(virPerfPtr perf, } static int +qemuDomainGetStatsPerfMbmt(virPerfPtr perf, + virDomainStatsRecordPtr record, + int *maxparams) +{ + uint64_t total_bytes = 0; + + if (virPerfReadEvent(perf, VIR_PERF_EVENT_MBMT, &total_bytes) < 0) + return -1; + + if (virTypedParamsAddDouble(&record->params, + &record->nparams, + maxparams, + "perf.total_bytes", + total_bytes*1e-6) < 0) + return -1; + + return 0; +} + +static int +qemuDomainGetStatsPerfMbml(virPerfPtr perf, + virDomainStatsRecordPtr record, + int *maxparams) +{ + uint64_t local_bytes = 0; + + if (virPerfReadEvent(perf, VIR_PERF_EVENT_MBML, &local_bytes) < 0) + return -1; + + if (virTypedParamsAddDouble(&record->params, + &record->nparams, + maxparams, + "perf.local_bytes", + local_bytes*1e-6) < 0) + return -1; + + return 0; +} + +static int qemuDomainGetStatsPerf(virQEMUDriverPtr driver ATTRIBUTE_UNUSED, virDomainObjPtr dom, virDomainStatsRecordPtr record, @@ -19534,6 +19576,14 @@ qemuDomainGetStatsPerf(virQEMUDriverPtr driver ATTRIBUTE_UNUSED, if (qemuDomainGetStatsPerfCmt(priv->perf, record, maxparams) < 0) goto cleanup; break; + case VIR_PERF_EVENT_MBMT: + if (qemuDomainGetStatsPerfMbmt(priv->perf, record, maxparams) < 0) + goto cleanup; + break; + case VIR_PERF_EVENT_MBML: + if (qemuDomainGetStatsPerfMbml(priv->perf, record, maxparams) < 0) + goto cleanup; + break; } } diff --git a/src/util/virperf.c b/src/util/virperf.c index bd65587..7cfdd77 100644 --- a/src/util/virperf.c +++ b/src/util/virperf.c @@ -38,7 +38,7 @@ VIR_LOG_INIT("util.perf"); #define VIR_FROM_THIS VIR_FROM_PERF VIR_ENUM_IMPL(virPerfEvent, VIR_PERF_EVENT_LAST, - "cmt"); + "cmt", "mbmt", "mbml"); struct virPerfEvent { int type; @@ -132,26 +132,36 @@ virPerfCmtEnable(virPerfEventPtr event, } VIR_FREE(buf); - if (virFileReadAll("/sys/devices/intel_cqm/events/llc_occupancy.scale", - 10, &buf) < 0) - goto error; - - if (virStrToLong_ui(buf, NULL, 10, &scale) < 0) { - virReportSystemError(errno, "%s", - _("failed to get cmt scaling factor")); - goto error; - } - - event->efields.cmt.scale = scale; - memset(&cmt_attr, 0, sizeof(cmt_attr)); cmt_attr.size = sizeof(cmt_attr); cmt_attr.type = event_type; - cmt_attr.config = 1; cmt_attr.inherit = 1; cmt_attr.disabled = 1; cmt_attr.enable_on_exec = 0; + switch (event->type) { + case VIR_PERF_EVENT_CMT: + if (virFileReadAll("/sys/devices/intel_cqm/events/llc_occupancy.scale", + 10, &buf) < 0) + goto error; + + if (virStrToLong_ui(buf, NULL, 10, &scale) < 0) { + virReportSystemError(errno, "%s", + _("failed to get cmt scaling factor")); + goto error; + } + event->efields.cmt.scale = scale; + + cmt_attr.config = 1; + break; + case VIR_PERF_EVENT_MBMT: + cmt_attr.config = 2; + break; + case VIR_PERF_EVENT_MBML: + cmt_attr.config = 3; + break; + } + event->fd = syscall(__NR_perf_event_open, &cmt_attr, pid, -1, -1, 0); if (event->fd < 0) { virReportSystemError(errno, @@ -186,6 +196,8 @@ virPerfEventEnable(virPerfPtr perf, switch (type) { case VIR_PERF_EVENT_CMT: + case VIR_PERF_EVENT_MBMT: + case VIR_PERF_EVENT_MBML: if (virPerfCmtEnable(event, pid) < 0) return -1; break; diff --git a/src/util/virperf.h b/src/util/virperf.h index 8ec8753..769e85a 100644 --- a/src/util/virperf.h +++ b/src/util/virperf.h @@ -26,6 +26,8 @@ typedef enum { VIR_PERF_EVENT_CMT, + VIR_PERF_EVENT_MBMT, + VIR_PERF_EVENT_MBML, VIR_PERF_EVENT_LAST } virPerfEventType; -- 1.9.1

2 1

[libvirt] [PATCH] headers: Remove unnecessary keyword extern from function declaration
by Erik Skultety 11 May '16

11 May '16

Usage of this keyword in front of function declaration that is exported via a header file is unnecessary, since internally, this has been the default for most compilers for quite some time. Signed-off-by: Erik Skultety <eskultet(a)redhat.com> --- src/conf/capabilities.h | 28 +++++++------- src/cpu/cpu.h | 24 ++++++------ src/cpu/cpu_map.h | 2 +- src/lxc/lxc_fuse.h | 6 +-- src/util/virhashcode.h | 2 +- src/util/virlog.h | 78 +++++++++++++++++++-------------------- src/util/virstats.h | 4 +- src/xen/block_stats.h | 4 +- src/xen/xen_driver.h | 2 +- src/xenapi/xenapi_driver.h | 2 +- tools/virt-host-validate-common.h | 62 +++++++++++++++---------------- tools/virt-host-validate-lxc.h | 2 +- tools/virt-host-validate-qemu.h | 2 +- 13 files changed, 109 insertions(+), 109 deletions(-) diff --git a/src/conf/capabilities.h b/src/conf/capabilities.h index 2767f48..cfdc34a 100644 --- a/src/conf/capabilities.h +++ b/src/conf/capabilities.h @@ -204,27 +204,27 @@ struct _virCapsDomainData { }; -extern virCapsPtr +virCapsPtr virCapabilitiesNew(virArch hostarch, bool offlineMigrate, bool liveMigrate); -extern void +void virCapabilitiesFreeNUMAInfo(virCapsPtr caps); -extern int +int virCapabilitiesAddHostFeature(virCapsPtr caps, const char *name); -extern int +int virCapabilitiesAddHostMigrateTransport(virCapsPtr caps, const char *name); -extern int +int virCapabilitiesSetNetPrefix(virCapsPtr caps, const char *prefix); -extern int +int virCapabilitiesAddHostNUMACell(virCapsPtr caps, int num, unsigned long long mem, @@ -236,19 +236,19 @@ virCapabilitiesAddHostNUMACell(virCapsPtr caps, virCapsHostNUMACellPageInfoPtr pageinfo); -extern int +int virCapabilitiesSetHostCPU(virCapsPtr caps, virCPUDefPtr cpu); -extern virCapsGuestMachinePtr * +virCapsGuestMachinePtr * virCapabilitiesAllocMachines(const char *const *names, int nnames); -extern void +void virCapabilitiesFreeMachines(virCapsGuestMachinePtr *machines, int nmachines); -extern virCapsGuestPtr +virCapsGuestPtr virCapabilitiesAddGuest(virCapsPtr caps, int ostype, virArch arch, @@ -257,7 +257,7 @@ virCapabilitiesAddGuest(virCapsPtr caps, int nmachines, virCapsGuestMachinePtr *machines); -extern virCapsGuestDomainPtr +virCapsGuestDomainPtr virCapabilitiesAddGuestDomain(virCapsGuestPtr guest, int hvtype, const char *emulator, @@ -265,13 +265,13 @@ virCapabilitiesAddGuestDomain(virCapsGuestPtr guest, int nmachines, virCapsGuestMachinePtr *machines); -extern virCapsGuestFeaturePtr +virCapsGuestFeaturePtr virCapabilitiesAddGuestFeature(virCapsGuestPtr guest, const char *name, bool defaultOn, bool toggle); -extern int +int virCapabilitiesHostSecModelAddBaseLabel(virCapsHostSecModelPtr secmodel, const char *type, const char *label); @@ -288,7 +288,7 @@ void virCapabilitiesClearHostNUMACellCPUTopology(virCapsHostNUMACellCPUPtr cpu, size_t ncpus); -extern char * +char * virCapabilitiesFormatXML(virCapsPtr caps); virBitmapPtr virCapabilitiesGetCpusForNodemask(virCapsPtr caps, diff --git a/src/cpu/cpu.h b/src/cpu/cpu.h index 7375876..f15dc16 100644 --- a/src/cpu/cpu.h +++ b/src/cpu/cpu.h @@ -122,19 +122,19 @@ struct cpuArchDriver { }; -extern virCPUCompareResult +virCPUCompareResult cpuCompareXML(virCPUDefPtr host, const char *xml, bool failIncompatible) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2); -extern virCPUCompareResult +virCPUCompareResult cpuCompare (virCPUDefPtr host, virCPUDefPtr cpu, bool failIncompatible) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2); -extern int +int cpuDecode (virCPUDefPtr cpu, const virCPUData *data, const char **models, @@ -142,7 +142,7 @@ cpuDecode (virCPUDefPtr cpu, const char *preferred) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2); -extern int +int cpuEncode (virArch arch, const virCPUDef *cpu, virCPUDataPtr *forced, @@ -153,27 +153,27 @@ cpuEncode (virArch arch, virCPUDataPtr *vendor) ATTRIBUTE_NONNULL(2); -extern void +void cpuDataFree (virCPUDataPtr data); -extern virCPUDataPtr +virCPUDataPtr cpuNodeData (virArch arch); -extern virCPUCompareResult +virCPUCompareResult cpuGuestData(virCPUDefPtr host, virCPUDefPtr guest, virCPUDataPtr *data, char **msg) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2); -extern char * +char * cpuBaselineXML(const char **xmlCPUs, unsigned int ncpus, const char **models, unsigned int nmodels, unsigned int flags); -extern virCPUDefPtr +virCPUDefPtr cpuBaseline (virCPUDefPtr *cpus, unsigned int ncpus, const char **models, @@ -181,12 +181,12 @@ cpuBaseline (virCPUDefPtr *cpus, unsigned int flags) ATTRIBUTE_NONNULL(1); -extern int +int cpuUpdate (virCPUDefPtr guest, const virCPUDef *host) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2); -extern int +int cpuHasFeature(const virCPUData *data, const char *feature) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2); @@ -198,7 +198,7 @@ cpuModelIsAllowed(const char *model, unsigned int nmodels) ATTRIBUTE_NONNULL(1); -extern int +int cpuGetModels(const char *arch, char ***models) ATTRIBUTE_NONNULL(1); diff --git a/src/cpu/cpu_map.h b/src/cpu/cpu_map.h index fcd6c34..6b476fd 100644 --- a/src/cpu/cpu_map.h +++ b/src/cpu/cpu_map.h @@ -43,7 +43,7 @@ typedef int xmlXPathContextPtr ctxt, void *data); -extern int +int cpuMapLoad(const char *arch, cpuMapLoadCallback cb, void *data); diff --git a/src/lxc/lxc_fuse.h b/src/lxc/lxc_fuse.h index d60492b..38bbe22 100644 --- a/src/lxc/lxc_fuse.h +++ b/src/lxc/lxc_fuse.h @@ -57,8 +57,8 @@ struct virLXCFuse { }; typedef struct virLXCFuse *virLXCFusePtr; -extern int lxcSetupFuse(virLXCFusePtr *f, virDomainDefPtr def); -extern int lxcStartFuse(virLXCFusePtr f); -extern void lxcFreeFuse(virLXCFusePtr *f); +int lxcSetupFuse(virLXCFusePtr *f, virDomainDefPtr def); +int lxcStartFuse(virLXCFusePtr f); +void lxcFreeFuse(virLXCFusePtr *f); #endif /* LXC_FUSE_H */ diff --git a/src/util/virhashcode.h b/src/util/virhashcode.h index 09e6eeb..7732f81 100644 --- a/src/util/virhashcode.h +++ b/src/util/virhashcode.h @@ -30,6 +30,6 @@ # include "internal.h" -extern uint32_t virHashCodeGen(const void *key, size_t len, uint32_t seed); +uint32_t virHashCodeGen(const void *key, size_t len, uint32_t seed); #endif /* __VIR_HASH_CODE_H__ */ diff --git a/src/util/virlog.h b/src/util/virlog.h index b5056f5..3ad00d4 100644 --- a/src/util/virlog.h +++ b/src/util/virlog.h @@ -170,50 +170,50 @@ typedef enum { VIR_LOG_STACK_TRACE = (1 << 0), } virLogFlags; -extern int virLogGetNbFilters(void); -extern int virLogGetNbOutputs(void); -extern char *virLogGetFilters(void); -extern char *virLogGetOutputs(void); -extern virLogPriority virLogGetDefaultPriority(void); -extern int virLogSetDefaultPriority(virLogPriority priority); -extern void virLogSetFromEnv(void); -extern int virLogDefineFilter(const char *match, - virLogPriority priority, - unsigned int flags); -extern int virLogDefineOutput(virLogOutputFunc f, - virLogCloseFunc c, - void *data, - virLogPriority priority, - virLogDestination dest, - const char *name, - unsigned int flags); +int virLogGetNbFilters(void); +int virLogGetNbOutputs(void); +char *virLogGetFilters(void); +char *virLogGetOutputs(void); +virLogPriority virLogGetDefaultPriority(void); +int virLogSetDefaultPriority(virLogPriority priority); +void virLogSetFromEnv(void); +int virLogDefineFilter(const char *match, + virLogPriority priority, + unsigned int flags); +int virLogDefineOutput(virLogOutputFunc f, + virLogCloseFunc c, + void *data, + virLogPriority priority, + virLogDestination dest, + const char *name, + unsigned int flags); /* * Internal logging API */ -extern void virLogLock(void); -extern void virLogUnlock(void); -extern int virLogReset(void); -extern int virLogParseDefaultPriority(const char *priority); -extern int virLogParseFilters(const char *filters); -extern int virLogParseOutputs(const char *output); -extern int virLogPriorityFromSyslog(int priority); -extern void virLogMessage(virLogSourcePtr source, - virLogPriority priority, - const char *filename, - int linenr, - const char *funcname, - virLogMetadataPtr metadata, - const char *fmt, ...) ATTRIBUTE_FMT_PRINTF(7, 8); -extern void virLogVMessage(virLogSourcePtr source, - virLogPriority priority, - const char *filename, - int linenr, - const char *funcname, - virLogMetadataPtr metadata, - const char *fmt, - va_list vargs) ATTRIBUTE_FMT_PRINTF(7, 0); +void virLogLock(void); +void virLogUnlock(void); +int virLogReset(void); +int virLogParseDefaultPriority(const char *priority); +int virLogParseFilters(const char *filters); +int virLogParseOutputs(const char *output); +int virLogPriorityFromSyslog(int priority); +void virLogMessage(virLogSourcePtr source, + virLogPriority priority, + const char *filename, + int linenr, + const char *funcname, + virLogMetadataPtr metadata, + const char *fmt, ...) ATTRIBUTE_FMT_PRINTF(7, 8); +void virLogVMessage(virLogSourcePtr source, + virLogPriority priority, + const char *filename, + int linenr, + const char *funcname, + virLogMetadataPtr metadata, + const char *fmt, + va_list vargs) ATTRIBUTE_FMT_PRINTF(7, 0); bool virLogProbablyLogMessage(const char *str); diff --git a/src/util/virstats.h b/src/util/virstats.h index d2c6b64..69f4cf1 100644 --- a/src/util/virstats.h +++ b/src/util/virstats.h @@ -25,7 +25,7 @@ # include "internal.h" -extern int virNetInterfaceStats(const char *path, - virDomainInterfaceStatsPtr stats); +int virNetInterfaceStats(const char *path, + virDomainInterfaceStatsPtr stats); #endif /* __STATS_LINUX_H__ */ diff --git a/src/xen/block_stats.h b/src/xen/block_stats.h index 6cc9959..b9c5ad6 100644 --- a/src/xen/block_stats.h +++ b/src/xen/block_stats.h @@ -27,11 +27,11 @@ # include "xen_driver.h" -extern int xenLinuxDomainBlockStats (xenUnifiedPrivatePtr priv, +int xenLinuxDomainBlockStats (xenUnifiedPrivatePtr priv, virDomainDefPtr def, const char *path, virDomainBlockStatsPtr stats); -extern int xenLinuxDomainDeviceID(int domid, const char *dev); +int xenLinuxDomainDeviceID(int domid, const char *dev); # endif /* __linux__ */ diff --git a/src/xen/xen_driver.h b/src/xen/xen_driver.h index 5d50a90..8578324 100644 --- a/src/xen/xen_driver.h +++ b/src/xen/xen_driver.h @@ -51,7 +51,7 @@ # define MAX_VIRT_CPUS XEN_LEGACY_MAX_VCPUS # endif -extern int xenRegister (void); +int xenRegister (void); # define XEN_UNIFIED_HYPERVISOR_OFFSET 0 # define XEN_UNIFIED_XEND_OFFSET 1 diff --git a/src/xenapi/xenapi_driver.h b/src/xenapi/xenapi_driver.h index 0925731..1051997 100644 --- a/src/xenapi/xenapi_driver.h +++ b/src/xenapi/xenapi_driver.h @@ -23,6 +23,6 @@ #ifndef __VIR_XENAPI_PRIV_H__ # define __VIR_XENAPI_PRIV_H__ -extern int xenapiRegister(void); +int xenapiRegister(void); #endif /* __VIR_XENAPI_PRIV_H__ */ diff --git a/tools/virt-host-validate-common.h b/tools/virt-host-validate-common.h index c14e922..b6fe17d 100644 --- a/tools/virt-host-validate-common.h +++ b/tools/virt-host-validate-common.h @@ -44,45 +44,45 @@ typedef enum { VIR_ENUM_DECL(virHostValidateCPUFlag); -extern void virHostMsgSetQuiet(bool quietFlag); +void virHostMsgSetQuiet(bool quietFlag); -extern void virHostMsgCheck(const char *prefix, - const char *format, - ...) ATTRIBUTE_FMT_PRINTF(2, 3); +void virHostMsgCheck(const char *prefix, + const char *format, + ...) ATTRIBUTE_FMT_PRINTF(2, 3); -extern void virHostMsgPass(void); -extern void virHostMsgFail(virHostValidateLevel level, - const char *format, - ...) ATTRIBUTE_FMT_PRINTF(2, 3); +void virHostMsgPass(void); +void virHostMsgFail(virHostValidateLevel level, + const char *format, + ...) ATTRIBUTE_FMT_PRINTF(2, 3); -extern int virHostValidateDeviceExists(const char *hvname, - const char *dev_name, - virHostValidateLevel level, - const char *hint); +int virHostValidateDeviceExists(const char *hvname, + const char *dev_name, + virHostValidateLevel level, + const char *hint); -extern int virHostValidateDeviceAccessible(const char *hvname, - const char *dev_name, - virHostValidateLevel level, - const char *hint); +int virHostValidateDeviceAccessible(const char *hvname, + const char *dev_name, + virHostValidateLevel level, + const char *hint); -extern virBitmapPtr virHostValidateGetCPUFlags(void); +virBitmapPtr virHostValidateGetCPUFlags(void); -extern int virHostValidateLinuxKernel(const char *hvname, - int version, - virHostValidateLevel level, - const char *hint); +int virHostValidateLinuxKernel(const char *hvname, + int version, + virHostValidateLevel level, + const char *hint); -extern int virHostValidateNamespace(const char *hvname, - const char *ns_name, - virHostValidateLevel level, - const char *hint); +int virHostValidateNamespace(const char *hvname, + const char *ns_name, + virHostValidateLevel level, + const char *hint); -extern int virHostValidateCGroupController(const char *hvname, - const char *cg_name, - virHostValidateLevel level, - const char *config_name); +int virHostValidateCGroupController(const char *hvname, + const char *cg_name, + virHostValidateLevel level, + const char *config_name); -extern int virHostValidateIOMMU(const char *hvname, - virHostValidateLevel level); +int virHostValidateIOMMU(const char *hvname, + virHostValidateLevel level); #endif /* __VIRT_HOST_VALIDATE_COMMON_H__ */ diff --git a/tools/virt-host-validate-lxc.h b/tools/virt-host-validate-lxc.h index 6f1b3e6..17b02a3 100644 --- a/tools/virt-host-validate-lxc.h +++ b/tools/virt-host-validate-lxc.h @@ -22,6 +22,6 @@ #ifndef __VIRT_HOST_VALIDATE_LXC_H__ # define __VIRT_HOST_VALIDATE_LXC_H__ -extern int virHostValidateLXC(void); +int virHostValidateLXC(void); #endif /* __VIRT_HOST_VALIDATE_LXC_H__ */ diff --git a/tools/virt-host-validate-qemu.h b/tools/virt-host-validate-qemu.h index 01d72bb..8a0ce46 100644 --- a/tools/virt-host-validate-qemu.h +++ b/tools/virt-host-validate-qemu.h @@ -22,6 +22,6 @@ #ifndef __VIRT_HOST_VALIDATE_QEMU_H__ # define __VIRT_HOST_VALIDATE_QEMU_H__ -extern int virHostValidateQEMU(void); +int virHostValidateQEMU(void); #endif /* __VIRT_HOST_VALIDATE_QEMU_H__ */ -- 2.5.5

2 2

[libvirt] [PATCH sandbox] pkgconfig: remove non-existent requirement on 'sandbox-2.0'
by Cole Robinson 11 May '16

11 May '16

From: Gary Tierney <gary.tierney(a)gmx.com> $ pkg-config --cflags libvirt-sandbox-1.0 Package sandbox-2.0 was not found in the pkg-config search path. Perhaps you should add the directory containing `sandbox-2.0.pc' to the PKG_CONFIG_PATH environment variable Package 'sandbox-2.0', required by 'libvirt-sandbox-1.0', not found https://bugzilla.redhat.com/show_bug.cgi?id=1327908 --- libvirt-sandbox-1.0.pc.in | 1 - 1 file changed, 1 deletion(-) diff --git a/libvirt-sandbox-1.0.pc.in b/libvirt-sandbox-1.0.pc.in index 1fb25bd..d444bba 100644 --- a/libvirt-sandbox-1.0.pc.in +++ b/libvirt-sandbox-1.0.pc.in @@ -6,6 +6,5 @@ includedir=@includedir@ Name: libvirt-sandbox Version: @VERSION@ Description: libvirt sandbox library -Requires: sandbox-2.0 Libs: -L${libdir} -lvirt-sandbox-1.0 @LIBVIRT_GOBJECT_LIBS@ Cflags: -I${includedir}/libvirt-sandbox-1.0 @LIBVIRT_GOBJECT_CFLAGS@ -- 2.7.4

2 1