From 3eacc53bd71cdedbcd7a04ace2360e63d314f3cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?=
 <marmarek@invisiblethingslab.com>
Date: Tue, 19 Feb 2019 17:16:30 +0100
Subject: [PATCH] version 4.12.0-rc3-1

---
 config                                        |  1 +
 debian-vm/debian/changelog                    | 24 +++++++++++++++++++
 ...nux-stubdomain-specific-QEMU-options.patch | 18 +++++++++++++-
 rel                                           |  2 +-
 version                                       |  2 +-
 xen.spec.in                                   |  2 --
 6 files changed, 44 insertions(+), 5 deletions(-)

diff --git a/config b/config
index 511ffb8f..deaffb16 100644
--- a/config
+++ b/config
@@ -40,6 +40,7 @@ CONFIG_NEEDS_LIBELF=y
 # CONFIG_TMEM is not set
 CONFIG_XENOPROF=y
 # CONFIG_XSM is not set
+# CONFIG_ARGO is not set
 
 #
 # Schedulers
diff --git a/debian-vm/debian/changelog b/debian-vm/debian/changelog
index 680c5917..35052b62 100644
--- a/debian-vm/debian/changelog
+++ b/debian-vm/debian/changelog
@@ -1,3 +1,27 @@
+xen (4.12.0~rc3-1) unstable; urgency=medium
+
+  [ Marek Marczykowski-Górecki ]
+  * Replace stubdomain MSI fix with the version sent upstream
+  * Few more QubesOS specific stubdomain fixes
+
+  [ Simon Gaiser ]
+  * libxl: Add support for new qubes-gui options
+
+  [ Marek Marczykowski-Górecki ]
+  * Fix copying xen.efi
+  * debian: update packaging based on upstream Xen 4.11 package
+  * debian: include native xendriverdomain.service
+  * debian: fix build on stretch
+
+  [ Frédéric Pierret (fepitre) ]
+  * Build Qubes Xen package only for dom0 Fedora and use upstream for VM
+
+  [ Marek Marczykowski-Górecki ]
+  * travis: update for R4.1
+  * Improve handling -rc releases
+
+ -- Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com>  Tue, 19 Feb 2019 17:16:30 +0100
+
 xen (4.12.0~rc1-0.1) unstable; urgency=medium
 
   [ Hans van Kranenburg ]
diff --git a/patch-stubdom-linux-v3-0005-libxl-Handle-Linux-stubdomain-specific-QEMU-options.patch b/patch-stubdom-linux-v3-0005-libxl-Handle-Linux-stubdomain-specific-QEMU-options.patch
index 11fbe1f7..c8c0bc75 100644
--- a/patch-stubdom-linux-v3-0005-libxl-Handle-Linux-stubdomain-specific-QEMU-options.patch
+++ b/patch-stubdom-linux-v3-0005-libxl-Handle-Linux-stubdomain-specific-QEMU-options.patch
@@ -129,7 +129,7 @@ index 3601b14..1fa4fa8 100644
  
      dm_args = flexarray_make(gc, 16, 1);
      dm_envs = flexarray_make(gc, 16, 1);
-@@ -1179,30 +1180,33 @@ static int libxl__build_device_model_args_new(libxl__gc *gc,
+@@ -1179,38 +1180,41 @@ static int libxl__build_device_model_args_new(libxl__gc *gc,
                        "-xen-domid",
                        GCSPRINTF("%d", guest_domid), NULL);
  
@@ -138,6 +138,14 @@ index 3601b14..1fa4fa8 100644
 -        flexarray_append(dm_args,
 -            GCSPRINTF("socket,id=libxl-cmd,fd=%d,server,nowait",
 -                      state->dm_monitor_fd));
+-
+-        /*
+-         * Start QEMU with its "CPU" paused, it will not start any emulation
+-         * until the QMP command "cont" is used. This also prevent QEMU from
+-         * writing "running" to the "state" xenstore node so we only use this
+-         * flag when we have the QMP based startup notification.
+-         * */
+-        flexarray_append(dm_args, "-S");
 -    } else {
 -        flexarray_append(dm_args,
 -                         GCSPRINTF("socket,id=libxl-cmd,"
@@ -151,6 +159,14 @@ index 3601b14..1fa4fa8 100644
 +            flexarray_append(dm_args,
 +                GCSPRINTF("socket,id=libxl-cmd,fd=%d,server,nowait",
 +                          state->dm_monitor_fd));
++
++            /*
++             * Start QEMU with its "CPU" paused, it will not start any emulation
++             * until the QMP command "cont" is used. This also prevent QEMU from
++             * writing "running" to the "state" xenstore node so we only use this
++             * flag when we have the QMP based startup notification.
++             * */
++            flexarray_append(dm_args, "-S");
 +        } else {
 +            flexarray_append(dm_args,
 +                             GCSPRINTF("socket,id=libxl-cmd,"
diff --git a/rel b/rel
index 49d59571..d00491fd 100644
--- a/rel
+++ b/rel
@@ -1 +1 @@
-0.1
+1
diff --git a/version b/version
index 24a297c5..4e8afe44 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-4.12.0~rc1
+4.12.0-rc3
diff --git a/xen.spec.in b/xen.spec.in
index 2bd4d2ad..c62b9387 100644
--- a/xen.spec.in
+++ b/xen.spec.in
@@ -954,7 +954,6 @@ rm -rf %{buildroot}
 %{_sbindir}/gdbsx
 %{_sbindir}/xen-kdd
 %endif
-%{_sbindir}/xen-bugtool
 %ifnarch armv7hl aarch64
 %{_sbindir}/xen-hptool
 %{_sbindir}/xen-hvmcrash
@@ -976,7 +975,6 @@ rm -rf %{buildroot}
 %ifnarch armv7hl aarch64
 %{_sbindir}/xen-lowmemd
 %endif
-%{_sbindir}/xen-ringwatch
 %{_sbindir}/xencov
 %ifnarch armv7hl aarch64
 %{_sbindir}/xen-mfndump