diff options
| author | Roman Bogorodskiy <bogorodskiy@gmail.com> | 2017-01-05 16:51:25 +0400 |
|---|---|---|
| committer | Roman Bogorodskiy <bogorodskiy@gmail.com> | 2017-01-30 20:48:42 +0400 |
| commit | 803966c76da17d79c26114f22b057091f055a867 (patch) | |
| tree | 48fd85983e82b9b7229afcc344cc820ca6dfb8e1 /tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub.args | |
| parent | 13a050b2c3abddaf15e446c6b6bfd0c50d2c7261 (diff) | |
| download | libvirt-803966c76da17d79c26114f22b057091f055a867.tar.gz | |
bhyve: fix SATA address allocation
As bhyve for a long time didn't have a notion of the explicit SATA
controller and created a controller for each drive, the bhyve driver
in libvirt acted in a similar way and didn't care about the SATA
controllers and assigned PCI addresses to drives directly, as
the generated command will look like this anyway:
2:0,ahci-hd,somedisk.img
This no longer makes sense because:
1. After commit c07d1c1c4f it's not possible to assign
PCI addresses to disks
2. Bhyve now supports multiple disk drives for a controller,
so it's going away from 1:1 controller:disk mapping, so
the controller object starts to make more sense now
So, this patch does the following:
- Assign PCI address to SATA controllers (previously we didn't do this)
- Assign disk addresses instead of PCI addresses for disks. Now, when
building a bhyve command, we take PCI address not from the disk
itself but from its controller
- Assign addresses at XML parsing time using the
assignAddressesCallback. This is done mainly for being able to
verify address allocation via xml2xml tests
- Adjust existing bhyvexml2{xml,argv} tests to chase the new
address allocation
This patch is largely based on work of Fabian Freyer.
Diffstat (limited to 'tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub.args')
| -rw-r--r-- | tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub.args | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub.args b/tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub.args index efdbd63a56..313724dc90 100644 --- a/tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub.args +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub.args @@ -5,7 +5,7 @@ -H \ -P \ -s 0:0,hostbridge \ +-s 2:0,ahci,hd:/tmp/freebsd.img \ -s 3:0,virtio-net,faketapdev,mac=52:54:00:f0:72:11 \ --s 2:0,ahci-hd,/tmp/freebsd.img \ -s 1,lpc \ -l com1,/dev/nmdm0A bhyve |