Remove stray direct access
Signed-off-by: Alex Williamson <alex.william...@redhat.com>
---
hw/acpi_piix4.c | 53 +++++++++++++++++++++++++++--------------------------
1 files changed, 27 insertions(+), 26 deletions(-)
diff --git a/hw/acpi_piix4.c b/hw/acpi_piix4.c
index 6ee832a..c1b1532 100644
--- a/hw/acpi_piix4.c
+++ b/hw/acpi_piix4.c
@@ -173,11 +173,12 @@ static const IORangeOps pm_iorange_ops = {
static void apm_ctrl_changed(uint32_t val, void *arg)
{
PIIX4PMState *s = arg;
+ PCIDevice *dev = &s->dev;
/* ACPI specs 3.0, 4.7.2.5 */
acpi_pm1_cnt_update(&s->ar, val == ACPI_ENABLE, val == ACPI_DISABLE);
- if (s->dev.config[0x5b] & (1 << 1)) {
+ if (pci_get_byte(dev->config + 0x5b) & (1 << 1)) {
if (s->smi_irq) {
qemu_irq_raise(s->smi_irq);
}
@@ -191,10 +192,11 @@ static void acpi_dbg_writel(void *opaque, uint32_t addr,
uint32_t val)
static void pm_io_space_update(PIIX4PMState *s)
{
+ PCIDevice *dev = &s->dev;
uint32_t pm_io_base;
- if (s->dev.config[0x80] & 1) {
- pm_io_base = le32_to_cpu(*(uint32_t *)(s->dev.config + 0x40));
+ if (pci_get_byte(dev->config + 0x80) & 1) {
+ pm_io_base = pci_get_long(dev->config + 0x40);
pm_io_base &= 0xffc0;
/* XXX: need to improve memory and ioport allocation */
@@ -297,16 +299,16 @@ static void piix4_update_hotplug(PIIX4PMState *s)
static void piix4_reset(void *opaque)
{
PIIX4PMState *s = opaque;
- uint8_t *pci_conf = s->dev.config;
+ PCIDevice *dev = &s->dev;
- pci_conf[0x58] = 0;
- pci_conf[0x59] = 0;
- pci_conf[0x5a] = 0;
- pci_conf[0x5b] = 0;
+ pci_set_byte(dev->config + 0x58, 0);
+ pci_set_byte(dev->config + 0x59, 0);
+ pci_set_byte(dev->config + 0x5a, 0);
+ pci_set_byte(dev->config + 0x5b, 0);
if (s->kvm_enabled) {
/* Mark SMM as already inited (until KVM supports SMM). */
- pci_conf[0x5B] = 0x02;
+ pci_set_byte(dev->config + 0x5B, 0x02);
}
piix4_update_hotplug(s);
}
@@ -322,13 +324,14 @@ static void piix4_powerdown(void *opaque, int irq, int
power_failing)
static void piix4_pm_machine_ready(Notifier *n, void *opaque)
{
PIIX4PMState *s = container_of(n, PIIX4PMState, machine_ready);
- uint8_t *pci_conf;
+ PCIDevice *dev = &s->dev;
- pci_conf = s->dev.config;
- pci_conf[0x5f] = (isa_is_ioport_assigned(0x378) ? 0x80 : 0) | 0x10;
- pci_conf[0x63] = 0x60;
- pci_conf[0x67] = (isa_is_ioport_assigned(0x3f8) ? 0x08 : 0) |
- (isa_is_ioport_assigned(0x2f8) ? 0x90 : 0);
+ pci_set_byte(dev->config + 0x5f,
+ (isa_is_ioport_assigned(0x378) ? 0x80 : 0) | 0x10);
+ pci_set_byte(dev->config + 0x63, 0x60);
+ pci_set_byte(dev->config + 0x67,
+ (isa_is_ioport_assigned(0x3f8) ? 0x08 : 0) |
+ (isa_is_ioport_assigned(0x2f8) ? 0x90 : 0));
}
@@ -337,18 +340,16 @@ static PIIX4PMState *global_piix4_pm_state; /* cpu hotadd
*/
static int piix4_pm_initfn(PCIDevice *dev)
{
PIIX4PMState *s = DO_UPCAST(PIIX4PMState, dev, dev);
- uint8_t *pci_conf;
/* for cpu hotadd */
global_piix4_pm_state = s;
- pci_conf = s->dev.config;
- pci_conf[0x06] = 0x80;
- pci_conf[0x07] = 0x02;
- pci_conf[0x09] = 0x00;
- pci_conf[0x3d] = 0x01; // interrupt pin 1
+ pci_set_byte(dev->config + 0x06, 0x80);
+ pci_set_byte(dev->config + 0x07, 0x02);
+ pci_set_byte(dev->config + 0x09, 0x00);
+ pci_set_byte(dev->config + 0x3d, 0x01); /* interrupt pin 1 */
- pci_conf[0x40] = 0x01; /* PM io base read only bit */
+ pci_set_byte(dev->config + 0x40, 0x01); /* PM io base read only bit */
/* APM */
apm_init(&s->apm, apm_ctrl_changed, s);
@@ -358,14 +359,14 @@ static int piix4_pm_initfn(PCIDevice *dev)
if (s->kvm_enabled) {
/* Mark SMM as already inited to prevent SMM from running. KVM does
not
* support SMM mode. */
- pci_conf[0x5B] = 0x02;
+ pci_set_byte(dev->config + 0x5B, 0x02);
}
/* XXX: which specification is used ? The i82731AB has different
mappings */
- pci_conf[0x90] = s->smb_io_base | 1;
- pci_conf[0x91] = s->smb_io_base >> 8;
- pci_conf[0xd2] = 0x09;
+ pci_set_byte(dev->config + 0x90, s->smb_io_base | 1);
+ pci_set_byte(dev->config + 0x91, s->smb_io_base >> 8);
+ pci_set_byte(dev->config + 0xd2, 0x09);
register_ioport_write(s->smb_io_base, 64, 1, smb_ioport_writeb, &s->smb);
register_ioport_read(s->smb_io_base, 64, 1, smb_ioport_readb, &s->smb);
