Commit 09d8277e authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/huth-gitlab/tags/pull-request-2018-08-31' into staging 



Removal of deprecated options and improvements for the qtests

# gpg: Signature made Fri 31 Aug 2018 09:10:23 BST
# gpg:                using RSA key 2ED9D774FE702DB5
# gpg: Good signature from "Thomas Huth <th.huth@gmx.de>"
# gpg:                 aka "Thomas Huth <thuth@redhat.com>"
# gpg:                 aka "Thomas Huth <huth@tuxfamily.org>"
# gpg:                 aka "Thomas Huth <th.huth@posteo.de>"
# Primary key fingerprint: 27B8 8847 EEE0 2501 18F3  EAB9 2ED9 D774 FE70 2DB5

* remotes/huth-gitlab/tags/pull-request-2018-08-31:
  tests: add a qmp success-response test
  tests: add qmp/qom-set-without-value test
  tests: add qmp/object-add-without-props test
  tests: add qmp_assert_error_class()
  tests/libqos: Utilize newer glib spawn check
  net: Remove the deprecated -tftp, -bootp, -redir and -smb options
  Remove the deprecated options -startdate, -localtime and -rtc-td-hack
  Remove the deprecated -nodefconfig option
  Remove the deprecated -balloon option

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 2fde22f8 ae6bf766

docs/interop/live-block-operations.rst

+2 −2
Original line number Diff line number Diff line
@@ -129,7 +129,7 @@ To show some example invocations of command-line, we will use the 
following invocation of QEMU, with a QMP server running over UNIX

socket::



    $ ./x86_64-softmmu/qemu-system-x86_64 -display none -nodefconfig \

    $ ./x86_64-softmmu/qemu-system-x86_64 -display none -no-user-config \

        -M q35 -nodefaults -m 512 \

        -blockdev node-name=node-A,driver=qcow2,file.driver=file,file.node-name=file,file.filename=./a.qcow2 \

        -device virtio-blk,drive=node-A,id=virtio0 \
@@ -694,7 +694,7 @@ instance, with the following invocation. (As noted earlier, for 
simplicity's sake, the destination QEMU is started on the same host, but

it could be located elsewhere)::



    $ ./x86_64-softmmu/qemu-system-x86_64 -display none -nodefconfig \

    $ ./x86_64-softmmu/qemu-system-x86_64 -display none -no-user-config \

        -M q35 -nodefaults -m 512 \

        -blockdev node-name=node-TargetDisk,driver=qcow2,file.driver=file,file.node-name=file,file.filename=./target-disk.qcow2 \

        -device virtio-blk,drive=node-TargetDisk,id=virtio0 \

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:

include/net/net.h

+0 −3
Original line number Diff line number Diff line
@@ -201,9 +201,6 @@ extern NICInfo nd_table[MAX_NICS]; 
extern const char *host_net_devices[];



/* from net.c */

extern const char *legacy_tftp_prefix;

extern const char *legacy_bootp_filename;



int net_client_parse(QemuOptsList *opts_list, const char *str);

int net_init_clients(Error **errp);

void net_check_clients(void);

include/net/slirp.h

+0 −4
Original line number Diff line number Diff line
@@ -30,10 +30,6 @@ 
void hmp_hostfwd_add(Monitor *mon, const QDict *qdict);

void hmp_hostfwd_remove(Monitor *mon, const QDict *qdict);



int net_slirp_redir(const char *redir_str);



int net_slirp_smb(const char *exported_dir);



void hmp_info_usernet(Monitor *mon, const QDict *qdict);



#endif

net/slirp.c

+29 −103
Original line number Diff line number Diff line
@@ -67,13 +67,11 @@ static int get_str_sep(char *buf, int buf_size, const char **pp, int sep) 
/* slirp network adapter */



#define SLIRP_CFG_HOSTFWD 1

#define SLIRP_CFG_LEGACY  2



struct slirp_config_str {

    struct slirp_config_str *next;

    int flags;

    char str[1024];

    int legacy_format;

};



