[PATCH for-4.21 0/2] Prepare RC1

[PATCH for-4.21 0/2] Prepare RC1

[Andrew Cooper]

Andrew Cooper (2):
  Config.mk: Pin QEMU_UPSTREAM_REVISION
  Update Xen version to 4.21.0-rc1

 Config.mk    |  2 +-
 README       | 10 +++++-----
 SUPPORT.md   |  2 +-
 xen/Makefile |  2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)


base-commit: acaecf31ea1d566a20b5ee9c0f1f3cb4ee0ec9c2
-- 
2.39.5

[PATCH 1/2] Config.mk: Pin QEMU_UPSTREAM_REVISION

[Andrew Cooper]

Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
---
CC: Oleksii Kurochko <oleksii.kurochko@gmail.com>
CC: Anthony PERARD <anthony.perard@vates.tech>
CC: Michal Orzel <michal.orzel@amd.com>
CC: Jan Beulich <jbeulich@suse.com>
CC: Julien Grall <julien@xen.org>
CC: Roger Pau Monné <roger.pau@citrix.com>
CC: Stefano Stabellini <sstabellini@kernel.org>
---
 Config.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Config.mk b/Config.mk
index 7edbab8efe89..89c7524a3ec8 100644
--- a/Config.mk
+++ b/Config.mk
@@ -205,7 +205,7 @@ 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 ?= master
+QEMU_UPSTREAM_REVISION ?= e064f42c80be6f6ff8c12dcb2a663bdf70f965f6
 
 MINIOS_UPSTREAM_URL ?= https://xenbits.xen.org/git-http/mini-os.git
 MINIOS_UPSTREAM_REVISION ?= 6732fd42d8eb8d0af9f5eb54aca17f4c250213a8
-- 
2.39.5

[PATCH 2/2] Update Xen version to 4.21.0-rc1

[Andrew Cooper]

Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
---
CC: Oleksii Kurochko <oleksii.kurochko@gmail.com>
CC: Anthony PERARD <anthony.perard@vates.tech>
CC: Michal Orzel <michal.orzel@amd.com>
CC: Jan Beulich <jbeulich@suse.com>
CC: Julien Grall <julien@xen.org>
CC: Roger Pau Monné <roger.pau@citrix.com>
CC: Stefano Stabellini <sstabellini@kernel.org>
---
 README       | 10 +++++-----
 SUPPORT.md   |  2 +-
 xen/Makefile |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/README b/README
index 9329f30e1366..eaee78bd7375 100644
--- a/README
+++ b/README
@@ -1,9 +1,9 @@
 ############################################################
-__  __                                _        _     _
-\ \/ /___ _ __        _   _ _ __  ___| |_ __ _| |__ | | ___
- \  // _ \ '_ \ _____| | | | '_ \/ __| __/ _` | '_ \| |/ _ \
- /  \  __/ | | |_____| |_| | | | \__ \ || (_| | |_) | |  __/
-/_/\_\___|_| |_|      \__,_|_| |_|___/\__\__,_|_.__/|_|\___|
+ __  __            _  _    ____  _
+ \ \/ /___ _ __   | || |  |___ \/ |   _ __ ___
+  \  // _ \ '_ \  | || |_   __) | |__| '__/ __|
+  /  \  __/ | | | |__   _| / __/| |__| | | (__
+ /_/\_\___|_| |_|    |_|(_)_____|_|  |_|  \___|
 
 ############################################################
 
diff --git a/SUPPORT.md b/SUPPORT.md
index eb44ee85fd12..491f9ecd1bbb 100644
--- a/SUPPORT.md
+++ b/SUPPORT.md
@@ -9,7 +9,7 @@ for the definitions of the support status levels etc.
 
 # Release Support
 
-    Xen-Version: 4.21-unstable
+    Xen-Version: 4.21-rc
     Initial-Release: n/a
     Supported-Until: TBD
     Security-Support-Until: Unreleased - not yet security-supported
diff --git a/xen/Makefile b/xen/Makefile
index 49da79e10fb4..ba8c7147a2f6 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    = 21
-export XEN_EXTRAVERSION ?= -unstable$(XEN_VENDORVERSION)
+export XEN_EXTRAVERSION ?= .0-rc1$(XEN_VENDORVERSION)
 export XEN_FULLVERSION   = $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION)
 -include xen-version
 
-- 
2.39.5

Re: [PATCH 2/2] Update Xen version to 4.21.0-rc1

[Roger Pau Monné]

