Commit 245c82b2 authored by Michal Berger's avatar Michal Berger Committed by Tomasz Zawadzki
Browse files

scripts/vagrant: Define pci address for the nvme ctrl 



This is done in order to avoid potential conflicts with default
addresses used by newer libvirt versions - these may not be in sync
with what we define through a qemu domain via qemuargs. Starting at
addr 0x10 should be safe. Without it, potential error may look like
this:

  vm_action.rb:7:in `create': Call to virDomainCreateWithFlags failed:
  internal error: qemu unexpectedly closed the monitor:
  qemu-system-x86_64: -device {"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}:
  PCI: slot 2 function 0 not available for cirrus-vga, in use by nvme,id=nvme-0
  (Libvirt::Error)

Change-Id: Ic976f8d54469cfdb84bd5559142de54d243482f6
Signed-off-by: default avatarMichal Berger <michal.berger@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/22463


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarKarol Latecki <karol.latecki@intel.com>
Reviewed-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-by: default avatarKamil Godzwon <kamilx.godzwon@intel.com>
Reviewed-by: default avatarKonrad Sztyber <konrad.sztyber@intel.com>
parent 35212373

scripts/vagrant/Vagrantfile

+3 −1
Original line number Diff line number Diff line
@@ -151,8 +151,10 @@ def setup_nvme_disk(libvirt, disk, index) 
  fdp_subsys_id = ""

  ms = ""



  addr = 0x10 + index



  # Define controller

  nvme_controller = "nvme,id=#{nvme_disk_id},serial=1234#{index}"

  nvme_controller = "nvme,id=#{nvme_disk_id},serial=1234#{index},addr=0x#{addr.to_s(16)}"



  # For the FDP, we need to hook our nvme into a dedicated subsystem

  if !nvme_fdp[index].nil? && nvme_fdp[index] != ""