Add -no-virtio-balloon command-line option

This new option may be used to disable the virtio-balloon device.

Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Eduardo Habkost 2009-06-10 16:34:08 -03:00 committed by Anthony Liguori
parent 6693665ace
commit df97b92060
4 changed files with 15 additions and 1 deletions

View File

@ -1152,7 +1152,7 @@ static void pc_init1(ram_addr_t ram_size,
} }
/* Add virtio balloon device */ /* Add virtio balloon device */
if (pci_enabled) { if (pci_enabled && !no_virtio_balloon) {
pci_create_simple(pci_bus, -1, "virtio-balloon-pci"); pci_create_simple(pci_bus, -1, "virtio-balloon-pci");
} }

View File

@ -680,6 +680,15 @@ STEXI
Disable HPET support. Disable HPET support.
ETEXI ETEXI
#ifdef TARGET_I386
DEF("no-virtio-balloon", 0, QEMU_OPTION_no_virtio_balloon,
"-no-virtio-balloon disable virtio balloon device\n")
#endif
STEXI
@item -no-virtio-balloon
Disable virtio-balloon device.
ETEXI
#ifdef TARGET_I386 #ifdef TARGET_I386
DEF("acpitable", HAS_ARG, QEMU_OPTION_acpitable, DEF("acpitable", HAS_ARG, QEMU_OPTION_acpitable,
"-acpitable [sig=str][,rev=n][,oem_id=str][,oem_table_id=str][,oem_rev=n][,asl_compiler_id=str][,asl_compiler_rev=n][,data=file1[:file2]...]\n" "-acpitable [sig=str][,rev=n][,oem_id=str][,oem_table_id=str][,oem_rev=n][,asl_compiler_id=str][,asl_compiler_rev=n][,data=file1[:file2]...]\n"

View File

@ -116,6 +116,7 @@ extern int win2k_install_hack;
extern int rtc_td_hack; extern int rtc_td_hack;
extern int alt_grab; extern int alt_grab;
extern int usb_enabled; extern int usb_enabled;
extern int no_virtio_balloon;
extern int smp_cpus; extern int smp_cpus;
extern int cursor_hide; extern int cursor_hide;
extern int graphic_rotate; extern int graphic_rotate;

4
vl.c
View File

@ -244,6 +244,7 @@ int smp_cpus = 1;
const char *vnc_display; const char *vnc_display;
int acpi_enabled = 1; int acpi_enabled = 1;
int no_hpet = 0; int no_hpet = 0;
int no_virtio_balloon = 0;
int fd_bootchk = 1; int fd_bootchk = 1;
int no_reboot = 0; int no_reboot = 0;
int no_shutdown = 0; int no_shutdown = 0;
@ -5551,6 +5552,9 @@ int main(int argc, char **argv, char **envp)
case QEMU_OPTION_no_hpet: case QEMU_OPTION_no_hpet:
no_hpet = 1; no_hpet = 1;
break; break;
case QEMU_OPTION_no_virtio_balloon:
no_virtio_balloon = 1;
break;
#endif #endif
case QEMU_OPTION_no_reboot: case QEMU_OPTION_no_reboot:
no_reboot = 1; no_reboot = 1;