[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 3/6] e1000: wire new subsection to property
From: |
Jason Wang |
Subject: |
[Qemu-devel] [PULL 3/6] e1000: wire new subsection to property |
Date: |
Tue, 10 Apr 2018 11:39:59 +0800 |
From: "Dr. David Alan Gilbert" <address@hidden>
Wire the new subsection from the previous commit to a property
so we can turn it off easily.
Signed-off-by: Dr. David Alan Gilbert <address@hidden>
Signed-off-by: Jason Wang <address@hidden>
---
hw/net/e1000.c | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/hw/net/e1000.c b/hw/net/e1000.c
index d399ce3..bb8ee2a 100644
--- a/hw/net/e1000.c
+++ b/hw/net/e1000.c
@@ -123,9 +123,11 @@ typedef struct E1000State_st {
#define E1000_FLAG_AUTONEG_BIT 0
#define E1000_FLAG_MIT_BIT 1
#define E1000_FLAG_MAC_BIT 2
+#define E1000_FLAG_TSO_BIT 3
#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)
+#define E1000_FLAG_TSO (1 << E1000_FLAG_TSO_BIT)
uint32_t compat_flags;
bool received_tx_tso;
} E1000State;
@@ -1422,6 +1424,13 @@ static bool e1000_full_mac_needed(void *opaque)
return chkflag(MAC);
}
+static bool e1000_tso_state_needed(void *opaque)
+{
+ E1000State *s = opaque;
+
+ return chkflag(TSO);
+}
+
static const VMStateDescription vmstate_e1000_mit_state = {
.name = "e1000/mit_state",
.version_id = 1,
@@ -1452,6 +1461,7 @@ static const VMStateDescription
vmstate_e1000_tx_tso_state = {
.name = "e1000/tx_tso_state",
.version_id = 1,
.minimum_version_id = 1,
+ .needed = e1000_tso_state_needed,
.post_load = e1000_tx_tso_post_load,
.fields = (VMStateField[]) {
VMSTATE_UINT8(tx.tso_props.ipcss, E1000State),
@@ -1677,6 +1687,8 @@ static Property e1000_properties[] = {
compat_flags, E1000_FLAG_MIT_BIT, true),
DEFINE_PROP_BIT("extra_mac_registers", E1000State,
compat_flags, E1000_FLAG_MAC_BIT, true),
+ DEFINE_PROP_BIT("migrate_tso_props", E1000State,
+ compat_flags, E1000_FLAG_TSO_BIT, true),
DEFINE_PROP_END_OF_LIST(),
};
--
2.7.4
- [Qemu-devel] [PULL 0/6] Net patches, Jason Wang, 2018/04/09
- [Qemu-devel] [PULL 2/6] e1000: Dupe offload data on reading old stream, Jason Wang, 2018/04/09
- [Qemu-devel] [PULL 1/6] e1000: Convert v3 fields to subsection, Jason Wang, 2018/04/09
- [Qemu-devel] [PULL 3/6] e1000: wire new subsection to property,
Jason Wang <=
- [Qemu-devel] [PULL 4/6] e1000: Migrate props via a temporary structure, Jason Wang, 2018/04/09
- [Qemu-devel] [PULL 5/6] e1000: Choose which set of props to migrate, Jason Wang, 2018/04/09
- [Qemu-devel] [PULL 6/6] e1000: Old machine types, turn new subsection off, Jason Wang, 2018/04/09
- Re: [Qemu-devel] [PULL 0/6] Net patches, Peter Maydell, 2018/04/10