- Ignore writes to CNTP_CTL_EL0 on HVF ARM (Alexander)
 - Add '-d invalid_mem' logging option (Zoltan)
 - Create QOM containers explicitly (Peter)
 - Rename sysemu/ -> system/ (Philippe)
 - Re-orderning of include/exec/ headers (Philippe)
   Move a lot of declarations from these legacy mixed bag headers:
     . "exec/cpu-all.h"
     . "exec/cpu-common.h"
     . "exec/cpu-defs.h"
     . "exec/exec-all.h"
     . "exec/translate-all"
   to these more specific ones:
     . "exec/page-protection.h"
     . "exec/translation-block.h"
     . "user/cpu_loop.h"
     . "user/guest-host.h"
     . "user/page-protection.h"
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEE+qvnXhKRciHc/Wuy4+MsLN6twN4FAmdlnyAACgkQ4+MsLN6t
 wN6mBw//QFWi7CrU+bb8KMM53kOU9C507tjn99LLGFb5or73/umDsw6eo/b8DHBt
 KIwGLgATel42oojKfNKavtAzLK5rOrywpboPDpa3SNeF1onW+99NGJ52LQUqIX6K
 A6bS0fPdGG9ZzEuPpbjDXlp++0yhDcdSgZsS42fEsT7Dyj5gzJYlqpqhiXGqpsn8
 4Y0UMxSL21K3HEexlzw2hsoOBFA3tUm2ujNDhNkt8QASr85yQVLCypABJnuoe///
 5Ojl5wTBeDwhANET0rhwHK8eIYaNboiM9fHopJYhvyw1bz6yAu9jQwzF/MrL3s/r
 xa4OBHBy5mq2hQV9Shcl3UfCQdk/vDaYaWpgzJGX8stgMGYfnfej1SIl8haJIfcl
 VMX8/jEFdYbjhO4AeGRYcBzWjEJymkDJZoiSWp2NuEDi6jqIW+7yW1q0Rnlg9lay
 ShAqLK5Pv4zUw3t0Jy3qv9KSW8sbs6PQxtzXjk8p97rTf76BJ2pF8sv1tVzmsidP
 9L92Hv5O34IqzBu2oATOUZYJk89YGmTIUSLkpT7asJZpBLwNM2qLp5jO00WVU0Sd
 +kAn324guYPkko/TVnjC/AY7CMu55EOtD9NU35k3mUAnxXT9oDUeL4NlYtfgrJx6
 x1Nzr2FkS68+wlPAFKNSSU5lTjsjNaFM0bIJ4LCNtenJVP+SnRo=
 =cjz8
 -----END PGP SIGNATURE-----
Merge tag 'exec-20241220' of https://github.com/philmd/qemu into staging
Accel & Exec patch queue
- Ignore writes to CNTP_CTL_EL0 on HVF ARM (Alexander)
- Add '-d invalid_mem' logging option (Zoltan)
- Create QOM containers explicitly (Peter)
- Rename sysemu/ -> system/ (Philippe)
- Re-orderning of include/exec/ headers (Philippe)
  Move a lot of declarations from these legacy mixed bag headers:
    . "exec/cpu-all.h"
    . "exec/cpu-common.h"
    . "exec/cpu-defs.h"
    . "exec/exec-all.h"
    . "exec/translate-all"
  to these more specific ones:
    . "exec/page-protection.h"
    . "exec/translation-block.h"
    . "user/cpu_loop.h"
    . "user/guest-host.h"
    . "user/page-protection.h"
 # -----BEGIN PGP SIGNATURE-----
 #
 # iQIzBAABCAAdFiEE+qvnXhKRciHc/Wuy4+MsLN6twN4FAmdlnyAACgkQ4+MsLN6t
 # wN6mBw//QFWi7CrU+bb8KMM53kOU9C507tjn99LLGFb5or73/umDsw6eo/b8DHBt
 # KIwGLgATel42oojKfNKavtAzLK5rOrywpboPDpa3SNeF1onW+99NGJ52LQUqIX6K
 # A6bS0fPdGG9ZzEuPpbjDXlp++0yhDcdSgZsS42fEsT7Dyj5gzJYlqpqhiXGqpsn8
 # 4Y0UMxSL21K3HEexlzw2hsoOBFA3tUm2ujNDhNkt8QASr85yQVLCypABJnuoe///
 # 5Ojl5wTBeDwhANET0rhwHK8eIYaNboiM9fHopJYhvyw1bz6yAu9jQwzF/MrL3s/r
 # xa4OBHBy5mq2hQV9Shcl3UfCQdk/vDaYaWpgzJGX8stgMGYfnfej1SIl8haJIfcl
 # VMX8/jEFdYbjhO4AeGRYcBzWjEJymkDJZoiSWp2NuEDi6jqIW+7yW1q0Rnlg9lay
 # ShAqLK5Pv4zUw3t0Jy3qv9KSW8sbs6PQxtzXjk8p97rTf76BJ2pF8sv1tVzmsidP
 # 9L92Hv5O34IqzBu2oATOUZYJk89YGmTIUSLkpT7asJZpBLwNM2qLp5jO00WVU0Sd
 # +kAn324guYPkko/TVnjC/AY7CMu55EOtD9NU35k3mUAnxXT9oDUeL4NlYtfgrJx6
 # x1Nzr2FkS68+wlPAFKNSSU5lTjsjNaFM0bIJ4LCNtenJVP+SnRo=
 # =cjz8
 # -----END PGP SIGNATURE-----
 # gpg: Signature made Fri 20 Dec 2024 11:45:20 EST
 # gpg:                using RSA key FAABE75E12917221DCFD6BB2E3E32C2CDEADC0DE
 # gpg: Good signature from "Philippe Mathieu-Daudé (F4BUG) <f4bug@amsat.org>" [unknown]
 # gpg: WARNING: This key is not certified with a trusted signature!
 # gpg:          There is no indication that the signature belongs to the owner.
 # Primary key fingerprint: FAAB E75E 1291 7221 DCFD  6BB2 E3E3 2C2C DEAD C0DE
