qemu-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Qemu-commits] [qemu/qemu] 6ab57a: net: cadence_gem: Fix Tx descriptor u


From: GitHub
Subject: [Qemu-commits] [qemu/qemu] 6ab57a: net: cadence_gem: Fix Tx descriptor update
Date: Tue, 10 Jun 2014 10:00:08 -0700

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 6ab57a6b80be45372d7f3dd58e9776549d0ce9cf
      
https://github.com/qemu/qemu/commit/6ab57a6b80be45372d7f3dd58e9776549d0ce9cf
  Author: Peter Crosthwaite <address@hidden>
  Date:   2014-06-10 (Tue, 10 Jun 2014)

  Changed paths:
    M hw/net/cadence_gem.c

  Log Message:
  -----------
  net: cadence_gem: Fix Tx descriptor update

The local variable "desc" was being used to read-modify-write the
first descriptor (of a multi-desc packet) upon packet completion.
desc however continues to be used by the code as the current
descriptor. Give this first desc RMW it's own local variable to
avoid trampling.

Signed-off-by: Peter Crosthwaite <address@hidden>
Signed-off-by: Michael Tokarev <address@hidden>


  Commit: fa15286a758eb036258bffae2b6c128e2a477cc3
      
https://github.com/qemu/qemu/commit/fa15286a758eb036258bffae2b6c128e2a477cc3
  Author: Peter Crosthwaite <address@hidden>
  Date:   2014-06-10 (Tue, 10 Jun 2014)

  Changed paths:
    M hw/net/cadence_gem.c

  Log Message:
  -----------
  net: cadence_gem: Add Tx descriptor fetch printf

Add a debug printf for TX descriptor fetching. This is helpful to anyone
needing to debug TX ring buffer traversal. It is also now consistent with
the RX code which has a similar printf.

Signed-off-by: Peter Crosthwaite <address@hidden>
Signed-off-by: Michael Tokarev <address@hidden>


  Commit: 3048ed6aac8bd7622e1f9c82ebe83f819b5d6b75
      
https://github.com/qemu/qemu/commit/3048ed6aac8bd7622e1f9c82ebe83f819b5d6b75
  Author: Peter Crosthwaite <address@hidden>
  Date:   2014-06-10 (Tue, 10 Jun 2014)

  Changed paths:
    M hw/net/cadence_gem.c

  Log Message:
  -----------
  net: cadence_gem: Comment spelling sweep

Fix some typos in comments.

Signed-off-by: Peter Crosthwaite <address@hidden>
Signed-off-by: Michael Tokarev <address@hidden>


  Commit: ef18c2f54ee6ac3df3e8617958bcdb53ee9e8e06
      
https://github.com/qemu/qemu/commit/ef18c2f54ee6ac3df3e8617958bcdb53ee9e8e06
  Author: Peter Crosthwaite <address@hidden>
  Date:   2014-06-10 (Tue, 10 Jun 2014)

  Changed paths:
    M hw/net/cadence_gem.c

  Log Message:
  -----------
  net: cadence_gem: Remove &desc[0] usages

Just use desc instead.

Signed-off-by: Peter Crosthwaite <address@hidden>
Signed-off-by: Michael Tokarev <address@hidden>


  Commit: 2a802aaf635e9700942a04f698bce9e476c207e2
      
https://github.com/qemu/qemu/commit/2a802aaf635e9700942a04f698bce9e476c207e2
  Author: Sergey Fedorov <address@hidden>
  Date:   2014-06-10 (Tue, 10 Jun 2014)

  Changed paths:
    M qtest.c

  Log Message:
  -----------
  qtest: fix hex2nib for capital characters

Signed-off-by: Sergey Fedorov <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Reviewed-by: Stefan Hajnoczi <address@hidden>
Signed-off-by: Michael Tokarev <address@hidden>


  Commit: 49bba868df17aebf7525a5c8f21c451abe3dcdc8
      
https://github.com/qemu/qemu/commit/49bba868df17aebf7525a5c8f21c451abe3dcdc8
  Author: Peter Maydell <address@hidden>
  Date:   2014-06-10 (Tue, 10 Jun 2014)

  Changed paths:
    M slirp/slirp.c

  Log Message:
  -----------
  slirp: Remove unused zero_ethaddr[] variable

The zero_ethaddr[] array is never used; delete it.

Signed-off-by: Peter Maydell <address@hidden>
Signed-off-by: Michael Tokarev <address@hidden>


  Commit: 831f4d27b6b7a5af89e82af5975de98bd19bd18c
      
https://github.com/qemu/qemu/commit/831f4d27b6b7a5af89e82af5975de98bd19bd18c
  Author: Peter Maydell <address@hidden>
  Date:   2014-06-10 (Tue, 10 Jun 2014)

  Changed paths:
    M hw/i386/pc.c

  Log Message:
  -----------
  hw/i386/pc.c: Remove unused parallel_io and parallel_irq variables

