qemu-trivial.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Laurent Vivier <laurent@vivier.eu>
To: qemu-devel@nongnu.org
Cc: "Tony Krowiak" <akrowiak@linux.ibm.com>,
	"Christian Borntraeger" <borntraeger@de.ibm.com>,
	"Cornelia Huck" <cohuck@redhat.com>,
	"Farhan Ali" <alifm@linux.ibm.com>,
	qemu-s390x@nongnu.org, "Eric Farman" <farman@linux.ibm.com>,
	"Alex Williamson" <alex.williamson@redhat.com>,
	"Halil Pasic" <pasic@linux.ibm.com>,
	"Laurent Vivier" <laurent@vivier.eu>,
	qemu-trivial@nongnu.org, "Juan Quintela" <quintela@redhat.com>,
	"Michael S. Tsirkin" <mst@redhat.com>,
	"Marcel Apfelbaum" <marcel.apfelbaum@gmail.com>,
	"Michael Tokarev" <mjt@tls.msk.ru>,
	"Dr. David Alan Gilbert" <dgilbert@redhat.com>,
	"Pierre Morel" <pmorel@linux.ibm.com>,
	"Li Qiang" <liq3ea@163.com>,
	"Philippe Mathieu-Daudé" <philmd@redhat.com>,
	"Eric Auger" <eric.auger@redhat.com>
Subject: [Qemu-trivial] [PULL 9/9] pci: msix: move 'MSIX_CAP_LENGTH' to header file
Date: Wed, 22 May 2019 18:07:23 +0200	[thread overview]
Message-ID: <20190522160723.31484-10-laurent@vivier.eu> (raw)
In-Reply-To: <20190522160723.31484-1-laurent@vivier.eu>

From: Li Qiang <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>
Message-Id: <20190521151543.92274-5-liq3ea@163.com>
Acked-by: Alex Williamson <alex.williamson@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Eric Auger <eric.auger@redhat.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
 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 4e336416a78a..d39dcf32e8c9 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 08729e5875a9..8e555db12ec0 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 1f27658d352f..08acfa836e49 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.20.1



  parent reply	other threads:[~2019-05-22 16:08 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-05-22 16:07 [Qemu-trivial] [PULL 0/9] Trivial branch patches Laurent Vivier
2019-05-22 16:07 ` [Qemu-trivial] [PULL 1/9] hw/virtio/virtio-mmio: Convert DPRINTF to trace and log Laurent Vivier
2019-05-22 16:07 ` [Qemu-trivial] [PULL 2/9] roms: Correct the EDK2_BASETOOLS_OPTFLAGS variable description Laurent Vivier
2019-05-22 16:07 ` [Qemu-trivial] [PULL 3/9] roms: List and describe the Makefile 'clean' rule Laurent Vivier
2019-05-22 16:07 ` [Qemu-trivial] [PULL 4/9] migration: Fix typo in migrate_add_blocker() error message Laurent Vivier
2019-05-22 16:07 ` [Qemu-trivial] [PULL 5/9] configure: Fix spelling of sdl-image in --help Laurent Vivier
2019-05-22 16:07 ` [Qemu-trivial] [PULL 6/9] vfio: pci: make "vfio-pci-nohotplug" as MACRO Laurent Vivier
2019-05-22 16:07 ` [Qemu-trivial] [PULL 7/9] hw: vfio: drop TYPE_FOO MACRO in VMStateDescription Laurent Vivier
2019-05-22 16:07 ` [Qemu-trivial] [PULL 8/9] vfio: platform: fix a typo Laurent Vivier
2019-05-22 16:07 ` Laurent Vivier [this message]
2019-05-23 11:56 ` [Qemu-trivial] [Qemu-devel] [PULL 0/9] Trivial branch 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=20190522160723.31484-10-laurent@vivier.eu \
    --to=laurent@vivier.eu \
    --cc=akrowiak@linux.ibm.com \
    --cc=alex.williamson@redhat.com \
    --cc=alifm@linux.ibm.com \
    --cc=borntraeger@de.ibm.com \
    --cc=cohuck@redhat.com \
    --cc=dgilbert@redhat.com \
    --cc=eric.auger@redhat.com \
    --cc=farman@linux.ibm.com \
    --cc=liq3ea@163.com \
    --cc=marcel.apfelbaum@gmail.com \
    --cc=mjt@tls.msk.ru \
    --cc=mst@redhat.com \
    --cc=pasic@linux.ibm.com \
    --cc=philmd@redhat.com \
    --cc=pmorel@linux.ibm.com \
    --cc=qemu-devel@nongnu.org \
    --cc=qemu-s390x@nongnu.org \
    --cc=qemu-trivial@nongnu.org \
    --cc=quintela@redhat.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).