| Message ID | alpine.DEB.2.02.1405071606230.14596@kaball.uk.xensource.com |
|---|---|
| State | New |
| Headers | show |
On 7 May 2014 16:09, Stefano Stabellini <stefano.stabellini@eu.citrix.com> wrote: > The following changes since commit 951916d02c59cd0eddd57c3d66f87f921931e394: > > Merge remote-tracking branch 'remotes/kraxel/tags/pull-usb-6' into staging (2014-05-06 13:06:32 +0100) > > are available in the git repository at: > > > git://xenbits.xen.org/people/sstabellini/qemu-dm.git xen-140507 > > for you to fetch changes up to 6a16be0810eccd3aede1ef592c3c1b64430b3280: > > xen_disk: add discard support (2014-05-07 14:56:54 +0000) Hi; I'm afraid I get merge conflicts when I pull this: From git://xenbits.xen.org/people/sstabellini/qemu-dm * [new branch] xen-140507 -> sstabellini/xen-140507 merging... Auto-merging xen-hvm.c CONFLICT (content): Merge conflict in xen-hvm.c Auto-merging xen-hvm-stub.c CONFLICT (content): Merge conflict in xen-hvm-stub.c Automatic merge failed; fix conflicts and then commit the result. It looks like they're pretty trivial, but since this pull involves file renames and I have no way to test Xen, I'd appreciate it if you could reroll the pull request. thanks -- PMM
On Wed, 7 May 2014, Peter Maydell wrote: > On 7 May 2014 16:09, Stefano Stabellini > <stefano.stabellini@eu.citrix.com> wrote: > > The following changes since commit 951916d02c59cd0eddd57c3d66f87f921931e394: > > > > Merge remote-tracking branch 'remotes/kraxel/tags/pull-usb-6' into staging (2014-05-06 13:06:32 +0100) > > > > are available in the git repository at: > > > > > > git://xenbits.xen.org/people/sstabellini/qemu-dm.git xen-140507 > > > > for you to fetch changes up to 6a16be0810eccd3aede1ef592c3c1b64430b3280: > > > > xen_disk: add discard support (2014-05-07 14:56:54 +0000) > > Hi; I'm afraid I get merge conflicts when I pull this: > >From git://xenbits.xen.org/people/sstabellini/qemu-dm > * [new branch] xen-140507 -> sstabellini/xen-140507 > merging... > Auto-merging xen-hvm.c > CONFLICT (content): Merge conflict in xen-hvm.c > Auto-merging xen-hvm-stub.c > CONFLICT (content): Merge conflict in xen-hvm-stub.c > Automatic merge failed; fix conflicts and then commit the result. > > It looks like they're pretty trivial, but since this pull involves > file renames and I have no way to test Xen, I'd appreciate > it if you could reroll the pull request. Sure
The following changes since commit 951916d02c59cd0eddd57c3d66f87f921931e394: Merge remote-tracking branch 'remotes/kraxel/tags/pull-usb-6' into staging (2014-05-06 13:06:32 +0100) are available in the git repository at: git://xenbits.xen.org/people/sstabellini/qemu-dm.git xen-140507 for you to fetch changes up to 6a16be0810eccd3aede1ef592c3c1b64430b3280: xen_disk: add discard support (2014-05-07 14:56:54 +0000) ---------------------------------------------------------------- Alexey Kardashevskiy (1): exec: Limit translation limiting in address_space_translate to xen Olaf Hering (1): xen_disk: add discard support Stefano Stabellini (1): pass an inclusive address range to xc_domain_pin_memory_cacheattr Wei Liu (3): xen: move Xen PV machine files to hw/xenpv xen: move Xen HVM files under hw/i386/xen xen: factor out common functions Zhenzhong Duan (1): qemu-xen: free all the pirqs for msi/msix when driver unload Makefile.target | 6 +- exec.c | 2 +- hw/block/xen_blkif.h | 12 ++++ hw/block/xen_disk.c | 33 +++++++++ hw/i386/Makefile.objs | 2 +- hw/i386/xen/Makefile.objs | 1 + hw/{ => i386}/xen/xen_apic.c | 0 hw/{ => i386}/xen/xen_platform.c | 0 hw/{ => i386}/xen/xen_pvdevice.c | 0 hw/xen/Makefile.objs | 1 - hw/xen/xen_pt_config_init.c | 6 +- hw/xen/xen_pt_msi.c | 6 +- hw/xenpv/Makefile.objs | 2 + hw/{i386 => xenpv}/xen_domainbuild.c | 0 hw/{i386 => xenpv}/xen_domainbuild.h | 0 hw/{i386 => xenpv}/xen_machine_pv.c | 0 include/hw/xen/xen_common.h | 7 ++ xen-common-stub.c | 19 ++++++ xen-common.c | 123 ++++++++++++++++++++++++++++++++++ xen-stub.c => xen-hvm-stub.c | 17 ++--- xen-all.c => xen-hvm.c | 123 ++++------------------------------ 21 files changed, 227 insertions(+), 133 deletions(-) create mode 100644 hw/i386/xen/Makefile.objs rename hw/{ => i386}/xen/xen_apic.c (100%) rename hw/{ => i386}/xen/xen_platform.c (100%) rename hw/{ => i386}/xen/xen_pvdevice.c (100%) create mode 100644 hw/xenpv/Makefile.objs rename hw/{i386 => xenpv}/xen_domainbuild.c (100%) rename hw/{i386 => xenpv}/xen_domainbuild.h (100%) rename hw/{i386 => xenpv}/xen_machine_pv.c (100%) create mode 100644 xen-common-stub.c create mode 100644 xen-common.c rename xen-stub.c => xen-hvm-stub.c (89%) rename xen-all.c => xen-hvm.c (92%)