From patchwork Sat Jan 23 16:02:13 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eduardo Habkost X-Patchwork-Id: 8097631 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 78FEA9F6FA for ; Sat, 23 Jan 2016 16:05:11 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E9528201B4 for ; Sat, 23 Jan 2016 16:05:10 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 504A3200F3 for ; Sat, 23 Jan 2016 16:05:10 +0000 (UTC) Received: from localhost ([::1]:57840 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aN0gX-0008QA-N9 for patchwork-qemu-devel@patchwork.kernel.org; Sat, 23 Jan 2016 11:05:09 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60844) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aN0e9-0003ia-KW for qemu-devel@nongnu.org; Sat, 23 Jan 2016 11:02:42 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aN0e8-000342-R0 for qemu-devel@nongnu.org; Sat, 23 Jan 2016 11:02:41 -0500 Received: from mx1.redhat.com ([209.132.183.28]:39274) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aN0e8-00033s-MY for qemu-devel@nongnu.org; Sat, 23 Jan 2016 11:02:40 -0500 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 (Postfix) with ESMTPS id 518368CB55 for ; Sat, 23 Jan 2016 16:02:40 +0000 (UTC) Received: from localhost (ovpn-113-27.phx2.redhat.com [10.3.113.27]) by int-mx13.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u0NG2cGZ018044; Sat, 23 Jan 2016 11:02:39 -0500 From: Eduardo Habkost To: qemu-devel@nongnu.org Date: Sat, 23 Jan 2016 14:02:13 -0200 Message-Id: <1453564933-29638-6-git-send-email-ehabkost@redhat.com> In-Reply-To: <1453564933-29638-1-git-send-email-ehabkost@redhat.com> References: <1453564933-29638-1-git-send-email-ehabkost@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: "Michael S. Tsirkin" , Laszlo Ersek , Marcel Apfelbaum , Markus Armbruster , Igor Mammedov , Paolo Bonzini , John Snow Subject: [Qemu-devel] [PATCH v2 5/5] q35: No need to check gigabyte_align 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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP gigabyte_align is always true on q35, so we don't need the !gigabyte_align compat code anymore. Signed-off-by: Eduardo Habkost --- hw/i386/pc_q35.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index aed4432..20722f2 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -81,11 +81,9 @@ static void pc_q35_init(MachineState *machine) * If it doesn't, we need to split it in chunks below and above 4G. * In any case, try to make sure that guest addresses aligned at * 1G boundaries get mapped to host addresses aligned at 1G boundaries. - * For old machine types, use whatever split we used historically to avoid - * breaking migration. */ if (machine->ram_size >= 0xb0000000) { - lowmem = pcmc->gigabyte_align ? 0x80000000 : 0xb0000000; + lowmem = 0x80000000; } else { lowmem = 0xb0000000; }