提交 bfd50603 编写于 作者: D Daniel P. Berrange

Make drivers be 'quiet' when opening RW connection. Removed duplicated RO checks

上级 b084f43f
Wed Aug 16 11:31:59 EDT 2006 Daniel Berrange <berrange@redhat.com>
* src/libvirt.c: Remove some duplicated changes for VIR_DOMAIN_RO
accidentally left in place from last checkin. Tell the drivers to
be 'quiet' when opening a RW connection, to stop XenD driver
complaining when we open the test driver.
Wed Aug 16 17:24:59 CEST 2006 Daniel Veillard <veillard@redhat.com> Wed Aug 16 17:24:59 CEST 2006 Daniel Veillard <veillard@redhat.com>
* include/libvirt/virterror.h src/libvirt.c src/virterror.c: enforce * include/libvirt/virterror.h src/libvirt.c src/virterror.c: enforce
......
...@@ -240,7 +240,7 @@ virConnectOpen(const char *name) ...@@ -240,7 +240,7 @@ virConnectOpen(const char *name)
for (i = 0;i < MAX_DRIVERS;i++) { for (i = 0;i < MAX_DRIVERS;i++) {
if ((virDriverTab[i] != NULL) && (virDriverTab[i]->open != NULL)) { if ((virDriverTab[i] != NULL) && (virDriverTab[i]->open != NULL)) {
res = virDriverTab[i]->open(ret, name, 0); res = virDriverTab[i]->open(ret, name, VIR_DRV_OPEN_QUIET);
/* /*
* For a default connect to Xen make sure we manage to contact * For a default connect to Xen make sure we manage to contact
* all related drivers. * all related drivers.
...@@ -812,10 +812,6 @@ virDomainSuspend(virDomainPtr domain) ...@@ -812,10 +812,6 @@ virDomainSuspend(virDomainPtr domain)
} }
conn = domain->conn; conn = domain->conn;
#if PEDANTIC
if (domain->conn->flags & VIR_CONNECT_RO)
return (-1);
#endif
/* /*
* Go though the driver registered entry points but use the * Go though the driver registered entry points but use the
...@@ -868,10 +864,6 @@ virDomainResume(virDomainPtr domain) ...@@ -868,10 +864,6 @@ virDomainResume(virDomainPtr domain)
} }
conn = domain->conn; conn = domain->conn;
#if PEDANTIC
if (domain->conn->flags & VIR_CONNECT_RO)
return (-1);
#endif
/* /*
* Go though the driver registered entry points but use the * Go though the driver registered entry points but use the
...@@ -1053,10 +1045,6 @@ virDomainShutdown(virDomainPtr domain) ...@@ -1053,10 +1045,6 @@ virDomainShutdown(virDomainPtr domain)
} }
conn = domain->conn; conn = domain->conn;
#if PEDANTIC
if (domain->conn->flags & VIR_CONNECT_RO)
return (-1);
#endif
/* Go though the driver registered entry points */ /* Go though the driver registered entry points */
for (i = 0;i < conn->nb_drivers;i++) { for (i = 0;i < conn->nb_drivers;i++) {
...@@ -1102,10 +1090,6 @@ virDomainReboot(virDomainPtr domain, unsigned int flags) ...@@ -1102,10 +1090,6 @@ virDomainReboot(virDomainPtr domain, unsigned int flags)
} }
conn = domain->conn; conn = domain->conn;
#if PEDANTIC
if (domain->conn->flags & VIR_CONNECT_RO)
return (-1);
#endif
/* Go though the driver registered entry points */ /* Go though the driver registered entry points */
for (i = 0;i < conn->nb_drivers;i++) { for (i = 0;i < conn->nb_drivers;i++) {
...@@ -1341,8 +1325,6 @@ virDomainSetMaxMemory(virDomainPtr domain, unsigned long memory) ...@@ -1341,8 +1325,6 @@ virDomainSetMaxMemory(virDomainPtr domain, unsigned long memory)
return (-1); return (-1);
} }
conn = domain->conn; conn = domain->conn;
if (domain->conn->flags & VIR_CONNECT_RO)
return (-1);
/* /*
* in that case instead of trying only though one method try all availble. * in that case instead of trying only though one method try all availble.
...@@ -1738,6 +1720,7 @@ virDomainSetVcpus(virDomainPtr domain, unsigned int nvcpus) ...@@ -1738,6 +1720,7 @@ virDomainSetVcpus(virDomainPtr domain, unsigned int nvcpus)
virLibDomainError(domain, VIR_ERR_OPERATION_DENIED, __FUNCTION__); virLibDomainError(domain, VIR_ERR_OPERATION_DENIED, __FUNCTION__);
return (-1); return (-1);
} }
if (nvcpus < 1) { if (nvcpus < 1) {
virLibDomainError(domain, VIR_ERR_INVALID_ARG, __FUNCTION__); virLibDomainError(domain, VIR_ERR_INVALID_ARG, __FUNCTION__);
return (-1); return (-1);
...@@ -1806,6 +1789,7 @@ virDomainPinVcpu(virDomainPtr domain, unsigned int vcpu, ...@@ -1806,6 +1789,7 @@ virDomainPinVcpu(virDomainPtr domain, unsigned int vcpu,
virLibDomainError(domain, VIR_ERR_OPERATION_DENIED, __FUNCTION__); virLibDomainError(domain, VIR_ERR_OPERATION_DENIED, __FUNCTION__);
return (-1); return (-1);
} }
if ((vcpu > 32000) || (cpumap == NULL) || (maplen < 1)) { if ((vcpu > 32000) || (cpumap == NULL) || (maplen < 1)) {
virLibDomainError(domain, VIR_ERR_INVALID_ARG, __FUNCTION__); virLibDomainError(domain, VIR_ERR_INVALID_ARG, __FUNCTION__);
return (-1); return (-1);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册