Re: [libvirt PATCH v2 6/8] tests: Add test case for the armvtimer timer

2020-02-13 Thread Andrea Bolognani 
On Thu, 2020-02-13 at 14:30 +0100, Ján Tomko wrote:
> On Fri, Feb 07, 2020 at 03:27:06PM +0100, Andrea Bolognani wrote:
> > Signed-off-by: Andrea Bolognani 
> > ---
> > .../clock-timer-armvtimer.aarch64-latest.args | 32 +++
> > .../clock-timer-armvtimer.xml | 27 
> > tests/qemuxml2argvtest.c  |  2 ++
> > .../clock-timer-armvtimer.aarch64-latest.xml  |  1 +
> > tests/qemuxml2xmltest.c   |  1 +
> > 5 files changed, 63 insertions(+)
> > create mode 100644 
> > tests/qemuxml2argvdata/clock-timer-armvtimer.aarch64-latest.args
> > create mode 100644 tests/qemuxml2argvdata/clock-timer-armvtimer.xml
> > create mode 12 
> > tests/qemuxml2xmloutdata/clock-timer-armvtimer.aarch64-latest.xml
> 
> Personally, having the XML test squashed with the XML parser/formatter
> and the ->argv conversion with the QEMU command line formatter feels
> nicer.

I tend to agree, and that's how I had it initially, but in this
particular case it ended up being more confusing IMHO.

I can split it again if you want me to. Your call entirely :)

-- 
Andrea Bolognani / Red Hat / Virtualization

Re: [libvirt PATCH v2 6/8] tests: Add test case for the armvtimer timer

2020-02-13 Thread Ján Tomko 

On Fri, Feb 07, 2020 at 03:27:06PM +0100, Andrea Bolognani wrote:

Signed-off-by: Andrea Bolognani 
---
.../clock-timer-armvtimer.aarch64-latest.args | 32 +++
.../clock-timer-armvtimer.xml | 27 
tests/qemuxml2argvtest.c  |  2 ++
.../clock-timer-armvtimer.aarch64-latest.xml  |  1 +
tests/qemuxml2xmltest.c   |  1 +
5 files changed, 63 insertions(+)
create mode 100644 
tests/qemuxml2argvdata/clock-timer-armvtimer.aarch64-latest.args
create mode 100644 tests/qemuxml2argvdata/clock-timer-armvtimer.xml
create mode 12 
tests/qemuxml2xmloutdata/clock-timer-armvtimer.aarch64-latest.xml



Personally, having the XML test squashed with the XML parser/formatter
and the ->argv conversion with the QEMU command line formatter feels
nicer.

Reviewed-by: Ján Tomko 

Jano


signature.asc
Description: PGP signature

[libvirt PATCH v2 6/8] tests: Add test case for the armvtimer timer

2020-02-07 Thread Andrea Bolognani 
Signed-off-by: Andrea Bolognani 
---
 .../clock-timer-armvtimer.aarch64-latest.args | 32 +++
 .../clock-timer-armvtimer.xml | 27 
 tests/qemuxml2argvtest.c  |  2 ++
 .../clock-timer-armvtimer.aarch64-latest.xml  |  1 +
 tests/qemuxml2xmltest.c   |  1 +
 5 files changed, 63 insertions(+)
 create mode 100644 
tests/qemuxml2argvdata/clock-timer-armvtimer.aarch64-latest.args
 create mode 100644 tests/qemuxml2argvdata/clock-timer-armvtimer.xml
 create mode 12 
tests/qemuxml2xmloutdata/clock-timer-armvtimer.aarch64-latest.xml

diff --git a/tests/qemuxml2argvdata/clock-timer-armvtimer.aarch64-latest.args 
b/tests/qemuxml2argvdata/clock-timer-armvtimer.aarch64-latest.args
new file mode 100644
index 00..a1faa97b9f
--- /dev/null
+++ b/tests/qemuxml2argvdata/clock-timer-armvtimer.aarch64-latest.args
@@ -0,0 +1,32 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/tmp/lib/domain--1-guest \
+USER=test \
+LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-guest/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-guest/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-guest/.config \
+QEMU_AUDIO_DRV=none \
+/usr/bin/qemu-system-aarch64 \
+-name guest=guest,debug-threads=on \
+-S \
+-object secret,id=masterKey0,format=raw,\
+file=/tmp/lib/domain--1-guest/master-key.aes \
+-machine virt,accel=kvm,usb=off,dump-guest-core=off,gic-version=3 \
+-cpu host,kvm-no-adjvtime=on \
+-m 4096 \
+-overcommit mem-lock=off \
+-smp 4,sockets=4,cores=1,threads=1 \
+-uuid 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 \
+-display none \
+-no-user-config \
+-nodefaults \
+-chardev socket,id=charmonitor,fd=1729,server,nowait \
+-mon chardev=charmonitor,id=monitor,mode=control \
+-rtc base=utc \
+-no-shutdown \
+-no-acpi \
+-boot strict=on \
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\
+resourcecontrol=deny \
+-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/clock-timer-armvtimer.xml 
b/tests/qemuxml2argvdata/clock-timer-armvtimer.xml
new file mode 100644
index 00..295ab64d75
--- /dev/null
+++ b/tests/qemuxml2argvdata/clock-timer-armvtimer.xml
@@ -0,0 +1,27 @@
+
+  guest
+  1ccfd97d-5eb4-478a-bbe6-88d254c16db7
+  4194304
+  4194304
+  4
+  
+hvm
+
+  
+  
+
+  
+  
+  
+
+  
+  destroy
+  restart
+  destroy
+  
+/usr/bin/qemu-system-aarch64
+
+
+
+  
+
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index 028364a06c..efa0ec9477 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -2729,6 +2729,8 @@ mymain(void)
 /* SVE aarch64 CPU features work on modern QEMU */
 DO_TEST_CAPS_ARCH_LATEST("aarch64-features-sve", "aarch64");
 
+DO_TEST_CAPS_ARCH_LATEST("clock-timer-armvtimer", "aarch64");
+
 qemuTestSetHostArch(, VIR_ARCH_NONE);
 
 DO_TEST("kvm-pit-delay", QEMU_CAPS_KVM_PIT_TICK_POLICY);
diff --git a/tests/qemuxml2xmloutdata/clock-timer-armvtimer.aarch64-latest.xml 
b/tests/qemuxml2xmloutdata/clock-timer-armvtimer.aarch64-latest.xml
new file mode 12
index 00..4bfddd6573
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/clock-timer-armvtimer.aarch64-latest.xml
@@ -0,0 +1 @@
+../qemuxml2argvdata/clock-timer-armvtimer.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
index ecd12c3d30..4b1699db7e 100644
--- a/tests/qemuxml2xmltest.c
+++ b/tests/qemuxml2xmltest.c
@@ -269,6 +269,7 @@ mymain(void)
 DO_TEST("clock-catchup", QEMU_CAPS_KVM_PIT_TICK_POLICY);
 DO_TEST("kvmclock", NONE);
 DO_TEST("clock-timer-hyperv-rtc", NONE);
+DO_TEST_CAPS_ARCH_LATEST("clock-timer-armvtimer", "aarch64");
 
 DO_TEST("cpu-eoi-disabled", NONE);
 DO_TEST("cpu-eoi-enabled", NONE);
-- 
2.24.1