From patchwork Sun Jan 8 21:40:04 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Mammedov X-Patchwork-Id: 134949 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 29848B6F65 for ; Mon, 9 Jan 2012 08:40:20 +1100 (EST) Received: from localhost ([::1]:55827 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Rk0TR-0002O7-8W for incoming@patchwork.ozlabs.org; Sun, 08 Jan 2012 16:40:17 -0500 Received: from eggs.gnu.org ([140.186.70.92]:56220) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Rk0TL-0002O2-77 for qemu-devel@nongnu.org; Sun, 08 Jan 2012 16:40:12 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Rk0TK-0002gg-9l for qemu-devel@nongnu.org; Sun, 08 Jan 2012 16:40:11 -0500 Received: from mx1.redhat.com ([209.132.183.28]:4850) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Rk0TK-0002g2-30 for qemu-devel@nongnu.org; Sun, 08 Jan 2012 16:40:10 -0500 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q08Le77j026788 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Sun, 8 Jan 2012 16:40:07 -0500 Received: from nial.usersys.redhat.com (vpn-11-23.rdu.redhat.com [10.11.11.23]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id q08Le579023104; Sun, 8 Jan 2012 16:40:06 -0500 From: Igor Mammedov To: qemu-devel@nongnu.org Date: Sun, 8 Jan 2012 22:40:04 +0100 Message-Id: <1326058804-561-1-git-send-email-imammedo@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-Received-From: 209.132.183.28 Cc: avi@redhat.com, gleb@redhat.com Subject: [Qemu-devel] [PATCH qemu-kvm] Fix: SCI isn't sent on cpu hotplug 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 Change introduced by e71f08bb4a "Fix cpu/pci hotplug to generate level triggered interrupt." was lost somewhre along the way. And as result SCI is not sent in case of cpu hotplug event. Restoring hunk 1 of e71f08bb4a fixes issue. Signed-off-by: Igor Mammedov --- hw/acpi_piix4.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/hw/acpi_piix4.c b/hw/acpi_piix4.c index 1b35707..741a8cc 100644 --- a/hw/acpi_piix4.c +++ b/hw/acpi_piix4.c @@ -94,7 +94,8 @@ static void pm_update_sci(PIIX4PMState *s) ACPI_BITMASK_POWER_BUTTON_ENABLE | ACPI_BITMASK_GLOBAL_LOCK_ENABLE | ACPI_BITMASK_TIMER_ENABLE)) != 0) || - (((s->gpe.sts[0] & s->gpe.en[0]) & PIIX4_PCI_HOTPLUG_STATUS) != 0); + (((s->gpe.sts[0] & s->gpe.en[0]) & + (PIIX4_CPU_HOTPLUG_STATUS | PIIX4_PCI_HOTPLUG_STATUS)) != 0); qemu_set_irq(s->irq, sci_level); /* schedule a timer interruption if needed */