Commit 5a24f20a authored by Peter Maydell's avatar Peter Maydell
Browse files

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: default avatarPeter Maydell <peter.maydell@linaro.org>
parents f2155a08 9be6e69f

.gitignore

+2 −8
Original line number Diff line number Diff line
@@ -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

hw/audio/pcspk.c

+1 −1
Original line number Diff line number Diff line
@@ -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)

include/hw/virtio/vhost.h

+1 −1
Original line number Diff line number Diff line
@@ -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;

target-i386/cpu.h

+0 −2
Original line number Diff line number Diff line
@@ -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

target-tricore/op_helper.c

+1 −1
Original line number Diff line number Diff line
@@ -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}; */