* tag 'exec-20241220' of https://github.com/philmd/qemu: (59 commits)
  util/qemu-timer: fix indentation
  meson: Do not define CONFIG_DEVICES on user emulation
  system/accel-ops: Remove unnecessary 'exec/cpu-common.h' header
  system/numa: Remove unnecessary 'exec/cpu-common.h' header
  hw/xen: Remove unnecessary 'exec/cpu-common.h' header
  target/mips: Drop left-over comment about Jazz machine
  target/mips: Remove tswap() calls in semihosting uhi_fstat_cb()
  target/xtensa: Remove tswap() calls in semihosting simcall() helper
  accel/tcg: Un-inline translator_is_same_page()
  accel/tcg: Include missing 'exec/translation-block.h' header
  accel/tcg: Move tcg_cflags_has/set() to 'exec/translation-block.h'
  accel/tcg: Restrict curr_cflags() declaration to 'internal-common.h'
  qemu/coroutine: Include missing 'qemu/atomic.h' header
  exec/translation-block: Include missing 'qemu/atomic.h' header
  accel/tcg: Declare cpu_loop_exit_requested() in 'exec/cpu-common.h'
  exec/cpu-all: Include 'cpu.h' earlier so MMU_USER_IDX is always defined
  target/sparc: Move sparc_restore_state_to_opc() to cpu.c
  target/sparc: Uninline cpu_get_tb_cpu_state()
  target/loongarch: Declare loongarch_cpu_dump_state() locally
  user: Move various declarations out of 'exec/exec-all.h'
  ...
Conflicts:
	hw/char/riscv_htif.c
	hw/intc/riscv_aplic.c
	target/s390x/cpu.c
	Apply sysemu header path changes to not in the pull request.
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
		
	
			
		
			
				
	
	
		
			351 lines
		
	
	
		
			10 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			351 lines
		
	
	
		
			10 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
/*
 | 
						|
 * QEMU IDE Emulation: PCI cmd646 support.
 | 
						|
 *
 | 
						|
 * Copyright (c) 2003 Fabrice Bellard
 | 
						|
 * Copyright (c) 2006 Openedhand Ltd.
 | 
						|
 *
 | 
						|
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 | 
						|
 * of this software and associated documentation files (the "Software"), to deal
 | 
						|
 * in the Software without restriction, including without limitation the rights
 | 
						|
 * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 | 
						|
 * copies of the Software, and to permit persons to whom the Software is
 | 
						|
 * furnished to do so, subject to the following conditions:
 | 
						|
 *
 | 
						|
 * The above copyright notice and this permission notice shall be included in
 | 
						|
 * all copies or substantial portions of the Software.
 | 
						|
 *
 | 
						|
 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 | 
						|
 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 | 
						|
 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
 | 
						|
 * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 | 
						|
 * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 | 
						|
 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 | 
						|
 * THE SOFTWARE.
 | 
						|
 */
 | 
						|
 | 
						|
