[Qemu-devel] [PULL 02/19] tests/multiboot: Update reference output

qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed

From: Paolo Bonzini <pbonzini@redhat.com>
To: qemu-devel@nongnu.org
Cc: Kevin Wolf <kwolf@redhat.com>
Subject: [Qemu-devel] [PULL 02/19] tests/multiboot: Update reference output
Date: Mon, 26 Jan 2015 10:24:13 +0100	[thread overview]
Message-ID: <1422264270-19278-3-git-send-email-pbonzini@redhat.com> (raw)
In-Reply-To: <1422264270-19278-1-git-send-email-pbonzini@redhat.com>

From: Kevin Wolf <kwolf@redhat.com>

The changes look okay (larger PCI hole, some rounding differences), so
just update the reference output of the test case.

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 tests/multiboot/mmap.out | 37 ++++++++++++++++++-------------------
 1 file changed, 18 insertions(+), 19 deletions(-)

diff --git a/tests/multiboot/mmap.out b/tests/multiboot/mmap.out
index e70b6eb..003e109 100644
--- a/tests/multiboot/mmap.out
+++ b/tests/multiboot/mmap.out
@@ -4,14 +4,14 @@
 === Running test case: mmap.elf  ===
 
 Lower memory: 639k
-Upper memory: 130040k
+Upper memory: 129920k
 
 e820 memory map:
 0x0 - 0x9fc00: type 1 [entry size: 20]
 0x9fc00 - 0xa0000: type 2 [entry size: 20]
 0xf0000 - 0x100000: type 2 [entry size: 20]
-0x100000 - 0x7ffe000: type 1 [entry size: 20]
-0x7ffe000 - 0x8000000: type 2 [entry size: 20]
+0x100000 - 0x7fe0000: type 1 [entry size: 20]
+0x7fe0000 - 0x8000000: type 2 [entry size: 20]
 0xfffc0000 - 0x100000000: type 2 [entry size: 20]
 
 mmap start:       0x9000
@@ -22,32 +22,31 @@ real mmap end:    0x9090
 === Running test case: mmap.elf -m 1.1M ===
 
 Lower memory: 639k
-Upper memory: 96k
+Upper memory: 104k
 
 e820 memory map:
 0x0 - 0x9fc00: type 1 [entry size: 20]
 0x9fc00 - 0xa0000: type 2 [entry size: 20]
 0xf0000 - 0x100000: type 2 [entry size: 20]
-0x100000 - 0x118000: type 1 [entry size: 20]
-0x118000 - 0x11a000: type 2 [entry size: 20]
+0x100000 - 0x11a000: type 1 [entry size: 20]
 0xfffc0000 - 0x100000000: type 2 [entry size: 20]
 
 mmap start:       0x9000
-mmap end:         0x9090
-real mmap end:    0x9090
+mmap end:         0x9078
+real mmap end:    0x9078
 
 
 === Running test case: mmap.elf -m 2G ===
 
 Lower memory: 639k
-Upper memory: 2096120k
+Upper memory: 2096000k
 
 e820 memory map:
 0x0 - 0x9fc00: type 1 [entry size: 20]
 0x9fc00 - 0xa0000: type 2 [entry size: 20]
 0xf0000 - 0x100000: type 2 [entry size: 20]
-0x100000 - 0x7fffe000: type 1 [entry size: 20]
-0x7fffe000 - 0x80000000: type 2 [entry size: 20]
+0x100000 - 0x7ffe0000: type 1 [entry size: 20]
+0x7ffe0000 - 0x80000000: type 2 [entry size: 20]
 0xfffc0000 - 0x100000000: type 2 [entry size: 20]
 
 mmap start:       0x9000
@@ -58,16 +57,16 @@ real mmap end:    0x9090
 === Running test case: mmap.elf -m 4G ===
 
 Lower memory: 639k
-Upper memory: 3668984k
+Upper memory: 3144576k
 
 e820 memory map:
 0x0 - 0x9fc00: type 1 [entry size: 20]
 0x9fc00 - 0xa0000: type 2 [entry size: 20]
 0xf0000 - 0x100000: type 2 [entry size: 20]
-0x100000 - 0xdfffe000: type 1 [entry size: 20]
-0xdfffe000 - 0xe0000000: type 2 [entry size: 20]
+0x100000 - 0xbffe0000: type 1 [entry size: 20]
+0xbffe0000 - 0xc0000000: type 2 [entry size: 20]
 0xfffc0000 - 0x100000000: type 2 [entry size: 20]
-0x100000000 - 0x120000000: type 1 [entry size: 20]
+0x100000000 - 0x140000000: type 1 [entry size: 20]
 
 mmap start:       0x9000
 mmap end:         0x90a8
