vmd(8): remove unused error code

classic Classic list List threaded Threaded
2 messages Options
Reply | Threaded
Open this post in threaded view
|

vmd(8): remove unused error code

Tobias Heider-2
The VMD_DISK_INVALID error code is no longer used since
https://marc.info/?l=openbsd-cvs&m=153147762830175 and
can be removed.

Ok?

Index: vmctl/vmctl.c
===================================================================
RCS file: /cvs/src/usr.sbin/vmctl/vmctl.c,v
retrieving revision 1.69
diff -u -p -u -r1.69 vmctl.c
--- vmctl/vmctl.c 22 May 2019 16:19:21 -0000 1.69
+++ vmctl/vmctl.c 1 Sep 2019 22:06:32 -0000
@@ -235,11 +235,6 @@ vm_start_complete(struct imsg *imsg, int
  warnx("could not open disk image(s)");
  *ret = ENOENT;
  break;
- case VMD_DISK_INVALID:
- warnx("specified disk image(s) are "
-    "not regular files");
- *ret = ENOENT;
- break;
  case VMD_CDROM_MISSING:
  warnx("could not find specified iso image");
  *ret = ENOENT;
Index: vmd/vmd.h
===================================================================
RCS file: /cvs/src/usr.sbin/vmd/vmd.h,v
retrieving revision 1.95
diff -u -p -u -r1.95 vmd.h
--- vmd/vmd.h 17 Jul 2019 05:51:07 -0000 1.95
+++ vmd/vmd.h 1 Sep 2019 22:06:32 -0000
@@ -68,7 +68,6 @@
 /* vmd -> vmctl error codes */
 #define VMD_BIOS_MISSING 1001
 #define VMD_DISK_MISSING 1002
-#define VMD_DISK_INVALID 1003
 #define VMD_VM_STOP_INVALID 1004
 #define VMD_CDROM_MISSING 1005
 #define VMD_CDROM_INVALID 1006

Reply | Threaded
Open this post in threaded view
|

Re: vmd(8): remove unused error code

Mike Larkin-2
On Mon, Sep 02, 2019 at 12:43:18AM +0200, Tobias Heider wrote:

> The VMD_DISK_INVALID error code is no longer used since
> https://marc.info/?l=openbsd-cvs&m=153147762830175 and
> can be removed.
>
> Ok?
>
> Index: vmctl/vmctl.c
> ===================================================================
> RCS file: /cvs/src/usr.sbin/vmctl/vmctl.c,v
> retrieving revision 1.69
> diff -u -p -u -r1.69 vmctl.c
> --- vmctl/vmctl.c 22 May 2019 16:19:21 -0000 1.69
> +++ vmctl/vmctl.c 1 Sep 2019 22:06:32 -0000
> @@ -235,11 +235,6 @@ vm_start_complete(struct imsg *imsg, int
>   warnx("could not open disk image(s)");
>   *ret = ENOENT;
>   break;
> - case VMD_DISK_INVALID:
> - warnx("specified disk image(s) are "
> -    "not regular files");
> - *ret = ENOENT;
> - break;
>   case VMD_CDROM_MISSING:
>   warnx("could not find specified iso image");
>   *ret = ENOENT;
> Index: vmd/vmd.h
> ===================================================================
> RCS file: /cvs/src/usr.sbin/vmd/vmd.h,v
> retrieving revision 1.95
> diff -u -p -u -r1.95 vmd.h
> --- vmd/vmd.h 17 Jul 2019 05:51:07 -0000 1.95
> +++ vmd/vmd.h 1 Sep 2019 22:06:32 -0000
> @@ -68,7 +68,6 @@
>  /* vmd -> vmctl error codes */
>  #define VMD_BIOS_MISSING 1001
>  #define VMD_DISK_MISSING 1002
> -#define VMD_DISK_INVALID 1003
>  #define VMD_VM_STOP_INVALID 1004
>  #define VMD_CDROM_MISSING 1005
>  #define VMD_CDROM_INVALID 1006
>

ok mlarkin

You might want to comment that 1003 was VMD_DISK_INVALID in case someone
later is wondering why we skipped 1002 to 1004. Like we do with syscalls.

-ml