#include "qemu/osdep.h"
 | 
						|
#include "hw/pci/pci.h"
 | 
						|
#include "hw/qdev-properties.h"
 | 
						|
#include "migration/vmstate.h"
 | 
						|
#include "qemu/module.h"
 | 
						|
#include "hw/isa/isa.h"
 | 
						|
#include "system/dma.h"
 | 
						|
#include "system/reset.h"
 | 
						|
 | 
						|
#include "hw/ide/pci.h"
 | 
						|
#include "ide-internal.h"
 | 
						|
#include "trace.h"
 | 
						|
 | 
						|
/* CMD646 specific */
 | 
						|
#define CFR                  0x50
 | 
						|
#define   CFR_INTR_CH0       0x04
 | 
						|
#define CNTRL                0x51
 | 
						|
#define   CNTRL_EN_CH0       0x04
 | 
						|
#define   CNTRL_EN_CH1       0x08
 | 
						|
#define ARTTIM23             0x57
 | 
						|
#define    ARTTIM23_INTR_CH1 0x10
 | 
						|
#define MRDMODE              0x71
 | 
						|
#define   MRDMODE_INTR_CH0   0x04
 | 
						|
#define   MRDMODE_INTR_CH1   0x08
 | 
						|
#define   MRDMODE_BLK_CH0    0x10
 | 
						|
#define   MRDMODE_BLK_CH1    0x20
 | 
						|
#define UDIDETCR0            0x73
 | 
						|
#define UDIDETCR1            0x7B
 | 
						|
 | 
						|
static void cmd646_update_irq(PCIDevice *pd);
 | 
						|
 | 
						|
static void cmd646_update_dma_interrupts(PCIDevice *pd)
 | 
						|
{
 | 
						|
    /* Sync DMA interrupt status from UDMA interrupt status */
 | 
						|
    if (pd->config[MRDMODE] & MRDMODE_INTR_CH0) {
 | 
						|
        pd->config[CFR] |= CFR_INTR_CH0;
 | 
						|
    } else {
 | 
						|
        pd->config[CFR] &= ~CFR_INTR_CH0;
 | 
						|
    }
 | 
						|
 | 
						|
    if (pd->config[MRDMODE] & MRDMODE_INTR_CH1) {
 | 
						|
        pd->config[ARTTIM23] |= ARTTIM23_INTR_CH1;
 | 
						|
    } else {
 | 
						|
        pd->config[ARTTIM23] &= ~ARTTIM23_INTR_CH1;
 | 
						|
    }
 | 
						|
}
 | 
						|
 | 
						|
static void cmd646_update_udma_interrupts(PCIDevice *pd)
 | 
						|
{
 | 
						|
    /* Sync UDMA interrupt status from DMA interrupt status */
 | 
						|
    if (pd->config[CFR] & CFR_INTR_CH0) {
 | 
						|
        pd->config[MRDMODE] |= MRDMODE_INTR_CH0;
 | 
						|
    } else {
 | 
						|
        pd->config[MRDMODE] &= ~MRDMODE_INTR_CH0;
 | 
						|
    }
 | 
						|
 | 
						|
    if (pd->config[ARTTIM23] & ARTTIM23_INTR_CH1) {
 | 
						|
        pd->config[MRDMODE] |= MRDMODE_INTR_CH1;
 | 
						|
    } else {
 | 
						|
        pd->config[MRDMODE] &= ~MRDMODE_INTR_CH1;
 | 
						|
    }
 | 
						|
}
 | 
						|
 | 
						|
static uint64_t bmdma_read(void *opaque, hwaddr addr,
 | 
						|
                           unsigned size)
 | 
						|
{
 | 
						|
    BMDMAState *bm = opaque;
 | 
						|
    PCIDevice *pci_dev = PCI_DEVICE(bm->pci_dev);
 | 
						|
    uint32_t val;
 | 
						|
 | 
						|
    if (size != 1) {
 | 
						|
        return ((uint64_t)1 << (size * 8)) - 1;
 | 
						|
    }
 | 
						|
 | 
						|
    switch(addr & 3) {
 | 
						|
    case 0:
 | 
						|
        val = bm->cmd;
 | 
						|
        break;
 | 
						|
    case 1:
 | 
						|
        val = pci_dev->config[MRDMODE];
 | 
						|
        break;
 | 
						|
    case 2:
 | 
						|
        val = bm->status;
 | 
						|
        break;
 | 
						|
    case 3:
 | 
						|
        if (bm == &bm->pci_dev->bmdma[0]) {
 | 
						|
            val = pci_dev->config[UDIDETCR0];
 | 
						|
        } else {
 | 
						|
            val = pci_dev->config[UDIDETCR1];
 | 
						|
        }
 | 
						|
        break;
 | 
						|
    default:
 | 
						|
        val = 0xff;
 | 
						|
        break;
 | 
						|
    }
 | 
						|
 | 
						|
    trace_bmdma_read_cmd646(addr, val);
 | 
						|
    return val;
 | 
						|
}
 | 
						|
 | 
						|
