virtio: move logging definitions to hw/virtio/virtio.h

[PATCH] virtio: move logging definitions to hw/virtio/virtio.h

Paolo Bonzini posted 1 patch 1 month, 1 week ago

Download mbox

Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/20240322180329.1227880-1-pbonzini@redhat.com

Maintainers: "Michael S. Tsirkin" <mst@redhat.com>, Cornelia Huck <cohuck@redhat.com>, Paolo Bonzini <pbonzini@redhat.com>

include/hw/virtio/virtio.h                  | 7 +++++++
include/standard-headers/linux/virtio_pci.h | 7 -------
2 files changed, 7 insertions(+), 7 deletions(-)

Expand all Fold all

[PATCH] virtio: move logging definitions to hw/virtio/virtio.h

Posted by Paolo Bonzini 1 month, 1 week ago

They are not included in upstream Linux, and therefore should not be
in standard-headers.  Otherwise, the next update to the headers would
eliminate them.

Cc: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 include/hw/virtio/virtio.h                  | 7 +++++++
 include/standard-headers/linux/virtio_pci.h | 7 -------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/include/hw/virtio/virtio.h b/include/hw/virtio/virtio.h
index b3c74a1bca7..2db5eef432a 100644
--- a/include/hw/virtio/virtio.h
+++ b/include/hw/virtio/virtio.h
@@ -38,6 +38,13 @@
 #define LM_DISABLE      0x00
 #define LM_ENABLE       0x01
 
+#define LM_LOGGING_CTRL                 0
+#define LM_BASE_ADDR_LOW                4
+#define LM_BASE_ADDR_HIGH               8
+#define LM_END_ADDR_LOW                 12
+#define LM_END_ADDR_HIGH                16
+#define LM_VRING_STATE_OFFSET           0x20
+
 struct VirtQueue;
 
 static inline hwaddr vring_align(hwaddr addr,
diff --git a/include/standard-headers/linux/virtio_pci.h b/include/standard-headers/linux/virtio_pci.h
index 86733278ba3..3e2bc2c97e6 100644
--- a/include/standard-headers/linux/virtio_pci.h
+++ b/include/standard-headers/linux/virtio_pci.h
@@ -221,13 +221,6 @@ struct virtio_pci_cfg_cap {
 #define VIRTIO_PCI_COMMON_ADM_Q_IDX	60
 #define VIRTIO_PCI_COMMON_ADM_Q_NUM	62
 
-#define LM_LOGGING_CTRL                 0
-#define LM_BASE_ADDR_LOW                4
-#define LM_BASE_ADDR_HIGH               8
-#define LM_END_ADDR_LOW                 12
-#define LM_END_ADDR_HIGH                16
-#define LM_VRING_STATE_OFFSET           0x20
-
 #endif /* VIRTIO_PCI_NO_MODERN */
 
 /* Admin command status. */
-- 
2.44.0

Re: [PATCH] virtio: move logging definitions to hw/virtio/virtio.h

Posted by Philippe Mathieu-Daudé 1 month, 1 week ago

On 22/3/24 19:03, Paolo Bonzini wrote:
> They are not included in upstream Linux, and therefore should not be
> in standard-headers.  Otherwise, the next update to the headers would
> eliminate them.
> 
> Cc: Michael S. Tsirkin <mst@redhat.com>
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> ---
>   include/hw/virtio/virtio.h                  | 7 +++++++
>   include/standard-headers/linux/virtio_pci.h | 7 -------
>   2 files changed, 7 insertions(+), 7 deletions(-)

Fixes: cd341fd1ff ("hw/virtio: Add support for VDPA network simulation 
devices")
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>