External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-07-05 01:22:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

vz: Move error messages onto a single line

Browse Source 
Error messages are exempt from the 80 columns rule. Move them
onto one line.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
This commit is contained in:
Michal Privoznik 2023-08-24 17:03:59 +02:00
parent 8a21339e63
commit 094d1e739d
3 changed files with 72 additions and 144 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/vz/vz_driver.c
View File

@ -842,8 +842,7 @@ vzDomainDefineXMLFlags(virConnectPtr conn, const char *xml, unsigned int flags)
if (!virDomainDefCheckABIStability(dom->def, def, driver->xmlopt)) { if (!virDomainDefCheckABIStability(dom->def, def, driver->xmlopt)) {
virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, "%s", virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, "%s",
_("Can't change domain configuration " _("Can't change domain configuration in managed save state"));
"in managed save state"));
goto cleanup; goto cleanup;
} }
} else { } else {
@ -1461,15 +1460,13 @@ static int vzCheckConfigUpdateFlags(virDomainObj *dom, unsigned int *flags)
if (!(*flags & VIR_DOMAIN_AFFECT_CONFIG)) { if (!(*flags & VIR_DOMAIN_AFFECT_CONFIG)) {
virReportError(VIR_ERR_OPERATION_INVALID, "%s", virReportError(VIR_ERR_OPERATION_INVALID, "%s",
_("domain config update needs VIR_DOMAIN_AFFECT_CONFIG " _("domain config update needs VIR_DOMAIN_AFFECT_CONFIG flag to be set"));
"flag to be set"));
return -1; return -1;
} }
if (virDomainObjIsActive(dom) && !(*flags & VIR_DOMAIN_AFFECT_LIVE)) { if (virDomainObjIsActive(dom) && !(*flags & VIR_DOMAIN_AFFECT_LIVE)) {
virReportError(VIR_ERR_OPERATION_INVALID, "%s", virReportError(VIR_ERR_OPERATION_INVALID, "%s",
_("Updates on a running domain need " _("Updates on a running domain need VIR_DOMAIN_AFFECT_LIVE flag"));
"VIR_DOMAIN_AFFECT_LIVE flag"));
return -1; return -1;
} }
@ -2793,8 +2790,7 @@ vzEatCookie(const char *cookiein, int cookieinlen, unsigned int flags)
if ((!(tmp = virXPathString("string(./session-uuid[1])", ctx)) if ((!(tmp = virXPathString("string(./session-uuid[1])", ctx))
|| (virUUIDParse(tmp, mig->session_uuid) < 0))) { || (virUUIDParse(tmp, mig->session_uuid) < 0))) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s", virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("missing or malformed session-uuid element " _("missing or malformed session-uuid element in migration data"));
"in migration data"));
goto error; goto error;
} }
} }
@ -2921,8 +2917,7 @@ vzMigrationCreateURI(void)
if (STRPREFIX(hostname, "localhost")) { if (STRPREFIX(hostname, "localhost")) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s", virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("hostname on destination resolved to localhost," _("hostname on destination resolved to localhost, but migration requires an FQDN"));
" but migration requires an FQDN"));
goto cleanup; goto cleanup;
} }

135
src/vz/vz_sdk.c
View File

