mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-09-13 11:15:08 +00:00
* src/qemu_driver.c: some uuid to string conversion were missing
patch from Guido Günther Daniel
This commit is contained in:
parent
01fd287bcd
commit
c1e6cc1969
@ -1,3 +1,8 @@
|
|||||||
|
Fri Jul 25 11:00:27 CEST 2008 Daniel Veillard <veillard@redhat.com>
|
||||||
|
|
||||||
|
* src/qemu_driver.c: some uuid to string conversion were missing
|
||||||
|
patch from Guido Günther
|
||||||
|
|
||||||
Fri Jul 25 10:46:25 CEST 2008 Daniel Veillard <veillard@redhat.com>
|
Fri Jul 25 10:46:25 CEST 2008 Daniel Veillard <veillard@redhat.com>
|
||||||
|
|
||||||
* include/libvirt/libvirt.h include/libvirt/libvirt.h.in:
|
* include/libvirt/libvirt.h include/libvirt/libvirt.h.in:
|
||||||
|
@ -63,6 +63,7 @@
|
|||||||
#include "stats_linux.h"
|
#include "stats_linux.h"
|
||||||
#include "capabilities.h"
|
#include "capabilities.h"
|
||||||
#include "memory.h"
|
#include "memory.h"
|
||||||
|
#include "uuid.h"
|
||||||
|
|
||||||
/* For storing short-lived temporary files. */
|
/* For storing short-lived temporary files. */
|
||||||
#define TEMPDIR LOCAL_STATE_DIR "/cache/libvirt"
|
#define TEMPDIR LOCAL_STATE_DIR "/cache/libvirt"
|
||||||
@ -2155,8 +2156,11 @@ static unsigned long qemudDomainGetMaxMemory(virDomainPtr dom) {
|
|||||||
virDomainObjPtr vm = virDomainFindByUUID(driver->domains, dom->uuid);
|
virDomainObjPtr vm = virDomainFindByUUID(driver->domains, dom->uuid);
|
||||||
|
|
||||||
if (!vm) {
|
if (!vm) {
|
||||||
|
char uuidstr[VIR_UUID_STRING_BUFLEN];
|
||||||
|
|
||||||
|
virUUIDFormat(dom->uuid, uuidstr);
|
||||||
qemudReportError(dom->conn, dom, NULL, VIR_ERR_INVALID_DOMAIN,
|
qemudReportError(dom->conn, dom, NULL, VIR_ERR_INVALID_DOMAIN,
|
||||||
_("no domain with matching uuid '%s'"), dom->uuid);
|
_("no domain with matching uuid '%s'"), uuidstr);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -2168,8 +2172,11 @@ static int qemudDomainSetMaxMemory(virDomainPtr dom, unsigned long newmax) {
|
|||||||
virDomainObjPtr vm = virDomainFindByUUID(driver->domains, dom->uuid);
|
virDomainObjPtr vm = virDomainFindByUUID(driver->domains, dom->uuid);
|
||||||
|
|
||||||
if (!vm) {
|
if (!vm) {
|
||||||
|
char uuidstr[VIR_UUID_STRING_BUFLEN];
|
||||||
|
|
||||||
|
virUUIDFormat(dom->uuid, uuidstr);
|
||||||
qemudReportError(dom->conn, dom, NULL, VIR_ERR_INVALID_DOMAIN,
|
qemudReportError(dom->conn, dom, NULL, VIR_ERR_INVALID_DOMAIN,
|
||||||
_("no domain with matching uuid '%s'"), dom->uuid);
|
_("no domain with matching uuid '%s'"), uuidstr);
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -2188,8 +2195,11 @@ static int qemudDomainSetMemory(virDomainPtr dom, unsigned long newmem) {
|
|||||||
virDomainObjPtr vm = virDomainFindByUUID(driver->domains, dom->uuid);
|
virDomainObjPtr vm = virDomainFindByUUID(driver->domains, dom->uuid);
|
||||||
|
|
||||||
if (!vm) {
|
if (!vm) {
|
||||||
|
char uuidstr[VIR_UUID_STRING_BUFLEN];
|
||||||
|
|
||||||
|
virUUIDFormat(dom->uuid, uuidstr);
|
||||||
qemudReportError(dom->conn, dom, NULL, VIR_ERR_INVALID_DOMAIN,
|
qemudReportError(dom->conn, dom, NULL, VIR_ERR_INVALID_DOMAIN,
|
||||||
_("no domain with matching uuid '%s'"), dom->uuid);
|
_("no domain with matching uuid '%s'"), uuidstr);
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -2458,8 +2468,11 @@ static int qemudDomainSetVcpus(virDomainPtr dom, unsigned int nvcpus) {
|
|||||||
int max;
|
int max;
|
||||||
|
|
||||||
if (!vm) {
|
if (!vm) {
|
||||||
|
char uuidstr[VIR_UUID_STRING_BUFLEN];
|
||||||
|
|
||||||
|
virUUIDFormat(dom->uuid, uuidstr);
|
||||||
qemudReportError(dom->conn, dom, NULL, VIR_ERR_INVALID_DOMAIN,
|
qemudReportError(dom->conn, dom, NULL, VIR_ERR_INVALID_DOMAIN,
|
||||||
_("no domain with matching uuid '%s'"), dom->uuid);
|
_("no domain with matching uuid '%s'"), uuidstr);
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -2617,8 +2630,11 @@ static int qemudDomainGetMaxVcpus(virDomainPtr dom) {
|
|||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
if (!vm) {
|
if (!vm) {
|
||||||
|
char uuidstr[VIR_UUID_STRING_BUFLEN];
|
||||||
|
|
||||||
|
virUUIDFormat(dom->uuid, uuidstr);
|
||||||
qemudReportError(dom->conn, dom, NULL, VIR_ERR_INVALID_DOMAIN,
|
qemudReportError(dom->conn, dom, NULL, VIR_ERR_INVALID_DOMAIN,
|
||||||
_("no domain with matching uuid '%s'"), dom->uuid);
|
_("no domain with matching uuid '%s'"), uuidstr);
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user