@@ -77,16 +76,16 @@ real mmap end:    0x90a8
 === Running test case: mmap.elf -m 8G ===
 
 Lower memory: 639k
-Upper memory: 3668984k
+Upper memory: 3144576k
 
 e820 memory map:
 0x0 - 0x9fc00: type 1 [entry size: 20]
 0x9fc00 - 0xa0000: type 2 [entry size: 20]
 0xf0000 - 0x100000: type 2 [entry size: 20]
-0x100000 - 0xdfffe000: type 1 [entry size: 20]
-0xdfffe000 - 0xe0000000: type 2 [entry size: 20]
+0x100000 - 0xbffe0000: type 1 [entry size: 20]
+0xbffe0000 - 0xc0000000: type 2 [entry size: 20]
 0xfffc0000 - 0x100000000: type 2 [entry size: 20]
-0x100000000 - 0x220000000: type 1 [entry size: 20]
+0x100000000 - 0x240000000: type 1 [entry size: 20]
 
 mmap start:       0x9000
 mmap end:         0x90a8
-- 
1.8.3.1

next prev parent reply	other threads:[~2015-01-26  9:24 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-01-26  9:24 [Qemu-devel] [PULL 00/19] i386, KVM, misc changes for 2015-01-26 Paolo Bonzini
2015-01-26  9:24 ` [Qemu-devel] [PULL 01/19] pc: fix KVM features in pc-1.3 and earlier machine types Paolo Bonzini
2015-01-26  9:24 ` Paolo Bonzini [this message]
2015-01-26  9:24 ` [Qemu-devel] [PULL 03/19] multiboot: Fix offset of bootloader name Paolo Bonzini
2015-01-26  9:24 ` [Qemu-devel] [PULL 04/19] tests/multiboot: Add test for modules Paolo Bonzini
2015-01-26  9:24 ` [Qemu-devel] [PULL 05/19] target-i386: use vmstate_offset_sub_array for AVX registers Paolo Bonzini
2015-01-26  9:24 ` [Qemu-devel] [PULL 06/19] target-i386: make xmm_regs 512-bit wide Paolo Bonzini
2015-01-26  9:24 ` [Qemu-devel] [PULL 07/19] qemu-timer: add timer_init and timer_init_ns/us/ms Paolo Bonzini
2015-01-26  9:24 ` [Qemu-devel] [PULL 08/19] qemu-timer: introduce timer_deinit Paolo Bonzini
2015-01-26  9:24 ` [Qemu-devel] [PULL 09/19] vmstate: accept QEMUTimer in VMSTATE_TIMER*, add VMSTATE_TIMER_PTR* Paolo Bonzini
2015-01-26  9:24 ` [Qemu-devel] [PULL 10/19] hw: misc, add educational driver Paolo Bonzini
2015-01-26  9:24 ` [Qemu-devel] [PULL 11/19] kvm_stat: Add aarch64 support Paolo Bonzini
2015-01-26  9:24 ` [Qemu-devel] [PULL 12/19] kvm_stat: Update exit reasons to the latest defintion Paolo Bonzini
2015-01-26  9:24 ` [Qemu-devel] [PULL 13/19] kvm_stat: Print errno when syscall to perf_event_open() fails Paolo Bonzini
2015-01-26  9:24 ` [Qemu-devel] [PULL 14/19] apic: do not dereference pointer before it is checked for NULL Paolo Bonzini
2015-01-26  9:24 ` [Qemu-devel] [PULL 15/19] .travis.yml: Add "--enable-modules" Paolo Bonzini
2015-01-26  9:24 ` [Qemu-devel] [PULL 16/19] exec: fix madvise of NULL pointer Paolo Bonzini
2015-01-26  9:24 ` [Qemu-devel] [PULL 17/19] sparse: Fix build with sparse on .S files Paolo Bonzini
2015-01-26  9:24 ` [Qemu-devel] [PULL 18/19] target-i386: Disable HLE and RTM on Haswell & Broadwell Paolo Bonzini
2015-01-26  9:24 ` [Qemu-devel] [PULL 19/19] kvm_stat: Add RESET support for perf event ioctl Paolo Bonzini
2015-01-26 10:30 ` [Qemu-devel] [PULL 00/19] i386, KVM, misc changes for 2015-01-26 Peter Maydell

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:e70b6eb dfblob:003e109 )
 OR (
bs:"[Qemu-devel] [PULL 02/19] tests/multiboot: Update reference output" )
	(help)

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=1422264270-19278-3-git-send-email-pbonzini@redhat.com \
    --to=pbonzini@redhat.com \
    --cc=kwolf@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).