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

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



trivial patches for 2015-02-10

# gpg: Signature made Tue 10 Feb 2015 07:27:11 GMT 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-02-10: (45 commits)
  virtio: Fix warning caused by missing 'static' attribute
  vga: Fix warning caused by missing 'static' attribute
  stubs: Fix warning caused by missing include statement
  spice: Add missing 'static' attribute
  serial: Fix warnings caused by missing 'static' attribute
  moxie: Fix warning caused by missing include statement
  migration: Fix warnings caused by missing 'static' attribute
  migration: Fix warning caused by missing declaration of vmstate_dummy
  disas/sh4: Fix warning caused by missing 'static' attribute
  translate-all: Use g_try_malloc() for dynamic translator buffer
  vnc: g_realloc() can't fail, bury dead error handling
  rdma: g_malloc0() can't fail, bury dead error handling
  kvm: g_malloc() can't fail, bury dead error handling
  rtl8139: g_malloc() can't fail, bury dead error handling
  onenand: g_malloc() can't fail, bury dead error handling
  Fix name error in migration stream analyzation script
  QJSON: fix typo in author's email address
  util/uri: URI member path can be null, compare more carfully
  util/uri: realloc2n() can't fail, drop dead error handling
  util/uri: uri_new() can't fail, drop dead error handling
  ...

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 89db2177 43d73554

cpu-exec.c

+3 −9
Original line number Diff line number Diff line
@@ -494,28 +494,22 @@ int cpu_exec(CPUArchState *env) 
                         * interrupt_request) which we will handle

                         * next time around the loop.

                         */

                        tb = (TranslationBlock *)(next_tb & ~TB_EXIT_MASK);

                        next_tb = 0;

                        break;

                    case TB_EXIT_ICOUNT_EXPIRED:

                    {

                        /* Instruction counter expired.  */

                        int insns_left;

                        tb = (TranslationBlock *)(next_tb & ~TB_EXIT_MASK);

                        insns_left = cpu->icount_decr.u32;

                        int insns_left = cpu->icount_decr.u32;

                        if (cpu->icount_extra && insns_left >= 0) {

                            /* Refill decrementer and continue execution.  */

                            cpu->icount_extra += insns_left;

                            if (cpu->icount_extra > 0xffff) {

                                insns_left = 0xffff;

                            } else {

                                insns_left = cpu->icount_extra;

                            }

                            insns_left = MIN(0xffff, cpu->icount_extra);

                            cpu->icount_extra -= insns_left;

                            cpu->icount_decr.u16.low = insns_left;

                        } else {

                            if (insns_left > 0) {

                                /* Execute remaining instructions.  */

                                tb = (TranslationBlock *)(next_tb & ~TB_EXIT_MASK);

                                cpu_exec_nocache(env, insns_left, tb);

                                align_clocks(&sc, cpu);

                            }

disas/sh4.c

+1 −1
Original line number Diff line number Diff line
@@ -332,7 +332,7 @@ typedef struct 


#ifdef DEFINE_TABLE



const sh_opcode_info sh_table[] =

static const sh_opcode_info sh_table[] =

  {

/* 0111nnnni8*1.... add #<imm>,<REG_N>  */{"add",{A_IMM,A_REG_N},{HEX_7,REG_N,IMM0_8}, arch_sh1_up},

fsdev/virtfs-proxy-helper.c

+9 −4
Original line number Diff line number Diff line
@@ -749,24 +749,29 @@ static int proxy_socket(const char *path, uid_t uid, gid_t gid) 
    if (bind(sock, (struct sockaddr *)&proxy,

            sizeof(struct sockaddr_un)) < 0) {

        do_perror("bind");

        return -1;

        goto error;

    }

    if (chown(proxy.sun_path, uid, gid) < 0) {

        do_perror("chown");

        return -1;

        goto error;

    }

    if (listen(sock, 1) < 0) {

        do_perror("listen");

        return -1;

        goto error;

    }



    size = sizeof(qemu);

    client = accept(sock, (struct sockaddr *)&qemu, &size);

    if (client < 0) {

        do_perror("accept");

        return -1;

        goto error;

    }

    close(sock);

    return client;



error:

    close(sock);

    return -1;

}



static void usage(char *prog)

hw/block/onenand.c

+1 −7
Original line number Diff line number Diff line
@@ -346,15 +346,9 @@ static inline int onenand_prog_spare(OneNANDState *s, int sec, int secn, 
static inline int onenand_erase(OneNANDState *s, int sec, int num)

{

    uint8_t *blankbuf, *tmpbuf;



    blankbuf = g_malloc(512);

    if (!blankbuf) {

        return 1;

    }

    tmpbuf = g_malloc(512);

    if (!tmpbuf) {

        g_free(blankbuf);

        return 1;

    }

    memset(blankbuf, 0xff, 512);

    for (; num > 0; num--, sec++) {

        if (s->blk_cur) {

hw/char/serial.c

+7 −7
Original line number Diff line number Diff line
@@ -658,7 +658,7 @@ static bool serial_thr_ipending_needed(void *opaque) 
    }

}



const VMStateDescription vmstate_serial_thr_ipending = {

static const VMStateDescription vmstate_serial_thr_ipending = {

    .name = "serial/thr_ipending",

    .version_id = 1,

    .minimum_version_id = 1,
@@ -674,7 +674,7 @@ static bool serial_tsr_needed(void *opaque) 
    return s->tsr_retry != 0;

}



const VMStateDescription vmstate_serial_tsr = {

static const VMStateDescription vmstate_serial_tsr = {

    .name = "serial/tsr",

    .version_id = 1,

    .minimum_version_id = 1,
@@ -693,7 +693,7 @@ static bool serial_recv_fifo_needed(void *opaque) 


}



const VMStateDescription vmstate_serial_recv_fifo = {

static const VMStateDescription vmstate_serial_recv_fifo = {

    .name = "serial/recv_fifo",

    .version_id = 1,

    .minimum_version_id = 1,
@@ -709,7 +709,7 @@ static bool serial_xmit_fifo_needed(void *opaque) 
    return !fifo8_is_empty(&s->xmit_fifo);

}



const VMStateDescription vmstate_serial_xmit_fifo = {

static const VMStateDescription vmstate_serial_xmit_fifo = {

    .name = "serial/xmit_fifo",

    .version_id = 1,

    .minimum_version_id = 1,
@@ -725,7 +725,7 @@ static bool serial_fifo_timeout_timer_needed(void *opaque) 
    return timer_pending(s->fifo_timeout_timer);

}



const VMStateDescription vmstate_serial_fifo_timeout_timer = {

static const VMStateDescription vmstate_serial_fifo_timeout_timer = {

    .name = "serial/fifo_timeout_timer",

    .version_id = 1,

    .minimum_version_id = 1,
@@ -741,7 +741,7 @@ static bool serial_timeout_ipending_needed(void *opaque) 
    return s->timeout_ipending != 0;

}



const VMStateDescription vmstate_serial_timeout_ipending = {

static const VMStateDescription vmstate_serial_timeout_ipending = {

    .name = "serial/timeout_ipending",

    .version_id = 1,

    .minimum_version_id = 1,
@@ -757,7 +757,7 @@ static bool serial_poll_needed(void *opaque) 
    return s->poll_msl >= 0;

}



const VMStateDescription vmstate_serial_poll = {

static const VMStateDescription vmstate_serial_poll = {

    .name = "serial/poll",

    .version_id = 1,

    .minimum_version_id = 1,