HV: rename structure acrn_vm_type

Rename structure acrn_vm_type to acrn_vm_load_order as it is used to
indicate the load order instead of the VM type.

Tracked-On: #2291
Signed-off-by: Conghui Chen <conghui.chen@intel.com>
Acked-by: Eddie Dong <eddie.dong@intel.com>
This commit is contained in:
Conghui Chen
2019-05-01 09:41:05 +08:00
committed by Eddie Dong
parent be2fe2a44d
commit e6670b32f4
9 changed files with 23 additions and 23 deletions

View File

@@ -88,7 +88,7 @@ void vdev_pt_remap_msix_table_bar(struct pci_vdev *vdev)
bar = &pdev->bar[msix->table_bar];
if (bar != NULL) {
vdev->msix.mmio_hpa = bar->base;
if (vm_config->type == PRE_LAUNCHED_VM) {
if (vm_config->load_order == PRE_LAUNCHED_VM) {
vdev->msix.mmio_gpa = vdev->bar[msix->table_bar].base;
} else {
vdev->msix.mmio_gpa = sos_vm_hpa2gpa(bar->base);
@@ -139,7 +139,7 @@ void vdev_pt_remap_msix_table_bar(struct pci_vdev *vdev)
if (msix->mmio_gpa != 0U) {
if (vm_config->type == PRE_LAUNCHED_VM) {
if (vm_config->load_order == PRE_LAUNCHED_VM) {
addr_hi = vdev->msix.mmio_gpa + vdev->msix.mmio_size;
addr_lo = vdev->msix.mmio_gpa;
} else {

View File

@@ -118,7 +118,7 @@ static bool pci_cfgdata_io_read(struct acrn_vm *vm, struct acrn_vcpu *vcpu, uint
if (vpci_is_valid_access(pi->cached_reg + offset, bytes)) {
vm_config = get_vm_config(vm->vm_id);
switch (vm_config->type) {
switch (vm_config->load_order) {
case PRE_LAUNCHED_VM:
partition_mode_cfgread(vpci, pi->cached_bdf, pi->cached_reg + offset, bytes, &val);
break;
@@ -157,7 +157,7 @@ static bool pci_cfgdata_io_write(struct acrn_vm *vm, uint16_t addr, size_t bytes
if (vpci_is_valid_access(pi->cached_reg + offset, bytes)) {
vm_config = get_vm_config(vm->vm_id);
switch (vm_config->type) {
switch (vm_config->load_order) {
case PRE_LAUNCHED_VM:
partition_mode_cfgwrite(vpci, pi->cached_bdf, pi->cached_reg + offset, bytes, val);
break;
@@ -203,7 +203,7 @@ void vpci_init(struct acrn_vm *vm)
vpci->vm = vm;
vm_config = get_vm_config(vm->vm_id);
switch (vm_config->type) {
switch (vm_config->load_order) {
case PRE_LAUNCHED_VM:
ret = partition_mode_vpci_init(vm);
break;
@@ -241,7 +241,7 @@ void vpci_cleanup(const struct acrn_vm *vm)
struct acrn_vm_config *vm_config;
vm_config = get_vm_config(vm->vm_id);
switch (vm_config->type) {
switch (vm_config->load_order) {
case PRE_LAUNCHED_VM:
partition_mode_vpci_deinit(vm);
break;