From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:42787)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <imammedo@redhat.com>) id 1ZeMhM-00035w-Nb
	for qemu-devel@nongnu.org; Tue, 22 Sep 2015 08:29:29 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <imammedo@redhat.com>) id 1ZeMhG-00035q-HW
	for qemu-devel@nongnu.org; Tue, 22 Sep 2015 08:29:28 -0400
Received: from mx1.redhat.com ([209.132.183.28]:44172)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <imammedo@redhat.com>) id 1ZeMhG-00035h-CG
	for qemu-devel@nongnu.org; Tue, 22 Sep 2015 08:29:22 -0400
Date: Tue, 22 Sep 2015 14:29:19 +0200
From: Igor Mammedov <imammedo@redhat.com>
Message-ID: <20150922142919.3db1f463@nial.brq.redhat.com>
In-Reply-To: <9e346b5686cef7b084a2563eae9d8143126b3b33.1442380656.git.zhugh.fnst@cn.fujitsu.com>
References: <cover.1442380656.git.zhugh.fnst@cn.fujitsu.com>
	<9e346b5686cef7b084a2563eae9d8143126b3b33.1442380656.git.zhugh.fnst@cn.fujitsu.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Subject: Re: [Qemu-devel] [PATCH v12 3/5] x86: use new method to correct
	reset sequence
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Zhu Guihua <zhugh.fnst@cn.fujitsu.com>
Cc: ehabkost@redhat.com, qemu-devel@nongnu.org, izumi.taku@jp.fujitsu.com, chen.fan.fnst@cn.fujitsu.com, pbonzini@redhat.com, afaerber@suse.de

On Wed, 16 Sep 2015 17:19:13 +0800
Zhu Guihua <zhugh.fnst@cn.fujitsu.com> wrote:

> During reset some devices (such as hpet, rtc) might send IRQ to APIC
> which changes APIC's state from default one it's supposed to have
> at machine startup time.
> Fix this by resetting APIC after devices have been reset to cancel
> any changes that qemu_devices_reset() might have done to its state.
> 
> Signed-off-by: Zhu Guihua <zhugh.fnst@cn.fujitsu.com>

Reviewed-by: Igor Mammedov <imammedo@redhat.com>

> ---
>  hw/i386/pc.c | 20 ++++++++++++++++++++
>  1 file changed, 20 insertions(+)
> 
> diff --git a/hw/i386/pc.c b/hw/i386/pc.c
> index 631f89f..b414055 100644
> --- a/hw/i386/pc.c
> +++ b/hw/i386/pc.c
> @@ -1924,6 +1924,25 @@ static void pc_machine_initfn(Object *obj)
>                               NULL, &error_abort);
>  }
>  
> +static void pc_machine_reset(void)
> +{
> +    CPUState *cs;
> +    X86CPU *cpu;
> +
> +    qemu_devices_reset();
> +
> +    /* Reset APIC after devices have been reset to cancel
> +     * any changes that qemu_devices_reset() might have done.
> +     */
> +    CPU_FOREACH(cs) {
> +        cpu = X86_CPU(cs);
> +
> +        if (cpu->apic_state) {
> +            device_reset(cpu->apic_state);
> +        }
> +    }
> +}
> +
>  static unsigned pc_cpu_index_to_socket_id(unsigned cpu_index)
>  {
>      unsigned pkg_id, core_id, smt_id;
> @@ -1944,6 +1963,7 @@ static void pc_machine_class_init(ObjectClass *oc, void *data)
>      mc->default_boot_order = "cad";
>      mc->hot_add_cpu = pc_hot_add_cpu;
>      mc->max_cpus = 255;
> +    mc->reset = pc_machine_reset;
>      hc->plug = pc_machine_device_plug_cb;
>      hc->unplug_request = pc_machine_device_unplug_request_cb;
>      hc->unplug = pc_machine_device_unplug_cb;