The variables parallel_io and parallel_irq are unused; delete them.

Signed-off-by: Peter Maydell <address@hidden>
Signed-off-by: Michael Tokarev <address@hidden>


  Commit: 71795856881e037e0f0384b556c5b65f211662ad
      
https://github.com/qemu/qemu/commit/71795856881e037e0f0384b556c5b65f211662ad
  Author: Peter Maydell <address@hidden>
  Date:   2014-06-10 (Tue, 10 Jun 2014)

  Changed paths:
    M hw/sd/sd.c

  Log Message:
  -----------
  hw/sd/sd.c: Drop unused sd_acmd_type[] array

Drop the sd_acmd_type[] array: it is never used. (The equivalent
sd_cmd_type[] array for normal commands is used to identify
those commands whose argument includes the card address in the
top 16 bits; but for app commands the card address is passed
with the APP_CMD prefix, not with the argument to the app command
itself.)

Signed-off-by: Peter Maydell <address@hidden>
Reviewed-by: Peter Crosthwaite <address@hidden>
Signed-off-by: Michael Tokarev <address@hidden>


  Commit: f9b5426fd50a60d9fda2c061c24f60537666e9af
      
https://github.com/qemu/qemu/commit/f9b5426fd50a60d9fda2c061c24f60537666e9af
  Author: Peter Maydell <address@hidden>
  Date:   2014-06-10 (Tue, 10 Jun 2014)

  Changed paths:
    M util/qemu-sockets.c

  Log Message:
  -----------
  util/qemu-sockets.c: Avoid unused variable warnings

The 'on' variable is never used, and 'off' is only used
if IPV6_V6ONLY is defined; delete 'on' and move 'off' to
the point where it is used. This avoids warnings from
clang 3.4.

Signed-off-by: Peter Maydell <address@hidden>
Signed-off-by: Michael Tokarev <address@hidden>


  Commit: a1fa7992a90658d803b8abaf182440c36c460d51
      
https://github.com/qemu/qemu/commit/a1fa7992a90658d803b8abaf182440c36c460d51
  Author: Peter Maydell <address@hidden>
  Date:   2014-06-10 (Tue, 10 Jun 2014)

  Changed paths:
    M hw/dma/xilinx_axidma.c

  Log Message:
  -----------
  hw/dma/xilinx_axidma: Remove unused stream_halted() function

The stream_halted() function is never used; remove it.

Signed-off-by: Peter Maydell <address@hidden>
Signed-off-by: Michael Tokarev <address@hidden>


  Commit: c1d75727931e30da1b2c28887f21278812cae57c
      
https://github.com/qemu/qemu/commit/c1d75727931e30da1b2c28887f21278812cae57c
  Author: Peter Maydell <address@hidden>
  Date:   2014-06-10 (Tue, 10 Jun 2014)

  Changed paths:
    M hw/intc/openpic.c

  Log Message:
  -----------
  hw/intc/openpic: Remove unused function IRQ_testbit()

The IRQ_testbit() function is never used; remove it.

Signed-off-by: Peter Maydell <address@hidden>
Signed-off-by: Michael Tokarev <address@hidden>


  Commit: f46b9cc71ca69907d7e0b75eae669ed747f375b0
      
https://github.com/qemu/qemu/commit/f46b9cc71ca69907d7e0b75eae669ed747f375b0
  Author: Peter Maydell <address@hidden>
  Date:   2014-06-10 (Tue, 10 Jun 2014)

  Changed paths:
    M hw/isa/pc87312.c

  Log Message:
  -----------
  hw/isa/pc87312: Remove unused function is_parallel_epp()

The function is_parallel_epp() is unused; remove it.

Signed-off-by: Peter Maydell <address@hidden>
Signed-off-by: Michael Tokarev <address@hidden>


  Commit: e3a17ef6cc8034b6a453014746c34b41435c3345
      
https://github.com/qemu/qemu/commit/e3a17ef6cc8034b6a453014746c34b41435c3345
  Author: Peter Maydell <address@hidden>
  Date:   2014-06-10 (Tue, 10 Jun 2014)

  Changed paths:
    M target-i386/translate.c

  Log Message:
  -----------
  target-i386/translate.c: Remove unused tcg_gen_lshift()

The function tcg_gen_lshift() is unused; remove it.

Signed-off-by: Peter Maydell <address@hidden>
Signed-off-by: Michael Tokarev <address@hidden>


  Commit: 029ad4bcf31384783dce9896b2fc5349d9c13a9f
      
https://github.com/qemu/qemu/commit/029ad4bcf31384783dce9896b2fc5349d9c13a9f
  Author: Peter Maydell <address@hidden>
  Date:   2014-06-10 (Tue, 10 Jun 2014)

  Changed paths:
    M hw/input/milkymist-softusb.c

  Log Message:
  -----------
  hw/misc/milkymist-softusb: Remove unused softusb_{read, write}_pmem()

