Merge branch 'master' of git://git.qemu.org/qemu into qom-cpu

Adapt header include paths.

Signed-off-by: Andreas Färber <afaerber@suse.de>
This commit is contained in:
Andreas Färber 2012-12-23 00:39:34 +01:00
commit 501a7ce727
1126 changed files with 3773 additions and 4070 deletions

View file

@ -1,10 +1,11 @@
#include "net.h"
#include "net/net.h"
#include "qdev.h"
#include "qerror.h"
#include "blockdev.h"
#include "qapi/qmp/qerror.h"
#include "sysemu/blockdev.h"
#include "hw/block-common.h"
#include "net/hub.h"
#include "qapi/qapi-visit-core.h"
#include "qapi/visitor.h"
#include "char/char.h"
void *qdev_get_prop_ptr(DeviceState *dev, Property *prop)
{