diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2019-05-23 12:00:37 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2019-05-23 12:00:37 +0100 |
| commit | c4600d5d417ea13e0f1cc047b227a2b5b0e694f5 (patch) | |
| tree | 0d161df5dd290aaa508108c15d087cddd46ffffa /hw/vfio/pci.c | |
| parent | 94b63b6007cb03dc77ab0833259c1e0d5e6b6fc1 (diff) | |
| parent | 2d9574bdbed69b374116c59259f6bd14f7dfad7f (diff) | |
| download | qemu-c4600d5d417ea13e0f1cc047b227a2b5b0e694f5.zip qemu-c4600d5d417ea13e0f1cc047b227a2b5b0e694f5.tar.gz qemu-c4600d5d417ea13e0f1cc047b227a2b5b0e694f5.tar.bz2 | |
Merge remote-tracking branch 'remotes/vivier2/tags/trivial-branch-pull-request' into staging
typo fixes, TYPE_XXX usage cleanup, comments update,
virtio-mmio trace functions cleanup
# gpg: Signature made Wed 22 May 2019 17:06:56 BST
# gpg: using RSA key F30C38BD3F2FBE3C
# gpg: Good signature from "Laurent Vivier <lvivier@redhat.com>" [full]
# gpg: aka "Laurent Vivier <laurent@vivier.eu>" [full]
# gpg: aka "Laurent Vivier (Red Hat) <lvivier@redhat.com>" [full]
# Primary key fingerprint: CD2F 75DD C8E3 A4DC 2E4F 5173 F30C 38BD 3F2F BE3C
* remotes/vivier2/tags/trivial-branch-pull-request:
pci: msix: move 'MSIX_CAP_LENGTH' to header file
vfio: platform: fix a typo
hw: vfio: drop TYPE_FOO MACRO in VMStateDescription
vfio: pci: make "vfio-pci-nohotplug" as MACRO
configure: Fix spelling of sdl-image in --help
migration: Fix typo in migrate_add_blocker() error message
roms: List and describe the Makefile 'clean' rule
roms: Correct the EDK2_BASETOOLS_OPTFLAGS variable description
hw/virtio/virtio-mmio: Convert DPRINTF to trace and log
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/vfio/pci.c')
| -rw-r--r-- | hw/vfio/pci.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c index 8cecb53..8e555db 100644 --- a/hw/vfio/pci.c +++ b/hw/vfio/pci.c @@ -35,11 +35,11 @@ #include "trace.h" #include "qapi/error.h" -#define MSIX_CAP_LENGTH 12 - #define TYPE_VFIO_PCI "vfio-pci" #define PCI_VFIO(obj) OBJECT_CHECK(VFIOPCIDevice, obj, TYPE_VFIO_PCI) +#define TYPE_VIFO_PCI_NOHOTPLUG "vfio-pci-nohotplug" + static void vfio_disable_interrupts(VFIOPCIDevice *vdev); static void vfio_mmap_set_enabled(VFIOPCIDevice *vdev, bool enabled); @@ -3304,8 +3304,8 @@ static void vfio_pci_nohotplug_dev_class_init(ObjectClass *klass, void *data) } static const TypeInfo vfio_pci_nohotplug_dev_info = { - .name = "vfio-pci-nohotplug", - .parent = "vfio-pci", + .name = TYPE_VIFO_PCI_NOHOTPLUG, + .parent = TYPE_VFIO_PCI, .instance_size = sizeof(VFIOPCIDevice), .class_init = vfio_pci_nohotplug_dev_class_init, }; |