summaryrefslogtreecommitdiff
path: root/docs/api_extension/0015-Step-15-of-15-remove-dead-xen-code.patch
diff options
context:
space:
mode:
Diffstat (limited to 'docs/api_extension/0015-Step-15-of-15-remove-dead-xen-code.patch')
-rw-r--r--docs/api_extension/0015-Step-15-of-15-remove-dead-xen-code.patch228
1 files changed, 228 insertions, 0 deletions
diff --git a/docs/api_extension/0015-Step-15-of-15-remove-dead-xen-code.patch b/docs/api_extension/0015-Step-15-of-15-remove-dead-xen-code.patch
new file mode 100644
index 0000000000..56b99a3355
--- /dev/null
+++ b/docs/api_extension/0015-Step-15-of-15-remove-dead-xen-code.patch
@@ -0,0 +1,228 @@
+From b013788742183afec9aa5068d3cfd185a3b5c62e Mon Sep 17 00:00:00 2001
+From: Eric Blake <eblake@redhat.com>
+Date: Thu, 7 Oct 2010 08:59:27 -0600
+Subject: [PATCH 15/15] vcpu: remove dead xen code
+
+* src/xen/xen_driver.h (xenUnifiedDriver): Remove now-unused
+domainGetMaxVcpus, domainSetVcpus.
+* src/xen/proxy_internal.c (xenProxyDriver): Likewise.
+* src/xen/xen_hypervisor.c (xenHypervisorDriver): Likewise.
+* src/xen/xen_inotify.c (xenInotifyDriver): Likewise.
+* src/xen/xend_internal.c (xenDaemonDriver)
+(xenDaemonDomainSetVcpus): Likewise.
+* src/xen/xm_internal.c (xenXMDriver, xenXMDomainSetVcpus):
+Likewise.
+* src/xen/xs_internal.c (xenStoreDriver): Likewise.
+---
+ src/xen/proxy_internal.c | 2 --
+ src/xen/xen_driver.h | 4 +---
+ src/xen/xen_hypervisor.c | 2 --
+ src/xen/xen_inotify.c | 2 --
+ src/xen/xend_internal.c | 33 ---------------------------------
+ src/xen/xm_internal.c | 43 -------------------------------------------
+ src/xen/xs_internal.c | 2 --
+ 7 files changed, 1 insertions(+), 87 deletions(-)
+
+diff --git a/src/xen/proxy_internal.c b/src/xen/proxy_internal.c
+index 335dfc4..4033727 100644
+--- a/src/xen/proxy_internal.c
++++ b/src/xen/proxy_internal.c
+@@ -67,10 +67,8 @@ struct xenUnifiedDriver xenProxyDriver = {
+ NULL, /* domainSave */
+ NULL, /* domainRestore */
+ NULL, /* domainCoreDump */
+- NULL, /* domainSetVcpus */
+ NULL, /* domainPinVcpu */
+ NULL, /* domainGetVcpus */
+- NULL, /* domainGetMaxVcpus */
+ NULL, /* listDefinedDomains */
+ NULL, /* numOfDefinedDomains */
+ NULL, /* domainCreate */
+diff --git a/src/xen/xen_driver.h b/src/xen/xen_driver.h
+index 115a26a..53f97d4 100644
+--- a/src/xen/xen_driver.h
++++ b/src/xen/xen_driver.h
+@@ -1,7 +1,7 @@
+ /*
+ * xen_unified.c: Unified Xen driver.
+ *
+- * Copyright (C) 2007 Red Hat, Inc.
++ * Copyright (C) 2007, 2010 Red Hat, Inc.
+ *
+ * See COPYING.LIB for the License of this software
+ *
+@@ -84,10 +84,8 @@ struct xenUnifiedDriver {
+ virDrvDomainSave domainSave;
+ virDrvDomainRestore domainRestore;
+ virDrvDomainCoreDump domainCoreDump;
+- virDrvDomainSetVcpus domainSetVcpus;
+ virDrvDomainPinVcpu domainPinVcpu;
+ virDrvDomainGetVcpus domainGetVcpus;
+- virDrvDomainGetMaxVcpus domainGetMaxVcpus;
+ virDrvListDefinedDomains listDefinedDomains;
+ virDrvNumOfDefinedDomains numOfDefinedDomains;
+ virDrvDomainCreate domainCreate;
+diff --git a/src/xen/xen_hypervisor.c b/src/xen/xen_hypervisor.c
+index 6246513..3797865 100644
+--- a/src/xen/xen_hypervisor.c
++++ b/src/xen/xen_hypervisor.c
+@@ -784,10 +784,8 @@ struct xenUnifiedDriver xenHypervisorDriver = {
+ NULL, /* domainSave */
+ NULL, /* domainRestore */
+ NULL, /* domainCoreDump */
+- xenHypervisorSetVcpus, /* domainSetVcpus */
+ xenHypervisorPinVcpu, /* domainPinVcpu */
+ xenHypervisorGetVcpus, /* domainGetVcpus */
+- xenHypervisorGetVcpuMax, /* domainGetMaxVcpus */
+ NULL, /* listDefinedDomains */
+ NULL, /* numOfDefinedDomains */
+ NULL, /* domainCreate */
+diff --git a/src/xen/xen_inotify.c b/src/xen/xen_inotify.c
+index d24b20f..9507061 100644
+--- a/src/xen/xen_inotify.c
++++ b/src/xen/xen_inotify.c
+@@ -71,10 +71,8 @@ struct xenUnifiedDriver xenInotifyDriver = {
+ NULL, /* domainSave */
+ NULL, /* domainRestore */
+ NULL, /* domainCoreDump */
+- NULL, /* domainSetVcpus */
+ NULL, /* domainPinVcpu */
+ NULL, /* domainGetVcpus */
+- NULL, /* domainGetMaxVcpus */
+ NULL, /* listDefinedDomains */
+ NULL, /* numOfDefinedDomains */
+ NULL, /* domainCreate */
+diff --git a/src/xen/xend_internal.c b/src/xen/xend_internal.c
+index 55c2cc4..b90c331 100644
+--- a/src/xen/xend_internal.c
++++ b/src/xen/xend_internal.c
+@@ -3611,37 +3611,6 @@ xenDaemonDomainSetVcpusFlags(virDomainPtr domain, unsigned int vcpus,
+ }
+
+ /**
+- * xenDaemonDomainSetVcpus:
+- * @domain: pointer to domain object
+- * @nvcpus: the new number of virtual CPUs for this domain
+- *
+- * Dynamically change the number of virtual CPUs used by the domain.
+- *
+- * Returns 0 for success; -1 (with errno) on error
+- */
+-int
+-xenDaemonDomainSetVcpus(virDomainPtr domain, unsigned int vcpus)
+-{
+- char buf[VIR_UUID_BUFLEN];
+- xenUnifiedPrivatePtr priv;
+-
+- if ((domain == NULL) || (domain->conn == NULL) || (domain->name == NULL)
+- || (vcpus < 1)) {
+- virXendError(VIR_ERR_INVALID_ARG, __FUNCTION__);
+- return (-1);
+- }
+-
+- priv = (xenUnifiedPrivatePtr) domain->conn->privateData;
+-
+- if (domain->id < 0 && priv->xendConfigVersion < 3)
+- return(-1);
+-
+- snprintf(buf, sizeof(buf), "%d", vcpus);
+- return(xend_op(domain->conn, domain->name, "op", "set_vcpus", "vcpus",
+- buf, NULL));
+-}
+-
+-/**
+ * xenDaemonDomainPinCpu:
+ * @domain: pointer to domain object
+ * @vcpu: virtual CPU number
+@@ -5213,10 +5182,8 @@ struct xenUnifiedDriver xenDaemonDriver = {
+ xenDaemonDomainSave, /* domainSave */
+ xenDaemonDomainRestore, /* domainRestore */
+ xenDaemonDomainCoreDump, /* domainCoreDump */
+- xenDaemonDomainSetVcpus, /* domainSetVcpus */
+ xenDaemonDomainPinVcpu, /* domainPinVcpu */
+ xenDaemonDomainGetVcpus, /* domainGetVcpus */
+- NULL, /* domainGetMaxVcpus */
+ xenDaemonListDefinedDomains, /* listDefinedDomains */
+ xenDaemonNumOfDefinedDomains,/* numOfDefinedDomains */
+ xenDaemonDomainCreate, /* domainCreate */
+diff --git a/src/xen/xm_internal.c b/src/xen/xm_internal.c
+index 2b8e51e..430d40b 100644
+--- a/src/xen/xm_internal.c
++++ b/src/xen/xm_internal.c
+@@ -103,10 +103,8 @@ struct xenUnifiedDriver xenXMDriver = {
+ NULL, /* domainSave */
+ NULL, /* domainRestore */
+ NULL, /* domainCoreDump */
+- xenXMDomainSetVcpus, /* domainSetVcpus */
+ xenXMDomainPinVcpu, /* domainPinVcpu */
+ NULL, /* domainGetVcpus */
+- NULL, /* domainGetMaxVcpus */
+ xenXMListDefinedDomains, /* listDefinedDomains */
+ xenXMNumOfDefinedDomains, /* numOfDefinedDomains */
+ xenXMDomainCreate, /* domainCreate */
+@@ -1630,47 +1628,6 @@ cleanup:
+ }
+
+ /*
+- * Set the VCPU count in config
+- */
+-int xenXMDomainSetVcpus(virDomainPtr domain, unsigned int vcpus) {
+- xenUnifiedPrivatePtr priv;
+- const char *filename;
+- xenXMConfCachePtr entry;
+- int ret = -1;
+-
+- if ((domain == NULL) || (domain->conn == NULL) || (domain->name == NULL)) {
+- xenXMError(VIR_ERR_INVALID_ARG, __FUNCTION__);
+- return (-1);
+- }
+- if (domain->conn->flags & VIR_CONNECT_RO)
+- return (-1);
+- if (domain->id != -1)
+- return (-1);
+-
+- priv = domain->conn->privateData;
+- xenUnifiedLock(priv);
+-
+- if (!(filename = virHashLookup(priv->nameConfigMap, domain->name)))
+- goto cleanup;
+-
+- if (!(entry = virHashLookup(priv->configCache, filename)))
+- goto cleanup;
+-
+- entry->def->maxvcpus = entry->def->vcpus = vcpus;
+-
+- /* If this fails, should we try to undo our changes to the
+- * in-memory representation of the config file. I say not!
+- */
+- if (xenXMConfigSaveFile(domain->conn, entry->filename, entry->def) < 0)
+- goto cleanup;
+- ret = 0;
+-
+-cleanup:
+- xenUnifiedUnlock(priv);
+- return ret;
+-}
+-
+-/*
+ * xenXMDomainSetVcpusFlags:
+ * @domain: pointer to domain object
+ * @nvcpus: number of vcpus
+diff --git a/src/xen/xs_internal.c b/src/xen/xs_internal.c
+index 9296f25..a9817b1 100644
+--- a/src/xen/xs_internal.c
++++ b/src/xen/xs_internal.c
+@@ -67,10 +67,8 @@ struct xenUnifiedDriver xenStoreDriver = {
+ NULL, /* domainSave */
+ NULL, /* domainRestore */
+ NULL, /* domainCoreDump */
+- NULL, /* domainSetVcpus */
+ NULL, /* domainPinVcpu */
+ NULL, /* domainGetVcpus */
+- NULL, /* domainGetMaxVcpus */
+ NULL, /* listDefinedDomains */
+ NULL, /* numOfDefinedDomains */
+ NULL, /* domainCreate */
+--
+1.7.2.3
+
View Lorry Controller Status