Skip to content
Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions ocaml/xenopsd/scripts/qemu-wrapper
Original file line number Diff line number Diff line change
Expand Up @@ -258,6 +258,12 @@ def main(argv):
n += 1
continue

if p == "-device":
if qemu_args[n + 1].startswith('nvme,'):
qemu_args[n + 1] += ',mdts=9'
Copy link
Contributor

@edwintorok edwintorok Dec 3, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could also change xc/device.ml and change nvme,serial=nvme0,... to nvme,serial=nvme0,mdts=9,... around line 2739 in let extra_args

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

but that would end up appending mdts=9 twice to the command line?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't have a strong opinion on whether to do it here or in Ocaml code, but if it's Ocaml code I would defer to someone more familiar with XAPI than me.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

diff --git a/ocaml/xenopsd/xc/device.ml b/ocaml/xenopsd/xc/device.ml
index 73f136feca..9beeecf436 100644
--- a/ocaml/xenopsd/xc/device.ml
+++ b/ocaml/xenopsd/xc/device.ml
@@ -2774,7 +2774,7 @@ module Backend = struct
         ]
 
       (* 4 and 5 are NICs, and we can only have two, 6 is platform *)
-      let extra_args = ["-device"; "nvme,serial=nvme0,id=nvme0,addr=7"]
+      let extra_args = ["-device"; "nvme,serial=nvme0,mdts=9,id=nvme0,addr=7"]
     end

Just like this? In that case we should do it here.

Copy link
Contributor

@lindig lindig Dec 3, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Here is a PR with that change: #6783

n += 1
continue

if p == "-loadvm":
loadvm_path = qemu_args[n+1]
incoming_fd = os.open(loadvm_path, os.O_RDONLY)
Expand Down
Loading