diff options
author | Markus Armbruster <armbru@redhat.com> | 2009-07-01 00:58:55 +0200 |
---|---|---|
committer | Eduardo Habkost <ehabkost@redhat.com> | 2009-07-02 14:32:42 -0300 |
commit | ba166830907e7d7434800921c793704d378ce743 (patch) | |
tree | 98cfc9c038000df8455d5ad41a56a955058778c3 | |
parent | 4fd636dd5d2fc0f0815ae5390bc45fb5070b135e (diff) |
Remove broken command line option -balloon
It clashes with upstream's -balloon.
Crept in with -vmchannel in commit af595fab. Originally came from
qemu-kvm, but is long gone there. Doesn't work, because commit
af595fab failed to put it in qemu_options[] (looks like a conflict
resolution accident).
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-ID: <87zlbpwcpc.fsf@pike.pond.sub.org>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Bugzilla: 503790
RH-Upstream-status: not-applicable
Acked-by: Eduardo Habkost <ehabkost@redhat.com>
Acked-by: john cooper <john.cooper@redhat.com>
Acked-by: Luiz Capitulino <lcapitulino@redhat.com>
-rw-r--r-- | qemu/vl.c | 16 |
1 files changed, 0 insertions, 16 deletions
@@ -221,7 +221,6 @@ static int full_screen = 0; static int no_frame = 0; #endif int no_quit = 0; -int balloon_used = 0; CharDriverState *vmchannel_hds[MAX_VMCHANNEL_DEVICES]; CharDriverState *serial_hds[MAX_SERIAL_PORTS]; CharDriverState *parallel_hds[MAX_PARALLEL_PORTS]; @@ -4248,7 +4247,6 @@ static void help(int exitcode) "Debug/Expert options:\n" "-monitor dev redirect the monitor to char device 'dev'\n" "-vmchannel di:DI,dev redirect the hypercall device with device id DI, to char device 'dev'\n" - "-balloon dev redirect the balloon hypercall device to char device 'dev'\n" "-serial dev redirect the serial port to char device 'dev'\n" "-parallel dev redirect the parallel port to char device 'dev'\n" "-pidfile file Write PID to 'file'\n" @@ -4398,7 +4396,6 @@ enum { QEMU_OPTION_vga, QEMU_OPTION_echr, QEMU_OPTION_monitor, - QEMU_OPTION_balloon, QEMU_OPTION_vmchannel, QEMU_OPTION_serial, QEMU_OPTION_parallel, @@ -5510,19 +5507,6 @@ int main(int argc, char **argv, char **envp) case QEMU_OPTION_monitor: monitor_device = optarg; break; - case QEMU_OPTION_balloon: - if (vmchannel_device_index >= MAX_VMCHANNEL_DEVICES) { - fprintf(stderr, "qemu: too many balloon/vmchannel devices\n"); - exit(1); - } - if (balloon_used) { - fprintf(stderr, "qemu: only one balloon device can be used\n"); - exit(1); - } - sprintf(vmchannel_devices[vmchannel_device_index],"di:cdcd,%s", optarg); - vmchannel_device_index++; - balloon_used = 1; - break; case QEMU_OPTION_vmchannel: if (vmchannel_device_index >= MAX_VMCHANNEL_DEVICES) { fprintf(stderr, "qemu: too many balloon/vmchannel devices\n"); |