static void bmdma_write(void *opaque, hwaddr addr,
 | 
						|
                        uint64_t val, unsigned size)
 | 
						|
{
 | 
						|
    BMDMAState *bm = opaque;
 | 
						|
    PCIDevice *pci_dev = PCI_DEVICE(bm->pci_dev);
 | 
						|
 | 
						|
    if (size != 1) {
 | 
						|
        return;
 | 
						|
    }
 | 
						|
 | 
						|
    trace_bmdma_write_cmd646(addr, val);
 | 
						|
    switch(addr & 3) {
 | 
						|
    case 0:
 | 
						|
        bmdma_cmd_writeb(bm, val);
 | 
						|
        break;
 | 
						|
    case 1:
 | 
						|
        pci_dev->config[MRDMODE] =
 | 
						|
            (pci_dev->config[MRDMODE] & ~0x30) | (val & 0x30);
 | 
						|
        cmd646_update_dma_interrupts(pci_dev);
 | 
						|
        cmd646_update_irq(pci_dev);
 | 
						|
        break;
 | 
						|
    case 2:
 | 
						|
        bmdma_status_writeb(bm, val);
 | 
						|
        break;
 | 
						|
    case 3:
 | 
						|
        if (bm == &bm->pci_dev->bmdma[0]) {
 | 
						|
            pci_dev->config[UDIDETCR0] = val;
 | 
						|
        } else {
 | 
						|
            pci_dev->config[UDIDETCR1] = val;
 | 
						|
        }
 | 
						|
        break;
 | 
						|
    }
 | 
						|
}
 | 
						|
 | 
						|
static const MemoryRegionOps cmd646_bmdma_ops = {
 | 
						|
    .read = bmdma_read,
 | 
						|
    .write = bmdma_write,
 | 
						|
};
 | 
						|
 | 
						|
static void bmdma_setup_bar(PCIIDEState *d)
 | 
						|
{
 | 
						|
    BMDMAState *bm;
 | 
						|
    int i;
 | 
						|
 | 
						|
    memory_region_init(&d->bmdma_bar, OBJECT(d), "cmd646-bmdma", 16);
 | 
						|
    for(i = 0;i < 2; i++) {
 | 
						|
        bm = &d->bmdma[i];
 | 
						|
        memory_region_init_io(&bm->extra_io, OBJECT(d), &cmd646_bmdma_ops, bm,
 | 
						|
                              "cmd646-bmdma-bus", 4);
 | 
						|
        memory_region_add_subregion(&d->bmdma_bar, i * 8, &bm->extra_io);
 | 
						|
        memory_region_init_io(&bm->addr_ioport, OBJECT(d),
 | 
						|
                              &bmdma_addr_ioport_ops, bm,
 | 
						|
                              "cmd646-bmdma-ioport", 4);
 | 
						|
        memory_region_add_subregion(&d->bmdma_bar, i * 8 + 4, &bm->addr_ioport);
 | 
						|
    }
 | 
						|
}
 | 
						|
 | 
						|
static void cmd646_update_irq(PCIDevice *pd)
 | 
						|
{
 | 
						|
    int pci_level;
 | 
						|
 | 
						|
    pci_level = ((pd->config[MRDMODE] & MRDMODE_INTR_CH0) &&
 | 
						|
                 !(pd->config[MRDMODE] & MRDMODE_BLK_CH0)) ||
 | 
						|
        ((pd->config[MRDMODE] & MRDMODE_INTR_CH1) &&
 | 
						|
         !(pd->config[MRDMODE] & MRDMODE_BLK_CH1));
 | 
						|
    pci_set_irq(pd, pci_level);
 | 
						|
}
 | 
						|
 | 
						|
/* the PCI irq level is the logical OR of the two channels */
 | 
						|
