[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 11/12] hw/isa/piix3: Resolve redundant TYPE_PIIX3_XEN_DEVICE
From: |
Anthony PERARD |
Subject: |
[PULL 11/12] hw/isa/piix3: Resolve redundant TYPE_PIIX3_XEN_DEVICE |
Date: |
Wed, 7 Jun 2023 15:18:38 +0100 |
From: Bernhard Beschow <shentey@gmail.com>
During the last patches, TYPE_PIIX3_XEN_DEVICE turned into a clone of
TYPE_PIIX3_DEVICE. Remove this redundancy.
Signed-off-by: Bernhard Beschow <shentey@gmail.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Anthony PERARD <anthony.perard@citrix.com>
Tested-by: Chuck Zmudzinski <brchuckz@aol.com>
Message-Id: <20230312120221.99183-7-shentey@gmail.com>
Message-Id: <20230403074124.3925-8-shentey@gmail.com>
Signed-off-by: Anthony PERARD <anthony.perard@citrix.com>
---
hw/i386/pc_piix.c | 5 ++---
hw/isa/piix3.c | 15 ---------------
include/hw/southbridge/piix.h | 1 -
3 files changed, 2 insertions(+), 19 deletions(-)
diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
index 2ed2b3f3c6..42af03dbb4 100644
--- a/hw/i386/pc_piix.c
+++ b/hw/i386/pc_piix.c
@@ -239,8 +239,6 @@ static void pc_init1(MachineState *machine,
if (pcmc->pci_enabled) {
PIIX3State *piix3;
PCIDevice *pci_dev;
- const char *type = xen_enabled() ? TYPE_PIIX3_XEN_DEVICE
- : TYPE_PIIX3_DEVICE;
pci_bus = i440fx_init(pci_type,
i440fx_host,
@@ -253,7 +251,8 @@ static void pc_init1(MachineState *machine,
: pc_pci_slot_get_pirq);
pcms->bus = pci_bus;
- pci_dev = pci_create_simple_multifunction(pci_bus, -1, true, type);
+ pci_dev = pci_create_simple_multifunction(pci_bus, -1, true,
+ TYPE_PIIX3_DEVICE);
if (xen_enabled()) {
pci_device_set_intx_routing_notifier(
diff --git a/hw/isa/piix3.c b/hw/isa/piix3.c
index 0549e043ca..117024e450 100644
--- a/hw/isa/piix3.c
+++ b/hw/isa/piix3.c
@@ -30,7 +30,6 @@
#include "hw/irq.h"
#include "hw/qdev-properties.h"
#include "hw/isa/isa.h"
-#include "hw/xen/xen.h"
#include "sysemu/runstate.h"
#include "migration/vmstate.h"
#include "hw/acpi/acpi_aml_interface.h"
@@ -381,24 +380,10 @@ static const TypeInfo piix3_info = {
.class_init = piix3_class_init,
};
-static void piix3_xen_class_init(ObjectClass *klass, void *data)
-{
- PCIDeviceClass *k = PCI_DEVICE_CLASS(klass);
-
- k->realize = piix3_realize;
-}
-
-static const TypeInfo piix3_xen_info = {
- .name = TYPE_PIIX3_XEN_DEVICE,
- .parent = TYPE_PIIX3_PCI_DEVICE,
- .class_init = piix3_xen_class_init,
-};
-
static void piix3_register_types(void)
{
type_register_static(&piix3_pci_type_info);
type_register_static(&piix3_info);
- type_register_static(&piix3_xen_info);
}
type_init(piix3_register_types)
diff --git a/include/hw/southbridge/piix.h b/include/hw/southbridge/piix.h
index a840340308..278171752f 100644
--- a/include/hw/southbridge/piix.h
+++ b/include/hw/southbridge/piix.h
@@ -67,7 +67,6 @@ DECLARE_INSTANCE_CHECKER(PIIX3State, PIIX3_PCI_DEVICE,
TYPE_PIIX3_PCI_DEVICE)
#define TYPE_PIIX3_DEVICE "PIIX3"
-#define TYPE_PIIX3_XEN_DEVICE "PIIX3-xen"
#define TYPE_PIIX4_PCI_DEVICE "piix4-isa"
#endif
--
Anthony PERARD
- [PULL 00/12] xen queue, Anthony PERARD, 2023/06/07
- [PULL 02/12] hw/xen: Fix memory leak in libxenstore_open() for Xen, Anthony PERARD, 2023/06/07
- [PULL 03/12] xen: Drop support for Xen versions below 4.7.1, Anthony PERARD, 2023/06/07
- [PULL 06/12] hw/pci/pci.c: Don't leak PCIBus::irq_count[] in pci_bus_irqs(), Anthony PERARD, 2023/06/07
- [PULL 04/12] hw/xen: Fix broken check for invalid state in xs_be_open(), Anthony PERARD, 2023/06/07
- [PULL 01/12] hw/xen: Simplify emulated Xen platform init, Anthony PERARD, 2023/06/07
- [PULL 07/12] hw/isa/piix3: Reuse piix3_realize() in piix3_xen_realize(), Anthony PERARD, 2023/06/07
- [PULL 09/12] hw/isa/piix3: Avoid Xen-specific variant of piix3_write_config(), Anthony PERARD, 2023/06/07
- [PULL 05/12] include/hw/xen/xen: Rename xen_piix3_set_irq() to xen_intx_set_irq(), Anthony PERARD, 2023/06/07
- [PULL 11/12] hw/isa/piix3: Resolve redundant TYPE_PIIX3_XEN_DEVICE,
Anthony PERARD <=
- [PULL 12/12] xen-block: fix segv on unrealize, Anthony PERARD, 2023/06/07
- [PULL 08/12] hw/isa/piix3: Wire up Xen PCI IRQ handling outside of PIIX3, Anthony PERARD, 2023/06/07
- [PULL 10/12] hw/isa/piix3: Resolve redundant k->config_write assignments, Anthony PERARD, 2023/06/07
- Re: [PULL 00/12] xen queue, Michael Tokarev, 2023/06/07
- Re: [PULL 00/12] xen queue, Richard Henderson, 2023/06/07