f-74: api: disques additionnels xvdX sur la cible SCSI de même rang, sdX refusé, migration des clés disk/sdX #74
Signed-off-by: GnomeZworc <nicolas.boufidjeline@g3e.fr>
This commit is contained in:
parent
9b5b4a6e62
commit
1e9f436648
7 changed files with 187 additions and 27 deletions
|
|
@ -49,14 +49,14 @@ func buildArgs(cfg Config) ([]string, error) {
|
|||
hasScsi := false
|
||||
virtioBlk := 0
|
||||
for _, d := range cfg.Disks {
|
||||
if strings.HasPrefix(d.Dev, "sd") {
|
||||
if strings.HasPrefix(d.Dev, "xvd") {
|
||||
hasScsi = true
|
||||
} else {
|
||||
virtioBlk++
|
||||
}
|
||||
}
|
||||
if virtioBlk > 1 {
|
||||
return nil, fmt.Errorf("qemu: %d disques virtio-blk (vd*) déclarés, un seul est supporté — utiliser des disques sd* pour les disques additionnels", virtioBlk)
|
||||
return nil, fmt.Errorf("qemu: %d disques virtio-blk (vd*) déclarés, un seul est supporté — utiliser des disques xvd* pour les disques additionnels", virtioBlk)
|
||||
}
|
||||
if hasScsi {
|
||||
args = append(args, "-device", "virtio-scsi-pci,id=scsi0,bus=pci.0,addr=0x1e")
|
||||
|
|
@ -64,7 +64,7 @@ func buildArgs(cfg Config) ([]string, error) {
|
|||
|
||||
sorted := make([]DiskConfig, len(cfg.Disks))
|
||||
copy(sorted, cfg.Disks)
|
||||
// vd* avant sd* : les disques virtio-blk bootent en premier.
|
||||
// vd* avant xvd* : les disques virtio-blk bootent en premier.
|
||||
// À lettre égale de type, ordre alphabétique.
|
||||
sort.Slice(sorted, func(i, j int) bool {
|
||||
iVirtio := strings.HasPrefix(sorted[i].Dev, "vd")
|
||||
|
|
@ -77,8 +77,8 @@ func buildArgs(cfg Config) ([]string, error) {
|
|||
|
||||
for idx, d := range sorted {
|
||||
bootindex := idx + 1
|
||||
if strings.HasPrefix(d.Dev, "sd") {
|
||||
scsiID := int(d.Dev[2] - 'a')
|
||||
if strings.HasPrefix(d.Dev, "xvd") {
|
||||
scsiID := int(d.Dev[3] - 'a')
|
||||
args = append(args,
|
||||
"-drive", fmt.Sprintf("file=%s,if=none,id=%s", d.Path, d.Dev),
|
||||
"-device", fmt.Sprintf("scsi-hd,drive=%s,bus=scsi0.0,scsi-id=%d,bootindex=%d,serial=%s", d.Dev, scsiID, bootindex, d.Dev),
|
||||
|
|
|
|||
|
|
@ -19,9 +19,9 @@ func TestBuildArgs_DiskSerialIsDeclaredDev(t *testing.T) {
|
|||
Name: "vm1",
|
||||
NICs: []NICConfig{{TapID: 1, Mac: "52:54:00:00:00:01"}},
|
||||
Disks: []DiskConfig{
|
||||
{Path: "/v/b.qcow2", Dev: "sdb"},
|
||||
{Path: "/v/b.qcow2", Dev: "xvdb"},
|
||||
{Path: "/v/root.qcow2", Dev: "vda"},
|
||||
{Path: "/v/a.qcow2", Dev: "sda"},
|
||||
{Path: "/v/a.qcow2", Dev: "xvda"},
|
||||
},
|
||||
})
|
||||
if err != nil {
|
||||
|
|
@ -31,8 +31,8 @@ func TestBuildArgs_DiskSerialIsDeclaredDev(t *testing.T) {
|
|||
want := []string{
|
||||
"virtio-scsi-pci,id=scsi0,bus=pci.0,addr=0x1e",
|
||||
"virtio-blk-pci,drive=vda,bus=pci.0,addr=0x1f,bootindex=1,serial=vda",
|
||||
"scsi-hd,drive=sda,bus=scsi0.0,scsi-id=0,bootindex=2,serial=sda",
|
||||
"scsi-hd,drive=sdb,bus=scsi0.0,scsi-id=1,bootindex=3,serial=sdb",
|
||||
"scsi-hd,drive=xvda,bus=scsi0.0,scsi-id=0,bootindex=2,serial=xvda",
|
||||
"scsi-hd,drive=xvdb,bus=scsi0.0,scsi-id=1,bootindex=3,serial=xvdb",
|
||||
"virtio-net-pci,netdev=net0,mac=52:54:00:00:00:01,bus=pci.0,addr=0x03",
|
||||
}
|
||||
got := devicesOf(args)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue