Accepting request 841811 from Virtualization

- Fix 'make check' with all downstream patches applied. Some
  patches touch config files and needed the corresponding augeaus
  test files updated.
  Updated patches:
  suse-libvirtd-disable-tls.patch,
  suse-qemu-conf.patch,
  suse-ovmf-paths.patch,
  suse-libxl-disable-autoballoon.patch
  boo#1175574

OBS-URL: https://build.opensuse.org/request/show/841811
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libvirt?expand=0&rev=313

libvirt.changes

@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Wed Oct 14 16:44:22 UTC 2020 - James Fehlig <jfehlig@suse.com>
+
+- Fix 'make check' with all downstream patches applied. Some
+  patches touch config files and needed the corresponding augeaus
+  test files updated.
+  Updated patches:
+  suse-libvirtd-disable-tls.patch,
+  suse-qemu-conf.patch,
+  suse-ovmf-paths.patch,
+  suse-libxl-disable-autoballoon.patch
+  boo#1175574
+
 -------------------------------------------------------------------
 Thu Oct  1 15:56:21 UTC 2020 - James Fehlig <jfehlig@suse.com>
 

suse-libvirtd-disable-tls.patch

@@ -31,3 +31,16 @@ Index: libvirt-6.8.0/src/remote/libvirtd.conf.in
  
  # Listen for unencrypted TCP connections on the public TCP/IP port.
  # NB, must pass the --listen flag to the @DAEMON_NAME@ process for this to
+Index: libvirt-6.8.0/src/remote/test_libvirtd.aug.in
+===================================================================
+--- libvirt-6.8.0.orig/src/remote/test_libvirtd.aug.in
++++ libvirt-6.8.0/src/remote/test_libvirtd.aug.in
+@@ -3,7 +3,7 @@ module Test_@DAEMON_NAME@ =
+ 
+    test @DAEMON_NAME_UC@.lns get conf =
+ @CUT_ENABLE_IP@
+-        { "listen_tls" = "0" }
++        { "listen_tls" = "1" }
+         { "listen_tcp" = "1" }
+         { "tls_port" = "16514" }
+         { "tcp_port" = "16509" }

suse-libxl-disable-autoballoon.patch

@@ -66,3 +66,16 @@ Index: libvirt-6.8.0/src/libxl/libxl_conf.c
      return 0;
  }
  
+Index: libvirt-6.8.0/src/libxl/test_libvirtd_libxl.aug.in
+===================================================================
+--- libvirt-6.8.0.orig/src/libxl/test_libvirtd_libxl.aug.in
++++ libvirt-6.8.0/src/libxl/test_libvirtd_libxl.aug.in
+@@ -2,7 +2,7 @@ module Test_libvirtd_libxl =
+   @CONFIG@
+ 
+    test Libvirtd_libxl.lns get conf =
+-{ "autoballoon" = "1" }
++{ "autoballoon" = "0" }
+ { "lock_manager" = "lockd" }
+ { "keepalive_interval" = "5" }
+ { "keepalive_count" = "5" }

suse-ovmf-paths.patch

@@ -50,3 +50,21 @@ Index: libvirt-6.8.0/src/security/virt-aa-helper.c
      };
      /* override the above with these */
      const char * const override[] = {
+Index: libvirt-6.8.0/src/qemu/test_libvirtd_qemu.aug.in
+===================================================================
+--- libvirt-6.8.0.orig/src/qemu/test_libvirtd_qemu.aug.in
++++ libvirt-6.8.0/src/qemu/test_libvirtd_qemu.aug.in
+@@ -95,10 +95,9 @@ module Test_libvirtd_qemu =
+ { "migration_port_max" = "49215" }
+ { "log_timestamp" = "0" }
+ { "nvram"
+-    { "1" = "/usr/share/OVMF/OVMF_CODE.fd:/usr/share/OVMF/OVMF_VARS.fd" }
+-    { "2" = "/usr/share/OVMF/OVMF_CODE.secboot.fd:/usr/share/OVMF/OVMF_VARS.fd" }
+-    { "3" = "/usr/share/AAVMF/AAVMF_CODE.fd:/usr/share/AAVMF/AAVMF_VARS.fd" }
+-    { "4" = "/usr/share/AAVMF/AAVMF32_CODE.fd:/usr/share/AAVMF/AAVMF32_VARS.fd" }
++    { "1" = "/usr/share/qemu/ovmf-x86_64-ms-4m-code.bin:/usr/share/qemu/ovmf-x86_64-ms-4m-vars.bin" }
++    { "2" = "/usr/share/qemu/ovmf-x86_64-ms-code.bin:/usr/share/qemu/ovmf-x86_64-ms-vars.bin" }
++    { "3" = "/usr/share/qemu/aavmf-aarch64-code.bin:/usr/share/qemu/aavmf-aarch64-vars.bin" }
+ }
+ { "stdio_handler" = "logd" }
+ { "gluster_debug_level" = "9" }

suse-qemu-conf.patch

@@ -73,3 +73,15 @@ Index: libvirt-6.8.0/src/qemu/qemu_conf.c
      cfg->securityRequireConfined = false;
  
      cfg->keepAliveInterval = 5;
+Index: libvirt-6.8.0/src/qemu/test_libvirtd_qemu.aug.in
+===================================================================
+--- libvirt-6.8.0.orig/src/qemu/test_libvirtd_qemu.aug.in
++++ libvirt-6.8.0/src/qemu/test_libvirtd_qemu.aug.in
+@@ -44,6 +44,7 @@ module Test_libvirtd_qemu =
+ { "remote_websocket_port_min" = "5700" }
+ { "remote_websocket_port_max" = "65535" }
+ { "security_driver" = "selinux" }
++{ "security_driver" = "apparmor" }
+ { "security_default_confined" = "1" }
+ { "security_require_confined" = "1" }
+ { "user" = "root" }