mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2025-04-01 20:05:19 +00:00
conf: generalize virDomainDefHasSpiceGraphics
Generalize the function, broaden its potential usage. Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> Reviewed-by: Daniel P. Berrangé <berrange@redhat.com> Reviewed-by: Martin Kletzander <mkletzan@redhat.com>
This commit is contained in:
parent
bfa7d5aaa8
commit
97829d016d
@ -31771,15 +31771,24 @@ virDomainObjGetMessages(virDomainObj *vm,
|
||||
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* virDomainDefHasGraphics:
|
||||
* @def: domain definition
|
||||
* @type: a graphics type
|
||||
*
|
||||
* Returns true if domain has a graphics of given type.
|
||||
*/
|
||||
bool
|
||||
virDomainDefHasSpiceGraphics(const virDomainDef *def)
|
||||
virDomainDefHasGraphics(const virDomainDef *def, virDomainGraphicsType type)
|
||||
{
|
||||
size_t i = 0;
|
||||
|
||||
for (i = 0; i < def->ngraphics; i++) {
|
||||
if (def->graphics[i]->type == VIR_DOMAIN_GRAPHICS_TYPE_SPICE) {
|
||||
virDomainGraphicsDef *graphics = def->graphics[i];
|
||||
|
||||
if (graphics->type == type)
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
return false;
|
||||
|
@ -4631,4 +4631,4 @@ virDomainObjGetMessages(virDomainObj *vm,
|
||||
unsigned int flags);
|
||||
|
||||
bool
|
||||
virDomainDefHasSpiceGraphics(const virDomainDef *def);
|
||||
virDomainDefHasGraphics(const virDomainDef *def, virDomainGraphicsType type);
|
||||
|
@ -337,6 +337,7 @@ virDomainDefGetVcpus;
|
||||
virDomainDefGetVcpusMax;
|
||||
virDomainDefGetVcpusTopology;
|
||||
virDomainDefHasDeviceAddress;
|
||||
virDomainDefHasGraphics;
|
||||
virDomainDefHasManagedPR;
|
||||
virDomainDefHasMdevHostdev;
|
||||
virDomainDefHasMemballoon;
|
||||
@ -345,7 +346,6 @@ virDomainDefHasNVMeDisk;
|
||||
virDomainDefHasOldStyleROUEFI;
|
||||
virDomainDefHasOldStyleUEFI;
|
||||
virDomainDefHasPCIHostdev;
|
||||
virDomainDefHasSpiceGraphics;
|
||||
virDomainDefHasUSB;
|
||||
virDomainDefHasVcpusOffline;
|
||||
virDomainDefHasVDPANet;
|
||||
|
@ -2153,7 +2153,7 @@ qemuValidateDomainChrSourceDef(const virDomainChrSourceDef *def,
|
||||
|
||||
case VIR_DOMAIN_CHR_TYPE_SPICEVMC:
|
||||
case VIR_DOMAIN_CHR_TYPE_SPICEPORT:
|
||||
if (!virDomainDefHasSpiceGraphics(vmdef)) {
|
||||
if (!virDomainDefHasGraphics(vmdef, VIR_DOMAIN_GRAPHICS_TYPE_SPICE)) {
|
||||
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
|
||||
_("chardev '%1$s' not supported without spice graphics"),
|
||||
virDomainChrTypeToString(def->type));
|
||||
@ -4737,7 +4737,7 @@ qemuValidateDomainDeviceDefAudio(virDomainAudioDef *audio,
|
||||
break;
|
||||
|
||||
case VIR_DOMAIN_AUDIO_TYPE_SPICE:
|
||||
if (!virDomainDefHasSpiceGraphics(def)) {
|
||||
if (!virDomainDefHasGraphics(def, VIR_DOMAIN_GRAPHICS_TYPE_SPICE)) {
|
||||
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
|
||||
_("Spice audio is not supported without spice graphics"));
|
||||
return -1;
|
||||
|
Loading…
x
Reference in New Issue
Block a user