Commit 7b733862 authored by Alexander Bulekov's avatar Alexander Bulekov Committed by Stefan Hajnoczi
Browse files

softmmu: split off vl.c:main() into main.c 



A program might rely on functions implemented in vl.c, but implement its
own main(). By placing main into a separate source file, there are no
complaints about duplicate main()s when linking against vl.o. For
example, the virtual-device fuzzer uses a main() provided by libfuzzer,
and needs to perform some initialization before running the softmmu
initialization. Now, main simply calls three vl.c functions which
handle the guest initialization, main loop and cleanup.

Signed-off-by: default avatarAlexander Bulekov <alxndr@bu.edu>
Reviewed-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: default avatarDarren Kenny <darren.kenny@oracle.com>
Message-id: 20200220041118.23264-3-alxndr@bu.edu
Signed-off-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
parent bac068e0

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -2032,6 +2032,7 @@ F: include/sysemu/runstate.h 
F: util/main-loop.c

F: util/qemu-timer.c

F: softmmu/vl.c

F: softmmu/main.c

F: qapi/run-state.json



Human Monitor (HMP)

Makefile.target

+1 −1
Original line number Diff line number Diff line
@@ -203,7 +203,7 @@ endif 
COMMON_LDADDS = ../libqemuutil.a



# build either PROG or PROGW

$(QEMU_PROG_BUILD): $(all-obj-y) $(COMMON_LDADDS)

$(QEMU_PROG_BUILD): $(all-obj-y) $(COMMON_LDADDS) $(softmmu-main-y)

	$(call LINK, $(filter-out %.mak, $^))

ifdef CONFIG_DARWIN

	$(call quiet-command,Rez -append $(SRC_PATH)/pc-bios/qemu.rsrc -o $@,"REZ","$(TARGET_DIR)$@")

include/sysemu/sysemu.h

+4 −0
Original line number Diff line number Diff line
@@ -115,6 +115,10 @@ QemuOpts *qemu_get_machine_opts(void); 


bool defaults_enabled(void);



void qemu_init(int argc, char **argv, char **envp);

void qemu_main_loop(void);

void qemu_cleanup(void);



extern QemuOptsList qemu_legacy_drive_opts;

extern QemuOptsList qemu_common_drive_opts;

extern QemuOptsList qemu_drive_opts;

softmmu/Makefile.objs

+1 −0
Original line number Diff line number Diff line 
softmmu-main-y = softmmu/main.o

obj-y += vl.o

vl.o-cflags := $(GPROF_CFLAGS) $(SDL_CFLAGS)

softmmu/main.c

0 → 100644
+53 −0
Original line number Diff line number Diff line 
/*

 * QEMU System Emulator

 *

 * Copyright (c) 2003-2020 Fabrice Bellard

 *

 * Permission is hereby granted, free of charge, to any person obtaining a copy

 * of this software and associated documentation files (the "Software"), to deal

 * in the Software without restriction, including without limitation the rights

 * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell

 * copies of the Software, and to permit persons to whom the Software is

 * furnished to do so, subject to the following conditions:

 *

 * The above copyright notice and this permission notice shall be included in

 * all copies or substantial portions of the Software.

 *

 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL

 * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

 * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN

 * THE SOFTWARE.

 */



#include "qemu/osdep.h"

#include "qemu-common.h"

#include "sysemu/sysemu.h"



#ifdef CONFIG_SDL

#if defined(__APPLE__) || defined(main)

#include <SDL.h>

int main(int argc, char **argv)

{

    return qemu_main(argc, argv, NULL);

}

#undef main

#define main qemu_main

#endif

#endif /* CONFIG_SDL */



#ifdef CONFIG_COCOA

#undef main

#define main qemu_main

#endif /* CONFIG_COCOA */



int main(int argc, char **argv, char **envp)

{

    qemu_init(argc, argv, envp);

    qemu_main_loop();

    qemu_cleanup();



    return 0;

}