diff options
| -rw-r--r-- | MAINTAINERS | 2 | ||||
| -rw-r--r-- | contrib/gitdm/filetypes.txt | 2 | ||||
| -rw-r--r-- | hw/i386/pc.c | 4 | ||||
| -rw-r--r-- | include/hw/virtio/virtio-net.h | 2 | ||||
| -rw-r--r-- | target/ppc/translate_init.inc.c | 8 |
5 files changed, 5 insertions, 13 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index af339b86db..fd3d4de3fa 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -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 diff --git a/contrib/gitdm/filetypes.txt b/contrib/gitdm/filetypes.txt index 15d6f803b9..165b71b3f9 100644 --- a/contrib/gitdm/filetypes.txt +++ b/contrib/gitdm/filetypes.txt @@ -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 diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 73d688f842..747548b7aa 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -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; diff --git a/include/hw/virtio/virtio-net.h b/include/hw/virtio/virtio-net.h index bd662752d2..a1a0be3bea 100644 --- a/include/hw/virtio/virtio-net.h +++ b/include/hw/virtio/virtio-net.h @@ -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; diff --git a/target/ppc/translate_init.inc.c b/target/ppc/translate_init.inc.c index ade06cc773..59e0b86762 100644 --- a/target/ppc/translate_init.inc.c +++ b/target/ppc/translate_init.inc.c @@ -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, |