diff options
| author | Roger Pau Monne <roger.pau@citrix.com> | 2013-01-23 17:55:39 +0000 |
|---|---|---|
| committer | Ian Jackson <Ian.Jackson@eu.citrix.com> | 2013-03-13 14:48:00 +0000 |
| commit | d46d13606e5533d63a83c6541942d7d66f217896 (patch) | |
| tree | 4d06397206690cbde9e7e1515b85b9eea58c9f90 /tools/libxl/libxl.c | |
| parent | f493a3228f7c3c6937f2798fea1f4ed44fb3a425 (diff) | |
| download | xen-d46d13606e5533d63a83c6541942d7d66f217896.tar.gz xen-d46d13606e5533d63a83c6541942d7d66f217896.tar.bz2 xen-d46d13606e5533d63a83c6541942d7d66f217896.zip | |
libxl: move libxl_device_action to idl
Move to idl for ease of expansion and auto-generated functions.
Signed-off-by: Roger Pau Monné <roger.pau@citrix.com>
Cc: Ian Campbell <ian.campbell@citrix.com>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
Diffstat (limited to 'tools/libxl/libxl.c')
| -rw-r--r-- | tools/libxl/libxl.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 345d88b83f..a09c0fad68 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -1695,12 +1695,12 @@ static void device_addrm_aocomplete(libxl__egc *egc, libxl__ao_device *aodev) if (aodev->rc) { if (aodev->dev) { LOG(ERROR, "unable to %s %s with id %u", - aodev->action == DEVICE_CONNECT ? "add" : "remove", + libxl__device_action_to_string(aodev->action), libxl__device_kind_to_string(aodev->dev->kind), aodev->dev->devid); } else { LOG(ERROR, "unable to %s device", - aodev->action == DEVICE_CONNECT ? "add" : "remove"); + libxl__device_action_to_string(aodev->action)); } goto out; } @@ -1806,7 +1806,7 @@ void libxl__device_vtpm_add(libxl__egc *egc, uint32_t domid, libxl__xs_kvs_of_flexarray(gc, front, front->count)); aodev->dev = device; - aodev->action = DEVICE_CONNECT; + aodev->action = LIBXL__DEVICE_ACTION_ADD; libxl__wait_device_connection(egc, aodev); rc = 0; @@ -2166,7 +2166,7 @@ static void device_disk_add(libxl__egc *egc, uint32_t domid, } aodev->dev = device; - aodev->action = DEVICE_CONNECT; + aodev->action = LIBXL__DEVICE_ACTION_ADD; libxl__wait_device_connection(egc, aodev); rc = 0; @@ -2631,7 +2631,7 @@ static void local_device_attach_cb(libxl__egc *egc, libxl__ao_device *aodev) rc = aodev->rc; if (rc) { LOGE(ERROR, "unable to %s %s with id %u", - aodev->action == DEVICE_CONNECT ? "add" : "remove", + libxl__device_action_to_string(aodev->action), libxl__device_kind_to_string(aodev->dev->kind), aodev->dev->devid); goto out; @@ -2685,7 +2685,7 @@ void libxl__device_disk_local_initiate_detach(libxl__egc *egc, disk, device); if (rc != 0) goto out; - aodev->action = DEVICE_DISCONNECT; + aodev->action = LIBXL__DEVICE_ACTION_REMOVE; aodev->dev = device; aodev->callback = local_device_detach_cb; aodev->force = 0; @@ -2716,7 +2716,7 @@ static void local_device_detach_cb(libxl__egc *egc, libxl__ao_device *aodev) if (aodev->rc) { LOGE(ERROR, "unable to %s %s with id %u", - aodev->action == DEVICE_CONNECT ? "add" : "remove", + libxl__device_action_to_string(aodev->action), libxl__device_kind_to_string(aodev->dev->kind), aodev->dev->devid); goto out; @@ -2895,7 +2895,7 @@ void libxl__device_nic_add(libxl__egc *egc, uint32_t domid, libxl__xs_kvs_of_flexarray(gc, front, front->count)); aodev->dev = device; - aodev->action = DEVICE_CONNECT; + aodev->action = LIBXL__DEVICE_ACTION_ADD; libxl__wait_device_connection(egc, aodev); rc = 0; @@ -3373,7 +3373,7 @@ out: \ GCNEW(aodev); \ libxl__prepare_ao_device(ao, aodev); \ - aodev->action = DEVICE_DISCONNECT; \ + aodev->action = LIBXL__DEVICE_ACTION_REMOVE; \ aodev->dev = device; \ aodev->callback = device_addrm_aocomplete; \ aodev->force = f; \ |