diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2017-03-14 11:15:00 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2017-03-14 11:15:00 +0000 |
| commit | 591bce29b10a957a5cad4354cd5959c45570aedb (patch) | |
| tree | 3d47614015a4fb06407bf28f6aa6b888b93617b5 /hw/net/e1000e.c | |
| parent | 94b5d57d2f5a3c849cecd65e424bb6f50b998df9 (diff) | |
| parent | adb560f7fc92903f52071086a46422be1e3f4640 (diff) | |
| download | focaccia-qemu-591bce29b10a957a5cad4354cd5959c45570aedb.tar.gz focaccia-qemu-591bce29b10a957a5cad4354cd5959c45570aedb.zip | |
Merge remote-tracking branch 'remotes/jasowang/tags/net-pull-request' into staging
# gpg: Signature made Tue 14 Mar 2017 07:55:01 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 * remotes/jasowang/tags/net-pull-request: hw/net: implement MIB counters in mcf_fec driver COLO-compare: Fix trace_event print bug e1000e: correctly tear down MSI-X memory regions Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/net/e1000e.c')
| -rw-r--r-- | hw/net/e1000e.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/net/e1000e.c b/hw/net/e1000e.c index b0f429b8e5..6e234938db 100644 --- a/hw/net/e1000e.c +++ b/hw/net/e1000e.c @@ -306,7 +306,7 @@ e1000e_init_msix(E1000EState *s) static void e1000e_cleanup_msix(E1000EState *s) { - if (msix_enabled(PCI_DEVICE(s))) { + if (msix_present(PCI_DEVICE(s))) { e1000e_unuse_msix_vectors(s, E1000E_MSIX_VEC_NUM); msix_uninit(PCI_DEVICE(s), &s->msix, &s->msix); } |