From: Zhipeng Lu <luzhip...@cestc.cn>
Signed-off-by: Zhipeng Lu <luzhip...@cestc.cn>
---
contrib/gitdm/domain-map | 1 +
meson | 2 +-
qapi/block-core.json | 3 ++-
roms/SLOF | 2 +-
roms/opensbi | 2 +-
roms/qboot | 2 +-
roms/seabios | 2 +-
roms/seabios-hppa | 2 +-
roms/skiboot | 2 +-
tests/lcitool/libvirt-ci | 2 +-
10 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/contrib/gitdm/domain-map b/contrib/gitdm/domain-map
index 3727918641..e1c1bf2a31 100644
--- a/contrib/gitdm/domain-map
+++ b/contrib/gitdm/domain-map
@@ -7,6 +7,7 @@
amd.com AMD
baidu.com Baidu
bytedance.com ByteDance
+cestc.cn Cestc
cmss.chinamobile.com China Mobile
citrix.com Citrix
crudebyte.com Crudebyte
diff --git a/meson b/meson
index 3a9b285a55..12f9f04ba0 160000
--- a/meson
+++ b/meson
@@ -1 +1 @@
-Subproject commit 3a9b285a55b91b53b2acda987192274352ecb5be
+Subproject commit 12f9f04ba0decfda425dbbf9a501084c153a2d18
diff --git a/qapi/block-core.json b/qapi/block-core.json
index 95ac4fa634..12af36de07 100644
--- a/qapi/block-core.json
+++ b/qapi/block-core.json
@@ -4356,7 +4356,8 @@
'*read-only': 'bool',
'*auto-read-only': 'bool',
'*force-share': 'bool',
- '*detect-zeroes': 'BlockdevDetectZeroesOptions' },
+ '*detect-zeroes': 'BlockdevDetectZeroesOptions',
+ '*media':'str'},
'discriminator': 'driver',
'data': {
'blkdebug': 'BlockdevOptionsBlkdebug',
diff --git a/roms/SLOF b/roms/SLOF
index 6b6c16b4b4..5b4c5acdcd 160000
--- a/roms/SLOF
+++ b/roms/SLOF
@@ -1 +1 @@
-Subproject commit 6b6c16b4b40763507cf1f518096f3c3883c5cf2d
+Subproject commit 5b4c5acdcd552a4e1796aeca6bb700f6cbb0282d
diff --git a/roms/opensbi b/roms/opensbi
index 4489876e93..48f91ee9c9 160000
--- a/roms/opensbi
+++ b/roms/opensbi
@@ -1 +1 @@
-Subproject commit 4489876e933d8ba0d8bc6c64bae71e295d45faac
+Subproject commit 48f91ee9c960f048c4a7d1da4447d31e04931e38
diff --git a/roms/qboot b/roms/qboot
index 8ca302e86d..a5300c4949 160000
--- a/roms/qboot
+++ b/roms/qboot
@@ -1 +1 @@
-Subproject commit 8ca302e86d685fa05b16e2b208888243da319941
+Subproject commit a5300c4949b8d4de2d34bedfaed66793f48ec948
diff --git a/roms/seabios b/roms/seabios
index 3208b098f5..d239552ce7 160000
--- a/roms/seabios
+++ b/roms/seabios
@@ -1 +1 @@
-Subproject commit 3208b098f51a9ef96d0dfa71d5ec3a3eaec88f0a
+Subproject commit d239552ce7220e448ae81f41515138f7b9e3c4db
diff --git a/roms/seabios-hppa b/roms/seabios-hppa
index 458626c4c6..bf3404006f 160000
--- a/roms/seabios-hppa
+++ b/roms/seabios-hppa
@@ -1 +1 @@
-Subproject commit 458626c4c6441045c0612f24313c7cf1f95e71c6
+Subproject commit bf3404006fd2c832857eb57e6f853862f97dacea
diff --git a/roms/skiboot b/roms/skiboot
index 24a7eb3596..820d43c0a7 160000
--- a/roms/skiboot
+++ b/roms/skiboot
@@ -1 +1 @@
-Subproject commit 24a7eb35966d93455520bc2debdd7954314b638b
+Subproject commit 820d43c0a7751e75a8830561f35535dfffd522bd
diff --git a/tests/lcitool/libvirt-ci b/tests/lcitool/libvirt-ci
index e3eb28cf2e..f83b916d5e 160000
--- a/tests/lcitool/libvirt-ci
+++ b/tests/lcitool/libvirt-ci
@@ -1 +1 @@
-Subproject commit e3eb28cf2e17fbcf7fe7e19505ee432b8ec5bbb5
+Subproject commit f83b916d5efa4bd33fbf4b7ea41bf6d535cc63fb
--
2.31.1
