Two small fixes

[libvirt] [PATCH 2/2] virarptable: Include rtnetlink.h only on Linux

Posted by Michal Privoznik 7 years, 1 month ago

And at the same time, do that from .c rather than .h file.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
---
 src/util/virarptable.c | 3 +++
 src/util/virarptable.h | 1 -
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/util/virarptable.c b/src/util/virarptable.c
index 2730ef91af..8d9ab5fdc8 100644
--- a/src/util/virarptable.c
+++ b/src/util/virarptable.c
@@ -26,6 +26,9 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <arpa/inet.h>
+#ifdef __linux__
+# include <linux/rtnetlink.h>
+#endif
 
 #include "viralloc.h"
 #include "virarptable.h"
diff --git a/src/util/virarptable.h b/src/util/virarptable.h
index 404d8eb867..6829198128 100644
--- a/src/util/virarptable.h
+++ b/src/util/virarptable.h
@@ -25,7 +25,6 @@
 # define __VIR_ARPTABLE_H__
 
 # include "internal.h"
-# include <linux/rtnetlink.h>
 
 typedef struct _virArpTableEntry virArpTableEntry;
 typedef virArpTableEntry *virArpTableEntryPtr;
-- 
2.16.1

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

Re: [libvirt] [PATCH 2/2] virarptable: Include rtnetlink.h only on Linux

Posted by Chen Hanxiao 7 years, 1 month ago


At 2018-03-15 20:49:30, "Michal Privoznik" <mprivozn@redhat.com> wrote:
>And at the same time, do that from .c rather than .h file.
>
>Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
>---
> src/util/virarptable.c | 3 +++
> src/util/virarptable.h | 1 -
> 2 files changed, 3 insertions(+), 1 deletion(-)
>
>diff --git a/src/util/virarptable.c b/src/util/virarptable.c
>index 2730ef91af..8d9ab5fdc8 100644
>--- a/src/util/virarptable.c
>+++ b/src/util/virarptable.c
>@@ -26,6 +26,9 @@
> #include <stdlib.h>
> #include <stdio.h>
> #include <arpa/inet.h>
>+#ifdef __linux__
>+# include <linux/rtnetlink.h>
>+#endif
> 
> #include "viralloc.h"
> #include "virarptable.h"
>diff --git a/src/util/virarptable.h b/src/util/virarptable.h
>index 404d8eb867..6829198128 100644
>--- a/src/util/virarptable.h
>+++ b/src/util/virarptable.h
>@@ -25,7 +25,6 @@
> # define __VIR_ARPTABLE_H__
> 
> # include "internal.h"
>-# include <linux/rtnetlink.h>
> 
> typedef struct _virArpTableEntry virArpTableEntry;
> typedef virArpTableEntry *virArpTableEntryPtr;
>-- 

Reviewed-by: Chen Hanxiao<chenhanxiao@gmail.com>

Regards,
- Chen

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

Re: [libvirt] [PATCH 2/2] virarptable: Include rtnetlink.h only on Linux

Posted by Daniel P. Berrangé 7 years, 1 month ago

On Thu, Mar 15, 2018 at 01:49:30PM +0100, Michal Privoznik wrote:
> And at the same time, do that from .c rather than .h file.
> 
> Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
> ---
>  src/util/virarptable.c | 3 +++
>  src/util/virarptable.h | 1 -
>  2 files changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/src/util/virarptable.c b/src/util/virarptable.c
> index 2730ef91af..8d9ab5fdc8 100644
> --- a/src/util/virarptable.c
> +++ b/src/util/virarptable.c
> @@ -26,6 +26,9 @@
>  #include <stdlib.h>
>  #include <stdio.h>
>  #include <arpa/inet.h>
> +#ifdef __linux__
> +# include <linux/rtnetlink.h>
> +#endif
>  
>  #include "viralloc.h"
>  #include "virarptable.h"
> diff --git a/src/util/virarptable.h b/src/util/virarptable.h
> index 404d8eb867..6829198128 100644
> --- a/src/util/virarptable.h
> +++ b/src/util/virarptable.h
> @@ -25,7 +25,6 @@
>  # define __VIR_ARPTABLE_H__
>  
>  # include "internal.h"
> -# include <linux/rtnetlink.h>
>  
>  typedef struct _virArpTableEntry virArpTableEntry;
>  typedef virArpTableEntry *virArpTableEntryPtr;

Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>


Regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list