[Libvir] [PATCH] Implement SetVcpus and DomainGetMaxVcpus for qemu
The attached patch fills in two of the vcpu functions for the qemu driver:
virDomainSetVcpus : set the number of vcpus the domain can use
virDomainGetMaxVcpus : max number of vcpus that can be assigned to the domain.
Code change is only in qemu_driver, as the backend stuff was already in place.
I also edited qemudGetMaxVcpus to ignore case when checking the passed OS
type, since it wasn't matching the returned results of qemudDomainGetOSType.
Thanks,
Cole
diff --git a/src/qemu_driver.c b/src/qemu_driver.c
index b65ae66..8bedf5a 100644
--- a/src/qemu_driver.c
+++ b/src/qemu_driver.c
@@ -113,6 +113,8 @@ static int qemudShutdownNetworkDaemon(virConnectPtr conn,
struct qemud_driver *driver,
struct qemud_network *network);
+static int qemudDomainGetMaxVcpus(virDomainPtr dom);
+
static struct qemud_driver *qemu_driver = NULL;
@@ -1524,21 +1526,23 @@ static const char *qemudGetType(virConnectPtr conn
ATTRIBUTE_UNUSED) {
return "QEMU";
}
-static int qemudGetMaxVCPUs(virConnectPtr conn ATTRIBUTE_UNUSED,
- const char *type) {
+static int qemudGetMaxVCPUs(virConnectPtr conn, const char *type) {
if (!type)
return 16;
- if (!strcmp(type, "qemu"))
+ if (!strcasecmp(type, "qemu"))
return 16;
/* XXX future KVM will support SMP. Need to probe
kernel to figure out KVM module version i guess */
- if (!strcmp(type, "kvm"))
+ if (!strcasecmp(type, "kvm"))
return 1;
- if (!strcmp(type, "kqemu"))
+ if (!strcasecmp(type, "kqemu"))
return 1;
+
+ qemudReportError(conn, NULL, NULL, VIR_ERR_INVALID_ARG,
+ _("unknown type '%s'"), type);
return -1;
}
@@ -2122,6 +2126,66 @@ static int qemudDomainSave(virDomainPtr dom,
}
+static int qemudDomainSetVcpus(virDomainPtr dom, unsigned int nvcpus) {
+ struct qemud_driver *driver = (struct qemud_driver *)dom->conn->privateData;
+ struct qemud_vm *vm = qemudFindVMByUUID(driver, dom->uuid);
+ int max;
+
+ if (!vm) {
+ qemudReportError(dom->conn, dom, NULL, VIR_ERR_INVALID_DOMAIN,
+ _("no domain with matching uuid '%s'"),
dom->uuid);
+ return -1;
+ }
+
+ if (qemudIsActiveVM(vm)) {
+ qemudReportError(dom->conn, dom, NULL, VIR_ERR_INTERNAL_ERROR,
"%s",
+ _("cannot change vcpu count of an active domain"));
+ return -1;
+ }
+
+ if ((max = qemudDomainGetMaxVcpus(dom)) < 0) {
+ qemudReportError(dom->conn, dom, NULL, VIR_ERR_INTERNAL_ERROR,
+ _("could not determine max vcpus for the domain"));
+ return -1;
+ }
+
+ if (nvcpus > max) {
+ qemudReportError(dom->conn, dom, NULL, VIR_ERR_INVALID_ARG,
+ _("requested vcpus is greater than max allowable"
+ " vcpus for the domain: %d > %d"), nvcpus, max);
+ return -1;
+ }
+
+ vm->def->vcpus = nvcpus;
+ return 0;
+}
+
+static int qemudDomainGetMaxVcpus(virDomainPtr dom) {
+ struct qemud_driver *driver = (struct qemud_driver *)dom->conn->privateData;
+ struct qemud_vm *vm = qemudFindVMByUUID(driver, dom->uuid);
+ char *type;
+ int ret;
+
+ if (!vm) {
+ qemudReportError(dom->conn, dom, NULL, VIR_ERR_INVALID_DOMAIN,
+ _("no domain with matching uuid '%s'"),
dom->uuid);
+ return -1;
+ }
+
+ if (!(type = qemudDomainGetOSType(dom))) {
+ return -1;
+ }
+
+ if ((ret = qemudGetMaxVCPUs(dom->conn, vm->def->virtType)) < 0) {
+ free(type);
+ return -1;
+ }
+
+ free(type);
+ return ret;
+}
+
+
static int qemudDomainRestore(virConnectPtr conn,
const char *path) {
struct qemud_driver *driver = (struct qemud_driver *)conn->privateData;
@@ -3042,10 +3106,10 @@ static virDriver qemuDriver = {
qemudDomainSave, /* domainSave */
qemudDomainRestore, /* domainRestore */
NULL, /* domainCoreDump */
- NULL, /* domainSetVcpus */
+ qemudDomainSetVcpus, /* domainSetVcpus */
NULL, /* domainPinVcpu */
NULL, /* domainGetVcpus */
- NULL, /* domainGetMaxVcpus */
+ qemudDomainGetMaxVcpus, /* domainGetMaxVcpus */
qemudDomainDumpXML, /* domainDumpXML */
qemudListDefinedDomains, /* listDomains */
qemudNumDefinedDomains, /* numOfDomains */