From patchwork Thu Mar 21 14:28:38 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Mammedov X-Patchwork-Id: 229707 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 123CD2C00CB for ; Fri, 22 Mar 2013 01:31:44 +1100 (EST) Received: from localhost ([::1]:57579 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UIgWo-0006Ad-Q0 for incoming@patchwork.ozlabs.org; Thu, 21 Mar 2013 10:31:38 -0400 Received: from eggs.gnu.org ([208.118.235.92]:37608) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UIgV6-0004FK-2k for qemu-devel@nongnu.org; Thu, 21 Mar 2013 10:30:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UIgUt-0004HU-NI for qemu-devel@nongnu.org; Thu, 21 Mar 2013 10:29:46 -0400 Received: from mx1.redhat.com ([209.132.183.28]:38068) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UIgUt-0004Ef-FV for qemu-devel@nongnu.org; Thu, 21 Mar 2013 10:29:39 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r2LETKMP003678 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 21 Mar 2013 10:29:21 -0400 Received: from dell-pet610-01.lab.eng.brq.redhat.com (dell-pet610-01.lab.eng.brq.redhat.com [10.34.42.20]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id r2LESmH3008812; Thu, 21 Mar 2013 10:29:16 -0400 From: Igor Mammedov To: qemu-devel@nongnu.org Date: Thu, 21 Mar 2013 15:28:38 +0100 Message-Id: <1363876125-8264-6-git-send-email-imammedo@redhat.com> In-Reply-To: <1363876125-8264-1-git-send-email-imammedo@redhat.com> References: <1363876125-8264-1-git-send-email-imammedo@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: kwolf@redhat.com, peter.maydell@linaro.org, aliguori@us.ibm.com, ehabkost@redhat.com, mst@redhat.com, jan.kiszka@siemens.com, stefano.stabellini@eu.citrix.com, claudio.fontana@huawei.com, armbru@redhat.com, quintela@redhat.com, lcapitulino@redhat.com, blauwirbel@gmail.com, yang.z.zhang@intel.com, alex.williamson@redhat.com, aderumier@odiso.com, kraxel@redhat.com, anthony.perard@citrix.com, pbonzini@redhat.com, afaerber@suse.de, rth@twiddle.net Subject: [Qemu-devel] [PATCH 05/12] target-i386: push hot-plugged VCPU state to KVM and unstop it X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org * synchronize CPU state to KVM * resume CPU, it makes CPU be able to handle interrupts in TCG mode and/or with user-space APIC. Signed-off-by: Igor Mammedov --- cpus.c | 11 ++++++++--- include/sysemu/cpus.h | 3 +++ stubs/Makefile.objs | 1 + stubs/resume_vcpu.c | 6 ++++++ target-i386/cpu.c | 5 +++++ 5 files changed, 23 insertions(+), 3 deletions(-) create mode 100644 stubs/resume_vcpu.c diff --git a/cpus.c b/cpus.c index e919dd7..ae479bf 100644 --- a/cpus.c +++ b/cpus.c @@ -973,6 +973,13 @@ void pause_all_vcpus(void) } } +void resume_vcpu(CPUState *cpu) +{ + cpu->stop = false; + cpu->stopped = false; + qemu_cpu_kick(cpu); +} + void resume_all_vcpus(void) { CPUArchState *penv = first_cpu; @@ -980,9 +987,7 @@ void resume_all_vcpus(void) qemu_clock_enable(vm_clock, true); while (penv) { CPUState *pcpu = ENV_GET_CPU(penv); - pcpu->stop = false; - pcpu->stopped = false; - qemu_cpu_kick(pcpu); + resume_vcpu(pcpu); penv = penv->next_cpu; } } diff --git a/include/sysemu/cpus.h b/include/sysemu/cpus.h index 6502488..9437df5 100644 --- a/include/sysemu/cpus.h +++ b/include/sysemu/cpus.h @@ -1,11 +1,14 @@ #ifndef QEMU_CPUS_H #define QEMU_CPUS_H +#include "qom/cpu.h" + /* cpus.c */ void qemu_init_cpu_loop(void); void resume_all_vcpus(void); void pause_all_vcpus(void); void cpu_stop_current(void); +void resume_vcpu(CPUState *cpu); void cpu_synchronize_all_states(void); void cpu_synchronize_all_post_reset(void); diff --git a/stubs/Makefile.objs b/stubs/Makefile.objs index 9c55b34..28fb4f8 100644 --- a/stubs/Makefile.objs +++ b/stubs/Makefile.objs @@ -23,3 +23,4 @@ stub-obj-y += sysbus.o stub-obj-y += vm-stop.o stub-obj-y += vmstate.o stub-obj-$(CONFIG_WIN32) += fd-register.o +stub-obj-y += resume_vcpu.o diff --git a/stubs/resume_vcpu.c b/stubs/resume_vcpu.c new file mode 100644 index 0000000..383b71a --- /dev/null +++ b/stubs/resume_vcpu.c @@ -0,0 +1,6 @@ +#include "qemu-common.h" +#include "sysemu/cpus.h" + +void resume_vcpu(CPUState *cpu) +{ +} diff --git a/target-i386/cpu.c b/target-i386/cpu.c index d03ff73..631bcd8 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -2260,6 +2260,11 @@ out: error_propagate(errp, local_err); return; } + + if (dev->hotplugged) { + cpu_synchronize_post_init(env); + resume_vcpu(CPU(cpu)); + } } /* Enables contiguous-apic-ID mode, for compatibility */