[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v2 03/12] e1000: Add support for migrating the entire
From: |
Jason Wang |
Subject: |
[Qemu-devel] [PULL v2 03/12] e1000: Add support for migrating the entire MAC registers' array |
Date: |
Thu, 12 Nov 2015 16:32:21 +0800 |
From: Leonid Bloch <address@hidden>
This patch makes the migration of the entire array of MAC registers
possible during live migration. The entire array is just 128 KB long, so
practically no penalty should be felt when transmitting it, additionally
to the previously transmitted individual registers. The advantage here is
eliminating the need to introduce new vmstate subsections in the future,
when additional MAC registers will be implemented.
Backward compatibility is preserved by introducing a e1000-specific
boolean parameter (in a later patch), which will be on by default.
Setting it to off would enable migration to older versions of QEMU.
Additionally, this parameter will be used to control the access to the
extra MAC registers in the future.
Signed-off-by: Leonid Bloch <address@hidden>
Signed-off-by: Dmitry Fleytman <address@hidden>
Signed-off-by: Jason Wang <address@hidden>
---
hw/net/e1000.c | 21 +++++++++++++++++++++
1 file changed, 21 insertions(+)
diff --git a/hw/net/e1000.c b/hw/net/e1000.c
index da72776..7088027 100644
--- a/hw/net/e1000.c
+++ b/hw/net/e1000.c
@@ -135,8 +135,10 @@ typedef struct E1000State_st {
/* Compatibility flags for migration to/from qemu 1.3.0 and older */
#define E1000_FLAG_AUTONEG_BIT 0
#define E1000_FLAG_MIT_BIT 1
+#define E1000_FLAG_MAC_BIT 2
#define E1000_FLAG_AUTONEG (1 << E1000_FLAG_AUTONEG_BIT)
#define E1000_FLAG_MIT (1 << E1000_FLAG_MIT_BIT)
+#define E1000_FLAG_MAC (1 << E1000_FLAG_MAC_BIT)
uint32_t compat_flags;
} E1000State;
@@ -1380,6 +1382,13 @@ static bool e1000_mit_state_needed(void *opaque)
return s->compat_flags & E1000_FLAG_MIT;
}
+static bool e1000_full_mac_needed(void *opaque)
+{
+ E1000State *s = opaque;
+
+ return s->compat_flags & E1000_FLAG_MAC;
+}
+
static const VMStateDescription vmstate_e1000_mit_state = {
.name = "e1000/mit_state",
.version_id = 1,
@@ -1395,6 +1404,17 @@ static const VMStateDescription vmstate_e1000_mit_state
= {
}
};
+static const VMStateDescription vmstate_e1000_full_mac_state = {
+ .name = "e1000/full_mac_state",
+ .version_id = 1,
+ .minimum_version_id = 1,
+ .needed = e1000_full_mac_needed,
+ .fields = (VMStateField[]) {
+ VMSTATE_UINT32_ARRAY(mac_reg, E1000State, 0x8000),
+ VMSTATE_END_OF_LIST()
+ }
+};
+
static const VMStateDescription vmstate_e1000 = {
.name = "e1000",
.version_id = 2,
@@ -1474,6 +1494,7 @@ static const VMStateDescription vmstate_e1000 = {
},
.subsections = (const VMStateDescription*[]) {
&vmstate_e1000_mit_state,
+ &vmstate_e1000_full_mac_state,
NULL
}
};
--
2.1.4
- [Qemu-devel] [PULL v2 00/12] Net patches, Jason Wang, 2015/11/12
- [Qemu-devel] [PULL v2 01/12] slirp: Fix type casts and format strings in debug code, Jason Wang, 2015/11/12
- [Qemu-devel] [PULL v2 02/12] e1000: Cosmetic and alignment fixes, Jason Wang, 2015/11/12
- [Qemu-devel] [PULL v2 03/12] e1000: Add support for migrating the entire MAC registers' array,
Jason Wang <=
- [Qemu-devel] [PULL v2 04/12] e1000: Introduced an array to control the access to the MAC registers, Jason Wang, 2015/11/12
- [Qemu-devel] [PULL v2 05/12] e1000: Trivial implementation of various MAC registers, Jason Wang, 2015/11/12
- [Qemu-devel] [PULL v2 06/12] e1000: Fixing the received/transmitted packets' counters, Jason Wang, 2015/11/12
- [Qemu-devel] [PULL v2 07/12] e1000: Fixing the received/transmitted octets' counters, Jason Wang, 2015/11/12
- [Qemu-devel] [PULL v2 08/12] e1000: Fixing the packet address filtering procedure, Jason Wang, 2015/11/12
- [Qemu-devel] [PULL v2 09/12] e1000: Implementing various counters, Jason Wang, 2015/11/12
- [Qemu-devel] [PULL v2 10/12] e1000: Introducing backward compatibility command line parameter, Jason Wang, 2015/11/12
- [Qemu-devel] [PULL v2 11/12] net: netmap: Fix compilation issue, Jason Wang, 2015/11/12
- [Qemu-devel] [PULL v2 12/12] net: netmap: use error_setg() helpers in place of error_report(), Jason Wang, 2015/11/12
- Re: [Qemu-devel] [PULL v2 00/12] Net patches, Peter Maydell, 2015/11/12