[Devel] [PATCH 3/6] provide a upstream alternative for ub functions

[Glauber Costa]

On 12/06/2012 01:13 PM, Kir Kolyshkin wrote:
> On 11/26/2012 06:35 PM, Glauber Costa wrote:
>> The ub functions will not be ever supported in upstream kernel.
>> Still, they are called in a quite widespread fashion throughout the
>> code.
>>
>> One possible course of action for this, is to skip the compilation
>> of ub.c, and at the same time provide an empty set of inline functions
>> in ub.h
>>
>> Signed-off-by: Glauber Costa <glommer at parallels.com>
>> ---
>>   include/ub.h        | 43 +++++++++++++++++++++++++++++++++++++++++++
>>   src/lib/Makefile.am |  5 ++++-
>>   2 files changed, 47 insertions(+), 1 deletion(-)
>>
>> diff --git a/include/ub.h b/include/ub.h
>> index 8155f12..1882b35 100644
>> --- a/include/ub.h
>> +++ b/include/ub.h
>> @@ -19,6 +19,8 @@
>>   #define    _UB_H_
>>     #include "types.h"
>> +#include "vzerror.h"
>> +#include "vzsyscalls.h"
>>     #define PROCUBC        "/proc/user_beancounters"
>>   #define PROC_BC_RES    "/proc/bc/resources"
>> @@ -138,6 +140,7 @@ struct ub_struct {
>>   };
>>   typedef struct ub_struct ub_param;
>>   +#ifdef VZ_KERNEL_SUPPORTED
>>   /** Apply UBC resources.
>>    *
>>    * @param h        CT handler.
>> @@ -175,4 +178,44 @@ void add_ub_limit(struct ub_struct *ub, int
>> res_id, unsigned long *limit);
>>   void free_ub_param(ub_param *ub);
>>   void merge_ub(ub_param *dst, ub_param *src);
>>   int is_vswap_config(const ub_param *param);
>> +#else
>> +#error not supported
> 
> Did you mean to really have this #error, or it's a leftover that should
> be removed?
> 

This should be removed, sorry.