External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-20 11:35:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Xen: Remove unneeded LIBXL_HAVE_* ifdefs

Browse Source 
Now that the minimum supported Xen version has bumped to 4.9, all
uses of LIBXL_HAVE_* that are included in Xen 4.9 can be removed
from the libxl driver.

Signed-off-by: Jim Fehlig <jfehlig@suse.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
This commit is contained in:
Jim Fehlig 2021-06-17 11:27:26 -06:00
parent 36d6da4ebf
commit e58004d70a
9 changed files with 6 additions and 157 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/libxl/libxl_capabilities.c
View File

@ -646,15 +646,6 @@ libxlMakeDomainDeviceVideoCaps(virDomainCapsDeviceVideo *dev)
return 0; return 0;
} }
bool libxlCapsHasPVUSB(void)
{
#ifdef LIBXL_HAVE_PVUSB
return true;
#else
return false;
#endif
}
static int static int
libxlMakeDomainDeviceHostdevCaps(virDomainCapsDeviceHostdev *dev) libxlMakeDomainDeviceHostdevCaps(virDomainCapsDeviceHostdev *dev)
{ {
@ -678,7 +669,6 @@ libxlMakeDomainDeviceHostdevCaps(virDomainCapsDeviceHostdev *dev)
VIR_DOMAIN_CAPS_ENUM_SET(dev->subsysType, VIR_DOMAIN_CAPS_ENUM_SET(dev->subsysType,
VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI); VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI);
if (libxlCapsHasPVUSB())
VIR_DOMAIN_CAPS_ENUM_SET(dev->subsysType, VIR_DOMAIN_CAPS_ENUM_SET(dev->subsysType,
VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_USB); VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_USB);

2
src/libxl/libxl_capabilities.h
View File

@ -39,8 +39,6 @@
* by libvirt for Xen, and cannot be used for a persistent network name. */ * by libvirt for Xen, and cannot be used for a persistent network name. */
#define LIBXL_GENERATED_PREFIX_XEN "vif" #define LIBXL_GENERATED_PREFIX_XEN "vif"
bool libxlCapsHasPVUSB(void) G_GNUC_NO_INLINE;
virCaps * virCaps *
libxlMakeCapabilities(libxl_ctx *ctx); libxlMakeCapabilities(libxl_ctx *ctx);

45
src/libxl/libxl_conf.c
View File

@ -619,11 +619,9 @@ libxlMakeDomBuildInfo(virDomainDef *def,
} }
b_info->u.hvm.boot = g_strdup(bootorder); b_info->u.hvm.boot = g_strdup(bootorder);
#ifdef LIBXL_HAVE_BUILDINFO_KERNEL
b_info->cmdline = g_strdup(def->os.cmdline); b_info->cmdline = g_strdup(def->os.cmdline);
b_info->kernel = g_strdup(def->os.kernel); b_info->kernel = g_strdup(def->os.kernel);
b_info->ramdisk = g_strdup(def->os.initrd); b_info->ramdisk = g_strdup(def->os.initrd);
#endif
/* /*
* Currently libxl only allows specifying the type of BIOS. * Currently libxl only allows specifying the type of BIOS.
@ -677,7 +675,6 @@ libxlMakeDomBuildInfo(virDomainDef *def,
0) 0)
return -1; return -1;
} else { } else {
#ifdef LIBXL_HAVE_BUILDINFO_SERIAL_LIST
b_info->u.hvm.serial_list = *g_new0(libxl_string_list, def->nserials + 1); b_info->u.hvm.serial_list = *g_new0(libxl_string_list, def->nserials + 1);
for (i = 0; i < def->nserials; i++) { for (i = 0; i < def->nserials; i++) {
if (libxlMakeChrdevStr(def->serials[i], if (libxlMakeChrdevStr(def->serials[i],
@ -688,12 +685,6 @@ libxlMakeDomBuildInfo(virDomainDef *def,
} }
} }
b_info->u.hvm.serial_list[i] = NULL; b_info->u.hvm.serial_list[i] = NULL;
#else
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
"%s",
_("Only one serial device is supported by libxl"));
return -1;
#endif
} }
} }
@ -714,22 +705,8 @@ libxlMakeDomBuildInfo(virDomainDef *def,
if (def->inputs[i]->bus != VIR_DOMAIN_INPUT_BUS_USB) if (def->inputs[i]->bus != VIR_DOMAIN_INPUT_BUS_USB)
continue; continue;
#ifdef LIBXL_HAVE_BUILDINFO_USBDEVICE_LIST
VIR_EXPAND_N(b_info->u.hvm.usbdevice_list, nusbdevice, 1); VIR_EXPAND_N(b_info->u.hvm.usbdevice_list, nusbdevice, 1);
#else
nusbdevice++;
if (nusbdevice > 1) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("libxenlight supports only one input device"));
return -1;
}
#endif
#ifdef LIBXL_HAVE_BUILDINFO_USBDEVICE_LIST
usbdevice = &b_info->u.hvm.usbdevice_list[nusbdevice - 1]; usbdevice = &b_info->u.hvm.usbdevice_list[nusbdevice - 1];
#else
usbdevice = &b_info->u.hvm.usbdevice;
#endif
switch (def->inputs[i]->type) { switch (def->inputs[i]->type) {
case VIR_DOMAIN_INPUT_TYPE_MOUSE: case VIR_DOMAIN_INPUT_TYPE_MOUSE:
VIR_FREE(*usbdevice); VIR_FREE(*usbdevice);
@ -746,11 +723,9 @@ libxlMakeDomBuildInfo(virDomainDef *def,
} }
} }
#ifdef LIBXL_HAVE_BUILDINFO_USBDEVICE_LIST
/* NULL-terminate usbdevice_list */ /* NULL-terminate usbdevice_list */
if (nusbdevice > 0) if (nusbdevice > 0)
VIR_EXPAND_N(b_info->u.hvm.usbdevice_list, nusbdevice, 1); VIR_EXPAND_N(b_info->u.hvm.usbdevice_list, nusbdevice, 1);
#endif
} else if (pvh) { } else if (pvh) {
b_info->cmdline = g_strdup(def->os.cmdline); b_info->cmdline = g_strdup(def->os.cmdline);
b_info->kernel = g_strdup(def->os.kernel); b_info->kernel = g_strdup(def->os.kernel);
@ -840,7 +815,6 @@ libxlMakeDomBuildInfo(virDomainDef *def,
return 0; return 0;
} }
#ifdef LIBXL_HAVE_VNUMA
static int static int
libxlMakeVnumaList(virDomainDef *def, libxlMakeVnumaList(virDomainDef *def,
libxl_ctx *ctx, libxl_ctx *ctx,
@ -948,7 +922,6 @@ libxlMakeVnumaList(virDomainDef *def,
return ret; return ret;
} }
#endif
static int static int
libxlDiskSetDiscard(libxl_device_disk *x_disk, int discard) libxlDiskSetDiscard(libxl_device_disk *x_disk, int discard)
@ -1136,12 +1109,10 @@ libxlMakeDisk(virDomainDiskDef *l_disk, libxl_device_disk *x_disk)
x_disk->format = LIBXL_DISK_FORMAT_RAW; x_disk->format = LIBXL_DISK_FORMAT_RAW;
x_disk->backend = LIBXL_DISK_BACKEND_TAP; x_disk->backend = LIBXL_DISK_BACKEND_TAP;
break; break;
#ifdef LIBXL_HAVE_QED
case VIR_STORAGE_FILE_QED: case VIR_STORAGE_FILE_QED:
x_disk->format = LIBXL_DISK_FORMAT_QED; x_disk->format = LIBXL_DISK_FORMAT_QED;
x_disk->backend = LIBXL_DISK_BACKEND_QDISK; x_disk->backend = LIBXL_DISK_BACKEND_QDISK;
break; break;
#endif
default: default:
virReportError(VIR_ERR_INTERNAL_ERROR, virReportError(VIR_ERR_INTERNAL_ERROR,
_("libxenlight does not support disk format %s " _("libxenlight does not support disk format %s "
@ -1159,11 +1130,9 @@ libxlMakeDisk(virDomainDiskDef *l_disk, libxl_device_disk *x_disk)
case VIR_STORAGE_FILE_QCOW2: case VIR_STORAGE_FILE_QCOW2:
x_disk->format = LIBXL_DISK_FORMAT_QCOW2; x_disk->format = LIBXL_DISK_FORMAT_QCOW2;
break; break;
#ifdef LIBXL_HAVE_QED
case VIR_STORAGE_FILE_QED: case VIR_STORAGE_FILE_QED:
x_disk->format = LIBXL_DISK_FORMAT_QED; x_disk->format = LIBXL_DISK_FORMAT_QED;
break; break;
#endif
case VIR_STORAGE_FILE_VHD: case VIR_STORAGE_FILE_VHD:
x_disk->format = LIBXL_DISK_FORMAT_VHD; x_disk->format = LIBXL_DISK_FORMAT_VHD;
break; break;
@ -1712,7 +1681,6 @@ libxlMakeBuildInfoVfb(virPortAllocatorRange *graphicsports,
break; break;
} }
#ifdef LIBXL_HAVE_SPICE_VDAGENT
if (l_vfb->data.spice.copypaste == VIR_TRISTATE_BOOL_YES) { if (l_vfb->data.spice.copypaste == VIR_TRISTATE_BOOL_YES) {
libxl_defbool_set(&b_info->u.hvm.spice.vdagent, true); libxl_defbool_set(&b_info->u.hvm.spice.vdagent, true);
libxl_defbool_set(&b_info->u.hvm.spice.clipboard_sharing, true); libxl_defbool_set(&b_info->u.hvm.spice.clipboard_sharing, true);
@ -1720,7 +1688,6 @@ libxlMakeBuildInfoVfb(virPortAllocatorRange *graphicsports,
libxl_defbool_set(&b_info->u.hvm.spice.vdagent, false); libxl_defbool_set(&b_info->u.hvm.spice.vdagent, false);
libxl_defbool_set(&b_info->u.hvm.spice.clipboard_sharing, false); libxl_defbool_set(&b_info->u.hvm.spice.clipboard_sharing, false);
} }
#endif
return 0; return 0;
} }
@ -2000,7 +1967,6 @@ libxlDriverGetDom0MaxmemConf(libxlDriverConfig *cfg,
} }
#ifdef LIBXL_HAVE_DEVICE_CHANNEL
static int static int
libxlPrepareChannel(virDomainChrDef *channel, libxlPrepareChannel(virDomainChrDef *channel,
const char *channelDir, const char *channelDir,
@ -2096,9 +2062,7 @@ libxlMakeChannelList(const char *channelDir,
VIR_FREE(x_channels); VIR_FREE(x_channels);
return -1; return -1;
} }
#endif
#ifdef LIBXL_HAVE_PVUSB
int int
libxlMakeUSBController(virDomainControllerDef *controller, libxlMakeUSBController(virDomainControllerDef *controller,
libxl_device_usbctrl *usbctrl) libxl_device_usbctrl *usbctrl)
@ -2315,7 +2279,6 @@ libxlMakeUSBList(virDomainDef *def, libxl_domain_config *d_config)
VIR_FREE(x_usbdevs); VIR_FREE(x_usbdevs);
return -1; return -1;
} }
#endif
int int
libxlMakePCI(virDomainHostdevDef *hostdev, libxl_device_pci *pcidev) libxlMakePCI(virDomainHostdevDef *hostdev, libxl_device_pci *pcidev)
@ -2429,7 +2392,6 @@ libxlMakeVideo(virDomainDef *def, libxl_domain_config *d_config)
} }
break; break;
#ifdef LIBXL_HAVE_QXL
case VIR_DOMAIN_VIDEO_TYPE_QXL: case VIR_DOMAIN_VIDEO_TYPE_QXL:
b_info->u.hvm.vga.kind = LIBXL_VGA_INTERFACE_TYPE_QXL; b_info->u.hvm.vga.kind = LIBXL_VGA_INTERFACE_TYPE_QXL;
if (def->videos[0]->vram < 128 * 1024) { if (def->videos[0]->vram < 128 * 1024) {
@ -2438,7 +2400,6 @@ libxlMakeVideo(virDomainDef *def, libxl_domain_config *d_config)
return -1; return -1;
} }
break; break;
#endif
default: default:
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
@ -2509,10 +2470,8 @@ libxlBuildDomainConfig(virPortAllocatorRange *graphicsports,
if (libxlMakeDomBuildInfo(def, cfg, caps, d_config) < 0) if (libxlMakeDomBuildInfo(def, cfg, caps, d_config) < 0)
return -1; return -1;
#ifdef LIBXL_HAVE_VNUMA
if (libxlMakeVnumaList(def, ctx, d_config) < 0) if (libxlMakeVnumaList(def, ctx, d_config) < 0)
return -1; return -1;
#endif
if (libxlMakeDiskList(def, d_config) < 0) if (libxlMakeDiskList(def, d_config) < 0)
return -1; return -1;
@ -2529,18 +2488,14 @@ libxlBuildDomainConfig(virPortAllocatorRange *graphicsports,
if (libxlMakePCIList(def, d_config) < 0) if (libxlMakePCIList(def, d_config) < 0)
return -1; return -1;
#ifdef LIBXL_HAVE_PVUSB
if (libxlMakeUSBControllerList(def, d_config) < 0) if (libxlMakeUSBControllerList(def, d_config) < 0)
return -1; return -1;
if (libxlMakeUSBList(def, d_config) < 0) if (libxlMakeUSBList(def, d_config) < 0)
return -1; return -1;
#endif
#ifdef LIBXL_HAVE_DEVICE_CHANNEL
if (libxlMakeChannelList(cfg->channelDir, def, d_config) < 0) if (libxlMakeChannelList(cfg->channelDir, def, d_config) < 0)
return -1; return -1;
#endif
/* /*
* Now that any potential VFBs are defined, update the build info with * Now that any potential VFBs are defined, update the build info with

20
src/libxl/libxl_domain.c
View File

@ -597,7 +597,6 @@ libxlDomainShutdownThread(void *opaque)
case VIR_DOMAIN_LIFECYCLE_ACTION_LAST: case VIR_DOMAIN_LIFECYCLE_ACTION_LAST:
goto endjob; goto endjob;
} }
#ifdef LIBXL_HAVE_SOFT_RESET
} else if (xl_reason == LIBXL_SHUTDOWN_REASON_SOFT_RESET) { } else if (xl_reason == LIBXL_SHUTDOWN_REASON_SOFT_RESET) {
libxlDomainObjPrivate *priv = vm->privateData; libxlDomainObjPrivate *priv = vm->privateData;
@ -624,7 +623,6 @@ libxlDomainShutdownThread(void *opaque)
} }
libxl_evenable_domain_death(cfg->ctx, vm->def->id, 0, &priv->deathW); libxl_evenable_domain_death(cfg->ctx, vm->def->id, 0, &priv->deathW);
libxlDomainUnpauseWrapper(cfg->ctx, vm->def->id); libxlDomainUnpauseWrapper(cfg->ctx, vm->def->id);
#endif
} else { } else {
VIR_INFO("Unhandled shutdown_reason %d", xl_reason); VIR_INFO("Unhandled shutdown_reason %d", xl_reason);
} }
@ -878,9 +876,7 @@ libxlDomainCleanup(libxlDriverPrivate *driver,
VIR_DEBUG("Cleaning up domain with id '%d' and name '%s'", VIR_DEBUG("Cleaning up domain with id '%d' and name '%s'",
vm->def->id, vm->def->name); vm->def->id, vm->def->name);
#ifdef LIBXL_HAVE_PVUSB
hostdev_flags |= VIR_HOSTDEV_SP_USB; hostdev_flags |= VIR_HOSTDEV_SP_USB;
#endif
/* now that we know it's stopped call the hook if present */ /* now that we know it's stopped call the hook if present */
if (virHookPresent(VIR_HOOK_DRIVER_LIBXL)) { if (virHookPresent(VIR_HOOK_DRIVER_LIBXL)) {
@ -1188,7 +1184,6 @@ libxlDomainUpdateDiskParams(virDomainDef *def, libxl_ctx *ctx)
VIR_FREE(disks); VIR_FREE(disks);
} }
#ifdef LIBXL_HAVE_DEVICE_CHANNEL
static void static void
libxlDomainCreateChannelPTY(virDomainDef *def, libxl_ctx *ctx) libxlDomainCreateChannelPTY(virDomainDef *def, libxl_ctx *ctx)
{ {
@ -1222,13 +1217,6 @@ libxlDomainCreateChannelPTY(virDomainDef *def, libxl_ctx *ctx)
for (i = 0; i < nchannels; i++) for (i = 0; i < nchannels; i++)
libxl_device_channel_dispose(&x_channels[i]); libxl_device_channel_dispose(&x_channels[i]);
} }
#endif
#ifdef LIBXL_HAVE_SRM_V2
# define LIBXL_DOMSTART_RESTORE_VER_ATTR /* empty */
#else
# define LIBXL_DOMSTART_RESTORE_VER_ATTR G_GNUC_UNUSED
#endif
/* /*
* Start a domain through libxenlight. * Start a domain through libxenlight.
@ -1240,7 +1228,7 @@ libxlDomainStart(libxlDriverPrivate *driver,
virDomainObj *vm, virDomainObj *vm,
bool start_paused, bool start_paused,
int restore_fd, int restore_fd,
uint32_t restore_ver LIBXL_DOMSTART_RESTORE_VER_ATTR) uint32_t restore_ver)
{ {
libxl_domain_config d_config; libxl_domain_config d_config;
virDomainDef *def = NULL; virDomainDef *def = NULL;
@ -1259,9 +1247,7 @@ libxlDomainStart(libxlDriverPrivate *driver,
unsigned int hostdev_flags = VIR_HOSTDEV_SP_PCI; unsigned int hostdev_flags = VIR_HOSTDEV_SP_PCI;
g_autofree char *config_json = NULL; g_autofree char *config_json = NULL;
#ifdef LIBXL_HAVE_PVUSB
hostdev_flags |= VIR_HOSTDEV_SP_USB; hostdev_flags |= VIR_HOSTDEV_SP_USB;
#endif
libxl_domain_config_init(&d_config); libxl_domain_config_init(&d_config);
@ -1385,9 +1371,7 @@ libxlDomainStart(libxlDriverPrivate *driver,
&domid, NULL, &aop_console_how); &domid, NULL, &aop_console_how);
} else { } else {
libxl_domain_restore_params_init(&params); libxl_domain_restore_params_init(&params);
#ifdef LIBXL_HAVE_SRM_V2
params.stream_version = restore_ver; params.stream_version = restore_ver;
#endif
ret = libxlDomainCreateRestoreWrapper(cfg->ctx, &d_config, &domid, ret = libxlDomainCreateRestoreWrapper(cfg->ctx, &d_config, &domid,
restore_fd, &params, restore_fd, &params,
&aop_console_how); &aop_console_how);
@ -1431,10 +1415,8 @@ libxlDomainStart(libxlDriverPrivate *driver,
libxlDomainCreateIfaceNames(vm->def, &d_config); libxlDomainCreateIfaceNames(vm->def, &d_config);
libxlDomainUpdateDiskParams(vm->def, cfg->ctx); libxlDomainUpdateDiskParams(vm->def, cfg->ctx);
#ifdef LIBXL_HAVE_DEVICE_CHANNEL
if (vm->def->nchannels > 0) if (vm->def->nchannels > 0)
libxlDomainCreateChannelPTY(vm->def, cfg->ctx); libxlDomainCreateChannelPTY(vm->def, cfg->ctx);
#endif
if ((dom_xml = virDomainDefFormat(vm->def, driver->xmlopt, 0)) == NULL) if ((dom_xml = virDomainDefFormat(vm->def, driver->xmlopt, 0)) == NULL)
goto destroy_dom; goto destroy_dom;

27
src/libxl/libxl_driver.c
View File

@ -394,9 +394,7 @@ libxlReconnectDomain(virDomainObj *vm,
unsigned int hostdev_flags = VIR_HOSTDEV_SP_PCI; unsigned int hostdev_flags = VIR_HOSTDEV_SP_PCI;
int ret = -1; int ret = -1;
#ifdef LIBXL_HAVE_PVUSB
hostdev_flags |= VIR_HOSTDEV_SP_USB; hostdev_flags |= VIR_HOSTDEV_SP_USB;
#endif
virObjectRef(vm); virObjectRef(vm);
virObjectLock(vm); virObjectLock(vm);
@ -567,11 +565,7 @@ static const libxl_osevent_hooks libxl_osevent_callbacks = {
}; };
static const libxl_childproc_hooks libxl_child_hooks = { static const libxl_childproc_hooks libxl_child_hooks = {
#ifdef LIBXL_HAVE_SIGCHLD_OWNER_SELECTIVE_REAP
.chldowner = libxl_sigchld_owner_libxl_always_selective_reap, .chldowner = libxl_sigchld_owner_libxl_always_selective_reap,
#else
.chldowner = libxl_sigchld_owner_libxl,
#endif
}; };
const struct libxl_event_hooks ev_hooks = { const struct libxl_event_hooks ev_hooks = {
@ -3144,7 +3138,6 @@ libxlDomainAttachHostPCIDevice(libxlDriverPrivate *driver,
return ret; return ret;
} }
#ifdef LIBXL_HAVE_PVUSB
static int static int
libxlDomainAttachControllerDevice(libxlDriverPrivate *driver, libxlDomainAttachControllerDevice(libxlDriverPrivate *driver,
virDomainObj *vm, virDomainObj *vm,
@ -3276,7 +3269,6 @@ libxlDomainAttachHostUSBDevice(libxlDriverPrivate *driver,
libxl_device_usbdev_dispose(&usbdev); libxl_device_usbdev_dispose(&usbdev);
return ret; return ret;
} }
#endif
static int static int
libxlDomainAttachHostDevice(libxlDriverPrivate *driver, libxlDomainAttachHostDevice(libxlDriverPrivate *driver,
@ -3296,12 +3288,10 @@ libxlDomainAttachHostDevice(libxlDriverPrivate *driver,
return -1; return -1;
break; break;
#ifdef LIBXL_HAVE_PVUSB
case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_USB: case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_USB:
if (libxlDomainAttachHostUSBDevice(driver, vm, hostdev) < 0) if (libxlDomainAttachHostUSBDevice(driver, vm, hostdev) < 0)
return -1; return -1;
break; break;
#endif
default: default:
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
@ -3482,13 +3472,11 @@ libxlDomainAttachDeviceLive(libxlDriverPrivate *driver,
dev->data.disk = NULL; dev->data.disk = NULL;
break; break;
#ifdef LIBXL_HAVE_PVUSB
case VIR_DOMAIN_DEVICE_CONTROLLER: case VIR_DOMAIN_DEVICE_CONTROLLER:
ret = libxlDomainAttachControllerDevice(driver, vm, dev->data.controller); ret = libxlDomainAttachControllerDevice(driver, vm, dev->data.controller);
if (!ret) if (!ret)
dev->data.controller = NULL; dev->data.controller = NULL;
break; break;
#endif
case VIR_DOMAIN_DEVICE_NET: case VIR_DOMAIN_DEVICE_NET:
ret = libxlDomainAttachNetDevice(driver, vm, ret = libxlDomainAttachNetDevice(driver, vm,
@ -3569,9 +3557,7 @@ libxlDomainAttachDeviceConfig(virDomainDef *vmdef, virDomainDeviceDef *dev)
switch (hostdev->source.subsys.type) { switch (hostdev->source.subsys.type) {
case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI: case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI:
#ifndef LIBXL_HAVE_PVUSB
case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_USB: case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_USB:
#endif
case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_LAST: case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_LAST:
return -1; return -1;
} }
@ -3689,7 +3675,6 @@ libxlDomainDetachHostPCIDevice(libxlDriverPrivate *driver,
return ret; return ret;
} }
#ifdef LIBXL_HAVE_PVUSB
static int static int
libxlDomainDetachControllerDevice(libxlDriverPrivate *driver, libxlDomainDetachControllerDevice(libxlDriverPrivate *driver,
virDomainObj *vm, virDomainObj *vm,
@ -3808,7 +3793,6 @@ libxlDomainDetachHostUSBDevice(libxlDriverPrivate *driver,
libxl_device_usbdev_dispose(&usbdev); libxl_device_usbdev_dispose(&usbdev);
return ret; return ret;
} }
#endif
static int static int
libxlDomainDetachHostDevice(libxlDriverPrivate *driver, libxlDomainDetachHostDevice(libxlDriverPrivate *driver,
@ -3828,10 +3812,8 @@ libxlDomainDetachHostDevice(libxlDriverPrivate *driver,
case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI: case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI:
return libxlDomainDetachHostPCIDevice(driver, vm, hostdev); return libxlDomainDetachHostPCIDevice(driver, vm, hostdev);
#ifdef LIBXL_HAVE_PVUSB
case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_USB: case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_USB:
return libxlDomainDetachHostUSBDevice(driver, vm, hostdev); return libxlDomainDetachHostUSBDevice(driver, vm, hostdev);
#endif
default: default:
virReportError(VIR_ERR_INTERNAL_ERROR, virReportError(VIR_ERR_INTERNAL_ERROR,
@ -3914,11 +3896,9 @@ libxlDomainDetachDeviceLive(libxlDriverPrivate *driver,
ret = libxlDomainDetachDeviceDiskLive(vm, dev); ret = libxlDomainDetachDeviceDiskLive(vm, dev);
break; break;
#ifdef LIBXL_HAVE_PVUSB
case VIR_DOMAIN_DEVICE_CONTROLLER: case VIR_DOMAIN_DEVICE_CONTROLLER:
ret = libxlDomainDetachControllerDevice(driver, vm, dev); ret = libxlDomainDetachControllerDevice(driver, vm, dev);
break; break;
#endif
case VIR_DOMAIN_DEVICE_NET: case VIR_DOMAIN_DEVICE_NET:
ret = libxlDomainDetachNetDevice(driver, vm, ret = libxlDomainDetachNetDevice(driver, vm,
@ -4856,10 +4836,6 @@ libxlDomainSetSchedulerParameters(virDomainPtr dom, virTypedParameterPtr params,
return libxlDomainSetSchedulerParametersFlags(dom, params, nparams, 0); return libxlDomainSetSchedulerParametersFlags(dom, params, nparams, 0);
} }
/* NUMA node affinity information is available through libxl
* starting from Xen 4.3. */
#ifdef LIBXL_HAVE_DOMAIN_NODEAFFINITY
/* Number of Xen NUMA parameters */ /* Number of Xen NUMA parameters */
#define LIBXL_NUMA_NPARAM 2 #define LIBXL_NUMA_NPARAM 2
@ -4978,7 +4954,6 @@ libxlDomainGetNumaParameters(virDomainPtr dom,
virObjectUnref(cfg); virObjectUnref(cfg);
return ret; return ret;
} }
#endif
static int static int
libxlDomainIsActive(virDomainPtr dom) libxlDomainIsActive(virDomainPtr dom)
@ -6535,9 +6510,7 @@ static virHypervisorDriver libxlHypervisorDriver = {
.domainGetSchedulerParametersFlags = libxlDomainGetSchedulerParametersFlags, /* 0.9.2 */ .domainGetSchedulerParametersFlags = libxlDomainGetSchedulerParametersFlags, /* 0.9.2 */
.domainSetSchedulerParameters = libxlDomainSetSchedulerParameters, /* 0.9.0 */ .domainSetSchedulerParameters = libxlDomainSetSchedulerParameters, /* 0.9.0 */
.domainSetSchedulerParametersFlags = libxlDomainSetSchedulerParametersFlags, /* 0.9.2 */ .domainSetSchedulerParametersFlags = libxlDomainSetSchedulerParametersFlags, /* 0.9.2 */
#ifdef LIBXL_HAVE_DOMAIN_NODEAFFINITY
.domainGetNumaParameters = libxlDomainGetNumaParameters, /* 1.1.1 */ .domainGetNumaParameters = libxlDomainGetNumaParameters, /* 1.1.1 */
#endif
.nodeGetFreeMemory = libxlNodeGetFreeMemory, /* 0.9.0 */ .nodeGetFreeMemory = libxlNodeGetFreeMemory, /* 0.9.0 */
.nodeGetCellsFreeMemory = libxlNodeGetCellsFreeMemory, /* 1.1.1 */ .nodeGetCellsFreeMemory = libxlNodeGetCellsFreeMemory, /* 1.1.1 */
.domainGetJobInfo = libxlDomainGetJobInfo, /* 1.3.1 */ .domainGetJobInfo = libxlDomainGetJobInfo, /* 1.3.1 */

24
src/libxl/xen_xl.c
View File

@ -128,7 +128,6 @@ xenParseXLOS(virConf *conf, virDomainDef *def, virCaps *caps)
if (xenConfigCopyStringOpt(conf, "acpi_firmware", &def->os.slic_table) < 0) if (xenConfigCopyStringOpt(conf, "acpi_firmware", &def->os.slic_table) < 0)
return -1; return -1;
#ifdef LIBXL_HAVE_BUILDINFO_KERNEL
if (xenConfigCopyStringOpt(conf, "kernel", &def->os.kernel) < 0) if (xenConfigCopyStringOpt(conf, "kernel", &def->os.kernel) < 0)
return -1; return -1;
@ -137,7 +136,6 @@ xenParseXLOS(virConf *conf, virDomainDef *def, virCaps *caps)
if (xenParseCmdline(conf, &def->os.cmdline) < 0) if (xenParseCmdline(conf, &def->os.cmdline) < 0)
return -1; return -1;
#endif
if (xenConfigGetString(conf, "boot", &boot, "c") < 0) if (xenConfigGetString(conf, "boot", &boot, "c") < 0)
return -1; return -1;
@ -402,7 +400,6 @@ xenParseXLSpice(virConf *conf, virDomainDef *def)
return -1; return -1;
} }
#ifdef LIBXL_HAVE_VNUMA
static int static int
xenParseXLVnuma(virConf *conf, xenParseXLVnuma(virConf *conf,
virDomainDef *def) virDomainDef *def)
@ -591,7 +588,6 @@ xenParseXLVnuma(virConf *conf,
return ret; return ret;
} }
#endif
static int static int
xenParseXLXenbusLimits(virConf *conf, virDomainDef *def) xenParseXLXenbusLimits(virConf *conf, virDomainDef *def)
@ -756,11 +752,9 @@ xenParseXLDisk(virConf *conf, virDomainDef *def)
case LIBXL_DISK_FORMAT_EMPTY: case LIBXL_DISK_FORMAT_EMPTY:
break; break;
#ifdef LIBXL_HAVE_QED
case LIBXL_DISK_FORMAT_QED: case LIBXL_DISK_FORMAT_QED:
disk->src->format = VIR_STORAGE_FILE_QED; disk->src->format = VIR_STORAGE_FILE_QED;
break; break;
#endif
default: default:
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
@ -833,15 +827,9 @@ xenParseXLInputDevs(virConf *conf, virDomainDef *def)
if (def->os.type == VIR_DOMAIN_OSTYPE_HVM) { if (def->os.type == VIR_DOMAIN_OSTYPE_HVM) {
val = virConfGetValue(conf, "usbdevice"); val = virConfGetValue(conf, "usbdevice");
/* usbdevice can be defined as either a single string or a list */ /* usbdevice can be defined as either a single string or a list */
if (val && val->type == VIR_CONF_LIST) { if (val && val->type == VIR_CONF_LIST)
#ifdef LIBXL_HAVE_BUILDINFO_USBDEVICE_LIST
val = val->list; val = val->list;
#else
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("multiple USB devices not supported"));
return -1;
#endif
}
/* otherwise val->next is NULL, so can be handled by the same code */ /* otherwise val->next is NULL, so can be handled by the same code */
while (val) { while (val) {
if (val->type != VIR_CONF_STRING) { if (val->type != VIR_CONF_STRING) {
@ -1162,10 +1150,8 @@ xenParseXL(virConf *conf,
if (xenParseXLOS(conf, def, caps) < 0) if (xenParseXLOS(conf, def, caps) < 0)
goto cleanup; goto cleanup;
#ifdef LIBXL_HAVE_VNUMA
if (xenParseXLVnuma(conf, def) < 0) if (xenParseXLVnuma(conf, def) < 0)
goto cleanup; goto cleanup;
#endif
if (xenParseXLXenbusLimits(conf, def) < 0) if (xenParseXLXenbusLimits(conf, def) < 0)
goto cleanup; goto cleanup;
@ -1224,7 +1210,6 @@ xenFormatXLOS(virConf *conf, virDomainDef *def)
xenConfigSetString(conf, "acpi_firmware", def->os.slic_table) < 0) xenConfigSetString(conf, "acpi_firmware", def->os.slic_table) < 0)
return -1; return -1;
#ifdef LIBXL_HAVE_BUILDINFO_KERNEL
if (def->os.kernel && if (def->os.kernel &&
xenConfigSetString(conf, "kernel", def->os.kernel) < 0) xenConfigSetString(conf, "kernel", def->os.kernel) < 0)
return -1; return -1;
@ -1236,7 +1221,6 @@ xenFormatXLOS(virConf *conf, virDomainDef *def)
if (def->os.cmdline && if (def->os.cmdline &&
xenConfigSetString(conf, "cmdline", def->os.cmdline) < 0) xenConfigSetString(conf, "cmdline", def->os.cmdline) < 0)
return -1; return -1;
#endif
for (i = 0; i < def->os.nBootDevs; i++) { for (i = 0; i < def->os.nBootDevs; i++) {
switch (def->os.bootDevs[i]) { switch (def->os.bootDevs[i]) {
@ -1390,7 +1374,6 @@ xenFormatXLCPUID(virConf *conf, virDomainDef *def)
return ret; return ret;
} }
#ifdef LIBXL_HAVE_VNUMA
static int static int
xenFormatXLVnode(virConfValue *list, xenFormatXLVnode(virConfValue *list,
virBuffer *buf) virBuffer *buf)
@ -1511,7 +1494,6 @@ xenFormatXLDomainVnuma(virConf *conf,
virConfFreeValue(vnumaVal); virConfFreeValue(vnumaVal);
return -1; return -1;
} }
#endif
static int static int
xenFormatXLXenbusLimits(virConf *conf, virDomainDef *def) xenFormatXLXenbusLimits(virConf *conf, virDomainDef *def)
@ -2196,10 +2178,8 @@ xenFormatXL(virDomainDef *def, virConnectPtr conn)
if (xenFormatXLCPUID(conf, def) < 0) if (xenFormatXLCPUID(conf, def) < 0)
return NULL; return NULL;
#ifdef LIBXL_HAVE_VNUMA
if (xenFormatXLDomainVnuma(conf, def) < 0) if (xenFormatXLDomainVnuma(conf, def) < 0)
return NULL; return NULL;
#endif
if (xenFormatXLXenbusLimits(conf, def) < 0) if (xenFormatXLXenbusLimits(conf, def) < 0)
return NULL; return NULL;

11
tests/domaincapsmock.c
View File

@ -17,17 +17,6 @@
#include <config.h> #include <config.h>
#include "virhostcpu.h" #include "virhostcpu.h"
#ifdef WITH_LIBXL
# include "libxl/libxl_capabilities.h"
#endif
#ifdef WITH_LIBXL
bool
libxlCapsHasPVUSB(void)
{
return true;
}
#endif
int int
virHostCPUGetKVMMaxVCPUs(void) virHostCPUGetKVMMaxVCPUs(void)

6
tests/libxlxml2domconfigtest.c
View File

@ -105,13 +105,7 @@ testCompareXMLToDomConfig(const char *xmlfile,
*/ */
# ifndef LIBXL_HAVE_BUILDINFO_APIC # ifndef LIBXL_HAVE_BUILDINFO_APIC
if (expectconfig.c_info.type == LIBXL_DOMAIN_TYPE_HVM) { if (expectconfig.c_info.type == LIBXL_DOMAIN_TYPE_HVM) {
# ifdef LIBXL_HAVE_MEMKB_64BITS
/*
* This part of the libxl API was changed without a guard in Xen 4.8.
* Reuse another Xen 4.8 specific conditional.
*/
libxl_defbool_unset(&expectconfig.b_info.acpi); libxl_defbool_unset(&expectconfig.b_info.acpi);
# endif
libxl_defbool_set(&expectconfig.b_info.u.hvm.apic, true); libxl_defbool_set(&expectconfig.b_info.u.hvm.apic, true);
libxl_defbool_set(&expectconfig.b_info.u.hvm.acpi, true); libxl_defbool_set(&expectconfig.b_info.u.hvm.acpi, true);
} }

12
tests/xlconfigtest.c
View File

@ -244,9 +244,7 @@ mymain(void)
DO_TEST("new-disk"); DO_TEST("new-disk");
DO_TEST_FORMAT("disk-positional-parms-full", false); DO_TEST_FORMAT("disk-positional-parms-full", false);
DO_TEST_FORMAT("disk-positional-parms-partial", false); DO_TEST_FORMAT("disk-positional-parms-partial", false);
#ifdef LIBXL_HAVE_QED
DO_TEST_FORMAT("disk-qed", false); DO_TEST_FORMAT("disk-qed", false);
#endif
DO_TEST("net-fakemodel"); DO_TEST("net-fakemodel");
DO_TEST("spice"); DO_TEST("spice");
DO_TEST("spice-features"); DO_TEST("spice-features");
@ -260,12 +258,10 @@ mymain(void)
DO_TEST("fullvirt-cpuid"); DO_TEST("fullvirt-cpuid");
DO_TEST("fullvirt-acpi-slic"); DO_TEST("fullvirt-acpi-slic");
DO_TEST("fullvirt-pci"); DO_TEST("fullvirt-pci");
#ifdef LIBXL_HAVE_VNUMA
DO_TEST("fullvirt-vnuma"); DO_TEST("fullvirt-vnuma");
DO_TEST_PARSE("fullvirt-vnuma-autocomplete", false); DO_TEST_PARSE("fullvirt-vnuma-autocomplete", false);
DO_TEST_PARSE("fullvirt-vnuma-nodistances", false); DO_TEST_PARSE("fullvirt-vnuma-nodistances", false);
DO_TEST_PARSE("fullvirt-vnuma-partialdist", false); DO_TEST_PARSE("fullvirt-vnuma-partialdist", false);
#endif
DO_TEST("paravirt-cmdline"); DO_TEST("paravirt-cmdline");
DO_TEST_FORMAT("paravirt-cmdline-extra-root", false); DO_TEST_FORMAT("paravirt-cmdline-extra-root", false);
@ -275,21 +271,13 @@ mymain(void)
DO_TEST_FORMAT("fullvirt-type", false); DO_TEST_FORMAT("fullvirt-type", false);
DO_TEST("pvh-type"); DO_TEST("pvh-type");
#ifdef LIBXL_HAVE_DEVICE_CHANNEL
DO_TEST("channel-pty"); DO_TEST("channel-pty");
DO_TEST("channel-unix"); DO_TEST("channel-unix");
#endif
#ifdef LIBXL_HAVE_BUILDINFO_SERIAL_LIST
DO_TEST("fullvirt-multiserial"); DO_TEST("fullvirt-multiserial");
#endif
#ifdef LIBXL_HAVE_BUILDINFO_USBDEVICE_LIST
DO_TEST("fullvirt-multiusb"); DO_TEST("fullvirt-multiusb");
#endif
#ifdef LIBXL_HAVE_BUILDINFO_KERNEL
DO_TEST("fullvirt-direct-kernel-boot"); DO_TEST("fullvirt-direct-kernel-boot");
DO_TEST_FORMAT("fullvirt-direct-kernel-boot-extra", false); DO_TEST_FORMAT("fullvirt-direct-kernel-boot-extra", false);
DO_TEST_FORMAT("fullvirt-direct-kernel-boot-bogus-extra", false); DO_TEST_FORMAT("fullvirt-direct-kernel-boot-bogus-extra", false);
#endif
#ifdef LIBXL_HAVE_BUILDINFO_GRANT_LIMITS #ifdef LIBXL_HAVE_BUILDINFO_GRANT_LIMITS
DO_TEST("max-gntframes"); DO_TEST("max-gntframes");
#endif #endif