All of lore.kernel.org
 help / color / mirror / Atom feed
From: James Hogan <james.hogan@imgtec.com>
To: <qemu-devel@nongnu.org>
Cc: <kvm@vger.kernel.org>, Aurelien Jarno <aurelien@aurel32.net>,
	"Paolo Bonzini" <pbonzini@redhat.com>,
	James Hogan <james.hogan@imgtec.com>
Subject: [PATCH 3/4] mips_malta: Remove incorrect KVM T&E references
Date: Thu, 26 Jun 2014 10:44:24 +0100	[thread overview]
Message-ID: <1403775865-25219-4-git-send-email-james.hogan@imgtec.com> (raw)
In-Reply-To: <1403775865-25219-1-git-send-email-james.hogan@imgtec.com>

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.

Reported-by: Andreas Färber <afaerber@suse.de>
Signed-off-by: James Hogan <james.hogan@imgtec.com>
Cc: Aurelien Jarno <aurelien@aurel32.net>
Cc: Paolo Bonzini <pbonzini@redhat.com>
---
 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 c0841991f4e9..76cf5f2c48f4 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. */
-- 
1.9.3


WARNING: multiple messages have this Message-ID (diff)
From: James Hogan <james.hogan@imgtec.com>
To: qemu-devel@nongnu.org
Cc: Paolo Bonzini <pbonzini@redhat.com>,
	James Hogan <james.hogan@imgtec.com>,
	Aurelien Jarno <aurelien@aurel32.net>,
	kvm@vger.kernel.org
Subject: [Qemu-devel] [PATCH 3/4] mips_malta: Remove incorrect KVM T&E references
Date: Thu, 26 Jun 2014 10:44:24 +0100	[thread overview]
Message-ID: <1403775865-25219-4-git-send-email-james.hogan@imgtec.com> (raw)
In-Reply-To: <1403775865-25219-1-git-send-email-james.hogan@imgtec.com>

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.

Reported-by: Andreas Färber <afaerber@suse.de>
Signed-off-by: James Hogan <james.hogan@imgtec.com>
Cc: Aurelien Jarno <aurelien@aurel32.net>
Cc: Paolo Bonzini <pbonzini@redhat.com>
---
 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 c0841991f4e9..76cf5f2c48f4 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. */
-- 
1.9.3

  parent reply	other threads:[~2014-06-26  9:44 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-06-26  9:44 [PATCH 0/4] QEMU MIPS KVM improvements for v2.1 James Hogan
2014-06-26  9:44 ` [Qemu-devel] " James Hogan
2014-06-26  9:44 ` [PATCH 1/4] mips/kvm: Init EBase to correct KSEG0 James Hogan
2014-06-26  9:44   ` [Qemu-devel] " James Hogan
2014-06-27  8:41   ` Aurelien Jarno
2014-06-27  8:41     ` [Qemu-devel] " Aurelien Jarno
2014-06-26  9:44 ` [PATCH 2/4] mips_malta: Change default KVM cpu to 24Kc (no FP) James Hogan
2014-06-26  9:44   ` [Qemu-devel] " James Hogan
2014-06-27  8:43   ` Aurelien Jarno
2014-06-27  8:43     ` [Qemu-devel] " Aurelien Jarno
2014-06-27 11:33     ` Paolo Bonzini
2014-06-27 11:33       ` [Qemu-devel] " Paolo Bonzini
2014-06-27 15:22       ` [PATCH v2 2/4] mips/kvm: Disable FPU on reset with KVM James Hogan
2014-06-27 15:22         ` [Qemu-devel] " James Hogan
2014-06-26  9:44 ` James Hogan [this message]
2014-06-26  9:44   ` [Qemu-devel] [PATCH 3/4] mips_malta: Remove incorrect KVM T&E references James Hogan
2014-06-27  8:43   ` Aurelien Jarno
2014-06-27  8:43     ` [Qemu-devel] " Aurelien Jarno
2014-06-26  9:44 ` [PATCH 4/4] mips_malta: Catch kernels linked at wrong address James Hogan
2014-06-26  9:44   ` [Qemu-devel] " James Hogan
2014-06-27  8:43   ` Aurelien Jarno
2014-06-27  8:43     ` [Qemu-devel] " Aurelien Jarno
2014-06-26 10:12 ` [PATCH 0/4] QEMU MIPS KVM improvements for v2.1 Paolo Bonzini
2014-06-26 10:12   ` [Qemu-devel] " Paolo Bonzini
2014-06-26 11:27   ` James Hogan
2014-06-26 11:27     ` [Qemu-devel] " James Hogan

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1403775865-25219-4-git-send-email-james.hogan@imgtec.com \
    --to=james.hogan@imgtec.com \
    --cc=aurelien@aurel32.net \
    --cc=kvm@vger.kernel.org \
    --cc=pbonzini@redhat.com \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.