static void cmd646_set_irq(void *opaque, int channel, int level)
 | 
						|
{
 | 
						|
    PCIIDEState *d = opaque;
 | 
						|
    PCIDevice *pd = PCI_DEVICE(d);
 | 
						|
    int irq_mask;
 | 
						|
 | 
						|
    irq_mask = MRDMODE_INTR_CH0 << channel;
 | 
						|
    if (level) {
 | 
						|
        pd->config[MRDMODE] |= irq_mask;
 | 
						|
    } else {
 | 
						|
        pd->config[MRDMODE] &= ~irq_mask;
 | 
						|
    }
 | 
						|
    cmd646_update_dma_interrupts(pd);
 | 
						|
    cmd646_update_irq(pd);
 | 
						|
}
 | 
						|
 | 
						|
static void cmd646_reset(DeviceState *dev)
 | 
						|
{
 | 
						|
    PCIIDEState *d = PCI_IDE(dev);
 | 
						|
    unsigned int i;
 | 
						|
 | 
						|
    for (i = 0; i < 2; i++) {
 | 
						|
        ide_bus_reset(&d->bus[i]);
 | 
						|
    }
 | 
						|
}
 | 
						|
 | 
						|
static uint32_t cmd646_pci_config_read(PCIDevice *d,
 | 
						|
                                       uint32_t address, int len)
 | 
						|
{
 | 
						|
    return pci_default_read_config(d, address, len);
 | 
						|
}
 | 
						|
 | 
						|
static void cmd646_pci_config_write(PCIDevice *d, uint32_t addr, uint32_t val,
 | 
						|
                                    int l)
 | 
						|
{
 | 
						|
    uint32_t i;
 | 
						|
 | 
						|
    pci_default_write_config(d, addr, val, l);
 | 
						|
 | 
						|
    for (i = addr; i < addr + l; i++) {
 | 
						|
        switch (i) {
 | 
						|
        case CFR:
 | 
						|
        case ARTTIM23:
 | 
						|
            cmd646_update_udma_interrupts(d);
 | 
						|
            break;
 | 
						|
        case MRDMODE:
 | 
						|
            cmd646_update_dma_interrupts(d);
 | 
						|
            break;
 | 
						|
        }
 | 
						|
    }
 | 
						|
 | 
						|
    cmd646_update_irq(d);
 | 
						|
}
 | 
						|
 | 
						|
/* CMD646 PCI IDE controller */
 | 
						|
static void pci_cmd646_ide_realize(PCIDevice *dev, Error **errp)
 | 
						|
{
 | 
						|
    PCIIDEState *d = PCI_IDE(dev);
 | 
						|
    DeviceState *ds = DEVICE(dev);
 | 
						|
    uint8_t *pci_conf = dev->config;
 | 
						|
    int i;
 | 
						|
 | 
						|
    pci_conf[PCI_CLASS_PROG] = 0x8f;
 | 
						|
 | 
						|
    pci_conf[CNTRL] = CNTRL_EN_CH0; // enable IDE0
 | 
						|
    if (d->secondary) {
 | 
						|
        /* XXX: if not enabled, really disable the secondary IDE controller */
 | 
						|
        pci_conf[CNTRL] |= CNTRL_EN_CH1; /* enable IDE1 */
 | 
						|
    }
 | 
						|
 | 
						|
    /* Set write-to-clear interrupt bits */
 | 
						|
    dev->wmask[CFR] = 0x0;
 | 
						|
    dev->w1cmask[CFR] = CFR_INTR_CH0;
 | 
						|
    dev->wmask[ARTTIM23] = 0x0;
 | 
						|
    dev->w1cmask[ARTTIM23] = ARTTIM23_INTR_CH1;
 | 
						|
    dev->wmask[MRDMODE] = 0x0;
 | 
						|
    dev->w1cmask[MRDMODE] = MRDMODE_INTR_CH0 | MRDMODE_INTR_CH1;
 | 
						|
 | 
						|
    memory_region_init_io(&d->data_bar[0], OBJECT(d), &pci_ide_data_le_ops,
 | 
						|
                          &d->bus[0], "cmd646-data0", 8);
 | 
						|
    pci_register_bar(dev, 0, PCI_BASE_ADDRESS_SPACE_IO, &d->data_bar[0]);
 | 
						|
 | 
						|
    memory_region_init_io(&d->cmd_bar[0], OBJECT(d), &pci_ide_cmd_le_ops,
 | 
						|
                          &d->bus[0], "cmd646-cmd0", 4);
 | 
						|
    pci_register_bar(dev, 1, PCI_BASE_ADDRESS_SPACE_IO, &d->cmd_bar[0]);
 | 
						|
 | 
						|
    memory_region_init_io(&d->data_bar[1], OBJECT(d), &pci_ide_data_le_ops,
 | 
						|
                          &d->bus[1], "cmd646-data1", 8);
 | 
						|
    pci_register_bar(dev, 2, PCI_BASE_ADDRESS_SPACE_IO, &d->data_bar[1]);
 | 
						|
 | 
						|
    memory_region_init_io(&d->cmd_bar[1], OBJECT(d), &pci_ide_cmd_le_ops,
 | 
						|
                          &d->bus[1], "cmd646-cmd1", 4);
 | 
						|
    pci_register_bar(dev, 3, PCI_BASE_ADDRESS_SPACE_IO, &d->cmd_bar[1]);
 | 
						|
 | 
						|
    bmdma_setup_bar(d);
 | 
						|
    pci_register_bar(dev, 4, PCI_BASE_ADDRESS_SPACE_IO, &d->bmdma_bar);
 | 
						|
 | 
						|
    /* TODO: RST# value should be 0 */
 | 
						|
    pci_conf[PCI_INTERRUPT_PIN] = 0x01; // interrupt on pin 1
 | 
						|
 | 
						|
    qdev_init_gpio_in(ds, cmd646_set_irq, 2);
 | 
						|
    for (i = 0; i < 2; i++) {
 | 
						|
        ide_bus_init(&d->bus[i], sizeof(d->bus[i]), ds, i, 2);
 | 
						|
        ide_bus_init_output_irq(&d->bus[i], qdev_get_gpio_in(ds, i));
 | 
						|
 | 
						|
        bmdma_init(&d->bus[i], &d->bmdma[i], d);
 | 
						|
        ide_bus_register_restart_cb(&d->bus[i]);
 | 
						|
    }
 | 
						|
}
 | 
						|
 | 
						|
