diff options
| author | Stefan Hajnoczi <stefanha@redhat.com> | 2016-11-15 12:07:53 +0000 |
|---|---|---|
| committer | Stefan Hajnoczi <stefanha@redhat.com> | 2016-11-15 12:07:53 +0000 |
| commit | 97e53cf82ca0ffa9abe2def2fabc5fc75b914d90 (patch) | |
| tree | cf7ae5a896702a38881fa1b214c1eed05c7d6e7d /net/net.c | |
| parent | 1ed9bd12c86b417669c22b4342ba27aec20c87e4 (diff) | |
| parent | a38299bf431a891c0a21a77199e7148c0983413e (diff) | |
| download | focaccia-qemu-97e53cf82ca0ffa9abe2def2fabc5fc75b914d90.tar.gz focaccia-qemu-97e53cf82ca0ffa9abe2def2fabc5fc75b914d90.zip | |
Merge remote-tracking branch 'jasowang/tags/net-pull-request' into staging
# gpg: Signature made Tue 15 Nov 2016 07:37:27 AM GMT # gpg: using RSA key 0xEF04965B398D6211 # 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 * jasowang/tags/net-pull-request: docs: fix COLO architecture diagram net: fix sending of data with -net socket, listen backend net: skip virtio-net config of deleted nic's peers Message-id: 1479195830-4725-1-git-send-email-jasowang@redhat.com Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Diffstat (limited to 'net/net.c')
| -rw-r--r-- | net/net.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/net/net.c b/net/net.c index ec984bf782..939fe3193a 100644 --- a/net/net.c +++ b/net/net.c @@ -1653,9 +1653,8 @@ int net_fill_rstate(SocketReadState *rs, const uint8_t *buf, int size) if (rs->index >= rs->packet_len) { rs->index = 0; rs->state = 0; - if (rs->finalize) { - rs->finalize(rs); - } + assert(rs->finalize); + rs->finalize(rs); } break; } |