* [Qemu-devel] [PATCH] hw/ppc: Remove the deprecated spapr-pci-vfio-host-bridge device
@ 2017-12-18 17:35 Thomas Huth
2017-12-19 6:42 ` Alexey Kardashevskiy
2018-01-03 0:39 ` David Gibson
0 siblings, 2 replies; 3+ messages in thread
From: Thomas Huth @ 2017-12-18 17:35 UTC (permalink / raw)
To: David Gibson, qemu-ppc; +Cc: qemu-devel, Alexey Kardashevskiy
It's a deprecated dummy device since QEMU v2.6.0. That should have
been enough time to allow the users to update their scripts in case
they still use it, so let's remove this legacy code now.
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
hw/ppc/spapr_pci_vfio.c | 47 -----------------------------------------------
qemu-doc.texi | 5 -----
scripts/device-crash-test | 1 -
3 files changed, 53 deletions(-)
diff --git a/hw/ppc/spapr_pci_vfio.c b/hw/ppc/spapr_pci_vfio.c
index 8448e0b..053efb0 100644
--- a/hw/ppc/spapr_pci_vfio.c
+++ b/hw/ppc/spapr_pci_vfio.c
@@ -29,31 +29,6 @@
#include "qemu/error-report.h"
#include "sysemu/qtest.h"
-#define TYPE_SPAPR_PCI_VFIO_HOST_BRIDGE "spapr-pci-vfio-host-bridge"
-
-#define SPAPR_PCI_VFIO_HOST_BRIDGE(obj) \
- OBJECT_CHECK(sPAPRPHBVFIOState, (obj), TYPE_SPAPR_PCI_VFIO_HOST_BRIDGE)
-
-typedef struct sPAPRPHBVFIOState sPAPRPHBVFIOState;
-
-struct sPAPRPHBVFIOState {
- sPAPRPHBState phb;
-
- int32_t iommugroupid;
-};
-
-static Property spapr_phb_vfio_properties[] = {
- DEFINE_PROP_INT32("iommu", sPAPRPHBVFIOState, iommugroupid, -1),
- DEFINE_PROP_END_OF_LIST(),
-};
-
-static void spapr_phb_vfio_instance_init(Object *obj)
-{
- if (!qtest_enabled()) {
- error_report("spapr-pci-vfio-host-bridge is deprecated");
- }
-}
-
bool spapr_phb_eeh_available(sPAPRPHBState *sphb)
{
return vfio_eeh_as_ok(&sphb->iommu_as);
@@ -218,25 +193,3 @@ int spapr_phb_vfio_eeh_configure(sPAPRPHBState *sphb)
return RTAS_OUT_SUCCESS;
}
-
-static void spapr_phb_vfio_class_init(ObjectClass *klass, void *data)
-{
- DeviceClass *dc = DEVICE_CLASS(klass);
-
- dc->props = spapr_phb_vfio_properties;
-}
-
-static const TypeInfo spapr_phb_vfio_info = {
- .name = TYPE_SPAPR_PCI_VFIO_HOST_BRIDGE,
- .parent = TYPE_SPAPR_PCI_HOST_BRIDGE,
- .instance_size = sizeof(sPAPRPHBVFIOState),
- .instance_init = spapr_phb_vfio_instance_init,
- .class_init = spapr_phb_vfio_class_init,
-};
-
-static void spapr_pci_vfio_register_types(void)
-{
- type_register_static(&spapr_phb_vfio_info);
-}
-
-type_init(spapr_pci_vfio_register_types)
diff --git a/qemu-doc.texi b/qemu-doc.texi
index f7317df..14d818d 100644
--- a/qemu-doc.texi
+++ b/qemu-doc.texi
@@ -2533,11 +2533,6 @@ The ``host_net_remove'' command is replaced by the ``netdev_del'' command.
The ``ivshmem'' device type is replaced by either the ``ivshmem-plain''
or ``ivshmem-doorbell`` device types.
-@subsection spapr-pci-vfio-host-bridge (since 2.6.0)
-
-The ``spapr-pci-vfio-host-bridge'' device type is replaced by
-the ``spapr-pci-host-bridge'' device type.
-
@section System emulator machines
@subsection Xilinx EP108 (since 2.11.0)
diff --git a/scripts/device-crash-test b/scripts/device-crash-test
index 1aca55f..7417177 100755
--- a/scripts/device-crash-test
+++ b/scripts/device-crash-test
@@ -119,7 +119,6 @@ ERROR_WHITELIST = [
{'device':'scsi-generic', 'expected':True}, # drive property not set
{'device':'scsi-hd', 'expected':True}, # drive property not set
{'device':'spapr-pci-host-bridge', 'expected':True}, # BUID not specified for PHB
- {'device':'spapr-pci-vfio-host-bridge', 'expected':True}, # BUID not specified for PHB
{'device':'spapr-rng', 'expected':True}, # spapr-rng needs an RNG backend!
{'device':'spapr-vty', 'expected':True}, # chardev property not set
{'device':'tpm-tis', 'expected':True}, # tpm_tis: backend driver with id (null) could not be found
--
1.8.3.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [Qemu-devel] [PATCH] hw/ppc: Remove the deprecated spapr-pci-vfio-host-bridge device
2017-12-18 17:35 [Qemu-devel] [PATCH] hw/ppc: Remove the deprecated spapr-pci-vfio-host-bridge device Thomas Huth
@ 2017-12-19 6:42 ` Alexey Kardashevskiy
2018-01-03 0:39 ` David Gibson
1 sibling, 0 replies; 3+ messages in thread
From: Alexey Kardashevskiy @ 2017-12-19 6:42 UTC (permalink / raw)
To: Thomas Huth, David Gibson, qemu-ppc; +Cc: qemu-devel
On 19/12/17 04:35, Thomas Huth wrote:
> It's a deprecated dummy device since QEMU v2.6.0. That should have
> been enough time to allow the users to update their scripts in case
> they still use it, so let's remove this legacy code now.
>
> Signed-off-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Alexey Kardashevskiy <aik@ozlabs.ru>
> ---
> hw/ppc/spapr_pci_vfio.c | 47 -----------------------------------------------
> qemu-doc.texi | 5 -----
> scripts/device-crash-test | 1 -
> 3 files changed, 53 deletions(-)
>
> diff --git a/hw/ppc/spapr_pci_vfio.c b/hw/ppc/spapr_pci_vfio.c
> index 8448e0b..053efb0 100644
> --- a/hw/ppc/spapr_pci_vfio.c
> +++ b/hw/ppc/spapr_pci_vfio.c
> @@ -29,31 +29,6 @@
> #include "qemu/error-report.h"
> #include "sysemu/qtest.h"
>
> -#define TYPE_SPAPR_PCI_VFIO_HOST_BRIDGE "spapr-pci-vfio-host-bridge"
> -
> -#define SPAPR_PCI_VFIO_HOST_BRIDGE(obj) \
> - OBJECT_CHECK(sPAPRPHBVFIOState, (obj), TYPE_SPAPR_PCI_VFIO_HOST_BRIDGE)
> -
> -typedef struct sPAPRPHBVFIOState sPAPRPHBVFIOState;
> -
> -struct sPAPRPHBVFIOState {
> - sPAPRPHBState phb;
> -
> - int32_t iommugroupid;
> -};
> -
> -static Property spapr_phb_vfio_properties[] = {
> - DEFINE_PROP_INT32("iommu", sPAPRPHBVFIOState, iommugroupid, -1),
> - DEFINE_PROP_END_OF_LIST(),
> -};
> -
> -static void spapr_phb_vfio_instance_init(Object *obj)
> -{
> - if (!qtest_enabled()) {
> - error_report("spapr-pci-vfio-host-bridge is deprecated");
> - }
> -}
> -
> bool spapr_phb_eeh_available(sPAPRPHBState *sphb)
> {
> return vfio_eeh_as_ok(&sphb->iommu_as);
> @@ -218,25 +193,3 @@ int spapr_phb_vfio_eeh_configure(sPAPRPHBState *sphb)
>
> return RTAS_OUT_SUCCESS;
> }
> -
> -static void spapr_phb_vfio_class_init(ObjectClass *klass, void *data)
> -{
> - DeviceClass *dc = DEVICE_CLASS(klass);
> -
> - dc->props = spapr_phb_vfio_properties;
> -}
> -
> -static const TypeInfo spapr_phb_vfio_info = {
> - .name = TYPE_SPAPR_PCI_VFIO_HOST_BRIDGE,
> - .parent = TYPE_SPAPR_PCI_HOST_BRIDGE,
> - .instance_size = sizeof(sPAPRPHBVFIOState),
> - .instance_init = spapr_phb_vfio_instance_init,
> - .class_init = spapr_phb_vfio_class_init,
> -};
> -
> -static void spapr_pci_vfio_register_types(void)
> -{
> - type_register_static(&spapr_phb_vfio_info);
> -}
> -
> -type_init(spapr_pci_vfio_register_types)
> diff --git a/qemu-doc.texi b/qemu-doc.texi
> index f7317df..14d818d 100644
> --- a/qemu-doc.texi
> +++ b/qemu-doc.texi
> @@ -2533,11 +2533,6 @@ The ``host_net_remove'' command is replaced by the ``netdev_del'' command.
> The ``ivshmem'' device type is replaced by either the ``ivshmem-plain''
> or ``ivshmem-doorbell`` device types.
>
> -@subsection spapr-pci-vfio-host-bridge (since 2.6.0)
> -
> -The ``spapr-pci-vfio-host-bridge'' device type is replaced by
> -the ``spapr-pci-host-bridge'' device type.
> -
> @section System emulator machines
>
> @subsection Xilinx EP108 (since 2.11.0)
> diff --git a/scripts/device-crash-test b/scripts/device-crash-test
> index 1aca55f..7417177 100755
> --- a/scripts/device-crash-test
> +++ b/scripts/device-crash-test
> @@ -119,7 +119,6 @@ ERROR_WHITELIST = [
> {'device':'scsi-generic', 'expected':True}, # drive property not set
> {'device':'scsi-hd', 'expected':True}, # drive property not set
> {'device':'spapr-pci-host-bridge', 'expected':True}, # BUID not specified for PHB
> - {'device':'spapr-pci-vfio-host-bridge', 'expected':True}, # BUID not specified for PHB
> {'device':'spapr-rng', 'expected':True}, # spapr-rng needs an RNG backend!
> {'device':'spapr-vty', 'expected':True}, # chardev property not set
> {'device':'tpm-tis', 'expected':True}, # tpm_tis: backend driver with id (null) could not be found
>
--
Alexey
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [Qemu-devel] [PATCH] hw/ppc: Remove the deprecated spapr-pci-vfio-host-bridge device
2017-12-18 17:35 [Qemu-devel] [PATCH] hw/ppc: Remove the deprecated spapr-pci-vfio-host-bridge device Thomas Huth
2017-12-19 6:42 ` Alexey Kardashevskiy
@ 2018-01-03 0:39 ` David Gibson
1 sibling, 0 replies; 3+ messages in thread
From: David Gibson @ 2018-01-03 0:39 UTC (permalink / raw)
To: Thomas Huth; +Cc: qemu-ppc, qemu-devel, Alexey Kardashevskiy
[-- Attachment #1: Type: text/plain, Size: 4260 bytes --]
On Mon, Dec 18, 2017 at 06:35:12PM +0100, Thomas Huth wrote:
> It's a deprecated dummy device since QEMU v2.6.0. That should have
> been enough time to allow the users to update their scripts in case
> they still use it, so let's remove this legacy code now.
>
> Signed-off-by: Thomas Huth <thuth@redhat.com>
I'm afraid this has bitrotted due to ongoing changes in the
ppc-for-2.12 tree, can you rebase and resend, please.
> ---
> hw/ppc/spapr_pci_vfio.c | 47 -----------------------------------------------
> qemu-doc.texi | 5 -----
> scripts/device-crash-test | 1 -
> 3 files changed, 53 deletions(-)
>
> diff --git a/hw/ppc/spapr_pci_vfio.c b/hw/ppc/spapr_pci_vfio.c
> index 8448e0b..053efb0 100644
> --- a/hw/ppc/spapr_pci_vfio.c
> +++ b/hw/ppc/spapr_pci_vfio.c
> @@ -29,31 +29,6 @@
> #include "qemu/error-report.h"
> #include "sysemu/qtest.h"
>
> -#define TYPE_SPAPR_PCI_VFIO_HOST_BRIDGE "spapr-pci-vfio-host-bridge"
> -
> -#define SPAPR_PCI_VFIO_HOST_BRIDGE(obj) \
> - OBJECT_CHECK(sPAPRPHBVFIOState, (obj), TYPE_SPAPR_PCI_VFIO_HOST_BRIDGE)
> -
> -typedef struct sPAPRPHBVFIOState sPAPRPHBVFIOState;
> -
> -struct sPAPRPHBVFIOState {
> - sPAPRPHBState phb;
> -
> - int32_t iommugroupid;
> -};
> -
> -static Property spapr_phb_vfio_properties[] = {
> - DEFINE_PROP_INT32("iommu", sPAPRPHBVFIOState, iommugroupid, -1),
> - DEFINE_PROP_END_OF_LIST(),
> -};
> -
> -static void spapr_phb_vfio_instance_init(Object *obj)
> -{
> - if (!qtest_enabled()) {
> - error_report("spapr-pci-vfio-host-bridge is deprecated");
> - }
> -}
> -
> bool spapr_phb_eeh_available(sPAPRPHBState *sphb)
> {
> return vfio_eeh_as_ok(&sphb->iommu_as);
> @@ -218,25 +193,3 @@ int spapr_phb_vfio_eeh_configure(sPAPRPHBState *sphb)
>
> return RTAS_OUT_SUCCESS;
> }
> -
> -static void spapr_phb_vfio_class_init(ObjectClass *klass, void *data)
> -{
> - DeviceClass *dc = DEVICE_CLASS(klass);
> -
> - dc->props = spapr_phb_vfio_properties;
> -}
> -
> -static const TypeInfo spapr_phb_vfio_info = {
> - .name = TYPE_SPAPR_PCI_VFIO_HOST_BRIDGE,
> - .parent = TYPE_SPAPR_PCI_HOST_BRIDGE,
> - .instance_size = sizeof(sPAPRPHBVFIOState),
> - .instance_init = spapr_phb_vfio_instance_init,
> - .class_init = spapr_phb_vfio_class_init,
> -};
> -
> -static void spapr_pci_vfio_register_types(void)
> -{
> - type_register_static(&spapr_phb_vfio_info);
> -}
> -
> -type_init(spapr_pci_vfio_register_types)
> diff --git a/qemu-doc.texi b/qemu-doc.texi
> index f7317df..14d818d 100644
> --- a/qemu-doc.texi
> +++ b/qemu-doc.texi
> @@ -2533,11 +2533,6 @@ The ``host_net_remove'' command is replaced by the ``netdev_del'' command.
> The ``ivshmem'' device type is replaced by either the ``ivshmem-plain''
> or ``ivshmem-doorbell`` device types.
>
> -@subsection spapr-pci-vfio-host-bridge (since 2.6.0)
> -
> -The ``spapr-pci-vfio-host-bridge'' device type is replaced by
> -the ``spapr-pci-host-bridge'' device type.
> -
> @section System emulator machines
>
> @subsection Xilinx EP108 (since 2.11.0)
> diff --git a/scripts/device-crash-test b/scripts/device-crash-test
> index 1aca55f..7417177 100755
> --- a/scripts/device-crash-test
> +++ b/scripts/device-crash-test
> @@ -119,7 +119,6 @@ ERROR_WHITELIST = [
> {'device':'scsi-generic', 'expected':True}, # drive property not set
> {'device':'scsi-hd', 'expected':True}, # drive property not set
> {'device':'spapr-pci-host-bridge', 'expected':True}, # BUID not specified for PHB
> - {'device':'spapr-pci-vfio-host-bridge', 'expected':True}, # BUID not specified for PHB
> {'device':'spapr-rng', 'expected':True}, # spapr-rng needs an RNG backend!
> {'device':'spapr-vty', 'expected':True}, # chardev property not set
> {'device':'tpm-tis', 'expected':True}, # tpm_tis: backend driver with id (null) could not be found
--
David Gibson | I'll have my music baroque, and my code
david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_
| _way_ _around_!
http://www.ozlabs.org/~dgibson
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2018-01-03 0:49 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-12-18 17:35 [Qemu-devel] [PATCH] hw/ppc: Remove the deprecated spapr-pci-vfio-host-bridge device Thomas Huth
2017-12-19 6:42 ` Alexey Kardashevskiy
2018-01-03 0:39 ` David Gibson
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.