Commit de5be3fe authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/huth-gitlab/tags/pull-request-2019-02-28' into staging 



- Updates to MAINTAINERS file
- Re-enable the guest-agent test
- Add the possibility to load a bios image on the mcf5208evb machine

# gpg: Signature made Thu 28 Feb 2019 12:23:25 GMT
# gpg:                using RSA key 2ED9D774FE702DB5
# gpg: Good signature from "Thomas Huth <th.huth@gmx.de>" [full]
# gpg:                 aka "Thomas Huth <thuth@redhat.com>" [full]
# gpg:                 aka "Thomas Huth <huth@tuxfamily.org>" [full]
# gpg:                 aka "Thomas Huth <th.huth@posteo.de>" [unknown]
# Primary key fingerprint: 27B8 8847 EEE0 2501 18F3  EAB9 2ED9 D774 FE70 2DB5

* remotes/huth-gitlab/tags/pull-request-2019-02-28:
  hw/m68k/mcf5208: Support loading of bios images
  tests/test-qga: Reenable guest-agent qtest
  MAINTAINERS: Clean up the RISC-V TCG backend section
  MAINTAINERS: Add some missing entries for the sun4m machine
  MAINTAINERS: Add maintainer to the TCG/i386 subsystem
  MAINTAINERS: Add maintainers to the Linux subsystem
  MAINTAINERS: Orphanize the 'GDB stub' subsystem
  MAINTAINERS: Add maintainer to the POSIX subsystem
  MAINTAINERS: Add an entry for the Dino machine
  MAINTAINERS: Add missing test entries to the Cryptography section
  MAINTAINERS: Add missing entries for the QObject section
  MAINTAINERS: Add missing entries for the PC machines
  MAINTAINERS: Add missing entries for the sun4u machines

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 41795758 9f04e1d9

MAINTAINERS

+41 −12
Original line number Diff line number Diff line
@@ -425,15 +425,20 @@ Hosts: 
------



LINUX

L: qemu-devel@nongnu.org

M: Michael S. Tsirkin <mst@redhat.com>

M: Cornelia Huck <cohuck@redhat.com>

M: Paolo Bonzini <pbonzini@redhat.com>

S: Maintained

F: linux-*

F: linux-headers/

F: scripts/update-linux-headers.sh



POSIX

L: qemu-devel@nongnu.org

M: Paolo Bonzini <pbonzini@redhat.com>

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
@@ -853,6 +858,15 @@ S: Maintained 
F: hw/cris/axis_dev88.c

F: hw/*/etraxfs_*.c



HP-PARISC Machines

------------------

Dino

M: Richard Henderson <rth@twiddle.net>

R: Helge Deller <deller@gmx.de>

S: Odd Fixes

F: hw/hppa/

F: pc-bios/hppa-firmware.img



LM32 Machines

-------------

EVR32 and uclinux BSP
@@ -1091,20 +1105,27 @@ M: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> 
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 <mark.cave-ayland@ilande.co.uk>

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 <atar4qemu@gmail.com>
@@ -1183,6 +1204,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 <mst@redhat.com>
@@ -1797,8 +1822,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/
@@ -1934,10 +1958,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
@@ -2059,6 +2087,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
@@ -2207,7 +2237,7 @@ F: tcg/arm/ 
F: disas/arm.c



i386 target

L: qemu-devel@nongnu.org

M: Richard Henderson <rth@twiddle.net>

S: Maintained

F: tcg/i386/

F: disas/i386.c
@@ -2226,7 +2256,6 @@ F: tcg/ppc/ 
F: disas/ppc.c



RISC-V

M: Michael Clark <mjc@sifive.com>

M: Palmer Dabbelt <palmer@sifive.com>

M: Alistair Francis <Alistair.Francis@wdc.com>

L: qemu-riscv@nongnu.org

hw/m68k/mcf5208.c

+29 −1
Original line number Diff line number Diff line
@@ -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");

tests/Makefile.include

+1 −1
Original line number Diff line number Diff line
@@ -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)