From 95222d0945ac8e7fea2adf2fc927634ff3ea1389 Mon Sep 17 00:00:00 2001 From: Stefano Stabellini Date: Thu, 30 May 2013 16:52:44 +0000 Subject: [PATCH] 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 --- hw/i386/pc_piix.c | 1 - include/hw/xen/xen.h | 1 - xen-all.c | 23 ----------------------- 3 files changed, 25 deletions(-) diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 06416ce74f..742544e734 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -324,7 +324,6 @@ static void pc_xen_hvm_init(QEMUMachineInitArgs *args) hw_error("xen hardware virtual machine initialisation failed"); } pc_init_pci_no_kvmclock(args); - xen_vcpu_init(); } #endif 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) diff --git a/xen-all.c b/xen-all.c index 5ca0c26c63..bc105f1627 100644 --- a/xen-all.c +++ b/xen-all.c @@ -574,29 +574,6 @@ void qmp_xen_set_global_dirty_log(bool enable, Error **errp) } } -/* VCPU Operations, MMIO, IO ring ... */ - -static void xen_reset_vcpu(void *opaque) -{ - CPUState *cpu = opaque; - - cpu->halted = 1; -} - -void xen_vcpu_init(void) -{ - if (first_cpu != NULL) { - CPUState *cpu = ENV_GET_CPU(first_cpu); - - qemu_register_reset(xen_reset_vcpu, cpu); - xen_reset_vcpu(cpu); - } - /* if rtc_clock is left to default (host_clock), disable it */ - if (rtc_clock == host_clock) { - qemu_clock_enable(rtc_clock, false); - } -} - /* get the ioreq packets from share mem */ static ioreq_t *cpu_get_ioreq_from_shared_memory(XenIOState *state, int vcpu) {