Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1LbX8z-0004vf-Pu for qemu-devel@nongnu.org; Mon, 23 Feb 2009 04:30:33 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1LbX8w-0004sy-UI for qemu-devel@nongnu.org; Mon, 23 Feb 2009 04:30:33 -0500 Received: from [199.232.76.173] (port=56512 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1LbX8w-0004sg-Dq for qemu-devel@nongnu.org; Mon, 23 Feb 2009 04:30:30 -0500 Received: from kirsty.vergenet.net ([202.4.237.240]:59230) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1LbX8v-0006zC-UW for qemu-devel@nongnu.org; Mon, 23 Feb 2009 04:30:30 -0500 Received: from yukiko.kent.sydney.vergenet.net (124-170-75-170.dyn.iinet.net.au [124.170.75.170]) by kirsty.vergenet.net (Postfix) with ESMTP id C6D8F24076 for ; Mon, 23 Feb 2009 20:30:28 +1100 (EST) Message-Id: <20090223092901.597859293@vergenet.net> References: <20090223091810.891526738@vergenet.net> Date: Mon, 23 Feb 2009 20:18:12 +1100 From: Simon Horman Content-Disposition: inline; filename=qemu-piix3_init-no-devfn-arg.patch Subject: [Qemu-devel] [patch 2/5] ioemu: Remove lsi_scsi_init()s devfn parameter as it is always passed as -1 Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel Signed-off-by: Simon Horman Index: qemu/hw/pc.c =================================================================== --- qemu.orig/hw/pc.c 2009-02-23 17:09:27.000000000 +1100 +++ qemu/hw/pc.c 2009-02-23 17:11:48.000000000 +1100 @@ -933,7 +933,7 @@ vga_bios_error: if (pci_enabled) { pci_bus = i440fx_init(&i440fx_state, i8259); - piix3_devfn = piix3_init(pci_bus, -1); + piix3_devfn = piix3_init(pci_bus); } else { pci_bus = NULL; } Index: qemu/hw/pc.h =================================================================== --- qemu.orig/hw/pc.h 2009-02-20 19:47:46.000000000 +1100 +++ qemu/hw/pc.h 2009-02-23 17:11:48.000000000 +1100 @@ -113,7 +113,7 @@ int pcspk_audio_init(AudioState *, qemu_ /* piix_pci.c */ PCIBus *i440fx_init(PCIDevice **pi440fx_state, qemu_irq *pic); void i440fx_set_smm(PCIDevice *d, int val); -int piix3_init(PCIBus *bus, int devfn); +int piix3_init(PCIBus *bus); void i440fx_init_memory_mappings(PCIDevice *d); extern PCIDevice *piix4_dev; Index: qemu/hw/piix_pci.c =================================================================== --- qemu.orig/hw/piix_pci.c 2009-02-20 19:47:46.000000000 +1100 +++ qemu/hw/piix_pci.c 2009-02-23 17:11:48.000000000 +1100 @@ -322,13 +322,13 @@ static int piix_load(QEMUFile* f, void * return pci_device_load(d, f); } -int piix3_init(PCIBus *bus, int devfn) +int piix3_init(PCIBus *bus) { PCIDevice *d; uint8_t *pci_conf; d = pci_register_device(bus, "PIIX3", sizeof(PCIDevice), - devfn, NULL, NULL); + -1, NULL, NULL); register_savevm("PIIX3", 0, 2, piix_save, piix_load, d); piix3_dev = d; -- -- Simon Horman VA Linux Systems Japan K.K., Sydney, Australia Satellite Office H: www.vergenet.net/~horms/ W: www.valinux.co.jp/en