From: "Michael S. Tsirkin" <mst@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Peter Maydell" <peter.maydell@linaro.org>,
"Marcel Apfelbaum" <marcel.a@redhat.com>,
"Michael Roth" <mdroth@linux.vnet.ibm.com>,
"Le Tan" <tamlokveer@gmail.com>,
"Anthony Liguori" <aliguori@amazon.com>,
=?UTF-8?q?Andreas=20F=C3=A4rber?= <afaerber@suse.de>
Subject: [Qemu-devel] [PULL v2 05/16] intel-iommu: fix coding style issues around in q35.c and machine.c
Date: Wed, 3 Sep 2014 16:45:07 +0300 [thread overview]
Message-ID: <1409751723-17480-6-git-send-email-mst@redhat.com> (raw)
In-Reply-To: <1409751723-17480-1-git-send-email-mst@redhat.com>
From: Le Tan <tamlokveer@gmail.com>
Fix coding style issues around in hw/pci-host/q35.c and hw/core/machine.c.
Signed-off-by: Le Tan <tamlokveer@gmail.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
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
next prev parent reply other threads:[~2014-09-03 13:42 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-09-03 13:44 [Qemu-devel] [PULL v2 00/16] pci, pc fixes, features Michael S. Tsirkin
2014-09-03 13:44 ` [Qemu-devel] [PULL v2 01/16] iommu: add is_write as a parameter to the translate function of MemoryRegionIOMMUOps Michael S. Tsirkin
2014-09-03 13:44 ` [Qemu-devel] [PULL v2 02/16] intel-iommu: introduce Intel IOMMU (VT-d) emulation Michael S. Tsirkin
2014-09-03 13:44 ` [Qemu-devel] [PULL v2 03/16] intel-iommu: add DMAR table to ACPI tables Michael S. Tsirkin
2014-09-03 13:45 ` [Qemu-devel] [PULL v2 04/16] intel-iommu: add Intel IOMMU emulation to q35 and add a machine option "iommu" as a switch Michael S. Tsirkin
2014-09-03 13:45 ` Michael S. Tsirkin [this message]
2014-09-03 13:45 ` [Qemu-devel] [PULL v2 06/16] intel-iommu: add supports for queued invalidation interface Michael S. Tsirkin
2014-09-03 13:45 ` [Qemu-devel] [PULL v2 07/16] intel-iommu: add context-cache to cache context-entry Michael S. Tsirkin
2014-09-03 13:45 ` [Qemu-devel] [PULL v2 08/16] intel-iommu: add IOTLB using hash table Michael S. Tsirkin
2014-09-03 13:45 ` [Qemu-devel] [PULL v2 09/16] vhost_net: cleanup start/stop condition Michael S. Tsirkin
2014-09-03 13:45 ` [Qemu-devel] [PULL v2 10/16] ioh3420: remove unused ioh3420_init() declaration Michael S. Tsirkin
2014-09-03 13:45 ` [Qemu-devel] [PULL v2 11/16] virtio-net: don't run bh on vm stopped Michael S. Tsirkin
2014-09-03 13:45 ` [Qemu-devel] [PULL v2 12/16] pci: avoid losing config updates to MSI/MSIX cap regs Michael S. Tsirkin
2014-09-03 13:45 ` [Qemu-devel] [PULL v2 13/16] vhost_net: start/stop guest notifiers properly Michael S. Tsirkin
2014-09-03 13:45 ` [Qemu-devel] [PULL v2 14/16] vhost_net: init acked_features to backend_features Michael S. Tsirkin
2014-09-03 13:45 ` [Qemu-devel] [PULL v2 15/16] vhost-scsi: init backend features earlier Michael S. Tsirkin
2014-09-03 13:45 ` [Qemu-devel] [PULL v2 16/16] acpi-build: Set FORCE_APIC_CLUSTER_MODEL bit for FADT flags Michael S. Tsirkin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1409751723-17480-6-git-send-email-mst@redhat.com \
--to=mst@redhat.com \
--cc=afaerber@suse.de \
--cc=aliguori@amazon.com \
--cc=marcel.a@redhat.com \
--cc=mdroth@linux.vnet.ibm.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=tamlokveer@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).