mirror of
https://github.com/xen-project/xen.git
synced 2026-10-29 18:50:05 +01:00
merge
This commit is contained in:
Ian Campbell committed
commit
dca9a796ed
2 files changed
+5
-5
No files matched your search
@@ -5,12 +5,12 @@ CFLAGS += $(CFLAGS_libxenctrl)
|
||||
LDLIBS += $(LDLIBS_libxenctrl)
|
||||
|
||||
SUBDIRS-y :=
|
||||
SUBDIRS-y += mce-test
|
||||
SUBDIRS-$(CONFIG_X86) += mce-test
|
||||
SUBDIRS-y += mem-sharing
|
||||
ifeq ($(XEN_TARGET_ARCH),__fixme__)
|
||||
SUBDIRS-y += regression
|
||||
endif
|
||||
SUBDIRS-y += x86_emulator
|
||||
SUBDIRS-$(CONFIG_X86) += x86_emulator
|
||||
SUBDIRS-y += xen-access
|
||||
|
||||
.PHONY: all clean install distclean
|
||||
|
||||
@@ -591,7 +591,7 @@ int iommu_do_domctl(
|
||||
if ( ret )
|
||||
break;
|
||||
|
||||
seg = domctl->u.get_device_group.machine_sbdf >> 16;
|
||||
seg = domctl->u.assign_device.machine_sbdf >> 16;
|
||||
bus = (domctl->u.assign_device.machine_sbdf >> 8) & 0xff;
|
||||
devfn = domctl->u.assign_device.machine_sbdf & 0xff;
|
||||
|
||||
@@ -615,7 +615,7 @@ int iommu_do_domctl(
|
||||
if ( ret )
|
||||
break;
|
||||
|
||||
seg = domctl->u.get_device_group.machine_sbdf >> 16;
|
||||
seg = domctl->u.assign_device.machine_sbdf >> 16;
|
||||
bus = (domctl->u.assign_device.machine_sbdf >> 8) & 0xff;
|
||||
devfn = domctl->u.assign_device.machine_sbdf & 0xff;
|
||||
|
||||
@@ -634,7 +634,7 @@ int iommu_do_domctl(
|
||||
if ( ret )
|
||||
break;
|
||||
|
||||
seg = domctl->u.get_device_group.machine_sbdf >> 16;
|
||||
seg = domctl->u.assign_device.machine_sbdf >> 16;
|
||||
bus = (domctl->u.assign_device.machine_sbdf >> 8) & 0xff;
|
||||
devfn = domctl->u.assign_device.machine_sbdf & 0xff;
|
||||
|
||||
|
||||