Commit 1d9cb42c authored by Thomas Huth's avatar Thomas Huth
Browse files

Remove the deprecated -balloon option 



The "-balloon" option has been replaced by "-device virtio-balloon".
It's been marked as deprecated since two releases, and nobody
complained, so let's remove it now.

Acked-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Reviewed-by: default avatarDaniel P. Berrangé <berrange@redhat.com>
Reviewed-by: default avatarCornelia Huck <cohuck@redhat.com>
Reviewed-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Reviewed-by: default avatarDavid Hildenbrand <david@redhat.com>
Acked-by: default avatarPeter Krempa <pkrempa@redhat.com>
Acked-by: default avatarJán Tomko <jtomko@redhat.com>
Signed-off-by: default avatarThomas Huth <thuth@redhat.com>
parent 19b599f7

docs/virtio-balloon-stats.txt

+3 −3
Original line number Diff line number Diff line
@@ -61,9 +61,9 @@ It's also important to note the following: 
   respond to the request the timer will never be re-armed, which has

   the same effect as disabling polling



Here are a few examples. QEMU is started with '-balloon virtio', which

generates '/machine/peripheral-anon/device[1]' as the QOM path for the

balloon device.

Here are a few examples. QEMU is started with '-device virtio-balloon',

which generates '/machine/peripheral-anon/device[1]' as the QOM path for

the balloon device.



Enable polling with 2 seconds interval:

qemu-deprecated.texi

+0 −5
Original line number Diff line number Diff line
@@ -86,11 +86,6 @@ enabled via the ``-machine usb=on'' argument. 


The ``-nodefconfig`` argument is a synonym for ``-no-user-config``.



@subsection -balloon (since 2.12.0)



The @option{--balloon virtio} argument has been superseded by

@option{--device virtio-balloon}.



@subsection -fsdev handle (since 2.12.0)



The ``handle'' fsdev backend does not support symlinks and causes the 9p

qemu-options.hx

+0 −10
Original line number Diff line number Diff line
@@ -454,16 +454,6 @@ modprobe i810_audio clocking=48000 
@end example

ETEXI



DEF("balloon", HAS_ARG, QEMU_OPTION_balloon,

    "-balloon virtio[,addr=str]\n"

    "                enable virtio balloon device (deprecated)\n", QEMU_ARCH_ALL)

STEXI

@item -balloon virtio[,addr=@var{addr}]

@findex -balloon

Enable virtio balloon device, optionally with PCI address @var{addr}. This

option is deprecated, use @option{-device virtio-balloon} instead.

ETEXI



DEF("device", HAS_ARG, QEMU_OPTION_device,

    "-device driver[,prop[=value][,...]]\n"

    "                add device (based on driver)\n"

vl.c

+0 −36
Original line number Diff line number Diff line
@@ -2127,36 +2127,6 @@ static void parse_display(const char *p) 
    }

}



static int balloon_parse(const char *arg)

{

    QemuOpts *opts;



    warn_report("This option is deprecated. "

                "Use '--device virtio-balloon' to enable the balloon device.");



    if (strcmp(arg, "none") == 0) {

        return 0;

    }



    if (!strncmp(arg, "virtio", 6)) {

        if (arg[6] == ',') {

            /* have params -> parse them */

            opts = qemu_opts_parse_noisily(qemu_find_opts("device"), arg + 7,

                                           false);

            if (!opts)

                return  -1;

        } else {

            /* create empty opts */

            opts = qemu_opts_create(qemu_find_opts("device"), NULL, 0,

                                    &error_abort);

        }

        qemu_opt_set(opts, "driver", "virtio-balloon", &error_abort);

        return 0;

    }



    return -1;

}



char *qemu_find_file(int type, const char *name)

{

    int i;
@@ -3660,12 +3630,6 @@ int main(int argc, char **argv, char **envp) 
            case QEMU_OPTION_no_hpet:

                no_hpet = 1;

                break;

            case QEMU_OPTION_balloon:

                if (balloon_parse(optarg) < 0) {

                    error_report("unknown -balloon argument %s", optarg);

                    exit(1);

                }

                break;

            case QEMU_OPTION_no_reboot:

                no_reboot = 1;

                break;