Skip to contentSkip to conversation

Trivial fixes for configure and Python scripts

PATCH Applied Cleber Rosa 3 participants 12 messages Feb 7, 2019 – Feb 14, 2019

lore
Share & tools
lore
#0 lore raw

cover Trivial fixes for configure and Python scripts

This is just a small collection of trivial fixes for configure and some Python scripts (missing/unused import statements).

Cleber Rosa (4):
configure: remove handling of "wav" audio driver
configure: fix qemu-img name scripts/render_block_graph.py: add a missing import tests/migration/guestperf/engine.py: remove unused import

 configure                           | 6 +-----
 scripts/render_block_graph.py       | 1 +
 tests/migration/guestperf/engine.py | 1 -
 3 files changed, 2 insertions(+), 6 deletions(-)
Signature · 1 line
2.20.1
#1 lore raw

PATCH 1/4 configure: remove handling of "wav" audio driver

This looks like a leftover that was never implemented.

---
 configure | 4 ----
 1 file changed, 4 deletions(-)
configure +0 -4
index fbd0825488..ff55e2273e 100755
@@ -3350,10 +3350,6 @@ for drv in $audio_drv_list; do
       oss_libs="$oss_lib"
     ;;
 
-    wav)
-    # XXX: Probes for CoreAudio, DirectSound
-    ;;
-
     *)
     echo "$audio_possible_drivers" | grep -q "\<$drv\>" || {
         error_exit "Unknown driver '$drv' selected" \
Signature · 1 line
2.20.1
Reviewed-by on v1 1/4
#2 lore raw

Re: [Qemu-devel] [PATCH 1/4] configure: remove handling of "wav" audio driver

Quoted 13 lines · Cleber Rosa

This looks like a leftover that was never implemented.

---
 configure | 4 ----
 1 file changed, 4 deletions(-)
configure +0 -0
index fbd0825488..ff55e2273e 100755

configure for drv in $audio_drv_list; do · line 3355

Quoted 10 lines
configure +0 -4
@@ -3350,10 +3350,6 @@ for drv in $audio_drv_list; do
       oss_libs="$oss_lib"
     ;;
 
-    wav)
-    # XXX: Probes for CoreAudio, DirectSound
-    ;;
-
     *)
     echo "$audio_possible_drivers" | grep -q "\<$drv\>" || {
         error_exit "Unknown driver '$drv' selected" \
Reviewed-by on v1 1/4
#3 lore raw

Re: [Qemu-devel] [PATCH 1/4] configure: remove handling of "wav" audio driver

In reply to Cleber Rosa
Quoted 13 lines · Cleber Rosa

This looks like a leftover that was never implemented.

---
 configure | 4 ----
 1 file changed, 4 deletions(-)
configure +0 -0
index fbd0825488..ff55e2273e 100755

configure for drv in $audio_drv_list; do · line 3355

Quoted 10 lines
configure +0 -4
@@ -3350,10 +3350,6 @@ for drv in $audio_drv_list; do
       oss_libs="$oss_lib"
     ;;
 
-    wav)
-    # XXX: Probes for CoreAudio, DirectSound
-    ;;
-
     *)
     echo "$audio_possible_drivers" | grep -q "\<$drv\>" || {
         error_exit "Unknown driver '$drv' selected" \
#4 lore raw

Re: [Qemu-devel] [Qemu-trivial] [PATCH 1/4] configure: remove handling of "wav" audio driver

In reply to Cleber Rosa
Quoted 13 lines · Cleber Rosa

This looks like a leftover that was never implemented.

---
 configure | 4 ----
 1 file changed, 4 deletions(-)
configure +0 -0
index fbd0825488..ff55e2273e 100755

configure for drv in $audio_drv_list; do · line 3355

Quoted 10 lines
configure +0 -4
@@ -3350,10 +3350,6 @@ for drv in $audio_drv_list; do
       oss_libs="$oss_lib"
     ;;
 
-    wav)
-    # XXX: Probes for CoreAudio, DirectSound
-    ;;
-
     *)
     echo "$audio_possible_drivers" | grep -q "\<$drv\>" || {
         error_exit "Unknown driver '$drv' selected" \

Applied to my trivial-patches branch.

Thanks,
Laurent

#5 lore raw

PATCH 2/4 configure: fix qemu-img name

In reply to Cleber Rosa
---
 configure | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
configure +1 -1
index ff55e2273e..c8fc1647fe 100755
@@ -1768,7 +1768,7 @@ disabled with --disable-FEATURE, default is enabled if available:
   virglrenderer   virgl rendering support
   xfsctl          xfsctl support
   qom-cast-debug  cast debugging support
-  tools           build qemu-io, qemu-nbd and qemu-image tools
+  tools           build qemu-io, qemu-nbd and qemu-img tools
   vxhs            Veritas HyperScale vDisk backend support
   bochs           bochs image format support
   cloop           cloop image format support
Signature · 1 line
2.20.1
Reviewed-by on v1 2/4
#6 lore raw

Re: [Qemu-devel] [PATCH 2/4] configure: fix qemu-img name

Quoted 11 lines · Cleber Rosa
---
 configure | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
configure +0 -0
index ff55e2273e..c8fc1647fe 100755

configure disabled with --disable-FEATURE, default is enabled if available: · line 1774

Quoted 8 lines
configure +1 -1
@@ -1768,7 +1768,7 @@ disabled with --disable-FEATURE, default is enabled if available:
   virglrenderer   virgl rendering support
   xfsctl          xfsctl support
   qom-cast-debug  cast debugging support
-  tools           build qemu-io, qemu-nbd and qemu-image tools
+  tools           build qemu-io, qemu-nbd and qemu-img tools
   vxhs            Veritas HyperScale vDisk backend support
   bochs           bochs image format support
   cloop           cloop image format support
Fixes c12d66aac1aa ("configure: add the missing help output for

optional features")

Perhaps the list can be updated with qemu-edid, ivshmem-client and elf2dmp?

#7 lore raw

Re: [Qemu-devel] [PATCH 2/4] configure: fix qemu-img name

Quoted 22 lines · Laurent Vivier
Quoted 11 lines · Cleber Rosa
---
 configure | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
configure +0 -0
index ff55e2273e..c8fc1647fe 100755

configure disabled with --disable-FEATURE, default is enabled if available: · line 1774

Quoted 8 lines
configure +1 -1
@@ -1768,7 +1768,7 @@ disabled with --disable-FEATURE, default is enabled if available:
   virglrenderer   virgl rendering support
   xfsctl          xfsctl support
   qom-cast-debug  cast debugging support
-  tools           build qemu-io, qemu-nbd and qemu-image tools
+  tools           build qemu-io, qemu-nbd and qemu-img tools
   vxhs            Veritas HyperScale vDisk backend support
   bochs           bochs image format support
   cloop           cloop image format support
Fixes c12d66aac1aa ("configure: add the missing help output for
Quoted 3 lines

optional features")

Perhaps the list can be updated with qemu-edid, ivshmem-client and elf2dmp?

Good idea! Eventually the trivial@ maintainer is willing to fulfil your request if he takes this patch :D

Quoted 1 line

As it or with Laurent's suggestion:

#8 lore raw

Re: [Qemu-devel] [Qemu-trivial] [PATCH 2/4] configure: fix qemu-img name

In reply to Cleber Rosa
Quoted 11 lines · Cleber Rosa
---
 configure | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
configure +0 -0
index ff55e2273e..c8fc1647fe 100755

configure disabled with --disable-FEATURE, default is enabled if available: · line 1774

Quoted 8 lines
configure +1 -1
@@ -1768,7 +1768,7 @@ disabled with --disable-FEATURE, default is enabled if available:
   virglrenderer   virgl rendering support
   xfsctl          xfsctl support
   qom-cast-debug  cast debugging support
-  tools           build qemu-io, qemu-nbd and qemu-image tools
+  tools           build qemu-io, qemu-nbd and qemu-img tools
   vxhs            Veritas HyperScale vDisk backend support
   bochs           bochs image format support
   cloop           cloop image format support

Applied to my trivial-patches branch.

Thanks,
Laurent

#9 lore raw

PATCH 3/4 scripts/render_block_graph.py: add a missing import

In reply to Cleber Rosa

The handle to QMP may be one of two classes, one implemented locally, and the other one, which seems to be from "qmp.qmp", but of which an import is missing.

CC Vladimir Sementsov-Ogievskiy <[email protected]>
---
 scripts/render_block_graph.py | 1 +
 1 file changed, 1 insertion(+)
scripts/render_block_graph.py +1 -0
index ed7e581b4f..7686e30761 100755
@@ -24,6 +24,7 @@ import subprocess
 import json
 from graphviz import Digraph
 from qemu import MonitorResponseError
+from qmp.qmp import QEMUMonitorProtocol
 
 
 def perm(arr):
Signature · 1 line
2.20.1
#10 lore raw

PATCH 4/4 tests/migration/guestperf/engine.py: remove unused import

In reply to Cleber Rosa
---
 tests/migration/guestperf/engine.py | 1 -
 1 file changed, 1 deletion(-)
tests/migration/guestperf/engine.py +0 -1
index 398e3f2706..1daf09c6f2 100644
@@ -26,7 +26,6 @@ import time
 
 sys.path.append(os.path.join(os.path.dirname(__file__), '..', '..', '..', 'scripts'))
 import qemu
-import qmp.qmp
 from guestperf.progress import Progress, ProgressStats
 from guestperf.report import Report
 from guestperf.timings import TimingRecord, Timings
Signature · 1 line
2.20.1
#11 lore raw
In reply to Cleber Rosa
Quoted 9 lines · Cleber Rosa

This is just a small collection of trivial fixes for configure and some Python scripts (missing/unused import statements).

Cleber Rosa (4):
configure: remove handling of "wav" audio driver
configure: fix qemu-img name scripts/render_block_graph.py: add a missing import tests/migration/guestperf/engine.py: remove unused import

Quoted 5 lines
 configure                           | 6 +-----
 scripts/render_block_graph.py       | 1 +
 tests/migration/guestperf/engine.py | 1 -
 3 files changed, 2 insertions(+), 6 deletions(-)

I've applied to my trivial-patches branchi patches 1 and 2, but not 3 and 4 as I don't know python and no one has reviewed them.

Thanks,
Laurent