The functions softusb_read_pmem() and softusb_write_pmem() are unused;
remove them.

Signed-off-by: Peter Maydell <address@hidden>
Signed-off-by: Michael Tokarev <address@hidden>


  Commit: fc4bde9025c07a2ef96d498f5d675d3ec044b00a
      
https://github.com/qemu/qemu/commit/fc4bde9025c07a2ef96d498f5d675d3ec044b00a
  Author: Peter Maydell <address@hidden>
  Date:   2014-06-10 (Tue, 10 Jun 2014)

  Changed paths:
    M target-microblaze/translate.c

  Log Message:
  -----------
  target-microblaze: Delete unused sign_extend() function

The sign_extend() function is unused; delete it.

Signed-off-by: Peter Maydell <address@hidden>
Reviewed-by: Edgar E. Iglesias <address@hidden>
Signed-off-by: Michael Tokarev <address@hidden>


  Commit: 89218c218f906b7384c2b365fc8bdc33b1452cbc
      
https://github.com/qemu/qemu/commit/89218c218f906b7384c2b365fc8bdc33b1452cbc
  Author: Peter Maydell <address@hidden>
  Date:   2014-06-10 (Tue, 10 Jun 2014)

  Changed paths:
    M hw/net/ne2000-isa.c

  Log Message:
  -----------
  hw/net/ne2000-isa: Register vmstate struct

The ne2000-isa device defines a VMState struct for migration, but
we forgot to actually register it. Correct this deficiency by
setting dc->vmsd.

Signed-off-by: Peter Maydell <address@hidden>
Signed-off-by: Michael Tokarev <address@hidden>


  Commit: d1180c1e57c8ea5acb6a472c07eebf371f5c282c
      
https://github.com/qemu/qemu/commit/d1180c1e57c8ea5acb6a472c07eebf371f5c282c
  Author: Stefan Weil <address@hidden>
  Date:   2014-06-10 (Tue, 10 Jun 2014)

  Changed paths:
    M hw/pci-host/apb.c

  Log Message:
  -----------
  apb: Fix compiler warnings (large constants)

Both constants need more than 32 bit.

Signed-off-by: Stefan Weil <address@hidden>
Signed-off-by: Michael Tokarev <address@hidden>


  Commit: 6998b6c11b4e8ca5e3c3e6bdbdf07a4f747d5d37
      
https://github.com/qemu/qemu/commit/6998b6c11b4e8ca5e3c3e6bdbdf07a4f747d5d37
  Author: Paolo Bonzini <address@hidden>
  Date:   2014-06-10 (Tue, 10 Jun 2014)

  Changed paths:
    M block/vdi.c

  Log Message:
  -----------
  vdi: remove double conversion

This should be a problem when running on big-endian machines.

Signed-off-by: Paolo Bonzini <address@hidden>
Reviewed-by: Benoit Canet <address@hidden>
Reviewed-by: Stefan Weil <address@hidden>
Signed-off-by: Michael Tokarev <address@hidden>


  Commit: a10678b08ecf87ef0b73426a876679178b392bcc
      
https://github.com/qemu/qemu/commit/a10678b08ecf87ef0b73426a876679178b392bcc
  Author: Paolo Bonzini <address@hidden>
  Date:   2014-06-10 (Tue, 10 Jun 2014)

  Changed paths:
    M hw/i386/smbios.c

  Log Message:
  -----------
  smbios: use g_free directly on NULL pointers

No need to wrap it with an if.

Signed-off-by: Paolo Bonzini <address@hidden>
Reviewed-by: Benoit Canet <address@hidden>
Signed-off-by: Michael Tokarev <address@hidden>


  Commit: 6b1dd54b6a4652a3a1e15a4beacd3be554a9ade1
      
https://github.com/qemu/qemu/commit/6b1dd54b6a4652a3a1e15a4beacd3be554a9ade1
  Author: Paolo Bonzini <address@hidden>
  Date:   2014-06-10 (Tue, 10 Jun 2014)

  Changed paths:
    M target-i386/cpu.c

  Log Message:
  -----------
  cpu/x86: correctly set errors in x86_cpu_parse_featurestr

Because of the "goto out", the contents of local_err are leaked
and lost.

Signed-off-by: Paolo Bonzini <address@hidden>
Signed-off-by: Michael Tokarev <address@hidden>


  Commit: ec15993d9d7ea7108101f068c9929a62be29dc67
      
