Commit 7d8df327 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/vivier2/tags/trivial-patches-pull-request' into staging 



- Some typo and UTF-8 fixes
- a ppc e6500 fix to remove duplicate SPR registering

# gpg: Signature made Thu 24 Jan 2019 12:48:05 GMT
# gpg:                using RSA key F30C38BD3F2FBE3C
# gpg: Good signature from "Laurent Vivier <lvivier@redhat.com>"
# gpg:                 aka "Laurent Vivier <laurent@vivier.eu>"
# gpg:                 aka "Laurent Vivier (Red Hat) <lvivier@redhat.com>"
# Primary key fingerprint: CD2F 75DD C8E3 A4DC 2E4F  5173 F30C 38BD 3F2F BE3C

* remotes/vivier2/tags/trivial-patches-pull-request:
  hw/i386/pc.c: fix one typo in function name
  virtio-net: Fix a typo
  ppc: e6500 registers SPR 604 twice
  contrib/gitdm: Fix a typo
  MAINTAINERS: Fix utf-8 mangling

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents feff0208 285816d7

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -1639,7 +1639,7 @@ F: include/hw/display/edid.h 
F: qemu-edid.c



Firmware configuration (fw_cfg)

M: Philippe Mathieu-Daudé <philmd@redhat.com>

M: Philippe Mathieu-Daudé <philmd@redhat.com>

R: Laszlo Ersek <lersek@redhat.com>

R: Gerd Hoffmann <kraxel@redhat.com>

S: Supported

contrib/gitdm/filetypes.txt

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
# This program is free software; you can redistribute it and/or modify

# it under the terms of the GNU General Public License as published by

# the Free Software Foundation; either version 2 of the License, or

# (at your option  any later version.

# (at your option) any later version.

#

# This program is distributed in the hope that it will be useful,

# but WITHOUT ANY WARRANTY; without even the implied warranty of

hw/i386/pc.c

+2 −2
Original line number Diff line number Diff line
@@ -2285,7 +2285,7 @@ static void pc_machine_device_unplug_cb(HotplugHandler *hotplug_dev, 
    }

}



static HotplugHandler *pc_get_hotpug_handler(MachineState *machine,

static HotplugHandler *pc_get_hotplug_handler(MachineState *machine,

                                             DeviceState *dev)

{

    if (object_dynamic_cast(OBJECT(dev), TYPE_PC_DIMM) ||
@@ -2615,7 +2615,7 @@ static void pc_machine_class_init(ObjectClass *oc, void *data) 
    pcmc->save_tsc_khz = true;

    pcmc->linuxboot_dma_enabled = true;

    assert(!mc->get_hotplug_handler);

    mc->get_hotplug_handler = pc_get_hotpug_handler;

    mc->get_hotplug_handler = pc_get_hotplug_handler;

    mc->cpu_index_to_instance_props = pc_cpu_index_to_props;

    mc->get_default_cpu_node_id = pc_get_default_cpu_node_id;

    mc->possible_cpu_arch_ids = pc_possible_cpu_arch_ids;

include/hw/virtio/virtio-net.h

+1 −1
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ typedef struct VirtioNetRscUnit { 
    uint16_t payload;       /* pure payload without virtio/eth/ip/tcp */

} VirtioNetRscUnit;



/* Coalesced segmant */

/* Coalesced segment */

typedef struct VirtioNetRscSeg {

    QTAILQ_ENTRY(VirtioNetRscSeg) next;

    void *buf;

target/ppc/translate_init.inc.c

+0 −8
Original line number Diff line number Diff line
@@ -4947,14 +4947,6 @@ static void init_proc_e500(CPUPPCState *env, int version) 
    }



    if (version == fsl_e6500) {

        spr_register(env, SPR_BOOKE_SPRG8, "SPRG8",

                     SPR_NOACCESS, SPR_NOACCESS,

                     &spr_read_generic, &spr_write_generic,

                     0x00000000);

        spr_register(env, SPR_BOOKE_SPRG9, "SPRG9",

                     SPR_NOACCESS, SPR_NOACCESS,

                     &spr_read_generic, &spr_write_generic,

                     0x00000000);

        /* Thread identification */

        spr_register(env, SPR_TIR, "TIR",

                     SPR_NOACCESS, SPR_NOACCESS,