From: "Michael S. Tsirkin" <mst@redhat.com>
To: qemu-devel@nongnu.org
Cc: Peter Maydell <peter.maydell@linaro.org>,
Anthony Liguori <aliguori@amazon.com>,
Marcel Apfelbaum <marcel.a@redhat.com>
Subject: [Qemu-devel] [PULL 20/23] pcie: coding style tweak
Date: Mon, 23 Jun 2014 18:54:14 +0300 [thread overview]
Message-ID: <1403538745-18622-21-git-send-email-mst@redhat.com> (raw)
In-Reply-To: <1403538745-18622-1-git-send-email-mst@redhat.com>
- whitespace fix
- unnecessary != 0 in a condition
Cc: Marcel Apfelbaum <marcel.a@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
hw/pci/pcie.c | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/hw/pci/pcie.c b/hw/pci/pcie.c
index da32589..a123c01 100644
--- a/hw/pci/pcie.c
+++ b/hw/pci/pcie.c
@@ -353,11 +353,9 @@ void pcie_cap_slot_reset(PCIDevice *dev)
PCI_EXP_SLTCTL_AIC_OFF);
if (dev->cap_present & QEMU_PCIE_SLTCAP_PCP) {
- bool populated;
- uint16_t pic;
-
/* Downstream ports enforce device number 0. */
- populated = (pci_bridge_get_sec_bus(PCI_BRIDGE(dev))->devices[0] != NULL);
+ bool populated = pci_bridge_get_sec_bus(PCI_BRIDGE(dev))->devices[0];
+ uint16_t pic;
if (populated) {
pci_word_test_and_clear_mask(exp_cap + PCI_EXP_SLTCTL,
@@ -369,7 +367,7 @@ void pcie_cap_slot_reset(PCIDevice *dev)
pic = populated ? PCI_EXP_SLTCTL_PIC_ON : PCI_EXP_SLTCTL_PIC_OFF;
pci_word_test_and_set_mask(exp_cap + PCI_EXP_SLTCTL, pic);
- }
+ }
pci_word_test_and_clear_mask(exp_cap + PCI_EXP_SLTSTA,
PCI_EXP_SLTSTA_EIS |/* on reset,
--
MST
next prev parent reply other threads:[~2014-06-23 15:54 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-06-23 15:53 [Qemu-devel] [PULL 00/23] pc,pci,vhost,net fixes, enhancements Michael S. Tsirkin
2014-06-23 15:53 ` [Qemu-devel] [PULL 01/23] vhost: block migration if backend does not log memory Michael S. Tsirkin
2014-06-23 15:53 ` [Qemu-devel] [PULL 02/23] vhost: fix resource leak in error handling Michael S. Tsirkin
2014-06-23 15:53 ` [Qemu-devel] [PULL 03/23] qapi/hmp: use 'backend' instead of 'device' with memory backend Michael S. Tsirkin
2014-06-23 15:53 ` [Qemu-devel] [PULL 04/23] libqemustub: add more stubs for qemu-char Michael S. Tsirkin
2014-06-23 15:53 ` [Qemu-devel] [PULL 05/23] qtest: fix qtest for vhost-user Michael S. Tsirkin
2014-06-23 15:53 ` [Qemu-devel] [PULL 06/23] qtest: fix vhost-user-test unbalanced mutex locks Michael S. Tsirkin
2014-06-23 15:53 ` [Qemu-devel] [PULL 07/23] e1000: emulate auto-negotiation during external link status change Michael S. Tsirkin
2014-06-23 15:53 ` [Qemu-devel] [PULL 08/23] e1000: improve auto-negotiation reporting via mii-tool Michael S. Tsirkin
2014-06-23 15:53 ` [Qemu-devel] [PULL 09/23] e1000: signal guest on successful link auto-negotiation Michael S. Tsirkin
2014-06-23 15:53 ` [Qemu-devel] [PULL 10/23] e1000: move e1000_autoneg_timer() to after set_ics() Michael S. Tsirkin
2014-06-23 15:53 ` [Qemu-devel] [PULL 11/23] e1000: factor out checking for auto-negotiation availability Michael S. Tsirkin
2014-06-23 15:53 ` [Qemu-devel] [PULL 12/23] qapi/string-output-visitor: fix human output Michael S. Tsirkin
2014-06-23 15:53 ` [Qemu-devel] [PULL 13/23] qemu-char: fix qemu_chr_fe_get_msgfd() Michael S. Tsirkin
2014-06-23 15:53 ` [Qemu-devel] [PULL 14/23] qemu-char: avoid leaking unused fds in tcp_get_msgfds() Michael S. Tsirkin
2014-06-23 15:53 ` [Qemu-devel] [PULL 15/23] virtio-pci: Report an error when msix vectors init fails Michael S. Tsirkin
2014-06-23 15:54 ` [Qemu-devel] [PULL 16/23] q35: Use PC_Q35_COMPAT_1_4 on pc-q35-1.4 compat_props Michael S. Tsirkin
2014-06-23 15:54 ` [Qemu-devel] [PULL 17/23] hw/pcie: correct debug message Michael S. Tsirkin
2014-06-23 15:54 ` [Qemu-devel] [PULL 18/23] hw/pcie: implement power controller functionality Michael S. Tsirkin
2014-06-23 15:54 ` [Qemu-devel] [PULL 19/23] hw/pcie: better hotplug/hotunplug support Michael S. Tsirkin
2014-06-23 15:54 ` Michael S. Tsirkin [this message]
2014-06-23 15:54 ` [Qemu-devel] [PULL 21/23] xen-hvm: Fix xen_hvm_init() to adjust pc memory layout Michael S. Tsirkin
2014-06-23 15:54 ` [Qemu-devel] [PULL 22/23] pc & q35: Add new machine opt max-ram-below-4g Michael S. Tsirkin
2014-06-23 15:54 ` [Qemu-devel] [PULL 23/23] xen-hvm: Handle " Michael S. Tsirkin
2014-06-24 11:21 ` [Qemu-devel] [PULL 00/23] pc,pci,vhost,net fixes, enhancements Peter Maydell
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=1403538745-18622-21-git-send-email-mst@redhat.com \
--to=mst@redhat.com \
--cc=aliguori@amazon.com \
--cc=marcel.a@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
/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).