motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-06 09:13:55 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
* 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: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Anthony Liguori 2012-12-10 08:35:15 -06:00
commit 1c97e303d4
16 changed files with 149 additions and 132 deletions
Download patch file Download diff file Expand all files Collapse all files

11
hw/qdev-core.h
View file

@ -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,

8
hw/qdev.c
View file

@ -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,
object_get_typename(OBJECT(bus)));
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();
}
}