| From 64dd41bc2de392fa018c5ce804cc451b83f18b94 Mon Sep 17 00:00:00 2001 |
| From: "Aneesh Kumar K.V" <aneesh.kumar@linux.vnet.ibm.com> |
| Date: Sun, 4 Dec 2011 22:35:28 +0530 |
| Subject: [PATCH 06/25] hw/9pfs: Add qdev.reset callback for virtio-9p-pci |
| device |
| |
| Add the device reset callback |
| |
| Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> |
| |
| hw/9pfs/virtio-9p-device.c | 3 ++- |
| hw/virtio-pci.c | 2 +- |
| hw/virtio-pci.h | 1 + |
| 3 files changed, 4 insertions(+), 2 deletions(-) |
| |
| diff --git a/hw/9pfs/virtio-9p-device.c b/hw/9pfs/virtio-9p-device.c |
| index c9bca8b..cd343e1 100644 |
| |
| |
| @@ -176,7 +176,8 @@ static PCIDeviceInfo virtio_9p_info = { |
| DEFINE_PROP_STRING("mount_tag", VirtIOPCIProxy, fsconf.tag), |
| DEFINE_PROP_STRING("fsdev", VirtIOPCIProxy, fsconf.fsdev_id), |
| DEFINE_PROP_END_OF_LIST(), |
| - } |
| + }, |
| + .qdev.reset = virtio_pci_reset, |
| }; |
| |
| static void virtio_9p_register_devices(void) |
| diff --git a/hw/virtio-pci.c b/hw/virtio-pci.c |
| index 64c6a94..c665f5c 100644 |
| |
| |
| @@ -266,7 +266,7 @@ static void virtio_pci_stop_ioeventfd(VirtIOPCIProxy *proxy) |
| proxy->ioeventfd_started = false; |
| } |
| |
| -static void virtio_pci_reset(DeviceState *d) |
| +void virtio_pci_reset(DeviceState *d) |
| { |
| VirtIOPCIProxy *proxy = container_of(d, VirtIOPCIProxy, pci_dev.qdev); |
| virtio_pci_stop_ioeventfd(proxy); |
| diff --git a/hw/virtio-pci.h b/hw/virtio-pci.h |
| index f8404de..344c22b 100644 |
| |
| |
| @@ -45,6 +45,7 @@ typedef struct { |
| } VirtIOPCIProxy; |
| |
| void virtio_init_pci(VirtIOPCIProxy *proxy, VirtIODevice *vdev); |
| +void virtio_pci_reset(DeviceState *d); |
| |
| /* Virtio ABI version, if we increment this, we break the guest driver. */ |
| #define VIRTIO_PCI_ABI_VERSION 0 |
| -- |
| 1.7.7.5 |
| |