mirror of
https://github.com/linuxkit/linuxkit.git
synced 2026-01-05 12:14:04 +00:00
eb221b4d4f
These are WIP taken from git@github.com:stefanha/linux.git#vsock (==4c9d2a6be1c6, using "cherry-pick -x") and correspond to RFC v5 of the frontend patches posted in http://thread.gmane.org/gmane.linux.kernel.virtualization/27455 There is no corresponding spec proposal update yet, but this set of patches correspond (roughly) to addressing the feedback on v4 of the spec proposal http://thread.gmane.org/gmane.comp.emulators.virtio.devel/1062. kernel_config.arm modifications copied from x86, not tested. Added /etc/kernel-patches/ directory to the image to be consumed by the licensing. Signed-off-by: Ian Campbell <ian.campbell@docker.com>
78 lines
3.2 KiB
Diff
78 lines
3.2 KiB
Diff
From ba1dc9346ba14b24f22ea04db21011f2874c3a67 Mon Sep 17 00:00:00 2001
|
|
From: Julia Lawall <julia.lawall@lip6.fr>
|
|
Date: Sat, 21 Nov 2015 18:39:17 +0100
|
|
Subject: [PATCH 2/9] VSOCK: constify vmci_transport_notify_ops structures
|
|
|
|
The vmci_transport_notify_ops structures are never modified, so declare
|
|
them as const.
|
|
|
|
Done with the help of Coccinelle.
|
|
|
|
Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
|
|
Signed-off-by: David S. Miller <davem@davemloft.net>
|
|
(cherry picked from commit 3b22dae38db1cea9ead3229f08cfb0b69aca5706)
|
|
---
|
|
net/vmw_vsock/vmci_transport.h | 2 +-
|
|
net/vmw_vsock/vmci_transport_notify.c | 2 +-
|
|
net/vmw_vsock/vmci_transport_notify.h | 5 +++--
|
|
net/vmw_vsock/vmci_transport_notify_qstate.c | 2 +-
|
|
4 files changed, 6 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/net/vmw_vsock/vmci_transport.h b/net/vmw_vsock/vmci_transport.h
|
|
index 2ad46f3..1820e74 100644
|
|
--- a/net/vmw_vsock/vmci_transport.h
|
|
+++ b/net/vmw_vsock/vmci_transport.h
|
|
@@ -121,7 +121,7 @@ struct vmci_transport {
|
|
u64 queue_pair_max_size;
|
|
u32 detach_sub_id;
|
|
union vmci_transport_notify notify;
|
|
- struct vmci_transport_notify_ops *notify_ops;
|
|
+ const struct vmci_transport_notify_ops *notify_ops;
|
|
struct list_head elem;
|
|
struct sock *sk;
|
|
spinlock_t lock; /* protects sk. */
|
|
diff --git a/net/vmw_vsock/vmci_transport_notify.c b/net/vmw_vsock/vmci_transport_notify.c
|
|
index 9b7f207..fd8cf02 100644
|
|
--- a/net/vmw_vsock/vmci_transport_notify.c
|
|
+++ b/net/vmw_vsock/vmci_transport_notify.c
|
|
@@ -661,7 +661,7 @@ static void vmci_transport_notify_pkt_process_negotiate(struct sock *sk)
|
|
}
|
|
|
|
/* Socket control packet based operations. */
|
|
-struct vmci_transport_notify_ops vmci_transport_notify_pkt_ops = {
|
|
+const struct vmci_transport_notify_ops vmci_transport_notify_pkt_ops = {
|
|
vmci_transport_notify_pkt_socket_init,
|
|
vmci_transport_notify_pkt_socket_destruct,
|
|
vmci_transport_notify_pkt_poll_in,
|
|
diff --git a/net/vmw_vsock/vmci_transport_notify.h b/net/vmw_vsock/vmci_transport_notify.h
|
|
index 7df7932..3c464d3 100644
|
|
--- a/net/vmw_vsock/vmci_transport_notify.h
|
|
+++ b/net/vmw_vsock/vmci_transport_notify.h
|
|
@@ -77,7 +77,8 @@ struct vmci_transport_notify_ops {
|
|
void (*process_negotiate) (struct sock *sk);
|
|
};
|
|
|
|
-extern struct vmci_transport_notify_ops vmci_transport_notify_pkt_ops;
|
|
-extern struct vmci_transport_notify_ops vmci_transport_notify_pkt_q_state_ops;
|
|
+extern const struct vmci_transport_notify_ops vmci_transport_notify_pkt_ops;
|
|
+extern const
|
|
+struct vmci_transport_notify_ops vmci_transport_notify_pkt_q_state_ops;
|
|
|
|
#endif /* __VMCI_TRANSPORT_NOTIFY_H__ */
|
|
diff --git a/net/vmw_vsock/vmci_transport_notify_qstate.c b/net/vmw_vsock/vmci_transport_notify_qstate.c
|
|
index dc9c792..21e591d 100644
|
|
--- a/net/vmw_vsock/vmci_transport_notify_qstate.c
|
|
+++ b/net/vmw_vsock/vmci_transport_notify_qstate.c
|
|
@@ -419,7 +419,7 @@ vmci_transport_notify_pkt_send_pre_enqueue(
|
|
}
|
|
|
|
/* Socket always on control packet based operations. */
|
|
-struct vmci_transport_notify_ops vmci_transport_notify_pkt_q_state_ops = {
|
|
+const struct vmci_transport_notify_ops vmci_transport_notify_pkt_q_state_ops = {
|
|
vmci_transport_notify_pkt_socket_init,
|
|
vmci_transport_notify_pkt_socket_destruct,
|
|
vmci_transport_notify_pkt_poll_in,
|
|
--
|
|
2.8.0.rc3
|
|
|