https://github.com/qemu/qemu/commit/ec15993d9d7ea7108101f068c9929a62be29dc67
  Author: Markus Armbruster <address@hidden>
  Date:   2014-06-10 (Tue, 10 Jun 2014)

  Changed paths:
    M libcacard/cac.c
    M libcacard/card_7816.c
    M libcacard/vcard.c
    M libcacard/vcard_emul_nss.c
    M libcacard/vreader.c

  Log Message:
  -----------
  libcacard: Drop superfluous conditionals around g_free()

Signed-off-by: Markus Armbruster <address@hidden>
Signed-off-by: Michael Tokarev <address@hidden>


  Commit: fec0da9cbf6b357e046cac4295185610399dcbb8
      
https://github.com/qemu/qemu/commit/fec0da9cbf6b357e046cac4295185610399dcbb8
  Author: Markus Armbruster <address@hidden>
  Date:   2014-06-10 (Tue, 10 Jun 2014)

  Changed paths:
    M libcacard/vcard.c
    M libcacard/vreader.c

  Log Message:
  -----------
  libcacard: Clean up dead stores before g_free()

Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Michael Tokarev <address@hidden>


  Commit: 4380be0e997284159e634100d2f5ec87f944d74d
      
https://github.com/qemu/qemu/commit/4380be0e997284159e634100d2f5ec87f944d74d
  Author: Chen Gang <address@hidden>
  Date:   2014-06-10 (Tue, 10 Jun 2014)

  Changed paths:
    M arch_init.c
    M page_cache.c

  Log Message:
  -----------
  migration: Plug memory leak in migrate-set-cache-size command

We call g_free() after cache_fini() in migration_end(), but we don't
call it after cache_fini() in xbzrle_cache_resize(), leaking the
memory.

cache_init() and cache_fini() are a pair.  Since cache_init()
allocates the cache, let cache_fini() free it.  This plugs the leak.

Signed-off-by: Chen Gang <address@hidden>
Reviewed-by: Dr. David Alan Gilbert <address@hidden>
Signed-off-by: Michael Tokarev <address@hidden>


  Commit: e2bb4ae74687c06a256d8058e340295c7a084fe4
      
https://github.com/qemu/qemu/commit/e2bb4ae74687c06a256d8058e340295c7a084fe4
  Author: Nicolas Owens <address@hidden>
  Date:   2014-06-10 (Tue, 10 Jun 2014)

  Changed paths:
    M hw/display/vmware_vga.c

  Log Message:
  -----------
  hw: vmware_vga: don't return cursorx when the driver asks for cursory register

hello address@hidden, this is my first contribution. apologies if
something is incorrect.

this patch fixes vmware_vga.c so that it actually returns the cursory
register when asked for, instead of cursorx.

Signed-off-by: Nicolas Owens <address@hidden>
Signed-off-by: Michael Tokarev <address@hidden>


  Commit: 1a2858995d283ddad4a745460d1cc770a9b93fc1
      
https://github.com/qemu/qemu/commit/1a2858995d283ddad4a745460d1cc770a9b93fc1
  Author: Michael Tokarev <address@hidden>
  Date:   2014-06-10 (Tue, 10 Jun 2014)

  Changed paths:
    M hw/virtio/virtio.c

  Log Message:
  -----------
  virtio.c: fix error message

Suggested-by: Peter Maydell <address@hidden>
Signed-off-by: Michael Tokarev <address@hidden>


  Commit: b780bf8eff43fc49b071795292dea5d05990fff3
      
https://github.com/qemu/qemu/commit/b780bf8eff43fc49b071795292dea5d05990fff3
  Author: Peter Maydell <address@hidden>
  Date:   2014-06-10 (Tue, 10 Jun 2014)

  Changed paths:
    M arch_init.c
    M block/vdi.c
    M hw/display/vmware_vga.c
    M hw/dma/xilinx_axidma.c
    M hw/i386/pc.c
    M hw/i386/smbios.c
    M hw/input/milkymist-softusb.c
    M hw/intc/openpic.c
    M hw/isa/pc87312.c
    M hw/net/cadence_gem.c
    M hw/net/ne2000-isa.c
    M hw/pci-host/apb.c
    M hw/sd/sd.c
    M hw/virtio/virtio.c
    M libcacard/cac.c
    M libcacard/card_7816.c
    M libcacard/vcard.c
    M libcacard/vcard_emul_nss.c
    M libcacard/vreader.c
    M page_cache.c
    M qtest.c
    M slirp/slirp.c
    M target-i386/cpu.c
    M target-i386/translate.c
    M target-microblaze/translate.c
    M util/qemu-sockets.c

  Log Message:
  -----------
  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 <address@hidden>"
# gpg:                 aka "Michael Tokarev <address@hidden>"
# gpg:                 aka "Michael Tokarev <address@hidden>"
# 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 <address@hidden>


Compare: https://github.com/qemu/qemu/compare/3334e929ae2d...b780bf8eff43

reply via email to

[Prev in Thread] Current Thread [Next in Thread]