From 49fa9881b2358e390e9e9466ddde74e995927efa Mon Sep 17 00:00:00 2001 From: Stefano Stabellini Date: Mon, 3 Jun 2013 15:38:48 +0000 Subject: xen: simplify xen_enabled No need for preprocessor conditionals in xen_enabled: xen_allowed is always defined. Signed-off-by: Stefano Stabellini CC: qemu-stable@nongnu.org --- include/hw/xen/xen.h | 4 ---- 1 file changed, 4 deletions(-) (limited to 'include/hw') diff --git a/include/hw/xen/xen.h b/include/hw/xen/xen.h index 7451c5a0bf..b42b0fdb48 100644 --- a/include/hw/xen/xen.h +++ b/include/hw/xen/xen.h @@ -25,11 +25,7 @@ extern bool xen_allowed; static inline bool xen_enabled(void) { -#if defined(CONFIG_XEN_BACKEND) && defined(CONFIG_XEN) return xen_allowed; -#else - return 0; -#endif } int xen_pci_slot_get_pirq(PCIDevice *pci_dev, int irq_num); -- cgit v1.2.3 From 9f24a8030a70ea4954b5b8c48f606012f086f65f Mon Sep 17 00:00:00 2001 From: Stefano Stabellini Date: Mon, 3 Jun 2013 15:37:45 +0000 Subject: xen: start PCI hole at 0xe0000000 (same as pc_init1 and qemu-xen-traditional) We are currently setting the PCI hole to start at HVM_BELOW_4G_RAM_END, that is 0xf0000000. Start the PCI hole at 0xe0000000 instead, that is the same value used by pc_init1 and qemu-xen-traditional. Signed-off-by: Stefano Stabellini CC: qemu-stable@nongnu.org --- include/hw/i386/pc.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'include/hw') diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index 663426cee8..626442b116 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -77,6 +77,9 @@ extern int fd_bootchk; void pc_register_ferr_irq(qemu_irq irq); void pc_acpi_smi_interrupt(void *opaque, int irq, int level); +#define QEMU_BELOW_4G_RAM_END 0xe0000000 +#define QEMU_BELOW_4G_MMIO_LENGTH ((1ULL << 32) - QEMU_BELOW_4G_RAM_END) + void pc_cpus_init(const char *cpu_model, DeviceState *icc_bridge); void pc_hot_add_cpu(const int64_t id, Error **errp); void pc_acpi_init(const char *default_dsdt); -- cgit v1.2.3 From 95222d0945ac8e7fea2adf2fc927634ff3ea1389 Mon Sep 17 00:00:00 2001 From: Stefano Stabellini Date: Thu, 30 May 2013 16:52:44 +0000 Subject: xen: remove xen_vcpu_init MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit No need for xen_vcpu_init anymore: - the RTC emulator doesn't have any periodic timers continuously running even in absence of guest interactions anymore; - qemu_dummy_start_vcpu takes care of disabling TCG for us, so we don't need to do it manually here. Signed-off-by: Stefano Stabellini Reviewed-by: Andreas Färber --- include/hw/xen/xen.h | 1 - 1 file changed, 1 deletion(-) (limited to 'include/hw') diff --git a/include/hw/xen/xen.h b/include/hw/xen/xen.h index b42b0fdb48..6d42dd1bd1 100644 --- a/include/hw/xen/xen.h +++ b/include/hw/xen/xen.h @@ -38,7 +38,6 @@ qemu_irq *xen_interrupt_controller_init(void); int xen_init(void); int xen_hvm_init(void); -void xen_vcpu_init(void); void xenstore_store_pv_console_info(int i, struct CharDriverState *chr); #if defined(NEED_CPU_H) && !defined(CONFIG_USER_ONLY) -- cgit v1.2.3