qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Jason Wang <jasowang@redhat.com>
To: peter.maydell@linaro.org, qemu-devel@nongnu.org
Cc: Miao Yan <yanmiaoebest@gmail.com>,
	Miao Yan <yanmiaobest@gmail.com>,
	Jason Wang <jasowang@redhat.com>
Subject: [Qemu-devel] [PULL 11/24] net/vmxnet3: rename VMXNET3_DEVICE_VERSION to VMXNET3_UPT_REVISION
Date: Mon, 11 Jan 2016 13:31:02 +0800	[thread overview]
Message-ID: <1452490275-18217-12-git-send-email-jasowang@redhat.com> (raw)
In-Reply-To: <1452490275-18217-1-git-send-email-jasowang@redhat.com>

From: Miao Yan <yanmiaobest@gmail.com>

VMXNET3_DEVICE_VERSION is used as return value for accessing
UPT Revision Report and Selection register. So rename it
to VMXNET3_UPT_REVISION.

Signed-off-by: Miao Yan <yanmiaoebest@gmail.com>
Reviewed-by: Dmitry Fleytman <dmitry@daynix.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>
---
 hw/net/vmxnet3.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/hw/net/vmxnet3.c b/hw/net/vmxnet3.c
index 6ba7c75..63692c5 100644
--- a/hw/net/vmxnet3.c
+++ b/hw/net/vmxnet3.c
@@ -50,7 +50,7 @@
 #define VMXNET3_LINK_STATUS_UP  0x1
 
 /* Least significant bit should be set for revision and version */
-#define VMXNET3_DEVICE_VERSION    0x1
+#define VMXNET3_UPT_REVISION      0x1
 #define VMXNET3_DEVICE_REVISION   0x1
 
 /* Number of interrupt vectors for non-MSIx modes */
@@ -1847,7 +1847,7 @@ vmxnet3_io_bar1_read(void *opaque, hwaddr addr, unsigned size)
         /* UPT Version Report Selection */
         case VMXNET3_REG_UVRS:
             VMW_CBPRN("Read BAR1 [VMXNET3_REG_UVRS], size %d", size);
-            ret = VMXNET3_DEVICE_VERSION;
+            ret = VMXNET3_UPT_REVISION;
             break;
 
         /* Command */
-- 
2.5.0

  parent reply	other threads:[~2016-01-11  5:32 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-01-11  5:30 [Qemu-devel] [PULL 00/24] Net patches Jason Wang
2016-01-11  5:30 ` [Qemu-devel] [PULL 01/24] net/vmxnet3: fix a build error when enabling debug output Jason Wang
2016-01-11  5:30 ` [Qemu-devel] [PULL 02/24] net/vmxnet3: use %zu for size_t in printf Jason Wang
2016-01-11  5:30 ` [Qemu-devel] [PULL 03/24] net/vmxnet3: fix debug macro pattern for vmxnet3 Jason Wang
2016-01-11  5:30 ` [Qemu-devel] [PULL 04/24] net/vmxnet3: remove redundant VMW_SHPRN(...) definition Jason Wang
2016-01-11  5:30 ` [Qemu-devel] [PULL 05/24] net: vmxnet3: avoid memory leakage in activate_device Jason Wang
2016-01-11  5:30 ` [Qemu-devel] [PULL 06/24] MAINTAINERS: Add an entry for the net/slirp.c file Jason Wang
2016-01-11  5:30 ` [Qemu-devel] [PULL 07/24] net/vmxnet3: return 1 on device activation failure Jason Wang
2016-01-11  5:30 ` [Qemu-devel] [PULL 08/24] net/vmxnet3: return correct value for VMXNET3_CMD_GET_DID_* command Jason Wang
2016-01-11  5:31 ` [Qemu-devel] [PULL 09/24] net/vmxnet3: return correct value for VMXNET3_CMD_GET_DEV_EXTRA_INFO Jason Wang
2016-01-11  5:31 ` [Qemu-devel] [PULL 10/24] net/vmxnet3: return 0 on unknown command Jason Wang
2016-01-11  5:31 ` Jason Wang [this message]
2016-01-11  5:31 ` [Qemu-devel] [PULL 12/24] net/dump: fix nfds->filename leak Jason Wang
2016-01-11  5:31 ` [Qemu-devel] [PULL 13/24] net/filter: fix nf->netdev_id leak Jason Wang
2016-01-11  5:31 ` [Qemu-devel] [PULL 14/24] vmxnet3: Change offsets of msi/msix pci capabilities Jason Wang
2016-01-11  5:31 ` [Qemu-devel] [PULL 15/24] vmxnet3: Change the offset of the MSIX PBA table Jason Wang
2016-01-11  5:31 ` [Qemu-devel] [PULL 16/24] vmxnet3: Introduce 'x-old-msi-offsets' back-compat property Jason Wang
2016-01-11  5:31 ` [Qemu-devel] [PULL 17/24] vmxnet3: coding: Introduce VMXNET3Class Jason Wang
2016-01-11  5:31 ` [Qemu-devel] [PULL 18/24] vmxnet3: The vmxnet3 device is a PCIE endpoint Jason Wang
2016-01-11  5:31 ` [Qemu-devel] [PULL 19/24] vmxnet3: Report the Device Serial Number capability Jason Wang
2016-01-11  5:31 ` [Qemu-devel] [PULL 20/24] vmxnet3: Introduce 'x-disable-pcie' back-compat property Jason Wang
2016-01-11  5:31 ` [Qemu-devel] [PULL 21/24] net: rocker: fix an incorrect array bounds check Jason Wang
2016-01-11  5:31 ` [Qemu-devel] [PULL 22/24] net: ne2000: fix bounds check in ioport operations Jason Wang
2016-01-11  5:31 ` [Qemu-devel] [PULL 23/24] l2tpv3: fix cookie decoding Jason Wang
2016-01-11  5:31 ` [Qemu-devel] [PULL 24/24] ether/slirp: Avoid redefinition of the same constants Jason Wang
2016-01-11 12:56 ` [Qemu-devel] [PULL 00/24] Net patches 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=1452490275-18217-12-git-send-email-jasowang@redhat.com \
    --to=jasowang@redhat.com \
    --cc=peter.maydell@linaro.org \
    --cc=qemu-devel@nongnu.org \
    --cc=yanmiaobest@gmail.com \
    --cc=yanmiaoebest@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).