[Qemu-commits] [qemu/qemu] 0d8e58: xen: fix style of hw/block/xen_blkif.h

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 0d8e58942a0b0b616bf26c816873102e6d059dc7
      
https://github.com/qemu/qemu/commit/0d8e58942a0b0b616bf26c816873102e6d059dc7
  Author: Juergen Gross <address@hidden>
  Date:   2016-06-22 (Wed, 22 Jun 2016)

  Changed paths:
    M hw/block/xen_blkif.h

  Log Message:
  -----------
  xen: fix style of hw/block/xen_blkif.h

Fix hw/block/xen_blkif.h to match qemu coding style.

Signed-off-by: Juergen Gross <address@hidden>
Acked-by: Stefano Stabellini <address@hidden>
Signed-off-by: Stefano Stabellini <address@hidden>


  Commit: 16246018d3097dc9ce15d07a54360dad03e9a7a6
      
https://github.com/qemu/qemu/commit/16246018d3097dc9ce15d07a54360dad03e9a7a6
  Author: Juergen Gross <address@hidden>
  Date:   2016-06-22 (Wed, 22 Jun 2016)

  Changed paths:
    M hw/block/xen_blkif.h

  Log Message:
  -----------
  xen: fix qdisk BLKIF_OP_DISCARD for 32/64 word size mix

In case the word size of the domU and qemu running the qdisk backend
differ BLKIF_OP_DISCARD will not work reliably, as the request
structure in the ring have different layouts for different word size.

Correct this by copying the request structure in case of different
word size element by element in the BLKIF_OP_DISCARD case, too.

Signed-off-by: Juergen Gross <address@hidden>
Acked-by: Stefano Stabellini <address@hidden>
Signed-off-by: Stefano Stabellini <address@hidden>


  Commit: 25f8f6b4c295940ae5d83c19509353afc1dbc9a4
      
https://github.com/qemu/qemu/commit/25f8f6b4c295940ae5d83c19509353afc1dbc9a4
  Author: Juergen Gross <address@hidden>
  Date:   2016-06-22 (Wed, 22 Jun 2016)

  Changed paths:
    M hw/xen/xen_backend.c
    M hw/xenpv/xen_machine_pv.c

  Log Message:
  -----------
  xen: move xen_sysdev to xen_backend.c

Commit 9432e53a5bc88681b2d3aec4dac9db07c5476d1b added xen_sysdev as a
system device to serve as an anchor for removable virtual buses. This
introduced a build failure for non-x86 builds with CONFIG_XEN_BACKEND
set, as xen_sysdev was defined in a x86 specific file while being
consumed in an architecture independent source.

Move the xen_sysdev definition and initialization to xen_backend.c to
avoid the build failure.

Signed-off-by: Juergen Gross <address@hidden>
Reviewed-by: Anthony PERARD <address@hidden>
Acked-by: Stefano Stabellini <address@hidden>
Signed-off-by: Stefano Stabellini <address@hidden>


  Commit: 59a79f65ba1eb197609532b52df7d48617c75b33
      
https://github.com/qemu/qemu/commit/59a79f65ba1eb197609532b52df7d48617c75b33
  Author: Peter Maydell <address@hidden>
  Date:   2016-06-23 (Thu, 23 Jun 2016)

  Changed paths:
    M hw/block/xen_blkif.h
    M hw/xen/xen_backend.c
    M hw/xenpv/xen_machine_pv.c

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

xen-20160622

# gpg: Signature made Wed 22 Jun 2016 12:45:56 BST
# gpg:                using RSA key 0x894F8F4870E1AE90
# gpg: Good signature from "Stefano Stabellini <address@hidden>"
# Primary key fingerprint: D04E 33AB A51F 67BA 07D3  0AEA 894F 8F48 70E1 AE90

* remotes/sstabellini/tags/xen-20160622-tag:
  xen: move xen_sysdev to xen_backend.c
  xen: fix qdisk BLKIF_OP_DISCARD for 32/64 word size mix
  xen: fix style of hw/block/xen_blkif.h

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


Compare: https://github.com/qemu/qemu/compare/6f1d2d1c5ad2...59a79f65ba1e