From patchwork Wed Apr 1 10:29:35 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 457221 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 9F1AD140187 for ; Wed, 1 Apr 2015 21:30:20 +1100 (AEDT) Received: from localhost ([::1]:50025 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YdFuc-0007So-IW for incoming@patchwork.ozlabs.org; Wed, 01 Apr 2015 06:30:18 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49332) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YdFu7-0006Xr-F8 for qemu-devel@nongnu.org; Wed, 01 Apr 2015 06:29:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YdFu6-0000jX-OB for qemu-devel@nongnu.org; Wed, 01 Apr 2015 06:29:47 -0400 Received: from mx1.redhat.com ([209.132.183.28]:54159) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YdFu6-0000j9-Gl for qemu-devel@nongnu.org; Wed, 01 Apr 2015 06:29:46 -0400 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id t31ATjaY019426 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Wed, 1 Apr 2015 06:29:46 -0400 Received: from donizetti.redhat.com (ovpn-112-45.ams2.redhat.com [10.36.112.45]) by int-mx13.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t31ATbYR032332; Wed, 1 Apr 2015 06:29:44 -0400 From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Wed, 1 Apr 2015 12:29:35 +0200 Message-Id: <1427884177-4928-4-git-send-email-pbonzini@redhat.com> In-Reply-To: <1427884177-4928-1-git-send-email-pbonzini@redhat.com> References: <1427884177-4928-1-git-send-email-pbonzini@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.26 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Igor Mammedov Subject: [Qemu-devel] [PULL 3/5] pc: acpi: fix pvpanic regression 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 From: Igor Mammedov Commit cd61cb2 pc: acpi-build: generate pvpanic device description dynamically introduced regression changing pvpanic device HID from QEMU0001 to QEMU0002. Fix AML generated code so that pvpanic device would keep its original HID. i.e. QEMU0001 Signed-off-by: Igor Mammedov Reported-by: Gal Hammer Message-Id: <1427717907-25027-1-git-send-email-imammedo@redhat.com> Acked-by: Michael S. Tsirkin Reviewed-by: Michael S. Tsirkin Signed-off-by: Paolo Bonzini --- hw/i386/acpi-build.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c index d0a5c85..e761005 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -788,7 +788,7 @@ build_ssdt(GArray *table_data, GArray *linker, scope = aml_scope("\\_SB.PCI0.ISA"); dev = aml_device("PEVR"); - aml_append(dev, aml_name_decl("_HID", aml_string("QEMU0002"))); + aml_append(dev, aml_name_decl("_HID", aml_string("QEMU0001"))); crs = aml_resource_template(); aml_append(crs,