[libvirt] [PATCH 0/2] libxl: A few more fixes related to vram

[Jim Fehlig]

Commit 3e428670 broke the xlconfigtests, which commit 96b21fb0 mostly
fixed. I found that running 'make check' on a machine with Xen installed
(/usr/lib/xen/bin/qemu-{dm,system-i386} exists) failed. Test files
containing <emulator>/usr/lib/xen/bin/qemu-dm</emulator>  resulted
in vram being set to the lower default values defined by the old
qemu-dm.

This series takes one possible approach to fixing the problem by only
using qemu-xen (aka qemu upstream) in the test files (note that libxl
defaults to qemu-xen if an emulator is not specified). Actually, it's
patch 2 that changes the test files. I added patch 1 after seeing
errors such as

  libvirt:  error : internal error: Child process
  (/usr/lib/xen/bin/qemu-dm -help) unexpected exit status 127:
  libvirt:  error : cannot execute binary /usr/lib/xen/bin/qemu-dm:
  No such file or directory
 
when specifying a non-existent emulator.

Another approach, suggested by Joao, is to allow vram == 0 and when
building the domain, set video_memkb in the libxl_domain_build_info
struct to LIBXL_MEMKB_DEFAULT, allowing libxl to pick the correct
default. For this approach, the <video> parsing logic would have
to change again. Currently, it sets a vram defaults if not done by
the driver post parse function. Along with adjusting the libxl driver
to handle vram = 0, all the xlconfigtests would have to change. E.g.

-      <model type='cirrus' vram='8192' heads='1' primary='yes'/>
+      <model type='cirrus' heads='1' primary='yes'/>

Jim Fehlig (2):
  libxl: don't attempt to probe a non-existent emulator
  xlconfigtests: use qemu-xen in all test data files

 src/libxl/libxl_conf.c                                    | 3 +++
 tests/xlconfigdata/test-disk-positional-parms-full.cfg    | 2 +-
 tests/xlconfigdata/test-disk-positional-parms-full.xml    | 2 +-
 tests/xlconfigdata/test-disk-positional-parms-partial.cfg | 2 +-
 tests/xlconfigdata/test-disk-positional-parms-partial.xml | 2 +-
 tests/xlconfigdata/test-fullvirt-multiusb.cfg             | 2 +-
 tests/xlconfigdata/test-fullvirt-multiusb.xml             | 2 +-
 tests/xlconfigdata/test-fullvirt-nohap.cfg                | 2 +-
 tests/xlconfigdata/test-fullvirt-nohap.xml                | 2 +-
 tests/xlconfigdata/test-new-disk.cfg                      | 2 +-
 tests/xlconfigdata/test-new-disk.xml                      | 2 +-
 tests/xlconfigdata/test-rbd-multihost-noauth.cfg          | 2 +-
 tests/xlconfigdata/test-rbd-multihost-noauth.xml          | 2 +-
 tests/xlconfigdata/test-spice-features.cfg                | 2 +-
 tests/xlconfigdata/test-spice-features.xml                | 2 +-
 tests/xlconfigdata/test-spice.cfg                         | 2 +-
 tests/xlconfigdata/test-spice.xml                         | 2 +-
 tests/xlconfigdata/test-vif-rate.cfg                      | 2 +-
 tests/xlconfigdata/test-vif-rate.xml                      | 2 +-
 19 files changed, 21 insertions(+), 18 deletions(-)

-- 
2.8.2