From 8ef856b79fd0c19332098d309e83ba69b908a043 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Date: Tue, 18 Dec 2018 12:56:05 +0100 Subject: [PATCH 01/13] MAINTAINERS: Add missing entries for the sun4u machines MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reviewed-by: Mark Cave-Ayland Signed-off-by: Philippe Mathieu-Daudé Signed-off-by: Thomas Huth --- MAINTAINERS | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/MAINTAINERS b/MAINTAINERS index 8f9f9d7c7d..22e0293a6c 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1100,9 +1100,13 @@ Sun4u M: Mark Cave-Ayland S: Maintained F: hw/sparc64/sun4u.c -F: pc-bios/openbios-sparc64 +F: hw/sparc64/sun4u_iommu.c +F: include/hw/sparc/sun4u_iommu.h F: hw/pci-host/sabre.c F: include/hw/pci-host/sabre.h +F: hw/pci-bridge/simba.c +F: include/hw/pci-bridge/simba.h +F: pc-bios/openbios-sparc64 Sun4v M: Artyom Tarasenko From 6f5a32947bb2235480de120384586403fd2c3956 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Date: Tue, 18 Dec 2018 12:56:06 +0100 Subject: [PATCH 02/13] MAINTAINERS: Add missing entries for the PC machines MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Michael S. Tsirkin Signed-off-by: Thomas Huth --- MAINTAINERS | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index 22e0293a6c..3a034f972c 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1185,6 +1185,10 @@ F: hw/acpi/ich9.c F: include/hw/acpi/ich9.h F: include/hw/acpi/piix4.h F: hw/misc/sga.c +F: hw/isa/apm.c +F: include/hw/isa/apm.h +F: tests/test-x86-cpuid.c +F: tests/test-x86-cpuid-compat.c PC Chipset M: Michael S. Tsirkin From cd81e02b1e47dea098367513ff0811080f12ca06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Date: Tue, 18 Dec 2018 12:56:08 +0100 Subject: [PATCH 03/13] MAINTAINERS: Add missing entries for the QObject section MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Thomas Huth Reviewed-by: Markus Armbruster Signed-off-by: Thomas Huth --- MAINTAINERS | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/MAINTAINERS b/MAINTAINERS index 3a034f972c..4e38864fbd 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1940,10 +1940,14 @@ F: include/qapi/qmp/ X: include/qapi/qmp/dispatch.h F: scripts/coccinelle/qobject.cocci F: tests/check-qdict.c -F: tests/check-qnum.c F: tests/check-qjson.c F: tests/check-qlist.c +F: tests/check-qlit.c +F: tests/check-qnull.c +F: tests/check-qnum.c +F: tests/check-qobject.c F: tests/check-qstring.c +F: qdict-test-data.txt T: git https://repo.or.cz/qemu/armbru.git qapi-next QEMU Guest Agent From 4d21171b61f1d4ac7c37a4d3d77cd17aa99611cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Date: Tue, 18 Dec 2018 12:56:09 +0100 Subject: [PATCH 04/13] MAINTAINERS: Add missing test entries to the Cryptography section MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Acked-by: Daniel P. Berrangé Signed-off-by: Philippe Mathieu-Daudé Signed-off-by: Thomas Huth --- MAINTAINERS | 2 ++ 1 file changed, 2 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index 4e38864fbd..d81f9c4563 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2069,6 +2069,8 @@ F: crypto/ F: include/crypto/ F: tests/test-crypto-* F: tests/benchmark-crypto-* +F: tests/crypto-tls-* +F: tests/pkix_asn1_tab.c F: qemu.sasl Coroutines From e188396c59851595c78012c531f1dc0b3c58cbae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Date: Tue, 18 Dec 2018 12:56:10 +0100 Subject: [PATCH 05/13] MAINTAINERS: Add an entry for the Dino machine MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Add Richard as maintainer, and Helge as reviewer. Cc: Richard Henderson Cc: Helge Deller Signed-off-by: Philippe Mathieu-Daudé [thuth: Add the machine entry alphabetically] Signed-off-by: Thomas Huth --- MAINTAINERS | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index d81f9c4563..892d2c4fcc 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -851,6 +851,15 @@ S: Maintained F: hw/cris/axis_dev88.c F: hw/*/etraxfs_*.c +HP-PARISC Machines +------------------ +Dino +M: Richard Henderson +R: Helge Deller +S: Odd Fixes +F: hw/hppa/ +F: pc-bios/hppa-firmware.img + LM32 Machines ------------- EVR32 and uclinux BSP From f3f0204d687c0dd2f27a32975a54c0487fd1d4c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Date: Tue, 18 Dec 2018 12:56:12 +0100 Subject: [PATCH 06/13] MAINTAINERS: Add maintainer to the POSIX subsystem MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Add Paolo as maintainer of the POSIX subsystem. Remove the qemu-devel@nongnu.org entry because the list is always selected by the 'All patches CC here' section. Cc: Paolo Bonzini Suggested-by: Markus Armbruster Signed-off-by: Philippe Mathieu-Daudé Signed-off-by: Thomas Huth --- MAINTAINERS | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index 892d2c4fcc..30a3359b1e 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -431,9 +431,12 @@ F: linux-* F: linux-headers/ POSIX -L: qemu-devel@nongnu.org +M: Paolo Bonzini S: Maintained -F: *posix* +F: os-posix.c +F: include/sysemu/os-posix.h +F: util/*posix*.c +F: include/qemu/*posix*.h NETBSD L: qemu-devel@nongnu.org From de5415b67599a7ee10c1e3bd157acba2860ff93b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Date: Tue, 18 Dec 2018 12:56:14 +0100 Subject: [PATCH 07/13] MAINTAINERS: Orphanize the 'GDB stub' subsystem MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Nobody is looking at those files, downgrade this subsystem as orphan. Remove the qemu-devel@nongnu.org entry because the list is always selected by the 'All patches CC here' section. Suggested-by: Markus Armbruster Signed-off-by: Philippe Mathieu-Daudé Signed-off-by: Thomas Huth --- MAINTAINERS | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index 30a3359b1e..ee7348626d 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1815,8 +1815,7 @@ F: util/error.c F: util/qemu-error.c GDB stub -L: qemu-devel@nongnu.org -S: Odd Fixes +S: Orphan F: gdbstub* F: gdb-xml/ From f5fecb4900744c719f2a4c24f88181a82c47684b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Date: Tue, 18 Dec 2018 12:56:11 +0100 Subject: [PATCH 08/13] MAINTAINERS: Add maintainers to the Linux subsystem MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Add Michael, Cornelia and Paolo as maintainers of the Linux subsystem. Remove the qemu-devel@nongnu.org entry because the list is always selected by the 'All patches CC here' section. Suggested-by: Paolo Bonzini Signed-off-by: Philippe Mathieu-Daudé Acked-by: Cornelia Huck [thuth: Add update-linux-headers.sh, too] Signed-off-by: Thomas Huth --- MAINTAINERS | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index ee7348626d..a1ceccf2a2 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -425,10 +425,12 @@ Hosts: ------ LINUX -L: qemu-devel@nongnu.org +M: Michael S. Tsirkin +M: Cornelia Huck +M: Paolo Bonzini S: Maintained -F: linux-* F: linux-headers/ +F: scripts/update-linux-headers.sh POSIX M: Paolo Bonzini From ecd1a5d0c19571b1e172538ca87420934f1f80d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Date: Tue, 18 Dec 2018 12:56:15 +0100 Subject: [PATCH 09/13] MAINTAINERS: Add maintainer to the TCG/i386 subsystem MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Richard obviously maintains this subdirectory, make this official :) Remove the qemu-devel@nongnu.org entry because the list is always selected by the 'All patches CC here' section. Cc: Richard Henderson Signed-off-by: Philippe Mathieu-Daudé Signed-off-by: Thomas Huth --- MAINTAINERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MAINTAINERS b/MAINTAINERS index a1ceccf2a2..8c217d84b3 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2232,7 +2232,7 @@ F: tcg/arm/ F: disas/arm.c i386 target -L: qemu-devel@nongnu.org +M: Richard Henderson S: Maintained F: tcg/i386/ F: disas/i386.c From aec2b887845e41a9fd9ee852edb10ec9bdf67b05 Mon Sep 17 00:00:00 2001 From: Thomas Huth Date: Fri, 15 Feb 2019 13:39:24 +0100 Subject: [PATCH 10/13] MAINTAINERS: Add some missing entries for the sun4m machine MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit These files / devices are only used by SPARC machines, so we can sort them into the corresponding category in the MAINTAINERS file. Cc: Mark Cave-Ayland Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Thomas Huth --- MAINTAINERS | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index 8c217d84b3..5a6db6caa9 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1103,12 +1103,15 @@ M: Mark Cave-Ayland S: Maintained F: hw/sparc/sun4m.c F: hw/sparc/sun4m_iommu.c +F: hw/display/cg3.c +F: hw/display/tcx.c F: hw/dma/sparc32_dma.c F: hw/misc/eccmemctl.c -F: hw/misc/slavio_misc.c +F: hw/*/slavio_*.c +F: include/hw/nvram/sun_nvram.h F: include/hw/sparc/sparc32_dma.h -F: pc-bios/openbios-sparc32 F: include/hw/sparc/sun4m_iommu.h +F: pc-bios/openbios-sparc32 Sun4u M: Mark Cave-Ayland From 572280e2c233e5b335e5de03c75e964da77c4bf1 Mon Sep 17 00:00:00 2001 From: Thomas Huth Date: Tue, 19 Feb 2019 09:12:39 +0100 Subject: [PATCH 11/13] MAINTAINERS: Clean up the RISC-V TCG backend section The e-mail address mjc@sifive.com of Michael is not valid anymore. Commit 7d04ac38959f8115f2a02 removed the entry already from the main RISC-V section, but apparently forgot to remove it from the TCG backend section, too. Fixes: 7d04ac38959f8115f2a029d81db1c8aac179aa95 Reviewed-by: Palmer Dabbelt Signed-off-by: Thomas Huth --- MAINTAINERS | 1 - 1 file changed, 1 deletion(-) diff --git a/MAINTAINERS b/MAINTAINERS index 5a6db6caa9..a4c7ebf986 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2254,7 +2254,6 @@ F: tcg/ppc/ F: disas/ppc.c RISC-V -M: Michael Clark M: Palmer Dabbelt M: Alistair Francis L: qemu-riscv@nongnu.org From a9d2e3f11c69d076e0703619809342e036eefb4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Date: Tue, 29 Jan 2019 09:38:07 +0100 Subject: [PATCH 12/13] tests/test-qga: Reenable guest-agent qtest MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Due to a misuse of rules.mak logical functions, commit f386df17448 disabled the guest-agent test. Enable it back. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Thomas Huth Reviewed-by: Laurent Vivier Signed-off-by: Thomas Huth --- tests/Makefile.include | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/Makefile.include b/tests/Makefile.include index 370de59974..4154da21fa 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -112,7 +112,7 @@ check-unit-y += tests/test-crypto-secret$(EXESUF) check-unit-$(CONFIG_GNUTLS) += tests/test-crypto-tlscredsx509$(EXESUF) check-unit-$(CONFIG_GNUTLS) += tests/test-crypto-tlssession$(EXESUF) ifneq (,$(findstring qemu-ga,$(TOOLS))) -check-unit-$(land,$(CONFIG_LINUX),$(CONFIG_VIRTIO_SERIAL)) += tests/test-qga$(EXESUF) +check-unit-$(call land,$(CONFIG_LINUX),$(CONFIG_VIRTIO_SERIAL)) += tests/test-qga$(EXESUF) endif check-unit-y += tests/test-timed-average$(EXESUF) check-unit-$(CONFIG_INOTIFY1) += tests/test-util-filemonitor$(EXESUF) From 9f04e1d9547224a935778c1935c605d607299070 Mon Sep 17 00:00:00 2001 From: Thomas Huth Date: Fri, 8 Feb 2019 19:33:07 +0100 Subject: [PATCH 13/13] hw/m68k/mcf5208: Support loading of bios images The MCF5208EVB supports 2 MiB of flash at address 0. Add support for this memory region and some code to load the file that can be specified with the "-bios" command line option. This can be used for example to load U-Boot images for the MCF5208EVB (we still lack some features in the CPU emulation for this firmware, though, so it can not be run successfully yet). Reviewed-by: Stefano Garzarella Signed-off-by: Thomas Huth --- hw/m68k/mcf5208.c | 30 +++++++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/hw/m68k/mcf5208.c b/hw/m68k/mcf5208.c index 8531e07e5b..6f6efae9fc 100644 --- a/hw/m68k/mcf5208.c +++ b/hw/m68k/mcf5208.c @@ -27,6 +27,8 @@ #define SYS_FREQ 166666666 +#define ROM_SIZE 0x200000 + #define PCSR_EN 0x0001 #define PCSR_RLD 0x0002 #define PCSR_PIF 0x0004 @@ -227,6 +229,7 @@ static void mcf5208evb_init(MachineState *machine) hwaddr entry; qemu_irq *pic; MemoryRegion *address_space_mem = get_system_memory(); + MemoryRegion *rom = g_new(MemoryRegion, 1); MemoryRegion *ram = g_new(MemoryRegion, 1); MemoryRegion *sram = g_new(MemoryRegion, 1); @@ -237,6 +240,10 @@ static void mcf5208evb_init(MachineState *machine) env->vbr = 0; /* TODO: Configure BARs. */ + /* ROM at 0x00000000 */ + memory_region_init_rom(rom, NULL, "mcf5208.rom", ROM_SIZE, &error_fatal); + memory_region_add_subregion(address_space_mem, 0x00000000, rom); + /* DRAM at 0x40000000 */ memory_region_allocate_system_memory(ram, NULL, "mcf5208.ram", ram_size); memory_region_add_subregion(address_space_mem, 0x40000000, ram); @@ -285,9 +292,30 @@ static void mcf5208evb_init(MachineState *machine) /* 0xfc0a4000 GPIO. */ /* 0xfc0a8000 SDRAM controller. */ + /* Load firmware */ + if (bios_name) { + char *fn; + uint8_t *ptr; + + fn = qemu_find_file(QEMU_FILE_TYPE_BIOS, bios_name); + if (!fn) { + error_report("Could not find ROM image '%s'", bios_name); + exit(1); + } + if (load_image_targphys(fn, 0x0, ROM_SIZE) < 8) { + error_report("Could not load ROM image '%s'", bios_name); + exit(1); + } + g_free(fn); + /* Initial PC is always at offset 4 in firmware binaries */ + ptr = rom_ptr(0x4, 4); + assert(ptr != NULL); + env->pc = ldl_p(ptr); + } + /* Load kernel. */ if (!kernel_filename) { - if (qtest_enabled()) { + if (qtest_enabled() || bios_name) { return; } error_report("Kernel image must be specified");