[libvirt] [PATCH] Fix compile error for stable 1.2.9
Seems a backport miss. An extra member is passed to struct virLXCBasicMountInfo. Signed-off-by: Yang hongyang <hongyang.yang@easystack.cn> --- src/lxc/lxc_container.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index 28dabec..1c65fa9 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -760,7 +760,7 @@ typedef struct { static const virLXCBasicMountInfo lxcBasicMounts[] = { { "proc", "/proc", "proc", MS_NOSUID|MS_NOEXEC|MS_NODEV, false, false }, - { "/proc/sys", "/proc/sys", NULL, MS_BIND|MS_NOSUID|MS_NOEXEC|MS_NODEV|MS_RDONLY, false, false, false }, + { "/proc/sys", "/proc/sys", NULL, MS_BIND|MS_NOSUID|MS_NOEXEC|MS_NODEV|MS_RDONLY, false, false }, { "sysfs", "/sys", "sysfs", MS_NOSUID|MS_NOEXEC|MS_NODEV|MS_RDONLY, false, false }, { "securityfs", "/sys/kernel/security", "securityfs", MS_NOSUID|MS_NOEXEC|MS_NODEV|MS_RDONLY, true, true }, #if WITH_SELINUX -- 1.7.1
What compiler are you using? It compiles just fine for me with gcc 5.3.0 On Sat, Jun 25, 2016 at 11:53:49AM +0800, Yang hongyang wrote:
Seems a backport miss. An extra member is passed to struct virLXCBasicMountInfo.
I have added some history to the commit message: Commit bda5f2b (a backport of commit 2471041) listed one more value than the virLXCBasicMountInfo has here, because v1.2.9-maint does not have the skipNoNetns bool (introduced by commit ba9b725 released in 1.2.11). and pushed it. Thank you for the patch. Jan
Signed-off-by: Yang hongyang <hongyang.yang@easystack.cn> --- src/lxc/lxc_container.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
Hi Jan,
-----Original message----- Sender: "Ján Tomko" <jtomko@redhat.com> Receiver: Yang hongyang <hongyang.yang@easystack.cn> Cc: libvir-list@redhat.com Subject: Re: [libvirt] [PATCH] Fix compile error for stable 1.2.9
What compiler are you using? It compiles just fine for me with gcc 5.3.0I'm using gcc version 4.4.7 20120313 (Red Hat 4.4.7-17) (GCC) on CentOS 6.5
On Sat, Jun 25, 2016 at 11:53:49AM +0800, Yang hongyang wrote:
Seems a backport miss. An extra member is passed to struct virLXCBasicMountInfo.
I have added some history to the commit message:
Commit bda5f2b (a backport of commit 2471041) listed one more value than the virLXCBasicMountInfo has here, because v1.2.9-maint does not have the skipNoNetns bool (introduced by commit ba9b725 released in 1.2.11).
and pushed it. Thank you for the patch.Thank you.
Jan
Signed-off-by: Yang hongyang <hongyang.yang@easystack.cn> --- src/lxc/lxc_container.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
participants (3)
-
Ján Tomko -
Yang Hongyang -
Yang hongyang