@@ -215,7 +215,7 @@ CFLAGS += -Wall -Wstrict-prototypes
# Clang complains about macros that expand to 'if ( ( foo == bar ) ) ...'
# and is over-zealous with the printf format lint
# and is a bit too fierce about unused return values
-CFLAGS-$(clang) += -Wno-parentheses -Wno-format -Wno-unused-value
+CFLAGS-$(clang) += -Wno-parentheses -Wno-unused-value
$(call cc-option-add,HOSTCFLAGS,HOSTCC,-Wdeclaration-after-statement)
$(call cc-option-add,CFLAGS,CC,-Wdeclaration-after-statement)
@@ -20,14 +20,25 @@
void libxl__alloc_failed(libxl_ctx *ctx, const char *func,
size_t nmemb, size_t size) {
#define M "libxl: FATAL ERROR: memory allocation failure"
-#define L (size ? M " (%s, %lu x %lu)\n" : M " (%s)\n"), \
- func, (unsigned long)nmemb, (unsigned long)size
- libxl__log(ctx, XTL_CRITICAL, ENOMEM, 0,0, func, INVALID_DOMID, L);
- fprintf(stderr, L);
+#define M_SIZE M " (%s, %lu x %lu)\n"
+#define M_NSIZE M " (%s)\n"
+ if (size) {
+ libxl__log(ctx, XTL_CRITICAL, ENOMEM, 0, 0, func, INVALID_DOMID,
+ M_SIZE, func, (unsigned long)nmemb, (unsigned long)size);
+ fprintf(stderr, M_SIZE, func, (unsigned long)nmemb,
+ (unsigned long)size);
+ } else {
+ libxl__log(ctx, XTL_CRITICAL, ENOMEM, 0, 0, func, INVALID_DOMID,
+ M_NSIZE, func);
+ fprintf(stderr, M_NSIZE, func);
+
+ }
+
fflush(stderr);
_exit(-1);
+#undef M_NSIZE
+#undef M_SIZE
#undef M
-#undef L
}
void libxl__ptr_add(libxl__gc *gc, void *ptr)
@@ -93,13 +93,16 @@ static void parse_cpuid(const char *arg, int *cpuid)
static void parse_cpuid_and_int(int argc, char *argv[],
int *cpuid, int *val, const char *what)
{
- if ( argc > 1 )
- parse_cpuid(argv[0], cpuid);
+ if ( argc == 0 )
+ {
+ fprintf(stderr, "Missing %s\n", what);
+ exit(EINVAL);
+ }
- if ( argc == 0 || sscanf(argv[argc > 1], "%d", val) != 1 )
+ parse_cpuid(argv[0], cpuid);
+ if ( sscanf(argv[1], "%d", val) != 1 )
{
- fprintf(stderr, argc ? "Invalid %s '%s'\n" : "Missing %s\n",
- what, argv[argc > 1]);
+ fprintf(stderr, "Invalid %s '%s'\n", what, argv[1]);
exit(EINVAL);
}
}
@@ -595,9 +595,8 @@ int show_mca_info(int inited, struct cpuinfo_x86 *c)
[mcheck_intel] = "Intel"
};
- snprintf(prefix, ARRAY_SIZE(prefix),
- g_type != mcheck_unset ? XENLOG_WARNING "CPU%i: "
- : XENLOG_INFO,
+ snprintf(prefix, ARRAY_SIZE(prefix), "%sCPU%u: ",
+ g_type != mcheck_unset ? XENLOG_WARNING : XENLOG_INFO,
smp_processor_id());
BUG_ON(inited >= ARRAY_SIZE(type_str));
switch (inited) {