dec64939c6
- arm/virt: Fix vcpu hotplug idx_from_topo_ids - Revert patches related to the vSVA - sync some bugfix patches from upstream - add generic vDPA device support Signed-off-by: yezengruan <yezengruan@huawei.com> (cherry picked from commit b99dbfd9847104300672fb4f559f1c2abba8aa33)
41 lines
1.5 KiB
Diff
41 lines
1.5 KiB
Diff
From f87df2b0761b55b24a9317f7694e2225a29c981d Mon Sep 17 00:00:00 2001
|
|
From: tangbinzy <tangbin_yewu@cmss.chinamobile.com>
|
|
Date: Wed, 23 Nov 2022 06:33:44 +0000
|
|
Subject: [PATCH 09/29] qemu-binfmt-conf.sh: fix -F option mainline inclusion
|
|
commit 719fab3afad22f34f0c812a8956adc88ab3242ce category: bugfix
|
|
|
|
------------------------------------------------------------
|
|
|
|
qemu-binfmt-conf.sh should use "-F" as short option for "--qemu-suffix".
|
|
Fix the getopt call to make this work.
|
|
|
|
Fixes: 7155be7cda5c ("qemu-binfmt-conf.sh: allow to provide a suffix to the interpreter name")
|
|
Signed-off-by: Martin Wilck <mwilck@suse.com>
|
|
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
|
|
Message-Id: <20211129135100.3934-1-mwilck@suse.com>
|
|
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
|
|
|
|
Signed-off-by: tangbinzy <tangbin_yewu@cmss.chinamobile.com>
|
|
---
|
|
scripts/qemu-binfmt-conf.sh | 4 +++-
|
|
1 file changed, 3 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/scripts/qemu-binfmt-conf.sh b/scripts/qemu-binfmt-conf.sh
|
|
index 7de996d536..e9bfeb94d3 100755
|
|
--- a/scripts/qemu-binfmt-conf.sh
|
|
+++ b/scripts/qemu-binfmt-conf.sh
|
|
@@ -340,7 +340,9 @@ PERSISTENT=no
|
|
PRESERVE_ARG0=no
|
|
QEMU_SUFFIX=""
|
|
|
|
-options=$(getopt -o ds:Q:S:e:hc:p:g: -l debian,systemd:,qemu-path:,qemu-suffix:,exportdir:,help,credential:,persistent:,preserve-argv0: -- "$@")
|
|
+_longopts="debian,systemd:,qemu-path:,qemu-suffix:,exportdir:,help,credential:,\
|
|
+persistent:,preserve-argv0:"
|
|
+options=$(getopt -o ds:Q:S:e:hc:p:g:F: -l ${_longopts} -- "$@")
|
|
eval set -- "$options"
|
|
|
|
while true ; do
|
|
--
|
|
2.27.0
|
|
|