[libvirt] [PATCH 0/2] Two small fixes
*** BLURB HERE *** Michal Privoznik (2): src: Don't add virarptable.c to setuid library virarptable: Include rtnetlink.h only on Linux src/Makefile.am | 1 - src/util/virarptable.c | 3 +++ src/util/virarptable.h | 1 - 3 files changed, 3 insertions(+), 2 deletions(-) -- 2.16.1
The setuid-rpc-client.la is intended to be small and contain only bare minimum of source files. virarptable.c is not one of them. Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- src/Makefile.am | 1 - 1 file changed, 1 deletion(-) diff --git a/src/Makefile.am b/src/Makefile.am index 82c5d5cde8..8b1e4c8a4e 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -672,7 +672,6 @@ noinst_LTLIBRARIES += libvirt-setuid-rpc-client.la libvirt_setuid_rpc_client_la_SOURCES = \ util/viralloc.c \ util/virarch.c \ - util/virarptable.c \ util/viratomic.c \ util/viratomic.h \ util/virbitmap.c \ -- 2.16.1
On Thu, Mar 15, 2018 at 01:49:29PM +0100, Michal Privoznik wrote:
The setuid-rpc-client.la is intended to be small and contain only bare minimum of source files. virarptable.c is not one of them.
Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- src/Makefile.am | 1 - 1 file changed, 1 deletion(-)
diff --git a/src/Makefile.am b/src/Makefile.am index 82c5d5cde8..8b1e4c8a4e 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -672,7 +672,6 @@ noinst_LTLIBRARIES += libvirt-setuid-rpc-client.la libvirt_setuid_rpc_client_la_SOURCES = \ util/viralloc.c \ util/virarch.c \ - util/virarptable.c \ util/viratomic.c \ util/viratomic.h \ util/virbitmap.c \
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 :|
At 2018-03-15 20:49:29, "Michal Privoznik" <mprivozn@redhat.com> wrote:
The setuid-rpc-client.la is intended to be small and contain only bare minimum of source files. virarptable.c is not one of them.
Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- src/Makefile.am | 1 - 1 file changed, 1 deletion(-)
My fault. Thanks. Reviewed-by: Chen Hanxiao<chenhanxiao@gmail.com> Regards, - Chen
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
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 :|
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
participants (3)
-
Chen Hanxiao -
Daniel P. Berrangé -
Michal Privoznik