Differential D29473 Diff 87199 usr.sbin/bhyve/bhyverun.c

Changeset View

Standalone View

usr.sbin/bhyve/bhyverun.c

Context not available.
	int guest_ncpus;	int guest_ncpus;
	uint16_t cores, maxcpus, sockets, threads;	uint16_t cores, maxcpus, sockets, threads;

		char *kbdlayout_name;

	int raw_stdio = 0;	int raw_stdio = 0;

	static char *progname;	static char *progname;
Context not available.
	fprintf(stderr,	fprintf(stderr,
	"Usage: %s [-aehuwxACDHPSWY]\n"	"Usage: %s [-aehuwxACDHPSWY]\n"
	" %*s [-c [[cpus=]numcpus][,sockets=n][,cores=n][,threads=n]]\n"	" %*s [-c [[cpus=]numcpus][,sockets=n][,cores=n][,threads=n]]\n"
	" %*s [-k <file>] [-l <lpc>] [-m mem] [-o <var>=<value>]\n"	" %*s [-k <file>] [-K layout] [-l <lpc>] [-m mem] [-o <var>=<value>]\n"
	" %*s [-p vcpu:hostcpu] [-s <pci>] [-U uuid] [<vm>]\n"	" %*s [-p vcpu:hostcpu] [-s <pci>] [-U uuid] [<vm>]\n"
	" -a: local apic is in xAPIC mode (deprecated)\n"	" -a: local apic is in xAPIC mode (deprecated)\n"
	" -A: create ACPI tables\n"	" -A: create ACPI tables\n"
Context not available.
	" -h: help\n"	" -h: help\n"
	" -H: vmexit from the guest on hlt\n"	" -H: vmexit from the guest on hlt\n"
	" -k: key=value flat config file\n"	" -k: key=value flat config file\n"
		" -K: PS2 keyboard layout\n"
	" -l: LPC device configuration\n"	" -l: LPC device configuration\n"
	" -m: memory size in MB\n"	" -m: memory size in MB\n"
	" -o: set config 'var' to 'value'\n"	" -o: set config 'var' to 'value'\n"
Context not available.
	size_t memsize;	size_t memsize;
	const char value, vmname;	const char value, vmname;
	char *optstr;	char *optstr;
		kbdlayout_name = NULL;
	#ifdef BHYVE_SNAPSHOT	#ifdef BHYVE_SNAPSHOT
	char *restore_file;	char *restore_file;
	struct restore_state rstate;	struct restore_state rstate;
Context not available.
	progname = basename(argv[0]);	progname = basename(argv[0]);

	#ifdef BHYVE_SNAPSHOT	#ifdef BHYVE_SNAPSHOT
	optstr = "aehuwxACDHIPSWYk:o:p:G:c:s:m:l:U:r:";	optstr = "aehuwxACDHIPSWYk:o:p:G:c:s:m:l:K:U:r:";
	#else	#else
	optstr = "aehuwxACDHIPSWYk:o:p:G:c:s:m:l:U:";	optstr = "aehuwxACDHIPSWYk:o:p:G:c:s:m:l:K:U:";
	#endif	#endif
	while ((c = getopt(argc, argv, optstr)) != -1) {	while ((c = getopt(argc, argv, optstr)) != -1) {
	switch (c) {	switch (c) {
Context not available.
	case 'k':	case 'k':
	parse_simple_config_file(optarg);	parse_simple_config_file(optarg);
	break;	break;
		case 'K':
		kbdlayout_name = optarg;
		jhbUnsubmitted Not Done Inline Actions This should be setting a config variable instead so that config files can set it, and the code to fetch it should not use the global variable, but fetch the relevant config setting instead. You'd also need to document the new config variable in bhyve_config.5. jhb: This should be setting a config variable instead so that config files can set it, and the code…
		break;
	case 'l':	case 'l':
	if (strncmp(optarg, "help", strlen(optarg)) == 0) {	if (strncmp(optarg, "help", strlen(optarg)) == 0) {
	lpc_print_supported_devices();	lpc_print_supported_devices();
Context not available.