aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2015-04-07 14:33:46 +0100
committerPeter Maydell <peter.maydell@linaro.org>2015-04-07 14:33:46 +0100
commit5a24f20a7208a58fb80d78ca0521bba6f4d7b145 (patch)
tree01f2c35ab535421d039b21b048a9c2ff65ae0d84
parentf2155a089600e80cf7bcdc814520ef3304882cc4 (diff)
parent9be6e69f12bc65e9c43ee5b8eb026412f11b8b71 (diff)
downloadqemu-arm-5a24f20a7208a58fb80d78ca0521bba6f4d7b145.tar.gz
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>
-rw-r--r--.gitignore10
-rw-r--r--hw/audio/pcspk.c2
-rw-r--r--include/hw/virtio/vhost.h2
-rw-r--r--target-i386/cpu.h2
-rw-r--r--target-tricore/op_helper.c2
-rw-r--r--translate-all.c4
6 files changed, 5 insertions, 17 deletions
diff --git a/.gitignore b/.gitignore
index e32a58417a..aed0e1ff02 100644
--- a/.gitignore
+++ b/.gitignore
@@ -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
diff --git a/hw/audio/pcspk.c b/hw/audio/pcspk.c
index 1d81bbe6aa..5266fb5457 100644
--- a/hw/audio/pcspk.c
+++ b/hw/audio/pcspk.c
@@ -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)
diff --git a/include/hw/virtio/vhost.h b/include/hw/virtio/vhost.h
index d5593d1620..8f04888e72 100644
--- a/include/hw/virtio/vhost.h
+++ b/include/hw/virtio/vhost.h
@@ -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;
diff --git a/target-i386/cpu.h b/target-i386/cpu.h
index 15db6d7aba..4ee12ca2e9 100644
--- a/target-i386/cpu.h
+++ b/target-i386/cpu.h
@@ -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
diff --git a/target-tricore/op_helper.c b/target-tricore/op_helper.c
index 220ec4a3c1..9907e07e22 100644
--- a/target-tricore/op_helper.c
+++ b/target-tricore/op_helper.c
@@ -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}; */
diff --git a/translate-all.c b/translate-all.c
index 9f47ce7f71..11763c6c3a 100644
--- a/translate-all.c
+++ b/translate-all.c
@@ -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