| Message ID | 20200908155530.249806-1-philmd@redhat.com |
|---|---|
| Headers | show |
| Series | hw/xen: Housekeeping | expand |
On 9/8/20 5:55 PM, Philippe Mathieu-Daudé wrote: > Move hardware stubs unrelated from the accelerator to xen-hw-stub.c. > > Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> > --- ... > Guest CPU Cores (HAXM) > --------------------- > diff --git a/stubs/meson.build b/stubs/meson.build > index e0b322bc282..c3e318a57f3 100644 > --- a/stubs/meson.build > +++ b/stubs/meson.build > @@ -46,4 +46,5 @@ stub_ss.add(files('vm-stop.c')) > stub_ss.add(files('win32-kbd-hook.c')) > if have_system > stub_ss.add(files('semihost.c')) > + stub_ss.add(when: 'CONFIG_XEN', if_false: files('xen-hw-stub.c')) Bah wrong place :/ not my day. > endif >
On 08/09/20 17:55, Philippe Mathieu-Daudé wrote: > Hard to make an exciting cover of this series. > > Basically: > - Make better separation between Xen accel and Xen hardware, > - Move stuff around to restrict PCMachineState to hw/i386/. > > Since v1: > - added missing include in stubs/xen-hw-stub.c > - added missing 'exec/cpu-common.h' for ram_addr_t > > (Due to a bug in 'make', while rebasing the archives > might not be updated... so I missed this missing > hunk as hw/core/libhwcore.fa didn't rebuilt stubs/) > > Philippe Mathieu-Daudé (6): > hw/i386/q35: Remove unreachable Xen code on Q35 machine > hw/i386/xen: Rename X86/PC specific function as xen_hvm_init_pc() > sysemu/xen: Add missing 'exec/cpu-common.h' header for ram_addr_t type > stubs: Split accelerator / hardware related stubs > hw/xen: Split x86-specific declaration from generic hardware ones > typedefs: Restrict PCMachineState to 'hw/i386/pc.h' > > include/hw/i386/pc.h | 4 ++-- > include/hw/xen/xen-x86.h | 15 ++++++++++++ > include/hw/xen/xen.h | 2 -- > include/qemu/typedefs.h | 1 - > include/sysemu/xen.h | 2 ++ > accel/stubs/xen-stub.c | 41 +------------------------------- > hw/i386/pc_piix.c | 8 +++---- > hw/i386/pc_q35.c | 13 ++--------- > hw/i386/xen/xen-hvm.c | 3 ++- > stubs/xen-hw-stub.c | 50 ++++++++++++++++++++++++++++++++++++++++ > MAINTAINERS | 1 + > stubs/meson.build | 1 + > 12 files changed, 80 insertions(+), 61 deletions(-) > create mode 100644 include/hw/xen/xen-x86.h > create mode 100644 stubs/xen-hw-stub.c > Queued, thanks. Paolo