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

Merge remote-tracking branch 'remotes/huth/tags/pull-request-2017-10-16' into staging 



Some m68k, qtest and config improvements

# gpg: Signature made Mon 16 Oct 2017 13:38:03 BST
# gpg:                using RSA key 0x2ED9D774FE702DB5
# gpg: Good signature from "Thomas Huth <th.huth@gmx.de>"
# gpg:                 aka "Thomas Huth <thuth@redhat.com>"
# gpg:                 aka "Thomas Huth <huth@tuxfamily.org>"
# gpg:                 aka "Thomas Huth <th.huth@posteo.de>"
# Primary key fingerprint: 27B8 8847 EEE0 2501 18F3  EAB9 2ED9 D774 FE70 2DB5

* remotes/huth/tags/pull-request-2017-10-16:
  default-configs: Enable CONFIG_VMXNET3_PCI only on x86
  tests/prom-env: Bump the timeout, and test pseries only in slow mode
  tests: use g_new() family of functions
  M68K: use g_new() family of functions
  hw/m68k: Replace fprintf(stderr, "*\n" with error_report()

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents c5bbcaa4 03bf6b5c

default-configs/i386-softmmu.mak

+1 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ CONFIG_QXL=$(CONFIG_SPICE) 
CONFIG_VGA_ISA=y

CONFIG_VGA_CIRRUS=y

CONFIG_VMWARE_VGA=y

CONFIG_VMXNET3_PCI=y

CONFIG_VIRTIO_VGA=y

CONFIG_VMMOUSE=y

CONFIG_IPMI=y

default-configs/pci.mak

+0 −1
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ CONFIG_MPTSAS_SCSI_PCI=y 
CONFIG_RTL8139_PCI=y

CONFIG_E1000_PCI=y

CONFIG_E1000E_PCI=y

CONFIG_VMXNET3_PCI=y

CONFIG_IDE_CORE=y

CONFIG_IDE_QDEV=y

CONFIG_IDE_PCI=y

default-configs/x86_64-softmmu.mak

+1 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ CONFIG_QXL=$(CONFIG_SPICE) 
CONFIG_VGA_ISA=y

CONFIG_VGA_CIRRUS=y

CONFIG_VMWARE_VGA=y

CONFIG_VMXNET3_PCI=y

CONFIG_VIRTIO_VGA=y

CONFIG_VMMOUSE=y

CONFIG_IPMI=y

hw/m68k/an5206.c

+2 −2
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ static void an5206_init(MachineState *machine) 
        if (qtest_enabled()) {

            return;

        }

        fprintf(stderr, "Kernel image must be specified\n");

        error_report("Kernel image must be specified");

        exit(1);

    }
@@ -83,7 +83,7 @@ static void an5206_init(MachineState *machine) 
        entry = KERNEL_LOAD_ADDR;

    }

    if (kernel_size < 0) {

        fprintf(stderr, "qemu: could not load kernel '%s'\n", kernel_filename);

        error_report("Could not load kernel '%s'", kernel_filename);

        exit(1);

    }

hw/m68k/mcf5206.c

+4 −3
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ 
 * This code is licensed under the GPL

 */

#include "qemu/osdep.h"

#include "qemu/error-report.h"

#include "qemu-common.h"

#include "cpu.h"

#include "hw/hw.h"
@@ -137,7 +138,7 @@ static m5206_timer_state *m5206_timer_init(qemu_irq irq) 
    m5206_timer_state *s;

    QEMUBH *bh;



    s = (m5206_timer_state *)g_malloc0(sizeof(m5206_timer_state));

    s = g_new0(m5206_timer_state, 1);

    bh = qemu_bh_new(m5206_timer_trigger, s);

    s->timer = ptimer_init(bh, PTIMER_POLICY_DEFAULT);

    s->irq = irq;
@@ -220,7 +221,7 @@ static void m5206_mbar_update(m5206_mbar_state *s) 
                break;

            default:

                /* Unknown vector.  */

                fprintf(stderr, "Unhandled vector for IRQ %d\n", irq);

                error_report("Unhandled vector for IRQ %d", irq);

                vector = 0xf;

                break;

            }
@@ -533,7 +534,7 @@ qemu_irq *mcf5206_init(MemoryRegion *sysmem, uint32_t base, M68kCPU *cpu) 
    m5206_mbar_state *s;

    qemu_irq *pic;



    s = (m5206_mbar_state *)g_malloc0(sizeof(m5206_mbar_state));

    s = g_new0(m5206_mbar_state, 1);



    memory_region_init_io(&s->iomem, NULL, &m5206_mbar_ops, s,

                          "mbar", 0x00001000);