diff options
author | Ian Campbell <ian.campbell@citrix.com> | 2011-01-11 18:16:45 +0000 |
---|---|---|
committer | Ian Campbell <ian.campbell@citrix.com> | 2011-01-11 18:16:45 +0000 |
commit | 64bc47d9a1055404b8c91467d6484ad3434bdde0 (patch) | |
tree | 06fb3b32f8d547a6b4f45d264fab9abecb218eba /tools | |
parent | f25a7171a1a740ec22e6a8ccc1b75fd348b10d91 (diff) | |
download | xen-64bc47d9a1055404b8c91467d6484ad3434bdde0.tar.gz xen-64bc47d9a1055404b8c91467d6484ad3434bdde0.tar.bz2 xen-64bc47d9a1055404b8c91467d6484ad3434bdde0.zip |
libxl: refactor code which adds per-PCI device backend nodes in xenstore
libxl_create_pci_backend and libxl_device_pci_add_xenstore contains
identical code to setup the per device xenstore nodes in the backend.
Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Committed-by: Ian Jackson <ian.jackson@eu.citrix.com>
Diffstat (limited to 'tools')
-rw-r--r-- | tools/libxl/libxl_pci.c | 45 |
1 files changed, 20 insertions, 25 deletions
diff --git a/tools/libxl/libxl_pci.c b/tools/libxl/libxl_pci.c index 29814b00ba..349950c655 100644 --- a/tools/libxl/libxl_pci.c +++ b/tools/libxl/libxl_pci.c @@ -221,6 +221,19 @@ parse_error: return ERROR_INVAL; } +static void libxl_create_pci_backend_device(libxl__gc *gc, flexarray_t *back, int num, libxl_device_pci *pcidev) +{ + flexarray_append(back, libxl__sprintf(gc, "key-%d", num)); + flexarray_append(back, libxl__sprintf(gc, PCI_BDF, pcidev->domain, pcidev->bus, pcidev->dev, pcidev->func)); + flexarray_append(back, libxl__sprintf(gc, "dev-%d", num)); + flexarray_append(back, libxl__sprintf(gc, PCI_BDF, pcidev->domain, pcidev->bus, pcidev->dev, pcidev->func)); + if (pcidev->vdevfn) + flexarray_vappend(back, libxl__sprintf(gc, "vdevfn-%d", num), libxl__sprintf(gc, "%x", pcidev->vdevfn), NULL); + flexarray_append(back, libxl__sprintf(gc, "opts-%d", num)); + flexarray_append(back, libxl__sprintf(gc, "msitranslate=%d,power_mgmt=%d", pcidev->msitranslate, pcidev->power_mgmt)); + flexarray_vappend(back, libxl__sprintf(gc, "state-%d", num), libxl__sprintf(gc, "%d", 1), NULL); +} + static int libxl_create_pci_backend(libxl__gc *gc, uint32_t domid, libxl_device_pci *pcidev, int num) { libxl_ctx *ctx = libxl__gc_owner(gc); @@ -249,20 +262,12 @@ static int libxl_create_pci_backend(libxl__gc *gc, uint32_t domid, libxl_device_ device.kind = DEVICE_PCI; flexarray_vappend(back, "frontend-id", libxl__sprintf(gc, "%d", domid), - "online", "1", "state", libxl__sprintf(gc, "%d", 1), - "domain", libxl__domid_to_name(gc, domid), NULL); - for (i = 0; i < num; i++) { - flexarray_append(back, libxl__sprintf(gc, "key-%d", i)); - flexarray_append(back, libxl__sprintf(gc, PCI_BDF, pcidev->domain, pcidev->bus, pcidev->dev, pcidev->func)); - flexarray_append(back, libxl__sprintf(gc, "dev-%d", i)); - flexarray_append(back, libxl__sprintf(gc, PCI_BDF, pcidev->domain, pcidev->bus, pcidev->dev, pcidev->func)); - if (pcidev->vdevfn) { - flexarray_vappend(back, libxl__sprintf(gc, "vdevfn-%d", i), libxl__sprintf(gc, "%x", pcidev->vdevfn), NULL); - } - flexarray_append(back, libxl__sprintf(gc, "opts-%d", i)); - flexarray_append(back, libxl__sprintf(gc, "msitranslate=%d,power_mgmt=%d", pcidev->msitranslate, pcidev->power_mgmt)); - flexarray_vappend(back, libxl__sprintf(gc, "state-%d", i), libxl__sprintf(gc, "%d", 1), NULL); - } + "online", "1", "state", libxl__sprintf(gc, "%d", 1), + "domain", libxl__domid_to_name(gc, domid), NULL); + + for (i = 0; i < num; i++, pcidev++) + libxl_create_pci_backend_device(gc, back, i, pcidev); + flexarray_vappend(back, "num_devs", libxl__sprintf(gc, "%d", num)); flexarray_vappend(front, @@ -305,17 +310,7 @@ static int libxl_device_pci_add_xenstore(libxl__gc *gc, uint32_t domid, libxl_de LIBXL__LOG(ctx, LIBXL__LOG_DEBUG, "Adding new pci device to xenstore"); num = atoi(num_devs); - flexarray_append(back, libxl__sprintf(gc, "key-%d", num)); - flexarray_append(back, libxl__sprintf(gc, PCI_BDF, pcidev->domain, pcidev->bus, pcidev->dev, pcidev->func)); - flexarray_append(back, libxl__sprintf(gc, "dev-%d", num)); - flexarray_append(back, libxl__sprintf(gc, PCI_BDF, pcidev->domain, pcidev->bus, pcidev->dev, pcidev->func)); - if (pcidev->vdevfn) { - flexarray_append(back, libxl__sprintf(gc, "vdevfn-%d", num)); - flexarray_append(back, libxl__sprintf(gc, "%x", pcidev->vdevfn)); - } - flexarray_append(back, libxl__sprintf(gc, "opts-%d", num)); - flexarray_append(back, libxl__sprintf(gc, "msitranslate=%d,power_mgmt=%d", pcidev->msitranslate, pcidev->power_mgmt)); - flexarray_vappend(back, libxl__sprintf(gc, "state-%d", num), libxl__sprintf(gc, "%d", 1), NULL); + libxl_create_pci_backend_device(gc, back, num, pcidev); flexarray_vappend(back, "num_devs", libxl__sprintf(gc, "%d", num + 1), NULL); flexarray_vappend(back, "state", libxl__sprintf(gc, "%d", 7), NULL); |