Re: [libvirt] [libvirt PATCH v2 11/44] Deprecate QEMU_CAPS_NO_USER_CONFIG

2018-04-15 Thread Andrea Bolognani 
On Thu, 2018-04-12 at 17:16 +0200, Ján Tomko wrote:
> On Thu, Apr 12, 2018 at 10:07:50AM +0200, Andrea Bolognani wrote:
> > On Mon, 2018-04-09 at 17:20 +0200, Ján Tomko wrote:
> > > Delete this one first, because QEMU_CAPS_NODEFCONFIG is only used
> > > when QEMU_CAPS_NO_USER_CONFIG is unsupported.
> > 
> > Is there a specific reason for the 6-patch gap between dropping
> > NO_USER_CONFIG and dropping NODEFCONFIG? It would IMHO make more
> > sense to drop them one immediately after the other.
> 
> I originally wrote them in the order they apper in
> virQEMUCapsInitQMPBasic, then relized inserting -nodefconfig everywhere
> just to replace it with -no-user-config later is pointless and moved it
> right after the first patch that touched all the test files
> (QEMU_CAPS_MONITOR_JSON)

So IIUC you would be okay with dropping NODEFCONFIG right after
NO_USER_CONFIG, correct? I would prefer that order - though I
realize I haven't ACKed the other patch yet :)

-- 
Andrea Bolognani / Red Hat / Virtualization

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

Re: [libvirt] [libvirt PATCH v2 11/44] Deprecate QEMU_CAPS_NO_USER_CONFIG

2018-04-15 Thread Andrea Bolognani 
On Mon, 2018-04-09 at 17:20 +0200, Ján Tomko wrote:
> Implied by QEMU >= 1.2.0.
> 
> Delete this one first, because QEMU_CAPS_NODEFCONFIG is only used
> when QEMU_CAPS_NO_USER_CONFIG is unsupported.

Is there a specific reason for the 6-patch gap between dropping
NO_USER_CONFIG and dropping NODEFCONFIG? It would IMHO make more
sense to drop them one immediately after the other.

[...]
> diff --git a/tests/qemuxml2argvdata/aarch64-aavmf-virtio-mmio.args 
> b/tests/qemuxml2argvdata/aarch64-aavmf-virtio-mmio.args
> index 21a3f591df..92da7122a6 100644
> --- a/tests/qemuxml2argvdata/aarch64-aavmf-virtio-mmio.args
> +++ b/tests/qemuxml2argvdata/aarch64-aavmf-virtio-mmio.args
> @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \
>  -smp 1,sockets=1,cores=1,threads=1 \
>  -uuid 496d7ea8-9739-544b-4ebd-ef08be936e8b \
>  -nographic \
> --nodefconfig \
> +-no-user-config \
>  -nodefaults \
>  -chardev socket,id=charmonitor,\
>  path=/tmp/lib/domain--1-aarch64test/monitor.sock,server,nowait \
> 
> [ ... etc ... ]

Unsurprisingly, aarch64-traditional-pci.args needs to be refreshed
this time as well :)

Reviewed-by: Andrea Bolognani 

-- 
Andrea Bolognani / Red Hat / Virtualization

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

Re: [libvirt] [libvirt PATCH v2 11/44] Deprecate QEMU_CAPS_NO_USER_CONFIG

2018-04-12 Thread Ján Tomko 

On Thu, Apr 12, 2018 at 10:07:50AM +0200, Andrea Bolognani wrote:

On Mon, 2018-04-09 at 17:20 +0200, Ján Tomko wrote:

Implied by QEMU >= 1.2.0.

Delete this one first, because QEMU_CAPS_NODEFCONFIG is only used
when QEMU_CAPS_NO_USER_CONFIG is unsupported.


Is there a specific reason for the 6-patch gap between dropping
NO_USER_CONFIG and dropping NODEFCONFIG? It would IMHO make more
sense to drop them one immediately after the other.



I originally wrote them in the order they apper in
virQEMUCapsInitQMPBasic, then relized inserting -nodefconfig everywhere
just to replace it with -no-user-config later is pointless and moved it
right after the first patch that touched all the test files
(QEMU_CAPS_MONITOR_JSON)

Jano


