falso
/
qemu-irix
mirror of https://github.com/n64decomp/qemu-irix.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

trivial patches for 2015-04-04 

-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQEcBAABAgAGBQJVH43FAAoJEL7lnXSkw9fbL0IIAJLyad9F5HRaakwfXIaMEj8F
 ICmMOn+XDyErG9Jqdai//TPix0btlGjDLpJ3EZGWWrvUPkO/RkkTz+ykW+FJdaU5
 6UcwaUcwsYLWxk8Wl/S6Bb0G1/wi4gLp+BQCRVC4ZSnDZAQwwGFOz74bfXaIjCcB
 +WX7ETxf47Sx1IY6XSF8dieitJ494pRtLEFMbN5YktnGBq792cMJnqdqVP76B62V
 rgD3W+qandblgXCtRVLhbUYXxzPsepYEtBrdfcjLk4utECkWwrsVHFhfjyAbwqTX
 Q7BWZWy7164BcdHrQYKFzg5XE7K9RICkWl/FESR/bAbC7FjAKU7fw3wwRRe1z5Q=
 =PAe9
 -----END PGP SIGNATURE-----

Merge remote-tracking branch 'remotes/mjt/tags/pull-trivial-patches-2015-04-04' into staging

trivial patches for 2015-04-04

# gpg: Signature made Sat Apr  4 08:07:49 2015 BST using RSA key ID A4C3D7DB
# gpg: Good signature from "Michael Tokarev <mjt@tls.msk.ru>"
# gpg:                 aka "Michael Tokarev <mjt@corpit.ru>"
# gpg:                 aka "Michael Tokarev <mjt@debian.org>"

* remotes/mjt/tags/pull-trivial-patches-2015-04-04:
  vhost: fix typo in vq_index description
  gitignore: Ignore more .pod files.
  target-tricore: Fix check which was always false
  target-i386: remove superfluous TARGET_HAS_SMC macro
  pcspk: Fix I/O port name

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell 2015-04-07 14:33:46 +01:00
parent f2155a0896 9be6e69f12
commit 5a24f20a72
6 changed files with 5 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
.gitignore vendored
View File

@ -37,14 +37,8 @@
/qemu-tech.html
/qemu-doc.info
/qemu-tech.info
/qemu.1
/qemu.pod
/qemu-img.1
/qemu-img.pod
/qemu-img
/qemu-nbd
/qemu-nbd.8
/qemu-nbd.pod
/qemu-options.def
/qemu-options.texi
/qemu-img-cmds.texi
@ -56,8 +50,7 @@
/qmp-commands.txt
/vscclient
/fsdev/virtfs-proxy-helper
/fsdev/virtfs-proxy-helper.1
/fsdev/virtfs-proxy-helper.pod
*.[1-9]
*.a
*.aux
*.cp
@ -70,6 +63,7 @@
*.ky
*.log
*.pdf
*.pod
*.cps
*.fns
*.kys

2
hw/audio/pcspk.c
View File

@ -167,7 +167,7 @@ static void pcspk_initfn(Object *obj)
{
PCSpkState *s = PC_SPEAKER(obj);
memory_region_init_io(&s->ioport, OBJECT(s), &pcspk_io_ops, s, "elcr", 1);
memory_region_init_io(&s->ioport, OBJECT(s), &pcspk_io_ops, s, "pcspk", 1);
}
static void pcspk_realizefn(DeviceState *dev, Error **errp)

2
include/hw/virtio/vhost.h
View File

@ -36,7 +36,7 @@ struct vhost_dev {
MemoryRegionSection *mem_sections;
struct vhost_virtqueue *vqs;
int nvqs;
/* the first virtuque which would be used by this vhost dev */
/* the first virtqueue which would be used by this vhost dev */
int vq_index;
unsigned long long features;
unsigned long long acked_features;

2
target-i386/cpu.h
View File

@ -31,8 +31,6 @@
/* Maximum instruction code size */
#define TARGET_MAX_INSN_SIZE 16
/* target supports implicit self modifying code */
#define TARGET_HAS_SMC
/* support for self modifying code even if the modified instruction is
close to the modifying instruction */
#define TARGET_HAS_PRECISE_SMC

2
target-tricore/op_helper.c
View File

@ -2573,7 +2573,7 @@ void helper_rslcx(CPUTriCoreState *env)
/* CSU trap */
}
/* if (PCXI.UL == 1) then trap(CTYP); */
if ((env->PCXI & MASK_PCXI_UL) == 1) {
if ((env->PCXI & MASK_PCXI_UL) != 0) {
/* CTYP trap */
}
/* EA = {PCXI.PCXS, 6'b0, PCXI.PCXO, 6'b0}; */

4
translate-all.c
View File

@ -1334,8 +1334,6 @@ static inline void tb_alloc_page(TranslationBlock *tb,
p->first_tb = (TranslationBlock *)((uintptr_t)tb | n);
invalidate_page_bitmap(p);
#if defined(TARGET_HAS_SMC) || 1
#if defined(CONFIG_USER_ONLY)
if (p->flags & PAGE_WRITE) {
target_ulong addr;
@ -1371,8 +1369,6 @@ static inline void tb_alloc_page(TranslationBlock *tb,
tlb_protect_code(page_addr);
}
#endif
#endif /* TARGET_HAS_SMC */
}
/* add a new TB and link it to the physical page tables. phys_page2 is