From: Li Qiang <liq3ea@163.com>
To: alex.williamson@redhat.com, lvivier@redhat.com
Cc: qemu-trivial@nongnu.org, philmd@redhat.com, liq3ea@gmail.com,
qemu-devel@nongnu.org, Li Qiang <liq3ea@163.com>
Subject: [Qemu-devel] [PATCH v2 4/4] pci: msix: move 'MSIX_CAP_LENGTH' to header file
Date: Tue, 21 May 2019 08:15:43 -0700 [thread overview]
Message-ID: <20190521151543.92274-5-liq3ea@163.com> (raw)
In-Reply-To: <20190521151543.92274-1-liq3ea@163.com>
'MSIX_CAP_LENGTH' is defined in two .c file. Move it
to hw/pci/msix.h file to reduce duplicated code.
CC: qemu-trivial@nongnu.org
Signed-off-by: Li Qiang <liq3ea@163.com>
---
hw/pci/msix.c | 2 --
hw/vfio/pci.c | 2 --
include/hw/pci/msix.h | 2 ++
3 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/hw/pci/msix.c b/hw/pci/msix.c
index 4e336416a7..d39dcf32e8 100644
--- a/hw/pci/msix.c
+++ b/hw/pci/msix.c
@@ -24,8 +24,6 @@
#include "qapi/error.h"
#include "trace.h"
-#define MSIX_CAP_LENGTH 12
-
/* MSI enable bit and maskall bit are in byte 1 in FLAGS register */
#define MSIX_CONTROL_OFFSET (PCI_MSIX_FLAGS + 1)
#define MSIX_ENABLE_MASK (PCI_MSIX_FLAGS_ENABLE >> 8)
diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c
index 08729e5875..8e555db12e 100644
--- a/hw/vfio/pci.c
+++ b/hw/vfio/pci.c
@@ -35,8 +35,6 @@
#include "trace.h"
#include "qapi/error.h"
-#define MSIX_CAP_LENGTH 12
-
#define TYPE_VFIO_PCI "vfio-pci"
#define PCI_VFIO(obj) OBJECT_CHECK(VFIOPCIDevice, obj, TYPE_VFIO_PCI)
diff --git a/include/hw/pci/msix.h b/include/hw/pci/msix.h
index 1f27658d35..08acfa836e 100644
--- a/include/hw/pci/msix.h
+++ b/include/hw/pci/msix.h
@@ -4,6 +4,8 @@
#include "qemu-common.h"
#include "hw/pci/pci.h"
+#define MSIX_CAP_LENGTH 12
+
void msix_set_message(PCIDevice *dev, int vector, MSIMessage msg);
MSIMessage msix_get_message(PCIDevice *dev, unsigned int vector);
int msix_init(PCIDevice *dev, unsigned short nentries,
--
2.17.1
next prev parent reply other threads:[~2019-05-21 15:25 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-21 15:15 [Qemu-devel] [PATCH v2 0/4] hw: vfio: some trivial fix Li Qiang
2019-05-21 15:15 ` [Qemu-devel] [PATCH v2 1/4] vfio: pci: make "vfio-pci-nohotplug" as MACRO Li Qiang
2019-05-22 15:24 ` [Qemu-devel] [Qemu-trivial] " Laurent Vivier
2019-05-21 15:15 ` [Qemu-devel] [PATCH v2 2/4] hw: vfio: drop TYPE_FOO MACRO in VMStateDescription Li Qiang
2019-05-22 15:26 ` [Qemu-devel] [Qemu-trivial] " Laurent Vivier
2019-05-21 15:15 ` [Qemu-devel] [PATCH v2 3/4] vfio: platform: fix a typo Li Qiang
2019-05-22 15:27 ` [Qemu-devel] [Qemu-trivial] " Laurent Vivier
2019-05-21 15:15 ` Li Qiang [this message]
2019-05-22 15:28 ` [Qemu-devel] [Qemu-trivial] [PATCH v2 4/4] pci: msix: move 'MSIX_CAP_LENGTH' to header file Laurent Vivier
2019-05-21 15:37 ` [Qemu-devel] [PATCH v2 0/4] hw: vfio: some trivial fix Alex Williamson
2019-05-21 15:39 ` Philippe Mathieu-Daudé
2019-05-21 15:50 ` Auger Eric
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=20190521151543.92274-5-liq3ea@163.com \
--to=liq3ea@163.com \
--cc=alex.williamson@redhat.com \
--cc=liq3ea@gmail.com \
--cc=lvivier@redhat.com \
--cc=philmd@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=qemu-trivial@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).