1. Patchew
  2. linux
  3. View series

[PATCH v1] virtio-pci: Improve code style for including header files

Feng Liu posted 1 patch 2 years, 8 months ago 
drivers/virtio/virtio_pci_modern.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
[PATCH v1] virtio-pci: Improve code style for including header files
Posted by Feng Liu 2 years, 8 months ago 
Fix code style related to including header file. Include header files
before declaring macro definitions to avoid conflicts.

Signed-off-by: Feng Liu <feliu@nvidia.com>
Reviewed-by: Jiri Pirko <jiri@nvidia.com>
---
 drivers/virtio/virtio_pci_modern.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/virtio/virtio_pci_modern.c b/drivers/virtio/virtio_pci_modern.c
index d6bb68ba84e5..b21a489e0086 100644
--- a/drivers/virtio/virtio_pci_modern.c
+++ b/drivers/virtio/virtio_pci_modern.c
@@ -15,9 +15,10 @@
  */
 
 #include <linux/delay.h>
+#include "virtio_pci_common.h"
+
 #define VIRTIO_PCI_NO_LEGACY
 #define VIRTIO_RING_NO_LEGACY
-#include "virtio_pci_common.h"
 
 static u64 vp_get_features(struct virtio_device *vdev)
 {
-- 
2.37.1 (Apple Git-137.1)
Re: [PATCH v1] virtio-pci: Improve code style for including header files
Posted by Michael S. Tsirkin 2 years, 8 months ago 
On Mon, May 29, 2023 at 02:17:29PM -0400, Feng Liu wrote:
> Fix code style related to including header file. Include header files
> before declaring macro definitions to avoid conflicts.
> 
> Signed-off-by: Feng Liu <feliu@nvidia.com>
> Reviewed-by: Jiri Pirko <jiri@nvidia.com>

Which conflicts? These macros are there precisely to change
how the header behaves.

> ---
>  drivers/virtio/virtio_pci_modern.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/virtio/virtio_pci_modern.c b/drivers/virtio/virtio_pci_modern.c
> index d6bb68ba84e5..b21a489e0086 100644
> --- a/drivers/virtio/virtio_pci_modern.c
> +++ b/drivers/virtio/virtio_pci_modern.c
> @@ -15,9 +15,10 @@
>   */
>  
>  #include <linux/delay.h>
> +#include "virtio_pci_common.h"
> +
>  #define VIRTIO_PCI_NO_LEGACY
>  #define VIRTIO_RING_NO_LEGACY
> -#include "virtio_pci_common.h"
>  
>  static u64 vp_get_features(struct virtio_device *vdev)
>  {
> -- 
> 2.37.1 (Apple Git-137.1)
Re: [PATCH v1] virtio-pci: Improve code style for including header files
Posted by Feng Liu 2 years, 8 months ago 

On 2023-05-30 a.m.7:27, Michael S. Tsirkin wrote:
> External email: Use caution opening links or attachments
> 
> 
> On Mon, May 29, 2023 at 02:17:29PM -0400, Feng Liu wrote:
>> Fix code style related to including header file. Include header files
>> before declaring macro definitions to avoid conflicts.
>>
>> Signed-off-by: Feng Liu <feliu@nvidia.com>
>> Reviewed-by: Jiri Pirko <jiri@nvidia.com>
> 
> Which conflicts? These macros are there precisely to change
> how the header behaves.
> 

Hi Michael
     I think including the header files should be placed before the 
macro definition.
     If VIRTIO_PCI_NO_LEGACY and VIRTIO_RING_NO_LEGACY are needed for 
control header file, we should put them at the beginning of 
virtio_pci_common.h.

What do you think?

>> ---
>>   drivers/virtio/virtio_pci_modern.c | 3 ++-
>>   1 file changed, 2 insertions(+), 1 deletion(-)
>>
>> diff --git a/drivers/virtio/virtio_pci_modern.c b/drivers/virtio/virtio_pci_modern.c
>> index d6bb68ba84e5..b21a489e0086 100644
>> --- a/drivers/virtio/virtio_pci_modern.c
>> +++ b/drivers/virtio/virtio_pci_modern.c
>> @@ -15,9 +15,10 @@
>>    */
>>
>>   #include <linux/delay.h>
>> +#include "virtio_pci_common.h"
>> +
>>   #define VIRTIO_PCI_NO_LEGACY
>>   #define VIRTIO_RING_NO_LEGACY
>> -#include "virtio_pci_common.h"
>>
>>   static u64 vp_get_features(struct virtio_device *vdev)
>>   {
>> --
>> 2.37.1 (Apple Git-137.1)
>
Re: [PATCH v1] virtio-pci: Improve code style for including header files
Posted by Michael S. Tsirkin 2 years, 8 months ago 
On Tue, May 30, 2023 at 10:07:23AM -0400, Feng Liu wrote:
> 
> 
> On 2023-05-30 a.m.7:27, Michael S. Tsirkin wrote:
> > External email: Use caution opening links or attachments
> > 
> > 
> > On Mon, May 29, 2023 at 02:17:29PM -0400, Feng Liu wrote:
> > > Fix code style related to including header file. Include header files
> > > before declaring macro definitions to avoid conflicts.
> > > 
> > > Signed-off-by: Feng Liu <feliu@nvidia.com>
> > > Reviewed-by: Jiri Pirko <jiri@nvidia.com>
> > 
> > Which conflicts? These macros are there precisely to change
> > how the header behaves.
> > 
> 
> Hi Michael
>     I think including the header files should be placed before the macro
> definition.
>     If VIRTIO_PCI_NO_LEGACY and VIRTIO_RING_NO_LEGACY are needed for control
> header file, we should put them at the beginning of virtio_pci_common.h.
> 
> What do you think?

I think you should read the code in question not make guesses.

> > > ---
> > >   drivers/virtio/virtio_pci_modern.c | 3 ++-
> > >   1 file changed, 2 insertions(+), 1 deletion(-)
> > > 
> > > diff --git a/drivers/virtio/virtio_pci_modern.c b/drivers/virtio/virtio_pci_modern.c
> > > index d6bb68ba84e5..b21a489e0086 100644
> > > --- a/drivers/virtio/virtio_pci_modern.c
> > > +++ b/drivers/virtio/virtio_pci_modern.c
> > > @@ -15,9 +15,10 @@
> > >    */
> > > 
> > >   #include <linux/delay.h>
> > > +#include "virtio_pci_common.h"
> > > +
> > >   #define VIRTIO_PCI_NO_LEGACY
> > >   #define VIRTIO_RING_NO_LEGACY
> > > -#include "virtio_pci_common.h"
> > > 
> > >   static u64 vp_get_features(struct virtio_device *vdev)
> > >   {
> > > --
> > > 2.37.1 (Apple Git-137.1)
> >
Re: [PATCH v1] virtio-pci: Improve code style for including header files
Posted by Feng Liu 2 years, 8 months ago 

On 2023-05-30 a.m.11:18, Michael S. Tsirkin wrote:
> External email: Use caution opening links or attachments
> 
> 
> On Tue, May 30, 2023 at 10:07:23AM -0400, Feng Liu wrote:
>>
>>
>> On 2023-05-30 a.m.7:27, Michael S. Tsirkin wrote:
>>> External email: Use caution opening links or attachments
>>>
>>>
>>> On Mon, May 29, 2023 at 02:17:29PM -0400, Feng Liu wrote:
>>>> Fix code style related to including header file. Include header files
>>>> before declaring macro definitions to avoid conflicts.
>>>>
>>>> Signed-off-by: Feng Liu <feliu@nvidia.com>
>>>> Reviewed-by: Jiri Pirko <jiri@nvidia.com>
>>>
>>> Which conflicts? These macros are there precisely to change
>>> how the header behaves.
>>>
>>
>> Hi Michael
>>      I think including the header files should be placed before the macro
>> definition.
>>      If VIRTIO_PCI_NO_LEGACY and VIRTIO_RING_NO_LEGACY are needed for control
>> header file, we should put them at the beginning of virtio_pci_common.h.
>>
>> What do you think?
> 
> I think you should read the code in question not make guesses.
> 
Okey. I see, thx

>>>> ---
>>>>    drivers/virtio/virtio_pci_modern.c | 3 ++-
>>>>    1 file changed, 2 insertions(+), 1 deletion(-)
>>>>
>>>> diff --git a/drivers/virtio/virtio_pci_modern.c b/drivers/virtio/virtio_pci_modern.c
>>>> index d6bb68ba84e5..b21a489e0086 100644
>>>> --- a/drivers/virtio/virtio_pci_modern.c
>>>> +++ b/drivers/virtio/virtio_pci_modern.c
>>>> @@ -15,9 +15,10 @@
>>>>     */
>>>>
>>>>    #include <linux/delay.h>
>>>> +#include "virtio_pci_common.h"
>>>> +
>>>>    #define VIRTIO_PCI_NO_LEGACY
>>>>    #define VIRTIO_RING_NO_LEGACY
>>>> -#include "virtio_pci_common.h"
>>>>
>>>>    static u64 vp_get_features(struct virtio_device *vdev)
>>>>    {
>>>> --
>>>> 2.37.1 (Apple Git-137.1)
>>>
>

Patchew 2.1-devel-b67e4c2

© 2016 - 2026 Red Hat, Inc.