static void pci_cmd646_ide_exitfn(PCIDevice *dev)
 | 
						|
{
 | 
						|
    PCIIDEState *d = PCI_IDE(dev);
 | 
						|
    unsigned i;
 | 
						|
 | 
						|
    for (i = 0; i < 2; ++i) {
 | 
						|
        memory_region_del_subregion(&d->bmdma_bar, &d->bmdma[i].extra_io);
 | 
						|
        memory_region_del_subregion(&d->bmdma_bar, &d->bmdma[i].addr_ioport);
 | 
						|
    }
 | 
						|
}
 | 
						|
 | 
						|
static const Property cmd646_ide_properties[] = {
 | 
						|
    DEFINE_PROP_UINT32("secondary", PCIIDEState, secondary, 0),
 | 
						|
};
 | 
						|
 | 
						|
static void cmd646_ide_class_init(ObjectClass *klass, void *data)
 | 
						|
{
 | 
						|
    DeviceClass *dc = DEVICE_CLASS(klass);
 | 
						|
    PCIDeviceClass *k = PCI_DEVICE_CLASS(klass);
 | 
						|
 | 
						|
    device_class_set_legacy_reset(dc, cmd646_reset);
 | 
						|
    dc->vmsd = &vmstate_ide_pci;
 | 
						|
    k->realize = pci_cmd646_ide_realize;
 | 
						|
    k->exit = pci_cmd646_ide_exitfn;
 | 
						|
    k->vendor_id = PCI_VENDOR_ID_CMD;
 | 
						|
    k->device_id = PCI_DEVICE_ID_CMD_646;
 | 
						|
    k->revision = 0x07;
 | 
						|
    k->class_id = PCI_CLASS_STORAGE_IDE;
 | 
						|
    k->config_read = cmd646_pci_config_read;
 | 
						|
    k->config_write = cmd646_pci_config_write;
 | 
						|
    device_class_set_props(dc, cmd646_ide_properties);
 | 
						|
    set_bit(DEVICE_CATEGORY_STORAGE, dc->categories);
 | 
						|
}
 | 
						|
 | 
						|
static const TypeInfo cmd646_ide_info = {
 | 
						|
    .name          = "cmd646-ide",
 | 
						|
    .parent        = TYPE_PCI_IDE,
 | 
						|
    .class_init    = cmd646_ide_class_init,
 | 
						|
};
 | 
						|
 | 
						|
static void cmd646_ide_register_types(void)
 | 
						|
{
 | 
						|
    type_register_static(&cmd646_ide_info);
 | 
						|
}
 | 
						|
 | 
						|
type_init(cmd646_ide_register_types)
 |