diff options
| author | Dr. David Alan Gilbert | 2016-12-14 20:58:29 +0100 |
|---|---|---|
| committer | Dr. David Alan Gilbert | 2017-01-24 19:00:31 +0100 |
| commit | 20daa90a20d2654d82c1d51d542ab56dd27bacbf (patch) | |
| tree | 33b6890f76cfa91e7579e4c8e345586374a0b1de /include/hw/pci | |
| parent | migration: Change name of live migration thread (diff) | |
| download | qemu-20daa90a20d2654d82c1d51d542ab56dd27bacbf.tar.gz qemu-20daa90a20d2654d82c1d51d542ab56dd27bacbf.tar.xz qemu-20daa90a20d2654d82c1d51d542ab56dd27bacbf.zip | |
PCI/migration merge vmstate_pci_device and vmstate_pcie_device
The vmstate_pci_device and vmstate_pcie_devices differ
just in the size of one buffer; combine the two using a _TEST
macro.
I think this is safe as long as everywhere which currently
uses either of these two uses the right type.
One thing that concerns me is that some places use pci_device_load/save
which does some irq mangling, but others just use the VMSTATE_PCI_DEVICE
macro - how are they getting the same irq mangling?
This passes a smoke test migrate of:
./x86_64-softmmu/qemu-system-x86_64 -M pc,accel=kvm -m 1024
./littlefed20.img -device e1000e -device virtio-net -device
e1000 -device virtio-rng -device megasas -device megasas-gen2 -device
ioh3420 -device nec-usb-xhci
to an unmodified qemu.
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Message-Id: <20161214195829.18241-1-dgilbert@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Diffstat (limited to 'include/hw/pci')
| -rw-r--r-- | include/hw/pci/pcie.h | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/include/hw/pci/pcie.h b/include/hw/pci/pcie.h index b08451d2c5..163c5195b6 100644 --- a/include/hw/pci/pcie.h +++ b/include/hw/pci/pcie.h @@ -125,16 +125,6 @@ void pcie_ari_init(PCIDevice *dev, uint16_t offset, uint16_t nextfn); void pcie_dev_ser_num_init(PCIDevice *dev, uint16_t offset, uint64_t ser_num); void pcie_ats_init(PCIDevice *dev, uint16_t offset); -extern const VMStateDescription vmstate_pcie_device; - -#define VMSTATE_PCIE_DEVICE(_field, _state) { \ - .name = (stringify(_field)), \ - .size = sizeof(PCIDevice), \ - .vmsd = &vmstate_pcie_device, \ - .flags = VMS_STRUCT, \ - .offset = vmstate_offset_value(_state, _field, PCIDevice), \ -} - void pcie_cap_slot_hotplug_cb(HotplugHandler *hotplug_dev, DeviceState *dev, Error **errp); void pcie_cap_slot_hot_unplug_request_cb(HotplugHandler *hotplug_dev, |