cryptospore / rpms / qemu-kvm

Forked from rpms/qemu-kvm 2 years ago
Clone

Blame SOURCES/kvm-pc-replace-i440fx_common_init-with-i440fx_init.patch

0a122b
From b1aa978a4310bc3c6811be75be978970022df6d2 Mon Sep 17 00:00:00 2001
0a122b
Message-Id: <b1aa978a4310bc3c6811be75be978970022df6d2.1387298827.git.minovotn@redhat.com>
0a122b
In-Reply-To: <3ed0fb61a3dc912ef036d7ef450bed192090709e.1387298827.git.minovotn@redhat.com>
0a122b
References: <3ed0fb61a3dc912ef036d7ef450bed192090709e.1387298827.git.minovotn@redhat.com>
0a122b
From: "Michael S. Tsirkin" <mst@redhat.com>
0a122b
Date: Tue, 17 Dec 2013 15:17:27 +0100
0a122b
Subject: [PATCH 15/56] pc: replace i440fx_common_init() with i440fx_init()
0a122b
MIME-Version: 1.0
0a122b
Content-Type: text/plain; charset=UTF-8
0a122b
Content-Transfer-Encoding: 8bit
0a122b
0a122b
RH-Author: Michael S. Tsirkin <mst@redhat.com>
0a122b
Message-id: <1387293161-4085-16-git-send-email-mst@redhat.com>
0a122b
Patchwork-id: 56321
0a122b
O-Subject: [PATCH qemu-kvm RHEL7.0 v2 15/57] pc: replace i440fx_common_init() with i440fx_init()
0a122b
Bugzilla: 1034876
0a122b
RH-Acked-by: Igor Mammedov <imammedo@redhat.com>
0a122b
RH-Acked-by: Marcel Apfelbaum <marcel.a@redhat.com>
0a122b
RH-Acked-by: Laszlo Ersek <lersek@redhat.com>
0a122b
0a122b
From: Igor Mammedov <imammedo@redhat.com>
0a122b
0a122b
It isn't used anywhere else.
0a122b
0a122b
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
0a122b
Reviewed-by: Andreas Färber <afaerber@suse.de>
0a122b
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
0a122b
Reviewed-by: Andreas Färber <afaerber@suse.de>
0a122b
Message-id: 1375109277-25561-4-git-send-email-imammedo@redhat.com
0a122b
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
0a122b
(cherry picked from commit 44fc8c5e743b84c1d29f603e4014125dcf152d26)
0a122b
---
0a122b
 hw/pci-host/piix.c | 50 +++++++++++++-------------------------------------
0a122b
 1 file changed, 13 insertions(+), 37 deletions(-)
0a122b
0a122b
Signed-off-by: Michal Novotny <minovotn@redhat.com>
0a122b
---
0a122b
 hw/pci-host/piix.c | 50 +++++++++++++-------------------------------------
0a122b
 1 file changed, 13 insertions(+), 37 deletions(-)
0a122b
0a122b
diff --git a/hw/pci-host/piix.c b/hw/pci-host/piix.c
0a122b
index c89b76b..8894c03 100644
0a122b
--- a/hw/pci-host/piix.c
0a122b
+++ b/hw/pci-host/piix.c
0a122b
@@ -224,19 +224,18 @@ static int i440fx_initfn(PCIDevice *dev)
0a122b
     return 0;
0a122b
 }
0a122b
 
0a122b
-static PCIBus *i440fx_common_init(const char *device_name,
0a122b
-                                  PCII440FXState **pi440fx_state,
0a122b
-                                  int *piix3_devfn,
0a122b
-                                  ISABus **isa_bus, qemu_irq *pic,
0a122b
-                                  MemoryRegion *address_space_mem,
0a122b
-                                  MemoryRegion *address_space_io,
0a122b
-                                  ram_addr_t ram_size,
0a122b
-                                  hwaddr pci_hole_start,
0a122b
-                                  hwaddr pci_hole_size,
0a122b
-                                  hwaddr pci_hole64_start,
0a122b
-                                  hwaddr pci_hole64_size,
0a122b
-                                  MemoryRegion *pci_address_space,
0a122b
-                                  MemoryRegion *ram_memory)
0a122b
+PCIBus *i440fx_init(PCII440FXState **pi440fx_state,
0a122b
+                    int *piix3_devfn,
0a122b
+                    ISABus **isa_bus, qemu_irq *pic,
0a122b
+                    MemoryRegion *address_space_mem,
0a122b
+                    MemoryRegion *address_space_io,
0a122b
+                    ram_addr_t ram_size,
0a122b
+                    hwaddr pci_hole_start,
0a122b
+                    hwaddr pci_hole_size,
0a122b
+                    hwaddr pci_hole64_start,
0a122b
+                    hwaddr pci_hole64_size,
0a122b
+                    MemoryRegion *pci_address_space,
0a122b
+                    MemoryRegion *ram_memory)
0a122b
 {
0a122b
     DeviceState *dev;
0a122b
     PCIBus *b;
0a122b
@@ -254,7 +253,7 @@ static PCIBus *i440fx_common_init(const char *device_name,
0a122b
     object_property_add_child(qdev_get_machine(), "i440fx", OBJECT(dev), NULL);
0a122b
     qdev_init_nofail(dev);
0a122b
 
0a122b
-    d = pci_create_simple(b, 0, device_name);
0a122b
+    d = pci_create_simple(b, 0, TYPE_I440FX_PCI_DEVICE);
0a122b
     *pi440fx_state = I440FX_PCI_DEVICE(d);
0a122b
     f = *pi440fx_state;
0a122b
     f->system_memory = address_space_mem;
0a122b
@@ -314,29 +313,6 @@ static PCIBus *i440fx_common_init(const char *device_name,
0a122b
     return b;
0a122b
 }
0a122b
 
0a122b
-PCIBus *i440fx_init(PCII440FXState **pi440fx_state, int *piix3_devfn,
0a122b
-                    ISABus **isa_bus, qemu_irq *pic,
0a122b
-                    MemoryRegion *address_space_mem,
0a122b
-                    MemoryRegion *address_space_io,
0a122b
-                    ram_addr_t ram_size,
0a122b
-                    hwaddr pci_hole_start,
0a122b
-                    hwaddr pci_hole_size,
0a122b
-                    hwaddr pci_hole64_start,
0a122b
-                    hwaddr pci_hole64_size,
0a122b
-                    MemoryRegion *pci_memory, MemoryRegion *ram_memory)
0a122b
-
0a122b
-{
0a122b
-    PCIBus *b;
0a122b
-
0a122b
-    b = i440fx_common_init(TYPE_I440FX_PCI_DEVICE, pi440fx_state,
0a122b
-                           piix3_devfn, isa_bus, pic,
0a122b
-                           address_space_mem, address_space_io, ram_size,
0a122b
-                           pci_hole_start, pci_hole_size,
0a122b
-                           pci_hole64_start, pci_hole64_size,
0a122b
-                           pci_memory, ram_memory);
0a122b
-    return b;
0a122b
-}
0a122b
-
0a122b
 /* PIIX3 PCI to ISA bridge */
0a122b
 static void piix3_set_irq_pic(PIIX3State *piix3, int pic_irq)
0a122b
 {
0a122b
-- 
0a122b
1.7.11.7
0a122b