yeahuh / rpms / qemu-kvm

Forked from rpms/qemu-kvm 2 years ago
Clone
5d360b
From 394cb4371862245164782e8a98910bc78f90c629 Mon Sep 17 00:00:00 2001
5d360b
From: Alex Williamson <alex.williamson@redhat.com>
5d360b
Date: Fri, 29 Sep 2017 21:45:24 +0200
5d360b
Subject: [PATCH 10/27] vfio: remove bootindex property from qdev to qom
5d360b
5d360b
RH-Author: Alex Williamson <alex.williamson@redhat.com>
5d360b
Message-id: <20170929214524.16765.24180.stgit@gimli.home>
5d360b
Patchwork-id: 76767
5d360b
O-Subject: [RHEL-7.5 qemu-kvm PATCH 10/16] vfio: remove bootindex property from qdev to qom
5d360b
Bugzilla: 1494181
5d360b
RH-Acked-by: Paolo Bonzini <pbonzini@redhat.com>
5d360b
RH-Acked-by: Auger Eric <eric.auger@redhat.com>
5d360b
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
5d360b
5d360b
From: Gonglei <arei.gonglei@huawei.com>
5d360b
5d360b
Upstream: abc5b3bfe1c77ad622188341d1ee4d49de308ae3
5d360b
RHEL: Only taking the instance_init infrastructure, bootindex not
5d360b
      moved and vars removed to allow clean build, re-added later.
5d360b
5d360b
Remove bootindex form qdev property to qom, things will
5d360b
continue to work just fine, and we can use qom features
5d360b
which are not supported by qdev property.
5d360b
5d360b
Signed-off-by: Gonglei <arei.gonglei@huawei.com>
5d360b
Reviewed-by: Gerd Hoffmann <kraxel@redhat.com>
5d360b
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
5d360b
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
5d360b
---
5d360b
 hw/misc/vfio.c | 5 +++++
5d360b
 1 file changed, 5 insertions(+)
5d360b
5d360b
diff --git a/hw/misc/vfio.c b/hw/misc/vfio.c
5d360b
index 64d4dc7..0af8613 100644
5d360b
--- a/hw/misc/vfio.c
5d360b
+++ b/hw/misc/vfio.c
5d360b
@@ -4060,6 +4060,10 @@ post_reset:
5d360b
     vfio_pci_post_reset(vdev);
5d360b
 }
5d360b
 
5d360b
+static void vfio_instance_init(Object *obj)
5d360b
+{
5d360b
+}
5d360b
+
5d360b
 static Property vfio_pci_dev_properties[] = {
5d360b
     DEFINE_PROP_PCI_HOST_DEVADDR("host", VFIOPCIDevice, host),
5d360b
     DEFINE_PROP_STRING("sysfsdev", VFIOPCIDevice, vbasedev.sysfsdev),
5d360b
@@ -4105,6 +4109,7 @@ static const TypeInfo vfio_pci_dev_info = {
5d360b
     .parent = TYPE_PCI_DEVICE,
5d360b
     .instance_size = sizeof(VFIOPCIDevice),
5d360b
     .class_init = vfio_pci_dev_class_init,
5d360b
+    .instance_init = vfio_instance_init,
5d360b
 };
5d360b
 
5d360b
 static void register_vfio_pci_dev_type(void)
5d360b
-- 
5d360b
1.8.3.1
5d360b