Deleted Added
full compact
bhyverun.c (234761) bhyverun.c (234938)
1/*-
2 * Copyright (c) 2011 NetApp, Inc.
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 124 unchanged lines hidden (view full) ---

133 " -p: pin vcpu 'n' to host cpu 'pincpu + n'\n"
134 " -B: inject breakpoint exception on vm entry\n"
135 " -H: vmexit from the guest on hlt\n"
136 " -P: vmexit from the guest on pause\n"
137 " -e: exit on unhandled i/o access\n"
138 " -h: help\n"
139 " -z: guest hz (default is %d)\n"
140 " -s: <slot,driver,configinfo> PCI slot config\n"
1/*-
2 * Copyright (c) 2011 NetApp, Inc.
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 124 unchanged lines hidden (view full) ---

133 " -p: pin vcpu 'n' to host cpu 'pincpu + n'\n"
134 " -B: inject breakpoint exception on vm entry\n"
135 " -H: vmexit from the guest on hlt\n"
136 " -P: vmexit from the guest on pause\n"
137 " -e: exit on unhandled i/o access\n"
138 " -h: help\n"
139 " -z: guest hz (default is %d)\n"
140 " -s: <slot,driver,configinfo> PCI slot config\n"
141 " -S: <slot,driver,configinfo> legacy PCI slot config\n"
141 " -n: <slot,name> PCI slot naming\n"
142 " -m: lowmem in MB\n"
143 " -M: highmem in MB\n"
144 " -x: mux vcpus to 1 hcpu\n"
145 " -t: mux vcpu timeslice hz (default %d)\n",
146 progname, DEFAULT_GDB_PORT, DEFAULT_GUEST_HZ,
147 DEFAULT_GUEST_TSLICE);
148 exit(code);

--- 376 unchanged lines hidden (view full) ---

525 struct vmctx *ctx;
526 uint64_t rip;
527
528 inject_bkpt = 0;
529 progname = basename(argv[0]);
530 gdb_port = DEFAULT_GDB_PORT;
531 guest_ncpus = 1;
532
142 " -n: <slot,name> PCI slot naming\n"
143 " -m: lowmem in MB\n"
144 " -M: highmem in MB\n"
145 " -x: mux vcpus to 1 hcpu\n"
146 " -t: mux vcpu timeslice hz (default %d)\n",
147 progname, DEFAULT_GDB_PORT, DEFAULT_GUEST_HZ,
148 DEFAULT_GUEST_TSLICE);
149 exit(code);

--- 376 unchanged lines hidden (view full) ---

526 struct vmctx *ctx;
527 uint64_t rip;
528
529 inject_bkpt = 0;
530 progname = basename(argv[0]);
531 gdb_port = DEFAULT_GDB_PORT;
532 guest_ncpus = 1;
533
533 while ((c = getopt(argc, argv, "ehBHPxp:g:c:z:s:n:m:M:")) != -1) {
534 while ((c = getopt(argc, argv, "ehBHPxp:g:c:z:s:S:n:m:M:")) != -1) {
534 switch (c) {
535 case 'B':
536 inject_bkpt = 1;
537 break;
538 case 'x':
539 guest_vcpu_mux = 1;
540 break;
541 case 'p':

--- 7 unchanged lines hidden (view full) ---

549 break;
550 case 'z':
551 guest_hz = atoi(optarg);
552 break;
553 case 't':
554 guest_tslice = atoi(optarg);
555 break;
556 case 's':
535 switch (c) {
536 case 'B':
537 inject_bkpt = 1;
538 break;
539 case 'x':
540 guest_vcpu_mux = 1;
541 break;
542 case 'p':

--- 7 unchanged lines hidden (view full) ---

550 break;
551 case 'z':
552 guest_hz = atoi(optarg);
553 break;
554 case 't':
555 guest_tslice = atoi(optarg);
556 break;
557 case 's':
557 pci_parse_slot(optarg);
558 pci_parse_slot(optarg, 0);
558 break;
559 break;
560 case 'S':
561 pci_parse_slot(optarg, 1);
562 break;
559 case 'n':
560 pci_parse_name(optarg);
561 break;
562 case 'm':
563 lomem_sz = strtoul(optarg, NULL, 0) * MB;
564 break;
565 case 'M':
566 himem_sz = strtoul(optarg, NULL, 0) * MB;

--- 107 unchanged lines hidden ---
563 case 'n':
564 pci_parse_name(optarg);
565 break;
566 case 'm':
567 lomem_sz = strtoul(optarg, NULL, 0) * MB;
568 break;
569 case 'M':
570 himem_sz = strtoul(optarg, NULL, 0) * MB;

--- 107 unchanged lines hidden ---