[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Xen-devel] [PATCH 3/3] xen-init-dom0: set Dom0 UUID if requested
- To: Wei Liu <wei.liu2@xxxxxxxxxx>, Xen-devel <xen-devel@xxxxxxxxxxxxxxxxxxxx>
- From: Edwin Török <edvin.torok@xxxxxxxxxx>
- Date: Thu, 15 Nov 2018 10:45:52 +0000
- Autocrypt: addr=edvin.torok@xxxxxxxxxx; prefer-encrypt=mutual; keydata= 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 9+7vClPkJR3cL3sPuy/pLsGT3/jpOrKSb0q8
- Cc: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>, Ian Jackson <Ian.Jackson@xxxxxxxxxxxxx>, Sergey Dyasli <sergey.dyasli@xxxxxxxxxx>
- Delivery-date: Thu, 15 Nov 2018 12:30:34 +0000
- List-id: Xen developer discussion <xen-devel.lists.xenproject.org>
- Openpgp: preference=signencrypt
On 14/11/2018 18:17, Wei Liu wrote:
> Read from XEN_CONFIG_DIR/dom0-uuid. If it contains a valid UUID, set
> it for Dom0.
>
> Signed-off-by: Wei Liu <wei.liu2@xxxxxxxxxx>
[snip]
In general this looks good, however I am not familiar with libxl
conventions, so just some generic comments below.
> +static void get_dom0_uuid(libxl_uuid *uuid)
> +{
> + int fd = -1;
> + ssize_t r;
> + char uuid_buf[LIBXL_UUID_FMTLEN+1];
> +
> + libxl_uuid_clear(uuid);
> +
> + fd = open(DOM0_UUID_PATH, O_RDONLY);
> + if (fd < 0) {
> + fprintf(stderr, "failed to open %s\n", DOM0_UUID_PATH);
> + goto out;
> + }
> +
> + r = read(fd, uuid_buf, LIBXL_UUID_FMTLEN);
Could this be a short read? I'm not familiar with libxl conventions, but
would there be a utility function that repeats the read if it is short,
or would fread be better?
> + if (r == -1) {
> + fprintf(stderr, "failed to read %s, errno %d\n", DOM0_UUID_PATH,
> errno);
> + goto out;
> + }
> +
> + if (r != LIBXL_UUID_FMTLEN) {
> + fprintf(stderr, "file too short\n");
Would be nice to print which file is too short.
> + goto out;
> + }
> +
> + uuid_buf[LIBXL_UUID_FMTLEN] = 0;
> +
> + if (libxl_uuid_from_string(uuid, uuid_buf)) {
> + fprintf(stderr, "failed to parse UUID\n");
As above, would be nice to print which file this error is from.
> + libxl_uuid_clear(uuid);
> + }
> +
> +out:
> + if (fd >= 0) close(fd);
> +}
> +
> int main(int argc, char **argv)
> {
> int rc;
> - struct xs_handle *xsh;
> + struct xs_handle *xsh = NULL;
> + xc_interface *xch = NULL;
> char *domname_string = NULL, *domid_string = NULL;
> + libxl_uuid uuid;
>
> xsh = xs_open(0);
> if (!xsh) {
> fprintf(stderr, "cannot open xenstore connection\n");
> - exit(1);
> + rc = 1;
> + goto out;
> + }
> +
> + xch = xc_interface_open(NULL, NULL, 0);
> + if (!xch) {
> + fprintf(stderr, "xc_interface_open() failed\n");
> + rc = 1;
> }
>
> /* Sanity check: this program can only be run once. */
> @@ -31,7 +82,16 @@ int main(int argc, char **argv)
> goto out;
> }
>
> - rc = gen_stub_json_config(0, NULL);
> + get_dom0_uuid(&uuid);
> +
> + if (!libxl_uuid_is_nil(&uuid) &&
> + xc_domain_sethandle(xch, 0, libxl_uuid_bytearray(&uuid))) {
> + fprintf(stderr, "failed to set Dom0 UUID\n");
Can xc_domain_sethandle tell us why it failed?
> + rc = 1;
> + goto out;
> + }
> +
> + rc = gen_stub_json_config(0, &uuid);
> if (rc)
> goto out;
>
> @@ -55,6 +115,7 @@ out:
> free(domid_string);
> free(domname_string);
> xs_close(xsh);
> + xc_interface_close(xch);
I assume this function doesn't mind getting called with NULL, right?
Best regards,
--Edwin
_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/mailman/listinfo/xen-devel
|