mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-07 01:33:56 -06:00
- Many fixes from the floor as usual
- New "edu" device (v1->v2: fix 32-bit compilation) - Disabling HLE and RTM on Haswell & Broadwell - kvm_stat updates - Added --enable-modules to Travis, in preparation for switching the default -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) iQEcBAABAgAGBQJUxiioAAoJEL/70l94x66D+zQIAKVq9DPm4RNJ2/c2nt6phAVr 6Z5yB+TMf4BKFORwVkionvIOEqOC0pdm3oo93/XH7DTsN7pFg7rdwJl+ADESgvl6 +tpUbrgjZuCuNQNXy/mjx0EJQUmTk8/x+a054hSo6XNvs2ZM9HjaKNX3ojS6pG1J mhIH4cjGPMCwu2hgm2mho/1zdIs4Qk3xT8Uzfq8i5gES14YX0Fmt93idUn3DRs7m zHdzHWr0JmXfZweNDdPgsfGO6g+NnwgGUOqeGY4Ucmurkepk9ViCaaJP7lOnuRhT 52isayOrfrZsSLm5xxwtSUjmgbxzlOEit1b8jLzpHb5b9b+LJiCtuJnN7vwHb34= =jgup -----END PGP SIGNATURE----- Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging - Many fixes from the floor as usual - New "edu" device (v1->v2: fix 32-bit compilation) - Disabling HLE and RTM on Haswell & Broadwell - kvm_stat updates - Added --enable-modules to Travis, in preparation for switching the default # gpg: Signature made Mon 26 Jan 2015 11:44:40 GMT using RSA key ID 78C7AE83 # gpg: Good signature from "Paolo Bonzini <bonzini@gnu.org>" # gpg: aka "Paolo Bonzini <pbonzini@redhat.com>" # gpg: WARNING: This key is not certified with sufficiently trusted signatures! # gpg: It is not certain that the signature belongs to the owner. # Primary key fingerprint: 46F5 9FBD 57D6 12E7 BFD4 E2F7 7E15 100C CD36 69B1 # Subkey fingerprint: F133 3857 4B66 2389 866C 7682 BFFB D25F 78C7 AE83 * remotes/bonzini/tags/for-upstream: kvm_stat: Add RESET support for perf event ioctl target-i386: Disable HLE and RTM on Haswell & Broadwell sparse: Fix build with sparse on .S files exec: fix madvise of NULL pointer .travis.yml: Add "--enable-modules" apic: do not dereference pointer before it is checked for NULL kvm_stat: Print errno when syscall to perf_event_open() fails kvm_stat: Update exit reasons to the latest defintion kvm_stat: Add aarch64 support hw: misc, add educational driver vmstate: accept QEMUTimer in VMSTATE_TIMER*, add VMSTATE_TIMER_PTR* qemu-timer: introduce timer_deinit qemu-timer: add timer_init and timer_init_ns/us/ms target-i386: make xmm_regs 512-bit wide target-i386: use vmstate_offset_sub_array for AVX registers tests/multiboot: Add test for modules multiboot: Fix offset of bootloader name tests/multiboot: Update reference output pc: fix KVM features in pc-1.3 and earlier machine types Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell
commit
0c28d0d07f
54 changed files with 944 additions and 192 deletions
|
|
@ -6,11 +6,14 @@ LD=ld
|
|||
LDFLAGS=-melf_i386 -T link.ld
|
||||
LIBS=$(shell $(CC) $(CCFLAGS) -print-libgcc-file-name)
|
||||
|
||||
all: mmap.elf
|
||||
all: mmap.elf modules.elf
|
||||
|
||||
mmap.elf: start.o mmap.o libc.o
|
||||
$(LD) $(LDFLAGS) -o $@ $^ $(LIBS)
|
||||
|
||||
modules.elf: start.o modules.o libc.o
|
||||
$(LD) $(LDFLAGS) -o $@ $^ $(LIBS)
|
||||
|
||||
%.o: %.c
|
||||
$(CC) $(CCFLAGS) -c -o $@ $^
|
||||
|
||||
|
|
|
|||
|
|
@ -22,6 +22,18 @@
|
|||
|
||||
#include "libc.h"
|
||||
|
||||
void* memcpy(void *dest, const void *src, int n)
|
||||
{
|
||||
char *d = dest;
|
||||
const char *s = src;
|
||||
|
||||
while (n--) {
|
||||
*d++ = *s++;
|
||||
}
|
||||
|
||||
return dest;
|
||||
}
|
||||
|
||||
static void print_char(char c)
|
||||
{
|
||||
outb(0xe9, c);
|
||||
|
|
|
|||
|
|
@ -57,5 +57,6 @@ static inline void outb(uint16_t port, uint8_t data)
|
|||
/* Misc functions */
|
||||
|
||||
void printf(const char *fmt, ...);
|
||||
void* memcpy(void *dest, const void *src, int n);
|
||||
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -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
tests/multiboot/module.txt
Normal file
1
tests/multiboot/module.txt
Normal file
|
|
@ -0,0 +1 @@
|
|||
This is a test file that is used as a multiboot module.
|
||||
55
tests/multiboot/modules.c
Normal file
55
tests/multiboot/modules.c
Normal file
|
|
@ -0,0 +1,55 @@
|
|||
/*
|
||||
* Copyright (c) 2015 Kevin Wolf <kwolf@redhat.com>
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
* of this software and associated documentation files (the "Software"), to deal
|
||||
* in the Software without restriction, including without limitation the rights
|
||||
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
* copies of the Software, and to permit persons to whom the Software is
|
||||
* furnished to do so, subject to the following conditions:
|
||||
*
|
||||
* The above copyright notice and this permission notice shall be included in
|
||||
* all copies or substantial portions of the Software.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
||||
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||
* THE SOFTWARE.
|
||||
*/
|
||||
|
||||
#include "libc.h"
|
||||
#include "multiboot.h"
|
||||
|
||||
int test_main(uint32_t magic, struct mb_info *mbi)
|
||||
{
|
||||
struct mb_module *mod;
|
||||
unsigned int i;
|
||||
|
||||
(void) magic;
|
||||
|
||||
printf("Module list with %d entries at %x\n",
|
||||
mbi->mods_count, mbi->mods_addr);
|
||||
|
||||
for (i = 0, mod = (struct mb_module*) mbi->mods_addr;
|
||||
i < mbi->mods_count;
|
||||
i++, mod++)
|
||||
{
|
||||
char buf[1024];
|
||||
unsigned int size = mod->mod_end - mod->mod_start;
|
||||
|
||||
printf("[%p] Module: %x - %x (%d bytes) '%s'\n",
|
||||
mod, mod->mod_start, mod->mod_end, size, mod->string);
|
||||
|
||||
/* Print test file, but remove the newline at the end */
|
||||
if (size < sizeof(buf)) {
|
||||
memcpy(buf, (void*) mod->mod_start, size);
|
||||
buf[size - 1] = '\0';
|
||||
printf(" Content: '%s'\n", buf);
|
||||
}
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
38
tests/multiboot/modules.out
Normal file
38
tests/multiboot/modules.out
Normal file
|
|
@ -0,0 +1,38 @@
|
|||
|
||||
|
||||
|
||||
=== Running test case: modules.elf ===
|
||||
|
||||
Module list with 0 entries at 102000
|
||||
|
||||
|
||||
=== Running test case: modules.elf -initrd module.txt ===
|
||||
|
||||
Module list with 1 entries at 102000
|
||||
[102000] Module: 103000 - 103038 (56 bytes) 'module.txt'
|
||||
Content: 'This is a test file that is used as a multiboot module.'
|
||||
|
||||
|
||||
=== Running test case: modules.elf -initrd module.txt argument ===
|
||||
|
||||
Module list with 1 entries at 102000
|
||||
[102000] Module: 103000 - 103038 (56 bytes) 'module.txt argument'
|
||||
Content: 'This is a test file that is used as a multiboot module.'
|
||||
|
||||
|
||||
=== Running test case: modules.elf -initrd module.txt argument,,with,,commas ===
|
||||
|
||||
Module list with 1 entries at 102000
|
||||
[102000] Module: 103000 - 103038 (56 bytes) 'module.txt argument,with,commas'
|
||||
Content: 'This is a test file that is used as a multiboot module.'
|
||||
|
||||
|
||||
=== Running test case: modules.elf -initrd module.txt,module.txt argument,module.txt ===
|
||||
|
||||
Module list with 3 entries at 102000
|
||||
[102000] Module: 103000 - 103038 (56 bytes) 'module.txt'
|
||||
Content: 'This is a test file that is used as a multiboot module.'
|
||||
[102010] Module: 104000 - 104038 (56 bytes) 'module.txt argument'
|
||||
Content: 'This is a test file that is used as a multiboot module.'
|
||||
[102020] Module: 105000 - 105038 (56 bytes) 'module.txt'
|
||||
Content: 'This is a test file that is used as a multiboot module.'
|
||||
|
|
@ -48,10 +48,17 @@ mmap() {
|
|||
run_qemu mmap.elf -m 8G
|
||||
}
|
||||
|
||||
modules() {
|
||||
run_qemu modules.elf
|
||||
run_qemu modules.elf -initrd module.txt
|
||||
run_qemu modules.elf -initrd "module.txt argument"
|
||||
run_qemu modules.elf -initrd "module.txt argument,,with,,commas"
|
||||
run_qemu modules.elf -initrd "module.txt,module.txt argument,module.txt"
|
||||
}
|
||||
|
||||
make all
|
||||
|
||||
for t in mmap; do
|
||||
for t in mmap modules; do
|
||||
|
||||
echo > test.log
|
||||
$t
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue