From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60221) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XPAp9-0001N6-Ko for qemu-devel@nongnu.org; Wed, 03 Sep 2014 09:42:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XPAp1-0002tN-Fq for qemu-devel@nongnu.org; Wed, 03 Sep 2014 09:42:11 -0400 Received: from mx1.redhat.com ([209.132.183.28]:22903) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XPAp1-0002tB-99 for qemu-devel@nongnu.org; Wed, 03 Sep 2014 09:42:03 -0400 Date: Wed, 3 Sep 2014 16:45:07 +0300 From: "Michael S. Tsirkin" Message-ID: <1409751723-17480-6-git-send-email-mst@redhat.com> References: <1409751723-17480-1-git-send-email-mst@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1409751723-17480-1-git-send-email-mst@redhat.com> Subject: [Qemu-devel] [PULL v2 05/16] intel-iommu: fix coding style issues around in q35.c and machine.c List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , Marcel Apfelbaum , Michael Roth , Le Tan , Anthony Liguori , =?us-ascii?B?PT9VVEYtOD9xP0FuZHJlYXM9MjBGPUMzPUE0cmJlcj89?= From: Le Tan Fix coding style issues around in hw/pci-host/q35.c and hw/core/machine.c. Signed-off-by: Le Tan Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- 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