Revision df97b920

b/hw/pc.c
1152 1152
    }
1153 1153

  
1154 1154
    /* Add virtio balloon device */
1155
    if (pci_enabled) {
1155
    if (pci_enabled && !no_virtio_balloon) {
1156 1156
        pci_create_simple(pci_bus, -1, "virtio-balloon-pci");
1157 1157
    }
1158 1158

  
b/qemu-options.hx
681 681
ETEXI
682 682

  
683 683
#ifdef TARGET_I386
684
DEF("no-virtio-balloon", 0, QEMU_OPTION_no_virtio_balloon,
685
    "-no-virtio-balloon disable virtio balloon device\n")
686
#endif
687
STEXI
688
@item -no-virtio-balloon
689
Disable virtio-balloon device.
690
ETEXI
691

  
692
#ifdef TARGET_I386
684 693
DEF("acpitable", HAS_ARG, QEMU_OPTION_acpitable,
685 694
    "-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"
686 695
    "                ACPI table description\n")
b/sysemu.h
116 116
extern int rtc_td_hack;
117 117
extern int alt_grab;
118 118
extern int usb_enabled;
119
extern int no_virtio_balloon;
119 120
extern int smp_cpus;
120 121
extern int cursor_hide;
121 122
extern int graphic_rotate;
b/vl.c
244 244
const char *vnc_display;
245 245
int acpi_enabled = 1;
246 246
int no_hpet = 0;
247
int no_virtio_balloon = 0;
247 248
int fd_bootchk = 1;
248 249
int no_reboot = 0;
249 250
int no_shutdown = 0;
......
5551 5552
            case QEMU_OPTION_no_hpet:
5552 5553
                no_hpet = 1;
5553 5554
                break;
5555
            case QEMU_OPTION_no_virtio_balloon:
5556
                no_virtio_balloon = 1;
5557
                break;
5554 5558
#endif
5555 5559
            case QEMU_OPTION_no_reboot:
5556 5560
                no_reboot = 1;

Also available in: Unified diff