diff options
| author | Michael S. Tsirkin | 2011-06-14 16:51:11 +0200 |
|---|---|---|
| committer | Michael S. Tsirkin | 2011-06-15 17:27:15 +0200 |
| commit | befeac45d4d9afb587eca9a27d975db4a7950960 (patch) | |
| tree | aab24c856a3ea944e287d7f2591bb4bab6a56eb4 /hw/9pfs/virtio-9p-debug.c | |
| parent | print meaningful error message in case of --disable-vhost-net (diff) | |
| parent | configure: Detect and don't try to use older libcurl (diff) | |
| download | qemu-befeac45d4d9afb587eca9a27d975db4a7950960.tar.gz qemu-befeac45d4d9afb587eca9a27d975db4a7950960.tar.xz qemu-befeac45d4d9afb587eca9a27d975db4a7950960.zip | |
Merge remote-tracking branch 'origin/master' into pci
Conflicts:
hw/virtio-pci.c
Diffstat (limited to 'hw/9pfs/virtio-9p-debug.c')
| -rw-r--r-- | hw/9pfs/virtio-9p-debug.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/hw/9pfs/virtio-9p-debug.c b/hw/9pfs/virtio-9p-debug.c index 6b18842fd4..4636ad51f0 100644 --- a/hw/9pfs/virtio-9p-debug.c +++ b/hw/9pfs/virtio-9p-debug.c @@ -10,8 +10,9 @@ * the COPYING file in the top-level directory. * */ -#include "virtio.h" -#include "pc.h" + +#include "hw/virtio.h" +#include "hw/pc.h" #include "virtio-9p.h" #include "virtio-9p-debug.h" |