Accepting request 762952 from home:bfrogers:branches:Virtualization

- Add a %bcond_without system_membarrier along with related
  processing to the spec file, to better investigate running QEMU
  with the --disable-membarrier configure option

OBS-URL: https://build.opensuse.org/request/show/762952
OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=522

README.PACKAGING

@@ -29,7 +29,7 @@ the latest upstream qemu. See 'LATEST' references in the scripts for details.
 The current status as of 31 Oct 2019 is that for this incarnation of qemu
 packaging, the previous workflow which relied on the patches being in a shared
 git repo on github or gitlab is no longer supported. This new bundle based
-workflos is still a work in progress.
+workflow is still a work in progress.
 If it isn't working right, please contact Bruce Rogers <brogers@suse.com>.
 *** END SPECIAL NOTE ***
 
@@ -47,7 +47,7 @@ in the near future.
 Bug or feature tracking identifiers should also be added to the patch similarly,
 using the abbreviations identified here:
 http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines#Current_set_of_abbreviations
-using the "Reference:" tag, with multiple entries comma separated.
+using the "References:" tag, with multiple entries comma separated.
 
 The ability to provide a conditional inclusion of a patch (eg based on
 architecture, is provided by using the "Include-If:" tag similarly, as follows:

qemu.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Sat Jan 11 01:54:12 UTC 2020 - Bruce Rogers <brogers@suse.com>
+
+- Add a %bcond_without system_membarrier along with related
+  processing to the spec file, to better investigate running QEMU
+  with the --disable-membarrier configure option
+
 -------------------------------------------------------------------
 Fri Jan 10 14:12:38 UTC 2020 - Bruce Rogers <brogers@suse.com>
 

qemu.spec

@@ -87,6 +87,8 @@
 %define summary_string Machine emulator and virtualizer
 %endif
 
+%bcond_without system_membarrier
+
 %define qemuver 4.2.0
 %define srcver  4.2.0
 %define sbver   1.12.1+
@@ -1211,7 +1213,11 @@ cd %mybuilddir
 %endif
 	--enable-lzo \
 	--disable-malloc-trim \
+%if %{with system_membarrier}
 	--enable-membarrier \
+%else
+	--disable-membarrier \
+%endif
 	--enable-mpath \
 	--disable-netmap \
 	--disable-nettle \
@@ -1300,7 +1306,11 @@ cd %mybuilddir
 	--disable-iconv \
 	--disable-kvm \
 	--disable-malloc-trim \
+%if %{with system_membarrier}
 	--enable-membarrier \
+%else
+	--disable-membarrier \
+%endif
 	--disable-parallels \
 	--disable-plugins \
 	--disable-qcow1 \

qemu.spec.in

@@ -87,6 +87,8 @@
 %define summary_string Machine emulator and virtualizer
 %endif
 
+%bcond_without system_membarrier
+
 INSERT_VERSIONING
 %define srcname qemu
 Name:           qemu%{name_suffix}
@@ -1016,7 +1018,11 @@ cd %mybuilddir
 %endif
 	--enable-lzo \
 	--disable-malloc-trim \
+%if %{with system_membarrier}
 	--enable-membarrier \
+%else
+	--disable-membarrier \
+%endif
 	--enable-mpath \
 	--disable-netmap \
 	--disable-nettle \
@@ -1105,7 +1111,11 @@ cd %mybuilddir
 	--disable-iconv \
 	--disable-kvm \
 	--disable-malloc-trim \
+%if %{with system_membarrier}
 	--enable-membarrier \
+%else
+	--disable-membarrier \
+%endif
 	--disable-parallels \
 	--disable-plugins \
 	--disable-qcow1 \