- Some typo and UTF-8 fixes
- a ppc e6500 fix to remove duplicate SPR registering -----BEGIN PGP SIGNATURE----- iQIcBAABAgAGBQJcSbQFAAoJEPMMOL0/L748kpUQAKwWBwvvJFevOO8yoUR5jXzc qZBxjuv+U1Rj+WBtb40M7H54zJYICgx+BqV3f9fKOI75FtRj1c5hRKe4lnjyinvy MAYjxpdKTdbo8g5sb4NXPkW6mGaEJ9lVUBHmPXXixgfddpapfRo8GEXDQAwnQQFx VpcglzGgYYhw1SWrH0McFqvrcZ0GTkIJ49dU+VHM4xFK0lnoGIasLTHlZGCFy7OE 48Rq8mApRJlQCLifVhH2uWe0IGE4n9QWrpycThsmT+EGPFVRY9FdH1XjetJ2pQT0 x6yyE8le1JiOWoKwC6y6pwG4WVwn92XE7UT8YIKyV5UapD2RuyghlgPLCZbJYs4r X7Q5kXoRrs5lQzDy5K3rTHiJAZMBw9ggQFd3+qSj91aCNAlVZFYESXw6mlV4OdZX NpaQgDW0LLOY7bR4InCyevOTrQM2GkalrLwa9Wn6MOpx6QuhzwaX7b70OxdVghUn EQ/rXlthzzCnZrnYwHAZ6j5RMMv6vDrnYJxRbUNFJy4HeY/QH0hauHl4UWy+93y3 Mo4Fqq7Z6j1uViy03zj/HvikhvIVZOO4ExqhAAyREXDr+id8DJVuwrw0zF8cwmZa 4QTESNefZu7JTQO8v+/rGSt3IbP64/mheCp+un4l/46XIUo3BH9b1ig/ebyNjPLl ngzh6SkTArrX4qMJqEZa =2lfm -----END PGP SIGNATURE----- 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: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
commit
7d8df3272d
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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,
|
||||
|
|
Loading…
Reference in New Issue