Skip to content

add -r option (user defined mac address) #33

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

Open
i0seph wants to merge 3 commits into
base: main
Choose a base branch
from
Open

add -r option (user defined mac address) #33

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f835243
add -r option (user defined mac address)
i0seph Apr 2, 2022
46f8dda
Update README.md
i0seph May 24, 2022
7fa96d3
Update README.md
i0seph Jan 30, 2025
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
20 changes: 16 additions & 4 deletions vftool/main.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,8 @@ static int createPty(bool waitForConnection)
NSString *initrd_path,
struct disc_info *dinfo,
unsigned int num_discs,
NSString *bridged_eth)
NSString *bridged_eth,
NSString *user_macaddr)
{
/* **************************************************************** */
/* Linux bootloader setup:
Expand Down Expand Up @@ -179,6 +180,12 @@ static int createPty(bool waitForConnection)
}

VZVirtioNetworkDeviceConfiguration *net_conf = [[VZVirtioNetworkDeviceConfiguration alloc] init];
// set user defined mac address
if (user_macaddr) {
VZMACAddress *nma = nil;
nma = [[VZMACAddress alloc] initWithString:user_macaddr];
[(VZVirtioNetworkDeviceConfiguration *)net_conf setMACAddress:[(VZMACAddress *)nma copy]];
}
[net_conf setAttachment:nda];
[conf setNetworkDevices:@[net_conf]];

Expand Down Expand Up @@ -228,6 +235,7 @@ static void usage(const char *me)
"\t-p <number of processors> (Default 1)\n"
"\t-m <memory size in MB> (Default 512MB)\n"
"\t-t <tty type> (0 = stdio, 1 = pty (default))\n"
"\t-r <mac address> (Default random)\n"
"\n\tSpecify multiple discs with multiple -d/-c options, in order (max %d)\n",
me, MAX_DISCS);
}
Expand All @@ -242,6 +250,7 @@ int main(int argc, char *argv[])
NSString *disc_path = NULL;
NSString *cdrom_path = NULL;
NSString *eth_if = NULL;
NSString *user_macaddr = NULL;
unsigned int cpus = 0;
unsigned int mem = 0;
unsigned int tty_type = 1;
Expand All @@ -250,7 +259,7 @@ int main(int argc, char *argv[])
unsigned int num_discs = 0;

int ch;
while ((ch = getopt(argc, argv, "k:a:i:d:c:b:p:m:t:h")) != -1) {
while ((ch = getopt(argc, argv, "k:a:i:d:c:b:p:m:t:r:h")) != -1) {
switch (ch) {
case 'k':
kern_path = [NSString stringWithUTF8String:optarg];
Expand Down Expand Up @@ -289,7 +298,10 @@ int main(int argc, char *argv[])
return 1;
}
break;

case 'r':
user_macaddr = [NSString stringWithUTF8String:optarg];
break;

case 'h':
default:
usage(argv[0]);
Expand Down Expand Up @@ -323,7 +335,7 @@ int main(int argc, char *argv[])
VZVirtualMachineConfiguration *conf = getVMConfig(mem, cpus, tty_type, cmdline,
kern_path, initrd_path,
dinfo, num_discs,
eth_if);
eth_if, user_macaddr);

if (!conf) {
NSLog(@"Couldn't create configuration for VM.\n");
Expand Down