Commit 507e4ddc authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/mjt/tags/trivial-patches-fetch' into staging 



trivial patches for 2016-09-13

# gpg: Signature made Tue 13 Sep 2016 16:53:11 BST
# gpg:                using RSA key 0x701B4F6B1A693E59
# gpg: Good signature from "Michael Tokarev <mjt@tls.msk.ru>"
# gpg:                 aka "Michael Tokarev <mjt@corpit.ru>"
# gpg:                 aka "Michael Tokarev <mjt@debian.org>"
# Primary key fingerprint: 6EE1 95D1 886E 8FFB 810D  4324 457C E0A0 8044 65C5
#      Subkey fingerprint: 7B73 BAD6 8BE7 A2C2 8931  4B22 701B 4F6B 1A69 3E59

* remotes/mjt/tags/trivial-patches-fetch:
  hw/net/e1000e: Fix compiler warning
  target-m68k: fix get_mac_extf helper
  timer/cpus: fix some typos and update some comments
  timer.h: fix inconsistency between comment and function prototype
  timer.h: fix typo
  maint: Ignore generated version file
  Document that curses usually needs -k option too
  trace-event: display "%d" instead of "0x%d"
  linux-user, trivial: display "0x%x" instead of "0x%d"
  pic: fix typo in error message: KVM_GET_IRQCHIP -> KVM_SET_IRQCHIP
  sparc: Use g_memdup() instead of g_new0() + memcpy()
  vl: remove unnecessary duplicate call to tpm_cleanup
  arm: spelling fix: mismatch
  hw/dma/omap: spelling fix: endianness
  hw/bt/hci: spelling fix: endianness
  docs: Fix description of the leaky bucket algorithm in throttle.txt

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 2d31515b eb83c203

.gitignore

+2 −0
Original line number Diff line number Diff line
@@ -53,6 +53,8 @@ 
/qemu-bridge-helper

/qemu-monitor.texi

/qemu-monitor-info.texi

/qemu-version.h

/qemu-version.h.tmp

/qmp-commands.txt

/vscclient

/fsdev/virtfs-proxy-helper

cpus.c

+3 −3
Original line number Diff line number Diff line
@@ -229,7 +229,7 @@ static int64_t cpu_get_clock_locked(void) 
    return ticks;

}



/* return the host CPU monotonic timer and handle stop/restart */

/* return the host CPU monotonic time */

int64_t cpu_get_clock(void)

{

    int64_t ti;
@@ -244,7 +244,7 @@ int64_t cpu_get_clock(void) 
}



/* enable cpu_get_ticks()

 * Caller must hold BQL which server as mutex for vm_clock_seqlock.

 * Caller must hold BQL which serves as mutex for vm_clock_seqlock.

 */

void cpu_enable_ticks(void)

{
@@ -260,7 +260,7 @@ void cpu_enable_ticks(void) 


/* disable cpu_get_ticks() : the clock is stopped. You must not call

 * cpu_get_ticks() after that.

 * Caller must hold BQL which server as mutex for vm_clock_seqlock.

 * Caller must hold BQL which serves as mutex for vm_clock_seqlock.

 */

void cpu_disable_ticks(void)

{

docs/throttle.txt

+4 −1
Original line number Diff line number Diff line
@@ -235,7 +235,10 @@ consider the following values: 
  - Water leaks from the bucket at a rate of 100 IOPS.

  - Water can be added to the bucket at a rate of 2000 IOPS.

  - The size of the bucket is 2000 x 60 = 120000

  - If 'iops-total-max' is unset then the bucket size is 100 x 60.

  - If 'iops-total-max-length' is unset then it defaults to 1 and the

    size of the bucket is 2000.

  - If 'iops-total-max' is unset then 'iops-total-max-length' must be

    unset as well. In this case the bucket size is 100.



The bucket is initially empty, therefore water can be added until it's

full at a rate of 2000 IOPS (the burst rate). Once the bucket is full

hw/bt/hci.c

+1 −1
Original line number Diff line number Diff line
@@ -421,7 +421,7 @@ static void bt_submit_raw_acl(struct bt_piconet_s *net, int length, uint8_t *dat 


/* HCI layer emulation */



/* Note: we could ignore endiannes because unswapped handles will still

/* Note: we could ignore endianness because unswapped handles will still

 * be valid as connection identifiers for the guest - they don't have to

 * be continuously allocated.  We do it though, to preserve similar

 * behaviour between hosts.  Some things, like the BD_ADDR cannot be

hw/dma/omap_dma.c

+1 −1
Original line number Diff line number Diff line
@@ -1975,7 +1975,7 @@ static void omap_dma4_write(void *opaque, hwaddr addr, 
        ch->endian[1] =(value >> 19) & 1;

        ch->endian_lock[1] =(value >> 18) & 1;

        if (ch->endian[0] != ch->endian[1])

            fprintf(stderr, "%s: DMA endiannes conversion enable attempt\n",

            fprintf(stderr, "%s: DMA endianness conversion enable attempt\n",

                            __FUNCTION__);

        ch->write_mode = (value >> 16) & 3;

        ch->burst[1] = (value & 0xc000) >> 14;