diff options
author | Eric Blake <eblake@redhat.com> | 2011-04-30 10:34:49 -0600 |
---|---|---|
committer | Eric Blake <eblake@redhat.com> | 2011-05-05 13:47:40 -0600 |
commit | 68ea80cfdd41bc3adbe70ac5d0a9c396c81690a3 (patch) | |
tree | ee1b6b553cc2a70a92d378607747b1ac24474f1e /src/vmx | |
parent | docs: <filesystem> attr is 'accessmode', not 'mode' (diff) | |
download | libvirt-68ea80cfdd41bc3adbe70ac5d0a9c396c81690a3.tar.gz libvirt-68ea80cfdd41bc3adbe70ac5d0a9c396c81690a3.tar.bz2 libvirt-68ea80cfdd41bc3adbe70ac5d0a9c396c81690a3.zip |
maint: rename virBufferVSprintf to virBufferAsprintf
We already have virAsprintf, so picking a similar name helps for
seeing a similar purpose. Furthermore, the prefix V before printf
generally implies 'va_list', even though this variant was '...', and
the old name got in the way of adding a new va_list version.
global rename performed with:
$ git grep -l virBufferVSprintf \
| xargs -L1 sed -i 's/virBufferVSprintf/virBufferAsprintf/g'
then revert the changes in ChangeLog-old.
Diffstat (limited to 'src/vmx')
-rw-r--r-- | src/vmx/vmx.c | 138 |
1 files changed, 69 insertions, 69 deletions
diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c index aee2d8045..775831487 100644 --- a/src/vmx/vmx.c +++ b/src/vmx/vmx.c @@ -2892,7 +2892,7 @@ virVMXFormatConfig(virVMXContext *ctx, virCapsPtr caps, virDomainDefPtr def, virBufferAddLit(&buffer, "config.version = \"8\"\n"); /* vmx:virtualHW.version */ - virBufferVSprintf(&buffer, "virtualHW.version = \"%d\"\n", + virBufferAsprintf(&buffer, "virtualHW.version = \"%d\"\n", virtualHW_version); /* def:os.arch -> vmx:guestOS */ @@ -2924,7 +2924,7 @@ virVMXFormatConfig(virVMXContext *ctx, virCapsPtr caps, virDomainDefPtr def, if (memcmp(def->uuid, zero, VIR_UUID_BUFLEN) == 0) { virBufferAddLit(&buffer, "uuid.action = \"create\"\n"); } else { - virBufferVSprintf(&buffer, "uuid.bios = \"%02x %02x %02x %02x %02x %02x " + virBufferAsprintf(&buffer, "uuid.bios = \"%02x %02x %02x %02x %02x %02x " "%02x %02x-%02x %02x %02x %02x %02x %02x %02x %02x\"\n", def->uuid[0], def->uuid[1], def->uuid[2], def->uuid[3], def->uuid[4], def->uuid[5], def->uuid[6], def->uuid[7], @@ -2946,32 +2946,32 @@ virVMXFormatConfig(virVMXContext *ctx, virCapsPtr caps, virDomainDefPtr def, goto cleanup; } - virBufferVSprintf(&buffer, "displayName = \"%s\"\n", displayName); + virBufferAsprintf(&buffer, "displayName = \"%s\"\n", displayName); /* def:description -> vmx:annotation */ if (def->description != NULL) { annotation = virVMXEscapeHexPipe(def->description); - virBufferVSprintf(&buffer, "annotation = \"%s\"\n", annotation); + virBufferAsprintf(&buffer, "annotation = \"%s\"\n", annotation); } /* def:mem.max_balloon -> vmx:memsize */ /* max-memory must be a multiple of 4096 kilobyte */ max_balloon = VIR_DIV_UP(def->mem.max_balloon, 4096) * 4096; - virBufferVSprintf(&buffer, "memsize = \"%lu\"\n", + virBufferAsprintf(&buffer, "memsize = \"%lu\"\n", max_balloon / 1024); /* Scale from kilobytes to megabytes */ /* def:mem.cur_balloon -> vmx:sched.mem.max */ if (def->mem.cur_balloon < max_balloon) { - virBufferVSprintf(&buffer, "sched.mem.max = \"%lu\"\n", + virBufferAsprintf(&buffer, "sched.mem.max = \"%lu\"\n", VIR_DIV_UP(def->mem.cur_balloon, 1024)); /* Scale from kilobytes to megabytes */ } /* def:mem.min_guarantee -> vmx:sched.mem.minsize */ if (def->mem.min_guarantee > 0) { - virBufferVSprintf(&buffer, "sched.mem.minsize = \"%lu\"\n", + virBufferAsprintf(&buffer, "sched.mem.minsize = \"%lu\"\n", VIR_DIV_UP(def->mem.min_guarantee, 1024)); /* Scale from kilobytes to megabytes */ } @@ -2991,7 +2991,7 @@ virVMXFormatConfig(virVMXContext *ctx, virCapsPtr caps, virDomainDefPtr def, goto cleanup; } - virBufferVSprintf(&buffer, "numvcpus = \"%d\"\n", def->maxvcpus); + virBufferAsprintf(&buffer, "numvcpus = \"%d\"\n", def->maxvcpus); /* def:cpumask -> vmx:sched.cpu.affinity */ if (def->cpumasklen > 0) { @@ -3015,7 +3015,7 @@ virVMXFormatConfig(virVMXContext *ctx, virCapsPtr caps, virDomainDefPtr def, for (i = 0; i < def->cpumasklen; ++i) { if (def->cpumask[i]) { - virBufferVSprintf(&buffer, "%d", i); + virBufferAsprintf(&buffer, "%d", i); if (sched_cpu_affinity_length > 1) { virBufferAddChar(&buffer, ','); @@ -3038,7 +3038,7 @@ virVMXFormatConfig(virVMXContext *ctx, virCapsPtr caps, virDomainDefPtr def, } else if (def->cputune.shares == def->vcpus * 2000) { virBufferAddLit(&buffer, "sched.cpu.shares = \"high\"\n"); } else { - virBufferVSprintf(&buffer, "sched.cpu.shares = \"%lu\"\n", + virBufferAsprintf(&buffer, "sched.cpu.shares = \"%lu\"\n", def->cputune.shares); } } @@ -3076,10 +3076,10 @@ virVMXFormatConfig(virVMXContext *ctx, virCapsPtr caps, virDomainDefPtr def, for (i = 0; i < 4; ++i) { if (scsi_present[i]) { - virBufferVSprintf(&buffer, "scsi%d.present = \"true\"\n", i); + virBufferAsprintf(&buffer, "scsi%d.present = \"true\"\n", i); if (scsi_virtualDev[i] != -1) { - virBufferVSprintf(&buffer, "scsi%d.virtualDev = \"%s\"\n", i, + virBufferAsprintf(&buffer, "scsi%d.virtualDev = \"%s\"\n", i, virVMXSCSIControllerModelTypeToString (scsi_virtualDev[i])); } @@ -3121,7 +3121,7 @@ virVMXFormatConfig(virVMXContext *ctx, virCapsPtr caps, virDomainDefPtr def, for (i = 0; i < 2; ++i) { /* floppy[0..1].present defaults to true, disable it explicitly */ if (! floppy_present[i]) { - virBufferVSprintf(&buffer, "floppy%d.present = \"false\"\n", i); + virBufferAsprintf(&buffer, "floppy%d.present = \"false\"\n", i); } } @@ -3201,7 +3201,7 @@ virVMXFormatVNC(virDomainGraphicsDefPtr def, virBufferPtr buffer) return -1; } - virBufferVSprintf(buffer, "RemoteDisplay.vnc.enabled = \"true\"\n"); + virBufferAsprintf(buffer, "RemoteDisplay.vnc.enabled = \"true\"\n"); if (def->data.vnc.autoport) { VIR_WARN0("VNC autoport is enabled, but the automatically assigned " @@ -3212,22 +3212,22 @@ virVMXFormatVNC(virDomainGraphicsDefPtr def, virBufferPtr buffer) def->data.vnc.port); } - virBufferVSprintf(buffer, "RemoteDisplay.vnc.port = \"%d\"\n", + virBufferAsprintf(buffer, "RemoteDisplay.vnc.port = \"%d\"\n", def->data.vnc.port); } if (def->data.vnc.listenAddr != NULL) { - virBufferVSprintf(buffer, "RemoteDisplay.vnc.ip = \"%s\"\n", + virBufferAsprintf(buffer, "RemoteDisplay.vnc.ip = \"%s\"\n", def->data.vnc.listenAddr); } if (def->data.vnc.keymap != NULL) { - virBufferVSprintf(buffer, "RemoteDisplay.vnc.keymap = \"%s\"\n", + virBufferAsprintf(buffer, "RemoteDisplay.vnc.keymap = \"%s\"\n", def->data.vnc.keymap); } if (def->data.vnc.auth.passwd != NULL) { - virBufferVSprintf(buffer, "RemoteDisplay.vnc.password = \"%s\"\n", + virBufferAsprintf(buffer, "RemoteDisplay.vnc.password = \"%s\"\n", def->data.vnc.auth.passwd); } @@ -3284,9 +3284,9 @@ virVMXFormatHardDisk(virVMXContext *ctx, virDomainDiskDefPtr def, return -1; } - virBufferVSprintf(buffer, "%s%d:%d.present = \"true\"\n", + virBufferAsprintf(buffer, "%s%d:%d.present = \"true\"\n", entryPrefix, controllerOrBus, unit); - virBufferVSprintf(buffer, "%s%d:%d.deviceType = \"%s-hardDisk\"\n", + virBufferAsprintf(buffer, "%s%d:%d.deviceType = \"%s-hardDisk\"\n", entryPrefix, controllerOrBus, unit, deviceTypePrefix); if (def->src != NULL) { @@ -3303,7 +3303,7 @@ virVMXFormatHardDisk(virVMXContext *ctx, virDomainDiskDefPtr def, return -1; } - virBufferVSprintf(buffer, "%s%d:%d.fileName = \"%s\"\n", + virBufferAsprintf(buffer, "%s%d:%d.fileName = \"%s\"\n", entryPrefix, controllerOrBus, unit, fileName); VIR_FREE(fileName); @@ -3311,7 +3311,7 @@ virVMXFormatHardDisk(virVMXContext *ctx, virDomainDiskDefPtr def, if (def->bus == VIR_DOMAIN_DISK_BUS_SCSI) { if (def->cachemode == VIR_DOMAIN_DISK_CACHE_WRITETHRU) { - virBufferVSprintf(buffer, "%s%d:%d.writeThrough = \"true\"\n", + virBufferAsprintf(buffer, "%s%d:%d.writeThrough = \"true\"\n", entryPrefix, controllerOrBus, unit); } else if (def->cachemode != VIR_DOMAIN_DISK_CACHE_DEFAULT) { VMX_ERROR(VIR_ERR_CONFIG_UNSUPPORTED, @@ -3364,11 +3364,11 @@ virVMXFormatCDROM(virVMXContext *ctx, virDomainDiskDefPtr def, return -1; } - virBufferVSprintf(buffer, "%s%d:%d.present = \"true\"\n", + virBufferAsprintf(buffer, "%s%d:%d.present = \"true\"\n", entryPrefix, controllerOrBus, unit); if (def->type == VIR_DOMAIN_DISK_TYPE_FILE) { - virBufferVSprintf(buffer, "%s%d:%d.deviceType = \"cdrom-image\"\n", + virBufferAsprintf(buffer, "%s%d:%d.deviceType = \"cdrom-image\"\n", entryPrefix, controllerOrBus, unit); if (def->src != NULL) { @@ -3385,17 +3385,17 @@ virVMXFormatCDROM(virVMXContext *ctx, virDomainDiskDefPtr def, return -1; } - virBufferVSprintf(buffer, "%s%d:%d.fileName = \"%s\"\n", + virBufferAsprintf(buffer, "%s%d:%d.fileName = \"%s\"\n", entryPrefix, controllerOrBus, unit, fileName); VIR_FREE(fileName); } } else if (def->type == VIR_DOMAIN_DISK_TYPE_BLOCK) { - virBufferVSprintf(buffer, "%s%d:%d.deviceType = \"atapi-cdrom\"\n", + virBufferAsprintf(buffer, "%s%d:%d.deviceType = \"atapi-cdrom\"\n", entryPrefix, controllerOrBus, unit); if (def->src != NULL) { - virBufferVSprintf(buffer, "%s%d:%d.fileName = \"%s\"\n", + virBufferAsprintf(buffer, "%s%d:%d.fileName = \"%s\"\n", entryPrefix, controllerOrBus, unit, def->src); } } else { @@ -3431,10 +3431,10 @@ virVMXFormatFloppy(virVMXContext *ctx, virDomainDiskDefPtr def, floppy_present[unit] = true; - virBufferVSprintf(buffer, "floppy%d.present = \"true\"\n", unit); + virBufferAsprintf(buffer, "floppy%d.present = \"true\"\n", unit); if (def->type == VIR_DOMAIN_DISK_TYPE_FILE) { - virBufferVSprintf(buffer, "floppy%d.fileType = \"file\"\n", unit); + virBufferAsprintf(buffer, "floppy%d.fileType = \"file\"\n", unit); if (def->src != NULL) { if (! virFileHasSuffix(def->src, ".flp")) { @@ -3450,16 +3450,16 @@ virVMXFormatFloppy(virVMXContext *ctx, virDomainDiskDefPtr def, return -1; } - virBufferVSprintf(buffer, "floppy%d.fileName = \"%s\"\n", + virBufferAsprintf(buffer, "floppy%d.fileName = \"%s\"\n", unit, fileName); VIR_FREE(fileName); } } else if (def->type == VIR_DOMAIN_DISK_TYPE_BLOCK) { - virBufferVSprintf(buffer, "floppy%d.fileType = \"device\"\n", unit); + virBufferAsprintf(buffer, "floppy%d.fileType = \"device\"\n", unit); if (def->src != NULL) { - virBufferVSprintf(buffer, "floppy%d.fileName = \"%s\"\n", + virBufferAsprintf(buffer, "floppy%d.fileName = \"%s\"\n", unit, def->src); } } else { @@ -3491,7 +3491,7 @@ virVMXFormatEthernet(virDomainNetDefPtr def, int controller, return -1; } - virBufferVSprintf(buffer, "ethernet%d.present = \"true\"\n", controller); + virBufferAsprintf(buffer, "ethernet%d.present = \"true\"\n", controller); /* def:model -> vmx:virtualDev, vmx:features */ if (def->model != NULL) { @@ -3508,12 +3508,12 @@ virVMXFormatEthernet(virDomainNetDefPtr def, int controller, } if (STRCASEEQ(def->model, "vmxnet2")) { - virBufferVSprintf(buffer, "ethernet%d.virtualDev = \"vmxnet\"\n", + virBufferAsprintf(buffer, "ethernet%d.virtualDev = \"vmxnet\"\n", controller); - virBufferVSprintf(buffer, "ethernet%d.features = \"15\"\n", + virBufferAsprintf(buffer, "ethernet%d.features = \"15\"\n", controller); } else { - virBufferVSprintf(buffer, "ethernet%d.virtualDev = \"%s\"\n", + virBufferAsprintf(buffer, "ethernet%d.virtualDev = \"%s\"\n", controller, def->model); } } @@ -3521,16 +3521,16 @@ virVMXFormatEthernet(virDomainNetDefPtr def, int controller, /* def:type, def:ifname -> vmx:connectionType */ switch (def->type) { case VIR_DOMAIN_NET_TYPE_BRIDGE: - virBufferVSprintf(buffer, "ethernet%d.networkName = \"%s\"\n", + virBufferAsprintf(buffer, "ethernet%d.networkName = \"%s\"\n", controller, def->data.bridge.brname); if (def->ifname != NULL) { - virBufferVSprintf(buffer, "ethernet%d.connectionType = \"custom\"\n", + virBufferAsprintf(buffer, "ethernet%d.connectionType = \"custom\"\n", controller); - virBufferVSprintf(buffer, "ethernet%d.vnet = \"%s\"\n", + virBufferAsprintf(buffer, "ethernet%d.vnet = \"%s\"\n", controller, def->ifname); } else { - virBufferVSprintf(buffer, "ethernet%d.connectionType = \"bridged\"\n", + virBufferAsprintf(buffer, "ethernet%d.connectionType = \"bridged\"\n", controller); } @@ -3549,28 +3549,28 @@ virVMXFormatEthernet(virDomainNetDefPtr def, int controller, suffix = (def->mac[3] << 16) | (def->mac[4] << 8) | def->mac[5]; if (prefix == 0x000c29) { - virBufferVSprintf(buffer, "ethernet%d.addressType = \"generated\"\n", + virBufferAsprintf(buffer, "ethernet%d.addressType = \"generated\"\n", controller); - virBufferVSprintf(buffer, "ethernet%d.generatedAddress = \"%s\"\n", + virBufferAsprintf(buffer, "ethernet%d.generatedAddress = \"%s\"\n", controller, mac_string); - virBufferVSprintf(buffer, "ethernet%d.generatedAddressOffset = \"0\"\n", + virBufferAsprintf(buffer, "ethernet%d.generatedAddressOffset = \"0\"\n", controller); } else if (prefix == 0x005056 && suffix <= 0x3fffff) { - virBufferVSprintf(buffer, "ethernet%d.addressType = \"static\"\n", + virBufferAsprintf(buffer, "ethernet%d.addressType = \"static\"\n", controller); - virBufferVSprintf(buffer, "ethernet%d.address = \"%s\"\n", + virBufferAsprintf(buffer, "ethernet%d.address = \"%s\"\n", controller, mac_string); } else if (prefix == 0x005056 && suffix >= 0x800000 && suffix <= 0xbfffff) { - virBufferVSprintf(buffer, "ethernet%d.addressType = \"vpx\"\n", + virBufferAsprintf(buffer, "ethernet%d.addressType = \"vpx\"\n", controller); - virBufferVSprintf(buffer, "ethernet%d.generatedAddress = \"%s\"\n", + virBufferAsprintf(buffer, "ethernet%d.generatedAddress = \"%s\"\n", controller, mac_string); } else { - virBufferVSprintf(buffer, "ethernet%d.addressType = \"static\"\n", + virBufferAsprintf(buffer, "ethernet%d.addressType = \"static\"\n", controller); - virBufferVSprintf(buffer, "ethernet%d.address = \"%s\"\n", + virBufferAsprintf(buffer, "ethernet%d.address = \"%s\"\n", controller, mac_string); - virBufferVSprintf(buffer, "ethernet%d.checkMACAddress = \"false\"\n", + virBufferAsprintf(buffer, "ethernet%d.checkMACAddress = \"false\"\n", controller); } @@ -3593,19 +3593,19 @@ virVMXFormatSerial(virVMXContext *ctx, virDomainChrDefPtr def, return -1; } - virBufferVSprintf(buffer, "serial%d.present = \"true\"\n", def->target.port); + virBufferAsprintf(buffer, "serial%d.present = \"true\"\n", def->target.port); /* def:type -> vmx:fileType and def:data.file.path -> vmx:fileName */ switch (def->source.type) { case VIR_DOMAIN_CHR_TYPE_DEV: - virBufferVSprintf(buffer, "serial%d.fileType = \"device\"\n", + virBufferAsprintf(buffer, "serial%d.fileType = \"device\"\n", def->target.port); - virBufferVSprintf(buffer, "serial%d.fileName = \"%s\"\n", + virBufferAsprintf(buffer, "serial%d.fileName = \"%s\"\n", def->target.port, def->source.data.file.path); break; case VIR_DOMAIN_CHR_TYPE_FILE: - virBufferVSprintf(buffer, "serial%d.fileType = \"file\"\n", + virBufferAsprintf(buffer, "serial%d.fileType = \"file\"\n", def->target.port); fileName = ctx->formatFileName(def->source.data.file.path, ctx->opaque); @@ -3614,22 +3614,22 @@ virVMXFormatSerial(virVMXContext *ctx, virDomainChrDefPtr def, return -1; } - virBufferVSprintf(buffer, "serial%d.fileName = \"%s\"\n", + virBufferAsprintf(buffer, "serial%d.fileName = \"%s\"\n", def->target.port, fileName); VIR_FREE(fileName); break; case VIR_DOMAIN_CHR_TYPE_PIPE: - virBufferVSprintf(buffer, "serial%d.fileType = \"pipe\"\n", + virBufferAsprintf(buffer, "serial%d.fileType = \"pipe\"\n", def->target.port); /* FIXME: Based on VI Client GUI default */ - virBufferVSprintf(buffer, "serial%d.pipe.endPoint = \"client\"\n", + virBufferAsprintf(buffer, "serial%d.pipe.endPoint = \"client\"\n", def->target.port); /* FIXME: Based on VI Client GUI default */ - virBufferVSprintf(buffer, "serial%d.tryNoRxLoss = \"false\"\n", + virBufferAsprintf(buffer, "serial%d.tryNoRxLoss = \"false\"\n", def->target.port); - virBufferVSprintf(buffer, "serial%d.fileName = \"%s\"\n", + virBufferAsprintf(buffer, "serial%d.fileName = \"%s\"\n", def->target.port, def->source.data.file.path); break; @@ -3659,12 +3659,12 @@ virVMXFormatSerial(virVMXContext *ctx, virDomainChrDefPtr def, return -1; } - virBufferVSprintf(buffer, "serial%d.fileType = \"network\"\n", + virBufferAsprintf(buffer, "serial%d.fileType = \"network\"\n", def->target.port); - virBufferVSprintf(buffer, "serial%d.fileName = \"%s://%s:%s\"\n", + virBufferAsprintf(buffer, "serial%d.fileName = \"%s://%s:%s\"\n", def->target.port, protocol, def->source.data.tcp.host, def->source.data.tcp.service); - virBufferVSprintf(buffer, "serial%d.network.endPoint = \"%s\"\n", + virBufferAsprintf(buffer, "serial%d.network.endPoint = \"%s\"\n", def->target.port, def->source.data.tcp.listen ? "server" : "client"); break; @@ -3678,7 +3678,7 @@ virVMXFormatSerial(virVMXContext *ctx, virDomainChrDefPtr def, /* vmx:yieldOnMsrRead */ /* FIXME: Based on VI Client GUI default */ - virBufferVSprintf(buffer, "serial%d.yieldOnMsrRead = \"true\"\n", + virBufferAsprintf(buffer, "serial%d.yieldOnMsrRead = \"true\"\n", def->target.port); return 0; @@ -3699,20 +3699,20 @@ virVMXFormatParallel(virVMXContext *ctx, virDomainChrDefPtr def, return -1; } - virBufferVSprintf(buffer, "parallel%d.present = \"true\"\n", + virBufferAsprintf(buffer, "parallel%d.present = \"true\"\n", def->target.port); /* def:type -> vmx:fileType and def:data.file.path -> vmx:fileName */ switch (def->source.type) { case VIR_DOMAIN_CHR_TYPE_DEV: - virBufferVSprintf(buffer, "parallel%d.fileType = \"device\"\n", + virBufferAsprintf(buffer, "parallel%d.fileType = \"device\"\n", def->target.port); - virBufferVSprintf(buffer, "parallel%d.fileName = \"%s\"\n", + virBufferAsprintf(buffer, "parallel%d.fileName = \"%s\"\n", def->target.port, def->source.data.file.path); break; case VIR_DOMAIN_CHR_TYPE_FILE: - virBufferVSprintf(buffer, "parallel%d.fileType = \"file\"\n", + virBufferAsprintf(buffer, "parallel%d.fileType = \"file\"\n", def->target.port); fileName = ctx->formatFileName(def->source.data.file.path, ctx->opaque); @@ -3721,7 +3721,7 @@ virVMXFormatParallel(virVMXContext *ctx, virDomainChrDefPtr def, return -1; } - virBufferVSprintf(buffer, "parallel%d.fileName = \"%s\"\n", + virBufferAsprintf(buffer, "parallel%d.fileName = \"%s\"\n", def->target.port, fileName); VIR_FREE(fileName); @@ -3763,7 +3763,7 @@ virVMXFormatSVGA(virDomainVideoDefPtr def, virBufferPtr buffer) return -1; } - virBufferVSprintf(buffer, "svga.vramSize = \"%lld\"\n", + virBufferAsprintf(buffer, "svga.vramSize = \"%lld\"\n", vram * 1024); /* kilobyte to byte */ return 0; |