thebestvibedev/tromcho.net
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix QEMU 8.2 and 9.0 patches (add @location comments)

Browse Source
This commit is contained in:
Vitaliy Filippov
2024-07-15 16:30:14 +03:00
parent 7a13f85ae2
commit 4d9293f0e9
2 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
patches/qemu-8.2-vitastor.patch
+6 -3
View File
@@ -71,7 +71,7 @@ index c9baeda639..85e1df5a56 100644
description: 'OpenGL support') description: 'OpenGL support')
option('rdma', type : 'feature', value : 'auto', option('rdma', type : 'feature', value : 'auto',
diff --git a/qapi/block-core.json b/qapi/block-core.json diff --git a/qapi/block-core.json b/qapi/block-core.json
index ca390c5700..8f11ae9fa5 100644 index ca390c5700..d2dbaeb279 100644
--- a/qapi/block-core.json --- a/qapi/block-core.json
+++ b/qapi/block-core.json +++ b/qapi/block-core.json
@@ -3201,7 +3201,7 @@ @@ -3201,7 +3201,7 @@
@@ -120,7 +120,7 @@ index ca390c5700..8f11ae9fa5 100644
'virtio-blk-vfio-pci': 'virtio-blk-vfio-pci':
{ 'type': 'BlockdevOptionsVirtioBlkVfioPci', { 'type': 'BlockdevOptionsVirtioBlkVfioPci',
'if': 'CONFIG_BLKIO' }, 'if': 'CONFIG_BLKIO' },
@@ -5148,6 +5171,17 @@ @@ -5148,6 +5171,20 @@
'*cluster-size' : 'size', '*cluster-size' : 'size',
'*encrypt' : 'RbdEncryptionCreateOptions' } } '*encrypt' : 'RbdEncryptionCreateOptions' } }
@@ -129,6 +129,9 @@ index ca390c5700..8f11ae9fa5 100644
+# +#
+# Driver specific image creation options for Vitastor. +# Driver specific image creation options for Vitastor.
+# +#
+# @location: Where to store the new image file. This location cannot
+# point to a snapshot.
+#
+# @size: Size of the virtual disk in bytes +# @size: Size of the virtual disk in bytes
+## +##
+{ 'struct': 'BlockdevCreateOptionsVitastor', +{ 'struct': 'BlockdevCreateOptionsVitastor',
@@ -138,7 +141,7 @@ index ca390c5700..8f11ae9fa5 100644
## ##
# @BlockdevVmdkSubformat: # @BlockdevVmdkSubformat:
# #
@@ -5370,6 +5404,7 @@ @@ -5370,6 +5407,7 @@
'ssh': 'BlockdevCreateOptionsSsh', 'ssh': 'BlockdevCreateOptionsSsh',
'vdi': 'BlockdevCreateOptionsVdi', 'vdi': 'BlockdevCreateOptionsVdi',
'vhdx': 'BlockdevCreateOptionsVhdx', 'vhdx': 'BlockdevCreateOptionsVhdx',
patches/qemu-9.0-vitastor.patch
+6 -3
View File
@@ -71,7 +71,7 @@ index 0a99a059ec..16dc440118 100644
description: 'OpenGL support') description: 'OpenGL support')
option('rdma', type : 'feature', value : 'auto', option('rdma', type : 'feature', value : 'auto',
diff --git a/qapi/block-core.json b/qapi/block-core.json diff --git a/qapi/block-core.json b/qapi/block-core.json
index 746d1694c2..fb7aa4423b 100644 index 746d1694c2..199a146a0b 100644
--- a/qapi/block-core.json --- a/qapi/block-core.json
+++ b/qapi/block-core.json +++ b/qapi/block-core.json
@@ -3203,7 +3203,7 @@ @@ -3203,7 +3203,7 @@
@@ -120,7 +120,7 @@ index 746d1694c2..fb7aa4423b 100644
'virtio-blk-vfio-pci': 'virtio-blk-vfio-pci':
{ 'type': 'BlockdevOptionsVirtioBlkVfioPci', { 'type': 'BlockdevOptionsVirtioBlkVfioPci',
'if': 'CONFIG_BLKIO' }, 'if': 'CONFIG_BLKIO' },
@@ -5180,6 +5203,17 @@ @@ -5180,6 +5203,20 @@
'*cluster-size' : 'size', '*cluster-size' : 'size',
'*encrypt' : 'RbdEncryptionCreateOptions' } } '*encrypt' : 'RbdEncryptionCreateOptions' } }
@@ -129,6 +129,9 @@ index 746d1694c2..fb7aa4423b 100644
+# +#
+# Driver specific image creation options for Vitastor. +# Driver specific image creation options for Vitastor.
+# +#
+# @location: Where to store the new image file. This location cannot
+# point to a snapshot.
+#
+# @size: Size of the virtual disk in bytes +# @size: Size of the virtual disk in bytes
+## +##
+{ 'struct': 'BlockdevCreateOptionsVitastor', +{ 'struct': 'BlockdevCreateOptionsVitastor',
@@ -138,7 +141,7 @@ index 746d1694c2..fb7aa4423b 100644
## ##
# @BlockdevVmdkSubformat: # @BlockdevVmdkSubformat:
# #
@@ -5402,6 +5436,7 @@ @@ -5402,6 +5439,7 @@
'ssh': 'BlockdevCreateOptionsSsh', 'ssh': 'BlockdevCreateOptionsSsh',
'vdi': 'BlockdevCreateOptionsVdi', 'vdi': 'BlockdevCreateOptionsVdi',
'vhdx': 'BlockdevCreateOptionsVhdx', 'vhdx': 'BlockdevCreateOptionsVhdx',