| Message ID | 20190619201050.19040-16-armbru@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | Move QOM, qdev, machine core and dump code | expand |
On Wed, Jun 19, 2019 at 10:10 PM Markus Armbruster <armbru@redhat.com> wrote: > > Cc: Marc-André Lureau <marcandre.lureau@redhat.com> > Signed-off-by: Markus Armbruster <armbru@redhat.com> Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com> > --- > MAINTAINERS | 2 +- > Makefile.target | 3 +-- > dump/Makefile.objs | 2 ++ > dump.c => dump/dump.c | 0 > win_dump.c => dump/win_dump.c | 0 > win_dump.h => dump/win_dump.h | 0 > 6 files changed, 4 insertions(+), 3 deletions(-) > create mode 100644 dump/Makefile.objs > rename dump.c => dump/dump.c (100%) > rename win_dump.c => dump/win_dump.c (100%) > rename win_dump.h => dump/win_dump.h (100%) > > diff --git a/MAINTAINERS b/MAINTAINERS > index ea110e99ca..a3fdda015f 100644 > --- a/MAINTAINERS > +++ b/MAINTAINERS > @@ -1850,7 +1850,7 @@ F: include/sysemu/device_tree.h > Dump > S: Supported > M: Marc-André Lureau <marcandre.lureau@redhat.com> > -F: dump.c > +F: dump/dump.c > F: hw/misc/vmcoreinfo.c > F: include/hw/misc/vmcoreinfo.h > F: include/sysemu/dump-arch.h > diff --git a/Makefile.target b/Makefile.target > index 167ae2174e..a6919e0caf 100644 > --- a/Makefile.target > +++ b/Makefile.target > @@ -150,13 +150,12 @@ endif #CONFIG_BSD_USER > ifdef CONFIG_SOFTMMU > obj-y += arch_init.o cpus.o gdbstub.o balloon.o ioport.o > obj-y += qtest.o > +obj-y += dump/ > obj-y += hw/ > obj-y += monitor/ > obj-y += qapi/ > obj-y += memory.o > obj-y += memory_mapping.o > -obj-y += dump.o > -obj-$(TARGET_X86_64) += win_dump.o > obj-y += migration/ram.o > LIBS := $(libs_softmmu) $(LIBS) > > diff --git a/dump/Makefile.objs b/dump/Makefile.objs > new file mode 100644 > index 0000000000..ea6b074967 > --- /dev/null > +++ b/dump/Makefile.objs > @@ -0,0 +1,2 @@ > +obj-y += dump.o > +obj-$(TARGET_X86_64) += win_dump.o > diff --git a/dump.c b/dump/dump.c > similarity index 100% > rename from dump.c > rename to dump/dump.c > diff --git a/win_dump.c b/dump/win_dump.c > similarity index 100% > rename from win_dump.c > rename to dump/win_dump.c > diff --git a/win_dump.h b/dump/win_dump.h > similarity index 100% > rename from win_dump.h > rename to dump/win_dump.h > -- > 2.21.0 >
On Wed, Jun 19, 2019 at 10:10:48PM +0200, Markus Armbruster wrote: > Cc: Marc-André Lureau <marcandre.lureau@redhat.com> > Signed-off-by: Markus Armbruster <armbru@redhat.com> > --- > MAINTAINERS | 2 +- > Makefile.target | 3 +-- > dump/Makefile.objs | 2 ++ > dump.c => dump/dump.c | 0 > win_dump.c => dump/win_dump.c | 0 > win_dump.h => dump/win_dump.h | 0 > 6 files changed, 4 insertions(+), 3 deletions(-) > create mode 100644 dump/Makefile.objs > rename dump.c => dump/dump.c (100%) > rename win_dump.c => dump/win_dump.c (100%) > rename win_dump.h => dump/win_dump.h (100%) Reviewed-by: Daniel P. Berrangé <berrange@redhat.com> Regards, Daniel
diff --git a/MAINTAINERS b/MAINTAINERS index ea110e99ca..a3fdda015f 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1850,7 +1850,7 @@ F: include/sysemu/device_tree.h Dump S: Supported M: Marc-André Lureau <marcandre.lureau@redhat.com> -F: dump.c +F: dump/dump.c F: hw/misc/vmcoreinfo.c F: include/hw/misc/vmcoreinfo.h F: include/sysemu/dump-arch.h diff --git a/Makefile.target b/Makefile.target index 167ae2174e..a6919e0caf 100644 --- a/Makefile.target +++ b/Makefile.target @@ -150,13 +150,12 @@ endif #CONFIG_BSD_USER ifdef CONFIG_SOFTMMU obj-y += arch_init.o cpus.o gdbstub.o balloon.o ioport.o obj-y += qtest.o +obj-y += dump/ obj-y += hw/ obj-y += monitor/ obj-y += qapi/ obj-y += memory.o obj-y += memory_mapping.o -obj-y += dump.o -obj-$(TARGET_X86_64) += win_dump.o obj-y += migration/ram.o LIBS := $(libs_softmmu) $(LIBS) diff --git a/dump/Makefile.objs b/dump/Makefile.objs new file mode 100644 index 0000000000..ea6b074967 --- /dev/null +++ b/dump/Makefile.objs @@ -0,0 +1,2 @@ +obj-y += dump.o +obj-$(TARGET_X86_64) += win_dump.o diff --git a/dump.c b/dump/dump.c similarity index 100% rename from dump.c rename to dump/dump.c diff --git a/win_dump.c b/dump/win_dump.c similarity index 100% rename from win_dump.c rename to dump/win_dump.c diff --git a/win_dump.h b/dump/win_dump.h similarity index 100% rename from win_dump.h rename to dump/win_dump.h
Cc: Marc-André Lureau <marcandre.lureau@redhat.com> Signed-off-by: Markus Armbruster <armbru@redhat.com> --- MAINTAINERS | 2 +- Makefile.target | 3 +-- dump/Makefile.objs | 2 ++ dump.c => dump/dump.c | 0 win_dump.c => dump/win_dump.c | 0 win_dump.h => dump/win_dump.h | 0 6 files changed, 4 insertions(+), 3 deletions(-) create mode 100644 dump/Makefile.objs rename dump.c => dump/dump.c (100%) rename win_dump.c => dump/win_dump.c (100%) rename win_dump.h => dump/win_dump.h (100%)