[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 14/21] fw_cfg: move setting of FW_CFG_VERSION_DMA bit
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PULL 14/21] fw_cfg: move setting of FW_CFG_VERSION_DMA bit to fw_cfg_init1() |
Date: |
Mon, 3 Jul 2017 22:45:38 +0300 |
From: Mark Cave-Ayland <address@hidden>
The setting of the FW_CFG_VERSION_DMA bit is the same across both the
TYPE_FW_CFG_MEM and TYPE_FW_CFG_IO devices, so unify the logic in
fw_cfg_init1().
Signed-off-by: Mark Cave-Ayland <address@hidden>
Reviewed-by: Laszlo Ersek <address@hidden>
Reviewed-by: Eduardo Habkost <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Tested-by: Gabriel Somlo <address@hidden>
---
hw/nvram/fw_cfg.c | 16 +++++++---------
1 file changed, 7 insertions(+), 9 deletions(-)
diff --git a/hw/nvram/fw_cfg.c b/hw/nvram/fw_cfg.c
index 4e4f71a..99bdbc2 100644
--- a/hw/nvram/fw_cfg.c
+++ b/hw/nvram/fw_cfg.c
@@ -913,6 +913,7 @@ static void fw_cfg_init1(DeviceState *dev)
{
FWCfgState *s = FW_CFG(dev);
MachineState *machine = MACHINE(qdev_get_machine());
+ uint32_t version = FW_CFG_VERSION;
assert(!object_resolve_path(FW_CFG_PATH, NULL));
@@ -927,6 +928,12 @@ static void fw_cfg_init1(DeviceState *dev)
fw_cfg_bootsplash(s);
fw_cfg_reboot(s);
+ if (s->dma_enabled) {
+ version |= FW_CFG_VERSION_DMA;
+ }
+
+ fw_cfg_add_i32(s, FW_CFG_ID, version);
+
s->machine_ready.notify = fw_cfg_machine_ready;
qemu_add_machine_init_done_notifier(&s->machine_ready);
}
@@ -938,7 +945,6 @@ FWCfgState *fw_cfg_init_io_dma(uint32_t iobase, uint32_t
dma_iobase,
SysBusDevice *sbd;
FWCfgIoState *ios;
FWCfgState *s;
- uint32_t version = FW_CFG_VERSION;
bool dma_requested = dma_iobase && dma_as;
dev = qdev_create(NULL, TYPE_FW_CFG_IO);
@@ -959,12 +965,8 @@ FWCfgState *fw_cfg_init_io_dma(uint32_t iobase, uint32_t
dma_iobase,
s->dma_as = dma_as;
s->dma_addr = 0;
sysbus_add_io(sbd, dma_iobase, &s->dma_iomem);
-
- version |= FW_CFG_VERSION_DMA;
}
- fw_cfg_add_i32(s, FW_CFG_ID, version);
-
return s;
}
@@ -980,7 +982,6 @@ FWCfgState *fw_cfg_init_mem_wide(hwaddr ctl_addr,
DeviceState *dev;
SysBusDevice *sbd;
FWCfgState *s;
- uint32_t version = FW_CFG_VERSION;
bool dma_requested = dma_addr && dma_as;
dev = qdev_create(NULL, TYPE_FW_CFG_MEM);
@@ -1001,11 +1002,8 @@ FWCfgState *fw_cfg_init_mem_wide(hwaddr ctl_addr,
s->dma_as = dma_as;
s->dma_addr = 0;
sysbus_mmio_map(sbd, 2, dma_addr);
- version |= FW_CFG_VERSION_DMA;
}
- fw_cfg_add_i32(s, FW_CFG_ID, version);
-
return s;
}
--
MST
- [Qemu-devel] [PULL 04/21] pci: Clean up error checking in pci_add_capability(), (continued)
- [Qemu-devel] [PULL 04/21] pci: Clean up error checking in pci_add_capability(), Michael S. Tsirkin, 2017/07/03
- [Qemu-devel] [PULL 05/21] pci: Add comment for pci_add_capability2(), Michael S. Tsirkin, 2017/07/03
- [Qemu-devel] [PULL 06/21] pci: Fix the wrong assertion., Michael S. Tsirkin, 2017/07/03
- [Qemu-devel] [PULL 07/21] pci: Make errp the last parameter of pci_add_capability(), Michael S. Tsirkin, 2017/07/03
- [Qemu-devel] [PULL 08/21] pci: Replace pci_add_capability2() with pci_add_capability(), Michael S. Tsirkin, 2017/07/03
- [Qemu-devel] [PULL 09/21] pci: Convert to realize, Michael S. Tsirkin, 2017/07/03
- [Qemu-devel] [PULL 10/21] pci: Convert shpc_init() to Error, Michael S. Tsirkin, 2017/07/03
- [Qemu-devel] [PULL 11/21] i386/kvm/pci-assign: Fix return type of verify_irqchip_kernel(), Michael S. Tsirkin, 2017/07/03
- [Qemu-devel] [PULL 12/21] i386/kvm/pci-assign: Use errp directly rather than local_err, Michael S. Tsirkin, 2017/07/03
- [Qemu-devel] [PULL 15/21] hw/acpi: remove dead acpi code, Michael S. Tsirkin, 2017/07/03
- [Qemu-devel] [PULL 14/21] fw_cfg: move setting of FW_CFG_VERSION_DMA bit to fw_cfg_init1(),
Michael S. Tsirkin <=
- [Qemu-devel] [PULL 13/21] fw_cfg: don't map the fw_cfg IO ports in fw_cfg_io_realize(), Michael S. Tsirkin, 2017/07/03
- [Qemu-devel] [PULL 16/21] intel_iommu: fix migration breakage on mr switch, Michael S. Tsirkin, 2017/07/03
- [Qemu-devel] [PULL 17/21] vhost: ensure vhost_ops are set before calling iotlb callback, Michael S. Tsirkin, 2017/07/03
- [Qemu-devel] [PULL 18/21] vhost-user: unregister slave req handler at cleanup time, Michael S. Tsirkin, 2017/07/03
- [Qemu-devel] [PULL 20/21] virtio-net: fix tx queue size for !vhost-user, Michael S. Tsirkin, 2017/07/03
- [Qemu-devel] [PULL 21/21] i386/acpi: update expected acpi files, Michael S. Tsirkin, 2017/07/03
- [Qemu-devel] [PULL 19/21] tests: Add unit tests for the VM Generation ID feature, Michael S. Tsirkin, 2017/07/03