summaryrefslogtreecommitdiffstats
path: root/hw/pci.c
diff options
context:
space:
mode:
authorAnthony Liguori2012-09-10 19:48:43 +0200
committerAnthony Liguori2012-09-10 19:48:43 +0200
commit14df77a609e39403c3ec814bae63bec0fb4d24d2 (patch)
treefaabedbfdaa0d8b467368f2be07d7d4eb929c247 /hw/pci.c
parentsocket: don't attempt to reconnect a TCP socket in server mode (diff)
parentvhost: Pass device path to vhost_dev_init() (diff)
downloadqemu-14df77a609e39403c3ec814bae63bec0fb4d24d2.tar.gz
qemu-14df77a609e39403c3ec814bae63bec0fb4d24d2.tar.xz
qemu-14df77a609e39403c3ec814bae63bec0fb4d24d2.zip
Merge remote-tracking branch 'mst/tags/for_anthony' into staging
* mst/tags/for_anthony: vhost: Pass device path to vhost_dev_init() monitor: Rename+move net_handle_fd_param -> monitor_handle_fd_param pcie_aer: clear cmask for Advanced Error Interrupt Message Number pcie: drop version_id field for live migration qemu: add .exrc
Diffstat (limited to 'hw/pci.c')
-rw-r--r--hw/pci.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/pci.c b/hw/pci.c
index 4d95984807..f855cf3f39 100644
--- a/hw/pci.c
+++ b/hw/pci.c
@@ -439,7 +439,7 @@ const VMStateDescription vmstate_pci_device = {
};
const VMStateDescription vmstate_pcie_device = {
- .name = "PCIDevice",
+ .name = "PCIEDevice",
.version_id = 2,
.minimum_version_id = 1,
.minimum_version_id_old = 1,