[libvirt] [PATCH 5/5] Deprecate QEMU_CAPS_NESTING

2018-05-03 Thread Ján Tomko
Unused since commit .

Signed-off-by: Ján Tomko 
---
 src/qemu/qemu_capabilities.h | 2 +-
 src/qemu/qemu_command.c  | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index 0cf7f12230..07dd9ff4ec 100644
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -105,7 +105,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for 
syntax-check */
 
 /* 40 */
 X_QEMU_CAPS_FSDEV, /* -fstype filesystem passthrough */
-QEMU_CAPS_NESTING, /* -enable-nesting (SVM/VMX) */
+X_QEMU_CAPS_NESTING, /* -enable-nesting (SVM/VMX) */
 X_QEMU_CAPS_NAME_PROCESS, /* Is -name process= available */
 X_QEMU_CAPS_DRIVE_READONLY, /* -drive readonly=on|off */
 X_QEMU_CAPS_SMBIOS_TYPE, /* Is -smbios type= available */
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 099265da17..e8f5f97fa1 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -6870,9 +6870,6 @@ qemuBuildCpuCommandLine(virCommandPtr cmd,
 if (cpu) {
 virCommandAddArg(cmd, "-cpu");
 virCommandAddArgFormat(cmd, "%s%s", cpu, cpu_flags ? cpu_flags : "");
-
-if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_NESTING) && hasHwVirt)
-virCommandAddArg(cmd, "-enable-nesting");
 }
 
 ret = 0;
-- 
2.16.1

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

Re: [libvirt] [PATCH 5/5] Deprecate QEMU_CAPS_NESTING

2018-05-04 Thread John Ferlan


On 05/03/2018 06:35 AM, Ján Tomko wrote:
> Unused since commit .
> 
> Signed-off-by: Ján Tomko 
> ---
>  src/qemu/qemu_capabilities.h | 2 +-
>  src/qemu/qemu_command.c  | 3 ---
>  2 files changed, 1 insertion(+), 4 deletions(-)
> 
> diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
> index 0cf7f12230..07dd9ff4ec 100644
> --- a/src/qemu/qemu_capabilities.h
> +++ b/src/qemu/qemu_capabilities.h
> @@ -105,7 +105,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for 
> syntax-check */
>  
>  /* 40 */
>  X_QEMU_CAPS_FSDEV, /* -fstype filesystem passthrough */
> -QEMU_CAPS_NESTING, /* -enable-nesting (SVM/VMX) */
> +X_QEMU_CAPS_NESTING, /* -enable-nesting (SVM/VMX) */
>  X_QEMU_CAPS_NAME_PROCESS, /* Is -name process= available */
>  X_QEMU_CAPS_DRIVE_READONLY, /* -drive readonly=on|off */
>  X_QEMU_CAPS_SMBIOS_TYPE, /* Is -smbios type= available */
> diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
> index 099265da17..e8f5f97fa1 100644
> --- a/src/qemu/qemu_command.c
> +++ b/src/qemu/qemu_command.c
> @@ -6870,9 +6870,6 @@ qemuBuildCpuCommandLine(virCommandPtr cmd,
>  if (cpu) {
>  virCommandAddArg(cmd, "-cpu");
>  virCommandAddArgFormat(cmd, "%s%s", cpu, cpu_flags ? cpu_flags : "");
> -
> -if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_NESTING) && hasHwVirt)

Did you clip too much here?   hasHWVirt is defined and set, but not used
according to my compiler

John
> -virCommandAddArg(cmd, "-enable-nesting");
>  }
>  
>  ret = 0;
> 

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list