[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 1/5] e1000: don't raise interrupt in pre_save()
From: |
Jason Wang |
Subject: |
[Qemu-devel] [PULL 1/5] e1000: don't raise interrupt in pre_save() |
Date: |
Mon, 29 Jul 2019 16:33:42 +0800 |
We should not raise any interrupt after VM has been stopped but this
is what e1000 currently did when mit timer is active in
pre_save(). Fixing this by scheduling a timer in post_load() which can
make sure the interrupt was raised when VM is running.
Reported-and-tested-by: Longpeng <address@hidden>
Signed-off-by: Jason Wang <address@hidden>
---
hw/net/e1000.c | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/hw/net/e1000.c b/hw/net/e1000.c
index 1dc1466..a023ceb 100644
--- a/hw/net/e1000.c
+++ b/hw/net/e1000.c
@@ -1381,11 +1381,6 @@ static int e1000_pre_save(void *opaque)
E1000State *s = opaque;
NetClientState *nc = qemu_get_queue(s->nic);
- /* If the mitigation timer is active, emulate a timeout now. */
- if (s->mit_timer_on) {
- e1000_mit_timer(s);
- }
-
/*
* If link is down and auto-negotiation is supported and ongoing,
* complete auto-negotiation immediately. This allows us to look
@@ -1423,7 +1418,8 @@ static int e1000_post_load(void *opaque, int version_id)
s->mit_irq_level = false;
}
s->mit_ide = 0;
- s->mit_timer_on = false;
+ s->mit_timer_on = true;
+ timer_mod(s->mit_timer, qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL) + 1);
/* nc.link_down can't be migrated, so infer link_down according
* to link status bit in mac_reg[STATUS].
--
2.5.0
- [Qemu-devel] [PULL 0/5] Net patches, Jason Wang, 2019/07/29
- [Qemu-devel] [PULL 1/5] e1000: don't raise interrupt in pre_save(),
Jason Wang <=
- [Qemu-devel] [PULL 3/5] qemu-bridge-helper: move repeating code in parse_acl_file, Jason Wang, 2019/07/29
- [Qemu-devel] [PULL 2/5] qemu-bridge-helper: restrict interface name to IFNAMSIZ, Jason Wang, 2019/07/29
- [Qemu-devel] [PULL 4/5] net: tap: replace snprintf with g_strdup_printf calls, Jason Wang, 2019/07/29
- [Qemu-devel] [PULL 5/5] net/colo-compare.c: Fix memory leak and code style issue., Jason Wang, 2019/07/29
- Re: [Qemu-devel] [PULL 0/5] Net patches, Peter Maydell, 2019/07/29