| Message ID | alpine.DEB.2.22.394.2302101420510.4661@ubuntu-linux-20-04-desktop (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Fri, 10 Feb 2023 at 22:27, Stefano Stabellini <sstabellini@kernel.org> wrote: > > The following changes since commit 90595cc9396bb910b148391fea2e78dd8c6c8b27: > > Merge tag 'migration-20230209-pull-request' of https://gitlab.com/juan.quintela/qemu into staging (2023-02-10 10:50:21 +0000) > > are available in the Git repository at: > > https://gitlab.com/sstabellini/qemu.git xenpvh > > for you to fetch changes up to 3f8ee848693872e3783cdcf2862be5421bb9cbcb: > > meson.build: enable xenpv machine build for ARM (2023-02-10 14:23:47 -0800) Hi -- 'xenpvh' doesn't appear to be a signed tag: From https://gitlab.com/sstabellini/qemu * branch xenpvh -> FETCH_HEAD error: FETCH_HEAD: cannot verify a non-tag object of type commit. Does not appear to be a signed tag thanks -- PMM
On Mon, 13 Feb 2023, Peter Maydell wrote: > On Fri, 10 Feb 2023 at 22:27, Stefano Stabellini <sstabellini@kernel.org> wrote: > > > > The following changes since commit 90595cc9396bb910b148391fea2e78dd8c6c8b27: > > > > Merge tag 'migration-20230209-pull-request' of https://gitlab.com/juan.quintela/qemu into staging (2023-02-10 10:50:21 +0000) > > > > are available in the Git repository at: > > > > https://gitlab.com/sstabellini/qemu.git xenpvh > > > > for you to fetch changes up to 3f8ee848693872e3783cdcf2862be5421bb9cbcb: > > > > meson.build: enable xenpv machine build for ARM (2023-02-10 14:23:47 -0800) > > Hi -- 'xenpvh' doesn't appear to be a signed tag: > > >From https://gitlab.com/sstabellini/qemu > * branch xenpvh -> FETCH_HEAD > error: FETCH_HEAD: cannot verify a non-tag object of type commit. > Does not appear to be a signed tag Sorry "xenpvh" was a branch name. Here is the corresponding signed tag: https://gitlab.com/sstabellini/qemu xenpvh-tag
On Mon, 13 Feb 2023 at 22:34, Stefano Stabellini <sstabellini@kernel.org> wrote: > > On Mon, 13 Feb 2023, Peter Maydell wrote: > > On Fri, 10 Feb 2023 at 22:27, Stefano Stabellini <sstabellini@kernel.org> wrote: > > > > > > The following changes since commit 90595cc9396bb910b148391fea2e78dd8c6c8b27: > > > > > > Merge tag 'migration-20230209-pull-request' of https://gitlab.com/juan.quintela/qemu into staging (2023-02-10 10:50:21 +0000) > > > > > > are available in the Git repository at: > > > > > > https://gitlab.com/sstabellini/qemu.git xenpvh > > > > > > for you to fetch changes up to 3f8ee848693872e3783cdcf2862be5421bb9cbcb: > > > > > > meson.build: enable xenpv machine build for ARM (2023-02-10 14:23:47 -0800) > > > > Hi -- 'xenpvh' doesn't appear to be a signed tag: > > > > >From https://gitlab.com/sstabellini/qemu > > * branch xenpvh -> FETCH_HEAD > > error: FETCH_HEAD: cannot verify a non-tag object of type commit. > > Does not appear to be a signed tag > > Sorry "xenpvh" was a branch name. Here is the corresponding signed tag: > > https://gitlab.com/sstabellini/qemu xenpvh-tag Something weird has happened here -- I'm getting merge conflicts in files in migration/ and in tests/unit/test-xbzrle.c, even though your pullreq diffstat says it doesn't touch those files. Can you try a rebase and resend? thanks -- PMM
On Tue, 14 Feb 2023, Peter Maydell wrote: > On Mon, 13 Feb 2023 at 22:34, Stefano Stabellini <sstabellini@kernel.org> wrote: > > > > On Mon, 13 Feb 2023, Peter Maydell wrote: > > > On Fri, 10 Feb 2023 at 22:27, Stefano Stabellini <sstabellini@kernel.org> wrote: > > > > > > > > The following changes since commit 90595cc9396bb910b148391fea2e78dd8c6c8b27: > > > > > > > > Merge tag 'migration-20230209-pull-request' of https://gitlab.com/juan.quintela/qemu into staging (2023-02-10 10:50:21 +0000) > > > > > > > > are available in the Git repository at: > > > > > > > > https://gitlab.com/sstabellini/qemu.git xenpvh > > > > > > > > for you to fetch changes up to 3f8ee848693872e3783cdcf2862be5421bb9cbcb: > > > > > > > > meson.build: enable xenpv machine build for ARM (2023-02-10 14:23:47 -0800) > > > > > > Hi -- 'xenpvh' doesn't appear to be a signed tag: > > > > > > >From https://gitlab.com/sstabellini/qemu > > > * branch xenpvh -> FETCH_HEAD > > > error: FETCH_HEAD: cannot verify a non-tag object of type commit. > > > Does not appear to be a signed tag > > > > Sorry "xenpvh" was a branch name. Here is the corresponding signed tag: > > > > https://gitlab.com/sstabellini/qemu xenpvh-tag > > Something weird has happened here -- I'm getting merge conflicts > in files in migration/ and in tests/unit/test-xbzrle.c, even though > your pullreq diffstat says it doesn't touch those files. Can you > try a rebase and resend? Just sent as a full pull request patch series. Also here for convenience: https://gitlab.com/sstabellini/qemu xenpvh2
On Tue, 2023-02-14 at 15:44 -0800, Stefano Stabellini wrote: > > Something weird has happened here -- I'm getting merge conflicts > > in files in migration/ and in tests/unit/test-xbzrle.c, even though > > your pullreq diffstat says it doesn't touch those files. Can you > > try a rebase and resend? > > Just sent as a full pull request patch series. Also here for > convenience: > > https://gitlab.com/sstabellini/qemu xenpvh2 I've rebased my tree at https://git.infradead.org/users/dwmw2/qemu.git/shortlog/refs/heads/xenfv on top of this. For the "phase 1" series I've been posting already, there's not a lot of interaction. But when it comes to wiring up all the PV back ends there were a few things to tweak, including frowning at the fact that you moved xen_bus_init() and xen_be_init() to somewhere generic to cover both "actual Xen" builds, while I wanted to move it to pc.c to cover "actual Xen" and "emulated Xen" on i386. I think I'm happy with what I did there in the final two commits. Please could I ask you to give it a quick smoke test on Arm?
The following changes since commit 90595cc9396bb910b148391fea2e78dd8c6c8b27: Merge tag 'migration-20230209-pull-request' of https://gitlab.com/juan.quintela/qemu into staging (2023-02-10 10:50:21 +0000) are available in the Git repository at: https://gitlab.com/sstabellini/qemu.git xenpvh for you to fetch changes up to 3f8ee848693872e3783cdcf2862be5421bb9cbcb: meson.build: enable xenpv machine build for ARM (2023-02-10 14:23:47 -0800) ---------------------------------------------------------------- Stefano Stabellini (5): hw/i386/xen/xen-hvm: move x86-specific fields out of XenIOState xen-hvm: reorganize xen-hvm and move common function to xen-hvm-common include/hw/xen/xen_common: return error from xen_create_ioreq_server hw/xen/xen-hvm-common: skip ioreq creation on ioreq registration failure meson.build: do not set have_xen_pci_passthrough for aarch64 targets Vikram Garhwal (5): hw/i386/xen/: move xen-mapcache.c to hw/xen/ hw/i386/xen: rearrange xen_hvm_init_pc hw/xen/xen-hvm-common: Use g_new and error_report hw/arm: introduce xenpvh machine meson.build: enable xenpv machine build for ARM docs/system/arm/xenpvh.rst | 34 ++ docs/system/target-arm.rst | 1 + hw/arm/meson.build | 2 + hw/arm/xen_arm.c | 182 +++++++ hw/i386/meson.build | 1 + hw/i386/xen/meson.build | 1 - hw/i386/xen/trace-events | 19 - hw/i386/xen/xen-hvm.c | 1078 ++++---------------------------------- hw/xen/meson.build | 7 + hw/xen/trace-events | 19 + hw/xen/xen-hvm-common.c | 893 +++++++++++++++++++++++++++++++ hw/{i386 => }/xen/xen-mapcache.c | 0 include/hw/arm/xen_arch_hvm.h | 9 + include/hw/i386/xen_arch_hvm.h | 11 + include/hw/xen/arch_hvm.h | 5 + include/hw/xen/xen-hvm-common.h | 98 ++++ include/hw/xen/xen_common.h | 13 +- meson.build | 4 +- 18 files changed, 1364 insertions(+), 1013 deletions(-) create mode 100644 docs/system/arm/xenpvh.rst create mode 100644 hw/arm/xen_arm.c create mode 100644 hw/xen/xen-hvm-common.c rename hw/{i386 => }/xen/xen-mapcache.c (100%) create mode 100644 include/hw/arm/xen_arch_hvm.h create mode 100644 include/hw/i386/xen_arch_hvm.h create mode 100644 include/hw/xen/arch_hvm.h create mode 100644 include/hw/xen/xen-hvm-common.h