[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 05/13] intel-iommu: fix coding style issues around in
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PULL 05/13] intel-iommu: fix coding style issues around in q35.c and machine.c |
Date: |
Tue, 2 Sep 2014 18:07:21 +0300 |
From: Le Tan <address@hidden>
Fix coding style issues around in hw/pci-host/q35.c and hw/core/machine.c.
Signed-off-by: Le Tan <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
---
hw/core/machine.c | 10 +++++++---
hw/pci-host/q35.c | 11 ++++++-----
2 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/hw/core/machine.c b/hw/core/machine.c
index 0708de5..f0046d6 100644
--- a/hw/core/machine.c
+++ b/hw/core/machine.c
@@ -284,10 +284,14 @@ static void machine_initfn(Object *obj)
machine_set_dump_guest_core,
NULL);
object_property_add_bool(obj, "mem-merge",
- machine_get_mem_merge, machine_set_mem_merge,
NULL);
- object_property_add_bool(obj, "usb", machine_get_usb, machine_set_usb,
NULL);
+ machine_get_mem_merge,
+ machine_set_mem_merge, NULL);
+ object_property_add_bool(obj, "usb",
+ machine_get_usb,
+ machine_set_usb, NULL);
object_property_add_str(obj, "firmware",
- machine_get_firmware, machine_set_firmware, NULL);
+ machine_get_firmware,
+ machine_set_firmware, NULL);
object_property_add_bool(obj, "iommu",
machine_get_iommu,
machine_set_iommu, NULL);
diff --git a/hw/pci-host/q35.c b/hw/pci-host/q35.c
index 721cf5b..057cab6 100644
--- a/hw/pci-host/q35.c
+++ b/hw/pci-host/q35.c
@@ -405,12 +405,13 @@ static int mch_init(PCIDevice *d)
memory_region_add_subregion_overlap(mch->system_memory, 0xa0000,
&mch->smram_region, 1);
memory_region_set_enabled(&mch->smram_region, false);
- init_pam(DEVICE(mch), mch->ram_memory, mch->system_memory,
mch->pci_address_space,
- &mch->pam_regions[0], PAM_BIOS_BASE, PAM_BIOS_SIZE);
+ init_pam(DEVICE(mch), mch->ram_memory, mch->system_memory,
+ mch->pci_address_space, &mch->pam_regions[0],
+ PAM_BIOS_BASE, PAM_BIOS_SIZE);
for (i = 0; i < 12; ++i) {
- init_pam(DEVICE(mch), mch->ram_memory, mch->system_memory,
mch->pci_address_space,
- &mch->pam_regions[i+1], PAM_EXPAN_BASE + i * PAM_EXPAN_SIZE,
- PAM_EXPAN_SIZE);
+ init_pam(DEVICE(mch), mch->ram_memory, mch->system_memory,
+ mch->pci_address_space, &mch->pam_regions[i+1],
+ PAM_EXPAN_BASE + i * PAM_EXPAN_SIZE, PAM_EXPAN_SIZE);
}
/* Intel IOMMU (VT-d) */
if (qemu_opt_get_bool(qemu_get_machine_opts(), "iommu", false)) {
--
MST
- [Qemu-devel] [PULL 00/13] pci, pc fixes, features, Michael S. Tsirkin, 2014/09/02
- [Qemu-devel] [PULL 02/13] intel-iommu: introduce Intel IOMMU (VT-d) emulation, Michael S. Tsirkin, 2014/09/02
- [Qemu-devel] [PULL 03/13] intel-iommu: add DMAR table to ACPI tables, Michael S. Tsirkin, 2014/09/02
- [Qemu-devel] [PULL 04/13] intel-iommu: add Intel IOMMU emulation to q35 and add a machine option "iommu" as a switch, Michael S. Tsirkin, 2014/09/02
- [Qemu-devel] [PULL 06/13] intel-iommu: add supports for queued invalidation interface, Michael S. Tsirkin, 2014/09/02
- [Qemu-devel] [PULL 05/13] intel-iommu: fix coding style issues around in q35.c and machine.c,
Michael S. Tsirkin <=
- [Qemu-devel] [PULL 01/13] iommu: add is_write as a parameter to the translate function of MemoryRegionIOMMUOps, Michael S. Tsirkin, 2014/09/02
- [Qemu-devel] [PULL 07/13] intel-iommu: add context-cache to cache context-entry, Michael S. Tsirkin, 2014/09/02
- [Qemu-devel] [PULL 09/13] vhost_net: cleanup start/stop condition, Michael S. Tsirkin, 2014/09/02
- [Qemu-devel] [PULL 08/13] intel-iommu: add IOTLB using hash table, Michael S. Tsirkin, 2014/09/02
- [Qemu-devel] [PULL 10/13] ioh3420: remove unused ioh3420_init() declaration, Michael S. Tsirkin, 2014/09/02
- [Qemu-devel] [PULL 11/13] virtio-net: don't run bh on vm stopped, Michael S. Tsirkin, 2014/09/02
- [Qemu-devel] [PULL 12/13] pci: avoid losing config updates to MSI/MSIX cap regs, Michael S. Tsirkin, 2014/09/02
- [Qemu-devel] [PULL 13/13] vhost_net: start/stop guest notifiers properly, Michael S. Tsirkin, 2014/09/02