diff options
| author | adsharma@los-vmm.sc.intel.com <adsharma@los-vmm.sc.intel.com> | 2005-08-25 11:18:47 -0700 |
|---|---|---|
| committer | adsharma@los-vmm.sc.intel.com <adsharma@los-vmm.sc.intel.com> | 2005-08-25 11:18:47 -0700 |
| commit | 4ef0b38ac3728810a7450e68356ce2cc2d4284e2 (patch) | |
| tree | 4320a5a82e0a60f1574bed4762de35a142863fb1 /tools/ioemu | |
| parent | 9710812c6e3f7f351f12f22db848e898c2734bc8 (diff) | |
| parent | 37603efb6ec45b3a0985ed08cadedca62267efe3 (diff) | |
| download | xen-4ef0b38ac3728810a7450e68356ce2cc2d4284e2.tar.gz xen-4ef0b38ac3728810a7450e68356ce2cc2d4284e2.tar.bz2 xen-4ef0b38ac3728810a7450e68356ce2cc2d4284e2.zip | |
Merge.
Diffstat (limited to 'tools/ioemu')
| -rw-r--r-- | tools/ioemu/hw/i8254.c | 2 | ||||
| -rw-r--r-- | tools/ioemu/hw/i8259.c | 2 | ||||
| -rw-r--r-- | tools/ioemu/hw/ioapic.h | 2 | ||||
| -rw-r--r-- | tools/ioemu/target-i386-dm/Makefile | 2 | ||||
| -rw-r--r-- | tools/ioemu/target-i386-dm/helper2.c | 2 | ||||
| -rw-r--r-- | tools/ioemu/vl.c | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/tools/ioemu/hw/i8254.c b/tools/ioemu/hw/i8254.c index afa772644e..c92a51ba51 100644 --- a/tools/ioemu/hw/i8254.c +++ b/tools/ioemu/hw/i8254.c @@ -22,7 +22,7 @@ * THE SOFTWARE. */ #include "vl.h" -#include "xc.h" +#include "xenctrl.h" #include <io/ioreq.h> //#define DEBUG_PIT diff --git a/tools/ioemu/hw/i8259.c b/tools/ioemu/hw/i8259.c index e0e26e7a70..a84e94d44a 100644 --- a/tools/ioemu/hw/i8259.c +++ b/tools/ioemu/hw/i8259.c @@ -22,7 +22,7 @@ * THE SOFTWARE. */ #include "vl.h" -#include "xc.h" +#include "xenctrl.h" #include <io/ioreq.h> /* debug PIC */ diff --git a/tools/ioemu/hw/ioapic.h b/tools/ioemu/hw/ioapic.h index a243b7f59d..1e70c865af 100644 --- a/tools/ioemu/hw/ioapic.h +++ b/tools/ioemu/hw/ioapic.h @@ -26,7 +26,7 @@ #ifndef __IOAPIC_H #define __IOAPIC_H -#include "xc.h" +#include "xenctrl.h" #include <io/ioreq.h> #include <io/vmx_vlapic.h> diff --git a/tools/ioemu/target-i386-dm/Makefile b/tools/ioemu/target-i386-dm/Makefile index f0afc5a699..67dcb2e99e 100644 --- a/tools/ioemu/target-i386-dm/Makefile +++ b/tools/ioemu/target-i386-dm/Makefile @@ -188,7 +188,7 @@ endif ######################################################### DEFINES+=-D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -DAPIC_SUPPORT -LIBS+=-lm -L../../libxc -lxc +LIBS+=-lm -L../../libxc -lxenctrl ifndef CONFIG_USER_ONLY LIBS+=-lz endif diff --git a/tools/ioemu/target-i386-dm/helper2.c b/tools/ioemu/target-i386-dm/helper2.c index 5cbeb88aeb..c3b740e3e5 100644 --- a/tools/ioemu/target-i386-dm/helper2.c +++ b/tools/ioemu/target-i386-dm/helper2.c @@ -47,7 +47,7 @@ #include <fcntl.h> #include <sys/ioctl.h> -#include "xc.h" +#include "xenctrl.h" #include <io/ioreq.h> #include "cpu.h" diff --git a/tools/ioemu/vl.c b/tools/ioemu/vl.c index 2380aacf5e..c274f42e2e 100644 --- a/tools/ioemu/vl.c +++ b/tools/ioemu/vl.c @@ -72,7 +72,7 @@ #endif #endif /* CONFIG_SDL */ -#include "xc.h" +#include "xenctrl.h" #include "exec-all.h" //#define DO_TB_FLUSH |