From ecf2e5a46d7559f258a2c914131ba25d3c5326bf Mon Sep 17 00:00:00 2001 From: Jan Kiszka Date: Thu, 19 Mar 2015 13:08:40 +0100 Subject: [PATCH 1/5] pcspk: Fix I/O port name Probably a copy&paste bug. Fixing it helps identifying the device model behind port 0x61. Signed-off-by: Jan Kiszka Reviewed-by: Gonglei Signed-off-by: Michael Tokarev --- hw/audio/pcspk.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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) From 9c04146ad4696b20c440bfbb4a6ab27ea254e7ca Mon Sep 17 00:00:00 2001 From: "Emilio G. Cota" Date: Sat, 21 Mar 2015 13:29:09 -0400 Subject: [PATCH 2/5] target-i386: remove superfluous TARGET_HAS_SMC macro Signed-off-by: Emilio G. Cota Reviewed-by: Paolo Bonzini Signed-off-by: Michael Tokarev --- target-i386/cpu.h | 2 -- translate-all.c | 4 ---- 2 files changed, 6 deletions(-) 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/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 From 7b4b0b5795e934a9b7efb916af86715b68555be9 Mon Sep 17 00:00:00 2001 From: Stefan Weil Date: Sat, 21 Mar 2015 14:44:58 +0100 Subject: [PATCH 3/5] target-tricore: Fix check which was always false With a mask value of 0x00400000, the result will never be 1. This fixes a Coverity warning. Signed-off-by: Stefan Weil Signed-off-by: Michael Tokarev --- target-tricore/op_helper.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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}; */ From 085feb61dbc6130bfd2e6c3f59d03220ff9e1bb3 Mon Sep 17 00:00:00 2001 From: Eric Blake Date: Fri, 20 Mar 2015 10:30:44 -0600 Subject: [PATCH 4/5] gitignore: Ignore more .pod files. kvm_stat.{1,pod} started showing up as untracked files in my directory, and I nearly accidentally merged them into a commit with my usual habit of 'git add .'. Rather than spelling out each such file, just ignore the entire pattern. Signed-off-by: Eric Blake Reviewed-by: Stefan Weil Signed-off-by: Michael Tokarev --- .gitignore | 10 ++-------- 1 file changed, 2 insertions(+), 8 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 From 9be6e69f12bc65e9c43ee5b8eb026412f11b8b71 Mon Sep 17 00:00:00 2001 From: Greg Kurz Date: Thu, 26 Mar 2015 12:10:29 +0100 Subject: [PATCH 5/5] vhost: fix typo in vq_index description Signed-off-by: Greg Kurz Acked-by: Jason Wang Signed-off-by: Michael Tokarev --- include/hw/virtio/vhost.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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;