-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1 iQEcBAABAgAGBQJfKPzsAAoJEO8Ells5jWIRT4sIAKTPaDXkQDXsmM7iQOcj9sn6 rDvoGdKUb+BfTSCv8sietApiOLWVoDqsCmR6TH8HyaJIrlncu/8tRUMIRTTTaLx+ P+fP2kV546j4R/gt0WU/S8c3YOQgN2skUK8/Xy/ePPzUZ/Ya6XXfI6IPBB+YcsUd COmiOHPehnS7EqVxGVDXr+G3iAZLkUZ1KrQZI5Kgd96HRPzrqDzNri7CzOFLrTpO CJGr1N+j+g8frcsOjFjoI9JqjmtB6xjvUGkbyQFryvYxNp5z+mJGM8DQFg61qDdE ROuuBRtMkEjlWDsz349S74czNpNYKzBLgeyIGTvahXIqnVBguHks6DKB8umeK20= =9r05 -----END PGP SIGNATURE----- Merge remote-tracking branch 'remotes/jasowang/tags/net-pull-request' into staging # gpg: Signature made Tue 04 Aug 2020 07:15:08 BST # gpg: using RSA key EF04965B398D6211 # gpg: Good signature from "Jason Wang (Jason Wang on RedHat) <jasowang@redhat.com>" [marginal] # 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: hw/net/net_tx_pkt: fix assertion failure in net_tx_pkt_add_raw_fragment() colo-compare: Remove superfluous NULL-pointer checks for s->iothread Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
commit
bcc983234b
|
@ -379,7 +379,10 @@ bool net_tx_pkt_add_raw_fragment(struct NetTxPkt *pkt, hwaddr pa,
|
|||
hwaddr mapped_len = 0;
|
||||
struct iovec *ventry;
|
||||
assert(pkt);
|
||||
assert(pkt->max_raw_frags > pkt->raw_frags);
|
||||
|
||||
if (pkt->raw_frags >= pkt->max_raw_frags) {
|
||||
return false;
|
||||
}
|
||||
|
||||
if (!len) {
|
||||
return true;
|
||||
|
|
|
@ -1442,9 +1442,7 @@ static void colo_compare_finalize(Object *obj)
|
|||
qemu_chr_fe_deinit(&s->chr_notify_dev, false);
|
||||
}
|
||||
|
||||
if (s->iothread) {
|
||||
colo_compare_timer_del(s);
|
||||
}
|
||||
colo_compare_timer_del(s);
|
||||
|
||||
qemu_bh_delete(s->event_bh);
|
||||
|
||||
|
@ -1470,9 +1468,7 @@ static void colo_compare_finalize(Object *obj)
|
|||
g_hash_table_destroy(s->connection_track_table);
|
||||
}
|
||||
|
||||
if (s->iothread) {
|
||||
object_unref(OBJECT(s->iothread));
|
||||
}
|
||||
object_unref(OBJECT(s->iothread));
|
||||
|
||||
g_free(s->pri_indev);
|
||||
g_free(s->sec_indev);
|
||||
|
|
Loading…
Reference in a new issue