Commit cdadde39 authored by Roger Pau Monne's avatar Roger Pau Monne Committed by Stefano Stabellini
Browse files

xen: fix usage of xc_domain_create in domain builder 



Due to the addition of HVMlite and the requirement to always provide a
valid xc_domain_configuration_t, xc_domain_create now always takes an arch
domain config, which can be NULL in order to mimic previous behaviour.

Add a small stub called xen_domain_create that encapsulates the correct
call to xc_domain_create depending on the libxc version detected.

Signed-off-by: default avatarRoger Pau Monné <roger.pau@citrix.com>
Acked-by: default avatarStefano Stabellini <stefano.stabellini@eu.citrix.com>
Signed-off-by: default avatarStefano Stabellini <stefano.stabellini@eu.citrix.com>
parent 8337c6cb

configure

+17 −0
Original line number Diff line number Diff line
@@ -1928,6 +1928,23 @@ EOF 
  elif

      cat > $TMPC <<EOF &&

#include <xenctrl.h>

#include <stdint.h>

int main(void) {

  xc_interface *xc = NULL;

  xen_domain_handle_t handle;

  xc_domain_create(xc, 0, handle, 0, NULL, NULL);

  return 0;

}

EOF

      compile_prog "" "$xen_libs"

    then

    xen_ctrl_version=470

    xen=yes



  # Xen 4.6

  elif

      cat > $TMPC <<EOF &&

#include <xenctrl.h>

#include <xenstore.h>

#include <stdint.h>

#include <xen/hvm/hvm_info_table.h>

hw/xenpv/xen_domainbuild.c

+1 −1
Original line number Diff line number Diff line
@@ -234,7 +234,7 @@ int xen_domain_build_pv(const char *kernel, const char *ramdisk, 
    int rc;



    memcpy(uuid, qemu_uuid, sizeof(uuid));

    rc = xc_domain_create(xen_xc, ssidref, uuid, flags, &xen_domid);

    rc = xen_domain_create(xen_xc, ssidref, uuid, flags, &xen_domid);

    if (rc < 0) {

        fprintf(stderr, "xen: xc_domain_create() failed\n");

        goto err;

include/hw/xen/xen_common.h

+16 −0
Original line number Diff line number Diff line
@@ -439,4 +439,20 @@ static inline int xen_xc_domain_add_to_physmap(XenXC xch, uint32_t domid, 
}

#endif



#if CONFIG_XEN_CTRL_INTERFACE_VERSION < 470

static inline int xen_domain_create(XenXC xc, uint32_t ssidref,

                                    xen_domain_handle_t handle, uint32_t flags,

                                    uint32_t *pdomid)

{

    return xc_domain_create(xc, ssidref, handle, flags, pdomid);

}

#else

static inline int xen_domain_create(XenXC xc, uint32_t ssidref,

                                    xen_domain_handle_t handle, uint32_t flags,

                                    uint32_t *pdomid)

{

    return xc_domain_create(xc, ssidref, handle, flags, pdomid, NULL);

}

#endif



#endif /* QEMU_HW_XEN_COMMON_H */