Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Compiles and works for Workstation 17.5.2 and Mainline kernel 6.9.1 #252

Open
wants to merge 2 commits into
base: workstation-17.5.1
Choose a base branch
from
+9 −4
Open

Compiles and works for Workstation 17.5.2 and Mainline kernel 6.9.1 #252

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
48866f7
Compiles and works for Workstation 17.5.2 and Mainline kernel 6.9.1. …
nan0desu May 18, 2024
d9f51ee
Seems x86cpuid.h also need to be patched to prevent array-index-out-o…
nan0desu May 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion vmmon-only/include/x86cpuid.h
View file
Open in desktop
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The attachment contains two other similar patches, for the same reason. (Sorry, but I was unable to
get them entered without the format getting munged.)

patch.txt

Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ typedef struct CPUIDQuery {
uint32 eax; // IN
uint32 ecx; // IN
uint32 numLogicalCPUs; // IN/OUT
CPUIDReply logicalCPUs[0]; // OUT
CPUIDReply logicalCPUs[]; // OUT
} CPUIDQuery;
#pragma pack(pop)
#endif
Expand Down
2 changes: 1 addition & 1 deletion vmmon-only/include/x86msr.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ typedef struct MSRReply {
typedef struct MSRQuery {
uint32 msrNum; // IN
uint32 numLogicalCPUs; // IN/OUT
MSRReply logicalCPUs[0]; // OUT
MSRReply logicalCPUs[]; // OUT
} MSRQuery;
#pragma pack(pop)

Expand Down
9 changes: 7 additions & 2 deletions vmnet-only/vmnetInt.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,13 @@
compat_skb_set_network_header(skb, sizeof (struct ethhdr)), \
dev_queue_xmit(skb) \
)
#define dev_lock_list() read_lock(&dev_base_lock)
#define dev_unlock_list() read_unlock(&dev_base_lock)
#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 9, 0)
# define dev_lock_list() rcu_read_lock()
# define dev_unlock_list() rcu_read_unlock()
#else
# define dev_lock_list() read_lock(&dev_base_lock)
# define dev_unlock_list() read_unlock(&dev_base_lock)
#endif


extern struct proto vmnet_proto;
Expand Down