motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-23 10:01:59 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

migration: remove error from notifier data

Browse source 
Remove the error object from opaque data passed to notifiers.
Use the new error parameter passed to the notifier instead.

Signed-off-by: Steve Sistare <steven.sistare@oracle.com>
Reviewed-by: Peter Xu <peterx@redhat.com>
Reviewed-by: David Hildenbrand <david@redhat.com>
Link: https://lore.kernel.org/r/1708622920-68779-3-git-send-email-steven.sistare@oracle.com
Signed-off-by: Peter Xu <peterx@redhat.com>
This commit is contained in:
Steve Sistare 2024-02-22 09:28:28 -08:00 • committed by Peter Xu
parent be19d836cd
commit d91f33c72e
5 changed files with 4 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
hw/virtio/vhost-user.c
View file

@ -2096,20 +2096,20 @@ static int vhost_user_postcopy_notifier(NotifierWithReturn *notifier,
if (!virtio_has_feature(dev->protocol_features, if (!virtio_has_feature(dev->protocol_features,
VHOST_USER_PROTOCOL_F_PAGEFAULT)) { VHOST_USER_PROTOCOL_F_PAGEFAULT)) {
/* TODO: Get the device name into this error somehow */ /* TODO: Get the device name into this error somehow */
error_setg(pnd->errp, error_setg(errp,
"vhost-user backend not capable of postcopy"); "vhost-user backend not capable of postcopy");
return -ENOENT; return -ENOENT;
} }
break; break;
case POSTCOPY_NOTIFY_INBOUND_ADVISE: case POSTCOPY_NOTIFY_INBOUND_ADVISE:
return vhost_user_postcopy_advise(dev, pnd->errp); return vhost_user_postcopy_advise(dev, errp);
case POSTCOPY_NOTIFY_INBOUND_LISTEN: case POSTCOPY_NOTIFY_INBOUND_LISTEN:
return vhost_user_postcopy_listen(dev, pnd->errp); return vhost_user_postcopy_listen(dev, errp);
case POSTCOPY_NOTIFY_INBOUND_END: case POSTCOPY_NOTIFY_INBOUND_END:
return vhost_user_postcopy_end(dev, pnd->errp); return vhost_user_postcopy_end(dev, errp);
default: default:
/* We ignore notifications we don't know */ /* We ignore notifications we don't know */

1
include/migration/misc.h
View file

@ -31,7 +31,6 @@ typedef enum PrecopyNotifyReason {
typedef struct PrecopyNotifyData { typedef struct PrecopyNotifyData {
enum PrecopyNotifyReason reason; enum PrecopyNotifyReason reason;
Error **errp;
} PrecopyNotifyData; } PrecopyNotifyData;
void precopy_infrastructure_init(void); void precopy_infrastructure_init(void);

1
migration/postcopy-ram.c
View file

@ -77,7 +77,6 @@ int postcopy_notify(enum PostcopyNotifyReason reason, Error **errp)
{ {
struct PostcopyNotifyData pnd; struct PostcopyNotifyData pnd;
pnd.reason = reason; pnd.reason = reason;
pnd.errp = errp;
return notifier_with_return_list_notify(&postcopy_notifier_list, return notifier_with_return_list_notify(&postcopy_notifier_list,
&pnd, errp); &pnd, errp);

1
migration/postcopy-ram.h
View file

@ -128,7 +128,6 @@ enum PostcopyNotifyReason {
struct PostcopyNotifyData { struct PostcopyNotifyData {
enum PostcopyNotifyReason reason; enum PostcopyNotifyReason reason;
Error **errp;
}; };
void postcopy_add_notifier(NotifierWithReturn *nn); void postcopy_add_notifier(NotifierWithReturn *nn);

1
migration/ram.c
View file

@ -426,7 +426,6 @@ int precopy_notify(PrecopyNotifyReason reason, Error **errp)
{ {
PrecopyNotifyData pnd; PrecopyNotifyData pnd;
pnd.reason = reason; pnd.reason = reason;
pnd.errp = errp;
return notifier_with_return_list_notify(&precopy_notifier_list, &pnd, errp); return notifier_with_return_list_notify(&precopy_notifier_list, &pnd, errp);
} }