[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

Re: [libvirt] [PATCH 10/11] hypervisor: Clean up



John Ferlan wrote:
> Clean up some function headers
> ---
>  src/xen/xen_hypervisor.c | 46 +++++++++++++++++-----------------------------
>  1 file changed, 17 insertions(+), 29 deletions(-)
>
> diff --git a/src/xen/xen_hypervisor.c b/src/xen/xen_hypervisor.c
> index 2437413..186f0c7 100644
> --- a/src/xen/xen_hypervisor.c
> +++ b/src/xen/xen_hypervisor.c
> @@ -1,7 +1,7 @@
>  /*
>   * xen_internal.c: direct access to Xen hypervisor level
>   *
> - * Copyright (C) 2005-2012 Red Hat, Inc.
> + * Copyright (C) 2005-2013 Red Hat, Inc.
>   *
>   * This library is free software; you can redistribute it and/or
>   * modify it under the terms of the GNU Lesser General Public
> @@ -1134,8 +1134,8 @@ virXen_getdomaininfolist(int handle, int first_domain, int maxids,
>  }
>  
>  static int
> -virXen_getdomaininfo(int handle, int first_domain,
> -                     xen_getdomaininfo *dominfo) {
> +virXen_getdomaininfo(int handle, int first_domain, xen_getdomaininfo *dominfo)
> +{
>   

More of the same. I personally prefer one line when it fits. Either way,
ACK to moving opening braces to a new line.

Regards,
Jim

>      xen_getdomaininfolist dominfos;
>  
>      if (hv_versions.hypervisor < 2) {
> @@ -1442,8 +1442,7 @@ xenHypervisorSetSchedulerParameters(virDomainPtr domain,
>  
>  
>  int
> -xenHypervisorDomainBlockStats(virDomainPtr dom,
> -                              const char *path,
> +xenHypervisorDomainBlockStats(virDomainPtr dom, const char *path,
>                                struct _virDomainBlockStats *stats)
>  {
>  #ifdef __linux__
> @@ -1471,8 +1470,7 @@ xenHypervisorDomainBlockStats(virDomainPtr dom,
>   * virNetwork interface, as yet not decided.
>   */
>  int
> -xenHypervisorDomainInterfaceStats(virDomainPtr dom,
> -                                  const char *path,
> +xenHypervisorDomainInterfaceStats(virDomainPtr dom, const char *path,
>                                    struct _virDomainInterfaceStats *stats)
>  {
>  #ifdef __linux__
> @@ -2195,8 +2193,7 @@ VIR_ONCE_GLOBAL_INIT(xenHypervisor)
>   * Returns 0 or -1 in case of error.
>   */
>  virDrvOpenStatus
> -xenHypervisorOpen(virConnectPtr conn,
> -                  virConnectAuthPtr auth ATTRIBUTE_UNUSED,
> +xenHypervisorOpen(virConnectPtr conn, virConnectAuthPtr auth ATTRIBUTE_UNUSED,
>                    unsigned int flags)
>  {
>      int ret;
> @@ -2284,12 +2281,11 @@ static int xenDefaultConsoleType(const char *ostype,
>  }
>  
>  static virCapsPtr
> -xenHypervisorBuildCapabilities(virConnectPtr conn,
> -                               virArch hostarch,
> -                               int host_pae,
> -                               const char *hvm_type,
> +xenHypervisorBuildCapabilities(virConnectPtr conn, virArch hostarch,
> +                               int host_pae, const char *hvm_type,
>                                 struct guest_arch *guest_archs,
> -                               int nr_guest_archs) {
> +                               int nr_guest_archs)
> +{
>      virCapsPtr caps;
>      int i;
>      int hv_major = hv_versions.hv >> 16;
> @@ -2537,8 +2533,7 @@ xenHypervisorMakeCapabilitiesSunOS(virConnectPtr conn)
>   * Return the capabilities of this hypervisor.
>   */
>  virCapsPtr
> -xenHypervisorMakeCapabilitiesInternal(virConnectPtr conn,
> -                                      virArch hostarch,
> +xenHypervisorMakeCapabilitiesInternal(virConnectPtr conn, virArch hostarch,
>                                        FILE *cpuinfo, FILE *capabilities)
>  {
>      char line[1024], *str, *token;
> @@ -2915,8 +2910,7 @@ xenHypervisorDomainGetOSType(virDomainPtr dom)
>  }
>  
>  int
> -xenHypervisorHasDomain(virConnectPtr conn,
> -                       int id)
> +xenHypervisorHasDomain(virConnectPtr conn, int id)
>  {
>      xenUnifiedPrivatePtr priv;
>      xen_getdomaininfo dominfo;
> @@ -2937,8 +2931,7 @@ xenHypervisorHasDomain(virConnectPtr conn,
>  }
>  
>  virDomainPtr
> -xenHypervisorLookupDomainByID(virConnectPtr conn,
> -                              int id)
> +xenHypervisorLookupDomainByID(virConnectPtr conn, int id)
>  {
>      xenUnifiedPrivatePtr priv;
>      xen_getdomaininfo dominfo;
> @@ -2972,8 +2965,7 @@ xenHypervisorLookupDomainByID(virConnectPtr conn,
>  
>  
>  virDomainPtr
> -xenHypervisorLookupDomainByUUID(virConnectPtr conn,
> -                                const unsigned char *uuid)
> +xenHypervisorLookupDomainByUUID(virConnectPtr conn, const unsigned char *uuid)
>  {
>      xen_getdomaininfolist dominfos;
>      xenUnifiedPrivatePtr priv;
> @@ -3045,8 +3037,7 @@ xenHypervisorLookupDomainByUUID(virConnectPtr conn,
>   * Returns the maximum of CPU defined by Xen.
>   */
>  int
> -xenHypervisorGetMaxVcpus(virConnectPtr conn,
> -                         const char *type ATTRIBUTE_UNUSED)
> +xenHypervisorGetMaxVcpus(virConnectPtr conn, const char *type ATTRIBUTE_UNUSED)
>  {
>      xenUnifiedPrivatePtr priv = (xenUnifiedPrivatePtr) conn->privateData;
>  
> @@ -3226,9 +3217,7 @@ xenHypervisorGetDomainInfo(virDomainPtr domain, virDomainInfoPtr info)
>   * Returns 0 in case of success, -1 in case of error.
>   */
>  int
> -xenHypervisorGetDomainState(virDomainPtr domain,
> -                            int *state,
> -                            int *reason,
> +xenHypervisorGetDomainState(virDomainPtr domain, int *state, int *reason,
>                              unsigned int flags)
>  {
>      xenUnifiedPrivatePtr priv = (xenUnifiedPrivatePtr)domain->conn->privateData;
> @@ -3382,8 +3371,7 @@ xenHypervisorResumeDomain(virDomainPtr domain)
>   * Returns 0 in case of success, -1 in case of error.
>   */
>  int
> -xenHypervisorDestroyDomainFlags(virDomainPtr domain,
> -                                unsigned int flags)
> +xenHypervisorDestroyDomainFlags(virDomainPtr domain, unsigned int flags)
>  {
>      int ret;
>      xenUnifiedPrivatePtr priv = (xenUnifiedPrivatePtr)domain->conn->privateData;
>   


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]