[libvirt] [PATCH v2.1 12/21] Introduce virDomainPinEmulator and virDomainGetEmulatorPinInfo functions.

Daniel Veillard veillard at redhat.com
Wed Aug 22 08:25:51 UTC 2012


On Tue, Aug 21, 2012 at 05:18:35PM +0800, Hu Tao wrote:
> From: Tang Chen <tangchen at cn.fujitsu.com>
> 
> Introduce 2 APIs to set/get physical cpu pinning info of emulator threads.
> 
> 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                 |   12 ++++
>  src/libvirt.c                |  147 ++++++++++++++++++++++++++++++++++++++++++
>  src/libvirt_public.syms      |    2 +
>  4 files changed, 171 insertions(+)
> 
> diff --git a/include/libvirt/libvirt.h.in b/include/libvirt/libvirt.h.in
> index 77a061e..43774eb 100644
> --- a/include/libvirt/libvirt.h.in
> +++ b/include/libvirt/libvirt.h.in
> @@ -1916,6 +1916,16 @@ int                     virDomainGetVcpuPinInfo (virDomainPtr domain,
>                                                   int maplen,
>                                                   unsigned int flags);
>  
> +int                     virDomainPinEmulator   (virDomainPtr domain,
> +                                                unsigned char *cpumap,
> +                                                int maplen,
> +                                                unsigned int flags);
> +
> +int                     virDomainGetEmulatorPinInfo (virDomainPtr domain,
> +                                                     unsigned char *cpumaps,
> +                                                     int maplen,
> +                                                     unsigned int flags);
> +

  okay, based on existing APIs like virDomainPinVcpuFlags that is
  consistent,

>  /**
>   * 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 203497d..5fa2d36 100644
> --- a/src/driver.h
> +++ b/src/driver.h
> @@ -306,6 +306,16 @@ typedef int
>                                           unsigned char *cpumaps,
>                                           int maplen,
>                                           unsigned int flags);
> + typedef int
> +        (*virDrvDomainPinEmulator)     (virDomainPtr domain,
> +                                        unsigned char *cpumap,
> +                                        int maplen,
> +                                        unsigned int flags);
> +typedef int
> +        (*virDrvDomainGetEmulatorPinInfo)   (virDomainPtr domain,
> +                                             unsigned char *cpumaps,
> +                                             int maplen,
> +                                             unsigned int flags);
>  
>  typedef int
>          (*virDrvDomainGetVcpus)         (virDomainPtr domain,
> @@ -941,6 +951,8 @@ struct _virDriver {
>      virDrvDomainPinVcpu                 domainPinVcpu;
>      virDrvDomainPinVcpuFlags            domainPinVcpuFlags;
>      virDrvDomainGetVcpuPinInfo          domainGetVcpuPinInfo;
> +    virDrvDomainPinEmulator             domainPinEmulator;
> +    virDrvDomainGetEmulatorPinInfo      domainGetEmulatorPinInfo;
>      virDrvDomainGetVcpus                domainGetVcpus;
>      virDrvDomainGetMaxVcpus             domainGetMaxVcpus;
>      virDrvDomainGetSecurityLabel        domainGetSecurityLabel;
> diff --git a/src/libvirt.c b/src/libvirt.c
> index b3fc8a8..60ce6d1 100644
> --- a/src/libvirt.c
> +++ b/src/libvirt.c
> @@ -8858,6 +8858,153 @@ error:
>  }
>  
>  /**
> + * virDomainPinEmulator:
> + * @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 emulator
> + * 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 virDomainGetEmulatorPinInfo for querying this information.
> + *
> + * Returns 0 in case of success, -1 in case of failure.
> + *
> + */
> +int
> +virDomainPinEmulator(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->domainPinEmulator) {
> +        int ret;
> +        ret = conn->driver->domainPinEmulator (domain, cpumap, maplen, flags);
> +        if (ret < 0)
> +            goto error;
> +        return ret;
> +    }
> +
> +    virLibConnError(VIR_ERR_NO_SUPPORT, __FUNCTION__);
> +
> +error:
> +    virDispatchError(domain->conn);
> +    return -1;
> +}
> +
> +/**
> + * virDomainGetEmulatorPinInfo:
> + * @domain: pointer to domain object, or NULL for Domain0
> + * @cpumap: pointer to a bit map of real CPUs for all emulator threads of
> + *     this domain (in 8-bit bytes) (OUT)
> + *     There is only one cpumap for all emulator 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 emulator threads of domain, store
> + * it in cpumap.
> + *
> + * Returns 1 in case of success,
> + * 0 in case of no emulator threads are pined to pcpus,
> + * -1 in case of failure.
> + */
> +int
> +virDomainGetEmulatorPinInfo(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->domainGetEmulatorPinInfo) {
> +        int ret;
> +        ret = conn->driver->domainGetEmulatorPinInfo(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 43f2cf2..92ae95a 100644
> --- a/src/libvirt_public.syms
> +++ b/src/libvirt_public.syms
> @@ -550,6 +550,8 @@ LIBVIRT_0.10.0 {
>          virConnectRegisterCloseCallback;
>          virConnectUnregisterCloseCallback;
>          virDomainGetSecurityLabelList;
> +        virDomainPinEmulator;
> +        virDomainGetEmulatorPinInfo;
>  } LIBVIRT_0.9.13;
>  
>  # .... define new API here using predicted next version number ....

  Okay, ACK !

Daniel

-- 
Daniel Veillard      | libxml Gnome XML XSLT toolkit  http://xmlsoft.org/
daniel at veillard.com  | Rpmfind RPM search engine http://rpmfind.net/
http://veillard.com/ | virtualization library  http://libvirt.org/




More information about the libvir-list mailing list