signature.asc
Description: Digital signature
--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

[libvirt] [libvirt PATCH v2 11/44] Deprecate QEMU_CAPS_NO_USER_CONFIG

2018-04-09 Thread Ján Tomko 
Implied by QEMU >= 1.2.0.

Delete this one first, because QEMU_CAPS_NODEFCONFIG is only used
when QEMU_CAPS_NO_USER_CONFIG is unsupported.

Signed-off-by: Ján Tomko 
---
 src/qemu/qemu_capabilities.c | 1 -
 src/qemu/qemu_capabilities.h | 2 +-
 src/qemu/qemu_command.c  | 5 +
 tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml | 1 -
 tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml | 1 -
 tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml | 1 -
 tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml | 1 -
 tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml   | 1 -
 tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml | 1 -
 tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml | 1 -
 tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml| 1 -
 tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml | 1 -
 tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml   | 1 -
 tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml | 1 -
 tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml | 1 -
 tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml| 1 -
 tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml | 1 -
 tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml | 1 -
 tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml| 1 -
 tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml  | 1 -
 tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml | 1 -
 tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml  | 1 -
 tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml | 1 -
 tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml  | 1 -
 tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml | 1 -
 tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml  | 1 -
 tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml  | 1 -
 tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml | 1 -
 tests/qemuxml2argvdata/aarch64-aavmf-virtio-mmio.args| 2 +-
 tests/qemuxml2argvdata/aarch64-acpi-uefi.args| 1 +
 [ ... etc ... ]
 tests/qemuxml2argvdata/watchdog.args | 1 +
 tests/qemuxml2argvdata/x86-kvm-32-on-64.args | 1 +
 635 files changed, 609 insertions(+), 202 deletions(-)

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 52142d4029..421d803ead 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -3656,7 +3656,6 @@ virQEMUCapsInitQMPBasic(virQEMUCapsPtr qemuCaps)
 virQEMUCapsSet(qemuCaps, QEMU_CAPS_FSDEV_WRITEOUT);
 virQEMUCapsSet(qemuCaps, QEMU_CAPS_DRIVE_IOTUNE);
 virQEMUCapsSet(qemuCaps, QEMU_CAPS_WAKEUP);
-virQEMUCapsSet(qemuCaps, QEMU_CAPS_NO_USER_CONFIG);
 virQEMUCapsSet(qemuCaps, QEMU_CAPS_NETDEV_BRIDGE);
 virQEMUCapsSet(qemuCaps, QEMU_CAPS_SECCOMP_SANDBOX);
 virQEMUCapsSet(qemuCaps, QEMU_CAPS_DTB);
diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index deb6261e0a..bdbbad8d6e 100644
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -178,7 +178,7 @@ typedef enum {
 QEMU_CAPS_BLOCKJOB_ASYNC, /* new block-job-cancel, block-stream */
 QEMU_CAPS_SCSI_CD, /* -device scsi-cd */
 QEMU_CAPS_IDE_CD, /* -device ide-cd */
-QEMU_CAPS_NO_USER_CONFIG, /* -no-user-config */
+X_QEMU_CAPS_NO_USER_CONFIG, /* -no-user-config */
 
 /* 95 */
 QEMU_CAPS_HDA_MICRO, /* -device hda-micro */
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 73b5ad244b..59496d32b5 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -10052,10 +10052,7 @@ qemuBuildCommandLine(virQEMUDriverPtr driver,
 }
 
 /* Disable global config files and default devices */
-if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_NO_USER_CONFIG))
-virCommandAddArg(cmd, "-no-user-config");
-else if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_NODEFCONFIG))
-virCommandAddArg(cmd, "-nodefconfig");
+virCommandAddArg(cmd, "-no-user-config");
 virCommandAddArg(cmd, "-nodefaults");
 
 if (qemuBuildSgaCommandLine(cmd, def, qemuCaps) < 0)
diff --git a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml 
b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml
index 46b88f218e..8ded417088 100644
--- a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml
@@ -56,7 +56,6 @@
   
   
   
-  
   
   
   
diff --git a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml 
b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml
index 47ac2eaf2d..6fcc7f1c57