Commit 048d3612 authored by Aurelien Jarno's avatar Aurelien Jarno
Browse files

Merge branch 'trivial-patches' of git://github.com/stefanha/qemu 

* 'trivial-patches' of git://github.com/stefanha/qemu:
  versatilepb: Use symbolic indices for ARM PIC
  qdev: kill bogus comment
  qemu-barrier: Fix compiler version check for future gcc versions
  hw: Add missing 'static' attribute for QEMUMachine
  cleanup useless return sentence
  qemu-sockets: Fix compiler warning (regression for MinGW)
  vnc: Fix spelling (hellmen -> hellman) in comment
  slirp: Fix spelling in comment (enought -> enough, insure -> ensure)
  tcg/arm: Use tcg_out_mov_reg rather than inline equivalent code
  cpu: Add missing 'static' attribute to qemu_global_mutex
  configure: Support empty target list (--target-list=)
  hw: Fix return value check for bdrv_read, bdrv_write
parents 6b2f90fb 02cd521f

block/qed-table.c

+0 −1
Original line number Diff line number Diff line
@@ -103,7 +103,6 @@ static void qed_write_table_cb(void *opaque, int ret) 
out:

    qemu_vfree(write_table_cb->table);

    gencb_complete(&write_table_cb->gencb, ret);

    return;

}



/**

blockdev.c

+0 −1
Original line number Diff line number Diff line
@@ -830,7 +830,6 @@ exit: 
    QSIMPLEQ_FOREACH_SAFE(states, &snap_bdrv_states, entry, next) {

        g_free(states);

    }

    return;

}

configure

+3 −2
Original line number Diff line number Diff line
@@ -125,7 +125,8 @@ cc_i386=i386-pc-linux-gnu-gcc 
libs_qga=""

debug_info="yes"



target_list=""

# Don't accept a target_list environment variable.

unset target_list



# Default value for a variable defining feature "foo".

#  * foo="no"  feature will only be used if --enable-foo arg is given
@@ -1288,7 +1289,7 @@ if ! "$python" -c 'import sys; sys.exit(sys.version_info < (2,4) or sys.version_ 
  exit 1

fi



if test -z "$target_list" ; then

if test -z "${target_list+xxx}" ; then

    target_list="$default_target_list"

else

    target_list=`echo "$target_list" | sed -e 's/,/ /g'`

cpus.c

+1 −1
Original line number Diff line number Diff line
@@ -613,7 +613,7 @@ static void qemu_tcg_init_cpu_signals(void) 
}

#endif /* _WIN32 */



QemuMutex qemu_global_mutex;

static QemuMutex qemu_global_mutex;

static QemuCond qemu_io_proceeded_cond;

static bool iothread_requesting_mutex;

hw/9pfs/virtio-9p.c

+0 −5
Original line number Diff line number Diff line
@@ -505,7 +505,6 @@ static void virtfs_reset(V9fsPDU *pdu) 
        error_report("9pfs:%s: One or more uncluncked fids "

                     "found during reset", __func__);

    }

    return;

}



#define P9_QID_TYPE_DIR         0x80
@@ -934,7 +933,6 @@ static void v9fs_version(void *opaque) 
out:

    complete_pdu(s, pdu, offset);

    v9fs_string_free(&version);

    return;

}



static void v9fs_attach(void *opaque)
@@ -1314,7 +1312,6 @@ out_nofid: 
        g_free(wnames);

        g_free(qids);

    }

    return;

}



static int32_t get_iounit(V9fsPDU *pdu, V9fsPath *path)
@@ -2257,7 +2254,6 @@ static void v9fs_flush(void *opaque) 
        free_pdu(pdu->s, cancel_pdu);

    }

    complete_pdu(s, pdu, 7);

    return;

}



static void v9fs_link(void *opaque)
@@ -2763,7 +2759,6 @@ out: 
    put_fid(pdu, fidp);

out_nofid:

    complete_pdu(s, pdu, retval);

    return;

}



static void v9fs_mknod(void *opaque)