[Xen-changelog] [xen-unstable] merge

[Xen patchbot-unstable <patchbot@xxxxxxx>]

# HG changeset patch
# User Ian Campbell <ijc@xxxxxxxxxxxxxx>
# Date 1357315117 0
# Node ID 64b36dde26bc3c4fc80312cc9eeb0e511f0cf94b
# Parent  509e9737e241010a3547689368ac1b7cb131e33c
# Parent  8fd5635f451b073ddc99e928c975e8a7743d1321
merge
---


diff -r 509e9737e241 -r 64b36dde26bc tools/tests/Makefile
--- a/tools/tests/Makefile      Thu Dec 20 11:53:08 2012 +0000
+++ b/tools/tests/Makefile      Fri Jan 04 15:58:37 2013 +0000
@@ -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
diff -r 509e9737e241 -r 64b36dde26bc xen/drivers/passthrough/iommu.c
--- a/xen/drivers/passthrough/iommu.c   Thu Dec 20 11:53:08 2012 +0000
+++ b/xen/drivers/passthrough/iommu.c   Fri Jan 04 15:58:37 2013 +0000
@@ -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;
 

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog