From nobody Wed Nov 5 17:00:22 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1536213588646947.37633115816; Wed, 5 Sep 2018 22:59:48 -0700 (PDT) Received: from localhost ([::1]:59526 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fxnKM-0000mb-Qd for importer@patchew.org; Thu, 06 Sep 2018 01:59:38 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41407) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fxnIn-0008Eq-Dk for qemu-devel@nongnu.org; Thu, 06 Sep 2018 01:58:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fxnIj-0008QQ-UI for qemu-devel@nongnu.org; Thu, 06 Sep 2018 01:58:01 -0400 Received: from chuckie.co.uk ([82.165.15.123]:55506 helo=s16892447.onlinehome-server.info) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fxnIj-0008PB-KG; Thu, 06 Sep 2018 01:57:57 -0400 Received: from [86.188.254.49] (helo=kentang.int.eigen.co) by s16892447.onlinehome-server.info with esmtpsa (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.76) (envelope-from ) id 1fxnIn-0004rx-Dd; Thu, 06 Sep 2018 06:58:03 +0100 From: Mark Cave-Ayland To: pbonzini@redhat.com, famz@redhat.com, hpoussin@reactos.org, rth@twiddle.net, peter.maydell@linaro.org, thuth@redhat.com, armbru@redhat.com, qemu-devel@nongnu.org, qemu-ppc@nongnu.org Date: Thu, 6 Sep 2018 06:57:34 +0100 Message-Id: <20180906055736.20256-2-mark.cave-ayland@ilande.co.uk> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180906055736.20256-1-mark.cave-ayland@ilande.co.uk> References: <20180906055736.20256-1-mark.cave-ayland@ilande.co.uk> X-SA-Exim-Connect-IP: 86.188.254.49 X-SA-Exim-Mail-From: mark.cave-ayland@ilande.co.uk X-SA-Exim-Version: 4.2.1 (built Sun, 08 Jan 2012 02:45:44 +0000) X-SA-Exim-Scanned: Yes (on s16892447.onlinehome-server.info) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 82.165.15.123 Subject: [Qemu-devel] [PATCH 1/3] scsi: move lsi53c895a structures and defines into separate lsi53c895a.h file X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" There is also one small change to the new header file which is the addition of the previously missing LSI53C810 define. Signed-off-by: Mark Cave-Ayland --- hw/scsi/lsi53c895a.c | 116 +----------------------------------- include/hw/scsi/lsi53c895a.h | 137 +++++++++++++++++++++++++++++++++++++++= ++++ 2 files changed, 138 insertions(+), 115 deletions(-) create mode 100644 include/hw/scsi/lsi53c895a.h diff --git a/hw/scsi/lsi53c895a.c b/hw/scsi/lsi53c895a.c index 955ba94800..edb0b13e23 100644 --- a/hw/scsi/lsi53c895a.c +++ b/hw/scsi/lsi53c895a.c @@ -18,6 +18,7 @@ #include "hw/hw.h" #include "hw/pci/pci.h" #include "hw/scsi/scsi.h" +#include "hw/scsi/lsi53c895a.h" #include "sysemu/dma.h" #include "qemu/log.h" =20 @@ -186,124 +187,9 @@ static const char *names[] =3D { #define PHASE_MI 7 #define PHASE_MASK 7 =20 -/* Maximum length of MSG IN data. */ -#define LSI_MAX_MSGIN_LEN 8 - /* Flag set if this is a tagged command. */ #define LSI_TAG_VALID (1 << 16) =20 -typedef struct lsi_request { - SCSIRequest *req; - uint32_t tag; - uint32_t dma_len; - uint8_t *dma_buf; - uint32_t pending; - int out; - QTAILQ_ENTRY(lsi_request) next; -} lsi_request; - -typedef struct { - /*< private >*/ - PCIDevice parent_obj; - /*< public >*/ - - MemoryRegion mmio_io; - MemoryRegion ram_io; - MemoryRegion io_io; - AddressSpace pci_io_as; - - int carry; /* ??? Should this be an a visible register somewhere? */ - int status; - /* Action to take at the end of a MSG IN phase. - 0 =3D COMMAND, 1 =3D disconnect, 2 =3D DATA OUT, 3 =3D DATA IN. */ - int msg_action; - int msg_len; - uint8_t msg[LSI_MAX_MSGIN_LEN]; - /* 0 if SCRIPTS are running or stopped. - * 1 if a Wait Reselect instruction has been issued. - * 2 if processing DMA from lsi_execute_script. - * 3 if a DMA operation is in progress. */ - int waiting; - SCSIBus bus; - int current_lun; - /* The tag is a combination of the device ID and the SCSI tag. */ - uint32_t select_tag; - int command_complete; - QTAILQ_HEAD(, lsi_request) queue; - lsi_request *current; - - uint32_t dsa; - uint32_t temp; - uint32_t dnad; - uint32_t dbc; - uint8_t istat0; - uint8_t istat1; - uint8_t dcmd; - uint8_t dstat; - uint8_t dien; - uint8_t sist0; - uint8_t sist1; - uint8_t sien0; - uint8_t sien1; - uint8_t mbox0; - uint8_t mbox1; - uint8_t dfifo; - uint8_t ctest2; - uint8_t ctest3; - uint8_t ctest4; - uint8_t ctest5; - uint8_t ccntl0; - uint8_t ccntl1; - uint32_t dsp; - uint32_t dsps; - uint8_t dmode; - uint8_t dcntl; - uint8_t scntl0; - uint8_t scntl1; - uint8_t scntl2; - uint8_t scntl3; - uint8_t sstat0; - uint8_t sstat1; - uint8_t scid; - uint8_t sxfer; - uint8_t socl; - uint8_t sdid; - uint8_t ssid; - uint8_t sfbr; - uint8_t stest1; - uint8_t stest2; - uint8_t stest3; - uint8_t sidl; - uint8_t stime0; - uint8_t respid0; - uint8_t respid1; - uint32_t mmrs; - uint32_t mmws; - uint32_t sfs; - uint32_t drs; - uint32_t sbms; - uint32_t dbms; - uint32_t dnad64; - uint32_t pmjad1; - uint32_t pmjad2; - uint32_t rbc; - uint32_t ua; - uint32_t ia; - uint32_t sbc; - uint32_t csbc; - uint32_t scratch[18]; /* SCRATCHA-SCRATCHR */ - uint8_t sbr; - uint32_t adder; - - /* Script ram is stored as 32-bit words in host byteorder. */ - uint32_t script_ram[2048]; -} LSIState; - -#define TYPE_LSI53C810 "lsi53c810" -#define TYPE_LSI53C895A "lsi53c895a" - -#define LSI53C895A(obj) \ - OBJECT_CHECK(LSIState, (obj), TYPE_LSI53C895A) =20 static inline int lsi_irq_on_rsl(LSIState *s) { diff --git a/include/hw/scsi/lsi53c895a.h b/include/hw/scsi/lsi53c895a.h new file mode 100644 index 0000000000..d80cb78c69 --- /dev/null +++ b/include/hw/scsi/lsi53c895a.h @@ -0,0 +1,137 @@ +/* + * QEMU LSI53C895A SCSI Host Bus Adapter emulation + * + * Copyright (c) 2006 CodeSourcery. + * Written by Paul Brook + * + * This code is licensed under the LGPL. + */ + +#ifndef LSI_H +#define LSI_H + +#include "qemu/osdep.h" + +#include "hw/hw.h" +#include "hw/pci/pci.h" +#include "hw/scsi/scsi.h" + +/* Maximum length of MSG IN data. */ +#define LSI_MAX_MSGIN_LEN 8 + +typedef struct lsi_request { + SCSIRequest *req; + uint32_t tag; + uint32_t dma_len; + uint8_t *dma_buf; + uint32_t pending; + int out; + QTAILQ_ENTRY(lsi_request) next; +} lsi_request; + +typedef struct { + /*< private >*/ + PCIDevice parent_obj; + /*< public >*/ + + MemoryRegion mmio_io; + MemoryRegion ram_io; + MemoryRegion io_io; + AddressSpace pci_io_as; + + int carry; /* ??? Should this be an a visible register somewhere? */ + int status; + /* Action to take at the end of a MSG IN phase. + 0 =3D COMMAND, 1 =3D disconnect, 2 =3D DATA OUT, 3 =3D DATA IN. */ + int msg_action; + int msg_len; + uint8_t msg[LSI_MAX_MSGIN_LEN]; + /* 0 if SCRIPTS are running or stopped. + * 1 if a Wait Reselect instruction has been issued. + * 2 if processing DMA from lsi_execute_script. + * 3 if a DMA operation is in progress. */ + int waiting; + SCSIBus bus; + int current_lun; + /* The tag is a combination of the device ID and the SCSI tag. */ + uint32_t select_tag; + int command_complete; + QTAILQ_HEAD(, lsi_request) queue; + lsi_request *current; + + uint32_t dsa; + uint32_t temp; + uint32_t dnad; + uint32_t dbc; + uint8_t istat0; + uint8_t istat1; + uint8_t dcmd; + uint8_t dstat; + uint8_t dien; + uint8_t sist0; + uint8_t sist1; + uint8_t sien0; + uint8_t sien1; + uint8_t mbox0; + uint8_t mbox1; + uint8_t dfifo; + uint8_t ctest2; + uint8_t ctest3; + uint8_t ctest4; + uint8_t ctest5; + uint8_t ccntl0; + uint8_t ccntl1; + uint32_t dsp; + uint32_t dsps; + uint8_t dmode; + uint8_t dcntl; + uint8_t scntl0; + uint8_t scntl1; + uint8_t scntl2; + uint8_t scntl3; + uint8_t sstat0; + uint8_t sstat1; + uint8_t scid; + uint8_t sxfer; + uint8_t socl; + uint8_t sdid; + uint8_t ssid; + uint8_t sfbr; + uint8_t stest1; + uint8_t stest2; + uint8_t stest3; + uint8_t sidl; + uint8_t stime0; + uint8_t respid0; + uint8_t respid1; + uint32_t mmrs; + uint32_t mmws; + uint32_t sfs; + uint32_t drs; + uint32_t sbms; + uint32_t dbms; + uint32_t dnad64; + uint32_t pmjad1; + uint32_t pmjad2; + uint32_t rbc; + uint32_t ua; + uint32_t ia; + uint32_t sbc; + uint32_t csbc; + uint32_t scratch[18]; /* SCRATCHA-SCRATCHR */ + uint8_t sbr; + uint32_t adder; + + /* Script ram is stored as 32-bit words in host byteorder. */ + uint32_t script_ram[2048]; +} LSIState; + +#define TYPE_LSI53C810 "lsi53c810" +#define LSI53C810(obj) \ + OBJECT_CHECK(LSIState, (obj), TYPE_LSI53C810) + +#define TYPE_LSI53C895A "lsi53c895a" +#define LSI53C895A(obj) \ + OBJECT_CHECK(LSIState, (obj), TYPE_LSI53C895A) + +#endif --=20 2.11.0 From nobody Wed Nov 5 17:00:22 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1536213588630131.27194998098048; Wed, 5 Sep 2018 22:59:48 -0700 (PDT) Received: from localhost ([::1]:59527 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fxnKN-0000n5-Q3 for importer@patchew.org; Thu, 06 Sep 2018 01:59:39 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41406) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fxnIn-0008Ep-Dg for qemu-devel@nongnu.org; Thu, 06 Sep 2018 01:58:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fxnIl-0008Rr-RA for qemu-devel@nongnu.org; Thu, 06 Sep 2018 01:58:01 -0400 Received: from chuckie.co.uk ([82.165.15.123]:55509 helo=s16892447.onlinehome-server.info) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fxnIl-0008RM-K6; Thu, 06 Sep 2018 01:57:59 -0400 Received: from [86.188.254.49] (helo=kentang.int.eigen.co) by s16892447.onlinehome-server.info with esmtpsa (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.76) (envelope-from ) id 1fxnIp-0004rx-JA; Thu, 06 Sep 2018 06:58:05 +0100 From: Mark Cave-Ayland To: pbonzini@redhat.com, famz@redhat.com, hpoussin@reactos.org, rth@twiddle.net, peter.maydell@linaro.org, thuth@redhat.com, armbru@redhat.com, qemu-devel@nongnu.org, qemu-ppc@nongnu.org Date: Thu, 6 Sep 2018 06:57:35 +0100 Message-Id: <20180906055736.20256-3-mark.cave-ayland@ilande.co.uk> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180906055736.20256-1-mark.cave-ayland@ilande.co.uk> References: <20180906055736.20256-1-mark.cave-ayland@ilande.co.uk> X-SA-Exim-Connect-IP: 86.188.254.49 X-SA-Exim-Mail-From: mark.cave-ayland@ilande.co.uk X-SA-Exim-Version: 4.2.1 (built Sun, 08 Jan 2012 02:45:44 +0000) X-SA-Exim-Scanned: Yes (on s16892447.onlinehome-server.info) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 82.165.15.123 Subject: [Qemu-devel] [PATCH 2/3] scsi: move lsi53c895a_create() and lsi53c810_create() callers to pci_create_simple() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" As part of commits a64aa5785d "hw: Deprecate -drive if=3Dscsi with non-onbo= ard HBAs" and b891538e81 "hw/ppc/prep: Fix implicit creation of "-drive if=3Dsc= si" devices" the lsi53c895a_create() and lsi53c810_create() functions were added to wrap pci_create_simple() and scsi_bus_legacy_handle_cmdline(). Unfortunately this prevents us from changing qdev properties on the device and/or changing the PCI configuration. Now that we have a separate header f= ile for these devices it is possible to return the LSI objects themselves, which enables us to both modify the LSI device configuration as required and also move the invocation of scsi_bus_legacy_handle_cmdline() to the caller as do= ne elsewhere. Signed-off-by: Mark Cave-Ayland --- hw/arm/realview.c | 5 ++++- hw/arm/versatilepb.c | 5 ++++- hw/hppa/machine.c | 5 ++++- hw/ppc/prep.c | 6 +++++- 4 files changed, 17 insertions(+), 4 deletions(-) diff --git a/hw/arm/realview.c b/hw/arm/realview.c index ab8c14fde3..75168afd4d 100644 --- a/hw/arm/realview.c +++ b/hw/arm/realview.c @@ -16,6 +16,7 @@ #include "hw/arm/primecell.h" #include "hw/devices.h" #include "hw/pci/pci.h" +#include "hw/scsi/lsi53c895a.h" #include "net/net.h" #include "sysemu/sysemu.h" #include "hw/boards.h" @@ -63,6 +64,7 @@ static void realview_init(MachineState *machine, MemoryRegion *ram_hack =3D g_new(MemoryRegion, 1); DeviceState *dev, *sysctl, *gpio2, *pl041; SysBusDevice *busdev; + LSIState *lsi; qemu_irq pic[64]; qemu_irq mmc_irq[2]; PCIBus *pci_bus =3D NULL; @@ -257,7 +259,8 @@ static void realview_init(MachineState *machine, } n =3D drive_get_max_bus(IF_SCSI); while (n >=3D 0) { - lsi53c895a_create(pci_bus); + lsi =3D LSI53C895A(pci_create_simple(pci_bus, -1, TYPE_LSI53C8= 95A)); + scsi_bus_legacy_handle_cmdline(&lsi->bus); n--; } } diff --git a/hw/arm/versatilepb.c b/hw/arm/versatilepb.c index 8b74857059..dd9962037e 100644 --- a/hw/arm/versatilepb.c +++ b/hw/arm/versatilepb.c @@ -19,6 +19,7 @@ #include "hw/pci/pci.h" #include "hw/i2c/i2c.h" #include "hw/boards.h" +#include "hw/scsi/lsi53c895a.h" #include "exec/address-spaces.h" #include "hw/block/flash.h" #include "qemu/error-report.h" @@ -189,6 +190,7 @@ static void versatile_init(MachineState *machine, int b= oard_id) DeviceState *dev, *sysctl; SysBusDevice *busdev; DeviceState *pl041; + LSIState *lsi; PCIBus *pci_bus; NICInfo *nd; I2CBus *i2c; @@ -278,7 +280,8 @@ static void versatile_init(MachineState *machine, int b= oard_id) } n =3D drive_get_max_bus(IF_SCSI); while (n >=3D 0) { - lsi53c895a_create(pci_bus); + lsi =3D LSI53C895A(pci_create_simple(pci_bus, -1, TYPE_LSI53C895A)= ); + scsi_bus_legacy_handle_cmdline(&lsi->bus); n--; } =20 diff --git a/hw/hppa/machine.c b/hw/hppa/machine.c index cf7c61c6cc..ddd8ee45e4 100644 --- a/hw/hppa/machine.c +++ b/hw/hppa/machine.c @@ -16,6 +16,7 @@ #include "hw/ide.h" #include "hw/timer/i8254.h" #include "hw/char/serial.h" +#include "hw/scsi/lsi53c895a.h" #include "hppa_sys.h" #include "qemu/units.h" #include "qapi/error.h" @@ -61,6 +62,7 @@ static void machine_hppa_init(MachineState *machine) const char *initrd_filename =3D machine->initrd_filename; PCIBus *pci_bus; ISABus *isa_bus; + LSIState *lsi; qemu_irq rtc_irq, serial_irq; char *firmware_filename; uint64_t firmware_low, firmware_high; @@ -115,7 +117,8 @@ static void machine_hppa_init(MachineState *machine) } =20 /* SCSI disk setup. */ - lsi53c895a_create(pci_bus); + lsi =3D LSI53C895A(pci_create_simple(pci_bus, -1, TYPE_LSI53C895A)); + scsi_bus_legacy_handle_cmdline(&lsi->bus); =20 /* Network setup. e1000 is good enough, failing Tulip support. */ for (i =3D 0; i < nb_nics; i++) { diff --git a/hw/ppc/prep.c b/hw/ppc/prep.c index 162b27a3b8..fcb2a41846 100644 --- a/hw/ppc/prep.c +++ b/hw/ppc/prep.c @@ -44,6 +44,7 @@ #include "hw/input/i8042.h" #include "hw/isa/pc87312.h" #include "hw/net/ne2000-isa.h" +#include "hw/scsi/lsi53c895a.h" #include "sysemu/arch_init.h" #include "sysemu/kvm.h" #include "sysemu/qtest.h" @@ -623,6 +624,7 @@ static void ibm_40p_init(MachineState *machine) DeviceState *dev; SysBusDevice *pcihost, *s; Nvram *m48t59 =3D NULL; + LSIState *lsi; PCIBus *pci_bus; ISABus *isa_bus; void *fw_cfg; @@ -702,7 +704,9 @@ static void ibm_40p_init(MachineState *machine) qdev_prop_set_uint32(dev, "equipment", 0xc0); qdev_init_nofail(dev); =20 - lsi53c810_create(pci_bus, PCI_DEVFN(1, 0)); + lsi =3D LSI53C810(pci_create_simple(pci_bus, PCI_DEVFN(1, 0), + TYPE_LSI53C810)); + scsi_bus_legacy_handle_cmdline(&lsi->bus); =20 /* XXX: s3-trio at PCI_DEVFN(2, 0) */ pci_vga_init(pci_bus); --=20 2.11.0 From nobody Wed Nov 5 17:00:22 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 153621369701473.3133362487498; Wed, 5 Sep 2018 23:01:37 -0700 (PDT) Received: from localhost ([::1]:59543 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fxnMG-0002Ay-22 for importer@patchew.org; Thu, 06 Sep 2018 02:01:36 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41423) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fxnIo-0008Es-69 for qemu-devel@nongnu.org; Thu, 06 Sep 2018 01:58:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fxnIn-0008Uh-CT for qemu-devel@nongnu.org; Thu, 06 Sep 2018 01:58:02 -0400 Received: from chuckie.co.uk ([82.165.15.123]:55510 helo=s16892447.onlinehome-server.info) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fxnIn-0008SV-3m; Thu, 06 Sep 2018 01:58:01 -0400 Received: from [86.188.254.49] (helo=kentang.int.eigen.co) by s16892447.onlinehome-server.info with esmtpsa (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.76) (envelope-from ) id 1fxnIr-0004rx-Mq; Thu, 06 Sep 2018 06:58:06 +0100 From: Mark Cave-Ayland To: pbonzini@redhat.com, famz@redhat.com, hpoussin@reactos.org, rth@twiddle.net, peter.maydell@linaro.org, thuth@redhat.com, armbru@redhat.com, qemu-devel@nongnu.org, qemu-ppc@nongnu.org Date: Thu, 6 Sep 2018 06:57:36 +0100 Message-Id: <20180906055736.20256-4-mark.cave-ayland@ilande.co.uk> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180906055736.20256-1-mark.cave-ayland@ilande.co.uk> References: <20180906055736.20256-1-mark.cave-ayland@ilande.co.uk> X-SA-Exim-Connect-IP: 86.188.254.49 X-SA-Exim-Mail-From: mark.cave-ayland@ilande.co.uk X-SA-Exim-Version: 4.2.1 (built Sun, 08 Jan 2012 02:45:44 +0000) X-SA-Exim-Scanned: Yes (on s16892447.onlinehome-server.info) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 82.165.15.123 Subject: [Qemu-devel] [PATCH 3/3] scsi: remove unused lsi53c895a_create() and lsi53c810_create() functions X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Now that these functions are no longer required they can be removed. Signed-off-by: Mark Cave-Ayland --- hw/scsi/lsi53c895a.c | 14 -------------- include/hw/pci/pci.h | 3 --- 2 files changed, 17 deletions(-) diff --git a/hw/scsi/lsi53c895a.c b/hw/scsi/lsi53c895a.c index edb0b13e23..2094b1ebc6 100644 --- a/hw/scsi/lsi53c895a.c +++ b/hw/scsi/lsi53c895a.c @@ -2162,17 +2162,3 @@ static void lsi53c895a_register_types(void) } =20 type_init(lsi53c895a_register_types) - -void lsi53c895a_create(PCIBus *bus) -{ - LSIState *s =3D LSI53C895A(pci_create_simple(bus, -1, "lsi53c895a")); - - scsi_bus_legacy_handle_cmdline(&s->bus); -} - -void lsi53c810_create(PCIBus *bus, int devfn) -{ - LSIState *s =3D LSI53C895A(pci_create_simple(bus, devfn, "lsi53c810")); - - scsi_bus_legacy_handle_cmdline(&s->bus); -} diff --git a/include/hw/pci/pci.h b/include/hw/pci/pci.h index 990d6fcbde..cb9d023f87 100644 --- a/include/hw/pci/pci.h +++ b/include/hw/pci/pci.h @@ -707,9 +707,6 @@ PCIDevice *pci_create_simple_multifunction(PCIBus *bus,= int devfn, PCIDevice *pci_create(PCIBus *bus, int devfn, const char *name); PCIDevice *pci_create_simple(PCIBus *bus, int devfn, const char *name); =20 -void lsi53c895a_create(PCIBus *bus); -void lsi53c810_create(PCIBus *bus, int devfn); - qemu_irq pci_allocate_irq(PCIDevice *pci_dev); void pci_set_irq(PCIDevice *pci_dev, int level); =20 --=20 2.11.0