[Qemu-commits] [qemu/qemu] c6d25a: xen-usb: do not reference PAGE_SIZE

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: c6d25aa6bab44e841ef6585cbbd9af05b7a90b65
      
https://github.com/qemu/qemu/commit/c6d25aa6bab44e841ef6585cbbd9af05b7a90b65
  Author: Stefano Stabellini <address@hidden>
  Date:   2016-10-21 (Fri, 21 Oct 2016)

  Changed paths:
    M hw/usb/xen-usb.c

  Log Message:
  -----------
  xen-usb: do not reference PAGE_SIZE

PAGE_SIZE is undefined on ARM64. Use XC_PAGE_SIZE instead, which is
always 4096 even when page granularity is 64K.

For this to actually work with 64K pages, more changes are required.

Signed-off-by: Stefano Stabellini <address@hidden>
Reviewed-by: Juergen Gross <address@hidden>
Release-acked-by: Wei Liu <address@hidden>


  Commit: 78f66897ddf58d1ffe5e0b95f7c1a1dad103a8da
      
https://github.com/qemu/qemu/commit/78f66897ddf58d1ffe5e0b95f7c1a1dad103a8da
  Author: Olaf Hering <address@hidden>
  Date:   2016-10-21 (Fri, 21 Oct 2016)

  Changed paths:
    M hw/i386/xen/xen_platform.c

  Log Message:
  -----------
  xen_platform: unplug also SCSI disks

Using 'vdev=sd[a-o]' will create an emulated LSI controller, which can
be used by the emulated BIOS to boot from disk. If the HVM domU has also
PV driver the disk may appear twice in the guest. To avoid this an
unplug of the emulated hardware is needed, similar to what is done for
IDE and NIC drivers already.

Since the SCSI controller provides only disks the entire controller can
be unplugged at once.

Impact of the change for classic and pvops based guest kernels:

 vdev=sda:disk0
before: pvops:   disk0=pv xvda + emulated sda
  classic: disk0=pv sda  + emulated sdq
after:  pvops:   disk0=pv xvda
  classic: disk0=pv sda

 vdev=hda:disk0, vdev=sda:disk1
before: pvops:   disk0=pv xvda
           disk1=emulated sda
  classic: disk0=pv hda
           disk1=pv sda  + emulated sdq
after:  pvops:   disk0=pv xvda
           disk1=not accessible by blkfront, index hda==index sda
  classic: disk0=pv hda
           disk1=pv sda

 vdev=hda:disk0, vdev=sda:disk1, vdev=sdb:disk2
before: pvops:   disk0=pv xvda
           disk1=emulated sda
           disk2=pv xvdb + emulated sdb
  classic: disk0=pv hda
           disk1=pv sda  + emulated sdq
           disk2=pv sdb  + emulated sdr
after:  pvops:   disk0=pv xvda
           disk1=not accessible by blkfront, index hda==index sda
           disk2=pv xvdb
  classic: disk0=pv hda
           disk1=pv sda
           disk2=pv sda

Signed-off-by: Olaf Hering <address@hidden>
Reviewed-by: Stefano Stabellini <address@hidden>
Signed-off-by: Stefano Stabellini <address@hidden>


  Commit: 35132016dc1c27de2b1354b161df6cc22f3ac5bf
      
https://github.com/qemu/qemu/commit/35132016dc1c27de2b1354b161df6cc22f3ac5bf
  Author: Olaf Hering <address@hidden>
  Date:   2016-10-21 (Fri, 21 Oct 2016)

  Changed paths:
    M hw/i386/xen/xen_platform.c

  Log Message:
  -----------
  xen_platform: SUSE xenlinux unplug for emulated PCI

Implement SUSE specific unplug protocol for emulated PCI devices
in PVonHVM guests. Its a simple 'outl(1, (ioaddr + 4));'.
This protocol was implemented and used since Xen 3.0.4.
It is used in all SUSE/SLES/openSUSE releases up to SLES11SP3 and
openSUSE 12.3.
In addition old (pre-2011) VMDP versions are handled as well.

Signed-off-by: Olaf Hering <address@hidden>
Reviewed-by: Stefano Stabellini <address@hidden>
Signed-off-by: Stefano Stabellini <address@hidden>


  Commit: 4387f5671f9676336c87b68f5e87ba54fbea3714
      
https://github.com/qemu/qemu/commit/4387f5671f9676336c87b68f5e87ba54fbea3714
  Author: Peter Maydell <address@hidden>
  Date:   2016-10-24 (Mon, 24 Oct 2016)

  Changed paths:
    M hw/i386/xen/xen_platform.c
    M hw/usb/xen-usb.c

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/sstabellini/tags/xen-20161021-tag' into 
staging

Xen 2016/10/21

# gpg: Signature made Fri 21 Oct 2016 20:52:42 BST
# gpg:                using RSA key 0x894F8F4870E1AE90
# gpg: Good signature from "Stefano Stabellini <address@hidden>"
# gpg:                 aka "Stefano Stabellini <address@hidden>"
# Primary key fingerprint: D04E 33AB A51F 67BA 07D3  0AEA 894F 8F48 70E1 AE90

* remotes/sstabellini/tags/xen-20161021-tag:
  xen_platform: SUSE xenlinux unplug for emulated PCI
  xen_platform: unplug also SCSI disks
  xen-usb: do not reference PAGE_SIZE

Signed-off-by: Peter Maydell <address@hidden>


Compare: https://github.com/qemu/qemu/compare/b49e452fe994...4387f5671f96