From 157ca4d843911663c7686c20218a2a8d6d00d0f3 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Wed, 4 Jun 2008 16:43:19 +0100 Subject: [PATCH] Compilation fixes - helper2.c compiles now --- i386-dm/helper2.c | 13 +++++++++---- qemu-xen.h | 3 +++ 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/i386-dm/helper2.c b/i386-dm/helper2.c index 491b94a89..4545372ca 100644 --- a/i386-dm/helper2.c +++ b/i386-dm/helper2.c @@ -52,6 +52,12 @@ #include "cpu.h" #include "exec-all.h" +#include "hw.h" +#include "pci.h" +#include "console.h" +#include "qemu-timer.h" +#include "sysemu.h" +#include "qemu-xen.h" //#define DEBUG_MMU @@ -188,7 +194,7 @@ target_ulong cpu_get_phys_page_debug(CPUState *env, target_ulong addr) } //some functions to handle the io req packet -void sp_info() +void sp_info(void) { ioreq_t *req; int i; @@ -404,7 +410,7 @@ void cpu_ioreq_timeoffset(CPUState *env, ioreq_t *req) time_offset += (unsigned long)req->data; - fprintf(logfile, "Time offset set %ld, added offset %ld\n", time_offset, req->data); + fprintf(logfile, "Time offset set %ld, added offset %lld\n", time_offset, req->data); sprintf(b, "%ld", time_offset); xenstore_vm_write(domid, "rtc/timeoffset", b); } @@ -512,10 +518,9 @@ void cpu_handle_ioreq(void *opaque) fprintf(logfile, "shutdown requested in cpu_handle_ioreq\n"); destroy_hvm_domain(); } - if (reset_requested) { + if (qemu_reset_requested()) { fprintf(logfile, "reset requested in cpu_handle_ioreq.\n"); qemu_system_reset(); - reset_requested = 0; } } diff --git a/qemu-xen.h b/qemu-xen.h index 6650e6322..06d8ec9f4 100644 --- a/qemu-xen.h +++ b/qemu-xen.h @@ -23,6 +23,9 @@ void timeoffset_get(void); void pci_xen_platform_init(PCIBus *bus); #endif + +void destroy_hvm_domain(void); + #ifdef __ia64__ static inline void xc_domain_shutdown_hook(int xc_handle, uint32_t domid) { -- 2.39.5