Skip to contentSkip to conversation

Get machine name from name of executable

PATCH In review Stefan Weil 3 participants 5 messages May 14, 2006

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Get machine name from name of executable

Today, QEMU allows machine selection using command line option -M. Without this option, it will always take the first machine for the given target architecture.

With my patch, QEMU first parses the name of the executable. The string after the last '-' is interpreted as machine name. If this machine does not exist, the first machine is taken, so the new QEMU remains compatible with the old behaviour.

With this patch, an installation might link e.g. qemu-system-arm to qemu-system-arm-integratorcp926, and running qemu-system-arm-integratorcp926 will automatically select machine integratorcp926.

My goal is a MIPS emulation which supports big and little endian mode in the same executable (like the real hardware). qemu-system-mipsel would be a symbolic link to qemu-system-mips and enable little endian mode.

I propose another code modification: instead of registration of all machines in vl.c, vl.c might call a target procedure which does this registration. So if MIPS, ARM or other targets add machines, vl.c would not change.
Example: vl.c calls qemu_register_mips_machines() which calls qemu_register_machine(&mips_machine).

Regards,
Stefan

vl.c 12 May 2006 20:19:15 -0000 renamed from vl.c 3 May 2006 22:02:44 -0000 1.185 +0 -0
@@ -4252,7 +4254,7 @@
    return 0;

}

-QEMUMachine *find_machine(const char *name) +static QEMUMachine *find_machine(const char *name)

{
    QEMUMachine *m;

@@ -5075,7 +5077,14 @@

    mallopt(M_MMAP_THRESHOLD, 4096 * 1024);
#endif
    register_machines();
+    machine = 0;
+    optarg = strrchr(argv[0], '-');
+    if (optarg != 0) {
+        machine = find_machine(optarg + 1);
+    }
+    if (!machine) {
    machine = first_machine;
+    }
    initrd_filename = NULL;
    for(i = 0; i < MAX_FD; i++)
        fd_filename[i] = NULL;
#1 lore raw
Quoted 9 lines · Stefan Weil

Today, QEMU allows machine selection using command line option -M. Without this option, it will always take the first machine for the given target architecture.

With my patch, QEMU first parses the name of the executable. The string after the last '-' is interpreted as machine name. If this machine does not exist, the first machine is taken, so the new QEMU remains compatible with the old behaviour.

Quoted 8 lines

With this patch, an installation might link e.g. qemu-system-arm to qemu-system-arm-integratorcp926, and running qemu-system-arm-integratorcp926
will automatically select machine integratorcp926.

My goal is a MIPS emulation which supports big and little endian mode in the same executable (like the real hardware). qemu-system-mipsel would be a symbolic link to qemu-system-mips and enable little endian mode.

A similiar approach was abandoned years ago in the case of GNU ls/dir/vdir due to continuous trouble on non-posix systems, and the potential of unexpected results with this aproach. (E.g. what happens if somebody adds a symlink qemu-default -> qemu-system-mipsel).

Thiemo

#2 lore raw
In reply to Stefan Weil

Hi,

The long term plan for qemu is to have a single executable for all machines. If you make a single executable for mips and mipsel, it is better to select the endianness in the code of the machine itself when initializing the CPU.

Regards,

Fabrice.

Quoted 62 lines · Stefan Weil

Today, QEMU allows machine selection using command line option -M. Without this option, it will always take the first machine for the given target architecture.

With my patch, QEMU first parses the name of the executable. The string after the last '-' is interpreted as machine name. If this machine does not exist, the first machine is taken, so the new QEMU remains compatible with the old behaviour.

With this patch, an installation might link e.g. qemu-system-arm to qemu-system-arm-integratorcp926, and running qemu-system-arm-integratorcp926 will automatically select machine integratorcp926.

My goal is a MIPS emulation which supports big and little endian mode in the same executable (like the real hardware). qemu-system-mipsel would be a symbolic link to qemu-system-mips and enable little endian mode.

I propose another code modification: instead of registration of all machines in vl.c, vl.c might call a target procedure which does this registration. So if MIPS, ARM or other targets add machines, vl.c would not change.
Example: vl.c calls qemu_register_mips_machines() which calls qemu_register_machine(&mips_machine).

Regards,
Stefan

vl.c 12 May 2006 20:19:15 -0000 renamed from vl.c 3 May 2006 22:02:44 -0000 1.185 +8 -1
@@ -4252,7 +4254,7 @@
    return 0;
 }
 
-QEMUMachine *find_machine(const char *name)
+static QEMUMachine *find_machine(const char *name)
 {
    QEMUMachine *m;
 
@@ -5075,7 +5077,14 @@
    mallopt(M_MMAP_THRESHOLD, 4096 * 1024);
 #endif
    register_machines();
+    machine = 0;
+    optarg = strrchr(argv[0], '-');
+    if (optarg != 0) {
+        machine = find_machine(optarg + 1);
+    }
+    if (!machine) {
    machine = first_machine;
+    }
    initrd_filename = NULL;
    for(i = 0; i < MAX_FD; i++)
        fd_filename[i] = NULL;

_______________________________________________
Qemu-devel mailing list
[email protected]
http://lists.nongnu.org/mailman/listinfo/qemu-devel

#3 lore raw

Hi,

ok, I think this plan is a good one. It might even be possible to run several different machines by starting a single QEMU emulation process. But you need some mechanism to tell QEMU which machine(s) to run. Of course, you could add new command line options. MIPS, for example, could select endianness automatically in user mode (from ELF format), but not in system mode when running a complete system with a firmware loader. So you need some way to tell QEMU that this is a MIPS CPU with a certain kind of endianness (the real CPU has a hardware input pin for this, we need something which replaces this hardware input pin).

Did you think about using configuration files (XML, YAML, or any other format) with machine descriptions (CPU, CPU variant, endianness, network hardware, serial ports, other hardware features which are compiled into the code or configured via command line options today)?

Regards
Stefan

Quoted 7 lines · Fabrice Bellard

Hi,

The long term plan for qemu is to have a single executable for all machines. If you make a single executable for mips and mipsel, it is better to select the endianness in the code of the machine itself when initializing the CPU.

Regards,

Fabrice.

#4 lore raw

I don't understand your problem : the '-M' option is used to select the machine. Your "ar7" machine must be added as a new machine. The endianness must be selected inside the machine code. If the machine can be launched with the two endiannesses, then you can just add two machines names.

Fabrice.

Quoted 36 lines · Stefan Weil

Hi,

ok, I think this plan is a good one. It might even be possible to run several different machines by starting a single QEMU emulation process. But you need some mechanism to tell QEMU which machine(s) to run. Of course, you could add new command line options. MIPS, for example, could select endianness automatically in user mode (from ELF format), but not in system mode when running a complete system with a firmware loader. So you need some way to tell QEMU that this is a MIPS CPU with a certain kind of endianness (the real CPU has a hardware input pin for this, we need something which replaces this hardware input pin).

Did you think about using configuration files (XML, YAML, or any other format) with machine descriptions (CPU, CPU variant, endianness, network hardware, serial ports, other hardware features which are compiled into the code or configured via command line options today)?

Regards
Stefan

Quoted 7 lines · Fabrice Bellard

Hi,

The long term plan for qemu is to have a single executable for all machines. If you make a single executable for mips and mipsel, it is better to select the endianness in the code of the machine itself when initializing the CPU.

Regards,

Fabrice.

_______________________________________________
Qemu-devel mailing list
[email protected]
http://lists.nongnu.org/mailman/listinfo/qemu-devel