From patchwork Wed Jul 9 15:59:30 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 368547 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 6443F1400AF for ; Thu, 10 Jul 2014 19:47:56 +1000 (EST) Received: from localhost ([::1]:60817 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X4uKQ-0006KO-G7 for incoming@patchwork.ozlabs.org; Wed, 09 Jul 2014 12:02:42 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59927) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X4uHl-0005o1-0k for qemu-devel@nongnu.org; Wed, 09 Jul 2014 12:00:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1X4uHf-0006lb-JI for qemu-devel@nongnu.org; Wed, 09 Jul 2014 11:59:56 -0400 Received: from mail-wg0-x22b.google.com ([2a00:1450:400c:c00::22b]:50376) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X4uHf-0006kY-Bh for qemu-devel@nongnu.org; Wed, 09 Jul 2014 11:59:51 -0400 Received: by mail-wg0-f43.google.com with SMTP id b13so7591282wgh.2 for ; Wed, 09 Jul 2014 08:59:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-type:content-transfer-encoding; bh=L4Bvyp72csXLGcrs4wMWZ2IOOR9D9X2lHMX0X40n/T8=; b=kAr81JX4ejF1fxQ/H/CvNQIisoDLKMQCGFi1i4gGWynBT/hl8+njoFDMosO5WV9ovJ +WFnEBbxyhvv04WjdRP8u/Vhl9rMrOVLq7mTZn/FMa/AJ0k8sQodzKLqvGOzEMds7dym Zw/CLt3+XToHOOox43Blihx2cpTbtB3IgAM0RM2DbnvutJ2/RkoUCw4r0PZQCWayeh5a K5qMuU9rgshWQYvzCdCpOF++XwDh9/lT442YLRneXOEgiKq/pykIQGvnHnpY8K2o34Eo cMPTXUJPY/rbyKSz//hvX+Xq0MH5709tvrMX3SF2xOXsR+eCY9OqbaJ4fURHwCfQTPVZ ejlw== X-Received: by 10.194.6.10 with SMTP id w10mr5429791wjw.51.1404921590473; Wed, 09 Jul 2014 08:59:50 -0700 (PDT) Received: from playground.station (net-2-35-201-190.cust.vodafonedsl.it. [2.35.201.190]) by mx.google.com with ESMTPSA id ub11sm9013105wib.1.2014.07.09.08.59.48 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 09 Jul 2014 08:59:49 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Wed, 9 Jul 2014 17:59:30 +0200 Message-Id: <1404921577-1461-4-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1404921577-1461-1-git-send-email-pbonzini@redhat.com> References: <1404921577-1461-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:400c:c00::22b Cc: James Hogan , Aurelien Jarno Subject: [Qemu-devel] [PULL 03/10] mips_malta: Remove incorrect KVM T&E references 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: James Hogan Fix the error message and code comments relating to KVM not supporting booting from the flash mapping when no kernel is provided. The issue is a general MIPS KVM issue and isn't specific to the Trap & Emulate version of MIPS KVM. Cc: Aurelien Jarno Cc: Paolo Bonzini Reported-by: Andreas Färber Signed-off-by: James Hogan Reviewed-by: Aurelien Jarno Signed-off-by: Paolo Bonzini --- hw/mips/mips_malta.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c index c084199..76cf5f2 100644 --- a/hw/mips/mips_malta.c +++ b/hw/mips/mips_malta.c @@ -1033,7 +1033,7 @@ void mips_malta_init(MachineState *machine) fl_idx++; if (kernel_filename) { ram_low_size = MIN(ram_size, 256 << 20); - /* For KVM T&E we reserve 1MB of RAM for running bootloader */ + /* For KVM we reserve 1MB of RAM for running bootloader */ if (kvm_enabled()) { ram_low_size -= 0x100000; bootloader_run_addr = 0x40000000 + ram_low_size; @@ -1057,10 +1057,10 @@ void mips_malta_init(MachineState *machine) bootloader_run_addr, kernel_entry); } } else { - /* The flash region isn't executable from a KVM T&E guest */ + /* The flash region isn't executable from a KVM guest */ if (kvm_enabled()) { error_report("KVM enabled but no -kernel argument was specified. " - "Booting from flash is not supported with KVM T&E."); + "Booting from flash is not supported with KVM."); exit(1); } /* Load firmware from flash. */