| Message ID | 20201027135547.374946-10-philmd@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | block/nvme: Fix Aarch64 host | expand |
Hi, On 10/27/20 2:55 PM, Philippe Mathieu-Daudé wrote: > To be able to use some definitions in structure declarations, > move them earlier. No logical change. > > Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> Reviewed-by: Eric Auger <eric.auger@redhat.com> Eric > --- > block/nvme.c | 19 ++++++++++--------- > 1 file changed, 10 insertions(+), 9 deletions(-) > > diff --git a/block/nvme.c b/block/nvme.c > index be14350f959..30075e230ca 100644 > --- a/block/nvme.c > +++ b/block/nvme.c > @@ -41,6 +41,16 @@ > > typedef struct BDRVNVMeState BDRVNVMeState; > > +/* Same index is used for queues and IRQs */ > +#define INDEX_ADMIN 0 > +#define INDEX_IO(n) (1 + n) > + > +/* This driver shares a single MSIX IRQ for the admin and I/O queues */ > +enum { > + MSIX_SHARED_IRQ_IDX = 0, > + MSIX_IRQ_COUNT = 1 > +}; > + > typedef struct { > int32_t head, tail; > uint8_t *queue; > @@ -81,15 +91,6 @@ typedef struct { > QEMUBH *completion_bh; > } NVMeQueuePair; > > -#define INDEX_ADMIN 0 > -#define INDEX_IO(n) (1 + n) > - > -/* This driver shares a single MSIX IRQ for the admin and I/O queues */ > -enum { > - MSIX_SHARED_IRQ_IDX = 0, > - MSIX_IRQ_COUNT = 1 > -}; > - > struct BDRVNVMeState { > AioContext *aio_context; > QEMUVFIOState *vfio; >
On Tue, Oct 27, 2020 at 02:55:31PM +0100, Philippe Mathieu-Daudé wrote: > To be able to use some definitions in structure declarations, > move them earlier. No logical change. > > Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> > --- > block/nvme.c | 19 ++++++++++--------- > 1 file changed, 10 insertions(+), 9 deletions(-) Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
diff --git a/block/nvme.c b/block/nvme.c index be14350f959..30075e230ca 100644 --- a/block/nvme.c +++ b/block/nvme.c @@ -41,6 +41,16 @@ typedef struct BDRVNVMeState BDRVNVMeState; +/* Same index is used for queues and IRQs */ +#define INDEX_ADMIN 0 +#define INDEX_IO(n) (1 + n) + +/* This driver shares a single MSIX IRQ for the admin and I/O queues */ +enum { + MSIX_SHARED_IRQ_IDX = 0, + MSIX_IRQ_COUNT = 1 +}; + typedef struct { int32_t head, tail; uint8_t *queue; @@ -81,15 +91,6 @@ typedef struct { QEMUBH *completion_bh; } NVMeQueuePair; -#define INDEX_ADMIN 0 -#define INDEX_IO(n) (1 + n) - -/* This driver shares a single MSIX IRQ for the admin and I/O queues */ -enum { - MSIX_SHARED_IRQ_IDX = 0, - MSIX_IRQ_COUNT = 1 -}; - struct BDRVNVMeState { AioContext *aio_context; QEMUVFIOState *vfio;
To be able to use some definitions in structure declarations, move them earlier. No logical change. Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> --- block/nvme.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-)