[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 20/24] vmxnet3: Introduce 'x-disable-pcie' back-compa
From: |
Jason Wang |
Subject: |
[Qemu-devel] [PULL 20/24] vmxnet3: Introduce 'x-disable-pcie' back-compat property |
Date: |
Mon, 11 Jan 2016 13:31:11 +0800 |
From: Shmulik Ladkani <address@hidden>
Following the previous patch which changed vmxnet3 to be a pci express
device, this patch introduces a boolean property 'x-disable-pcie' whose
default is false.
Setting 'x-disable-pcie' to 'on' preserves the old 'pci device' (non
express) behavior. This allows migration to older versions.
Signed-off-by: Shmulik Ladkani <address@hidden>
Signed-off-by: Jason Wang <address@hidden>
---
hw/net/vmxnet3.c | 2 ++
include/hw/compat.h | 4 ++++
2 files changed, 6 insertions(+)
diff --git a/hw/net/vmxnet3.c b/hw/net/vmxnet3.c
index aee218c..67abad3 100644
--- a/hw/net/vmxnet3.c
+++ b/hw/net/vmxnet3.c
@@ -2663,6 +2663,8 @@ static Property vmxnet3_properties[] = {
DEFINE_NIC_PROPERTIES(VMXNET3State, conf),
DEFINE_PROP_BIT("x-old-msi-offsets", VMXNET3State, compat_flags,
VMXNET3_COMPAT_FLAG_OLD_MSI_OFFSETS_BIT, false),
+ DEFINE_PROP_BIT("x-disable-pcie", VMXNET3State, compat_flags,
+ VMXNET3_COMPAT_FLAG_DISABLE_PCIE_BIT, false),
DEFINE_PROP_END_OF_LIST(),
};
diff --git a/include/hw/compat.h b/include/hw/compat.h
index fd20d0e..98df0dd 100644
--- a/include/hw/compat.h
+++ b/include/hw/compat.h
@@ -6,6 +6,10 @@
.driver = "vmxnet3",\
.property = "x-old-msi-offsets",\
.value = "on",\
+ },{\
+ .driver = "vmxnet3",\
+ .property = "x-disable-pcie",\
+ .value = "on",\
},
#define HW_COMPAT_2_4 \
--
2.5.0
- [Qemu-devel] [PULL 10/24] net/vmxnet3: return 0 on unknown command, (continued)
- [Qemu-devel] [PULL 10/24] net/vmxnet3: return 0 on unknown command, Jason Wang, 2016/01/11
- [Qemu-devel] [PULL 11/24] net/vmxnet3: rename VMXNET3_DEVICE_VERSION to VMXNET3_UPT_REVISION, Jason Wang, 2016/01/11
- [Qemu-devel] [PULL 12/24] net/dump: fix nfds->filename leak, Jason Wang, 2016/01/11
- [Qemu-devel] [PULL 13/24] net/filter: fix nf->netdev_id leak, Jason Wang, 2016/01/11
- [Qemu-devel] [PULL 14/24] vmxnet3: Change offsets of msi/msix pci capabilities, Jason Wang, 2016/01/11
- [Qemu-devel] [PULL 15/24] vmxnet3: Change the offset of the MSIX PBA table, Jason Wang, 2016/01/11
- [Qemu-devel] [PULL 16/24] vmxnet3: Introduce 'x-old-msi-offsets' back-compat property, Jason Wang, 2016/01/11
- [Qemu-devel] [PULL 17/24] vmxnet3: coding: Introduce VMXNET3Class, Jason Wang, 2016/01/11
- [Qemu-devel] [PULL 18/24] vmxnet3: The vmxnet3 device is a PCIE endpoint, Jason Wang, 2016/01/11
- [Qemu-devel] [PULL 19/24] vmxnet3: Report the Device Serial Number capability, Jason Wang, 2016/01/11
- [Qemu-devel] [PULL 20/24] vmxnet3: Introduce 'x-disable-pcie' back-compat property,
Jason Wang <=
- [Qemu-devel] [PULL 21/24] net: rocker: fix an incorrect array bounds check, Jason Wang, 2016/01/11
- [Qemu-devel] [PULL 23/24] l2tpv3: fix cookie decoding, Jason Wang, 2016/01/11
- [Qemu-devel] [PULL 22/24] net: ne2000: fix bounds check in ioport operations, Jason Wang, 2016/01/11
- [Qemu-devel] [PULL 24/24] ether/slirp: Avoid redefinition of the same constants, Jason Wang, 2016/01/11
- Re: [Qemu-devel] [PULL 00/24] Net patches, Peter Maydell, 2016/01/11