@ -2415,15 +2415,13 @@ prlsdkCheckUnsupportedParams(PRL_HANDLE sdkdom, virDomainDef *def)
if (def->blkio.ndevices > 0) { if (def->blkio.ndevices > 0) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("blkio parameters are not supported " _("blkio parameters are not supported by vz driver"));
"by vz driver"));
return -1; return -1;
} }
if (virDomainDefGetMemoryTotal(def) != def->mem.cur_balloon) { if (virDomainDefGetMemoryTotal(def) != def->mem.cur_balloon) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("changing balloon parameters is not supported " _("changing balloon parameters is not supported by vz driver"));
"by vz driver"));
return -1; return -1;
} }
@ -2440,8 +2438,7 @@ prlsdkCheckUnsupportedParams(PRL_HANDLE sdkdom, virDomainDef *def)
virMemoryLimitIsSet(def->mem.swap_hard_limit)) { virMemoryLimitIsSet(def->mem.swap_hard_limit)) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("Memory parameter is not supported " _("Memory parameter is not supported by vz driver"));
"by vz driver"));
return -1; return -1;
} }
@ -2453,8 +2450,7 @@ prlsdkCheckUnsupportedParams(PRL_HANDLE sdkdom, virDomainDef *def)
if (def->placement_mode) { if (def->placement_mode) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("changing cpu placement mode is not supported " _("changing cpu placement mode is not supported by vz driver"));
"by vz driver"));
return -1; return -1;
} }
@ -2489,8 +2485,7 @@ prlsdkCheckUnsupportedParams(PRL_HANDLE sdkdom, virDomainDef *def)
memMode == VIR_DOMAIN_NUMATUNE_MEM_STRICT) || memMode == VIR_DOMAIN_NUMATUNE_MEM_STRICT) ||
virDomainNumatuneHasPerNodeBinding(def->numa)) { virDomainNumatuneHasPerNodeBinding(def->numa)) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("numa parameters are not supported " _("numa parameters are not supported by vz driver"));
"by vz driver"));
return -1; return -1;
} }
@ -2499,8 +2494,7 @@ prlsdkCheckUnsupportedParams(PRL_HANDLE sdkdom, virDomainDef *def)
def->onCrash != VIR_DOMAIN_LIFECYCLE_ACTION_DESTROY) { def->onCrash != VIR_DOMAIN_LIFECYCLE_ACTION_DESTROY) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("on_reboot, on_poweroff and on_crash parameters " _("on_reboot, on_poweroff and on_crash parameters are not supported by vz driver"));
"are not supported by vz driver"));
return -1; return -1;
} }
@ -2516,8 +2510,7 @@ prlsdkCheckUnsupportedParams(PRL_HANDLE sdkdom, virDomainDef *def)
def->os.bios.useserial != 0) { def->os.bios.useserial != 0) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("changing OS parameters is not supported " _("changing OS parameters is not supported by vz driver"));
"by vz driver"));
return -1; return -1;
} }
@ -2531,8 +2524,7 @@ prlsdkCheckUnsupportedParams(PRL_HANDLE sdkdom, virDomainDef *def)
!(vmType == PVT_CT && IS_CT(def))) { !(vmType == PVT_CT && IS_CT(def))) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("changing OS type is not supported " _("changing OS type is not supported by vz driver"));
"by vz driver"));
return -1; return -1;
} }
@ -2555,16 +2547,14 @@ prlsdkCheckUnsupportedParams(PRL_HANDLE sdkdom, virDomainDef *def)
if (def->emulator) { if (def->emulator) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("changing emulator is not supported " _("changing emulator is not supported by vz driver"));
"by vz driver"));
return -1; return -1;
} }
for (i = 0; i < VIR_DOMAIN_FEATURE_LAST; i++) { for (i = 0; i < VIR_DOMAIN_FEATURE_LAST; i++) {
if (def->features[i]) { if (def->features[i]) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("changing features is not supported " _("changing features is not supported by vz driver"));
"by vz driver"));
return -1; return -1;
} }
} }
@ -2573,15 +2563,13 @@ prlsdkCheckUnsupportedParams(PRL_HANDLE sdkdom, virDomainDef *def)
def->clock.ntimers != 0) { def->clock.ntimers != 0) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("changing clock parameters is not supported " _("changing clock parameters is not supported by vz driver"));
"by vz driver"));
return -1; return -1;
} }
if (!IS_CT(def) && def->nfss != 0) { if (!IS_CT(def) && def->nfss != 0) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("Filesystems in VMs are not supported " _("Filesystems in VMs are not supported by vz driver"));
"by vz driver"));
return -1; return -1;
} }
@ -2591,8 +2579,7 @@ prlsdkCheckUnsupportedParams(PRL_HANDLE sdkdom, virDomainDef *def)
def->nleases != 0 || def->nhubs != 0) { def->nleases != 0 || def->nhubs != 0) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("changing devices parameters is not supported " _("changing devices parameters is not supported by vz driver"));
"by vz driver"));
return -1; return -1;
} }
@ -2716,15 +2703,13 @@ static int prlsdkCheckVideoUnsupportedParams(virDomainDef *def)
return 0; return 0;
} else { } else {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("Video adapters are not supported " _("Video adapters are not supported int containers."));
"int containers."));
return -1; return -1;
} }
} else { } else {
if (def->nvideos != 1) { if (def->nvideos != 1) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("vz driver supports " _("vz driver supports only one video adapter."));
"only one video adapter."));
return -1; return -1;
} }
} }
@ -2733,22 +2718,19 @@ static int prlsdkCheckVideoUnsupportedParams(virDomainDef *def)
if (v->type != VIR_DOMAIN_VIDEO_TYPE_VGA) { if (v->type != VIR_DOMAIN_VIDEO_TYPE_VGA) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("vz driver supports " _("vz driver supports only VGA video adapters."));
"only VGA video adapters."));
return -1; return -1;
} }
if (v->heads != 1) { if (v->heads != 1) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("vz driver doesn't support " _("vz driver doesn't support multihead video adapters."));
"multihead video adapters."));
return -1; return -1;
} }
if (v->accel != NULL && (v->accel->accel2d || v->accel->accel3d)) { if (v->accel != NULL && (v->accel->accel2d || v->accel->accel3d)) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("vz driver doesn't support " _("vz driver doesn't support setting video acceleration parameters."));
"setting video acceleration parameters."));
return -1; return -1;
} }
@ -2759,15 +2741,13 @@ static int prlsdkCheckSerialUnsupportedParams(virDomainChrDef *chr)
{ {
if (chr->deviceType != VIR_DOMAIN_CHR_DEVICE_TYPE_SERIAL) { if (chr->deviceType != VIR_DOMAIN_CHR_DEVICE_TYPE_SERIAL) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("Specified character device type is not supported " _("Specified character device type is not supported by vz driver."));
"by vz driver."));
return -1; return -1;
} }
if (chr->targetType != VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_NONE) { if (chr->targetType != VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_NONE) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("Specified character device target type is not " _("Specified character device target type is not supported by vz driver."));
"supported by vz driver."));
return -1; return -1;
} }
@ -2779,22 +2759,19 @@ static int prlsdkCheckSerialUnsupportedParams(virDomainChrDef *chr)
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("Specified character device source type is not " _("Specified character device source type is not supported by vz driver."));
"supported by vz driver."));
return -1; return -1;
} }
if (chr->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE) { if (chr->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("Setting device info for character devices is not " _("Setting device info for character devices is not supported by vz driver."));
"supported by vz driver."));
return -1; return -1;
} }
if (chr->source->nseclabels > 0) { if (chr->source->nseclabels > 0) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("Setting security labels is not " _("Setting security labels is not supported by vz driver."));
"supported by vz driver."));
return -1; return -1;
} }
@ -2812,8 +2789,7 @@ static int prlsdkCheckSerialUnsupportedParams(virDomainChrDef *chr)
STRNEQ(chr->source->data.udp.bindService, STRNEQ(chr->source->data.udp.bindService,
chr->source->data.udp.connectService))) { chr->source->data.udp.connectService))) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("Different bind and connect parameters for " _("Different bind and connect parameters for udp character device is not supported."));
"udp character device is not supported."));
return -1; return -1;
} }
@ -2825,71 +2801,61 @@ static int prlsdkCheckNetUnsupportedParams(virDomainNetDef *net)
if (net->type != VIR_DOMAIN_NET_TYPE_NETWORK && if (net->type != VIR_DOMAIN_NET_TYPE_NETWORK &&
net->type != VIR_DOMAIN_NET_TYPE_BRIDGE) { net->type != VIR_DOMAIN_NET_TYPE_BRIDGE) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("Specified network adapter type is not " _("Specified network adapter type is not supported by vz driver."));
"supported by vz driver."));
return -1; return -1;
} }
if (net->backend.tap || net->backend.vhost) { if (net->backend.tap || net->backend.vhost) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("Interface backend parameters are not " _("Interface backend parameters are not supported by vz driver."));
"supported by vz driver."));
return -1; return -1;
} }
if (net->data.network.portgroup) { if (net->data.network.portgroup) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("Virtual network portgroups are not " _("Virtual network portgroups are not supported by vz driver."));
"supported by vz driver."));
return -1; return -1;
} }
if (net->tune.sndbuf_specified) { if (net->tune.sndbuf_specified) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("Setting interface sndbuf is not " _("Setting interface sndbuf is not supported by vz driver."));
"supported by vz driver."));
return -1; return -1;
} }
if (net->script) { if (net->script) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("Setting interface script is not " _("Setting interface script is not supported by vz driver."));
"supported by vz driver."));
return -1; return -1;
} }
if (net->ifname_guest) { if (net->ifname_guest) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("Setting guest interface name is not " _("Setting guest interface name is not supported by vz driver."));
"supported by vz driver."));
return -1; return -1;
} }
if (net->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE) { if (net->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("Setting device info for network devices is not " _("Setting device info for network devices is not supported by vz driver."));
"supported by vz driver."));
return -1; return -1;
} }
if (net->filter) { if (net->filter) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("Setting network filter is not " _("Setting network filter is not supported by vz driver."));
"supported by vz driver."));
return -1; return -1;
} }
if (net->bandwidth) { if (net->bandwidth) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("Setting network bandwidth is not " _("Setting network bandwidth is not supported by vz driver."));
"supported by vz driver."));
return -1; return -1;
} }
if (net->vlan.trunk) { if (net->vlan.trunk) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("Setting up vlans is not " _("Setting up vlans is not supported by vz driver."));
"supported by vz driver."));
return -1; return -1;
} }
@ -2901,50 +2867,43 @@ static int prlsdkCheckFSUnsupportedParams(virDomainFSDef *fs)
if (fs->type != VIR_DOMAIN_FS_TYPE_FILE && if (fs->type != VIR_DOMAIN_FS_TYPE_FILE &&
fs->type != VIR_DOMAIN_FS_TYPE_VOLUME) { fs->type != VIR_DOMAIN_FS_TYPE_VOLUME) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("Only file based or volume based filesystems " _("Only file based or volume based filesystems are supported by vz driver."));
"are supported by vz driver."));
return -1; return -1;
} }
if (fs->fsdriver != VIR_DOMAIN_FS_DRIVER_TYPE_PLOOP) { if (fs->fsdriver != VIR_DOMAIN_FS_DRIVER_TYPE_PLOOP) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("Only ploop fs driver is " _("Only ploop fs driver is supported by vz driver."));
"supported by vz driver."));
return -1; return -1;
} }
if (fs->accessmode != VIR_DOMAIN_FS_ACCESSMODE_PASSTHROUGH) { if (fs->accessmode != VIR_DOMAIN_FS_ACCESSMODE_PASSTHROUGH) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("Changing fs access mode is not " _("Changing fs access mode is not supported by vz driver."));
"supported by vz driver."));
return -1; return -1;
} }
if (fs->wrpolicy != VIR_DOMAIN_FS_WRPOLICY_DEFAULT) { if (fs->wrpolicy != VIR_DOMAIN_FS_WRPOLICY_DEFAULT) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("Changing fs write policy is not " _("Changing fs write policy is not supported by vz driver."));
"supported by vz driver."));
return -1; return -1;
} }
if (fs->format != VIR_STORAGE_FILE_PLOOP) { if (fs->format != VIR_STORAGE_FILE_PLOOP) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("Only ploop disk images are " _("Only ploop disk images are supported by vz driver."));
"supported by vz driver."));
return -1; return -1;
} }
if (fs->readonly) { if (fs->readonly) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("Setting readonly for filesystems is " _("Setting readonly for filesystems is not supported by vz driver."));
"not supported by vz driver."));
return -1; return -1;
} }
if (fs->space_hard_limit || fs->space_soft_limit) { if (fs->space_hard_limit || fs->space_soft_limit) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("Setting fs quotas is not " _("Setting fs quotas is not supported by vz driver."));
"supported by vz driver."));
return -1; return -1;
} }
@ -3053,8 +3012,7 @@ static int prlsdkAddSerial(PRL_HANDLE sdkdom, virDomainChrDef *chr)
break; break;
default: default:
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("vz driver doesn't support " _("vz driver doesn't support specified serial source type."));
"specified serial source type."));
goto cleanup; goto cleanup;
} }
@ -3280,8 +3238,7 @@ static int prlsdkConfigureNet(struct _vzDriver *driver G_GNUC_UNUSED,
pret = PrlVmDevNet_SetAdapterType(sdknet, PNT_VIRTIO); pret = PrlVmDevNet_SetAdapterType(sdknet, PNT_VIRTIO);
} else { } else {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("Specified network adapter model is not " _("Specified network adapter model is not supported by vz driver."));
"supported by vz driver."));
goto cleanup; goto cleanup;
} }
prlsdkCheckRetGoto(pret, cleanup); prlsdkCheckRetGoto(pret, cleanup);
@ -3434,8 +3391,7 @@ static int prlsdkConfigureDisk(struct _vzDriver *driver,
case VIR_DOMAIN_DISK_BUS_LAST: case VIR_DOMAIN_DISK_BUS_LAST:
default: default:
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("Specified disk bus is not " _("Specified disk bus is not supported by vz driver."));
"supported by vz driver."));
goto cleanup; goto cleanup;
} }
@ -4276,8 +4232,7 @@ prlsdkUnregisterDomain(struct _vzDriver *driver, virDomainObj *dom, unsigned int
!(flags & VIR_DOMAIN_UNDEFINE_MANAGED_SAVE)) { !(flags & VIR_DOMAIN_UNDEFINE_MANAGED_SAVE)) {
virReportError(VIR_ERR_OPERATION_INVALID, "%s", virReportError(VIR_ERR_OPERATION_INVALID, "%s",
_("Refusing to undefine while domain managed " _("Refusing to undefine while domain managed save image exists"));
"save image exists"));
return -1; return -1;
} }

