[libvirt] [PATCH 09/12] Introduce virDomainPinHypervisorFlags and virDomainGetHypervisorPinInfo functions.

Hu Tao hutao at cn.fujitsu.com
Fri Jul 27 05:39:00 UTC 2012


On Wed, Jul 25, 2012 at 01:26:29PM +0800, tangchen wrote:
> From: Tang Chen <tangchen at cn.fujitsu.com>
> 
> Introduce 2 APIs for client to use.
>     1) virDomainPinHypervisorFlags: call remote driver api, such as remoteDomainPinHypervisorFlags.
>     2) virDomainGetHypervisorPinInfo: call remote driver api, such as remoteDomainGetHypervisorPinInfo.

Not true. These two APIs call underlying driver's corresponding
implementation.

> 
> Signed-off-by: Tang Chen <tangchen at cn.fujitsu.com>
> Signed-off-by: Hu Tao <hutao at cn.fujitsu.com>
> ---
>  include/libvirt/libvirt.h.in |   10 +++
>  src/driver.h                 |   13 +++-
>  src/libvirt.c                |  147 ++++++++++++++++++++++++++++++++++++++++++
>  src/libvirt_public.syms      |    2 +
>  4 files changed, 171 insertions(+), 1 deletion(-)
> 
> diff --git a/include/libvirt/libvirt.h.in b/include/libvirt/libvirt.h.in
> index fcef461..74d495f 100644
> --- a/include/libvirt/libvirt.h.in
> +++ b/include/libvirt/libvirt.h.in
> @@ -1863,6 +1863,16 @@ int                     virDomainGetVcpuPinInfo (virDomainPtr domain,
>                                                   int maplen,
>                                                   unsigned int flags);
>  
> +int                     virDomainPinHypervisorFlags   (virDomainPtr domain,
> +                                                       unsigned char *cpumap,
> +                                                       int maplen,
> +                                                       unsigned int flags);
> +
> +int                     virDomainGetHypervisorPinInfo (virDomainPtr domain,
> +                                                      unsigned char *cpumaps,
> +                                                      int maplen,
> +                                                      unsigned int flags);
> +
>  /**
>   * VIR_USE_CPU:
>   * @cpumap: pointer to a bit map of real CPUs (in 8-bit bytes) (IN/OUT)
> diff --git a/src/driver.h b/src/driver.h
> index 46d9846..a326754 100644
> --- a/src/driver.h
> +++ b/src/driver.h
> @@ -305,7 +305,16 @@ typedef int
>                                           unsigned char *cpumaps,
>                                           int maplen,
>                                           unsigned int flags);
> -
> + typedef int
> +        (*virDrvDomainPinHypervisorFlags)     (virDomainPtr domain,
> +                                               unsigned char *cpumap,
> +                                               int maplen,
> +                                               unsigned int flags);
> +typedef int
> +        (*virDrvDomainGetHypervisorPinInfo)   (virDomainPtr domain,
> +                                               unsigned char *cpumaps,
> +                                               int maplen,
> +                                               unsigned int flags);
>  typedef int
>          (*virDrvDomainGetVcpus)         (virDomainPtr domain,
>                                           virVcpuInfoPtr info,
> @@ -937,6 +946,8 @@ struct _virDriver {
>      virDrvDomainPinVcpu                 domainPinVcpu;
>      virDrvDomainPinVcpuFlags            domainPinVcpuFlags;
>      virDrvDomainGetVcpuPinInfo          domainGetVcpuPinInfo;
> +    virDrvDomainPinHypervisorFlags      domainPinHypervisorFlags;
> +    virDrvDomainGetHypervisorPinInfo    domainGetHypervisorPinInfo;
>      virDrvDomainGetVcpus                domainGetVcpus;
>      virDrvDomainGetMaxVcpus             domainGetMaxVcpus;
>      virDrvDomainGetSecurityLabel        domainGetSecurityLabel;
> diff --git a/src/libvirt.c b/src/libvirt.c
> index 8315b4f..a904cc5 100644
> --- a/src/libvirt.c
> +++ b/src/libvirt.c
> @@ -8845,6 +8845,153 @@ error:
>  }
>  
>  /**
> + * virDomainPinHypervisorFlags:
> + * @domain: pointer to domain object, or NULL for Domain0
> + * @cpumap: pointer to a bit map of real CPUs (in 8-bit bytes) (IN)
> + *      Each bit set to 1 means that corresponding CPU is usable.
> + *      Bytes are stored in little-endian order: CPU0-7, 8-15...
> + *      In each byte, lowest CPU number is least significant bit.
> + * @maplen: number of bytes in cpumap, from 1 up to size of CPU map in
> + *      underlying virtualization system (Xen...).
> + *      If maplen < size, missing bytes are set to zero.
> + *      If maplen > size, failure code is returned.
> + * @flags: bitwise-OR of virDomainModificationImpact
> + *
> + * Dynamically change the real CPUs which can be allocated to all hypervisor
> + * threads. This function may require privileged access to the hypervisor.
> + *
> + * @flags may include VIR_DOMAIN_AFFECT_LIVE or VIR_DOMAIN_AFFECT_CONFIG.
> + * Both flags may be set.
> + * If VIR_DOMAIN_AFFECT_LIVE is set, the change affects a running domain
> + * and may fail if domain is not alive.
> + * If VIR_DOMAIN_AFFECT_CONFIG is set, the change affects persistent state,
> + * and will fail for transient domains. If neither flag is specified (that is,
> + * @flags is VIR_DOMAIN_AFFECT_CURRENT), then an inactive domain modifies
> + * persistent setup, while an active domain is hypervisor-dependent on whether
> + * just live or both live and persistent state is changed.
> + * Not all hypervisors can support all flag combinations.
> + *
> + * See also virDomainGetHypervisorPinInfo for querying this information.
> + *
> + * Returns 0 in case of success, -1 in case of failure.
> + *
> + */
> +int
> +virDomainPinHypervisorFlags(virDomainPtr domain, unsigned char *cpumap,
> +                            int maplen, unsigned int flags)
> +{
> +    virConnectPtr conn;
> +
> +    VIR_DOMAIN_DEBUG(domain, "cpumap=%p, maplen=%d, flags=%x",
> +                     cpumap, maplen, flags);
> +
> +    virResetLastError();
> +
> +    if (!VIR_IS_CONNECTED_DOMAIN(domain)) {
> +        virLibDomainError(VIR_ERR_INVALID_DOMAIN, __FUNCTION__);
> +        virDispatchError(NULL);
> +        return -1;
> +    }
> +
> +    if (domain->conn->flags & VIR_CONNECT_RO) {
> +        virLibDomainError(VIR_ERR_OPERATION_DENIED, __FUNCTION__);
> +        goto error;
> +    }
> +
> +    if ((cpumap == NULL) || (maplen < 1)) {
> +        virLibDomainError(VIR_ERR_INVALID_ARG, __FUNCTION__);
> +        goto error;
> +    }
> +
> +    conn = domain->conn;
> +
> +    if (conn->driver->domainPinHypervisorFlags) {
> +        int ret;
> +        ret = conn->driver->domainPinHypervisorFlags (domain, cpumap, maplen, flags);
> +        if (ret < 0)
> +            goto error;
> +        return ret;
> +    }
> +
> +    virLibConnError(VIR_ERR_NO_SUPPORT, __FUNCTION__);
> +
> +error:
> +    virDispatchError(domain->conn);
> +    return -1;
> +}
> +
> +/**
> + * virDomainGetHypervisorPinInfo:
> + * @domain: pointer to domain object, or NULL for Domain0
> + * @cpumap: pointer to a bit map of real CPUs for all hypervisor threads of
> + *     this domain (in 8-bit bytes) (OUT)
> + *     There is only one cpumap for all hypervisor threads.
> + *     Must not be NULL.
> + * @maplen: the number of bytes in one cpumap, from 1 up to size of CPU map.
> + *     Must be positive.
> + * @flags: bitwise-OR of virDomainModificationImpact
> + *     Must not be VIR_DOMAIN_AFFECT_LIVE and
> + *     VIR_DOMAIN_AFFECT_CONFIG concurrently.
> + *
> + * Query the CPU affinity setting of all hypervisor threads of domain, store
> + * it in cpumap.
> + *
> + * Returns 1 in case of success,
> + * 0 in case of no hypervisor threads are pined to pcpus,
> + * -1 in case of failure.
> + */
> +int
> +virDomainGetHypervisorPinInfo(virDomainPtr domain, unsigned char *cpumap,
> +                              int maplen, unsigned int flags)
> +{
> +    virConnectPtr conn;
> +
> +    VIR_DOMAIN_DEBUG(domain, "cpumap=%p, maplen=%d, flags=%x",
> +                     cpumap, maplen, flags);
> +
> +    virResetLastError();
> +
> +    if (!VIR_IS_CONNECTED_DOMAIN(domain)) {
> +        virLibDomainError(VIR_ERR_INVALID_DOMAIN, __FUNCTION__);
> +        virDispatchError(NULL);
> +        return -1;
> +    }
> +
> +    if (!cpumap || maplen <= 0) {
> +        virLibDomainError(VIR_ERR_INVALID_ARG, __FUNCTION__);
> +        goto error;
> +    }
> +    if (INT_MULTIPLY_OVERFLOW(1, maplen)) {
> +        virLibDomainError(VIR_ERR_OVERFLOW, _("input too large: 1 * %d"),
> +                          maplen);
> +        goto error;
> +    }
> +
> +    /* At most one of these two flags should be set.  */
> +    if ((flags & VIR_DOMAIN_AFFECT_LIVE) &&
> +        (flags & VIR_DOMAIN_AFFECT_CONFIG)) {
> +        virLibDomainError(VIR_ERR_INVALID_ARG, __FUNCTION__);
> +        goto error;
> +    }
> +    conn = domain->conn;
> +
> +    if (conn->driver->domainGetHypervisorPinInfo) {
> +        int ret;
> +        ret = conn->driver->domainGetHypervisorPinInfo(domain, cpumap,
> +                                                       maplen, flags);
> +        if (ret < 0)
> +            goto error;
> +        return ret;
> +    }
> +
> +    virLibConnError(VIR_ERR_NO_SUPPORT, __FUNCTION__);
> +
> +error:
> +    virDispatchError(domain->conn);
> +    return -1;
> +}
> +
> +/**
>   * virDomainGetVcpus:
>   * @domain: pointer to domain object, or NULL for Domain0
>   * @info: pointer to an array of virVcpuInfo structures (OUT)
> diff --git a/src/libvirt_public.syms b/src/libvirt_public.syms
> index 1a8e58a..0a57331 100644
> --- a/src/libvirt_public.syms
> +++ b/src/libvirt_public.syms
> @@ -547,6 +547,8 @@ LIBVIRT_0.9.13 {
>  LIBVIRT_0.9.14 {
>      global:
>          virDomainGetHostname;
> +        virDomainPinHypervisorFlags;
> +        virDomainGetHypervisorPinInfo;
>  } LIBVIRT_0.9.13;
>  
>  # .... define new API here using predicted next version number ....
> -- 
> 1.7.10.2
> 
> --
> libvir-list mailing list
> libvir-list at redhat.com
> https://www.redhat.com/mailman/listinfo/libvir-list

-- 
Thanks,
Hu Tao




More information about the libvir-list mailing list