Commit 1c97e303 authored by Anthony Liguori's avatar Anthony Liguori
Browse files

Merge remote-tracking branch 'afaerber/qom-cpu' into staging 



* afaerber/qom-cpu:
  target-i386: Postpone cpuid_level update to realize time
  target-i386: Use define for cpuid vendor string size
  target-i386: Separate feature string parsing from CPU model lookup
  target-i386/cpu.c: Coding style fixes
  qdev: qdev_create(): use error_report() instead of hw_error()
  sysemu.h: Include qemu-types.h instead of qemu-common.h
  Create qemu-types.h for struct typedefs
  qlist.h: Do not include qemu-common.h
  qga/channel-posix.c: Include headers it needs
  qapi/qmp-registry.c: Include headers it needs
  ui/vnc-palette.c: Include headers it needs
  user: Rename qemu-types.h to qemu-user-types.h
  user: Move *-user/qemu-types.h to main directory

Signed-off-by: default avatarAnthony Liguori <aliguori@us.ibm.com>
parents 7c12fd9b b34d12d1

bsd-user/qemu-types.h

deleted100644 → 0
+0 −24
Original line number Diff line number Diff line 
#ifndef QEMU_TYPES_H

#define QEMU_TYPES_H

#include "cpu.h"



#ifdef TARGET_ABI32

typedef uint32_t abi_ulong;

typedef int32_t abi_long;

#define TARGET_ABI_FMT_lx "%08x"

#define TARGET_ABI_FMT_ld "%d"

#define TARGET_ABI_FMT_lu "%u"

#define TARGET_ABI_BITS 32

#else

typedef target_ulong abi_ulong;

typedef target_long abi_long;

#define TARGET_ABI_FMT_lx TARGET_FMT_lx

#define TARGET_ABI_FMT_ld TARGET_FMT_ld

#define TARGET_ABI_FMT_lu TARGET_FMT_lu

#define TARGET_ABI_BITS TARGET_LONG_BITS

/* for consistency, define ABI32 too */

#if TARGET_ABI_BITS == 32

#define TARGET_ABI32 1

#endif

#endif

#endif

bsd-user/qemu.h

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ 
#include <stdlib.h>

#endif /* DEBUG_REMAP */



#include "qemu-types.h"

#include "qemu-user-types.h"



enum BSDType {

    target_freebsd,

cpu-all.h

+1 −1
Original line number Diff line number Diff line
@@ -180,7 +180,7 @@ static inline void tswap64s(uint64_t *s) 


#if defined(CONFIG_USER_ONLY)

#include <assert.h>

#include "qemu-types.h"

#include "qemu-user-types.h"



/* On some host systems the guest address space is reserved on the host.

 * This allows the guest address space to be offset to a convenient location.

hw/qdev-core.h

+1 −10
Original line number Diff line number Diff line
@@ -3,20 +3,11 @@ 


#include "qemu-queue.h"

#include "qemu-option.h"

#include "qemu-types.h"

#include "qemu/object.h"

#include "hw/irq.h"

#include "error.h"



typedef struct Property Property;



typedef struct PropertyInfo PropertyInfo;



typedef struct CompatProperty CompatProperty;



typedef struct BusState BusState;



typedef struct BusClass BusClass;



enum DevState {

    DEV_STATE_CREATED = 1,

    DEV_STATE_INITIALIZED,

hw/qdev.c

+5 −3
Original line number Diff line number Diff line
@@ -109,10 +109,12 @@ DeviceState *qdev_create(BusState *bus, const char *name) 
    dev = qdev_try_create(bus, name);

    if (!dev) {

        if (bus) {

            hw_error("Unknown device '%s' for bus '%s'\n", name,

            error_report("Unknown device '%s' for bus '%s'\n", name,

                         object_get_typename(OBJECT(bus)));

            abort();

        } else {

            hw_error("Unknown device '%s' for default sysbus\n", name);

            error_report("Unknown device '%s' for default sysbus\n", name);

            abort();

        }

    }