| From 7529646c9b02c1e122b6f3972fd034be651962cc Mon Sep 17 00:00:00 2001 |
| Message-Id: <7529646c9b02c1e122b6f3972fd034be651962cc.1387298827.git.minovotn@redhat.com> |
| In-Reply-To: <3ed0fb61a3dc912ef036d7ef450bed192090709e.1387298827.git.minovotn@redhat.com> |
| References: <3ed0fb61a3dc912ef036d7ef450bed192090709e.1387298827.git.minovotn@redhat.com> |
| From: "Michael S. Tsirkin" <mst@redhat.com> |
| Date: Tue, 17 Dec 2013 15:17:32 +0100 |
| Subject: [PATCH 17/56] pc: add I440FX QOM cast macro |
| MIME-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| RH-Author: Michael S. Tsirkin <mst@redhat.com> |
| Message-id: <1387293161-4085-18-git-send-email-mst@redhat.com> |
| Patchwork-id: 56323 |
| O-Subject: [PATCH qemu-kvm RHEL7.0 v2 17/57] pc: add I440FX QOM cast macro |
| Bugzilla: 1034876 |
| RH-Acked-by: Igor Mammedov <imammedo@redhat.com> |
| RH-Acked-by: Marcel Apfelbaum <marcel.a@redhat.com> |
| RH-Acked-by: Laszlo Ersek <lersek@redhat.com> |
| |
| From: Igor Mammedov <imammedo@redhat.com> |
| |
| Signed-off-by: Igor Mammedov <imammedo@redhat.com> |
| Reviewed-by: Michael S. Tsirkin <mst@redhat.com> |
| Reviewed-by: Andreas Färber <afaerber@suse.de> |
| Message-id: 1375109277-25561-3-git-send-email-imammedo@redhat.com |
| Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> |
| (cherry picked from commit 1d0d4aa412eef7d98e53c313c79c359f2f65376e) |
| |
| hw/pci-host/piix.c | 8 ++++++-- |
| 1 file changed, 6 insertions(+), 2 deletions(-) |
| |
| Signed-off-by: Michal Novotny <minovotn@redhat.com> |
| |
| hw/pci-host/piix.c | 8 ++++++-- |
| 1 file changed, 6 insertions(+), 2 deletions(-) |
| |
| diff --git a/hw/pci-host/piix.c b/hw/pci-host/piix.c |
| index 8894c03..adc094a 100644 |
| |
| |
| @@ -38,6 +38,10 @@ |
| * http://download.intel.com/design/chipsets/datashts/29054901.pdf |
| */ |
| |
| +#define TYPE_I440FX_PCI_HOST_BRIDGE "i440FX-pcihost" |
| +#define I440FX_PCI_HOST_BRIDGE(obj) \ |
| + OBJECT_CHECK(I440FXState, (obj), TYPE_I440FX_PCI_HOST_BRIDGE) |
| + |
| typedef struct I440FXState { |
| PCIHostState parent_obj; |
| } I440FXState; |
| @@ -245,7 +249,7 @@ PCIBus *i440fx_init(PCII440FXState **pi440fx_state, |
| PCII440FXState *f; |
| unsigned i; |
| |
| - dev = qdev_create(NULL, "i440FX-pcihost"); |
| + dev = qdev_create(NULL, TYPE_I440FX_PCI_HOST_BRIDGE); |
| s = PCI_HOST_BRIDGE(dev); |
| b = pci_bus_new(dev, NULL, pci_address_space, |
| address_space_io, 0, TYPE_PCI_BUS); |
| @@ -627,7 +631,7 @@ static void i440fx_pcihost_class_init(ObjectClass *klass, void *data) |
| } |
| |
| static const TypeInfo i440fx_pcihost_info = { |
| - .name = "i440FX-pcihost", |
| + .name = TYPE_I440FX_PCI_HOST_BRIDGE, |
| .parent = TYPE_PCI_HOST_BRIDGE, |
| .instance_size = sizeof(I440FXState), |
| .class_init = i440fx_pcihost_class_init, |
| -- |
| 1.7.11.7 |
| |