From 041a513f80aba6e240be7c55fc51e5b94d197f75 Mon Sep 17 00:00:00 2001
From: David Gibson <david@gibson.dropbear.id.au>
Date: Tue, 27 Jul 2021 15:41:05 +1000
Subject: [PATCH] versions: Update qemu to v6.1.0

We need qemu-6.1 for ACPI PCI hotplug support for the q35 machine.  At the
moment qemu will use SHPC hotplug under the PCIe to PCI bridge on q35.
SHPC is too slow to use for our purposes (it requires a 5s delay).

Update the qemu version to v6.1.0.  This leaves the experimental version
*older* than the normal version, but we'll fix that up later.

We also need to tweak the snapcraft.yaml, since the location for configs
has changed in the new qemu version.

fixes #1691

Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
---
 snap/snapcraft.yaml                                           | 2 +-
 tools/packaging/qemu/patches/6.1.x/no_patches.txt             | 0
 .../packaging/qemu/patches/tag_patches/v6.1.0/no_patches.txt  | 0
 versions.yaml                                                 | 4 ++--
 4 files changed, 3 insertions(+), 3 deletions(-)
 create mode 100644 tools/packaging/qemu/patches/6.1.x/no_patches.txt
 create mode 100644 tools/packaging/qemu/patches/tag_patches/v6.1.0/no_patches.txt

diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 7690b65d8..7179db8ee 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -305,7 +305,7 @@ parts:
         ;;
 
       *)
-        cp -a ${kata_dir}/tools/packaging/qemu/default-configs/* default-configs/devices/
+        cp -a ${kata_dir}/tools/packaging/qemu/default-configs/* configs/devices/
         ;;
       esac
 
diff --git a/tools/packaging/qemu/patches/6.1.x/no_patches.txt b/tools/packaging/qemu/patches/6.1.x/no_patches.txt
new file mode 100644
index 000000000..e69de29bb
diff --git a/tools/packaging/qemu/patches/tag_patches/v6.1.0/no_patches.txt b/tools/packaging/qemu/patches/tag_patches/v6.1.0/no_patches.txt
new file mode 100644
index 000000000..e69de29bb
diff --git a/versions.yaml b/versions.yaml
index 03a05cbde..36409d7a8 100644
--- a/versions.yaml
+++ b/versions.yaml
@@ -88,8 +88,8 @@ assets:
     qemu:
       description: "VMM that uses KVM"
       url: "https://github.com/qemu/qemu"
-      version: "v5.2.0"
-      tag: "v5.2.0"
+      version: "v6.1.0"
+      tag: "v6.1.0"
       # Do not include any non-full release versions
       # Break the line *without CR or space being appended*, to appease
       # yamllint, and note the deliberate ' ' at the end of the expression.