[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 3/6] e1000e: fix for migration compatibility
From: |
Cao jin |
Subject: |
[Qemu-devel] [PATCH 3/6] e1000e: fix for migration compatibility |
Date: |
Wed, 17 Aug 2016 22:39:04 +0800 |
commit 66bf7d58 removed internal msi state flag E1000E_USE_MSI, but it
is used by intr_state which exists in vmstate. Restore it for migration
to older QEMU versions
CC: Dmitry Fleytman <address@hidden>
CC: Jason Wang <address@hidden>
CC: Markus Armbruster <address@hidden>
CC: Marcel Apfelbaum <address@hidden>
CC: Michael S. Tsirkin <address@hidden>
Signed-off-by: Cao jin <address@hidden>
---
hw/net/e1000e.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/hw/net/e1000e.c b/hw/net/e1000e.c
index 82a7be1..ba37fe9 100644
--- a/hw/net/e1000e.c
+++ b/hw/net/e1000e.c
@@ -89,7 +89,8 @@ typedef struct E1000EState {
#define E1000E_MSIX_TABLE (0x0000)
#define E1000E_MSIX_PBA (0x2000)
-#define E1000E_USE_MSIX BIT(0)
+#define E1000E_USE_MSI BIT(0)
+#define E1000E_USE_MSIX BIT(1)
static uint64_t
e1000e_mmio_read(void *opaque, hwaddr addr, unsigned size)
@@ -470,6 +471,8 @@ static void e1000e_pci_realize(PCIDevice *pci_dev, Error
**errp)
ret = msi_init(PCI_DEVICE(s), 0xD0, 1, true, false, NULL);
if (ret) {
trace_e1000e_msi_init_fail(ret);
+ } else {
+ s->intr_state |= E1000E_USE_MSI;
}
if (e1000e_add_pm_capability(pci_dev, e1000e_pmrb_offset,
--
2.1.0
[Qemu-devel] [PATCH 5/6] megasas: remove unnecessary megasas_use_msix(), Cao jin, 2016/08/17
[Qemu-devel] [PATCH 6/6] megasas: undo the overwrites of user configuration, Cao jin, 2016/08/17
[Qemu-devel] [PATCH 1/6] msix_init: assert programming error, Cao jin, 2016/08/17