[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v2 26/28] piix: use TYPE_FOO constants than string co
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PULL v2 26/28] piix: use TYPE_FOO constants than string constats |
Date: |
Wed, 24 Oct 2018 20:54:55 -0400 |
From: Li Qiang <address@hidden>
Make them more QOMConventional.
Cc:address@hidden
Signed-off-by: Li Qiang <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
---
hw/pci-host/piix.c | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/hw/pci-host/piix.c b/hw/pci-host/piix.c
index 82421a86e3..731190d92d 100644
--- a/hw/pci-host/piix.c
+++ b/hw/pci-host/piix.c
@@ -95,6 +95,9 @@ typedef struct PIIX3State {
#define I440FX_PCI_DEVICE(obj) \
OBJECT_CHECK(PCII440FXState, (obj), TYPE_I440FX_PCI_DEVICE)
+#define TYPE_PIIX3_DEVICE "PIIX3"
+#define TYPE_PIIX3_XEN_DEVICE "PIIX3-xen"
+
struct PCII440FXState {
/*< private >*/
PCIDevice parent_obj;
@@ -424,13 +427,13 @@ PCIBus *i440fx_init(const char *host_type, const char
*pci_type,
* These additional routes can be discovered through ACPI. */
if (xen_enabled()) {
PCIDevice *pci_dev = pci_create_simple_multifunction(b,
- -1, true, "PIIX3-xen");
+ -1, true, TYPE_PIIX3_XEN_DEVICE);
piix3 = PIIX3_PCI_DEVICE(pci_dev);
pci_bus_irqs(b, xen_piix3_set_irq, xen_pci_slot_get_pirq,
piix3, XEN_PIIX_NUM_PIRQS);
} else {
PCIDevice *pci_dev = pci_create_simple_multifunction(b,
- -1, true, "PIIX3");
+ -1, true, TYPE_PIIX3_DEVICE);
piix3 = PIIX3_PCI_DEVICE(pci_dev);
pci_bus_irqs(b, piix3_set_irq, pci_slot_get_pirq, piix3,
PIIX_NUM_PIRQS);
@@ -748,7 +751,7 @@ static void piix3_class_init(ObjectClass *klass, void *data)
}
static const TypeInfo piix3_info = {
- .name = "PIIX3",
+ .name = TYPE_PIIX3_DEVICE,
.parent = TYPE_PIIX3_PCI_DEVICE,
.class_init = piix3_class_init,
};
@@ -761,7 +764,7 @@ static void piix3_xen_class_init(ObjectClass *klass, void
*data)
};
static const TypeInfo piix3_xen_info = {
- .name = "PIIX3-xen",
+ .name = TYPE_PIIX3_XEN_DEVICE,
.parent = TYPE_PIIX3_PCI_DEVICE,
.class_init = piix3_xen_class_init,
};
--
MST
- [Qemu-devel] [PULL v2 16/28] MAINTAINERS: list "tests/acpi-test-data" files in ACPI/SMBIOS section, (continued)
- [Qemu-devel] [PULL v2 16/28] MAINTAINERS: list "tests/acpi-test-data" files in ACPI/SMBIOS section, Michael S. Tsirkin, 2018/10/24
- [Qemu-devel] [PULL v2 17/28] pci-testdev: add optional memory bar, Michael S. Tsirkin, 2018/10/24
- [Qemu-devel] [PULL v2 18/28] hw/pci-host/x86: extract get_pci_hole64_start_value() helpers, Michael S. Tsirkin, 2018/10/24
- [Qemu-devel] [PULL v2 19/28] hw/pci-host/x86: extend the 64-bit PCI hole relative to the fw-assigned base, Michael S. Tsirkin, 2018/10/24
- [Qemu-devel] [PULL v2 21/28] hw/pci-bridge/xio3130: Remove unused functions, Michael S. Tsirkin, 2018/10/24
- [Qemu-devel] [PULL v2 22/28] hw/pci-bridge/ioh3420: Remove unuseful header, Michael S. Tsirkin, 2018/10/24
- [Qemu-devel] [PULL v2 23/28] hw/pci: Add missing include, Michael S. Tsirkin, 2018/10/24
- [Qemu-devel] [PULL v2 20/28] tests/bios-tables-test: add 64-bit PCI MMIO aperture round-up test on Q35, Michael S. Tsirkin, 2018/10/24
- [Qemu-devel] [PULL v2 25/28] i440fx: use ARRAY_SIZE for pam_regions, Michael S. Tsirkin, 2018/10/24
- [Qemu-devel] [PULL v2 24/28] pci_bridge: fix typo in comment, Michael S. Tsirkin, 2018/10/24
- [Qemu-devel] [PULL v2 26/28] piix: use TYPE_FOO constants than string constats,
Michael S. Tsirkin <=
- [Qemu-devel] [PULL v2 27/28] piix_pci: fix i440fx data sheet link, Michael S. Tsirkin, 2018/10/24
- [Qemu-devel] [PULL v2 28/28] vhost-scsi: prevent using uninitialized vqs, Michael S. Tsirkin, 2018/10/24
- Re: [Qemu-devel] [PULL v2 00/28] pci, pc, virtio: fixes, features, Peter Maydell, 2018/10/25
- Re: [Qemu-devel] [PULL v2 00/28] pci, pc, virtio: fixes, features, Michael S. Tsirkin, 2018/10/25
- Re: [Qemu-devel] [PULL v2 00/28] pci, pc, virtio: fixes, features, Singh, Brijesh, 2018/10/26
- Re: [Qemu-devel] [PULL v2 00/28] pci, pc, virtio: fixes, features, Peter Maydell, 2018/10/26
- Re: [Qemu-devel] [PULL v2 00/28] pci, pc, virtio: fixes, features, Michael S. Tsirkin, 2018/10/25
- Re: [Qemu-devel] [PULL v2 00/28] pci, pc, virtio: fixes, features, Michael S. Tsirkin, 2018/10/25
- Re: [Qemu-devel] [PULL v2 00/28] pci, pc, virtio: fixes, features, Peter Maydell, 2018/10/27
- Re: [Qemu-devel] [PULL v2 00/28] pci, pc, virtio: fixes, features, Peter Maydell, 2018/10/30