tree 7186ab9b901ab1d7e67a2097d8825c1691aba478
parent 3334e929ae2d01e47c3e64757ee7fcf975cede94
parent 1a2858995d283ddad4a745460d1cc770a9b93fc1
author Peter Maydell <peter.maydell@linaro.org> 1402416963 +0100
committer Peter Maydell <peter.maydell@linaro.org> 1402416963 +0100
mergetag object 1a2858995d283ddad4a745460d1cc770a9b93fc1
 type commit
 tag trivial-patches-2014-06-10
 tagger Michael Tokarev <mjt@tls.msk.ru> 1402416439 +0400
 
 trivial patches for 2014-06-10
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.12 (GNU/Linux)
 
 iQEcBAABAgAGBQJTly03AAoJEL7lnXSkw9fbFqUH/jokkFQDO9XJ7+SuU/DC1GMH
 JtJZIyLjwu3LmvlsGlCjHcBD/vCF2HLdYWxo+wdiY2kxJdoY3VDhiCpVA4m+U+Lb
 R7L2NV/YsCnTPsDrlm2G8TydowkqUJWzOUrISjM1o+xryL3KG6/QR7+2tksdWJ5J
 T6zD8MX3QsM1j6u5+JdrkAwDSf8oegHS56KSA5vZrRth2/rg++LXMm1J932HLnwa
 Nkb8ymmkUGtErj2x0qBcv6wNQ53u7tpX3RjOWI7t9ripXICH+3a5ZMFiaM2E37Ws
 hJDfGoDZ/N19d+cxLJBxvUrfZKwCdWvvDYHx3XyXIW3HkB6UKaG7DwMENWDoGck=
 =7cOf
 -----END PGP SIGNATURE-----

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

trivial patches for 2014-06-10

# gpg: Signature made Tue 10 Jun 2014 17:07:19 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-10: (25 commits)
  virtio.c: fix error message
  hw: vmware_vga: don't return cursorx when the driver asks for cursory register
  migration: Plug memory leak in migrate-set-cache-size command
  libcacard: Clean up dead stores before g_free()
  libcacard: Drop superfluous conditionals around g_free()
  cpu/x86: correctly set errors in x86_cpu_parse_featurestr
  smbios: use g_free directly on NULL pointers
  vdi: remove double conversion
  apb: Fix compiler warnings (large constants)
  hw/net/ne2000-isa: Register vmstate struct
  target-microblaze: Delete unused sign_extend() function
  hw/misc/milkymist-softusb: Remove unused softusb_{read, write}_pmem()
  target-i386/translate.c: Remove unused tcg_gen_lshift()
  hw/isa/pc87312: Remove unused function is_parallel_epp()
  hw/intc/openpic: Remove unused function IRQ_testbit()
  hw/dma/xilinx_axidma: Remove unused stream_halted() function
  util/qemu-sockets.c: Avoid unused variable warnings
  hw/sd/sd.c: Drop unused sd_acmd_type[] array
  hw/i386/pc.c: Remove unused parallel_io and parallel_irq variables
  slirp: Remove unused zero_ethaddr[] variable
  ...

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>