66
src/vz/vz_utils.c
View File

@ -273,8 +273,7 @@ vzCheckDiskUnsupportedParams(virDomainDiskDef *disk)
disk->device != VIR_DOMAIN_DISK_DEVICE_CDROM) { disk->device != VIR_DOMAIN_DISK_DEVICE_CDROM) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("Only hard disks and cdroms are supported " _("Only hard disks and cdroms are supported by vz driver."));
"by vz driver."));
return -1; return -1;
} }
@ -282,8 +281,7 @@ vzCheckDiskUnsupportedParams(virDomainDiskDef *disk)
disk->blockio.physical_block_size || disk->blockio.physical_block_size ||
disk->blockio.discard_granularity) { disk->blockio.discard_granularity) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("Setting disk block sizes is not " _("Setting disk block sizes is not supported by vz driver."));
"supported by vz driver."));
return -1; return -1;
} }
@ -295,56 +293,48 @@ vzCheckDiskUnsupportedParams(virDomainDiskDef *disk)
disk->blkdeviotune.write_iops_sec) { disk->blkdeviotune.write_iops_sec) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("Setting disk io limits is not " _("Setting disk io limits is not supported by vz driver yet."));
"supported by vz driver yet."));
return -1; return -1;
} }
if (disk->serial && disk->device != VIR_DOMAIN_DISK_DEVICE_DISK) { if (disk->serial && disk->device != VIR_DOMAIN_DISK_DEVICE_DISK) {
VIR_INFO("%s", _("Setting disk serial number is " VIR_INFO("%s", _("Setting disk serial number is supported only for disk devices."));
"supported only for disk devices."));
} }
if (disk->wwn) { if (disk->wwn) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("Setting disk wwn id is not " _("Setting disk wwn id is not supported by vz driver."));
"supported by vz driver."));
return -1; return -1;
} }
if (disk->vendor) { if (disk->vendor) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("Setting disk vendor is not " _("Setting disk vendor is not supported by vz driver."));
"supported by vz driver."));
return -1; return -1;
} }
if (disk->product) { if (disk->product) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("Setting disk product id is not " _("Setting disk product id is not supported by vz driver."));
"supported by vz driver."));
return -1; return -1;
} }
if (disk->error_policy != VIR_DOMAIN_DISK_ERROR_POLICY_DEFAULT) { if (disk->error_policy != VIR_DOMAIN_DISK_ERROR_POLICY_DEFAULT) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("Setting disk error policy is not " _("Setting disk error policy is not supported by vz driver."));
"supported by vz driver."));
return -1; return -1;
} }
if (disk->iomode != VIR_DOMAIN_DISK_IO_DEFAULT && if (disk->iomode != VIR_DOMAIN_DISK_IO_DEFAULT &&
disk->iomode != VIR_DOMAIN_DISK_IO_NATIVE) { disk->iomode != VIR_DOMAIN_DISK_IO_NATIVE) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("Only native iomode is " _("Only native iomode is supported by vz driver."));
"supported by vz driver."));
return -1; return -1;
} }
if (disk->copy_on_read) { if (disk->copy_on_read) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("Disk copy_on_read is not " _("Disk copy_on_read is not supported by vz driver."));
"supported by vz driver."));
return -1; return -1;
} }
@ -356,29 +346,25 @@ vzCheckDiskUnsupportedParams(virDomainDiskDef *disk)
if (disk->startupPolicy != VIR_DOMAIN_STARTUP_POLICY_DEFAULT) { if (disk->startupPolicy != VIR_DOMAIN_STARTUP_POLICY_DEFAULT) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("Setting up disk startup policy is not " _("Setting up disk startup policy is not supported by vz driver."));
"supported by vz driver."));
return -1; return -1;
} }
if (disk->transient) { if (disk->transient) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("Transient disks are not " _("Transient disks are not supported by vz driver."));
"supported by vz driver."));
return -1; return -1;
} }
if (disk->discard) { if (disk->discard) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("Setting up disk discard parameter is not " _("Setting up disk discard parameter is not supported by vz driver."));
"supported by vz driver."));
return -1; return -1;
} }
if (disk->iothread) { if (disk->iothread) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("Setting up disk io thread # is not " _("Setting up disk io thread # is not supported by vz driver."));
"supported by vz driver."));
return -1; return -1;
} }
@ -386,8 +372,7 @@ vzCheckDiskUnsupportedParams(virDomainDiskDef *disk)
disk->src->type != VIR_STORAGE_TYPE_BLOCK) { disk->src->type != VIR_STORAGE_TYPE_BLOCK) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("Only disk and block storage types are " _("Only disk and block storage types are supported by vz driver."));
"supported by vz driver."));
return -1; return -1;
} }
@ -504,52 +489,45 @@ int vzCheckUnsupportedGraphics(virDomainGraphicsDef *gr)
{ {
if (gr->type != VIR_DOMAIN_GRAPHICS_TYPE_VNC) { if (gr->type != VIR_DOMAIN_GRAPHICS_TYPE_VNC) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("vz driver supports only " _("vz driver supports only VNC graphics."));
"VNC graphics."));
return -1; return -1;
} }
if (gr->data.vnc.websocket != 0) { if (gr->data.vnc.websocket != 0) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("vz driver doesn't support " _("vz driver doesn't support websockets for VNC graphics."));
"websockets for VNC graphics."));
return -1; return -1;
} }
if (gr->data.vnc.keymap != 0 && if (gr->data.vnc.keymap != 0 &&
STRNEQ(gr->data.vnc.keymap, "en-us")) { STRNEQ(gr->data.vnc.keymap, "en-us")) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("vz driver supports only " _("vz driver supports only \"en-us\" keymap for VNC graphics."));
"\"en-us\" keymap for VNC graphics."));
return -1; return -1;
} }
if (gr->data.vnc.sharePolicy == VIR_DOMAIN_GRAPHICS_VNC_SHARE_ALLOW_EXCLUSIVE) { if (gr->data.vnc.sharePolicy == VIR_DOMAIN_GRAPHICS_VNC_SHARE_ALLOW_EXCLUSIVE) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("vz driver doesn't support " _("vz driver doesn't support exclusive share policy for VNC graphics."));
"exclusive share policy for VNC graphics."));
return -1; return -1;
} }
if (gr->data.vnc.auth.connected == VIR_DOMAIN_GRAPHICS_AUTH_CONNECTED_FAIL || if (gr->data.vnc.auth.connected == VIR_DOMAIN_GRAPHICS_AUTH_CONNECTED_FAIL ||
gr->data.vnc.auth.connected == VIR_DOMAIN_GRAPHICS_AUTH_CONNECTED_KEEP) { gr->data.vnc.auth.connected == VIR_DOMAIN_GRAPHICS_AUTH_CONNECTED_KEEP) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("vz driver doesn't support " _("vz driver doesn't support given action in case of password change."));
"given action in case of password change."));
return -1; return -1;
} }
if (gr->data.vnc.auth.expires) { if (gr->data.vnc.auth.expires) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("vz driver doesn't support " _("vz driver doesn't support setting password expire time."));
"setting password expire time."));
return -1; return -1;
} }
if (gr->nListens > 1) { if (gr->nListens > 1) {
virReportError(VIR_ERR_INVALID_ARG, "%s", virReportError(VIR_ERR_INVALID_ARG, "%s",
_("vz driver doesn't support more than " _("vz driver doesn't support more than one listening VNC server per domain"));
"one listening VNC server per domain"));
return -1; return -1;
} }