From d7254001585c268c8e88ff4fc25d9ce537475ddd Mon Sep 17 00:00:00 2001
From: Bo Chen <chen.bo@intel.com>
Date: Wed, 10 Jan 2024 09:45:32 -0800
Subject: [PATCH] build: Release v36.1 (bug fix release)

Signed-off-by: Bo Chen <chen.bo@intel.com>
---
 Cargo.lock              |  2 +-
 Cargo.toml              |  2 +-
 release-notes.md        | 11 +++++++++++
 vm-migration/src/lib.rs |  2 +-
 4 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index f40fbc0f4..653a33a79 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -427,7 +427,7 @@ checksum = "2da6da31387c7e4ef160ffab6d5e7f00c42626fe39aea70a7b0f1773f7dd6c1b"
 
 [[package]]
 name = "cloud-hypervisor"
-version = "36.0.0"
+version = "36.1.0"
 dependencies = [
  "anyhow",
  "api_client",
diff --git a/Cargo.toml b/Cargo.toml
index 547bccc28..02b360e0f 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "cloud-hypervisor"
-version = "36.0.0"
+version = "36.1.0"
 authors = ["The Cloud Hypervisor Authors"]
 edition = "2021"
 default-run = "cloud-hypervisor"
diff --git a/release-notes.md b/release-notes.md
index 456b84c39..068fba03f 100644
--- a/release-notes.md
+++ b/release-notes.md
@@ -1,3 +1,4 @@
+- [v36.1](#v361)
 - [v36.0](#v360)
     - [Command Line Changes](#command-line-changes)
     - [Enabled Features Reported via API Endpoint and CLI](#enabled-features-reported-via-api-endpoint-and-cli)
@@ -310,6 +311,16 @@
     - [Unit testing](#unit-testing)
     - [Integration tests parallelization](#integration-tests-parallelization)
 
+# v36.1
+
+This is a bug fix release. The following issues have been addressed:
+
+* Fix aio backend behavior for block devices when writeback cache
+disabled (#5930)
+* Fix PvPanic device PCI BAR alignment (#5956)
+* Bug fix to OpenAPI specification file (#5967)
+* Error out early for live migration when TDX is enabled (#6025)
+
 # v36.0
 
 This release has been tracked in our [roadmap
diff --git a/vm-migration/src/lib.rs b/vm-migration/src/lib.rs
index 85bc3d2eb..ea9394019 100644
--- a/vm-migration/src/lib.rs
+++ b/vm-migration/src/lib.rs
@@ -13,7 +13,7 @@ pub mod protocol;
 
 /// Global VMM version for versioning
 const MAJOR_VERSION: u16 = 36;
-const MINOR_VERSION: u16 = 0;
+const MINOR_VERSION: u16 = 1;
 const VMM_VERSION: u16 = MAJOR_VERSION << 12 | MINOR_VERSION & 0b1111;
 
 pub trait VersionMapped {