[xen staging-4.18] update Xen version to 4.18.4

[patchbot@xxxxxxx]

commit e77ff547385861c72108aa380ab279e35d0f4735
Author:     Jan Beulich <jbeulich@xxxxxxxx>
AuthorDate: Thu Dec 19 09:04:30 2024 +0100
Commit:     Jan Beulich <jbeulich@xxxxxxxx>
CommitDate: Thu Dec 19 09:04:30 2024 +0100

    update Xen version to 4.18.4
---
 Config.mk    | 4 ++--
 xen/Makefile | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Config.mk b/Config.mk
index 39fe4cef1f..6190b31358 100644
--- a/Config.mk
+++ b/Config.mk
@@ -221,10 +221,10 @@ OVMF_UPSTREAM_URL ?= 
https://xenbits.xen.org/git-http/ovmf.git
 OVMF_UPSTREAM_REVISION ?= ba91d0292e593df8528b66f99c1b0b14fadc8e16
 
 QEMU_UPSTREAM_URL ?= https://xenbits.xen.org/git-http/qemu-xen.git
-QEMU_UPSTREAM_REVISION ?= qemu-xen-4.18.1
+QEMU_UPSTREAM_REVISION ?= qemu-xen-4.18.4
 
 MINIOS_UPSTREAM_URL ?= https://xenbits.xen.org/git-http/mini-os.git
-MINIOS_UPSTREAM_REVISION ?= ff13dabd3099687921145a5e3e960ba8337e7488
+MINIOS_UPSTREAM_REVISION ?= xen-RELEASE-4.18.4
 
 SEABIOS_UPSTREAM_URL ?= https://xenbits.xen.org/git-http/seabios.git
 SEABIOS_UPSTREAM_REVISION ?= rel-1.16.2
diff --git a/xen/Makefile b/xen/Makefile
index 68b14fb356..a4e7a2f6d1 100644
--- a/xen/Makefile
+++ b/xen/Makefile
@@ -6,7 +6,7 @@ this-makefile := $(call lastword,$(MAKEFILE_LIST))
 # All other places this is stored (eg. compile.h) should be autogenerated.
 export XEN_VERSION       = 4
 export XEN_SUBVERSION    = 18
-export XEN_EXTRAVERSION ?= .4-pre$(XEN_VENDORVERSION)
+export XEN_EXTRAVERSION ?= .4$(XEN_VENDORVERSION)
 export XEN_FULLVERSION   = $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION)
 -include xen-version
 
--
generated by git-patchbot for /home/xen/git/xen.git#staging-4.18