From patchwork Fri May 14 07:29:19 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Isaku Yamahata X-Patchwork-Id: 52585 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 0B2DFB7E87 for ; Fri, 14 May 2010 18:22:25 +1000 (EST) Received: from localhost ([127.0.0.1]:58515 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OCqA1-0003GK-Ka for incoming@patchwork.ozlabs.org; Fri, 14 May 2010 04:22:21 -0400 Received: from [140.186.70.92] (port=56515 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OCq97-0003Eu-1b for qemu-devel@nongnu.org; Fri, 14 May 2010 04:21:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OCq95-0001AI-AB for qemu-devel@nongnu.org; Fri, 14 May 2010 04:21:24 -0400 Received: from mail.valinux.co.jp ([210.128.90.3]:37524) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OCpO1-0002ef-Ng for qemu-devel@nongnu.org; Fri, 14 May 2010 03:32:47 -0400 Received: from ps.local.valinux.co.jp (vagw.valinux.co.jp [210.128.90.14]) by mail.valinux.co.jp (Postfix) with SMTP id D2AB410715D; Fri, 14 May 2010 16:32:38 +0900 (JST) Received: (nullmailer pid 28011 invoked by uid 1000); Fri, 14 May 2010 07:29:25 -0000 From: Isaku Yamahata To: qemu-devel@nongnu.org Date: Fri, 14 May 2010 16:29:19 +0900 Message-Id: <510f2dcbd3719d3b47f91438a3bc2dc27d46bfa4.1273821065.git.yamahata@valinux.co.jp> X-Mailer: git-send-email 1.6.6.1 In-Reply-To: References: In-Reply-To: References: X-Virus-Scanned: clamav-milter 0.95.2 at va-mail.local.valinux.co.jp X-Virus-Status: Clean X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) Cc: blauwirbel@gmail.com, yamahata@valinux.co.jp, kraxel@redhat.com Subject: [Qemu-devel] [PATCH 21/26] pci hotplug: add argument to pci hot plug callback. X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Add argument, DeviceState*, to pci hot plug callback. The argument will be used later to remove global variable. Signed-off-by: Blue Swirl Signed-off-by: Isaku Yamahata Acked-by: Gerd Hoffmann --- changes v10 -> v11: - change callback argument from void* to DeviceState*. --- hw/acpi_piix4.c | 6 +++--- hw/pci.c | 8 +++++--- hw/pci.h | 4 ++-- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/hw/acpi_piix4.c b/hw/acpi_piix4.c index d4f4662..c3e71e3 100644 --- a/hw/acpi_piix4.c +++ b/hw/acpi_piix4.c @@ -568,7 +568,7 @@ static void pciej_write(void *opaque, uint32_t addr, uint32_t val) #endif } -static int piix4_device_hotplug(PCIDevice *dev, int state); +static int piix4_device_hotplug(DeviceState *qdev, PCIDevice *dev, int state); void piix4_acpi_system_hot_add_init(PCIBus *bus) { @@ -581,7 +581,7 @@ void piix4_acpi_system_hot_add_init(PCIBus *bus) register_ioport_write(PCI_EJ_BASE, 4, 4, pciej_write, bus); register_ioport_read(PCI_EJ_BASE, 4, 4, pciej_read, bus); - pci_bus_hotplug(bus, piix4_device_hotplug); + pci_bus_hotplug(bus, piix4_device_hotplug, NULL); } static void enable_device(struct pci_status *p, struct gpe_regs *g, int slot) @@ -596,7 +596,7 @@ static void disable_device(struct pci_status *p, struct gpe_regs *g, int slot) p->down |= (1 << slot); } -static int piix4_device_hotplug(PCIDevice *dev, int state) +static int piix4_device_hotplug(DeviceState *qdev, PCIDevice *dev, int state) { int slot = PCI_SLOT(dev->devfn); diff --git a/hw/pci.c b/hw/pci.c index f167436..679f067 100644 --- a/hw/pci.c +++ b/hw/pci.c @@ -42,6 +42,7 @@ struct PCIBus { pci_set_irq_fn set_irq; pci_map_irq_fn map_irq; pci_hotplug_fn hotplug; + DeviceState *hotplug_qdev; void *irq_opaque; PCIDevice *devices[256]; PCIDevice *parent_dev; @@ -233,10 +234,11 @@ void pci_bus_irqs(PCIBus *bus, pci_set_irq_fn set_irq, pci_map_irq_fn map_irq, bus->irq_count = qemu_mallocz(nirq * sizeof(bus->irq_count[0])); } -void pci_bus_hotplug(PCIBus *bus, pci_hotplug_fn hotplug) +void pci_bus_hotplug(PCIBus *bus, pci_hotplug_fn hotplug, DeviceState *qdev) { bus->qbus.allow_hotplug = 1; bus->hotplug = hotplug; + bus->hotplug_qdev = qdev; } void pci_bus_set_mem_base(PCIBus *bus, target_phys_addr_t base) @@ -1661,7 +1663,7 @@ static int pci_qdev_init(DeviceState *qdev, DeviceInfo *base) pci_add_option_rom(pci_dev); if (qdev->hotplugged) - bus->hotplug(pci_dev, 1); + bus->hotplug(bus->hotplug_qdev, pci_dev, 1); return 0; } @@ -1669,7 +1671,7 @@ static int pci_unplug_device(DeviceState *qdev) { PCIDevice *dev = DO_UPCAST(PCIDevice, qdev, qdev); - dev->bus->hotplug(dev, 0); + dev->bus->hotplug(dev->bus->hotplug_qdev, dev, 0); return 0; } diff --git a/hw/pci.h b/hw/pci.h index 625188c..f6e6c5f 100644 --- a/hw/pci.h +++ b/hw/pci.h @@ -209,13 +209,13 @@ int pci_device_load(PCIDevice *s, QEMUFile *f); typedef void (*pci_set_irq_fn)(void *opaque, int irq_num, int level); typedef int (*pci_map_irq_fn)(PCIDevice *pci_dev, int irq_num); -typedef int (*pci_hotplug_fn)(PCIDevice *pci_dev, int state); +typedef int (*pci_hotplug_fn)(DeviceState *qdev, PCIDevice *pci_dev, int state); void pci_bus_new_inplace(PCIBus *bus, DeviceState *parent, const char *name, int devfn_min); PCIBus *pci_bus_new(DeviceState *parent, const char *name, int devfn_min); void pci_bus_irqs(PCIBus *bus, pci_set_irq_fn set_irq, pci_map_irq_fn map_irq, void *irq_opaque, int nirq); -void pci_bus_hotplug(PCIBus *bus, pci_hotplug_fn hotplug); +void pci_bus_hotplug(PCIBus *bus, pci_hotplug_fn hotplug, DeviceState *dev); PCIBus *pci_register_bus(DeviceState *parent, const char *name, pci_set_irq_fn set_irq, pci_map_irq_fn map_irq, void *irq_opaque, int devfn_min, int nirq);