summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvi Kivity <avi@redhat.com>2009-07-28 20:52:11 +0300
committerAvi Kivity <avi@redhat.com>2009-07-28 20:52:11 +0300
commit47159e9b25e1d05b5cd591e295e97897c53a9f75 (patch)
tree1563bcfa1c3a76c5b2123f436582a59d5ee39240 /cpu-all.h
parentMerge commit '42bc608b2a144dfa5141dd6ba5d12cb97ac804a7' into upstream-merge (diff)
parentintroduce on_vcpu (diff)
downloadqemu-kvm-47159e9b25e1d05b5cd591e295e97897c53a9f75.tar.gz
qemu-kvm-47159e9b25e1d05b5cd591e295e97897c53a9f75.tar.bz2
qemu-kvm-47159e9b25e1d05b5cd591e295e97897c53a9f75.zip
Merge commit '452e475196a3f8b6b96d16bbaca727ebc1278a97' into upstream-merge
* commit '452e475196a3f8b6b96d16bbaca727ebc1278a97': (55 commits) introduce on_vcpu qemu-io: reject invalid pattern qemu-io: Rework alloc command qmu-img: fix qemu-img convert to generate a valid image when the source referenced a backing file vmdk: Fix backing file handling use struct initializer for audio.c Add save/restore support to the LSI logic SCSI device model. Handle BH's queued by AIO completions in qemu_aio_flush() Fake dirty loggin when it's not there Use correct input constant Fix warning in kvm-all.c Set PVR in sregs Enable PPC KVM for non-embedded Sparc32: convert Sun4c interrupt controller to qdev Sparc32: convert SBI to qdev Fix CONFIG_PROFILER Sparc32/64: use 64 bit type for memory size qdev: add 64 bit type Sparc64: refactor kernel init Sparc64: refactor CPU init ... Conflicts: kvm-all.c Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'cpu-all.h')
-rw-r--r--cpu-all.h9
1 files changed, 7 insertions, 2 deletions
diff --git a/cpu-all.h b/cpu-all.h
index 3381125c8..d8891f835 100644
--- a/cpu-all.h
+++ b/cpu-all.h
@@ -624,8 +624,13 @@ static inline void stfq_be_p(void *ptr, float64 v)
/* On some host systems the guest address space is reserved on the host.
* This allows the guest address space to be offset to a convenient location.
*/
-//#define GUEST_BASE 0x20000000
-#define GUEST_BASE 0
+#if defined(CONFIG_USE_GUEST_BASE)
+extern unsigned long guest_base;
+extern int have_guest_base;
+#define GUEST_BASE guest_base
+#else
+#define GUEST_BASE 0ul
+#endif
/* All direct uses of g2h and h2g need to go away for usermode softmmu. */
#define g2h(x) ((void *)((unsigned long)(x) + GUEST_BASE))