[Xen-changelog] [qemu-xen master] Merge remote-tracking branch 'sstabellini/tags/xen-20161102-tag' into staging

[patchbot@xxxxxxx]

commit 9226682a401f34b10fd79dfe17ba334da0800747
Merge: 199a5bde46b0eab898ab1ec591f423000302569f 
021746c131cdfeab9d82ff918795a9f18d20d7ae
Author:     Stefan Hajnoczi <stefanha@xxxxxxxxxx>
AuthorDate: Fri Nov 4 09:26:24 2016 +0000
Commit:     Stefan Hajnoczi <stefanha@xxxxxxxxxx>
CommitDate: Fri Nov 4 09:26:24 2016 +0000

    Merge remote-tracking branch 'sstabellini/tags/xen-20161102-tag' into 
staging
    
    Xen 2016/11/02
    
    # gpg: Signature made Wed 02 Nov 2016 07:28:40 PM GMT
    # gpg:                using RSA key 0x894F8F4870E1AE90
    # gpg: Good signature from "Stefano Stabellini <sstabellini@xxxxxxxxxx>"
    # gpg:                 aka "Stefano Stabellini 
<stefano.stabellini@xxxxxxxxxxxxx>"
    # Primary key fingerprint: D04E 33AB A51F 67BA 07D3  0AEA 894F 8F48 70E1 
AE90
    
    * sstabellini/tags/xen-20161102-tag:
      PCMachineState: introduce acpi_build_enabled field
      hw/xen/xen_pvdev: Include qemu/log.h for qemu_log_vprintf()
    
    Message-id: alpine.DEB.2.10.1611021227530.19454@sstabellini-ThinkPad-X260
    Signed-off-by: Stefan Hajnoczi <stefanha@xxxxxxxxxx>

 hw/i386/acpi-build.c | 2 +-
 hw/i386/pc.c         | 2 ++
 hw/xen/xen_pvdev.c   | 2 +-
 include/hw/i386/pc.h | 2 ++
 xen-common.c         | 6 ++++++
 5 files changed, 12 insertions(+), 2 deletions(-)

--
generated by git-patchbot for /home/xen/git/qemu-xen.git#master

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
https://lists.xenproject.org/xen-changelog