Commit 2b5b7ae9 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/mjt/tags/trivial-patches-2014-06-24' into staging 



trivial patches for 2014-06-24

# gpg: Signature made Tue 24 Jun 2014 17:07:31 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>"
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg:          There is no indication that the signature belongs to the owner.
# Primary key fingerprint: 6EE1 95D1 886E 8FFB 810D  4324 457C E0A0 8044 65C5
#      Subkey fingerprint: 6F67 E18E 7C91 C5B1 5514  66A7 BEE5 9D74 A4C3 D7DB

* remotes/mjt/tags/trivial-patches-2014-06-24:
  Add support for the arm breakpoint syscall
  Increase maximum number of session of the internal TFTP server.
  target-s390x: Remove unused ld_code6() function
  hw/moxie/moxiesim.c: Remove unused moxie_intc_create()
  target-unicore: Remove unused functions
  build-sys: introduce install-prog macro to install&strip binaries and use it
  tcg: mark tcg_out* and tcg_patch* with attribute 'unused'
  rng-random: NULL check not needed before g_free()
  block.c: Remove useless 'buf' variable
  vscclient: Add required headers to fix build on FreeBSD
  target-ppc: Fix compiler warning
  configure: Enable TPM by default, add --disable-tpm
  Fix new typos (found by codespell)
  virtio-serial: remove useless set_config function

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 513d80ed d5355087

Makefile

+2 −10
Original line number Diff line number Diff line
@@ -385,12 +385,8 @@ install-sysconfig: install-datadir install-confdir 


install: all $(if $(BUILD_DOCS),install-doc) install-sysconfig \

install-datadir install-localstatedir

	$(INSTALL_DIR) "$(DESTDIR)$(bindir)"

ifneq ($(TOOLS),)

	$(INSTALL_PROG) $(TOOLS) "$(DESTDIR)$(bindir)"

ifneq ($(STRIP),)

	$(STRIP) $(TOOLS:%="$(DESTDIR)$(bindir)/%")

endif

	$(call install-prog,$(TOOLS),$(DESTDIR)$(bindir))

endif

ifneq ($(CONFIG_MODULES),)

	$(INSTALL_DIR) "$(DESTDIR)$(qemu_moddir)"
@@ -401,11 +397,7 @@ ifneq ($(CONFIG_MODULES),) 
	done

endif

ifneq ($(HELPERS-y),)

	$(INSTALL_DIR) "$(DESTDIR)$(libexecdir)"

	$(INSTALL_PROG) $(HELPERS-y) "$(DESTDIR)$(libexecdir)"

ifneq ($(STRIP),)

	$(STRIP) $(HELPERS-y:%="$(DESTDIR)$(libexecdir)/%")

endif

	$(call install-prog,$(HELPERS-y),$(DESTDIR)$(libexecdir))

endif

ifneq ($(BLOBS),)

	set -e; for x in $(BLOBS); do \

Makefile.target

+1 −4
Original line number Diff line number Diff line
@@ -190,10 +190,7 @@ endif 


install: all

ifneq ($(PROGS),)

	$(INSTALL_PROG) $(PROGS) "$(DESTDIR)$(bindir)"

ifneq ($(STRIP),)

	$(STRIP) $(PROGS:%="$(DESTDIR)$(bindir)/%")

endif

	$(call install-prog,$(PROGS),$(DESTDIR)$(bindir))

endif

ifdef CONFIG_TRACE_SYSTEMTAP

	$(INSTALL_DIR) "$(DESTDIR)$(qemu_datadir)/../systemtap/tapset"

backends/rng-random.c

+1 −4
Original line number Diff line number Diff line
@@ -106,10 +106,7 @@ static void rng_random_set_filename(Object *obj, const char *filename, 
        return;

    }



    if (s->filename) {

    g_free(s->filename);

    }



    s->filename = g_strdup(filename);

}

block.c

+0 −2
Original line number Diff line number Diff line
@@ -5581,7 +5581,6 @@ void bdrv_img_create(const char *filename, const char *fmt, 
        if (backing_file) {

            BlockDriverState *bs;

            uint64_t size;

            char buf[32];

            int back_flags;



            /* backing files always opened read-only */
@@ -5602,7 +5601,6 @@ void bdrv_img_create(const char *filename, const char *fmt, 
            bdrv_get_geometry(bs, &size);

            size *= 512;



            snprintf(buf, sizeof(buf), "%" PRId64, size);

            qemu_opt_set_number(opts, BLOCK_OPT_SIZE, size);



            bdrv_unref(bs);

block/iscsi.c

+1 −1
Original line number Diff line number Diff line
@@ -101,7 +101,7 @@ typedef struct IscsiAIOCB { 
#define ISCSI_CMD_RETRIES ARRAY_SIZE(iscsi_retry_times)

static const unsigned iscsi_retry_times[] = {8, 32, 128, 512, 2048};



/* this threshhold is a trade-off knob to choose between

/* this threshold is a trade-off knob to choose between

 * the potential additional overhead of an extra GET_LBA_STATUS request

 * vs. unnecessarily reading a lot of zero sectors over the wire.

 * If a read request is greater or equal than ISCSI_CHECKALLOC_THRES