conf: domaincaps: Fix broken attempt at being const-correct

'virBlahPtr const blah' results into modification to the value of 'blah'
triggering compilation error rather than the modification of the virBlah
struct the pointer points to.

All of the domain capability formatting code was broken in this regard.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Peter Krempa 2019-10-25 14:21:08 +02:00
parent 6b9f2e8847
commit f118a00342
2 changed files with 18 additions and 18 deletions

View File

@ -321,7 +321,7 @@ virDomainCapsEnumClear(virDomainCapsEnumPtr capsEnum)
static int static int
virDomainCapsEnumFormat(virBufferPtr buf, virDomainCapsEnumFormat(virBufferPtr buf,
virDomainCapsEnumPtr capsEnum, const virDomainCapsEnum *capsEnum,
const char *capsEnumName, const char *capsEnumName,
virDomainCapsValToStr valToStr) virDomainCapsValToStr valToStr)
{ {
@ -362,7 +362,7 @@ virDomainCapsEnumFormat(virBufferPtr buf,
static void static void
virDomainCapsStringValuesFormat(virBufferPtr buf, virDomainCapsStringValuesFormat(virBufferPtr buf,
virDomainCapsStringValuesPtr values) const virDomainCapsStringValues *values)
{ {
size_t i; size_t i;
@ -406,7 +406,7 @@ virDomainCapsStringValuesFormat(virBufferPtr buf,
static void static void
virDomainCapsLoaderFormat(virBufferPtr buf, virDomainCapsLoaderFormat(virBufferPtr buf,
virDomainCapsLoaderPtr loader) const virDomainCapsLoader *loader)
{ {
FORMAT_PROLOGUE(loader); FORMAT_PROLOGUE(loader);
@ -420,9 +420,9 @@ virDomainCapsLoaderFormat(virBufferPtr buf,
static void static void
virDomainCapsOSFormat(virBufferPtr buf, virDomainCapsOSFormat(virBufferPtr buf,
virDomainCapsOSPtr os) const virDomainCapsOS *os)
{ {
virDomainCapsLoaderPtr loader = &os->loader; const virDomainCapsLoader *loader = &os->loader;
FORMAT_PROLOGUE(os); FORMAT_PROLOGUE(os);
@ -453,7 +453,7 @@ virDomainCapsCPUCustomFormat(virBufferPtr buf,
static void static void
virDomainCapsCPUFormat(virBufferPtr buf, virDomainCapsCPUFormat(virBufferPtr buf,
virDomainCapsCPUPtr cpu) const virDomainCapsCPU *cpu)
{ {
virBufferAddLit(buf, "<cpu>\n"); virBufferAddLit(buf, "<cpu>\n");
virBufferAdjustIndent(buf, 2); virBufferAdjustIndent(buf, 2);
@ -492,7 +492,7 @@ virDomainCapsCPUFormat(virBufferPtr buf,
static void static void
virDomainCapsDeviceDiskFormat(virBufferPtr buf, virDomainCapsDeviceDiskFormat(virBufferPtr buf,
virDomainCapsDeviceDiskPtr const disk) const virDomainCapsDeviceDisk *disk)
{ {
FORMAT_PROLOGUE(disk); FORMAT_PROLOGUE(disk);
@ -506,7 +506,7 @@ virDomainCapsDeviceDiskFormat(virBufferPtr buf,
static void static void
virDomainCapsDeviceGraphicsFormat(virBufferPtr buf, virDomainCapsDeviceGraphicsFormat(virBufferPtr buf,
virDomainCapsDeviceGraphicsPtr const graphics) const virDomainCapsDeviceGraphics *graphics)
{ {
FORMAT_PROLOGUE(graphics); FORMAT_PROLOGUE(graphics);
@ -518,7 +518,7 @@ virDomainCapsDeviceGraphicsFormat(virBufferPtr buf,
static void static void
virDomainCapsDeviceVideoFormat(virBufferPtr buf, virDomainCapsDeviceVideoFormat(virBufferPtr buf,
virDomainCapsDeviceVideoPtr const video) const virDomainCapsDeviceVideo *video)
{ {
FORMAT_PROLOGUE(video); FORMAT_PROLOGUE(video);
@ -530,7 +530,7 @@ virDomainCapsDeviceVideoFormat(virBufferPtr buf,
static void static void
virDomainCapsDeviceHostdevFormat(virBufferPtr buf, virDomainCapsDeviceHostdevFormat(virBufferPtr buf,
virDomainCapsDeviceHostdevPtr const hostdev) const virDomainCapsDeviceHostdev *hostdev)
{ {
FORMAT_PROLOGUE(hostdev); FORMAT_PROLOGUE(hostdev);
@ -546,7 +546,7 @@ virDomainCapsDeviceHostdevFormat(virBufferPtr buf,
static void static void
virDomainCapsDeviceRNGFormat(virBufferPtr buf, virDomainCapsDeviceRNGFormat(virBufferPtr buf,
virDomainCapsDeviceRNGPtr const rng) const virDomainCapsDeviceRNG *rng)
{ {
FORMAT_PROLOGUE(rng); FORMAT_PROLOGUE(rng);
@ -575,7 +575,7 @@ virDomainCapsDeviceRNGFormat(virBufferPtr buf,
*/ */
static void static void
virDomainCapsFeatureGICFormat(virBufferPtr buf, virDomainCapsFeatureGICFormat(virBufferPtr buf,
virDomainCapsFeatureGICPtr const gic) const virDomainCapsFeatureGIC *gic)
{ {
FORMAT_PROLOGUE(gic); FORMAT_PROLOGUE(gic);
@ -586,7 +586,7 @@ virDomainCapsFeatureGICFormat(virBufferPtr buf,
static void static void
virDomainCapsFeatureSEVFormat(virBufferPtr buf, virDomainCapsFeatureSEVFormat(virBufferPtr buf,
virSEVCapabilityPtr const sev) const virSEVCapability *sev)
{ {
if (!sev) { if (!sev) {
virBufferAddLit(buf, "<sev supported='no'/>\n"); virBufferAddLit(buf, "<sev supported='no'/>\n");
@ -605,7 +605,7 @@ virDomainCapsFeatureSEVFormat(virBufferPtr buf,
char * char *
virDomainCapsFormat(virDomainCapsPtr const caps) virDomainCapsFormat(const virDomainCaps *caps)
{ {
virBuffer buf = VIR_BUFFER_INITIALIZER; virBuffer buf = VIR_BUFFER_INITIALIZER;
const char *virttype_str = virDomainVirtTypeToString(caps->virttype); const char *virttype_str = virDomainVirtTypeToString(caps->virttype);
@ -669,7 +669,7 @@ virDomainCapsFormat(virDomainCapsPtr const caps)
static int static int
virDomainCapsDeviceRNGDefValidate(virDomainCapsPtr const caps, virDomainCapsDeviceRNGDefValidate(const virDomainCaps *caps,
const virDomainRNGDef *dev) const virDomainRNGDef *dev)
{ {
if (ENUM_VALUE_MISSING(caps->rng.model, dev->model)) { if (ENUM_VALUE_MISSING(caps->rng.model, dev->model)) {
@ -683,7 +683,7 @@ virDomainCapsDeviceRNGDefValidate(virDomainCapsPtr const caps,
int int
virDomainCapsDeviceDefValidate(virDomainCapsPtr const caps, virDomainCapsDeviceDefValidate(const virDomainCaps *caps,
const virDomainDeviceDef *dev, const virDomainDeviceDef *dev,
const virDomainDef *def G_GNUC_UNUSED) const virDomainDef *def G_GNUC_UNUSED)
{ {

View File

@ -226,9 +226,9 @@ int virDomainCapsEnumSet(virDomainCapsEnumPtr capsEnum,
unsigned int *values); unsigned int *values);
void virDomainCapsEnumClear(virDomainCapsEnumPtr capsEnum); void virDomainCapsEnumClear(virDomainCapsEnumPtr capsEnum);
char * virDomainCapsFormat(virDomainCapsPtr const caps); char * virDomainCapsFormat(const virDomainCaps *caps);
int virDomainCapsDeviceDefValidate(virDomainCapsPtr const caps, int virDomainCapsDeviceDefValidate(const virDomainCaps *caps,
const virDomainDeviceDef *dev, const virDomainDeviceDef *dev,
const virDomainDef *def); const virDomainDef *def);