@@ -105,21 +105,25 @@ struct cmd_spec cmd_table[] = {
{ "pci-assignable-add",
&main_pciassignable_add, 0, 1,
"Make a device assignable for pci-passthru",
- "<BDF>",
+ "[options] <BDF>",
+ "-n NAME, --name=NAME Name the assignable device.\n"
"-h Print this help.\n"
},
{ "pci-assignable-remove",
&main_pciassignable_remove, 0, 1,
"Remove a device from being assignable",
- "[options] <BDF>",
+ "[options] <BDF>|NAME",
"-h Print this help.\n"
"-r Attempt to re-assign the device to the\n"
- " original driver"
+ " original driver."
},
{ "pci-assignable-list",
&main_pciassignable_list, 0, 0,
"List all the assignable pci devices",
- "",
+ "[options]",
+ "-h Print this help.\n"
+ "-n, --show-names Display assignable device names where\n"
+ " supplied.\n"
},
{ "pause",
&main_pause, 0, 1,
@@ -152,55 +152,68 @@ int main_pciattach(int argc, char **argv)
return EXIT_SUCCESS;
}
-static void pciassignable_list(void)
+static void pciassignable_list(bool show_names)
{
- libxl_device_pci *pcis;
+ libxl_pci_bdf *pcibdfs;
int num, i;
- pcis = libxl_device_pci_assignable_list(ctx, &num);
+ pcibdfs = libxl_pci_bdf_assignable_list(ctx, &num);
- if ( pcis == NULL )
+ if ( pcibdfs == NULL )
return;
for (i = 0; i < num; i++) {
- printf("%04x:%02x:%02x.%01x\n",
- pcis[i].bdf.domain, pcis[i].bdf.bus, pcis[i].bdf.dev,
- pcis[i].bdf.func);
+ libxl_pci_bdf *pcibdf = &pcibdfs[i];
+ char *name = show_names ?
+ libxl_pci_bdf_assignable_bdf2name(ctx, pcibdf) : NULL;
+
+ printf("%04x:%02x:%02x.%01x %s\n",
+ pcibdf->domain, pcibdf->bus, pcibdf->dev, pcibdf->func,
+ name ?: "");
+
+ free(name);
}
- libxl_device_pci_assignable_list_free(pcis, num);
+ libxl_pci_bdf_assignable_list_free(pcibdfs, num);
}
int main_pciassignable_list(int argc, char **argv)
{
int opt;
-
- SWITCH_FOREACH_OPT(opt, "", NULL, "pci-assignable-list", 0) {
- /* No options */
+ static struct option opts[] = {
+ {"show-names", 0, 0, 'n'},
+ COMMON_LONG_OPTS
+ };
+ bool show_names = false;
+
+ SWITCH_FOREACH_OPT(opt, "n", opts, "pci-assignable-list", 0) {
+ case 'n':
+ show_names = true;
+ break;
}
- pciassignable_list();
+ pciassignable_list(show_names);
return 0;
}
-static int pciassignable_add(const char *bdf, int rebind)
+static int pciassignable_add(const char *bdf, const char *name, int rebind)
{
- libxl_device_pci pci;
+ libxl_pci_bdf pcibdf;
XLU_Config *config;
int r = 0;
- libxl_device_pci_init(&pci);
+ libxl_pci_bdf_init(&pcibdf);
config = xlu_cfg_init(stderr, "command line");
if (!config) { perror("xlu_cfg_init"); exit(-1); }
- if (xlu_pci_parse_bdf(config, &pci.bdf, bdf)) {
+ if (xlu_pci_parse_bdf(config, &pcibdf, bdf)) {
fprintf(stderr, "pci-assignable-add: malformed BDF \"%s\"\n", bdf);
exit(2);
}
- if (libxl_device_pci_assignable_add(ctx, &pci, rebind))
+ if (libxl_pci_bdf_assignable_add(ctx, &pcibdf, name, rebind))
r = 1;
- libxl_device_pci_dispose(&pci);
+ libxl_pci_bdf_dispose(&pcibdf);
xlu_cfg_destroy(config);
return r;
@@ -210,39 +223,58 @@ int main_pciassignable_add(int argc, char **argv)
{
int opt;
const char *bdf = NULL;
-
- SWITCH_FOREACH_OPT(opt, "", NULL, "pci-assignable-add", 1) {
- /* No options */
+ static struct option opts[] = {
+ {"name", 1, 0, 'n'},
+ COMMON_LONG_OPTS
+ };
+ const char *name = NULL;
+
+ SWITCH_FOREACH_OPT(opt, "n:", opts, "pci-assignable-add", 0) {
+ case 'n':
+ name = optarg;
+ break;
}
bdf = argv[optind];
- if (pciassignable_add(bdf, 1))
+ if (pciassignable_add(bdf, name, 1))
return EXIT_FAILURE;
return EXIT_SUCCESS;
}
-static int pciassignable_remove(const char *bdf, int rebind)
+static int pciassignable_remove(const char *ident, int rebind)
{
- libxl_device_pci pci;
+ libxl_pci_bdf *pcibdf;
XLU_Config *config;
int r = 0;
- libxl_device_pci_init(&pci);
-
config = xlu_cfg_init(stderr, "command line");
if (!config) { perror("xlu_cfg_init"); exit(-1); }
- if (xlu_pci_parse_bdf(config, &pci.bdf, bdf)) {
- fprintf(stderr, "pci-assignable-remove: malformed BDF \"%s\"\n", bdf);
- exit(2);
+ pcibdf = libxl_pci_bdf_assignable_name2bdf(ctx, ident);
+ if (!pcibdf) {
+ pcibdf = calloc(1, sizeof(*pcibdf));
+
+ if (!pcibdf) {
+ fprintf(stderr,
+ "pci-assignable-remove: failed to allocate memory\n");
+ exit(2);
+ }
+
+ libxl_pci_bdf_init(pcibdf);
+ if (xlu_pci_parse_bdf(config, pcibdf, ident)) {
+ fprintf(stderr,
+ "pci-assignable-remove: malformed BDF '%s'\n", ident);
+ exit(2);
+ }
}
- if (libxl_device_pci_assignable_remove(ctx, &pci, rebind))
+ if (libxl_pci_bdf_assignable_remove(ctx, pcibdf, rebind))
r = 1;
- libxl_device_pci_dispose(&pci);
+ libxl_pci_bdf_dispose(pcibdf);
+ free(pcibdf);
xlu_cfg_destroy(config);
return r;
@@ -251,7 +283,7 @@ static int pciassignable_remove(const char *bdf, int rebind)
int main_pciassignable_remove(int argc, char **argv)
{
int opt;
- const char *bdf = NULL;
+ const char *ident = NULL;
int rebind = 0;
SWITCH_FOREACH_OPT(opt, "r", NULL, "pci-assignable-remove", 1) {
@@ -260,9 +292,9 @@ int main_pciassignable_remove(int argc, char **argv)
break;
}
- bdf = argv[optind];
+ ident = argv[optind];
- if (pciassignable_remove(bdf, rebind))
+ if (pciassignable_remove(ident, rebind))
return EXIT_FAILURE;
return EXIT_SUCCESS;