Skip to content

Commit 0fbe2c6

Browse files
committed
Remove handling of VBD.other_config:backend-local
There is no use case for it anymore. This is part of XSA-489 / CVE-2026-23559. Signed-off-by: Rob Hoes <rob.hoes@citrix.com>
1 parent 5cc5240 commit 0fbe2c6

2 files changed

Lines changed: 1 addition & 12 deletions

File tree

ocaml/xapi/xapi_globs.ml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -240,8 +240,6 @@ let vbd_polling_idle_threshold_key = "polling-idle-threshold"
240240

241241
(* set in VBD other-config *)
242242

243-
let vbd_backend_local_key = "backend-local" (* set in VBD other-config *)
244-
245243
let mac_seed = "mac_seed" (* set in a VM to generate MACs by hash chaining *)
246244

247245
let ( ** ) = Int64.mul

ocaml/xapi/xapi_xenops.ml

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -678,16 +678,7 @@ module MD = struct
678678
)
679679
)
680680
in
681-
let backend_of_vbd vbd =
682-
let vbd_oc = vbd.API.vBD_other_config in
683-
if List.mem_assoc Xapi_globs.vbd_backend_local_key vbd_oc then (
684-
let path = List.assoc Xapi_globs.vbd_backend_local_key vbd_oc in
685-
warn "Using local override for VBD backend: %s -> %s" vbd.API.vBD_uuid
686-
path ;
687-
Some (Local path)
688-
) else
689-
disk_of_vdi ~__context ~self:vbd.API.vBD_VDI
690-
in
681+
let backend_of_vbd vbd = disk_of_vdi ~__context ~self:vbd.API.vBD_VDI in
691682
let can_attach_early =
692683
let sr_opt =
693684
try Some (Db.VDI.get_SR ~__context ~self:vbd.API.vBD_VDI)

0 commit comments

Comments
 (0)