From 2621f73e49c1b91c1064c8b7d5738fe3e36cdc56 Mon Sep 17 00:00:00 2001 From: Roger Pau Monne Date: Thu, 26 Jul 2012 10:35:31 +0100 Subject: libxl: rename _IOEMU nic type to VIF_IOEMU This change will avoid the confusion caused by the fact that IOEMU means both PV and TAP network interfaces. Signed-off-by: Roger Pau Monne Acked-by: Ian Jackson Committed-by: Ian Campbell --- tools/libxl/libxl.c | 6 +++--- tools/libxl/libxl_dm.c | 8 ++++---- tools/libxl/libxl_types.idl | 2 +- tools/libxl/xl_cmdimpl.c | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) (limited to 'tools') diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 89183b1365..559b45e586 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -2316,7 +2316,7 @@ int libxl__device_nic_setdefault(libxl__gc *gc, libxl_device_nic *nic) libxl__xen_script_dir_path()) < 0 ) return ERROR_FAIL; if (!nic->nictype) - nic->nictype = LIBXL_NIC_TYPE_IOEMU; + nic->nictype = LIBXL_NIC_TYPE_VIF_IOEMU; return 0; } @@ -2470,7 +2470,7 @@ static void libxl__device_nic_from_xs_be(libxl__gc *gc, nic->script = xs_read(ctx->xsh, XBT_NULL, libxl__sprintf(gc, "%s/script", be_path), &len); - /* XXX ioemu nics are not in xenstore at all? */ + /* vif_ioemu nics use the same xenstore entries as vif interfaces */ nic->nictype = LIBXL_NIC_TYPE_VIF; nic->model = NULL; /* XXX Only for TYPE_IOEMU */ nic->ifname = NULL; /* XXX Only for TYPE_IOEMU */ @@ -2603,7 +2603,7 @@ const char *libxl__device_nic_devname(libxl__gc *gc, switch (type) { case LIBXL_NIC_TYPE_VIF: return GCSPRINTF("vif%u.%d", domid, devid); - case LIBXL_NIC_TYPE_IOEMU: + case LIBXL_NIC_TYPE_VIF_IOEMU: return GCSPRINTF("vif%u.%d" TAP_DEVICE_SUFFIX, domid, devid); default: abort(); diff --git a/tools/libxl/libxl_dm.c b/tools/libxl/libxl_dm.c index 0e2ec188a1..11cfc42708 100644 --- a/tools/libxl/libxl_dm.c +++ b/tools/libxl/libxl_dm.c @@ -215,12 +215,12 @@ static char ** libxl__build_device_model_args_old(libxl__gc *gc, free(s); for (i = 0; i < num_nics; i++) { - if (nics[i].nictype == LIBXL_NIC_TYPE_IOEMU) { + if (nics[i].nictype == LIBXL_NIC_TYPE_VIF_IOEMU) { char *smac = libxl__sprintf(gc, LIBXL_MAC_FMT, LIBXL_MAC_BYTES(nics[i].mac)); const char *ifname = libxl__device_nic_devname(gc, domid, nics[i].devid, - LIBXL_NIC_TYPE_IOEMU); + LIBXL_NIC_TYPE_VIF_IOEMU); flexarray_vappend(dm_args, "-net", GCSPRINTF( @@ -469,12 +469,12 @@ static char ** libxl__build_device_model_args_new(libxl__gc *gc, b_info->max_vcpus)); } for (i = 0; i < num_nics; i++) { - if (nics[i].nictype == LIBXL_NIC_TYPE_IOEMU) { + if (nics[i].nictype == LIBXL_NIC_TYPE_VIF_IOEMU) { char *smac = libxl__sprintf(gc, LIBXL_MAC_FMT, LIBXL_MAC_BYTES(nics[i].mac)); const char *ifname = libxl__device_nic_devname(gc, guest_domid, nics[i].devid, - LIBXL_NIC_TYPE_IOEMU); + LIBXL_NIC_TYPE_VIF_IOEMU); flexarray_append(dm_args, "-device"); flexarray_append(dm_args, libxl__sprintf(gc, "%s,id=nic%d,netdev=net%d,mac=%s", diff --git a/tools/libxl/libxl_types.idl b/tools/libxl/libxl_types.idl index c3fbe77c67..574d8d2f6d 100644 --- a/tools/libxl/libxl_types.idl +++ b/tools/libxl/libxl_types.idl @@ -60,7 +60,7 @@ libxl_disk_backend = Enumeration("disk_backend", [ ]) libxl_nic_type = Enumeration("nic_type", [ - (1, "IOEMU"), + (1, "VIF_IOEMU"), (2, "VIF"), ]) diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index ad5849d92e..26fcf13f49 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -977,7 +977,7 @@ static void parse_config_data(const char *config_source, nic->bridge = strdup(p2 + 1); } else if (!strcmp(p, "type")) { if (!strcmp(p2 + 1, "ioemu")) - nic->nictype = LIBXL_NIC_TYPE_IOEMU; + nic->nictype = LIBXL_NIC_TYPE_VIF_IOEMU; else nic->nictype = LIBXL_NIC_TYPE_VIF; } else if (!strcmp(p, "ip")) { @@ -5194,7 +5194,7 @@ int main_networkattach(int argc, char **argv) if (!strcmp("vif", oparg)) { nic.nictype = LIBXL_NIC_TYPE_VIF; } else if (!strcmp("ioemu", oparg)) { - nic.nictype = LIBXL_NIC_TYPE_IOEMU; + nic.nictype = LIBXL_NIC_TYPE_VIF_IOEMU; } else { fprintf(stderr, "Invalid parameter `type'.\n"); return 1; -- cgit v1.2.3