typedef struct SlirpState {
@@ -87,19 +85,13 @@ typedef struct SlirpState { 
} SlirpState;



static struct slirp_config_str *slirp_configs;

const char *legacy_tftp_prefix;

const char *legacy_bootp_filename;

static QTAILQ_HEAD(slirp_stacks, SlirpState) slirp_stacks =

    QTAILQ_HEAD_INITIALIZER(slirp_stacks);



static int slirp_hostfwd(SlirpState *s, const char *redir_str,

                         int legacy_format, Error **errp);

static int slirp_guestfwd(SlirpState *s, const char *config_str,

                          int legacy_format, Error **errp);

static int slirp_hostfwd(SlirpState *s, const char *redir_str, Error **errp);

static int slirp_guestfwd(SlirpState *s, const char *config_str, Error **errp);



#ifndef _WIN32

static const char *legacy_smb_export;



static int slirp_smb(SlirpState *s, const char *exported_dir,

                     struct in_addr vserver_addr, Error **errp);

static void slirp_smb_cleanup(SlirpState *s);
@@ -196,13 +188,6 @@ static int net_slirp_init(NetClientState *peer, const char *model, 
        return -1;

    }



    if (!tftp_export) {

        tftp_export = legacy_tftp_prefix;

    }

    if (!bootfile) {

        bootfile = legacy_bootp_filename;

    }



    if (vnetwork) {

        if (get_str_sep(buf, sizeof(buf), &vnetwork, '/') < 0) {

            if (!inet_aton(vnetwork, &net)) {
@@ -382,21 +367,16 @@ static int net_slirp_init(NetClientState *peer, const char *model, 


    for (config = slirp_configs; config; config = config->next) {

        if (config->flags & SLIRP_CFG_HOSTFWD) {

            if (slirp_hostfwd(s, config->str,

                              config->flags & SLIRP_CFG_LEGACY, errp) < 0) {

            if (slirp_hostfwd(s, config->str, errp) < 0) {

                goto error;

            }

        } else {

            if (slirp_guestfwd(s, config->str,

                               config->flags & SLIRP_CFG_LEGACY, errp) < 0) {

            if (slirp_guestfwd(s, config->str, errp) < 0) {

                goto error;

            }

        }

    }

#ifndef _WIN32

    if (!smb_export) {

        smb_export = legacy_smb_export;

    }

    if (smb_export) {

        if (slirp_smb(s, smb_export, smbsrv, errp) < 0) {

            goto error;
@@ -506,8 +486,7 @@ void hmp_hostfwd_remove(Monitor *mon, const QDict *qdict) 
    monitor_printf(mon, "invalid format\n");

}



static int slirp_hostfwd(SlirpState *s, const char *redir_str,

                         int legacy_format, Error **errp)

static int slirp_hostfwd(SlirpState *s, const char *redir_str, Error **errp)

{

    struct in_addr host_addr = { .s_addr = INADDR_ANY };

    struct in_addr guest_addr = { .s_addr = 0 };
@@ -532,7 +511,6 @@ static int slirp_hostfwd(SlirpState *s, const char *redir_str, 
        goto fail_syntax;

    }



    if (!legacy_format) {

    if (get_str_sep(buf, sizeof(buf), &p, ':') < 0) {

        fail_reason = "Missing : separator";

        goto fail_syntax;
@@ -541,9 +519,8 @@ static int slirp_hostfwd(SlirpState *s, const char *redir_str, 
        fail_reason = "Bad host address";

        goto fail_syntax;

    }

    }



    if (get_str_sep(buf, sizeof(buf), &p, legacy_format ? ':' : '-') < 0) {

    if (get_str_sep(buf, sizeof(buf), &p, '-') < 0) {

        fail_reason = "Bad host port separator";

        goto fail_syntax;

    }
@@ -602,35 +579,13 @@ void hmp_hostfwd_add(Monitor *mon, const QDict *qdict) 
    }

    if (s) {

        Error *err = NULL;

        if (slirp_hostfwd(s, redir_str, 0, &err) < 0) {

        if (slirp_hostfwd(s, redir_str, &err) < 0) {

            error_report_err(err);

        }

    }



}



int net_slirp_redir(const char *redir_str)

{

    struct slirp_config_str *config;

    Error *err = NULL;

    int res;



    if (QTAILQ_EMPTY(&slirp_stacks)) {

        config = g_malloc(sizeof(*config));

        pstrcpy(config->str, sizeof(config->str), redir_str);

        config->flags = SLIRP_CFG_HOSTFWD | SLIRP_CFG_LEGACY;

        config->next = slirp_configs;

        slirp_configs = config;

        return 0;

    }



    res = slirp_hostfwd(QTAILQ_FIRST(&slirp_stacks), redir_str, 1, &err);

    if (res < 0) {

        error_report_err(err);

    }

    return res;

}



#ifndef _WIN32



/* automatic user mode samba server configuration */
@@ -746,28 +701,6 @@ static int slirp_smb(SlirpState* s, const char *exported_dir, 
    return 0;

}



/* automatic user mode samba server configuration (legacy interface) */

int net_slirp_smb(const char *exported_dir)

{

    struct in_addr vserver_addr = { .s_addr = 0 };



    if (legacy_smb_export) {

        fprintf(stderr, "-smb given twice\n");

        return -1;

    }

    legacy_smb_export = exported_dir;

    if (!QTAILQ_EMPTY(&slirp_stacks)) {

        Error *err = NULL;

        int res = slirp_smb(QTAILQ_FIRST(&slirp_stacks), exported_dir,

                            vserver_addr, &err);

        if (res < 0) {

            error_report_err(err);

        }

        return res;

    }

    return 0;

}



#endif /* !defined(_WIN32) */



struct GuestFwd {
@@ -789,8 +722,7 @@ static void guestfwd_read(void *opaque, const uint8_t *buf, int size) 
    slirp_socket_recv(fwd->slirp, fwd->server, fwd->port, buf, size);

}



static int slirp_guestfwd(SlirpState *s, const char *config_str,

                          int legacy_format, Error **errp)

static int slirp_guestfwd(SlirpState *s, const char *config_str, Error **errp)

{

    struct in_addr server = { .s_addr = 0 };

    struct GuestFwd *fwd;
@@ -800,11 +732,6 @@ static int slirp_guestfwd(SlirpState *s, const char *config_str, 
    int port;



    p = config_str;

    if (legacy_format) {

        if (get_str_sep(buf, sizeof(buf), &p, ':') < 0) {

            goto fail_syntax;

        }

    } else {

    if (get_str_sep(buf, sizeof(buf), &p, ':') < 0) {

        goto fail_syntax;

    }
@@ -820,7 +747,6 @@ static int slirp_guestfwd(SlirpState *s, const char *config_str, 
    if (get_str_sep(buf, sizeof(buf), &p, '-') < 0) {

        goto fail_syntax;

    }

    }

    port = strtol(buf, &end, 10);

    if (*end != '\0' || port < 1 || port > 65535) {

        goto fail_syntax;