Commit 76b64a7a authored by Anthony Liguori's avatar Anthony Liguori
Browse files

win32: provide separate macros for weak decls and definitions 



mingw32 seems to want the declaration to also carry the weak attribute.
Strangely, gcc on Linux absolutely does not want the declaration to be marked
as weak.  This may not be the right fix, but it seems to do the trick.

Signed-off-by: default avatarAnthony Liguori <aliguori@us.ibm.com>
parent d1186a33

arch_init.h

+4 −0
Original line number Diff line number Diff line 
#ifndef QEMU_ARCH_INIT_H

#define QEMU_ARCH_INIT_H



#include "qmp-commands.h"



enum {

    QEMU_ARCH_ALL = -1,

    QEMU_ARCH_ALPHA = 1,
@@ -32,4 +34,6 @@ int tcg_available(void); 
int kvm_available(void);

int xen_available(void);



CpuDefinitionInfoList GCC_WEAK_DECL *arch_query_cpu_definitions(Error **errp);



#endif

compiler.h

+6 −0
Original line number Diff line number Diff line
@@ -45,7 +45,13 @@ 
#  define GCC_ATTR __attribute__((__unused__, format(gnu_printf, 1, 2)))

#  define GCC_FMT_ATTR(n, m) __attribute__((format(gnu_printf, n, m)))

# endif

#if defined(_WIN32)

#define GCC_WEAK __attribute__((weak))

#define GCC_WEAK_DECL GCC_WEAK

#else

#define GCC_WEAK __attribute__((weak))

#define GCC_WEAK_DECL

#endif

#else

#define GCC_ATTR /**/

#define GCC_FMT_ATTR(n, m)

qmp.c

+7 −1
Original line number Diff line number Diff line
@@ -468,8 +468,14 @@ DevicePropertyInfoList *qmp_device_list_properties(const char *typename, 
    return prop_list;

}



CpuDefinitionInfoList GCC_WEAK *qmp_query_cpu_definitions(Error **errp)

CpuDefinitionInfoList GCC_WEAK *arch_query_cpu_definitions(Error **errp)

{

    error_set(errp, QERR_NOT_SUPPORTED);

    return NULL;

}



CpuDefinitionInfoList *qmp_query_cpu_definitions(Error **errp)

{

    return arch_query_cpu_definitions(errp);

}

target-i386/cpu.c

+2 −2
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ 
#include "qemu-config.h"



#include "qapi/qapi-visit-core.h"

#include "qmp-commands.h"

#include "arch_init.h"



#include "hyperv.h"
@@ -1126,7 +1126,7 @@ void x86_cpu_list(FILE *f, fprintf_function cpu_fprintf, const char *optarg) 
    }

}



CpuDefinitionInfoList *qmp_query_cpu_definitions(Error **errp)

CpuDefinitionInfoList *arch_query_cpu_definitions(Error **errp)

{

    CpuDefinitionInfoList *cpu_list = NULL;

    x86_def_t *def;

target-ppc/translate_init.c

+2 −2
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ 
#include "gdbstub.h"

#include <kvm.h>

#include "kvm_ppc.h"

#include "qmp-commands.h"

#include "arch_init.h"



//#define PPC_DUMP_CPU

//#define PPC_DEBUG_SPR
@@ -10346,7 +10346,7 @@ void ppc_cpu_list (FILE *f, fprintf_function cpu_fprintf) 
    }

}



CpuDefinitionInfoList *qmp_query_cpu_definitions(Error **errp)

CpuDefinitionInfoList *arch_query_cpu_definitions(Error **errp)

{

    CpuDefinitionInfoList *cpu_list = NULL;

    int i;