From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41140) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aYgAl-0004ID-V2 for qemu-devel@nongnu.org; Wed, 24 Feb 2016 15:36:36 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aYgAl-0005fP-7A for qemu-devel@nongnu.org; Wed, 24 Feb 2016 15:36:35 -0500 Received: from mx1.redhat.com ([209.132.183.28]:46086) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aYgAk-0005fL-QL for qemu-devel@nongnu.org; Wed, 24 Feb 2016 15:36:34 -0500 Date: Wed, 24 Feb 2016 22:36:29 +0200 From: "Michael S. Tsirkin" Message-ID: <1456343639-3471-24-git-send-email-mst@redhat.com> References: <1456343639-3471-1-git-send-email-mst@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1456343639-3471-1-git-send-email-mst@redhat.com> Subject: [Qemu-devel] [PULL 23/23] q35: No need to check gigabyte_align List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , Eduardo Habkost , Markus Armbruster , Paolo Bonzini , Igor Mammedov , Laszlo Ersek , Richard Henderson From: Eduardo Habkost gigabyte_align is always true on q35, so we don't need the !gigabyte_align compat code anymore. Signed-off-by: Eduardo Habkost Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin Reviewed-by: Laszlo Ersek Reviewed-by: Markus Armbruster Reviewed-by: Igor Mammedov --- 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 da28d77..46522c9 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; } -- MST