From: Oleksandr Grytsov Date: Tue, 11 Jul 2017 16:52:28 +0000 (+0300) Subject: libxl: remove unneeded DEVICE_ADD macro X-Git-Tag: 4.10.0-rc1~349 X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=03e1a56d81c16eece735e4d0ef74bfb10eaaba07;p=xen.git libxl: remove unneeded DEVICE_ADD macro Signed-off-by: Oleksandr Grytsov Acked-by: Wei Liu --- diff --git a/tools/libxl/libxl_device.c b/tools/libxl/libxl_device.c index 487be28840..67b7afbf09 100644 --- a/tools/libxl/libxl_device.c +++ b/tools/libxl/libxl_device.c @@ -1793,10 +1793,8 @@ out: return AO_CREATE_FAIL(rc); } -static void device_add_domain_config(libxl__gc *gc, - libxl_domain_config *d_config, - const struct libxl_device_type *dt, - void *type) +void device_add_domain_config(libxl__gc *gc, libxl_domain_config *d_config, + const struct libxl_device_type *dt, void *type) { int *num_dev; unsigned int i; diff --git a/tools/libxl/libxl_disk.c b/tools/libxl/libxl_disk.c index c20cc49851..cfa5e8ae69 100644 --- a/tools/libxl/libxl_disk.c +++ b/tools/libxl/libxl_disk.c @@ -277,7 +277,8 @@ static void device_disk_add(libxl__egc *egc, uint32_t domid, rc = libxl__get_domain_configuration(gc, domid, &d_config); if (rc) goto out; - DEVICE_ADD(disk, disks, domid, &disk_saved, COMPARE_DISK, &d_config); + device_add_domain_config(gc, &d_config, &libxl__disk_devtype, + &disk_saved); rc = libxl__dm_check_start(gc, &d_config, domid); if (rc) goto out; @@ -832,7 +833,7 @@ int libxl_cdrom_insert(libxl_ctx *ctx, uint32_t domid, libxl_device_disk *disk, rc = libxl__get_domain_configuration(gc, domid, &d_config); if (rc) goto out; - DEVICE_ADD(disk, disks, domid, &disk_saved, COMPARE_DISK, &d_config); + device_add_domain_config(gc, &d_config, &libxl__disk_devtype, &disk_saved); rc = libxl__dm_check_start(gc, &d_config, domid); if (rc) goto out; diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index 976827ac71..81e87ae1c6 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -4281,55 +4281,6 @@ void libxl__xcinfo2xlinfo(libxl_ctx *ctx, (a)->port == (b)->port) #define COMPARE_USBCTRL(a, b) ((a)->devid == (b)->devid) -/* DEVICE_ADD - * - * Add a device in libxl_domain_config structure - * - * It takes 6 parameters: - * type: the type of the device, say nic, vtpm, disk, pci etc - * ptr: pointer to the start of the array, the array must be - * of type libxl_device_#type - * domid: domain id of target domain - * dev: the device that is to be added / removed / updated - * compare: the COMPARE_* macro used to compare @dev's identifier to - * those in the array pointed to by @ptr - * d_config: pointer to template domain config - * - * For most device types (nic, vtpm), the array pointer @ptr can be - * derived from @type, pci device being the exception, hence we need - * to have @ptr. - * - * If there is already a device with the same identifier in d_config, - * that entry is updated. - */ -#define DEVICE_ADD(type, ptr, domid, dev, compare, d_config) \ - ({ \ - int DA_x; \ - libxl_device_##type *DA_p = NULL; \ - \ - /* Check for existing device */ \ - for (DA_x = 0; DA_x < (d_config)->num_##ptr; DA_x++) { \ - if (compare(&(d_config)->ptr[DA_x], (dev))) { \ - DA_p = &(d_config)->ptr[DA_x]; \ - break; \ - } \ - } \ - \ - if (!DA_p) { \ - (d_config)->ptr = \ - libxl__realloc(NOGC, (d_config)->ptr, \ - ((d_config)->num_##ptr + 1) * \ - sizeof(libxl_device_##type)); \ - DA_p = &(d_config)->ptr[(d_config)->num_##ptr]; \ - (d_config)->num_##ptr++; \ - } else { \ - libxl_device_##type##_dispose(DA_p); \ - } \ - \ - libxl_device_##type##_init(DA_p); \ - libxl_device_##type##_copy(CTX, DA_p, (dev)); \ - }) - /* This function copies X bytes from source to destination bitmap, * where X is the smaller of the two sizes. * @@ -4359,6 +4310,9 @@ static inline bool libxl__acpi_defbool_val(const libxl_domain_build_info *b_info libxl_defbool_val(b_info->u.hvm.acpi); } +void device_add_domain_config(libxl__gc *gc, libxl_domain_config *d_config, + const struct libxl_device_type *dt, void *type); + void libxl__device_add_async(libxl__egc *egc, uint32_t domid, const struct libxl_device_type *dt, void *type, libxl__ao_device *aodev); diff --git a/tools/libxl/libxl_pci.c b/tools/libxl/libxl_pci.c index 7a2d42f4c3..f929e5aaa6 100644 --- a/tools/libxl/libxl_pci.c +++ b/tools/libxl/libxl_pci.c @@ -160,7 +160,8 @@ static int libxl__device_pci_add_xenstore(libxl__gc *gc, uint32_t domid, libxl_d rc = libxl__get_domain_configuration(gc, domid, &d_config); if (rc) goto out; - DEVICE_ADD(pci, pcidevs, domid, &pcidev_saved, COMPARE_PCI, &d_config); + device_add_domain_config(gc, &d_config, &libxl__pcidev_devtype, + &pcidev_saved); rc = libxl__dm_check_start(gc, &d_config, domid); if (rc) goto out; diff --git a/tools/libxl/libxl_usb.c b/tools/libxl/libxl_usb.c index 7f78f4e692..1d5a2432ba 100644 --- a/tools/libxl/libxl_usb.c +++ b/tools/libxl/libxl_usb.c @@ -246,8 +246,8 @@ static int libxl__device_usbctrl_add_xenstore(libxl__gc *gc, uint32_t domid, rc = libxl__get_domain_configuration(gc, domid, &d_config); if (rc) goto out; - DEVICE_ADD(usbctrl, usbctrls, domid, &usbctrl_saved, - COMPARE_USBCTRL, &d_config); + device_add_domain_config(gc, &d_config, &libxl__usbctrl_devtype, + &usbctrl_saved); rc = libxl__dm_check_start(gc, &d_config, domid); if (rc) goto out; @@ -1194,8 +1194,8 @@ static int libxl__device_usbdev_add_xenstore(libxl__gc *gc, uint32_t domid, rc = libxl__get_domain_configuration(gc, domid, &d_config); if (rc) goto out; - DEVICE_ADD(usbdev, usbdevs, domid, &usbdev_saved, - COMPARE_USB, &d_config); + device_add_domain_config(gc, &d_config, &libxl__usbdev_devtype, + &usbdev_saved); rc = libxl__dm_check_start(gc, &d_config, domid); if (rc) goto out;