From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:60671)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <mst@redhat.com>) id 1VW5iC-0005zM-Tw
	for qemu-devel@nongnu.org; Tue, 15 Oct 2013 10:35:10 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <mst@redhat.com>) id 1VW5i6-0002fF-HI
	for qemu-devel@nongnu.org; Tue, 15 Oct 2013 10:35:04 -0400
Received: from mx1.redhat.com ([209.132.183.28]:52059)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <mst@redhat.com>) id 1VW5i6-0002f5-92
	for qemu-devel@nongnu.org; Tue, 15 Oct 2013 10:34:58 -0400
Date: Tue, 15 Oct 2013 17:37:25 +0300
From: "Michael S. Tsirkin" <mst@redhat.com>
Message-ID: <20131015143725.GB7763@redhat.com>
References: <1381762577-12526-1-git-send-email-mst@redhat.com>
	<87r4bnlbj6.fsf@codemonkey.ws> <20131015052816.GC16331@redhat.com>
	<CA+aC4kvGLGQh0rtjh3Xg5S7yS7MKEH7Y4Gx9vaSG035m2dUVew@mail.gmail.com>
	<20131015142008.GA7613@redhat.com>
	<CA+aC4ktt=UJJu+iF0RNRqCHUr9dzA0C=ONoeRMX6wC6BNT0bMw@mail.gmail.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <CA+aC4ktt=UJJu+iF0RNRqCHUr9dzA0C=ONoeRMX6wC6BNT0bMw@mail.gmail.com>
Subject: Re: [Qemu-devel] [PULL 00/43] pci, pc, acpi fixes, enhancements
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: Anthony Liguori <anthony@codemonkey.ws>
Cc: Peter Maydell <peter.maydell@linaro.org>, Igor Mammedov <imammedo@redhat.com>, marcel.a@redhat.com, qemu-devel <qemu-devel@nongnu.org>, Gerd Hoffmann <kraxel@redhat.com>

On Tue, Oct 15, 2013 at 07:21:34AM -0700, Anthony Liguori wrote:
> I cannot reasonable revert a series like this before we cut GA.

It's very simple actually.
Here's a patch to disable it all.

diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
index 63ae2ae..1a5a70c 100644
--- a/hw/i386/pc_piix.c
+++ b/hw/i386/pc_piix.c
@@ -59,7 +59,7 @@ static const int ide_irq[MAX_IDE_BUS] = { 14, 15 };
 
 static bool has_pvpanic;
 static bool has_pci_info = true;
-static bool has_acpi_build = true;
+static bool has_acpi_build = false;
 
 /* PC hardware initialisation */
 static void pc_init1(QEMUMachineInitArgs *args,
diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c
index 4c191d3..4db95de 100644
--- a/hw/i386/pc_q35.c
+++ b/hw/i386/pc_q35.c
@@ -49,7 +49,7 @@
 
 static bool has_pvpanic;
 static bool has_pci_info = true;
-static bool has_acpi_build = true;
+static bool has_acpi_build = false;
 
 /* PC hardware initialisation */
 static void pc_q35_init(QEMUMachineInitArgs *args)