6:03 p.m.
*** BLURB HERE ***
Michal Privoznik (2):
esx: Report error in esxVI_LookupVirtualMachineByName
esx: De-duplicate @virtualMachine check in esxDomainLookupByName
src/esx/esx_driver.c | 7 +------
src/esx/esx_vi.c | 5 ++++-
2 files changed, 5 insertions(+), 7 deletions(-)
--
2.16.4
6:03 p.m.
New subject: [libvirt] [PATCH 1/2] esx: Report error in esxVI_LookupVirtualMachineByName
When reviewing 00d9edfe2f39f60b40 I've changed proposed patch and
made it to not report error if no domain is found. This is wrong
and the original patch was okay. Thing is, both callers pass
occurrence = OptionalItem so no error message overwriting is done
as I thought initially.
Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com>
---
src/esx/esx_vi.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/esx/esx_vi.c b/src/esx/esx_vi.c
index 0bdfc5a8be..25fbdc7e44 100644
--- a/src/esx/esx_vi.c
+++ b/src/esx/esx_vi.c
@@ -3014,8 +3014,11 @@ esxVI_LookupVirtualMachineByName(esxVI_Context *ctx, const char
*name,
break;
}
- if (!(*virtualMachine) && occurrence != esxVI_Occurrence_OptionalItem)
+ if (!(*virtualMachine) && occurrence != esxVI_Occurrence_OptionalItem) {
+ virReportError(VIR_ERR_NO_DOMAIN,
+ _("Could not find domain with name '%s'"),
name);
goto cleanup;
+ }
result = 0;
--
2.16.4
6:03 p.m.
New subject: [libvirt] [PATCH 2/2] esx: De-duplicate @virtualMachine check in esxDomainLookupByName
The function call esxVI_LookupVirtualMachineByName(occurrence =
OptionalItem) and then checks if @virtualMachine is NULL. If it
is an error is reported. The same result can be achieved by
setting occurrence to RequiredItem.
Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com>
---
src/esx/esx_driver.c | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c
index e906d11fa9..01bcc99962 100644
--- a/src/esx/esx_driver.c
+++ b/src/esx/esx_driver.c
@@ -1577,12 +1577,7 @@ esxDomainLookupByName(virConnectPtr conn, const char *name)
"config.uuid\0") < 0 ||
esxVI_LookupVirtualMachineByName(priv->primary, name, propertyNameList,
&virtualMachine,
- esxVI_Occurrence_OptionalItem) < 0) {
- goto cleanup;
- }
-
- if (!virtualMachine) {
- virReportError(VIR_ERR_NO_DOMAIN, _("No domain with name
'%s'"), name);
+ esxVI_Occurrence_RequiredItem) < 0) {
goto cleanup;
}
--
2.16.4
8:08 p.m.
2018-07-03 17:03 GMT+02:00 Michal Privoznik <mprivozn(a)redhat.com>:
*** BLURB HERE ***
Michal Privoznik (2):
esx: Report error in esxVI_LookupVirtualMachineByName
esx: De-duplicate @virtualMachine check in esxDomainLookupByName
src/esx/esx_driver.c | 7 +------
src/esx/esx_vi.c | 5 ++++-
2 files changed, 5 insertions(+), 7 deletions(-)
ACK for both patches.
--
Matthias Bolte
http://photron.blogspot.com
12:30 a.m.
On 07/03/2018 07:08 PM, Matthias Bolte wrote:
2018-07-03 17:03 GMT+02:00 Michal Privoznik
<mprivozn(a)redhat.com>:
> *** BLURB HERE ***
>
> Michal Privoznik (2):
> esx: Report error in esxVI_LookupVirtualMachineByName
> esx: De-duplicate @virtualMachine check in esxDomainLookupByName
>
> src/esx/esx_driver.c | 7 +------
> src/esx/esx_vi.c | 5 ++++-
> 2 files changed, 5 insertions(+), 7 deletions(-)
>
ACK for both patches.
Thanks, pushed.
Michal
2409
days inactive
2409
days old
4 comments
3 participants
participants (3)
-
Matthias Bolte -
Michal Privoznik -
Michal Prívozník