[libvirt] [PATCH] parallels: fix prlsdkCheckUnsupportedParams checks
for memory limits since unset ones are no longer zero Signed-off-by: Maxim Nestratov <mnestratov@parallels.com> --- src/parallels/parallels_sdk.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/parallels/parallels_sdk.c b/src/parallels/parallels_sdk.c index a775348..4c90a18 100644 --- a/src/parallels/parallels_sdk.c +++ b/src/parallels/parallels_sdk.c @@ -1791,10 +1791,10 @@ prlsdkCheckUnsupportedParams(PRL_HANDLE sdkdom, virDomainDefPtr def) } if (def->mem.nhugepages || - def->mem.hard_limit || - def->mem.soft_limit || + virMemoryLimitIsSet(def->mem.hard_limit) || + virMemoryLimitIsSet(def->mem.soft_limit) || def->mem.min_guarantee || - def->mem.swap_hard_limit) { + virMemoryLimitIsSet(def->mem.swap_hard_limit)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("Memory parameter is not supported " -- 1.7.1
On Thu, Mar 12, 2015 at 18:43:29 +0300, Maxim Nestratov wrote:
for memory limits since unset ones are no longer zero
Ah, sorry, my bad for not noticing this while reviewing Pavel's series.
Signed-off-by: Maxim Nestratov <mnestratov@parallels.com> --- src/parallels/parallels_sdk.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/parallels/parallels_sdk.c b/src/parallels/parallels_sdk.c index a775348..4c90a18 100644 --- a/src/parallels/parallels_sdk.c +++ b/src/parallels/parallels_sdk.c @@ -1791,10 +1791,10 @@ prlsdkCheckUnsupportedParams(PRL_HANDLE sdkdom, virDomainDefPtr def) }
if (def->mem.nhugepages || - def->mem.hard_limit || - def->mem.soft_limit || + virMemoryLimitIsSet(def->mem.hard_limit) || + virMemoryLimitIsSet(def->mem.soft_limit) || def->mem.min_guarantee || - def->mem.swap_hard_limit) { + virMemoryLimitIsSet(def->mem.swap_hard_limit)) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("Memory parameter is not supported "
ACK, I'll push this once the build with this patch finishes. Peter
13.03.2015 11:04, Peter Krempa пишет:
On Thu, Mar 12, 2015 at 18:43:29 +0300, Maxim Nestratov wrote:
for memory limits since unset ones are no longer zero Ah, sorry, my bad for not noticing this while reviewing Pavel's series. Never mind. Signed-off-by: Maxim Nestratov <mnestratov@parallels.com> --- src/parallels/parallels_sdk.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/parallels/parallels_sdk.c b/src/parallels/parallels_sdk.c index a775348..4c90a18 100644 --- a/src/parallels/parallels_sdk.c +++ b/src/parallels/parallels_sdk.c @@ -1791,10 +1791,10 @@ prlsdkCheckUnsupportedParams(PRL_HANDLE sdkdom, virDomainDefPtr def) }
if (def->mem.nhugepages || - def->mem.hard_limit || - def->mem.soft_limit || + virMemoryLimitIsSet(def->mem.hard_limit) || + virMemoryLimitIsSet(def->mem.soft_limit) || def->mem.min_guarantee || - def->mem.swap_hard_limit) { + virMemoryLimitIsSet(def->mem.swap_hard_limit)) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("Memory parameter is not supported " ACK, I'll push this once the build with this patch finishes.
Peter Thank you
participants (2)
-
Maxim Nestratov -
Peter Krempa