On Mon, Oct 06, 2025 at 09:08:40PM +0100, Andrew Cooper wrote:
> Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
> ---
> CC: Oleksii Kurochko <oleksii.kurochko@gmail.com>
> CC: Anthony PERARD <anthony.perard@vates.tech>
> CC: Michal Orzel <michal.orzel@amd.com>
> CC: Jan Beulich <jbeulich@suse.com>
> CC: Julien Grall <julien@xen.org>
> CC: Roger Pau Monné <roger.pau@citrix.com>
> CC: Stefano Stabellini <sstabellini@kernel.org>
> ---
>  README       | 10 +++++-----
>  SUPPORT.md   |  2 +-
>  xen/Makefile |  2 +-
>  3 files changed, 7 insertions(+), 7 deletions(-)
> 
> diff --git a/README b/README
> index 9329f30e1366..eaee78bd7375 100644
> --- a/README
> +++ b/README
> @@ -1,9 +1,9 @@
>  ############################################################
> -__  __                                _        _     _
> -\ \/ /___ _ __        _   _ _ __  ___| |_ __ _| |__ | | ___
> - \  // _ \ '_ \ _____| | | | '_ \/ __| __/ _` | '_ \| |/ _ \
> - /  \  __/ | | |_____| |_| | | | \__ \ || (_| | |_) | |  __/
> -/_/\_\___|_| |_|      \__,_|_| |_|___/\__\__,_|_.__/|_|\___|
> + __  __            _  _    ____  _
> + \ \/ /___ _ __   | || |  |___ \/ |   _ __ ___
> +  \  // _ \ '_ \  | || |_   __) | |__| '__/ __|
> +  /  \  __/ | | | |__   _| / __/| |__| | | (__
> + /_/\_\___|_| |_|    |_|(_)_____|_|  |_|  \___|
>  
>  ############################################################
>  
> diff --git a/SUPPORT.md b/SUPPORT.md
> index eb44ee85fd12..491f9ecd1bbb 100644
> --- a/SUPPORT.md
> +++ b/SUPPORT.md
> @@ -9,7 +9,7 @@ for the definitions of the support status levels etc.
>  
>  # Release Support
>  
> -    Xen-Version: 4.21-unstable
> +    Xen-Version: 4.21-rc
>      Initial-Release: n/a
>      Supported-Until: TBD
>      Security-Support-Until: Unreleased - not yet security-supported
> diff --git a/xen/Makefile b/xen/Makefile
> index 49da79e10fb4..ba8c7147a2f6 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    = 21
> -export XEN_EXTRAVERSION ?= -unstable$(XEN_VENDORVERSION)
> +export XEN_EXTRAVERSION ?= .0-rc1$(XEN_VENDORVERSION)

In previous switches to start cutting RC's we didn't add the 1 to the
XEN_EXTRAVERSION, see 19730dbb3fd8078743d5196bd7fc32f3765557ad for
example.  If we do add the rc number we need to remember to bump it
each time and RC is released.

Thanks, Roger.

Re: [PATCH for-4.21 0/2] Prepare RC1

[Roger Pau Monné]

On Mon, Oct 06, 2025 at 09:08:38PM +0100, Andrew Cooper wrote:
> Andrew Cooper (2):
>   Config.mk: Pin QEMU_UPSTREAM_REVISION
>   Update Xen version to 4.21.0-rc1

Acked-by: Roger Pau Monné <roger.pau@citrix.com>

I've got one comment in patch 2, as it has a slight difference from
the previous switch to RC versioning.

Thanks, Roger.

Re: [PATCH 2/2] Update Xen version to 4.21.0-rc1

[Andrew Cooper]

On 07/10/2025 7:54 am, Roger Pau Monné wrote:
> On Mon, Oct 06, 2025 at 09:08:40PM +0100, Andrew Cooper wrote:
>> Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
>> ---
>> CC: Oleksii Kurochko <oleksii.kurochko@gmail.com>
>> CC: Anthony PERARD <anthony.perard@vates.tech>
>> CC: Michal Orzel <michal.orzel@amd.com>
>> CC: Jan Beulich <jbeulich@suse.com>
>> CC: Julien Grall <julien@xen.org>
>> CC: Roger Pau Monné <roger.pau@citrix.com>
>> CC: Stefano Stabellini <sstabellini@kernel.org>
>> ---
>>  README       | 10 +++++-----
>>  SUPPORT.md   |  2 +-
>>  xen/Makefile |  2 +-
>>  3 files changed, 7 insertions(+), 7 deletions(-)
>>
>> diff --git a/README b/README
>> index 9329f30e1366..eaee78bd7375 100644
>> --- a/README
>> +++ b/README
>> @@ -1,9 +1,9 @@
>>  ############################################################
>> -__  __                                _        _     _
>> -\ \/ /___ _ __        _   _ _ __  ___| |_ __ _| |__ | | ___
>> - \  // _ \ '_ \ _____| | | | '_ \/ __| __/ _` | '_ \| |/ _ \
>> - /  \  __/ | | |_____| |_| | | | \__ \ || (_| | |_) | |  __/
>> -/_/\_\___|_| |_|      \__,_|_| |_|___/\__\__,_|_.__/|_|\___|
>> + __  __            _  _    ____  _
>> + \ \/ /___ _ __   | || |  |___ \/ |   _ __ ___
>> +  \  // _ \ '_ \  | || |_   __) | |__| '__/ __|
>> +  /  \  __/ | | | |__   _| / __/| |__| | | (__
>> + /_/\_\___|_| |_|    |_|(_)_____|_|  |_|  \___|
>>  
>>  ############################################################
>>  
>> diff --git a/SUPPORT.md b/SUPPORT.md
>> index eb44ee85fd12..491f9ecd1bbb 100644
>> --- a/SUPPORT.md
>> +++ b/SUPPORT.md
>> @@ -9,7 +9,7 @@ for the definitions of the support status levels etc.
>>  
>>  # Release Support
>>  
>> -    Xen-Version: 4.21-unstable
>> +    Xen-Version: 4.21-rc
>>      Initial-Release: n/a
>>      Supported-Until: TBD
>>      Security-Support-Until: Unreleased - not yet security-supported
>> diff --git a/xen/Makefile b/xen/Makefile
>> index 49da79e10fb4..ba8c7147a2f6 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    = 21
>> -export XEN_EXTRAVERSION ?= -unstable$(XEN_VENDORVERSION)
>> +export XEN_EXTRAVERSION ?= .0-rc1$(XEN_VENDORVERSION)
> In previous switches to start cutting RC's we didn't add the 1 to the
> XEN_EXTRAVERSION, see 19730dbb3fd8078743d5196bd7fc32f3765557ad for
> example.

Correct.  That was also buggy and complained about.

>   If we do add the rc number we need to remember to bump it
> each time and RC is released.

Last time we had truly buggy early rc tarballs, the middle ones were
bodged somewhat (incompletely, and not a straight git archive), and by
RC5 we had a commit with the correct XEN_EXTRAVERSION to make the
tarball correct.

See 4.20.0-rc5

~Andrew

Re: [PATCH 1/2] Config.mk: Pin QEMU_UPSTREAM_REVISION

[Julien Grall]

Hi Andrew,

On 06/10/2025 21:08, Andrew Cooper wrote:
> Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>

Acked-by: Julien Grall <jgrall@amazon.com>

Cheers,

-- 
Julien Grall

Re: [PATCH 2/2] Update Xen version to 4.21.0-rc1

[Julien Grall]

Hi Andrew,

On 07/10/2025 09:28, Andrew Cooper wrote:
> On 07/10/2025 7:54 am, Roger Pau Monné wrote:
>> On Mon, Oct 06, 2025 at 09:08:40PM +0100, Andrew Cooper wrote:
>>> Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
>>> ---
>>> CC: Oleksii Kurochko <oleksii.kurochko@gmail.com>
>>> CC: Anthony PERARD <anthony.perard@vates.tech>
>>> CC: Michal Orzel <michal.orzel@amd.com>
>>> CC: Jan Beulich <jbeulich@suse.com>
>>> CC: Julien Grall <julien@xen.org>
>>> CC: Roger Pau Monné <roger.pau@citrix.com>
>>> CC: Stefano Stabellini <sstabellini@kernel.org>
>>> ---
>>>   README       | 10 +++++-----
>>>   SUPPORT.md   |  2 +-
>>>   xen/Makefile |  2 +-
>>>   3 files changed, 7 insertions(+), 7 deletions(-)
>>>
>>> diff --git a/README b/README
>>> index 9329f30e1366..eaee78bd7375 100644
>>> --- a/README
>>> +++ b/README
>>> @@ -1,9 +1,9 @@
>>>   ############################################################
>>> -__  __                                _        _     _
>>> -\ \/ /___ _ __        _   _ _ __  ___| |_ __ _| |__ | | ___
>>> - \  // _ \ '_ \ _____| | | | '_ \/ __| __/ _` | '_ \| |/ _ \
>>> - /  \  __/ | | |_____| |_| | | | \__ \ || (_| | |_) | |  __/
>>> -/_/\_\___|_| |_|      \__,_|_| |_|___/\__\__,_|_.__/|_|\___|
>>> + __  __            _  _    ____  _
>>> + \ \/ /___ _ __   | || |  |___ \/ |   _ __ ___
>>> +  \  // _ \ '_ \  | || |_   __) | |__| '__/ __|
>>> +  /  \  __/ | | | |__   _| / __/| |__| | | (__
>>> + /_/\_\___|_| |_|    |_|(_)_____|_|  |_|  \___|
>>>   
>>>   ############################################################
>>>   
>>> diff --git a/SUPPORT.md b/SUPPORT.md
>>> index eb44ee85fd12..491f9ecd1bbb 100644
>>> --- a/SUPPORT.md
>>> +++ b/SUPPORT.md
>>> @@ -9,7 +9,7 @@ for the definitions of the support status levels etc.
>>>   
>>>   # Release Support
>>>   
>>> -    Xen-Version: 4.21-unstable
>>> +    Xen-Version: 4.21-rc
>>>       Initial-Release: n/a
>>>       Supported-Until: TBD
>>>       Security-Support-Until: Unreleased - not yet security-supported
>>> diff --git a/xen/Makefile b/xen/Makefile
>>> index 49da79e10fb4..ba8c7147a2f6 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    = 21
>>> -export XEN_EXTRAVERSION ?= -unstable$(XEN_VENDORVERSION)
>>> +export XEN_EXTRAVERSION ?= .0-rc1$(XEN_VENDORVERSION)
>> In previous switches to start cutting RC's we didn't add the 1 to the
>> XEN_EXTRAVERSION, see 19730dbb3fd8078743d5196bd7fc32f3765557ad for
>> example.
> 
> Correct.  That was also buggy and complained about.
> 
>>    If we do add the rc number we need to remember to bump it
>> each time and RC is released.
> 
> Last time we had truly buggy early rc tarballs, the middle ones were
> bodged somewhat (incompletely, and not a straight git archive), and by
> RC5 we had a commit with the correct XEN_EXTRAVERSION to make the
> tarball correct.

docs/process/release-technician-checklist.txt says:

#      `.0-rc$(XEN_VENDORVERSION)'       during freeze, first rc onwards 
(including staging, before branching)

I don't have any strong preference on whether we should also update it 
with the RC number. But the doc should at least be updated to reflect 
the decision. Can you send an update?

I think we also have a few updates to the checklist which would be good 
to merge as well. (one is from you).

Cheers,

-- 
Julien Grall

Re: [PATCH for-4.21 0/2] Prepare RC1

[Oleksii Kurochko]

[-- Attachment #1: Type: text/plain, Size: 452 bytes --]


On 10/6/25 10:08 PM, Andrew Cooper wrote:
> Andrew Cooper (2):
>    Config.mk: Pin QEMU_UPSTREAM_REVISION
>    Update Xen version to 4.21.0-rc1
>
>   Config.mk    |  2 +-
>   README       | 10 +++++-----
>   SUPPORT.md   |  2 +-
>   xen/Makefile |  2 +-
>   4 files changed, 8 insertions(+), 8 deletions(-)
>
>
> base-commit: acaecf31ea1d566a20b5ee9c0f1f3cb4ee0ec9c2

Release-Acked-By: Oleksii Kurochko<oleksii.kurochko@gmail.com>

Thanks.

~ Oleksii

[-- Attachment #2: Type: text/html, Size: 900 bytes --]

Re: [PATCH 2/2] Update Xen version to 4.21.0-rc1

[Jan Beulich]

On 07.10.2025 10:28, Andrew Cooper wrote:
> On 07/10/2025 7:54 am, Roger Pau Monné wrote:
>> On Mon, Oct 06, 2025 at 09:08:40PM +0100, Andrew Cooper wrote:
>>> --- 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    = 21
>>> -export XEN_EXTRAVERSION ?= -unstable$(XEN_VENDORVERSION)
>>> +export XEN_EXTRAVERSION ?= .0-rc1$(XEN_VENDORVERSION)
>> In previous switches to start cutting RC's we didn't add the 1 to the
>> XEN_EXTRAVERSION, see 19730dbb3fd8078743d5196bd7fc32f3765557ad for
>> example.
> 
> Correct.  That was also buggy and complained about.
> 
>>   If we do add the rc number we need to remember to bump it
>> each time and RC is released.
> 
> Last time we had truly buggy early rc tarballs, the middle ones were
> bodged somewhat (incompletely, and not a straight git archive), and by
> RC5 we had a commit with the correct XEN_EXTRAVERSION to make the
> tarball correct.
> 
> See 4.20.0-rc5

Yet then the question still is whether it is perhaps the tarball making
which is what wants adjusting, to not use "$(MAKE) -C xen xenversion",
but rather go from, say, the tag in git.

Jan