|
 |
9bac43 |
From e6c4563d68a353e9b3938c9f49a239b5dca61868 Mon Sep 17 00:00:00 2001
|
|
|
9bac43 |
From: Thomas Huth <thuth@redhat.com>
|
|
|
9bac43 |
Date: Thu, 19 Oct 2017 10:16:49 +0200
|
|
|
9bac43 |
Subject: [PATCH 67/69] hw: Remove the redundant user_creatable = false from
|
|
|
9bac43 |
SYS_BUS_DEVICEs
|
|
|
9bac43 |
|
|
|
9bac43 |
RH-Author: Thomas Huth <thuth@redhat.com>
|
|
|
9bac43 |
Message-id: <1508408209-5712-4-git-send-email-thuth@redhat.com>
|
|
|
9bac43 |
Patchwork-id: 77375
|
|
|
9bac43 |
O-Subject: [RHV7.5 qemu-kvm-rhev PATCH 3/3] hw: Remove the redundant user_creatable = false from SYS_BUS_DEVICEs
|
|
|
9bac43 |
Bugzilla: 1503998
|
|
|
9bac43 |
RH-Acked-by: Laszlo Ersek <lersek@redhat.com>
|
|
|
9bac43 |
RH-Acked-by: Cornelia Huck <cohuck@redhat.com>
|
|
|
9bac43 |
RH-Acked-by: Eduardo Habkost <ehabkost@redhat.com>
|
|
|
9bac43 |
|
|
|
9bac43 |
The devices that are addressed by this patch are SYS_BUS_DEVICE, and
|
|
|
9bac43 |
in QEMU 2.10, sysbus devices are marked with user_creatable = false by
|
|
|
9bac43 |
default already. So there is now no need anymore to explicitely set
|
|
|
9bac43 |
this flag to false in the downstream qemu-kvm build.
|
|
|
9bac43 |
|
|
|
9bac43 |
Signed-off-by: Thomas Huth <thuth@redhat.com>
|
|
|
9bac43 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
9bac43 |
---
|
|
|
9bac43 |
hw/block/pflash_cfi01.c | 1 -
|
|
|
9bac43 |
hw/i386/kvm/clock.c | 1 -
|
|
|
9bac43 |
hw/ide/ahci.c | 1 -
|
|
|
9bac43 |
hw/isa/isa-bus.c | 1 -
|
|
|
9bac43 |
hw/virtio/virtio-mmio.c | 1 -
|
|
|
9bac43 |
5 files changed, 5 deletions(-)
|
|
|
9bac43 |
|
|
|
9bac43 |
diff --git a/hw/block/pflash_cfi01.c b/hw/block/pflash_cfi01.c
|
|
|
9bac43 |
index afe6230..1113ab1 100644
|
|
|
9bac43 |
--- a/hw/block/pflash_cfi01.c
|
|
|
9bac43 |
+++ b/hw/block/pflash_cfi01.c
|
|
|
9bac43 |
@@ -925,7 +925,6 @@ static void pflash_cfi01_class_init(ObjectClass *klass, void *data)
|
|
|
9bac43 |
dc->realize = pflash_cfi01_realize;
|
|
|
9bac43 |
dc->props = pflash_cfi01_properties;
|
|
|
9bac43 |
dc->vmsd = &vmstate_pflash;
|
|
|
9bac43 |
- dc->user_creatable = false; /* RH state preserve */
|
|
|
9bac43 |
set_bit(DEVICE_CATEGORY_STORAGE, dc->categories);
|
|
|
9bac43 |
}
|
|
|
9bac43 |
|
|
|
9bac43 |
diff --git a/hw/i386/kvm/clock.c b/hw/i386/kvm/clock.c
|
|
|
9bac43 |
index fc7212f..363d1b5 100644
|
|
|
9bac43 |
--- a/hw/i386/kvm/clock.c
|
|
|
9bac43 |
+++ b/hw/i386/kvm/clock.c
|
|
|
9bac43 |
@@ -289,7 +289,6 @@ static void kvmclock_class_init(ObjectClass *klass, void *data)
|
|
|
9bac43 |
dc->realize = kvmclock_realize;
|
|
|
9bac43 |
dc->vmsd = &kvmclock_vmsd;
|
|
|
9bac43 |
dc->props = kvmclock_properties;
|
|
|
9bac43 |
- dc->user_creatable = false; /* RH state preserve */
|
|
|
9bac43 |
}
|
|
|
9bac43 |
|
|
|
9bac43 |
static const TypeInfo kvmclock_info = {
|
|
|
9bac43 |
diff --git a/hw/ide/ahci.c b/hw/ide/ahci.c
|
|
|
9bac43 |
index 2cb41fc..da6c23d 100644
|
|
|
9bac43 |
--- a/hw/ide/ahci.c
|
|
|
9bac43 |
+++ b/hw/ide/ahci.c
|
|
|
9bac43 |
@@ -1720,7 +1720,6 @@ static void sysbus_ahci_class_init(ObjectClass *klass, void *data)
|
|
|
9bac43 |
dc->vmsd = &vmstate_sysbus_ahci;
|
|
|
9bac43 |
dc->props = sysbus_ahci_properties;
|
|
|
9bac43 |
dc->reset = sysbus_ahci_reset;
|
|
|
9bac43 |
- dc->user_creatable = false; /* RH state preserve */
|
|
|
9bac43 |
set_bit(DEVICE_CATEGORY_STORAGE, dc->categories);
|
|
|
9bac43 |
}
|
|
|
9bac43 |
|
|
|
9bac43 |
diff --git a/hw/isa/isa-bus.c b/hw/isa/isa-bus.c
|
|
|
9bac43 |
index 467042f..348e0ea 100644
|
|
|
9bac43 |
--- a/hw/isa/isa-bus.c
|
|
|
9bac43 |
+++ b/hw/isa/isa-bus.c
|
|
|
9bac43 |
@@ -221,7 +221,6 @@ static void isabus_bridge_class_init(ObjectClass *klass, void *data)
|
|
|
9bac43 |
|
|
|
9bac43 |
set_bit(DEVICE_CATEGORY_BRIDGE, dc->categories);
|
|
|
9bac43 |
dc->fw_name = "isa";
|
|
|
9bac43 |
- dc->user_creatable = false; /* RH state preserve */
|
|
|
9bac43 |
}
|
|
|
9bac43 |
|
|
|
9bac43 |
static const TypeInfo isabus_bridge_info = {
|
|
|
9bac43 |
diff --git a/hw/virtio/virtio-mmio.c b/hw/virtio/virtio-mmio.c
|
|
|
9bac43 |
index 62df6c2..5807aa8 100644
|
|
|
9bac43 |
--- a/hw/virtio/virtio-mmio.c
|
|
|
9bac43 |
+++ b/hw/virtio/virtio-mmio.c
|
|
|
9bac43 |
@@ -448,7 +448,6 @@ static void virtio_mmio_class_init(ObjectClass *klass, void *data)
|
|
|
9bac43 |
|
|
|
9bac43 |
dc->realize = virtio_mmio_realizefn;
|
|
|
9bac43 |
dc->reset = virtio_mmio_reset;
|
|
|
9bac43 |
- dc->user_creatable = false; /* RH state preserve */
|
|
|
9bac43 |
set_bit(DEVICE_CATEGORY_MISC, dc->categories);
|
|
|
9bac43 |
dc->props = virtio_mmio_properties;
|
|
|
9bac43 |
}
|
|
|
9bac43 |
--
|
|
|
9bac43 |
1.8.3.1
|
|
|
9bac43 |
|