diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2015-11-12 14:15:32 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2015-11-12 14:15:32 +0000 |
| commit | 17e50a72a3aade0eddfebc012a5d7bdd40a03573 (patch) | |
| tree | 6c8421ccb37258a48fc9ccc83c3700d7d7bd9bd6 /migration/qemu-file-unix.c | |
| parent | df1ac44e9f0c1b1d775c65b6e86fbcac0be77930 (diff) | |
| parent | 39bec4f38b028a2cff8c38f3455aef44d7b3b6c4 (diff) | |
| download | focaccia-qemu-17e50a72a3aade0eddfebc012a5d7bdd40a03573.tar.gz focaccia-qemu-17e50a72a3aade0eddfebc012a5d7bdd40a03573.zip | |
Merge remote-tracking branch 'remotes/jasowang/tags/net-pull-request' into staging
# gpg: Signature made Thu 12 Nov 2015 08:01:55 GMT using RSA key ID 398D6211 # gpg: Good signature from "Jason Wang (Jason Wang on RedHat) <jasowang@redhat.com>" # gpg: WARNING: This key is not certified with sufficiently trusted signatures! # gpg: It is not certain that the signature belongs to the owner. # Primary key fingerprint: 215D 46F4 8246 689E C77F 3562 EF04 965B 398D 6211 * remotes/jasowang/tags/net-pull-request: net: netmap: use error_setg() helpers in place of error_report() net: netmap: Fix compilation issue e1000: Introducing backward compatibility command line parameter e1000: Implementing various counters e1000: Fixing the packet address filtering procedure e1000: Fixing the received/transmitted octets' counters e1000: Fixing the received/transmitted packets' counters e1000: Trivial implementation of various MAC registers e1000: Introduced an array to control the access to the MAC registers e1000: Add support for migrating the entire MAC registers' array e1000: Cosmetic and alignment fixes slirp: Fix type casts and format strings in debug code Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'migration/qemu-file-unix.c')
0 files changed, 0 insertions, 0 deletions